2.25.91
authorChao-Hsiung Liao <chliao@src.gnome.org>
Tue, 3 Feb 2009 06:54:06 +0000 (06:54 +0000)
committerChao-Hsiung Liao <chliao@src.gnome.org>
Tue, 3 Feb 2009 06:54:06 +0000 (06:54 +0000)
svn path=/trunk/; revision=10032

po/ChangeLog
po/zh_HK.po
po/zh_TW.po

index 9c14ab0..4b59e13 100644 (file)
@@ -1,3 +1,8 @@
+2009-02-03  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+       * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+       * zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
 2009-02-02  Jorge Gonzalez  <jorgegonz@svn.gnome.org> 
 
        * es.po: Updated Spanish translation.
index 14aedca..5098fbe 100644 (file)
@@ -6,10 +6,10 @@
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005. 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 2.23.90\n"
+"Project-Id-Version: evolution-data-server 2.25.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-11 20:54+0800\n"
-"PO-Revision-Date: 2008-08-12 20:12+0800\n"
+"POT-Creation-Date: 2009-02-03 14:52+0800\n"
+"PO-Revision-Date: 2009-02-03 14:54+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,685 +17,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Query refused"
-msgstr "查詢被拒絕"
-
-#: ../camel/camel-db.c:108
-msgid "Insufficient memory"
-msgstr "記憶體不足"
-
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
-msgid "No output stream"
-msgstr "沒有輸出串流"
-
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
-msgid "No input stream"
-msgstr "沒有輸入串流"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1838
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "在 APPEND 指令後傳回未預期的回應狀態「%s」"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1853
-msgid "No response on continuation after APPEND command"
-msgstr "在 APPEND 指令後沒有持續回應"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1895
-msgid "Unknown error occurred during APPEND command!"
-msgstr "在 APPEND 指令期間發生未知的錯誤!"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "在 X 秒內未閱讀的逾期快取訊息"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr "早於 X 秒的逾期快取訊息"
-
-#: ../libedataserverui/e-passwords.c:218
-#, c-format
-msgid "Keyring key is unusable: no user or host name"
-msgstr "密碼匙圈密碼匙無法使用:沒有使用者或主機名稱"
-
-#: ../libedataserverui/e-passwords.c:1055
-msgid "You have the Caps Lock key on."
-msgstr "你的 Caps Lock 是開啟的。"
-
-#: ../calendar/backends/file/e-cal-backend-file.c:221
-#: ../calendar/backends/file/e-cal-backend-file.c:227
-msgid "Cannot save calendar data"
-msgstr "不能儲存行事曆資料"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:101
-msgid "Invalid range"
-msgstr "無效的範圍"
-
-# mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-msgid "Unsupported field"
-msgstr "不支援的欄位"
-
-# mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
-msgid "Unsupported method"
-msgstr "不支援的方法"
-
-# camel/providers/imap/camel-imap-store.c:466
-# camel/providers/smtp/camel-smtp-transport.c:366
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-msgid "Unsupported authentication method"
-msgstr "不支援的驗證方法"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-msgid "TLS not available"
-msgstr "無法使用 TLS"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Offline unavailable"
-msgstr "離線無法使用"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "Search size limit exceeded"
-msgstr "超過搜尋大小限制"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "Search time limit exceeded"
-msgstr "超過搜尋時間限制"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-msgid "Invalid query"
-msgstr "無效的查詢"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:140
-msgid "Invalid server version"
-msgstr "無效的伺服器版本"
-
-#: ../camel/camel-disco-diary.c:261
-#, c-format
-msgid ""
-"Could not open '%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"無法開啟「%s」:\n"
-"%s\n"
-"這個資料夾內所做的更改將不會重新同步。"
-
-# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:837
-#, c-format
-msgid "Unexpected request from GnuPG for '%s'"
-msgstr "GnuPG 傳回對「%s」未預期的要求"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
-#, c-format
-msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "不能寫入資料夾「%s」的離線日誌:%s"
-
-# camel/camel-session.c:295
-# camel/camel-session.c:364
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177
-#, c-format
-msgid "No provider available for protocol '%s'"
-msgstr "沒有通訊協定「%s」的提供者"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:305
-#, c-format
-msgid "Cannot create folder '%s': folder exists"
-msgstr "不能建立資料夾「%s」:資料夾已存在"
-
-# camel/camel-url.c:289
-#: ../camel/camel-url.c:313
-#, c-format
-msgid "Could not parse URL '%s'"
-msgstr "無法解析 URL「%s」"
-
-# shell/e-shell-importer.c:384
-#: ../camel/camel-vee-folder.c:580
-#, c-format
-msgid "Error storing '%s': %s"
-msgstr "儲存「%s」發生錯誤:%s"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "不能將郵件加入至資料夾「%s」:%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1309
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1330
-#, c-format
-msgid "Cannot rename Groupwise folder '%s' to '%s'"
-msgstr "不能將 Groipwise 資料夾「%s」更名為「%s」"
-
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:217
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-# camel/providers/local/camel-mh-folder.c:194
-# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imap/camel-imap-folder.c:2748
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "無法取得郵件 ID 為 %s 的郵件: %s"
-
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/imap/camel-imap-folder.c:2749
-msgid "No such message available."
-msgstr "沒有這個郵件。"
-
-# camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-provider.c:48
-msgid "Ch_eck for new messages in subscribed folders"
-msgstr "檢查訂閱資料夾裏的新郵件(_E)"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap/camel-imap-store.c:1975
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "不能建立資料夾「%s」:資料夾已存在。"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "無法選取資料夾「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "無法選取資料夾「%s」:錯誤的指令"
-
-# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "傳送指令至 IMAP 伺服器 %s 失敗:%s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-msgid "service unavailable"
-msgstr "服務無法使用"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr "啟用某些過濾器和虛擬資料夾規則所要求的通信論壇偵測"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:423
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "不能存取資料夾「%s」:%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:482
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "不能同步旗標至資料夾「%s」:未知的錯誤"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:488
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "不能同步旗標至資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:628
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "不能清空資料夾「%s」:未知的錯誤"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:633
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "不能清空資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:889
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "不能取得從資料夾「%2$s」取得郵件 %1$s:沒有此郵件"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:894
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "不能取得從資料夾「%2$s」取得郵件 %1$s:錯誤的指令"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/imap4/camel-imap4-folder.c:938
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "不能將郵件附加到資料夾「%s」:資料夾是唯讀的"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/imap4/camel-imap4-folder.c:1031
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "不能將郵件附加到資料夾「%s」:未知的錯誤"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/imap4/camel-imap4-folder.c:1061
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "不能將郵件附加到資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:1181
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "不能從資料夾「%s」移動郵件至資料夾「%s」:未知的錯誤"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:1185
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "不能從資料夾「%s」複製郵件至資料夾「%s」:未知的錯誤"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:1193
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "不能從資料夾「%s」移動郵件至資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:1197
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "不能從資料夾「%s」複製郵件至資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "不能從 IMAP 伺服器 %2$s 取得資料夾「%1$s」:未知的錯誤"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:821
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "不能從 IMAP 伺服器 %2$s 取得「%1$s」的 LIST 資訊 :%3$s"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "不能建立資料夾「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:907
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "不能建立資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "不能刪除資料夾「%s」:特殊的資料夾"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "不能刪除資料夾「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "不能刪除資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "不能將資料夾「%s」重新命名為「%s」:特殊的資料夾"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "不能將資料夾「%s」重新命名為「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "不能將資料夾「%s」重新命名為「%s」:錯誤的指令"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1575
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "無法於 IMAP 伺服器 %3$s 取得樣式「%2$s」的 %1$s 資訊:%4$s"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1681
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "不能訂閱資料夾「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1686
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "不能訂閱資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/imap4/camel-imap4-store.c:1753
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "不能取消訂閱資料夾「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1758
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "不能取消訂閱資料夾「%s」:錯誤的指令"
-
-#: ../camel/providers/local/camel-local-provider.c:48
-msgid "_Use the '.folders' folder summary file (exmh)"
-msgstr "使用「.folders」資料夾摘要檔案[exmh](_U)"
-
-# camel/providers/local/camel-local-store.c:289
-#: ../camel/providers/local/camel-local-store.c:441
-#: ../camel/providers/local/camel-mbox-store.c:300
-#, c-format
-msgid "Could not delete folder index file '%s': %s"
-msgstr "不能刪除資料夾索引檔案「%s」: %s"
-
-# camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-local-store.c:464
-#: ../camel/providers/local/camel-mbox-store.c:324
-#, c-format
-msgid "Could not delete folder meta file '%s': %s"
-msgstr "不能刪除資料夾中繼檔案「%s」:%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
-#, c-format
-msgid "Cannot create folder '%s': %s"
-msgstr "不能建立資料夾「%s」:%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
-#, c-format
-msgid "Cannot get folder '%s': %s"
-msgstr "不能建立資料夾「%s」:%s"
-
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
-#, c-format
-msgid "Cannot get folder '%s': folder does not exist."
-msgstr "不能取得資料夾「%s」:資料夾不存在。"
-
-# camel/providers/local/camel-maildir-store.c:122
-#: ../camel/providers/local/camel-maildir-store.c:189
-#, c-format
-msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "不能取得資料夾「%s」:不是 maildir 目錄。"
-
-# camel/providers/local/camel-maildir-store.c:151
-# camel/providers/local/camel-maildir-store.c:188
-# camel/providers/local/camel-mh-store.c:127
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
-#, c-format
-msgid "Could not delete folder '%s': %s"
-msgstr "無法刪除資料夾「%s」:%s"
-
-# camel/providers/local/camel-maildir-store.c:107
-# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
-#, c-format
-msgid "Could not scan folder '%s': %s"
-msgstr "無法掃描資料夾「%s」:%s"
-
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:198
-#, c-format
-msgid "Cannot get folder '%s': not a regular file."
-msgstr "不能取得資料夾「%s」:不是一般檔案。"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
-#, c-format
-msgid ""
-"Could not delete folder '%s':\n"
-"%s"
-msgstr ""
-"無法刪除資料夾「%s」:\n"
-"%s"
-
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:247
-#, c-format
-msgid "'%s' is not a regular file."
-msgstr "「%s」不是普通的檔案。"
-
-# camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mbox-store.c:254
-#, c-format
-msgid "Folder '%s' is not empty. Not deleted."
-msgstr "資料夾「%s」內仍有檔案。所以不刪除。"
-
-# camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
-#, c-format
-msgid "Could not delete folder summary file '%s': %s"
-msgstr "無法刪除資料夾摘要檔案「%s」: %s"
-
-# camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/local/camel-mbox-store.c:378
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "不能建立目錄「%s」: %s。"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-store.c:498
-#, c-format
-msgid "Could not rename '%s': '%s': %s"
-msgstr "無法重新命名「%s」:「%s」:%s"
-
-# camel/providers/local/camel-maildir-store.c:107
-# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-mh-store.c:232
-#, c-format
-msgid "Could not create folder '%s': %s"
-msgstr "無法建立資料夾「%s」:%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mh-store.c:244
-#, c-format
-msgid "Cannot get folder '%s': not a directory."
-msgstr "不能取得資料夾「%s」:不是目錄。"
-
-#: ../camel/providers/local/camel-spool-store.c:135
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "排程器「%s」不能被開啟:%s"
-
-# camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-spool-store.c:147
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "排程器「%s」不是一般檔案或目錄。"
-
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:166
-#, c-format
-msgid "Folder '%s/%s' does not exist."
-msgstr "資料夾「%s/%s」不存在。"
-
-# camel/providers/local/camel-maildir-store.c:96
-# camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-spool-store.c:176
-#, c-format
-msgid ""
-"Could not open folder '%s':\n"
-"%s"
-msgstr ""
-"無法開啟資料夾「%s」:\n"
-"%s"
-
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:180
-#, c-format
-msgid "Folder '%s' does not exist."
-msgstr "資料夾「%s」不存在。"
-
-# camel/providers/local/camel-maildir-store.c:107
-# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-store.c:185
-#, c-format
-msgid ""
-"Could not create folder '%s':\n"
-"%s"
-msgstr ""
-"無法建立資料夾「%s」:\n"
-"%s"
-
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-spool-store.c:193
-#, c-format
-msgid "'%s' is not a mailbox file."
-msgstr "「%s」不是 mailbox 檔案。"
-
-#: ../camel/providers/local/camel-spool-summary.c:239
-#: ../camel/providers/local/camel-spool-summary.c:256
-#: ../camel/providers/local/camel-spool-summary.c:267
-#, c-format
-msgid ""
-"Could not sync spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in '%s'"
-msgstr ""
-"無法同步排程資料夾 %s: %s\n"
-"資料夾可能損毀,複製儲存於「%s」"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:419
-#, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "在 POP 伺服器 %2$s 以 SASL 「%1$s」登入失敗: %3$s"
-
-# camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:663
-#, c-format
-msgid "No such folder '%s'."
-msgstr "沒有這個資料夾「%s」。"
-
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: ../addressbook/backends/file/e-book-backend-file.c:555
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360
+#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "載入中..."
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: ../addressbook/backends/file/e-book-backend-file.c:558
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4282
+#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
-msgstr "搜尋..."
+msgstr "搜尋..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4446
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "正在下載聯絡人 (%d)..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "正在更新聯絡人快取 (%d)..."
@@ -711,32 +60,32 @@ msgstr "使用電子郵件地址"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1017
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
 msgid "Reconnecting to LDAP server..."
-msgstr "正重新連線至 LDAP 伺服器..."
+msgstr "正在重新連接 LDAP 伺服器..."
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1613
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
 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:1747
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
 msgid "Removing contact from LDAP server..."
 msgstr "正在移除 LDAP 伺服器中的聯絡人..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2058
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
 msgid "Modifying contact from LDAP server..."
 msgstr "正在修改 LDAP 伺服器中的聯絡人..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4142
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
 msgid "Receiving LDAP search results..."
-msgstr "接收 LDAP 搜尋結果..."
+msgstr "æ­£å\9c¨æ\8e¥æ\94¶ LDAP æ\90\9cå°\8bçµ\90æ\9e\9c..."
 
 # executive-summary/component/e-summary.c:940
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4304
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
 msgid "Error performing search"
 msgstr "進行搜尋時發生錯誤"
 
@@ -744,63 +93,63 @@ msgstr "進行搜尋時發生錯誤"
 #. * function names, e.g.
 #. * "e_book_add_contact" on book before
 #. * "e_book_open
-#: ../addressbook/libebook/e-book.c:252 ../addressbook/libebook/e-book.c:256
-#: ../addressbook/libebook/e-book.c:461 ../addressbook/libebook/e-book.c:465
-#: ../addressbook/libebook/e-book.c:604 ../addressbook/libebook/e-book.c:608
-#: ../addressbook/libebook/e-book.c:695 ../addressbook/libebook/e-book.c:699
-#: ../addressbook/libebook/e-book.c:995 ../addressbook/libebook/e-book.c:1000
-#: ../addressbook/libebook/e-book.c:1179 ../addressbook/libebook/e-book.c:1183
-#: ../addressbook/libebook/e-book.c:1338 ../addressbook/libebook/e-book.c:1342
-#: ../addressbook/libebook/e-book.c:1544 ../addressbook/libebook/e-book.c:1548
-#: ../addressbook/libebook/e-book.c:1787 ../addressbook/libebook/e-book.c:1791
-#: ../addressbook/libebook/e-book.c:2025 ../addressbook/libebook/e-book.c:2029
-#: ../addressbook/libebook/e-book.c:2234 ../addressbook/libebook/e-book.c:2238
-#: ../addressbook/libebook/e-book.c:3339
+#: ../addressbook/libebook/e-book.c:260 ../addressbook/libebook/e-book.c:264
+#: ../addressbook/libebook/e-book.c:469 ../addressbook/libebook/e-book.c:473
+#: ../addressbook/libebook/e-book.c:612 ../addressbook/libebook/e-book.c:616
+#: ../addressbook/libebook/e-book.c:703 ../addressbook/libebook/e-book.c:707
+#: ../addressbook/libebook/e-book.c:1003 ../addressbook/libebook/e-book.c:1008
+#: ../addressbook/libebook/e-book.c:1187 ../addressbook/libebook/e-book.c:1191
+#: ../addressbook/libebook/e-book.c:1346 ../addressbook/libebook/e-book.c:1350
+#: ../addressbook/libebook/e-book.c:1552 ../addressbook/libebook/e-book.c:1556
+#: ../addressbook/libebook/e-book.c:1795 ../addressbook/libebook/e-book.c:1799
+#: ../addressbook/libebook/e-book.c:2033 ../addressbook/libebook/e-book.c:2037
+#: ../addressbook/libebook/e-book.c:2242 ../addressbook/libebook/e-book.c:2246
+#: ../addressbook/libebook/e-book.c:3405
 #, c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr "在通訊錄中「%s」在「%s」之前"
 
-#: ../addressbook/libebook/e-book.c:265 ../addressbook/libebook/e-book.c:474
-#: ../addressbook/libebook/e-book.c:617 ../addressbook/libebook/e-book.c:708
-#: ../addressbook/libebook/e-book.c:1010 ../addressbook/libebook/e-book.c:1193
-#: ../addressbook/libebook/e-book.c:1352 ../addressbook/libebook/e-book.c:1557
-#: ../addressbook/libebook/e-book.c:1800 ../addressbook/libebook/e-book.c:2039
-#: ../addressbook/libebook/e-book.c:2247 ../addressbook/libebook/e-book.c:2593
-#: ../addressbook/libebook/e-book.c:2792
+#: ../addressbook/libebook/e-book.c:273 ../addressbook/libebook/e-book.c:482
+#: ../addressbook/libebook/e-book.c:625 ../addressbook/libebook/e-book.c:716
+#: ../addressbook/libebook/e-book.c:1018 ../addressbook/libebook/e-book.c:1201
+#: ../addressbook/libebook/e-book.c:1360 ../addressbook/libebook/e-book.c:1565
+#: ../addressbook/libebook/e-book.c:1808 ../addressbook/libebook/e-book.c:2047
+#: ../addressbook/libebook/e-book.c:2255 ../addressbook/libebook/e-book.c:2634
+#: ../addressbook/libebook/e-book.c:2833
 #, c-format
 msgid "book busy"
 msgstr "通訊錄忙碌中"
 
-#: ../addressbook/libebook/e-book.c:296 ../addressbook/libebook/e-book.c:300
-#: ../addressbook/libebook/e-book.c:505 ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:644 ../addressbook/libebook/e-book.c:648
-#: ../addressbook/libebook/e-book.c:735 ../addressbook/libebook/e-book.c:739
-#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1040
-#: ../addressbook/libebook/e-book.c:1223 ../addressbook/libebook/e-book.c:1226
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1383
-#: ../addressbook/libebook/e-book.c:1593 ../addressbook/libebook/e-book.c:1597
-#: ../addressbook/libebook/e-book.c:1847 ../addressbook/libebook/e-book.c:1851
-#: ../addressbook/libebook/e-book.c:2069 ../addressbook/libebook/e-book.c:2073
-#: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277
-#: ../addressbook/libebook/e-book.c:2538 ../addressbook/libebook/e-book.c:2619
-#: ../addressbook/libebook/e-book.c:2623 ../addressbook/libebook/e-book.c:2818
-#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3348
+#: ../addressbook/libebook/e-book.c:304 ../addressbook/libebook/e-book.c:308
+#: ../addressbook/libebook/e-book.c:513 ../addressbook/libebook/e-book.c:517
+#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:656
+#: ../addressbook/libebook/e-book.c:743 ../addressbook/libebook/e-book.c:747
+#: ../addressbook/libebook/e-book.c:1045 ../addressbook/libebook/e-book.c:1048
+#: ../addressbook/libebook/e-book.c:1231 ../addressbook/libebook/e-book.c:1234
+#: ../addressbook/libebook/e-book.c:1387 ../addressbook/libebook/e-book.c:1391
+#: ../addressbook/libebook/e-book.c:1601 ../addressbook/libebook/e-book.c:1605
+#: ../addressbook/libebook/e-book.c:1855 ../addressbook/libebook/e-book.c:1859
+#: ../addressbook/libebook/e-book.c:2077 ../addressbook/libebook/e-book.c:2081
+#: ../addressbook/libebook/e-book.c:2281 ../addressbook/libebook/e-book.c:2285
+#: ../addressbook/libebook/e-book.c:2518 ../addressbook/libebook/e-book.c:2660
+#: ../addressbook/libebook/e-book.c:2664 ../addressbook/libebook/e-book.c:2859
+#: ../addressbook/libebook/e-book.c:2863 ../addressbook/libebook/e-book.c:3414
 #, c-format
 msgid "CORBA exception making \"%s\" call"
 msgstr "CORBA 例外造成「%s」呼叫"
 
 # ui/evolution-mail.xml.h:3
-#: ../addressbook/libebook/e-book.c:2523
+#: ../addressbook/libebook/e-book.c:2507
 #, c-format
 msgid "%s: there is no current operation"
 msgstr "%s:目前沒有操作"
 
-#: ../addressbook/libebook/e-book.c:2552
+#: ../addressbook/libebook/e-book.c:2532
 #, c-format
 msgid "%s: could not cancel"
 msgstr "%s:無法取消"
 
-#: ../addressbook/libebook/e-book.c:2579 ../addressbook/libebook/e-book.c:2583
+#: ../addressbook/libebook/e-book.c:2620 ../addressbook/libebook/e-book.c:2624
 #, c-format
 msgid "\"%s\" on book after \"%s\""
 msgstr "在通訊錄中「%s」在「%s」之後"
@@ -809,34 +158,34 @@ msgstr "在通訊錄中「%s」在「%s」之後"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../addressbook/libebook/e-book.c:2647
+#: ../addressbook/libebook/e-book.c:2688
 #, c-format
 msgid "%s: canceled"
 msgstr "%s:已取消"
 
-#: ../addressbook/libebook/e-book.c:3203
+#: ../addressbook/libebook/e-book.c:3269
 #, c-format
 msgid "%s: Invalid source."
 msgstr "%s:無效的來源。"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: ../addressbook/libebook/e-book.c:3211 ../addressbook/libebook/e-book.c:3277
+#: ../addressbook/libebook/e-book.c:3277 ../addressbook/libebook/e-book.c:3343
 #, c-format
 msgid "%s: no factories available for URI `%s'"
 msgstr "%s:URI「%s」沒有可用的製造廠"
 
-#: ../addressbook/libebook/e-book.c:3223
+#: ../addressbook/libebook/e-book.c:3289
 #, c-format
 msgid "%s: Could not create EBookListener"
 msgstr "%s:無法建立 EBookListener"
 
-#: ../addressbook/libebook/e-book.c:3490
+#: ../addressbook/libebook/e-book.c:3556
 #, c-format
 msgid "%s: there was no self contact UID stored in gconf"
 msgstr "%s:沒有儲存於 gconf 中的本身聯絡人 UID"
 
