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



commit fc5d52bd39b757086547a4067fea3a60c40e2953
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Wed Sep 22 18:51:21 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  792 +++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po |  826 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 829 insertions(+), 789 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 618663e..d8f1935 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,9 +7,9 @@
 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"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=Misc.\n";
+"POT-Creation-Date: 2010-09-16 19:55+0000\n"
+"PO-Revision-Date: 2010-09-22 18:51+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"
@@ -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,8 @@ 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 +870,15 @@ 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 +1014,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 +1027,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 +1049,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 +1167,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 +1326,13 @@ 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 +1341,8 @@ 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,12 +1350,13 @@ 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 "æ?ªæ??å®?"
 
 # camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1227
+#: ../libedataserverui/e-book-auth-util.c:206
 #: ../libedataserverui/e-book-auth-util.c:435
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -1365,55 +1372,59 @@ 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 +1432,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 +1455,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 +1476,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 "æ²?æ??é?¯èª¤"
 
@@ -1543,10 +1554,7 @@ msgstr "ã??%sã??ç??第äº?å??å¼?æ?¸å¿?é ?ç?ºå­?串"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
-msgid ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
-"\"classification\""
+msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
 msgstr "ã??%sã??ç??第ä¸?å??å¼?æ?¸å¿?é ?ç?ºã??ä»»ä½?ã??ã??ã??æ??è¦?ã??ä¹?ä¸?ï¼?æ??ã??æ??è¿°ã??ã??ã??ä½?ç½®ã??ã??ã??å?°æ??è??ã??ã??ã??å?¬é??人ã??ã??ã??å??é¡?ã??å?¶ä¸­ä¹?ä¸?"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
@@ -1556,9 +1564,7 @@ msgstr "ã??%sã??é??è¦?è?³å°?ä¸?å??å¼?æ?¸"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
-msgid ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
+msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
 msgstr "ã??%sã??ç??æ??æ??å¼?æ?¸å¿?é ?ç?ºå­?串ï¼?æ??å?ªæ??ä¸?å??å¼?æ?¸ç?ºé??輯å?½å?¼ (#f)"
 
 # camel/providers/local/camel-maildir-folder.c:218
@@ -1586,163 +1592,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 "ç?¡æ³?實é«?å??å¾?端ç¨?å¼?"
@@ -1855,7 +1861,8 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "è??伺æ??å?¨é??æ?°å??æ­¥"
 
-#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
+#: ../camel/camel-disco-folder.c:68
+#: ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
 msgstr "正����������模�"
 
@@ -1866,7 +1873,8 @@ msgstr "正����������模�"
 msgid "Preparing folder '%s' for offline"
 msgstr "æº?å??è³?æ??夾ã??%sã??ä¾?é?¢ç·?使ç?¨"
 
-#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+#: ../camel/camel-disco-folder.c:445
+#: ../camel/camel-offline-folder.c:224
 msgid "Copy folder content locally for offline operation"
 msgstr "è¤?製è³?æ??夾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?業"
 
@@ -1877,17 +1885,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: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-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:281
+#: ../camel/providers/imapx/camel-imapx-folder.c:324
+#: ../camel/providers/imapx/camel-imapx-folder.c:356
+#: ../camel/providers/imapx/camel-imapx-folder.c:387
+#: ../camel/providers/imapx/camel-imapx-store.c:193
+#: ../camel/providers/imapx/camel-imapx-store.c:715
+#: ../camel/providers/imapx/camel-imapx-store.c:778
+#: ../camel/providers/imapx/camel-imapx-store.c:837
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ä½ å¿?é ?æ?¼ç¶²ä¸?å·¥ä½?æ??è?½å®?æ??æ­¤æ??ä½?"
@@ -1898,14 +1906,19 @@ msgstr "ä½ å¿?é ?æ?¼ç¶²ä¸?å·¥ä½?æ??è?½å®?æ??æ­¤æ??ä½?"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
-#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
-#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
-#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
-#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
-#: ../camel/camel-tcp-stream-raw.c:250
-#: ../camel/providers/imapx/camel-imapx-server.c:4654
-#: ../camel/providers/imapx/camel-imapx-server.c:4671
+#: ../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: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:4675
+#: ../camel/providers/imapx/camel-imapx-server.c:4692
 #: ../camel/providers/nntp/camel-nntp-summary.c:396
 #: ../camel/providers/pop3/camel-pop3-folder.c:269
 #: ../camel/providers/pop3/camel-pop3-folder.c:625
@@ -1922,7 +1935,8 @@ msgstr "å·²å??æ¶?"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:643
+#: ../camel/camel-file-utils.c:734
 #: ../camel/camel-file-utils.c:791
 #, c-format
 msgid "Canceled"
@@ -1930,7 +1944,8 @@ msgstr "å·²å??æ¶?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:808
+#: ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ç?¡æ³?建ç«?å­?代è??ç?? '%s'ï¼?%s"
@@ -1943,18 +1958,21 @@ msgstr "ç?¡æ³?è®?å?? %s ç??æ­¡è¿?è¾­ï¼? %s"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
+#: ../camel/camel-filter-driver.c:1037
+#: ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
 msgstr "å??æ­¥è??ç??è³?æ??夾"
 
 # camel/camel-filter-driver.c:866
-#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1134
+#: ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "å??æ??é??濾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
+#: ../camel/camel-filter-driver.c:1145
+#: ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "å?·è¡?é??濾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
@@ -1979,20 +1997,23 @@ msgstr "���件 %d (%d%%)"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
+#: ../camel/camel-filter-driver.c:1275
+#: ../camel/camel-filter-driver.c:1297
 #, c-format
 msgid "Failed on message %d"
 msgstr "å?¨ç¬¬ %d å°?é?µä»¶ç?¼ç??é?¯èª¤"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
+#: ../camel/camel-filter-driver.c:1312
+#: ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
 msgstr "å??æ­¥è??ç??è³?æ??夾"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
+#: ../camel/camel-filter-driver.c:1316
+#: ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "å®?æ??"
 
@@ -2029,13 +2050,15 @@ msgstr "ç?¡æ??ç??å??æ?¸çµ¦ (user-tag)"
 
 # camel/camel-filter-search.c:439
 # camel/camel-filter-search.c:445
-#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
+#: ../camel/camel-filter-search.c:744
+#: ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "å?·è¡?é??濾å?¨æ??å°?ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-folder-search.c:328
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:345
+#: ../camel/camel-folder-search.c:456
 #: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
@@ -2046,7 +2069,8 @@ msgstr ""
 "%s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:357
+#: ../camel/camel-folder-search.c:468
 #: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
@@ -2058,7 +2082,8 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
+#: ../camel/camel-folder-search.c:843
+#: ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) é??è¦?å?®ä¸?é??輯å?¼çµ?æ??"
@@ -2068,7 +2093,8 @@ msgstr "(%s) é??è¦?å?®ä¸?é??輯å?¼çµ?æ??"
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ä¸?å??許æ?¾å?¨ %s è£?é?¢"
 
-#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
+#: ../camel/camel-folder-search.c:944
+#: ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) é??è¦?ç?¸ç¬¦é¡?å??å­?串"
@@ -2096,11 +2122,11 @@ msgstr[0] "æ­£å?¨å­¸ç¿?ã??%sã??中ç??æ?°å??å?¾é?µä»¶"
 
 # mail/mail-ops.c:1649
 #: ../camel/camel-folder.c:147
-#, fuzzy, c-format
+#, c-format
 #| msgid "Scanning for changed messages in %s"
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "æ­£å?¨å­¸ç¿?ã??%sã??中ç??æ?°å??å?¾é?µä»¶"
+msgstr[0] "æ­£å?¨å­¸ç¿?ã??%sã??中ç?? ham é?µä»¶"
 
 # mail/mail-ops.c:1565
 #: ../camel/camel-folder.c:171
@@ -2122,7 +2148,8 @@ msgstr "正��製�件"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:701
+#: ../camel/camel-gpg-context.c:706
 #: ../camel/camel-gpg-context.c:1330
 #, c-format
 msgid "Failed to execute gpg: %s"
@@ -2150,7 +2177,8 @@ msgstr ""
 msgid "Failed to parse gpg userid hint."
 msgstr "解æ?? gpg userid æ??示æ??失æ??ã??"
 
-#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:812
+#: ../camel/camel-gpg-context.c:827
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "解æ?? gpg å¯?èª?è¦?æ±?æ??失æ??ã??"
@@ -2197,22 +2225,29 @@ msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ä¸?è?½å? å¯?é?µä»¶ï¼?æ²?æ??æ??ä¾?æ??æ??ç??æ?¶ä»¶è??ã??"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+#: ../camel/camel-gpg-context.c:1434
+#: ../camel/camel-smime-context.c:821
 msgid "Could not generate signing data: "
 msgstr "ç?¡æ³?ç?¢ç??簽署è³?æ??ï¼?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
