[evolution-data-server/gnome-2-32] Update Simplified Chinese translation.

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server/gnome-2-32] Update Simplified Chinese translation.
Date: Mon, 25 Oct 2010 08:04:19 +0000 (UTC)
commit f7d04c7c8227e3a6724e1a85c636d0d444a919ef
Author: Aron Xu <aronxu gnome org>
Date:   Mon Oct 25 08:03:00 2010 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po |  771 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 386 insertions(+), 385 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6677fc9..60ff885 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: evolution-data-server master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&component=Misc.\n"
-"POT-Creation-Date: 2010-09-06 08:47+0000\n"
-"PO-Revision-Date: 2010-09-16 15:37+0000\n"
+"POT-Creation-Date: 2010-10-22 08:20+0000\n"
+"PO-Revision-Date: 2010-10-25 16:00+0800\n"
 "Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -39,13 +39,13 @@ msgstr "æ£å?¨è½½å?¥..."
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4505
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "æ£å?¨æ??ç´¢..."
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4664
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "æ£å?¨ä¸?è½½è??ç³»äºº(%d)..."
@@ -61,39 +61,39 @@ msgstr "æ£å?¨æ?´æ?°è??ç³»äººç¼?å?(%d)..."
 msgid "Not connected"
 msgstr "æ?ªè¿?æ?¥ã??"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:763
 msgid "Using Distinguished Name (DN)"
 msgstr "ä½¿ç?¨å·²è¯?å?«ç??å§?å?? (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:766
 msgid "Using Email Address"
 msgstr "ä½¿ç?¨ç?µå?é?®ä»¶å?°å??"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1032
 msgid "Reconnecting to LDAP server..."
 msgstr "æ£å?¨é??æ?°è¿?æ?¥ LDAP æ??å?¡å?¨..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1157
 msgid "Invalid DN syntax"
 msgstr "æ? æ?? DN è¯æ³?"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1674
 msgid "Adding contact to LDAP server..."
 msgstr "æ£å?¨å°?è??ç³»äººæ·»å? å?° LDAP æ??å?¡å?¨..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1806
 msgid "Removing contact from LDAP server..."
 msgstr "æ£å?¨ä»? LDAP æ??å?¡å?¨å? é?¤è??ç³»äºº..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2242
 msgid "Modifying contact from LDAP server..."
 msgstr "æ£å?¨ä¿®æ?¹ LDAP æ??å?¡å?¨ä¸?ç??è??ç³»äºº..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4355
 msgid "Receiving LDAP search results..."
 msgstr "æ£å?¨æ?¥æ?¶ LDAP ç??æ??ç´¢ç»?æ??..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4527
 msgid "Error performing search"
 msgstr "æ?§è¡?æ??ç´¢é??è¯¯"
 
@@ -102,7 +102,7 @@ msgstr "æ?§è¡?æ??ç´¢é??è¯¯"
 msgid "Create resource '%s' failed with HTTP status: %d"
 msgstr "å??å»ºèµ?æº?â??%sâ??å¤±è´¥ï¼?HTTP ç?¶æ??ç ?ä¸º: %d"
 
-#: ../addressbook/libebook/e-book.c:2995
+#: ../addressbook/libebook/e-book.c:3000
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%sï¼?GConf ä¸æ²¡æ??å?å?¨ UIDâ??%sâ??ç??æº?ã??"
@@ -293,7 +293,7 @@ msgstr "ç½?ç»?æ?¥è®° URL"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:667
+#: ../libedataserverui/e-categories-dialog.c:687
 msgid "Categories"
 msgstr "ç±»å?«"
 
@@ -559,7 +559,7 @@ msgstr "ç??æ?¥"
 
 #: ../addressbook/libebook/e-contact.c:262
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:44
+#: ../libedataserver/e-categories.c:47
 msgid "Anniversary"
 msgstr "å?¨å¹´çºªå¿µæ?¥"
 
@@ -642,15 +642,15 @@ msgstr "SIP å?°å??"
 msgid "Unnamed List"
 msgstr "æ?ªå?½å??ç??å??è¡¨"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:287
+#: ../addressbook/libedata-book/e-data-book-factory.c:298
 #, c-format
 msgid "Empty URI"
 msgstr "ç©ºç?? URI"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:306
-#: ../addressbook/libedata-book/e-data-book-factory.c:344
-#: ../calendar/libedata-cal/e-data-cal-factory.c:331
-#: ../calendar/libedata-cal/e-data-cal-factory.c:343
+#: ../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
 #, c-format
 msgid "Invalid source"
 msgstr "æ? æ??ç??æº?"
@@ -666,7 +666,7 @@ msgid "Repository offline"
 msgstr "ä»?åº?ç¦»çº¿"
 
 #: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libecal/e-cal.c:4066 ../calendar/libedata-cal/e-data-cal.c:111
+#: ../calendar/libecal/e-cal.c:4067 ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Permission denied"
 msgstr "æ²¡æ??æ??é??"
 
@@ -753,12 +753,12 @@ msgid "No space"
 msgstr "æ²¡æ??ç©ºé?´"
 
 #: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libecal/e-cal.c:4050 ../calendar/libedata-cal/e-data-cal.c:132
+#: ../calendar/libecal/e-cal.c:4051 ../calendar/libedata-cal/e-data-cal.c:132
 msgid "Invalid argument"
 msgstr "æ? æ??å??æ?°"
 
 #: ../addressbook/libedata-book/e-data-book.c:193
-#: ../calendar/libecal/e-cal.c:4088 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../calendar/libecal/e-cal.c:4089 ../calendar/libedata-cal/e-data-cal.c:133
 msgid "Not supported"
 msgstr "ä¸?æ?¯æ??"
 
@@ -856,22 +856,22 @@ msgid "Cannot get changes: %s"
 msgstr "æ? æ³?è?·å??æ?´æ?¹ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:737
+#: ../addressbook/libedata-book/e-data-book.c:738
 #, c-format
 msgid "Cancel operation failed: %s"
 msgstr "å??æ¶?æ??ä½?å¤±è´¥ï¼?%s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
 #, c-format
 msgid "Unexpected HTTP status code %d returned"
 msgstr "è¿?å??äº?æ??å¤?ç?? HTTP ç?¶æ??ä»£ç ? %d"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4142
 msgid "Calendar doesn't support Free/Busy"
 msgstr "æ?¥å??ä¸?æ?¯æ??ç©ºé?²/ç¹?å¿?"
 
 #: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
-#: ../libedataserver/e-categories.c:45
+#: ../libedataserver/e-categories.c:48
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
@@ -885,102 +885,102 @@ msgstr "ç??æ?¥ï¼?%s"
 msgid "Anniversary: %s"
 msgstr "å?¨å¹´ï¼?%s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:239
+#: ../calendar/backends/file/e-cal-backend-file.c:251
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "æ? æ³?ä¿?å?æ?¥å??æ?°æ?®ï¼?URI æ ¼å¼?é??è¯¯ã??"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:246
-#: ../calendar/backends/file/e-cal-backend-file.c:252
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
 msgid "Cannot save calendar data"
 msgstr "æ? æ³?ä¿?å?æ?¥å??æ?°æ?®"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1121
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2251
 msgid "Reply Requested: by "
 msgstr "è¯·æ±?å??å¤?ï¼?ç?±"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1126
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2256
 msgid "Reply Requested: When convenient"
 msgstr "è¯·æ±?å??å¤?ï¼?æ?¹ä¾¿æ?¶"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:295
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:330
 #, c-format
 msgid "Loading %s items"
 msgstr "è½½å?¥ %s é¡¹"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
 msgid "Calendar"
 msgstr "æ?¥å??"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:989
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
 msgid "Invalid server URI"
 msgstr "æ? æ??ç??æ??å?¡å?¨ URI"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1342
-#: ../calendar/backends/http/e-cal-backend-http.c:659
-#: ../calendar/backends/weather/e-cal-backend-weather.c:487
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1123
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1383
+#: ../calendar/backends/http/e-cal-backend-http.c:720
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
 msgid "Could not create cache file"
 msgstr "æ? æ³?å??å»ºç¼?å?æ??ä»¶"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1094
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1135
 msgid "Could not create thread for populating cache"
 msgstr "æ? æ³?å??å»ºå¢?æ®?ç¼?å?å??å»ºçº¿ç´¢"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:327
+#: ../calendar/backends/http/e-cal-backend-http.c:366
 msgid "Redirected to Invalid URI"
 msgstr "å·²é??å®?å??å?°æ? æ?? URI"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:350
+#: ../calendar/backends/http/e-cal-backend-http.c:398
 msgid "Bad file format."
 msgstr "æ? æ??ç??æ??ä»¶æ ¼å¼?ã??"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:357
+#: ../calendar/backends/http/e-cal-backend-http.c:405
 msgid "Not a calendar."
 msgstr "ä¸?æ?¯æ?¥å??ã??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:154
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
 msgstr "æ? æ³?è?·å??å¤©æ°?æ?°æ?®"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Fog"
 msgstr "å¤©æ°?ï¼?é?¾"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy Night"
 msgstr "å¤©æ°?ï¼?å¤?äº?å¤?æ??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Cloudy"
 msgstr "å¤©æ°?ï¼?å¤?äº?"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Overcast"
 msgstr "å¤©æ°?ï¼?é?´å¤©"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Showers"
 msgstr "å¤©æ°?ï¼?é?µé?¨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Snow"
 msgstr "å¤©æ°?ï¼?é?ª"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Clear Night"
 msgstr "å¤©æ°?ï¼?æ?´æ??å¤?æ??"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:260
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Sunny"
 msgstr "å¤©æ°?ï¼?æ?´"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:261
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Thunderstorms"
 msgstr "å¤©æ°?ï¼?æ?´é£?é?¨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:407
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
 msgid "Forecast"
 msgstr "å¤©æ°?é¢?æ?¥"
 
@@ -988,148 +988,148 @@ msgstr "å¤©æ°?é¢?æ?¥"
 msgid "Untitled appointment"
 msgstr "æ? æ ?é¢?çº¦ä¼?"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "18th"
 msgstr "18å?«æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3976
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3977
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3978
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/libecal/e-cal-util.c:677 ../calendar/libecal/e-cal-util.c:704
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "é«?"
 
-#: ../calendar/libecal/e-cal-util.c:679 ../calendar/libecal/e-cal-util.c:706
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "ä¸"
 
-#: ../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:708
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "ä½?"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:702
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "æ?ªå®?ä¹?"
 
-#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1229 ../libedataserverui/e-book-auth-util.c:206
 #: ../libedataserverui/e-book-auth-util.c:435
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -1139,64 +1139,64 @@ msgstr "ä¸º %s è¾?å?¥å¯?ç ? (ç?¨æ?· %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1241
+#: ../calendar/libecal/e-cal.c:1243
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "è¾?å?¥ %s ç??å¯?ç ?ï¼?ä»¥ä¾¿ä¸ºç?¨æ?· %s å?¯ç?¨ä»£ç??æ??å?¡å?¨"
 
