[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: Wed, 22 Sep 2010 10:55:42 +0000 (UTC)
commit 129bf6ea7e85793b5128bd711bf80045ecfa625d
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Wed Sep 22 18:55:33 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  527 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po |  527 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 536 insertions(+), 518 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 618663e..1b64280 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server 2.31.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-05 19:20+0800\n"
-"PO-Revision-Date: 2010-09-05 19:20+0800\n"
+"POT-Creation-Date: 2010-09-22 18:51+0800\n"
+"PO-Revision-Date: 2010-09-22 18:54+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -349,7 +349,7 @@ msgstr "ç¶²èª? URL"
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:667
+#: ../libedataserverui/e-categories-dialog.c:670
 msgid "Categories"
 msgstr "å??é¡?"
 
@@ -736,15 +736,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:342
+#: ../calendar/libedata-cal/e-data-cal-factory.c:354
 #, c-format
 msgid "Invalid source"
 msgstr "ç?¡æ??ç??ä¾?æº?"
@@ -763,7 +763,7 @@ msgstr "è³?æ??åº«é?¢ç·?"
 
 # shell/e-storage.c:475
 #: ../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:4065 ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Permission denied"
 msgstr "æ¬?é??ä¸?è¶³"
 
@@ -869,13 +869,13 @@ msgstr "æ²?æ??ç©ºé??"
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
 #: ../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:4049 ../calendar/libedata-cal/e-data-cal.c:132
 msgid "Invalid argument"
 msgstr "ç?¡æ??ç??å??æ?¸"
 
 # shell/e-storage.c:477
 #: ../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:4087 ../calendar/libedata-cal/e-data-cal.c:133
 msgid "Not supported"
 msgstr "ä¸?æ?¯æ?´"
 
@@ -1011,12 +1011,12 @@ msgstr "ä¸?è?½å??å¾?æ?´æ?¹ï¼?%s"
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
 #. 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"
@@ -1024,7 +1024,7 @@ msgstr "å?³å??æ?ªé ?æ??ç?? HTTP ç??æ??ç¢¼ %d"
 # 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:4094
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4142
 msgid "Calendar doesn't support Free/Busy"
 msgstr "è¡?äº?æ??ä¸?æ?¯æ?´ç©ºé??/å¿?ç¢?"
 
@@ -1046,115 +1046,115 @@ 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/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
 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:989
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
 msgid "Invalid server URI"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ URI"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../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:690
+#: ../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:1094
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1135
 msgid "Could not create thread for populating cache"
 msgstr "ç?¡æ³?å»ºç«?ç§»æ¤?å¿«å??ç??å?·è¡?ç·?"
 
 # mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:327
+#: ../calendar/backends/http/e-cal-backend-http.c:359
 msgid "Redirected to Invalid URI"
 msgstr "é??æ?°æ??å??ç?¡æ??ç?? URI"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:350
+#: ../calendar/backends/http/e-cal-backend-http.c:382
 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:357
+#: ../calendar/backends/http/e-cal-backend-http.c:389
 msgid "Not a calendar."
 msgstr "ä¸¦é??è¡?äº?æ??ã??"
 
 # mail/mail-ops.c:1872
-#: ../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 "å¤©æ°£ï¼?æ?´æ??ç??å¤?æ??"
 
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: ../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 "å¤©æ°£é ?å ±"
 
@@ -1164,157 +1164,157 @@ msgid "Untitled appointment"
 msgstr "æ?ªå?½å??ç??ç´?æ??"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "1st"
 msgstr "1æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "2nd"
 msgstr "2æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "3rd"
 msgstr "3æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "4th"
 msgstr "4æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "5th"
 msgstr "5æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "6th"
 msgstr "6æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "7th"
 msgstr "7æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "8th"
 msgstr "8æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "9th"
 msgstr "9æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "10th"
 msgstr "10æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "11th"
 msgstr "11æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "12th"
 msgstr "12æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "13th"
 msgstr "13æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "14th"
 msgstr "14æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "15th"
 msgstr "15æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "16th"
 msgstr "16æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "17th"
 msgstr "17æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "18th"
 msgstr "18æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "19th"
 msgstr "19æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "20th"
 msgstr "20æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "21st"
 msgstr "21æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "22nd"
 msgstr "22æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "23rd"
 msgstr "23æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "24th"
 msgstr "24æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "25th"
 msgstr "25æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3976
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "26th"
 msgstr "26æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3977
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "27th"
 msgstr "27æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3978
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "28th"
 msgstr "28æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "29th"
 msgstr "29æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "30th"
 msgstr "30æ?¥"
 
 # calendar/gui/print.c:306
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "31st"
 msgstr "31æ?¥"
 
@@ -1323,11 +1323,11 @@ msgstr "31æ?¥"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:10
 # calendar/gui/e-calendar-table.c:345
 # mail/message-list.c:689
-#: ../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 "ä¸?è?¬"
 
@@ -1336,7 +1336,7 @@ msgstr "ä¸?è?¬"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:12
 # calendar/gui/e-calendar-table.c:347
 # mail/message-list.c:687
-#: ../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 "ä½?"
 
@@ -1344,7 +1344,7 @@ msgstr "ä½?"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #. 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 "æ?ªæ??å®?"
 
@@ -1365,55 +1365,55 @@ msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 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:4051
 msgid "Backend is busy"
 msgstr "å¾?ç«¯å¿?ç¢?ä¸"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:4054
+#: ../calendar/libecal/e-cal.c:4053
 msgid "Repository is offline"
 msgstr "å??åº«å·²é?¢ç·?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:4056
+#: ../calendar/libecal/e-cal.c:4055
 msgid "No such calendar"
 msgstr "ç?¡æ¤è¡?äº?æ??"
 
-#: ../calendar/libecal/e-cal.c:4058 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libecal/e-cal.c:4057 ../calendar/libedata-cal/e-data-cal.c:113
 #: ../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:4060 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4059 ../calendar/libedata-cal/e-data-cal.c:114
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
 # addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:4062
+#: ../calendar/libecal/e-cal.c:4061
 msgid "URI not loaded"
 msgstr "URI æ?ªè¼?å?¥"
 
-#: ../calendar/libecal/e-cal.c:4064
+#: ../calendar/libecal/e-cal.c:4063
 msgid "URI already loaded"
 msgstr "URI å·²è¼?å?¥"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4068 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4067 ../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:4069 ../calendar/libedata-cal/e-data-cal.c:115
 msgid "Object ID already exists"
 msgstr "ç?©ä»¶ ID å·²å?å?¨"
 
 # shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:4072
+#: ../calendar/libecal/e-cal.c:4071
 msgid "Protocol not supported"
 msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 
@@ -1421,20 +1421,20 @@ 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:4074
+#: ../calendar/libecal/e-cal.c:4073
 msgid "Operation has been canceled"
 msgstr "æ??ä½?å·²å??æ¶?"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:4076
+#: ../calendar/libecal/e-cal.c:4075
 msgid "Could not cancel operation"
 msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../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:4077
+#: ../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
@@ -1444,18 +1444,18 @@ msgid "Authentication failed"
 msgstr "é©?è?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:4080
+#: ../calendar/libecal/e-cal.c:4079
 #: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "è¦?æ±?é©?è?"
 
-#: ../calendar/libecal/e-cal.c:4082
+#: ../calendar/libecal/e-cal.c:4081
 msgid "A D-Bus exception has occurred"
 msgstr "ç?¼ç?? D-Bus ä¾?å¤?"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4084
+#: ../calendar/libecal/e-cal.c:4083
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:158
 #: ../camel/providers/imap/camel-imap-command.c:457
 #: ../camel/providers/imap/camel-imap-store.c:627
@@ -1465,7 +1465,7 @@ msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
 # shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:4086
+#: ../calendar/libecal/e-cal.c:4085
 msgid "No error"
 msgstr "æ²?æ??é?¯èª¤"
 
@@ -1586,163 +1586,163 @@ 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"
 
 # camel/camel-filter-driver.c:671
 #. 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"
 
 # mail/mail-crypto.c:251
 #. 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"
 
 # mail/mail-ops.c:1872
 #. 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"
 
 # 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:974
+#: ../calendar/libedata-cal/e-data-cal.c:978
 #, 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:994
+#: ../calendar/libedata-cal/e-data-cal.c:998
 #, 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: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"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-data-cal-factory.c:353
+#: ../calendar/libedata-cal/e-data-cal-factory.c:364
 #, c-format
 msgid "Invalid URI"
 msgstr "ç?¡æ??ç?? URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:371
+#: ../calendar/libedata-cal/e-data-cal-factory.c:382
 #, 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:421
+#: ../calendar/libedata-cal/e-data-cal-factory.c:432
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ç?¡æ³?å¯¦é«?å??å¾?ç«¯ç¨?å¼?"
@@ -1877,17 +1877,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 "ä½ å¿?é ?æ?¼ç¶²ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
@@ -1901,11 +1901,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-tcp-stream-raw.c:250
-#: ../camel/providers/imapx/camel-imapx-server.c:4654
-#: ../camel/providers/imapx/camel-imapx-server.c:4671
+#: ../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:4691
+#: ../camel/providers/imapx/camel-imapx-server.c:4708
+#: ../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
@@ -2096,11 +2097,10 @@ msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç??æ?°å??å?¾é?µä»¶"
 
 # mail/mail-ops.c:1649
 #: ../camel/camel-folder.c:147
-#, fuzzy, c-format
-#| msgid "Scanning for changed messages in %s"
+#, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç??æ?°å??å?¾é?µä»¶"
+msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç?? ham é?µä»¶"
 
 # mail/mail-ops.c:1565
 #: ../camel/camel-folder.c:171
@@ -2380,33 +2380,33 @@ msgid "parse error"
 msgstr "è§£æ??é?¯èª¤"
 
 # camel/camel-service.c:548
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "è§£æ??ï¼?%s"
 
 # camel/camel-service.c:600
-#: ../camel/camel-net-utils.c:715
+#: ../camel/camel-net-utils.c:717
 msgid "Host lookup failed"
 msgstr "æ??å°?ä¸»æ©?å¤±æ??"
 
 # camel/camel-service.c:600
-#: ../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-service.c:548
-#: ../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/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-net-utils.c:867
+#: ../camel/camel-net-utils.c:869
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "æ??å°?å??ç¨±å¤±æ??ï¼? %s"
@@ -2454,7 +2454,7 @@ msgstr "ç?¡æ³?è¼?å?¥ %sï¼?æ¨¡çµ?å?§æ²?æ??å??å§?ç¢¼ã??"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "æ²?æ??é??è¨?å??å®?ã??%sã??ç??æ??ä¾?è??"
@@ -2519,49 +2519,49 @@ msgid ""
 msgstr "é??å??é?¸é ?å°?æ??ä½¿ç?¨ CRAM-MD5 å? å¯?ç??å¯?ç¢¼é?£ç·?è?³ä¼ºæ??å?¨ï¼?è?¥ç?¼ç?¾è©²ä¼ºæ??å?¨æ?¯æ?´é??ç¨®æ??å??ã??"
 
 # camel/camel-sasl-digest-md5.c:43
-#: ../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:45
-#: ../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:810
-#: ../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:819
-#: ../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:825
-#: ../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 "ä¼ºæ??å?¨æ?¥å??å??å?«ç?¡æ??ç?? ã??Quality of Protectionã??ä»£ç¬¦"
 
 # camel/camel-sasl-digest-md5.c:847
-#: ../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:865
-#: ../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:875
-#: ../camel/camel-sasl-digest-md5.c:903
+#: ../camel/camel-sasl-digest-md5.c:905
 #, c-format
 msgid "Server response does not match"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸?ç¬¦"
@@ -2720,7 +2720,7 @@ msgid "URL '%s' needs a path component"
 msgstr "URLã??%sã??é??è¦? path å??ä»¶"
 
 # camel/camel-session.c:479
-#: ../camel/camel-session.c:261
+#: ../camel/camel-session.c:260
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2730,7 +2730,7 @@ msgstr ""
 "%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:758
+#: ../camel/camel-session.c:760
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "è«?è¼¸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?ç¢¼ã??"
@@ -3006,72 +3006,81 @@ msgstr "å??æ?¶ç?"
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
-#: ../camel/camel-tcp-stream-raw.c:809
+#: ../camel/camel-tcp-stream-raw.c:714 ../camel/camel-tcp-stream-raw.c:725
+#, fuzzy, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "ä»£ç??ä¼ºæ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS5"
+
+#: ../camel/camel-tcp-stream-raw.c:736
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-raw.c:825 ../camel/camel-tcp-stream-raw.c:831
 #, 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:815
+#: ../camel/camel-tcp-stream-raw.c:837
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "æ?¾ä¸?å?°å??é?©ç??é©?è?é¡?å??ï¼?ä»£ç¢¼ 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:827
+#: ../camel/camel-tcp-stream-raw.c:849
 msgid "General SOCKS server failure"
 msgstr "ä¸?è?¬æ?§ SOCKS ä¼ºæ??å?¨å¤±æ??"
 
-#: ../camel/camel-tcp-stream-raw.c:828
+#: ../camel/camel-tcp-stream-raw.c:850
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS ä¼ºæ??å?¨ç??è¦?å??ä¸?å??è¨±é?£ç·?"
 
-#: ../camel/camel-tcp-stream-raw.c:829
+#: ../camel/camel-tcp-stream-raw.c:851
 msgid "Network is unreachable from SOCKS server"
 msgstr "ç¶²çµ¡ç?¡æ³?é??é?? SOCKS ä¼ºæ??å?¨å?°é??"
 
-#: ../camel/camel-tcp-stream-raw.c:830
+#: ../camel/camel-tcp-stream-raw.c:852
 msgid "Host is unreachable from SOCKS server"
 msgstr "ä¸»æ©?ç?¡æ³?é??é?? SOCKS ä¼ºæ??å?¨å?°é??"
 
 # camel/camel-remote-store.c:252
-#: ../camel/camel-tcp-stream-raw.c:831
+#: ../camel/camel-tcp-stream-raw.c:853
 msgid "Connection refused"
 msgstr "é?£ç·?è¢«æ??çµ?"
 
-#: ../camel/camel-tcp-stream-raw.c:832
-#, fuzzy
+#: ../camel/camel-tcp-stream-raw.c:854
 msgid "Time-to-live expired"
-msgstr "è·³å¾?æ??å®?æ??é??"
+msgstr "è¶?é?? Time-to-live æ??é??"
 
 # shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:833
+#: ../camel/camel-tcp-stream-raw.c:855
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS ä¼ºæ??å?¨ä¸?æ?¯æ?´æ??ä»¤"
 
 # shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:834
+#: ../camel/camel-tcp-stream-raw.c:856
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS ä¼ºæ??å?¨ä¸?æ?¯æ?´ä½?å??é¡?å??"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/camel-tcp-stream-raw.c:835
+#: ../camel/camel-tcp-stream-raw.c:857
 msgid "Unknown error from SOCKS server"
 msgstr "ä¾?è?ª SOCKS ä¼ºæ??å?¨ç??ä¸?æ??é?¯èª¤"
 
-#: ../camel/camel-tcp-stream-raw.c:865
+#: ../camel/camel-tcp-stream-raw.c:887
 #, 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:882
+#: ../camel/camel-tcp-stream-raw.c:905
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ä¾?è?ª SOCKS ä¼ºæ??å?¨ç??ä¸?å®?æ?´å??è¦?"
 
-#: ../camel/camel-tcp-stream-raw.c:897
+#: ../camel/camel-tcp-stream-raw.c:920
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ä¸»æ©?å??ç¨±å¤ªé?·ï¼?æ??å¤? 255 å?ç¬¦ï¼?"
@@ -3080,7 +3089,7 @@ msgstr "ä¸»æ©?å??ç¨±å¤ªé?·ï¼?æ??å¤? 255 å?ç¬¦ï¼?"
 # camel/providers/imap/camel-imap-store.c:433
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:929 ../camel/camel-tcp-stream-raw.c:939
+#: ../camel/camel-tcp-stream-raw.c:952 ../camel/camel-tcp-stream-raw.c:962
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "å¾?ä»£ç??ä¼ºæ??å?¨å?³å??ç?¡æ??ç??å??è¦?"
@@ -3167,19 +3176,19 @@ msgid "Could not parse URL '%s'"
 msgstr "ç?¡æ³?è§£æ?? URLã??%sã??"
 
 # shell/e-shell-importer.c:384
-#: ../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:451
-#: ../camel/camel-vee-folder.c:1117
+#: ../camel/camel-vee-folder.c:1118
 #, c-format
 msgid "No such message %s in %s"
 msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/camel-vee-folder.c: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 "ä¸?è?½è¤?è£½æ??ç§»å??é?µä»¶å?°è??æ?¬è³?æ??å¤¾ä¸"
@@ -3260,7 +3269,7 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼?"
 # camel/providers/imap/camel-imap-folder.c:1281
 #: ../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 "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨ã??"
@@ -3268,40 +3277,40 @@ msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨ã??"
 # camel/camel-movemail.c:306
 #: ../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 "ç?¡æ³?å??å¾?é?µä»¶ã??"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../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 ç??æ??è¦?"
 
 # mail/mail-ops.c:992
-#: ../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:3757
+#: ../camel/providers/imapx/camel-imapx-server.c:3881
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c: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"
@@ -3313,7 +3322,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:2511
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2538
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ç?¡æ³?å»ºç«?é?µä»¶ï¼? %s"
@@ -3346,13 +3355,13 @@ msgstr "æª¢æ?¥æ?°é?µä»¶"
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../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)"
 
 #: ../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