-#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
-#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
+#: ../camel/camel-gpg-context.c:1481
+#: ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848
+#: ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081
+#: ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
 msgstr "å?·è¡? gpg 失æ??ã??"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-gpg-context.c:1622
+#: ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638
+#: ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943
+#: ../camel/camel-smime-context.c:957
 #: ../camel/camel-smime-context.c:966
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
@@ -2233,7 +2268,8 @@ msgid "This is a digitally encrypted message part"
 msgstr "é??æ?¯æ?¸ç¢¼å??å? å¯?è¨?æ?¯é?¨ä»½"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1922
+#: ../camel/camel-gpg-context.c:1931
 #: ../camel/camel-gpg-context.c:1954
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
@@ -2244,7 +2280,8 @@ msgstr "ä¸?è?½è§£å¯?æ­¤é?µä»¶ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解å¯? MIME çµ?件æ??失æ??ï¼?é??è¨?å??å®?é?¯èª¤"
 
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
+#: ../camel/camel-gpg-context.c:2023
+#: ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "���容"
 
@@ -2259,7 +2296,8 @@ msgstr "ä¸?è?½å»ºç«?é??å®? helper å°?管ï¼?%s"
 msgid "Cannot fork locking helper: %s"
 msgstr "ä¸?è?½å??å??é??å®? helper ï¼? %s"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-lock-client.c:211
+#: ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "ç?¡æ³?é??å®?ã??%sã??ï¼? lock-helper å??å®?é?¯èª¤"
@@ -2358,7 +2396,8 @@ msgid "Error writing mail temp file: %s"
 msgstr "寫å?¥é?µä»¶æ?«å­?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/camel-movemail.c:587
-#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
+#: ../camel/camel-movemail.c:483
+#: ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "è¤?製é?µä»¶æ?«å­?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
@@ -2380,33 +2419,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"
@@ -2419,7 +2458,8 @@ msgstr "æ­£å?¨å°?è³?æ??夾ã??%sã??中ç??é?µä»¶å??æ­¥å?°ç£?ç¢?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
+#: ../camel/camel-offline-journal.c:144
+#: ../camel/camel-offline-journal.c:170
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ä¸?è?½å¯«å?¥è³?æ??夾ã??%sã??ç??é?¢ç·?æ?¥èª?ï¼?%s"
@@ -2454,7 +2494,8 @@ 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:207
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "æ²?æ??é??è¨?å??å®?ã??%sã??ç??æ??ä¾?è??"
@@ -2513,55 +2554,51 @@ msgstr "CRAM-MD5"
 
 # camel/camel-sasl-cram-md5.c:37
 #: ../camel/camel-sasl-cram-md5.c:47
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
+msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨ CRAM-MD5 å? å¯?ç??å¯?碼é?£ç·?è?³ä¼ºæ??å?¨ï¼?è?¥ç?¼ç?¾è©²ä¼ºæ??å?¨æ?¯æ?´é??種æ??å??ã??"
 
 # camel/camel-sasl-digest-md5.c:43
-#: ../camel/camel-sasl-digest-md5.c: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
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
+#: ../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 "伺æ??å?¨å??æ??ä¸?符"
@@ -2576,9 +2613,7 @@ msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨ Kerberos 5 é©?è­?é?£ç·?è?³ä¼ºæ??å?¨ã??"
 
 #: ../camel/camel-sasl-gssapi.c:119
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
+msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
 msgstr "æ??ä¾?ç??è­?件ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?辨è­?ã??"
 
 #: ../camel/camel-sasl-gssapi.c:124
@@ -2586,27 +2621,19 @@ msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
 
 #: ../camel/camel-sasl-gssapi.c:127
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
+msgid "The provided target_name parameter contained an invalid or unsupported type of name."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸å??å?«ç?¡æ??æ??ä¸?æ?¯æ?´ç??å??稱é¡?å??ã??"
 
 #: ../camel/camel-sasl-gssapi.c:131
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
+msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
 msgstr "input_token å??å?«ä¸?å??ç??é??é??ï¼?é??é??  input_chan_bindingsï¼?é?£çµ?è?³é??äº?æ??å®?ç??å??æ?¸ã??"
 
 #: ../camel/camel-sasl-gssapi.c:136
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
+msgid "The input_token contains an invalid signature, or a signature that could not be verified."
 msgstr "input_token å??å?«ç?¡æ??ç??簽署ï¼?æ??è??ç?¡æ³?確èª?ç??簽署ã??"
 
 #: ../camel/camel-sasl-gssapi.c:140
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
+msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
 msgstr "æ??ä¾?ç??è­?件ä¸?é?©ç?¨æ?¼ç¶²çµ¡ä½?ç½®ï¼?æ??è??è­?件è­?å?¥æ??æ¨?æ?ªå??ç?§ä»»ä½?è­?æ?¸ã??"
 
 #: ../camel/camel-sasl-gssapi.c:145
@@ -2627,8 +2654,10 @@ msgstr "å??ç?§ç??è­?件已ç¶?é??æ??ã??"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
-#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
+#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:296
+#: ../camel/camel-sasl-gssapi.c:340
+#: ../camel/camel-sasl-gssapi.c:357
 #: ../camel/providers/smtp/camel-smtp-transport.c:1176
 #, c-format
 msgid "Bad authentication response from server."
@@ -2647,7 +2676,8 @@ msgstr "��"
 
 # camel/camel-sasl-login.c:34
 # camel/camel-sasl-plain.c:34
-#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:41
+#: ../camel/camel-sasl-plain.c:45
 msgid "This option will connect to the server using a simple password."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨æ?®é??ç??å¯?碼é?£ç·?è?³ä¼ºæ??å?¨ã??"
 
@@ -2663,9 +2693,7 @@ msgstr "NTLM / SPA"
 
 # camel/camel-sasl-kerberos4.c:42
 #: ../camel/camel-sasl-ntlm.c:43
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
+msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨ NTLM / å®?å?¨å¯?碼é©?è­?é?£ç·?è?³å?ºæ?¼ Windows ç??伺æ??å?¨ã??"
 
 #: ../camel/camel-sasl-plain.c:43
@@ -2736,7 +2764,8 @@ msgid "Please enter the %s password for %s on host %s."
 msgstr "è«?輸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?碼ã??"
 
 # camel/camel-smime-context.c:327
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
+#: ../camel/camel-smime-context.c:348
+#: ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "æ?¾ä¸?å?° '%s' ç??è­?æ?¸"
@@ -2775,7 +2804,8 @@ msgid "Cannot add CMS Signing time"
 msgstr "���� CMS SigningTime"
 
 # composer/e-msg-composer.c:1092
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:436
+#: ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ç??å? å¯?è­?æ?¸ä¸?å­?å?¨"
@@ -2853,7 +2883,8 @@ msgstr "å??裹ç??è³?æ??中é?ºæ¼?æ??è¦?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:584
+#: ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 
@@ -2864,12 +2895,14 @@ msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "ç?¡æ³?設å®?é?µä»¶æ??è¦?"
 
 # mail/mail-crypto.c:59
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:616
+#: ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "è­?æ?¸å?¯å?¥å¤±æ??"
 
@@ -2895,7 +2928,8 @@ msgid "Signer: %s <%s>: %s\n"
 msgstr "簽署è??ï¼? %s<%s>ï¼? %s\n"
 
 # mail/mail-crypto.c:251
-#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:832
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot create encoder context"
 msgstr "��建�編碼�網絡�置"
 
@@ -2904,12 +2938,14 @@ msgstr "��建�編碼�網絡�置"
 msgid "Failed to add data to CMS encoder"
 msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ CMS 編碼å?¨"
 
-#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:1131
 msgid "Failed to encode data"
 msgstr "ç?¡æ³?編碼è³?æ??"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
+#: ../camel/camel-smime-context.c:981
+#: ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
 msgstr "解碼å?¨å¤±æ??"
 
@@ -2977,14 +3013,16 @@ msgstr "ç?¡æ³?建ç«?è³?æ??夾ï¼?%sï¼?è³?æ??夾已å­?å?¨"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/camel-store.c:616
+#: ../camel/camel-vee-store.c:263
 #: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??夾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/camel-store.c:680
+#: ../camel/camel-vee-store.c:213
 #: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -2996,82 +3034,83 @@ msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??夾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:1129 ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1129
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "å??æ?¶ç­?"
 
 # calendar/gui/goto-dialog.glade.h:9
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1132 ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:1132
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
-#: ../camel/camel-tcp-stream-raw.c:809
+#: ../camel/camel-tcp-stream-raw.c:814
 #, 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:820
 #, 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:832
 msgid "General SOCKS server failure"
 msgstr "ä¸?è?¬æ?§ SOCKS 伺æ??å?¨å¤±æ??"
 
