[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: Fri, 18 Mar 2011 07:01:06 +0000 (UTC)
commit e413544dbdfbcd18c201a7aa85171f84fcdb2b69
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Fri Mar 18 15:00:57 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1283 ++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 1283 ++++++++++++++++++++++++++++++----------------------------
 2 files changed, 1328 insertions(+), 1238 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 3edb0de..3a95870 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 2.91.4\n"
+"Project-Id-Version: evolution-data-server 2.91.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-12 19:28+0800\n"
-"PO-Revision-Date: 2010-12-12 19:29+0800\n"
+"POT-Creation-Date: 2011-03-18 14:59+0800\n"
+"PO-Revision-Date: 2011-03-18 14:59+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
@@ -39,6 +39,57 @@ msgstr "è¼?å?¥ä¸â?¦"
 msgid "Searching..."
 msgstr "æ??å°?ä¸â?¦"
 
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contactsâ?¦"
+msgstr "æ?¥è©¢æ?´æ?°ç??è?¯çµ¡äººâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+msgid "Personal"
+msgstr "å??äºº"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+msgid "Friends"
+msgstr "æ??å??"
+
+# addressbook/contact-editor/e-contact-quick-add.c:276
+# addressbook/gui/widgets/e-addressbook-view.c:700
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+msgid "Family"
+msgstr "å®¶äºº"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "å??äº?"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groupsâ?¦"
+msgstr "æ?¥è©¢æ?´æ?°ç??ç¾£çµ?â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contactâ?¦"
+msgstr "å»ºç«?æ?°ç??è?¯çµ¡äººâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ?¦"
+msgstr "å?ªé?¤è?¯çµ¡äººâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contactâ?¦"
+msgstr "ä¿®æ?¹è?¯çµ¡äººâ?¦"
+
+# mail/mail-send-recv.c:287
+# mail/mail-send-recv.c:333
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+msgid "Loadingâ?¦"
+msgstr "è¼?å?¥ä¸â?¦"
+
+# camel/providers/smtp/camel-smtp-transport.c:218
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+msgid "Authenticating with the serverâ?¦"
+msgstr "è??ä¼ºæ??å?¨é©?è?â?¦"
+
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
@@ -46,8 +97,8 @@ msgid "Downloading contacts (%d)... "
 msgstr "æ£å?¨ä¸?è¼?è?¯çµ¡äºº (%d)â?¦"
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3075
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "æ£å?¨æ?´æ?°è?¯çµ¡äººå¿«å?? (%d)â?¦"
@@ -111,12 +162,13 @@ msgstr "é?²è¡?æ??å°?æ??ç?¼ç??é?¯èª¤"
 #: ../addressbook/libedata-book/e-data-book.c:441
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
-#: ../calendar/backends/http/e-cal-backend-http.c:378
-#: ../calendar/libecal/e-cal.c:4180
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4177
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:160
 #: ../camel/providers/imap/camel-imap-command.c:481
 #: ../camel/providers/imap/camel-imap-store.c:425
 #: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
 #: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
@@ -126,7 +178,7 @@ msgstr "ä¸?æ??ç??é?¯èª¤"
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "å»ºç«?è³?æº?ã??%sã??å¤±æ??ï¼?HTTP ç??æ??ï¼?%d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3066
+#: ../addressbook/libebook/e-book.c:3160
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%sï¼?æ²?æ??å?²å?æ?¼ GConf ä¸ç?? UIDã??%sã??ä¾?æº?ã??"
@@ -134,7 +186,7 @@ msgstr "%sï¼?æ²?æ??å?²å?æ?¼ GConf ä¸ç?? UIDã??%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
-#: ../addressbook/libebook/e-book.c:3422
+#: ../addressbook/libebook/e-book.c:3516
 #: ../addressbook/libedata-book/e-data-book.c:183
 msgid "Address book does not exist"
 msgstr "é??è¨?é??ä¸?å?å?¨"
@@ -378,7 +430,7 @@ msgstr "ç¶²èª? URL"
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:759
+#: ../libedataserverui/e-categories-dialog.c:757
 msgid "Categories"
 msgstr "å??é¡?"
 
@@ -673,7 +725,7 @@ msgstr "å?ºç??æ?¥æ??"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
 #: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Anniversary"
 msgstr "é?±å¹´ç´?å¿µæ?¥"
 
@@ -764,34 +816,35 @@ msgstr "SIP ä½?å??"
 msgid "Unnamed List"
 msgstr "æ?ªå?½å??ç??æ¸?å?®"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:298
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
 #, c-format
 msgid "Empty URI"
 msgstr "ç©ºç?? URI"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:317
-#: ../addressbook/libedata-book/e-data-book-factory.c:355
-#: ../calendar/libedata-cal/e-data-cal-factory.c:346
-#: ../calendar/libedata-cal/e-data-cal-factory.c:358
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
 #, c-format
 msgid "Invalid source"
 msgstr "ç?¡æ??ç??ä¾?æº?"
 
 #: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../calendar/libedata-cal/e-data-cal.c:108
 msgid "Success"
 msgstr "æ??å??"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
 #: ../addressbook/libedata-book/e-data-book.c:174
-#: ../calendar/libedata-cal/e-data-cal.c:111
+#: ../calendar/libedata-cal/e-data-cal.c:109
 msgid "Repository offline"
 msgstr "è³?æ??åº«é?¢ç·?"
 
 # shell/e-storage.c:475
 #: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4162 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:110
 msgid "Permission denied"
 msgstr "æ¬?é??ä¸?è¶³"
 
@@ -806,31 +859,31 @@ msgstr "è?¯çµ¡äºº ID å·²ç¶?å?å?¨"
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../calendar/libedata-cal/e-data-cal.c:115
 msgid "Authentication Failed"
 msgstr "é©?è?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
 #: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../calendar/libedata-cal/e-data-cal.c:116
 msgid "Authentication Required"
 msgstr "è¦?æ±?é©?è?"
 
 # mail/mail-config.glade.h:1
 #: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../calendar/libedata-cal/e-data-cal.c:117
 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:181
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Unsupported authentication method"
 msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
 
 #: ../addressbook/libedata-book/e-data-book.c:182
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../calendar/libedata-cal/e-data-cal.c:120
 msgid "TLS not available"
 msgstr "ç?¡æ³?ä½¿ç?¨ TLS"
 
@@ -841,35 +894,35 @@ msgstr "é??è¨?é??å·²ç¶?ç§»é?¤"
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
 #: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../calendar/libedata-cal/e-data-cal.c:123
 msgid "Not available in offline mode"
 msgstr "ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨"
 
 #: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../calendar/libedata-cal/e-data-cal.c:124
 msgid "Search size limit exceeded"
 msgstr "è¶?é??æ??å°?å¤§å°?é??å?¶"
 
 #: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../calendar/libedata-cal/e-data-cal.c:125
 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:188
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../calendar/libedata-cal/e-data-cal.c:126
 msgid "Invalid query"
 msgstr "ç?¡æ??ç??æ?¥è©¢"
 
 #: ../addressbook/libedata-book/e-data-book.c:189
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../calendar/libedata-cal/e-data-cal.c:127
 msgid "Query refused"
 msgstr "æ?¥è©¢è¢«æ??çµ?"
 
 # calendar/gui/e-itip-control.c:883
 #: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:130
+#: ../calendar/libedata-cal/e-data-cal.c:128
 msgid "Could not cancel"
 msgstr "ç?¡æ³?å??æ¶?"
 
@@ -878,7 +931,7 @@ msgstr "ç?¡æ³?å??æ¶?"
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
 #: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libedata-cal/e-data-cal.c:132
+#: ../calendar/libedata-cal/e-data-cal.c:130
 msgid "Invalid server version"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ç??æ?¬"
 
@@ -890,20 +943,20 @@ msgstr "æ²?æ??ç©ºé??"
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
 #: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libecal/e-cal.c:4146 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:131
 msgid "Invalid argument"
 msgstr "ç?¡æ??ç??å??æ?¸"
 
 # shell/e-storage.c:477
 #. Translators: The string for NOT_SUPPORTED error
 #: ../addressbook/libedata-book/e-data-book.c:196
-#: ../calendar/libecal/e-cal.c:4185 ../calendar/libedata-cal/e-data-cal.c:135
+#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:133
 msgid "Not supported"
 msgstr "ä¸?æ?¯æ?´"
 
 # addressbook/gui/widgets/e-addressbook-view.c:718
 #: ../addressbook/libedata-book/e-data-book.c:204
-#: ../calendar/libedata-cal/e-data-cal.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:141
 msgid "Other error"
 msgstr "å?¶ä»?é?¯èª¤"
 
@@ -1048,8 +1101,8 @@ msgstr "ç?¡æ³?é?£æ?¥ä¼ºæ??å?¨ (%s)"
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "HTTP å??æ??æ?ªé ?æ??ç??ç??æ??ç¢¼ %d (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2495
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1061,23 +1114,23 @@ 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:4266
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
 msgid "Calendar doesn't support Free/Busy"
 msgstr "è¡?äº?æ??ä¸?æ?¯æ?´ç©ºé??/å¿?ç¢?"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
 #, c-format
 msgid "Birthday: %s"
 msgstr "ç??æ?¥ï¼?%s"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ç´?å¿µæ?¥ï¼?%s"
@@ -1092,69 +1145,69 @@ msgid "Cannot save calendar data"
 msgstr "ä¸?è?½å?²å?è¡?äº?æ??è³?æ??"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2107
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
 msgid "Reply Requested: by "
 msgstr "è¦?æ±?å??è¦?ï¼?æ ¹æ??"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2112
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
 msgid "Reply Requested: When convenient"
 msgstr "è¦?æ±?å??è¦?ï¼?ç?¶æ??ç©ºæ??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
 msgid "Loading Appointment items"
 msgstr "æ£å?¨è¼?å?¥ç´?æ??é ?ç?®"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:332
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
 msgid "Loading Task items"
 msgstr "æ£å?¨è¼?å?¥å·¥ä½?é ?ç?®"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:334
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
 msgid "Loading Note items"
 msgstr "æ£å?¨è¼?å?¥ç?è¨?é ?ç?®"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:336
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
 msgid "Loading items"
 msgstr "æ£å?¨è¼?å?¥é ?ç?®"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:963
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
 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:1026
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
 msgid "Invalid server URI"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ URI"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1387
-#: ../calendar/backends/http/e-cal-backend-http.c:721
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
 #: ../calendar/backends/weather/e-cal-backend-weather.c:520
 msgid "Could not create cache file"
 msgstr "ç?¡æ³?å»ºç«?å¿«å??æª?æ¡?"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1139
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
 msgid "Could not create thread for populating cache"
 msgstr "ç?¡æ³?å»ºç«?ç§»æ¤?å¿«å??ç??å?·è¡?ç·?"
 
 # mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:366
+#: ../calendar/backends/http/e-cal-backend-http.c:423
 msgid "Redirected to Invalid URI"
 msgstr "é??æ?°æ??å??ç?¡æ??ç?? URI"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:399
+#: ../calendar/backends/http/e-cal-backend-http.c:456
 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:406
+#: ../calendar/backends/http/e-cal-backend-http.c:463
 msgid "Not a calendar."
 msgstr "ä¸¦é??è¡?äº?æ??ã??"
 
@@ -1206,162 +1259,162 @@ msgid "Forecast"
 msgstr "å¤©æ°£é ?å ±"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: ../calendar/libecal/e-cal-component.c:1306
+#: ../calendar/libecal/e-cal-component.c:1299
 msgid "Untitled appointment"
 msgstr "æ?ªå?½å??ç??ç´?æ??"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "1st"
 msgstr "1æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "2nd"
 msgstr "2æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
 msgstr "3æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
 msgstr "4æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
 msgstr "5æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
 msgstr "6æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
 msgstr "7æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
 msgstr "8æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
 msgstr "9æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
 msgstr "10æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
 msgstr "11æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
 msgstr "12æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
 msgstr "13æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
 msgstr "14æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
 msgstr "15æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
 msgstr "16æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
 msgstr "17æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
 msgstr "18æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
 msgstr "19æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
 msgstr "20æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
 msgstr "21æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
 msgstr "22æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
 msgstr "23æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
 msgstr "24æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
 msgstr "25æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
 msgstr "26æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
 msgstr "27æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
 msgstr "28æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
 msgstr "29æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
 msgstr "30æ?¥"
 
 # calendar/gui/print.c:306
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
 msgstr "31æ?¥"
 
@@ -1397,7 +1450,7 @@ msgstr "æ?ªæ??å®?"
 
 # camel/camel-smime-context.c:194
 #: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
@@ -1412,55 +1465,55 @@ msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "è¼¸å?¥ %s ç??å¯?ç¢¼ä»¥ä¾¿ä½¿ç?¨è?? %s è?½ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨"
 
-#: ../calendar/libecal/e-cal.c:4148
+#: ../calendar/libecal/e-cal.c:4145
 msgid "Backend is busy"
 msgstr "å¾?ç«¯å¿?ç¢?ä¸"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:4150
+#: ../calendar/libecal/e-cal.c:4147
 msgid "Repository is offline"
 msgstr "å??åº«å·²é?¢ç·?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:4152
+#: ../calendar/libecal/e-cal.c:4149
 msgid "No such calendar"
 msgstr "ç?¡æ¤è¡?äº?æ??"
 
-#: ../calendar/libecal/e-cal.c:4154 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4151 ../calendar/libedata-cal/e-data-cal.c:112
 #: ../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:4156 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../calendar/libecal/e-cal.c:4153 ../calendar/libedata-cal/e-data-cal.c:113
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
 # addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:4158
+#: ../calendar/libecal/e-cal.c:4155
 msgid "URI not loaded"
 msgstr "URI æ?ªè¼?å?¥"
 
-#: ../calendar/libecal/e-cal.c:4160
+#: ../calendar/libecal/e-cal.c:4157
 msgid "URI already loaded"
 msgstr "URI å·²è¼?å?¥"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4164 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4161 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "ä¸?æ??ç??ä½¿ç?¨è??"
 
-#: ../calendar/libecal/e-cal.c:4166 ../calendar/libedata-cal/e-data-cal.c:116
+#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Object ID already exists"
 msgstr "ç?©ä»¶ ID å·²å?å?¨"
 
 # shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:4168
+#: ../calendar/libecal/e-cal.c:4165
 msgid "Protocol not supported"
 msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 
@@ -1468,22 +1521,22 @@ 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:4170
+#: ../calendar/libecal/e-cal.c:4167
 msgid "Operation has been canceled"
 msgstr "æ??ä½?å·²å??æ¶?"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:4172
+#: ../calendar/libecal/e-cal.c:4169
 msgid "Could not cancel operation"
 msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../calendar/libecal/e-cal.c:4174
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1311
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1329
-#: ../camel/providers/groupwise/camel-groupwise-store.c:635
-#: ../camel/providers/groupwise/camel-groupwise-store.c:817
+#: ../calendar/libecal/e-cal.c:4171
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:87
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
@@ -1491,17 +1544,17 @@ msgid "Authentication failed"
 msgstr "é©?è?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:4176
-#: ../camel/providers/smtp/camel-smtp-transport.c:768
+#: ../calendar/libecal/e-cal.c:4173
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
 msgstr "è¦?æ±?é©?è?"
 
-#: ../calendar/libecal/e-cal.c:4178
+#: ../calendar/libecal/e-cal.c:4175
 msgid "A D-Bus exception has occurred"
 msgstr "ç?¼ç?? D-Bus ä¾?å¤?"
 
 # shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:4182
+#: ../calendar/libecal/e-cal.c:4179
 msgid "No error"
 msgstr "æ²?æ??é?¯èª¤"
 
@@ -1599,249 +1652,249 @@ msgstr "ã??%sã??ç??æ??æ??å¼?æ?¸å¿?é ?ç?ºå?ä¸²ï¼?æ??å?ªæ??ä¸?å??å¼?æ?¸ç?ºé??è¼¯
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Invalid range"
 msgstr "ç?¡æ??ç??ç¯?å??"
 
 # mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../calendar/libedata-cal/e-data-cal.c:118
 msgid "Unsupported method"
 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:123
+#: ../calendar/libedata-cal/e-data-cal.c:121
 msgid "Calendar does not exist"
 msgstr "è¡?äº?æ??ä¸?å?å?¨"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../calendar/libedata-cal/e-data-cal.c:122
 msgid "Unknown user"
 msgstr "ä¸?æ??ç??ä½¿ç?¨è??"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:610
+#: ../calendar/libedata-cal/e-data-cal.c:608
 #, c-format
 msgid "Cannot retrieve calendar address: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ä½?å??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:635
+#: ../calendar/libedata-cal/e-data-cal.c:633
 #, c-format
 msgid "Cannot retrieve calendar alarm e-mail address: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??é¬§é?´é?»å?é?µä»¶ä½?å??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:660
+#: ../calendar/libedata-cal/e-data-cal.c:658
 #, c-format
 msgid "Cannot retrieve calendar's LDAP attribute: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?? LDAP å±¬æ?§ï¼?%s"
 
 # camel/camel-filter-driver.c:671
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:685
+#: ../calendar/libedata-cal/e-data-cal.c:683
 #, c-format
 msgid "Cannot retrieve calendar scheduling information: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è¡?ç¨?è³?è¨?ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:709
+#: ../calendar/libedata-cal/e-data-cal.c:707
 #, c-format
 msgid "Cannot open calendar: %s"
 msgstr "ä¸?è?½é??å??è¡?äº?æ??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:730
+#: ../calendar/libedata-cal/e-data-cal.c:728
 #, c-format
 msgid "Cannot refresh calendar: %s"
 msgstr "ä¸?è?½é??æ?°æ?´ç??è¡?äº?æ??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:749
+#: ../calendar/libedata-cal/e-data-cal.c:747
 #, c-format
 msgid "Cannot remove calendar: %s"
 msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ï¼?%s"
 
 # mail/mail-crypto.c:251
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:770
+#: ../calendar/libedata-cal/e-data-cal.c:768
 #, c-format
 msgid "Cannot create calendar object: %s"
 msgstr "ä¸?è?½å»ºç«?è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:798
+#: ../calendar/libedata-cal/e-data-cal.c:796
 #, c-format
 msgid "Cannot modify calendar object: %s"
 msgstr "ä¸?è?½ä¿®æ?¹è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:824
+#: ../calendar/libedata-cal/e-data-cal.c:822
 #, c-format
 msgid "Cannot remove calendar object: %s"
 msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:845
+#: ../calendar/libedata-cal/e-data-cal.c:843
 #, c-format
 msgid "Cannot receive calendar objects: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:864
+#: ../calendar/libedata-cal/e-data-cal.c:862
 #, c-format
 msgid "Cannot discard calendar alarm: %s"
 msgstr "ä¸?è?½å??æ¶?è¡?äº?æ??é¬§é?´ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:885
+#: ../calendar/libedata-cal/e-data-cal.c:883
 #, c-format
 msgid "Cannot send calendar objects: %s"
 msgstr "ä¸?è?½å?³é??è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:912
+#: ../calendar/libedata-cal/e-data-cal.c:910
 #, c-format
 msgid "Cannot retrieve default calendar object path: %s"
 msgstr "ä¸?è?½å??å¾?é ?è¨ç??è¡?äº?æ??ç?©ä»¶è·¯å¾?ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:937
+#: ../calendar/libedata-cal/e-data-cal.c:935
 #, c-format
 msgid "Cannot retrieve calendar object path: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶è·¯å¾?ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
+#: ../calendar/libedata-cal/e-data-cal.c:960
 #, c-format
 msgid "Cannot retrieve calendar object list: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶æ¸?å?®ï¼?%s"
 
 # mail/mail-ops.c:1872
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
+#: ../calendar/libedata-cal/e-data-cal.c:988
 #, c-format
 msgid "Could not retrieve attachment list: %s"
 msgstr "ä¸?è?½å??å¾?é??ä»¶æ¸?å?®ï¼?%s"
 
 # camel/providers/local/camel-mbox-store.c:110
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1016
+#: ../calendar/libedata-cal/e-data-cal.c:1014
 #, c-format
 msgid "Could not complete calendar query: %s"
 msgstr "ä¸?è?½å®?æ??è¡?äº?æ??æ?¥è©¢ï¼?%s"
 
 # mail/mail-ops.c:1872
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
+#: ../calendar/libedata-cal/e-data-cal.c:1039
 #, c-format
 msgid "Could not retrieve calendar time zone: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??æ??å??ï¼?%s"
 
 # calendar/gui/e-itip-control.c:883
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1066
+#: ../calendar/libedata-cal/e-data-cal.c:1064
 #, c-format
 msgid "Could not add calendar time zone: %s"
 msgstr "ä¸?è?½å? å?¥è¡?äº?æ??æ??å??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1085
+#: ../calendar/libedata-cal/e-data-cal.c:1083
 #, c-format
 msgid "Could not set default calendar time zone: %s"
 msgstr "ä¸?è?½è¨å®?é ?è¨ç??è¡?äº?æ??æ??å??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1108
+#: ../calendar/libedata-cal/e-data-cal.c:1106
 #, c-format
 msgid "Cannot retrieve calendar changes: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??æ?´æ?¹ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1139
+#: ../calendar/libedata-cal/e-data-cal.c:1137
 #, c-format
 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:368
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
 #, c-format
 msgid "Invalid URI"
 msgstr "ç?¡æ??ç?? URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:386
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
 #, 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:436
+#: ../calendar/libedata-cal/e-data-cal-factory.c:443
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ç?¡æ³?å¯¦é«?å??å¾?ç«¯ç¨?å¼?"
 
 # camel/camel-cipher-context.c:171
-#: ../camel/camel-cipher-context.c:204
+#: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´ç°½ç½²"
 
 # camel/camel-cipher-context.c:251
-#: ../camel/camel-cipher-context.c:217
+#: ../camel/camel-cipher-context.c:213
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´é©?è?ç°½ç½²"
 
 # camel/camel-cipher-context.c:294
-#: ../camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:229
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´å? å¯?"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:247
+#: ../camel/camel-cipher-context.c:243
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´è§£å¯?"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:260
+#: ../camel/camel-cipher-context.c:256
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "ä½ ä¸?è?½å?¯å?¥é??ç¨®å? å¯?æ?¹å¼?ç??å¯?ç¢¼å??"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:274
+#: ../camel/camel-cipher-context.c:270
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "ä½ ä¸?è?½å?¯å?ºé??ç¨®å? å¯?æ?¹å¼?ç??å¯?ç¢¼å??"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:815
+#: ../camel/camel-cipher-context.c:812
 msgid "Signing message"
 msgstr "æ£å?¨ç°½ç½²è¨?æ?¯"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:1056
+#: ../camel/camel-cipher-context.c:1053
 msgid "Encrypting message"
 msgstr "æ£å?¨å? å¯?è¨?æ?¯"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:1183
+#: ../camel/camel-cipher-context.c:1180
 msgid "Decrypting message"
 msgstr "æ£å?¨è§£å¯?è¨?æ?¯"
 
 # mail/mail-ops.c:1728
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:178
 #, c-format
 msgid "Unable to create cache path"
 msgstr "ç?¡æ³?å»ºç«?å¿«å??è·¯å¾?"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/camel-data-cache.c:494
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ç?¡æ³?ç§»é?¤å¿«å??é ?ç?®ï¼? %sï¼? %s"
@@ -1849,7 +1902,7 @@ msgstr "ç?¡æ³?ç§»é?¤å¿«å??é ?ç?®ï¼? %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/camel-data-wrapper.c:147
+#: ../camel/camel-data-wrapper.c:143
 #, c-format
 msgid "No stream available"
 msgstr "æ²?æ??å?¯ç?¨ç??ä¸²æµ?"
@@ -1886,24 +1939,24 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "è??ä¼ºæ??å?¨é??æ?°å??æ¥"
 
-#: ../camel/camel-disco-folder.c:67 ../camel/camel-offline-folder.c:83
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
 msgid "Downloading new messages for offline mode"
 msgstr "æ£å?¨ä¸?è¼?æ?°è¨?æ?¯ç?¨æ?¼é?¢ç·?æ¨¡å¼?"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../camel/camel-disco-folder.c:389
+#: ../camel/camel-disco-folder.c:398
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "æº?å??è³?æ??å¤¾ã??%sã??ä¾?é?¢ç·?ä½¿ç?¨"
 
-#: ../camel/camel-disco-folder.c:455 ../camel/camel-offline-folder.c:316
+#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
 msgid "Copy folder content locally for offline operation"
 msgstr "è¤?è£½è³?æ??å¤¾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
 
 # camel/camel-disco-store.c:271
 #: ../camel/camel-disco-store.c:420
-#: ../camel/providers/groupwise/camel-groupwise-store.c:232
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
 #: ../camel/providers/imap/camel-imap-store.c:1250
 #: ../camel/providers/imap/camel-imap-store.c:1771
 #: ../camel/providers/imap/camel-imap-store.c:2244
@@ -1915,10 +1968,10 @@ msgstr "è¤?è£½è³?æ??å¤¾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
 #: ../camel/providers/imapx/camel-imapx-folder.c:465
 #: ../camel/providers/imapx/camel-imapx-folder.c:505
 #: ../camel/providers/imapx/camel-imapx-folder.c:541
-#: ../camel/providers/imapx/camel-imapx-store.c:277
-#: ../camel/providers/imapx/camel-imapx-store.c:1299
-#: ../camel/providers/imapx/camel-imapx-store.c:1387
-#: ../camel/providers/imapx/camel-imapx-store.c:1422
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ä½ å¿?é ?æ?¼ç¶²ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
@@ -1929,88 +1982,88 @@ msgstr "ä½ å¿?é ?æ?¼ç¶²ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: ../camel/camel-file-utils.c:719
+#: ../camel/camel-file-utils.c:722
 #, c-format
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:839 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:817 ../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:886
+#: ../camel/camel-filter-driver.c:864
 #, 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:1073 ../camel/camel-filter-driver.c:1082
+#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
 msgstr "å??æ¥è??ç??è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:866
-#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "å??æ??é??æ¿¾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: ../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1631
+#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "å?·è¡?é??æ¿¾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-filter-driver.c:643
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1256
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ç?¡æ³?é??å??æ??ç¨?å?¨è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:652
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1267
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ç?¡æ³?è??ç??æ??ç¨?å?¨è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:666
-#: ../camel/camel-filter-driver.c:1307
+#: ../camel/camel-filter-driver.c:1285
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "æ?¥æ?¶é?µä»¶ %d (%d%%)"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:1314 ../camel/camel-filter-driver.c:1336
+#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
 #, 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:1351 ../camel/camel-filter-driver.c:1456
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
 msgstr "å??æ¥è??ç??è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "å®?æ??"
 
 # camel/camel-filter-driver.c:748
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1398
 #, 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:1438
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "å?¨ç¬¬ %d / %d å°?é?µä»¶å¤±æ??"
@@ -2041,8 +2094,8 @@ msgid "Error executing filter search: %s: %s"
 msgstr "å?·è¡?é??æ¿¾å?¨æ??å°?ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-folder-search.c:328
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
-#: ../camel/camel-folder-search.c:627
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2052,8 +2105,8 @@ msgstr ""
 "%s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
-#: ../camel/camel-folder-search.c:639
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2064,88 +2117,88 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) é??è¦?å?®ä¸?é??è¼¯å?¼çµ?æ??"
 