@@ -3372,7 +3381,7 @@ msgstr "æª¢æ?¥æ?°é?µä»¶ä¸æ?¯å?¦æ??å??å?¾é?µä»¶å?§å®¹(_U)"
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../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)"
 
@@ -3405,7 +3414,7 @@ msgstr "ç?¨æ?¼å?å?? Novell Groupwise ä¼ºæ??å?¨"
 # mail/mail-config.glade.h:52
 #: ../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"
@@ -3427,7 +3436,7 @@ msgstr "ç¶²å??ä¸ç??ä½¿ç?¨è??æ??ä¸»æ©?ç?¡æ³?ä½¿ç?¨"
 # camel/providers/smtp/camel-smtp-transport.c:410
 #: ../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:3008
 #, c-format
 msgid "You did not enter a password."
 msgstr "ä½ æ²?æ??è¼¸å?¥å¯?ç¢¼ã??"
@@ -3441,7 +3450,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"
@@ -3462,7 +3471,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 "æ¯?è³?æ??å¤¾ä¸¦ä¸?å??è¨±å??å?«å?è³?æ??å¤¾"
@@ -3601,7 +3610,7 @@ msgstr "ç?¡æ³?å»ºç«?ç?®é?? %sï¼?%s"
 
 # mail/mail-ops.c:1649
 #: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3759