-#: ../calendar/libecal/e-cal.c:4052
+#: ../calendar/libecal/e-cal.c:4053
 msgid "Backend is busy"
 msgstr "å??å?°ç¹?å¿?"
 
-#: ../calendar/libecal/e-cal.c:4054
+#: ../calendar/libecal/e-cal.c:4055
 msgid "Repository is offline"
 msgstr "ä»?åº?ç¦»çº¿"
 
-#: ../calendar/libecal/e-cal.c:4056
+#: ../calendar/libecal/e-cal.c:4057
 msgid "No such calendar"
 msgstr "æ²¡æ??è¿?æ ·ç??æ?¥å??"
 
-#: ../calendar/libecal/e-cal.c:4058 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libecal/e-cal.c:4059 ../calendar/libedata-cal/e-data-cal.c:113
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "æ?¾ä¸?å?°å¯¹è±¡"
 
-#: ../calendar/libecal/e-cal.c:4060 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4061 ../calendar/libedata-cal/e-data-cal.c:114
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "æ? æ??å¯¹è±¡"
 
-#: ../calendar/libecal/e-cal.c:4062
+#: ../calendar/libecal/e-cal.c:4063
 msgid "URI not loaded"
 msgstr "URI æ?ªè½½å?¥"
 
-#: ../calendar/libecal/e-cal.c:4064
+#: ../calendar/libecal/e-cal.c:4065
 msgid "URI already loaded"
 msgstr "URI å·²ç»?è½½å?¥"
 
-#: ../calendar/libecal/e-cal.c:4068 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4069 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "æ?ªç?¥ç?¨æ?·"
 
-#: ../calendar/libecal/e-cal.c:4070 ../calendar/libedata-cal/e-data-cal.c:115
+#: ../calendar/libecal/e-cal.c:4071 ../calendar/libedata-cal/e-data-cal.c:115
 msgid "Object ID already exists"
 msgstr "å¯¹è±¡ ID å·²ç»?å?å?¨"
 
-#: ../calendar/libecal/e-cal.c:4072
+#: ../calendar/libecal/e-cal.c:4073
 msgid "Protocol not supported"
 msgstr "ä¸?æ?¯æ??ç??å??è®®"
 
-#: ../calendar/libecal/e-cal.c:4074
+#: ../calendar/libecal/e-cal.c:4075
 msgid "Operation has been canceled"
 msgstr "æ??ä½?å·²å??æ¶?"
 
-#: ../calendar/libecal/e-cal.c:4076
+#: ../calendar/libecal/e-cal.c:4077
 msgid "Could not cancel operation"
 msgstr "æ? æ³?å??æ¶?æ??ä½?"
 
-#: ../calendar/libecal/e-cal.c:4078
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
+#: ../calendar/libecal/e-cal.c:4079
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1466
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1484
 #: ../camel/providers/groupwise/camel-groupwise-store.c:618
 #: ../camel/providers/groupwise/camel-groupwise-store.c:793
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:85
@@ -1205,16 +1205,16 @@ msgstr "æ? æ³?å??æ¶?æ??ä½?"
 msgid "Authentication failed"
 msgstr "è®¤è¯?å¤±è´¥"
 
-#: ../calendar/libecal/e-cal.c:4080
+#: ../calendar/libecal/e-cal.c:4081
 #: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "å¿?é¡»è®¤è¯?"
 
-#: ../calendar/libecal/e-cal.c:4082
+#: ../calendar/libecal/e-cal.c:4083
 msgid "A D-Bus exception has occurred"
 msgstr "å??ç??äº?ä¸?ä¸ª D-Bus å¼?å¸¸"
 
-#: ../calendar/libecal/e-cal.c:4084
+#: ../calendar/libecal/e-cal.c:4085
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:158
 #: ../camel/providers/imap/camel-imap-command.c:457
 #: ../camel/providers/imap/camel-imap-store.c:627
@@ -1223,7 +1223,7 @@ msgstr "å??ç??äº?ä¸?ä¸ª D-Bus å¼?å¸¸"
 msgid "Unknown error"
 msgstr "æ?ªç?¥ç??é??è¯¯"
 
-#: ../calendar/libecal/e-cal.c:4086
+#: ../calendar/libecal/e-cal.c:4087
 msgid "No error"
 msgstr "æ? é??è¯¯"
 
@@ -1337,154 +1337,154 @@ msgid "Unknown user"
 msgstr "æ?ªç?¥ç?¨æ?·"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:604
+#: ../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:624
+#: ../calendar/libedata-cal/e-data-cal.c:628
 #, 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:644
+#: ../calendar/libedata-cal/e-data-cal.c:648
 #, c-format
 msgid "Cannot retrieve calendar's LDAP attribute: %s"
 msgstr "æ? æ³?è?·å??æ?¥å??ç?? LDAP å±?æ?§ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:664
+#: ../calendar/libedata-cal/e-data-cal.c:668
 #, 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:683
+#: ../calendar/libedata-cal/e-data-cal.c:687
 #, 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:704
+#: ../calendar/libedata-cal/e-data-cal.c:708
 #, 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:723
+#: ../calendar/libedata-cal/e-data-cal.c:727
 #, c-format
 msgid "Cannot remove calendar: %s"
 msgstr "æ? æ³?ç§»é?¤æ?¥å??ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:744
+#: ../calendar/libedata-cal/e-data-cal.c:748
 #, 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:768
+#: ../calendar/libedata-cal/e-data-cal.c:772
 #, 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:794
+#: ../calendar/libedata-cal/e-data-cal.c:798
 #, 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:815
+#: ../calendar/libedata-cal/e-data-cal.c:819
 #, 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:834
+#: ../calendar/libedata-cal/e-data-cal.c:838
 #, 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:855
+#: ../calendar/libedata-cal/e-data-cal.c:859
 #, 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:880
+#: ../calendar/libedata-cal/e-data-cal.c:884
 #, 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:900
+#: ../calendar/libedata-cal/e-data-cal.c:904
 #, 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:920
+#: ../calendar/libedata-cal/e-data-cal.c:924
 #, c-format
 msgid "Cannot retrieve calendar object list: %s"
 msgstr "æ? æ³?è?·å??æ?¥å??å¯¹è±¡ç??å??è¡¨ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:948
+#: ../calendar/libedata-cal/e-data-cal.c:952
 #, c-format
 msgid "Could not retrieve attachment list: %s"
 msgstr "æ? æ³?è?·å??é??ä»¶å??è¡¨ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:974
+#: ../calendar/libedata-cal/e-data-cal.c:978
 #, c-format
 msgid "Could not complete calendar query: %s"
 msgstr "æ? æ³?å®?æ??æ?¥å??æ?¥è¯¢ï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:994
+#: ../calendar/libedata-cal/e-data-cal.c:998
 #, c-format
 msgid "Could not retrieve calendar time zone: %s"
 msgstr "æ? æ³?è?·å??æ?¥å??æ?¶å?ºï¼?%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
+#: ../calendar/libedata-cal/e-data-cal.c:1018
 #, 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:1033
+#: ../calendar/libedata-cal/e-data-cal.c:1037
 #, 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:1056
+#: ../calendar/libedata-cal/e-data-cal.c:1060
 #, 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:1087
+#: ../calendar/libedata-cal/e-data-cal.c:1091
 #, c-format
 msgid "Cannot retrieve calendar free/busy list: %s"
 msgstr "æ? æ³?è?·å??æ?¥å??ç©ºé?²ã??ç¹?å¿?å??è¡¨ï¼?%s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:353
+#: ../calendar/libedata-cal/e-data-cal-factory.c:368
 #, c-format
 msgid "Invalid URI"
 msgstr "æ? æ??ç?? URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:371
+#: ../calendar/libedata-cal/e-data-cal-factory.c:386
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "å¯¹â??%2$sâ??ç??â??%1$sâ??æ²¡æ??å??ç«¯å·¥å??"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:421
+#: ../calendar/libedata-cal/e-data-cal-factory.c:436
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "æ? æ³?å®?ä¾?å??å??ç«¯"
@@ -1496,7 +1496,7 @@ msgstr "è¯¥å¯?ç ?ä¸?æ?¯æ??ç¾å??"
 
 #: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
-msgstr "ç¾å??ä¿¡ä»¶"
+msgstr "ç¾å??æ¶?æ?¯"
 
 #: ../camel/camel-cipher-context.c:131
 #, c-format
@@ -1505,7 +1505,7 @@ msgstr "è¯¥å¯?ç ?ä¸?æ?¯æ??éª?è¯?"
 
 #: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
-msgstr "æ ¡éª?ä¿¡ä»¶"
+msgstr "æ ¡éª?æ¶?æ?¯"
 
 #: ../camel/camel-cipher-context.c:188
 #, c-format
@@ -1514,7 +1514,7 @@ msgstr "è¯¥å¯?ç ?ä¸?æ?¯æ??å? å¯?"
 
 #: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
-msgstr "å? å¯?ä¿¡ä»¶"
+msgstr "å? å¯?æ¶?æ?¯"
 
 #: ../camel/camel-cipher-context.c:246
 #, c-format
@@ -1523,7 +1523,7 @@ msgstr "è¯¥å¯?ç ?ä¸?æ?¯æ??è§£å¯?"
 
 #: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
-msgstr "è§£å¯?ä¿¡ä»¶"
+msgstr "è§£å¯?æ¶?æ?¯"
 
 #: ../camel/camel-cipher-context.c:297
 #, c-format
@@ -1584,7 +1584,7 @@ msgstr "é??æ?°ä¸?æ??å?¡å?¨å??æ¥"
 
 #: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
-msgstr "ä¸?è½½æ?°ä¿¡ä»¶ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
+msgstr "ä¸?è½½æ?°æ¶?æ?¯ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
 
 #: ../camel/camel-disco-folder.c:379
 #, c-format
@@ -1601,17 +1601,17 @@ msgstr "å°?æ??ä»¶å¤¹å??å®¹å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?"
 #: ../camel/providers/imap/camel-imap-store.c:1720
 #: ../camel/providers/imap/camel-imap-store.c:2178
 #: ../camel/providers/imap/camel-imap-store.c:3022
-#: ../camel/providers/imapx/camel-imapx-folder.c:165
-#: ../camel/providers/imapx/camel-imapx-folder.c:196
-#: ../camel/providers/imapx/camel-imapx-folder.c:225
+#: ../camel/providers/imapx/camel-imapx-folder.c:164
+#: ../camel/providers/imapx/camel-imapx-folder.c:195
+#: ../camel/providers/imapx/camel-imapx-folder.c:224
 #: ../camel/providers/imapx/camel-imapx-folder.c:282
 #: ../camel/providers/imapx/camel-imapx-folder.c:325
 #: ../camel/providers/imapx/camel-imapx-folder.c:357
 #: ../camel/providers/imapx/camel-imapx-folder.c:388