-#: ../camel/camel-folder-search.c:938
+#: ../camel/camel-folder-search.c:935
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ä¸?å??è¨±æ?¾å?¨ %s è£?é?¢"
 
-#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
 #, 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:978
+#: ../camel/camel-folder-search.c:975
 #, 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:987
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) é??è¦?è³?æ??å¤¾è¨å®?"
 
 # mail/mail-ops.c:1649
-#: ../camel/camel-folder.c:220
+#: ../camel/camel-folder.c:216
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç??æ?°å??å?¾é?µä»¶"
 
 # mail/mail-ops.c:1649
-#: ../camel/camel-folder.c:244
+#: ../camel/camel-folder.c:240
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç?? ham é?µä»¶"
 
 # mail/mail-ops.c:1565
-#: ../camel/camel-folder.c:270
+#: ../camel/camel-folder.c:266
 #, c-format
 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:881
+#: ../camel/camel-folder.c:875
 #: ../camel/providers/local/camel-maildir-folder.c:293
 msgid "Moving messages"
 msgstr "æ£å?¨ç§»å??é?µä»¶"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:884
+#: ../camel/camel-folder.c:878
 msgid "Copying messages"
 msgstr "æ£å?¨è¤?è£½é?µä»¶"
 
 # camel/providers/pop3/camel-pop3-folder.c:296
-#: ../camel/camel-folder.c:3253
+#: ../camel/camel-folder.c:3247
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æ£å?¨å??å??é?µä»¶ã??%sã??"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
-#: ../camel/camel-gpg-context.c:1276
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "å?·è¡? gpg å¤±æ??ï¼? %s"
 
-#: ../camel/camel-gpg-context.c:651
-#: ../camel/providers/smtp/camel-smtp-transport.c:716
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../camel/camel-gpg-context.c:715
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2156,17 +2209,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:732
+#: ../camel/camel-gpg-context.c:728
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "è§£æ?? gpg userid æ??ç¤ºæ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:757 ../camel/camel-gpg-context.c:772
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "è§£æ?? gpg å¯?èª?è¦?æ±?æ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2175,7 +2228,7 @@ msgstr ""
 "é??è¦? PIN æ??è?½ç?ºä½ ç??æ?ºæ?§å?¡è§£é??ï¼?\n"
 "ã??%sã??"
 
-#: ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2185,7 +2238,7 @@ msgstr ""
 "ã??%sã??"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:803
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG å?³å??å°?ã??%sã??æ?ªé ?æ??ç??è¦?æ±?"
@@ -2196,54 +2249,54 @@ msgstr "GnuPG å?³å??å°?ã??%sã??æ?ªé ?æ??ç??è¦?æ±?"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: ../camel/camel-gpg-context.c:832 ../camel/camel-net-utils.c:515
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
 #: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4908
-#: ../camel/providers/imapx/camel-imapx-server.c:4925
-#: ../camel/providers/imapx/camel-imapx-store.c:199
-#: ../camel/providers/nntp/camel-nntp-summary.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:364
-#: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:504
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:506
 #: ../camel/providers/pop3/camel-pop3-store.c:487
 #: ../libedataserverui/e-book-auth-util.c:229
 #, c-format
 msgid "Cancelled"
 msgstr "å·²å??æ¶?"
 
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:846
 #, 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:862
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "å¾? GnuPG å?³å??æ??å¤?ç??å??æ??ï¼? %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/camel-gpg-context.c:993
+#: ../camel/camel-gpg-context.c:989
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ä¸?è?½å? å¯?é?µä»¶ï¼?æ²?æ??æ??ä¾?æ??æ??ç??æ?¶ä»¶è??ã??"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:824
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
 msgid "Could not generate signing data: "
 msgstr "ç?¡æ³?ç?¢ç??ç°½ç½²è³?æ??ï¼?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:1586 ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1896 ../camel/camel-gpg-context.c:2042
-#: ../camel/camel-gpg-context.c:2141 ../camel/camel-gpg-context.c:2189
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 msgid "Failed to execute gpg."
 msgstr "å?·è¡? gpg å¤±æ??ã??"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1666 ../camel/camel-gpg-context.c:1674
-#: ../camel/camel-gpg-context.c:1682 ../camel/camel-gpg-context.c:1701
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
 #: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
 #: ../camel/camel-smime-context.c:971
 #, c-format
@@ -2251,32 +2304,32 @@ msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç½²ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1741
+#: ../camel/camel-gpg-context.c:1737
 msgid "Cannot verify message signature: "
 msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç½²ï¼?"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1862
+#: ../camel/camel-gpg-context.c:1858
 msgid "Could not generate encrypting data: "
 msgstr "ç?¡æ³?ç?¢ç??å? å¯?è³?æ??ï¼?"
 
-#: ../camel/camel-gpg-context.c:1915
+#: ../camel/camel-gpg-context.c:1911
 msgid "This is a digitally encrypted message part"
 msgstr "é??æ?¯æ?¸ç¢¼å??å? å¯?è¨?æ?¯é?¨ä»½"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1973 ../camel/camel-gpg-context.c:1982
-#: ../camel/camel-gpg-context.c:2005
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ä¸?è?½è§£å¯?æ¤é?µä»¶ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
-#: ../camel/camel-gpg-context.c:1993
+#: ../camel/camel-gpg-context.c:1989
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "è§£å¯? MIME çµ?ä»¶æ??å¤±æ??ï¼?é??è¨?å??å®?é?¯èª¤"
 
-#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1255
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "å? å¯?å?§å®¹"
 
@@ -2395,18 +2448,18 @@ msgstr "å¯«å?¥é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 msgid "Error copying mail temp file: %s"
 msgstr "è¤?è£½é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../camel/camel-multipart-signed.c:286
+#: ../camel/camel-multipart-signed.c:327
 #, c-format
 msgid "No content available"
 msgstr "æ²?æ??å?¯ç?¨ç??å?§å®¹"
 
-#: ../camel/camel-multipart-signed.c:294
+#: ../camel/camel-multipart-signed.c:335
 #, c-format
 msgid "No signature available"
 msgstr "æ²?æ??å?¯ç?¨ç??ç°½ç½²"
 
 # shell/e-storage.c:467
-#: ../camel/camel-multipart-signed.c:620
+#: ../camel/camel-multipart-signed.c:663
 #, c-format
 msgid "parse error"
 msgstr "è§£æ??é?¯èª¤"
@@ -2444,7 +2497,7 @@ msgid "Name lookup failed: %s"
 msgstr "æ??å°?å??ç¨±å¤±æ??ï¼? %s"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-offline-folder.c:193
+#: ../camel/camel-offline-folder.c:189
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "æ£å?¨å°?è³?æ??å¤¾ã??%sã??ä¸ç??é?µä»¶å??æ¥å?°ç£?ç¢?"
@@ -2486,7 +2539,7 @@ msgstr "ç?¡æ³?è¼?å?¥ %sï¼?æ¨¡çµ?å?§æ²?æ??å??å§?ç¢¼ã??"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:202
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "æ²?æ??é??è¨?å??å®?ã??%sã??ç??æ??ä¾?è??"
@@ -2539,190 +2592,190 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-cram-md5.c:35
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 # camel/camel-sasl-cram-md5.c:37
-#: ../camel/camel-sasl-cram-md5.c:47
+#: ../camel/camel-sasl-cram-md5.c:43
 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:58
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 # camel/camel-sasl-digest-md5.c:45
-#: ../camel/camel-sasl-digest-md5.c:60
+#: ../camel/camel-sasl-digest-md5.c:56
 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:821
+#: ../camel/camel-sasl-digest-md5.c:817
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ä¼ºæ??å?¨æ?¥å??é??é?·(>2048 ä½?å?? )"
 
 # camel/camel-sasl-digest-md5.c:819
-#: ../camel/camel-sasl-digest-md5.c:832
+#: ../camel/camel-sasl-digest-md5.c:828
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ä¼ºæ??å?¨æ?¥å??ç?¡æ??\n"
 
 # camel/camel-sasl-digest-md5.c:825
-#: ../camel/camel-sasl-digest-md5.c:840
+#: ../camel/camel-sasl-digest-md5.c:836
 #, 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:875
+#: ../camel/camel-sasl-digest-md5.c:871
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸¦æ?ªå??å?«æ??æ¬?è³?æ??"
 
 # camel/camel-sasl-digest-md5.c:865
-#: ../camel/camel-sasl-digest-md5.c:896
+#: ../camel/camel-sasl-digest-md5.c:892
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ä¼ºæ??å?¨å??æ??å??å?«ä¸?å®?æ?´ç??æ??æ¬?è³?æ??"
 
 # camel/camel-sasl-digest-md5.c:875
-#: ../camel/camel-sasl-digest-md5.c:909
+#: ../camel/camel-sasl-digest-md5.c:905
 #, c-format
 msgid "Server response does not match"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸?ç¬¦"
 
-#: ../camel/camel-sasl-gssapi.c:85
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
 # camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ Kerberos 5 é©?è?é?£ç·?è?³ä¼ºæ??å?¨ã??"
 
-#: ../camel/camel-sasl-gssapi.c:128
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "æ??ä¾?ç??è?ä»¶ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?è¾¨è?ã??"
 
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
 
-#: ../camel/camel-sasl-gssapi.c:136
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸å??å?«ç?¡æ??æ??ä¸?æ?¯æ?´ç??å??ç¨±é¡?å??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:141
 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:145
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token å??å?«ç?¡æ??ç??ç°½ç½²ï¼?æ??è??ç?¡æ³?ç¢ºèª?ç??ç°½ç½²ã??"
 
-#: ../camel/camel-sasl-gssapi.c:149
+#: ../camel/camel-sasl-gssapi.c:150
 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:154
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "æ??ä¾?ç??ç¶²çµ¡ä½?ç½®è?å?¥æ??æ¨?æ?ªå??ç?§æ??æ??ç??ç¶²çµ¡ä½?ç½®ã??"
 
-#: ../camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "å?¨ input_token å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "å?¨è?ä»¶å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:164
 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:169 ../camel/camel-sasl-gssapi.c:309
-#: ../camel/camel-sasl-gssapi.c:353 ../camel/camel-sasl-gssapi.c:370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1249
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ä¾?è?ªä¼ºæ??å?¨ç??ä¸?è?¯è¨±å?¯å??æ??ã??"
 
 # mail/mail-config.glade.h:1
-#: ../camel/camel-sasl-gssapi.c:382
+#: ../camel/camel-sasl-gssapi.c:383
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ä¸?æ?¯æ?´ç??é¡?å??"
 
 # camel/camel-sasl-login.c:32
-#: ../camel/camel-sasl-login.c:39
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "ç?»å?¥"
 
 # camel/camel-sasl-login.c:34
 # camel/camel-sasl-plain.c:34
-#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨æ?®é??ç??å¯?ç¢¼é?£ç·?è?³ä¼ºæ??å?¨ã??"
 
 # camel/camel-sasl-login.c:127
-#: ../camel/camel-sasl-login.c:95
+#: ../camel/camel-sasl-login.c:91
 #, c-format
 msgid "Unknown authentication state."
 msgstr "æ?ªç?¥ç??é©?è¨¼ç??æ³?ã??"
 
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 # camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:39
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ NTLM / å®?å?¨å¯?ç¢¼é©?è?é?£ç·?è?³å?ºæ?¼ Windows ç??ä¼ºæ??å?¨ã??"
 
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP å??æ?¼ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:44
 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:83
+#: ../camel/camel-sasl-popb4smtp.c:79
 msgid "POP Source URI"
 msgstr "POP ä¾?æº? URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:90
+#: ../camel/camel-sasl-popb4smtp.c:86
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP å??æ?¼ SMTP å??è¨±ä½¿ç?¨æ?ªç?¥ç??å?³è¼¸"
 
-#: ../camel/camel-sasl-popb4smtp.c:98
+#: ../camel/camel-sasl-popb4smtp.c:94
 #, c-format
 msgid "POP Before SMTP authentication using a non-POP source"
 msgstr "POP å??æ?¼ SMTP å??è¨±ä½¿ç?¨é?? POP ä¾?æº?"
@@ -2734,25 +2787,25 @@ msgid "Regular expression compilation failed: %s: %s"
 msgstr "æ£è¦?è¡¨ç¤ºå¼?ç·¨è¯å¤±æ??ï¼? %sï¼? %s"
 
 # camel/camel-service.c:154
-#: ../camel/camel-service.c:89
+#: ../camel/camel-service.c:85
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URLã??%sã??é??è¦? username å??ä»¶"
 
 # camel/camel-service.c:162
-#: ../camel/camel-service.c:93
+#: ../camel/camel-service.c:89
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URLã??%sã??é??è¦? host å??ä»¶"
 
 # camel/camel-service.c:170
-#: ../camel/camel-service.c:97
+#: ../camel/camel-service.c:93
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URLã??%sã??é??è¦? path å??ä»¶"
 
 # camel/camel-session.c:479
-#: ../camel/camel-session.c:260
+#: ../camel/camel-session.c:256
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2762,69 +2815,69 @@ msgstr ""
 "%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:757
+#: ../camel/camel-session.c:753
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "è«?è¼¸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?ç¢¼ã??"
 
 # camel/camel-smime-context.c:327
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1048
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "æ?¾ä¸?å?° '%s' ç??è?æ?¸"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "ç?¡æ³?å»ºç«? CMS è¨?æ?¯"
 
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:377
 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:387
+#: ../camel/camel-smime-context.c:383
 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:394
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "ç?¡æ³?é??å?  CMS è³?æ??"
 
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "ç?¡æ³?å»ºç«? CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "æ?¾ä¸?å?°è?æ?¸é??"
 
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr "ç?¡æ³?æ?°å¢? CMS SigningTime"
 
 # composer/e-msg-composer.c:1092
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ç??å? å¯?è?æ?¸ä¸?å?å?¨"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? MS SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "ç?¡æ³?æ?°å¢?å? å¯?è?æ?¸"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
 msgstr "ç?¡æ³?æ?°å¢? CMS SignerInfo"
 
@@ -2832,61 +2885,61 @@ msgstr "ç?¡æ³?æ?°å¢? CMS SignerInfo"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:507
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr "æ?ªæ??å®?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "è?¯å¥½ç??ç°½ç½²"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "é?¯èª¤ç??ç°½ç½²"
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "å?§å®¹å?¨å?³é??æ??è¢«ç«?æ?¹æ??æ?´æ?¹"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "æ?¾ä¸?å?°ç°½ç½²è?æ?¸"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "ç°½ç½²è?æ?¸ä¸?å??ä¿¡ä»»"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "æ?ªç?¥ç??ç°½ç½²æ¼?ç®?æ³?"
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "ä¸?æ?¯æ?´é??ç¨®ç°½ç½²æ¼?ç®?æ³?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "æ ¼å¼?ä¸?è?¯ç??ç°½ç½²"
 
 # shell/e-storage.c:467
-#: ../camel/camel-smime-context.c:525
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "è§£æ??é?¯èª¤"
 
-#: ../camel/camel-smime-context.c:568
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "ç°½ç½²ä¸æ²?æ??è¢«ç°½ç½²ç??è³?æ??"
 
-#: ../camel/camel-smime-context.c:573
+#: ../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:586 ../camel/camel-smime-context.c:597
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 
@@ -2897,32 +2950,32 @@ 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:604 ../camel/camel-smime-context.c:608
+#: ../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:618 ../camel/camel-smime-context.c:623
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "è?æ?¸å?¯å?¥å¤±æ??"
 
-#: ../camel/camel-smime-context.c:633
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "é??è?æ?¸è¨?æ?¯ï¼?ç?¡æ³?é©?è?è?æ?¸"
 
-#: ../camel/camel-smime-context.c:636
+#: ../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:640
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "æ?¾ä¸?å?°ç°½ç½²æ??è¦?"
 
 # mail/mail-config.glade.h:72
-#: ../camel/camel-smime-context.c:656
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ç°½ç½²è??ï¼? %s<%s>ï¼? %s\n"
@@ -2996,7 +3049,7 @@ msgstr "S/MIME è§£å¯?ï¼?æ?¾ä¸?å?°å? å¯?å?§å®¹"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:2184
+#: ../camel/camel-store.c:2181
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨"
@@ -3007,113 +3060,115 @@ 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:2375 ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:2372 ../camel/camel-store.c:2382
+#: ../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:2378 ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2386
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:2811
+#: ../camel/camel-store.c:2829
 #, 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:2938 ../camel/camel-vee-store.c:367
+#: ../camel/camel-store.c:2956 ../camel/camel-vee-store.c:367
 #: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/camel-store.c:3079 ../camel/camel-vee-store.c:417
-#: ../camel/providers/local/camel-maildir-store.c:662
+#: ../camel/camel-store.c:3097 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:668
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 
-#: ../camel/camel-tcp-stream-raw.c:747 ../camel/camel-tcp-stream-raw.c:758
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ä»£ç??ä¼ºæ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS4"
 
-#: ../camel/camel-tcp-stream-raw.c:769
+#: ../camel/camel-tcp-stream-raw.c:771
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ä»£ç??ä¼ºæ??å?¨ä¸»æ©?æ??çµ?æ??å??ç??è¦?æ±?ï¼?ä»£ç¢¼ %d"
 
-#: ../camel/camel-tcp-stream-raw.c:865 ../camel/camel-tcp-stream-raw.c:871
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ä»£ç??ä¼ºæ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS5"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: ../camel/camel-tcp-stream-raw.c:877
+#: ../camel/camel-tcp-stream-raw.c:879
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "æ?¾ä¸?å?°å??é?©ç??é©?è?é¡?å??ï¼?ä»£ç¢¼ 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:889
+#: ../camel/camel-tcp-stream-raw.c:891
 msgid "General SOCKS server failure"
 msgstr "ä¸?è?¬æ?§ SOCKS ä¼ºæ??å?¨å¤±æ??"
 