+#: ../camel/providers/imapx/camel-imapx-server.c:3797
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "æ??æ?? %s ä¸æ?´æ?¹é??ç??é?µä»¶"
@@ -3619,7 +3628,7 @@ msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
 #: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4937
+#: ../camel/providers/imapx/camel-imapx-server.c:4975
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3628,7 +3637,7 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
 #: ../camel/providers/imap/camel-imap-folder.c:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4938
+#: ../camel/providers/imapx/camel-imapx-server.c:4976
 msgid "No such message available."
 msgstr "æ²?æ??é??å??é?µä»¶ã??"
 
@@ -3688,26 +3697,26 @@ msgstr "å¿«å?? %s å¤±æ??ï¼?"
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Checking for New Mail"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../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)"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
 #: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
 msgid "Connection to Server"
 msgstr "é?£ç·?å?°ä¼ºæ??å?¨"
 
 # camel/providers/imap/camel-imap-store.c:531
 #: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Use custom command to connect to server"
 msgstr "ä½¿ç?¨è?ªé?¸æ??ä»¤ä¾?é?£ç·?å?°ä¼ºæ??å?¨(_U)"
 
@@ -3719,20 +3728,20 @@ msgstr "æ??ä»¤(_M):"
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
 #: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
 #: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "è³?æ??å¤¾"
 
 # camel/providers/imap/camel-imap-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 msgid "_Show only subscribed folders"
 msgstr "å?ªé¡¯ç¤ºå·²è¨?é?±ç??è³?æ??å¤¾(_S)"
 
 # camel/providers/imap/camel-imap-provider.c:52
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "O_verride server-supplied folder namespace"
 msgstr "è¦?è??ä¼ºæ??å?¨æ??ä¾?ä¹?è³?æ??å¤¾ç??å?½å??ç©ºé??(_V)"
 
@@ -3743,19 +3752,19 @@ 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:75
+#: ../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:77
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "æª¢æ?¥æ?°é?µä»¶ä¸æ?¯å?¦æ??å??å?¾é?µä»¶å?§å®¹(_K)"
 
 # mail/mail-config.glade.h:12
 #: ../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)"
 
@@ -3766,26 +3775,26 @@ msgstr "IMAP"
 
 # camel/providers/imap/camel-imap-provider.c:65
 #: ../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:82
 #: ../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/smtp/camel-smtp-transport.c:534
 #: ../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/camel-remote-store.c:195
 #: ../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 "%s ç?? IMAP æ??å??æ?¼ %s"
@@ -3820,15 +3829,15 @@ 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:2860
+#: ../camel/providers/imapx/camel-imapx-server.c:2896
 #, 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:573
-#: ../camel/providers/imapx/camel-imapx-server.c:2826
+#: ../camel/providers/imapx/camel-imapx-server.c:2861
 #: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "ä¸?æ?¯æ?´ STARTTLS"