-#: ../camel/providers/imapx/camel-imapx-store.c:189
-#: ../camel/providers/imapx/camel-imapx-store.c:711
-#: ../camel/providers/imapx/camel-imapx-store.c:774
-#: ../camel/providers/imapx/camel-imapx-store.c:833
+#: ../camel/providers/imapx/camel-imapx-store.c:193
+#: ../camel/providers/imapx/camel-imapx-store.c:720
+#: ../camel/providers/imapx/camel-imapx-store.c:783
+#: ../camel/providers/imapx/camel-imapx-store.c:842
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "æ?¨å¿?é¡»å?¨çº¿å·¥ä½?ä»¥ä¾¿å®?æ??è¯¥æ??ä½?"
@@ -1619,11 +1619,12 @@ msgstr "æ?¨å¿?é¡»å?¨çº¿å·¥ä½?ä»¥ä¾¿å®?æ??è¯¥æ??ä½?"
 #: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
 #: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
 #: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
-#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
-#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:514
+#: ../camel/camel-net-utils.c:691 ../camel/camel-net-utils.c:840
 #: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4654
-#: ../camel/providers/imapx/camel-imapx-server.c:4671
+#: ../camel/providers/imapx/camel-imapx-server.c:4704
+#: ../camel/providers/imapx/camel-imapx-server.c:4721
+#: ../camel/providers/imapx/camel-imapx-store.c:241
 #: ../camel/providers/nntp/camel-nntp-summary.c:396
 #: ../camel/providers/pop3/camel-pop3-folder.c:269
 #: ../camel/providers/pop3/camel-pop3-folder.c:625
@@ -1648,7 +1649,7 @@ msgstr "å??å»ºå?è¿?ç¨?â??%sâ??å¤±è´¥ï¼?%s"
 #: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "æ?¶å?° %s å??æ?¥ç??æ? æ??ä¿¡ä»¶æµ?ï¼?%s"
+msgstr "æ?¶å?° %s å??æ?¥ç??æ? æ??æ¶?æ?¯æµ?ï¼?%s"
 
 #: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
@@ -1704,7 +1705,7 @@ msgstr "å?¨ç¬¬%då°?ä¿¡å¤±è´¥ï¼?å?±%då°?"
 
 #: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
-msgstr "è?·å??ä¿¡ä»¶å¤±è´¥"
+msgstr "è?·å??æ¶?æ?¯å¤±è´¥"
 
 #: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
@@ -1780,16 +1781,16 @@ msgstr[0] "å?¨â??%sâ??ä¸å¦ä¹ æ?°ç??æ??å®³é?®ä»¶"
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "å?¨â??%sâ??ä¸è¿?æ»¤æ?°ä¿¡ä»¶"
+msgstr[0] "å?¨â??%sâ??ä¸è¿?æ»¤æ?°æ¶?æ?¯"
 
 #: ../camel/camel-folder.c:688
 #: ../camel/providers/local/camel-maildir-folder.c:366
 msgid "Moving messages"
-msgstr "ç§»å?¨ä¿¡ä»¶"
+msgstr "ç§»å?¨æ¶?æ?¯"
 
 #: ../camel/camel-folder.c:690
 msgid "Copying messages"
-msgstr "å¤?å?¶ä¿¡ä»¶"
+msgstr "å¤?å?¶æ¶?æ?¯"
 
 #: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
 #: ../camel/camel-gpg-context.c:1330
@@ -1878,11 +1879,11 @@ msgstr "æ?§è¡? gpg å¤±è´¥ã??"
 #: ../camel/camel-smime-context.c:966
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "æ? æ³?æ ¡éª?ä¿¡ä»¶ç¾å??ï¼?ä¿¡ä»¶æ ¼å¼?ä¸?å¯¹"
+msgstr "æ? æ³?æ ¡éª?æ¶?æ?¯ç¾å??ï¼?æ¶?æ?¯æ ¼å¼?ä¸?å¯¹"
 
 #: ../camel/camel-gpg-context.c:1695
 msgid "Cannot verify message signature: "
-msgstr "æ? æ³?æ ¡éª?ä¿¡ä»¶ç¾å??ï¼?"
+msgstr "æ? æ³?æ ¡éª?æ¶?æ?¯ç¾å??ï¼?"
 
 #: ../camel/camel-gpg-context.c:1814
 msgid "Could not generate encrypting data: "
@@ -1890,13 +1891,13 @@ msgstr "æ? æ³?ç??æ??å? å¯?æ?°æ?®ï¼?"
 
 #: ../camel/camel-gpg-context.c:1866
 msgid "This is a digitally encrypted message part"
-msgstr "è¿?æ?¯ä¿¡ä»¶ç??æ?°å?å? å¯?é?¨å??"
+msgstr "è¿?æ?¯æ¶?æ?¯ç??æ?°å?å? å¯?é?¨å??"
 
 #: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
 #: ../camel/camel-gpg-context.c:1954
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
-msgstr "æ? æ³?è§£å¯?ä¿¡ä»¶ï¼?ä¿¡ä»¶æ ¼å¼?ä¸?å¯¹"
+msgstr "æ? æ³?è§£å¯?æ¶?æ?¯ï¼?æ¶?æ?¯æ ¼å¼?ä¸?å¯¹"
 
 #: ../camel/camel-gpg-context.c:1942
 #, c-format
@@ -2016,29 +2017,29 @@ msgstr "æ²¡æ??å?¯ç?¨ç??ç¾å??"
 msgid "parse error"
 msgstr "è§£æ??é??è¯¯"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "è§£æ??ï¼?%s"
 
-#: ../camel/camel-net-utils.c:715
+#: ../camel/camel-net-utils.c:717
 msgid "Host lookup failed"
 msgstr "ä¸»æ?ºæ?¥é??å¤±è´¥"
 
-#: ../camel/camel-net-utils.c:719
+#: ../camel/camel-net-utils.c:721
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ä¸»æ?ºæ?¥é??å¤±è´¥ï¼?%sï¼?%s"
 
-#: ../camel/camel-net-utils.c:842
+#: ../camel/camel-net-utils.c:844
 msgid "Resolving address"
 msgstr "è§£æ??å?°å??"
 
-#: ../camel/camel-net-utils.c:862
+#: ../camel/camel-net-utils.c:864
 msgid "Name lookup failed"
 msgstr "å??ç§°æ?¥é??å¤±è´¥"
 
-#: ../camel/camel-net-utils.c:867
+#: ../camel/camel-net-utils.c:869
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "å??ç§°æ?¥é??å¤±è´¥ï¼?%s"
@@ -2046,9 +2047,9 @@ msgstr "å??ç§°æ?¥é??å¤±è´¥ï¼?%s"
 #: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "æ£å?¨å°?æ??ä»¶å¤¹â??%sâ??ä¸ç??ä¿¡ä»¶å??æ¥å?°ç£?ç??"
+msgstr "æ£å?¨å°?æ??ä»¶å¤¹â??%sâ??ä¸ç??æ¶?æ?¯å??æ¥å?°ç£?ç??"
 
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "æ? æ³?å??å?¥æ??ä»¶å¤¹â??%sâ??ç??ç¦»çº¿æ?¥è®°ï¼?%s"
@@ -2131,42 +2132,42 @@ msgid ""
 "the server supports it."
 msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??ç??è¯?ï¼?è¯¥é??é¡¹å°?ç?¨å®?å?¨ CRAM-MD5 å¯?ç ?è¿?æ?¥å?°æ??å?¡å?¨ã??"
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:58
+#: ../camel/camel-sasl-digest-md5.c:60
 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:818
+#: ../camel/camel-sasl-digest-md5.c:820
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "æ??å?¡å?¨è´¨è¯¢è¿?é?¿ (>2048 å?è??)"
 
-#: ../camel/camel-sasl-digest-md5.c:829
+#: ../camel/camel-sasl-digest-md5.c:831
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "æ??å?¡å?¨è´¨è¯¢æ? æ??\n"
 
-#: ../camel/camel-sasl-digest-md5.c:837
+#: ../camel/camel-sasl-digest-md5.c:839
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "æ??å?¡å?¨è´¨è¯¢å?«æ??æ? æ??ç??â??å??è´¨ä¿?æ?¤â??æ ?å¿?"
 
-#: ../camel/camel-sasl-digest-md5.c:869
+#: ../camel/camel-sasl-digest-md5.c:871
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "æ??å?¡å?¨åº?ç?ä¸?å?«æ??è®¤è¯?æ?°æ?®"
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:892
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "æ??å?¡å?¨åº?è¾¾å?«æ??ä¸?å®?æ?´ç??è®¤è¯?æ?°æ?®"
 
-#: ../camel/camel-sasl-digest-md5.c:903
+#: ../camel/camel-sasl-digest-md5.c:905
 #, c-format
 msgid "Server response does not match"
 msgstr "æ??å?¡å?¨åº?ç?ä¸?å?¹é??"
@@ -2332,7 +2333,7 @@ msgstr "æ? æ³?æ?¾å?°â??%sâ??ç??è¯?ä¹¦"
 
 #: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
-msgstr "æ? æ³?å??å»º CMS ä¿¡ä»¶"
+msgstr "æ? æ³?å??å»º CMS æ¶?æ?¯"
 
 #: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
@@ -2433,7 +2434,7 @@ msgstr "æ? æ³?è®¡ç®?æ??è¦?"
 
 #: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
-msgstr "æ? æ³?è®¾ç½®ä¿¡ä»¶æ??è¦?"
+msgstr "æ? æ³?è®¾ç½®æ¶?æ?¯æ??è¦?"
 
 #: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
@@ -2442,12 +2443,12 @@ msgstr "è¯?ä¹¦å¯¼å?¥å¤±è´¥"
 #: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "å?ªæ??è¯?ä¹¦ç??ä¿¡ä»¶ï¼?æ? æ³?æ ¡éª?è¯?ä¹¦"
+msgstr "å?ªæ??è¯?ä¹¦ç??æ¶?æ?¯ï¼?æ? æ³?æ ¡éª?è¯?ä¹¦"
 
 #: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr "å?ªæ??è¯?ä¹¦ç??ä¿¡ä»¶ï¼?è¯?ä¹¦å·²å¯¼å?¥å¹¶æ ¡éª?"
+msgstr "å?ªæ??è¯?ä¹¦ç??æ¶?æ?¯ï¼?è¯?ä¹¦å·²å¯¼å?¥å¹¶æ ¡éª?"
 
 #: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
@@ -2484,7 +2485,7 @@ msgstr "æ? æ³?ä¸ºå? å¯?æ?¹é??å¯?é?¥å??é??å¯?é?¥æ§½"
 
 #: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
-msgstr "æ? æ³?å??å»º CMS ä¿¡ä»¶"
+msgstr "æ? æ³?å??å»º CMS æ¶?æ?¯"
 
 #: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
@@ -2692,20 +2693,20 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "æ? æ³?è§£æ?? URLâ??%sâ??"
 