-#: ../camel/camel-tcp-stream-raw.c:890
+#: ../camel/camel-tcp-stream-raw.c:892
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS ä¼ºæ??å?¨ç??è¦?å??ä¸?å??è¨±é?£ç·?"
 
-#: ../camel/camel-tcp-stream-raw.c:891
+#: ../camel/camel-tcp-stream-raw.c:893
 msgid "Network is unreachable from SOCKS server"
 msgstr "ç¶²çµ¡ç?¡æ³?é??é?? SOCKS ä¼ºæ??å?¨å?°é??"
 
-#: ../camel/camel-tcp-stream-raw.c:892
+#: ../camel/camel-tcp-stream-raw.c:894
 msgid "Host is unreachable from SOCKS server"
 msgstr "ä¸»æ©?ç?¡æ³?é??é?? SOCKS ä¼ºæ??å?¨å?°é??"
 
 # camel/camel-remote-store.c:252
-#: ../camel/camel-tcp-stream-raw.c:893
+#: ../camel/camel-tcp-stream-raw.c:895
 msgid "Connection refused"
 msgstr "é?£ç·?è¢«æ??çµ?"
 
-#: ../camel/camel-tcp-stream-raw.c:894
+#: ../camel/camel-tcp-stream-raw.c:896
 msgid "Time-to-live expired"
 msgstr "è¶?é?? Time-to-live æ??é??"
 
 # shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:895
+#: ../camel/camel-tcp-stream-raw.c:897
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS ä¼ºæ??å?¨ä¸?æ?¯æ?´æ??ä»¤"
 
 # shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:896
+#: ../camel/camel-tcp-stream-raw.c:898
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS ä¼ºæ??å?¨ä¸?æ?¯æ?´ä½?å??é¡?å??"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/camel-tcp-stream-raw.c:897
+#: ../camel/camel-tcp-stream-raw.c:899
 msgid "Unknown error from SOCKS server"
 msgstr "ä¾?è?ª SOCKS ä¼ºæ??å?¨ç??ä¸?æ??é?¯èª¤"
 
-#: ../camel/camel-tcp-stream-raw.c:930
+#: ../camel/camel-tcp-stream-raw.c:932
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "å¾? SOCKS ä¼ºæ??å?¨å??å¾?ä¸?æ??ç??ä½?å??é¡?å??"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-tcp-stream-raw.c:948
+#: ../camel/camel-tcp-stream-raw.c:950
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ä¾?è?ª SOCKS ä¼ºæ??å?¨ç??ä¸?å®?æ?´å??è¦?"
 
-#: ../camel/camel-tcp-stream-raw.c:968
+#: ../camel/camel-tcp-stream-raw.c:970
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ä¸»æ©?å??ç¨±å¤ªé?·ï¼?æ??å¤? 255 å?ç¬¦ï¼?"
@@ -3122,12 +3177,12 @@ msgstr "ä¸»æ©?å??ç¨±å¤ªé?·ï¼?æ??å¤? 255 å?ç¬¦ï¼?"
 # camel/providers/imap/camel-imap-store.c:433
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1000 ../camel/camel-tcp-stream-raw.c:1010
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "å¾?ä»£ç??ä¼ºæ??å?¨å?³å??ç?¡æ??ç??å??è¦?"
 
-#: ../camel/camel-tcp-stream-ssl.c:457
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -3140,18 +3195,18 @@ msgstr ""
 "æ??ç´?æª?:              %s\n"
 "ç°½ç½²:              %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "è?¯å¥½"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 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:467
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -3166,7 +3221,7 @@ msgstr ""
 "\n"
 "ä½ æ?³è¦?æ?¥å??å??ï¼?"
 
-#: ../camel/camel-tcp-stream-ssl.c:511
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -3175,7 +3230,7 @@ msgstr ""
 "è?æ?¸å??é¡?ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:563
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -3184,7 +3239,7 @@ msgstr ""
 "ä¸?æ£ç¢ºç??è?æ?¸ç¶²å??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:581
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -3193,7 +3248,7 @@ msgstr ""
 "è?æ?¸å·²é?¾æ??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:598
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -3203,25 +3258,25 @@ msgstr ""
 "ç?¼ç?§è??ï¼? %s"
 
 # camel/camel-url.c:289
-#: ../camel/camel-url.c:314
+#: ../camel/camel-url.c:316
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "ç?¡æ³?è§£æ?? URLã??%sã??"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/camel-vee-folder.c:1251 ../camel/camel-vee-folder.c:1414
+#: ../camel/camel-vee-folder.c:1235 ../camel/camel-vee-folder.c:1398
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ä¸?è?½è¤?è£½æ??ç§»å??é?µä»¶å?°è??æ?¬è³?æ??å¤¾ä¸"
 
 # camel/camel-vee-folder.c:451
-#: ../camel/camel-vee-folder.c:1287
+#: ../camel/camel-vee-folder.c:1271
 #, c-format
 msgid "No such message %s in %s"
 msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
 
 # shell/e-shell-importer.c:384
-#: ../camel/camel-vee-folder.c:1355
+#: ../camel/camel-vee-folder.c:1339
 #, c-format
 msgid "Error storing '%s': "
 msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?"
@@ -3255,42 +3310,42 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "ç?¡æ³?è¤?è£½è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??å¤¾"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:959
-#: ../camel/providers/imap/camel-imap-folder.c:390
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "ç?¡æ³?è¼?å?¥ %s ç??æ??è¦?"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1035
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "æª¢æ?¥å?ªé?¤ç??é?µä»¶ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1520
-#: ../camel/providers/groupwise/camel-groupwise-store.c:672
-#: ../camel/providers/groupwise/camel-groupwise-store.c:803
-#: ../camel/providers/imap/camel-imap-folder.c:3919
-#: ../camel/providers/imap/camel-imap-folder.c:4001
-#: ../camel/providers/imapx/camel-imapx-server.c:3889
-#: ../camel/providers/imapx/camel-imapx-server.c:4020
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
 
 # camel/camel-movemail.c:306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1992
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2046
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2710
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2720
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
 #, c-format
 msgid "Could not get message"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ã??"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2430
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2480
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
@@ -3302,7 +3357,7 @@ 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:2466
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ç?¡æ³?å»ºç«?é?µä»¶ï¼? %s"
@@ -3314,7 +3369,7 @@ 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/groupwise/camel-groupwise-folder.c:2646
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3326,7 +3381,7 @@ 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:2646
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
 #: ../camel/providers/local/camel-maildir-folder.c:100
 #: ../camel/providers/local/camel-maildir-folder.c:307
 #: ../camel/providers/local/camel-mbox-folder.c:117
@@ -3342,19 +3397,19 @@ 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:2665
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:455
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
 #, c-format
 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:2683
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2693
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2897
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
 #, c-format
 msgid "This message is not available in offline mode."
 msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨ã??"
@@ -3402,6 +3457,8 @@ msgstr "é?¸é ?"
 
 # camel/providers/imap/camel-imap-provider.c:57
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "å¥?ç?¨é??æ¿¾å?¨è?³æ¤ä¼ºæ??å?¨æ?¶ä»¶å?£ç??æ?°é?µä»¶(_A)"
 
@@ -3459,72 +3516,72 @@ msgid ""
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ GroupWise ä¼ºæ??å?¨ã??"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
 #, 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:209
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
 #: ../camel/providers/imap/camel-imap-store.c:801
-#: ../camel/providers/imapx/camel-imapx-server.c:3100
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
 #, c-format
 msgid "You did not enter a password."
 msgstr "ä½ æ²?æ??è¼¸å?¥å¯?ç¢¼ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:332
+#: ../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:563
+#: ../camel/providers/groupwise/camel-groupwise-store.c:556
 #: ../camel/providers/imap/camel-imap-store.c:1808
 #: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imapx/camel-imapx-store.c:342
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1224
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
 #, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ä¸?è?½å»ºç«? GroupWise è³?æ??å¤¾ã??"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
 #, c-format
 msgid "Cannot create a special system folder"
 msgstr "ä¸?è?½å»ºç«?ç?¹æ®?ç??ç³»çµ±è³?æ??å¤¾"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1243
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
 #: ../camel/providers/imap/camel-imap-store.c:1886
 #: ../camel/providers/imap/camel-imap-store.c:2323
-#: ../camel/providers/imapx/camel-imapx-store.c:1341
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
 #, 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:1328
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1353
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
 #, 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:1387
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise ä¼ºæ??å?¨ %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1389
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s ç?? GroupWise æ??å??æ?¼ %s"
@@ -3630,25 +3687,25 @@ 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:291
+#: ../camel/providers/imap/camel-imap-folder.c:292
 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:367
+#: ../camel/providers/imap/camel-imap-folder.c:369
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é?? %sï¼?%s"
 
 # mail/mail-ops.c:1649
-#: ../camel/providers/imap/camel-imap-folder.c:990
-#: ../camel/providers/imapx/camel-imapx-server.c:3933
+#: ../camel/providers/imap/camel-imap-folder.c:992
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "æ??æ?? %s ä¸æ?´æ?¹é??ç??é?µä»¶"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/providers/imap/camel-imap-folder.c:3326
+#: ../camel/providers/imap/camel-imap-folder.c:3369
 msgid "Unable to retrieve message: "
 msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
 
@@ -3659,8 +3716,8 @@ 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/imap/camel-imap-folder.c:3361
-#: ../camel/providers/imapx/camel-imapx-server.c:5217
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5193
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3668,33 +3725,33 @@ 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:3362
-#: ../camel/providers/imapx/camel-imapx-server.c:5218
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5194
 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:3437
-#: ../camel/providers/imap/camel-imap-folder.c:4332
-#: ../camel/providers/nntp/camel-nntp-folder.c:407
+#: ../camel/providers/imap/camel-imap-folder.c:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
 #, c-format
 msgid "This message is not currently available"
 msgstr "é??å°?é?µä»¶ç?®å??ä»?æ?ªå?¯ç?¨"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4133
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ä¸?å®?æ?´ç??ä¼ºæ??å?¨å??æ??ï¼?æ?ªæ??ä¾?ä»»ä½?è³?è¨?çµ¦è¨?æ?¯ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4143
+#: ../camel/providers/imap/camel-imap-folder.c:4186
 #, 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:4372
+#: ../camel/providers/imap/camel-imap-folder.c:4415
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "å?¨ FETCH ç??å??æ??å?§æ?¾ä¸?å?°é?µä»¶ç??å?§æ??ã??"
@@ -3782,12 +3839,6 @@ msgstr "è¦?è??ä¼ºæ??å?¨æ??ä¾?ä¹?è³?æ??å¤¾ç??å?½å??ç©ºé??(_V)"
 msgid "Names_pace:"
 msgstr "å?½å??ç©ºé??(_P):"
 
-# camel/providers/imap/camel-imap-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-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:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
@@ -3820,7 +3871,7 @@ msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ IMAP ä¼ºæ??å?¨ã??"
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
 #: ../camel/providers/imap/camel-imap-store.c:243
-#: ../camel/providers/nntp/camel-nntp-store.c:313
+#: ../camel/providers/nntp/camel-nntp-store.c:342
 #: ../camel/providers/pop3/camel-pop3-store.c:135
 #: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
@@ -3828,7 +3879,7 @@ msgid "Could not connect to %s: %s"
 msgstr "ç?¡æ³?é?£æ?¥å?° %sï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-store.c:244
-#: ../camel/providers/nntp/camel-nntp-store.c:314
+#: ../camel/providers/nntp/camel-nntp-store.c:343
 #: ../camel/providers/pop3/camel-pop3-store.c:136
 #: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
@@ -3837,7 +3888,7 @@ msgstr "SSL ç?¡æ³?ä½¿ç?¨"
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
 #: ../camel/providers/imap/camel-imap-store.c:264
-#: ../camel/providers/nntp/camel-nntp-store.c:333
+#: ../camel/providers/nntp/camel-nntp-store.c:362
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "ç?¡æ³?é?£æ?¥å?° %sï¼?"
@@ -3847,15 +3898,15 @@ msgstr "ç?¡æ³?é?£æ?¥å?° %sï¼?"
 #: ../camel/providers/imap/camel-imap-store.c:390
 #: ../camel/providers/imap/camel-imap-store.c:397
 #: ../camel/providers/imap/camel-imap-store.c:424
-#: ../camel/providers/imapx/camel-imapx-server.c:2942
-#: ../camel/providers/imapx/camel-imapx-server.c:2982
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
 #, 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:371
-#: ../camel/providers/imapx/camel-imapx-server.c:2943
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
 #: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "STARTTLS not supported"
 msgstr "ä¸?æ?¯æ?´ STARTTLS"
@@ -3863,7 +3914,7 @@ msgstr "ä¸?æ?¯æ?´ STARTTLS"
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #: ../camel/providers/imap/camel-imap-store.c:391
-#: ../camel/providers/imapx/camel-imapx-server.c:2983
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
 msgid "SSL negotiations failed"
 msgstr "SSL å??å??å¤±æ??"
 
@@ -3874,7 +3925,7 @@ msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
 
 # camel/camel-remote-store.c:252
 #: ../camel/providers/imap/camel-imap-store.c:549
-#: ../camel/providers/imapx/camel-imapx-server.c:2770
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
 #, c-format
 msgid "Connection cancelled"
 msgstr "é?£ç·?å·²å??æ¶?"
@@ -3882,14 +3933,14 @@ msgstr "é?£ç·?å·²å??æ¶?"
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
 #: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imapx/camel-imapx-server.c:2775
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ç?¡æ³?ä»¥æ??ä»¤ã??%sã??é?£ç·?ï¼? %s"
 
 # camel/providers/imap/camel-imap-store.c:456
 #: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imapx/camel-imapx-server.c:3056
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %s"
@@ -3897,7 +3948,7 @@ 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:752
-#: ../camel/providers/imapx/camel-imapx-server.c:3068
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
 #: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid "No support for authentication type %s"
@@ -3905,7 +3956,7 @@ msgstr "ä¸?æ?¯æ?´é©?è?é¡?å?? %s"
 
 # camel/providers/imap/camel-imap-store.c:531
 #: ../camel/providers/imap/camel-imap-store.c:836
-#: ../camel/providers/imapx/camel-imapx-server.c:3144
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3918,14 +3969,14 @@ msgstr ""
 
 # camel/providers/smtp/camel-smtp-transport.c:534
 #: ../camel/providers/imap/camel-imap-store.c:997
-#: ../camel/providers/imapx/camel-imapx-store.c:183
+#: ../camel/providers/imapx/camel-imapx-store.c:182
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s"
 
 # camel/camel-remote-store.c:195
 #: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imapx/camel-imapx-store.c:184
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
@@ -3934,20 +3985,20 @@ msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
 #: ../camel/providers/imap/camel-imap-store.c:1367
 #: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imapx/camel-imapx-store.c:372
-#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
 #: ../camel/providers/local/camel-maildir-folder.c:409
 #: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:609
 #: ../camel/providers/local/camel-maildir-store.c:615
-#: ../camel/providers/local/camel-maildir-store.c:663
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:669
 #: ../camel/providers/local/camel-spool-store.c:289
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
 #: ../camel/providers/imap/camel-imap-store.c:1822
 #: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imapx/camel-imapx-store.c:1320
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3957,7 +4008,7 @@ msgstr "è³?æ??å¤¾å??ç¨±ã??%sã??ç?¡æ??ï¼?å? ç?ºå®?å??æ?¬å?ç¬¦ã??%cã??"
 # camel/providers/local/camel-local-store.c:158
 #: ../camel/providers/imap/camel-imap-store.c:1939
 #: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:413
+#: ../camel/providers/local/camel-mbox-store.c:407
 #: ../camel/providers/local/camel-mh-store.c:504
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
@@ -3965,7 +4016,7 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨ã??"
 
 # camel/providers/local/camel-mbox-summary.c:879
 #: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imapx/camel-imapx-store.c:1331
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ä¸?æ??ç??æ¯?è³?æ??å¤¾ï¼? %s"
@@ -4021,19 +4072,19 @@ msgid "IMAP+"
 msgstr "IMAP"
 
 # camel/camel-movemail.c:256
-#: ../camel/providers/imapx/camel-imapx-server.c:1410
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
 msgid "Error writing to cache stream: "
 msgstr "å¯«å?¥å¿«å??ä¸²æµ?æ??ç?¼ç??é?¯èª¤ï¼?"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imapx/camel-imapx-server.c:2092
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
 #, c-format
 msgid "Not authenticated"
 msgstr "å°?æ?ªé©?è?"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imapx/camel-imapx-server.c:2865
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
 #, c-format
 msgid "Could not connect to %s (port %s): "
 msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
@@ -4042,7 +4093,7 @@ msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
 # 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:3329
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
 msgid "Closing tmp stream failed: "
 msgstr "ç?¡æ³?é??é?? tmp ä¸²æµ?ï¼?"
 
@@ -4053,26 +4104,15 @@ msgstr "ç?¡æ³?é??é?? tmp ä¸²æµ?ï¼?"
 # 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:5365
-#, c-format
-msgid "Cannot create spool file: %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:5381
+#: ../camel/providers/imapx/camel-imapx-server.c:5343
+#: ../camel/providers/imapx/camel-imapx-server.c:5358
 msgid "Cannot create spool file: "
 msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../camel/providers/imapx/camel-imapx-store.c:1136
-#: ../camel/providers/nntp/camel-nntp-store.c:1610
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, c-format
 msgid "No such folder: %s"
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ï¼? %s"
@@ -4087,33 +4127,33 @@ msgstr "ä¾?æº?ä¸²æµ?å?³å??ç?¡è³?æ??"
 msgid "Source stream unavailable"
 msgstr "ä¾?æº?ä¸²æµ?ç?¡æ³?ä½¿ç?¨"
 
-#: ../camel/providers/local/camel-local-folder.c:182
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 # camel/providers/local/camel-mbox-folder.c:203
-#: ../camel/providers/local/camel-local-folder.c:192
-#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ä¿¡ç®±ï¼?%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:210
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../camel/providers/local/camel-local-folder.c:469
+#: ../camel/providers/local/camel-local-folder.c:466
 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:685
+#: ../camel/providers/local/camel-local-folder.c:700
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -4189,7 +4229,7 @@ msgstr "æ¨?æº? Unix mbox æ??ç¨?å?¨ç?®é??"
 #: ../camel/providers/local/camel-local-store.c:174
 #: ../camel/providers/local/camel-local-store.c:319
 #: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:532
+#: ../camel/providers/local/camel-mbox-store.c:526
 #: ../camel/providers/local/camel-spool-store.c:318
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -4237,14 +4277,14 @@ msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?%s "
 
 # camel/providers/local/camel-local-store.c:289
 #: ../camel/providers/local/camel-local-store.c:498
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:695
 #, 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:526
-#: ../camel/providers/local/camel-mbox-store.c:730
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ä¸ç¹¼æª?æ¡?ã??%sã??ï¼?%s"
@@ -4289,7 +4329,7 @@ msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«ã??.ã??"
 
 #: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:680
+#: ../camel/providers/local/camel-maildir-store.c:686
 #, c-format
 msgid "Folder %s already exists"
 msgstr "è³?æ??å¤¾ %s å·²å?å?¨"
@@ -4298,8 +4338,8 @@ msgstr "è³?æ??å¤¾ %s å·²å?å?¨"
 # camel/providers/local/camel-local-store.c:158
 #: ../camel/providers/local/camel-maildir-store.c:191
 #: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:381
-#: ../camel/providers/local/camel-mbox-store.c:395
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
@@ -4307,7 +4347,7 @@ 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:206
-#: ../camel/providers/local/camel-mbox-store.c:347
+#: ../camel/providers/local/camel-mbox-store.c:341
 #: ../camel/providers/local/camel-mh-store.c:464
 #, c-format
 msgid "Cannot get folder '%s': %s"
@@ -4317,7 +4357,7 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
 #: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-mbox-store.c:351
 #: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
@@ -4347,7 +4387,7 @@ 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:508
-#: ../camel/providers/local/camel-maildir-store.c:819
+#: ../camel/providers/local/camel-maildir-store.c:825
 #: ../camel/providers/local/camel-spool-store.c:143
 #: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
@@ -4356,33 +4396,33 @@ 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:671
+#: ../camel/providers/local/camel-maildir-store.c:677
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼?%sï¼?è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«ã??.ã??"
 
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:565
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, 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:556
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "æª¢æ?¥è³?æ??å¤¾ç??ä¸?è?´æ?§"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/local/camel-maildir-summary.c:649
+#: ../camel/providers/local/camel-maildir-summary.c:650
 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:742
+#: ../camel/providers/local/camel-maildir-summary.c:743
 #: ../camel/providers/local/camel-mbox-summary.c:468
 #: ../camel/providers/local/camel-mbox-summary.c:690
 #: ../camel/providers/local/camel-mbox-summary.c:826
@@ -4415,41 +4455,41 @@ msgid "Cannot create folder lock on %s: %s"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾é??å®? %s ï¼? %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mbox-store.c:540
+#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
 #, 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:406
+#: ../camel/providers/local/camel-mbox-store.c:400
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/local/camel-mbox-store.c:556
+#: ../camel/providers/local/camel-mbox-store.c:550
 #, 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:572
+#: ../camel/providers/local/camel-mbox-store.c:566
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?%sï¼?%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:574
+#: ../camel/providers/local/camel-mbox-store.c:568
 msgid "Folder already exists"
 msgstr "è³?æ??å¤¾å·²å?å?¨"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:615
-#: ../camel/providers/local/camel-mbox-store.c:628
-#: ../camel/providers/local/camel-mbox-store.c:657
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -4460,38 +4500,38 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:638
+#: ../camel/providers/local/camel-mbox-store.c:632
 #, 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:647
+#: ../camel/providers/local/camel-mbox-store.c:641
 #, 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:673