-#: ../addressbook/libebook/e-book.c:3623
+#: ../addressbook/libebook/e-book.c:3689
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s:沒有儲存於 gconf 中的 uid `%s' 來源。"
@@ -1080,7 +429,7 @@ msgstr "網誌 URL"
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:426
+#: ../libedataserverui/e-categories-dialog.c:517
 msgid "Categories"
 msgstr "分類"
 
@@ -1315,7 +664,7 @@ msgstr "相片"
 # mail/message-list.c:1083
 #: ../addressbook/libebook/e-contact.c:241
 msgid "Logo"
-msgstr "標"
+msgstr "標"
 
 #: ../addressbook/libebook/e-contact.c:243
 msgid "Name"
@@ -1375,10 +724,10 @@ msgstr "出生日期"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
 #: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
 #: ../libedataserver/e-categories.c:43
 msgid "Anniversary"
-msgstr "紀念日"
+msgstr "週年紀念日"
 
 #. Security fields
 #: ../addressbook/libebook/e-contact.c:263
@@ -1428,319 +777,195 @@ msgstr "地理資訊"
 msgid "Telephone"
 msgstr "電話"
 
+#: ../addressbook/libebook/e-contact.c:278
+msgid "Skype Home Name 1"
+msgstr "Skype 住家名稱 1"
+
+#: ../addressbook/libebook/e-contact.c:279
+msgid "Skype Home Name 2"
+msgstr "Skype 住家名稱 2"
+
+#: ../addressbook/libebook/e-contact.c:280
+msgid "Skype Home Name 3"
+msgstr "Skype 住家名稱 3"
+
+#: ../addressbook/libebook/e-contact.c:281
+msgid "Skype Work Name 1"
+msgstr "Skype 工作名稱 1"
+
+#: ../addressbook/libebook/e-contact.c:282
+msgid "Skype Work Name 2"
+msgstr "Skype 工作名稱 2"
+
+#: ../addressbook/libebook/e-contact.c:283
+msgid "Skype Work Name 3"
+msgstr "Skype 工作名稱 3"
+
+#: ../addressbook/libebook/e-contact.c:284
+msgid "Skype Name List"
+msgstr "Skype 名稱清單"
+
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:1493
+#: ../addressbook/libebook/e-contact.c:1507
 #: ../addressbook/libebook/e-destination.c:761
 msgid "Unnamed List"
 msgstr "未命名的清單"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
 #: ../libedataserver/e-categories.c:44
 msgid "Birthday"
 msgstr "生日"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
 #, c-format
 msgid "Birthday: %s"
 msgstr "生日:%s"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
 #, c-format
 msgid "Anniversary: %s"
 msgstr "紀念日:%s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:214
+#: ../calendar/backends/file/e-cal-backend-file.c:212
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "無法儲存行事曆資料:URI 的格式不正確。"
 
+#: ../calendar/backends/file/e-cal-backend-file.c:219
+#: ../calendar/backends/file/e-cal-backend-file.c:225
+msgid "Cannot save calendar data"
+msgstr "不能儲存行事曆資料"
+
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:335
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
 msgid "Could not create thread for getting deltas"
 msgstr "無法建立取得 deltas 的執行緒"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:367
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
 #: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1049
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1348
-#: ../calendar/backends/http/e-cal-backend-http.c:569
-#: ../calendar/backends/weather/e-cal-backend-weather.c:466
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
+#: ../calendar/backends/http/e-cal-backend-http.c:587
+#: ../calendar/backends/weather/e-cal-backend-weather.c:484
 msgid "Could not create cache file"
 msgstr "無法建立快取檔案"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:380
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1061
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
 msgid "Could not create thread for populating cache"
 msgstr "無法建立移植快取的執行緒"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1899
 msgid "Reply Requested: by "
 msgstr "要求回覆:根據"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1904
 msgid "Reply Requested: When convenient"
 msgstr "要求回覆:當有空時"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:275
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
 #, 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:885
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
 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:943
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
 msgid "Invalid server URI"
 msgstr "無效的伺服器 URI"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:962
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:971
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1067
-#: ../calendar/libecal/e-cal.c:5076
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1075
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1107
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1145
-#: ../camel/providers/groupwise/camel-groupwise-store.c:594
-#: ../camel/providers/groupwise/camel-groupwise-store.c:746
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
+#: ../calendar/libecal/e-cal.c:5098
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1131
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1163
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1201
+#: ../camel/providers/groupwise/camel-groupwise-store.c:588
+#: ../camel/providers/groupwise/camel-groupwise-store.c:753
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:184
 msgid "Authentication failed"
-msgstr "驗證失敗"
-
-# mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:269
-msgid "Redirected to Invalid URI"
-msgstr "重新指向無效的 URI"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:290
-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:296
-msgid "Not a calendar."
-msgstr "並非行事曆。"
-
-# mail/mail-ops.c:1872
-#: ../calendar/backends/weather/e-cal-backend-weather.c:144
-msgid "Could not retrieve weather data"
-msgstr "無法取得天氣資料"
-
-# mail/mail-format.c:756
-# mail/message-list.c:1082
-#: ../calendar/backends/weather/e-cal-backend-weather.c:216
-msgid "Fair"
-msgstr "晴朗"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:217
-msgid "Snow showers"
-msgstr "陣雪"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:218
-msgid "Snow"
-msgstr "下雪"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:219
-msgid "Partly cloudy"
-msgstr "局部有雲"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:220
-msgid "Smoke"
-msgstr "煙"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:221
-msgid "Thunderstorms"
-msgstr "雷暴"
-
-# addressbook/printing/e-contact-print.glade.h:4
-#: ../calendar/backends/weather/e-cal-backend-weather.c:222
-msgid "Cloudy"
-msgstr "多雲"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:223
-msgid "Drizzle"
-msgstr "毛毛雨"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:224
-msgid "Sunny"
-msgstr "艷陽"
-
-# calendar/gui/goto-dialog.glade.h:2
-#: ../calendar/backends/weather/e-cal-backend-weather.c:225
-msgid "Dust"
-msgstr "微塵"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:226
-msgid "Clear"
-msgstr "無雲的"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:227
-msgid "Mostly cloudy"
-msgstr "陰天"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:228
-msgid "Windy"
-msgstr "有風的"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:229
-msgid "Rain showers"
-msgstr "陣雨"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:230
-msgid "Foggy"
-msgstr "霧"
+msgstr "驗證失敗"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:231
-msgid "Rain/snow mixed"
-msgstr "雨/雪混合"
+# mail/mail-config.glade.h:37
+#: ../calendar/backends/http/e-cal-backend-http.c:267
+msgid "Redirected to Invalid URI"
+msgstr "重新指向無效的 URI"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:232
-msgid "Sleet"
-msgstr "冰雹"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/backends/http/e-cal-backend-http.c:288
+msgid "Bad file format."
+msgstr "錯誤的檔案格式。"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:233
-msgid "Very hot/humid"
-msgstr "非常炎熱/潮濕"
+# camel/providers/imap/camel-imap-store.c:803
+# mail/mail-local.c:334
+#: ../calendar/backends/http/e-cal-backend-http.c:294
+msgid "Not a calendar."
+msgstr "並非行事曆。"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:234
-msgid "Blizzard"
-msgstr "暴風雪"
+# mail/mail-ops.c:1872
+#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+msgid "Could not retrieve weather data"
+msgstr "無法取得天氣資料"
 
-# ui/evolution-task-editor-dialog.xml.h:24
-#: ../calendar/backends/weather/e-cal-backend-weather.c:235
-msgid "Freezing rain"
-msgstr "凍雨"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+msgid "Weather: Fog"
+msgstr "天氣:起霧"
 
-# addressbook/printing/e-contact-print.glade.h:11
-#: ../calendar/backends/weather/e-cal-backend-weather.c:236
-msgid "Haze"
-msgstr "霾"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+msgid "Weather: Cloudy"
+msgstr "天氣:多雲"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:237
-msgid "Blowing snow"
-msgstr "å\90¹é\99\8dé\9bª"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+msgid "Weather: Cloudy Night"
+msgstr "天氣ï¼\9aå¤\9aé\9b²ç\9a\84å¤\9cæ\99\9a"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:238
-msgid "Freezing drizzle"
-msgstr "å\87\8dæ¯\9bæ¯\9bé\9b¨"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+msgid "Weather: Overcast"
+msgstr "天氣ï¼\9aå¤\9aé\9b²"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:239
-msgid "Very cold/wind chill"
-msgstr "非常冷/風寒"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+msgid "Weather: Showers"
+msgstr "天氣:陣雨"
 
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: ../calendar/backends/weather/e-cal-backend-weather.c:240
-msgid "Rain"
-msgstr "下雨"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+msgid "Weather: Snow"
+msgstr "天氣:下雪"
 
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
-#: ../calendar/backends/weather/e-cal-backend-weather.c:260
-#: ../calendar/backends/weather/e-cal-backend-weather.c:267
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Sunny"
 msgstr "天氣:艷陽"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-#: ../calendar/backends/weather/e-cal-backend-weather.c:268
-#: ../calendar/backends/weather/e-cal-backend-weather.c:271
-msgid "Weather: Snow"
-msgstr "天氣:下雪"
-
 #: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Partly Cloudy"
-msgstr "天氣:多雲"
+msgid "Weather: Clear Night"
+msgstr "天氣:晴朗的夜晚"
 
 #: ../calendar/backends/weather/e-cal-backend-weather.c:254
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
-#: ../calendar/backends/weather/e-cal-backend-weather.c:264
-#: ../calendar/backends/weather/e-cal-backend-weather.c:270
-msgid "Weather: Fog"
-msgstr "天氣:起霧"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Thunderstorms"
 msgstr "天氣:雷暴"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
-#: ../calendar/backends/weather/e-cal-backend-weather.c:261
-msgid "Weather: Cloudy"
-msgstr "天氣:多雲"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
-#: ../calendar/backends/weather/e-cal-backend-weather.c:263
-#: ../calendar/backends/weather/e-cal-backend-weather.c:265
-#: ../calendar/backends/weather/e-cal-backend-weather.c:266
-#: ../calendar/backends/weather/e-cal-backend-weather.c:269
-#: ../calendar/backends/weather/e-cal-backend-weather.c:272
-#: ../calendar/backends/weather/e-cal-backend-weather.c:274
-msgid "Weather: Rain"
-msgstr "天氣:下雪"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:349
-#, c-format
-msgid "%.1f°C - %s"
-msgstr "%.1f°C - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:351
-#, c-format
-msgid "%.1f°F - %s"
-msgstr "%.1f°F - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:354
-#, c-format
-msgid "%.1f/%.1f°C - %s"
-msgstr "%.1f/%.1f°C - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:356
-#, c-format
-msgid "%.1f/%.1f°F - %s"
-msgstr "%.1f/%.1f°F - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:362
-#, c-format
-msgid "%d%% chance of precipitation\n"
-msgstr "%d%% 降雨機率\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:369
-#, c-format
-msgid "%.1fcm snow\n"
-msgstr "%.1fcm 雪\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:371
-#, c-format
-msgid "%.1fin snow\n"
-msgstr "%.1fin 漂雪\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:374
-#, c-format
-msgid "%.1f-%.1fcm snow\n"
-msgstr "%.1f-%.1fcm 雪\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:376
-#, c-format
-msgid "%.1f-%.1fin snow\n"
-msgstr "%.1f-%.1fin 雪\n"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+msgid "Forecast"
+msgstr "天氣預報"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
 #: ../calendar/libecal/e-cal-component.c:1322
@@ -1913,7 +1138,7 @@ msgstr "高"
 
 #: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
 msgid "Normal"
-msgstr "正常"
+msgstr "一般"
 
 # calendar/gui/calendar-model.c:501
 # calendar/gui/calendar-model.c:1070
@@ -1933,7 +1158,7 @@ msgid "Undefined"
 msgstr "未指定"
 
 # camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
@@ -1943,80 +1168,80 @@ 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:1679
+#: ../calendar/libecal/e-cal.c:1691
 #, 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:5048
+#: ../calendar/libecal/e-cal.c:5070
 msgid "Invalid argument"
 msgstr "無效的參數"
 
-#: ../calendar/libecal/e-cal.c:5050
+#: ../calendar/libecal/e-cal.c:5072
 msgid "Backend is busy"
 msgstr "後端忙碌中"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:5052
-#: ../calendar/libedata-cal/e-cal-backend-util.c:97
+#: ../calendar/libecal/e-cal.c:5074
+#: ../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:5054
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
 msgstr "無此行事曆"
 
-#: ../calendar/libecal/e-cal.c:5056
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
 #: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
-msgstr "æ\9cªç\99¼ç\8f¾物件"
+msgstr "æ\89¾ä¸\8då\88°物件"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:5058
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:5080
+#: ../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:5060
+#: ../calendar/libecal/e-cal.c:5082
 msgid "URI not loaded"
 msgstr "URI 未載入"
 
-#: ../calendar/libecal/e-cal.c:5062
+#: ../calendar/libecal/e-cal.c:5084
 msgid "URI already loaded"
 msgstr "URI 已載入"
 
 # shell/e-storage.c:475
-#: ../calendar/libecal/e-cal.c:5064
-#: ../calendar/libedata-cal/e-cal-backend-util.c:99
+#: ../calendar/libecal/e-cal.c:5086
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 #: ../servers/exchange/storage/e-storage.c:571
 msgid "Permission denied"
 msgstr "權限不足"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:5066
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libecal/e-cal.c:5088
+#: ../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:5068
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:5090
+#: ../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:5070
+#: ../calendar/libecal/e-cal.c:5092
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
@@ -2024,52 +1249,52 @@ 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:5072
+#: ../calendar/libecal/e-cal.c:5094
 msgid "Operation has been canceled"
 msgstr "操作已取消"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libecal/e-cal.c:5096
+#: ../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:5078
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libecal/e-cal.c:5100
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
 #: ../camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication required"
 msgstr "要求驗證"
 
-#: ../calendar/libecal/e-cal.c:5080
+#: ../calendar/libecal/e-cal.c:5102
 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:5082
-#: ../calendar/libedata-cal/e-cal-backend-util.c:138
+#: ../calendar/libecal/e-cal.c:5104
+#: ../calendar/libedata-cal/e-cal-backend-util.c:146
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:223
 #: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../camel/providers/imap/camel-imap-store.c:743
 #: ../camel/providers/imap4/camel-imap4-engine.c:1570
 #: ../camel/providers/imap4/camel-imap4-engine.c:1609
 #: ../camel/providers/imap4/camel-imap4-engine.c:1654
 #: ../camel/providers/imap4/camel-imap4-engine.c:1710
 #: ../camel/providers/imap4/camel-imap4-store.c:315
 #: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#: ../camel/providers/pop3/camel-pop3-store.c:553
-#: ../camel/providers/pop3/camel-pop3-store.c:560
-#: ../camel/providers/pop3/camel-pop3-store.c:566
+#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../camel/providers/pop3/camel-pop3-store.c:554
+#: ../camel/providers/pop3/camel-pop3-store.c:561
+#: ../camel/providers/pop3/camel-pop3-store.c:567
 #: ../servers/exchange/storage/e-storage.c:585
 #: ../servers/groupwise/e-gw-connection.c:241
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
 # shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:5084
-#: ../calendar/libedata-cal/e-cal-backend-util.c:95
+#: ../calendar/libecal/e-cal.c:5106
+#: ../calendar/libedata-cal/e-cal-backend-util.c:103
 #: ../servers/exchange/storage/e-storage.c:553
 msgid "No error"
 msgstr "沒有錯誤"
@@ -2166,6 +1391,60 @@ msgid ""
 "be a boolean false (#f)"
 msgstr "「%s」的所有引數必須為字串,或只有一個引數為邏輯偽值 (#f)"
 
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+msgid "Invalid range"
+msgstr "無效的範圍"
+
+# mail/mail-config.glade.h:1
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+msgid "Unsupported field"
+msgstr "不支援的欄位"
+
+# mail/mail-config.glade.h:1
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+msgid "Unsupported method"
+msgstr "不支援的方法"
+
+# camel/providers/imap/camel-imap-store.c:466
+# camel/providers/smtp/camel-smtp-transport.c:366
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+msgid "Unsupported authentication method"
+msgstr "不支援的驗證方法"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+msgid "TLS not available"
+msgstr "無法使用 TLS"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+msgid "Offline mode unavailable"
+msgstr "離線模式無法使用"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+msgid "Search size limit exceeded"
+msgstr "超過搜尋大小限制"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+msgid "Search time limit exceeded"
+msgstr "超過搜尋時間限制"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+msgid "Invalid query"
+msgstr "無效的查詢"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+msgid "Query refused"
+msgstr "查詢被拒絕"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+msgid "Invalid server version"
+msgstr "無效的伺服器版本"
+
 # camel/camel-cipher-context.c:171
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
@@ -2222,11 +1501,15 @@ msgid "Unable to create cache path"
 msgstr "無法建立快取路徑"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/camel-data-cache.c:381
+#: ../camel/camel-data-cache.c:403
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "無法移除快取項目: %s: %s"
 
+#: ../camel/camel-db.c:469
+msgid "Insufficient memory"
+msgstr "記憶體不足"
+
 #: ../camel/camel-disco-diary.c:198
 #, c-format
 msgid ""
@@ -2238,6 +1521,18 @@ msgstr ""
 "接下來在此伺服器上的操作,在你重新連線到網絡時\n"
 "將不會重播。"
 
+#: ../camel/camel-disco-diary.c:261
+#: ../camel/providers/imap/camel-imap-journal.c:318
+#, c-format
+msgid ""
+"Could not open '%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+"無法開啟「%s」:\n"
+"%s\n"
+"這個資料夾內所做的更改將不會重新同步。"
+
 #: ../camel/camel-disco-diary.c:297
 msgid "Resynchronizing with server"
 msgstr "與伺服器重新同步"
@@ -2259,10 +1554,11 @@ msgstr "準備資料夾「%s」供離線使用"
 
 # camel/camel-disco-store.c:271
 #: ../camel/camel-disco-store.c:403
-#: ../camel/providers/imap/camel-imap-store.c:1002
-#: ../camel/providers/imap/camel-imap-store.c:1810
-#: ../camel/providers/imap/camel-imap-store.c:2226
-#: ../camel/providers/imap/camel-imap-store.c:2989
+#: ../camel/providers/groupwise/camel-groupwise-store.c:226
+#: ../camel/providers/imap/camel-imap-store.c:1003
+#: ../camel/providers/imap/camel-imap-store.c:1813
+#: ../camel/providers/imap/camel-imap-store.c:2229
+#: ../camel/providers/imap/camel-imap-store.c:2997
 msgid "You must be working online to complete this operation"
 msgstr "你必須於網上工作才能完成此操作"
 
@@ -2272,84 +1568,84 @@ msgstr "沒有可用的描述"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:785
+#: ../camel/camel-filter-driver.c:795
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "無法建立子代處理 '%s':%s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/camel-filter-driver.c:827
+#: ../camel/camel-filter-driver.c:837
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "無法讀取 %s 的歡迎辭: %s"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025
+#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
 msgid "Syncing folders"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:866
-#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1494
+#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "分析過濾器發生錯誤: %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1503
+#: ../camel/camel-filter-driver.c:1133 ../camel/camel-filter-driver.c:1539
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "執行過濾器發生錯誤: %s: %s"
 
 # camel/camel-filter-driver.c:643
-#: ../camel/camel-filter-driver.c:1191
+#: ../camel/camel-filter-driver.c:1221
 msgid "Unable to open spool folder"
 msgstr "無法開啟 spool 資料夾"
 
 # camel/camel-filter-driver.c:652
-#: ../camel/camel-filter-driver.c:1200
+#: ../camel/camel-filter-driver.c:1230
 msgid "Unable to process spool folder"
 msgstr "無法處理 spool 資料夾"
 
 # camel/camel-filter-driver.c:666
-#: ../camel/camel-filter-driver.c:1215
+#: ../camel/camel-filter-driver.c:1246
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "接收郵件 %d (%d%%)"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-filter-driver.c:1219
+#: ../camel/camel-filter-driver.c:1250
 msgid "Cannot open message"
 msgstr "不能開啟郵件"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:1220 ../camel/camel-filter-driver.c:1233
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
 #, 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:1247 ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1343
+#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
 msgid "Complete"
 msgstr "完成"
 
 # camel/camel-filter-driver.c:748
-#: ../camel/camel-filter-driver.c:1308
+#: ../camel/camel-filter-driver.c:1344
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在接收第 %d / %d 封郵件"
 
 # camel/camel-filter-driver.c:753
 # camel/camel-filter-driver.c:771
-#: ../camel/camel-filter-driver.c:1323
+#: ../camel/camel-filter-driver.c:1359
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d / %d 封郵件失敗"
@@ -2388,7 +1684,8 @@ msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤: %s: %s"
 
 # camel/camel-folder-search.c:328
-#: ../camel/camel-folder-search.c:332 ../camel/camel-folder-search.c:447
+#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:608
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2398,7 +1695,8 @@ msgstr ""
 "%s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:457
+#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
+#: ../camel/camel-folder-search.c:618
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2409,78 +1707,78 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:643 ../camel/camel-folder-search.c:685
+#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) 需要單一邏輯值結果"
 
-#: ../camel/camel-folder-search.c:738
+#: ../camel/camel-folder-search.c:906
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) 不允許放在 %s 裏面"
 
-#: ../camel/camel-folder-search.c:744 ../camel/camel-folder-search.c:751
+#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) 需要相符類型字串"
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:778
+#: ../camel/camel-folder-search.c:946
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) 期望陣列結果"
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:787
+#: ../camel/camel-folder-search.c:955
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) 需要資料夾設定"
 
-# camel/camel-folder-search.c:559
-#: ../camel/camel-folder-search.c:882
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "在不明的檔頭內執行查詢:%s"
-
-#: ../camel/camel-folder.c:693
+#: ../camel/camel-folder.c:696
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "不支援的操作:添加郵件: %s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1349
+#: ../camel/camel-folder.c:1398
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "不支援的操作:以詞句搜尋: %s"
 
-#: ../camel/camel-folder.c:1390
+# camel/camel-folder-search.c:338
+#: ../camel/camel-folder.c:1440
+#, c-format
+msgid "Unsupported operation: count by expression: for %s"
+msgstr "不支援的操作:以詞句計數:用於 %s"
+
+#: ../camel/camel-folder.c:1480
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "不支援的操作:以 UIDs 搜尋: %s"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1506
+#: ../camel/camel-folder.c:1596
 msgid "Moving messages"
-msgstr "移動郵件"
+msgstr "正在移動郵件"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1506
+#: ../camel/camel-folder.c:1596
 msgid "Copying messages"
-msgstr "複製郵件"
+msgstr "正在複製郵件"
 
 # widgets/misc/e-messagebox.c:159
-#: ../camel/camel-folder.c:1852
+#: ../camel/camel-folder.c:1942
 msgid "Learning junk"
 msgstr "了解垃圾郵件"
 
-#: ../camel/camel-folder.c:1869
+#: ../camel/camel-folder.c:1959
 msgid "Learning non-junk"
 msgstr "了解非垃圾郵件"
 
 # mail/mail-ops.c:1565
-#: ../camel/camel-folder.c:1888
+#: ../camel/camel-folder.c:1978
 msgid "Filtering new message(s)"
 msgstr "取回 %d 封郵件"
 
@@ -2521,9 +1819,15 @@ msgstr ""
 "你需要密語才能為此使用者的密碼匙解鎖:\n"
 "「%s」"
 
+# camel/providers/imap/camel-imap-command.c:232
+#: ../camel/camel-gpg-context.c:837
+#, c-format
+msgid "Unexpected request from GnuPG for '%s'"
+msgstr "GnuPG 傳回對「%s」未預期的要求"
+
 # mail/mail-send-recv.c:471
 #: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1068
-#: ../camel/providers/nntp/camel-nntp-store.c:1281
+#: ../camel/providers/nntp/camel-nntp-store.c:1287
 msgid "Canceled."
 msgstr "已取消。"
 
@@ -2749,8 +2053,8 @@ msgstr "解析錯誤"
 # camel/camel-service.c:580
 #: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
 #: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:447
-#: ../camel/providers/pop3/camel-pop3-store.c:547
+#: ../camel/providers/pop3/camel-pop3-store.c:448
+#: ../camel/providers/pop3/camel-pop3-store.c:548
 msgid "Canceled"
 msgstr "已取消"
 
@@ -2792,11 +2096,18 @@ msgid "Name lookup failed: %s"
 msgstr "搜尋名稱失敗: %s"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-offline-folder.c:254
+#: ../camel/camel-offline-folder.c:253
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "正在將資料夾「%s」中的郵件同步到磁碟"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
+#, c-format
+msgid "Cannot write offline journal for folder '%s': %s"
+msgstr "不能寫入資料夾「%s」的離線日誌:%s"
+
 # camel/camel-session.c:68
 #: ../camel/camel-provider.c:60
 msgid "Virtual folder email provider"
@@ -2825,6 +2136,13 @@ msgstr "無法載入 %s:%s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "無法載入 %s:模組內沒有初始碼。"
 
+# camel/camel-session.c:295
+# camel/camel-session.c:364
+#: ../camel/camel-provider.c:373 ../camel/camel-session.c:182
+#, c-format
+msgid "No provider available for protocol '%s'"
+msgstr "沒有通訊協定「%s」的提供者"
+
 # camel/camel-sasl-anonymous.c:33
 #: ../camel/camel-sasl-anonymous.c:37
 msgid "Anonymous"
@@ -2839,7 +2157,7 @@ msgstr "這個選項將會使用匿名登入至伺服器。"
 # camel/camel-sasl-plain.c:87
 #: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
 msgid "Authentication failed."
-msgstr "é©\97証失敗。"
+msgstr "é©\97è­\89失敗。"
 
 # camel/camel-sasl-anonymous.c:119
 #: ../camel/camel-sasl-anonymous.c:133
@@ -2989,7 +2307,7 @@ msgstr "參照的證件已經過期。"
 #: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
 #: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
 #: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/providers/imap/camel-imap-store.c:1273
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
@@ -3095,7 +2413,7 @@ msgid "URL '%s' needs a path component"
 msgstr "URL「%s」需要 path 元件"
 
 # camel/camel-session.c:479
-#: ../camel/camel-session.c:303
+#: ../camel/camel-session.c:308
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3105,11 +2423,15 @@ msgstr ""
 "%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:478
+#: ../camel/camel-session.c:483
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "請輸入 %2$s 於主機 %3$s 的 %1$s 密碼。"
 
+#: ../camel/camel-session.c:822
+msgid "Camel session doesn't support forwarding of a message."
+msgstr "Camel 作業階段不支援轉送訊息。"
+
 # camel/camel-smime-context.c:327
 #: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778
 #, c-format
@@ -3352,33 +2674,40 @@ msgid "export keys: unimplemented"
 msgstr "匯出密碼匙:未執行"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/camel-store.c:272
+#: ../camel/camel-store.c:283
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:174
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "不能取得資料夾:在此儲存空間上無效的操作"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/camel-store.c:316
+#, c-format
+msgid "Cannot create folder '%s': folder exists"
+msgstr "不能建立資料夾「%s」:資料夾已存在"
+
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/camel-store.c:369
+#: ../camel/camel-store.c:395
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "不能建立資料夾:在此儲存空間上無效的操作"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:397
+#: ../camel/camel-store.c:423
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "無法建立資料夾:%s:資料夾已存在"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-store.c:461 ../camel/camel-vee-store.c:384
+#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:384
 #: ../camel/providers/local/camel-maildir-store.c:219
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾: %s :無效的操作"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/camel-store.c:513 ../camel/camel-vee-store.c:421
+#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:421
 #: ../camel/providers/local/camel-maildir-store.c:291
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -3390,14 +2719,14 @@ 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:854 ../camel/camel-vtrash-folder.c:53
-#: ../camel/providers/imap/camel-imap-store.c:1060
+#: ../camel/camel-store.c:899 ../camel/camel-vtrash-folder.c:54
+#: ../camel/providers/imap/camel-imap-store.c:1061
 msgid "Trash"
 msgstr "回收筒"
 
 # calendar/gui/goto-dialog.glade.h:9
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:857 ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-store.c:902 ../camel/camel-vtrash-folder.c:56
 msgid "Junk"
 msgstr "垃圾郵件"
 
@@ -3522,7 +2851,7 @@ msgstr "密碼匙的用途並不支援證書簽署"
 msgid "Error in application verification"
 msgstr "應用程式驗證時錯誤"
 
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -3535,11 +2864,11 @@ msgstr ""
 "指紋檔:              %s\n"
 "簽署:              %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
 msgid "GOOD"
 msgstr "良好"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
 msgid "BAD"
 msgstr "不良"
 
@@ -3567,7 +2896,7 @@ msgstr ""
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:889
+#: ../camel/camel-tcp-stream-ssl.c:890
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -3582,7 +2911,7 @@ msgstr ""
 "\n"
 "你想要接受嗎?"
 
-#: ../camel/camel-tcp-stream-ssl.c:933
+#: ../camel/camel-tcp-stream-ssl.c:934
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -3591,7 +2920,7 @@ msgstr ""
 "證書問題: %s\n"
 "發照者: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:985
+#: ../camel/camel-tcp-stream-ssl.c:986
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -3600,7 +2929,7 @@ msgstr ""
 "不正確的證書網域: %s\n"
 "發照者: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1003
+#: ../camel/camel-tcp-stream-ssl.c:1004
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -3609,7 +2938,7 @@ msgstr ""
 "證書已逾期: %s\n"
 "發照者: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1020
+#: ../camel/camel-tcp-stream-ssl.c:1021
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -3618,14 +2947,26 @@ msgstr ""
 "證書撒銷清單已逾期: %s\n"
 "發照者: %s"
 
+# camel/camel-url.c:289
+#: ../camel/camel-url.c:313
+#, c-format
+msgid "Could not parse URL '%s'"
+msgstr "無法解析 URL「%s」"
+
+# shell/e-shell-importer.c:384
+#: ../camel/camel-vee-folder.c:582
+#, c-format
+msgid "Error storing '%s': %s"
+msgstr "儲存「%s」發生錯誤:%s"
+
 # camel/camel-vee-folder.c:451
-#: ../camel/camel-vee-folder.c:626
+#: ../camel/camel-vee-folder.c:660
 #, 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:749 ../camel/camel-vee-folder.c:755
+#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
 
@@ -3648,12 +2989,12 @@ msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾: %s :沒有這個資料夾"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-vtrash-folder.c:55
 msgid "Cannot copy messages to the Trash folder"
 msgstr "無法複製訊息到「回收筒」資料夾"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-vtrash-folder.c:57
 msgid "Cannot copy messages to the Junk folder"
 msgstr "無法複製訊息到「垃圾郵件」資料夾"
 
@@ -3664,7 +3005,7 @@ msgstr "無法複製訊息到「垃圾郵件」資料夾"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:129
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3676,26 +3017,28 @@ msgstr ""
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
-#: ../camel/providers/local/camel-maildir-folder.c:251
-#: ../camel/providers/local/camel-mbox-folder.c:349
-#: ../camel/providers/local/camel-mh-folder.c:204
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:129
+#: ../camel/providers/local/camel-maildir-folder.c:248
+#: ../camel/providers/local/camel-maildir-folder.c:275
+#: ../camel/providers/local/camel-mbox-folder.c:347
+#: ../camel/providers/local/camel-mbox-folder.c:399
+#: ../camel/providers/local/camel-mh-folder.c:214
 msgid "No such message"
-msgstr "沒有這封郵件"
+msgstr "無此郵件"
 
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
-#: ../camel/providers/imap4/camel-imap4-folder.c:812
-#: ../camel/providers/nntp/camel-nntp-folder.c:156
-#: ../camel/providers/nntp/camel-nntp-folder.c:232
-#: ../camel/providers/nntp/camel-nntp-folder.c:373
-#: ../camel/providers/pop3/camel-pop3-folder.c:266
-#: ../camel/providers/pop3/camel-pop3-folder.c:560
-#: ../camel/providers/pop3/camel-pop3-folder.c:621
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:141
+#: ../camel/providers/imap4/camel-imap4-folder.c:821
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:411
+#: ../camel/providers/pop3/camel-pop3-folder.c:268
+#: ../camel/providers/pop3/camel-pop3-folder.c:578
 #: ../camel/providers/pop3/camel-pop3-folder.c:639
+#: ../camel/providers/pop3/camel-pop3-folder.c:657
 msgid "User canceled"
 msgstr "使用者已取消"
 
@@ -3706,58 +3049,66 @@ msgstr "使用者已取消"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:135
-#: ../camel/providers/imap4/camel-imap4-folder.c:817
-#: ../camel/providers/nntp/camel-nntp-folder.c:147
-#: ../camel/providers/nntp/camel-nntp-folder.c:149
-#: ../camel/providers/nntp/camel-nntp-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/imap4/camel-imap4-folder.c:826
+#: ../camel/providers/nntp/camel-nntp-folder.c:166
+#: ../camel/providers/nntp/camel-nntp-folder.c:168
+#: ../camel/providers/nntp/camel-nntp-folder.c:177
+#: ../camel/providers/nntp/camel-nntp-folder.c:253
 #: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
-#: ../camel/providers/pop3/camel-pop3-folder.c:624
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:581
 #: ../camel/providers/pop3/camel-pop3-folder.c:642
+#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "無法取得郵件 %s: %s"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:160
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164
-#: ../camel/providers/imap4/camel-imap4-folder.c:835
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:165
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2277
+#: ../camel/providers/imap4/camel-imap4-folder.c:844
 msgid "This message is not available in offline mode."
 msgstr "這封郵件無法在離線模式下使用。"
 
 # camel/camel-movemail.c:306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:179
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:185
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1851
 msgid "Could not get message"
 msgstr "無法取得郵件。"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:818
-#: ../camel/providers/imap/camel-imap-folder.c:248
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:867
+#: ../camel/providers/imap/camel-imap-folder.c:264
 #, c-format
 msgid "Could not load summary for %s"
-msgstr "無法載入 %s 的摘要"
+msgstr "無法載入 %s 的摘要"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1071
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1127
 msgid "Trash Folder Full. Please Empty."
 msgstr "回收筒資料夾已滿。請將它清空。"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1248
-#: ../camel/providers/groupwise/camel-groupwise-store.c:623
-#: ../camel/providers/groupwise/camel-groupwise-store.c:736
-#: ../camel/providers/imap/camel-imap-folder.c:3161
-#: ../camel/providers/imap/camel-imap-folder.c:3238
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1335
+#: ../camel/providers/groupwise/camel-groupwise-store.c:617
+#: ../camel/providers/groupwise/camel-groupwise-store.c:743
+#: ../camel/providers/imap/camel-imap-folder.c:3333
+#: ../camel/providers/imap/camel-imap-folder.c:3409
 #, 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:2135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2177
+#, c-format
+msgid "Cannot append message to folder '%s': %s"
+msgstr "不能將郵件加入至資料夾「%s」:%s"
+
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
 # camel/providers/local/camel-maildir-folder.c:217
@@ -3765,7 +3116,7 @@ msgstr "正取得 %s 中新郵件的摘要資訊"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2165
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "無法建立郵件: %s"
@@ -3782,7 +3133,7 @@ msgstr "不能取得資料夾容器 %s"
 #: ../camel/providers/groupwise/camel-groupwise-journal.c:349
 #: ../camel/providers/imap4/camel-imap4-journal.c:319
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "不能在離線模式中添加郵件:無法使用快取"
+msgstr "不能在離線模式中加入郵件:無法使用快取"
 
 # camel/providers/local/camel-mbox-folder.c:259
 #: ../camel/providers/groupwise/camel-groupwise-journal.c:365
@@ -3804,7 +3155,7 @@ msgstr "檢查新郵件"
 #: ../camel/providers/imap/camel-imap-provider.c:46
 #: ../camel/providers/imap4/camel-imap4-provider.c:41
 msgid "C_heck for new messages in all folders"
-msgstr "檢查所有資料夾裏的新郵件(_H)"
+msgstr "檢查所有資料夾中是否有新郵件(_H)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:68
@@ -3841,8 +3192,8 @@ msgid "SOAP Settings"
 msgstr "SOAP 設定值"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:76
-msgid "Post Office Agent SOAP Port:"
-msgstr "郵局代辦 SOAP 埠"
+msgid "Post Office Agent SOAP _Port:"
+msgstr "郵局代辦 SOAP 埠(_P):"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:89
 msgid "Novell GroupWise"
@@ -3875,50 +3226,58 @@ msgid ""
 msgstr "這個選項將會使用簡易的密碼連線至 GroupWise 伺服器。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#: ../camel/providers/groupwise/camel-groupwise-store.c:104
 msgid "Host or user not available in url"
 msgstr "網址中的使用者或主機無法使用"
 
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: ../camel/providers/groupwise/camel-groupwise-store.c:206
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1357
 msgid "You did not enter a password."
 msgstr "你沒有輸入密碼。"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:302
+#: ../camel/providers/groupwise/camel-groupwise-store.c:303
 msgid "Some features may not work correctly with your current server version"
 msgstr "某些功能可能無法在你目前的伺服器版本上正常運作"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../camel/providers/groupwise/camel-groupwise-store.c:532
-#: ../camel/providers/imap/camel-imap-store.c:1846
-#: ../camel/providers/imap/camel-imap-store.c:2044
+#: ../camel/providers/groupwise/camel-groupwise-store.c:524
+#: ../camel/providers/imap/camel-imap-store.c:1849
+#: ../camel/providers/imap/camel-imap-store.c:2047
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1219
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "在離線模式中不能建立 GroupWise 資料夾。"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
-#: ../camel/providers/imap/camel-imap-store.c:1921
-#: ../camel/providers/imap/camel-imap-store.c:2301
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
+#: ../camel/providers/imap/camel-imap-store.c:1924
+#: ../camel/providers/imap/camel-imap-store.c:2304
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "母資料夾並不允許包含子資料夾"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#, c-format
+msgid "Cannot rename GroupWise folder '%s' to '%s'"
+msgstr "不能將 GroupWise 資料夾「%s」重新命名為「%s」"
+
 # shell/e-shortcuts-view.c:137
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:121
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise 伺服器 %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1364
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s 的 GroupWise 服務於 %s"
@@ -3932,7 +3291,7 @@ msgstr "經由 %s 傳送 GroupWise 郵件"
 # mail/mail-ops.c:603
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:167
 msgid "Sending Message"
-msgstr "傳送郵件"
+msgstr "正在傳送郵件"
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:221
 msgid ""
@@ -4015,6 +3374,16 @@ msgstr "用於存取 Hula 伺服器"
 msgid "This option will connect to the Hula server using a plaintext password."
 msgstr "這個選項將會使用簡易的密碼連線至 Hula 伺服器。"
 
+#: ../camel/providers/imap/camel-imap-command.c:183
+#: ../camel/providers/imap/camel-imap-command.c:267
+msgid "No output stream"
+msgstr "沒有輸出串流"
+
+#: ../camel/providers/imap/camel-imap-command.c:188
+#: ../camel/providers/imap/camel-imap-command.c:272
+msgid "No input stream"
+msgstr "沒有輸入串流"
+
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
@@ -4022,13 +3391,13 @@ msgstr "這個選項將會使用簡易的密碼連線至 Hula 伺服器。"
 #: ../camel/providers/imap/camel-imap-command.c:231
 #: ../camel/providers/imap/camel-imap-command.c:280
 #: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3029
+#: ../camel/providers/imap/camel-imap-store.c:3037
 msgid "Operation cancelled"
-msgstr "作業已取消"
+msgstr "操作程序已取消"
 
 # camel/camel-remote-store.c:476
 #: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3032
+#: ../camel/providers/imap/camel-imap-store.c:3040
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "伺服器突然中斷連線: %s"
@@ -4075,77 +3444,114 @@ msgid "Unexpected OK response from IMAP server: %s"
 msgstr "從 IMAP 伺服器傳回不當的 OK 回應: %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-folder.c:88
+#: ../camel/providers/imap/camel-imap-folder.c:89
 msgid "Always check for new mail in this folder"
-msgstr "永遠檢查資料夾中是否有新郵件"
+msgstr "永遠檢查這個資料夾中是否有新郵件"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/imap/camel-imap-folder.c:229
+#: ../camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "無法建立目錄 %s: %s"
+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:843
+#: ../camel/providers/imap/camel-imap-folder.c:888
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "掃描 %s 中更改過的郵件"
 
+#: ../camel/providers/imap/camel-imap-folder.c:1926
+#, c-format
+msgid "Unexpected response status '%s' after APPEND command"
+msgstr "在 APPEND 指令後傳回未預期的回應狀態「%s」"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1941
+msgid "No response on continuation after APPEND command"
+msgstr "在 APPEND 指令後沒有持續回應"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1983
+msgid "Unknown error occurred during APPEND command!"
+msgstr "在 APPEND 指令期間發生未知的錯誤!"
+
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/providers/imap/camel-imap-folder.c:2707
+#: ../camel/providers/imap/camel-imap-folder.c:2813
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "無法從取回郵件: %s"
 
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/imap/camel-imap-folder.c:2848
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "無法取得郵件 ID 為 %s 的郵件: %s"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+#: ../camel/providers/imap/camel-imap-folder.c:2849
+msgid "No such message available."
+msgstr "沒有這個郵件。"
+
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/imap/camel-imap-folder.c:2788
-#: ../camel/providers/imap/camel-imap-folder.c:3540
-#: ../camel/providers/nntp/camel-nntp-folder.c:220
+#: ../camel/providers/imap/camel-imap-folder.c:2903
+#: ../camel/providers/imap/camel-imap-folder.c:3712
+#: ../camel/providers/nntp/camel-nntp-folder.c:239
 msgid "This message is not currently available"
 msgstr "這封郵件目前仍未可用"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3367
+#: ../camel/providers/imap/camel-imap-folder.c:3538
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "不完整的伺服器回應:未提供任何資訊給訊息 %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3375
+#: ../camel/providers/imap/camel-imap-folder.c:3546
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "不完整的伺服器回應:未提供 UID 給訊息 %d"
 
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: ../camel/providers/imap/camel-imap-folder.c:3578
+#: ../camel/providers/imap/camel-imap-folder.c:3750
 msgid "Could not find message body in FETCH response."
 msgstr "在 FETCH 的回應內找不到郵件的內文。"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/providers/imap/camel-imap-message-cache.c:160
-#: ../camel/providers/imap/camel-imap-message-cache.c:220
+#: ../camel/providers/imap/camel-imap-message-cache.c:182
+#: ../camel/providers/imap/camel-imap-message-cache.c:246
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "無法開啟快取目錄:%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/providers/imap/camel-imap-message-cache.c:307
-#: ../camel/providers/imap/camel-imap-message-cache.c:364
-#: ../camel/providers/imap/camel-imap-message-cache.c:395
-#: ../camel/providers/imap/camel-imap-message-cache.c:427
+#: ../camel/providers/imap/camel-imap-message-cache.c:333
+#: ../camel/providers/imap/camel-imap-message-cache.c:390
+#: ../camel/providers/imap/camel-imap-message-cache.c:421
+#: ../camel/providers/imap/camel-imap-message-cache.c:453
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "快取郵件 %s 失敗: %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/providers/imap/camel-imap-message-cache.c:478
+#: ../camel/providers/imap/camel-imap-message-cache.c:533
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "快取 %s 失敗: %s"
 
+# camel/providers/imap/camel-imap-provider.c:45
+#: ../camel/providers/imap/camel-imap-provider.c:48
+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:50
@@ -4156,7 +3562,7 @@ msgstr "命名空間"
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imap4/camel-imap4-provider.c:54
 msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "å°\87é\81\8e濾å\99¨å¥\97ç\94¨æ\96¼æ­¤ä¼ºæ\9c\8då\99¨ç\9a\84收件匣的新郵件(_A)"
+msgstr "å¥\97ç\94¨é\81\8e濾æ¢\9d件è\87³æ­¤ä¼ºæ\9c\8då\99¨收件匣的新郵件(_A)"
 
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../camel/providers/imap/camel-imap-provider.c:72
@@ -4186,14 +3592,14 @@ 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:436
+#: ../camel/providers/imap/camel-imap-store.c:437
 #: ../camel/providers/imap4/camel-imap4-store.c:214
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 伺服器 %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/imap/camel-imap-store.c:438
+#: ../camel/providers/imap/camel-imap-store.c:439
 #: ../camel/providers/imap4/camel-imap4-store.c:216
 #, c-format
 msgid "IMAP service for %s on %s"
@@ -4201,39 +3607,39 @@ msgstr "%s 的 IMAP 服務於 %s"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap/camel-imap-store.c:582
+#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imap/camel-imap-store.c:583
 #: ../camel/providers/imap4/camel-imap4-store.c:251
 #: ../camel/providers/imap4/camel-imap4-store.c:266
 #: ../camel/providers/nntp/camel-nntp-store.c:183
 #: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/pop3/camel-pop3-store.c:185
+#: ../camel/providers/pop3/camel-pop3-store.c:172
+#: ../camel/providers/pop3/camel-pop3-store.c:186
 #: ../camel/providers/smtp/camel-smtp-transport.c:260
 #: ../camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s: %s"
-msgstr "無法連線至 %s : %s"
+msgstr "無法連接到 %s:%s"
 
-#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imap/camel-imap-store.c:569
 #: ../camel/providers/imap4/camel-imap4-store.c:252
 #: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:172
+#: ../camel/providers/pop3/camel-pop3-store.c:173
 #: ../camel/providers/smtp/camel-smtp-transport.c:261
 msgid "SSL unavailable"
-msgstr "TLS 無法使用"
+msgstr "SSL 無法使用"
 
 # camel/camel-remote-store.c:252
-#: ../camel/providers/imap/camel-imap-store.c:579
-#: ../camel/providers/imap/camel-imap-store.c:861
+#: ../camel/providers/imap/camel-imap-store.c:580
+#: ../camel/providers/imap/camel-imap-store.c:862
 msgid "Connection cancelled"
 msgstr "連線已取消"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap/camel-imap-store.c:741
+#: ../camel/providers/imap/camel-imap-store.c:691
+#: ../camel/providers/imap/camel-imap-store.c:710
+#: ../camel/providers/imap/camel-imap-store.c:716
+#: ../camel/providers/imap/camel-imap-store.c:742
 #: ../camel/providers/imap4/camel-imap4-store.c:314
 #: ../camel/providers/imap4/camel-imap4-store.c:329
 #: ../camel/providers/imap4/camel-imap4-store.c:338
@@ -4242,18 +3648,18 @@ 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:691
+#: ../camel/providers/imap/camel-imap-store.c:692
 #: ../camel/providers/smtp/camel-smtp-transport.c:333
 msgid "STARTTLS not supported"
 msgstr "不支援 STARTTLS"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../camel/providers/imap/camel-imap-store.c:710
+#: ../camel/providers/imap/camel-imap-store.c:711
 msgid "SSL negotiations failed"
 msgstr "SSL 協商失敗"
 
-#: ../camel/providers/imap/camel-imap-store.c:716
+#: ../camel/providers/imap/camel-imap-store.c:717
 #: ../camel/providers/imap4/camel-imap4-store.c:339
 #: ../camel/providers/smtp/camel-smtp-transport.c:372
 msgid "SSL is not available in this build"
@@ -4261,18 +3667,18 @@ msgstr "此一版本並未啟用 SSL"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:864
+#: ../camel/providers/imap/camel-imap-store.c:865
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "無法以指令「%s」連線: %s"
 
 # mail/local-config.glade.h:8
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1052
-#: ../camel/providers/imap/camel-imap-store.c:2397
+#: ../camel/providers/imap/camel-imap-store.c:1053
+#: ../camel/providers/imap/camel-imap-store.c:2400
 #: ../camel/providers/imap4/camel-imap4-store-summary.c:368
 #: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:77
+#: ../camel/providers/local/camel-maildir-folder.c:78
 #: ../camel/providers/local/camel-maildir-store.c:219
 #: ../camel/providers/local/camel-maildir-store.c:291
 #: ../camel/providers/local/camel-maildir-store.c:517
@@ -4282,35 +3688,35 @@ msgstr "無法以指令「%s」連線: %s"
 msgid "Inbox"
 msgstr "收件匣"
 
-#: ../camel/providers/imap/camel-imap-store.c:1054
+#: ../camel/providers/imap/camel-imap-store.c:1055
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
 msgid "Drafts"
 msgstr "草稿"
 
-#: ../camel/providers/imap/camel-imap-store.c:1056
+#: ../camel/providers/imap/camel-imap-store.c:1057
 msgid "Sent"
 msgstr "已傳送"
 
-#: ../camel/providers/imap/camel-imap-store.c:1058
+#: ../camel/providers/imap/camel-imap-store.c:1059
 msgid "Templates"
 msgstr "範本"
 
 # camel/providers/imap/camel-imap-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1304
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 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:1313
+#: ../camel/providers/imap/camel-imap-store.c:1314
 #: ../camel/providers/smtp/camel-smtp-transport.c:507
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支援驗證類型 %s"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: ../camel/providers/imap/camel-imap-store.c:1385
+#: ../camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4321,16 +3727,26 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1858
-#: ../camel/providers/imap/camel-imap-store.c:2239
+#: ../camel/providers/imap/camel-imap-store.c:1861
+#: ../camel/providers/imap/camel-imap-store.c:2242
 #: ../camel/providers/imap4/camel-imap4-store.c:959
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "資料夾名稱「%s」無效,因為它包括字符「%c」"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap/camel-imap-store.c:1978
+#: ../camel/providers/local/camel-maildir-store.c:192
+#: ../camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mh-store.c:249
+#, c-format
+msgid "Cannot create folder '%s': folder exists."
+msgstr "不能建立資料夾「%s」:資料夾已存在。"
+
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/imap/camel-imap-store.c:2250
+#: ../camel/providers/imap/camel-imap-store.c:2253
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "不明的母資料夾: %s"
@@ -4354,6 +3770,30 @@ msgstr "IMAP4 伺服器 %s 非預期的回應:%s"
 msgid "Unexpected greeting from IMAP server %s."
 msgstr "IMAP 伺服器 %s 非預期的問候語。"
 
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#, c-format
+msgid "Cannot select folder '%s': Invalid mailbox name"
+msgstr "無法選取資料夾「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-engine.c:456
+#, c-format
+msgid "Cannot select folder '%s': Bad command"
+msgstr "無法選取資料夾「%s」:錯誤的指令"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/imap4/camel-imap4-engine.c:1433
+#, c-format
+msgid "Failed to send command to IMAP server %s: %s"
+msgstr "傳送指令至 IMAP 伺服器 %s 失敗:%s"
+
+#: ../camel/providers/imap4/camel-imap4-engine.c:1435
+msgid "service unavailable"
+msgstr "服務無法使用"
+
 # camel/camel-remote-store.c:476
 #: ../camel/providers/imap4/camel-imap4-engine.c:1569
 #: ../camel/providers/imap4/camel-imap4-engine.c:1608
@@ -4363,10 +3803,128 @@ msgstr "IMAP 伺服器 %s 非預期的問候語。"
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "IMAP4 伺服器 %s 意外中斷連線:%s"
 
+#: ../camel/providers/imap4/camel-imap4-folder.c:89
+msgid ""
+"Enable extended Mailing-List detection required for some filter and vFolder "
+"rules"
+msgstr "啟用某些過濾器和虛擬資料夾規則所要求的通信論壇偵測"
+
+#: ../camel/providers/imap4/camel-imap4-folder.c:90
+msgid "Expire cached messages that haven't been read in X seconds"
+msgstr "在 X 秒內未閱讀的逾期快取訊息"
+
+#: ../camel/providers/imap4/camel-imap4-folder.c:91
+msgid "Expire cached messages older than X seconds"
+msgstr "早於 X 秒的逾期快取訊息"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-folder.c:432
+#, c-format
+msgid "Cannot access folder '%s': %s"
+msgstr "不能存取資料夾「%s」:%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-folder.c:491
+#, c-format
+msgid "Cannot sync flags to folder '%s': Unknown error"
+msgstr "不能同步旗標至資料夾「%s」:未知的錯誤"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-folder.c:497
+#, c-format
+msgid "Cannot sync flags to folder '%s': Bad command"
+msgstr "不能同步旗標至資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-folder.c:637
+#, c-format
+msgid "Cannot expunge folder '%s': Unknown error"
+msgstr "不能清空資料夾「%s」:未知的錯誤"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-folder.c:642
+#, c-format
+msgid "Cannot expunge folder '%s': Bad command"
+msgstr "不能清空資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:898
+#, c-format
+msgid "Cannot get message %s from folder '%s': No such message"
+msgstr "不能取得從資料夾「%2$s」取得郵件 %1$s:沒有此郵件"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:903
+#, c-format
+msgid "Cannot get message %s from folder '%s': Bad command"
+msgstr "不能取得從資料夾「%2$s」取得郵件 %1$s:錯誤的指令"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: ../camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot append message to folder '%s': Folder is read-only"
+msgstr "不能將郵件附加到資料夾「%s」:資料夾是唯讀的"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: ../camel/providers/imap4/camel-imap4-folder.c:1040
+#, c-format
+msgid "Cannot append message to folder '%s': Unknown error"
+msgstr "不能將郵件附加到資料夾「%s」:未知的錯誤"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: ../camel/providers/imap4/camel-imap4-folder.c:1070
+#, c-format
+msgid "Cannot append message to folder '%s': Bad command"
+msgstr "不能將郵件附加到資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:1190
+#, c-format
+msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+msgstr "不能從資料夾「%s」移動郵件至資料夾「%s」:未知的錯誤"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:1194
+#, c-format
+msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+msgstr "不能從資料夾「%s」複製郵件至資料夾「%s」:未知的錯誤"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:1202
+#, c-format
+msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+msgstr "不能從資料夾「%s」移動郵件至資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:1206
+#, c-format
+msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+msgstr "不能從資料夾「%s」複製郵件至資料夾「%s」:錯誤的指令"
+
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../camel/providers/imap4/camel-imap4-provider.c:56
 msgid "Check new messages for _Junk contents"
-msgstr "檢查新訊息中是否有「垃圾郵件」內容(_J)"
+msgstr "檢查新郵件中是否有垃圾郵件(_J)"
 
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../camel/providers/imap4/camel-imap4-provider.c:58
@@ -4394,7 +3952,7 @@ msgstr "此選項會使用純文字密碼,連線到 IMAPv4rev1 伺服器。"
 #: ../camel/providers/imapp/camel-imapp-store.c:249
 #: ../camel/providers/nntp/camel-nntp-store.c:195
 #: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/pop3/camel-pop3-store.c:183
 #: ../camel/providers/smtp/camel-smtp-transport.c:272
 msgid "Connection canceled"
 msgstr "連線已取消"
@@ -4410,7 +3968,7 @@ msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了: 伺服器不
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:250
+#: ../camel/providers/pop3/camel-pop3-store.c:251
 msgid "TLS negotiations failed"
 msgstr "TLS 協商失敗"
 
@@ -4433,39 +3991,139 @@ msgstr "無法驗證 IMAP 伺服器 %s (使用 %s)"
 msgid "Cannot create IMAP folders in offline mode."
 msgstr "在離線模式中無法建立 IMAP 資料夾。"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-store.c:740
+#, c-format
+msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+msgstr "不能從 IMAP 伺服器 %2$s 取得資料夾「%1$s」:未知的錯誤"
+
+#: ../camel/providers/imap4/camel-imap4-store.c:821
+#, c-format
+msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+msgstr "不能從 IMAP 伺服器 %2$s 取得「%1$s」的 LIST 資訊 :%3$s"
+
 # addressbook/contact-editor/e-contact-editor.c:1248
 #: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#: ../camel/providers/imap4/camel-imap4-store.c:1579
 msgid "Bad command"
 msgstr "錯誤的指令"
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: ../camel/providers/imap4/camel-imap4-store.c:902
+#, c-format
+msgid "Cannot create folder '%s': Invalid mailbox name"
+msgstr "不能建立資料夾「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-store.c:907
+#, c-format
+msgid "Cannot create folder '%s': Bad command"
+msgstr "不能建立資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#, c-format
+msgid "Cannot delete folder '%s': Special folder"
+msgstr "不能刪除資料夾「%s」:特殊的資料夾"
+
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
 #: ../camel/providers/imap4/camel-imap4-store.c:1020
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "在離線模式中無法刪除 IMAP 資料夾。"
 
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#, c-format
+msgid "Cannot delete folder '%s': Invalid mailbox name"
+msgstr "不能刪除資料夾「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-store.c:1084
+#, c-format
+msgid "Cannot delete folder '%s': Bad command"
+msgstr "不能刪除資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#, c-format
+msgid "Cannot rename folder '%s' to '%s': Special folder"
+msgstr "不能將資料夾「%s」重新命名為「%s」:特殊的資料夾"
+
 # camel/providers/local/camel-local-store.c:237
 #: ../camel/providers/imap4/camel-imap4-store.c:1111
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "在離線模式中無法重新命名 IMAP 資料夾。"
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#, c-format
+msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+msgstr "不能將資料夾「%s」重新命名為「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-store.c:1147
+#, c-format
+msgid "Cannot rename folder '%s' to '%s': Bad command"
+msgstr "不能將資料夾「%s」重新命名為「%s」:錯誤的指令"
+
+#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
+#. * The fourth one is an error message.
+#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#, c-format
+msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+msgstr "無法於 IMAP 伺服器 %3$s 取得樣式「%2$s」的 %1$s 資訊:%4$s"
+
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1636
+#: ../camel/providers/imap4/camel-imap4-store.c:1638
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "在離線模式中無法訂閱 IMAP 資料夾。"
 
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
+#, c-format
+msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+msgstr "不能訂閱資料夾「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-store.c:1688
+#, c-format
+msgid "Cannot subscribe to folder '%s': Bad command"
+msgstr "不能訂閱資料夾「%s」:錯誤的指令"
+
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1708
+#: ../camel/providers/imap4/camel-imap4-store.c:1710
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "在離線模式中無法取消訂閱 IMAP 資料夾。"
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#, c-format
+msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+msgstr "不能取消訂閱資料夾「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-store.c:1760
+#, c-format
+msgid "Cannot unsubscribe from folder '%s': Bad command"
+msgstr "不能取消訂閱資料夾「%s」:錯誤的指令"
+
 # mail/mail-ops.c:1649
 #: ../camel/providers/imap4/camel-imap4-summary.c:1596
 msgid "Scanning for changed messages"
-msgstr "掃描更改過的郵件"
+msgstr "掃描已更改的郵件"
 
 #: ../camel/providers/imap4/camel-imap4-summary.c:1617
 #, c-format
@@ -4532,30 +4190,34 @@ 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:174
+#: ../camel/providers/local/camel-local-folder.c:176
 msgid "Index message body data"
 msgstr "傳送郵件給聯絡人"
 
 #. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:390
+#: ../camel/providers/local/camel-local-folder.c:392
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 # camel/providers/local/camel-mbox-folder.c:203
 #. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:394
-#: ../camel/providers/local/camel-local-folder.c:397
+#: ../camel/providers/local/camel-local-folder.c:396
+#: ../camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:401
+#: ../camel/providers/local/camel-local-folder.c:403
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../camel/providers/local/camel-local-provider.c:48
+msgid "_Use the '.folders' folder summary file (exmh)"
+msgstr "使用「.folders」資料夾摘要檔案[exmh](_U)"
+
 # camel/providers/local/camel-local-provider.c:39
 #: ../camel/providers/local/camel-local-provider.c:55
 msgid "MH-format mail directories"
@@ -4616,8 +4278,8 @@ msgid "Standard Unix mbox spool directory"
 msgstr "標準 Unix mbox 排程器目錄"
 
 # camel/providers/local/camel-local-store.c:127
-#: ../camel/providers/local/camel-local-store.c:171
-#: ../camel/providers/local/camel-local-store.c:282
+#: ../camel/providers/local/camel-local-store.c:165
+#: ../camel/providers/local/camel-local-store.c:276
 #: ../camel/providers/local/camel-mbox-store.c:359
 #: ../camel/providers/local/camel-spool-store.c:129
 #, c-format
@@ -4625,58 +4287,72 @@ msgid "Store root %s is not an absolute path"
 msgstr "儲存根目錄 %s 不是絕對路徑"
 
 # camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:172
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "儲存根目錄 %s 不是合法的目錄"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:195
-#: ../camel/providers/local/camel-local-store.c:293
+#: ../camel/providers/local/camel-local-store.c:181
+#: ../camel/providers/local/camel-local-store.c:189
+#: ../camel/providers/local/camel-local-store.c:287
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "不能取得資料夾:%s:%s"
 
 # camel/providers/local/camel-local-store.c:173
-#: ../camel/providers/local/camel-local-store.c:207
+#: ../camel/providers/local/camel-local-store.c:201
 msgid "Local stores do not have an inbox"
 msgstr "本地端的存儲沒有收件匣"
 
 # camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-local-store.c:253
+#: ../camel/providers/local/camel-local-store.c:247
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地端郵件檔案 %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-local-store.c:348
+#: ../camel/providers/local/camel-local-store.c:342
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "無法將資料夾 %s 重新命名為 %s: %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-local-store.c:416
+#: ../camel/providers/local/camel-local-store.c:410
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "無法重新命名「%s」:%s "
 
+# camel/providers/local/camel-local-store.c:289
+#: ../camel/providers/local/camel-local-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:300
+#, c-format
+msgid "Could not delete folder index file '%s': %s"
+msgstr "不能刪除資料夾索引檔案「%s」: %s"
+
+# camel/providers/local/camel-local-store.c:279
+#: ../camel/providers/local/camel-local-store.c:458
+#: ../camel/providers/local/camel-mbox-store.c:324
+#, c-format
+msgid "Could not delete folder meta file '%s': %s"
+msgstr "不能刪除資料夾中繼檔案「%s」:%s"
+
 # camel/providers/local/camel-local-summary.c:404
-#: ../camel/providers/local/camel-local-summary.c:506
+#: ../camel/providers/local/camel-local-summary.c:508
 msgid "Unable to add message to summary: unknown reason"
 msgstr "無法新增郵件到摘要資訊:不明的原因"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/providers/local/camel-maildir-folder.c:220
+#: ../camel/providers/local/camel-maildir-folder.c:222
 msgid "Maildir append message canceled"
 msgstr "Maildir 增添郵件已取消"
 
 # camel/providers/local/camel-maildir-folder.c:150
 # camel/providers/local/camel-maildir-folder.c:158
 # camel/providers/local/camel-maildir-folder.c:169
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:225
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "無法將郵件儲存到 maildir 資料夾: %s: %s"
@@ -4684,16 +4360,18 @@ msgstr "無法將郵件儲存到 maildir 資料夾: %s: %s"
 # camel/providers/local/camel-mbox-folder.c:335
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-maildir-folder.c:250
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:273
-#: ../camel/providers/local/camel-mbox-folder.c:348
-#: ../camel/providers/local/camel-mbox-folder.c:369
-#: ../camel/providers/local/camel-mbox-folder.c:400
-#: ../camel/providers/local/camel-mbox-folder.c:408
-#: ../camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-mh-folder.c:214
-#: ../camel/providers/local/camel-mh-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:247
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:288
+#: ../camel/providers/local/camel-maildir-folder.c:297
+#: ../camel/providers/local/camel-mbox-folder.c:346
+#: ../camel/providers/local/camel-mbox-folder.c:398
+#: ../camel/providers/local/camel-mbox-folder.c:419
+#: ../camel/providers/local/camel-mbox-folder.c:450
+#: ../camel/providers/local/camel-mbox-folder.c:458
+#: ../camel/providers/local/camel-mh-folder.c:213
+#: ../camel/providers/local/camel-mh-folder.c:224
+#: ../camel/providers/local/camel-mh-folder.c:233
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4704,53 +4382,107 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:298
 msgid "Invalid message contents"
 msgstr "無效的郵件內文"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:148
+#: ../camel/providers/local/camel-maildir-store.c:173
+#: ../camel/providers/local/camel-mbox-store.c:176
+#: ../camel/providers/local/camel-mbox-store.c:188
+#, c-format
+msgid "Cannot create folder '%s': %s"
+msgstr "不能建立資料夾「%s」:%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mh-store.c:217
+#, c-format
+msgid "Cannot get folder '%s': %s"
+msgstr "不能建立資料夾「%s」:%s"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../camel/providers/local/camel-maildir-store.c:165
+#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-mh-store.c:224
+#, c-format
+msgid "Cannot get folder '%s': folder does not exist."
+msgstr "不能取得資料夾「%s」:資料夾不存在。"
+
+# camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-maildir-store.c:189
+#, c-format
+msgid "Cannot get folder '%s': not a maildir directory."
+msgstr "不能取得資料夾「%s」:不是 maildir 目錄。"
+
+# camel/providers/local/camel-maildir-store.c:151
+# camel/providers/local/camel-maildir-store.c:188
+# camel/providers/local/camel-mh-store.c:127
+#: ../camel/providers/local/camel-maildir-store.c:234
+#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/providers/local/camel-mh-store.c:273
+#, c-format
+msgid "Could not delete folder '%s': %s"
+msgstr "無法刪除資料夾「%s」:%s"
+
 # camel/providers/local/camel-maildir-store.c:152
 #: ../camel/providers/local/camel-maildir-store.c:236
 msgid "not a maildir directory"
 msgstr "不是一個 maildir 目錄"
 
+# camel/providers/local/camel-maildir-store.c:107
+# camel/providers/local/camel-mh-store.c:103
+#: ../camel/providers/local/camel-maildir-store.c:440
+#: ../camel/providers/local/camel-spool-store.c:331
+#: ../camel/providers/local/camel-spool-store.c:345
+#, c-format
+msgid "Could not scan folder '%s': %s"
+msgstr "無法掃描資料夾「%s」:%s"
+
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: ../camel/providers/local/camel-maildir-summary.c:433
-#: ../camel/providers/local/camel-maildir-summary.c:567
+#: ../camel/providers/local/camel-maildir-summary.c:439
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "不能開啟 maildir 目錄路徑:%s: %s"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: ../camel/providers/local/camel-maildir-summary.c:560
+#: ../camel/providers/local/camel-maildir-summary.c:551
 msgid "Checking folder consistency"
 msgstr "檢查資料夾的一致性"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/local/camel-maildir-summary.c:664
+#: ../camel/providers/local/camel-maildir-summary.c:656
 msgid "Checking for new messages"
 msgstr "檢查新郵件"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: ../camel/providers/local/camel-maildir-summary.c:756
-#: ../camel/providers/local/camel-mbox-summary.c:520
-#: ../camel/providers/local/camel-mbox-summary.c:693
-#: ../camel/providers/local/camel-mbox-summary.c:790
-#: ../camel/providers/local/camel-spool-summary.c:141
+#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-mbox-summary.c:529
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-spool-summary.c:148
 msgid "Storing folder"
 msgstr "儲存資料夾"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:159
 #: ../camel/providers/local/camel-spool-folder.c:150
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "不能建立資料夾鎖定 %s : %s"
 
 # camel/providers/local/camel-mbox-folder.c:203
-#: ../camel/providers/local/camel-mbox-folder.c:217
+#: ../camel/providers/local/camel-mbox-folder.c:220
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "不能開啟 mailbox:%s: %s\n"
@@ -4759,24 +4491,24 @@ msgstr "不能開啟 mailbox:%s: %s\n"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/local/camel-mbox-folder.c:279
+#: ../camel/providers/local/camel-mbox-folder.c:281
 msgid "Mail append canceled"
 msgstr "郵件增添已取消"
 
 # camel/providers/local/camel-mbox-folder.c:259
-#: ../camel/providers/local/camel-mbox-folder.c:282
+#: ../camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "不能將郵件儲存到 mbox 檔案: %s: %s"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: ../camel/providers/local/camel-mbox-folder.c:401
+#: ../camel/providers/local/camel-mbox-folder.c:451
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "資料夾好像已經損毀並且不能復原。"
 
 # camel/providers/local/camel-mbox-folder.c:381
-#: ../camel/providers/local/camel-mbox-folder.c:409
-#: ../camel/providers/local/camel-mh-folder.c:224
+#: ../camel/providers/local/camel-mbox-folder.c:459
+#: ../camel/providers/local/camel-mh-folder.c:234
 msgid "Message construction failed."
 msgstr "訊息結構失敗。"
 
@@ -4786,6 +4518,52 @@ msgstr "訊息結構失敗。"
 msgid "Cannot create a folder by this name."
 msgstr "無法建立以此為名的資料夾"
 
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#: ../camel/providers/local/camel-mbox-store.c:198
+#, c-format
+msgid "Cannot get folder '%s': not a regular file."
+msgstr "不能取得資料夾「%s」:不是一般檔案。"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:228
+#: ../camel/providers/local/camel-mbox-store.c:239
+#: ../camel/providers/local/camel-mbox-store.c:262
+#, c-format
+msgid ""
+"Could not delete folder '%s':\n"
+"%s"
+msgstr ""
+"無法刪除資料夾「%s」:\n"
+"%s"
+
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#: ../camel/providers/local/camel-mbox-store.c:247
+#, c-format
+msgid "'%s' is not a regular file."
+msgstr "「%s」不是普通的檔案。"
+
+# camel/providers/local/camel-mbox-store.c:153
+#: ../camel/providers/local/camel-mbox-store.c:254
+#, c-format
+msgid "Folder '%s' is not empty. Not deleted."
+msgstr "資料夾「%s」內仍有檔案。所以不刪除。"
+
+# camel/providers/local/camel-local-store.c:279
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:288
+#, c-format
+msgid "Could not delete folder summary file '%s': %s"
+msgstr "無法刪除資料夾摘要檔案「%s」: %s"
+
+# camel/providers/imap/camel-imap-folder.c:172
+#: ../camel/providers/local/camel-mbox-store.c:378
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "不能建立目錄「%s」: %s。"
+
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 #: ../camel/providers/local/camel-mbox-store.c:392
@@ -4802,6 +4580,12 @@ msgstr "資料夾已存在"
 msgid "The new folder name is illegal."
 msgstr "指定的資料夾名稱不合法: %s"
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: ../camel/providers/local/camel-mbox-store.c:498
+#, c-format
+msgid "Could not rename '%s': '%s': %s"
+msgstr "無法重新命名「%s」:「%s」:%s"
+
 # camel/providers/local/camel-local-store.c:237
 #: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
@@ -4810,115 +4594,184 @@ msgstr "無法將 '%s' 重新命名成 %s:%s"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-mbox-summary.c:526
+#: ../camel/providers/local/camel-mbox-summary.c:535
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "無法開啟資料夾: %s: %s"
 
 # camel/providers/local/camel-mbox-summary.c:296
-#: ../camel/providers/local/camel-mbox-summary.c:574
+#: ../camel/providers/local/camel-mbox-summary.c:585
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "靠近 %ld (於資料夾 %s)的位置發生嚴重的郵件分析錯誤"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-summary.c:630
+#: ../camel/providers/local/camel-mbox-summary.c:648
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "不能檢查資料夾:%s: %s"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: ../camel/providers/local/camel-mbox-summary.c:698
-#: ../camel/providers/local/camel-mbox-summary.c:795
-#: ../camel/providers/local/camel-spool-summary.c:146
+#: ../camel/providers/local/camel-mbox-summary.c:716
+#: ../camel/providers/local/camel-mbox-summary.c:836
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "無法開啟檔案: %s: %s"
 
 # camel/providers/local/camel-mbox-summary.c:524
-#: ../camel/providers/local/camel-mbox-summary.c:710
-#: ../camel/providers/local/camel-spool-summary.c:159
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-spool-summary.c:166
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "不能開啟暫存 mailbox:%s"
 
 # camel/providers/local/camel-mbox-summary.c:635
 # camel/providers/local/camel-mbox-summary.c:804
-#: ../camel/providers/local/camel-mbox-summary.c:723
-#: ../camel/providers/local/camel-mbox-summary.c:942
+#: ../camel/providers/local/camel-mbox-summary.c:741
+#: ../camel/providers/local/camel-mbox-summary.c:945
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "無法關閉來源資料夾 %s : %s"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/local/camel-mbox-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:750
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "無法關閉暫存資料夾: %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:747
+#: ../camel/providers/local/camel-mbox-summary.c:765
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "無法重新命名資料夾:%s "
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:806
-#: ../camel/providers/local/camel-mbox-summary.c:1146
+#: ../camel/providers/local/camel-mbox-summary.c:847
+#: ../camel/providers/local/camel-mbox-summary.c:1075
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "無法儲存資料夾:%s "
 
-#: ../camel/providers/local/camel-mbox-summary.c:853
-#: ../camel/providers/local/camel-mbox-summary.c:882
-#: ../camel/providers/local/camel-mbox-summary.c:1188
-#: ../camel/providers/local/camel-mbox-summary.c:1217
-msgid "Detected a corrupt mbox file or an invalid 'From' header"
-msgstr "偵測到一個損壞的 mbox 檔案或無效的「From」標頭"
+# camel/providers/local/camel-mbox-summary.c:549
+# camel/providers/local/camel-mbox-summary.c:557
+# camel/providers/local/camel-mbox-summary.c:746
+# camel/providers/local/camel-mbox-summary.c:754
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:894
+#: ../camel/providers/local/camel-mbox-summary.c:1105
+#: ../camel/providers/local/camel-mbox-summary.c:1113
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "摘要與資料夾不協調,即使經過同步"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/local/camel-mbox-summary.c:1035
-#: ../camel/providers/local/camel-spool-summary.c:327
+#: ../camel/providers/local/camel-mbox-summary.c:1038
+#: ../camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "不明的錯誤: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1071
-#, c-format
-msgid "Folder %s cannot be opened: %s"
-msgstr "不能開啟資料夾 %s: %s"
-
 # camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1282
-#: ../camel/providers/local/camel-mbox-summary.c:1308
+#: ../camel/providers/local/camel-mbox-summary.c:1181
+#: ../camel/providers/local/camel-mbox-summary.c:1207
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "寫入暫存郵箱失敗:  %s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1299
+#: ../camel/providers/local/camel-mbox-summary.c:1198
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "寫入暫存郵箱失敗: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:176
+#: ../camel/providers/local/camel-mh-folder.c:178
 msgid "MH append message canceled"
 msgstr "MH 增添郵件已取消"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/local/camel-mh-folder.c:179
+#: ../camel/providers/local/camel-mh-folder.c:181
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "不能將郵件儲存到 mh 資料夾: %s: %s"
 
+# camel/providers/local/camel-maildir-store.c:107
+# camel/providers/local/camel-mh-store.c:103
+#: ../camel/providers/local/camel-mh-store.c:232
+#, c-format
+msgid "Could not create folder '%s': %s"
+msgstr "無法建立資料夾「%s」:%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-mh-store.c:244
+#, c-format
+msgid "Cannot get folder '%s': not a directory."
+msgstr "不能取得資料夾「%s」:不是目錄。"
+
 # camel/providers/local/camel-mh-summary.c:218
-#: ../camel/providers/local/camel-mh-summary.c:246
+#: ../camel/providers/local/camel-mh-summary.c:264
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "不能開啟 MH 目錄路徑: %s: %s"
 
+#: ../camel/providers/local/camel-spool-store.c:135
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "排程器「%s」不能被開啟:%s"
+
+# camel/providers/local/camel-local-store.c:134
+#: ../camel/providers/local/camel-spool-store.c:147
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "排程器「%s」不是一般檔案或目錄。"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../camel/providers/local/camel-spool-store.c:166
+#, c-format
+msgid "Folder '%s/%s' does not exist."
+msgstr "資料夾「%s/%s」不存在。"
+
+# camel/providers/local/camel-maildir-store.c:96
+# camel/providers/local/camel-mh-store.c:90
+#: ../camel/providers/local/camel-spool-store.c:176
+#, c-format
+msgid ""
+"Could not open folder '%s':\n"
+"%s"
+msgstr ""
+"無法開啟資料夾「%s」:\n"
+"%s"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../camel/providers/local/camel-spool-store.c:180
+#, c-format
+msgid "Folder '%s' does not exist."
+msgstr "資料夾「%s」不存在。"
+
+# camel/providers/local/camel-maildir-store.c:107
+# camel/providers/local/camel-mh-store.c:103
+#: ../camel/providers/local/camel-spool-store.c:185
+#, c-format
+msgid ""
+"Could not create folder '%s':\n"
+"%s"
+msgstr ""
+"無法建立資料夾「%s」:\n"
+"%s"
+
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:193
+#, c-format
+msgid "'%s' is not a mailbox file."
+msgstr "「%s」不是 mailbox 檔案。"
+
 #: ../camel/providers/local/camel-spool-store.c:210
 msgid "Store does not support an INBOX"
 msgstr "儲存並不支援 INBOX"
@@ -4943,22 +4796,34 @@ msgid "Spool folders cannot be deleted"
 msgstr "排程資料夾不能刪除"
 
 # camel/camel-movemail.c:158
-#: ../camel/providers/local/camel-spool-summary.c:172
-#: ../camel/providers/local/camel-spool-summary.c:182
-#: ../camel/providers/local/camel-spool-summary.c:192
+#: ../camel/providers/local/camel-spool-summary.c:179
+#: ../camel/providers/local/camel-spool-summary.c:189
+#: ../camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "無法與暫存資料夾同步 %s: %s"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-summary.c:208
+#: ../camel/providers/local/camel-spool-summary.c:215
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "無法與排程資料夾同步 %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:176
-#: ../camel/providers/nntp/camel-nntp-folder.c:208
+#: ../camel/providers/local/camel-spool-summary.c:246
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:274
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in '%s'"
+msgstr ""
+"無法同步排程資料夾 %s: %s\n"
+"資料夾可能損毀,複製儲存於「%s」"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:137
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:227
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "內部錯誤:UID 格式無效:%s"
@@ -4967,20 +4832,20 @@ msgstr "內部錯誤:UID 格式無效:%s"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-folder.c:330
-#: ../camel/providers/nntp/camel-nntp-folder.c:333
-#: ../camel/providers/nntp/camel-nntp-folder.c:375
-#: ../camel/providers/nntp/camel-nntp-folder.c:377
+#: ../camel/providers/nntp/camel-nntp-folder.c:368
+#: ../camel/providers/nntp/camel-nntp-folder.c:371
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/nntp/camel-nntp-folder.c:415
 #, c-format
 msgid "Posting failed: %s"
 msgstr "張貼失敗:%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:395
+#: ../camel/providers/nntp/camel-nntp-folder.c:433
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "離線工作時無法張貼 NNTP 訊息!"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/nntp/camel-nntp-folder.c:406
+#: ../camel/providers/nntp/camel-nntp-folder.c:444
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "你無法從 NNTP 資料夾複製訊息!"
 
@@ -5084,44 +4949,44 @@ msgid "Cannot authenticate to server: %s"
 msgstr "無法驗證伺服器:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/nntp/camel-nntp-store.c:1283
+#: ../camel/providers/nntp/camel-nntp-store.c:1289
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP 指令失敗: %s"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../camel/providers/nntp/camel-nntp-store.c:1337
+#: ../camel/providers/nntp/camel-nntp-store.c:1343
 msgid "Not connected."
 msgstr "未連線。"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../camel/providers/nntp/camel-nntp-store.c:1390
+#: ../camel/providers/nntp/camel-nntp-store.c:1396
 #, c-format
 msgid "No such folder: %s"
 msgstr "沒有這個資料夾: %s"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/nntp/camel-nntp-summary.c:273
-#: ../camel/providers/nntp/camel-nntp-summary.c:369
+#: ../camel/providers/nntp/camel-nntp-summary.c:271
+#: ../camel/providers/nntp/camel-nntp-summary.c:364
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s:掃描新郵件"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:280
+#: ../camel/providers/nntp/camel-nntp-summary.c:278
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover 傳來意外的伺服器回應:%s"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:383
+#: ../camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "標題傳來意外的伺服器回應:%s"
 
 # ui/evolution-mail.xml.h:2
-#: ../camel/providers/nntp/camel-nntp-summary.c:423
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
 msgid "Use cancel"
 msgstr "使用取消"
 
@@ -5129,35 +4994,36 @@ msgstr "使用取消"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-summary.c:425
+#: ../camel/providers/nntp/camel-nntp-summary.c:416
 #, c-format
 msgid "Operation failed: %s"
 msgstr "作業失敗: %s"
 
 # camel/providers/pop3/camel-pop3-folder.c:149
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
+#: ../camel/providers/pop3/camel-pop3-folder.c:253
 msgid "Retrieving POP summary"
 msgstr "取回 POP 的摘要"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:271
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "不能取得 POP 摘要: %s"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:312
+#: ../camel/providers/pop3/camel-pop3-folder.c:314
 msgid "Expunging old messages"
 msgstr "清空舊的郵件"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:320
+#: ../camel/providers/pop3/camel-pop3-folder.c:322
 msgid "Expunging deleted messages"
 msgstr "清空刪除的郵件"
 
 # camel/providers/pop3/camel-pop3-folder.c:292
-#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:530
+#: ../camel/providers/pop3/camel-pop3-folder.c:552
 #, c-format
 msgid "No message with UID %s"
 msgstr "沒有郵件具有這個 UID %s"
@@ -5165,13 +5031,13 @@ msgstr "沒有郵件具有這個 UID %s"
 # camel/providers/pop3/camel-pop3-folder.c:296
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:541
+#: ../camel/providers/pop3/camel-pop3-folder.c:559
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "接收 POP 郵件 %d"
 
 # camel/camel-sasl-login.c:127
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:649
 msgid "Unknown reason"
 msgstr "不明的原因"
 
@@ -5217,56 +5083,61 @@ msgid ""
 msgstr "這個選項將會使用加密的密碼經由 APOP 通訊協定連線到 POP 伺服器。不過就算伺服器聲稱能夠支援,但對於所有使用者來講都未必一定可行。"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:208
+#: ../camel/providers/pop3/camel-pop3-store.c:209
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "無法從 POP 伺服器 %s 讀取有效的問候語"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/pop3/camel-pop3-store.c:225
-#: ../camel/providers/pop3/camel-pop3-store.c:239
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#: ../camel/providers/pop3/camel-pop3-store.c:226
+#: ../camel/providers/pop3/camel-pop3-store.c:240
+#: ../camel/providers/pop3/camel-pop3-store.c:250
+#: ../camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "無法以安全模式連線到 POP 伺服器 %s: %s"
 
 # shell/e-storage.c:477
-#: ../camel/providers/pop3/camel-pop3-store.c:226
+#: ../camel/providers/pop3/camel-pop3-store.c:227
 msgid "STLS not supported by server"
 msgstr "伺服器不支援 STLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:257
 msgid "TLS is not available in this build"
 msgstr "此一版本並未啟用 TLS"
 
 # camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:363
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "無法連線到 POP 伺服器 %s"
 
 # camel/providers/pop3/camel-pop3-store.c:409
-#: ../camel/providers/pop3/camel-pop3-store.c:403
-#: ../camel/providers/pop3/camel-pop3-store.c:536
+#: ../camel/providers/pop3/camel-pop3-store.c:404
+#: ../camel/providers/pop3/camel-pop3-store.c:537
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "無法連線到 POP 伺服器 %s:不支援所要求的驗證機制。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:431
+#: ../camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "SASL '%s' Login failed for POP server %s: %s"
+msgstr "在 POP 伺服器 %2$s 以 SASL 「%1$s」登入失敗: %3$s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "不能登入 POP 伺服器 %s: SASL 通訊協定錯誤"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:450
+#: ../camel/providers/pop3/camel-pop3-store.c:451
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "無法驗證 POP 伺服器 %s:%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:509
+#: ../camel/providers/pop3/camel-pop3-store.c:510
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -5274,8 +5145,8 @@ msgid ""
 msgstr "無法連線至 POP 伺服器 %s:\t收到無效的 APOP ID。推測可能是使用者假冒攻擊。請聯絡你的系統管理者。"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:550
-#: ../camel/providers/pop3/camel-pop3-store.c:563
+#: ../camel/providers/pop3/camel-pop3-store.c:551
+#: ../camel/providers/pop3/camel-pop3-store.c:564
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5285,7 +5156,7 @@ msgstr ""
 "傳送密碼時發生錯誤:%s"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:557
+#: ../camel/providers/pop3/camel-pop3-store.c:558
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5294,6 +5165,12 @@ msgstr ""
 "無法連線 POP 伺服器 %s。\n"
 "傳送使用者名稱發生錯誤:%s"
 
+# camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:671
+#, c-format
+msgid "No such folder '%s'."
+msgstr "沒有這個資料夾「%s」。"
+
 # camel/providers/sendmail/camel-sendmail-provider.c:37
 # mail/mail-config.glade.h:67
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
@@ -5514,7 +5391,7 @@ msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP 伺服器 %s 不支援所要求的驗證類型 %s。"
 
 # camel/providers/smtp/camel-smtp-transport.c:418
-#: ../camel/providers/smtp/camel-smtp-transport.c:564
+#: ../camel/providers/smtp/camel-smtp-transport.c:568
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5526,112 +5403,112 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/smtp/camel-smtp-transport.c:697
+#: ../camel/providers/smtp/camel-smtp-transport.c:701
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 伺服器 %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:699
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "經由 %s 傳送 SMTP 郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:721
 msgid "Cannot send message: service not connected."
 msgstr "無法傳送訊息:服務未連線。"
 
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Cannot send message: sender address not valid."
 msgstr "不能傳送郵件:寄件者的地址無效。"
 
 # mail/mail-ops.c:603
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Sending message"
 msgstr "傳送郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:742
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
 msgid "Cannot send message: no recipients defined."
 msgstr "不能傳送郵件:沒有定義收件者。"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "不能傳送郵件:一或多個無效的收件者"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../camel/providers/smtp/camel-smtp-transport.c:982
+#: ../camel/providers/smtp/camel-smtp-transport.c:986
 msgid "SMTP Greeting"
 msgstr "SMTP 迎接"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1007
+#: ../camel/providers/smtp/camel-smtp-transport.c:1011
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1024
+#: ../camel/providers/smtp/camel-smtp-transport.c:1028
 msgid "HELO command failed"
 msgstr "HELO 指令失敗"
 
 # mail/mail-config.glade.h:10
-#: ../camel/providers/smtp/camel-smtp-transport.c:1090
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "SMTP Authentication"
 msgstr "SMTP 驗證"
 
 # camel/providers/smtp/camel-smtp-transport.c:728
-#: ../camel/providers/smtp/camel-smtp-transport.c:1096
+#: ../camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Error creating SASL authentication object."
 msgstr "建立 SASL 驗證物件時發生錯誤。"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1113
-#: ../camel/providers/smtp/camel-smtp-transport.c:1124
+#: ../camel/providers/smtp/camel-smtp-transport.c:1117
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1130
+#: ../camel/providers/smtp/camel-smtp-transport.c:1134
 msgid "AUTH command failed"
 msgstr "AUTH 指令失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:809
-#: ../camel/providers/smtp/camel-smtp-transport.c:1200
+#: ../camel/providers/smtp/camel-smtp-transport.c:1204
 msgid "Bad authentication response from server.\n"
 msgstr "從伺服器傳回不正確驗證的回應。\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:835
-#: ../camel/providers/smtp/camel-smtp-transport.c:1227
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM 指令失敗:%s:郵件未傳送"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1244
+#: ../camel/providers/smtp/camel-smtp-transport.c:1248
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM 指令失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:879
-#: ../camel/providers/smtp/camel-smtp-transport.c:1268
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO 指令失敗:%s:郵件未傳送"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1287
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> 失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:929
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
-#: ../camel/providers/smtp/camel-smtp-transport.c:1396
-#: ../camel/providers/smtp/camel-smtp-transport.c:1415
+#: ../camel/providers/smtp/camel-smtp-transport.c:1331
+#: ../camel/providers/smtp/camel-smtp-transport.c:1400
+#: ../camel/providers/smtp/camel-smtp-transport.c:1419
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA 指令失敗:%s:郵件未傳送"
@@ -5640,30 +5517,30 @@ msgstr "DATA 指令失敗:%s:郵件未傳送"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1344
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1348
+#: ../camel/providers/smtp/camel-smtp-transport.c:1435
 msgid "DATA command failed"
 msgstr "DATA 指令失敗"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1454
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1470
+#: ../camel/providers/smtp/camel-smtp-transport.c:1474
 msgid "RSET command failed"
 msgstr "RSET 指令失敗"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1507
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
 msgid "QUIT command failed"
 msgstr "QUIT 指令失敗"
 
@@ -5687,7 +5564,7 @@ msgstr "禮物"
 
 #: ../libedataserver/e-categories.c:49
 msgid "Goals/Objectives"
-msgstr "ç\9b®æ¨\99/æ¨\99ç\9a\84"
+msgstr "çµ\82é»\9e\9b®æ¨\99"
 
 #: ../libedataserver/e-categories.c:50
 msgid "Holiday"
@@ -5715,7 +5592,7 @@ msgstr "國際的"
 # ui/evolution-task-editor-dialog.xml.h:16
 #: ../libedataserver/e-categories.c:56
 msgid "Key Customer"
-msgstr "é\87\8dè¦\81客戶"
+msgstr "é\97\9cé\8dµ客戶"
 
 #: ../libedataserver/e-categories.c:57
 msgid "Miscellaneous"
@@ -5735,7 +5612,7 @@ msgstr "電話"
 #. Translators: "Status" is a category name; it can mean anything user wants to
 #: ../libedataserver/e-categories.c:61
 msgid "Status"
-msgstr "ç\8b\80æ³\81"
+msgstr "ç\8b\80æ\85\8b"
 
 #: ../libedataserver/e-categories.c:62
 msgid "Strategies"
@@ -5743,7 +5620,7 @@ msgstr "策略"
 
 #: ../libedataserver/e-categories.c:63
 msgid "Suppliers"
-msgstr "供給者"
+msgstr "供應商"
 
 # addressbook/backend/ebook/e-card.c:3434
 #: ../libedataserver/e-categories.c:64
@@ -5768,7 +5645,7 @@ msgstr "正在等待"
 #. time, in 12-hour format.
 #: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
 # calendar/gui/calendar-model.c:794
 # e-util/e-time-utils.c:278
@@ -5778,7 +5655,7 @@ msgstr "%a %m/%d/%Y %I:%M:%S %p"
 #. time, in 24-hour format.
 #: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
+msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a weekday, a date and a time,
@@ -5820,7 +5697,7 @@ msgstr "%a %m/%d/%Y %H"
 #: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773
 #: ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
+msgstr "%Y/%m/%d (%a)"
 
 # calendar/gui/calendar-model.c:797
 # e-util/e-time-utils.c:287
@@ -5877,14 +5754,14 @@ msgstr "%m/%d/%Y %H"
 #. This is the preferred date format for the locale.
 #: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1776
 msgid "%m/%d/%Y"
-msgstr "%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:1834 ../libedataserver/e-time-utils.c:1956
 msgid "%I:%M:%S %p"
-msgstr "%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.
@@ -5903,7 +5780,7 @@ msgstr "%H:%M:%S"
 #. without seconds.
 #: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
 msgid "%I:%M %p"
-msgstr "%I:%M %p"
+msgstr "%p %I:%M"
 
 # e-util/e-time-utils.c:312
 # widgets/misc/e-dateedit.c:1259
@@ -5942,19 +5819,19 @@ msgstr "正以匿名方式存取 LDAP 伺服器"
 msgid "Failed to authenticate.\n"
 msgstr "驗證證書失敗。\n"
 
-#: ../libedataserverui/e-categories-dialog.c:261
+#: ../libedataserverui/e-categories-dialog.c:362
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "在組態中已經有名為「%s」的分類。請使用另外的名稱"
 
-#: ../libedataserverui/e-categories-dialog.c:462
+#: ../libedataserverui/e-categories-dialog.c:526
 msgid "Icon"
 msgstr "圖示"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:467
+#: ../libedataserverui/e-categories-dialog.c:531
 msgid "Category"
 msgstr "分類"
 
@@ -5982,7 +5859,7 @@ msgstr "分類名稱(_N)"
 # addressbook/contact-editor/e-contact-editor.c:603
 #: ../libedataserverui/e-categories-dialog.glade.h:5
 msgid "Item(s) belong to these _categories:"
-msgstr "屬於這些分類的項目:"
+msgstr "屬於這些分類的項目(_C):"
 
 # calendar/gui/e-calendar-table.c:150
 #: ../libedataserverui/e-categories-dialog.glade.h:6
@@ -5991,27 +5868,42 @@ msgstr "可用的分類(_A):"
 
 #: ../libedataserverui/e-categories-dialog.glade.h:7
 msgid "_Edit"
-msgstr "編輯 (_E)"
+msgstr "編輯(_E)"
 
 # calendar/gui/e-calendar-table.c:150
 #: ../libedataserverui/e-categories-dialog.glade.h:8
 msgid "categories"
 msgstr "分類"
 
-#: ../libedataserverui/e-name-selector-dialog.c:266
+# calendar/gui/e-calendar-table.c:150
+#: ../libedataserverui/e-category-completion.c:290
+#, c-format
+#| msgid "Category List"
+msgid "Create category \"%s\""
+msgstr "建立分類「%s」"
+
+#: ../libedataserverui/e-cell-renderer-color.c:222
+msgid "Color Info"
+msgstr "色彩資訊"
+
+#: ../libedataserverui/e-cell-renderer-color.c:223
+msgid "The color to render"
+msgstr "要繪製的色彩"
+
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Select Contacts from Address Book"
 msgstr "從通訊錄選取聯絡人"
 
-#: ../libedataserverui/e-name-selector-dialog.c:546
+#: ../libedataserverui/e-name-selector-dialog.c:565
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:571
+#: ../libedataserverui/e-name-selector-dialog.c:590
 msgid "_Remove"
 msgstr "移除(_R)"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:744
+#: ../libedataserverui/e-name-selector-dialog.c:767
 #: ../libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Any Category"
 msgstr "任何分類"
@@ -6050,76 +5942,85 @@ msgstr "聯絡人"
 
 #: ../libedataserverui/e-name-selector-dialog.glade.h:9
 msgid "Search"
-msgstr "尋找"
+msgstr "搜尋"
 
 #: ../libedataserverui/e-name-selector-dialog.glade.h:10
 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:2240
+#: ../libedataserverui/e-name-selector-entry.c:2456
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "展開行內 %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2255
+#: ../libedataserverui/e-name-selector-entry.c:2471
 #, c-format
 msgid "Cop_y %s"
 msgstr "複製(_Y) %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2265
+#: ../libedataserverui/e-name-selector-entry.c:2481
 #, c-format
 msgid "C_ut %s"
 msgstr "剪下(_U) %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2282
+#: ../libedataserverui/e-name-selector-entry.c:2498
 #, c-format
 msgid "_Edit %s"
 msgstr "編輯 %s(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:466
+#: ../libedataserverui/e-name-selector-list.c:472
 #, c-format
 msgid "_Delete %s"
 msgstr "刪除(_D) %s"
 
-#: ../libedataserverui/e-passwords.c:1175
+#: ../libedataserverui/e-passwords.c:234
+#, c-format
+msgid "Keyring key is unusable: no user or host name"
+msgstr "密碼匙圈密碼匙無法使用:沒有使用者或主機名稱"
+
+#: ../libedataserverui/e-passwords.c:1094
+msgid "You have the Caps Lock key on."
+msgstr "你的 Caps Lock 是開啟的。"
+
+#: ../libedataserverui/e-passwords.c:1216
 msgid "_Remember this passphrase"
 msgstr "記住這個密語(_R)"
 
-#: ../libedataserverui/e-passwords.c:1176
+#: ../libedataserverui/e-passwords.c:1217
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密語(_R)"
 
-#: ../libedataserverui/e-passwords.c:1181
+#: ../libedataserverui/e-passwords.c:1222
 msgid "_Remember this password"
 msgstr "記住這個密碼(_R)"
 
-#: ../libedataserverui/e-passwords.c:1182
+#: ../libedataserverui/e-passwords.c:1223
 msgid "_Remember this password for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
 
 # shell/e-shell-importer.c:602
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:95
+#: ../libedataserverui/e-source-selector-dialog.c:100
 msgid "Select destination"
 msgstr "選取目的地"
 
-#: ../libedataserverui/e-source-selector-dialog.c:148
+#: ../libedataserverui/e-source-selector-dialog.c:156
 msgid "_Destination"
 msgstr "目的端(_D)"
 
 # camel/camel-smime-context.c:194
-#: ../servers/exchange/lib/e2k-autoconfig.c:1683
-#: ../servers/exchange/storage/exchange-account.c:971
+#: ../servers/exchange/lib/e2k-autoconfig.c:1698
+#: ../servers/exchange/storage/exchange-account.c:959
 #, c-format
 msgid "Enter password for %s"
 msgstr "輸入 %s 的密碼 "
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1684
-#: ../servers/exchange/storage/exchange-account.c:976
+#: ../servers/exchange/lib/e2k-autoconfig.c:1699
+#: ../servers/exchange/storage/exchange-account.c:964
 msgid "Enter password"
 msgstr "輸入密碼"
 
@@ -6131,11 +6032,11 @@ msgstr "擁有者"
 
 #: ../servers/exchange/lib/e2k-security-descriptor.c:857
 msgid "Publishing Editor"
-msgstr "發佈編輯"
+msgstr "發佈編輯"
 
 #: ../servers/exchange/lib/e2k-security-descriptor.c:865
 msgid "Editor"
-msgstr "編輯"
+msgstr "編輯"
 
 #: ../servers/exchange/lib/e2k-security-descriptor.c:872
 msgid "Publishing Author"
@@ -6159,7 +6060,7 @@ msgstr "散佈者"
 
 #: ../servers/exchange/lib/e2k-security-descriptor.c:891
 msgid "None"
-msgstr ""
+msgstr "沒有"
 
 #: ../servers/exchange/lib/e2k-security-descriptor.c:906
 msgid "Custom"
@@ -6232,27 +6133,27 @@ msgstr "這個操作無法在離線模式下進行"
 # shell/e-shell-view.c:552
 #. i18n: This is the title of an "other user's folders"
 #. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:662
+#: ../servers/exchange/storage/exchange-account.c:642
 #, c-format
 msgid "%s's Folders"
 msgstr "%s 的資料夾"
 
-#: ../servers/exchange/storage/exchange-account.c:1277
+#: ../servers/exchange/storage/exchange-account.c:1265
 msgid "Personal Folders"
 msgstr "個人資料夾"
 
-#: ../servers/exchange/storage/exchange-account.c:1292
+#: ../servers/exchange/storage/exchange-account.c:1280
 msgid "Favorite Public Folders"
 msgstr "喜好的公開資料夾"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1309
+#: ../servers/exchange/storage/exchange-account.c:1297
 msgid "All Public Folders"
 msgstr "所有的公開資料夾"
 
 # addressbook/backend/ebook/e-card.c:3346
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1323
+#: ../servers/exchange/storage/exchange-account.c:1311
 msgid "Global Address List"
 msgstr "全域地址清單"
 
@@ -6331,74 +6232,3 @@ msgstr "Evolution 資料伺服器登入服務"
 #, c-format
 msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
 msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
-
-#: ../libedataserverui/e-cell-renderer-color.c:210
-msgid "Color Info"
-msgstr "色彩資訊"
-
-#: ../libedataserverui/e-cell-renderer-color.c:211
-msgid "The color to render"
-msgstr "要繪製的色彩"
-
-# camel/camel-smime-context.c:327
-#~ msgid "Cannot find certificate for `%s'"
-#~ msgstr "找不到 `%s' 的憑證"
-
-#~ msgid "Folder was destroyed and recreated on server."
-#~ msgstr "資料夾已破壞並在伺服器上重建。"
-
-#~ msgid ""
-#~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
-#~ msgstr "非預期的伺服器回應:提供相同的 UID 給訊息 %d 和 %d"
-
-# camel/providers/imap/camel-imap-folder.c:191
-#~ msgid "Could not save summary: %s: %s"
-#~ msgstr "無法儲存摘要: %s: %s"
-
-# camel/providers/pop3/camel-pop3-store.c:361
-#~ msgid "%sPlease enter the GroupWise password for %s@%s"
-#~ msgstr "%s請輸入給 %s@%s 的 GroupWise 密碼"
-
-# camel/providers/imap/camel-imap-store.c:531
-#~ msgid "Unable to authenticate to GroupWise server. "
-#~ msgstr "無法驗證 GroupWise 伺服器。"
-
-# camel/providers/imap/camel-imap-store.c:490
-#~ msgid "%sPlease enter the IMAP password for %s@%s"
-#~ msgstr "%s 請輸入 %s@%s 的 IMAP 密碼"
-
-# camel/providers/smtp/camel-smtp-transport.c:395
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%s請輸入 IMAP 密碼 (%s 於主機 %s)"
-
-# camel/providers/local/camel-mbox-summary.c:549
-# camel/providers/local/camel-mbox-summary.c:557
-# camel/providers/local/camel-mbox-summary.c:746
-# camel/providers/local/camel-mbox-summary.c:754
-#~ msgid "Summary and folder mismatch, even after a sync"
-#~ msgstr "摘要與資料夾不協調,即使經過同步"
-
-# camel/providers/local/camel-mbox-summary.c:600
-#~ msgid "Error writing to temp mailbox: %s"
-#~ msgstr "寫入暫存郵箱時發生錯誤:%s"
-
-# camel/providers/smtp/camel-smtp-transport.c:395
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "請輸入 %s@%s 的 NNTP 密碼"
-
-# camel/providers/smtp/camel-smtp-transport.c:395
-#~ msgid "%sPlease enter the SMTP password for %s on host %s"
-#~ msgstr "%s請輸入 SMTP 密碼 (%s 於主機 %s)"
-
-# calendar/gui/e-calendar-table.c:150
-#~ msgid "Category _Color"
-#~ msgstr "分類色彩(_C)"
-
-#~ msgid "Select User"
-#~ msgstr "選擇使用者"
-
-#~ msgid "Addressbook..."
-#~ msgstr "通訊錄..."
-
-#~ msgid "\t\t\t\t\t\t"
-#~ msgstr "\t\t\t\t\t\t"
index 24a232e..cbac988 100644 (file)
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005. 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 2.23.90\n"
+"Project-Id-Version: evolution-data-server 2.25.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-11 20:54+0800\n"
-"PO-Revision-Date: 2008-08-08 19:33+0800\n"
+"POT-Creation-Date: 2009-02-03 14:52+0800\n"
+"PO-Revision-Date: 2009-02-02 19:59+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-"Language-Team: Chinese (Taiwan) <community@linuxhall.org>\n"
+"Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Query refused"
-msgstr "查詢被拒絕"
-
-#: ../camel/camel-db.c:108
-msgid "Insufficient memory"
-msgstr "記憶體不足"
-
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
-msgid "No output stream"
-msgstr "沒有輸出串流"
-
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
-msgid "No input stream"
-msgstr "沒有輸入串流"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1838
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "在 APPEND 指令後傳回未預期的回應狀態「%s」"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1853
-msgid "No response on continuation after APPEND command"
-msgstr "在 APPEND 指令後沒有持續回應"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1895
-msgid "Unknown error occurred during APPEND command!"
-msgstr "在 APPEND 指令期間發生未知的錯誤!"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "在 X 秒內未閱讀的逾期快取訊息"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr "早於 X 秒的逾期快取訊息"
-
-#: ../libedataserverui/e-passwords.c:218
-#, c-format
-msgid "Keyring key is unusable: no user or host name"
-msgstr "鑰匙圈金鑰無法使用:沒有使用者或主機名稱"
-
-#: ../libedataserverui/e-passwords.c:1055
-msgid "You have the Caps Lock key on."
-msgstr "您的 Caps Lock 是開啟的。"
-
-#: ../calendar/backends/file/e-cal-backend-file.c:221
-#: ../calendar/backends/file/e-cal-backend-file.c:227
-msgid "Cannot save calendar data"
-msgstr "不能儲存行事曆資料"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:101
-msgid "Invalid range"
-msgstr "無效的範圍"
-
-# mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-msgid "Unsupported field"
-msgstr "不支援的欄位"
-
-# mail/mail-config.glade.h:1
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
-msgid "Unsupported method"
-msgstr "不支援的方法"
-
-# camel/providers/imap/camel-imap-store.c:466
-# camel/providers/smtp/camel-smtp-transport.c:366
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-msgid "Unsupported authentication method"
-msgstr "不支援的驗證方法"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-msgid "TLS not available"
-msgstr "無法使用 TLS"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Offline unavailable"
-msgstr "離線無法使用"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "Search size limit exceeded"
-msgstr "超過搜尋大小限制"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "Search time limit exceeded"
-msgstr "超過搜尋時間限制"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-msgid "Invalid query"
-msgstr "無效的查詢"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libedata-cal/e-cal-backend-util.c:140
-msgid "Invalid server version"
-msgstr "無效的伺服器版本"
-
-#: ../camel/camel-disco-diary.c:261
-#, c-format
-msgid ""
-"Could not open '%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"無法開啟「%s」:\n"
-"%s\n"
-"這個資料夾內所做的變更將不會重新同步。"
-
-# camel/providers/imap/camel-imap-command.c:232
-#: ../camel/camel-gpg-context.c:837
-#, c-format
-msgid "Unexpected request from GnuPG for '%s'"
-msgstr "GnuPG 傳回對「%s」未預期的要求"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
-#, c-format
-msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "不能寫入資料夾「%s」的離線日誌:%s"
-
-# camel/camel-session.c:295
-# camel/camel-session.c:364
-#: ../camel/camel-provider.c:373 ../camel/camel-session.c:177
-#, c-format
-msgid "No provider available for protocol '%s'"
-msgstr "沒有通訊協定「%s」的提供者"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:305
-#, c-format
-msgid "Cannot create folder '%s': folder exists"
-msgstr "不能建立資料夾「%s」:資料夾已存在"
-
-# camel/camel-url.c:289
-#: ../camel/camel-url.c:313
-#, c-format
-msgid "Could not parse URL '%s'"
-msgstr "無法解析 URL「%s」"
-
-# shell/e-shell-importer.c:384
-#: ../camel/camel-vee-folder.c:580
-#, c-format
-msgid "Error storing '%s': %s"
-msgstr "儲存「%s」發生錯誤:%s"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2031
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2073
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "不能將郵件加入至資料夾「%s」:%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1309
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1330
-#, c-format
-msgid "Cannot rename Groupwise folder '%s' to '%s'"
-msgstr "不能將 Groipwise 資料夾「%s」更名為「%s」"
-
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:217
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-# camel/providers/local/camel-mh-folder.c:194
-# camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/imap/camel-imap-folder.c:2748
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "無法取得郵件 ID 為 %s 的郵件: %s"
-
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/imap/camel-imap-folder.c:2749
-msgid "No such message available."
-msgstr "沒有這個郵件。"
-
-# camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-provider.c:48
-msgid "Ch_eck for new messages in subscribed folders"
-msgstr "檢查訂閱資料夾裡的新郵件(_E)"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap/camel-imap-store.c:1975
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "不能建立資料夾「%s」:資料夾已存在。"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "無法選取資料夾「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "無法選取資料夾「%s」:錯誤的指令"
-
-# camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "傳送指令至 IMAP 伺服器 %s 失敗:%s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-msgid "service unavailable"
-msgstr "服務無法使用"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr "啟用某些過濾器和虛擬資料夾規則所要求的通信論壇偵測"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:423
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "不能存取資料夾「%s」:%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:482
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "不能同步旗標至資料夾「%s」:未知的錯誤"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:488
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "不能同步旗標至資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:628
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "不能清空資料夾「%s」:未知的錯誤"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-folder.c:633
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "不能清空資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:889
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "不能取得從資料夾「%2$s」取得郵件 %1$s:沒有此郵件"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:894
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "不能取得從資料夾「%2$s」取得郵件 %1$s:錯誤的指令"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/imap4/camel-imap4-folder.c:938
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "不能將郵件附加到資料夾「%s」:資料夾是唯讀的"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/imap4/camel-imap4-folder.c:1031
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "不能將郵件附加到資料夾「%s」:未知的錯誤"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/imap4/camel-imap4-folder.c:1061
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "不能將郵件附加到資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:1181
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "不能從資料夾「%s」移動郵件至資料夾「%s」:未知的錯誤"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:1185
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "不能從資料夾「%s」複製郵件至資料夾「%s」:未知的錯誤"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:1193
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "不能從資料夾「%s」移動郵件至資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/imap4/camel-imap4-folder.c:1197
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "不能從資料夾「%s」複製郵件至資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "不能從 IMAP 伺服器 %2$s 取得資料夾「%1$s」:未知的錯誤"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:821
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "不能從 IMAP 伺服器 %2$s 取得「%1$s」的 LIST 資訊 :%3$s"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "不能建立資料夾「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:907
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "不能建立資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "不能刪除資料夾「%s」:特殊的資料夾"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "不能刪除資料夾「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "不能刪除資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "不能將資料夾「%s」重新命名為「%s」:特殊的資料夾"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "不能將資料夾「%s」重新命名為「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "不能將資料夾「%s」重新命名為「%s」:錯誤的指令"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1575
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "無法於 IMAP 伺服器 %3$s 取得樣式「%2$s」的 %1$s 資訊:%4$s"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/imap4/camel-imap4-store.c:1681
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "不能訂閱資料夾「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1686
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "不能訂閱資料夾「%s」:錯誤的指令"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/imap4/camel-imap4-store.c:1753
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "不能取消訂閱資料夾「%s」:無效的信箱名稱"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1758
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "不能取消訂閱資料夾「%s」:錯誤的指令"
-
-#: ../camel/providers/local/camel-local-provider.c:48
-msgid "_Use the '.folders' folder summary file (exmh)"
-msgstr "使用「.folders」資料夾摘要檔案[exmh](_U)"
-
-# camel/providers/local/camel-local-store.c:289
-#: ../camel/providers/local/camel-local-store.c:441
-#: ../camel/providers/local/camel-mbox-store.c:300
-#, c-format
-msgid "Could not delete folder index file '%s': %s"
-msgstr "不能刪除資料夾索引檔案「%s」: %s"
-
-# camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-local-store.c:464
-#: ../camel/providers/local/camel-mbox-store.c:324
-#, c-format
-msgid "Could not delete folder meta file '%s': %s"
-msgstr "不能刪除資料夾中繼檔案「%s」:%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
-#, c-format
-msgid "Cannot create folder '%s': %s"
-msgstr "不能建立資料夾「%s」:%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
-#, c-format
-msgid "Cannot get folder '%s': %s"
-msgstr "不能建立資料夾「%s」:%s"
-
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
-#, c-format
-msgid "Cannot get folder '%s': folder does not exist."
-msgstr "不能取得資料夾「%s」:資料夾不存在。"
-
-# camel/providers/local/camel-maildir-store.c:122
-#: ../camel/providers/local/camel-maildir-store.c:189
-#, c-format
-msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "不能取得資料夾「%s」:不是 maildir 目錄。"
-
-# camel/providers/local/camel-maildir-store.c:151
-# camel/providers/local/camel-maildir-store.c:188
-# camel/providers/local/camel-mh-store.c:127
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
-#, c-format
-msgid "Could not delete folder '%s': %s"
-msgstr "無法刪除資料夾「%s」:%s"
-
-# camel/providers/local/camel-maildir-store.c:107
-# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
-#, c-format
-msgid "Could not scan folder '%s': %s"
-msgstr "無法掃描資料夾「%s」:%s"
-
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:198
-#, c-format
-msgid "Cannot get folder '%s': not a regular file."
-msgstr "不能取得資料夾「%s」:不是一般檔案。"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
-#, c-format
-msgid ""
-"Could not delete folder '%s':\n"
-"%s"
-msgstr ""
-"無法刪除資料夾「%s」:\n"
-"%s"
-
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-mbox-store.c:247
-#, c-format
-msgid "'%s' is not a regular file."
-msgstr "「%s」不是普通的檔案。"
-
-# camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mbox-store.c:254
-#, c-format
-msgid "Folder '%s' is not empty. Not deleted."
-msgstr "資料夾「%s」內仍有檔案。所以不刪除。"
-
-# camel/providers/local/camel-local-store.c:279
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
-#, c-format
-msgid "Could not delete folder summary file '%s': %s"
-msgstr "無法刪除資料夾摘要檔案「%s」: %s"
-
-# camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/local/camel-mbox-store.c:378
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "不能建立目錄「%s」: %s。"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-store.c:498
-#, c-format
-msgid "Could not rename '%s': '%s': %s"
-msgstr "無法重新命名「%s」:「%s」:%s"
-
-# camel/providers/local/camel-maildir-store.c:107
-# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-mh-store.c:232
-#, c-format
-msgid "Could not create folder '%s': %s"
-msgstr "無法建立資料夾「%s」:%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mh-store.c:244
-#, c-format
-msgid "Cannot get folder '%s': not a directory."
-msgstr "不能取得資料夾「%s」:不是目錄。"
-
-#: ../camel/providers/local/camel-spool-store.c:135
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "排程器「%s」不能被開啟:%s"
-
-# camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-spool-store.c:147
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "排程器「%s」不是一般檔案或目錄。"
-
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:166
-#, c-format
-msgid "Folder '%s/%s' does not exist."
-msgstr "資料夾「%s/%s」不存在。"
-
-# camel/providers/local/camel-maildir-store.c:96
-# camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-spool-store.c:176
-#, c-format
-msgid ""
-"Could not open folder '%s':\n"
-"%s"
-msgstr ""
-"無法開啟資料夾「%s」:\n"
-"%s"
-
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
-#: ../camel/providers/local/camel-spool-store.c:180
-#, c-format
-msgid "Folder '%s' does not exist."
-msgstr "資料夾「%s」不存在。"
-
-# camel/providers/local/camel-maildir-store.c:107
-# camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-store.c:185
-#, c-format
-msgid ""
-"Could not create folder '%s':\n"
-"%s"
-msgstr ""
-"無法建立資料夾「%s」:\n"
-"%s"
-
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: ../camel/providers/local/camel-spool-store.c:193
-#, c-format
-msgid "'%s' is not a mailbox file."
-msgstr "「%s」不是 mailbox 檔案。"
-
-#: ../camel/providers/local/camel-spool-summary.c:239
-#: ../camel/providers/local/camel-spool-summary.c:256
-#: ../camel/providers/local/camel-spool-summary.c:267
-#, c-format
-msgid ""
-"Could not sync spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in '%s'"
-msgstr ""
-"無法同步排程資料夾 %s: %s\n"
-"資料夾可能損毀,複製儲存於「%s」"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:419
-#, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
-msgstr "在 POP 伺服器 %2$s 以 SASL 「%1$s」登入失敗: %3$s"
-
-# camel/providers/pop3/camel-pop3-store.c:484
-#: ../camel/providers/pop3/camel-pop3-store.c:663
-#, c-format
-msgid "No such folder '%s'."
-msgstr "沒有這個資料夾「%s」。"
-
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: ../addressbook/backends/file/e-book-backend-file.c:555
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2360
+#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2391
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "載入中..."
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: ../addressbook/backends/file/e-book-backend-file.c:558
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2293
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2315
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2358
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4282
+#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2322
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2344
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
-msgstr "搜尋..."
+msgstr "搜尋..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2725
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4446
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2759
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "正在下載連絡人 (%d)..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2874
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3059
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3103
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2908
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3093
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3137
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "正在更新連絡人快取 (%d)..."
@@ -711,32 +60,32 @@ msgstr "使用電子郵件地址"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1017
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
 msgid "Reconnecting to LDAP server..."