-#: ../camel/camel-vee-folder.c:1044
+#: ../camel/camel-vee-folder.c:1045
 #, c-format
 msgid "Error storing '%s': "
 msgstr "å?å?¨â??%sâ??å?ºé??ï¼?"
 
-#: ../camel/camel-vee-folder.c:1117
+#: ../camel/camel-vee-folder.c:1118
 #, c-format
 msgid "No such message %s in %s"
-msgstr "å?¨ %2$s ä¸æ²¡æ??ä¿¡ä»¶ %1$s"
+msgstr "å?¨ %2$s ä¸æ²¡æ??æ¶?æ?¯ %1$s"
 
-#: ../camel/camel-vee-folder.c:1133 ../camel/camel-vee-folder.c:1148
+#: ../camel/camel-vee-folder.c:1134 ../camel/camel-vee-folder.c:1149
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "æ? æ³?å°?ä¿¡ä»¶ç§»å?¨æ??å¤?å?¶å?°è??æ??æ??ä»¶å¤¹ä¸"
+msgstr "æ? æ³?å°?æ¶?æ?¯ç§»å?¨æ??å¤?å?¶å?°è??æ??æ??ä»¶å¤¹ä¸"
 
 #: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
 #: ../camel/camel-vee-store.c:417
@@ -2724,11 +2725,11 @@ msgstr "æ? æ³?å? é?¤æ??ä»¶å¤¹ï¼?%sï¼?æ²¡æ??è¯¥æ??ä»¶å¤¹"
 
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
-msgstr "æ? æ³?å°?ä¿¡ä»¶å¤?å?¶å?°å??æ?¶ç«?æ??ä»¶å¤¹"
+msgstr "æ? æ³?å°?æ¶?æ?¯å¤?å?¶å?°å??æ?¶ç«?æ??ä»¶å¤¹"
 
 #: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
-msgstr "æ? æ³?å°?ä¿¡ä»¶å¤?å?¶å?°å??å?¾é?®ä»¶æ??ä»¶å¤¹"
+msgstr "æ? æ³?å°?æ¶?æ?¯å¤?å?¶å?°å??å?¾é?®ä»¶æ??ä»¶å¤¹"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
@@ -2736,7 +2737,7 @@ msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
-"æ? æ³?è?·å??ä¿¡ä»¶ï¼?%s\n"
+"æ? æ³?è?·å??æ¶?æ?¯ï¼?%s\n"
 "  %s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:139
@@ -2747,7 +2748,7 @@ msgstr ""
 #: ../camel/providers/local/camel-mbox-folder.c:380
 #: ../camel/providers/local/camel-mh-folder.c:215
 msgid "No such message"
-msgstr "æ²¡æ??è¯¥ä¿¡ä»¶"
+msgstr "æ²¡æ??è¯¥æ¶?æ?¯"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:158
 #: ../camel/providers/nntp/camel-nntp-folder.c:244
@@ -2755,55 +2756,55 @@ msgstr "æ²¡æ??è¯¥ä¿¡ä»¶"
 #: ../camel/providers/pop3/camel-pop3-folder.c:714
 #, c-format
 msgid "Cannot get message %s: "
-msgstr "æ? æ³?è?·å??ä¿¡ä»¶ %sï¼?"
+msgstr "æ? æ³?è?·å??æ¶?æ?¯ %sï¼?"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:176
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:186
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2645
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2672
 #, c-format
 msgid "This message is not available in offline mode."
-msgstr "è¯¥ä¿¡ä»¶æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨ã??"
+msgstr "è¯¥æ¶?æ?¯æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨ã??"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:203
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:213
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2190
 #, c-format
 msgid "Could not get message"
-msgstr "æ? æ³?è?·å¾?ä¿¡ä»¶"
+msgstr "æ? æ³?è?·å¾?æ¶?æ?¯"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1038
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1070
 #: ../camel/providers/imap/camel-imap-folder.c:376
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "æ? æ³?ä¸º %s è½½å?¥æ¦?è¦?"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1144
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "æ£?æ?¥å·²å? é?¤ç??æ?°å»º %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1670
 #: ../camel/providers/groupwise/camel-groupwise-store.c:654
 #: ../camel/providers/groupwise/camel-groupwise-store.c:779
 #: ../camel/providers/imap/camel-imap-folder.c:3814
 #: ../camel/providers/imap/camel-imap-folder.c:3892
-#: ../camel/providers/imapx/camel-imapx-server.c:3719
-#: ../camel/providers/imapx/camel-imapx-server.c:3844
+#: ../camel/providers/imapx/camel-imapx-server.c:3765
+#: ../camel/providers/imapx/camel-imapx-server.c:3889
 #, c-format
 msgid "Fetching summary information for new messages in %s"
-msgstr "ä»? %s ä¸ç??æ?°ä¿¡ä»¶ä¸è?·å??æ¦?è¦?ä¿¡æ?¯"
+msgstr "ä»? %s ä¸ç??æ?°æ¶?æ?¯ä¸è?·å??æ¦?è¦?ä¿¡æ?¯"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2475
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2525
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2502
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2552
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
-msgstr "æ? æ³?å°?ä¿¡ä»¶è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?%s"
+msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?%s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2511
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2538
 #, c-format
 msgid "Cannot create message: %s"
-msgstr "æ? æ³?å??å»ºä¿¡ä»¶ï¼?%s"
+msgstr "æ? æ³?å??å»ºæ¶?æ?¯ï¼?%s"
 
 #: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
@@ -2813,11 +2814,11 @@ msgstr "æ? æ³?è?·å¾?æ??ä»¶å¤¹å®¹å?¨ %s"
 #: ../camel/providers/groupwise/camel-groupwise-journal.c:303
 #, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?è¿½å? ä¿¡ä»¶ï¼?ç¼?å?ä¸?å?¯ç?¨"
+msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?è¿½å? æ¶?æ?¯ï¼?ç¼?å?ä¸?å?¯ç?¨"
 
 #: ../camel/providers/groupwise/camel-groupwise-journal.c:320
 msgid "Cannot append message in offline mode: "
-msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?è¿½å? ä¿¡ä»¶ï¼?"
+msgstr "æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸?è¿½å? æ¶?æ?¯ï¼?"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
@@ -2825,13 +2826,13 @@ msgstr "æ£?æ?¥æ?°é?®ä»¶"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "C_heck for new messages in all folders"
-msgstr "å?¨æ??æ??æ??ä»¶å¤¹ä¸æ£?æ?¥æ?°ä¿¡ä»¶(_H)"
+msgstr "å?¨æ??æ??æ??ä»¶å¤¹ä¸æ£?æ?¥æ?°æ¶?æ?¯(_H)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
 #: ../camel/providers/local/camel-local-provider.c:42
 #: ../camel/providers/local/camel-local-provider.c:82
 #: ../camel/providers/local/camel-local-provider.c:102
@@ -2840,15 +2841,15 @@ msgstr "é??é¡¹"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "åº?ç?¨è¿?æ»¤è§?å??å?°æ¤æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_A)"
+msgstr "åº?ç?¨è¿?æ»¤è§?å??å?°æ¤æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°æ¶?æ?¯(_A)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
-msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??å®¹(_U)"
+msgstr "æ£?æ?¥æ?°æ¶?æ?¯ç??å??å?¾å??å®¹(_U)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "ä»?å?¨æ?¶ä»¶ç®±ä¸æ£?æ?¥å??å?¾é?®ä»¶(_B)"
 
@@ -2874,7 +2875,7 @@ msgstr "è®¿é?® Novell GroupWise æ??å?¡å?¨"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:98
 #: ../camel/providers/imap/camel-imap-provider.c:97
-#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
 #: ../camel/providers/nntp/camel-nntp-provider.c:72
 #: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
@@ -2892,7 +2893,7 @@ msgstr "URL ä¸ç??ä¸»æ?ºæ??ç?¨æ?·ä¸?å?¯ç?¨"
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:207
 #: ../camel/providers/imap/camel-imap-store.c:1188
-#: ../camel/providers/imapx/camel-imapx-server.c:2972
+#: ../camel/providers/imapx/camel-imapx-server.c:3016
 #, c-format
 msgid "You did not enter a password."
 msgstr "æ?¨æ²¡æ??è¾?å?¥å¯?ç ?ã??"
@@ -2904,7 +2905,7 @@ msgstr "æ??äº?ç?¹æ?§å?¯è?½æ? æ³?ä¸?æ?¨ç?®å??ç??æ??å?¡å?¨ç??æ?¬å?±å??å·¥ä½?"
 #: ../camel/providers/groupwise/camel-groupwise-store.c:550
 #: ../camel/providers/imap/camel-imap-store.c:1757
 #: ../camel/providers/imap/camel-imap-store.c:1952
-#: ../camel/providers/imapx/camel-imapx-store.c:412
+#: ../camel/providers/imapx/camel-imapx-store.c:421
 #, c-format
 msgid "No such folder %s"
 msgstr "æ²¡æ??æ??ä»¶å¤¹ %s"
@@ -2922,7 +2923,7 @@ msgstr "æ? æ³?å??å»ºç?¹æ®?ç³»ç»?æ??ä»¶å¤¹"
 #: ../camel/providers/groupwise/camel-groupwise-store.c:1206
 #: ../camel/providers/imap/camel-imap-store.c:1835
 #: ../camel/providers/imap/camel-imap-store.c:2257
-#: ../camel/providers/imapx/camel-imapx-store.c:875
+#: ../camel/providers/imapx/camel-imapx-store.c:884
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "ç?¶æ??ä»¶å¤¹ä¸?å??è®¸å?«æ??å?æ??ä»¶å¤¹"
@@ -2951,7 +2952,7 @@ msgstr "é??è¿? %s å??é?? GroupWise é?®ä»¶"
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
-msgstr "å??é??ä¿¡ä»¶"
+msgstr "å??é??æ¶?æ?¯"
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:105
 #, c-format
@@ -2971,7 +2972,7 @@ msgstr ""
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #, c-format
 msgid "Could not send message: %s"
-msgstr "æ? æ³?å??é??ä¿¡ä»¶ï¼?%s"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-command.c:190
 #: ../camel/providers/imap/camel-imap-command.c:288
@@ -3041,32 +3042,32 @@ msgid "Could not create directory %s: %s"
 msgstr "æ? æ³?å??å»ºç?®å½? %sï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3759
+#: ../camel/providers/imapx/camel-imapx-server.c:3805
 #, c-format
 msgid "Scanning for changed messages in %s"
-msgstr "æ?«æ?? %s ä¸æ?´æ?¹äº?ç??ä¿¡ä»¶"
+msgstr "æ?«æ?? %s ä¸æ?´æ?¹äº?ç??æ¶?æ?¯"
 
 #: ../camel/providers/imap/camel-imap-folder.c:3231
 msgid "Unable to retrieve message: "