-#: ../camel/providers/local/camel-mbox-store.c:687
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ç?¡æ³?å?ªé?¤è³?æ??å¤¾æ??è¦?æª?æ¡?ã??%sã??ï¼? %s"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: ../camel/providers/local/camel-mbox-store.c:767
+#: ../camel/providers/local/camel-mbox-store.c:761
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "æ?°ç??è³?æ??å¤¾å??ç¨±ä¸?å??æ³?ã??"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-store.c:782
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, 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:865
+#: ../camel/providers/local/camel-mbox-store.c:859
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "ç?¡æ³?å°? '%s' é??æ?°å?½å??æ?? %sï¼?%s"
@@ -4618,7 +4658,7 @@ 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:230
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ä¸?è?½é??å?? MH ç?®é??è·¯å¾?ï¼? %sï¼? %s"
@@ -4731,9 +4771,9 @@ msgstr ""
 "ç?¡æ³?å??æ¥æ??ç¨?è³?æ??å¤¾ %sï¼?%s\n"
 "è³?æ??å¤¾å?¯è?½æ??æ¯?ï¼?è¤?æ?¬å?²å?æ?¼ã??%sã??"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:200
-#: ../camel/providers/nntp/camel-nntp-folder.c:279
-#: ../camel/providers/nntp/camel-nntp-folder.c:393
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
@@ -4745,12 +4785,12 @@ msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%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/nntp/camel-nntp-folder.c:241
-#: ../camel/providers/nntp/camel-nntp-folder.c:245
-#: ../camel/providers/pop3/camel-pop3-folder.c:369
-#: ../camel/providers/pop3/camel-pop3-folder.c:434
-#: ../camel/providers/pop3/camel-pop3-folder.c:446
-#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:697
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
@@ -4759,9 +4799,9 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
 # 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:477
-#: ../camel/providers/nntp/camel-nntp-folder.c:483
-#: ../camel/providers/nntp/camel-nntp-folder.c:530
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr "å¼µè²¼å¤±æ??ï¼?%s"
@@ -4770,17 +4810,17 @@ msgstr "å¼µè²¼å¤±æ??ï¼?%s"
 # 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:525
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
 msgid "Posting failed: "
 msgstr "å¼µè²¼å¤±æ??ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
 #, 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:574
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ä½ ç?¡æ³?å¾? NNTP è³?æ??å¤¾è¤?è£½è¨?æ?¯ï¼?"
@@ -4812,36 +4852,36 @@ msgid ""
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç´?æ??å?ç??å¯?ç¢¼é©?è? NNTP ä¼ºæ??å?¨ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../camel/providers/nntp/camel-nntp-store.c:77
+#: ../camel/providers/nntp/camel-nntp-store.c:73
 #, 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:89
+#: ../camel/providers/nntp/camel-nntp-store.c:85
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ç?¡æ³?é©?è?ä¼ºæ??å?¨ï¼?%s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/nntp/camel-nntp-store.c:346
+#: ../camel/providers/nntp/camel-nntp-store.c:375
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:359
+#: ../camel/providers/nntp/camel-nntp-store.c:388
 #, 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:527
+#: ../camel/providers/nntp/camel-nntp-store.c:582
 #, c-format
 msgid "USENET News via %s"
 msgstr "ç¶?ç?± %s ç?? USENET æ?°è??"
 
 # mail/mail-ops.c:1755
-#: ../camel/providers/nntp/camel-nntp-store.c:1045
+#: ../camel/providers/nntp/camel-nntp-store.c:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4852,7 +4892,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4863,7 +4903,7 @@ msgstr ""
 "\n"
 "æ²?æ??é¡?ä¼¼ç??æ?°è??ç¾£çµ?ã??é?¸å??ç??é ?ç?®å?¯è?½æ?¯ç?¶ä»£è³?æ??å¤¾ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4874,48 +4914,48 @@ msgstr ""
 "\n"
 "æ?°è??ç¾£çµ?ä¸?å?å?¨ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1235
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
 #, 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:1251
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ä½ ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??é??æ?°å?½å??è³?æ??å¤¾ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1268
+#: ../camel/providers/nntp/camel-nntp-store.c:1323
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "ä½ ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??ç§»é?¤è³?æ??å¤¾ï¼?æ?¹ä»¥å??æ¶?è¨?é?±ã??"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/nntp/camel-nntp-store.c:1479
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
 msgid "NNTP Command failed: "
 msgstr "NNTP æ??ä»¤å¤±æ??ï¼?"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../camel/providers/nntp/camel-nntp-store.c:1553
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, c-format
 msgid "Not connected."
 msgstr "æ?ªé?£ç·?ã??"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/nntp/camel-nntp-summary.c:234
-#: ../camel/providers/nntp/camel-nntp-summary.c:345
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%sï¼?æ??æ??æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:246
+#: ../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:362
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "æ¨?é¡?å?³ä¾?æ??å¤?ç??ä¼ºæ??å?¨å??æ??ï¼?%s"
@@ -4924,48 +4964,48 @@ msgstr "æ¨?é¡?å?³ä¾?æ??å¤?ç??ä¼ºæ??å?¨å??æ??ï¼?%s"
 # 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:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ä½?æ¥å¤±æ??ï¼? %s"
 
 # camel/providers/pop3/camel-pop3-folder.c:292
 #: ../camel/providers/pop3/camel-pop3-folder.c:277
-#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#: ../camel/providers/pop3/camel-pop3-folder.c:336
 #, c-format
 msgid "No message with UID %s"
 msgstr "æ²?æ??é?µä»¶å?·æ??é??å?? UID %s"
 
 # camel/providers/pop3/camel-pop3-folder.c:296
-#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "æ?¥æ?¶ POP é?µä»¶ %d"
 
 # camel/camel-sasl-login.c:127
-#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
 msgid "Unknown reason"
 msgstr "ä¸?æ??ç??å??å? "
 
 # camel/providers/pop3/camel-pop3-folder.c:149
-#: ../camel/providers/pop3/camel-pop3-folder.c:486
+#: ../camel/providers/pop3/camel-pop3-folder.c:488
 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:509
+#: ../camel/providers/pop3/camel-pop3-folder.c:511
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "ä¸?è?½å??å¾? POP æ??è¦?ï¼? %s"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:561
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
 msgid "Expunging old messages"
 msgstr "æ¸?ç©ºè??ç??é?µä»¶"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../camel/providers/pop3/camel-pop3-folder.c:577
 msgid "Expunging deleted messages"
 msgstr "æ¸?ç©ºå?ªé?¤ç??é?µä»¶"
 
@@ -5139,18 +5179,18 @@ msgid "POP3 server for %s on %s"
 msgstr "%s å?¨ %s ç?? POP3 ä¼ºæ??å?¨"
 
 # camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:694
+#: ../camel/providers/pop3/camel-pop3-store.c:693
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %s"
 
 # camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:721
+#: ../camel/providers/pop3/camel-pop3-store.c:720
 #, c-format
 msgid "No such folder '%s'."
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ã??%sã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:738
+#: ../camel/providers/pop3/camel-pop3-store.c:737
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 å?²å?å??æ²?æ??è³?æ??å¤¾é??å±¤"
@@ -5270,7 +5310,7 @@ 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:488
+#: ../camel/providers/smtp/camel-smtp-transport.c:495
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5282,225 +5322,225 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:606
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
 #, 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:613
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?å¯?ä»¶è??ç??å?°å??ç?¡æ??ã??"
 
 # mail/mail-ops.c:603
-#: ../camel/providers/smtp/camel-smtp-transport.c:617
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
 msgid "Sending message"
 msgstr "å?³é??é?µä»¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:642
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
 #, 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:655
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?ä¸?æ??å¤?å??ç?¡æ??ç??æ?¶ä»¶è??"
 
 # camel/providers/smtp/camel-smtp-transport.c:168
-#: ../camel/providers/smtp/camel-smtp-transport.c:718
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Syntax error, command unrecognized"
 msgstr "èª?æ³?é?¯èª¤ï¼?ä¸?èª?è?ç??æ??ä»¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Syntax error in parameters or arguments"
 msgstr "å??æ?¸å?§ç??èª?æ³?é?¯èª¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:172
-#: ../camel/providers/smtp/camel-smtp-transport.c:722
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Command not implemented"
 msgstr "æ??ä»¤æ²?æ??å¯¦ä½?"
 
 # camel/providers/smtp/camel-smtp-transport.c:174
-#: ../camel/providers/smtp/camel-smtp-transport.c:724
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Command parameter not implemented"
 msgstr "æ??ä»¤ç??å??æ?¸æ²?æ??å¯¦ä½?"
 
 # camel/providers/smtp/camel-smtp-transport.c:176
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "System status, or system help reply"
 msgstr "ç³»çµ±ç??æ³?ï¼?æ??è??æ?¯ç³»çµ±ç??æ±?å?©èªªæ??å??æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:178
-#: ../camel/providers/smtp/camel-smtp-transport.c:728
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Help message"
 msgstr "æ±?å?©èªªæ??è¨?æ?¯"
 
 # camel/providers/smtp/camel-smtp-transport.c:180
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "Service ready"
 msgstr "æ??å??å·²å°±ç·?"
 
 # camel/providers/smtp/camel-smtp-transport.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:732
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Service closing transmission channel"
 msgstr "æ¤æ??å??å°?å?³è¼¸é??é??é??é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Service not available, closing transmission channel"
 msgstr "æ¤æ??å??ä»?æ?ªå?¯ç?¨ï¼?å?³è¼¸é??é??é??é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:736
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested mail action okay, completed"
 msgstr " æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ??å??å®?æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:188
-#: ../camel/providers/smtp/camel-smtp-transport.c:738
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 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:740
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
 
 # camel/providers/smtp/camel-smtp-transport.c:192
-#: ../camel/providers/smtp/camel-smtp-transport.c:742
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
 
 # camel/providers/smtp/camel-smtp-transport.c:194
-#: ../camel/providers/smtp/camel-smtp-transport.c:744
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "Requested action aborted: error in processing"
 msgstr "æ??è¦?æ±?ç??å??ä½?å·²æ?¾æ£?ï¼?æ£å?¨è??ç??æ??ç?¼ç??é?¯èª¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:196
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "User not local; please try <forward-path>"
 msgstr "ä¸?æ?¯æ?¬å?°ç«¯ç??ä½¿ç?¨è??ï¼?è«?å??è©¦ä½¿ç?¨ <è½?å¯?è·¯å¾?>"
 
 # camel/providers/smtp/camel-smtp-transport.c:198
-#: ../camel/providers/smtp/camel-smtp-transport.c:748
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Requested action not taken: insufficient system storage"
 msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?ç³»çµ±ç??å?²å?ç©ºé??ä¸?è¶³"
 
 # camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:750
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ?¾æ£?ï¼?è¶?å?ºå?¯ä¾?å?²å?ç©ºé??ç??é??å?¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:202
-#: ../camel/providers/smtp/camel-smtp-transport.c:752
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 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:754
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
 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:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
 msgid "Transaction failed"
 msgstr "å?·è¡?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:210
-#: ../camel/providers/smtp/camel-smtp-transport.c:760
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
 msgid "A password transition is needed"
 msgstr "é??è¦?å¯?ç¢¼å?³é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:762
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
 msgid "Authentication mechanism is too weak"
 msgstr "é©?è?æ©?å?¶å¤ªå¼±äº?"
 
 # camel/providers/smtp/camel-smtp-transport.c:214
-#: ../camel/providers/smtp/camel-smtp-transport.c:764
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Encryption required for requested authentication mechanism"
 msgstr "æ??è¦?æ±?ç??é©?è?æ©?å?¶å¿?é ?å? å¯?è??ç??"
 
 # camel/providers/smtp/camel-smtp-transport.c:216
-#: ../camel/providers/smtp/camel-smtp-transport.c:766
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "Temporary authentication failure"
 msgstr "è?¨æ??é©?è?å¤±æ??"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../camel/providers/smtp/camel-smtp-transport.c:1023
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
 msgid "SMTP Greeting"
 msgstr "SMTP è¿?æ?¥"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1050
-#: ../camel/providers/smtp/camel-smtp-transport.c:1067
-#: ../camel/providers/smtp/camel-smtp-transport.c:1075
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
 msgid "HELO command failed: "
 msgstr "HELO æ??ä»¤å¤±æ??ï¼?"
 
 # mail/mail-config.glade.h:10
-#: ../camel/providers/smtp/camel-smtp-transport.c:1143
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "SMTP Authentication"
 msgstr "SMTP é©?è?"
 
 # camel/providers/smtp/camel-smtp-transport.c:728
-#: ../camel/providers/smtp/camel-smtp-transport.c:1150
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
 #, 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:1169
-#: ../camel/providers/smtp/camel-smtp-transport.c:1180
-#: ../camel/providers/smtp/camel-smtp-transport.c:1189
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
 msgid "AUTH command failed: "
 msgstr "AUTH æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
-#: ../camel/providers/smtp/camel-smtp-transport.c:1311
-#: ../camel/providers/smtp/camel-smtp-transport.c:1320
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO æ??ä»¤å¤±æ??ï¼?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1363
-#: ../camel/providers/smtp/camel-smtp-transport.c:1372
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1414
-#: ../camel/providers/smtp/camel-smtp-transport.c:1424
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
-#: ../camel/providers/smtp/camel-smtp-transport.c:1512
-#: ../camel/providers/smtp/camel-smtp-transport.c:1525
-#: ../camel/providers/smtp/camel-smtp-transport.c:1533
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
 msgid "DATA command failed: "
 msgstr "DATA æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1558
-#: ../camel/providers/smtp/camel-smtp-transport.c:1572
-#: ../camel/providers/smtp/camel-smtp-transport.c:1580
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
 msgid "RSET command failed: "
 msgstr "RSET æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1605
-#: ../camel/providers/smtp/camel-smtp-transport.c:1619
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
 #: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
 msgid "QUIT command failed: "
 msgstr "QUIT æ??ä»¤å¤±æ??ï¼?"
 
@@ -5635,7 +5675,7 @@ msgstr "æ£å?¨ç?å¾?"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -5645,7 +5685,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:1640 ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -5654,7 +5694,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:1645 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -5663,7 +5703,7 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -5686,8 +5726,8 @@ 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:1663 ../libedataserver/e-time-utils.c:1765
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -5744,21 +5784,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:1697 ../libedataserver/e-time-utils.c:1768
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
 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:1826 ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
 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:1830 ../libedataserver/e-time-utils.c:1938
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5770,7 +5810,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:1835 ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
@@ -5781,7 +5821,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:1839 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -5790,7 +5830,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:1842
+#: ../libedataserver/e-time-utils.c:1871
 msgid "%H%M"
 msgstr "%H%M"
 
@@ -5799,76 +5839,76 @@ 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:1846
+#: ../libedataserver/e-time-utils.c:1875
 msgid "%I %p"
 msgstr "%I %p"
 
 #: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:668
+#: ../libedataserverui/e-book-auth-util.c:673
 msgid "Accessing LDAP Server anonymously"
 msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
 
 #: ../libedataserverui/e-book-auth-util.c:199
-#: ../libedataserverui/e-book-auth-util.c:430
+#: ../libedataserverui/e-book-auth-util.c:435
 msgid "Failed to authenticate.\n"
 msgstr "é©?è?è?æ?¸å¤±æ??ã??\n"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../libedataserverui/e-categories-dialog.c:134
+#: ../libedataserverui/e-categories-dialog.c:127
 msgid "Category Properties"
 msgstr "å??é¡?å±¬æ?§"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:138
 msgid "Category _Name"
 msgstr "å??é¡?å??ç¨±(_N)"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:144
 msgid "Category _Icon"
 msgstr "å??é¡?å??ç¤º(_I)"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:192
+#: ../libedataserverui/e-categories-dialog.c:185
 msgid "Category Icon"
 msgstr "å??é¡?å??ç¤º"
 
-#: ../libedataserverui/e-categories-dialog.c:198
+#: ../libedataserverui/e-categories-dialog.c:191
 msgid "_No Image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:409
+#: ../libedataserverui/e-categories-dialog.c:406
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "å?¨çµ?æ??ä¸å·²ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?ä½¿ç?¨å?¦å¤?ç??å??ç¨±"
 
-#: ../libedataserverui/e-categories-dialog.c:664
+#: ../libedataserverui/e-categories-dialog.c:661
 msgid "Currently _used categories:"
 msgstr "ç?®å??ä½¿ç?¨ç??å??é¡?(_U):"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:668
 msgid "_Available Categories:"
 msgstr "å?¯ç?¨ç??å??é¡?(_A):"
 
-#: ../libedataserverui/e-categories-dialog.c:714
+#: ../libedataserverui/e-categories-dialog.c:711
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../libedataserverui/e-categories-dialog.c:770
+#: ../libedataserverui/e-categories-dialog.c:768
 msgid "Icon"
 msgstr "å??ç¤º"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:775
+#: ../libedataserverui/e-categories-dialog.c:773
 msgid "Category"
 msgstr "å??é¡?"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-category-completion.c:292
+#: ../libedataserverui/e-category-completion.c:294
 #, c-format
 msgid "Create category \"%s\""
 msgstr "å»ºç«?å??é¡?ã??%sã??"
@@ -5893,7 +5933,7 @@ msgstr "æ??å°?(_S):"
 
 # calendar/gui/e-tasks.c:155
 #: ../libedataserverui/e-name-selector-dialog.c:242
-#: ../libedataserverui/e-name-selector-dialog.c:984
+#: ../libedataserverui/e-name-selector-dialog.c:977
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
 
@@ -5915,49 +5955,49 @@ msgstr "é??è¨?é??"
 msgid "Contacts"
 msgstr "è?¯çµ¡äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:415
+#: ../libedataserverui/e-name-selector-dialog.c:412
 msgid "Select Contacts from Address Book"
 msgstr "å¾?é??è¨?é??é?¸å??è?¯çµ¡äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:754
+#: ../libedataserverui/e-name-selector-dialog.c:747
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:758
+#: ../libedataserverui/e-name-selector-dialog.c:751
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
 # camel/camel-movemail.c:245
-#: ../libedataserverui/e-name-selector-dialog.c:898
+#: ../libedataserverui/e-name-selector-dialog.c:891
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "è¼?å?¥é??è¨?é??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2658
+#: ../libedataserverui/e-name-selector-entry.c:2661
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "å±?é??è¡?å?§ %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2673
+#: ../libedataserverui/e-name-selector-entry.c:2676
 #, c-format
 msgid "Cop_y %s"
 msgstr "è¤?è£½(_Y) %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2683
+#: ../libedataserverui/e-name-selector-entry.c:2686
 #, c-format
 msgid "C_ut %s"
 msgstr "å?ªä¸?(_U) %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2700
+#: ../libedataserverui/e-name-selector-entry.c:2703
 #, c-format
 msgid "_Edit %s"
 msgstr "ç·¨è¼¯ %s(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:516
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "å?ªé?¤(_D) %s"
@@ -5968,22 +6008,27 @@ msgid "Keyring key is unusable: no user or host name"
 msgstr "å¯?ç¢¼å??å??å¯?ç¢¼å??ç?¡æ³?ä½¿ç?¨ï¼?æ²?æ??ä½¿ç?¨è??æ??ä¸»æ©?å??ç¨±"
 
 #: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "ä½ ç?? Caps Lock æ?¯é??å??ç??ã??"
 
-#: ../libedataserverui/e-passwords.c:824
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "è¨?ä½?é??å??å¯?èª?(_R)"
 
-#: ../libedataserverui/e-passwords.c:825
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?èª?(_R)"
 
-#: ../libedataserverui/e-passwords.c:830
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "è¨?ä½?é??å??å¯?ç¢¼(_R)"
 
-#: ../libedataserverui/e-passwords.c:831
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?ç¢¼(_R)"
 
@@ -5993,7 +6038,7 @@ msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?ç¢¼(_R)"
 msgid "Select destination"
 msgstr "é?¸å??ç?®ç??å?°"
 
-#: ../libedataserverui/e-source-selector-dialog.c:174
+#: ../libedataserverui/e-source-selector-dialog.c:170
 msgid "_Destination"
 msgstr "ç?®ç??ç«¯(_D)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1329f9c..2f55d5d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 2.91.4\n"
+"Project-Id-Version: evolution-data-server 2.91.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-12 19:28+0800\n"
-"PO-Revision-Date: 2010-12-11 07:11+0800\n"
+"POT-Creation-Date: 2011-03-18 14:59+0800\n"
+"PO-Revision-Date: 2011-03-18 09:55+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"
 "Language: \n"
@@ -39,6 +39,57 @@ msgstr "è¼?å?¥ä¸â?¦"
 msgid "Searching..."
 msgstr "æ??å°?ä¸â?¦"
 
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contactsâ?¦"
+msgstr "æ?¥è©¢æ?´æ?°ç??é?£çµ¡äººâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+msgid "Personal"
+msgstr "å??äºº"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+msgid "Friends"
+msgstr "æ??å??"
+
+# addressbook/contact-editor/e-contact-quick-add.c:276
+# addressbook/gui/widgets/e-addressbook-view.c:700
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+msgid "Family"
+msgstr "å®¶äºº"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "å??äº?"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groupsâ?¦"
+msgstr "æ?¥è©¢æ?´æ?°ç??ç¾¤çµ?â?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contactâ?¦"
+msgstr "å»ºç«?æ?°ç??é?£çµ¡äººâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ?¦"
+msgstr "å?ªé?¤é?£çµ¡äººâ?¦"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contactâ?¦"
+msgstr "ä¿®æ?¹é?£çµ¡äººâ?¦"
+
+# mail/mail-send-recv.c:287
+# mail/mail-send-recv.c:333
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+msgid "Loadingâ?¦"
+msgstr "è¼?å?¥ä¸â?¦"
+
+# camel/providers/smtp/camel-smtp-transport.c:218
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+msgid "Authenticating with the serverâ?¦"
+msgstr "è??ä¼ºæ??å?¨é©?è?â?¦"
+
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
@@ -46,8 +97,8 @@ msgid "Downloading contacts (%d)... "
 msgstr "æ£å?¨ä¸?è¼?é?£çµ¡äºº (%d)â?¦"
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2847
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3075
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "æ£å?¨æ?´æ?°é?£çµ¡äººå¿«å?? (%d)â?¦"
@@ -111,12 +162,13 @@ msgstr "é?²è¡?æ??å°?æ??ç?¼ç??é?¯èª¤"
 #: ../addressbook/libedata-book/e-data-book.c:441
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
-#: ../calendar/backends/http/e-cal-backend-http.c:378
-#: ../calendar/libecal/e-cal.c:4180
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4177
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:160
 #: ../camel/providers/imap/camel-imap-command.c:481
 #: ../camel/providers/imap/camel-imap-store.c:425
 #: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
 #: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