-#: ../camel/camel-tcp-stream-raw.c:828
+#: ../camel/camel-tcp-stream-raw.c:833
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS 伺æ??å?¨ç??è¦?å??ä¸?å??許é?£ç·?"
 
-#: ../camel/camel-tcp-stream-raw.c:829
+#: ../camel/camel-tcp-stream-raw.c:834
 msgid "Network is unreachable from SOCKS server"
 msgstr "網絡ç?¡æ³?é??é?? SOCKS 伺æ??å?¨å?°é??"
 
-#: ../camel/camel-tcp-stream-raw.c:830
+#: ../camel/camel-tcp-stream-raw.c:835
 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:836
 msgid "Connection refused"
 msgstr "é?£ç·?被æ??çµ?"
 
-#: ../camel/camel-tcp-stream-raw.c:832
-#, fuzzy
+#: ../camel/camel-tcp-stream-raw.c:837
 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:838
 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:839
 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:840
 msgid "Unknown error from SOCKS server"
 msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?æ??é?¯èª¤"
 
-#: ../camel/camel-tcp-stream-raw.c:865
+#: ../camel/camel-tcp-stream-raw.c:870
 #, 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:887
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?å®?æ?´å??è¦?"
 
-#: ../camel/camel-tcp-stream-raw.c:897
+#: ../camel/camel-tcp-stream-raw.c:902
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "主æ©?å??稱太é?·ï¼?æ??å¤? 255 å­?符ï¼?"
@@ -3080,7 +3119,8 @@ 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:934
+#: ../camel/camel-tcp-stream-raw.c:944
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "å¾?代ç??伺æ??å?¨å?³å??ç?¡æ??ç??å??è¦?"
@@ -3167,24 +3207,26 @@ 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 "ä¸?è?½è¤?製æ??移å??é?µä»¶å?°è??æ?¬è³?æ??夾中"
 
-#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:141
+#: ../camel/camel-vee-store.c:143
 #: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
@@ -3260,7 +3302,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 +3310,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:3741
+#: ../camel/providers/imapx/camel-imapx-server.c:3865
 #, 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 +3355,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 +3388,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 +3414,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 +3447,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"
@@ -3413,8 +3455,7 @@ msgstr "�碼"
 
 # camel/providers/imap/camel-imap-provider.c:82
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:100
-msgid ""
-"This option will connect to the GroupWise server using a plaintext password."
+msgid "This option will connect to the GroupWise server using a plaintext password."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨ç°¡æ??ç??å¯?碼é?£ç·?è?³ GroupWise 伺æ??å?¨ã??"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
@@ -3427,7 +3468,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:2992
 #, c-format
 msgid "You did not enter a password."
 msgstr "ä½ æ²?æ??輸å?¥å¯?碼ã??"
@@ -3441,7 +3482,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:416
 #, c-format
 msgid "No such folder %s"
 msgstr "æ²?æ??é??å??è³?æ??夾 %s"
@@ -3462,7 +3503,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:879
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "æ¯?è³?æ??夾並ä¸?å??許å??å?«å­?è³?æ??夾"
@@ -3507,10 +3548,7 @@ msgstr "ä¸?è?½å??å¾?è³?æ??夾ï¼?å?¨æ­¤å?²å­?空é??ä¸?ç?¡æ??ç??æ??ä½?"
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:152
 #, c-format
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
+msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
 msgstr "ä½ å·²ç¶?è¶?é??é??å??帳è??ç??å?²å­?é??å?¶ã??ä½ ç??é?µä»¶æ??å??å­?å?¨å¯?件å?£ä¸­ã??è«?å??å?ªé?¤/å°?å­?ä½ ç??é?µä»¶å¾?å??æ?? å?³é??/æ?¥æ?¶ é??æ?°å¯?é??ã??\n"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:150
@@ -3601,7 +3639,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:3781
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "æ??æ?? %s 中æ?´æ?¹é??ç??é?µä»¶"
@@ -3619,7 +3657,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:4958
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3628,7 +3666,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:4959
 msgid "No such message available."
 msgstr "æ²?æ??é??å??é?µä»¶ã??"
 
@@ -3688,26 +3726,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 +3757,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 +3781,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 +3804,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 +3858,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:2845
+#: ../camel/providers/imapx/camel-imapx-server.c:2881
 #, 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:2846
 #: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "��� STARTTLS"
@@ -3836,7 +3874,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:2882
 msgid "SSL negotiations failed"
 msgstr "SSL å??å??失æ??"
 
@@ -3847,7 +3885,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:2682
 #, c-format
 msgid "Connection cancelled"
 msgstr "é?£ç·?å·²å??æ¶?"
@@ -3855,7 +3893,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:2687
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ç?¡æ³?以æ??令ã??%sã??é?£ç·?ï¼? %s"
@@ -3864,8 +3902,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:463
+#: ../camel/providers/imapx/camel-imapx-store.c:1060
 #: ../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 +3915,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:2948
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 伺æ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è­?é¡?å?? %s"
@@ -3885,7 +3923,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:2960
 #: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "No support for authentication type %s"
@@ -3893,7 +3931,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:3030
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3906,10 +3944,9 @@ 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:858
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "è³?æ??夾å??稱ã??%sã??ç?¡æ??ï¼?å? ç?ºå®?å??æ?¬å­?符ã??%cã??"
 
 # camel/providers/local/camel-local-store.c:142
@@ -3924,7 +3961,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:869
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ä¸?æ??ç??æ¯?è³?æ??夾ï¼? %s"
@@ -3941,58 +3978,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:1384
 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:2039
 #, 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:2773
 #, c-format
 msgid "Could not connect to %s (port %s): "
 msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
@@ -4001,7 +4038,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:3202
 msgid "Closing tmp stream failed: "
 msgstr "ç?¡æ³?é??é?? tmp 串æµ?ï¼?"
 
@@ -4012,7 +4049,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:5083
 #, c-format
 msgid "Cannot create spool file: %s"
 msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
@@ -4024,24 +4061,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:5099
 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:432
 #: ../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 "��串���使�"
@@ -4100,9 +4137,7 @@ msgid "Local delivery"
 msgstr "æ?¬å?°ç«¯å¯?é??"
 
 #: ../camel/providers/local/camel-local-provider.c:70
-msgid ""
-"For retrieving (moving) local mail from standard mbox-formatted spools into "
-"folders managed by Evolution."
+msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
 msgstr "ç?¨æ?¼è?ªæ¨?æº? mbox æ ¼å¼?æ??ç¨?å?¨æ?¥æ?¶ï¼?移å??ï¼?æ?¬å?°ç«¯é?µä»¶è?³ Evolution 管ç??ç??è³?æ??夾ã??"
 
 # camel/providers/imap/camel-imap-provider.c:57
@@ -4497,9 +4532,7 @@ msgstr "ç?¡æ³?å?²å­?è³?æ??夾ï¼?%s "
 #: ../camel/providers/local/camel-mbox-summary.c:869
 #: ../camel/providers/local/camel-mbox-summary.c:1102
 #, c-format
-msgid ""
-"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
-"it.)"
+msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)"
 msgstr "MBOX æª?æ¡?å·²æ??å£?ï¼?è«?修正å®?ã??ï¼?é ?æ??æ?? From é??ä¸?è¡?ï¼?å?»æ?¾ä¸?å?°å®?ã??ï¼?"
 
 # camel/providers/local/camel-mbox-summary.c:549
@@ -4722,8 +4755,7 @@ msgid "You cannot copy messages from a NNTP folder!"
 msgstr "ä½ ç?¡æ³?å¾? NNTP è³?æ??夾è¤?製è¨?æ?¯ï¼?"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid ""
-"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "以簡ç?­è¡¨ç¤ºæ³?顯示è³?æ??夾(ä¾?å¦?ï¼?c.o.linux è??ä¸?æ?¯ comp.o_s.linux)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
@@ -4742,9 +4774,7 @@ msgstr "é??æ?¯è®?å??è??ç?¼ä¿¡è?³ USENET æ?°è??ç¾£çµ?ç??ä¾?æ??è??ã??"
 
 # camel/providers/nntp/camel-nntp-store.c:293
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
+msgid "This option will authenticate with the NNTP server using a plaintext password."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨ç´?æ??å­?ç??å¯?碼é©?è­? NNTP 伺æ??å?¨ã??"
 
 # camel/providers/imap/camel-imap-folder.c:172