-msgstr "正重新連線至 LDAP 伺服器..."
+msgstr "正在重新連接 LDAP 伺服器..."
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1613
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
 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:1747
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
 msgid "Removing contact from LDAP server..."
 msgstr "正在移除 LDAP 伺服器中的連絡人..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2058
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
 msgid "Modifying contact from LDAP server..."
 msgstr "正在修改 LDAP 伺服器中的連絡人..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4142
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
 msgid "Receiving LDAP search results..."
-msgstr "接收 LDAP 搜尋結果..."
+msgstr "æ­£å\9c¨æ\8e¥æ\94¶ LDAP æ\90\9cå°\8bçµ\90æ\9e\9c..."
 
 # executive-summary/component/e-summary.c:940
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4304
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
 msgid "Error performing search"
 msgstr "進行搜尋時發生錯誤"
 
@@ -744,63 +93,63 @@ msgstr "進行搜尋時發生錯誤"
 #. * function names, e.g.
 #. * "e_book_add_contact" on book before
 #. * "e_book_open
-#: ../addressbook/libebook/e-book.c:252 ../addressbook/libebook/e-book.c:256
-#: ../addressbook/libebook/e-book.c:461 ../addressbook/libebook/e-book.c:465
-#: ../addressbook/libebook/e-book.c:604 ../addressbook/libebook/e-book.c:608
-#: ../addressbook/libebook/e-book.c:695 ../addressbook/libebook/e-book.c:699
-#: ../addressbook/libebook/e-book.c:995 ../addressbook/libebook/e-book.c:1000
-#: ../addressbook/libebook/e-book.c:1179 ../addressbook/libebook/e-book.c:1183
-#: ../addressbook/libebook/e-book.c:1338 ../addressbook/libebook/e-book.c:1342
-#: ../addressbook/libebook/e-book.c:1544 ../addressbook/libebook/e-book.c:1548
-#: ../addressbook/libebook/e-book.c:1787 ../addressbook/libebook/e-book.c:1791
-#: ../addressbook/libebook/e-book.c:2025 ../addressbook/libebook/e-book.c:2029
-#: ../addressbook/libebook/e-book.c:2234 ../addressbook/libebook/e-book.c:2238
-#: ../addressbook/libebook/e-book.c:3339
+#: ../addressbook/libebook/e-book.c:260 ../addressbook/libebook/e-book.c:264
+#: ../addressbook/libebook/e-book.c:469 ../addressbook/libebook/e-book.c:473
+#: ../addressbook/libebook/e-book.c:612 ../addressbook/libebook/e-book.c:616
+#: ../addressbook/libebook/e-book.c:703 ../addressbook/libebook/e-book.c:707
+#: ../addressbook/libebook/e-book.c:1003 ../addressbook/libebook/e-book.c:1008
+#: ../addressbook/libebook/e-book.c:1187 ../addressbook/libebook/e-book.c:1191
+#: ../addressbook/libebook/e-book.c:1346 ../addressbook/libebook/e-book.c:1350
+#: ../addressbook/libebook/e-book.c:1552 ../addressbook/libebook/e-book.c:1556
+#: ../addressbook/libebook/e-book.c:1795 ../addressbook/libebook/e-book.c:1799
+#: ../addressbook/libebook/e-book.c:2033 ../addressbook/libebook/e-book.c:2037
+#: ../addressbook/libebook/e-book.c:2242 ../addressbook/libebook/e-book.c:2246
+#: ../addressbook/libebook/e-book.c:3405
 #, c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr "在通訊錄中「%s」在「%s」之前"
 