-msgstr "æ? æ³?è?·å??ä¿¡ä»¶ï¼?"
+msgstr "æ? æ³?è?·å??æ¶?æ?¯ï¼?"
 
 #: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4937
+#: ../camel/providers/imapx/camel-imapx-server.c:4991
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
-msgstr "æ? æ³?è?·å??ä¿¡ä»¶ ID %sï¼?%s"
+msgstr "æ? æ³?è?·å??æ¶?æ?¯ ID %sï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-folder.c:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4938
+#: ../camel/providers/imapx/camel-imapx-server.c:4992
 msgid "No such message available."
-msgstr "æ²¡æ??è¯¥ä¿¡ä»¶ã??"
+msgstr "æ²¡æ??è¯¥æ¶?æ?¯ã??"
 
 #: ../camel/providers/imap/camel-imap-folder.c:3341
 #: ../camel/providers/imap/camel-imap-folder.c:4211
 #: ../camel/providers/nntp/camel-nntp-folder.c:326
 #, c-format
 msgid "This message is not currently available"
-msgstr "è¯¥ä¿¡ä»¶ç?®å??ä¸?å?¯ç?¨"
+msgstr "è¯¥æ¶?æ?¯ç?®å??ä¸?å?¯ç?¨"
 
 #: ../camel/providers/imap/camel-imap-folder.c:4021
 #, c-format
@@ -3091,12 +3092,12 @@ msgstr "æ? æ³?æ??å¼?ç¼?å?ç?®å½?ï¼?"
 #: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
-msgstr "ç¼?å?ä¿¡ä»¶ %s å¤±è´¥ï¼?%s"
+msgstr "ç¼?å?æ¶?æ?¯ %s å¤±è´¥ï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:388
 #, c-format
 msgid "Failed to cache message %s: "
-msgstr "ç¼?å?ä¿¡ä»¶ %s å¤±è´¥ï¼?"
+msgstr "ç¼?å?æ¶?æ?¯ %s å¤±è´¥ï¼?"
 
 #: ../camel/providers/imap/camel-imap-message-cache.c:525
 #, c-format
@@ -3104,22 +3105,22 @@ msgid "Failed to cache %s: "
 msgstr "ç¼?å? %s å¤±è´¥ï¼?"
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Checking for New Mail"
 msgstr "æ£?æ?¥æ?°é?®ä»¶"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
-msgstr "å?¨è®¢é??ç??æ??ä»¶å¤¹ä¸æ£?æ?¥æ?°ä¿¡ä»¶(_E)"
+msgstr "å?¨è®¢é??ç??æ??ä»¶å¤¹ä¸æ£?æ?¥æ?°æ¶?æ?¯(_E)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
 msgid "Connection to Server"
 msgstr "è¿?æ?¥æ??å?¡å?¨"
 
 #: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Use custom command to connect to server"
 msgstr "ä½¿ç?¨è?ªå®?ä¹?å?½ä»¤è¿?æ?¥å?°æ??å?¡å?¨(_U)"
 
@@ -3128,18 +3129,18 @@ msgid "Co_mmand:"
 msgstr "å?½ä»¤(_M)ï¼?"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
 #: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "æ??ä»¶å¤¹"
 
 #: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 msgid "_Show only subscribed folders"
 msgstr "å?ªæ?¾ç¤ºè®¢é??äº?ç??æ??ä»¶å¤¹(_S)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "O_verride server-supplied folder namespace"
 msgstr "è¦?ç??æ??å?¡å?¨æ??ä¾?ç??æ??ä»¶å¤¹å?½å??ç©ºé?´(_V)"
 
@@ -3148,17 +3149,17 @@ msgid "Names_pace:"
 msgstr "å?½å??ç©ºé?´(_P)ï¼?"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "åº?ç?¨è¿?æ»¤è§?å??å?°æ?¬æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡ä»¶(_A)"
+msgstr "åº?ç?¨è¿?æ»¤è§?å??å?°æ?¬æ??å?¡å?¨ä¸?æ?¶ä»¶ç®±ä¸ç??æ?°æ¶?æ?¯(_A)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:77
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
-msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??å®¹(_K)"
+msgstr "æ£?æ?¥æ?°æ¶?æ?¯ç??å??å?¾å??å®¹(_K)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "è?ªå?¨å°?è¿?ç¨?é?®ä»¶å??æ¥å?°æ?¬å?°(_Z)"
 
@@ -3167,23 +3168,23 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:91
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP æ??å?¡å?¨ä¸?ç??é?®ä»¶ç??è¯»å??ã??"
 
 #: ../camel/providers/imap/camel-imap-provider.c:99
-#: ../camel/providers/imapx/camel-imapx-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:106
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "è¯¥é??é¡¹å°?ä½¿ç?¨çº¯æ??æ?¬å¯?ç ?è¿?æ?¥å?° IMAP æ??å?¡å?¨ã??"
 
 #: ../camel/providers/imap/camel-imap-store.c:310
-#: ../camel/providers/imapx/camel-imapx-store.c:224
+#: ../camel/providers/imapx/camel-imapx-store.c:228
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP æ??å?¡å?¨ %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:312
-#: ../camel/providers/imapx/camel-imapx-store.c:226
+#: ../camel/providers/imapx/camel-imapx-store.c:230
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%2$s ä¸º %1$s æ??ä¾?ç?? IMAP æ??å?¡"
@@ -3213,20 +3214,20 @@ msgstr "æ? æ³?è¿?æ?¥å?° %sï¼?"
 #: ../camel/providers/imap/camel-imap-store.c:592
 #: ../camel/providers/imap/camel-imap-store.c:599
 #: ../camel/providers/imap/camel-imap-store.c:626
-#: ../camel/providers/imapx/camel-imapx-server.c:2825
-#: ../camel/providers/imapx/camel-imapx-server.c:2861
+#: ../camel/providers/imapx/camel-imapx-server.c:2869
+#: ../camel/providers/imapx/camel-imapx-server.c:2905
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "ä»¥å®?å?¨æ¨¡å¼?è¿?æ?¥å?° IMAP æ??å?¡å?¨ %s å¤±è´¥ï¼?%s"
 
 #: ../camel/providers/imap/camel-imap-store.c:573
-#: ../camel/providers/imapx/camel-imapx-server.c:2826
+#: ../camel/providers/imapx/camel-imapx-server.c:2870
 #: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "ä¸?æ?¯æ?? STARTTLS"
 
 #: ../camel/providers/imap/camel-imap-store.c:593
-#: ../camel/providers/imapx/camel-imapx-server.c:2862
+#: ../camel/providers/imapx/camel-imapx-server.c:2906
 msgid "SSL negotiations failed"
 msgstr "SSL å??å??å¤±è´¥"
 
@@ -3236,13 +3237,13 @@ msgid "SSL is not available in this build"
 msgstr "æ?¬æ¬¡ç¼?è¯?ä¸æ?ªå??å?« SSL"
 
 #: ../camel/providers/imap/camel-imap-store.c:748
-#: ../camel/providers/imapx/camel-imapx-server.c:2662
+#: ../camel/providers/imapx/camel-imapx-server.c:2706
 #, c-format
 msgid "Connection cancelled"
 msgstr "è¿?æ?¥å·²å??æ¶?"
 
 #: ../camel/providers/imap/camel-imap-store.c:753
-#: ../camel/providers/imapx/camel-imapx-server.c:2667
+#: ../camel/providers/imapx/camel-imapx-server.c:2711
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "æ? æ³?ä½¿ç?¨å?½ä»¤â??%sâ??è¿?æ?¥ï¼?%s"
@@ -3250,32 +3251,32 @@ msgstr "æ? æ³?ä½¿ç?¨å?½ä»¤â??%sâ??è¿?æ?¥ï¼?%s"
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
 #: ../camel/providers/imap/camel-imap-store.c:926
 #: ../camel/providers/imap/camel-imap-store.c:2350
-#: ../camel/providers/imapx/camel-imapx-store.c:459
-#: ../camel/providers/imapx/camel-imapx-store.c:1056
+#: ../camel/providers/imapx/camel-imapx-store.c:468
+#: ../camel/providers/imapx/camel-imapx-store.c:1065
 #: ../camel/providers/local/camel-maildir-folder.c:90
 #: ../camel/providers/local/camel-maildir-store.c:225
 #: ../camel/providers/local/camel-maildir-store.c:315
-#: ../camel/providers/local/camel-maildir-store.c:562
-#: ../camel/providers/local/camel-maildir-store.c:575
+#: ../camel/providers/local/camel-maildir-store.c:567
+#: ../camel/providers/local/camel-maildir-store.c:580
 #: ../camel/providers/local/camel-spool-store.c:508
 msgid "Inbox"
 msgstr "æ?¶ä»¶ç®±"
 
 #: ../camel/providers/imap/camel-imap-store.c:1129
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/imapx/camel-imapx-server.c:2972
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP æ??å?¡å?¨ %s ä¸?æ?¯æ??è¦?æ±?ç??éª?è¯?ç±»å?? %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:1141
-#: ../camel/providers/imapx/camel-imapx-server.c:2940
+#: ../camel/providers/imapx/camel-imapx-server.c:2984
 #: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ä¸?æ?¯æ??éª?è¯?ç±»å?? %s"
 
 #: ../camel/providers/imap/camel-imap-store.c:1220
-#: ../camel/providers/imapx/camel-imapx-server.c:3010
+#: ../camel/providers/imapx/camel-imapx-server.c:3054
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3288,7 +3289,7 @@ msgstr ""
 
 #: ../camel/providers/imap/camel-imap-store.c:1771
 #: ../camel/providers/imap/camel-imap-store.c:2193
-#: ../camel/providers/imapx/camel-imapx-store.c:854
+#: ../camel/providers/imapx/camel-imapx-store.c:863
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -3303,7 +3304,7 @@ msgid "Cannot create folder '%s': folder exists."
 msgstr "æ? æ³?å??å»ºæ??ä»¶å¤¹â??%sâ??ï¼?æ??ä»¶å¤¹å·²å?å?¨ã??"
 
 #: ../camel/providers/imap/camel-imap-store.c:2206
-#: ../camel/providers/imapx/camel-imapx-store.c:865
+#: ../camel/providers/imapx/camel-imapx-store.c:874
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "æ?ªç?¥ç??ç?¶æ??ä»¶å¤¹ï¼?%s"
@@ -3317,79 +3318,79 @@ msgstr "æ??å?¡å?¨æ??å¤?æ?å¼? "
 msgid "Server unexpectedly disconnected: "
 msgstr "æ??å?¡å?¨æ??å¤?æ?å¼?ï¼?"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:75
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "æ? æ³?ä¸º %s å??å»ºæ??ä»¶å¤¹æ¦?è¦?"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:83
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "æ? æ³?ä¸º %s å??å»ºç¼?å?ï¼?"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Use _Quick Resync if the server supports it"
 msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??å??ä½¿ç?¨å¿«é??é??æ?°å??æ¥(_Q)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use I_dle if the server supports it"
 msgstr "å¦?æ??æ??å?¡å?¨æ?¯æ??ç??è¯?ä½¿ç?¨ I_DLE"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
 msgstr "å?½ä»¤ï¼?"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Numbe_r of cached connections to use"
 msgstr "ä½¿ç?¨ç??ç¼?å?è¿?æ?¥ç??æ?°ç?®(_R)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "å?½å??ç©ºé?´ï¼?"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1365