@@ -3836,7 +3845,7 @@ msgstr "ä¸?æ?¯æ?´ STARTTLS"
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #: ../camel/providers/imap/camel-imap-store.c:593
-#: ../camel/providers/imapx/camel-imapx-server.c:2862
+#: ../camel/providers/imapx/camel-imapx-server.c:2897
 msgid "SSL negotiations failed"
 msgstr "SSL å??å??å¤±æ??"
 
@@ -3847,7 +3856,7 @@ msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
 
 # camel/camel-remote-store.c:252
 #: ../camel/providers/imap/camel-imap-store.c:748
-#: ../camel/providers/imapx/camel-imapx-server.c:2662
+#: ../camel/providers/imapx/camel-imapx-server.c:2696
 #, c-format
 msgid "Connection cancelled"
 msgstr "é?£ç·?å·²å??æ¶?"
@@ -3855,7 +3864,7 @@ msgstr "é?£ç·?å·²å??æ¶?"
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
 #: ../camel/providers/imap/camel-imap-store.c:753
-#: ../camel/providers/imapx/camel-imapx-server.c:2667
+#: ../camel/providers/imapx/camel-imapx-server.c:2701
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ç?¡æ³?ä»¥æ??ä»¤ã??%sã??é?£ç·?ï¼? %s"
@@ -3864,8 +3873,8 @@ 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
@@ -3877,7 +3886,7 @@ msgstr "æ?¶ä»¶å?£"
 
 # camel/providers/imap/camel-imap-store.c:456
 #: ../camel/providers/imap/camel-imap-store.c:1129
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/imapx/camel-imapx-server.c:2964
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %s"
@@ -3885,7 +3894,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:1141
-#: ../camel/providers/imapx/camel-imapx-server.c:2940
+#: ../camel/providers/imapx/camel-imapx-server.c:2976
 #: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "No support for authentication type %s"
@@ -3893,7 +3902,7 @@ msgstr "ä¸?æ?¯æ?´é©?è?é¡?å?? %s"
 
 # camel/providers/imap/camel-imap-store.c:531
 #: ../camel/providers/imap/camel-imap-store.c:1220
-#: ../camel/providers/imapx/camel-imapx-server.c:3010
+#: ../camel/providers/imapx/camel-imapx-server.c:3046
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3906,7 +3915,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\""
@@ -3924,7 +3933,7 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨ã??"
 
 # camel/providers/local/camel-mbox-summary.c:879
 #: ../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"
@@ -3941,58 +3950,58 @@ msgid "Server unexpectedly disconnected: "
 msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼?"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../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/local/camel-mbox-store.c:110
-#: ../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 "å¦?æ??ä¼ºæ??å?¨æ?¯æ?´å??ä½¿ç?¨é??ç½®(_D)"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
-#: ../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/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "å?½å??ç©ºé??"
 
 # camel/providers/imap/camel-imap-provider.c:63
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "IMAP+"
 msgstr "IMAP"
 
 # camel/camel-movemail.c:256
-#: ../camel/providers/imapx/camel-imapx-server.c:1365
+#: ../camel/providers/imapx/camel-imapx-server.c:1386
 msgid "Error writing to cache stream: "
 msgstr "å¯«å?¥å¿«å??ä¸²æµ?æ??ç?¼ç??é?¯èª¤ï¼?"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imapx/camel-imapx-server.c:2019
+#: ../camel/providers/imapx/camel-imapx-server.c:2044
 #, 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:2753
+#: ../camel/providers/imapx/camel-imapx-server.c:2787
 #, c-format
 msgid "Could not connect to %s (port %s): "
 msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
@@ -4001,7 +4010,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:3182
+#: ../camel/providers/imapx/camel-imapx-server.c:3218
 msgid "Closing tmp stream failed: "
 msgstr "ç?¡æ³?é??é?? tmp ä¸²æµ?ï¼?"
 
@@ -4012,7 +4021,7 @@ 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:5061
+#: ../camel/providers/imapx/camel-imapx-server.c:5100
 #, c-format
 msgid "Cannot create spool file: %s"
 msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
@@ -4024,24 +4033,24 @@ 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/imapx/camel-imapx-server.c:5076
+#: ../camel/providers/imapx/camel-imapx-server.c:5116
 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: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 "ä¾?æº?ä¸²æµ?ç?¡æ³?ä½¿ç?¨"
@@ -5715,27 +5724,27 @@ msgid "Failed to authenticate.\n"
 msgstr "é©?è?è?æ?¸å¤±æ??ã??\n"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:148
 msgid "Category Icon"
 msgstr "å??é¡?å??ç¤º"
 
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:154
 msgid "_No Image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:368
+#: ../libedataserverui/e-categories-dialog.c:371
 #, 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:679
 msgid "Icon"
 msgstr "å??ç¤º"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:681
+#: ../libedataserverui/e-categories-dialog.c:684
 msgid "Category"
 msgstr "å??é¡?"
 
@@ -5779,20 +5788,20 @@ msgstr "å??é¡?"
 msgid "Create category \"%s\""
 msgstr "å»ºç«?å??é¡?ã??%sã??"
 
-#: ../libedataserverui/e-name-selector-dialog.c:319
+#: ../libedataserverui/e-name-selector-dialog.c:324
 msgid "Select Contacts from Address Book"
 msgstr "å¾?é??è¨?é??é?¸å??è?¯çµ¡äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:658
+#: ../libedataserverui/e-name-selector-dialog.c:663
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:662
+#: ../libedataserverui/e-name-selector-dialog.c:667
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:890
+#: ../libedataserverui/e-name-selector-dialog.c:895
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
@@ -5837,30 +5846,30 @@ 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"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2651
+#: ../libedataserverui/e-name-selector-entry.c:2655
 #, c-format
 msgid "Cop_y %s"
 msgstr "è¤?è£½(_Y) %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2661
+#: ../libedataserverui/e-name-selector-entry.c:2665
 #, c-format
 msgid "C_ut %s"
 msgstr "å?ªä¸?(_U) %s"
 
 #. 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)"
 
-#: ../libedataserverui/e-name-selector-list.c:516
+#: ../libedataserverui/e-name-selector-list.c:519
 #, c-format
 msgid "_Delete %s"
 msgstr "å?ªé?¤(_D) %s"
@@ -5874,19 +5883,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)"
 
@@ -5896,7 +5905,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)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8d8ce19..db0c00d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server 2.31.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-05 19:20+0800\n"
-"PO-Revision-Date: 2010-09-04 15:10+0800\n"
+"POT-Creation-Date: 2010-09-22 18:51+0800\n"
+"PO-Revision-Date: 2010-09-21 21:07+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
@@ -349,7 +349,7 @@ msgstr "ç¶²èª? URL"
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:667
+#: ../libedataserverui/e-categories-dialog.c:670
 msgid "Categories"
 msgstr "å??é¡?"
 
@@ -736,15 +736,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:342
+#: ../calendar/libedata-cal/e-data-cal-factory.c:354
 #, c-format
 msgid "Invalid source"
 msgstr "ç?¡æ??ç??ä¾?æº?"
@@ -763,7 +763,7 @@ msgstr "è³?æ??åº«é?¢ç·?"
 
 # shell/e-storage.c:475
 #: ../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:4065 ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Permission denied"
 msgstr "æ¬?é??ä¸?è¶³"
 