-#: ../addressbook/libebook/e-book.c:265 ../addressbook/libebook/e-book.c:474
-#: ../addressbook/libebook/e-book.c:617 ../addressbook/libebook/e-book.c:708
-#: ../addressbook/libebook/e-book.c:1010 ../addressbook/libebook/e-book.c:1193
-#: ../addressbook/libebook/e-book.c:1352 ../addressbook/libebook/e-book.c:1557
-#: ../addressbook/libebook/e-book.c:1800 ../addressbook/libebook/e-book.c:2039
-#: ../addressbook/libebook/e-book.c:2247 ../addressbook/libebook/e-book.c:2593
-#: ../addressbook/libebook/e-book.c:2792
+#: ../addressbook/libebook/e-book.c:273 ../addressbook/libebook/e-book.c:482
+#: ../addressbook/libebook/e-book.c:625 ../addressbook/libebook/e-book.c:716
+#: ../addressbook/libebook/e-book.c:1018 ../addressbook/libebook/e-book.c:1201
+#: ../addressbook/libebook/e-book.c:1360 ../addressbook/libebook/e-book.c:1565
+#: ../addressbook/libebook/e-book.c:1808 ../addressbook/libebook/e-book.c:2047
+#: ../addressbook/libebook/e-book.c:2255 ../addressbook/libebook/e-book.c:2634
+#: ../addressbook/libebook/e-book.c:2833
 #, c-format
 msgid "book busy"
 msgstr "通訊錄忙碌中"
 