+#: ../camel/providers/imapx/camel-imapx-server.c:1396
 msgid "Error writing to cache stream: "
 msgstr "å??å?¥ç¼?å?æµ?é??è¯¯ï¼?"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2019
+#: ../camel/providers/imapx/camel-imapx-server.c:2054
 #, c-format
 msgid "Not authenticated"
 msgstr "æ²¡æ??éª?è¯?"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2753
+#: ../camel/providers/imapx/camel-imapx-server.c:2797
 #, c-format
 msgid "Could not connect to %s (port %s): "
 msgstr "æ? æ³?è¿?æ?¥å?° %s(ç«¯å?£ %s)ï¼?"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3182
+#: ../camel/providers/imapx/camel-imapx-server.c:3226
 msgid "Closing tmp stream failed: "
 msgstr "å?³é?ä¸´æ?¶æµ?å¤±è´¥ï¼?"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5061
+#: ../camel/providers/imapx/camel-imapx-server.c:5116
 #, c-format
 msgid "Cannot create spool file: %s"
 msgstr "æ? æ³?å??å»ºè?±æ?ºæ??ä»¶ï¼?%s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5076
+#: ../camel/providers/imapx/camel-imapx-server.c:5132
 msgid "Cannot create spool file: "
 msgstr "æ? æ³?å??å»ºè?±æ?ºæ??ä»¶ï¼?"
 
-#: ../camel/providers/imapx/camel-imapx-store.c:428
+#: ../camel/providers/imapx/camel-imapx-store.c:437
 #: ../camel/providers/nntp/camel-nntp-store.c:1510
 #, c-format
 msgid "No such folder: %s"
 msgstr "æ²¡æ??æ??ä»¶å¤¹ï¼?%s"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:71
+#: ../camel/providers/imapx/camel-imapx-stream.c:68
 #, c-format
 msgid "Source stream returned no data"
 msgstr "æº?æµ?æ²¡è¿?å??æ?°æ?®"
 
-#: ../camel/providers/imapx/camel-imapx-stream.c:80
+#: ../camel/providers/imapx/camel-imapx-stream.c:77
 #, c-format
 msgid "Source stream unavailable"
 msgstr "æº?æµ?ä¸?å?¯ç?¨"
@@ -3414,13 +3415,13 @@ msgstr "%s (%s)"
 msgid "Index message body data"
 msgstr "ç´¢å¼?ä¿¡ä½?æ?°æ?®"
 
-#: ../camel/providers/local/camel-local-folder.c:686
+#: ../camel/providers/local/camel-local-folder.c:677
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
 "%s"
 msgstr ""
-"æ? æ³?ä»?æ??ä»¶å¤¹ %2$s è?·å??ä¿¡ä»¶ %1$s\n"
+"æ? æ³?ä»?æ??ä»¶å¤¹ %2$s è?·å??æ¶?æ?¯ %1$s\n"
 "%3$s"
 
 #: ../camel/providers/local/camel-local-provider.c:44
@@ -3450,7 +3451,7 @@ msgstr ""
 #: ../camel/providers/local/camel-local-provider.c:84
 #: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
-msgstr "å¯¹ INBOX ä¸ç??æ?°ä¿¡ä»¶åº?ç?¨è¿?æ»¤è§?å??(_A)"
+msgstr "å¯¹ INBOX ä¸ç??æ?°æ¶?æ?¯åº?ç?¨è¿?æ»¤è§?å??(_A)"
 
 #: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
@@ -3481,53 +3482,53 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "æ ?å?? Unix mbox è?±æ?ºç?®å½?"
 
-#: ../camel/providers/local/camel-local-store.c:149
-#: ../camel/providers/local/camel-local-store.c:284
+#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:305
 #: ../camel/providers/local/camel-mbox-store.c:371
 #: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "å?å?¨æ ¹ç?®å½? %s ä¸?æ?¯ç»?å¯¹è·¯å¾?"
 
-#: ../camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-local-store.c:179
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "å?å?¨æ ¹ç?®å½? %s ä¸?æ?¯æ?®é??ç?®å½?"
 
-#: ../camel/providers/local/camel-local-store.c:169
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:297
+#: ../camel/providers/local/camel-local-store.c:190
+#: ../camel/providers/local/camel-local-store.c:200
+#: ../camel/providers/local/camel-local-store.c:318
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "æ? æ³?è?·å??æ??ä»¶å¤¹ï¼?%sï¼?%s"
 
-#: ../camel/providers/local/camel-local-store.c:193
+#: ../camel/providers/local/camel-local-store.c:214
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "æ?¬å?°å?å?¨æ²¡æ??æ?¶ä»¶ç®±"
 
-#: ../camel/providers/local/camel-local-store.c:250
+#: ../camel/providers/local/camel-local-store.c:271
 #, c-format
 msgid "Local mail file %s"
 msgstr "æ?¬å?°é?®ä»¶æ??ä»¶ %s"
 
-#: ../camel/providers/local/camel-local-store.c:358
+#: ../camel/providers/local/camel-local-store.c:379
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "æ? æ³?å°?æ??ä»¶å¤¹ %s æ?¹å??ä¸º %sï¼?%s"
 
-#: ../camel/providers/local/camel-local-store.c:431
+#: ../camel/providers/local/camel-local-store.c:452
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "æ? æ³?é??å?½å??â??%sâ??ï¼?%s"
 
-#: ../camel/providers/local/camel-local-store.c:461
+#: ../camel/providers/local/camel-local-store.c:482
 #: ../camel/providers/local/camel-mbox-store.c:304
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "æ? æ³?å? é?¤æ??ä»¶å¤¹ç´¢å¼?æ??ä»¶â??%sâ??ï¼?%s"
 
-#: ../camel/providers/local/camel-local-store.c:489
+#: ../camel/providers/local/camel-local-store.c:510
 #: ../camel/providers/local/camel-mbox-store.c:333
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
@@ -3536,12 +3537,12 @@ msgstr "æ? æ³?å? é?¤æ??ä»¶å¤¹å??æ??ä»¶â??%sâ??ï¼?%s"
 #: ../camel/providers/local/camel-local-summary.c:537
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
-msgstr "æ? æ³?å°?ä¿¡ä»¶æ·»å? å?°æ¦?è¦?ä¸ï¼?æ?ªç?¥ç??å??å? "
+msgstr "æ? æ³?å°?æ¶?æ?¯æ·»å? å?°æ¦?è¦?ä¸ï¼?æ?ªç?¥ç??å??å? "
 
 #: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
-msgstr "æ? æ³?å°?ä¿¡ä»¶é??å? å?°é?®ä»¶ç?®å½?æ??ä»¶å¤¹ï¼?%sï¼?"
+msgstr "æ? æ³?å°?æ¶?æ?¯é??å? å?°é?®ä»¶ç?®å½?æ??ä»¶å¤¹ï¼?%sï¼?"
 
 #: ../camel/providers/local/camel-maildir-folder.c:283
 #: ../camel/providers/local/camel-maildir-folder.c:291
@@ -3550,12 +3551,12 @@ msgstr "æ? æ³?å°?ä¿¡ä»¶é??å? å?°é?®ä»¶ç?®å½?æ??ä»¶å¤¹ï¼?%sï¼?"
 #: ../camel/providers/local/camel-mh-folder.c:235
 #, c-format
 msgid "Cannot get message %s from folder %s: "
-msgstr "æ? æ³?ä»?æ??ä»¶å¤¹ %2$s è?·å??ä¿¡ä»¶ %1$sï¼?"
+msgstr "æ? æ³?ä»?æ??ä»¶å¤¹ %2$s è?·å??æ¶?æ?¯ %1$sï¼?"
 
 #: ../camel/providers/local/camel-maildir-folder.c:399
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
-msgstr "æ? æ³?å°?ä¿¡ä»¶è½¬ç§»å?°ç?®æ ?æ??ä»¶å¤¹ï¼?%s"
+msgstr "æ? æ³?å°?æ¶?æ?¯è½¬ç§»å?°ç?®æ ?æ??ä»¶å¤¹ï¼?%s"
 
 #: ../camel/providers/local/camel-maildir-store.c:136
 #: ../camel/providers/local/camel-maildir-store.c:167
@@ -3595,7 +3596,7 @@ msgstr "æ? æ³?å? é?¤æ??ä»¶å¤¹â??%sâ??ï¼?%s"
 msgid "not a maildir directory"
 msgstr "ä¸?æ?¯ maildir ç?®å½?"
 
-#: ../camel/providers/local/camel-maildir-store.c:482
+#: ../camel/providers/local/camel-maildir-store.c:487
 #: ../camel/providers/local/camel-spool-store.c:364
 #: ../camel/providers/local/camel-spool-store.c:380
 #, c-format
@@ -3614,7 +3615,7 @@ msgstr "æ£?æ?¥æ??ä»¶å¤¹ä¸?è?´æ?§"
 
 #: ../camel/providers/local/camel-maildir-summary.c:641
 msgid "Checking for new messages"
-msgstr "æ£?æ?¥æ?°ä¿¡ä»¶"
+msgstr "æ£?æ?¥æ?°æ¶?æ?¯"
 
 #: ../camel/providers/local/camel-maildir-summary.c:732
 #: ../camel/providers/local/camel-mbox-summary.c:465
@@ -3638,7 +3639,7 @@ msgstr "æ? æ³?æ??å¼?é?®ä»¶ç®±ï¼?%sï¼?"
 #: ../camel/providers/local/camel-mbox-folder.c:260
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
-msgstr "æ? æ³?å°?ä¿¡ä»¶é??å? å?°é?®ä»¶ç®±æ??ä»¶ï¼?%sï¼?"
+msgstr "æ? æ³?å°?æ¶?æ?¯é??å? å?°é?®ä»¶ç®±æ??ä»¶ï¼?%sï¼?"
 
 #: ../camel/providers/local/camel-mbox-folder.c:433
 msgid "The folder appears to be irrecoverably corrupted."
@@ -3795,7 +3796,7 @@ msgstr "å??å?¥ä¸´æ?¶ mailbox å¤±è´¥ï¼?%sï¼?%s"
 #: ../camel/providers/local/camel-mh-folder.c:165
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
-msgstr "æ? æ³?å°?ä¿¡ä»¶é??å? å?° mh æ??ä»¶å¤¹ï¼?%sï¼?"
+msgstr "æ? æ³?å°?æ¶?æ?¯é??å? å?° mh æ??ä»¶å¤¹ï¼?%sï¼?"
 
 #: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