@@ -869,13 +869,13 @@ msgstr "æ²?æ??ç©ºé??"
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
 #: ../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:4049 ../calendar/libedata-cal/e-data-cal.c:132
 msgid "Invalid argument"
 msgstr "ç?¡æ??ç??å??æ?¸"
 
 # shell/e-storage.c:477
 #: ../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:4087 ../calendar/libedata-cal/e-data-cal.c:133
 msgid "Not supported"
 msgstr "ä¸?æ?¯æ?´"
 
@@ -1011,12 +1011,12 @@ msgstr "ä¸?è?½å??å¾?è®?æ?´ï¼?%s"
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
 #. 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"
@@ -1024,7 +1024,7 @@ msgstr "å?³å??æ?ªé ?æ??ç?? HTTP ç??æ??ç¢¼ %d"
 # 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:4094
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4142
 msgid "Calendar doesn't support Free/Busy"
 msgstr "è¡?äº?æ??ä¸?æ?¯æ?´ç©ºé??/å¿?ç¢?"
 
@@ -1046,115 +1046,115 @@ 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/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:959
 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:989
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
 msgid "Invalid server URI"
 msgstr "ç?¡æ??ç??ä¼ºæ??å?¨ URI"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../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:690
+#: ../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:1094
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1135
 msgid "Could not create thread for populating cache"
 msgstr "ç?¡æ³?å»ºæ§?ç§»æ¤?å¿«å??ç??å?·è¡?ç·?"
 
 # mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:327
+#: ../calendar/backends/http/e-cal-backend-http.c:359
 msgid "Redirected to Invalid URI"
 msgstr "é??æ?°æ??å??ç?¡æ??ç?? URI"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:350
+#: ../calendar/backends/http/e-cal-backend-http.c:382
 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:357
+#: ../calendar/backends/http/e-cal-backend-http.c:389
 msgid "Not a calendar."
 msgstr "ä¸¦é??è¡?äº?æ??ã??"
 
 # mail/mail-ops.c:1872
-#: ../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 "å¤©æ°£ï¼?æ?´æ??ç??å¤?æ??"
 
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: ../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 "å¤©æ°£é ?å ±"
 
@@ -1164,157 +1164,157 @@ msgid "Untitled appointment"
 msgstr "æ?ªå?½å??ç??ç´?æ??"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "1st"
 msgstr "1æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "2nd"
 msgstr "2æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "3rd"
 msgstr "3æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "4th"
 msgstr "4æ?¥"
 
 # calendar/gui/print.c:300
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "5th"
 msgstr "5æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "6th"
 msgstr "6æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "7th"
 msgstr "7æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "8th"
 msgstr "8æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "9th"
 msgstr "9æ?¥"
 
 # calendar/gui/print.c:301
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "10th"
 msgstr "10æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "11th"
 msgstr "11æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "12th"
 msgstr "12æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "13th"
 msgstr "13æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "14th"
 msgstr "14æ?¥"
 
 # calendar/gui/print.c:302
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "15th"
 msgstr "15æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "16th"
 msgstr "16æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "17th"
 msgstr "17æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "18th"
 msgstr "18æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "19th"
 msgstr "19æ?¥"
 
 # calendar/gui/print.c:303
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "20th"
 msgstr "20æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "21st"
 msgstr "21æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "22nd"
 msgstr "22æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "23rd"
 msgstr "23æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "24th"
 msgstr "24æ?¥"
 
 # calendar/gui/print.c:304
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "25th"
 msgstr "25æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3976
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "26th"
 msgstr "26æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3977
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "27th"
 msgstr "27æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3978
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "28th"
 msgstr "28æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "29th"
 msgstr "29æ?¥"
 
 # calendar/gui/print.c:305
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "30th"
 msgstr "30æ?¥"
 
 # calendar/gui/print.c:306
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "31st"
 msgstr "31æ?¥"
 
@@ -1323,11 +1323,11 @@ msgstr "31æ?¥"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:10
 # calendar/gui/e-calendar-table.c:345
 # mail/message-list.c:689
-#: ../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 "ä¸?è?¬"
 
@@ -1336,7 +1336,7 @@ msgstr "ä¸?è?¬"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:12
 # calendar/gui/e-calendar-table.c:347
 # mail/message-list.c:687
-#: ../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 "ä½?"
 
@@ -1344,7 +1344,7 @@ msgstr "ä½?"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
 # calendar/gui/e-calendar-table.c:348
 #. 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 "æ?ªæ??å®?"
 
@@ -1365,55 +1365,55 @@ msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 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:4051
 msgid "Backend is busy"
 msgstr "å¾?ç«¯å¿?ç¢?ä¸"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:4054
+#: ../calendar/libecal/e-cal.c:4053
 msgid "Repository is offline"
 msgstr "å??åº«å·²é?¢ç·?"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:4056
+#: ../calendar/libecal/e-cal.c:4055
 msgid "No such calendar"
 msgstr "ç?¡æ¤è¡?äº?æ??"
 
-#: ../calendar/libecal/e-cal.c:4058 ../calendar/libedata-cal/e-data-cal.c:113
+#: ../calendar/libecal/e-cal.c:4057 ../calendar/libedata-cal/e-data-cal.c:113
 #: ../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:4060 ../calendar/libedata-cal/e-data-cal.c:114
+#: ../calendar/libecal/e-cal.c:4059 ../calendar/libedata-cal/e-data-cal.c:114
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
 
 # addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:4062
+#: ../calendar/libecal/e-cal.c:4061
 msgid "URI not loaded"
 msgstr "URI æ?ªè¼?å?¥"
 
-#: ../calendar/libecal/e-cal.c:4064
+#: ../calendar/libecal/e-cal.c:4063
 msgid "URI already loaded"
 msgstr "URI å·²è¼?å?¥"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4068 ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4067 ../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:4069 ../calendar/libedata-cal/e-data-cal.c:115
 msgid "Object ID already exists"
 msgstr "ç?©ä»¶ ID å·²å?å?¨"
 
 # shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:4072
+#: ../calendar/libecal/e-cal.c:4071
 msgid "Protocol not supported"
 msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
 
@@ -1421,20 +1421,20 @@ 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:4074
+#: ../calendar/libecal/e-cal.c:4073
 msgid "Operation has been canceled"
 msgstr "æ??ä½?å·²å??æ¶?"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:4076
+#: ../calendar/libecal/e-cal.c:4075
 msgid "Could not cancel operation"
 msgstr "ç?¡æ³?å??æ¶?æ??ä½?"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../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:4077
+#: ../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
@@ -1444,18 +1444,18 @@ msgid "Authentication failed"
 msgstr "é©?è?å¤±æ??"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:4080
+#: ../calendar/libecal/e-cal.c:4079
 #: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "è¦?æ±?é©?è?"
 
-#: ../calendar/libecal/e-cal.c:4082
+#: ../calendar/libecal/e-cal.c:4081
 msgid "A D-Bus exception has occurred"
 msgstr "ç?¼ç?? D-Bus ä¾?å¤?"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:4084
+#: ../calendar/libecal/e-cal.c:4083
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:158
 #: ../camel/providers/imap/camel-imap-command.c:457
 #: ../camel/providers/imap/camel-imap-store.c:627
@@ -1465,7 +1465,7 @@ msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
 # shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:4086