@@ -4940,17 +4970,12 @@ msgstr "ç?¨æ?¼é?£ç·?å?° POP 伺æ??å?¨ä¸¦ä¸?è¼?é?µä»¶ã??"
 
 # camel/providers/pop3/camel-pop3-provider.c:69
 #: ../camel/providers/pop3/camel-pop3-provider.c:72
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
+msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨ç´?æ??å­?ç??å¯?碼é?£ç·?å?° POP 伺æ??å?¨ã??ä¸?è?¬ç?? POP 伺æ??å?¨å?ªæ??æ?¯æ?´é??種æ?¹å¼?ã??"
 
 # camel/providers/pop3/camel-pop3-provider.c:79
 #: ../camel/providers/pop3/camel-pop3-provider.c:82
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
+msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨å? å¯?ç??å¯?碼ç¶?ç?± APOP é??è¨?å??å®?é?£ç·?å?° POP 伺æ??å?¨ã??ä¸?é??å°±ç®?伺æ??å?¨è?²ç¨±è?½å¤ æ?¯æ?´ï¼?ä½?å°?æ?¼æ??æ??使ç?¨è??ä¾?è¬?é?½æ?ªå¿?ä¸?å®?å?¯è¡?ã??"
 
 #. Translators: This is the separator between an error and an explanation
@@ -4998,9 +5023,7 @@ msgstr "æ­¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ TLS"
 #: ../camel/providers/pop3/camel-pop3-store.c:300
 #: ../camel/providers/pop3/camel-pop3-store.c:452
 #, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
+msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
 msgstr "ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %sï¼?ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è­?æ©?å?¶ã??"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
@@ -5022,9 +5045,7 @@ msgstr "ç?¡æ³?é©?è­? POP 伺æ??å?¨ %sï¼?"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:421
 #, c-format
-msgid ""
-"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
-"attack suspected. Please contact your admin."
+msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
 msgstr "ç?¡æ³?é?£ç·?è?³ POP 伺æ??å?¨ %sï¼?\tæ?¶å?°ç?¡æ??ç?? APOP IDã??æ?¨æ¸¬å?¯è?½æ?¯ä½¿ç?¨è??å??å??æ?»æ??ã??è«?è?¯çµ¡ä½ ç??系統管ç??è??ã??"
 
 # camel/providers/pop3/camel-pop3-store.c:417
@@ -5096,9 +5117,7 @@ msgstr "Sendmail"
 
 # camel/providers/sendmail/camel-sendmail-provider.c:39
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
+msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
 msgstr "å°?é??é??ç??é?µä»¶äº¤çµ¦æ?¬å?°ç«¯ç³»çµ±ä¸?ç??ã??sendmailã??ç¨?å¼?è??ç??ã??"
 
 # camel/camel-url.c:289
@@ -5536,7 +5555,8 @@ msgstr "正���"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1635
+#: ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -5546,7 +5566,8 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1640
+#: ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -5555,7 +5576,8 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1645
+#: ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -5564,7 +5586,8 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1650
+#: ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -5587,7 +5610,8 @@ msgstr "%a %m/%d/%Y %H"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1663
+#: ../libedataserver/e-time-utils.c:1765
 #: ../libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
@@ -5645,21 +5669,24 @@ msgstr "%m/%d/%Y %H"
 # widgets/misc/e-dateedit.c:1465
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
+#: ../libedataserver/e-time-utils.c:1697
+#: ../libedataserver/e-time-utils.c:1768
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 # e-util/e-time-utils.c:323
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1826
+#: ../libedataserver/e-time-utils.c:1946
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 # e-util/e-time-utils.c:315
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
+#: ../libedataserver/e-time-utils.c:1830
+#: ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5671,7 +5698,8 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1835
+#: ../libedataserver/e-time-utils.c:1943
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
@@ -5682,7 +5710,8 @@ msgstr "%p %I:%M"
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1839
+#: ../libedataserver/e-time-utils.c:1935
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -5725,9 +5754,7 @@ msgstr "æ²?æ??å??ç??(_N)"
 
 #: ../libedataserverui/e-categories-dialog.c:368
 #, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
+msgid "There is already a category '%s' in the configuration. Please use another name"
 msgstr "å?¨çµ?æ??中已ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?使ç?¨å?¦å¤?ç??å??稱"
 
 #: ../libedataserverui/e-categories-dialog.c:676
@@ -5779,20 +5806,20 @@ msgstr "å??é¡?"
 msgid "Create category \"%s\""
 msgstr "建ç«?å??é¡?ã??%sã??"
 
-#: ../libedataserverui/e-name-selector-dialog.c:319
+#: ../libedataserverui/e-name-selector-dialog.c:321
 msgid "Select Contacts from Address Book"
 msgstr "å¾?é??è¨?é??é?¸å??è?¯çµ¡äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:658
+#: ../libedataserverui/e-name-selector-dialog.c:660
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:662
+#: ../libedataserverui/e-name-selector-dialog.c:664
 msgid "_Remove"
 msgstr "移�(_R)"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:890
+#: ../libedataserverui/e-name-selector-dialog.c:892
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
@@ -5837,25 +5864,25 @@ msgid "_Search:"
 msgstr "æ??å°?(_S):"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2636
+#: ../libedataserverui/e-name-selector-entry.c:2639
 #, 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:2654
 #, 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:2664
 #, 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:2681
 #, c-format
 msgid "_Edit %s"
 msgstr "編輯 %s(_E)"
@@ -5874,19 +5901,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 +5923,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)"
 
@@ -5921,3 +5948,4 @@ msgstr "ç?¡æ??ç??伺æ??å?¨å??æ??"
 #: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "é?¯èª¤ç??å??æ?¸"
+
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8d8ce19..f48dbed 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,9 +7,9 @@
 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"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=Misc.\n";
+"POT-Creation-Date: 2010-09-16 19:55+0000\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"
@@ -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,8 @@ 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 +870,15 @@ 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 +1014,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 +1027,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 +1049,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 +1167,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 +1326,13 @@ 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 +1341,8 @@ 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,12 +1350,13 @@ 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 "æ?ªæ??å®?"
 
 # camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1227 ../libedataserverui/e-book-auth-util.c:206
+#: ../calendar/libecal/e-cal.c:1227
+#: ../libedataserverui/e-book-auth-util.c:206
 #: ../libedataserverui/e-book-auth-util.c:435
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -1365,55 +1372,59 @@ 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 +1432,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 +1455,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 +1476,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 "æ²?æ??é?¯èª¤"
 
@@ -1543,13 +1554,8 @@ msgstr "ã??%sã??ç??第äº?å??å¼?æ?¸å¿?é ?ç?ºå­?串"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
-msgid ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
-"\"classification\""
-msgstr ""
-"ã??%sã??ç??第ä¸?å??å¼?æ?¸å¿?é ?ç?ºã??ä»»ä½?ã??ã??ã??æ??è¦?ã??ä¹?ä¸?ï¼?æ??ã??æ??è¿°ã??ã??ã??ä½?ç½®ã??ã??ã??å?°æ??"
-"è??ã??ã??ã??å?¬é??人ã??ã??ã??å??é¡?ã??å?¶ä¸­ä¹?ä¸?"
+msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
+msgstr "ã??%sã??ç??第ä¸?å??å¼?æ?¸å¿?é ?ç?ºã??ä»»ä½?ã??ã??ã??æ??è¦?ã??ä¹?ä¸?ï¼?æ??ã??æ??è¿°ã??ã??ã??ä½?ç½®ã??ã??ã??å?°æ??è??ã??ã??ã??å?¬é??人ã??ã??ã??å??é¡?ã??å?¶ä¸­ä¹?ä¸?"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
@@ -1558,9 +1564,7 @@ msgstr "ã??%sã??é??è¦?è?³å°?ä¸?å??å¼?æ?¸"
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
-msgid ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
+msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
 msgstr "ã??%sã??ç??æ??æ??å¼?æ?¸å¿?é ?ç?ºå­?串ï¼?æ??å?ªæ??ä¸?å??å¼?æ?¸ç?ºå¸?æ??å?½å?¼ (#f)"
 
 # camel/providers/local/camel-maildir-folder.c:218
@@ -1588,163 +1592,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 "ç?¡æ³?實é«?å??å¾?端ç¨?å¼?"
@@ -1857,7 +1861,8 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "è??伺æ??å?¨é??æ?°å??æ­¥"
 
-#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
+#: ../camel/camel-disco-folder.c:68
+#: ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
 msgstr "正����������模�"
 
@@ -1868,7 +1873,8 @@ msgstr "正����������模�"
 msgid "Preparing folder '%s' for offline"
 msgstr "æº?å??è³?æ??夾ã??%sã??ä¾?é?¢ç·?使ç?¨"
 