@@ -3918,7 +3919,7 @@ msgstr "å??é?¨é??è¯¯ï¼?UID ç??æ ¼å¼?æ? æ??ï¼?%s"
 #: ../camel/providers/pop3/camel-pop3-folder.c:706
 #, c-format
 msgid "Cannot get message %s: %s"
-msgstr "æ? æ³?è?·å??ä¿¡ä»¶ %sï¼?%s"
+msgstr "æ? æ³?è?·å??æ¶?æ?¯ %sï¼?%s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:465
 #: ../camel/providers/nntp/camel-nntp-folder.c:471
@@ -3934,12 +3935,12 @@ msgstr "å??è¡¨å¤±è´¥ï¼?"
 #: ../camel/providers/nntp/camel-nntp-folder.c:541
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "æ?¨ç¦»çº¿æ?¶æ? æ³?æ??é?? NNTP ä¿¡ä»¶ï¼?"
+msgstr "æ?¨ç¦»çº¿æ?¶æ? æ³?æ??é?? NNTP æ¶?æ?¯ï¼?"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:560
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "æ?¨æ? æ³?ä»? NNTP æ??ä»¶å¤¹å¤?å?¶ä¿¡ä»¶ï¼?"
+msgstr "æ?¨æ? æ³?ä»? NNTP æ??ä»¶å¤¹å¤?å?¶æ¶?æ?¯ï¼?"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
@@ -4050,7 +4051,7 @@ msgstr "æ?ªè¿?æ?¥ã??"
 #: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%sï¼?æ£å?¨æ?«æ??æ?°ä¿¡ä»¶"
+msgstr "%sï¼?æ£å?¨æ?«æ??æ?°æ¶?æ?¯"
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
@@ -4078,24 +4079,24 @@ msgstr "æ? æ³?è?·å?? POP æ¦?è¦?ï¼?%s"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:324
 msgid "Expunging old messages"
-msgstr "é??æ¯?æ?§ä¿¡ä»¶"
+msgstr "é??æ¯?æ?§æ¶?æ?¯"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:332
 msgid "Expunging deleted messages"
-msgstr "å½»åº?é??æ¯?å·²å? é?¤ç??ä¿¡ä»¶"
+msgstr "å½»åº?é??æ¯?å·²å? é?¤ç??æ¶?æ?¯"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:566
 #: ../camel/providers/pop3/camel-pop3-folder.c:596
 #, c-format
 msgid "No message with UID %s"
-msgstr "æ²¡æ?? UID ä¸º %s ç??ä¿¡ä»¶"
+msgstr "æ²¡æ?? UID ä¸º %s ç??æ¶?æ?¯"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
 #: ../camel/providers/pop3/camel-pop3-folder.c:603
 #, c-format
 msgid "Retrieving POP message %d"
-msgstr "æ£å?¨è?·å?? POP ä¿¡ä»¶ %d"
+msgstr "æ£å?¨è?·å?? POP æ¶?æ?¯ %d"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:707
 msgid "Unknown reason"
@@ -4103,11 +4104,11 @@ msgstr "æ?ªç?¥å??å? "
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
-msgstr "ä¿¡ä»¶å?å?¨"
+msgstr "æ¶?æ?¯å?å?¨"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
-msgstr "å?¨æ??å?¡å?¨ä¸?ä¿?ç??ä¿¡ä»¶(_L)"
+msgstr "å?¨æ??å?¡å?¨ä¸?ä¿?ç??æ¶?æ?¯(_L)"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
@@ -4292,7 +4293,7 @@ msgstr "æ? æ³?å??å»º sendmail è¿?ç¨?ï¼?%sï¼?é?®ä»¶æ?ªå??é??"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:194
 msgid "Could not send message: "
-msgstr "æ? æ³?å??é??ä¿¡ä»¶ï¼?"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?"
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
@@ -4347,7 +4348,7 @@ msgstr "ç³»ç»?ç?¶æ??ï¼?æ??ç³»ç»?æ±?å?©å°±ç»ª"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:126
 msgid "Help message"
-msgstr "å¸®å?©ä¿¡ä»¶"
+msgstr "å¸®å?©æ¶?æ?¯"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
@@ -4468,26 +4469,26 @@ msgstr "é??è¿? %s å??é?? SMTP é?®ä»¶"
 #: ../camel/providers/smtp/camel-smtp-transport.c:691
 #, c-format
 msgid "Cannot send message: service not connected."
-msgstr "æ? æ³?å??é??ä¿¡ä»¶ï¼?æ??å?¡æ?ªè¿?æ?¥ã??"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?æ??å?¡æ?ªè¿?æ?¥ã??"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:698
 #, c-format
 msgid "Cannot send message: sender address not valid."
-msgstr "æ? æ³?å??é??ä¿¡ä»¶ï¼?å??ä»¶äººå?°å??ä¸?å??æ³?ã??"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?å??ä»¶äººå?°å??ä¸?å??æ³?ã??"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Sending message"
-msgstr "å??é??ä¿¡ä»¶"
+msgstr "å??é??æ¶?æ?¯"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:718
 #, c-format
 msgid "Cannot send message: no recipients defined."
-msgstr "æ? æ³?å??é??ä¿¡ä»¶ï¼?æ²¡æ??å®?ä¹?æ?¶ä»¶äººã??"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?æ²¡æ??å®?ä¹?æ?¶ä»¶äººã??"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:730
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "æ? æ³?å??é??ä¿¡ä»¶ï¼?ä¸?ä¸ªæ??å¤?ä¸ªé??æ³?æ?¶ä»¶äºº"
+msgstr "æ? æ³?å??é??æ¶?æ?¯ï¼?ä¸?ä¸ªæ??å¤?ä¸ªé??æ³?æ?¶ä»¶äºº"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:966
 msgid "SMTP Greeting"
@@ -4552,85 +4553,85 @@ msgstr "RSET å?½ä»¤å¤±è´¥ï¼?"
 msgid "QUIT command failed: "
 msgstr "QUIT å?½ä»¤å¤±è´¥ï¼?"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:49
 msgid "Business"
 msgstr "å??å?¡"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:50
 msgid "Competition"
 msgstr "å®?æ??"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:51
 msgid "Favorites"
 msgstr "æ??ç?±"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:52
 msgid "Gifts"
 msgstr "ç¤¼ç?©"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:53
 msgid "Goals/Objectives"
 msgstr "ç?®æ ?"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:54
 msgid "Holiday"
 msgstr "å??æ?¥"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:55
 msgid "Holiday Cards"
 msgstr "å??æ?¥å?¡"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:57
 msgid "Hot Contacts"
 msgstr "äº²å¯?è??ç³»äºº"
 
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:58
 msgid "Ideas"
 msgstr "æ?³æ³?"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:59
 msgid "International"
 msgstr "å?½é??"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:60
 msgid "Key Customer"
 msgstr "å?³é?®å®¢æ?·"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:61
 msgid "Miscellaneous"
 msgstr "æ??ç±»"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:62
 msgid "Personal"
 msgstr "ä¸ªäºº"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:63
 msgid "Phone Calls"
 msgstr "é??ç?µè¯?"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:65
 msgid "Status"
 msgstr "ç?¶æ??"
 
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:66
 msgid "Strategies"
 msgstr "ç?ç?¥"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:67
 msgid "Suppliers"
 msgstr "ä¾?åº?å??"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:68
 msgid "Time & Expenses"
 msgstr "æ?¶é?´å??è?±è´¹"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:69
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:70
 msgid "Waiting"
 msgstr "ç?å??"
 
@@ -4772,26 +4773,26 @@ msgstr "å?¿å??è®¿é?® LDAP æ??å?¡å?¨"
 msgid "Failed to authenticate.\n"
 msgstr "èº«ä»½éª?è¯?å¤±è´¥ã??\n"
 
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:166
 msgid "Category Icon"
 msgstr "ç±»å?«å?¾æ ?"
 
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:172
 msgid "_No Image"
 msgstr "æ²¡æ??å?¾å??(_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:368
+#: ../libedataserverui/e-categories-dialog.c:388
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "é??ç½®ä¸å·²ç»?æ??ç±»å?«â??%sâ??äº?ã??è¯·ä½¿ç?¨å?¦å¤?ä¸?ä¸ªå??ç§°"
 
-#: ../libedataserverui/e-categories-dialog.c:676
+#: ../libedataserverui/e-categories-dialog.c:696
 msgid "Icon"
 msgstr "å?¾æ ?"
 
-#: ../libedataserverui/e-categories-dialog.c:681
+#: ../libedataserverui/e-categories-dialog.c:701
 msgid "Category"
 msgstr "ç±»å?«"
 
@@ -4828,19 +4829,19 @@ msgstr "ç±»å?«"
 msgid "Create category \"%s\""
 msgstr "å??å»ºå??ç±»â??%sâ??"
 
-#: ../libedataserverui/e-name-selector-dialog.c:319
+#: ../libedataserverui/e-name-selector-dialog.c:321
 msgid "Select Contacts from Address Book"
 msgstr "ä»?å?°å??ç°¿ä¸é??æ?©è??ç³»äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:658
+#: ../libedataserverui/e-name-selector-dialog.c:660
 msgid "_Add"
 msgstr "æ·»å? (_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:662
+#: ../libedataserverui/e-name-selector-dialog.c:664
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:890
+#: ../libedataserverui/e-name-selector-dialog.c:892
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "ä»»ä½?ç±»å?«"
@@ -4882,25 +4883,25 @@ msgid "_Search:"
 msgstr "æ??ç´¢(_S)ï¼?"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2636
+#: ../libedataserverui/e-name-selector-entry.c:2640
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "åµ?å?¥å¼?å±?å¼? %s(_X)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2651
+#: ../libedataserverui/e-name-selector-entry.c:2655
 #, c-format
 msgid "Cop_y %s"
 msgstr "å¤?å?¶ %s(_Y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2661
+#: ../libedataserverui/e-name-selector-entry.c:2665
 #, c-format
 msgid "C_ut %s"
 msgstr "å?ªå?? %s(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2678
+#: ../libedataserverui/e-name-selector-entry.c:2682
 #, c-format
 msgid "_Edit %s"
 msgstr "ç¼?è¾? %s(_E)"
@@ -4919,19 +4920,19 @@ msgstr "å¯?é?¥ç?¯ä¸?å?¯ç?¨ï¼?æ²¡æ??ç?¨æ?·æ??ä¸»æ?ºå??"
 msgid "You have the Caps Lock key on."
 msgstr "æ?¨æ??å¼?äº? Caps Lockã??"
 
-#: ../libedataserverui/e-passwords.c:1241
+#: ../libedataserverui/e-passwords.c:1243
 msgid "_Remember this passphrase"
 msgstr "è®°ä½?æ¤å¯?ç ?å?¥(_R)"
 
-#: ../libedataserverui/e-passwords.c:1242
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?å?¥(_R)"
 