+#: ../calendar/libecal/e-cal.c:4085
 msgid "No error"
 msgstr "æ²?æ??é?¯èª¤"
 
@@ -1588,163 +1588,163 @@ 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"
 
 # camel/camel-filter-driver.c:671
 #. 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"
 
 # mail/mail-crypto.c:251
 #. 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"
 
 # mail/mail-ops.c:1872
 #. 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"
 
 # 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:974
+#: ../calendar/libedata-cal/e-data-cal.c:978
 #, 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:994
+#: ../calendar/libedata-cal/e-data-cal.c:998
 #, 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: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"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-data-cal-factory.c:353
+#: ../calendar/libedata-cal/e-data-cal-factory.c:364
 #, c-format
 msgid "Invalid URI"
 msgstr "ç?¡æ??ç?? URI"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:371
+#: ../calendar/libedata-cal/e-data-cal-factory.c:382
 #, 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:421
+#: ../calendar/libedata-cal/e-data-cal-factory.c:432
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ç?¡æ³?å¯¦é«?å??å¾?ç«¯ç¨?å¼?"
@@ -1879,17 +1879,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 "æ?¨å¿?é ?æ?¼ç·?ä¸?å·¥ä½?æ??è?½å®?æ??æ¤æ??ä½?"
@@ -1903,11 +1903,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-tcp-stream-raw.c:250
-#: ../camel/providers/imapx/camel-imapx-server.c:4654
-#: ../camel/providers/imapx/camel-imapx-server.c:4671
+#: ../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:4691
+#: ../camel/providers/imapx/camel-imapx-server.c:4708
+#: ../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
@@ -2098,11 +2099,10 @@ msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç??æ?°å??å?¾é?µä»¶"
 
 # mail/mail-ops.c:1649
 #: ../camel/camel-folder.c:147
-#, fuzzy, c-format
-#| msgid "Scanning for changed messages in %s"
+#, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç??æ?°å??å?¾é?µä»¶"
+msgstr[0] "æ£å?¨å¸ç¿?ã??%sã??ä¸ç?? ham é?µä»¶"
 
 # mail/mail-ops.c:1565
 #: ../camel/camel-folder.c:171
@@ -2382,33 +2382,33 @@ msgid "parse error"
 msgstr "è§£æ??é?¯èª¤"
 
 # camel/camel-service.c:548
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "è§£æ??ï¼?%s"
 
 # camel/camel-service.c:600
-#: ../camel/camel-net-utils.c:715
+#: ../camel/camel-net-utils.c:717
 msgid "Host lookup failed"
 msgstr "æ??å°?ä¸»æ©?å¤±æ??"
 
 # camel/camel-service.c:600
-#: ../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-service.c:548
-#: ../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/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-net-utils.c:867
+#: ../camel/camel-net-utils.c:869
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "æ??å°?å??ç¨±å¤±æ??ï¼? %s"
@@ -2456,7 +2456,7 @@ msgstr "ç?¡æ³?è¼?å?¥ %sï¼?æ¨¡çµ?å?§æ²?æ??å??å§?ç¢¼ã??"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:206
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "æ²?æ??é??è¨?å??å®?ã??%sã??ç??æ??ä¾?è??"
@@ -2523,12 +2523,12 @@ msgstr ""
 "å??ã??"
 
 # camel/camel-sasl-digest-md5.c:43
-#: ../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:45
-#: ../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."
@@ -2537,37 +2537,37 @@ msgstr ""
 "å??ã??"
 
 # camel/camel-sasl-digest-md5.c:810
-#: ../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:819
-#: ../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:825
-#: ../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 "ä¼ºæ??å?¨æ?¥å??å??å?«ç?¡æ??ç?? ã??Quality of Protectionã??ä»£ç¬¦"
 
 # camel/camel-sasl-digest-md5.c:847
-#: ../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:865
-#: ../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:875
-#: ../camel/camel-sasl-digest-md5.c:903
+#: ../camel/camel-sasl-digest-md5.c:905
 #, c-format
 msgid "Server response does not match"
 msgstr "ä¼ºæ??å?¨å??æ??ä¸?ç¬¦"
@@ -2727,7 +2727,7 @@ msgid "URL '%s' needs a path component"
 msgstr "URLã??%sã??é??è¦? path å??ä»¶"
 
 # camel/camel-session.c:479
-#: ../camel/camel-session.c:261
+#: ../camel/camel-session.c:260
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2737,7 +2737,7 @@ msgstr ""
 "%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:758
+#: ../camel/camel-session.c:760
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "è«?è¼¸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?ç¢¼ã??"
@@ -3013,72 +3013,81 @@ msgstr "å??æ?¶ç?"
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
-#: ../camel/camel-tcp-stream-raw.c:809
+#: ../camel/camel-tcp-stream-raw.c:714 ../camel/camel-tcp-stream-raw.c:725
+#, fuzzy, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "ä»£ç??ä¼ºæ??å?¨ä¸»æ©?ä¸?æ?¯æ?´ SOCKS5"
+
+#: ../camel/camel-tcp-stream-raw.c:736
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-raw.c:825 ../camel/camel-tcp-stream-raw.c:831
 #, 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:815
+#: ../camel/camel-tcp-stream-raw.c:837
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "æ?¾ä¸?å?°å??é?©ç??é©?è?é¡?å??ï¼?ä»£ç¢¼ 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:827
+#: ../camel/camel-tcp-stream-raw.c:849
 msgid "General SOCKS server failure"
 msgstr "ä¸?è?¬æ?§ SOCKS ä¼ºæ??å?¨å¤±æ??"
 
-#: ../camel/camel-tcp-stream-raw.c:828
+#: ../camel/camel-tcp-stream-raw.c:850
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS ä¼ºæ??å?¨ç??è¦?å??ä¸?å??è¨±é?£ç·?"
 
-#: ../camel/camel-tcp-stream-raw.c:829
+#: ../camel/camel-tcp-stream-raw.c:851
 msgid "Network is unreachable from SOCKS server"
 msgstr "ç¶²è·¯ç?¡æ³?é??é?? SOCKS ä¼ºæ??å?¨å?°é??"
 
-#: ../camel/camel-tcp-stream-raw.c:830
+#: ../camel/camel-tcp-stream-raw.c:852
 msgid "Host is unreachable from SOCKS server"
 msgstr "ä¸»æ©?ç?¡æ³?é??é?? SOCKS ä¼ºæ??å?¨å?°é??"
 
 # camel/camel-remote-store.c:252
-#: ../camel/camel-tcp-stream-raw.c:831
+#: ../camel/camel-tcp-stream-raw.c:853
 msgid "Connection refused"
 msgstr "é?£ç·?è¢«æ??çµ?"
 
-#: ../camel/camel-tcp-stream-raw.c:832
-#, fuzzy
+#: ../camel/camel-tcp-stream-raw.c:854
 msgid "Time-to-live expired"
-msgstr "è·³å¾?æ??å®?æ??é??"
+msgstr "è¶?é?? Time-to-live æ??é??"
 
 # shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:833
+#: ../camel/camel-tcp-stream-raw.c:855
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKS ä¼ºæ??å?¨ä¸?æ?¯æ?´æ??ä»¤"
 
 # shell/e-storage.c:477