-#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+#: ../camel/camel-disco-folder.c:445
+#: ../camel/camel-offline-folder.c:224
 msgid "Copy folder content locally for offline operation"
 msgstr "è¤?製è³?æ??夾å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?業"
 
@@ -1879,17 +1885,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: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-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:281
+#: ../camel/providers/imapx/camel-imapx-folder.c:324
+#: ../camel/providers/imapx/camel-imapx-folder.c:356
+#: ../camel/providers/imapx/camel-imapx-folder.c:387
+#: ../camel/providers/imapx/camel-imapx-store.c:193
+#: ../camel/providers/imapx/camel-imapx-store.c:715
+#: ../camel/providers/imapx/camel-imapx-store.c:778
+#: ../camel/providers/imapx/camel-imapx-store.c:837
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "æ?¨å¿?é ?æ?¼ç·?ä¸?å·¥ä½?æ??è?½å®?æ??æ­¤æ??ä½?"
@@ -1900,14 +1906,19 @@ msgstr "æ?¨å¿?é ?æ?¼ç·?ä¸?å·¥ä½?æ??è?½å®?æ??æ­¤æ??ä½?"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
-#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
-#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
-#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
-#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
-#: ../camel/camel-tcp-stream-raw.c:250
-#: ../camel/providers/imapx/camel-imapx-server.c:4654
-#: ../camel/providers/imapx/camel-imapx-server.c:4671
+#: ../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: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:4675
+#: ../camel/providers/imapx/camel-imapx-server.c:4692
 #: ../camel/providers/nntp/camel-nntp-summary.c:396
 #: ../camel/providers/pop3/camel-pop3-folder.c:269
 #: ../camel/providers/pop3/camel-pop3-folder.c:625
@@ -1924,7 +1935,8 @@ msgstr "å·²å??æ¶?"
 # calendar/gui/e-calendar-table.c:422
 # camel/camel-service.c:544
 # camel/camel-service.c:580
-#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:643
+#: ../camel/camel-file-utils.c:734
 #: ../camel/camel-file-utils.c:791
 #, c-format
 msgid "Canceled"
@@ -1932,7 +1944,8 @@ msgstr "å·²å??æ¶?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:808
+#: ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "ç?¡æ³?建æ§?å­?代è??ç?? '%s'ï¼?%s"
@@ -1945,18 +1958,21 @@ msgstr "ç?¡æ³?è®?å?? %s ç??æ­¡è¿?è¾­ï¼? %s"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
+#: ../camel/camel-filter-driver.c:1037
+#: ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
 msgstr "å??æ­¥è??ç??è³?æ??夾"
 
 # camel/camel-filter-driver.c:866
-#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
+#: ../camel/camel-filter-driver.c:1134
+#: ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "å??æ??é??濾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
+#: ../camel/camel-filter-driver.c:1145
+#: ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "å?·è¡?é??濾å?¨ç?¼ç??é?¯èª¤ï¼? %s: %s"
@@ -1981,20 +1997,23 @@ msgstr "���件 %d (%d%%)"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
+#: ../camel/camel-filter-driver.c:1275
+#: ../camel/camel-filter-driver.c:1297
 #, c-format
 msgid "Failed on message %d"
 msgstr "å?¨ç¬¬ %d å°?é?µä»¶ç?¼ç??é?¯èª¤"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
+#: ../camel/camel-filter-driver.c:1312
+#: ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
 msgstr "å??æ­¥è??ç??è³?æ??夾"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
+#: ../camel/camel-filter-driver.c:1316
+#: ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "å®?æ??"
 
@@ -2031,13 +2050,15 @@ msgstr "ç?¡æ??ç??å??æ?¸çµ¦ (user-tag)"
 
 # camel/camel-filter-search.c:439
 # camel/camel-filter-search.c:445
-#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
+#: ../camel/camel-filter-search.c:744
+#: ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "å?·è¡?é??濾å?¨æ??å°?ç?¼ç??é?¯èª¤ï¼? %s: %s"
 
 # camel/camel-folder-search.c:328
-#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:345
+#: ../camel/camel-folder-search.c:456
 #: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
@@ -2048,7 +2069,8 @@ msgstr ""
 "%s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:357
+#: ../camel/camel-folder-search.c:468
 #: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
@@ -2060,7 +2082,8 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
+#: ../camel/camel-folder-search.c:843
+#: ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) é??è¦?å?®ä¸?å¸?æ??å?¼çµ?æ??"
@@ -2070,7 +2093,8 @@ msgstr "(%s) é??è¦?å?®ä¸?å¸?æ??å?¼çµ?æ??"
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ä¸?å??許æ?¾å?¨ %s 裡é?¢"
 
-#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
+#: ../camel/camel-folder-search.c:944
+#: ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) é??è¦?ç?¸ç¬¦é¡?å??å­?串"
@@ -2098,11 +2122,11 @@ msgstr[0] "æ­£å?¨å­¸ç¿?ã??%sã??中ç??æ?°å??å?¾é?µä»¶"
 
 # mail/mail-ops.c:1649
 #: ../camel/camel-folder.c:147
-#, fuzzy, c-format
+#, c-format
 #| msgid "Scanning for changed messages in %s"
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "æ­£å?¨å­¸ç¿?ã??%sã??中ç??æ?°å??å?¾é?µä»¶"
+msgstr[0] "æ­£å?¨å­¸ç¿?ã??%sã??中ç?? ham é?µä»¶"
 
 # mail/mail-ops.c:1565
 #: ../camel/camel-folder.c:171
@@ -2124,7 +2148,8 @@ msgstr "正��製�件"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:701
+#: ../camel/camel-gpg-context.c:706
 #: ../camel/camel-gpg-context.c:1330
 #, c-format
 msgid "Failed to execute gpg: %s"
@@ -2152,7 +2177,8 @@ msgstr ""
 msgid "Failed to parse gpg userid hint."
 msgstr "解æ?? gpg userid æ??示æ??失æ??ã??"
 
-#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#: ../camel/camel-gpg-context.c:812
+#: ../camel/camel-gpg-context.c:827
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "解æ?? gpg å¯?èª?è¦?æ±?æ??失æ??ã??"
@@ -2199,22 +2225,29 @@ msgid "Failed to encrypt: No valid recipients specified."
 msgstr "ä¸?è?½å? å¯?é?µä»¶ï¼?æ²?æ??æ??ä¾?æ??æ??ç??æ?¶ä»¶è??ã??"
 
 # mail/mail-ops.c:1872
-#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+#: ../camel/camel-gpg-context.c:1434
+#: ../camel/camel-smime-context.c:821
 msgid "Could not generate signing data: "
 msgstr "ç?¡æ³?ç?¢ç??簽章è³?æ??ï¼?"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
-#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
-#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
+#: ../camel/camel-gpg-context.c:1481
+#: ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848
+#: ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081
+#: ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
 msgstr "å?·è¡? gpg 失æ??ã??"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
-#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-gpg-context.c:1622
+#: ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638
+#: ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943
+#: ../camel/camel-smime-context.c:957
 #: ../camel/camel-smime-context.c:966
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
@@ -2235,7 +2268,8 @@ msgid "This is a digitally encrypted message part"
 msgstr "é??æ?¯æ?¸ä½?å??å? å¯?è¨?æ?¯é?¨ä»½"
 
 # camel/camel-pgp-context.c:890
-#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1922
+#: ../camel/camel-gpg-context.c:1931
 #: ../camel/camel-gpg-context.c:1954
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
@@ -2246,7 +2280,8 @@ msgstr "ä¸?è?½è§£å¯?æ­¤é?µä»¶ï¼?é?¯èª¤ç??è¨?æ?¯æ ¼å¼?"
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "解å¯? MIME çµ?件æ??失æ??ï¼?é??è¨?å??å®?é?¯èª¤"
 
-#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
+#: ../camel/camel-gpg-context.c:2023
+#: ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "���容"
 
@@ -2261,7 +2296,8 @@ msgstr "ä¸?è?½å»ºæ§?é??å®? helper å°?管ï¼?%s"
 msgid "Cannot fork locking helper: %s"
 msgstr "ä¸?è?½å??å??é??å®? helper ï¼? %s"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-lock-client.c:211
+#: ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "ç?¡æ³?é??å®?ã??%sã??ï¼? lock-helper å??å®?é?¯èª¤"
@@ -2360,7 +2396,8 @@ msgid "Error writing mail temp file: %s"
 msgstr "寫å?¥é?µä»¶æ?«å­?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 # camel/camel-movemail.c:587