@@ -126,7 +178,7 @@ msgstr "ä¸?æ??ç??é?¯èª¤"
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "å»ºç«?è³?æº?ã??%sã??å¤±æ??ï¼?HTTP ç??æ??ï¼?%d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3066
+#: ../addressbook/libebook/e-book.c:3160
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%sï¼?æ²?æ??å?²å?æ?¼ GConf ä¸ç?? UIDã??%sã??ä¾?æº?ã??"
@@ -134,7 +186,7 @@ msgstr "%sï¼?æ²?æ??å?²å?æ?¼ GConf ä¸ç?? UIDã??%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
-#: ../addressbook/libebook/e-book.c:3422
+#: ../addressbook/libebook/e-book.c:3516
 #: ../addressbook/libedata-book/e-data-book.c:183
 msgid "Address book does not exist"
 msgstr "é??è¨?é??ä¸?å?å?¨"
@@ -378,7 +430,7 @@ msgstr "ç¶²èª? URL"
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:759
+#: ../libedataserverui/e-categories-dialog.c:757
 msgid "Categories"
 msgstr "å??é¡?"
 
@@ -673,7 +725,7 @@ msgstr "å?ºç??æ?¥æ??"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
 #: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Anniversary"
 msgstr "é?±å¹´ç´?å¿µæ?¥"
 
@@ -764,34 +816,35 @@ msgstr "SIP ä½?å??"
 msgid "Unnamed List"
 msgstr "æ?ªå?½å??ç??æ¸?å?®"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:298
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
 #, c-format
 msgid "Empty URI"
 msgstr "ç©ºç?? URI"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:317
-#: ../addressbook/libedata-book/e-data-book-factory.c:355
-#: ../calendar/libedata-cal/e-data-cal-factory.c:346
-#: ../calendar/libedata-cal/e-data-cal-factory.c:358
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
 #, c-format
 msgid "Invalid source"
 msgstr "ç?¡æ??ç??ä¾?æº?"
 
 #: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:110
+#: ../calendar/libedata-cal/e-data-cal.c:108
 msgid "Success"
 msgstr "æ??å??"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
 #: ../addressbook/libedata-book/e-data-book.c:174
-#: ../calendar/libedata-cal/e-data-cal.c:111
+#: ../calendar/libedata-cal/e-data-cal.c:109
 msgid "Repository offline"
 msgstr "è³?æ??åº«é?¢ç·?"
 
 # shell/e-storage.c:475
 #: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4162 ../calendar/libedata-cal/e-data-cal.c:112
+#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:110
 msgid "Permission denied"
 msgstr "æ¬?é??ä¸?è¶³"
 
@@ -806,31 +859,31 @@ msgstr "é?£çµ¡äºº ID å·²ç¶?å?å?¨"
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../calendar/libedata-cal/e-data-cal.c:115
 msgid "Authentication Failed"
 msgstr "é©?è?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
 #: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../calendar/libedata-cal/e-data-cal.c:116
 msgid "Authentication Required"
 msgstr "è¦?æ±?é©?è?"
 
 # mail/mail-config.glade.h:1
 #: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../calendar/libedata-cal/e-data-cal.c:117
 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:181
-#: ../calendar/libedata-cal/e-data-cal.c:121
+#: ../calendar/libedata-cal/e-data-cal.c:119
 msgid "Unsupported authentication method"
 msgstr "ä¸?æ?¯æ?´ç??é©?è?æ?¹æ³?"
 
 #: ../addressbook/libedata-book/e-data-book.c:182
-#: ../calendar/libedata-cal/e-data-cal.c:122
+#: ../calendar/libedata-cal/e-data-cal.c:120
 msgid "TLS not available"
 msgstr "ç?¡æ³?ä½¿ç?¨ TLS"
 
@@ -841,35 +894,35 @@ msgstr "é??è¨?é??å·²ç¶?ç§»é?¤"
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
 #: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../calendar/libedata-cal/e-data-cal.c:123
 msgid "Not available in offline mode"
 msgstr "ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨"
 
 #: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../calendar/libedata-cal/e-data-cal.c:124
 msgid "Search size limit exceeded"
 msgstr "è¶?é??æ??å°?å¤§å°?é??å?¶"
 
 #: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../calendar/libedata-cal/e-data-cal.c:125
 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:188
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../calendar/libedata-cal/e-data-cal.c:126
 msgid "Invalid query"
 msgstr "ç?¡æ??ç??æ?¥è©¢"
 
 #: ../addressbook/libedata-book/e-data-book.c:189
-#: ../calendar/libedata-cal/e-data-cal.c:129
+#: ../calendar/libedata-cal/e-data-cal.c:127
 msgid "Query refused"
 msgstr "æ?¥è©¢è¢«æ??çµ?"
 
 # calendar/gui/e-itip-control.c:883
 #: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:130
+#: ../calendar/libedata-cal/e-data-cal.c:128
 msgid "Could not cancel"
 msgstr "ç?¡æ³?å??æ¶?"
 
@@ -878,7 +931,7 @@ msgstr "ç?¡æ³?å??æ¶?"
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
 #: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libedata-cal/e-data-cal.c:132
+#: ../calendar/libedata-cal/e-data-cal.c:130
 msgid "Invalid server version"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ç??æ?¬"
 
@@ -890,20 +943,20 @@ msgstr "æ²?æ??ç©ºé??"
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
 #: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libecal/e-cal.c:4146 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:131
 msgid "Invalid argument"
 msgstr "ç?¡æ??ç??å??æ?¸"
 
 # shell/e-storage.c:477
 #. Translators: The string for NOT_SUPPORTED error
 #: ../addressbook/libedata-book/e-data-book.c:196
-#: ../calendar/libecal/e-cal.c:4185 ../calendar/libedata-cal/e-data-cal.c:135
+#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:133
 msgid "Not supported"
 msgstr "ä¸?æ?¯æ?´"
 
 # addressbook/gui/widgets/e-addressbook-view.c:718
 #: ../addressbook/libedata-book/e-data-book.c:204
-#: ../calendar/libedata-cal/e-data-cal.c:143
+#: ../calendar/libedata-cal/e-data-cal.c:141
 msgid "Other error"
 msgstr "å?¶ä»?é?¯èª¤"
 
@@ -1048,8 +1101,8 @@ msgstr "ç?¡æ³?é?£æ?¥ä¼ºæ??å?¨ (%s)"
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "HTTP å??æ??æ?ªé ?æ??ç??ç??æ??ç¢¼ %d (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2090
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2495
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1061,23 +1114,23 @@ 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:4266
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
 msgid "Calendar doesn't support Free/Busy"
 msgstr "è¡?äº?æ??ä¸?æ?¯æ?´ç©ºé??/å¿?ç¢?"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
 #, c-format
 msgid "Birthday: %s"
 msgstr "ç??æ?¥ï¼?%s"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
 #, c-format
 msgid "Anniversary: %s"
 msgstr "ç´?å¿µæ?¥ï¼?%s"
@@ -1092,69 +1145,69 @@ msgid "Cannot save calendar data"
 msgstr "ä¸?è?½å?²å?è¡?äº?æ??è³?æ??"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2107
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
 msgid "Reply Requested: by "
 msgstr "è¦?æ±?å??è¦?ï¼?ä¾?"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2112
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
 msgid "Reply Requested: When convenient"
 msgstr "è¦?æ±?å??è¦?ï¼?ç?¶æ??ç©ºæ??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
 msgid "Loading Appointment items"
 msgstr "æ£å?¨è¼?å?¥ç´?æ??é ?ç?®"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:332
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
 msgid "Loading Task items"
 msgstr "æ£å?¨è¼?å?¥å·¥ä½?é ?ç?®"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:334
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
 msgid "Loading Note items"
 msgstr "æ£å?¨è¼?å?¥ç?è¨?é ?ç?®"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:336
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
 msgid "Loading items"
 msgstr "æ£å?¨è¼?å?¥é ?ç?®"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:963
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
 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:1026
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
 msgid "Invalid server URI"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ URI"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1387
-#: ../calendar/backends/http/e-cal-backend-http.c:721
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
 #: ../calendar/backends/weather/e-cal-backend-weather.c:520
 msgid "Could not create cache file"
 msgstr "ç?¡æ³?å»ºæ§?å¿«å??æª?æ¡?"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1139
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
 msgid "Could not create thread for populating cache"
 msgstr "ç?¡æ³?å»ºæ§?ç§»æ¤?å¿«å??ç??å?·è¡?ç·?"
 
 # mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:366
+#: ../calendar/backends/http/e-cal-backend-http.c:423
 msgid "Redirected to Invalid URI"
 msgstr "é??æ?°æ??å??ç?¡æ??ç?? URI"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:399
+#: ../calendar/backends/http/e-cal-backend-http.c:456
 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:406
+#: ../calendar/backends/http/e-cal-backend-http.c:463
 msgid "Not a calendar."
 msgstr "ä¸¦é??è¡?äº?æ??ã??"
 
@@ -1206,162 +1259,162 @@ msgid "Forecast"
 msgstr "å¤©æ°£é ?å ±"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: ../calendar/libecal/e-cal-component.c:1306
+#: ../calendar/libecal/e-cal-component.c:1299
 msgid "Untitled appointment"
 msgstr "æ?ªå?½å??ç??ç´?æ??"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "1st"
 msgstr "1æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "2nd"
 msgstr "2æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
 msgstr "3æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
 msgstr "4æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
 msgstr "5æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
 msgstr "6æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
 msgstr "7æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
 msgstr "8æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
 msgstr "9æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
 msgstr "10æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
 msgstr "11æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
 msgstr "12æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
 msgstr "13æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
 msgstr "14æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
 msgstr "15æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
 msgstr "16æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
 msgstr "17æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
 msgstr "18æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
 msgstr "19æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
 msgstr "20æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
 msgstr "21æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
 msgstr "22æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
 msgstr "23æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
 msgstr "24æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
 msgstr "25æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
 msgstr "26æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
 msgstr "27æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
 msgstr "28æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
 msgstr "29æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
 msgstr "30æ?¥"
 
 # calendar/gui/print.c:306
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
 msgstr "31æ?¥"
 
@@ -1397,7 +1450,7 @@ msgstr "æ?ªæ??å®?"
 
 # camel/camel-smime-context.c:194
 #: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
@@ -1412,55 +1465,55 @@ msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "è¼¸å?¥ %s ç??å¯?ç¢¼ä»¥ä¾¿ä½¿ç?¨è?? %s è?½ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨"
 
-#: ../calendar/libecal/e-cal.c:4148
+#: ../calendar/libecal/e-cal.c:4145
 msgid "Backend is busy"
 msgstr "å¾?ç«¯å¿?ç¢?ä¸"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:4150
+#: ../calendar/libecal/e-cal.c:4147
 msgid "Repository is offline"
 msgstr "å??åº«å·²é?¢ç·?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:4152
+#: ../calendar/libecal/e-cal.c:4149
 msgid "No such calendar"
 msgstr "ç?¡æ¤è¡?äº?æ??"
 
-#: ../calendar/libecal/e-cal.c:4154 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4151 ../calendar/libedata-cal/e-data-cal.c:112
 #: ../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:4156 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../calendar/libecal/e-cal.c:4153 ../calendar/libedata-cal/e-data-cal.c:113
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
 # addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:4158
+#: ../calendar/libecal/e-cal.c:4155
 msgid "URI not loaded"
 msgstr "URI æ?ªè¼?å?¥"
 
-#: ../calendar/libecal/e-cal.c:4160
+#: ../calendar/libecal/e-cal.c:4157
 msgid "URI already loaded"
 msgstr "URI å·²è¼?å?¥"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4164 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4161 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "ä¸?æ??ç??ä½¿ç?¨è??"
 
-#: ../calendar/libecal/e-cal.c:4166 ../calendar/libedata-cal/e-data-cal.c:116
+#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Object ID already exists"
 msgstr "ç?©ä»¶ ID å·²å?å?¨"
 
 # shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:4168
+#: ../calendar/libecal/e-cal.c:4165
 msgid "Protocol not supported"
 msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 
@@ -1468,22 +1521,22 @@ 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:4170
+#: ../calendar/libecal/e-cal.c:4167
 msgid "Operation has been canceled"
 msgstr "æ??ä½?å·²å??æ¶?"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:4172
+#: ../calendar/libecal/e-cal.c:4169
 msgid "Could not cancel operation"
 msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../calendar/libecal/e-cal.c:4174
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1311
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1329
-#: ../camel/providers/groupwise/camel-groupwise-store.c:635
-#: ../camel/providers/groupwise/camel-groupwise-store.c:817
+#: ../calendar/libecal/e-cal.c:4171
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:87
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:120
 #, c-format
@@ -1491,17 +1544,17 @@ msgid "Authentication failed"
 msgstr "é©?è?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:4176
-#: ../camel/providers/smtp/camel-smtp-transport.c:768
+#: ../calendar/libecal/e-cal.c:4173
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
 msgstr "è¦?æ±?é©?è?"
 
-#: ../calendar/libecal/e-cal.c:4178
+#: ../calendar/libecal/e-cal.c:4175
 msgid "A D-Bus exception has occurred"
 msgstr "ç?¼ç?? D-Bus ä¾?å¤?"
 
 # shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:4182
+#: ../calendar/libecal/e-cal.c:4179
 msgid "No error"
 msgstr "æ²?æ??é?¯èª¤"
 
@@ -1601,249 +1654,249 @@ msgstr "ã??%sã??ç??æ??æ??å¼?æ?¸å¿?é ?ç?ºå?ä¸²ï¼?æ??å?ªæ??ä¸?å??å¼?æ?¸ç?ºå¸?æ??
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Invalid range"
 msgstr "ç?¡æ??ç??ç¯?å??"
 
 # mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../calendar/libedata-cal/e-data-cal.c:118
 msgid "Unsupported method"
 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:123
+#: ../calendar/libedata-cal/e-data-cal.c:121
 msgid "Calendar does not exist"
 msgstr "è¡?äº?æ??ä¸?å?å?¨"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../calendar/libedata-cal/e-data-cal.c:122
 msgid "Unknown user"
 msgstr "ä¸?æ??ç??ä½¿ç?¨è??"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:610
+#: ../calendar/libedata-cal/e-data-cal.c:608
 #, c-format
 msgid "Cannot retrieve calendar address: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ä½?å??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:635
+#: ../calendar/libedata-cal/e-data-cal.c:633
 #, c-format
 msgid "Cannot retrieve calendar alarm e-mail address: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??é¬§é?´é?»å?é?µä»¶ä½?å??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:660
+#: ../calendar/libedata-cal/e-data-cal.c:658
 #, c-format
 msgid "Cannot retrieve calendar's LDAP attribute: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?? LDAP å±¬æ?§ï¼?%s"
 
 # camel/camel-filter-driver.c:671
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:685
+#: ../calendar/libedata-cal/e-data-cal.c:683
 #, c-format
 msgid "Cannot retrieve calendar scheduling information: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è¡?ç¨?è³?è¨?ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:709
+#: ../calendar/libedata-cal/e-data-cal.c:707
 #, c-format
 msgid "Cannot open calendar: %s"
 msgstr "ä¸?è?½é??å??è¡?äº?æ??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:730
+#: ../calendar/libedata-cal/e-data-cal.c:728
 #, c-format
 msgid "Cannot refresh calendar: %s"
 msgstr "ä¸?è?½é??æ?°æ?´ç??è¡?äº?æ??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:749
+#: ../calendar/libedata-cal/e-data-cal.c:747
 #, c-format
 msgid "Cannot remove calendar: %s"
 msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ï¼?%s"
 
 # mail/mail-crypto.c:251
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:770
+#: ../calendar/libedata-cal/e-data-cal.c:768
 #, c-format
 msgid "Cannot create calendar object: %s"
 msgstr "ä¸?è?½å»ºç«?è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:798
+#: ../calendar/libedata-cal/e-data-cal.c:796
 #, c-format
 msgid "Cannot modify calendar object: %s"
 msgstr "ä¸?è?½ä¿®æ?¹è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:824
+#: ../calendar/libedata-cal/e-data-cal.c:822
 #, c-format
 msgid "Cannot remove calendar object: %s"
 msgstr "ä¸?è?½ç§»é?¤è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:845
+#: ../calendar/libedata-cal/e-data-cal.c:843
 #, c-format
 msgid "Cannot receive calendar objects: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:864
+#: ../calendar/libedata-cal/e-data-cal.c:862
 #, c-format
 msgid "Cannot discard calendar alarm: %s"
 msgstr "ä¸?è?½å??æ¶?è¡?äº?æ??é¬§é?´ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:885
+#: ../calendar/libedata-cal/e-data-cal.c:883
 #, c-format
 msgid "Cannot send calendar objects: %s"
 msgstr "ä¸?è?½å?³é??è¡?äº?æ??ç?©ä»¶ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:912
+#: ../calendar/libedata-cal/e-data-cal.c:910
 #, c-format
 msgid "Cannot retrieve default calendar object path: %s"
 msgstr "ä¸?è?½å??å¾?é ?è¨ç??è¡?äº?æ??ç?©ä»¶è·¯å¾?ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:937
+#: ../calendar/libedata-cal/e-data-cal.c:935
 #, c-format
 msgid "Cannot retrieve calendar object path: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶è·¯å¾?ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
+#: ../calendar/libedata-cal/e-data-cal.c:960
 #, c-format
 msgid "Cannot retrieve calendar object list: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??ç?©ä»¶æ¸?å?®ï¼?%s"
 
 # mail/mail-ops.c:1872
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:990
+#: ../calendar/libedata-cal/e-data-cal.c:988
 #, c-format
 msgid "Could not retrieve attachment list: %s"
 msgstr "ä¸?è?½å??å¾?é??ä»¶æ¸?å?®ï¼?%s"
 
 # camel/providers/local/camel-mbox-store.c:110
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1016
+#: ../calendar/libedata-cal/e-data-cal.c:1014
 #, c-format
 msgid "Could not complete calendar query: %s"
 msgstr "ä¸?è?½å®?æ??è¡?äº?æ??æ?¥è©¢ï¼?%s"
 
 # mail/mail-ops.c:1872
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1041
+#: ../calendar/libedata-cal/e-data-cal.c:1039
 #, c-format
 msgid "Could not retrieve calendar time zone: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??æ??å??ï¼?%s"
 
 # calendar/gui/e-itip-control.c:883
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1066
+#: ../calendar/libedata-cal/e-data-cal.c:1064
 #, c-format
 msgid "Could not add calendar time zone: %s"
 msgstr "ä¸?è?½å? å?¥è¡?äº?æ??æ??å??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1085
+#: ../calendar/libedata-cal/e-data-cal.c:1083
 #, c-format
 msgid "Could not set default calendar time zone: %s"
 msgstr "ä¸?è?½è¨å®?é ?è¨ç??è¡?äº?æ??æ??å??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1108
+#: ../calendar/libedata-cal/e-data-cal.c:1106
 #, c-format
 msgid "Cannot retrieve calendar changes: %s"
 msgstr "ä¸?è?½å??å¾?è¡?äº?æ??è®?æ?´ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1139
+#: ../calendar/libedata-cal/e-data-cal.c:1137
 #, c-format
 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:368
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
 #, c-format
 msgid "Invalid URI"
 msgstr "ç?¡æ??ç?? URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:386
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
 #, 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:436
+#: ../calendar/libedata-cal/e-data-cal-factory.c:443
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ç?¡æ³?å¯¦é«?å??å¾?ç«¯ç¨?å¼?"
 
 # camel/camel-cipher-context.c:171
-#: ../camel/camel-cipher-context.c:204
+#: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´ç°½ç½²"
 
 # camel/camel-cipher-context.c:251
-#: ../camel/camel-cipher-context.c:217
+#: ../camel/camel-cipher-context.c:213
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´é©?è?ç°½ç½²"
 
 # camel/camel-cipher-context.c:294
-#: ../camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:229
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´å? å¯?"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:247
+#: ../camel/camel-cipher-context.c:243
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "é??ç¨®å? å¯?æ?¹å¼?ä¸?æ?¯æ?´è§£å¯?"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:260
+#: ../camel/camel-cipher-context.c:256
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "æ?¨ä¸?è?½å?¯å?¥é??ç¨®å? å¯?æ?¹å¼?ç??é??é?°"
 
 # camel/camel-cipher-context.c:336
-#: ../camel/camel-cipher-context.c:274
+#: ../camel/camel-cipher-context.c:270
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "æ?¨ä¸?è?½å?¯å?ºé??ç¨®å? å¯?æ?¹å¼?ç??é??é?°"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:815
+#: ../camel/camel-cipher-context.c:812
 msgid "Signing message"
 msgstr "æ£å?¨ç°½ç½²è¨?æ?¯"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:1056
+#: ../camel/camel-cipher-context.c:1053
 msgid "Encrypting message"
 msgstr "æ£å?¨å? å¯?è¨?æ?¯"
 
 # mail/mail-ops.c:603
-#: ../camel/camel-cipher-context.c:1183
+#: ../camel/camel-cipher-context.c:1180
 msgid "Decrypting message"
 msgstr "æ£å?¨è§£å¯?è¨?æ?¯"
 
 # mail/mail-ops.c:1728
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:178
 #, c-format
 msgid "Unable to create cache path"
 msgstr "ç?¡æ³?å»ºæ§?å¿«å??è·¯å¾?"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/camel-data-cache.c:494
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ç?¡æ³?ç§»é?¤å¿«å??é ?ç?®ï¼? %sï¼? %s"
@@ -1851,7 +1904,7 @@ msgstr "ç?¡æ³?ç§»é?¤å¿«å??é ?ç?®ï¼? %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/camel-data-wrapper.c:147
+#: ../camel/camel-data-wrapper.c:143
 #, c-format
 msgid "No stream available"
 msgstr "æ²?æ??å?¯ç?¨ç??ä¸²æµ?"
@@ -1888,24 +1941,24 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "è??ä¼ºæ??å?¨é??æ?°å??æ¥"
 
-#: ../camel/camel-disco-folder.c:67 ../camel/camel-offline-folder.c:83
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
 msgid "Downloading new messages for offline mode"
 msgstr "æ£å?¨ä¸?è¼?æ?°è¨?æ?¯ç?¨æ?¼é?¢ç·?æ¨¡å¼?"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../camel/camel-disco-folder.c:389
+#: ../camel/camel-disco-folder.c:398
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "æº?å??è³?æ??å¤¾ã??%sã??ä¾?é?¢ç·?ä½¿ç?¨"
 
-#: ../camel/camel-disco-folder.c:455 ../camel/camel-offline-folder.c:316
+#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
 msgid "Copy folder content locally for offline operation"
 msgstr "è¤?è£½è³?æ??å¤¾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
 
 # camel/camel-disco-store.c:271
 #: ../camel/camel-disco-store.c:420