-#: ../addressbook/libebook/e-book.c:296 ../addressbook/libebook/e-book.c:300
-#: ../addressbook/libebook/e-book.c:505 ../addressbook/libebook/e-book.c:509
-#: ../addressbook/libebook/e-book.c:644 ../addressbook/libebook/e-book.c:648
-#: ../addressbook/libebook/e-book.c:735 ../addressbook/libebook/e-book.c:739
-#: ../addressbook/libebook/e-book.c:1037 ../addressbook/libebook/e-book.c:1040
-#: ../addressbook/libebook/e-book.c:1223 ../addressbook/libebook/e-book.c:1226
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1383
-#: ../addressbook/libebook/e-book.c:1593 ../addressbook/libebook/e-book.c:1597
-#: ../addressbook/libebook/e-book.c:1847 ../addressbook/libebook/e-book.c:1851
-#: ../addressbook/libebook/e-book.c:2069 ../addressbook/libebook/e-book.c:2073
-#: ../addressbook/libebook/e-book.c:2273 ../addressbook/libebook/e-book.c:2277
-#: ../addressbook/libebook/e-book.c:2538 ../addressbook/libebook/e-book.c:2619
-#: ../addressbook/libebook/e-book.c:2623 ../addressbook/libebook/e-book.c:2818
-#: ../addressbook/libebook/e-book.c:2822 ../addressbook/libebook/e-book.c:3348
+#: ../addressbook/libebook/e-book.c:304 ../addressbook/libebook/e-book.c:308
+#: ../addressbook/libebook/e-book.c:513 ../addressbook/libebook/e-book.c:517
+#: ../addressbook/libebook/e-book.c:652 ../addressbook/libebook/e-book.c:656
+#: ../addressbook/libebook/e-book.c:743 ../addressbook/libebook/e-book.c:747
+#: ../addressbook/libebook/e-book.c:1045 ../addressbook/libebook/e-book.c:1048
+#: ../addressbook/libebook/e-book.c:1231 ../addressbook/libebook/e-book.c:1234
+#: ../addressbook/libebook/e-book.c:1387 ../addressbook/libebook/e-book.c:1391
+#: ../addressbook/libebook/e-book.c:1601 ../addressbook/libebook/e-book.c:1605
+#: ../addressbook/libebook/e-book.c:1855 ../addressbook/libebook/e-book.c:1859
+#: ../addressbook/libebook/e-book.c:2077 ../addressbook/libebook/e-book.c:2081
+#: ../addressbook/libebook/e-book.c:2281 ../addressbook/libebook/e-book.c:2285
+#: ../addressbook/libebook/e-book.c:2518 ../addressbook/libebook/e-book.c:2660
+#: ../addressbook/libebook/e-book.c:2664 ../addressbook/libebook/e-book.c:2859
+#: ../addressbook/libebook/e-book.c:2863 ../addressbook/libebook/e-book.c:3414
 #, c-format
 msgid "CORBA exception making \"%s\" call"
 msgstr "CORBA 例外造成「%s」呼叫"
 
 # ui/evolution-mail.xml.h:3
-#: ../addressbook/libebook/e-book.c:2523
+#: ../addressbook/libebook/e-book.c:2507
 #, c-format
 msgid "%s: there is no current operation"
 msgstr "%s:目前沒有操作"
 
-#: ../addressbook/libebook/e-book.c:2552
+#: ../addressbook/libebook/e-book.c:2532
 #, c-format
 msgid "%s: could not cancel"
 msgstr "%s:無法取消"
 
-#: ../addressbook/libebook/e-book.c:2579 ../addressbook/libebook/e-book.c:2583
+#: ../addressbook/libebook/e-book.c:2620 ../addressbook/libebook/e-book.c:2624
 #, c-format
 msgid "\"%s\" on book after \"%s\""
 msgstr "在通訊錄中「%s」在「%s」之後"
@@ -809,34 +158,34 @@ msgstr "在通訊錄中「%s」在「%s」之後"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../addressbook/libebook/e-book.c:2647
+#: ../addressbook/libebook/e-book.c:2688
 #, c-format
 msgid "%s: canceled"
 msgstr "%s:已取消"
 
-#: ../addressbook/libebook/e-book.c:3203
+#: ../addressbook/libebook/e-book.c:3269
 #, c-format
 msgid "%s: Invalid source."
 msgstr "%s:無效的來源。"
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: ../addressbook/libebook/e-book.c:3211 ../addressbook/libebook/e-book.c:3277
+#: ../addressbook/libebook/e-book.c:3277 ../addressbook/libebook/e-book.c:3343
 #, c-format
 msgid "%s: no factories available for URI `%s'"
 msgstr "%s:URI「%s」沒有可用的製造廠"
 
-#: ../addressbook/libebook/e-book.c:3223
+#: ../addressbook/libebook/e-book.c:3289
 #, c-format
 msgid "%s: Could not create EBookListener"
 msgstr "%s:無法建構 EBookListener"
 
-#: ../addressbook/libebook/e-book.c:3490
+#: ../addressbook/libebook/e-book.c:3556
 #, c-format
 msgid "%s: there was no self contact UID stored in gconf"
 msgstr "%s:沒有儲存於 gconf 中的本身連絡人 UID"
 