-#: ../camel/camel-tcp-stream-raw.c:834
+#: ../camel/camel-tcp-stream-raw.c:856
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKS ä¼ºæ??å?¨ä¸?æ?¯æ?´ä½?å??é¡?å??"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/camel-tcp-stream-raw.c:835
+#: ../camel/camel-tcp-stream-raw.c:857
 msgid "Unknown error from SOCKS server"
 msgstr "ä¾?è?ª SOCKS ä¼ºæ??å?¨ç??ä¸?æ??é?¯èª¤"
 
-#: ../camel/camel-tcp-stream-raw.c:865
+#: ../camel/camel-tcp-stream-raw.c:887
 #, 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:882
+#: ../camel/camel-tcp-stream-raw.c:905
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ä¾?è?ª SOCKS ä¼ºæ??å?¨ç??ä¸?å®?æ?´å??è¦?"
 
-#: ../camel/camel-tcp-stream-raw.c:897
+#: ../camel/camel-tcp-stream-raw.c:920
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ä¸»æ©?å??ç¨±å¤ªé?·ï¼?æ??å¤? 255 å?å??ï¼?"
@@ -3087,7 +3096,7 @@ msgstr "ä¸»æ©?å??ç¨±å¤ªé?·ï¼?æ??å¤? 255 å?å??ï¼?"
 # camel/providers/imap/camel-imap-store.c:433
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:929 ../camel/camel-tcp-stream-raw.c:939
+#: ../camel/camel-tcp-stream-raw.c:952 ../camel/camel-tcp-stream-raw.c:962
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "å¾?ä»£ç??ä¼ºæ??å?¨å?³å??ç?¡æ??ç??å??è¦?"
@@ -3174,19 +3183,19 @@ msgid "Could not parse URL '%s'"
 msgstr "ç?¡æ³?è§£æ?? URLã??%sã??"
 
 # shell/e-shell-importer.c:384
-#: ../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:451
-#: ../camel/camel-vee-folder.c:1117
+#: ../camel/camel-vee-folder.c:1118
 #, c-format
 msgid "No such message %s in %s"
 msgstr "æ²?æ?? %s é??é¡?é?µä»¶å?¨ %s ä¸"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/camel-vee-folder.c: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 "ä¸?è?½è¤?è£½æ??ç§»å??é?µä»¶å?°è??æ?¬è³?æ??å¤¾ä¸"
@@ -3267,7 +3276,7 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ %sï¼?"
 # camel/providers/imap/camel-imap-folder.c:1281
 #: ../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 "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨ã??"
@@ -3275,40 +3284,40 @@ msgstr "é??å°?é?µä»¶ç?¡æ³?å?¨é?¢ç·?æ¨¡å¼?ä¸?ä½¿ç?¨ã??"
 # camel/camel-movemail.c:306
 #: ../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 "ç?¡æ³?å??å¾?é?µä»¶ã??"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../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 ç??æ??è¦?"
 
 # mail/mail-ops.c:992
-#: ../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:3757
+#: ../camel/providers/imapx/camel-imapx-server.c:3881
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "æ£å??å¾? %s ä¸æ?°é?µä»¶ç??æ??è¦?è³?è¨?"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c: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"
@@ -3320,7 +3329,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:2511
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2538
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "ç?¡æ³?å»ºæ§?é?µä»¶ï¼? %s"
@@ -3353,13 +3362,13 @@ msgstr "æª¢æ?¥æ?°é?µä»¶"
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../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)"
 
 #: ../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
@@ -3379,7 +3388,7 @@ msgstr "æª¢æ?¥æ?°é?µä»¶ä¸æ?¯å?¦æ??å??å?¾é?µä»¶å?§å®¹(_U)"
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../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)"
 
@@ -3412,7 +3421,7 @@ msgstr "ç?¨æ?¼å?å?? Novell Groupwise ä¼ºæ??å?¨"
 # mail/mail-config.glade.h:52
 #: ../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"
@@ -3434,7 +3443,7 @@ msgstr "ç¶²å??ä¸ç??ä½¿ç?¨è??æ??ä¸»æ©?ç?¡æ³?ä½¿ç?¨"
 # camel/providers/smtp/camel-smtp-transport.c:410
 #: ../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:3008
 #, c-format
 msgid "You did not enter a password."
 msgstr "æ?¨æ²?æ??è¼¸å?¥å¯?ç¢¼ã??"
@@ -3448,7 +3457,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"
@@ -3469,7 +3478,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 "æ¯?è³?æ??å¤¾ä¸¦ä¸?å??è¨±å??å?«å?è³?æ??å¤¾"
@@ -3610,7 +3619,7 @@ msgstr "ç?¡æ³?å»ºç«?ç?®é?? %sï¼?%s"
 
 # mail/mail-ops.c:1649
 #: ../camel/providers/imap/camel-imap-folder.c:960
-#: ../camel/providers/imapx/camel-imapx-server.c:3759
+#: ../camel/providers/imapx/camel-imapx-server.c:3797
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "æ??æ?? %s ä¸è®?æ?´é??ç??é?µä»¶"
@@ -3628,7 +3637,7 @@ msgstr "ç?¡æ³?å??å??é?µä»¶ï¼?"
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
 #: ../camel/providers/imap/camel-imap-folder.c:3266
-#: ../camel/providers/imapx/camel-imapx-server.c:4937
+#: ../camel/providers/imapx/camel-imapx-server.c:4975
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3637,7 +3646,7 @@ msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
 #: ../camel/providers/imap/camel-imap-folder.c:3267
-#: ../camel/providers/imapx/camel-imapx-server.c:4938
+#: ../camel/providers/imapx/camel-imapx-server.c:4976
 msgid "No such message available."
 msgstr "æ²?æ??é??å??é?µä»¶ã??"
 
@@ -3697,26 +3706,26 @@ msgstr "å¿«å?? %s å¤±æ??ï¼?"
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
 #: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "Checking for New Mail"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
 
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../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)"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
 #: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
 msgid "Connection to Server"
 msgstr "é?£ç·?å?°ä¼ºæ??å?¨"
 
 # camel/providers/imap/camel-imap-store.c:531
 #: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Use custom command to connect to server"
 msgstr "ä½¿ç?¨è?ªè¨?æ??ä»¤ä¾?é?£ç·?å?°ä¼ºæ??å?¨(_U)"
 
@@ -3728,20 +3737,20 @@ msgstr "æ??ä»¤(_M):"
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
 #: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
 #: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "è³?æ??å¤¾"
 
 # camel/providers/imap/camel-imap-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:65
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 msgid "_Show only subscribed folders"
 msgstr "å?ªé¡¯ç¤ºå·²è¨?é?±ç??è³?æ??å¤¾(_S)"
 
 # camel/providers/imap/camel-imap-provider.c:52
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "O_verride server-supplied folder namespace"
 msgstr "è¦?è??ä¼ºæ??å?¨æ??ä¾?ä¹?è³?æ??å¤¾ç??å?½å??ç©ºé??(_V)"
 
@@ -3752,19 +3761,19 @@ 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:75
+#: ../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:77
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "æª¢æ?¥æ?°é?µä»¶ä¸æ?¯å?¦æ??å??å?¾é?µä»¶å?§å®¹(_K)"
 
 # mail/mail-config.glade.h:12
 #: ../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)"
 