-#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
+#: ../camel/camel-movemail.c:483
+#: ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "è¤?製é?µä»¶æ?«å­?æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
@@ -2382,33 +2419,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"
@@ -2421,7 +2458,8 @@ msgstr "æ­£å?¨å°?è³?æ??夾ã??%sã??中ç??é?µä»¶å??æ­¥å?°ç£?ç¢?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
+#: ../camel/camel-offline-journal.c:144
+#: ../camel/camel-offline-journal.c:170
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "ä¸?è?½å¯«å?¥è³?æ??夾ã??%sã??ç??é?¢ç·?æ?¥èª?ï¼?%s"
@@ -2456,7 +2494,8 @@ 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:207
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "æ²?æ??é??è¨?å??å®?ã??%sã??ç??æ??ä¾?è??"
@@ -2515,59 +2554,51 @@ msgstr "CRAM-MD5"
 
 # camel/camel-sasl-cram-md5.c:37
 #: ../camel/camel-sasl-cram-md5.c:47
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr ""
-"é??å??é?¸é ?å°?æ??使ç?¨ CRAM-MD5 å? å¯?ç??å¯?碼é?£ç·?è?³ä¼ºæ??å?¨ï¼?è?¥ç?¼ç?¾è©²ä¼ºæ??å?¨æ?¯æ?´é??種æ??"
-"å??ã??"
+msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
+msgstr "é??å??é?¸é ?å°?æ??使ç?¨ CRAM-MD5 å? å¯?ç??å¯?碼é?£ç·?è?³ä¼ºæ??å?¨ï¼?è?¥ç?¼ç?¾è©²ä¼ºæ??å?¨æ?¯æ?´é??種æ??å??ã??"
 
 # camel/camel-sasl-digest-md5.c:43
-#: ../camel/camel-sasl-digest-md5.c: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
-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: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 "伺æ??å?¨å??æ??ä¸?符"
@@ -2582,9 +2613,7 @@ msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨ Kerberos 5 é©?è­?é?£ç·?è?³ä¼ºæ??å?¨ã??"
 
 #: ../camel/camel-sasl-gssapi.c:119
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
+msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
 msgstr "æ??ä¾?ç??è­?件ä¸?æ?¯æ?´æ??å®?ç??æ©?å?¶ï¼?æ??è??æ?¯å?·è¡?ç?¡æ³?辨è­?ã??"
 
 #: ../camel/camel-sasl-gssapi.c:124
@@ -2592,28 +2621,19 @@ msgid "The provided target_name parameter was ill-formed."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸æ ¼å¼?é?¯èª¤ã??"
 
 #: ../camel/camel-sasl-gssapi.c:127
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
+msgid "The provided target_name parameter contained an invalid or unsupported type of name."
 msgstr "æ??ä¾?ç?? target_name å??æ?¸å??å?«ç?¡æ??æ??ä¸?æ?¯æ?´ç??å??稱é¡?å??ã??"
 
 #: ../camel/camel-sasl-gssapi.c:131
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
-msgstr ""
-"input_token å??å?«ä¸?å??ç??é??é??ï¼?é??é??  input_chan_bindingsï¼?é?£çµ?è?³é??äº?æ??å®?ç??å??æ?¸ã??"
+msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
+msgstr "input_token å??å?«ä¸?å??ç??é??é??ï¼?é??é??  input_chan_bindingsï¼?é?£çµ?è?³é??äº?æ??å®?ç??å??æ?¸ã??"
 
 #: ../camel/camel-sasl-gssapi.c:136
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
+msgid "The input_token contains an invalid signature, or a signature that could not be verified."
 msgstr "input_token å??å?«ç?¡æ??ç??簽章ï¼?æ??è??ç?¡æ³?確èª?ç??簽章ã??"
 
 #: ../camel/camel-sasl-gssapi.c:140
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
+msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
 msgstr "æ??ä¾?ç??è­?件ä¸?é?©ç?¨æ?¼ç¶²è·¯ä½?ç½®ï¼?æ??è??è­?件è­?å?¥æ??æ¨?æ?ªå??ç?§ä»»ä½?æ??è­?ã??"
 
 #: ../camel/camel-sasl-gssapi.c:145
@@ -2634,8 +2654,10 @@ msgstr "å??ç?§ç??è­?件已ç¶?é??æ??ã??"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
-#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
+#: ../camel/camel-sasl-gssapi.c:160
+#: ../camel/camel-sasl-gssapi.c:296
+#: ../camel/camel-sasl-gssapi.c:340
+#: ../camel/camel-sasl-gssapi.c:357
 #: ../camel/providers/smtp/camel-smtp-transport.c:1176
 #, c-format
 msgid "Bad authentication response from server."
@@ -2654,7 +2676,8 @@ msgstr "��"
 
 # camel/camel-sasl-login.c:34
 # camel/camel-sasl-plain.c:34
-#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
+#: ../camel/camel-sasl-login.c:41
+#: ../camel/camel-sasl-plain.c:45
 msgid "This option will connect to the server using a simple password."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨æ?®é??ç??å¯?碼é?£ç·?è?³ä¼ºæ??å?¨ã??"
 
@@ -2670,9 +2693,7 @@ msgstr "NTLM / SPA"
 
 # camel/camel-sasl-kerberos4.c:42
 #: ../camel/camel-sasl-ntlm.c:43
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
+msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨ NTLM / å®?å?¨å¯?碼é©?è­?é?£ç·?è?³å?ºæ?¼ Windows ç??伺æ??å?¨ã??"
 
 #: ../camel/camel-sasl-plain.c:43
@@ -2743,7 +2764,8 @@ msgid "Please enter the %s password for %s on host %s."
 msgstr "è«?輸å?¥ %2$s æ?¼ä¸»æ©? %3$s ç?? %1$s å¯?碼ã??"
 
 # camel/camel-smime-context.c:327
-#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
+#: ../camel/camel-smime-context.c:348
+#: ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "æ?¾ä¸?å?° '%s' ç??æ??è­?"
@@ -2782,7 +2804,8 @@ msgid "Cannot add CMS Signing time"
 msgstr "���� CMS SigningTime"
 
 # composer/e-msg-composer.c:1092
-#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
+#: ../camel/camel-smime-context.c:436
+#: ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ç??å? å¯?æ??è­?ä¸?å­?å?¨"
@@ -2860,7 +2883,8 @@ msgstr "å??裹ç??è³?æ??中é?ºæ¼?æ??è¦?"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:584
+#: ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 
@@ -2871,12 +2895,14 @@ msgstr "ç?¡æ³?è¨?ç®?æ??è¦?"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "ç?¡æ³?設å®?é?µä»¶æ??è¦?"
 
 # mail/mail-crypto.c:59
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:616
+#: ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "æ??è­?å?¯å?¥å¤±æ??"
 
@@ -2902,7 +2928,8 @@ msgid "Signer: %s <%s>: %s\n"
 msgstr "簽署è??ï¼? %s<%s>ï¼? %s\n"
 
 # mail/mail-crypto.c:251
-#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
+#: ../camel/camel-smime-context.c:832
+#: ../camel/camel-smime-context.c:1114
 msgid "Cannot create encoder context"
 msgstr "��建�編碼�網路�置"
 
@@ -2911,12 +2938,14 @@ msgstr "��建�編碼�網路�置"
 msgid "Failed to add data to CMS encoder"
 msgstr "ç?¡æ³?æ?°å¢?è³?æ??è?³ CMS 編碼å?¨"
 
-#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
+#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:1131
 msgid "Failed to encode data"
 msgstr "ç?¡æ³?編碼è³?æ??"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
+#: ../camel/camel-smime-context.c:981
+#: ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
 msgstr "解碼å?¨å¤±æ??"
 
@@ -2984,14 +3013,16 @@ msgstr "ç?¡æ³?建æ§?è³?æ??夾ï¼?%sï¼?è³?æ??夾已å­?å?¨"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/camel-store.c:616
+#: ../camel/camel-vee-store.c:263
 #: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ä¸?è?½å?ªé?¤è³?æ??夾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/camel-store.c:680
+#: ../camel/camel-vee-store.c:213
 #: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -3003,82 +3034,83 @@ msgstr "ä¸?è?½é??æ?°å?½å??è³?æ??夾ï¼? %s ï¼?ç?¡æ??ç??æ??ä½?"
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:1129 ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1129
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "å??æ?¶ç­?"
 
 # calendar/gui/goto-dialog.glade.h:9
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:1132 ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:1132
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
-#: ../camel/camel-tcp-stream-raw.c:809
+#: ../camel/camel-tcp-stream-raw.c:814
 #, 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:820
 #, 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:832
 msgid "General SOCKS server failure"
 msgstr "ä¸?è?¬æ?§ SOCKS 伺æ??å?¨å¤±æ??"
 
-#: ../camel/camel-tcp-stream-raw.c:828
+#: ../camel/camel-tcp-stream-raw.c:833
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS 伺æ??å?¨ç??è¦?å??ä¸?å??許é?£ç·?"
 