-#: ../addressbook/libebook/e-book.c:3623
+#: ../addressbook/libebook/e-book.c:3689
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s:沒有儲存於 gconf 中的 uid `%s' 來源。"
@@ -1080,7 +429,7 @@ msgstr "網誌 URL"
 # calendar/gui/e-calendar-table.c:150
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:426
+#: ../libedataserverui/e-categories-dialog.c:517
 msgid "Categories"
 msgstr "分類"
 
@@ -1315,7 +664,7 @@ msgstr "相片"
 # mail/message-list.c:1083
 #: ../addressbook/libebook/e-contact.c:241
 msgid "Logo"
-msgstr "標"
+msgstr "標"
 
 #: ../addressbook/libebook/e-contact.c:243
 msgid "Name"
@@ -1375,10 +724,10 @@ msgstr "出生日期"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
 #: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:461
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
 #: ../libedataserver/e-categories.c:43
 msgid "Anniversary"
-msgstr "紀念日"
+msgstr "週年紀念日"
 
 #. Security fields
 #: ../addressbook/libebook/e-contact.c:263
@@ -1428,319 +777,195 @@ msgstr "地理資訊"
 msgid "Telephone"
 msgstr "電話"
 
+#: ../addressbook/libebook/e-contact.c:278
+msgid "Skype Home Name 1"
+msgstr "Skype 住家名稱 1"
+
+#: ../addressbook/libebook/e-contact.c:279
+msgid "Skype Home Name 2"
+msgstr "Skype 住家名稱 2"
+
+#: ../addressbook/libebook/e-contact.c:280
+msgid "Skype Home Name 3"
+msgstr "Skype 住家名稱 3"
+
+#: ../addressbook/libebook/e-contact.c:281
+msgid "Skype Work Name 1"
+msgstr "Skype 工作名稱 1"
+
+#: ../addressbook/libebook/e-contact.c:282
+msgid "Skype Work Name 2"
+msgstr "Skype 工作名稱 2"
+
+#: ../addressbook/libebook/e-contact.c:283
+msgid "Skype Work Name 3"
+msgstr "Skype 工作名稱 3"
+
+#: ../addressbook/libebook/e-contact.c:284
+msgid "Skype Name List"
+msgstr "Skype 名稱清單"
+
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../addressbook/libebook/e-contact.c:1493
+#: ../addressbook/libebook/e-contact.c:1507
 #: ../addressbook/libebook/e-destination.c:761
 msgid "Unnamed List"
 msgstr "未命名的清單"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:463
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
 #: ../libedataserver/e-categories.c:44
 msgid "Birthday"
 msgstr "生日"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:489
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
 #, c-format
 msgid "Birthday: %s"
 msgstr "生日:%s"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:513
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
 #, c-format
 msgid "Anniversary: %s"
 msgstr "紀念日:%s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:214
+#: ../calendar/backends/file/e-cal-backend-file.c:212
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "無法儲存行事曆資料:URI 的格式不正確。"
 
+#: ../calendar/backends/file/e-cal-backend-file.c:219
+#: ../calendar/backends/file/e-cal-backend-file.c:225
+msgid "Cannot save calendar data"
+msgstr "不能儲存行事曆資料"
+
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:335
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
 msgid "Could not create thread for getting deltas"
 msgstr "無法建構取得 deltas 的執行緒"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:367
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
 #: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1049
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1348
-#: ../calendar/backends/http/e-cal-backend-http.c:569
-#: ../calendar/backends/weather/e-cal-backend-weather.c:466
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
+#: ../calendar/backends/http/e-cal-backend-http.c:587
+#: ../calendar/backends/weather/e-cal-backend-weather.c:484
 msgid "Could not create cache file"
 msgstr "無法建構快取檔案"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:380
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1061
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
 msgid "Could not create thread for populating cache"
 msgstr "無法建構移植快取的執行緒"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1056
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1795
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1899
 msgid "Reply Requested: by "
 msgstr "要求回覆:依"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1061
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1904
 msgid "Reply Requested: When convenient"
 msgstr "要求回覆:當有空時"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:275
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
 #, 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:885
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
 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:943
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
 msgid "Invalid server URI"
 msgstr "無效的伺服器 URI"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:962
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:971
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1067
-#: ../calendar/libecal/e-cal.c:5076
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1075
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1107
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1145
-#: ../camel/providers/groupwise/camel-groupwise-store.c:594
-#: ../camel/providers/groupwise/camel-groupwise-store.c:746
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
+#: ../calendar/libecal/e-cal.c:5098
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1131
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1163
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1201
+#: ../camel/providers/groupwise/camel-groupwise-store.c:588
+#: ../camel/providers/groupwise/camel-groupwise-store.c:753
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:184
 msgid "Authentication failed"
-msgstr "驗證失敗"
-
-# mail/mail-config.glade.h:37
-#: ../calendar/backends/http/e-cal-backend-http.c:269
-msgid "Redirected to Invalid URI"
-msgstr "重新指向無效的 URI"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/backends/http/e-cal-backend-http.c:290
-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:296
-msgid "Not a calendar."
-msgstr "並非行事曆。"
-
-# mail/mail-ops.c:1872
-#: ../calendar/backends/weather/e-cal-backend-weather.c:144
-msgid "Could not retrieve weather data"
-msgstr "無法取得天氣資料"
-
-# mail/mail-format.c:756
-# mail/message-list.c:1082
-#: ../calendar/backends/weather/e-cal-backend-weather.c:216
-msgid "Fair"
-msgstr "晴朗"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:217
-msgid "Snow showers"
-msgstr "陣雪"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:218
-msgid "Snow"
-msgstr "下雪"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:219
-msgid "Partly cloudy"
-msgstr "局部有雲"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:220
-msgid "Smoke"
-msgstr "煙"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:221
-msgid "Thunderstorms"
-msgstr "雷暴"
-
-# addressbook/printing/e-contact-print.glade.h:4
-#: ../calendar/backends/weather/e-cal-backend-weather.c:222
-msgid "Cloudy"
-msgstr "多雲"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:223
-msgid "Drizzle"
-msgstr "毛毛雨"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:224
-msgid "Sunny"
-msgstr "艷陽"
-
-# calendar/gui/goto-dialog.glade.h:2
-#: ../calendar/backends/weather/e-cal-backend-weather.c:225
-msgid "Dust"
-msgstr "微塵"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:226
-msgid "Clear"
-msgstr "無雲的"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:227
-msgid "Mostly cloudy"
-msgstr "陰天"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:228
-msgid "Windy"
-msgstr "有風的"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:229
-msgid "Rain showers"
-msgstr "陣雨"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:230
-msgid "Foggy"
-msgstr "霧"
+msgstr "驗證失敗"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:231
-msgid "Rain/snow mixed"
-msgstr "雨/雪混合"
+# mail/mail-config.glade.h:37
+#: ../calendar/backends/http/e-cal-backend-http.c:267
+msgid "Redirected to Invalid URI"
+msgstr "重新指向無效的 URI"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:232
-msgid "Sleet"
-msgstr "冰雹"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/backends/http/e-cal-backend-http.c:288
+msgid "Bad file format."
+msgstr "錯誤的檔案格式。"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:233
-msgid "Very hot/humid"
-msgstr "非常炎熱/潮溼"
+# camel/providers/imap/camel-imap-store.c:803
+# mail/mail-local.c:334
+#: ../calendar/backends/http/e-cal-backend-http.c:294
+msgid "Not a calendar."
+msgstr "並非行事曆。"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:234
-msgid "Blizzard"
-msgstr "暴風雪"
+# mail/mail-ops.c:1872
+#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+msgid "Could not retrieve weather data"
+msgstr "無法取得天氣資料"
 
-# ui/evolution-task-editor-dialog.xml.h:24
-#: ../calendar/backends/weather/e-cal-backend-weather.c:235
-msgid "Freezing rain"
-msgstr "凍雨"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+msgid "Weather: Fog"
+msgstr "天氣:起霧"
 
-# addressbook/printing/e-contact-print.glade.h:11
-#: ../calendar/backends/weather/e-cal-backend-weather.c:236
-msgid "Haze"
-msgstr "霾"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:247
+msgid "Weather: Cloudy"
+msgstr "天氣:多雲"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:237
-msgid "Blowing snow"
-msgstr "å\90¹é\99\8dé\9bª"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+msgid "Weather: Cloudy Night"
+msgstr "天氣ï¼\9aå¤\9aé\9b²ç\9a\84å¤\9cæ\99\9a"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:238
-msgid "Freezing drizzle"
-msgstr "å\87\8dæ¯\9bæ¯\9bé\9b¨"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+msgid "Weather: Overcast"
+msgstr "天氣ï¼\9aå¤\9aé\9b²"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:239
-msgid "Very cold/wind chill"
-msgstr "非常冷/風寒"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+msgid "Weather: Showers"
+msgstr "天氣:陣雨"
 
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
-#: ../calendar/backends/weather/e-cal-backend-weather.c:240
-msgid "Rain"
-msgstr "下雨"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+msgid "Weather: Snow"
+msgstr "天氣:下雪"
 
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
-#: ../calendar/backends/weather/e-cal-backend-weather.c:260
-#: ../calendar/backends/weather/e-cal-backend-weather.c:267
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Sunny"
 msgstr "天氣:艷陽"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-#: ../calendar/backends/weather/e-cal-backend-weather.c:268
-#: ../calendar/backends/weather/e-cal-backend-weather.c:271
-msgid "Weather: Snow"
-msgstr "天氣:下雪"
-
 #: ../calendar/backends/weather/e-cal-backend-weather.c:253
-msgid "Weather: Partly Cloudy"
-msgstr "天氣:多雲"
+msgid "Weather: Clear Night"
+msgstr "天氣:晴朗的夜晚"
 
 #: ../calendar/backends/weather/e-cal-backend-weather.c:254
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
-#: ../calendar/backends/weather/e-cal-backend-weather.c:264
-#: ../calendar/backends/weather/e-cal-backend-weather.c:270
-msgid "Weather: Fog"
-msgstr "天氣:起霧"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Thunderstorms"
 msgstr "天氣:雷暴"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
-#: ../calendar/backends/weather/e-cal-backend-weather.c:261
-msgid "Weather: Cloudy"
-msgstr "天氣:多雲"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
-#: ../calendar/backends/weather/e-cal-backend-weather.c:263
-#: ../calendar/backends/weather/e-cal-backend-weather.c:265
-#: ../calendar/backends/weather/e-cal-backend-weather.c:266
-#: ../calendar/backends/weather/e-cal-backend-weather.c:269
-#: ../calendar/backends/weather/e-cal-backend-weather.c:272
-#: ../calendar/backends/weather/e-cal-backend-weather.c:274
-msgid "Weather: Rain"
-msgstr "天氣:下雪"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:349
-#, c-format
-msgid "%.1f°C - %s"
-msgstr "%.1f°C - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:351
-#, c-format
-msgid "%.1f°F - %s"
-msgstr "%.1f°F - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:354
-#, c-format
-msgid "%.1f/%.1f°C - %s"
-msgstr "%.1f/%.1f°C - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:356
-#, c-format
-msgid "%.1f/%.1f°F - %s"
-msgstr "%.1f/%.1f°F - %s"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:362
-#, c-format
-msgid "%d%% chance of precipitation\n"
-msgstr "%d%% 降雨機率\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:369
-#, c-format
-msgid "%.1fcm snow\n"
-msgstr "%.1fcm 雪\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:371
-#, c-format
-msgid "%.1fin snow\n"
-msgstr "%.1fin 漂雪\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:374
-#, c-format
-msgid "%.1f-%.1fcm snow\n"
-msgstr "%.1f-%.1fcm 雪\n"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:376
-#, c-format
-msgid "%.1f-%.1fin snow\n"
-msgstr "%.1f-%.1fin 雪\n"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+msgid "Forecast"
+msgstr "天氣預報"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
 #: ../calendar/libecal/e-cal-component.c:1322
@@ -1913,7 +1138,7 @@ msgstr "高"
 
 #: ../calendar/libecal/e-cal-util.c:687 ../calendar/libecal/e-cal-util.c:715
 msgid "Normal"
-msgstr "正常"
+msgstr "一般"
 
 # calendar/gui/calendar-model.c:501
 # calendar/gui/calendar-model.c:1070
@@ -1933,7 +1158,7 @@ msgid "Undefined"
 msgstr "未指定"
 
 # camel/camel-smime-context.c:194
-#: ../calendar/libecal/e-cal.c:1665 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1677 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
@@ -1943,80 +1168,80 @@ 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:1679
+#: ../calendar/libecal/e-cal.c:1691
 #, 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:5048
+#: ../calendar/libecal/e-cal.c:5070
 msgid "Invalid argument"
 msgstr "無效的參數"
 
-#: ../calendar/libecal/e-cal.c:5050
+#: ../calendar/libecal/e-cal.c:5072
 msgid "Backend is busy"
 msgstr "後端忙碌中"
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
-#: ../calendar/libecal/e-cal.c:5052
-#: ../calendar/libedata-cal/e-cal-backend-util.c:97
+#: ../calendar/libecal/e-cal.c:5074
+#: ../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:5054
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libecal/e-cal.c:5076
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
 msgstr "無此行事曆"
 
-#: ../calendar/libecal/e-cal.c:5056
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:5078
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
 #: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
-msgstr "æ\9cªç\99¼ç\8f¾物件"
+msgstr "æ\89¾ä¸\8då\88°物件"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../calendar/libecal/e-cal.c:5058
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:5080
+#: ../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:5060
+#: ../calendar/libecal/e-cal.c:5082
 msgid "URI not loaded"
 msgstr "URI 未載入"
 
-#: ../calendar/libecal/e-cal.c:5062
+#: ../calendar/libecal/e-cal.c:5084
 msgid "URI already loaded"
 msgstr "URI 已載入"
 
 # shell/e-storage.c:475
-#: ../calendar/libecal/e-cal.c:5064
-#: ../calendar/libedata-cal/e-cal-backend-util.c:99
+#: ../calendar/libecal/e-cal.c:5086
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 #: ../servers/exchange/storage/e-storage.c:571
 msgid "Permission denied"
 msgstr "權限不足"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/libecal/e-cal.c:5066
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libecal/e-cal.c:5088
+#: ../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:5068
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:5090
+#: ../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:5070
+#: ../calendar/libecal/e-cal.c:5092
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
@@ -2024,52 +1249,52 @@ 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:5072
+#: ../calendar/libecal/e-cal.c:5094
 msgid "Operation has been canceled"
 msgstr "操作已取消"
 
 # calendar/gui/e-itip-control.c:883
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libecal/e-cal.c:5096
+#: ../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:5078
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libecal/e-cal.c:5100
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
 #: ../camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication required"
 msgstr "要求驗證"
 
-#: ../calendar/libecal/e-cal.c:5080
+#: ../calendar/libecal/e-cal.c:5102
 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:5082
-#: ../calendar/libedata-cal/e-cal-backend-util.c:138
+#: ../calendar/libecal/e-cal.c:5104
+#: ../calendar/libedata-cal/e-cal-backend-util.c:146
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:223
 #: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../camel/providers/imap/camel-imap-store.c:743
 #: ../camel/providers/imap4/camel-imap4-engine.c:1570
 #: ../camel/providers/imap4/camel-imap4-engine.c:1609
 #: ../camel/providers/imap4/camel-imap4-engine.c:1654
 #: ../camel/providers/imap4/camel-imap4-engine.c:1710
 #: ../camel/providers/imap4/camel-imap4-store.c:315
 #: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#: ../camel/providers/pop3/camel-pop3-store.c:553
-#: ../camel/providers/pop3/camel-pop3-store.c:560
-#: ../camel/providers/pop3/camel-pop3-store.c:566
+#: ../camel/providers/imap4/camel-imap4-store.c:1579
+#: ../camel/providers/pop3/camel-pop3-store.c:554
+#: ../camel/providers/pop3/camel-pop3-store.c:561
+#: ../camel/providers/pop3/camel-pop3-store.c:567
 #: ../servers/exchange/storage/e-storage.c:585
 #: ../servers/groupwise/e-gw-connection.c:241
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
 # shell/e-storage.c:459
-#: ../calendar/libecal/e-cal.c:5084
-#: ../calendar/libedata-cal/e-cal-backend-util.c:95
+#: ../calendar/libecal/e-cal.c:5106
+#: ../calendar/libedata-cal/e-cal-backend-util.c:103
 #: ../servers/exchange/storage/e-storage.c:553
 msgid "No error"
 msgstr "沒有錯誤"
@@ -2168,6 +1393,60 @@ msgid ""
 "be a boolean false (#f)"
 msgstr "「%s」的所有引數必須為字串,或只有一個引數為布林偽值 (#f)"
 
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+msgid "Invalid range"
+msgstr "無效的範圍"
+
+# mail/mail-config.glade.h:1
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+msgid "Unsupported field"
+msgstr "不支援的欄位"
+
+# mail/mail-config.glade.h:1
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+msgid "Unsupported method"
+msgstr "不支援的方法"
+
+# camel/providers/imap/camel-imap-store.c:466
+# camel/providers/smtp/camel-smtp-transport.c:366
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+msgid "Unsupported authentication method"
+msgstr "不支援的驗證方法"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+msgid "TLS not available"
+msgstr "無法使用 TLS"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+msgid "Offline mode unavailable"
+msgstr "離線模式無法使用"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+msgid "Search size limit exceeded"
+msgstr "超過搜尋大小限制"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+msgid "Search time limit exceeded"
+msgstr "超過搜尋時間限制"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+msgid "Invalid query"
+msgstr "無效的查詢"
+
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+msgid "Query refused"
+msgstr "查詢被拒絕"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+msgid "Invalid server version"
+msgstr "無效的伺服器版本"
+
 # camel/camel-cipher-context.c:171
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
@@ -2224,11 +1503,15 @@ msgid "Unable to create cache path"
 msgstr "無法建構快取路徑"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/camel-data-cache.c:381
+#: ../camel/camel-data-cache.c:403
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "無法移除快取項目: %s: %s"
 
+#: ../camel/camel-db.c:469
+msgid "Insufficient memory"
+msgstr "記憶體不足"
+
 #: ../camel/camel-disco-diary.c:198
 #, c-format
 msgid ""
@@ -2240,6 +1523,18 @@ msgstr ""
 "接下來在此伺服器上的操作,在您重新連線到網路時\n"
 "將不會重播。"
 
+#: ../camel/camel-disco-diary.c:261
+#: ../camel/providers/imap/camel-imap-journal.c:318
+#, c-format
+msgid ""
+"Could not open '%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+"無法開啟「%s」:\n"
+"%s\n"
+"這個資料夾內所做的變更將不會重新同步。"
+
 #: ../camel/camel-disco-diary.c:297
 msgid "Resynchronizing with server"
 msgstr "與伺服器重新同步"
@@ -2261,10 +1556,11 @@ msgstr "準備資料夾「%s」供離線使用"
 
 # camel/camel-disco-store.c:271
 #: ../camel/camel-disco-store.c:403
-#: ../camel/providers/imap/camel-imap-store.c:1002
-#: ../camel/providers/imap/camel-imap-store.c:1810
-#: ../camel/providers/imap/camel-imap-store.c:2226
-#: ../camel/providers/imap/camel-imap-store.c:2989
+#: ../camel/providers/groupwise/camel-groupwise-store.c:226
+#: ../camel/providers/imap/camel-imap-store.c:1003
+#: ../camel/providers/imap/camel-imap-store.c:1813
+#: ../camel/providers/imap/camel-imap-store.c:2229
+#: ../camel/providers/imap/camel-imap-store.c:2997
 msgid "You must be working online to complete this operation"
 msgstr "您必須於線上工作才能完成此操作"
 
@@ -2274,84 +1570,84 @@ msgstr "沒有可用的描述"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:785
+#: ../camel/camel-filter-driver.c:795
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "無法建構子代處理 '%s':%s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/camel-filter-driver.c:827
+#: ../camel/camel-filter-driver.c:837
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "無法讀取 %s 的歡迎辭: %s"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: ../camel/camel-filter-driver.c:1016 ../camel/camel-filter-driver.c:1025
+#: ../camel/camel-filter-driver.c:1026 ../camel/camel-filter-driver.c:1035
 msgid "Syncing folders"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:866
-#: ../camel/camel-filter-driver.c:1114 ../camel/camel-filter-driver.c:1494
+#: ../camel/camel-filter-driver.c:1124 ../camel/camel-filter-driver.c:1530
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "分析過濾器發生錯誤: %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: ../camel/camel-filter-driver.c:1123 ../camel/camel-filter-driver.c:1503
+#: ../camel/camel-filter-driver.c:1133 ../camel/camel-filter-driver.c:1539
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "執行過濾器發生錯誤: %s: %s"
 
 # camel/camel-filter-driver.c:643
-#: ../camel/camel-filter-driver.c:1191
+#: ../camel/camel-filter-driver.c:1221
 msgid "Unable to open spool folder"
 msgstr "無法開啟 spool 資料夾"
 
 # camel/camel-filter-driver.c:652
-#: ../camel/camel-filter-driver.c:1200
+#: ../camel/camel-filter-driver.c:1230
 msgid "Unable to process spool folder"
 msgstr "無法處理 spool 資料夾"
 
 # camel/camel-filter-driver.c:666
-#: ../camel/camel-filter-driver.c:1215
+#: ../camel/camel-filter-driver.c:1246
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "接收郵件 %d (%d%%)"
 
 # camel/camel-filter-driver.c:671
-#: ../camel/camel-filter-driver.c:1219
+#: ../camel/camel-filter-driver.c:1250
 msgid "Cannot open message"
 msgstr "不能開啟郵件"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/camel-filter-driver.c:1220 ../camel/camel-filter-driver.c:1233
+#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1269
 #, 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:1247 ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1283 ../camel/camel-filter-driver.c:1374
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: ../camel/camel-filter-driver.c:1251 ../camel/camel-filter-driver.c:1343
+#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1379
 msgid "Complete"
 msgstr "完成"
 
 # camel/camel-filter-driver.c:748
-#: ../camel/camel-filter-driver.c:1308
+#: ../camel/camel-filter-driver.c:1344
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在接收第 %d / %d 封郵件"
 
 # camel/camel-filter-driver.c:753
 # camel/camel-filter-driver.c:771
-#: ../camel/camel-filter-driver.c:1323
+#: ../camel/camel-filter-driver.c:1359
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d / %d 封郵件失敗"
@@ -2390,7 +1686,8 @@ msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤: %s: %s"
 
 # camel/camel-folder-search.c:328
-#: ../camel/camel-folder-search.c:332 ../camel/camel-folder-search.c:447
+#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:608
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2400,7 +1697,8 @@ msgstr ""
 "%s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:457
+#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
+#: ../camel/camel-folder-search.c:618
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2411,78 +1709,78 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:643 ../camel/camel-folder-search.c:685
+#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:853
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) 需要單一布林值結果"
 
-#: ../camel/camel-folder-search.c:738
+#: ../camel/camel-folder-search.c:906
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) 不允許放在 %s 裡面"
 
-#: ../camel/camel-folder-search.c:744 ../camel/camel-folder-search.c:751
+#: ../camel/camel-folder-search.c:912 ../camel/camel-folder-search.c:919
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) 需要相符類型字串"
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:778
+#: ../camel/camel-folder-search.c:946
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) 期望陣列結果"
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: ../camel/camel-folder-search.c:787
+#: ../camel/camel-folder-search.c:955
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) 需要資料夾設定"
 
-# camel/camel-folder-search.c:559
-#: ../camel/camel-folder-search.c:882
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "在不明的檔頭內執行查詢:%s"
-
-#: ../camel/camel-folder.c:693
+#: ../camel/camel-folder.c:696
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "不支援的操作:添加郵件: %s"
 
 # camel/camel-folder-search.c:338
-#: ../camel/camel-folder.c:1349
+#: ../camel/camel-folder.c:1398
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "不支援的操作:以詞句搜尋: %s"
 
-#: ../camel/camel-folder.c:1390
+# camel/camel-folder-search.c:338
+#: ../camel/camel-folder.c:1440
+#, c-format
+msgid "Unsupported operation: count by expression: for %s"
+msgstr "不支援的操作:以詞句計數:用於 %s"
+
+#: ../camel/camel-folder.c:1480
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
 msgstr "不支援的操作:以 UIDs 搜尋: %s"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1506
+#: ../camel/camel-folder.c:1596
 msgid "Moving messages"
-msgstr "移動郵件"
+msgstr "正在移動郵件"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-folder.c:1506
+#: ../camel/camel-folder.c:1596
 msgid "Copying messages"
-msgstr "複製郵件"
+msgstr "正在複製郵件"
 
 # widgets/misc/e-messagebox.c:159
-#: ../camel/camel-folder.c:1852
+#: ../camel/camel-folder.c:1942
 msgid "Learning junk"
 msgstr "了解垃圾郵件"
 
-#: ../camel/camel-folder.c:1869
+#: ../camel/camel-folder.c:1959
 msgid "Learning non-junk"
 msgstr "了解非垃圾郵件"
 
 # mail/mail-ops.c:1565
-#: ../camel/camel-folder.c:1888
+#: ../camel/camel-folder.c:1978
 msgid "Filtering new message(s)"
 msgstr "取回 %d 封郵件"
 
@@ -2523,9 +1821,15 @@ msgstr ""
 "您需要密語才能為此使用者的金鑰解鎖:\n"
 "「%s」"
 
+# camel/providers/imap/camel-imap-command.c:232
+#: ../camel/camel-gpg-context.c:837
+#, c-format
+msgid "Unexpected request from GnuPG for '%s'"
+msgstr "GnuPG 傳回對「%s」未預期的要求"
+
 # mail/mail-send-recv.c:471
 #: ../camel/camel-gpg-context.c:862 ../camel/camel-gpg-context.c:1068
-#: ../camel/providers/nntp/camel-nntp-store.c:1281
+#: ../camel/providers/nntp/camel-nntp-store.c:1287
 msgid "Canceled."
 msgstr "已取消。"
 
@@ -2751,8 +2055,8 @@ msgstr "解析錯誤"
 # camel/camel-service.c:580
 #: ../camel/camel-net-utils.c:505 ../camel/camel-net-utils.c:667
 #: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:447
-#: ../camel/providers/pop3/camel-pop3-store.c:547
+#: ../camel/providers/pop3/camel-pop3-store.c:448
+#: ../camel/providers/pop3/camel-pop3-store.c:548
 msgid "Canceled"
 msgstr "已取消"
 
@@ -2794,11 +2098,18 @@ msgid "Name lookup failed: %s"
 msgstr "搜尋名稱失敗: %s"
 
 # mail/mail-ops.c:898
-#: ../camel/camel-offline-folder.c:254
+#: ../camel/camel-offline-folder.c:253
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "正在將資料夾「%s」中的郵件同步到磁碟"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/camel-offline-journal.c:164 ../camel/camel-offline-journal.c:187
+#, c-format
+msgid "Cannot write offline journal for folder '%s': %s"
+msgstr "不能寫入資料夾「%s」的離線日誌:%s"
+
 # camel/camel-session.c:68
 #: ../camel/camel-provider.c:60
 msgid "Virtual folder email provider"
@@ -2827,6 +2138,13 @@ msgstr "無法載入 %s:%s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "無法載入 %s:模組內沒有初始碼。"
 
+# camel/camel-session.c:295
+# camel/camel-session.c:364
+#: ../camel/camel-provider.c:373 ../camel/camel-session.c:182
+#, c-format
+msgid "No provider available for protocol '%s'"
+msgstr "沒有通訊協定「%s」的提供者"
+
 # camel/camel-sasl-anonymous.c:33
 #: ../camel/camel-sasl-anonymous.c:37
 msgid "Anonymous"
@@ -2841,7 +2159,7 @@ msgstr "這個選項將會使用匿名登入至伺服器。"
 # camel/camel-sasl-plain.c:87
 #: ../camel/camel-sasl-anonymous.c:124 ../camel/camel-sasl-plain.c:91
 msgid "Authentication failed."
-msgstr "é©\97証失敗。"
+msgstr "é©\97è­\89失敗。"
 
 # camel/camel-sasl-anonymous.c:119
 #: ../camel/camel-sasl-anonymous.c:133
@@ -2996,7 +2314,7 @@ msgstr "參照的證件已經過期。"
 #: ../camel/camel-sasl-gssapi.c:205 ../camel/camel-sasl-gssapi.c:253
 #: ../camel/camel-sasl-gssapi.c:289 ../camel/camel-sasl-gssapi.c:304
 #: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/providers/imap/camel-imap-store.c:1273
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
@@ -3102,7 +2420,7 @@ msgid "URL '%s' needs a path component"
 msgstr "URL「%s」需要 path 元件"
 
 # camel/camel-session.c:479
-#: ../camel/camel-session.c:303
+#: ../camel/camel-session.c:308
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3112,11 +2430,15 @@ msgstr ""
 "%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: ../camel/camel-session.c:478
+#: ../camel/camel-session.c:483
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "請輸入 %2$s 於主機 %3$s 的 %1$s 密碼。"
 
+#: ../camel/camel-session.c:822
+msgid "Camel session doesn't support forwarding of a message."
+msgstr "Camel 作業階段不支援轉送訊息。"
+
 # camel/camel-smime-context.c:327
 #: ../camel/camel-smime-context.c:234 ../camel/camel-smime-context.c:778
 #, c-format
@@ -3359,33 +2681,40 @@ msgid "export keys: unimplemented"
 msgstr "匯出鑰匙:未執行"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/camel-store.c:272
+#: ../camel/camel-store.c:283
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:174
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "不能取得資料夾:在此儲存空間上無效的操作"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/camel-store.c:316
+#, c-format
+msgid "Cannot create folder '%s': folder exists"
+msgstr "不能建立資料夾「%s」:資料夾已存在"
+
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/camel-store.c:369
+#: ../camel/camel-store.c:395
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "不能建構資料夾:在此儲存空間上無效的操作"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/camel-store.c:397
+#: ../camel/camel-store.c:423
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "無法建構資料夾:%s:資料夾已存在"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: ../camel/camel-store.c:461 ../camel/camel-vee-store.c:384
+#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:384
 #: ../camel/providers/local/camel-maildir-store.c:219
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾: %s :無效的操作"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/camel-store.c:513 ../camel/camel-vee-store.c:421
+#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:421
 #: ../camel/providers/local/camel-maildir-store.c:291
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -3397,14 +2726,14 @@ 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:854 ../camel/camel-vtrash-folder.c:53
-#: ../camel/providers/imap/camel-imap-store.c:1060
+#: ../camel/camel-store.c:899 ../camel/camel-vtrash-folder.c:54
+#: ../camel/providers/imap/camel-imap-store.c:1061
 msgid "Trash"
 msgstr "回收筒"
 
 # calendar/gui/goto-dialog.glade.h:9
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:857 ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-store.c:902 ../camel/camel-vtrash-folder.c:56
 msgid "Junk"
 msgstr "垃圾郵件"
 
@@ -3529,7 +2858,7 @@ msgstr "金鑰的用途並不支援憑證簽署"
 msgid "Error in application verification"
 msgstr "應用程式驗證時錯誤"
 
-#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-openssl.c:700 ../camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -3542,11 +2871,11 @@ msgstr ""
 "指紋檔:              %s\n"
 "簽章:              %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
 msgid "GOOD"
 msgstr "良好"
 
-#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:885
+#: ../camel/camel-tcp-stream-openssl.c:706 ../camel/camel-tcp-stream-ssl.c:886
 msgid "BAD"
 msgstr "不良"
 
@@ -3574,7 +2903,7 @@ msgstr ""
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:889
+#: ../camel/camel-tcp-stream-ssl.c:890
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -3589,7 +2918,7 @@ msgstr ""
 "\n"
 "您想要接受嗎?"
 
-#: ../camel/camel-tcp-stream-ssl.c:933
+#: ../camel/camel-tcp-stream-ssl.c:934
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -3598,7 +2927,7 @@ msgstr ""
 "憑證問題: %s\n"
 "發照者: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:985
+#: ../camel/camel-tcp-stream-ssl.c:986
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -3607,7 +2936,7 @@ msgstr ""
 "不正確的憑證網域: %s\n"
 "發照者: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1003
+#: ../camel/camel-tcp-stream-ssl.c:1004
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -3616,7 +2945,7 @@ msgstr ""
 "憑證已逾期: %s\n"
 "發照者: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1020
+#: ../camel/camel-tcp-stream-ssl.c:1021
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -3625,14 +2954,26 @@ msgstr ""
 "憑證撒銷清單已逾期: %s\n"
 "發照者: %s"
 
+# camel/camel-url.c:289
+#: ../camel/camel-url.c:313
+#, c-format
+msgid "Could not parse URL '%s'"
+msgstr "無法解析 URL「%s」"
+
+# shell/e-shell-importer.c:384
+#: ../camel/camel-vee-folder.c:582
+#, c-format
+msgid "Error storing '%s': %s"
+msgstr "儲存「%s」發生錯誤:%s"
+
 # camel/camel-vee-folder.c:451
-#: ../camel/camel-vee-folder.c:626
+#: ../camel/camel-vee-folder.c:660
 #, 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:749 ../camel/camel-vee-folder.c:755
+#: ../camel/camel-vee-folder.c:820 ../camel/camel-vee-folder.c:826
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
 
@@ -3655,12 +2996,12 @@ msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾: %s :沒有這個資料夾"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-vtrash-folder.c:55
 msgid "Cannot copy messages to the Trash folder"
 msgstr "無法複製訊息到「回收筒」資料夾"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-vtrash-folder.c:57
 msgid "Cannot copy messages to the Junk folder"
 msgstr "無法複製訊息到「垃圾郵件」資料夾"
 
@@ -3671,7 +3012,7 @@ msgstr "無法複製訊息到「垃圾郵件」資料夾"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:129
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3683,26 +3024,28 @@ msgstr ""
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:116
-#: ../camel/providers/local/camel-maildir-folder.c:251
-#: ../camel/providers/local/camel-mbox-folder.c:349
-#: ../camel/providers/local/camel-mh-folder.c:204
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:129
+#: ../camel/providers/local/camel-maildir-folder.c:248
+#: ../camel/providers/local/camel-maildir-folder.c:275
+#: ../camel/providers/local/camel-mbox-folder.c:347
+#: ../camel/providers/local/camel-mbox-folder.c:399
+#: ../camel/providers/local/camel-mh-folder.c:214
 msgid "No such message"
-msgstr "沒有這封郵件"
+msgstr "無此郵件"
 
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
-#: ../camel/providers/imap4/camel-imap4-folder.c:812
-#: ../camel/providers/nntp/camel-nntp-folder.c:156
-#: ../camel/providers/nntp/camel-nntp-folder.c:232
-#: ../camel/providers/nntp/camel-nntp-folder.c:373
-#: ../camel/providers/pop3/camel-pop3-folder.c:266
-#: ../camel/providers/pop3/camel-pop3-folder.c:560
-#: ../camel/providers/pop3/camel-pop3-folder.c:621
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:141
+#: ../camel/providers/imap4/camel-imap4-folder.c:821
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:251
+#: ../camel/providers/nntp/camel-nntp-folder.c:411
+#: ../camel/providers/pop3/camel-pop3-folder.c:268
+#: ../camel/providers/pop3/camel-pop3-folder.c:578
 #: ../camel/providers/pop3/camel-pop3-folder.c:639
+#: ../camel/providers/pop3/camel-pop3-folder.c:657
 msgid "User canceled"
 msgstr "使用者已取消"
 
@@ -3713,58 +3056,66 @@ msgstr "使用者已取消"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:135
-#: ../camel/providers/imap4/camel-imap4-folder.c:817
-#: ../camel/providers/nntp/camel-nntp-folder.c:147
-#: ../camel/providers/nntp/camel-nntp-folder.c:149
-#: ../camel/providers/nntp/camel-nntp-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/imap4/camel-imap4-folder.c:826
+#: ../camel/providers/nntp/camel-nntp-folder.c:166
+#: ../camel/providers/nntp/camel-nntp-folder.c:168
+#: ../camel/providers/nntp/camel-nntp-folder.c:177
+#: ../camel/providers/nntp/camel-nntp-folder.c:253
 #: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
-#: ../camel/providers/pop3/camel-pop3-folder.c:624
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:581
 #: ../camel/providers/pop3/camel-pop3-folder.c:642
+#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:660
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "無法取得郵件 %s: %s"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:160
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2164
-#: ../camel/providers/imap4/camel-imap4-folder.c:835
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:165
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2277
+#: ../camel/providers/imap4/camel-imap4-folder.c:844
 msgid "This message is not available in offline mode."
 msgstr "這封郵件無法在離線模式下使用。"
 
 # camel/camel-movemail.c:306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:179
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1696
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1747
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:185
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1851
 msgid "Could not get message"
 msgstr "無法取得郵件。"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:818
-#: ../camel/providers/imap/camel-imap-folder.c:248
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:867
+#: ../camel/providers/imap/camel-imap-folder.c:264
 #, c-format
 msgid "Could not load summary for %s"
-msgstr "無法載入 %s 的摘要"
+msgstr "無法載入 %s 的摘要"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1071
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1127
 msgid "Trash Folder Full. Please Empty."
 msgstr "回收筒資料夾已滿。請將它清空。"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1248
-#: ../camel/providers/groupwise/camel-groupwise-store.c:623
-#: ../camel/providers/groupwise/camel-groupwise-store.c:736
-#: ../camel/providers/imap/camel-imap-folder.c:3161
-#: ../camel/providers/imap/camel-imap-folder.c:3238
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1335
+#: ../camel/providers/groupwise/camel-groupwise-store.c:617
+#: ../camel/providers/groupwise/camel-groupwise-store.c:743
+#: ../camel/providers/imap/camel-imap-folder.c:3333
+#: ../camel/providers/imap/camel-imap-folder.c:3409
 #, 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:2135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2177
+#, c-format
+msgid "Cannot append message to folder '%s': %s"
+msgstr "不能將郵件加入至資料夾「%s」:%s"
+
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
 # camel/providers/local/camel-maildir-folder.c:217
@@ -3772,7 +3123,7 @@ msgstr "正取得 %s 中新郵件的摘要資訊"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2165
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "無法建構郵件: %s"
@@ -3789,7 +3140,7 @@ msgstr "不能取得資料夾容器 %s"
 #: ../camel/providers/groupwise/camel-groupwise-journal.c:349
 #: ../camel/providers/imap4/camel-imap4-journal.c:319
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "不能在離線模式中添加郵件:無法使用快取"
+msgstr "不能在離線模式中加入郵件:無法使用快取"
 
 # camel/providers/local/camel-mbox-folder.c:259
 #: ../camel/providers/groupwise/camel-groupwise-journal.c:365
@@ -3811,7 +3162,7 @@ msgstr "檢查新郵件"
 #: ../camel/providers/imap/camel-imap-provider.c:46
 #: ../camel/providers/imap4/camel-imap4-provider.c:41
 msgid "C_heck for new messages in all folders"
-msgstr "檢查所有資料夾裡的新郵件(_H)"
+msgstr "檢查所有資料夾中是否有新郵件(_H)"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:68
@@ -3848,8 +3199,8 @@ msgid "SOAP Settings"
 msgstr "SOAP 設定值"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:76
-msgid "Post Office Agent SOAP Port:"
-msgstr "郵局代辦 SOAP 埠"
+msgid "Post Office Agent SOAP _Port:"
+msgstr "郵局代辦 SOAP 埠(_P):"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:89
 msgid "Novell GroupWise"
@@ -3882,50 +3233,58 @@ msgid ""
 msgstr "這個選項將會使用簡易的密碼連線至 GroupWise 伺服器。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#: ../camel/providers/groupwise/camel-groupwise-store.c:104
 msgid "Host or user not available in url"
 msgstr "網址中的使用者或主機無法使用"
 
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: ../camel/providers/groupwise/camel-groupwise-store.c:206
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1357
 msgid "You did not enter a password."
 msgstr "您沒有輸入密碼。"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:302
+#: ../camel/providers/groupwise/camel-groupwise-store.c:303
 msgid "Some features may not work correctly with your current server version"
 msgstr "某些功能可能無法在您目前的伺服器版本上正常運作"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../camel/providers/groupwise/camel-groupwise-store.c:532
-#: ../camel/providers/imap/camel-imap-store.c:1846
-#: ../camel/providers/imap/camel-imap-store.c:2044
+#: ../camel/providers/groupwise/camel-groupwise-store.c:524
+#: ../camel/providers/imap/camel-imap-store.c:1849
+#: ../camel/providers/imap/camel-imap-store.c:2047
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1219
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "在離線模式中不能建構 GroupWise 資料夾。"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1233
-#: ../camel/providers/imap/camel-imap-store.c:1921
-#: ../camel/providers/imap/camel-imap-store.c:2301
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
+#: ../camel/providers/imap/camel-imap-store.c:1924
+#: ../camel/providers/imap/camel-imap-store.c:2304
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "母資料夾並不允許包含子資料夾"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#, c-format
+msgid "Cannot rename GroupWise folder '%s' to '%s'"
+msgstr "不能將 GroupWise 資料夾「%s」重新命名為「%s」"
+
 # shell/e-shortcuts-view.c:137
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1362
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:121
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise 伺服器 %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1364
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "%s 的 GroupWise 服務於 %s"
@@ -3939,7 +3298,7 @@ msgstr "經由 %s 傳送 GroupWise 郵件"
 # mail/mail-ops.c:603
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:167
 msgid "Sending Message"
-msgstr "傳送郵件"
+msgstr "正在傳送郵件"
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:221
 msgid ""
@@ -4024,6 +3383,16 @@ msgstr "用於存取 Hula 伺服器"
 msgid "This option will connect to the Hula server using a plaintext password."
 msgstr "這個選項將會使用簡易的密碼連線至 Hula 伺服器。"
 
+#: ../camel/providers/imap/camel-imap-command.c:183
+#: ../camel/providers/imap/camel-imap-command.c:267
+msgid "No output stream"
+msgstr "沒有輸出串流"
+
+#: ../camel/providers/imap/camel-imap-command.c:188
+#: ../camel/providers/imap/camel-imap-command.c:272
+msgid "No input stream"
+msgstr "沒有輸入串流"
+
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
@@ -4031,13 +3400,13 @@ msgstr "這個選項將會使用簡易的密碼連線至 Hula 伺服器。"
 #: ../camel/providers/imap/camel-imap-command.c:231
 #: ../camel/providers/imap/camel-imap-command.c:280
 #: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3029
+#: ../camel/providers/imap/camel-imap-store.c:3037
 msgid "Operation cancelled"
-msgstr "作業已取消"
+msgstr "操作程序已取消"
 
 # camel/camel-remote-store.c:476
 #: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3032
+#: ../camel/providers/imap/camel-imap-store.c:3040
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "伺服器突然中斷連線: %s"
@@ -4084,77 +3453,114 @@ msgid "Unexpected OK response from IMAP server: %s"
 msgstr "從 IMAP 伺服器傳回不當的 OK 回應: %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: ../camel/providers/imap/camel-imap-folder.c:88
+#: ../camel/providers/imap/camel-imap-folder.c:89
 msgid "Always check for new mail in this folder"
-msgstr "永遠檢查資料夾中是否有新郵件"
+msgstr "永遠檢查這個資料夾中是否有新郵件"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: ../camel/providers/imap/camel-imap-folder.c:229
+#: ../camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "無法建構目錄 %s: %s"
+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:843
+#: ../camel/providers/imap/camel-imap-folder.c:888
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "掃描 %s 中變更過的郵件"
 
+#: ../camel/providers/imap/camel-imap-folder.c:1926
+#, c-format
+msgid "Unexpected response status '%s' after APPEND command"
+msgstr "在 APPEND 指令後傳回未預期的回應狀態「%s」"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1941
+msgid "No response on continuation after APPEND command"
+msgstr "在 APPEND 指令後沒有持續回應"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1983
+msgid "Unknown error occurred during APPEND command!"
+msgstr "在 APPEND 指令期間發生未知的錯誤!"
+
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../camel/providers/imap/camel-imap-folder.c:2707
+#: ../camel/providers/imap/camel-imap-folder.c:2813
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "無法從取回郵件: %s"
 
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#: ../camel/providers/imap/camel-imap-folder.c:2848
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "無法取得郵件 ID 為 %s 的郵件: %s"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+#: ../camel/providers/imap/camel-imap-folder.c:2849
+msgid "No such message available."
+msgstr "沒有這個郵件。"
+
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: ../camel/providers/imap/camel-imap-folder.c:2788
-#: ../camel/providers/imap/camel-imap-folder.c:3540
-#: ../camel/providers/nntp/camel-nntp-folder.c:220
+#: ../camel/providers/imap/camel-imap-folder.c:2903
+#: ../camel/providers/imap/camel-imap-folder.c:3712
+#: ../camel/providers/nntp/camel-nntp-folder.c:239
 msgid "This message is not currently available"
 msgstr "這封郵件目前仍未可用"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3367
+#: ../camel/providers/imap/camel-imap-folder.c:3538
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "不完整的伺服器回應:未提供任何資訊給訊息 %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3375
+#: ../camel/providers/imap/camel-imap-folder.c:3546
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "不完整的伺服器回應:未提供 UID 給訊息 %d"
 
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: ../camel/providers/imap/camel-imap-folder.c:3578
+#: ../camel/providers/imap/camel-imap-folder.c:3750
 msgid "Could not find message body in FETCH response."
 msgstr "在 FETCH 的回應內找不到郵件的內文。"
 
 # camel/providers/imap/camel-imap-message-cache.c:150
-#: ../camel/providers/imap/camel-imap-message-cache.c:160
-#: ../camel/providers/imap/camel-imap-message-cache.c:220
+#: ../camel/providers/imap/camel-imap-message-cache.c:182
+#: ../camel/providers/imap/camel-imap-message-cache.c:246
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "無法開啟快取目錄:%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/providers/imap/camel-imap-message-cache.c:307
-#: ../camel/providers/imap/camel-imap-message-cache.c:364
-#: ../camel/providers/imap/camel-imap-message-cache.c:395
-#: ../camel/providers/imap/camel-imap-message-cache.c:427
+#: ../camel/providers/imap/camel-imap-message-cache.c:333
+#: ../camel/providers/imap/camel-imap-message-cache.c:390
+#: ../camel/providers/imap/camel-imap-message-cache.c:421
+#: ../camel/providers/imap/camel-imap-message-cache.c:453
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "快取郵件 %s 失敗: %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/providers/imap/camel-imap-message-cache.c:478
+#: ../camel/providers/imap/camel-imap-message-cache.c:533
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "快取 %s 失敗: %s"
 
+# camel/providers/imap/camel-imap-provider.c:45
+#: ../camel/providers/imap/camel-imap-provider.c:48
+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:50
@@ -4165,7 +3571,7 @@ msgstr "命名空間"
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imap4/camel-imap4-provider.c:54
 msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "å°\87é\81\8e濾å\99¨å¥\97ç\94¨æ\96¼æ­¤ä¼ºæ\9c\8då\99¨ç\9a\84收件匣的新郵件(_A)"
+msgstr "å¥\97ç\94¨é\81\8e濾æ¢\9d件è\87³æ­¤ä¼ºæ\9c\8då\99¨收件匣的新郵件(_A)"
 
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../camel/providers/imap/camel-imap-provider.c:72
@@ -4195,14 +3601,14 @@ 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:436
+#: ../camel/providers/imap/camel-imap-store.c:437
 #: ../camel/providers/imap4/camel-imap4-store.c:214
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 伺服器 %s"
 
 # camel/camel-remote-store.c:195
-#: ../camel/providers/imap/camel-imap-store.c:438
+#: ../camel/providers/imap/camel-imap-store.c:439
 #: ../camel/providers/imap4/camel-imap4-store.c:216
 #, c-format
 msgid "IMAP service for %s on %s"
@@ -4210,39 +3616,39 @@ msgstr "%s 的 IMAP 服務於 %s"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap/camel-imap-store.c:582
+#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imap/camel-imap-store.c:583
 #: ../camel/providers/imap4/camel-imap4-store.c:251
 #: ../camel/providers/imap4/camel-imap4-store.c:266
 #: ../camel/providers/nntp/camel-nntp-store.c:183
 #: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:171
-#: ../camel/providers/pop3/camel-pop3-store.c:185
+#: ../camel/providers/pop3/camel-pop3-store.c:172
+#: ../camel/providers/pop3/camel-pop3-store.c:186
 #: ../camel/providers/smtp/camel-smtp-transport.c:260
 #: ../camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s: %s"
-msgstr "無法連線至 %s : %s"
+msgstr "無法連接到 %s:%s"
 
-#: ../camel/providers/imap/camel-imap-store.c:568
+#: ../camel/providers/imap/camel-imap-store.c:569
 #: ../camel/providers/imap4/camel-imap4-store.c:252
 #: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:172
+#: ../camel/providers/pop3/camel-pop3-store.c:173
 #: ../camel/providers/smtp/camel-smtp-transport.c:261
 msgid "SSL unavailable"
-msgstr "TLS 無法使用"
+msgstr "SSL 無法使用"
 
 # camel/camel-remote-store.c:252
-#: ../camel/providers/imap/camel-imap-store.c:579
-#: ../camel/providers/imap/camel-imap-store.c:861
+#: ../camel/providers/imap/camel-imap-store.c:580
+#: ../camel/providers/imap/camel-imap-store.c:862
 msgid "Connection cancelled"
 msgstr "連線已取消"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap/camel-imap-store.c:741
+#: ../camel/providers/imap/camel-imap-store.c:691
+#: ../camel/providers/imap/camel-imap-store.c:710
+#: ../camel/providers/imap/camel-imap-store.c:716
+#: ../camel/providers/imap/camel-imap-store.c:742
 #: ../camel/providers/imap4/camel-imap4-store.c:314
 #: ../camel/providers/imap4/camel-imap4-store.c:329
 #: ../camel/providers/imap4/camel-imap4-store.c:338
@@ -4251,18 +3657,18 @@ 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:691
+#: ../camel/providers/imap/camel-imap-store.c:692
 #: ../camel/providers/smtp/camel-smtp-transport.c:333
 msgid "STARTTLS not supported"
 msgstr "不支援 STARTTLS"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../camel/providers/imap/camel-imap-store.c:710
+#: ../camel/providers/imap/camel-imap-store.c:711
 msgid "SSL negotiations failed"
 msgstr "SSL 協商失敗"
 
-#: ../camel/providers/imap/camel-imap-store.c:716
+#: ../camel/providers/imap/camel-imap-store.c:717
 #: ../camel/providers/imap4/camel-imap4-store.c:339
 #: ../camel/providers/smtp/camel-smtp-transport.c:372
 msgid "SSL is not available in this build"
@@ -4270,18 +3676,18 @@ msgstr "此一版本並未啟用 SSL"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: ../camel/providers/imap/camel-imap-store.c:864
+#: ../camel/providers/imap/camel-imap-store.c:865
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "無法以指令「%s」連線: %s"
 
 # mail/local-config.glade.h:8
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1052
-#: ../camel/providers/imap/camel-imap-store.c:2397
+#: ../camel/providers/imap/camel-imap-store.c:1053
+#: ../camel/providers/imap/camel-imap-store.c:2400
 #: ../camel/providers/imap4/camel-imap4-store-summary.c:368
 #: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:77
+#: ../camel/providers/local/camel-maildir-folder.c:78
 #: ../camel/providers/local/camel-maildir-store.c:219
 #: ../camel/providers/local/camel-maildir-store.c:291
 #: ../camel/providers/local/camel-maildir-store.c:517
@@ -4291,35 +3697,35 @@ msgstr "無法以指令「%s」連線: %s"
 msgid "Inbox"
 msgstr "收件匣"
 
-#: ../camel/providers/imap/camel-imap-store.c:1054
+#: ../camel/providers/imap/camel-imap-store.c:1055
 #: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
 msgid "Drafts"
 msgstr "草稿"
 
-#: ../camel/providers/imap/camel-imap-store.c:1056
+#: ../camel/providers/imap/camel-imap-store.c:1057
 msgid "Sent"
 msgstr "已傳送"
 
-#: ../camel/providers/imap/camel-imap-store.c:1058
+#: ../camel/providers/imap/camel-imap-store.c:1059
 msgid "Templates"
 msgstr "範本"
 
 # camel/providers/imap/camel-imap-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1304
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 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:1313
+#: ../camel/providers/imap/camel-imap-store.c:1314
 #: ../camel/providers/smtp/camel-smtp-transport.c:507
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支援驗證類型 %s"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: ../camel/providers/imap/camel-imap-store.c:1385
+#: ../camel/providers/imap/camel-imap-store.c:1388
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -4330,16 +3736,26 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1858
-#: ../camel/providers/imap/camel-imap-store.c:2239
+#: ../camel/providers/imap/camel-imap-store.c:1861
+#: ../camel/providers/imap/camel-imap-store.c:2242
 #: ../camel/providers/imap4/camel-imap4-store.c:959
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "資料夾名稱「%s」無效,因為它包括字元「%c」"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap/camel-imap-store.c:1978
+#: ../camel/providers/local/camel-maildir-store.c:192
+#: ../camel/providers/local/camel-mbox-store.c:204
+#: ../camel/providers/local/camel-mh-store.c:249
+#, c-format
+msgid "Cannot create folder '%s': folder exists."
+msgstr "不能建立資料夾「%s」:資料夾已存在。"
+
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/imap/camel-imap-store.c:2250
+#: ../camel/providers/imap/camel-imap-store.c:2253
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "不明的母資料夾: %s"
@@ -4363,6 +3779,30 @@ msgstr "IMAP4 伺服器 %s 非預期的回應:%s"
 msgid "Unexpected greeting from IMAP server %s."
 msgstr "IMAP 伺服器 %s 非預期的問候語。"
 
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#, c-format
+msgid "Cannot select folder '%s': Invalid mailbox name"
+msgstr "無法選取資料夾「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-engine.c:456
+#, c-format
+msgid "Cannot select folder '%s': Bad command"
+msgstr "無法選取資料夾「%s」:錯誤的指令"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/imap4/camel-imap4-engine.c:1433
+#, c-format
+msgid "Failed to send command to IMAP server %s: %s"
+msgstr "傳送指令至 IMAP 伺服器 %s 失敗:%s"
+
+#: ../camel/providers/imap4/camel-imap4-engine.c:1435
+msgid "service unavailable"
+msgstr "服務無法使用"
+
 # camel/camel-remote-store.c:476
 #: ../camel/providers/imap4/camel-imap4-engine.c:1569
 #: ../camel/providers/imap4/camel-imap4-engine.c:1608
@@ -4372,10 +3812,128 @@ msgstr "IMAP 伺服器 %s 非預期的問候語。"
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr "IMAP4 伺服器 %s 意外中斷連線:%s"
 
+#: ../camel/providers/imap4/camel-imap4-folder.c:89
+msgid ""
+"Enable extended Mailing-List detection required for some filter and vFolder "
+"rules"
+msgstr "啟用某些過濾器和虛擬資料夾規則所要求的通信論壇偵測"
+
+#: ../camel/providers/imap4/camel-imap4-folder.c:90
+msgid "Expire cached messages that haven't been read in X seconds"
+msgstr "在 X 秒內未閱讀的逾期快取訊息"
+
+#: ../camel/providers/imap4/camel-imap4-folder.c:91
+msgid "Expire cached messages older than X seconds"
+msgstr "早於 X 秒的逾期快取訊息"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-folder.c:432
+#, c-format
+msgid "Cannot access folder '%s': %s"
+msgstr "不能存取資料夾「%s」:%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-folder.c:491
+#, c-format
+msgid "Cannot sync flags to folder '%s': Unknown error"
+msgstr "不能同步旗標至資料夾「%s」:未知的錯誤"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-folder.c:497
+#, c-format
+msgid "Cannot sync flags to folder '%s': Bad command"
+msgstr "不能同步旗標至資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-folder.c:637
+#, c-format
+msgid "Cannot expunge folder '%s': Unknown error"
+msgstr "不能清空資料夾「%s」:未知的錯誤"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-folder.c:642
+#, c-format
+msgid "Cannot expunge folder '%s': Bad command"
+msgstr "不能清空資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:898
+#, c-format
+msgid "Cannot get message %s from folder '%s': No such message"
+msgstr "不能取得從資料夾「%2$s」取得郵件 %1$s:沒有此郵件"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:903
+#, c-format
+msgid "Cannot get message %s from folder '%s': Bad command"
+msgstr "不能取得從資料夾「%2$s」取得郵件 %1$s:錯誤的指令"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: ../camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot append message to folder '%s': Folder is read-only"
+msgstr "不能將郵件附加到資料夾「%s」:資料夾是唯讀的"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: ../camel/providers/imap4/camel-imap4-folder.c:1040
+#, c-format
+msgid "Cannot append message to folder '%s': Unknown error"
+msgstr "不能將郵件附加到資料夾「%s」:未知的錯誤"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: ../camel/providers/imap4/camel-imap4-folder.c:1070
+#, c-format
+msgid "Cannot append message to folder '%s': Bad command"
+msgstr "不能將郵件附加到資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:1190
+#, c-format
+msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+msgstr "不能從資料夾「%s」移動郵件至資料夾「%s」:未知的錯誤"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:1194
+#, c-format
+msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+msgstr "不能從資料夾「%s」複製郵件至資料夾「%s」:未知的錯誤"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:1202
+#, c-format
+msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+msgstr "不能從資料夾「%s」移動郵件至資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/imap4/camel-imap4-folder.c:1206
+#, c-format
+msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+msgstr "不能從資料夾「%s」複製郵件至資料夾「%s」:錯誤的指令"
+
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../camel/providers/imap4/camel-imap4-provider.c:56
 msgid "Check new messages for _Junk contents"
-msgstr "檢查新訊息中是否有「垃圾郵件」內容(_J)"
+msgstr "檢查新郵件中是否有垃圾郵件(_J)"
 
 # camel/providers/imap/camel-imap-provider.c:45
 #: ../camel/providers/imap4/camel-imap4-provider.c:58
@@ -4403,7 +3961,7 @@ msgstr "此選項會使用純文字密碼,連線到 IMAPv4rev1 伺服器。"
 #: ../camel/providers/imapp/camel-imapp-store.c:249
 #: ../camel/providers/nntp/camel-nntp-store.c:195
 #: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/pop3/camel-pop3-store.c:183
 #: ../camel/providers/smtp/camel-smtp-transport.c:272
 msgid "Connection canceled"
 msgstr "連線已取消"
@@ -4419,7 +3977,7 @@ msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了: 伺服器不
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:250
+#: ../camel/providers/pop3/camel-pop3-store.c:251
 msgid "TLS negotiations failed"
 msgstr "TLS 協商失敗"
 
@@ -4442,39 +4000,139 @@ msgstr "無法驗證 IMAP 伺服器 %s (使用 %s)"
 msgid "Cannot create IMAP folders in offline mode."
 msgstr "在離線模式中無法建構 IMAP 資料夾。"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-store.c:740
+#, c-format
+msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+msgstr "不能從 IMAP 伺服器 %2$s 取得資料夾「%1$s」:未知的錯誤"
+
+#: ../camel/providers/imap4/camel-imap4-store.c:821
+#, c-format
+msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+msgstr "不能從 IMAP 伺服器 %2$s 取得「%1$s」的 LIST 資訊 :%3$s"
+
 # addressbook/contact-editor/e-contact-editor.c:1248
 #: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#: ../camel/providers/imap4/camel-imap4-store.c:1579
 msgid "Bad command"
 msgstr "錯誤的指令"
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: ../camel/providers/imap4/camel-imap4-store.c:902
+#, c-format
+msgid "Cannot create folder '%s': Invalid mailbox name"
+msgstr "不能建立資料夾「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-store.c:907
+#, c-format
+msgid "Cannot create folder '%s': Bad command"
+msgstr "不能建立資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-store.c:1013
+#, c-format
+msgid "Cannot delete folder '%s': Special folder"
+msgstr "不能刪除資料夾「%s」:特殊的資料夾"
+
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
 #: ../camel/providers/imap4/camel-imap4-store.c:1020
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "在離線模式中無法刪除 IMAP 資料夾。"
 
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#, c-format
+msgid "Cannot delete folder '%s': Invalid mailbox name"
+msgstr "不能刪除資料夾「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-store.c:1084
+#, c-format
+msgid "Cannot delete folder '%s': Bad command"
+msgstr "不能刪除資料夾「%s」:錯誤的指令"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-store.c:1104
+#, c-format
+msgid "Cannot rename folder '%s' to '%s': Special folder"
+msgstr "不能將資料夾「%s」重新命名為「%s」:特殊的資料夾"
+
 # camel/providers/local/camel-local-store.c:237
 #: ../camel/providers/imap4/camel-imap4-store.c:1111
 msgid "Cannot rename IMAP folders in offline mode."
 msgstr "在離線模式中無法重新命名 IMAP 資料夾。"
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#, c-format
+msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+msgstr "不能將資料夾「%s」重新命名為「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-store.c:1147
+#, c-format
+msgid "Cannot rename folder '%s' to '%s': Bad command"
+msgstr "不能將資料夾「%s」重新命名為「%s」:錯誤的指令"
+
+#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
+#. * The fourth one is an error message.
+#: ../camel/providers/imap4/camel-imap4-store.c:1577
+#, c-format
+msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+msgstr "無法於 IMAP 伺服器 %3$s 取得樣式「%2$s」的 %1$s 資訊:%4$s"
+
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1636
+#: ../camel/providers/imap4/camel-imap4-store.c:1638
 msgid "Cannot subscribe to IMAP folders in offline mode."
 msgstr "在離線模式中無法訂閱 IMAP 資料夾。"
 
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/imap4/camel-imap4-store.c:1683
+#, c-format
+msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+msgstr "不能訂閱資料夾「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-store.c:1688
+#, c-format
+msgid "Cannot subscribe to folder '%s': Bad command"
+msgstr "不能訂閱資料夾「%s」:錯誤的指令"
+
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/imap4/camel-imap4-store.c:1708
+#: ../camel/providers/imap4/camel-imap4-store.c:1710
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr "在離線模式中無法取消訂閱 IMAP 資料夾。"
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: ../camel/providers/imap4/camel-imap4-store.c:1755
+#, c-format
+msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+msgstr "不能取消訂閱資料夾「%s」:無效的信箱名稱"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/imap4/camel-imap4-store.c:1760
+#, c-format
+msgid "Cannot unsubscribe from folder '%s': Bad command"
+msgstr "不能取消訂閱資料夾「%s」:錯誤的指令"
+
 # mail/mail-ops.c:1649
 #: ../camel/providers/imap4/camel-imap4-summary.c:1596
 msgid "Scanning for changed messages"
-msgstr "掃描變更過的郵件"
+msgstr "掃描已變更的郵件"
 
 #: ../camel/providers/imap4/camel-imap4-summary.c:1617
 #, c-format
@@ -4541,30 +4199,34 @@ 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:174
+#: ../camel/providers/local/camel-local-folder.c:176
 msgid "Index message body data"
 msgstr "傳送郵件給連絡人"
 
 #. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:390
+#: ../camel/providers/local/camel-local-folder.c:392
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 # camel/providers/local/camel-mbox-folder.c:203
 #. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:394
-#: ../camel/providers/local/camel-local-folder.c:397
+#: ../camel/providers/local/camel-local-folder.c:396
+#: ../camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:401
+#: ../camel/providers/local/camel-local-folder.c:403
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../camel/providers/local/camel-local-provider.c:48
+msgid "_Use the '.folders' folder summary file (exmh)"
+msgstr "使用「.folders」資料夾摘要檔案[exmh](_U)"
+
 # camel/providers/local/camel-local-provider.c:39
 #: ../camel/providers/local/camel-local-provider.c:55
 msgid "MH-format mail directories"
@@ -4626,8 +4288,8 @@ msgid "Standard Unix mbox spool directory"
 msgstr "標準 Unix mbox 排程器目錄"
 
 # camel/providers/local/camel-local-store.c:127
-#: ../camel/providers/local/camel-local-store.c:171
-#: ../camel/providers/local/camel-local-store.c:282
+#: ../camel/providers/local/camel-local-store.c:165
+#: ../camel/providers/local/camel-local-store.c:276
 #: ../camel/providers/local/camel-mbox-store.c:359
 #: ../camel/providers/local/camel-spool-store.c:129
 #, c-format
@@ -4635,58 +4297,72 @@ msgid "Store root %s is not an absolute path"
 msgstr "儲存根目錄 %s 不是絕對路徑"
 
 # camel/providers/local/camel-local-store.c:134
-#: ../camel/providers/local/camel-local-store.c:178
+#: ../camel/providers/local/camel-local-store.c:172
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "儲存根目錄 %s 不是合法的目錄"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:195
-#: ../camel/providers/local/camel-local-store.c:293
+#: ../camel/providers/local/camel-local-store.c:181
+#: ../camel/providers/local/camel-local-store.c:189
+#: ../camel/providers/local/camel-local-store.c:287
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "不能取得資料夾:%s:%s"
 
 # camel/providers/local/camel-local-store.c:173
-#: ../camel/providers/local/camel-local-store.c:207
+#: ../camel/providers/local/camel-local-store.c:201
 msgid "Local stores do not have an inbox"
 msgstr "本地端的存儲沒有收件匣"
 
 # camel/providers/local/camel-local-store.c:183
-#: ../camel/providers/local/camel-local-store.c:253
+#: ../camel/providers/local/camel-local-store.c:247
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地端郵件檔案 %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: ../camel/providers/local/camel-local-store.c:348
+#: ../camel/providers/local/camel-local-store.c:342
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "無法將資料夾 %s 重新命名為 %s: %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-local-store.c:416
+#: ../camel/providers/local/camel-local-store.c:410
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "無法重新命名「%s」:%s "
 
+# camel/providers/local/camel-local-store.c:289
+#: ../camel/providers/local/camel-local-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:300
+#, c-format
+msgid "Could not delete folder index file '%s': %s"
+msgstr "不能刪除資料夾索引檔案「%s」: %s"
+
+# camel/providers/local/camel-local-store.c:279
+#: ../camel/providers/local/camel-local-store.c:458
+#: ../camel/providers/local/camel-mbox-store.c:324
+#, c-format
+msgid "Could not delete folder meta file '%s': %s"
+msgstr "不能刪除資料夾中繼檔案「%s」:%s"
+
 # camel/providers/local/camel-local-summary.c:404
-#: ../camel/providers/local/camel-local-summary.c:506
+#: ../camel/providers/local/camel-local-summary.c:508
 msgid "Unable to add message to summary: unknown reason"
 msgstr "無法新增郵件到摘要資訊:不明的原因"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../camel/providers/local/camel-maildir-folder.c:220
+#: ../camel/providers/local/camel-maildir-folder.c:222
 msgid "Maildir append message canceled"
 msgstr "Maildir 增添郵件已取消"
 
 # camel/providers/local/camel-maildir-folder.c:150
 # camel/providers/local/camel-maildir-folder.c:158
 # camel/providers/local/camel-maildir-folder.c:169
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:225
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "無法將郵件儲存到 maildir 資料夾: %s: %s"
@@ -4694,16 +4370,18 @@ msgstr "無法將郵件儲存到 maildir 資料夾: %s: %s"
 # camel/providers/local/camel-mbox-folder.c:335
 # camel/providers/local/camel-mbox-folder.c:367
 # camel/providers/local/camel-mbox-folder.c:380
-#: ../camel/providers/local/camel-maildir-folder.c:250
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:273
-#: ../camel/providers/local/camel-mbox-folder.c:348
-#: ../camel/providers/local/camel-mbox-folder.c:369
-#: ../camel/providers/local/camel-mbox-folder.c:400
-#: ../camel/providers/local/camel-mbox-folder.c:408
-#: ../camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-mh-folder.c:214
-#: ../camel/providers/local/camel-mh-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:247
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:288
+#: ../camel/providers/local/camel-maildir-folder.c:297
+#: ../camel/providers/local/camel-mbox-folder.c:346
+#: ../camel/providers/local/camel-mbox-folder.c:398
+#: ../camel/providers/local/camel-mbox-folder.c:419
+#: ../camel/providers/local/camel-mbox-folder.c:450
+#: ../camel/providers/local/camel-mbox-folder.c:458
+#: ../camel/providers/local/camel-mh-folder.c:213
+#: ../camel/providers/local/camel-mh-folder.c:224
+#: ../camel/providers/local/camel-mh-folder.c:233
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4714,53 +4392,107 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:298
 msgid "Invalid message contents"
 msgstr "無效的郵件內文"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:148
+#: ../camel/providers/local/camel-maildir-store.c:173
+#: ../camel/providers/local/camel-mbox-store.c:176
+#: ../camel/providers/local/camel-mbox-store.c:188
+#, c-format
+msgid "Cannot create folder '%s': %s"
+msgstr "不能建立資料夾「%s」:%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-maildir-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mh-store.c:217
+#, c-format
+msgid "Cannot get folder '%s': %s"
+msgstr "不能建立資料夾「%s」:%s"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../camel/providers/local/camel-maildir-store.c:165
+#: ../camel/providers/local/camel-mbox-store.c:155
+#: ../camel/providers/local/camel-mh-store.c:224
+#, c-format
+msgid "Cannot get folder '%s': folder does not exist."
+msgstr "不能取得資料夾「%s」:資料夾不存在。"
+
+# camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-maildir-store.c:189
+#, c-format
+msgid "Cannot get folder '%s': not a maildir directory."
+msgstr "不能取得資料夾「%s」:不是 maildir 目錄。"
+
+# camel/providers/local/camel-maildir-store.c:151
+# camel/providers/local/camel-maildir-store.c:188
+# camel/providers/local/camel-mh-store.c:127
+#: ../camel/providers/local/camel-maildir-store.c:234
+#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/providers/local/camel-mh-store.c:273
+#, c-format
+msgid "Could not delete folder '%s': %s"
+msgstr "無法刪除資料夾「%s」:%s"
+
 # camel/providers/local/camel-maildir-store.c:152
 #: ../camel/providers/local/camel-maildir-store.c:236
 msgid "not a maildir directory"
 msgstr "不是一個 maildir 目錄"
 
+# camel/providers/local/camel-maildir-store.c:107
+# camel/providers/local/camel-mh-store.c:103
+#: ../camel/providers/local/camel-maildir-store.c:440
+#: ../camel/providers/local/camel-spool-store.c:331
+#: ../camel/providers/local/camel-spool-store.c:345
+#, c-format
+msgid "Could not scan folder '%s': %s"
+msgstr "無法掃描資料夾「%s」:%s"
+
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: ../camel/providers/local/camel-maildir-summary.c:433
-#: ../camel/providers/local/camel-maildir-summary.c:567
+#: ../camel/providers/local/camel-maildir-summary.c:439
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "不能開啟 maildir 目錄路徑:%s: %s"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: ../camel/providers/local/camel-maildir-summary.c:560
+#: ../camel/providers/local/camel-maildir-summary.c:551
 msgid "Checking folder consistency"
 msgstr "檢查資料夾的一致性"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/local/camel-maildir-summary.c:664
+#: ../camel/providers/local/camel-maildir-summary.c:656
 msgid "Checking for new messages"
 msgstr "檢查新郵件"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: ../camel/providers/local/camel-maildir-summary.c:756
-#: ../camel/providers/local/camel-mbox-summary.c:520
-#: ../camel/providers/local/camel-mbox-summary.c:693
-#: ../camel/providers/local/camel-mbox-summary.c:790
-#: ../camel/providers/local/camel-spool-summary.c:141
+#: ../camel/providers/local/camel-maildir-summary.c:742
+#: ../camel/providers/local/camel-mbox-summary.c:529
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-spool-summary.c:148
 msgid "Storing folder"
 msgstr "儲存資料夾"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: ../camel/providers/local/camel-mbox-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:159
 #: ../camel/providers/local/camel-spool-folder.c:150
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "不能建構資料夾鎖定 %s : %s"
 
 # camel/providers/local/camel-mbox-folder.c:203
-#: ../camel/providers/local/camel-mbox-folder.c:217
+#: ../camel/providers/local/camel-mbox-folder.c:220
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "不能開啟 mailbox:%s: %s\n"
@@ -4769,24 +4501,24 @@ msgstr "不能開啟 mailbox:%s: %s\n"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/local/camel-mbox-folder.c:279
+#: ../camel/providers/local/camel-mbox-folder.c:281
 msgid "Mail append canceled"
 msgstr "郵件增添已取消"
 
 # camel/providers/local/camel-mbox-folder.c:259
-#: ../camel/providers/local/camel-mbox-folder.c:282
+#: ../camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "不能將郵件儲存到 mbox 檔案: %s: %s"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: ../camel/providers/local/camel-mbox-folder.c:401
+#: ../camel/providers/local/camel-mbox-folder.c:451
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "資料夾好像已經損毀並且不能復原。"
 
 # camel/providers/local/camel-mbox-folder.c:381
-#: ../camel/providers/local/camel-mbox-folder.c:409
-#: ../camel/providers/local/camel-mh-folder.c:224
+#: ../camel/providers/local/camel-mbox-folder.c:459
+#: ../camel/providers/local/camel-mh-folder.c:234
 msgid "Message construction failed."
 msgstr "訊息結構失敗。"
 
@@ -4796,6 +4528,52 @@ msgstr "訊息結構失敗。"
 msgid "Cannot create a folder by this name."
 msgstr "無法建構以此為名的資料夾"
 
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#: ../camel/providers/local/camel-mbox-store.c:198
+#, c-format
+msgid "Cannot get folder '%s': not a regular file."
+msgstr "不能取得資料夾「%s」:不是一般檔案。"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:228
+#: ../camel/providers/local/camel-mbox-store.c:239
+#: ../camel/providers/local/camel-mbox-store.c:262
+#, c-format
+msgid ""
+"Could not delete folder '%s':\n"
+"%s"
+msgstr ""
+"無法刪除資料夾「%s」:\n"
+"%s"
+
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#: ../camel/providers/local/camel-mbox-store.c:247
+#, c-format
+msgid "'%s' is not a regular file."
+msgstr "「%s」不是普通的檔案。"
+
+# camel/providers/local/camel-mbox-store.c:153
+#: ../camel/providers/local/camel-mbox-store.c:254
+#, c-format
+msgid "Folder '%s' is not empty. Not deleted."
+msgstr "資料夾「%s」內仍有檔案。所以不刪除。"
+
+# camel/providers/local/camel-local-store.c:279
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:288
+#, c-format
+msgid "Could not delete folder summary file '%s': %s"
+msgstr "無法刪除資料夾摘要檔案「%s」: %s"
+
+# camel/providers/imap/camel-imap-folder.c:172
+#: ../camel/providers/local/camel-mbox-store.c:378
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "不能建立目錄「%s」: %s。"
+
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
 #: ../camel/providers/local/camel-mbox-store.c:392
@@ -4812,6 +4590,12 @@ msgstr "資料夾已存在"
 msgid "The new folder name is illegal."
 msgstr "指定的資料夾名稱不合法: %s"
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: ../camel/providers/local/camel-mbox-store.c:498
+#, c-format
+msgid "Could not rename '%s': '%s': %s"
+msgstr "無法重新命名「%s」:「%s」:%s"
+
 # camel/providers/local/camel-local-store.c:237
 #: ../camel/providers/local/camel-mbox-store.c:579
 #, c-format
@@ -4820,115 +4604,184 @@ msgstr "無法將 '%s' 重新命名成 %s:%s"
 
 # camel/providers/local/camel-maildir-store.c:96
 # camel/providers/local/camel-mh-store.c:90
-#: ../camel/providers/local/camel-mbox-summary.c:526
+#: ../camel/providers/local/camel-mbox-summary.c:535
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "無法開啟資料夾: %s: %s"
 
 # camel/providers/local/camel-mbox-summary.c:296
-#: ../camel/providers/local/camel-mbox-summary.c:574
+#: ../camel/providers/local/camel-mbox-summary.c:585
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "靠近 %ld (於資料夾 %s)的位置發生嚴重的郵件分析錯誤"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/local/camel-mbox-summary.c:630
+#: ../camel/providers/local/camel-mbox-summary.c:648
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "不能檢查資料夾:%s: %s"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: ../camel/providers/local/camel-mbox-summary.c:698
-#: ../camel/providers/local/camel-mbox-summary.c:795
-#: ../camel/providers/local/camel-spool-summary.c:146
+#: ../camel/providers/local/camel-mbox-summary.c:716
+#: ../camel/providers/local/camel-mbox-summary.c:836
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "無法開啟檔案: %s: %s"
 
 # camel/providers/local/camel-mbox-summary.c:524
-#: ../camel/providers/local/camel-mbox-summary.c:710
-#: ../camel/providers/local/camel-spool-summary.c:159
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-spool-summary.c:166
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "不能開啟暫存 mailbox:%s"
 
 # camel/providers/local/camel-mbox-summary.c:635
 # camel/providers/local/camel-mbox-summary.c:804
-#: ../camel/providers/local/camel-mbox-summary.c:723
-#: ../camel/providers/local/camel-mbox-summary.c:942
+#: ../camel/providers/local/camel-mbox-summary.c:741
+#: ../camel/providers/local/camel-mbox-summary.c:945
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "無法關閉來源資料夾 %s : %s"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/local/camel-mbox-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:750
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "無法關閉暫存資料夾: %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:747
+#: ../camel/providers/local/camel-mbox-summary.c:765
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "無法重新命名資料夾:%s "
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: ../camel/providers/local/camel-mbox-summary.c:806
-#: ../camel/providers/local/camel-mbox-summary.c:1146
+#: ../camel/providers/local/camel-mbox-summary.c:847
+#: ../camel/providers/local/camel-mbox-summary.c:1075
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "無法儲存資料夾:%s "
 
-#: ../camel/providers/local/camel-mbox-summary.c:853
-#: ../camel/providers/local/camel-mbox-summary.c:882
-#: ../camel/providers/local/camel-mbox-summary.c:1188
-#: ../camel/providers/local/camel-mbox-summary.c:1217
-msgid "Detected a corrupt mbox file or an invalid 'From' header"
-msgstr "偵測到一個損壞的 mbox 檔案或無效的「From」標頭"
+# camel/providers/local/camel-mbox-summary.c:549
+# camel/providers/local/camel-mbox-summary.c:557
+# camel/providers/local/camel-mbox-summary.c:746
+# camel/providers/local/camel-mbox-summary.c:754
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:894
+#: ../camel/providers/local/camel-mbox-summary.c:1105
+#: ../camel/providers/local/camel-mbox-summary.c:1113
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "摘要與資料夾不協調,即使經過同步"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: ../camel/providers/local/camel-mbox-summary.c:1035
-#: ../camel/providers/local/camel-spool-summary.c:327
+#: ../camel/providers/local/camel-mbox-summary.c:1038
+#: ../camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "不明的錯誤: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1071
-#, c-format
-msgid "Folder %s cannot be opened: %s"
-msgstr "不能開啟資料夾 %s: %s"
-
 # camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1282
-#: ../camel/providers/local/camel-mbox-summary.c:1308
+#: ../camel/providers/local/camel-mbox-summary.c:1181
+#: ../camel/providers/local/camel-mbox-summary.c:1207
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "寫入暫存郵箱失敗:  %s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: ../camel/providers/local/camel-mbox-summary.c:1299
+#: ../camel/providers/local/camel-mbox-summary.c:1198
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "寫入暫存郵箱失敗: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:176
+#: ../camel/providers/local/camel-mh-folder.c:178
 msgid "MH append message canceled"
 msgstr "MH 增添郵件已取消"
 
 # camel/providers/local/camel-mh-folder.c:149
 # camel/providers/local/camel-mh-folder.c:157
-#: ../camel/providers/local/camel-mh-folder.c:179
+#: ../camel/providers/local/camel-mh-folder.c:181
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "不能將郵件儲存到 mh 資料夾: %s: %s"
 
+# camel/providers/local/camel-maildir-store.c:107
+# camel/providers/local/camel-mh-store.c:103
+#: ../camel/providers/local/camel-mh-store.c:232
+#, c-format
+msgid "Could not create folder '%s': %s"
+msgstr "無法建立資料夾「%s」:%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: ../camel/providers/local/camel-mh-store.c:244
+#, c-format
+msgid "Cannot get folder '%s': not a directory."
+msgstr "不能取得資料夾「%s」:不是目錄。"
+
 # camel/providers/local/camel-mh-summary.c:218
-#: ../camel/providers/local/camel-mh-summary.c:246
+#: ../camel/providers/local/camel-mh-summary.c:264
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "不能開啟 MH 目錄路徑: %s: %s"
 
+#: ../camel/providers/local/camel-spool-store.c:135
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "排程器「%s」不能被開啟:%s"
+
+# camel/providers/local/camel-local-store.c:134
+#: ../camel/providers/local/camel-spool-store.c:147
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "排程器「%s」不是一般檔案或目錄。"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../camel/providers/local/camel-spool-store.c:166
+#, c-format
+msgid "Folder '%s/%s' does not exist."
+msgstr "資料夾「%s/%s」不存在。"
+
+# camel/providers/local/camel-maildir-store.c:96
+# camel/providers/local/camel-mh-store.c:90
+#: ../camel/providers/local/camel-spool-store.c:176
+#, c-format
+msgid ""
+"Could not open folder '%s':\n"
+"%s"
+msgstr ""
+"無法開啟資料夾「%s」:\n"
+"%s"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#: ../camel/providers/local/camel-spool-store.c:180
+#, c-format
+msgid "Folder '%s' does not exist."
+msgstr "資料夾「%s」不存在。"
+
+# camel/providers/local/camel-maildir-store.c:107
+# camel/providers/local/camel-mh-store.c:103
+#: ../camel/providers/local/camel-spool-store.c:185
+#, c-format
+msgid ""
+"Could not create folder '%s':\n"
+"%s"
+msgstr ""
+"無法建立資料夾「%s」:\n"
+"%s"
+
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#: ../camel/providers/local/camel-spool-store.c:193
+#, c-format
+msgid "'%s' is not a mailbox file."
+msgstr "「%s」不是 mailbox 檔案。"
+
 #: ../camel/providers/local/camel-spool-store.c:210
 msgid "Store does not support an INBOX"
 msgstr "儲存並不支援 INBOX"
@@ -4953,22 +4806,34 @@ msgid "Spool folders cannot be deleted"
 msgstr "排程資料夾不能刪除"
 
 # camel/camel-movemail.c:158
-#: ../camel/providers/local/camel-spool-summary.c:172
-#: ../camel/providers/local/camel-spool-summary.c:182
-#: ../camel/providers/local/camel-spool-summary.c:192
+#: ../camel/providers/local/camel-spool-summary.c:179
+#: ../camel/providers/local/camel-spool-summary.c:189
+#: ../camel/providers/local/camel-spool-summary.c:199
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "無法與暫存資料夾同步 %s: %s"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: ../camel/providers/local/camel-spool-summary.c:208
+#: ../camel/providers/local/camel-spool-summary.c:215
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "無法與排程資料夾同步 %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:176
-#: ../camel/providers/nntp/camel-nntp-folder.c:208
+#: ../camel/providers/local/camel-spool-summary.c:246
+#: ../camel/providers/local/camel-spool-summary.c:263
+#: ../camel/providers/local/camel-spool-summary.c:274
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in '%s'"
+msgstr ""
+"無法同步排程資料夾 %s: %s\n"
+"資料夾可能損毀,複製儲存於「%s」"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:137
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:227
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "內部錯誤:UID 格式無效:%s"
@@ -4977,20 +4842,20 @@ msgstr "內部錯誤:UID 格式無效:%s"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-folder.c:330
-#: ../camel/providers/nntp/camel-nntp-folder.c:333
-#: ../camel/providers/nntp/camel-nntp-folder.c:375
-#: ../camel/providers/nntp/camel-nntp-folder.c:377
+#: ../camel/providers/nntp/camel-nntp-folder.c:368
+#: ../camel/providers/nntp/camel-nntp-folder.c:371
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/nntp/camel-nntp-folder.c:415
 #, c-format
 msgid "Posting failed: %s"
 msgstr "張貼失敗:%s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:395
+#: ../camel/providers/nntp/camel-nntp-folder.c:433
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "離線工作時無法張貼 NNTP 訊息!"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: ../camel/providers/nntp/camel-nntp-folder.c:406
+#: ../camel/providers/nntp/camel-nntp-folder.c:444
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "您無法從 NNTP 資料夾複製訊息!"
 
@@ -5094,44 +4959,44 @@ msgid "Cannot authenticate to server: %s"
 msgstr "無法驗證伺服器:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/nntp/camel-nntp-store.c:1283
+#: ../camel/providers/nntp/camel-nntp-store.c:1289
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP 指令失敗: %s"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../camel/providers/nntp/camel-nntp-store.c:1337
+#: ../camel/providers/nntp/camel-nntp-store.c:1343
 msgid "Not connected."
 msgstr "未連線。"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: ../camel/providers/nntp/camel-nntp-store.c:1390
+#: ../camel/providers/nntp/camel-nntp-store.c:1396
 #, c-format
 msgid "No such folder: %s"
 msgstr "沒有這個資料夾: %s"
 
 # mail/mail-ops.c:992
-#: ../camel/providers/nntp/camel-nntp-summary.c:273
-#: ../camel/providers/nntp/camel-nntp-summary.c:369
+#: ../camel/providers/nntp/camel-nntp-summary.c:271
+#: ../camel/providers/nntp/camel-nntp-summary.c:364
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s:掃描新郵件"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:280
+#: ../camel/providers/nntp/camel-nntp-summary.c:278
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover 傳來意外的伺服器回應:%s"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:383
+#: ../camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "標題傳來意外的伺服器回應:%s"
 
 # ui/evolution-mail.xml.h:2
-#: ../camel/providers/nntp/camel-nntp-summary.c:423
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
 msgid "Use cancel"
 msgstr "使用取消"
 
@@ -5139,35 +5004,36 @@ msgstr "使用取消"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: ../camel/providers/nntp/camel-nntp-summary.c:425
+#: ../camel/providers/nntp/camel-nntp-summary.c:416
 #, c-format
 msgid "Operation failed: %s"
 msgstr "作業失敗: %s"
 
 # camel/providers/pop3/camel-pop3-folder.c:149
-#: ../camel/providers/pop3/camel-pop3-folder.c:251
+#: ../camel/providers/pop3/camel-pop3-folder.c:253
 msgid "Retrieving POP summary"
 msgstr "取回 POP 的摘要"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:271
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "不能取得 POP 摘要: %s"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:312
+#: ../camel/providers/pop3/camel-pop3-folder.c:314
 msgid "Expunging old messages"
 msgstr "清空舊的郵件"
 
 # mail/message-browser.c:199
-#: ../camel/providers/pop3/camel-pop3-folder.c:320
+#: ../camel/providers/pop3/camel-pop3-folder.c:322
 msgid "Expunging deleted messages"
 msgstr "清空刪除的郵件"
 
 # camel/providers/pop3/camel-pop3-folder.c:292
-#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:530
+#: ../camel/providers/pop3/camel-pop3-folder.c:552
 #, c-format
 msgid "No message with UID %s"
 msgstr "沒有郵件具有這個 UID %s"
@@ -5175,13 +5041,13 @@ msgstr "沒有郵件具有這個 UID %s"
 # camel/providers/pop3/camel-pop3-folder.c:296
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:541
+#: ../camel/providers/pop3/camel-pop3-folder.c:559
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "接收 POP 郵件 %d"
 
 # camel/camel-sasl-login.c:127
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:649
 msgid "Unknown reason"
 msgstr "不明的原因"
 
@@ -5231,56 +5097,61 @@ msgstr ""
 "聲稱能夠支援,但對於所有使用者來講都未必一定可行。"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:208
+#: ../camel/providers/pop3/camel-pop3-store.c:209
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "無法從 POP 伺服器 %s 讀取有效的問候語"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: ../camel/providers/pop3/camel-pop3-store.c:225
-#: ../camel/providers/pop3/camel-pop3-store.c:239
-#: ../camel/providers/pop3/camel-pop3-store.c:249
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#: ../camel/providers/pop3/camel-pop3-store.c:226
+#: ../camel/providers/pop3/camel-pop3-store.c:240
+#: ../camel/providers/pop3/camel-pop3-store.c:250
+#: ../camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "無法以安全模式連線到 POP 伺服器 %s: %s"
 
 # shell/e-storage.c:477
-#: ../camel/providers/pop3/camel-pop3-store.c:226
+#: ../camel/providers/pop3/camel-pop3-store.c:227
 msgid "STLS not supported by server"
 msgstr "伺服器不支援 STLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../camel/providers/pop3/camel-pop3-store.c:257
 msgid "TLS is not available in this build"
 msgstr "此一版本並未啟用 TLS"
 
 # camel/providers/pop3/camel-pop3-store.c:322
-#: ../camel/providers/pop3/camel-pop3-store.c:362
+#: ../camel/providers/pop3/camel-pop3-store.c:363
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "無法連線到 POP 伺服器 %s"
 
 # camel/providers/pop3/camel-pop3-store.c:409
-#: ../camel/providers/pop3/camel-pop3-store.c:403
-#: ../camel/providers/pop3/camel-pop3-store.c:536
+#: ../camel/providers/pop3/camel-pop3-store.c:404
+#: ../camel/providers/pop3/camel-pop3-store.c:537
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "無法連線到 POP 伺服器 %s:不支援所要求的驗證機制。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:431
+#: ../camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "SASL '%s' Login failed for POP server %s: %s"
+msgstr "在 POP 伺服器 %2$s 以 SASL 「%1$s」登入失敗: %3$s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "不能登入 POP 伺服器 %s: SASL 通訊協定錯誤"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:450
+#: ../camel/providers/pop3/camel-pop3-store.c:451
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "無法驗證 POP 伺服器 %s:%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:509
+#: ../camel/providers/pop3/camel-pop3-store.c:510
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -5290,8 +5161,8 @@ msgstr ""
 "聯絡您的系統管理者。"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:550
-#: ../camel/providers/pop3/camel-pop3-store.c:563
+#: ../camel/providers/pop3/camel-pop3-store.c:551
+#: ../camel/providers/pop3/camel-pop3-store.c:564
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5301,7 +5172,7 @@ msgstr ""
 "傳送密碼時發生錯誤:%s"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: ../camel/providers/pop3/camel-pop3-store.c:557
+#: ../camel/providers/pop3/camel-pop3-store.c:558
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -5310,6 +5181,12 @@ msgstr ""
 "無法連線 POP 伺服器 %s。\n"
 "傳送使用者名稱發生錯誤:%s"
 
+# camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:671
+#, c-format
+msgid "No such folder '%s'."
+msgstr "沒有這個資料夾「%s」。"
+
 # camel/providers/sendmail/camel-sendmail-provider.c:37
 # mail/mail-config.glade.h:67
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
@@ -5530,7 +5407,7 @@ msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP 伺服器 %s 不支援所要求的驗證類型 %s。"
 
 # camel/providers/smtp/camel-smtp-transport.c:418
-#: ../camel/providers/smtp/camel-smtp-transport.c:564
+#: ../camel/providers/smtp/camel-smtp-transport.c:568
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -5542,112 +5419,112 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: ../camel/providers/smtp/camel-smtp-transport.c:697
+#: ../camel/providers/smtp/camel-smtp-transport.c:701
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 伺服器 %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: ../camel/providers/smtp/camel-smtp-transport.c:699
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "經由 %s 傳送 SMTP 郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:721
 msgid "Cannot send message: service not connected."
 msgstr "無法傳送訊息:服務未連線。"
 
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Cannot send message: sender address not valid."
 msgstr "不能傳送郵件:寄件者的地址無效。"
 
 # mail/mail-ops.c:603
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Sending message"
 msgstr "傳送郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:742
+#: ../camel/providers/smtp/camel-smtp-transport.c:746
 msgid "Cannot send message: no recipients defined."
 msgstr "不能傳送郵件:沒有定義收件者。"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "不能傳送郵件:一或多個無效的收件者"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../camel/providers/smtp/camel-smtp-transport.c:982
+#: ../camel/providers/smtp/camel-smtp-transport.c:986
 msgid "SMTP Greeting"
 msgstr "SMTP 迎接"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1007
+#: ../camel/providers/smtp/camel-smtp-transport.c:1011
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1024
+#: ../camel/providers/smtp/camel-smtp-transport.c:1028
 msgid "HELO command failed"
 msgstr "HELO 指令失敗"
 
 # mail/mail-config.glade.h:10
-#: ../camel/providers/smtp/camel-smtp-transport.c:1090
+#: ../camel/providers/smtp/camel-smtp-transport.c:1094
 msgid "SMTP Authentication"
 msgstr "SMTP 驗證"
 
 # camel/providers/smtp/camel-smtp-transport.c:728
-#: ../camel/providers/smtp/camel-smtp-transport.c:1096
+#: ../camel/providers/smtp/camel-smtp-transport.c:1100
 msgid "Error creating SASL authentication object."
 msgstr "建構 SASL 驗證物件時發生錯誤。"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1113
-#: ../camel/providers/smtp/camel-smtp-transport.c:1124
+#: ../camel/providers/smtp/camel-smtp-transport.c:1117
+#: ../camel/providers/smtp/camel-smtp-transport.c:1128
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1130
+#: ../camel/providers/smtp/camel-smtp-transport.c:1134
 msgid "AUTH command failed"
 msgstr "AUTH 指令失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:809
-#: ../camel/providers/smtp/camel-smtp-transport.c:1200
+#: ../camel/providers/smtp/camel-smtp-transport.c:1204
 msgid "Bad authentication response from server.\n"
 msgstr "從伺服器傳回不正確驗證的回應。\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:835
-#: ../camel/providers/smtp/camel-smtp-transport.c:1227
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM 指令失敗:%s:郵件未傳送"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1244
+#: ../camel/providers/smtp/camel-smtp-transport.c:1248
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM 指令失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:879
-#: ../camel/providers/smtp/camel-smtp-transport.c:1268
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO 指令失敗:%s:郵件未傳送"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1287
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> 失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:929
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
-#: ../camel/providers/smtp/camel-smtp-transport.c:1396
-#: ../camel/providers/smtp/camel-smtp-transport.c:1415
+#: ../camel/providers/smtp/camel-smtp-transport.c:1331
+#: ../camel/providers/smtp/camel-smtp-transport.c:1400
+#: ../camel/providers/smtp/camel-smtp-transport.c:1419
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA 指令失敗:%s:郵件未傳送"
@@ -5656,30 +5533,30 @@ msgstr "DATA 指令失敗:%s:郵件未傳送"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1344
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1348
+#: ../camel/providers/smtp/camel-smtp-transport.c:1435
 msgid "DATA command failed"
 msgstr "DATA 指令失敗"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1454
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1470
+#: ../camel/providers/smtp/camel-smtp-transport.c:1474
 msgid "RSET command failed"
 msgstr "RSET 指令失敗"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT 指令失敗:%s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1507
+#: ../camel/providers/smtp/camel-smtp-transport.c:1511
 msgid "QUIT command failed"
 msgstr "QUIT 指令失敗"
 
@@ -5703,7 +5580,7 @@ msgstr "禮物"
 
 #: ../libedataserver/e-categories.c:49
 msgid "Goals/Objectives"
-msgstr "ç\9b®æ¨\99/æ¨\99ç\9a\84"
+msgstr "çµ\82é»\9e\9b®æ¨\99"
 
 #: ../libedataserver/e-categories.c:50
 msgid "Holiday"
@@ -5731,7 +5608,7 @@ msgstr "國際的"
 # ui/evolution-task-editor-dialog.xml.h:16
 #: ../libedataserver/e-categories.c:56
 msgid "Key Customer"
-msgstr "é\87\8dè¦\81客戶"
+msgstr "é\97\9cé\8dµ客戶"
 
 #: ../libedataserver/e-categories.c:57
 msgid "Miscellaneous"
@@ -5751,7 +5628,7 @@ msgstr "電話"
 #. Translators: "Status" is a category name; it can mean anything user wants to
 #: ../libedataserver/e-categories.c:61
 msgid "Status"
-msgstr "ç\8b\80æ³\81"
+msgstr "ç\8b\80æ\85\8b"
 
 #: ../libedataserver/e-categories.c:62
 msgid "Strategies"
@@ -5759,7 +5636,7 @@ msgstr "策略"
 
 #: ../libedataserver/e-categories.c:63
 msgid "Suppliers"
-msgstr "供給者"
+msgstr "供應商"
 
 # addressbook/backend/ebook/e-card.c:3434
 #: ../libedataserver/e-categories.c:64
@@ -5784,7 +5661,7 @@ msgstr "正在等待"
 #. time, in 12-hour format.
 #: ../libedataserver/e-time-utils.c:1644 ../libedataserver/e-time-utils.c:1911
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
 # calendar/gui/calendar-model.c:794
 # e-util/e-time-utils.c:278
@@ -5794,7 +5671,7 @@ msgstr "%a %m/%d/%Y %I:%M:%S %p"
 #. time, in 24-hour format.
 #: ../libedataserver/e-time-utils.c:1649 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
+msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 # e-util/e-time-utils.c:283
 #. strptime format of a weekday, a date and a time,
@@ -5836,7 +5713,7 @@ msgstr "%a %m/%d/%Y %H"
 #: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1773
 #: ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
+msgstr "%Y/%m/%d (%a)"
 
 # calendar/gui/calendar-model.c:797
 # e-util/e-time-utils.c:287
@@ -5893,14 +5770,14 @@ msgstr "%m/%d/%Y %H"
 #. This is the preferred date format for the locale.
 #: ../libedataserver/e-time-utils.c:1707 ../libedataserver/e-time-utils.c:1776
 msgid "%m/%d/%Y"
-msgstr "%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:1834 ../libedataserver/e-time-utils.c:1956
 msgid "%I:%M:%S %p"
-msgstr "%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.
@@ -5919,7 +5796,7 @@ msgstr "%H:%M:%S"
 #. without seconds.
 #: ../libedataserver/e-time-utils.c:1843 ../libedataserver/e-time-utils.c:1953
 msgid "%I:%M %p"
-msgstr "%I:%M %p"
+msgstr "%p %I:%M"
 
 # e-util/e-time-utils.c:312
 # widgets/misc/e-dateedit.c:1259
@@ -5958,19 +5835,19 @@ msgstr "正以匿名方式存取 LDAP 伺服器"
 msgid "Failed to authenticate.\n"
 msgstr "驗證憑證失敗。\n"
 
-#: ../libedataserverui/e-categories-dialog.c:261
+#: ../libedataserverui/e-categories-dialog.c:362
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "在組態中已經有名為「%s」的分類。請使用另外的名稱"
 
-#: ../libedataserverui/e-categories-dialog.c:462
+#: ../libedataserverui/e-categories-dialog.c:526
 msgid "Icon"
 msgstr "圖示"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-categories-dialog.c:467
+#: ../libedataserverui/e-categories-dialog.c:531
 msgid "Category"
 msgstr "分類"
 
@@ -5998,7 +5875,7 @@ msgstr "分類名稱(_N)"
 # addressbook/contact-editor/e-contact-editor.c:603
 #: ../libedataserverui/e-categories-dialog.glade.h:5
 msgid "Item(s) belong to these _categories:"
-msgstr "屬於這些分類的項目:"
+msgstr "屬於這些分類的項目(_C):"
 
 # calendar/gui/e-calendar-table.c:150
 #: ../libedataserverui/e-categories-dialog.glade.h:6
@@ -6007,27 +5884,42 @@ msgstr "可用的分類(_A):"
 
 #: ../libedataserverui/e-categories-dialog.glade.h:7
 msgid "_Edit"
-msgstr "編輯 (_E)"
+msgstr "編輯(_E)"
 
 # calendar/gui/e-calendar-table.c:150
 #: ../libedataserverui/e-categories-dialog.glade.h:8
 msgid "categories"
 msgstr "分類"
 
-#: ../libedataserverui/e-name-selector-dialog.c:266
+# calendar/gui/e-calendar-table.c:150
+#: ../libedataserverui/e-category-completion.c:290
+#, c-format
+#| msgid "Category List"
+msgid "Create category \"%s\""
+msgstr "建立分類「%s」"
+
+#: ../libedataserverui/e-cell-renderer-color.c:222
+msgid "Color Info"
+msgstr "色彩資訊"
+
+#: ../libedataserverui/e-cell-renderer-color.c:223
+msgid "The color to render"
+msgstr "要繪製的色彩"
+
+#: ../libedataserverui/e-name-selector-dialog.c:278
 msgid "Select Contacts from Address Book"
 msgstr "從通訊錄選取連絡人"
 
-#: ../libedataserverui/e-name-selector-dialog.c:546
+#: ../libedataserverui/e-name-selector-dialog.c:565
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:571
+#: ../libedataserverui/e-name-selector-dialog.c:590
 msgid "_Remove"
 msgstr "移除(_R)"
 
 # calendar/gui/e-tasks.c:155
-#: ../libedataserverui/e-name-selector-dialog.c:744
+#: ../libedataserverui/e-name-selector-dialog.c:767
 #: ../libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Any Category"
 msgstr "任何分類"
@@ -6066,76 +5958,85 @@ msgstr "連絡人"
 
 #: ../libedataserverui/e-name-selector-dialog.glade.h:9
 msgid "Search"
-msgstr "尋找"
+msgstr "搜尋"
 
 #: ../libedataserverui/e-name-selector-dialog.glade.h:10
 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:2240
+#: ../libedataserverui/e-name-selector-entry.c:2456
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "展開行內 %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2255
+#: ../libedataserverui/e-name-selector-entry.c:2471
 #, c-format
 msgid "Cop_y %s"
 msgstr "複製(_Y) %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2265
+#: ../libedataserverui/e-name-selector-entry.c:2481
 #, c-format
 msgid "C_ut %s"
 msgstr "剪下(_U) %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2282
+#: ../libedataserverui/e-name-selector-entry.c:2498
 #, c-format
 msgid "_Edit %s"
 msgstr "編輯 %s(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:466
+#: ../libedataserverui/e-name-selector-list.c:472
 #, c-format
 msgid "_Delete %s"
 msgstr "刪除(_D) %s"
 
-#: ../libedataserverui/e-passwords.c:1175
+#: ../libedataserverui/e-passwords.c:234
+#, c-format
+msgid "Keyring key is unusable: no user or host name"
+msgstr "鑰匙圈金鑰無法使用:沒有使用者或主機名稱"
+
+#: ../libedataserverui/e-passwords.c:1094
+msgid "You have the Caps Lock key on."
+msgstr "您的 Caps Lock 是開啟的。"
+
+#: ../libedataserverui/e-passwords.c:1216
 msgid "_Remember this passphrase"
 msgstr "記住這個密語(_R)"
 
-#: ../libedataserverui/e-passwords.c:1176
+#: ../libedataserverui/e-passwords.c:1217
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密語(_R)"
 
-#: ../libedataserverui/e-passwords.c:1181
+#: ../libedataserverui/e-passwords.c:1222
 msgid "_Remember this password"
 msgstr "記住這個密碼(_R)"
 
-#: ../libedataserverui/e-passwords.c:1182
+#: ../libedataserverui/e-passwords.c:1223
 msgid "_Remember this password for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
 
 # shell/e-shell-importer.c:602
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:95
+#: ../libedataserverui/e-source-selector-dialog.c:100
 msgid "Select destination"
 msgstr "選取目的地"
 
-#: ../libedataserverui/e-source-selector-dialog.c:148
+#: ../libedataserverui/e-source-selector-dialog.c:156
 msgid "_Destination"
 msgstr "目的端(_D)"
 
 # camel/camel-smime-context.c:194
-#: ../servers/exchange/lib/e2k-autoconfig.c:1683
-#: ../servers/exchange/storage/exchange-account.c:971
+#: ../servers/exchange/lib/e2k-autoconfig.c:1698
+#: ../servers/exchange/storage/exchange-account.c:959
 #, c-format
 msgid "Enter password for %s"
 msgstr "輸入 %s 的密碼 "
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1684
-#: ../servers/exchange/storage/exchange-account.c:976
+#: ../servers/exchange/lib/e2k-autoconfig.c:1699
+#: ../servers/exchange/storage/exchange-account.c:964
 msgid "Enter password"
 msgstr "輸入密碼"
 
@@ -6147,11 +6048,11 @@ msgstr "擁有者"
 
 #: ../servers/exchange/lib/e2k-security-descriptor.c:857
 msgid "Publishing Editor"
-msgstr "發佈編輯"
+msgstr "發佈編輯"
 
 #: ../servers/exchange/lib/e2k-security-descriptor.c:865
 msgid "Editor"
-msgstr "編輯"
+msgstr "編輯"
 
 #: ../servers/exchange/lib/e2k-security-descriptor.c:872
 msgid "Publishing Author"
@@ -6175,7 +6076,7 @@ msgstr "散佈者"
 
 #: ../servers/exchange/lib/e2k-security-descriptor.c:891
 msgid "None"
-msgstr ""
+msgstr "沒有"
 
 #: ../servers/exchange/lib/e2k-security-descriptor.c:906
 msgid "Custom"
@@ -6248,27 +6149,27 @@ msgstr "這個操作無法在離線模式下進行"
 # shell/e-shell-view.c:552
 #. i18n: This is the title of an "other user's folders"
 #. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:662
+#: ../servers/exchange/storage/exchange-account.c:642
 #, c-format
 msgid "%s's Folders"
 msgstr "%s 的資料夾"
 
-#: ../servers/exchange/storage/exchange-account.c:1277
+#: ../servers/exchange/storage/exchange-account.c:1265
 msgid "Personal Folders"
 msgstr "個人資料夾"
 
-#: ../servers/exchange/storage/exchange-account.c:1292
+#: ../servers/exchange/storage/exchange-account.c:1280
 msgid "Favorite Public Folders"
 msgstr "喜好的公開資料夾"
 
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1309
+#: ../servers/exchange/storage/exchange-account.c:1297
 msgid "All Public Folders"
 msgstr "所有的公開資料夾"
 
 # addressbook/backend/ebook/e-card.c:3346
 #. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1323
+#: ../servers/exchange/storage/exchange-account.c:1311
 msgid "Global Address List"
 msgstr "全域地址清單"
 
@@ -6347,74 +6248,3 @@ msgstr "Evolution 資料伺服器登入服務"
 #, c-format
 msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
 msgstr "發生多重分割錯誤;無法顯示錯誤對話方塊\n"
-
-#: ../libedataserverui/e-cell-renderer-color.c:210
-msgid "Color Info"
-msgstr "色彩資訊"
-
-#: ../libedataserverui/e-cell-renderer-color.c:211
-msgid "The color to render"
-msgstr "要繪製的色彩"
-
-# camel/camel-smime-context.c:327
-#~ msgid "Cannot find certificate for `%s'"
-#~ msgstr "找不到 `%s' 的憑證"
-
-#~ msgid "Folder was destroyed and recreated on server."
-#~ msgstr "資料夾已破壞並在伺服器上重建。"
-
-#~ msgid ""
-#~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
-#~ msgstr "非預期的伺服器回應:提供相同的 UID 給訊息 %d 和 %d"
-
-# camel/providers/imap/camel-imap-folder.c:191
-#~ msgid "Could not save summary: %s: %s"
-#~ msgstr "無法儲存摘要: %s: %s"
-
-# camel/providers/pop3/camel-pop3-store.c:361
-#~ msgid "%sPlease enter the GroupWise password for %s@%s"
-#~ msgstr "%s請輸入給 %s@%s 的 GroupWise 密碼"
-
-# camel/providers/imap/camel-imap-store.c:531
-#~ msgid "Unable to authenticate to GroupWise server. "
-#~ msgstr "無法驗證 GroupWise 伺服器。"
-
-# camel/providers/imap/camel-imap-store.c:490
-#~ msgid "%sPlease enter the IMAP password for %s@%s"
-#~ msgstr "%s 請輸入 %s@%s 的 IMAP 密碼"
-
-# camel/providers/smtp/camel-smtp-transport.c:395
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%s請輸入 IMAP 密碼 (%s 於主機 %s)"
-
-# camel/providers/local/camel-mbox-summary.c:549
-# camel/providers/local/camel-mbox-summary.c:557
-# camel/providers/local/camel-mbox-summary.c:746
-# camel/providers/local/camel-mbox-summary.c:754
-#~ msgid "Summary and folder mismatch, even after a sync"
-#~ msgstr "摘要與資料夾不協調,即使經過同步"
-
-# camel/providers/local/camel-mbox-summary.c:600
-#~ msgid "Error writing to temp mailbox: %s"
-#~ msgstr "寫入暫存郵箱時發生錯誤:%s"
-
-# camel/providers/smtp/camel-smtp-transport.c:395
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "請輸入 %s@%s 的 NNTP 密碼"
-
-# camel/providers/smtp/camel-smtp-transport.c:395
-#~ msgid "%sPlease enter the SMTP password for %s on host %s"
-#~ msgstr "%s請輸入 SMTP 密碼 (%s 於主機 %s)"
-
-# calendar/gui/e-calendar-table.c:150
-#~ msgid "Category _Color"
-#~ msgstr "分類色彩(_C)"
-
-#~ msgid "Select User"
-#~ msgstr "選擇使用者"
-
-#~ msgid "Addressbook..."
-#~ msgstr "通訊錄..."
-
-#~ msgid "\t\t\t\t\t\t"
-#~ msgstr "\t\t\t\t\t\t"