Updated Traditional Chinese translation(Hong Kong and Taiwan)

1 files changed, 102 insertions, 93 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index c6956849b..5e404c6e9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,10 +6,10 @@
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005. 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 2.29.6\n"
+"Project-Id-Version: evolution-data-server 2.29.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-22 22:35+0800\n"
-"PO-Revision-Date: 2010-01-22 10:06+0800\n"
+"POT-Creation-Date: 2010-02-15 11:49+0800\n"
+"PO-Revision-Date: 2010-02-14 22:42+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"
@@ -31,13 +31,13 @@ msgstr "載入中..."
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4524
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4551
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "搜尋中..."
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4688
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "正在下載連絡人 (%d)..."
@@ -49,47 +49,47 @@ msgstr "正在下載連絡人 (%d)..."
 msgid "Updating contacts cache (%d)... "
 msgstr "正在更新連絡人快取 (%d)..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:786
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
 msgid "Using Distinguished Name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
 # mail/mail-config.glade.h:29
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:789
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
 msgid "Using Email Address"
 msgstr "使用電子郵件地址"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
 msgid "Reconnecting to LDAP server..."
 msgstr "正在重新連接 LDAP 伺服器..."
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
 msgid "Adding contact to LDAP server..."
 msgstr "正在新增連絡人至 LDAP 伺服器..."
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
 msgid "Removing contact from LDAP server..."
 msgstr "正在移除 LDAP 伺服器中的連絡人..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
 msgid "Modifying contact from LDAP server..."
 msgstr "正在修改 LDAP 伺服器中的連絡人..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4385
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 搜尋結果..."
 
 # executive-summary/component/e-summary.c:940
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4546
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
 msgid "Error performing search"
 msgstr "進行搜尋時發生錯誤"
 