-#: ../camel/camel-tcp-stream-raw.c:829
+#: ../camel/camel-tcp-stream-raw.c:834
 msgid "Network is unreachable from SOCKS server"
 msgstr "網路ç?¡æ³?é??é?? SOCKS 伺æ??å?¨å?°é??"
 
-#: ../camel/camel-tcp-stream-raw.c:830
+#: ../camel/camel-tcp-stream-raw.c:835
 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:836
 msgid "Connection refused"
 msgstr "é?£ç·?被æ??çµ?"
 
-#: ../camel/camel-tcp-stream-raw.c:832
-#, fuzzy
+#: ../camel/camel-tcp-stream-raw.c:837
 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:838
 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:839
 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:840
 msgid "Unknown error from SOCKS server"
 msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?æ??é?¯èª¤"
 
-#: ../camel/camel-tcp-stream-raw.c:865
+#: ../camel/camel-tcp-stream-raw.c:870
 #, 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:887
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "ä¾?è?ª SOCKS 伺æ??å?¨ç??ä¸?å®?æ?´å??è¦?"
 
-#: ../camel/camel-tcp-stream-raw.c:897
+#: ../camel/camel-tcp-stream-raw.c:902
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "主æ©?å??稱太é?·ï¼?æ??å¤? 255 å­?å??ï¼?"
@@ -3087,7 +3119,8 @@ 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:934
+#: ../camel/camel-tcp-stream-raw.c:944
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "å¾?代ç??伺æ??å?¨å?³å??ç?¡æ??ç??å??è¦?"
@@ -3174,24 +3207,26 @@ 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 "ä¸?è?½è¤?製æ??移å??é?µä»¶å?°è??æ?¬è³?æ??夾中"
 
-#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:141
+#: ../camel/camel-vee-store.c:143
 #: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
@@ -3267,7 +3302,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 +3310,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:3741
+#: ../camel/providers/imapx/camel-imapx-server.c:3865
 #, 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 +3355,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 +3388,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 +3414,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 +3447,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"
@@ -3420,8 +3455,7 @@ msgstr "�碼"
 
 # camel/providers/imap/camel-imap-provider.c:82
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:100
-msgid ""
-"This option will connect to the GroupWise server using a plaintext password."
+msgid "This option will connect to the GroupWise server using a plaintext password."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨ç°¡æ??ç??å¯?碼é?£ç·?è?³ GroupWise 伺æ??å?¨ã??"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
@@ -3434,7 +3468,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:2992
 #, c-format
 msgid "You did not enter a password."
 msgstr "æ?¨æ²?æ??輸å?¥å¯?碼ã??"
@@ -3448,7 +3482,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:416
 #, c-format
 msgid "No such folder %s"
 msgstr "æ²?æ??é??å??è³?æ??夾 %s"
@@ -3469,7 +3503,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:879
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "æ¯?è³?æ??夾並ä¸?å??許å??å?«å­?è³?æ??夾"
@@ -3514,13 +3548,8 @@ msgstr "ä¸?è?½å??å¾?è³?æ??夾ï¼?å?¨æ­¤å?²å­?空é??ä¸?ç?¡æ??ç??æ??ä½?"
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:152
 #, c-format
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
-msgstr ""
-"æ?¨å·²ç¶?è¶?é??é??å??帳è??ç??å?²å­?é??å?¶ã??æ?¨ç??é?µä»¶æ??å??å­?å?¨å¯?件å?£ä¸­ã??è«?å??å?ªé?¤/å°?å­?æ?¨ç??é?µä»¶"
-"å¾?å??æ?? å?³é??/æ?¥æ?¶ é??æ?°å¯?é??ã??\n"
+msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
+msgstr "æ?¨å·²ç¶?è¶?é??é??å??帳è??ç??å?²å­?é??å?¶ã??æ?¨ç??é?µä»¶æ??å??å­?å?¨å¯?件å?£ä¸­ã??è«?å??å?ªé?¤/å°?å­?æ?¨ç??é?µä»¶å¾?å??æ?? å?³é??/æ?¥æ?¶ é??æ?°å¯?é??ã??\n"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:150
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:157
@@ -3610,7 +3639,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:3781
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "æ??æ?? %s 中è®?æ?´é??ç??é?µä»¶"
@@ -3628,7 +3657,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:4958
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "ç?¡æ³?å??å¾?é?µä»¶ ID ç?º %s ç??é?µä»¶ï¼? %s"
@@ -3637,7 +3666,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:4959
 msgid "No such message available."
 msgstr "æ²?æ??é??å??é?µä»¶ã??"
 
@@ -3697,26 +3726,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 +3757,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 +3781,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 +3804,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 +3858,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:2845
+#: ../camel/providers/imapx/camel-imapx-server.c:2881
 #, 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:2846
 #: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "��� STARTTLS"
@@ -3845,7 +3874,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:2882
 msgid "SSL negotiations failed"
 msgstr "SSL å??å??失æ??"
 
@@ -3856,7 +3885,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:2682
 #, c-format
 msgid "Connection cancelled"
 msgstr "é?£ç·?å·²å??æ¶?"
@@ -3864,7 +3893,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:2687
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ç?¡æ³?以æ??令ã??%sã??é?£ç·?ï¼? %s"
@@ -3873,8 +3902,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:463
+#: ../camel/providers/imapx/camel-imapx-store.c:1060
 #: ../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 +3915,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:2948
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 伺æ??å?¨ %s ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è­?é¡?å?? %s"
@@ -3894,7 +3923,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:2960
 #: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "No support for authentication type %s"
@@ -3902,7 +3931,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:3030
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3915,10 +3944,9 @@ 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:858
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "è³?æ??夾å??稱ã??%sã??ç?¡æ??ï¼?å? ç?ºå®?å??æ?¬å­?å??ã??%cã??"
 
 # camel/providers/local/camel-local-store.c:142
@@ -3933,7 +3961,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:869
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "ä¸?æ??ç??æ¯?è³?æ??夾ï¼? %s"
@@ -3950,58 +3978,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:1384
 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:2039
 #, 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:2773
 #, c-format
 msgid "Could not connect to %s (port %s): "
 msgstr "ç?¡æ³?é?£ç·?è?³ %s (å? è?? %s)ï¼?"
@@ -4010,7 +4038,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:3202
 msgid "Closing tmp stream failed: "
 msgstr "ç?¡æ³?é??é?? tmp 串æµ?ï¼?"
 
@@ -4021,7 +4049,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:5083
 #, c-format
 msgid "Cannot create spool file: %s"
 msgstr "ä¸?è?½å»ºç«?æ??ç¨?å?¨æª?æ¡?ï¼?%s"
@@ -4033,24 +4061,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:5099
 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:432
 #: ../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 "��串���使�"
@@ -4109,11 +4137,8 @@ msgid "Local delivery"
 msgstr "æ?¬å?°ç«¯å¯?é??"
 
 #: ../camel/providers/local/camel-local-provider.c:70
-msgid ""
-"For retrieving (moving) local mail from standard mbox-formatted spools into "
-"folders managed by Evolution."
-msgstr ""
-"ç?¨æ?¼è?ªæ¨?æº? mbox æ ¼å¼?æ??ç¨?å?¨æ?¥æ?¶ï¼?移å??ï¼?æ?¬å?°ç«¯é?µä»¶è?³ Evolution 管ç??ç??è³?æ??夾ã??"
+msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
+msgstr "ç?¨æ?¼è?ªæ¨?æº? mbox æ ¼å¼?æ??ç¨?å?¨æ?¥æ?¶ï¼?移å??ï¼?æ?¬å?°ç«¯é?µä»¶è?³ Evolution 管ç??ç??è³?æ??夾ã??"
 
 # camel/providers/imap/camel-imap-provider.c:57
 #: ../camel/providers/local/camel-local-provider.c:84
@@ -4507,9 +4532,7 @@ msgstr "ç?¡æ³?å?²å­?è³?æ??夾ï¼?%s "
 #: ../camel/providers/local/camel-mbox-summary.c:869
 #: ../camel/providers/local/camel-mbox-summary.c:1102
 #, c-format
-msgid ""
-"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
-"it.)"
+msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)"
 msgstr "MBOX æª?æ¡?å·²æ??å£?ï¼?è«?修正å®?ã??ï¼?é ?æ??æ?? From é??ä¸?è¡?ï¼?å?»æ?¾ä¸?å?°å®?ã??ï¼?"
 
 # camel/providers/local/camel-mbox-summary.c:549
@@ -4732,8 +4755,7 @@ msgid "You cannot copy messages from a NNTP folder!"
 msgstr "æ?¨ç?¡æ³?å¾? NNTP è³?æ??夾è¤?製è¨?æ?¯ï¼?"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid ""