@@ -3775,26 +3784,26 @@ msgstr "IMAP"
 
 # camel/providers/imap/camel-imap-provider.c:65
 #: ../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:82
 #: ../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/smtp/camel-smtp-transport.c:534
 #: ../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/camel-remote-store.c:195
 #: ../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 "%s ç?? IMAP æ??å??æ?¼ %s"
@@ -3829,15 +3838,15 @@ 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:2860
+#: ../camel/providers/imapx/camel-imapx-server.c:2896
 #, 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:573
-#: ../camel/providers/imapx/camel-imapx-server.c:2826
+#: ../camel/providers/imapx/camel-imapx-server.c:2861
 #: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "ä¸?æ?¯æ?´ STARTTLS"
@@ -3845,7 +3854,7 @@ msgstr "ä¸?æ?¯æ?´ STARTTLS"
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #: ../camel/providers/imap/camel-imap-store.c:593
-#: ../camel/providers/imapx/camel-imapx-server.c:2862
+#: ../camel/providers/imapx/camel-imapx-server.c:2897
 msgid "SSL negotiations failed"
 msgstr "SSL å??å??å¤±æ??"
 
@@ -3856,7 +3865,7 @@ msgstr "æ¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ SSL"
 
 # camel/camel-remote-store.c:252
 #: ../camel/providers/imap/camel-imap-store.c:748
-#: ../camel/providers/imapx/camel-imapx-server.c:2662
+#: ../camel/providers/imapx/camel-imapx-server.c:2696
 #, c-format
 msgid "Connection cancelled"
 msgstr "é?£ç·?å·²å??æ¶?"
@@ -3864,7 +3873,7 @@ msgstr "é?£ç·?å·²å??æ¶?"
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
 #: ../camel/providers/imap/camel-imap-store.c:753
-#: ../camel/providers/imapx/camel-imapx-server.c:2667
+#: ../camel/providers/imapx/camel-imapx-server.c:2701
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ç?¡æ³?ä»¥æ??ä»¤ã??%sã??é?£ç·?ï¼? %s"
@@ -3873,8 +3882,8 @@ 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
@@ -3886,7 +3895,7 @@ msgstr "æ?¶ä»¶å?£"
 
 # camel/providers/imap/camel-imap-store.c:456
 #: ../camel/providers/imap/camel-imap-store.c:1129
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/imapx/camel-imapx-server.c:2964
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ä¼ºæ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è?é¡?å?? %s"
@@ -3894,7 +3903,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:1141
-#: ../camel/providers/imapx/camel-imapx-server.c:2940
+#: ../camel/providers/imapx/camel-imapx-server.c:2976
 #: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "No support for authentication type %s"
@@ -3902,7 +3911,7 @@ msgstr "ä¸?æ?¯æ?´é©?è?é¡?å?? %s"
 
 # camel/providers/imap/camel-imap-store.c:531
 #: ../camel/providers/imap/camel-imap-store.c:1220
-#: ../camel/providers/imapx/camel-imapx-server.c:3010
+#: ../camel/providers/imapx/camel-imapx-server.c:3046
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3915,7 +3924,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\""
@@ -3933,7 +3942,7 @@ msgstr "ä¸?è?½å»ºç«?è³?æ??å¤¾ã??%sã??ï¼?è³?æ??å¤¾å·²å?å?¨ã??"
 
 # camel/providers/local/camel-mbox-summary.c:879
 #: ../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"
@@ -3950,58 +3959,58 @@ msgid "Server unexpectedly disconnected: "
 msgstr "ä¼ºæ??å?¨çª?ç?¶ä¸æ?·é?£ç·?ï¼?"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../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/local/camel-mbox-store.c:110
-#: ../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 "å¦?æ??ä¼ºæ??å?¨æ?¯æ?´å??ä½¿ç?¨é??ç½®(_D)"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
-#: ../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/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Namespace:"
 msgstr "å?½å??ç©ºé??"
 
 # camel/providers/imap/camel-imap-provider.c:63
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "IMAP+"
 msgstr "IMAP"
 
 # camel/camel-movemail.c:256
-#: ../camel/providers/imapx/camel-imapx-server.c:1365
+#: ../camel/providers/imapx/camel-imapx-server.c:1386
 msgid "Error writing to cache stream: "
 msgstr "å¯«å?¥å¿«å??ä¸²æµ?æ??ç?¼ç??é?¯èª¤ï¼?"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imapx/camel-imapx-server.c:2019
+#: ../camel/providers/imapx/camel-imapx-server.c:2044
 #, 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:2753
+#: ../camel/providers/imapx/camel-imapx-server.c:2787
 #, c-format
 msgid "Could not connect to %s (port %s): "
 msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
@@ -4010,7 +4019,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:3182
+#: ../camel/providers/imapx/camel-imapx-server.c:3218
 msgid "Closing tmp stream failed: "
 msgstr "ç?¡æ³?é??é?? tmp ä¸²æµ?ï¼?"
 
@@ -4021,7 +4030,7 @@ 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:5061
+#: ../camel/providers/imapx/camel-imapx-server.c:5100
 #, c-format
 msgid "Cannot create spool file: %s"
 msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
@@ -4033,24 +4042,24 @@ 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/imapx/camel-imapx-server.c:5076
+#: ../camel/providers/imapx/camel-imapx-server.c:5116
 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: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 "ä¾?æº?ä¸²æµ?ç?¡æ³?ä½¿ç?¨"
@@ -5731,27 +5740,27 @@ msgid "Failed to authenticate.\n"
 msgstr "é©?è?æ??è?å¤±æ??ã??\n"
 
 # calendar/gui/e-calendar-table.c:150
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:148
 msgid "Category Icon"
 msgstr "å??é¡?å??ç¤º"
 
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:154
 msgid "_No Image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../libedataserverui/e-categories-dialog.c:368
+#: ../libedataserverui/e-categories-dialog.c:371
 #, 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:679
 msgid "Icon"
 msgstr "å??ç¤º"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:681
+#: ../libedataserverui/e-categories-dialog.c:684
 msgid "Category"
 msgstr "å??é¡?"
 
@@ -5795,20 +5804,20 @@ msgstr "å??é¡?"
 msgid "Create category \"%s\""
 msgstr "å»ºç«?å??é¡?ã??%sã??"
 
-#: ../libedataserverui/e-name-selector-dialog.c:319
+#: ../libedataserverui/e-name-selector-dialog.c:324
 msgid "Select Contacts from Address Book"
 msgstr "å¾?é??è¨?é??é?¸å??é?£çµ¡äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:658
+#: ../libedataserverui/e-name-selector-dialog.c:663
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:662
+#: ../libedataserverui/e-name-selector-dialog.c:667
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:890
+#: ../libedataserverui/e-name-selector-dialog.c:895
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
@@ -5853,30 +5862,30 @@ 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"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2651
+#: ../libedataserverui/e-name-selector-entry.c:2655
 #, c-format
 msgid "Cop_y %s"
 msgstr "è¤?è£½(_Y) %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2661
+#: ../libedataserverui/e-name-selector-entry.c:2665
 #, c-format
 msgid "C_ut %s"
 msgstr "å?ªä¸?(_U) %s"
 
 #. 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)"
 
-#: ../libedataserverui/e-name-selector-list.c:516
+#: ../libedataserverui/e-name-selector-list.c:519
 #, c-format
 msgid "_Delete %s"
 msgstr "å?ªé?¤(_D) %s"
@@ -5890,19 +5899,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)"
 
@@ -5912,7 +5921,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)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]