-#: ../libedataserverui/e-passwords.c:1247
+#: ../libedataserverui/e-passwords.c:1249
 msgid "_Remember this password"
 msgstr "è®°ä½?æ¤å¯?ç ?(_R)"
 
-#: ../libedataserverui/e-passwords.c:1248
+#: ../libedataserverui/e-passwords.c:1250
 msgid "_Remember this password for the remainder of this session"
 msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?(_R)"
 
@@ -4940,7 +4941,7 @@ msgstr "æ?¬æ¬¡ä¼?è¯?è®°ä½?æ¤å¯?ç ?(_R)"
 msgid "Select destination"
 msgstr "é??æ?©ç?®ç??å?°"
 
-#: ../libedataserverui/e-source-selector-dialog.c:172
+#: ../libedataserverui/e-source-selector-dialog.c:174
 msgid "_Destination"
 msgstr "ç?®ç??(_D)"
 
@@ -4973,10 +4974,10 @@ msgstr "æ? æ??å??æ?°"
 #~ msgstr "ç¦»çº¿æ¨¡å¼?ä¸?å?¯ç?¨"
 
 #~ msgid "Cannot open message"
-#~ msgstr "æ? æ³?æ??å¼?ä¿¡ä»¶"
+#~ msgstr "æ? æ³?æ??å¼?æ¶?æ?¯"
 
 #~ msgid "Unsupported operation: append message: for %s"
-#~ msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?é??å? ä¿¡ä»¶ï¼?ä¸º %s"
+#~ msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?é??å? æ¶?æ?¯ï¼?ä¸º %s"
 
 #~ msgid "Unsupported operation: search by expression: for %s"
 #~ msgstr "ä¸?æ?¯æ??ç??æ??ä½?ï¼?æ??è¡¨è¾¾å¼?æ??ç´¢ï¼?æ??ç´¢ %s"
@@ -4998,13 +4999,13 @@ msgstr "æ? æ??å??æ?°"
 #~ msgstr "å·²å??æ¶?ã??"
 
 #~ msgid "This is a digitally signed message part"
-#~ msgstr "è¿?æ?¯ä¿¡ä»¶ç??æ?°å?ç¾å??é?¨å??"
+#~ msgstr "è¿?æ?¯æ¶?æ?¯ç??æ?°å?ç¾å??é?¨å??"
 
 #~ msgid "Cannot verify message signature: could not create temp file: %s"
-#~ msgstr "æ? æ³?æ ¡éª?ä¿¡ä»¶ç¾å??ï¼?æ? æ³?å??å»ºä¸´æ?¶æ??ä»¶ï¼?%s"
+#~ msgstr "æ? æ³?æ ¡éª?æ¶?æ?¯ç¾å??ï¼?æ? æ³?å??å»ºä¸´æ?¶æ??ä»¶ï¼?%s"
 
 #~ msgid "Unable to parse message content"
-#~ msgstr "æ? æ³?å??æ??ä¿¡ä»¶å??å®¹"
+#~ msgstr "æ? æ³?å??æ??æ¶?æ?¯å??å®¹"
 
 #~ msgid "cannot create thread"
 #~ msgstr "æ? æ³?å??å»ºçº¿ç´¢"
@@ -5191,10 +5192,10 @@ msgstr "æ? æ??å??æ?°"
 #~ msgstr "å?¯ç?¨æ??äº?è¿?æ»¤å?¨å??è??æ??æ??ä»¶å¤¹è§?å??æ??é??ç??æ?©å±?é?®ä»¶å??è¡¨æ£?æµ?"
 
 #~ msgid "Expire cached messages that haven't been read in X seconds"
-#~ msgstr "å°?è?¥å¹²ç§?æ?ªé??è¯»ç??ç¼?å?ä¿¡ä»¶è®¾ç½®ä¸ºè¿?æ??"
+#~ msgstr "å°?è?¥å¹²ç§?æ?ªé??è¯»ç??ç¼?å?æ¶?æ?¯è®¾ç½®ä¸ºè¿?æ??"
 
 #~ msgid "Expire cached messages older than X seconds"
-#~ msgstr "å?¨è?¥å¹²ç§?å??å°?ä¿¡ä»¶è®¾ç½®ä¸ºè¿?æ??"
+#~ msgstr "å?¨è?¥å¹²ç§?å??å°?æ¶?æ?¯è®¾ç½®ä¸ºè¿?æ??"
 
 #~ msgid "Cannot access folder '%s': %s"
 #~ msgstr "æ? æ³?è®¿é?®æ??ä»¶å¤¹â??%sâ??ï¼?%s"
@@ -5212,34 +5213,34 @@ msgstr "æ? æ??å??æ?°"
 #~ msgstr "æ? æ³?é??æ¯?æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
 
 #~ msgid "Cannot get message %s from folder '%s': No such message"
-#~ msgstr "æ? æ³?ä»?æ??ä»¶å¤¹â??%2$sâ??è?·å??ä¿¡ä»¶ %1$sï¼?æ²¡æ??è¿?æ ·ç??ä¿¡ä»¶"
+#~ msgstr "æ? æ³?ä»?æ??ä»¶å¤¹â??%2$sâ??è?·å??æ¶?æ?¯ %1$sï¼?æ²¡æ??è¿?æ ·ç??æ¶?æ?¯"
 
 #~ msgid "Cannot get message %s from folder '%s': Bad command"
-#~ msgstr "æ? æ³?ä»?æ??ä»¶å¤¹â??%2$sâ??è?·å??ä¿¡ä»¶ %1$sï¼?å?½ä»¤æ? æ??"
+#~ msgstr "æ? æ³?ä»?æ??ä»¶å¤¹â??%2$sâ??è?·å??æ¶?æ?¯ %1$sï¼?å?½ä»¤æ? æ??"
 
 #~ msgid "Cannot append message to folder '%s': Folder is read-only"
-#~ msgstr "æ? æ³?å°?ä¿¡ä»¶è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ??ä»¶å¤¹ä¸ºå?ªè¯»"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ??ä»¶å¤¹ä¸ºå?ªè¯»"
 
 #~ msgid "Cannot append message to folder '%s': Unknown error"
-#~ msgstr "æ? æ³?å°?ä¿¡ä»¶è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
 
 #~ msgid "Cannot append message to folder '%s': Bad command"
-#~ msgstr "æ? æ³?å°?ä¿¡ä»¶è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯è¿½å? å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
 
 #~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr "æ? æ³?å°?ä¿¡ä»¶ä»?æ??ä»¶å¤¹â??%sâ??ç§»å?¨å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??ä»¶å¤¹â??%sâ??ç§»å?¨å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
 
 #~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr "æ? æ³?å°?ä¿¡ä»¶ä»?æ??ä»¶å¤¹â??%sâ??å¤?å?¶å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??ä»¶å¤¹â??%sâ??å¤?å?¶å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ?ªç?¥é??è¯¯"
 
 #~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr "æ? æ³?å°?ä¿¡ä»¶ä»?æ??ä»¶å¤¹â??%sâ??ç§»å?¨å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??ä»¶å¤¹â??%sâ??ç§»å?¨å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
 
 #~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr "æ? æ³?å°?ä¿¡ä»¶ä»?æ??ä»¶å¤¹â??%sâ??å¤?å?¶å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
+#~ msgstr "æ? æ³?å°?æ¶?æ?¯ä»?æ??ä»¶å¤¹â??%sâ??å¤?å?¶å?°æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
 
 #~ msgid "Check new messages for _Junk contents"
-#~ msgstr "æ£?æ?¥æ?°ä¿¡ä»¶ç??å??å?¾å??å®¹(_J)"
+#~ msgstr "æ£?æ?¥æ?°æ¶?æ?¯ç??å??å?¾å??å®¹(_J)"
 
 #~ msgid "Only check for Junk messa_ges in the INBOX folder"
 #~ msgstr "ä»?å?¨æ?¶ä»¶ç®±ä¸æ£?æ?¥å??å?¾é?®ä»¶(_G)"
@@ -5329,13 +5330,13 @@ msgstr "æ? æ??å??æ?°"
 #~ msgstr "æ? æ³?é??è®¢æ??ä»¶å¤¹â??%sâ??ï¼?æ? æ??ç??å?½ä»¤"
 
 #~ msgid "Scanning for changed messages"
-#~ msgstr "æ?«æ??æ?´æ?¹äº?ç??ä¿¡ä»¶"
+#~ msgstr "æ?«æ??æ?´æ?¹äº?ç??æ¶?æ?¯"
 
 #~ msgid "IMAP server %s is in an inconsistent state."
 #~ msgstr "IMAP æ??å?¡å?¨ %s ç??ç?¶æ??ä¸?ä¸?è?´ã??"
 
 #~ msgid "Fetching envelopes of new messages"
-#~ msgstr "è?·å??æ?°æ?°ä¿¡ä»¶ç??ä¿¡å°?"
+#~ msgstr "è?·å??æ?°æ?°æ¶?æ?¯ç??ä¿¡å°?"
 
 #~ msgid "Unexpected token in response from IMAP server %s: "
 #~ msgstr "æ?¥è?ª IMAP4 æ??å?¡å?¨ %s ç??æ??å¤?å??åº?ï¼?"
@@ -5365,16 +5366,16 @@ msgstr "æ? æ??å??æ?°"
 #~ msgstr "é?®ä»¶ç?®å½?é??å? æ¶?æ?¯å·²å??æ¶?"
 
 #~ msgid "Invalid message contents"
-#~ msgstr "æ? æ??ç??ä¿¡ä»¶å??å®¹"
+#~ msgstr "æ? æ??ç??æ¶?æ?¯å??å®¹"
 
 #~ msgid "Mail append canceled"
 #~ msgstr "é?®ä»¶è¿½å? å·²å??æ¶?"
 
 #~ msgid "Message construction failed."
-#~ msgstr "ä¿¡ä»¶æ??å»ºå¤±è´¥ã??"
+#~ msgstr "æ¶?æ?¯æ??å»ºå¤±è´¥ã??"
 
 #~ msgid "MH append message canceled"
-#~ msgstr "MH è¿½å? ä¿¡ä»¶å·²å??æ¶?"
+#~ msgstr "MH è¿½å? æ¶?æ?¯å·²å??æ¶?"
 
 #~ msgid "Use cancel"
 #~ msgstr "ä½¿ç?¨å??æ¶?"
@@ -5488,7 +5489,7 @@ msgstr "æ? æ??å??æ?°"
 #~ msgstr "æ? æ³?ä»¥æ¤å??ç§°å??å»ºæ??ä»¶å¤¹"
 
 #~ msgid "This operation cannot be performed in off-line mode"
-#~ msgstr "è¯¥ä¿¡ä»¶æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨"
+#~ msgstr "è¯¥æ¶?æ?¯æ? æ³?å?¨è?±æ?ºæ¨¡å¼?ä¸ä½¿ç?¨"
 
 #~ msgid "%s's Folders"
 #~ msgstr "%s ç??æ??ä»¶å¤¹"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]