-"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "以簡ç?­è¡¨ç¤ºæ³?顯示è³?æ??夾(ä¾?å¦?ï¼?c.o.linux è??ä¸?æ?¯ comp.o_s.linux)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
@@ -4752,9 +4774,7 @@ msgstr "é??æ?¯è®?å??è??ç?¼ä¿¡è?³ USENET æ?°è??群çµ?ç??ä¾?æ??è??ã??"
 
 # camel/providers/nntp/camel-nntp-store.c:293
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
+msgid "This option will authenticate with the NNTP server using a plaintext password."
 msgstr "é??å??é?¸é ?å°?æ??使ç?¨ç´?æ??å­?ç??å¯?碼é©?è­? NNTP 伺æ??å?¨ã??"
 
 # camel/providers/imap/camel-imap-folder.c:172
@@ -4950,22 +4970,13 @@ msgstr "ç?¨æ?¼é?£ç·?å?° POP 伺æ??å?¨ä¸¦ä¸?è¼?é?µä»¶ã??"
 
 # camel/providers/pop3/camel-pop3-provider.c:69
 #: ../camel/providers/pop3/camel-pop3-provider.c:72
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"é??å??é?¸é ?å°?æ??使ç?¨ç´?æ??å­?ç??å¯?碼é?£ç·?å?° POP 伺æ??å?¨ã??ä¸?è?¬ç?? POP 伺æ??å?¨å?ªæ??æ?¯æ?´é??種"
-"æ?¹å¼?ã??"
+msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgstr "é??å??é?¸é ?å°?æ??使ç?¨ç´?æ??å­?ç??å¯?碼é?£ç·?å?° POP 伺æ??å?¨ã??ä¸?è?¬ç?? POP 伺æ??å?¨å?ªæ??æ?¯æ?´é??種æ?¹å¼?ã??"
 
 # camel/providers/pop3/camel-pop3-provider.c:79
 #: ../camel/providers/pop3/camel-pop3-provider.c:82
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"é??å??é?¸é ?å°?æ??使ç?¨å? å¯?ç??å¯?碼ç¶?ç?± APOP é??è¨?å??å®?é?£ç·?å?° POP 伺æ??å?¨ã??ä¸?é??å°±ç®?伺æ??å?¨"
-"è?²ç¨±è?½å¤ æ?¯æ?´ï¼?ä½?å°?æ?¼æ??æ??使ç?¨è??ä¾?è¬?é?½æ?ªå¿?ä¸?å®?å?¯è¡?ã??"
+msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
+msgstr "é??å??é?¸é ?å°?æ??使ç?¨å? å¯?ç??å¯?碼ç¶?ç?± APOP é??è¨?å??å®?é?£ç·?å?° POP 伺æ??å?¨ã??ä¸?é??å°±ç®?伺æ??å?¨è?²ç¨±è?½å¤ æ?¯æ?´ï¼?ä½?å°?æ?¼æ??æ??使ç?¨è??ä¾?è¬?é?½æ?ªå¿?ä¸?å®?å?¯è¡?ã??"
 
 #. Translators: This is the separator between an error and an explanation
 #: ../camel/providers/pop3/camel-pop3-store.c:98
@@ -5012,9 +5023,7 @@ msgstr "æ­¤ä¸?ç??æ?¬ä¸¦æ?ªå??ç?¨ TLS"
 #: ../camel/providers/pop3/camel-pop3-store.c:300
 #: ../camel/providers/pop3/camel-pop3-store.c:452
 #, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
+msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
 msgstr "ç?¡æ³?é?£ç·?å?° POP 伺æ??å?¨ %sï¼?ä¸?æ?¯æ?´æ??è¦?æ±?ç??é©?è­?æ©?å?¶ã??"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
@@ -5036,12 +5045,8 @@ msgstr "ç?¡æ³?é©?è­? POP 伺æ??å?¨ %sï¼?"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:421
 #, c-format
-msgid ""
-"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
-"attack suspected. Please contact your admin."
-msgstr ""
-"ç?¡æ³?é?£ç·?è?³ POP 伺æ??å?¨ %sï¼?\tæ?¶å?°ç?¡æ??ç?? APOP IDã??æ?¨æ¸¬å?¯è?½æ?¯ä½¿ç?¨è??å??å??æ?»æ??ã??è«?"
-"è?¯çµ¡æ?¨ç??系統管ç??è??ã??"
+msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
+msgstr "ç?¡æ³?é?£ç·?è?³ POP 伺æ??å?¨ %sï¼?\tæ?¶å?°ç?¡æ??ç?? APOP IDã??æ?¨æ¸¬å?¯è?½æ?¯ä½¿ç?¨è??å??å??æ?»æ??ã??è«?è?¯çµ¡æ?¨ç??系統管ç??è??ã??"
 
 # camel/providers/pop3/camel-pop3-store.c:417
 #: ../camel/providers/pop3/camel-pop3-store.c:471
@@ -5112,9 +5117,7 @@ msgstr "Sendmail"
 
 # camel/providers/sendmail/camel-sendmail-provider.c:39
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
+msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
 msgstr "å°?é??é??ç??é?µä»¶äº¤çµ¦æ?¬å?°ç«¯ç³»çµ±ä¸?ç??ã??sendmailã??ç¨?å¼?è??ç??ã??"
 
 # camel/camel-url.c:289
@@ -5552,7 +5555,8 @@ msgstr "正���"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
+#: ../libedataserver/e-time-utils.c:1635
+#: ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
@@ -5562,7 +5566,8 @@ msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1640
+#: ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
@@ -5571,7 +5576,8 @@ msgstr "%Y/%m/%d (%a) %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1645
+#: ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
@@ -5580,7 +5586,8 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1650
+#: ../libedataserver/e-time-utils.c:1889
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
 
@@ -5603,7 +5610,8 @@ msgstr "%a %m/%d/%Y %H"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1663
+#: ../libedataserver/e-time-utils.c:1765
 #: ../libedataserver/e-time-utils.c:1884
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
@@ -5661,21 +5669,24 @@ msgstr "%m/%d/%Y %H"
 # widgets/misc/e-dateedit.c:1465
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
+#: ../libedataserver/e-time-utils.c:1697
+#: ../libedataserver/e-time-utils.c:1768
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 # e-util/e-time-utils.c:323
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
+#: ../libedataserver/e-time-utils.c:1826
+#: ../libedataserver/e-time-utils.c:1946
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 # e-util/e-time-utils.c:315
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
+#: ../libedataserver/e-time-utils.c:1830
+#: ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5687,7 +5698,8 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
+#: ../libedataserver/e-time-utils.c:1835
+#: ../libedataserver/e-time-utils.c:1943
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
@@ -5698,7 +5710,8 @@ msgstr "%p %I:%M"
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
+#: ../libedataserver/e-time-utils.c:1839
+#: ../libedataserver/e-time-utils.c:1935
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -5741,9 +5754,7 @@ msgstr "æ²?æ??å??ç??(_N)"
 
 #: ../libedataserverui/e-categories-dialog.c:368
 #, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
+msgid "There is already a category '%s' in the configuration. Please use another name"
 msgstr "å?¨çµ?æ??中已ç¶?æ??å??ç?ºã??%sã??ç??å??é¡?ã??è«?使ç?¨å?¦å¤?ç??å??稱"
 
 #: ../libedataserverui/e-categories-dialog.c:676
@@ -5795,20 +5806,20 @@ msgstr "å??é¡?"
 msgid "Create category \"%s\""
 msgstr "建ç«?å??é¡?ã??%sã??"
 
-#: ../libedataserverui/e-name-selector-dialog.c:319
+#: ../libedataserverui/e-name-selector-dialog.c:321
 msgid "Select Contacts from Address Book"
 msgstr "å¾?é??è¨?é??é?¸å??é?£çµ¡äºº"
 
-#: ../libedataserverui/e-name-selector-dialog.c:658
+#: ../libedataserverui/e-name-selector-dialog.c:660
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:662
+#: ../libedataserverui/e-name-selector-dialog.c:664
 msgid "_Remove"
 msgstr "移�(_R)"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:890
+#: ../libedataserverui/e-name-selector-dialog.c:892
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
@@ -5853,25 +5864,25 @@ msgid "_Search:"
 msgstr "æ??å°?(_S):"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2636
+#: ../libedataserverui/e-name-selector-entry.c:2639
 #, 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:2654
 #, 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:2664
 #, 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:2681
 #, c-format
 msgid "_Edit %s"
 msgstr "編輯 %s(_E)"
@@ -5890,19 +5901,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 +5923,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)"
 
@@ -5937,3 +5948,4 @@ msgstr "ç?¡æ??ç??伺æ??å?¨å??æ??"
 #: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "é?¯èª¤ç??å??æ?¸"
+



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