-#: ../camel/providers/groupwise/camel-groupwise-store.c:232
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
 #: ../camel/providers/imap/camel-imap-store.c:1250
 #: ../camel/providers/imap/camel-imap-store.c:1771
 #: ../camel/providers/imap/camel-imap-store.c:2244
@@ -1917,10 +1970,10 @@ msgstr "è¤?è£½è³?æ??å¤¾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥"
 #: ../camel/providers/imapx/camel-imapx-folder.c:465
 #: ../camel/providers/imapx/camel-imapx-folder.c:505
 #: ../camel/providers/imapx/camel-imapx-folder.c:541
-#: ../camel/providers/imapx/camel-imapx-store.c:277
-#: ../camel/providers/imapx/camel-imapx-store.c:1299
-#: ../camel/providers/imapx/camel-imapx-store.c:1387
-#: ../camel/providers/imapx/camel-imapx-store.c:1422
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "æ?¨å¿?é ?æ?¼ç·?ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
@@ -1931,88 +1984,88 @@ msgstr "æ?¨å¿?é ?æ?¼ç·?ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: ../camel/camel-file-utils.c:719
+#: ../camel/camel-file-utils.c:722
 #, c-format
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:839 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:817 ../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:886
+#: ../camel/camel-filter-driver.c:864
 #, 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:1073 ../camel/camel-filter-driver.c:1082
+#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
 msgstr "å??æ¥è??ç??è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:866
-#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1620
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "å??æ??é??æ¿¾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: ../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1631
+#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "å?·è¡?é??æ¿¾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-filter-driver.c:643
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1256
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ç?¡æ³?é??å??æ??ç¨?å?¨è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:652
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1267
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ç?¡æ³?è??ç??æ??ç¨?å?¨è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:666
-#: ../camel/camel-filter-driver.c:1307
+#: ../camel/camel-filter-driver.c:1285
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "æ?¥æ?¶é?µä»¶ %d (%d%%)"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:1314 ../camel/camel-filter-driver.c:1336
+#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
 #, 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:1351 ../camel/camel-filter-driver.c:1456
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
 msgstr "å??æ¥è??ç??è³?æ??å¤¾"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: ../camel/camel-filter-driver.c:1356 ../camel/camel-filter-driver.c:1462
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "å®?æ??"
 
 # camel/camel-filter-driver.c:748
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1398
 #, 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:1438
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "å?¨ç¬¬ %d / %d å°?é?µä»¶å¤±æ??"
@@ -2043,8 +2096,8 @@ msgid "Error executing filter search: %s: %s"
 msgstr "å?·è¡?é??æ¿¾å?¨æ??å°?ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-folder-search.c:328
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
-#: ../camel/camel-folder-search.c:627
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2054,8 +2107,8 @@ msgstr ""
 "%s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
-#: ../camel/camel-folder-search.c:639
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2066,88 +2119,88 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) é??è¦?å?®ä¸?å¸?æ??å?¼çµ?æ??"
 
-#: ../camel/camel-folder-search.c:938
+#: ../camel/camel-folder-search.c:935
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ä¸?å??è¨±æ?¾å?¨ %s è£¡é?¢"
 
-#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
 #, 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:978
+#: ../camel/camel-folder-search.c:975
 #, 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:987
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) é??è¦?è³?æ??å¤¾è¨å®?"
 
 # mail/mail-ops.c:1649
-#: ../camel/camel-folder.c:220
+#: ../camel/camel-folder.c:216
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç??æ?°å??å?¾é?µä»¶"
 
 # mail/mail-ops.c:1649
-#: ../camel/camel-folder.c:244
+#: ../camel/camel-folder.c:240
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç?? ham é?µä»¶"
 
 # mail/mail-ops.c:1565
-#: ../camel/camel-folder.c:270
+#: ../camel/camel-folder.c:266
 #, c-format
 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:881
+#: ../camel/camel-folder.c:875
 #: ../camel/providers/local/camel-maildir-folder.c:293
 msgid "Moving messages"
 msgstr "æ£å?¨ç§»å??é?µä»¶"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:884
+#: ../camel/camel-folder.c:878
 msgid "Copying messages"
 msgstr "æ£å?¨è¤?è£½é?µä»¶"
 
 # camel/providers/pop3/camel-pop3-folder.c:296
-#: ../camel/camel-folder.c:3253
+#: ../camel/camel-folder.c:3247
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æ£å?¨å??å??é?µä»¶ã??%sã??"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:646 ../camel/camel-gpg-context.c:651
-#: ../camel/camel-gpg-context.c:1276
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "å?·è¡? gpg å¤±æ??ï¼? %s"
 
-#: ../camel/camel-gpg-context.c:651
-#: ../camel/providers/smtp/camel-smtp-transport.c:716
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../camel/camel-gpg-context.c:715
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2158,17 +2211,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:732
+#: ../camel/camel-gpg-context.c:728
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "è§£æ?? gpg userid æ??ç¤ºæ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:757 ../camel/camel-gpg-context.c:772
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "è§£æ?? gpg å¯?èª?è¦?æ±?æ??å¤±æ??ã??"
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2177,7 +2230,7 @@ msgstr ""
 "é??è¦? PIN æ??è?½ç?ºæ?¨ç??æ?ºæ?§å?¡è§£é??ï¼?\n"
 "ã??%sã??"
 
-#: ../camel/camel-gpg-context.c:797
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2187,7 +2240,7 @@ msgstr ""
 "ã??%sã??"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:803
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "GnuPG å?³å??å°?ã??%sã??æ?ªé ?æ??ç??è¦?æ±?"
@@ -2198,54 +2251,54 @@ msgstr "GnuPG å?³å??å°?ã??%sã??æ?ªé ?æ??ç??è¦?æ±?"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: ../camel/camel-gpg-context.c:832 ../camel/camel-net-utils.c:515
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
 #: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4908
-#: ../camel/providers/imapx/camel-imapx-server.c:4925
-#: ../camel/providers/imapx/camel-imapx-store.c:199
-#: ../camel/providers/nntp/camel-nntp-summary.c:402
-#: ../camel/providers/pop3/camel-pop3-folder.c:364
-#: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:504
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:506
 #: ../camel/providers/pop3/camel-pop3-store.c:487
 #: ../libedataserverui/e-book-auth-util.c:229
 #, c-format
 msgid "Cancelled"
 msgstr "å·²å??æ¶?"
 
-#: ../camel/camel-gpg-context.c:850
+#: ../camel/camel-gpg-context.c:846
 #, 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:862
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "å¾? GnuPG å?³å??æ??å¤?ç??å??æ??ï¼? %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/camel-gpg-context.c:993
+#: ../camel/camel-gpg-context.c:989
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ä¸?è?½å? å¯?é?µä»¶ï¼?æ²?æ??æ??ä¾?æ??æ??ç??æ?¶ä»¶è??ã??"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1539 ../camel/camel-smime-context.c:824
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
 msgid "Could not generate signing data: "
 msgstr "ç?¡æ³?ç?¢ç??ç°½ç« è³?æ??ï¼?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:1586 ../camel/camel-gpg-context.c:1786
-#: ../camel/camel-gpg-context.c:1896 ../camel/camel-gpg-context.c:2042
-#: ../camel/camel-gpg-context.c:2141 ../camel/camel-gpg-context.c:2189
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 msgid "Failed to execute gpg."
 msgstr "å?·è¡? gpg å¤±æ??ã??"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1666 ../camel/camel-gpg-context.c:1674
-#: ../camel/camel-gpg-context.c:1682 ../camel/camel-gpg-context.c:1701
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
 #: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
 #: ../camel/camel-smime-context.c:971
 #, c-format
@@ -2253,32 +2306,32 @@ msgid "Cannot verify message signature: Incorrect message format"
 msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç« ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1741
+#: ../camel/camel-gpg-context.c:1737
 msgid "Cannot verify message signature: "
 msgstr "ä¸?è?½é©?è?æ¤é?µä»¶ç??ç°½ç« ï¼?"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1862
+#: ../camel/camel-gpg-context.c:1858
 msgid "Could not generate encrypting data: "
 msgstr "ç?¡æ³?ç?¢ç??å? å¯?è³?æ??ï¼?"
 
-#: ../camel/camel-gpg-context.c:1915
+#: ../camel/camel-gpg-context.c:1911
 msgid "This is a digitally encrypted message part"
 msgstr "é??æ?¯æ?¸ä½?å??å? å¯?è¨?æ?¯é?¨ä»½"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1973 ../camel/camel-gpg-context.c:1982
-#: ../camel/camel-gpg-context.c:2005
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ä¸?è?½è§£å¯?æ¤é?µä»¶ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 
-#: ../camel/camel-gpg-context.c:1993
+#: ../camel/camel-gpg-context.c:1989
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "è§£å¯? MIME çµ?ä»¶æ??å¤±æ??ï¼?é??è¨?å??å®?é?¯èª¤"
 
-#: ../camel/camel-gpg-context.c:2082 ../camel/camel-smime-context.c:1255
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "å? å¯?å?§å®¹"
 
@@ -2397,18 +2450,18 @@ msgstr "å¯«å?¥é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 msgid "Error copying mail temp file: %s"
 msgstr "è¤?è£½é?µä»¶æ?«å?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../camel/camel-multipart-signed.c:286
+#: ../camel/camel-multipart-signed.c:327
 #, c-format
 msgid "No content available"
 msgstr "æ²?æ??å?¯ç?¨ç??å?§å®¹"
 
-#: ../camel/camel-multipart-signed.c:294
+#: ../camel/camel-multipart-signed.c:335
 #, c-format
 msgid "No signature available"
 msgstr "æ²?æ??å?¯ç?¨ç??ç°½ç« "
 
 # shell/e-storage.c:467
-#: ../camel/camel-multipart-signed.c:620
+#: ../camel/camel-multipart-signed.c:663
 #, c-format
 msgid "parse error"
 msgstr "è§£æ??é?¯èª¤"
@@ -2446,7 +2499,7 @@ msgid "Name lookup failed: %s"
 msgstr "æ??å°?å??ç¨±å¤±æ??ï¼? %s"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-offline-folder.c:193
+#: ../camel/camel-offline-folder.c:189
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "æ£å?¨å°?è³?æ??å¤¾ã??%sã??ä¸ç??é?µä»¶å??æ¥å?°ç£?ç¢?"
@@ -2488,7 +2541,7 @@ msgstr "ç?¡æ³?è¼?å?¥ %sï¼?æ¨¡çµ?å?§æ²?æ??å??å§?ç¢¼ã??"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:202
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "æ²?æ??é??è¨?å??å®?ã??%sã??ç??æ??ä¾?è??"
@@ -2541,12 +2594,12 @@ msgstr ""
 "%s"
 
 # camel/camel-sasl-cram-md5.c:35
-#: ../camel/camel-sasl-cram-md5.c:45
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 # camel/camel-sasl-cram-md5.c:37
-#: ../camel/camel-sasl-cram-md5.c:47
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2555,12 +2608,12 @@ msgstr ""
 "å??ã??"
 
 # camel/camel-sasl-digest-md5.c:43
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 # camel/camel-sasl-digest-md5.c:45
-#: ../camel/camel-sasl-digest-md5.c:60
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2569,167 +2622,167 @@ msgstr ""
 "å??ã??"
 
 # camel/camel-sasl-digest-md5.c:810
-#: ../camel/camel-sasl-digest-md5.c:821
+#: ../camel/camel-sasl-digest-md5.c:817
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ä¼ºæ??å?¨æ?¥å??é??é?·(>2048 ä½?å?? )"
 
 # camel/camel-sasl-digest-md5.c:819
-#: ../camel/camel-sasl-digest-md5.c:832
+#: ../camel/camel-sasl-digest-md5.c:828
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "ä¼ºæ??å?¨æ?¥å??ç?¡æ??\n"
 
 # camel/camel-sasl-digest-md5.c:825
-#: ../camel/camel-sasl-digest-md5.c:840
+#: ../camel/camel-sasl-digest-md5.c:836
 #, 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:875
+#: ../camel/camel-sasl-digest-md5.c:871
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸¦æ?ªå??å?«æ??æ¬?è³?æ??"
 
 # camel/camel-sasl-digest-md5.c:865
-#: ../camel/camel-sasl-digest-md5.c:896
+#: ../camel/camel-sasl-digest-md5.c:892
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ä¼ºæ??å?¨å??æ??å??å?«ä¸?å®?æ?´ç??æ??æ¬?è³?æ??"
 
 # camel/camel-sasl-digest-md5.c:875
-#: ../camel/camel-sasl-digest-md5.c:909
+#: ../camel/camel-sasl-digest-md5.c:905
 #, c-format
 msgid "Server response does not match"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸?ç¬¦"
 
-#: ../camel/camel-sasl-gssapi.c:85
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
 # camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ Kerberos 5 é©?è?é?£ç·?è?³ä¼ºæ??å?¨ã??"
 
-#: ../camel/camel-sasl-gssapi.c:128
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr "æ??ä¾?ç??è?ä»¶ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?è¾¨è?ã??"
 
-#: ../camel/camel-sasl-gssapi.c:133
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
 
-#: ../camel/camel-sasl-gssapi.c:136
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸å??å?«ç?¡æ??æ??ä¸?æ?¯æ?´ç??å??ç¨±é¡?å??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:140
+#: ../camel/camel-sasl-gssapi.c:141
 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:145
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token å??å?«ç?¡æ??ç??ç°½ç« ï¼?æ??è??ç?¡æ³?ç¢ºèª?ç??ç°½ç« ã??"
 
-#: ../camel/camel-sasl-gssapi.c:149
+#: ../camel/camel-sasl-gssapi.c:150
 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:154
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "æ??ä¾?ç??ç¶²è·¯ä½?ç½®è?å?¥æ??æ¨?æ?ªå??ç?§æ??æ??ç??ç¶²è·¯ä½?ç½®ã??"
 
-#: ../camel/camel-sasl-gssapi.c:157
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "å?¨ input_token å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "å?¨è?ä»¶å?·è¡?ä¸?è?´æ?§æª¢æ?¥å¤±æ??ã??"
 
-#: ../camel/camel-sasl-gssapi.c:163
+#: ../camel/camel-sasl-gssapi.c:164
 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:169 ../camel/camel-sasl-gssapi.c:309
-#: ../camel/camel-sasl-gssapi.c:353 ../camel/camel-sasl-gssapi.c:370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1249
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ä¾?è?ªä¼ºæ??å?¨ç??ä¸?è?¯è¨±å?¯å??æ??ã??"
 
 # mail/mail-config.glade.h:1
-#: ../camel/camel-sasl-gssapi.c:382
+#: ../camel/camel-sasl-gssapi.c:383
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ä¸?æ?¯æ?´ç??é¡?å??"
 
 # camel/camel-sasl-login.c:32
-#: ../camel/camel-sasl-login.c:39
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "ç?»å?¥"
 
 # camel/camel-sasl-login.c:34
 # camel/camel-sasl-plain.c:34
-#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨æ?®é??ç??å¯?ç¢¼é?£ç·?è?³ä¼ºæ??å?¨ã??"
 
 # camel/camel-sasl-login.c:127
-#: ../camel/camel-sasl-login.c:95
+#: ../camel/camel-sasl-login.c:91
 #, c-format
 msgid "Unknown authentication state."
 msgstr "æ?ªç?¥ç??é©?è¨¼ç??æ³?ã??"
 
-#: ../camel/camel-sasl-ntlm.c:41
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
 # camel/camel-sasl-kerberos4.c:42
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:39
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ NTLM / å®?å?¨å¯?ç¢¼é©?è?é?£ç·?è?³å?ºæ?¼ Windows ç??ä¼ºæ??å?¨ã??"
 
-#: ../camel/camel-sasl-plain.c:43
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP å??æ?¼ SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:44
 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:83
+#: ../camel/camel-sasl-popb4smtp.c:79
 msgid "POP Source URI"
 msgstr "POP ä¾?æº? URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:90
+#: ../camel/camel-sasl-popb4smtp.c:86
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "POP å??æ?¼ SMTP å??è¨±ä½¿ç?¨æ?ªç?¥ç??å?³è¼¸"
 
-#: ../camel/camel-sasl-popb4smtp.c:98
+#: ../camel/camel-sasl-popb4smtp.c:94
 #, c-format
 msgid "POP Before SMTP authentication using a non-POP source"
 msgstr "POP å??æ?¼ SMTP å??è¨±ä½¿ç?¨é?? POP ä¾?æº?"
@@ -2741,25 +2794,25 @@ msgid "Regular expression compilation failed: %s: %s"
 msgstr "æ£è¦?è¡¨ç¤ºå¼?ç·¨è¯å¤±æ??ï¼? %sï¼? %s"
 
 # camel/camel-service.c:154
-#: ../camel/camel-service.c:89
+#: ../camel/camel-service.c:85
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URLã??%sã??é??è¦? username å??ä»¶"
 
 # camel/camel-service.c:162
-#: ../camel/camel-service.c:93
+#: ../camel/camel-service.c:89
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URLã??%sã??é??è¦? host å??ä»¶"
 
 # camel/camel-service.c:170
-#: ../camel/camel-service.c:97
+#: ../camel/camel-service.c:93
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URLã??%sã??é??è¦? path å??ä»¶"
 
 # camel/camel-session.c:479
-#: ../camel/camel-session.c:260
+#: ../camel/camel-session.c:256
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2769,69 +2822,69 @@ msgstr ""
 "%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:757
+#: ../camel/camel-session.c:753
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "è«?è¼¸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?ç¢¼ã??"
 
 # camel/camel-smime-context.c:327
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1048
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "æ?¾ä¸?å?° '%s' ç??æ??è?"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "ç?¡æ³?å»ºæ§? CMS è¨?æ?¯"
 
-#: ../camel/camel-smime-context.c:381
+#: ../camel/camel-smime-context.c:377
 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:387
+#: ../camel/camel-smime-context.c:383
 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:394
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "ç?¡æ³?é??å?  CMS è³?æ??"
 
-#: ../camel/camel-smime-context.c:400
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "ç?¡æ³?å»ºæ§? CMS SignerInfo"
 
-#: ../camel/camel-smime-context.c:406
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "æ?¾ä¸?å?°æ??è?é??"
 
-#: ../camel/camel-smime-context.c:412
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr "ç?¡æ³?æ?°å¢? CMS SigningTime"
 
 # composer/e-msg-composer.c:1092
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ç??å? å¯?æ??è?ä¸?å?å?¨"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:463
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "ç?¡æ³?æ?°å¢? MS SMIMEEncKeyPrefs å±¬æ?§"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "ç?¡æ³?æ?°å¢?å? å¯?æ??è?"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
 msgstr "ç?¡æ³?æ?°å¢? CMS SignerInfo"
 
@@ -2839,61 +2892,61 @@ msgstr "ç?¡æ³?æ?°å¢? CMS SignerInfo"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:507
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr "æ?ªæ??å®?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "è?¯å¥½ç??ç°½ç« "
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "é?¯èª¤ç??ç°½ç« "
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "å?§å®¹å?¨å?³é??æ??è¢«ç«?æ?¹æ??è®?æ?´"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "æ?¾ä¸?å?°ç°½ç½²æ??è?"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "ç°½ç½²æ??è?ä¸?å??ä¿¡ä»»"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "æ?ªç?¥ç??ç°½ç« æ¼?ç®?æ³?"
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "ä¸?æ?¯æ?´é??ç¨®ç°½ç« æ¼?ç®?æ³?"
 
 # mail/mail-config.glade.h:74
-#: ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "æ ¼å¼?ä¸?è?¯ç??ç°½ç« "
 
 # shell/e-storage.c:467
-#: ../camel/camel-smime-context.c:525
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "è§£æ??é?¯èª¤"
 
-#: ../camel/camel-smime-context.c:568
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "ç°½ç« ä¸æ²?æ??è¢«ç°½ç½²ç??è³?æ??"
 
-#: ../camel/camel-smime-context.c:573
+#: ../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:586 ../camel/camel-smime-context.c:597
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 
@@ -2904,32 +2957,32 @@ 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:604 ../camel/camel-smime-context.c:608
+#: ../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:618 ../camel/camel-smime-context.c:623
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "æ??è?å?¯å?¥å¤±æ??"
 
-#: ../camel/camel-smime-context.c:633
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "é??æ??è?è¨?æ?¯ï¼?ç?¡æ³?é©?è?æ??è?"
 
-#: ../camel/camel-smime-context.c:636
+#: ../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:640
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "æ?¾ä¸?å?°ç°½ç« æ??è¦?"
 
 # mail/mail-config.glade.h:72
-#: ../camel/camel-smime-context.c:656
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "ç°½ç½²è??ï¼? %s<%s>ï¼? %s\n"
@@ -3003,7 +3056,7 @@ msgstr "S/MIME è§£å¯?ï¼?æ?¾ä¸?å?°å? å¯?å?§å®¹"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:2184
+#: ../camel/camel-store.c:2181
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨"
@@ -3014,113 +3067,115 @@ 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:2375 ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:2372 ../camel/camel-store.c:2382
+#: ../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:2378 ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2386
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:2811
+#: ../camel/camel-store.c:2829
 #, 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:2938 ../camel/camel-vee-store.c:367
+#: ../camel/camel-store.c:2956 ../camel/camel-vee-store.c:367
 #: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/camel-store.c:3079 ../camel/camel-vee-store.c:417
-#: ../camel/providers/local/camel-maildir-store.c:662
+#: ../camel/camel-store.c:3097 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:668
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 
-#: ../camel/camel-tcp-stream-raw.c:747 ../camel/camel-tcp-stream-raw.c:758
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ä»£ç??ä¼ºæ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS4"
 
-#: ../camel/camel-tcp-stream-raw.c:769
+#: ../camel/camel-tcp-stream-raw.c:771
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ä»£ç??ä¼ºæ??å?¨ä¸»æ©?æ??çµ?æ??å??ç??è¦?æ±?ï¼?ä»£ç¢¼ %d"
 
-#: ../camel/camel-tcp-stream-raw.c:865 ../camel/camel-tcp-stream-raw.c:871
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ä»£ç??ä¼ºæ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS5"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: ../camel/camel-tcp-stream-raw.c:877
+#: ../camel/camel-tcp-stream-raw.c:879
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "æ?¾ä¸?å?°å??é?©ç??é©?è?é¡?å??ï¼?ä»£ç¢¼ 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:889
+#: ../camel/camel-tcp-stream-raw.c:891
 msgid "General SOCKS server failure"
 msgstr "ä¸?è?¬æ?§ SOCKS ä¼ºæ??å?¨å¤±æ??"
 