-#: ../addressbook/libebook/e-book.c:2121
+#: ../addressbook/libebook/e-book.c:2149
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s：沒有儲存於 gconf 中的 uid `%s' 來源。"
@@ -877,7 +877,7 @@ msgstr "無效的伺服器 URI"
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:994
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1003
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1097
-#: ../calendar/libecal/e-cal.c:3953
+#: ../calendar/libecal/e-cal.c:4016
 #: ../calendar/libedata-cal/e-cal-backend-util.c:117
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1335
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1371
@@ -1143,7 +1143,7 @@ msgid "Undefined"
 msgstr "未指定"
 
 # camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1138 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1169 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
@@ -1153,36 +1153,36 @@ msgstr "輸入 %s (使用者 %s) 的密碼 "
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1152
+#: ../calendar/libecal/e-cal.c:1183
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "輸入 %s 的密碼以便使用者 %s 能使用代理伺服器"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:3925
+#: ../calendar/libecal/e-cal.c:3988
 msgid "Invalid argument"
 msgstr "無效的參數"
 
-#: ../calendar/libecal/e-cal.c:3927
+#: ../calendar/libecal/e-cal.c:3990
 msgid "Backend is busy"
 msgstr "後端忙碌中"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:3929
+#: ../calendar/libecal/e-cal.c:3992
 #: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "Repository is offline"
 msgstr "倉庫已離線"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../calendar/libecal/e-cal.c:3931
+#: ../calendar/libecal/e-cal.c:3994
 #: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
 msgstr "無此行事曆"
 
-#: ../calendar/libecal/e-cal.c:3933
+#: ../calendar/libecal/e-cal.c:3996
 #: ../calendar/libedata-cal/e-cal-backend-util.c:111
 #: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
@@ -1190,42 +1190,42 @@ msgstr "找不到物件"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:3935
+#: ../calendar/libecal/e-cal.c:3998
 #: ../calendar/libedata-cal/e-cal-backend-util.c:113
 #: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid object"
 msgstr "無效的物件"
 
 # addressbook/conduit/address-conduit.c:214
-#: ../calendar/libecal/e-cal.c:3937
+#: ../calendar/libecal/e-cal.c:4000
 msgid "URI not loaded"
 msgstr "URI 未載入"
 
-#: ../calendar/libecal/e-cal.c:3939
+#: ../calendar/libecal/e-cal.c:4002
 msgid "URI already loaded"
 msgstr "URI 已載入"
 
 # shell/e-storage.c:475
-#: ../calendar/libecal/e-cal.c:3941
+#: ../calendar/libecal/e-cal.c:4004
 #: ../calendar/libedata-cal/e-cal-backend-util.c:107
 msgid "Permission denied"
 msgstr "權限不足"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:3943
+#: ../calendar/libecal/e-cal.c:4006
 #: ../calendar/libedata-cal/e-cal-backend-util.c:131
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Unknown User"
 msgstr "不明的使用者"
 
-#: ../calendar/libecal/e-cal.c:3945
+#: ../calendar/libecal/e-cal.c:4008
 #: ../calendar/libedata-cal/e-cal-backend-util.c:115
 msgid "Object ID already exists"
 msgstr "物件 ID 已存在"
 
 # shell/e-storage.c:477
-#: ../calendar/libecal/e-cal.c:3947
+#: ../calendar/libecal/e-cal.c:4010
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
@@ -1233,30 +1233,30 @@ 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:3949
+#: ../calendar/libecal/e-cal.c:4012
 msgid "Operation has been canceled"
 msgstr "操作已取消"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:3951
+#: ../calendar/libecal/e-cal.c:4014
 #: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Could not cancel operation"
 msgstr "無法取消操作"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
-#: ../calendar/libecal/e-cal.c:3955
+#: ../calendar/libecal/e-cal.c:4018
 #: ../calendar/libedata-cal/e-cal-backend-util.c:119
 #: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "要求驗證"
 
-#: ../calendar/libecal/e-cal.c:3957
+#: ../calendar/libecal/e-cal.c:4020
 msgid "A CORBA exception has occurred"
 msgstr "發生 CORBA 例外"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:3959
+#: ../calendar/libecal/e-cal.c:4022
 #: ../calendar/libedata-cal/e-cal-backend-util.c:146
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:214
 #: ../camel/providers/imap/camel-imap-command.c:432
@@ -1274,7 +1274,7 @@ msgid "Unknown error"
 msgstr "不明的錯誤"
 
 # shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:3961
+#: ../calendar/libecal/e-cal.c:4024
 #: ../calendar/libedata-cal/e-cal-backend-util.c:103
 msgid "No error"
 msgstr "沒有錯誤"
@@ -1465,7 +1465,7 @@ msgstr "不能建立行事曆物件"
 
 #: ../calendar/libedata-cal/e-data-cal.c:637
 #, c-format
-msgid "Cannot modify calender object"
+msgid "Cannot modify calendar object"
 msgstr "不能修改行事曆物件"
 
 #: ../calendar/libedata-cal/e-data-cal.c:661
@@ -1844,50 +1844,50 @@ msgstr "(%s) 期望陣列結果"
 msgid "(%s) requires the folder set"
 msgstr "(%s) 需要資料夾設定"
 
-#: ../camel/camel-folder.c:669
+#: ../camel/camel-folder.c:676
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "不支援的操作：添加郵件： %s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1374
+#: ../camel/camel-folder.c:1381
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "不支援的操作：以詞句搜尋： %s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1415
+#: ../camel/camel-folder.c:1422
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "不支援的操作：以詞句計數：用於 %s"
 
-#: ../camel/camel-folder.c:1454
+#: ../camel/camel-folder.c:1461
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "不支援的操作：以 UIDs 搜尋： %s"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1567
+#: ../camel/camel-folder.c:1574
 #: ../camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
 msgstr "正在移動郵件"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1567
+#: ../camel/camel-folder.c:1574
 msgid "Copying messages"
 msgstr "正在複製郵件"
 
 # widgets/misc/e-messagebox.c:159
-#: ../camel/camel-folder.c:1908
+#: ../camel/camel-folder.c:1915
 msgid "Learning junk"
 msgstr "了解垃圾郵件"
 
-#: ../camel/camel-folder.c:1926
+#: ../camel/camel-folder.c:1933
 msgid "Learning non-junk"
 msgstr "了解非垃圾郵件"
 
 # mail/mail-ops.c:1565
-#: ../camel/camel-folder.c:1946
+#: ../camel/camel-folder.c:1953
 msgid "Filtering new message(s)"
 msgstr "取回 %d 封郵件"
 
@@ -3044,8 +3044,8 @@ msgstr "回收筒資料夾已滿。請將它清空。"
 #: ../camel/providers/groupwise/camel-groupwise-store.c:763
 #: ../camel/providers/imap/camel-imap-folder.c:3429
 #: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2603
-#: ../camel/providers/imapx/camel-imapx-server.c:2687
+#: ../camel/providers/imapx/camel-imapx-server.c:2728
+#: ../camel/providers/imapx/camel-imapx-server.c:2813
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "正取得 %s 中新郵件的摘要資訊"
@@ -3103,12 +3103,14 @@ msgstr "檢查新郵件"
 #: ../camel/providers/hula/camel-hula-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:46
 #: ../camel/providers/imap4/camel-imap4-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "C_heck for new messages in all folders"
 msgstr "檢查所有資料夾中是否有新郵件(_H)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
 #: ../camel/providers/local/camel-local-provider.c:46
 #: ../camel/providers/local/camel-local-provider.c:86
 #: ../camel/providers/local/camel-local-provider.c:106
@@ -3128,6 +3130,7 @@ msgstr "檢查新郵件中是否有垃圾郵件內容(_U)"
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "只檢查收件匣資料夾中的垃圾郵件(_B)"
 
@@ -3162,7 +3165,7 @@ msgstr "用於存取 Novell Groupwise 伺服器"
 #: ../camel/providers/hula/camel-hula-provider.c:93
 #: ../camel/providers/imap/camel-imap-provider.c:100
 #: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:104
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
 #: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
@@ -3195,7 +3198,7 @@ msgstr "某些功能可能無法在您目前的伺服器版本上正常運作"
 #: ../camel/providers/groupwise/camel-groupwise-store.c:540
 #: ../camel/providers/imap/camel-imap-store.c:1879
 #: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:245
+#: ../camel/providers/imapx/camel-imapx-store.c:297
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
@@ -3263,6 +3266,7 @@ msgstr "郵件無法傳送： %s"
 # mail/mail-config.glade.h:13
 #: ../camel/providers/hula/camel-hula-provider.c:48
 #: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
 
@@ -3270,18 +3274,21 @@ msgstr "檢查新郵件"
 # mail/mail-config.c:1216
 #: ../camel/providers/hula/camel-hula-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "Connection to Server"
 msgstr "連線到伺服器"
 
 # camel/providers/imap/camel-imap-store.c:531
 #: ../camel/providers/hula/camel-hula-provider.c:55
 #: ../camel/providers/imap/camel-imap-provider.c:54
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "_Use custom command to connect to server"
 msgstr "使用自訂指令來連線到伺服器(_U)"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
 #: ../camel/providers/hula/camel-hula-provider.c:57
 #: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
 msgid "Command:"
 msgstr "指令："
 
@@ -3290,6 +3297,7 @@ msgstr "指令："
 #: ../camel/providers/hula/camel-hula-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:60
 #: ../camel/providers/imap4/camel-imap4-provider.c:43
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "資料夾"
@@ -3298,6 +3306,7 @@ msgstr "資料夾"
 #: ../camel/providers/hula/camel-hula-provider.c:62
 #: ../camel/providers/imap/camel-imap-provider.c:62
 #: ../camel/providers/imap4/camel-imap4-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
 msgid "_Show only subscribed folders"
 msgstr "只顯示已訂閱的資料夾(_S)"
 
@@ -3305,6 +3314,7 @@ msgstr "只顯示已訂閱的資料夾(_S)"
 #: ../camel/providers/hula/camel-hula-provider.c:64
 #: ../camel/providers/imap/camel-imap-provider.c:64
 #: ../camel/providers/imap4/camel-imap4-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
 msgid "O_verride server-supplied folder namespace"
 msgstr "覆蓋伺服器提供之資料夾的命名空間(_V)"
 
@@ -3409,7 +3419,7 @@ msgstr "無法建立目錄 %s：%s"
 # mail/mail-ops.c:1649
 #. Check UIDs and flags of all messages we already know of.
 #: ../camel/providers/imap/camel-imap-folder.c:918
-#: ../camel/providers/imapx/camel-imapx-server.c:2633
+#: ../camel/providers/imapx/camel-imapx-server.c:2758
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "掃描 %s 中變更過的郵件"
@@ -3502,29 +3512,34 @@ msgstr "快取 %s 失敗： %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "檢查訂閱資料夾裡的新郵件(_E)"
 
 # camel/providers/imap/camel-imap-provider.c:54
 #: ../camel/providers/imap/camel-imap-provider.c:66
 #: ../camel/providers/imap4/camel-imap4-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
 msgid "Namespace:"
 msgstr "命名空間"
 
 # camel/providers/imap/camel-imap-provider.c:57
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imap4/camel-imap4-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr "套用過濾條件至此伺服器收件匣的新郵件(_A)"
 
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "檢查新郵件中是否有垃圾郵件內容(_K)"
 
 # mail/mail-config.glade.h:12
 #: ../camel/providers/imap/camel-imap-provider.c:76
 #: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "自動將遠端郵件同步到本地端(_Z)"
 
@@ -3535,18 +3550,20 @@ msgstr "IMAP"
 
 # camel/providers/imap/camel-imap-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../camel/providers/imapx/camel-imapx-provider.c:90
 msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
 # camel/providers/imap/camel-imap-provider.c:82
 #: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../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:435
 #: ../camel/providers/imap4/camel-imap4-store.c:210
+#: ../camel/providers/imapx/camel-imapx-store.c:167
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 伺服器 %s"
@@ -3554,6 +3571,7 @@ msgstr "IMAP 伺服器 %s"
 # camel/camel-remote-store.c:195
 #: ../camel/providers/imap/camel-imap-store.c:437
 #: ../camel/providers/imap4/camel-imap4-store.c:212
+#: ../camel/providers/imapx/camel-imapx-store.c:169
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s 的 IMAP 服務於 %s"
@@ -3585,7 +3603,7 @@ msgstr "SSL 無法使用"
 # camel/camel-remote-store.c:252
 #: ../camel/providers/imap/camel-imap-store.c:578
 #: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:1993
+#: ../camel/providers/imapx/camel-imapx-server.c:2017
 msgid "Connection cancelled"
 msgstr "連線已取消"
 
@@ -3597,15 +3615,15 @@ msgstr "連線已取消"
 #: ../camel/providers/imap4/camel-imap4-store.c:310
 #: ../camel/providers/imap4/camel-imap4-store.c:325
 #: ../camel/providers/imap4/camel-imap4-store.c:334
-#: ../camel/providers/imapx/camel-imapx-server.c:2033
-#: ../camel/providers/imapx/camel-imapx-server.c:2047
+#: ../camel/providers/imapx/camel-imapx-server.c:2057
+#: ../camel/providers/imapx/camel-imapx-server.c:2071
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
 
 # shell/e-storage.c:477
 #: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2034
+#: ../camel/providers/imapx/camel-imapx-server.c:2058
 #: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "不支援 STARTTLS"
@@ -3613,7 +3631,7 @@ msgstr "不支援 STARTTLS"
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2048
+#: ../camel/providers/imapx/camel-imapx-server.c:2072
 msgid "SSL negotiations failed"
 msgstr "SSL 協商失敗"
 
@@ -3636,8 +3654,8 @@ msgstr "無法以指令「%s」連線： %s"
 #: ../camel/providers/imap/camel-imap-store.c:2430
 #: ../camel/providers/imap4/camel-imap4-store-summary.c:356
 #: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:409
-#: ../camel/providers/imapx/camel-imapx-store.c:640
+#: ../camel/providers/imapx/camel-imapx-store.c:349
+#: ../camel/providers/imapx/camel-imapx-store.c:578
 #: ../camel/providers/local/camel-maildir-folder.c:81
 #: ../camel/providers/local/camel-maildir-store.c:219
 #: ../camel/providers/local/camel-maildir-store.c:291
@@ -4114,49 +4132,32 @@ msgstr "無法建立 %s 的資料夾摘要"
 msgid "Could not create cache for %s"
 msgstr "無法建立 %s 的快取"
 
-# camel/providers/pop3/camel-pop3-provider.c:37
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
-msgid "Message storage"
-msgstr "郵件儲存空間"
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "Use I_dle if the server supports it"
+msgstr "如果伺服器支援則使用閒置(_D)"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:60
+msgid "Numbe_r of cached connections to use"
+msgstr "要使用的快取連線數量(_R)"
 
 # camel/providers/imap/camel-imap-provider.c:63
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:88
 msgid "IMAP+"
 msgstr "IMAP"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"實驗性的 IMAP 4(.1) 客戶端\n"
-"這是未經測試且不提供支援的程式碼，您會想使用普通的 imap 代替。\n"
-"\n"
-"！！！ 不 要 將 它 用 於 重 要 的 電 子 郵 件！！！\n"
-
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imapx/camel-imapx-server.c:1996
+#: ../camel/providers/imapx/camel-imapx-server.c:2020
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "無法連線至 %s (埠號 %s)： %s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/providers/imapx/camel-imapx-server.c:2076
-#: ../camel/providers/imapx/camel-imapx-store.c:147
+#: ../camel/providers/imapx/camel-imapx-server.c:2100
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s請輸入 %s@%s 的 IMAP 密碼"
 
-# camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/imapx/camel-imapx-store.c:130
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "無法連線到 POP 伺服器 %s"
-
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
 #: ../camel/providers/local/camel-local-folder.c:178
@@ -5017,6 +5018,11 @@ msgstr "接收 POP 郵件 %d"
 msgid "Unknown reason"
 msgstr "不明的原因"
 
+# camel/providers/pop3/camel-pop3-provider.c:37
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
+msgid "Message storage"
+msgstr "郵件儲存空間"
+
 # camel/providers/pop3/camel-pop3-provider.c:39
 #: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "_Leave messages on server"
@@ -6032,11 +6038,14 @@ msgstr "無效的伺服器回應"
 msgid "Bad parameter"
 msgstr "錯誤的參數"
 
-#~ msgid "\"%s\" on book before \"%s\""
-#~ msgstr "在通訊錄中「%s」在「%s」之前"
-
-#~ msgid "book busy"
-#~ msgstr "通訊錄忙碌中"
-
-#~ msgid "CORBA exception making \"%s\" call"
-#~ msgstr "CORBA 例外造成「%s」呼叫"
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "實驗性的 IMAP 4(.1) 客戶端\n"
+#~ "這是未經測試且不提供支援的程式碼，您會想使用普通的 imap 代替。\n"
+#~ "\n"
+#~ "！！！ 不 要 將 它 用 於 重 要 的 電 子 郵 件！！！\n"