-#: ../camel/camel-tcp-stream-raw.c:890
+#: ../camel/camel-tcp-stream-raw.c:892
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS ä¼ºæ??å?¨ç??è¦?å??ä¸?å??è¨±é?£ç·?"
 
-#: ../camel/camel-tcp-stream-raw.c:891
+#: ../camel/camel-tcp-stream-raw.c:893
 msgid "Network is unreachable from SOCKS server"
 msgstr "ç¶²è·¯ç?¡æ³?é??é?? SOCKS ä¼ºæ??å?¨å?°é??"
 
-#: ../camel/camel-tcp-stream-raw.c:892
+#: ../camel/camel-tcp-stream-raw.c:894
 msgid "Host is unreachable from SOCKS server"
 msgstr "ä¸»æ©?ç?¡æ³?é??é?? SOCKS ä¼ºæ??å?¨å?°é??"
 
 # camel/camel-remote-store.c:252
-#: ../camel/camel-tcp-stream-raw.c:893
+#: ../camel/camel-tcp-stream-raw.c:895
 msgid "Connection refused"
 msgstr "é?£ç·?è¢«æ??çµ?"
 
-#: ../camel/camel-tcp-stream-raw.c:894
+#: ../camel/camel-tcp-stream-raw.c:896
 msgid "Time-to-live expired"
 msgstr "è¶?é?? Time-to-live æ??é??"
 
 # shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:895
+#: ../camel/camel-tcp-stream-raw.c:897
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS ä¼ºæ??å?¨ä¸?æ?¯æ?´æ??ä»¤"
 
 # shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:896
+#: ../camel/camel-tcp-stream-raw.c:898
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS ä¼ºæ??å?¨ä¸?æ?¯æ?´ä½?å??é¡?å??"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/camel-tcp-stream-raw.c:897
+#: ../camel/camel-tcp-stream-raw.c:899
 msgid "Unknown error from SOCKS server"
 msgstr "ä¾?è?ª SOCKS ä¼ºæ??å?¨ç??ä¸?æ??é?¯èª¤"
 
-#: ../camel/camel-tcp-stream-raw.c:930
+#: ../camel/camel-tcp-stream-raw.c:932
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "å¾? SOCKS ä¼ºæ??å?¨å??å¾?ä¸?æ??ç??ä½?å??é¡?å??"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-tcp-stream-raw.c:948
+#: ../camel/camel-tcp-stream-raw.c:950
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ä¾?è?ª SOCKS ä¼ºæ??å?¨ç??ä¸?å®?æ?´å??è¦?"
 
-#: ../camel/camel-tcp-stream-raw.c:968
+#: ../camel/camel-tcp-stream-raw.c:970
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ä¸»æ©?å??ç¨±å¤ªé?·ï¼?æ??å¤? 255 å?å??ï¼?"
@@ -3129,12 +3184,12 @@ msgstr "ä¸»æ©?å??ç¨±å¤ªé?·ï¼?æ??å¤? 255 å?å??ï¼?"
 # camel/providers/imap/camel-imap-store.c:433
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1000 ../camel/camel-tcp-stream-raw.c:1010
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "å¾?ä»£ç??ä¼ºæ??å?¨å?³å??ç?¡æ??ç??å??è¦?"
 
-#: ../camel/camel-tcp-stream-ssl.c:457
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -3147,18 +3202,18 @@ msgstr ""
 "æ??ç´?æª?:              %s\n"
 "ç°½ç« :              %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "è?¯å¥½"
 
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:459
 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:467
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -3173,7 +3228,7 @@ msgstr ""
 "\n"
 "æ?¨æ?³è¦?æ?¥å??å??ï¼?"
 
-#: ../camel/camel-tcp-stream-ssl.c:511
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -3182,7 +3237,7 @@ msgstr ""
 "æ??è?å??é¡?ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:563
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -3191,7 +3246,7 @@ msgstr ""
 "ä¸?æ£ç¢ºç??æ??è?ç¶²å??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:581
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -3200,7 +3255,7 @@ msgstr ""
 "æ??è?å·²é?¾æ??ï¼? %s\n"
 "ç?¼ç?§è??ï¼? %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:598
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -3210,25 +3265,25 @@ msgstr ""
 "ç?¼ç?§è??ï¼? %s"
 
 # camel/camel-url.c:289
-#: ../camel/camel-url.c:314
+#: ../camel/camel-url.c:316
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "ç?¡æ³?è§£æ?? URLã??%sã??"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/camel-vee-folder.c:1251 ../camel/camel-vee-folder.c:1414
+#: ../camel/camel-vee-folder.c:1235 ../camel/camel-vee-folder.c:1398
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ä¸?è?½è¤?è£½æ??ç§»å??é?µä»¶å?°è??æ?¬è³?æ??å¤¾ä¸"
 
 # camel/camel-vee-folder.c:451
-#: ../camel/camel-vee-folder.c:1287
+#: ../camel/camel-vee-folder.c:1271
 #, c-format
 msgid "No such message %s in %s"
 msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
 
 # shell/e-shell-importer.c:384
-#: ../camel/camel-vee-folder.c:1355
+#: ../camel/camel-vee-folder.c:1339
 #, c-format
 msgid "Error storing '%s': "
 msgstr "å?²å?ã??%sã??ç?¼ç??é?¯èª¤ï¼?"
@@ -3262,42 +3317,42 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "ç?¡æ³?è¤?è£½è¨?æ?¯å?°ã??å??å?¾é?µä»¶ã??è³?æ??å¤¾"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:959
-#: ../camel/providers/imap/camel-imap-folder.c:390
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "ç?¡æ³?è¼?å?¥ %s ç??æ??è¦?"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1035
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "æª¢æ?¥å?ªé?¤ç??é?µä»¶ %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1520
-#: ../camel/providers/groupwise/camel-groupwise-store.c:672
-#: ../camel/providers/groupwise/camel-groupwise-store.c:803
-#: ../camel/providers/imap/camel-imap-folder.c:3919
-#: ../camel/providers/imap/camel-imap-folder.c:4001
-#: ../camel/providers/imapx/camel-imapx-server.c:3889
-#: ../camel/providers/imapx/camel-imapx-server.c:4020
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
 
 # camel/camel-movemail.c:306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1992
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2046
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2710
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2720
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
 #, c-format
 msgid "Could not get message"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ã??"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2430
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2480
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "ä¸?è?½å°?é?µä»¶å?²å?è?³è³?æ??å¤¾ã??%sã??ï¼?%s"
@@ -3309,7 +3364,7 @@ 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:2466
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ç?¡æ³?å»ºæ§?é?µä»¶ï¼? %s"
@@ -3321,7 +3376,7 @@ 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/groupwise/camel-groupwise-folder.c:2646
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3333,7 +3388,7 @@ 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:2646
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
 #: ../camel/providers/local/camel-maildir-folder.c:100
 #: ../camel/providers/local/camel-maildir-folder.c:307
 #: ../camel/providers/local/camel-mbox-folder.c:117
@@ -3349,19 +3404,19 @@ 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:2665
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:418
-#: ../camel/providers/pop3/camel-pop3-folder.c:455
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
 #, c-format
 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:2683
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2693
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2897
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
 #, c-format
 msgid "This message is not available in offline mode."
 msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨ã??"
@@ -3409,6 +3464,8 @@ msgstr "é?¸é ?"
 
 # camel/providers/imap/camel-imap-provider.c:57
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "å¥?ç?¨é??æ¿¾å?¨è?³æ¤ä¼ºæ??å?¨æ?¶ä»¶å?£ç??æ?°é?µä»¶(_A)"
 
@@ -3466,72 +3523,72 @@ msgid ""
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ GroupWise ä¼ºæ??å?¨ã??"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
 #, 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:209
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
 #: ../camel/providers/imap/camel-imap-store.c:801
-#: ../camel/providers/imapx/camel-imapx-server.c:3100
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
 #, c-format
 msgid "You did not enter a password."
 msgstr "æ?¨æ²?æ??è¼¸å?¥å¯?ç¢¼ã??"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:332
+#: ../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:563
+#: ../camel/providers/groupwise/camel-groupwise-store.c:556
 #: ../camel/providers/imap/camel-imap-store.c:1808
 #: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imapx/camel-imapx-store.c:342
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1224
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
 #, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "å?¨é?¢ç·?æ¨¡å¼?ä¸ä¸?è?½å»ºæ§? GroupWise è³?æ??å¤¾ã??"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
 #, c-format
 msgid "Cannot create a special system folder"
 msgstr "ä¸?è?½å»ºç«?ç?¹æ®?ç??ç³»çµ±è³?æ??å¤¾"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1243
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
 #: ../camel/providers/imap/camel-imap-store.c:1886
 #: ../camel/providers/imap/camel-imap-store.c:2323
-#: ../camel/providers/imapx/camel-imapx-store.c:1341
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
 #, 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:1328
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1353
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
 #, 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:1387
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise ä¼ºæ??å?¨ %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1389
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s ç?? GroupWise æ??å??æ?¼ %s"
@@ -3639,25 +3696,25 @@ 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:291
+#: ../camel/providers/imap/camel-imap-folder.c:292
 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:367
+#: ../camel/providers/imap/camel-imap-folder.c:369
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é?? %sï¼?%s"
 
 # mail/mail-ops.c:1649
-#: ../camel/providers/imap/camel-imap-folder.c:990
-#: ../camel/providers/imapx/camel-imapx-server.c:3933
+#: ../camel/providers/imap/camel-imap-folder.c:992
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "æ??æ?? %s ä¸è®?æ?´é??ç??é?µä»¶"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/providers/imap/camel-imap-folder.c:3326
+#: ../camel/providers/imap/camel-imap-folder.c:3369
 msgid "Unable to retrieve message: "
 msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
 
@@ -3668,8 +3725,8 @@ 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/imap/camel-imap-folder.c:3361
-#: ../camel/providers/imapx/camel-imapx-server.c:5217
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5193
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3677,33 +3734,33 @@ 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:3362
-#: ../camel/providers/imapx/camel-imapx-server.c:5218
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5194
 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:3437
-#: ../camel/providers/imap/camel-imap-folder.c:4332
-#: ../camel/providers/nntp/camel-nntp-folder.c:407
+#: ../camel/providers/imap/camel-imap-folder.c:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
 #, c-format
 msgid "This message is not currently available"
 msgstr "é??å°?é?µä»¶ç?®å??ä»?æ?ªå?¯ç?¨"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4133
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "ä¸?å®?æ?´ç??ä¼ºæ??å?¨å??æ??ï¼?æ?ªæ??ä¾?ä»»ä½?è³?è¨?çµ¦è¨?æ?¯ %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4143
+#: ../camel/providers/imap/camel-imap-folder.c:4186
 #, 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:4372
+#: ../camel/providers/imap/camel-imap-folder.c:4415
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "å?¨ FETCH ç??å??æ??å?§æ?¾ä¸?å?°é?µä»¶ç??å?§æ??ã??"
@@ -3791,12 +3848,6 @@ msgstr "è¦?è??ä¼ºæ??å?¨æ??ä¾?ä¹?è³?æ??å¤¾ç??å?½å??ç©ºé??(_V)"
 msgid "Names_pace:"
 msgstr "å?½å??ç©ºé??(_P):"
 
-# camel/providers/imap/camel-imap-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-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:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
@@ -3829,7 +3880,7 @@ msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç°¡æ??ç??å¯?ç¢¼é?£ç·?è?³ IMAP ä¼ºæ??å?¨ã??"
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
 #: ../camel/providers/imap/camel-imap-store.c:243
-#: ../camel/providers/nntp/camel-nntp-store.c:313
+#: ../camel/providers/nntp/camel-nntp-store.c:342
 #: ../camel/providers/pop3/camel-pop3-store.c:135
 #: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
@@ -3837,7 +3888,7 @@ msgid "Could not connect to %s: %s"
 msgstr "ç?¡æ³?é?£æ?¥å?° %sï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-store.c:244
-#: ../camel/providers/nntp/camel-nntp-store.c:314
+#: ../camel/providers/nntp/camel-nntp-store.c:343
 #: ../camel/providers/pop3/camel-pop3-store.c:136
 #: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
@@ -3846,7 +3897,7 @@ msgstr "SSL ç?¡æ³?ä½¿ç?¨"
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
 #: ../camel/providers/imap/camel-imap-store.c:264
-#: ../camel/providers/nntp/camel-nntp-store.c:333
+#: ../camel/providers/nntp/camel-nntp-store.c:362
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "ç?¡æ³?é?£æ?¥å?° %sï¼?"
@@ -3856,15 +3907,15 @@ msgstr "ç?¡æ³?é?£æ?¥å?° %sï¼?"
 #: ../camel/providers/imap/camel-imap-store.c:390
 #: ../camel/providers/imap/camel-imap-store.c:397
 #: ../camel/providers/imap/camel-imap-store.c:424
-#: ../camel/providers/imapx/camel-imapx-server.c:2942
-#: ../camel/providers/imapx/camel-imapx-server.c:2982
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
 #, 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:371
-#: ../camel/providers/imapx/camel-imapx-server.c:2943
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
 #: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "STARTTLS not supported"
 msgstr "ä¸?æ?¯æ?´ STARTTLS"
@@ -3872,7 +3923,7 @@ msgstr "ä¸?æ?¯æ?´ STARTTLS"
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #: ../camel/providers/imap/camel-imap-store.c:391
-#: ../camel/providers/imapx/camel-imapx-server.c:2983
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
 msgid "SSL negotiations failed"
 msgstr "SSL å??å??å¤±æ??"
 
@@ -3883,7 +3934,7 @@ msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
 
 # camel/camel-remote-store.c:252
 #: ../camel/providers/imap/camel-imap-store.c:549
-#: ../camel/providers/imapx/camel-imapx-server.c:2770
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
 #, c-format
 msgid "Connection cancelled"
 msgstr "é?£ç·?å·²å??æ¶?"
@@ -3891,14 +3942,14 @@ msgstr "é?£ç·?å·²å??æ¶?"
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
 #: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imapx/camel-imapx-server.c:2775
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ç?¡æ³?ä»¥æ??ä»¤ã??%sã??é?£ç·?ï¼? %s"
 
 # camel/providers/imap/camel-imap-store.c:456
 #: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imapx/camel-imapx-server.c:3056
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %s"
@@ -3906,7 +3957,7 @@ 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:752
-#: ../camel/providers/imapx/camel-imapx-server.c:3068
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
 #: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid "No support for authentication type %s"
@@ -3914,7 +3965,7 @@ msgstr "ä¸?æ?¯æ?´é©?è?é¡?å?? %s"
 
 # camel/providers/imap/camel-imap-store.c:531
 #: ../camel/providers/imap/camel-imap-store.c:836
-#: ../camel/providers/imapx/camel-imapx-server.c:3144
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3927,14 +3978,14 @@ msgstr ""
 
 # camel/providers/smtp/camel-smtp-transport.c:534
 #: ../camel/providers/imap/camel-imap-store.c:997
-#: ../camel/providers/imapx/camel-imapx-store.c:183
+#: ../camel/providers/imapx/camel-imapx-store.c:182
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s"
 
 # camel/camel-remote-store.c:195
 #: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imapx/camel-imapx-store.c:184
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
@@ -3943,20 +3994,20 @@ msgstr "%s ç?? IMAP æ??å??æ?¼ %s"
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
 #: ../camel/providers/imap/camel-imap-store.c:1367
 #: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imapx/camel-imapx-store.c:372
-#: ../camel/providers/imapx/camel-imapx-store.c:794
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
 #: ../camel/providers/local/camel-maildir-folder.c:409
 #: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:609
 #: ../camel/providers/local/camel-maildir-store.c:615
-#: ../camel/providers/local/camel-maildir-store.c:663
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:669
 #: ../camel/providers/local/camel-spool-store.c:289
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
 #: ../camel/providers/imap/camel-imap-store.c:1822
 #: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imapx/camel-imapx-store.c:1320
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3966,7 +4017,7 @@ msgstr "è³?æ??å¤¾å??ç¨±ã??%sã??ç?¡æ??ï¼?å? ç?ºå®?å??æ?¬å?å??ã??%cã??"
 # camel/providers/local/camel-local-store.c:158
 #: ../camel/providers/imap/camel-imap-store.c:1939
 #: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:413
+#: ../camel/providers/local/camel-mbox-store.c:407
 #: ../camel/providers/local/camel-mh-store.c:504
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
@@ -3974,7 +4025,7 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨ã??"
 
 # camel/providers/local/camel-mbox-summary.c:879
 #: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imapx/camel-imapx-store.c:1331
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ä¸?æ??ç??æ¯?è³?æ??å¤¾ï¼? %s"
@@ -4030,19 +4081,19 @@ msgid "IMAP+"
 msgstr "IMAP"
 
 # camel/camel-movemail.c:256
-#: ../camel/providers/imapx/camel-imapx-server.c:1410
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
 msgid "Error writing to cache stream: "
 msgstr "å¯«å?¥å¿«å??ä¸²æµ?æ??ç?¼ç??é?¯èª¤ï¼?"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imapx/camel-imapx-server.c:2092
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
 #, c-format
 msgid "Not authenticated"
 msgstr "å°?æ?ªé©?è?"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imapx/camel-imapx-server.c:2865
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
 #, c-format
 msgid "Could not connect to %s (port %s): "
 msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
@@ -4051,7 +4102,7 @@ msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
 # 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:3329
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
 msgid "Closing tmp stream failed: "
 msgstr "ç?¡æ³?é??é?? tmp ä¸²æµ?ï¼?"
 
@@ -4062,26 +4113,15 @@ msgstr "ç?¡æ³?é??é?? tmp ä¸²æµ?ï¼?"
 # 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:5365
-#, c-format
-msgid "Cannot create spool file: %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:5381
+#: ../camel/providers/imapx/camel-imapx-server.c:5343
+#: ../camel/providers/imapx/camel-imapx-server.c:5358
 msgid "Cannot create spool file: "
 msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../camel/providers/imapx/camel-imapx-store.c:1136
-#: ../camel/providers/nntp/camel-nntp-store.c:1610
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, c-format
 msgid "No such folder: %s"
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ï¼? %s"
@@ -4096,33 +4136,33 @@ msgstr "ä¾?æº?ä¸²æµ?å?³å??ç?¡è³?æ??"
 msgid "Source stream unavailable"
 msgstr "ä¾?æº?ä¸²æµ?ç?¡æ³?ä½¿ç?¨"
 
-#: ../camel/providers/local/camel-local-folder.c:182
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 # camel/providers/local/camel-mbox-folder.c:203
-#: ../camel/providers/local/camel-local-folder.c:192
-#: ../camel/providers/local/camel-local-folder.c:201
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "ä¿¡ç®±ï¼?%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:210
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../camel/providers/local/camel-local-folder.c:469
+#: ../camel/providers/local/camel-local-folder.c:466
 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:685
+#: ../camel/providers/local/camel-local-folder.c:700
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -4199,7 +4239,7 @@ msgstr "æ¨?æº? Unix mbox æ??ç¨?å?¨ç?®é??"
 #: ../camel/providers/local/camel-local-store.c:174
 #: ../camel/providers/local/camel-local-store.c:319
 #: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:532
+#: ../camel/providers/local/camel-mbox-store.c:526
 #: ../camel/providers/local/camel-spool-store.c:318
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -4247,14 +4287,14 @@ msgstr "ç?¡æ³?é??æ?°å?½å??ã??%sã??ï¼?%s "
 
 # camel/providers/local/camel-local-store.c:289
 #: ../camel/providers/local/camel-local-store.c:498
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:695
 #, 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:526
-#: ../camel/providers/local/camel-mbox-store.c:730
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??å¤¾ä¸ç¹¼æª?æ¡?ã??%sã??ï¼?%s"
@@ -4299,7 +4339,7 @@ msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«ã??.ã??"
 
 #: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:680
+#: ../camel/providers/local/camel-maildir-store.c:686
 #, c-format
 msgid "Folder %s already exists"
 msgstr "è³?æ??å¤¾ %s å·²å?å?¨"
@@ -4308,8 +4348,8 @@ msgstr "è³?æ??å¤¾ %s å·²å?å?¨"
 # camel/providers/local/camel-local-store.c:158
 #: ../camel/providers/local/camel-maildir-store.c:191
 #: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:381
-#: ../camel/providers/local/camel-mbox-store.c:395
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
@@ -4317,7 +4357,7 @@ 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:206
-#: ../camel/providers/local/camel-mbox-store.c:347
+#: ../camel/providers/local/camel-mbox-store.c:341
 #: ../camel/providers/local/camel-mh-store.c:464
 #, c-format
 msgid "Cannot get folder '%s': %s"
@@ -4327,7 +4367,7 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?%s"
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
 #: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-mbox-store.c:351
 #: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
@@ -4357,7 +4397,7 @@ 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:508
-#: ../camel/providers/local/camel-maildir-store.c:819
+#: ../camel/providers/local/camel-maildir-store.c:825
 #: ../camel/providers/local/camel-spool-store.c:143
 #: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
@@ -4366,33 +4406,33 @@ 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:671
+#: ../camel/providers/local/camel-maildir-store.c:677
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??å¤¾ï¼?%sï¼?è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«ã??.ã??"
 
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: ../camel/providers/local/camel-maildir-summary.c:435
-#: ../camel/providers/local/camel-maildir-summary.c:565
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, 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:556
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "æª¢æ?¥è³?æ??å¤¾ç??ä¸?è?´æ?§"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/local/camel-maildir-summary.c:649
+#: ../camel/providers/local/camel-maildir-summary.c:650
 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:742
+#: ../camel/providers/local/camel-maildir-summary.c:743
 #: ../camel/providers/local/camel-mbox-summary.c:468
 #: ../camel/providers/local/camel-mbox-summary.c:690
 #: ../camel/providers/local/camel-mbox-summary.c:826
@@ -4425,41 +4465,41 @@ msgid "Cannot create folder lock on %s: %s"
 msgstr "ä¸?è?½å»ºæ§?è³?æ??å¤¾é??å®? %s ï¼? %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mbox-store.c:540
+#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
 #, 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:406
+#: ../camel/providers/local/camel-mbox-store.c:400
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ã??%sã??ï¼?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/local/camel-mbox-store.c:556
+#: ../camel/providers/local/camel-mbox-store.c:550
 #, 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:572
+#: ../camel/providers/local/camel-mbox-store.c:566
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ä¸?è?½å??å¾?è³?æ??å¤¾ï¼?%sï¼?%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:574
+#: ../camel/providers/local/camel-mbox-store.c:568
 msgid "Folder already exists"
 msgstr "è³?æ??å¤¾å·²å?å?¨"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:615
-#: ../camel/providers/local/camel-mbox-store.c:628
-#: ../camel/providers/local/camel-mbox-store.c:657
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -4470,38 +4510,38 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:638
+#: ../camel/providers/local/camel-mbox-store.c:632
 #, 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:647
+#: ../camel/providers/local/camel-mbox-store.c:641
 #, 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:673
-#: ../camel/providers/local/camel-mbox-store.c:687
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "ç?¡æ³?å?ªé?¤è³?æ??å¤¾æ??è¦?æª?æ¡?ã??%sã??ï¼? %s"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: ../camel/providers/local/camel-mbox-store.c:767
+#: ../camel/providers/local/camel-mbox-store.c:761
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "æ?°ç??è³?æ??å¤¾å??ç¨±ä¸?å??æ³?ã??"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-store.c:782
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, 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:865
+#: ../camel/providers/local/camel-mbox-store.c:859
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "ç?¡æ³?å°? '%s' é??æ?°å?½å??æ?? %sï¼?%s"
@@ -4628,7 +4668,7 @@ 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:230
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "ä¸?è?½é??å?? MH ç?®é??è·¯å¾?ï¼? %sï¼? %s"
@@ -4741,9 +4781,9 @@ msgstr ""
 "ç?¡æ³?å??æ¥æ??ç¨?è³?æ??å¤¾ %sï¼?%s\n"
 "è³?æ??å¤¾å?¯è?½æ??æ¯?ï¼?è¤?æ?¬å?²å?æ?¼ã??%sã??"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:200
-#: ../camel/providers/nntp/camel-nntp-folder.c:279
-#: ../camel/providers/nntp/camel-nntp-folder.c:393
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%s"
@@ -4755,12 +4795,12 @@ msgstr "å?§é?¨é?¯èª¤ï¼?UID æ ¼å¼?ç?¡æ??ï¼?%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/nntp/camel-nntp-folder.c:241
-#: ../camel/providers/nntp/camel-nntp-folder.c:245
-#: ../camel/providers/pop3/camel-pop3-folder.c:369
-#: ../camel/providers/pop3/camel-pop3-folder.c:434
-#: ../camel/providers/pop3/camel-pop3-folder.c:446
-#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:697
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
@@ -4769,9 +4809,9 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼? %s"
 # 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:477
-#: ../camel/providers/nntp/camel-nntp-folder.c:483
-#: ../camel/providers/nntp/camel-nntp-folder.c:530
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr "å¼µè²¼å¤±æ??ï¼?%s"
@@ -4780,17 +4820,17 @@ msgstr "å¼µè²¼å¤±æ??ï¼?%s"
 # 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:525
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
 msgid "Posting failed: "
 msgstr "å¼µè²¼å¤±æ??ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:554
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
 #, 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:574
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "æ?¨ç?¡æ³?å¾? NNTP è³?æ??å¤¾è¤?è£½è¨?æ?¯ï¼?"
@@ -4822,36 +4862,36 @@ msgid ""
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ç´?æ??å?ç??å¯?ç¢¼é©?è? NNTP ä¼ºæ??å?¨ã??"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../camel/providers/nntp/camel-nntp-store.c:77
+#: ../camel/providers/nntp/camel-nntp-store.c:73
 #, 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:89
+#: ../camel/providers/nntp/camel-nntp-store.c:85
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "ç?¡æ³?é©?è?ä¼ºæ??å?¨ï¼?%s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/nntp/camel-nntp-store.c:346
+#: ../camel/providers/nntp/camel-nntp-store.c:375
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "ç?¡æ³?è®?å?? %s ç??æ¡è¿?è¾ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:359
+#: ../camel/providers/nntp/camel-nntp-store.c:388
 #, 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:527
+#: ../camel/providers/nntp/camel-nntp-store.c:582
 #, c-format
 msgid "USENET News via %s"
 msgstr "ç¶?ç?± %s ç?? USENET æ?°è??"
 
 # mail/mail-ops.c:1755
-#: ../camel/providers/nntp/camel-nntp-store.c:1045
+#: ../camel/providers/nntp/camel-nntp-store.c:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4862,7 +4902,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1160
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4873,7 +4913,7 @@ msgstr ""
 "\n"
 "æ²?æ??é¡?ä¼¼ç??æ?°è??ç¾¤çµ?ã??é?¸å??ç??é ?ç?®å?¯è?½æ?¯ç?¶ä»£è³?æ??å¤¾ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1202
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4884,48 +4924,48 @@ msgstr ""
 "\n"
 "æ?°è??ç¾¤çµ?ä¸?å?å?¨ï¼?"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1235
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
 #, 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:1251
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "æ?¨ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??é??æ?°å?½å??è³?æ??å¤¾ã??"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1268
+#: ../camel/providers/nntp/camel-nntp-store.c:1323
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "æ?¨ç?¡æ³?å?¨ã??æ?°è??ã??å?²å?å??ç§»é?¤è³?æ??å¤¾ï¼?æ?¹ä»¥å??æ¶?è¨?é?±ã??"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/nntp/camel-nntp-store.c:1479
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
 msgid "NNTP Command failed: "
 msgstr "NNTP æ??ä»¤å¤±æ??ï¼?"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../camel/providers/nntp/camel-nntp-store.c:1553
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, c-format
 msgid "Not connected."
 msgstr "æ?ªé?£ç·?ã??"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/nntp/camel-nntp-summary.c:234
-#: ../camel/providers/nntp/camel-nntp-summary.c:345
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%sï¼?æ??æ??æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:246
+#: ../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:362
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "æ¨?é¡?å?³ä¾?æ??å¤?ç??ä¼ºæ??å?¨å??æ??ï¼?%s"
@@ -4934,48 +4974,48 @@ msgstr "æ¨?é¡?å?³ä¾?æ??å¤?ç??ä¼ºæ??å?¨å??æ??ï¼?%s"
 # 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:407
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "ä½?æ¥å¤±æ??ï¼? %s"
 
 # camel/providers/pop3/camel-pop3-folder.c:292
 #: ../camel/providers/pop3/camel-pop3-folder.c:277
-#: ../camel/providers/pop3/camel-pop3-folder.c:334
+#: ../camel/providers/pop3/camel-pop3-folder.c:336
 #, c-format
 msgid "No message with UID %s"
 msgstr "æ²?æ??é?µä»¶å?·æ??é??å?? UID %s"
 
 # camel/providers/pop3/camel-pop3-folder.c:296
-#: ../camel/providers/pop3/camel-pop3-folder.c:342
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "æ?¥æ?¶ POP é?µä»¶ %d"
 
 # camel/camel-sasl-login.c:127
-#: ../camel/providers/pop3/camel-pop3-folder.c:447
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
 msgid "Unknown reason"
 msgstr "ä¸?æ??ç??å??å? "
 
 # camel/providers/pop3/camel-pop3-folder.c:149
-#: ../camel/providers/pop3/camel-pop3-folder.c:486
+#: ../camel/providers/pop3/camel-pop3-folder.c:488
 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:509
+#: ../camel/providers/pop3/camel-pop3-folder.c:511
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "ä¸?è?½å??å¾? POP æ??è¦?ï¼? %s"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:561
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
 msgid "Expunging old messages"
 msgstr "æ¸?ç©ºè??ç??é?µä»¶"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:575
+#: ../camel/providers/pop3/camel-pop3-folder.c:577
 msgid "Expunging deleted messages"
 msgstr "æ¸?ç©ºå?ªé?¤ç??é?µä»¶"
 
@@ -5155,18 +5195,18 @@ msgid "POP3 server for %s on %s"
 msgstr "%s å?¨ %s ç?? POP3 ä¼ºæ??å?¨"
 
 # camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:694
+#: ../camel/providers/pop3/camel-pop3-store.c:693
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "ç?¡æ³?é?£ç·?å?° POP ä¼ºæ??å?¨ %s"
 
 # camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:721
+#: ../camel/providers/pop3/camel-pop3-store.c:720
 #, c-format
 msgid "No such folder '%s'."
 msgstr "æ²?æ??é??å??è³?æ??å¤¾ã??%sã??ã??"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:738
+#: ../camel/providers/pop3/camel-pop3-store.c:737
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 å?²å?å??æ²?æ??è³?æ??å¤¾é??å±¤"
@@ -5286,7 +5326,7 @@ 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:488
+#: ../camel/providers/smtp/camel-smtp-transport.c:495
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5298,225 +5338,225 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:606
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
 #, 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:613
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?å¯?ä»¶è??ç??å?°å??ç?¡æ??ã??"
 
 # mail/mail-ops.c:603
-#: ../camel/providers/smtp/camel-smtp-transport.c:617
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
 msgid "Sending message"
 msgstr "å?³é??é?µä»¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:642
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
 #, 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:655
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ä¸?è?½å?³é??é?µä»¶ï¼?ä¸?æ??å¤?å??ç?¡æ??ç??æ?¶ä»¶è??"
 
 # camel/providers/smtp/camel-smtp-transport.c:168
-#: ../camel/providers/smtp/camel-smtp-transport.c:718
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Syntax error, command unrecognized"
 msgstr "èª?æ³?é?¯èª¤ï¼?ä¸?èª?è?ç??æ??ä»¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Syntax error in parameters or arguments"
 msgstr "å??æ?¸å?§ç??èª?æ³?é?¯èª¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:172
-#: ../camel/providers/smtp/camel-smtp-transport.c:722
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Command not implemented"
 msgstr "æ??ä»¤æ²?æ??å¯¦ä½?"
 
 # camel/providers/smtp/camel-smtp-transport.c:174
-#: ../camel/providers/smtp/camel-smtp-transport.c:724
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Command parameter not implemented"
 msgstr "æ??ä»¤ç??å??æ?¸æ²?æ??å¯¦ä½?"
 
 # camel/providers/smtp/camel-smtp-transport.c:176
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "System status, or system help reply"
 msgstr "ç³»çµ±ç??æ³?ï¼?æ??è??æ?¯ç³»çµ±ç??æ±?å?©èªªæ??å??æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:178
-#: ../camel/providers/smtp/camel-smtp-transport.c:728
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Help message"
 msgstr "æ±?å?©èªªæ??è¨?æ?¯"
 
 # camel/providers/smtp/camel-smtp-transport.c:180
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "Service ready"
 msgstr "æ??å??å·²å°±ç·?"
 
 # camel/providers/smtp/camel-smtp-transport.c:182
-#: ../camel/providers/smtp/camel-smtp-transport.c:732
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Service closing transmission channel"
 msgstr "æ¤æ??å??å°?å?³è¼¸é??é??é??é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:734
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Service not available, closing transmission channel"
 msgstr "æ¤æ??å??ä»?æ?ªå?¯ç?¨ï¼?å?³è¼¸é??é??é??é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:736
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested mail action okay, completed"
 msgstr " æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ??å??å®?æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:188
-#: ../camel/providers/smtp/camel-smtp-transport.c:738
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 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:740
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
 
 # camel/providers/smtp/camel-smtp-transport.c:192
-#: ../camel/providers/smtp/camel-smtp-transport.c:742
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?é?µç®±ä»?æ?ªå?¯ç?¨"
 
 # camel/providers/smtp/camel-smtp-transport.c:194
-#: ../camel/providers/smtp/camel-smtp-transport.c:744
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "Requested action aborted: error in processing"
 msgstr "æ??è¦?æ±?ç??å??ä½?å·²æ?¾æ£?ï¼?æ£å?¨è??ç??æ??ç?¼ç??é?¯èª¤"
 
 # camel/providers/smtp/camel-smtp-transport.c:196
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "User not local; please try <forward-path>"
 msgstr "ä¸?æ?¯æ?¬å?°ç«¯ç??ä½¿ç?¨è??ï¼?è«?å??è©¦ä½¿ç?¨ <è½?å¯?è·¯å¾?>"
 
 # camel/providers/smtp/camel-smtp-transport.c:198
-#: ../camel/providers/smtp/camel-smtp-transport.c:748
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Requested action not taken: insufficient system storage"
 msgstr "æ??è¦?æ±?ç??å??ä½?ç?¡æ³?å?·è¡?ï¼?ç³»çµ±ç??å?²å?ç©ºé??ä¸?è¶³"
 
 # camel/providers/smtp/camel-smtp-transport.c:200
-#: ../camel/providers/smtp/camel-smtp-transport.c:750
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "æ??è¦?æ±?ç??é?µä»¶å??ä½?å·²æ?¾æ£?ï¼?è¶?å?ºå?¯ä¾?å?²å?ç©ºé??ç??é??å?¶"
 
 # camel/providers/smtp/camel-smtp-transport.c:202
-#: ../camel/providers/smtp/camel-smtp-transport.c:752
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 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:754
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
 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:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
 msgid "Transaction failed"
 msgstr "å?·è¡?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:210
-#: ../camel/providers/smtp/camel-smtp-transport.c:760
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
 msgid "A password transition is needed"
 msgstr "é??è¦?å¯?ç¢¼å?³é??"
 
 # camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:762
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
 msgid "Authentication mechanism is too weak"
 msgstr "é©?è?æ©?å?¶å¤ªå¼±äº?"
 
 # camel/providers/smtp/camel-smtp-transport.c:214
-#: ../camel/providers/smtp/camel-smtp-transport.c:764
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Encryption required for requested authentication mechanism"
 msgstr "æ??è¦?æ±?ç??é©?è?æ©?å?¶å¿?é ?å? å¯?è??ç??"
 
 # camel/providers/smtp/camel-smtp-transport.c:216
-#: ../camel/providers/smtp/camel-smtp-transport.c:766
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "Temporary authentication failure"
 msgstr "è?¨æ??é©?è?å¤±æ??"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../camel/providers/smtp/camel-smtp-transport.c:1023
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
 msgid "SMTP Greeting"
 msgstr "SMTP è¿?æ?¥"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1050
-#: ../camel/providers/smtp/camel-smtp-transport.c:1067
-#: ../camel/providers/smtp/camel-smtp-transport.c:1075
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
 msgid "HELO command failed: "
 msgstr "HELO æ??ä»¤å¤±æ??ï¼?"
 
 # mail/mail-config.glade.h:10
-#: ../camel/providers/smtp/camel-smtp-transport.c:1143
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "SMTP Authentication"
 msgstr "SMTP é©?è?"
 
 # camel/providers/smtp/camel-smtp-transport.c:728
-#: ../camel/providers/smtp/camel-smtp-transport.c:1150
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
 #, 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:1169
-#: ../camel/providers/smtp/camel-smtp-transport.c:1180
-#: ../camel/providers/smtp/camel-smtp-transport.c:1189
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
 msgid "AUTH command failed: "
 msgstr "AUTH æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1297
-#: ../camel/providers/smtp/camel-smtp-transport.c:1311
-#: ../camel/providers/smtp/camel-smtp-transport.c:1320
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO æ??ä»¤å¤±æ??ï¼?"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1363
-#: ../camel/providers/smtp/camel-smtp-transport.c:1372
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1414
-#: ../camel/providers/smtp/camel-smtp-transport.c:1424
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
-#: ../camel/providers/smtp/camel-smtp-transport.c:1512
-#: ../camel/providers/smtp/camel-smtp-transport.c:1525
-#: ../camel/providers/smtp/camel-smtp-transport.c:1533
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
 msgid "DATA command failed: "
 msgstr "DATA æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1558
-#: ../camel/providers/smtp/camel-smtp-transport.c:1572
-#: ../camel/providers/smtp/camel-smtp-transport.c:1580
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
 msgid "RSET command failed: "
 msgstr "RSET æ??ä»¤å¤±æ??ï¼?"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1605
-#: ../camel/providers/smtp/camel-smtp-transport.c:1619
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
 #: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
 msgid "QUIT command failed: "
 msgstr "QUIT æ??ä»¤å¤±æ??ï¼?"
 
@@ -5651,7 +5691,7 @@ msgstr "æ£å?¨ç?å¾?"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -5661,7 +5701,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:1640 ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -5670,7 +5710,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:1645 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -5679,7 +5719,7 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1918
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -5702,8 +5742,8 @@ 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:1663 ../libedataserver/e-time-utils.c:1765
-#: ../libedataserver/e-time-utils.c:1884
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -5760,21 +5800,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:1697 ../libedataserver/e-time-utils.c:1768
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
 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:1826 ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
 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:1830 ../libedataserver/e-time-utils.c:1938
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5786,7 +5826,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:1835 ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
@@ -5797,7 +5837,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:1839 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -5806,7 +5846,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:1842
+#: ../libedataserver/e-time-utils.c:1871
 msgid "%H%M"
 msgstr "%H%M"
 
@@ -5815,76 +5855,76 @@ 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:1846
+#: ../libedataserver/e-time-utils.c:1875
 msgid "%I %p"
 msgstr "%I %p"
 
 #: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:668
+#: ../libedataserverui/e-book-auth-util.c:673
 msgid "Accessing LDAP Server anonymously"
 msgstr "æ£ä»¥å?¿å??æ?¹å¼?å?å?? LDAP ä¼ºæ??å?¨"
 
 #: ../libedataserverui/e-book-auth-util.c:199
-#: ../libedataserverui/e-book-auth-util.c:430
+#: ../libedataserverui/e-book-auth-util.c:435
 msgid "Failed to authenticate.\n"
 msgstr "é©?è?æ??è?å¤±æ??ã??\n"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../libedataserverui/e-categories-dialog.c:134
+#: ../libedataserverui/e-categories-dialog.c:127
 msgid "Category Properties"
 msgstr "å??é¡?å±¬æ?§"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:138
 msgid "Category _Name"
 msgstr "å??é¡?å??ç¨±(_N)"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:144
 msgid "Category _Icon"
 msgstr "å??é¡?å??ç¤º(_I)"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:192
+#: ../libedataserverui/e-categories-dialog.c:185
 msgid "Category Icon"
 msgstr "å??é¡?å??ç¤º"
 
-#: ../libedataserverui/e-categories-dialog.c:198
+#: ../libedataserverui/e-categories-dialog.c:191
 msgid "_No Image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:409
+#: ../libedataserverui/e-categories-dialog.c:406
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "å?¨çµ?æ??ä¸å·²ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?ä½¿ç?¨å?¦å¤?ç??å??ç¨±"
 
-#: ../libedataserverui/e-categories-dialog.c:664
+#: ../libedataserverui/e-categories-dialog.c:661
 msgid "Currently _used categories:"
 msgstr "ç?®å??ä½¿ç?¨ç??å??é¡?(_U):"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:668
 msgid "_Available Categories:"
 msgstr "å?¯ç?¨ç??å??é¡?(_A):"
 
-#: ../libedataserverui/e-categories-dialog.c:714
+#: ../libedataserverui/e-categories-dialog.c:711
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../libedataserverui/e-categories-dialog.c:770
+#: ../libedataserverui/e-categories-dialog.c:768
 msgid "Icon"
 msgstr "å??ç¤º"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:775
+#: ../libedataserverui/e-categories-dialog.c:773
 msgid "Category"
 msgstr "å??é¡?"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-category-completion.c:292
+#: ../libedataserverui/e-category-completion.c:294
 #, c-format
 msgid "Create category \"%s\""
 msgstr "å»ºç«?å??é¡?ã??%sã??"
@@ -5909,7 +5949,7 @@ msgstr "æ??å°?(_S):"
 
 # calendar/gui/e-tasks.c:155
 #: ../libedataserverui/e-name-selector-dialog.c:242
-#: ../libedataserverui/e-name-selector-dialog.c:984
+#: ../libedataserverui/e-name-selector-dialog.c:977
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
 
@@ -5931,49 +5971,49 @@ msgstr "é??è¨?é??"
 msgid "Contacts"
 msgstr "é?£çµ¡äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:415
+#: ../libedataserverui/e-name-selector-dialog.c:412
 msgid "Select Contacts from Address Book"
 msgstr "å¾?é??è¨?é??é?¸å??é?£çµ¡äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:754
+#: ../libedataserverui/e-name-selector-dialog.c:747
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:758
+#: ../libedataserverui/e-name-selector-dialog.c:751
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
 # camel/camel-movemail.c:245
-#: ../libedataserverui/e-name-selector-dialog.c:898
+#: ../libedataserverui/e-name-selector-dialog.c:891
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "è¼?å?¥é??è¨?é??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2658
+#: ../libedataserverui/e-name-selector-entry.c:2661
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "å±?é??è¡?å?§ %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2673
+#: ../libedataserverui/e-name-selector-entry.c:2676
 #, c-format
 msgid "Cop_y %s"
 msgstr "è¤?è£½(_Y) %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2683
+#: ../libedataserverui/e-name-selector-entry.c:2686
 #, c-format
 msgid "C_ut %s"
 msgstr "å?ªä¸?(_U) %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2700
+#: ../libedataserverui/e-name-selector-entry.c:2703
 #, c-format
 msgid "_Edit %s"
 msgstr "ç·¨è¼¯ %s(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:516
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "å?ªé?¤(_D) %s"
@@ -5984,22 +6024,27 @@ msgid "Keyring key is unusable: no user or host name"
 msgstr "é?°å??å??é??é?°ç?¡æ³?ä½¿ç?¨ï¼?æ²?æ??ä½¿ç?¨è??æ??ä¸»æ©?å??ç¨±"
 
 #: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "æ?¨ç?? Caps Lock æ?¯é??å??ç??ã??"
 
-#: ../libedataserverui/e-passwords.c:824
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "è¨?ä½?é??å??å¯?èª?(_R)"
 
-#: ../libedataserverui/e-passwords.c:825
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?èª?(_R)"
 
-#: ../libedataserverui/e-passwords.c:830
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "è¨?ä½?é??å??å¯?ç¢¼(_R)"
 
-#: ../libedataserverui/e-passwords.c:831
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?ç¢¼(_R)"
 
@@ -6009,7 +6054,7 @@ msgstr "è¨?ä½?é??å??ç?¨æ?¼å?©é¤?ç??å·¥ä½?é??æ®µç??å¯?ç¢¼(_R)"
 msgid "Select destination"
 msgstr "é?¸å??ç?®ç??å?°"
 
-#: ../libedataserverui/e-source-selector-dialog.c:174
+#: ../libedataserverui/e-source-selector-dialog.c:170
 msgid "_Destination"
 msgstr "ç?®ç??ç«¯(_D)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]