[evolution] Update Chinese (Taiwan) translation



commit a34c5531bf1cec583e1a4022b46eeddf73398baf
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Mon Mar 26 10:24:37 2018 +0000

    Update Chinese (Taiwan) translation
    
    (cherry picked from commit f91e69d7bcf97a517e151fec7e6dd116546ac138)

 po/zh_TW.po | 7098 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 4186 insertions(+), 2912 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f3dad05..1494cbb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,121 +11,18 @@ msgstr ""
 "Project-Id-Version: evolution 3.3.91\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-28 17:53+0000\n"
-"PO-Revision-Date: 2017-03-01 10:23+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"POT-Creation-Date: 2018-03-12 14:50+0000\n"
+"PO-Revision-Date: 2018-03-26 18:05+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "Language: zh_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"
-"X-Generator: Poedit 1.8.12\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Project-Style: gnome\n"
 
-#: ../evolution.appdata.xml.in.h:1 ../data/evolution.desktop.in.in.h:1
-#: ../src/mail/e-mail-browser.c:1098
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
-#: ../src/shell/e-shell-window-private.c:240
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../evolution.appdata.xml.in.h:2 ../data/evolution.desktop.in.in.h:4
-msgid "Manage your email, contacts and schedule"
-msgstr "管理您的郵件、連絡人和行程"
-
-#: ../evolution.appdata.xml.in.h:3
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolution 是一套個人資訊管理應用程式,提供了整合郵件、行事曆和通訊錄等功能。"
-
-#: ../evolution.appdata.xml.in.h:4
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
-msgstr ""
-"Evolution 支援了用於資訊交換的廣範圍的工業標準資料格式與網路協定,著重於標準"
-"的相容性與安全性。Evolution 也可以與 Microsoft Exchange 透過「Exchange 網頁服"
-"務」(EWS)延伸功能平順的整合。"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Evolution Alarm Notify"
-msgstr "Evolution 鬧鈴通知"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Calendar event notifications"
-msgstr "行事曆事件通知"
-
-#: ../data/evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:428
-msgid "Groupware Suite"
-msgstr "Groupware 套裝軟體"
-
-#: ../data/evolution.desktop.in.in.h:3
-msgid "Evolution Mail and Calendar"
-msgstr "Evolution 郵件與行事曆"
-
-#: ../data/evolution.desktop.in.in.h:5
-msgid "email;calendar;contact;addressbook;task;"
-msgstr ""
-"email;calendar;contact;addressbook;task;電子郵件;行事曆;連絡人;通訊錄;工作;"
-
-#: ../data/evolution.desktop.in.in.h:6
-msgid "New Window"
-msgstr "新增視窗"
-
-#: ../data/evolution.desktop.in.in.h:7
-msgid "Compose a Message"
-msgstr "編輯郵件"
-
-#: ../data/evolution.desktop.in.in.h:8
-#: ../src/e-util/e-name-selector-dialog.c:448
-#: ../src/modules/addressbook/e-book-shell-backend.c:301
-#: ../src/modules/addressbook/e-book-shell-view.c:371
-msgid "Contacts"
-msgstr "連絡人"
-
-#: ../data/evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:833
-#: ../src/e-util/e-send-options.c:544
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
-#: ../src/modules/calendar/e-cal-shell-view.c:577
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "行事曆"
-
-#: ../data/evolution.desktop.in.in.h:10 ../src/e-util/e-send-options.c:536
-#: ../src/mail/importers/elm-importer.c:330
-#: ../src/mail/importers/kmail-importer.c:251
-#: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1240
-#: ../src/smime/gui/certificate-manager.c:1682
-msgid "Mail"
-msgstr "郵件"
-
-#: ../data/evolution.desktop.in.in.h:11 ../src/calendar/gui/e-memo-table.c:368
-#: ../src/modules/calendar/e-cal-shell-content.c:1665
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
-#: ../src/modules/calendar/e-memo-shell-view.c:313
-msgid "Memos"
-msgstr "備忘錄"
-
-#: ../data/evolution.desktop.in.in.h:12 ../src/calendar/gui/e-task-table.c:696
-#: ../src/calendar/gui/print.c:2408
-#: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1114
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
-#: ../src/modules/calendar/e-cal-shell-content.c:1625
-#: ../src/modules/calendar/e-task-shell-view-actions.c:218
-#: ../src/modules/calendar/e-task-shell-view-actions.c:233
-#: ../src/modules/calendar/e-task-shell-view.c:471
-msgid "Tasks"
-msgstr "工作"
-
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "啟用地址格式化"
@@ -268,6 +165,18 @@ msgstr "是否在編輯器中顯示 筆記 欄位"
 msgid "Whether to show Certificates tab in the editor"
 msgstr "是否在編輯器中顯示憑證分頁"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:33
+#, fuzzy
+#| msgid "Create a new contact list"
+msgid "Where to open contact locations"
+msgstr "建立新的連絡人列表"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:34
+msgid ""
+"Currently supported values are “openstreetmap” and “google”; if unknown set, "
+"uses “openstreetmap”"
+msgstr ""
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "將郵件轉換為 Unicode"
@@ -1000,21 +909,31 @@ msgid "Create events, memos and tasks as Private by default"
 msgstr "預設建立的事件、備忘錄和工作都設為私人"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+msgid "Draw events as flat, not shaded."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
+msgid ""
+"Whether to order days in the Week View from left to right, rather than from "
+"top to bottom."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "(已廢棄) 每週的開始,從星期日 (0) 到星期六 (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“week-start-day-name” instead."
 msgstr ""
 "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「week-start-day-name」代替。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:164
 msgid "(Deprecated) Work days"
 msgstr "(已廢棄) 工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:165
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key "
 "was deprecated in version 3.10 and should no longer be used. Use the “work-"
@@ -1334,10 +1253,20 @@ msgid ""
 msgstr "傳送時永遠將郵件儲存至寄件匣,讓使用者選擇郵件何時可送出。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+msgid "Include signature in new messages only"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+msgid ""
+"Include selected signature only for new messages, but have no signature "
+"added for Replies or Forwards."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Put personalized signatures at the top of replies"
 msgstr "將個人化簽名檔置於回信頂端"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -1346,21 +1275,33 @@ msgstr ""
 "使用者在回覆郵件時希望他們簽名檔放在何處。這會決定簽名檔放置在郵件的頂端或底"
 "部。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "無法加入簽名檔分隔符號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr "設為 TRUE 表示在您撰寫郵件時不想在簽名檔前加入簽名檔分隔符。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#, fuzzy
+#| msgid "_Keep signature above the original message on replying"
+msgid "Keep original message signature in replies"
+msgstr "回信時保留原始郵件的簽名(_K)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+msgid ""
+"When set to TRUE, keep original message signature in replies, otherwise "
+"strip the signature and everything below it when replying to the message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Ignore list Reply-To:"
 msgstr "忽略通信論壇 Reply-To:"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -1376,11 +1317,11 @@ msgstr ""
 "進行回信給個人的動作;而如果您使用「回覆到論壇」動作,它也會照做。它的運作方"
 "式是比對 Reply-To: 標頭和 List-Post: 標頭,如果有的話。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "List of localized “Re”"
 msgstr "「Re」本地化列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid ""
 "Comma-separated list of localized “Re” abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard “Re” prefix. "
@@ -1389,11 +1330,11 @@ msgstr ""
 "當回信時在主旨文字中要略過的本地化「Re」縮寫列表 (逗號分隔),做為標準「Re」的"
 "前綴。例如「SV,AV」。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "List of localized “Re” separators"
 msgstr "「Re」分隔字元本地化列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "A list of localized “Re” separators, used to skip in a subject text when "
 "replying to a message, as an addition to the standard “:” and the Unicode "
@@ -1402,29 +1343,40 @@ msgstr ""
 "當回信時在主旨文字中要略過的本地化「Re」分隔字元縮寫列表,一般標準為「:」與萬"
 "國碼「︰」分隔字元。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid "Use localized “Fwd”/“Re” in message Subject"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid ""
+"When set to true, uses localized “Fwd”/“Re” in message Subject on reply and "
+"forward as provided by current locale translation, otherwise uses "
+"unlocalized version."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Number of characters for wrapping"
 msgstr "文字換列的字元數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Will autowrap lines after given number of characters."
 msgstr "在指定字元數後自動進行文字換列。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid ""
 "Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
 msgstr "詢問「prompt-on-many-to-cc-recips」的收件者與副本數目"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "When to ask, when the number of To and CC recipients reaches this value."
 msgstr "當收件者與副本數目達到這個數值時,是否要詢問。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
 msgstr "是否在工具列中顯示簽署與加密按鈕"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are "
 "always shown in the composer’s toolbar. Otherwise they are shown only when "
@@ -1433,37 +1385,37 @@ msgstr ""
 "如果設定為「true」,PGP 或 S/MIME 的簽署與加密按鈕會永遠顯示在編輯器的工具列"
 "上。否則它們只會在被使用時才顯示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Wrap quoted text in replies"
 msgstr "回信中的引文是否換行"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "If set to “true” quoted text in replies will be wrapped."
 msgstr "如果設定為「true」回信中的引文會自動換列。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Whether to obey Content-Disposition:inline message header hint"
 msgstr "是否遵守 Content-Disposition:inline 郵件標頭提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Set to “false” to block automatic display of attachments with Content-"
 "Disposition: inline."
 msgstr "設定為「false」以阻擋 Content-Disposition: inline 附件的顯示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Save file format for drag-and-drop operation"
 msgstr "拖放操作時儲存的檔案格式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Can be either “mbox” or “pdf”."
 msgstr "可以是「mbox」或「pdf」。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show image animations"
 msgstr "顯示動畫影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -1471,75 +1423,75 @@ msgstr ""
 "啟用 HTML 郵件中的動畫影像。許多使用者認為動畫影像很煩人,因而偏好以靜態影像"
 "代替。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Enable or disable type ahead search feature"
 msgstr "啟用或停用隨打即查功能"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "啟用側邊欄搜尋功能允許互動式搜尋資料夾名稱。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Enable or disable magic space bar"
 msgstr "啟用或停用魔術空白鍵"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "啟用此選項可在郵件預覽、郵件列表和資料夾中使用空白鍵捲動畫面。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "啟用以在所有資料夾使用類似的郵件列表檢視設定值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "啟用此選項會讓所有的資料夾使用類似的郵件列表檢視設定值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Mark citations in the message “Preview”"
 msgstr "在郵件「預覽」中標示引用"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Mark citations in the message “Preview”."
 msgstr "在郵件「預覽」中標示引用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Citation highlight color"
 msgstr "引用反白色彩"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Citation highlight color."
 msgstr "引用反白色彩。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Enable/disable caret mode"
 msgstr "啟用/停用插入號模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "啟用插入號模式,如此您可以在閱讀郵件時看到游標。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Default charset in which to display messages"
 msgstr "用於顯示郵件的預設字元集"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Default charset in which to display messages."
 msgstr "用於顯示郵件的預設字元集。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "自動透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Show notification about missing remote content"
 msgstr "顯示關於缺少的遠端內容的通知"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid ""
 "When the message preview shows a message which requires to download remote "
 "content, while the download is not allowed for the user or the site, then "
@@ -1548,27 +1500,27 @@ msgstr ""
 "當郵件預覽顯示一封郵件需要下載遠端內容,而使用者或網站不允許下載時,在預覽窗"
 "格上顯示關於它的通知。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Show animated images as animations."
 msgstr "播放動畫影像。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Show all message headers"
 msgstr "顯示所有郵件檔頭"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Show all the headers when viewing a messages."
 msgstr "檢視郵件時顯示檔頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "List of headers to show when viewing a message."
 msgstr "檢視郵件時顯示的檔頭列表。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
@@ -1577,100 +1529,100 @@ msgstr ""
 "每個檔頭都以配對方式呈現:檔頭的名稱,及一個布林值表示此檔頭是否啟用。停用的"
 "檔頭在檢視郵件時不會顯示,但仍會列在偏好設定中。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Show photo of the sender"
 msgstr "顯示寄件者的相片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "在郵件閱讀窗格中顯示寄件者的相片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Search gravatar.com for photo of the sender"
 msgstr "在 gravatar.com 搜尋寄件者的相片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr "也允許在 gravatar.com 搜尋寄件者的相片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定的時限過後,標示成已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定的時限過後,標示成已閱讀。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Mark as Seen always after specified timeout"
 msgstr "在指定的時限過後永遠標示成已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
 msgstr "如果設定為 true,選取的郵件會在逾時時間或改變資料夾時設定為未讀。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Timeout for marking messages as seen"
 msgstr "將郵件標示成已閱讀的時限"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "將郵件標示成已閱讀的時限,以毫秒計。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Show Attachment Bar"
 msgstr "顯示附件列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
 msgstr "當郵件帶有附件時在郵件預覽窗格下方顯示附件列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Sender email-address column in the message list"
 msgstr "在郵件列表的寄件者電子郵件欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "在郵件列表的中以分離的欄位顯示寄件者的電子郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Show deleted messages in the message-list"
 msgstr "在郵件列表中顯示刪除的郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在郵件列表中顯示刪除的郵件 (加上刪除號)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Show junk messages in the message-list"
 msgstr "在郵件列表中顯示垃圾的郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "在郵件列表中顯示垃圾的郵件 (加上刪除號)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Enable Unmatched search folder"
 msgstr "啟用未符合搜尋資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 msgstr ""
 "啟用搜尋資料夾中的未符合搜尋資料夾。如果搜尋資料夾停用則不會有任何動作。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "隱藏各資料夾預覽並移除選取區"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid ""
 "This key is read only once and reset to “false” after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -1678,31 +1630,31 @@ msgstr ""
 "這個鍵值只能讀取一次,並會在讀取後設為「false」。這樣會取消在列表中對該郵件的"
 "選取並移除對該資料夾的預覽。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Height of the message-list pane"
 msgstr "郵件列表窗格高度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Height of the message-list pane."
 msgstr "郵件列表窗格的高度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "郵件標題在使用者介面中是否摺疊"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Width of the message-list pane"
 msgstr "郵件列表窗格寬度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Width of the message-list pane."
 msgstr "郵件列表窗格的寬度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Layout style"
 msgstr "配置樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. “0” (Classic View) places the preview pane below the "
@@ -1712,76 +1664,76 @@ msgstr ""
 "配置方式決定了在郵件列表中預覽窗格的位置。「0」(標準檢視)將預覽窗格放在郵件"
 "列表下方。「1」(垂直檢視)將預覽窗格放在郵件列表旁邊。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Variable width font"
 msgstr "變動寬度字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "The variable width font for mail display."
 msgstr "用於顯示郵件的變動寬度字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Terminal font"
 msgstr "終端機字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "The terminal font for mail display."
 msgstr "用於顯示郵件的終端機字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Use custom fonts"
 msgstr "使用自訂字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自訂字型來顯示郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "壓縮在 TO/CC/BCC 中位址的顯示方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "將 TO/CC/BCC 中位址的顯示方式壓縮為 address_count 中指定的長度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示於 TO/CC/BCC 中位址的長度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a “...” is shown."
 msgstr "這會設定在預設郵件列表檢視中顯示位址的長度,超過的部分會顯示「…」。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Thread the message-list based on Subject"
 msgstr "以主旨為基礎串接郵件列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 "當郵件不包含 In-Reply-To 或 References 檔頭時,是否按照主旨放回郵件群組。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Default value for thread expand state"
 msgstr "相關郵件展開狀態的預設數值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr "這個設定值指定相關郵件預設為展開或收摺的狀態。需要重新啟動 Evolution。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否依郵件群組中最新的郵件來排序相關郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message’s date. Evolution requires a "
@@ -1790,11 +1742,11 @@ msgstr ""
 "這個設定值指定相關郵件要依每個郵件群組最新的郵件排序,而非依照郵件的日期。"
 "Evolution 將需要重新啟動。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Whether sort thread children always ascending"
 msgstr "是否永遠遞增排序相關郵件子項"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
@@ -1802,11 +1754,11 @@ msgstr ""
 "這個設定值指定相關郵件的子項是否永遠遞增排序,而非依照相關郵件同樣的排序順"
 "序。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "在資料夾樹狀圖中以字母排序帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -1816,27 +1768,29 @@ msgstr ""
 "告知在郵件檢視中如何排序資料夾樹狀圖中的帳號。當設定為 true 時帳號會以字母排"
 "序,但這臺電腦與搜尋資料夾例外,否則帳號會以使用者給予的順序排列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Log filter actions"
 msgstr "記錄過濾器動作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Log filter actions to the specified log file."
 msgstr "將過濾器動作記錄到指定的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Logfile to log filter actions"
 msgstr "用於記錄過濾器動作的記錄檔案"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-msgid "Logfile to log filter actions."
-msgstr "用於記錄過濾器動作的記錄檔案。"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+msgid ""
+"If not set, or being “stdout”, then the logging is done to stdout, instead "
+"to a file."
+msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Flush Outbox after filtering"
 msgstr "過濾後清空寄件匣"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any “Forward to” filter action and approximately "
@@ -1845,100 +1799,112 @@ msgstr ""
 "是否在過濾完後清空寄件匣。寄件匣的清空只用在當使用了任何「轉寄至」過濾器動"
 "作,並且在這個動作後大約一分鐘開始進行。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Default forward style"
 msgstr "預設轉遞樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Default reply style"
 msgstr "預設回覆樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "使用快捷鍵傳送時提示 (Ctrl+Enter)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
 msgstr "當使用者使用快捷鍵傳送郵件時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt on empty subject"
 msgstr "沒有主旨時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "當使用者傳送沒有主旨的郵件時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when emptying the trash"
 msgstr "使用者清空回收筒時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "當使用者嘗試清空回收筒時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when user expunges"
 msgstr "使用者清空時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#, fuzzy
+#| msgid "Prompt when user expunges"
+msgid "Prompt when user calls Empty Junk"
+msgstr "使用者清空時提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#, fuzzy
+#| msgid "Prompt the user when he or she tries to expunge a folder."
+msgid "Prompt the user when he or she tries to Empty a Junk folder."
+msgstr "當使用者嘗試清空資料夾時,提示使用者。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "寄信給沒有輸入有效郵件位址的收件者前先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
 msgstr "它會停用/啟用重覆提示警告您正試著傳送郵件給沒有輸入郵件位址的收件者"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "當使用者傳送不含收件者或副本收件者的郵件時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "當使用者嘗試傳送不想要的 HTML 時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "當使用者嘗試傳送 HTML 郵件到不想接受 HTML 郵件的收件者時,顯示提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "如果使用者嘗試一次開啟 10 或更多的郵件,詢問使用者是否確定要這麼做。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt while marking multiple messages"
 msgstr "當標記多個郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "啟用或停用標記多個郵件時的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when deleting messages in search folder"
 msgstr "當刪除搜尋資料夾中的郵件時顯示提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -1947,11 +1913,11 @@ msgstr ""
 "它啟用/停用在從搜尋資料夾中刪除郵件時是否重複提示以警告那將會永久刪除郵件,而"
 "非僅是將郵件自搜尋結果中移除。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "詢問是否在資料夾樹狀圖中以拖放複製資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "Possible values are: “never” — do not allow copy with drag &amp; drop of "
 "folders in folder tree, “always” — allow copy with drag &amp; drop of "
@@ -1961,11 +1927,11 @@ msgstr ""
 "可能的數值有:「never」 — 不允許在資料夾樹狀圖中拖放複製、「 always」 — 不詢"
 "問就允許在資料夾樹狀圖中拖放複製或「ask」 — (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "詢問是否在資料夾樹狀圖中拖放以移動資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "Possible values are: “never” — do not allow move with drag &amp; drop of "
 "folders in folder tree, “always” — allow move with drag &amp; drop of "
@@ -1975,21 +1941,21 @@ msgstr ""
 "可能的數值有:「never」 — 不允許在資料夾樹狀圖中拖放移動、「 always」 — 不詢"
 "問就允許在資料夾樹狀圖中拖放移動或「ask」 — (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Prompt when replying privately to list messages"
 msgstr "當私人回覆通信論壇郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 msgstr "它會停用/啟用重覆提示警告您正試著回覆私人信件給透過通信論壇寄出的信。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "當通信論壇劫持私人回覆時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -1998,34 +1964,34 @@ msgstr ""
 "它會停用/啟用重覆提示警告您正試著回覆私人信件給透過通信論壇寄出的信。而通信論"
 "壇設定的 Reply-To: 標頭會將您的回信重新導向至通信論壇上的所有成員"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Prompt when replying to many recipients"
 msgstr "當回覆給許多收件者時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "它會停用/啟用警告您「您正回覆給很多人」的重覆提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid ""
 "Prompt when switching composer format and the content needs to lose its "
 "formatting"
 msgstr "當切換編輯器模式會導致內容失去現有格式時先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer format and the content needs to lose its formatting."
 msgstr ""
 "它會停用/啟用重覆提示警告您正在切換編輯器模式而其中內容會失去先前的格式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "當回覆給許多收件者與副本時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
@@ -2033,56 +1999,56 @@ msgstr ""
 "當寄信給許多收件者與副本時啟用或停用提示。「composer-many-to-cc-recips-num」"
 "定義了這個界限值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
 msgstr "當轉寄或回覆顯示的郵件後自動關閉郵件瀏覽器視窗的原則。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Empty Trash folders on exit"
 msgstr "結束時清空垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "結束 Evolution 時清空所有垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Minimum days between emptying the trash on exit"
 msgstr "結束時清空回收筒最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "結束時清空回收筒最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Last time Empty Trash was run"
 msgstr "上次清空回收筒的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "上次執行列表回收筒的時間,從 1970 年一月一日(電腦紀元)後算起的日數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "錯誤訊息在狀態列中顯示的時間(秒)。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Level beyond which the message should be logged."
 msgstr "應記錄的郵件等級。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "This can have three possible values. “0” for errors. “1” for warnings. “2” "
 "for debug messages."
 msgstr "這裡可使用三種數值。「0」為錯誤,「1」為警告,「2」為除錯訊息。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Show original “Date” header value."
 msgstr "顯示原始的「日期」標頭數值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "Show the original “Date” header (with a local time only if the time zone "
 "differs). Otherwise always show “Date” header value in a user preferred "
@@ -2091,11 +2057,11 @@ msgstr ""
 "顯示原始的「日期」檔頭(若時區不同時會使用當地時間)。否則永遠以使用者偏好的"
 "格式和本地時區顯示「日期」檔頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "List of Labels and their associated colors"
 msgstr "標籤和相關色彩的列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -2103,44 +2069,44 @@ msgstr ""
 "Evolution 的郵件元件已知的標籤列表。列表包含字串,其中包含 name:color,color "
 "使用 HTML 十六進位編碼。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Check incoming mail being junk"
 msgstr "檢查內送的垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Run junk test on incoming mail."
 msgstr "在內送的郵件執行垃圾郵件檢查。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Empty Junk folders on exit"
 msgstr "離開時清空垃圾郵件資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "離開 Evolution 時清空所有垃圾郵件資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "Minimum days between emptying the junk on exit"
 msgstr "結束時清空垃圾郵件最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "結束時清空垃圾郵件最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Last time Empty Junk was run"
 msgstr "上次清空垃圾郵件的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "上次執行清空垃圾郵件的時間,從 1970 年一月一日(電腦紀元)後算起的日數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "The default plugin for Junk hook"
 msgstr "垃圾釣鉤的預設外掛程式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won’t fall back "
@@ -2149,11 +2115,11 @@ msgstr ""
 "這是預設的垃圾郵件外掛程式,即使已啟用了其他的外掛程式。如果停用這裡列出的預"
 "設外掛程式,並不會影響其他可用的外掛程式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "決定是否在通訊錄中尋找寄件者電子郵件帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn’t be a spam. It looks up in the books marked for autocompletion. It "
@@ -2164,13 +2130,13 @@ msgstr ""
 "會搜尋標記為自動補齊的通訊錄。但若標記為自動補齊的是遠端通訊錄(像 LDAP),則"
 "速度可能會很慢。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "決定是否只在本地端通訊錄中尋找檢查垃圾郵件用的電子郵件位址"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -2179,11 +2145,11 @@ msgstr ""
 "這個選項相關於鍵值「lookup_addressbook」,是用來決定是否只在本地端通訊錄中查"
 "詢電子郵件位址以用於垃圾郵件過濾時「排除已知連絡人寄出的郵件」功能。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "決定是否使用自訂標頭來檢查垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -2192,52 +2158,52 @@ msgstr ""
 "決定是否使用自訂標頭來檢查垃圾郵件。如果啟用這個選項並且提供標頭,將會提升垃"
 "圾郵件檢查的速度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "Custom headers to use while checking for junk."
 msgstr "檢查垃圾郵件用的自訂標頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format “headername=value”."
 msgstr ""
 "檢查垃圾郵件用的自訂標頭。此列表中的元素格式為「headername=value」字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "UID string of the default account."
 msgstr "預設帳號的 UID 字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Save directory"
 msgstr "儲存目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid "Directory for saving mail component files."
 msgstr "用來儲存郵件元件檔的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "Composer load/attach directory"
 msgstr "編輯器讀取/附加目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid "Directory for loading/attaching files to composer."
 msgstr "用來郵件編輯器載入/附件的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "Check for new messages on start"
 msgstr "啟動時檢查新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 msgstr "當 Evolution 啟動時是否檢查新郵件。這也包含寄出寄件匣中的郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "Check for new messages in all active accounts"
 msgstr "檢查所有使用中帳號的新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account “Check for new messages every X minutes” option when Evolution is "
@@ -2246,21 +2212,21 @@ msgstr ""
 "當 Evolution 啟動時是否檢查所有使用中帳號的新郵件而不管「檢查新郵件於每 X 分"
 "鐘」選項。這個選項只能和「send_recv_on_start」選項一起使用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "Server synchronization interval"
 msgstr "伺服器同步間隔"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr "控制本地端變更與遠端郵件伺服器同步的頻率。間隔必須至少有 30 秒。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid "Allow expunge in virtual folders"
 msgstr "允許在虛擬資料夾使用清空"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder→Expunge will "
 "be callable in virtual folders, while the expunge itself will be done in all "
@@ -2271,77 +2237,175 @@ msgstr ""
 "本身會對虛擬資料夾與所有資料夾中被刪除的郵件進行,並不只針對屬於虛擬資料夾中"
 "被刪除的郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 #: ../src/mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML format"
 msgstr "繼承布景主題的顏色為 HTML 模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
 msgstr ""
 "當啟用時,背景、文字與連結的布景主題顏色會一併送出,產生 HTML 格式的郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid "An Archive folder for On This Computer folders."
 msgstr "用於「這臺電腦上」的封存資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
 msgstr "在「這臺電腦的資料夾」中用於「郵件|封存…」功能的封存資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#, fuzzy
+#| msgid "Whether to show icons of events in the month view"
+msgid "Whether the To Do bar is visible in the main window"
+msgstr "是否在月檢視中顯示事件的圖示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+msgid "Stores whether the To Do bar is visible in the main window."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+#, fuzzy
+#| msgid "If “true”, show the memo preview pane in the main window"
+msgid "Width of the To Do bar in the main window"
+msgstr "如果為「true」,則在主視窗中顯示備忘錄預覽窗格"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+#, fuzzy
+#| msgid "Apply the given geometry to the main window"
+msgid "Holds the width of the To Do bar for the main window."
+msgstr "將指定的尺寸套用到主視窗"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Whether the To Do bar is visible in a sub-window"
+msgstr "是否可以看到工具列。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+msgid "Stores whether the To Do bar is visible in a sub-window."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+msgid "Width of the To Do bar in a sub-window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+msgid "Holds the width of the To Do bar for a sub-window."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Whether the To Do bar should show also completed tasks"
+msgstr "是否可以看到工具列。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
+msgid "Stores whether the To Do bar should show also completed tasks."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+msgid "Whether the To Do bar should show also tasks without Due date"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+msgid "Stores whether the To Do bar should show also tasks without Due date."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+#, fuzzy
+#| msgid "Show the status bar"
+msgid "Show start up wizard"
+msgstr "顯示狀態列"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
+msgid "Whether show start up wizard when there is no mail account configured."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+msgid "Whether go to the previous message after message deletion"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+msgid ""
+"If set to true, goes to the previous message when the selected is deleted; "
+"or to the next message, when it’s set to false."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+msgid "Show Subject above Sender in Messages column"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+msgid ""
+"Whether to show Subject above Sender (From/To) in the Messages column, "
+"usually shown in the Vertical/Wide view of the message list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+msgid "Visually wrap long lines in composer"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#: ../src/composer/e-composer-actions.c:552
+msgid ""
+"Whether to visually wrap long lines of text to avoid horizontal scrolling"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 msgid "(Deprecated) Default forward style"
 msgstr "(已廢棄) 預設轉寄樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“forward-style-name” instead."
 msgstr ""
 "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「forward-style-name」代替。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 msgid "(Deprecated) Default reply style"
 msgstr "(已廢棄) 預設的回覆樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“reply-style-name” instead."
 msgstr "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「reply-style-name」代替。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(已廢棄) 自訂檔頭以及它們是否啟用的列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“show-headers” instead."
 msgstr "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「show-headers」代替。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(已廢棄) 透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“image-loading-policy” instead."
 msgstr ""
 "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「image-loading-policy」代替。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
 msgstr "(已廢棄) 當使用者轉寄或回覆視窗中顯示的郵件時詢問是否要關閉郵件視窗"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“browser-close-on-reply-policy” instead."
@@ -2349,7 +2413,7 @@ msgstr ""
 "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「browser-close-on-reply-policy」"
 "代替。"
 
-#. Translators: This is the a list of words for the attach reminder plugin to look
+#. Translators: This is a list of words for the attach reminder plugin to look
 #. for in a message body. Please use any number of words here in your language that might
 #. indicate that an attachment should have been attached to the message.
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
@@ -2642,7 +2706,7 @@ msgid ""
 msgstr "當使用 autoar 壓縮附加的目錄時使用的壓縮過濾器。"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../src/shell/main.c:320
+#: ../src/shell/main.c:317
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
@@ -2753,6 +2817,16 @@ msgstr "啟用特殊 WebKit 開發者工具"
 msgid "Any change of this option requires restart of Evolution."
 msgstr "這個選項的任何改變都需要重新啟動 Evolution。"
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:36
+msgid "The last extension being used when backing up Evolution data."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:37
+msgid ""
+"It can be either “.gz” or “.xz” and it influences what extension will be "
+"preselected in the file chooser."
+msgstr ""
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "只使用本地垃圾郵件測試。"
@@ -2787,6 +2861,126 @@ msgstr ""
 "執行 sa-learn 的完整路徑。如果沒有設定,就會使用編譯時期的路徑,通常是 /usr/"
 "bin/sa-learn。這個指令不應包含任何其他引數。"
 
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
+msgid "Theme name to use, defaults to “bclear”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
+msgid ""
+"Use “highlight --list-scripts=themes” to get the list of installed themes "
+"and then the value to one of them. The change requires only re-format of the "
+"message part to take into effect, like using right-click→Format As→...."
+msgstr ""
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:1
+#: ../data/org.gnome.Evolution.desktop.in.in.h:1
+#: ../src/mail/e-mail-browser.c:1112
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
+#: ../src/shell/e-shell-window-private.c:240
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:2
+#: ../data/org.gnome.Evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "管理您的郵件、連絡人和行程"
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:3
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution 是一套個人資訊管理應用程式,提供了整合郵件、行事曆和通訊錄等功能。"
+
+#: ../data/org.gnome.Evolution.appdata.xml.in.h:4
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
+msgstr ""
+"Evolution 支援了用於資訊交換的廣範圍的工業標準資料格式與網路協定,著重於標準"
+"的相容性與安全性。Evolution 也可以與 Microsoft Exchange 透過「Exchange 網頁服"
+"務」(EWS)延伸功能平順的整合。"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:2
+#: ../src/shell/e-shell-utils.c:428
+msgid "Groupware Suite"
+msgstr "Groupware 套裝軟體"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution 郵件與行事曆"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:5
+msgid "email;calendar;contact;addressbook;task;"
+msgstr ""
+"email;calendar;contact;addressbook;task;電子郵件;行事曆;連絡人;通訊錄;工作;"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:6
+msgid "New Window"
+msgstr "新增視窗"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:7
+msgid "Compose a Message"
+msgstr "編輯郵件"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:8
+#: ../src/e-util/e-name-selector-dialog.c:448
+#: ../src/modules/addressbook/e-book-shell-backend.c:307
+#: ../src/modules/addressbook/e-book-shell-view.c:371
+msgid "Contacts"
+msgstr "連絡人"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:9
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
+#: ../src/e-util/e-collection-account-wizard.c:559
+#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:469
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
+#: ../src/modules/calendar/e-cal-shell-view.c:582
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Calendar"
+msgstr "行事曆"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:10
+#: ../src/e-util/e-send-options.c:536 ../src/mail/importers/elm-importer.c:330
+#: ../src/mail/importers/kmail-importer.c:251
+#: ../src/mail/importers/pine-importer.c:423
+#: ../src/modules/mail/e-mail-shell-view.c:1249
+#: ../src/smime/gui/certificate-manager.c:1682
+msgid "Mail"
+msgstr "郵件"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:11
+#: ../src/calendar/gui/e-memo-table.c:368 ../src/e-util/e-webdav-browser.c:459
+#: ../src/modules/calendar/e-cal-shell-content.c:1719
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
+#: ../src/modules/calendar/e-memo-shell-view.c:313
+msgid "Memos"
+msgstr "備忘錄"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:12
+#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2408
+#: ../src/calendar/importers/icalendar-importer.c:77
+#: ../src/calendar/importers/icalendar-importer.c:1110
+#: ../src/e-util/e-webdav-browser.c:460
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-cal-shell-content.c:1679
+#: ../src/modules/calendar/e-task-shell-view-actions.c:218
+#: ../src/modules/calendar/e-task-shell-view-actions.c:233
+#: ../src/modules/calendar/e-task-shell-view.c:471
+msgid "Tasks"
+msgstr "工作"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Evolution 鬧鈴通知"
+
+#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "行事曆事件通知"
+
 #: ../data/views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
 msgstr "地址卡(_A)"
@@ -2848,11 +3042,11 @@ msgstr "用於寬檢視(_W)"
 msgid "As Sent Folder for Wi_de View"
 msgstr "做為寬檢視的寄送資料夾(_D)"
 
-#: ../data/views/memos/galview.xml.h:1
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2439
 msgid "_Memos"
 msgstr "備忘錄(_M)"
 
-#: ../data/views/tasks/galview.xml.h:1
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2443
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "工作(_T)"
@@ -2870,116 +3064,98 @@ msgid "This address book could not be opened."
 msgstr "無法開啟此通訊錄。"
 
 #: ../src/addressbook/addressbook.error.xml.h:2
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr "此通訊錄伺服器無法連線,或伺服器名稱可能拼錯,或您的網路連線已經停止。"
-
-#: ../src/addressbook/addressbook.error.xml.h:3
-msgid "Failed to authenticate with LDAP server."
+#, fuzzy
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to communicate with LDAP server."
 msgstr "無法核對 LDAP 伺服器。"
 
-#: ../src/addressbook/addressbook.error.xml.h:4
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"請檢查來確定您的密碼拼法正確,而且您使用的是支援的登入方法。請記得許多密碼有"
-"區分大小寫;您可能啟動了大寫鎖定鍵。"
-
-#: ../src/addressbook/addressbook.error.xml.h:5
+#: ../src/addressbook/addressbook.error.xml.h:3
 msgid "This address book server does not have any suggested search bases."
 msgstr "此通訊錄伺服器沒有任何建議的搜尋基礎。"
 
-#: ../src/addressbook/addressbook.error.xml.h:6
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"此 LDAP 伺服器可能使用舊的 LDAP 版本,它不支援此功能,或可能設定錯誤。請洽詢"
-"管理員,瞭解支援的搜尋基礎。"
-
-#: ../src/addressbook/addressbook.error.xml.h:7
+#: ../src/addressbook/addressbook.error.xml.h:4
 msgid "This server does not support LDAPv3 schema information."
 msgstr "此伺服器不支援 LDAPv3 綱要資訊。"
 
-#: ../src/addressbook/addressbook.error.xml.h:8
+#: ../src/addressbook/addressbook.error.xml.h:5
 msgid "Could not get schema information for LDAP server."
 msgstr "無法取得 LDAP 伺服器的綱要資訊。"
 
-#: ../src/addressbook/addressbook.error.xml.h:9
+#: ../src/addressbook/addressbook.error.xml.h:6
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 伺服器未回應有效的綱要資訊。"
 
-#: ../src/addressbook/addressbook.error.xml.h:10
+#: ../src/addressbook/addressbook.error.xml.h:7
 msgid "Could not remove address book."
 msgstr "無法移除通訊錄。"
 
-#: ../src/addressbook/addressbook.error.xml.h:11
-msgid "Delete address book “{0}”?"
-msgstr "刪除通訊錄「{0}」?"
+#: ../src/addressbook/addressbook.error.xml.h:8
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete address book “{0}”?"
+msgstr "確定要刪除備忘錄「{0}」?"
 
-#: ../src/addressbook/addressbook.error.xml.h:12
+#: ../src/addressbook/addressbook.error.xml.h:9
 msgid "This address book will be removed permanently."
 msgstr "此通訊錄將被永遠移除。"
 
-#: ../src/addressbook/addressbook.error.xml.h:13
-#: ../src/calendar/calendar.error.xml.h:7 ../src/mail/mail.error.xml.h:69
+#: ../src/addressbook/addressbook.error.xml.h:10
+#: ../src/calendar/calendar.error.xml.h:7 ../src/e-util/e-system.error.xml.h:27
+#: ../src/mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "不要刪除(_N)"
 
-#: ../src/addressbook/addressbook.error.xml.h:14
+#: ../src/addressbook/addressbook.error.xml.h:11
 msgid "Delete remote address book “{0}”?"
 msgstr "刪除遠端通訊錄「{0}」?"
 
-#: ../src/addressbook/addressbook.error.xml.h:15
+#: ../src/addressbook/addressbook.error.xml.h:12
 msgid ""
 "This will permanently remove the address book “{0}” from the server. Are you "
 "sure you want to proceed?"
 msgstr "這樣會從伺服器永遠刪除通訊錄「{0}」。您確定要繼續嗎?"
 
-#: ../src/addressbook/addressbook.error.xml.h:16
+#: ../src/addressbook/addressbook.error.xml.h:13
 #: ../src/calendar/calendar.error.xml.h:65
+#: ../src/e-util/e-system.error.xml.h:28
 msgid "_Delete From Server"
 msgstr "從伺服器刪除(_D)"
 
-#: ../src/addressbook/addressbook.error.xml.h:17
+#: ../src/addressbook/addressbook.error.xml.h:14
 msgid "Category editor not available."
 msgstr "分類編輯器無法使用。"
 
-#: ../src/addressbook/addressbook.error.xml.h:18
+#: ../src/addressbook/addressbook.error.xml.h:15
 msgid "Unable to open address book “{0}”"
 msgstr "無法開啟通訊錄「{0}」"
 
-#: ../src/addressbook/addressbook.error.xml.h:19
+#: ../src/addressbook/addressbook.error.xml.h:16
 msgid "Unable to perform search."
 msgstr "無法執行搜尋。"
 
-#: ../src/addressbook/addressbook.error.xml.h:20
+#: ../src/addressbook/addressbook.error.xml.h:17
 msgid "Failed to refresh address book “{0}”"
 msgstr "無法重新整理通訊錄「{0}」"
 
-#: ../src/addressbook/addressbook.error.xml.h:21
+#: ../src/addressbook/addressbook.error.xml.h:18
 msgid "Would you like to save your changes?"
 msgstr "要儲存所做的變更?"
 
-#: ../src/addressbook/addressbook.error.xml.h:22
+#: ../src/addressbook/addressbook.error.xml.h:19
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "您已經修改此連絡人。要儲存這些變更?"
 
-#: ../src/addressbook/addressbook.error.xml.h:23
+#: ../src/addressbook/addressbook.error.xml.h:20
 msgid "_Discard"
 msgstr "放棄(_D)"
 
-#: ../src/addressbook/addressbook.error.xml.h:24
+#: ../src/addressbook/addressbook.error.xml.h:21
 msgid "Cannot move contact."
 msgstr "無法移動連絡人。"
 
-#: ../src/addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:22
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -2987,103 +3163,104 @@ msgstr ""
 "您正在嘗試從某一個通訊錄,將連絡人移至另一個通訊錄,但是它無法從來源移除。您"
 "想要儲存一個副本來代替嗎?"
 
-#: ../src/addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:23
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "你所選擇的影像太大。您是否要改變大小後才儲存它?"
 
-#: ../src/addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:24
 msgid "_Resize"
 msgstr "調整大小(_R)"
 
-#: ../src/addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:25
 msgid "_Use as it is"
 msgstr "將它視為(_U)"
 
-#: ../src/addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:26
 msgid "_Do not save"
 msgstr "不要儲存(_D)"
 
-#: ../src/addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "Unable to save {0}."
 msgstr "無法儲存 {0}。"
 
-#: ../src/addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "Error saving {0} to {1}: {2}"
 msgstr "將 {0} 儲存至 {1} 發生錯誤: {2}"
 
-#: ../src/addressbook/addressbook.error.xml.h:32
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "Address “{0}” already exists."
 msgstr "通訊錄「{0}」已存在。"
 
-#: ../src/addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:30
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
 msgstr "此連絡人的電子郵件地址已經存在。您無論如何都要加入同樣位址的新名片嗎?"
 
-#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/addressbook.error.xml.h:31
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1355
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1359
+#: ../src/e-util/e-accounts-window.c:1526
 #: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:23
+#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:25
 #: ../src/mail/e-mail-account-manager.c:719
 #: ../src/mail/e-mail-label-manager.c:371
 #: ../src/mail/em-folder-properties.c:1031
 #: ../src/mail/em-vfolder-editor-rule.c:397
-#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:60
+#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:61
 #: ../src/modules/mail/em-composer-prefs.c:422
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:543
 #: ../src/plugins/email-custom-header/email-custom-header.c:837
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../src/plugins/templates/templates.c:463
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../src/addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:32
 msgid "Some addresses already exist in this contact list."
 msgstr "有些位址已在這個連絡人列表中。"
 
-#: ../src/addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
 msgstr "您嘗試加入的位址已經是這個列表的一部分。要強制加入它們嗎?"
 
-#: ../src/addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:34
 msgid "Skip duplicates"
 msgstr "略過重複項目"
 
-#: ../src/addressbook/addressbook.error.xml.h:38
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Add with duplicates"
 msgstr "加入重複項目"
 
-#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/addressbook.error.xml.h:36
 msgid "List “{0}” is already in this contact list."
 msgstr "列表「{0}」已經在這個連絡人列表中。"
 
-#: ../src/addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:37
 msgid ""
 "A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
 msgstr "以「{0}」為名的連絡人列表已經存在這個連絡人列表中。要強制加入它嗎?"
 
-#: ../src/addressbook/addressbook.error.xml.h:41
+#: ../src/addressbook/addressbook.error.xml.h:38
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "刪除連絡人失敗"
 
-#: ../src/addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:39
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "您沒有足夠的權限刪除這個通訊錄中的連絡人。"
 
-#: ../src/addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:40
 msgid "Cannot add new contact"
 msgstr "不能加入新的連絡人"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:42
 msgid ""
 "“{0}” is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -3091,12 +3268,12 @@ msgstr ""
 "「{0}」是一個唯讀的通訊錄,不能被修改。請從連絡人檢視的側邊欄中選擇不同的通訊"
 "錄。"
 
-#: ../src/addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:43
 msgid "Cannot save a contact, address book is still opening"
 msgstr "無法儲存連絡人,通訊錄仍在開啟中"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:48
+#: ../src/addressbook/addressbook.error.xml.h:45
 msgid ""
 "Cannot save a contact to the address book “{0}”, because it is still "
 "opening. Either wait till it’s opened, or select a different address book."
@@ -3104,11 +3281,11 @@ msgstr ""
 "無法儲存連絡人到通訊錄「{0}」中,因為通訊錄仍在開啟中。只能等待它開啟完成,或"
 "是選擇不同的通訊錄。"
 
-#: ../src/addressbook/addressbook.error.xml.h:49
+#: ../src/addressbook/addressbook.error.xml.h:46
 msgid "Something has gone wrong when displaying the contact"
 msgstr "顯示連絡人時發生錯誤"
 
-#: ../src/addressbook/addressbook.error.xml.h:50
+#: ../src/addressbook/addressbook.error.xml.h:47
 msgid ""
 "A WebKitWebProcess crashed when displaying the contact. You can try again by "
 "moving to another contact and back. If the issue persists, please file a bug "
@@ -3169,8 +3346,8 @@ msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1996
-#: ../src/mail/mail-config.ui.h:37
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1976
+#: ../src/mail/mail-config.ui.h:38
 msgid "Options"
 msgstr "選項"
 
@@ -3190,12 +3367,14 @@ msgstr "選項"
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
 #: ../src/calendar/gui/e-cal-dialogs.c:694
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
-#: ../src/composer/e-composer-actions.c:227 ../src/e-util/e-activity-bar.c:357
+#: ../src/composer/e-composer-actions.c:229 ../src/e-util/e-activity-bar.c:357
 #: ../src/e-util/e-attachment-dialog.c:309
 #: ../src/e-util/e-attachment-store.c:664
-#: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:301
-#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:137
-#: ../src/e-util/e-category-editor.c:207 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:302
+#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:140
+#: ../src/e-util/e-category-editor.c:211 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-collection-account-wizard.c:1563
+#: ../src/e-util/e-collection-account-wizard.c:1798
 #: ../src/e-util/e-color-chooser-widget.c:125
 #: ../src/e-util/e-filter-datespec.c:289
 #: ../src/e-util/e-html-editor-actions.c:321
@@ -3203,27 +3382,29 @@ msgstr "選項"
 #: ../src/e-util/e-image-chooser-dialog.c:169
 #: ../src/e-util/e-mail-signature-script-dialog.c:366
 #: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:813
-#: ../src/e-util/e-rule-editor.c:178 ../src/e-util/e-rule-editor.c:280
-#: ../src/e-util/e-rule-editor.c:789 ../src/e-util/e-send-options.ui.h:16
-#: ../src/e-util/e-source-config-dialog.c:377
+#: ../src/e-util/e-rule-editor.c:187 ../src/e-util/e-rule-editor.c:298
+#: ../src/e-util/e-rule-editor.c:930 ../src/e-util/e-send-options.ui.h:16
+#: ../src/e-util/e-source-config-dialog.c:360
 #: ../src/e-util/e-source-selector-dialog.c:370
 #: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:3
 #: ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4065
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4133
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
-#: ../src/mail/e-mail-config-window.c:331 ../src/mail/e-mail-label-dialog.c:194
+#: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
 #: ../src/mail/e-mail-tag-editor.c:168 ../src/mail/em-folder-selector.c:318
 #: ../src/mail/mail-config.ui.h:2 ../src/mail/mail.error.xml.h:16
-#: ../src/mail/mail-send-recv.c:747 ../src/mail/mail-send-recv.c:829
+#: ../src/mail/mail-send-recv.c:867 ../src/mail/mail-send-recv.c:949
 #: ../src/mail/mail-vfolder-ui.c:149 ../src/mail/mail-vfolder-ui.c:271
-#: ../src/modules/backup-restore/evolution-backup-tool.c:932
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:277
+#: ../src/modules/backup-restore/evolution-backup-tool.c:936
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
 #: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../src/plugins/face/face.c:295
-#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:419
 #: ../src/plugins/save-calendar/save-calendar.c:185
-#: ../src/shell/e-shell-content.c:657 ../src/shell/e-shell-content.c:764
+#: ../src/shell/e-shell-content.c:639 ../src/shell/e-shell-content.c:746
 #: ../src/shell/e-shell-utils.c:70 ../src/shell/e-shell-utils.c:139
 #: ../src/smime/gui/certificate-manager.c:665
 #: ../src/smime/gui/certificate-manager.c:742
@@ -3238,30 +3419,31 @@ msgstr "取消(_C)"
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
 #: ../src/calendar/calendar.error.xml.h:47
-#: ../src/calendar/gui/e-comp-editor.c:2107
-#: ../src/composer/e-composer-actions.c:228
-#: ../src/composer/e-composer-actions.c:348
+#: ../src/calendar/gui/e-comp-editor.c:2115
+#: ../src/composer/e-composer-actions.c:230
+#: ../src/composer/e-composer-actions.c:350
 #: ../src/e-util/e-attachment-store.c:833
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-web-view.c:4066
+#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4134
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
-#: ../src/shell/e-shell-content.c:658 ../src/shell/e-shell-utils.c:140
+#: ../src/shell/e-shell-content.c:640 ../src/shell/e-shell-utils.c:140
 #: ../src/smime/gui/certificate-manager.c:666
 #: ../src/smime/gui/certificate-manager.c:743
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2004
-#: ../src/calendar/gui/e-comp-editor.c:2076
-#: ../src/e-util/e-preferences-window.c:380
+#: ../src/calendar/gui/e-comp-editor.c:2012
+#: ../src/calendar/gui/e-comp-editor.c:2084
+#: ../src/e-util/e-preferences-window.c:390
 #: ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell.c:1309 ../src/shell/e-shell-window-actions.c:964
+#: ../src/shell/e-shell.c:1309 ../src/shell/e-shell-window-actions.c:994
 msgid "_Help"
 msgstr "求助(_H)"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../src/e-util/e-misc-utils.c:3493
 msgid "Image"
 msgstr "影像"
 
@@ -3287,8 +3469,8 @@ msgid "Full _Name..."
 msgstr "全名(_N)…"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:750
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1169
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1181
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "電子郵件"
@@ -3319,8 +3501,8 @@ msgid "_Home Page:"
 msgstr "首頁(_H):"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../src/calendar/gui/e-comp-editor-event.c:727
-#: ../src/modules/itip-formatter/itip-view.c:2045
+#: ../src/calendar/gui/e-comp-editor-event.c:725
+#: ../src/modules/itip-formatter/itip-view.c:2048
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
@@ -3408,20 +3590,21 @@ msgid "_Anniversary:"
 msgstr "週年紀念日(_A):"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2045
+#: ../src/calendar/gui/e-calendar-view.c:2056
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2044
+#: ../src/calendar/gui/e-calendar-view.c:2055
 msgid "Birthday"
 msgstr "生日"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/modules/addressbook/autocompletion-config.c:127
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "雜項"
@@ -3463,16 +3646,16 @@ msgstr "住家"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:860
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "工作"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:513
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:915
-#: ../src/calendar/gui/e-cal-model.c:3823
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:525
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
+#: ../src/calendar/gui/e-cal-model.c:3805
 msgid "Other"
 msgstr "其他"
 
@@ -3496,18 +3679,19 @@ msgstr "加入 _X.509"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1371
-#: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:223
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1375
+#: ../src/e-util/e-attachment-view.c:356 ../src/e-util/e-filter-rule.c:409
 #: ../src/e-util/e-mail-signature-manager.c:368
 #: ../src/e-util/e-name-selector-dialog.c:1037
-#: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:25
-#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438
+#: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:27
+#: ../src/mail/e-mail-config-identity-page.c:871
+#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
 #: ../src/mail/em-folder-properties.c:1037
-#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:61
+#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:62
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:553
 #: ../src/plugins/email-custom-header/email-custom-header.c:847
-#: ../src/plugins/publish-calendar/publish-calendar.c:789
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../src/plugins/publish-calendar/publish-calendar.c:790
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
 #: ../src/plugins/templates/templates.c:473
 msgid "_Remove"
 msgstr "移除(_R)"
@@ -3521,29 +3705,29 @@ msgid "_Load X.509"
 msgstr "載入 X.509 (_L)"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:72
-#: ../src/modules/addressbook/e-book-shell-backend.c:312
+#: ../src/modules/addressbook/e-book-shell-backend.c:318
 msgid "Certificates"
 msgstr "憑證"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
-#: ../src/calendar/gui/e-comp-editor.c:2039
+#: ../src/calendar/gui/e-comp-editor.c:2047
 #: ../src/e-util/e-html-editor-actions.c:913
 msgid "_Undo"
 msgstr "復原(_U)"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:120
+#: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
 msgid "Undo"
 msgstr "復原"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:267
-#: ../src/calendar/gui/e-comp-editor.c:2046
+#: ../src/calendar/gui/e-comp-editor.c:2054
 #: ../src/e-util/e-html-editor-actions.c:899
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../src/calendar/gui/e-comp-editor.c:2048 ../src/e-util/e-focus-tracker.c:136
+#: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "取消復原"
 
@@ -3590,7 +3774,7 @@ msgstr "開啟 X.509 憑證"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4320
-#: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:145
+#: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:148
 #: ../src/e-util/e-html-editor-actions.c:322
 #: ../src/e-util/e-html-editor-actions.c:416
 #: ../src/e-util/e-image-chooser-dialog.c:172 ../src/plugins/face/face.c:296
@@ -3678,26 +3862,27 @@ msgstr "無效的連絡人。"
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
 #: ../src/e-util/e-attachment-dialog.c:311
-#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:208
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:212
 #: ../src/e-util/e-charset-combo-box.c:100
 #: ../src/e-util/e-color-chooser-widget.c:126
 #: ../src/e-util/e-filter-datespec.c:290
 #: ../src/e-util/e-html-editor-link-dialog.c:255
 #: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:814
-#: ../src/e-util/e-rule-editor.c:179 ../src/e-util/e-rule-editor.c:281
-#: ../src/e-util/e-rule-editor.c:790 ../src/e-util/e-send-options.ui.h:17
-#: ../src/e-util/e-source-config-dialog.c:378
+#: ../src/e-util/e-rule-editor.c:188 ../src/e-util/e-rule-editor.c:299
+#: ../src/e-util/e-rule-editor.c:931 ../src/e-util/e-send-options.ui.h:17
+#: ../src/e-util/e-source-config-dialog.c:361
 #: ../src/e-util/e-source-selector-dialog.c:371
 #: ../src/e-util/e-table-config.c:549 ../src/e-util/e-table-config.ui.h:4
 #: ../src/e-util/e-timezone-dialog.ui.h:3
-#: ../src/mail/e-mail-config-window.c:332 ../src/mail/e-mail-tag-editor.c:169
+#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:169
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
 #: ../src/mail/mail-dialogs.ui.h:24 ../src/mail/mail-vfolder-ui.c:150
 #: ../src/mail/mail-vfolder-ui.c:272
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:278
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:420
-#: ../src/shell/e-shell-content.c:659 ../src/shell/e-shell-content.c:765
-#: ../src/shell/main.c:180 ../src/smime/gui/certificate-manager.c:1349
+#: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:747
+#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1349
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "OK"
@@ -3830,22 +4015,22 @@ msgid "Insert email addresses from Address Book"
 msgstr "從通訊錄插入電子郵件位址"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../src/e-util/filter.ui.h:26
+#: ../src/e-util/filter.ui.h:28
 msgid "_Top"
 msgstr "頂端(_T)"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:27
+#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:29
 msgid "_Up"
 msgstr "上(_U)"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:28
+#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "下(_D)"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../src/e-util/filter.ui.h:29
+#: ../src/e-util/filter.ui.h:31
 msgid "_Bottom"
 msgstr "底部(_B)"
 
@@ -3853,29 +4038,29 @@ msgstr "底部(_B)"
 msgid "Contact List Members"
 msgstr "連絡人列表成員"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1485
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1499
 msgid "_Members"
 msgstr "成員(_M)"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1625
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1639
 msgid "Error adding list"
 msgstr "新增列表時發生錯誤"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1645
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1659
 msgid "Error modifying list"
 msgstr "編輯列表時發生錯誤"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1665
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1679
 msgid "Error removing list"
 msgstr "移除列表時發生錯誤"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1219
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1225
 msgid "Name contains"
 msgstr "名稱包含"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1212
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1218
 msgid "Email begins with"
 msgstr "電子郵件開始於"
 
@@ -3883,8 +4068,8 @@ msgstr "電子郵件開始於"
 #: ../src/calendar/gui/caltypes.xml.in.h:26
 #: ../src/calendar/gui/memotypes.xml.in.h:19
 #: ../src/calendar/gui/tasktypes.xml.in.h:30
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1205
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1662
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1211
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1713
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:782
 #: ../src/modules/calendar/e-task-shell-view-actions.c:983
 msgid "Any field contains"
@@ -3896,180 +4081,186 @@ msgstr "任何欄位包含"
 msgid "evolution address book"
 msgstr "evolution 通訊錄"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:149
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:185
 msgid "Copy _Email Address"
 msgstr "複製電子郵件位址(_E)"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:151
-#: ../src/e-util/e-web-view.c:368
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:187
+#: ../src/e-util/e-web-view.c:370
 msgid "Copy the email address to the clipboard"
 msgstr "複製電子郵件位址到剪貼簿"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:156
-#: ../src/e-util/e-web-view.c:380
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:192
+#: ../src/e-util/e-web-view.c:382
 msgid "_Send New Message To..."
 msgstr "傳送新郵件至(_S)…"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:158
-#: ../src/e-util/e-web-view.c:382
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:194
+#: ../src/e-util/e-web-view.c:384
 msgid "Send a mail message to this address"
 msgstr "傳送郵件到這個位址"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:290
-#: ../src/e-util/e-web-view.c:1317
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:321
+#: ../src/e-util/e-web-view.c:1374
 #, c-format
 msgid "Click to mail %s"
 msgstr "按一下來傳送郵件 %s"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:142
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
+#, fuzzy, c-format
+#| msgid "Click to open %s"
+msgid "Click to open map for %s"
+msgstr "按一下來開啟 %s"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:154
 msgid "Open map"
 msgstr "開啟地圖"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:438
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:450
 msgid "SIP"
 msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:682
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:694
 msgid "List Members:"
 msgstr "列表成員:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:754
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:766
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "暱稱"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:755
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:767
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:756
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:768
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:757
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:758
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:770
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:759
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:771
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:760
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:772
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:761
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:773
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:774
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:763
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:775
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:837
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "公司"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:826
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
 msgid "Department"
 msgstr "部門"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:839
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "辦公室"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:840
 msgid "Profession"
 msgstr "職業"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:841
 msgid "Position"
 msgstr "位置"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:842
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "主管"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:831
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:843
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "助理"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:844
 msgid "Video Chat"
 msgstr "視訊交談"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:834
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:846
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:847
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:888
 msgid "Phone"
 msgstr "電話"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:836
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
 msgid "Fax"
 msgstr "傳真"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:905
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:850
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:891
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:917
 msgid "Address"
 msgstr "地址"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:886
 msgid "Home Page"
 msgstr "首頁"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:887
 msgid "Web Log"
 msgstr "網誌"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:889
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:894
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "配偶"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:904
 msgid "Personal"
 msgstr "個人"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "備註"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1133
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1145
 msgid "List Members"
 msgstr "列表成員"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1154
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1166
 msgid "Job Title"
 msgstr "職稱"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1195
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1207
 msgid "Home page"
 msgstr "首頁"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1205
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1217
 msgid "Blog"
 msgstr "部落格"
 
@@ -4077,10 +4268,10 @@ msgstr "部落格"
 #: ../src/calendar/gui/e-cal-component-preview.c:308
 #: ../src/calendar/gui/e-cal-model-tasks.c:314
 #: ../src/calendar/gui/e-cal-model-tasks.c:556
-#: ../src/calendar/gui/e-task-table.c:209
-#: ../src/calendar/gui/e-task-table.c:224
-#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3586
-#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:966
+#: ../src/calendar/gui/e-task-table.c:210
+#: ../src/calendar/gui/e-task-table.c:225
+#: ../src/calendar/gui/e-task-table.c:635 ../src/calendar/gui/print.c:3586
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1086
 msgid "Cancelled"
 msgstr "已取消"
 
@@ -4152,7 +4343,7 @@ msgid ""
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr ""
 "此 Evolution 版本未將 LDAP 支援編譯進去。如果您想在 Evolution 使用 LDAP,必須"
-"安裝啟用 LDAP 的 Evolution 套件。"
+"安裝啟用 LDAP 的 Evolution 軟體包。"
 
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:160
 msgid ""
@@ -4271,7 +4462,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "從剪貼簿貼上連絡人"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "Delete selected contacts"
 msgstr "刪除選定的連絡人"
 
@@ -4306,15 +4497,17 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "您確定要刪除這個連絡人 (%s)?"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
-#: ../src/calendar/gui/e-comp-editor.c:1997 ../src/e-util/e-focus-tracker.c:783
+#: ../src/calendar/gui/e-comp-editor.c:2005
+#: ../src/e-util/e-accounts-window.c:1714 ../src/e-util/e-focus-tracker.c:783
 #: ../src/e-util/evolution-source-viewer.c:806
+#: ../src/e-util/e-webdav-browser.c:2688
 #: ../src/mail/e-mail-account-manager.c:737
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1087
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1524
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:676
 #: ../src/modules/calendar/e-task-shell-view-actions.c:830
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
-#: ../src/shell/e-shell-window-actions.c:822
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
+#: ../src/shell/e-shell-window-actions.c:852
 #: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "刪除(_D)"
@@ -4509,7 +4702,7 @@ msgstr "拉近(_I)"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2421
+#: ../src/mail/e-mail-reader.c:2500
 msgid "Zoom _Out"
 msgstr "拉遠(_O)"
 
@@ -4517,7 +4710,7 @@ msgstr "拉遠(_O)"
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
 #: ../src/e-util/e-html-editor-actions.c:1872
 #: ../src/e-util/e-html-editor-find-dialog.c:250
-#: ../src/shell/e-shell-window-actions.c:899
+#: ../src/shell/e-shell-window-actions.c:929
 msgid "_Find"
 msgstr "尋找(_F)"
 
@@ -4583,8 +4776,8 @@ msgstr ""
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
 #: ../src/calendar/importers/icalendar-importer.c:479
-#: ../src/calendar/importers/icalendar-importer.c:976
-#: ../src/calendar/importers/icalendar-importer.c:1016
+#: ../src/calendar/importers/icalendar-importer.c:972
+#: ../src/calendar/importers/icalendar-importer.c:1012
 #: ../src/shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "匯入…"
@@ -4762,27 +4955,27 @@ msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "電話"
 
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:103
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:116
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:118
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:129
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:131
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:357
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:373
 msgid "Start time"
 msgstr "開始時刻"
 
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../src/calendar/alarm-notify/alarm-queue.c:1988
+#: ../src/calendar/alarm-notify/alarm-queue.c:2002
 msgid "Appointments"
 msgstr "會議"
 
@@ -4795,19 +4988,21 @@ msgid "_Snooze"
 msgstr "延期(_S)"
 
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1363
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
-#: ../src/calendar/gui/e-comp-editor.c:2062
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1367
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2222
+#: ../src/calendar/gui/e-comp-editor.c:2070
+#: ../src/e-util/e-accounts-window.c:1706
 #: ../src/e-util/e-html-editor-actions.c:922
-#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/filter.ui.h:24
-#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171
+#: ../src/e-util/e-mail-signature-manager.c:358
+#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:26
+#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:172
 #: ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:65
+#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:66
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:548
 #: ../src/plugins/email-custom-header/email-custom-header.c:842
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../src/plugins/templates/templates.c:468
-#: ../src/shell/e-shell-window-actions.c:950 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/shell/e-shell-window-actions.c:980 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -4821,11 +5016,11 @@ msgid "_Dismiss"
 msgstr "解除(_D)"
 
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../src/calendar/alarm-notify/alarm-queue.c:1955
-#: ../src/calendar/alarm-notify/alarm-queue.c:1965
+#: ../src/calendar/alarm-notify/alarm-queue.c:1969
+#: ../src/calendar/alarm-notify/alarm-queue.c:1979
 #: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1678
-#: ../src/modules/itip-formatter/itip-view.c:1789
+#: ../src/modules/itip-formatter/itip-view.c:1681
+#: ../src/modules/itip-formatter/itip-view.c:1792
 msgid "Location:"
 msgstr "位置:"
 
@@ -4842,7 +5037,7 @@ msgstr "忽略時間(_T):"
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:342
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
 msgid "days"
 msgstr "天"
 
@@ -4853,52 +5048,50 @@ msgstr "小時"
 
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
-#: ../src/mail/e-mail-config-provider-page.c:571
+#: ../src/mail/e-mail-config-provider-page.c:579
 msgid "minutes"
 msgstr "分鐘"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:1756
-#: ../src/calendar/alarm-notify/alarm-queue.c:1936
+#: ../src/calendar/alarm-notify/alarm-queue.c:1770
+#: ../src/calendar/alarm-notify/alarm-queue.c:1950
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:1765
-#: ../src/calendar/alarm-notify/alarm-queue.c:1767
+#: ../src/calendar/alarm-notify/alarm-queue.c:1779
+#: ../src/calendar/alarm-notify/alarm-queue.c:1781
 msgid "No description available."
 msgstr "沒有任何描述。"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:1775
+#: ../src/calendar/alarm-notify/alarm-queue.c:1789
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:1780
-#: ../src/calendar/alarm-notify/alarm-queue.c:1927
-#: ../src/calendar/alarm-notify/alarm-queue.c:2278
+#: ../src/calendar/alarm-notify/alarm-queue.c:1794
+#: ../src/calendar/alarm-notify/alarm-queue.c:1941
+#: ../src/calendar/alarm-notify/alarm-queue.c:2292
 msgid "Evolution Reminders"
 msgstr "Evolution 提醒"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:1823
+#: ../src/calendar/alarm-notify/alarm-queue.c:1837
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "您有 %d 個提醒"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:2096
+#: ../src/calendar/alarm-notify/alarm-queue.c:2110
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:2097
+#: ../src/calendar/alarm-notify/alarm-queue.c:2111
 #: ../src/mail/mail-dialogs.ui.h:20
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
 msgid "_No"
 msgstr "否(_N)"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:2098
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
+#: ../src/calendar/alarm-notify/alarm-queue.c:2112
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:2102
+#: ../src/calendar/alarm-notify/alarm-queue.c:2116
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4915,7 +5108,7 @@ msgstr ""
 "\n"
 "您確定要執行這個程式?"
 
-#: ../src/calendar/alarm-notify/alarm-queue.c:2117
+#: ../src/calendar/alarm-notify/alarm-queue.c:2131
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -5090,7 +5283,7 @@ msgid "_Save Changes"
 msgstr "儲存變更(_S)"
 
 #: ../src/calendar/calendar.error.xml.h:31
-#: ../src/composer/mail-composer.error.xml.h:13
+#: ../src/composer/mail-composer.error.xml.h:15
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
@@ -5128,7 +5321,7 @@ msgid ""
 msgstr "電子郵件邀請函會傳送給所有參與者並讓他們回覆。"
 
 #: ../src/calendar/calendar.error.xml.h:40
-#: ../src/composer/mail-composer.error.xml.h:38 ../src/mail/mail.error.xml.h:8
+#: ../src/composer/mail-composer.error.xml.h:40 ../src/mail/mail.error.xml.h:8
 #: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "傳送(_S)"
@@ -5208,32 +5401,40 @@ msgid "Editor could not be loaded."
 msgstr "無法載入編輯器。"
 
 #: ../src/calendar/calendar.error.xml.h:57
-msgid "Delete calendar “{0}”?"
-msgstr "刪除行事曆「{0}」?"
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete calendar “{0}”?"
+msgstr "確定要刪除備忘錄「{0}」?"
 
 #: ../src/calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "這個行事曆將會被永遠移除。"
 
 #: ../src/calendar/calendar.error.xml.h:59
-msgid "Delete task list “{0}”?"
-msgstr "刪除工作列表「{0}」?"
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete task list “{0}”?"
+msgstr "確定要刪除備忘錄「{0}」?"
 
 #: ../src/calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "這項工作列表將會被永遠移除。"
 
 #: ../src/calendar/calendar.error.xml.h:61
-msgid "Delete memo list “{0}”?"
-msgstr "刪除備忘錄列表「{0}」?"
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete memo list “{0}”?"
+msgstr "確定要刪除備忘錄「{0}」?"
 
 #: ../src/calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
 msgstr "這個備忘錄列表將會被永遠移除。"
 
 #: ../src/calendar/calendar.error.xml.h:63
-msgid "Delete remote calendar “{0}”?"
-msgstr "刪除遠端行事曆「{0}」?"
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete remote calendar “{0}”?"
+msgstr "確定要刪除備忘錄「{0}」?"
 
 #: ../src/calendar/calendar.error.xml.h:64
 msgid ""
@@ -5242,8 +5443,10 @@ msgid ""
 msgstr "這樣會從伺服器永遠刪除行事曆「{0}」。您確定要繼續嗎?"
 
 #: ../src/calendar/calendar.error.xml.h:66
-msgid "Delete remote task list “{0}”?"
-msgstr "刪除遠端工作列表「{0}」?"
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete remote task list “{0}”?"
+msgstr "確定要刪除備忘錄「{0}」?"
 
 #: ../src/calendar/calendar.error.xml.h:67
 msgid ""
@@ -5252,8 +5455,10 @@ msgid ""
 msgstr "這樣會從伺服器永遠刪除工作列表「{0}」。您確定要繼續嗎?"
 
 #: ../src/calendar/calendar.error.xml.h:68
-msgid "Delete remote memo list “{0}”?"
-msgstr "刪除遠端備忘錄列表「{0}」?"
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete remote memo list “{0}”?"
+msgstr "確定要刪除備忘錄「{0}」?"
 
 #: ../src/calendar/calendar.error.xml.h:69
 msgid ""
@@ -5610,6 +5815,7 @@ msgstr "不包含"
 #: ../src/calendar/gui/memotypes.xml.in.h:4
 #: ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
+#: ../src/e-util/e-collection-account-wizard.c:1655
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -5643,21 +5849,21 @@ msgstr "不是"
 #: ../src/calendar/gui/caltypes.xml.in.h:9
 #: ../src/calendar/gui/e-cal-list-view.c:238
 #: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-task-table.c:522
+#: ../src/calendar/gui/e-task-table.c:523
 #: ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "公開"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:10
 #: ../src/calendar/gui/e-cal-list-view.c:239
-#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:523
+#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:524
 #: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "私人"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:11
 #: ../src/calendar/gui/e-cal-list-view.c:240
-#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:524
+#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:525
 #: ../src/calendar/gui/memotypes.xml.in.h:12
 #: ../src/e-util/e-html-editor-page-dialog.c:113
 #: ../src/e-util/e-send-options.ui.h:7
@@ -5679,8 +5885,8 @@ msgstr "出席者"
 #: ../src/calendar/gui/caltypes.xml.in.h:14
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:5
 #: ../src/mail/message-list.etspec.h:14
-#: ../src/plugins/publish-calendar/publish-calendar.c:860
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
+#: ../src/plugins/publish-calendar/publish-calendar.c:861
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../src/plugins/save-calendar/csv-format.c:387
 msgid "Location"
 msgstr "位置"
@@ -5719,7 +5925,7 @@ msgid "Do Not Exist"
 msgstr "不存在"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2003
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2002
 msgid "Recurrence"
 msgstr "週期性"
 
@@ -5751,6 +5957,19 @@ msgstr "摘要包含"
 msgid "Description Contains"
 msgstr "描述包含"
 
+#: ../src/calendar/gui/comp-util.c:1490
+#: ../src/modules/itip-formatter/itip-view.c:2365
+#, c-format
+msgid "with one guest"
+msgid_plural "with %d guests"
+msgstr[0] ""
+
+#: ../src/calendar/gui/comp-util.c:1546
+#, fuzzy, c-format
+#| msgid "Comment:"
+msgid "Comments: %s"
+msgstr "註解:"
+
 #: ../src/calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "新增會議"
@@ -5860,28 +6079,28 @@ msgstr[0] "%d 週"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:419
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1827
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1811
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "播放音效"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:423
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1825
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1809
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "彈出警告視窗"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:427
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1831
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1815
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "傳送郵件"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:431
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1829
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1813
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "執行程式"
@@ -5974,7 +6193,7 @@ msgid "calendar view for one or more weeks"
 msgstr "用於一或多週的行事曆檢視"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:214
-#: ../src/e-util/e-filter-rule.c:770 ../src/mail/e-mail-config-page.c:127
+#: ../src/e-util/e-filter-rule.c:985 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "無標題"
 
@@ -5999,8 +6218,8 @@ msgid "Due Date:"
 msgstr "截止日期:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:298
-#: ../src/modules/itip-formatter/itip-view.c:1681
-#: ../src/modules/itip-formatter/itip-view.c:1798
+#: ../src/modules/itip-formatter/itip-view.c:1684
+#: ../src/modules/itip-formatter/itip-view.c:1801
 msgid "Status:"
 msgstr "狀態:"
 
@@ -6008,9 +6227,9 @@ msgstr "狀態:"
 #: ../src/calendar/gui/e-cal-model-tasks.c:310
 #: ../src/calendar/gui/e-cal-model-tasks.c:552
 #: ../src/calendar/gui/e-cal-model-tasks.c:633
-#: ../src/calendar/gui/e-task-table.c:205
-#: ../src/calendar/gui/e-task-table.c:220
-#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3580
+#: ../src/calendar/gui/e-task-table.c:206
+#: ../src/calendar/gui/e-task-table.c:221
+#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3580
 msgid "In Progress"
 msgstr "進行中"
 
@@ -6019,9 +6238,9 @@ msgstr "進行中"
 #: ../src/calendar/gui/e-cal-model-tasks.c:554
 #: ../src/calendar/gui/e-meeting-store.c:202
 #: ../src/calendar/gui/e-meeting-store.c:225
-#: ../src/calendar/gui/e-task-table.c:207
-#: ../src/calendar/gui/e-task-table.c:222
-#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3583
+#: ../src/calendar/gui/e-task-table.c:208
+#: ../src/calendar/gui/e-task-table.c:223
+#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3583
 #: ../src/calendar/gui/tasktypes.xml.in.h:13
 #: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Completed"
@@ -6030,9 +6249,9 @@ msgstr "已完成"
 #: ../src/calendar/gui/e-cal-component-preview.c:312
 #: ../src/calendar/gui/e-cal-model-tasks.c:308
 #: ../src/calendar/gui/e-cal-model-tasks.c:550
-#: ../src/calendar/gui/e-task-table.c:203
-#: ../src/calendar/gui/e-task-table.c:218
-#: ../src/calendar/gui/e-task-table.c:631 ../src/calendar/gui/print.c:3577
+#: ../src/calendar/gui/e-task-table.c:204
+#: ../src/calendar/gui/e-task-table.c:219
+#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3577
 #: ../src/calendar/gui/tasktypes.xml.in.h:11
 msgid "Not Started"
 msgstr "未開始"
@@ -6042,29 +6261,29 @@ msgid "Priority:"
 msgstr "優先等級:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:327
-#: ../src/calendar/gui/e-task-table.c:548
+#: ../src/calendar/gui/e-task-table.c:549
 #: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:322
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:327
 msgid "High"
 msgstr "高"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:329
-#: ../src/calendar/gui/e-cal-model.c:1888
-#: ../src/calendar/gui/e-task-table.c:549
+#: ../src/calendar/gui/e-cal-model.c:1890
+#: ../src/calendar/gui/e-task-table.c:550
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
-#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:321
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:326
 msgid "Normal"
 msgstr "一般"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:331
-#: ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/e-task-table.c:551
 #: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:320
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:325
 msgid "Low"
 msgstr "低"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:350
-#: ../src/mail/e-mail-config-service-page.c:671
+#: ../src/mail/e-mail-config-service-page.c:531
 msgid "Description:"
 msgstr "描述:"
 
@@ -6087,7 +6306,7 @@ msgstr "正在建立工作列表「%s」的檢視"
 msgid "Creating view for memo list “%s”"
 msgstr "正在建立備忘錄列表「%s」的檢視"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1955
+#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1966
 msgid "Destination is read only"
 msgstr "目的地是唯讀"
 
@@ -6119,7 +6338,7 @@ msgid "Select Date"
 msgstr "選擇日期"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:693
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1248
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1288
 msgid "Select _Today"
 msgstr "選擇今天(_T)"
 
@@ -6238,17 +6457,17 @@ msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr "貼上的文字並未包含有效的 iCalendar 資料"
 
 #: ../src/calendar/gui/e-calendar-view.c:864
-#: ../src/calendar/gui/e-cal-ops.c:1552
+#: ../src/calendar/gui/e-cal-ops.c:1556
 msgid "Default calendar not found"
 msgstr "找不到預設行事曆"
 
 #: ../src/calendar/gui/e-calendar-view.c:869
-#: ../src/calendar/gui/e-cal-ops.c:1555
+#: ../src/calendar/gui/e-cal-ops.c:1559
 msgid "Default memo list not found"
 msgstr "找不到預設備忘錄列表"
 
 #: ../src/calendar/gui/e-calendar-view.c:874
-#: ../src/calendar/gui/e-cal-ops.c:1558
+#: ../src/calendar/gui/e-cal-ops.c:1562
 msgid "Default task list not found"
 msgstr "找不到預設工作列表"
 
@@ -6267,7 +6486,7 @@ msgstr "貼上 iCalendar 資料"
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #: ../src/calendar/gui/e-calendar-view.c:1831
 #: ../src/calendar/gui/e-memo-table.c:493
-#: ../src/calendar/gui/e-task-table.c:818
+#: ../src/calendar/gui/e-task-table.c:819
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "召集人: %s <%s>"
@@ -6277,29 +6496,32 @@ msgstr "召集人: %s <%s>"
 #. * organizer.value.
 #: ../src/calendar/gui/e-calendar-view.c:1835
 #: ../src/calendar/gui/e-memo-table.c:498
-#: ../src/calendar/gui/e-task-table.c:822
+#: ../src/calendar/gui/e-task-table.c:823
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
+#. Translators: It will display "Location: LocationOfTheAppointment"
 #: ../src/calendar/gui/e-calendar-view.c:1851
-#: ../src/calendar/gui/e-meeting-time-sel.c:2725
-#: ../src/calendar/gui/print.c:3531
+#: ../src/calendar/gui/e-meeting-time-sel.c:2671
+#: ../src/calendar/gui/e-to-do-pane.c:346 ../src/calendar/gui/print.c:3531
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#. Translators: It will display "Time: StartDateAndTime (Duration)"
 #: ../src/calendar/gui/e-calendar-view.c:1891
+#: ../src/calendar/gui/e-to-do-pane.c:443
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
 
-#: ../src/calendar/gui/e-calendar-view.c:2277
-#: ../src/calendar/gui/e-calendar-view.c:2284
-#: ../src/calendar/gui/e-calendar-view.c:2291
-#: ../src/calendar/gui/e-calendar-view.c:2294
+#: ../src/calendar/gui/e-calendar-view.c:2288
+#: ../src/calendar/gui/e-calendar-view.c:2295
+#: ../src/calendar/gui/e-calendar-view.c:2302
+#: ../src/calendar/gui/e-calendar-view.c:2305
 msgid "%d %b %Y"
 msgstr "%Y年%m月%d日"
 
@@ -6308,14 +6530,14 @@ msgstr "%Y年%m月%d日"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2282
-#: ../src/calendar/gui/e-day-view.c:3078
-#: ../src/calendar/gui/e-day-view-top-item.c:849
+#: ../src/calendar/gui/e-calendar-view.c:2293
+#: ../src/calendar/gui/e-day-view.c:3104
+#: ../src/calendar/gui/e-day-view-top-item.c:865
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%m月%d日"
 
-#: ../src/calendar/gui/e-calendar-view.c:2304
+#: ../src/calendar/gui/e-calendar-view.c:2315
 msgid "%A %d %b %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -6325,16 +6547,16 @@ msgstr "%Y年%m月%d日%A"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2308
-#: ../src/calendar/gui/e-day-view.c:3062
-#: ../src/calendar/gui/e-day-view-top-item.c:845
+#: ../src/calendar/gui/e-calendar-view.c:2319
+#: ../src/calendar/gui/e-day-view.c:3088
+#: ../src/calendar/gui/e-day-view-top-item.c:861
 #: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
 msgstr "%m月%d日 (%a)"
 
-#: ../src/calendar/gui/e-calendar-view.c:2311
-#: ../src/calendar/gui/e-calendar-view.c:2317
-#: ../src/calendar/gui/e-calendar-view.c:2320
+#: ../src/calendar/gui/e-calendar-view.c:2322
+#: ../src/calendar/gui/e-calendar-view.c:2328
+#: ../src/calendar/gui/e-calendar-view.c:2331
 msgid "%a %d %b %Y"
 msgstr "%Y年%m月%d日 (%a)"
 
@@ -6374,43 +6596,43 @@ msgstr "來源"
 #: ../src/calendar/gui/e-meeting-store.c:167
 #: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
 #: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3412
-#: ../src/modules/itip-formatter/itip-view.c:6082
+#: ../src/modules/itip-formatter/itip-view.c:3559
+#: ../src/modules/itip-formatter/itip-view.c:6316
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:613
-#: ../src/calendar/gui/e-cal-ops.c:1249
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:289
+#: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:614
+#: ../src/calendar/gui/e-cal-ops.c:1250
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:388
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../src/calendar/gui/e-cal-model.c:1505 ../src/calendar/gui/e-cal-ops.c:185
-#: ../src/calendar/gui/e-cal-ops.c:1366
+#: ../src/calendar/gui/e-cal-model.c:1507 ../src/calendar/gui/e-cal-ops.c:186
+#: ../src/calendar/gui/e-cal-ops.c:1367
 msgid "Creating an event"
 msgstr "建立一個事件"
 
-#: ../src/calendar/gui/e-cal-model.c:1509 ../src/calendar/gui/e-cal-ops.c:189
-#: ../src/calendar/gui/e-cal-ops.c:1370
+#: ../src/calendar/gui/e-cal-model.c:1511 ../src/calendar/gui/e-cal-ops.c:190
+#: ../src/calendar/gui/e-cal-ops.c:1371
 msgid "Creating a memo"
 msgstr "建立一份備忘錄"
 
-#: ../src/calendar/gui/e-cal-model.c:1513 ../src/calendar/gui/e-cal-ops.c:193
-#: ../src/calendar/gui/e-cal-ops.c:1374
+#: ../src/calendar/gui/e-cal-model.c:1515 ../src/calendar/gui/e-cal-ops.c:194
+#: ../src/calendar/gui/e-cal-ops.c:1375
 msgid "Creating a task"
 msgstr "建立一項工作"
 
-#: ../src/calendar/gui/e-cal-model.c:1890
+#: ../src/calendar/gui/e-cal-model.c:1892
 msgid "Recurring"
 msgstr "週期性模式"
 
-#: ../src/calendar/gui/e-cal-model.c:1892
+#: ../src/calendar/gui/e-cal-model.c:1894
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model.c:1896
 #: ../src/calendar/gui/e-cal-model-tasks.c:1136
 #: ../src/calendar/gui/e-meeting-list-view.c:207
 #: ../src/calendar/gui/e-meeting-store.c:174
@@ -6419,52 +6641,52 @@ msgstr "已指定"
 msgid "Yes"
 msgstr "是"
 
-#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model.c:1896
 #: ../src/calendar/gui/e-cal-model-tasks.c:1136
 #: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:186
 msgid "No"
 msgstr "否"
 
-#: ../src/calendar/gui/e-cal-model.c:3818
+#: ../src/calendar/gui/e-cal-model.c:3800
 #: ../src/calendar/gui/e-meeting-list-view.c:219
 #: ../src/calendar/gui/e-meeting-store.c:194
 #: ../src/calendar/gui/e-meeting-store.c:217
-#: ../src/modules/itip-formatter/itip-view.c:6070
+#: ../src/modules/itip-formatter/itip-view.c:6304
 msgid "Accepted"
 msgstr "接受"
 
-#: ../src/calendar/gui/e-cal-model.c:3819
+#: ../src/calendar/gui/e-cal-model.c:3801
 #: ../src/calendar/gui/e-meeting-list-view.c:220
 #: ../src/calendar/gui/e-meeting-store.c:196
 #: ../src/calendar/gui/e-meeting-store.c:219
-#: ../src/modules/itip-formatter/itip-view.c:6076
+#: ../src/modules/itip-formatter/itip-view.c:6310
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../src/calendar/gui/e-cal-model.c:3820
+#: ../src/calendar/gui/e-cal-model.c:3802
 #: ../src/calendar/gui/e-meeting-list-view.c:221
 #: ../src/calendar/gui/e-meeting-store.c:198
 #: ../src/calendar/gui/e-meeting-store.c:221
-#: ../src/calendar/gui/e-meeting-time-sel.c:533
+#: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "暫訂"
 
-#: ../src/calendar/gui/e-cal-model.c:3821
+#: ../src/calendar/gui/e-cal-model.c:3803
 #: ../src/calendar/gui/e-meeting-list-view.c:222
 #: ../src/calendar/gui/e-meeting-store.c:200
 #: ../src/calendar/gui/e-meeting-store.c:223
-#: ../src/modules/itip-formatter/itip-view.c:6079
+#: ../src/modules/itip-formatter/itip-view.c:6313
 msgid "Delegated"
 msgstr "已委派"
 
-#: ../src/calendar/gui/e-cal-model.c:3822
+#: ../src/calendar/gui/e-cal-model.c:3804
 msgid "Needs action"
 msgstr "需要動作"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../src/calendar/gui/e-cal-model.c:3877
+#: ../src/calendar/gui/e-cal-model.c:3859
 #: ../src/calendar/gui/e-meeting-list-view.c:687
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -6475,13 +6697,13 @@ msgid "Status"
 msgstr "狀態"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:148
-#: ../src/calendar/gui/e-task-table.c:606
+#: ../src/calendar/gui/e-task-table.c:607
 msgid "Free"
 msgstr "空閒"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:151
-#: ../src/calendar/gui/e-meeting-time-sel.c:534
-#: ../src/calendar/gui/e-task-table.c:607
+#: ../src/calendar/gui/e-meeting-time-sel.c:524
+#: ../src/calendar/gui/e-task-table.c:608
 msgid "Busy"
 msgstr "忙碌"
 
@@ -6501,155 +6723,155 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/calendar/gui/e-cal-ops.c:304
+#: ../src/calendar/gui/e-cal-ops.c:305
 msgid "Modifying an event"
 msgstr "修改一個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:308
+#: ../src/calendar/gui/e-cal-ops.c:309
 msgid "Modifying a memo"
 msgstr "修改一份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:312
+#: ../src/calendar/gui/e-cal-ops.c:313
 msgid "Modifying a task"
 msgstr "修改一項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:411
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1923
 msgid "Removing an event"
 msgstr "移除一個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:415
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1927
 msgid "Removing a memo"
 msgstr "移除一份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:419
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1931
 msgid "Removing a task"
 msgstr "移除一項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:510
+#: ../src/calendar/gui/e-cal-ops.c:511
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "刪除 %d 個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:514
+#: ../src/calendar/gui/e-cal-ops.c:515
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "刪除 %d 份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:518
+#: ../src/calendar/gui/e-cal-ops.c:519
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "刪除 %d 項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:721
+#: ../src/calendar/gui/e-cal-ops.c:722
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "貼上 %d 個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:736
+#: ../src/calendar/gui/e-cal-ops.c:737
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "貼上 %d 份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:751
+#: ../src/calendar/gui/e-cal-ops.c:752
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "貼上 %d 項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:850
+#: ../src/calendar/gui/e-cal-ops.c:851
 msgid "Updating an event"
 msgstr "更新一個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:854
+#: ../src/calendar/gui/e-cal-ops.c:855
 msgid "Updating a memo"
 msgstr "更新一則備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:858
+#: ../src/calendar/gui/e-cal-ops.c:859
 msgid "Updating a task"
 msgstr "更新一項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:966
+#: ../src/calendar/gui/e-cal-ops.c:967
 #, c-format
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "正在取得在行事曆「%s」中要清空的事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:970
+#: ../src/calendar/gui/e-cal-ops.c:971
 #, c-format
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "正在取得在備忘錄列表「%s」中要清空的備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:974
+#: ../src/calendar/gui/e-cal-ops.c:975
 #, c-format
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "正在取得在工作列表「%s」中要清空的工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:1000
+#: ../src/calendar/gui/e-cal-ops.c:1001
 #, c-format
 msgid "Purging events in the calendar “%s”"
 msgstr "正在清空行事曆「%s」中的事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:1004
+#: ../src/calendar/gui/e-cal-ops.c:1005
 #, c-format
 msgid "Purging memos in the memo list “%s”"
 msgstr "正在清空備忘錄列表「%s」中的備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:1008
+#: ../src/calendar/gui/e-cal-ops.c:1009
 #, c-format
 msgid "Purging tasks in the task list “%s”"
 msgstr "正在清空工作列表「%s」中的工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:1108
+#: ../src/calendar/gui/e-cal-ops.c:1109
 msgid "Purging events"
 msgstr "正在清除事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:1112
+#: ../src/calendar/gui/e-cal-ops.c:1113
 msgid "Purging memos"
 msgstr "正在清除備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:1116
+#: ../src/calendar/gui/e-cal-ops.c:1117
 msgid "Purging tasks"
 msgstr "正在清除工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:1218
+#: ../src/calendar/gui/e-cal-ops.c:1219
 msgid "Expunging completed tasks"
 msgstr "清除已完成的工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:2049
+#: ../src/calendar/gui/e-cal-ops.c:2060
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "移個 %d 個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:2050
+#: ../src/calendar/gui/e-cal-ops.c:2061
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "正在複製 %d 個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:2056
+#: ../src/calendar/gui/e-cal-ops.c:2067
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "正在移動 %d 份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:2057
+#: ../src/calendar/gui/e-cal-ops.c:2068
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "正在複製 %d 份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:2063
+#: ../src/calendar/gui/e-cal-ops.c:2074
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "正在移動 %d 項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:2064
+#: ../src/calendar/gui/e-cal-ops.c:2075
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -6702,12 +6924,17 @@ msgstr "開始時刻不是有效的時刻"
 
 #: ../src/calendar/gui/e-comp-editor-event.c:442
 #: ../src/calendar/gui/e-comp-editor-event.c:458
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:199
-#: ../src/calendar/gui/e-comp-editor.c:338 ../src/mail/e-mail-display.c:2116
-#: ../src/mail/e-mail-reader-utils.c:646 ../src/mail/mail-send-recv.c:490
-#: ../src/mail/mail-send-recv.c:1288 ../src/plugins/face/face.c:174
-#: ../src/shell/e-shell.c:1073 ../src/shell/e-shell.c:1097
-#: ../src/smime/gui/certificate-manager.c:357
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
+#: ../src/calendar/gui/e-comp-editor.c:338
+#: ../src/em-format/e-mail-part-secure-button.c:93
+#: ../src/e-util/e-misc-utils.c:4136 ../src/e-util/e-misc-utils.c:4148
+#: ../src/e-util/e-misc-utils.c:4162 ../src/mail/e-mail-autoconfig.c:893
+#: ../src/mail/e-mail-display.c:2243 ../src/mail/e-mail-reader-utils.c:806
+#: ../src/mail/mail-send-recv.c:569 ../src/mail/mail-send-recv.c:1422
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:172
+#: ../src/plugins/face/face.c:174 ../src/shell/e-shell.c:1073
+#: ../src/shell/e-shell.c:1097 ../src/smime/gui/certificate-manager.c:357
+#, c-format
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
@@ -6719,119 +6946,119 @@ msgstr "結束日期不是有效的日期"
 msgid "End time is not a valid time"
 msgstr "結束時刻不是有效的時刻"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:586
+#: ../src/calendar/gui/e-comp-editor-event.c:584
 #: ../src/calendar/gui/e-comp-editor-memo.c:126
 #: ../src/calendar/gui/e-comp-editor-task.c:591
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:588
+#: ../src/calendar/gui/e-comp-editor-event.c:586
 #: ../src/calendar/gui/e-comp-editor-memo.c:128
 #: ../src/calendar/gui/e-comp-editor-task.c:593
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:594
+#: ../src/calendar/gui/e-comp-editor-event.c:592
 #: ../src/calendar/gui/e-comp-editor-task.c:599
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:596
+#: ../src/calendar/gui/e-comp-editor-event.c:594
 #: ../src/calendar/gui/e-comp-editor-task.c:601
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:602
+#: ../src/calendar/gui/e-comp-editor-event.c:600
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:604
+#: ../src/calendar/gui/e-comp-editor-event.c:602
 msgid "Toggles whether to have All Day Event"
 msgstr "切換是否要有全天事件"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:610
+#: ../src/calendar/gui/e-comp-editor-event.c:608
 msgid "Show Time as _Busy"
 msgstr "顯示時間為忙碌(_B)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:612
+#: ../src/calendar/gui/e-comp-editor-event.c:610
 msgid "Toggles whether to show time as busy"
 msgstr "切換是否將時間顯示為忙碌"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:621
+#: ../src/calendar/gui/e-comp-editor-event.c:619
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:623
+#: ../src/calendar/gui/e-comp-editor-event.c:621
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:628
+#: ../src/calendar/gui/e-comp-editor-event.c:626
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:630
+#: ../src/calendar/gui/e-comp-editor-event.c:628
 msgid "Classify as private"
 msgstr "歸類為私人"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:635
+#: ../src/calendar/gui/e-comp-editor-event.c:633
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:637
+#: ../src/calendar/gui/e-comp-editor-event.c:635
 msgid "Classify as confidential"
 msgstr "歸類為機密"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:738
+#: ../src/calendar/gui/e-comp-editor-event.c:736
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:743
+#: ../src/calendar/gui/e-comp-editor-event.c:741
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:753
+#: ../src/calendar/gui/e-comp-editor-event.c:751
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "全天事件(_Y)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:806
+#: ../src/calendar/gui/e-comp-editor-event.c:804
 #: ../src/calendar/gui/e-comp-editor-memo.c:213
 #: ../src/calendar/gui/e-comp-editor-task.c:765
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "一般"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:809
+#: ../src/calendar/gui/e-comp-editor-event.c:807
 #: ../src/calendar/gui/e-comp-editor-task.c:782
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "提醒"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:812
+#: ../src/calendar/gui/e-comp-editor-event.c:810
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "週期性"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:815
+#: ../src/calendar/gui/e-comp-editor-event.c:813
 #: ../src/calendar/gui/e-comp-editor-memo.c:216
 #: ../src/calendar/gui/e-comp-editor-task.c:785
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "附件"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:825
+#: ../src/calendar/gui/e-comp-editor-event.c:823
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "排程"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:857
+#: ../src/calendar/gui/e-comp-editor-event.c:855
 #, c-format
 msgid "Meeting — %s"
 msgstr "會議 — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:858
+#: ../src/calendar/gui/e-comp-editor-event.c:856
 #, c-format
 msgid "Appointment — %s"
 msgstr "約會 — %s"
@@ -6872,7 +7099,7 @@ msgstr "備忘錄 — %s"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:123
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
-#: ../src/em-format/e-mail-formatter-attachment.c:333
+#: ../src/em-format/e-mail-formatter-attachment.c:334
 #: ../src/e-util/e-attachment-bar.c:101 ../src/e-util/e-attachment-bar.c:106
 #: ../src/e-util/e-attachment-paned.c:175
 #: ../src/e-util/e-attachment-paned.c:180 ../src/mail/message-list.etspec.h:4
@@ -6880,60 +7107,60 @@ msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:194
-#: ../src/e-util/e-attachment.c:2419
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:201
+#: ../src/e-util/e-attachment.c:2469
 #, c-format
 msgid "Could not load “%s”"
 msgstr "無法載入「%s」"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:196
-#: ../src/e-util/e-attachment.c:2422
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:203
+#: ../src/e-util/e-attachment.c:2472
 #, c-format
 msgid "Could not load the attachment"
 msgstr "無法載入附件"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:401
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:422
 msgid ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
 msgstr "還有一些需要下載的附件。請等候下載工作完成。"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:428
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:452
 #, c-format
 msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr "找不到附件「%s」,請將它從列表移除"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:445
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:469
 #, c-format
 msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 msgstr "附件「%s」沒有有效的 URI,請將它從列表移除"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:606
-#: ../src/composer/e-composer-actions.c:320
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:647
+#: ../src/composer/e-composer-actions.c:322
 msgid "_Attachment..."
 msgstr "附件(_A)…"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:608
-#: ../src/composer/e-composer-actions.c:322
-#: ../src/e-util/e-attachment-view.c:343
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
+#: ../src/composer/e-composer-actions.c:324
+#: ../src/e-util/e-attachment-view.c:344
 msgid "Attach a file"
 msgstr "附加檔案"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:615
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:656
 msgid "_Attachments"
 msgstr "附件(_A)"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:617
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:658
 msgid "Show attachments"
 msgstr "顯示附件"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:770
-#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:725
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
+#: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "圖示檢視"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:772
-#: ../src/e-util/e-attachment-bar.c:768 ../src/e-util/e-attachment-paned.c:727
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:813
+#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "列表檢視"
 
@@ -6952,60 +7179,66 @@ msgid "Failed to delete selected attendee"
 msgid_plural "Failed to delete selected attendees"
 msgstr[0] "刪除選取的出席者失敗"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:581
+#: ../src/calendar/gui/e-comp-editor-page-general.c:434
+#, fuzzy
+#| msgid "Email Address is not a valid email"
+msgid "Organizer address is not a valid user mail address"
+msgstr "電子郵件位址不是有效的電子郵件"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:584
 msgid "A_ttendees"
 msgstr "出席者(_T)"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:583
+#: ../src/calendar/gui/e-comp-editor-page-general.c:586
 msgid "Toggles whether the Attendees are displayed"
 msgstr "切換是否顯示出席者"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:592
+#: ../src/calendar/gui/e-comp-editor-page-general.c:595
 msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:594
+#: ../src/calendar/gui/e-comp-editor-page-general.c:597
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:600
+#: ../src/calendar/gui/e-comp-editor-page-general.c:603
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:602
+#: ../src/calendar/gui/e-comp-editor-page-general.c:605
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:608
+#: ../src/calendar/gui/e-comp-editor-page-general.c:611
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:610
+#: ../src/calendar/gui/e-comp-editor-page-general.c:613
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:616
+#: ../src/calendar/gui/e-comp-editor-page-general.c:619
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:618
+#: ../src/calendar/gui/e-comp-editor-page-general.c:621
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切換是否顯示「出席者類型」欄位"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:943
+#: ../src/calendar/gui/e-comp-editor-page-general.c:947
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:953
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1084
+#: ../src/calendar/gui/e-comp-editor-page-general.c:957
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1088
 msgid "At least one attendee is required."
 msgstr "最少需要一個出席者。"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1207
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1211
 msgid "Or_ganizer:"
 msgstr "會議召集人(_G):"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1286
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1290
 msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "出席者(_N)…"
@@ -7170,115 +7403,116 @@ msgid "occurrences"
 msgstr "次"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1485
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2015
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1484
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2014
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "這個會議的週期為(_U)"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1490
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1489
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "這個工作的週期為(_U)"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1495
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1494
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "這個備忘錄的週期為(_U)"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1500
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1499
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "這個元件的週期為(_U)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1861
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1860
 msgid "Recurrence exception date is invalid"
 msgstr "週期的例外日期是無效的"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1909
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1908
 msgid "End time of the recurrence is before the start"
 msgstr "週期性事件的結束時刻早於開始時刻"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1952
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1951
 msgid "R_ecurrence"
 msgstr "週期性(_E)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1954
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1953
 msgid "Set or unset recurrence"
 msgstr "設定或取消設定週期性"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2046
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "每"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2081
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "天"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2083
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "週"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2085
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "個月"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2087
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "年"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2116
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "共"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2118
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "直到"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2120
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "永遠"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2136
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性會議。"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2162
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2149
 msgid "Exceptions"
 msgstr "例外"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777
-#: ../src/mail/mail-config.ui.h:64
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2214
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1765
+#: ../src/mail/e-mail-config-identity-page.c:853
+#: ../src/mail/mail-config.ui.h:65
 msgid "A_dd"
 msgstr "加入(_A)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785
-#: ../src/mail/mail-config.ui.h:66
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2230
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1773
+#: ../src/mail/mail-config.ui.h:67
 msgid "Re_move"
 msgstr "移除(_M)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2255
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2238
 msgid "Preview"
 msgstr "預覽"
 
@@ -7286,167 +7520,167 @@ msgstr "預覽"
 msgid "Send To"
 msgstr "傳送到"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1554
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1550
 msgid "_Reminders"
 msgstr "提醒(_R)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1556
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1552
 msgid "Set or unset reminders"
 msgstr "設定或取消設定提醒"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1609
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1605
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 msgid "Reminders"
 msgstr "提醒"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1638
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1630
 msgid "_Reminder"
 msgstr "提醒(_R)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1671
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1663
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d 天前"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1678
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1670
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d 小時前"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1677
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
 msgstr[0] "%d 分鐘前"
 
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1693
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "沒有"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1687
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "15 分鐘前"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1697
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1689
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "1 小時前"
 
 #. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1699
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1691
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "1 天前"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1711
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "自訂"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1846
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "分鐘"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1864
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1848
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "小时"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1866
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1850
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "天"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1883
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1867
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "早於"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1869
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "晚於"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1901
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "開始"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1903
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1887
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "結束"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1926
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1906
 msgid "Re_peat the reminder"
 msgstr "重複提醒(_P)"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1951
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1931
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "一次於每"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1988
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1968
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "分鐘"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1990
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1970
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "小時"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1992
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1972
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "天"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2033
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2009
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2166
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "自訂訊息(_M)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2077
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2053
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "自訂提醒音效(_S)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2088
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2064
 msgid "Select a sound file"
 msgstr "選擇聲音檔案"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2116
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2092
 msgid "_Program:"
 msgstr "執行程式(_P):"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2141
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2117
 msgid "_Arguments:"
 msgstr "引數(_A):"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2173
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2149
 msgid "_Send To:"
 msgstr "傳送到(_T):"
 
@@ -7478,102 +7712,102 @@ msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:686
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:687
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "網頁(_W):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1057
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1058
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "到期日(_U):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1117
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1148
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "完成日期(_C):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1133
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1164
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "公開"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1134
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1165
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "私人"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1135
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1166
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "機密"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1151
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "歸類(_L):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1201
 msgctxt "ECompEditor"
 msgid "Not Started"
 msgstr "未開始"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1202
 msgctxt "ECompEditor"
 msgid "In Progress"
 msgstr "進行中"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
 msgctxt "ECompEditor"
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1173
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1204
 msgctxt "ECompEditor"
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "狀態(_S):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1212
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1243
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "未定義"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1244
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "高"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1214
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1245
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "普通"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1215
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1246
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "低"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1224
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1255
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "優先等級(_Y):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1278
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1309
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "完成百分比:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1359
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1390
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1515
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "顯示時間為忙碌(_B)"
@@ -7638,169 +7872,172 @@ msgstr "附件"
 msgid "Sending notifications to attendees..."
 msgstr "傳送通知給出席者…"
 
-#: ../src/calendar/gui/e-comp-editor.c:993
+#: ../src/calendar/gui/e-comp-editor.c:997
 msgid "Saving changes..."
 msgstr "正在儲存變更…"
 
-#: ../src/calendar/gui/e-comp-editor.c:1249
+#: ../src/calendar/gui/e-comp-editor.c:1257
 msgid "No Summary"
 msgstr "沒有摘要"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1976
-#: ../src/composer/e-composer-actions.c:327
+#: ../src/calendar/gui/e-comp-editor.c:1984
+#: ../src/composer/e-composer-actions.c:329
+#: ../src/e-util/e-accounts-window.c:1730
 #: ../src/e-util/e-html-editor-dialog.c:194
 #: ../src/e-util/e-mail-signature-editor.c:309
 #: ../src/e-util/e-name-selector-dialog.c:548
-#: ../src/e-util/e-preferences-window.c:389
+#: ../src/e-util/e-preferences-window.c:399
 #: ../src/e-util/e-table-field-chooser-dialog.c:205
-#: ../src/mail/e-mail-browser.c:127 ../src/mail/e-mail-notes.c:931
+#: ../src/mail/e-mail-browser.c:128 ../src/mail/e-mail-notes.c:931
 #: ../src/mail/em-folder-properties.c:1158
-#: ../src/mail/em-subscription-editor.c:1765
+#: ../src/mail/em-subscription-editor.c:1739
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
-#: ../src/shell/e-shell-window-actions.c:278
-#: ../src/shell/e-shell-window-actions.c:787
+#: ../src/shell/e-shell-window-actions.c:296
+#: ../src/shell/e-shell-window-actions.c:817
 #: ../src/smime/gui/certificate-manager.c:2212
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:1978
+#: ../src/calendar/gui/e-comp-editor.c:1986
 msgid "Close the current window"
 msgstr "關閉目前的視窗"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:1983 ../src/e-util/e-focus-tracker.c:773
-#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2110
-#: ../src/e-util/e-web-view.c:407 ../src/mail/e-mail-browser.c:134
-#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:808
+#: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
+#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2075
+#: ../src/e-util/e-web-view.c:409 ../src/mail/e-mail-browser.c:135
+#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:838
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:1985 ../src/e-util/e-focus-tracker.c:173
+#: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
 #: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
-#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:409
-#: ../src/e-util/e-web-view.c:1942 ../src/mail/e-mail-browser.c:136
-#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:411
+#: ../src/e-util/e-web-view.c:2003 ../src/mail/e-mail-browser.c:137
+#: ../src/shell/e-shell-window-actions.c:840
 msgid "Copy the selection"
 msgstr "複製選取的內容"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:1990 ../src/e-util/e-focus-tracker.c:768
-#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2096
-#: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:815
+#: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
+#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2061
+#: ../src/mail/e-mail-browser.c:142 ../src/shell/e-shell-window-actions.c:845
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: ../src/calendar/gui/e-comp-editor.c:1992 ../src/e-util/e-focus-tracker.c:166
+#: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
 #: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1951
-#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:817
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2012
+#: ../src/mail/e-mail-browser.c:144 ../src/shell/e-shell-window-actions.c:847
 msgid "Cut the selection"
 msgstr "剪下選取範圍"
 
-#: ../src/calendar/gui/e-comp-editor.c:1999 ../src/e-util/e-focus-tracker.c:187
+#: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
 #: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/shell/e-shell-window-actions.c:854
 msgid "Delete the selection"
 msgstr "刪除選取範圍"
 
-#: ../src/calendar/gui/e-comp-editor.c:2006
+#: ../src/calendar/gui/e-comp-editor.c:2014
 msgid "View help"
 msgstr "檢視求助"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2011 ../src/e-util/e-focus-tracker.c:778
-#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2122
-#: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:843
+#: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
+#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2087
+#: ../src/mail/e-mail-browser.c:149 ../src/shell/e-shell-window-actions.c:873
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2013 ../src/e-util/e-focus-tracker.c:180
+#: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
 #: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1960
-#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:845
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2021
+#: ../src/mail/e-mail-browser.c:151 ../src/shell/e-shell-window-actions.c:875
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿的內容"
 
-#: ../src/calendar/gui/e-comp-editor.c:2018
-#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2323
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1229
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1243
+#: ../src/calendar/gui/e-comp-editor.c:2026
+#: ../src/composer/e-composer-actions.c:383 ../src/mail/e-mail-reader.c:2402
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1249
 msgid "_Print..."
 msgstr "列印(_P)…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2025 ../src/mail/e-mail-reader.c:2330
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1236
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1693
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2409
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1242
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1744
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:813
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Pre_view..."
 msgstr "預覽(_V)…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2032 ../src/e-util/e-focus-tracker.c:788
-#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:417
-#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:920
+#: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
+#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:419
+#: ../src/mail/e-mail-browser.c:156 ../src/shell/e-shell-window-actions.c:950
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:194
+#: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
 #: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:157 ../src/shell/e-shell-window-actions.c:922
+#: ../src/mail/e-mail-browser.c:158 ../src/shell/e-shell-window-actions.c:952
 msgid "Select all text"
 msgstr "選取所有文字"
 
-#: ../src/calendar/gui/e-comp-editor.c:2055
+#: ../src/calendar/gui/e-comp-editor.c:2063
 msgid "_Classification"
 msgstr "歸類(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2069
+#: ../src/calendar/gui/e-comp-editor.c:2077
 #: ../src/e-util/e-html-editor-actions.c:929
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:164
-#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:957
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:165
+#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:987
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2083
+#: ../src/calendar/gui/e-comp-editor.c:2091
 #: ../src/e-util/e-html-editor-actions.c:950
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2090
-#: ../src/composer/e-composer-actions.c:371
+#: ../src/calendar/gui/e-comp-editor.c:2098
+#: ../src/composer/e-composer-actions.c:373
 msgid "_Options"
 msgstr "選項(_O)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2097
-#: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:178
-#: ../src/shell/e-shell-window-actions.c:1000
+#: ../src/calendar/gui/e-comp-editor.c:2105
+#: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:179
+#: ../src/shell/e-shell-window-actions.c:1030
 #: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2109
+#: ../src/calendar/gui/e-comp-editor.c:2117
 msgid "Save current changes"
 msgstr "儲存目前的變更"
 
-#: ../src/calendar/gui/e-comp-editor.c:2114
+#: ../src/calendar/gui/e-comp-editor.c:2122
 #: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:940
 msgid "Save and Close"
 msgstr "儲存並關閉"
 
-#: ../src/calendar/gui/e-comp-editor.c:2116
+#: ../src/calendar/gui/e-comp-editor.c:2124
 msgid "Save current changes and close editor"
 msgstr "儲存目前的變更並且關閉編輯器"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-week-view.c:1726
-#: ../src/calendar/gui/print.c:1070 ../src/calendar/gui/print.c:1089
-#: ../src/calendar/gui/print.c:2626 ../src/calendar/gui/print.c:2646
+#: ../src/calendar/gui/e-day-view.c:2156 ../src/calendar/gui/e-to-do-pane.c:241
+#: ../src/calendar/gui/e-week-view.c:1781 ../src/calendar/gui/print.c:1070
+#: ../src/calendar/gui/print.c:1089 ../src/calendar/gui/print.c:2626
+#: ../src/calendar/gui/print.c:2646
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-week-view.c:1729
-#: ../src/calendar/gui/print.c:1075 ../src/calendar/gui/print.c:1091
-#: ../src/calendar/gui/print.c:2631 ../src/calendar/gui/print.c:2648
+#: ../src/calendar/gui/e-day-view.c:2159 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1784 ../src/calendar/gui/print.c:1075
+#: ../src/calendar/gui/print.c:1091 ../src/calendar/gui/print.c:2631
+#: ../src/calendar/gui/print.c:2648
 msgid "pm"
 msgstr "下午"
 
@@ -7810,15 +8047,15 @@ msgstr "下午"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../src/calendar/gui/e-day-view.c:3045
-#: ../src/calendar/gui/e-day-view-top-item.c:841
+#: ../src/calendar/gui/e-day-view.c:3071
+#: ../src/calendar/gui/e-day-view-top-item.c:857
 #: ../src/calendar/gui/e-week-view-main-item.c:205
 #: ../src/calendar/gui/print.c:2093
 msgid "%A %d %B"
 msgstr "%m月%d日%A"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3770
+#: ../src/calendar/gui/e-day-view.c:3792
 #, c-format
 msgid "Week %d"
 msgstr "第 %d 週"
@@ -7939,7 +8176,10 @@ msgstr "出席者"
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../src/calendar/gui/e-memo-table.etspec.h:3
 #: ../src/calendar/gui/e-task-table.etspec.h:3
+#: ../src/e-util/e-accounts-window.c:1407
 #: ../src/e-util/e-attachment-tree-view.c:205
+#: ../src/e-util/e-collection-account-wizard.c:1696
+#: ../src/e-util/e-webdav-browser.c:2381
 #: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "類型"
@@ -7966,76 +8206,77 @@ msgid "Failure reason: %s"
 msgstr "失敗原因:%s"
 
 #: ../src/calendar/gui/e-meeting-store.c:1914
-#: ../src/plugins/publish-calendar/publish-calendar.c:349
+#: ../src/e-util/e-collection-account-wizard.c:268
+#: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:535
+#: ../src/calendar/gui/e-meeting-time-sel.c:525
 msgid "Out of Office"
 msgstr "不在辦公室"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:537
+#: ../src/calendar/gui/e-meeting-time-sel.c:527
 msgid "No Information"
 msgstr "沒有資訊"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:553
+#: ../src/calendar/gui/e-meeting-time-sel.c:543
 msgid "Atte_ndees..."
 msgstr "出席者(_N)…"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:572
+#: ../src/calendar/gui/e-meeting-time-sel.c:562
 msgid "O_ptions"
 msgstr "選項(_P)"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:593
+#: ../src/calendar/gui/e-meeting-time-sel.c:583
 msgid "Show _only working hours"
 msgstr "只顯示工作時間(_O)"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:606
+#: ../src/calendar/gui/e-meeting-time-sel.c:596
 msgid "Show _zoomed out"
 msgstr "顯示縮小(_Z)"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:624
+#: ../src/calendar/gui/e-meeting-time-sel.c:614
 msgid "_Update free/busy"
 msgstr "更新空閒/忙碌(_U)"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:641
+#: ../src/calendar/gui/e-meeting-time-sel.c:631
 msgid "_<<"
 msgstr "_<<"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:661
+#: ../src/calendar/gui/e-meeting-time-sel.c:651
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:678
+#: ../src/calendar/gui/e-meeting-time-sel.c:668
 msgid ">_>"
 msgstr ">_>"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:700
+#: ../src/calendar/gui/e-meeting-time-sel.c:690
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:711
+#: ../src/calendar/gui/e-meeting-time-sel.c:701
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:722
+#: ../src/calendar/gui/e-meeting-time-sel.c:712
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:732
+#: ../src/calendar/gui/e-meeting-time-sel.c:722
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:771
+#: ../src/calendar/gui/e-meeting-time-sel.c:761
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:800
+#: ../src/calendar/gui/e-meeting-time-sel.c:790
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2721
+#: ../src/calendar/gui/e-meeting-time-sel.c:2667
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -8044,7 +8285,7 @@ msgstr ""
 "摘要:%s\n"
 "位置:%s"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2723
+#: ../src/calendar/gui/e-meeting-time-sel.c:2669
 #: ../src/calendar/gui/print.c:3520
 #, c-format
 msgid "Summary: %s"
@@ -8075,19 +8316,19 @@ msgid "Language"
 msgstr "語言"
 
 #: ../src/calendar/gui/e-memo-table.c:455
-#: ../src/calendar/gui/e-task-table.c:781
+#: ../src/calendar/gui/e-task-table.c:782
 msgid "* No Summary *"
 msgstr "* 沒有摘要 *"
 
 #. Translators: This is followed by an event's start date/time
 #: ../src/calendar/gui/e-memo-table.c:540
-#: ../src/calendar/gui/e-task-table.c:863
+#: ../src/calendar/gui/e-task-table.c:864
 msgid "Start: "
 msgstr "開始:"
 
 #. Translators: This is followed by an event's due date/time
 #: ../src/calendar/gui/e-memo-table.c:560
-#: ../src/calendar/gui/e-task-table.c:882
+#: ../src/calendar/gui/e-task-table.c:883
 msgid "Due: "
 msgstr "到期:"
 
@@ -8116,7 +8357,7 @@ msgstr "選擇全部可見的備忘錄"
 msgid "Click to add a memo"
 msgstr "請按這裡增加新的備忘錄"
 
-#: ../src/calendar/gui/e-task-table.c:551
+#: ../src/calendar/gui/e-task-table.c:552
 #: ../src/calendar/gui/tasktypes.xml.in.h:22
 #: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
@@ -8126,29 +8367,29 @@ msgstr "未指定"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../src/calendar/gui/e-task-table.c:579
+#: ../src/calendar/gui/e-task-table.c:580
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/calendar/gui/e-task-table.c:1084
+#: ../src/calendar/gui/e-task-table.c:1096
 msgid "Cut selected tasks to the clipboard"
 msgstr "剪下選取的工作至剪貼簿"
 
-#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/calendar/gui/e-task-table.c:1102
 msgid "Copy selected tasks to the clipboard"
 msgstr "複製選取的工作至剪貼簿"
 
-#: ../src/calendar/gui/e-task-table.c:1096
+#: ../src/calendar/gui/e-task-table.c:1108
 msgid "Paste tasks from the clipboard"
 msgstr "從剪貼簿貼上工作"
 
-#: ../src/calendar/gui/e-task-table.c:1102
+#: ../src/calendar/gui/e-task-table.c:1114
 #: ../src/modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
 
-#: ../src/calendar/gui/e-task-table.c:1108
+#: ../src/calendar/gui/e-task-table.c:1120
 msgid "Select all visible tasks"
 msgstr "選擇全部可見的工作"
 
@@ -8164,7 +8405,8 @@ msgstr "開始日期"
 msgid "Completion date"
 msgstr "完成日期"
 
-#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:968
+#: ../src/calendar/gui/e-task-table.etspec.h:6
+#: ../src/mail/mail-send-recv.c:1088
 msgid "Complete"
 msgstr "完成"
 
@@ -8187,6 +8429,105 @@ msgstr "優先等級"
 msgid "Select Timezone"
 msgstr "選擇一個時區"
 
+#. Translators: It will display "Start: StartDateAndTime"
+#: ../src/calendar/gui/e-to-do-pane.c:370
+#, fuzzy, c-format
+#| msgid "Start: "
+msgid "Start: %s"
+msgstr "開始:"
+
+#. Translators: It will display "Due: DueDateAndTime"
+#: ../src/calendar/gui/e-to-do-pane.c:390
+#, fuzzy, c-format
+#| msgid "Due: "
+msgid "Due: %s"
+msgstr "到期:"
+
+#. Translators: It will display "Completed: DateAndTimeWhenCompleted"
+#: ../src/calendar/gui/e-to-do-pane.c:404
+#, fuzzy, c-format
+#| msgid "Completed "
+msgid "Completed: %s"
+msgstr "已完成 "
+
+#. strftime format of a weekday and a date.
+#: ../src/calendar/gui/e-to-do-pane.c:1429 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/e-util/e-datetime-format.c:206
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1842
+#: ../src/modules/itip-formatter/itip-view.c:254
+msgid "Today"
+msgstr "今天"
+
+#. strftime format of a weekday and a date.
+#: ../src/calendar/gui/e-to-do-pane.c:1431
+#: ../src/e-util/e-datetime-format.c:217
+#: ../src/modules/itip-formatter/itip-view.c:282
+msgid "Tomorrow"
+msgstr "明天"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1441
+#, fuzzy
+#| msgid "With _Due Date"
+msgid "Tasks without Due date"
+msgstr "到期日(_D):"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2014
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
+msgid "New _Appointment..."
+msgstr "新增會議(_A)…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2022
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "New _Meeting..."
+msgstr "新增會議(_M)…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2030
+#, fuzzy
+#| msgid "New _Task"
+msgid "New _Task..."
+msgstr "新增工作(_T)"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2038
+#, fuzzy
+#| msgctxt "New"
+#| msgid "Assigne_d Task"
+msgid "_New Assigned Task..."
+msgstr "指派的工作(_D)"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2051
+#, fuzzy
+#| msgid "_Open"
+msgid "_Open..."
+msgstr "開啟(_O)"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2065
+#, fuzzy
+#| msgid "Delete This _Occurrence"
+msgid "_Delete This Instance..."
+msgstr "刪除這次發生的事件(_O)"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2073
+#, fuzzy
+#| msgid "All Instances"
+msgid "D_elete All Instances..."
+msgstr "所有例項"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2081
+#, fuzzy
+#| msgid "_Delete"
+msgid "_Delete..."
+msgstr "刪除(_D)"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2098
+msgid "_Show Tasks without Due date"
+msgstr ""
+
+#: ../src/calendar/gui/e-to-do-pane.c:2364
+#, fuzzy
+#| msgid "_To Do"
+msgid "To Do"
+msgstr "待辦事項(_T)"
+
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
@@ -8195,32 +8536,32 @@ msgstr "選擇一個時區"
 msgid "%d %B"
 msgstr "%m月%d日"
 
-#: ../src/calendar/gui/itip-utils.c:789 ../src/calendar/gui/itip-utils.c:851
-#: ../src/calendar/gui/itip-utils.c:985
+#: ../src/calendar/gui/itip-utils.c:785 ../src/calendar/gui/itip-utils.c:847
+#: ../src/calendar/gui/itip-utils.c:981
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: ../src/calendar/gui/itip-utils.c:842
+#: ../src/calendar/gui/itip-utils.c:838
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個出席者"
 
-#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
+#: ../src/calendar/gui/itip-utils.c:1069 ../src/calendar/gui/itip-utils.c:1230
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
+#: ../src/calendar/gui/itip-utils.c:1072 ../src/calendar/gui/itip-utils.c:1233
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1240
+#: ../src/calendar/gui/itip-utils.c:1075 ../src/calendar/gui/itip-utils.c:1236
 msgid "Memo information"
 msgstr "備忘錄資訊"
 
-#: ../src/calendar/gui/itip-utils.c:1082 ../src/calendar/gui/itip-utils.c:1258
+#: ../src/calendar/gui/itip-utils.c:1078 ../src/calendar/gui/itip-utils.c:1254
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-#: ../src/calendar/gui/itip-utils.c:1085
+#: ../src/calendar/gui/itip-utils.c:1081
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
@@ -8228,7 +8569,7 @@ msgstr "行事曆資訊"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1122
+#: ../src/calendar/gui/itip-utils.c:1118
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "已接受"
@@ -8237,7 +8578,7 @@ msgstr "已接受"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1129
+#: ../src/calendar/gui/itip-utils.c:1125
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
@@ -8249,7 +8590,7 @@ msgstr "暫時接受"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1136 ../src/calendar/gui/itip-utils.c:1184
+#: ../src/calendar/gui/itip-utils.c:1132 ../src/calendar/gui/itip-utils.c:1180
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "已拒絕"
@@ -8258,7 +8599,7 @@ msgstr "已拒絕"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1143
+#: ../src/calendar/gui/itip-utils.c:1139
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已委派"
@@ -8266,7 +8607,7 @@ msgstr "已委派"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1156
+#: ../src/calendar/gui/itip-utils.c:1152
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已更新"
@@ -8274,7 +8615,7 @@ msgstr "已更新"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1163
+#: ../src/calendar/gui/itip-utils.c:1159
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -8282,7 +8623,7 @@ msgstr "取消"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1170
+#: ../src/calendar/gui/itip-utils.c:1166
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "重新整理"
@@ -8290,204 +8631,80 @@ msgstr "重新整理"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1177
+#: ../src/calendar/gui/itip-utils.c:1173
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../src/calendar/gui/itip-utils.c:1255
+#: ../src/calendar/gui/itip-utils.c:1251
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1263
+#: ../src/calendar/gui/itip-utils.c:1259
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: ../src/calendar/gui/itip-utils.c:1292
+#: ../src/calendar/gui/itip-utils.c:1288
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "無法取得資源,新的事件與其他事件有所重疊。"
 
-#: ../src/calendar/gui/itip-utils.c:1297
+#: ../src/calendar/gui/itip-utils.c:1293
 msgid "Unable to book a resource, error: "
 msgstr "無法預訂資源,錯誤為:"
 
-#: ../src/calendar/gui/itip-utils.c:1468
+#: ../src/calendar/gui/itip-utils.c:1464
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的出席者。"
 
-#: ../src/calendar/gui/itip-utils.c:2149
+#: ../src/calendar/gui/itip-utils.c:2209
 msgid "Sending an event"
 msgstr "正在傳送事件"
 
-#: ../src/calendar/gui/itip-utils.c:2153
+#: ../src/calendar/gui/itip-utils.c:2213
 msgid "Sending a memo"
 msgstr "正在傳送備忘錄"
 
-#: ../src/calendar/gui/itip-utils.c:2157
+#: ../src/calendar/gui/itip-utils.c:2217
 msgid "Sending a task"
 msgstr "正在傳送工作"
 
-#: ../src/calendar/gui/print.c:661
-msgid "1st"
-msgstr "1日"
-
-#: ../src/calendar/gui/print.c:661
-msgid "2nd"
-msgstr "2日"
-
-#: ../src/calendar/gui/print.c:661
-msgid "3rd"
-msgstr "3日"
-
-#: ../src/calendar/gui/print.c:661
-msgid "4th"
-msgstr "4日"
-
-#: ../src/calendar/gui/print.c:661
-msgid "5th"
-msgstr "5日"
-
-#: ../src/calendar/gui/print.c:662
-msgid "6th"
-msgstr "6日"
-
-#: ../src/calendar/gui/print.c:662
-msgid "7th"
-msgstr "7日"
-
-#: ../src/calendar/gui/print.c:662
-msgid "8th"
-msgstr "8日"
-
-#: ../src/calendar/gui/print.c:662
-msgid "9th"
-msgstr "9日"
-
-#: ../src/calendar/gui/print.c:662
-msgid "10th"
-msgstr "10日"
-
-#: ../src/calendar/gui/print.c:663
-msgid "11th"
-msgstr "11日"
-
-#: ../src/calendar/gui/print.c:663
-msgid "12th"
-msgstr "12日"
-
-#: ../src/calendar/gui/print.c:663
-msgid "13th"
-msgstr "13日"
-
-#: ../src/calendar/gui/print.c:663
-msgid "14th"
-msgstr "14日"
-
-#: ../src/calendar/gui/print.c:663
-msgid "15th"
-msgstr "15日"
-
-#: ../src/calendar/gui/print.c:664
-msgid "16th"
-msgstr "16日"
-
-#: ../src/calendar/gui/print.c:664
-msgid "17th"
-msgstr "17日"
-
-#: ../src/calendar/gui/print.c:664
-msgid "18th"
-msgstr "18日"
-
-#: ../src/calendar/gui/print.c:664
-msgid "19th"
-msgstr "19日"
-
-#: ../src/calendar/gui/print.c:664
-msgid "20th"
-msgstr "20日"
-
-#: ../src/calendar/gui/print.c:665
-msgid "21st"
-msgstr "21日"
-
-#: ../src/calendar/gui/print.c:665
-msgid "22nd"
-msgstr "22日"
-
-#: ../src/calendar/gui/print.c:665
-msgid "23rd"
-msgstr "23日"
-
-#: ../src/calendar/gui/print.c:665
-msgid "24th"
-msgstr "24日"
-
-#: ../src/calendar/gui/print.c:665
-msgid "25th"
-msgstr "25日"
-
-#: ../src/calendar/gui/print.c:666
-msgid "26th"
-msgstr "26日"
-
-#: ../src/calendar/gui/print.c:666
-msgid "27th"
-msgstr "27日"
-
-#: ../src/calendar/gui/print.c:666
-msgid "28th"
-msgstr "28日"
-
-#: ../src/calendar/gui/print.c:666
-msgid "29th"
-msgstr "29日"
-
-#: ../src/calendar/gui/print.c:666
-msgid "30th"
-msgstr "30日"
-
-#: ../src/calendar/gui/print.c:667
-msgid "31st"
-msgstr "31日"
-
 #. G_DATE_BAD_WEEKDAY
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:727
+#: ../src/calendar/gui/print.c:721
 msgid "Mo"
 msgstr "一"
 
 #. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:728
+#: ../src/calendar/gui/print.c:722
 msgid "Tu"
 msgstr "二"
 
 #. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:729
+#: ../src/calendar/gui/print.c:723
 msgid "We"
 msgstr "三"
 
 #. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:730
+#: ../src/calendar/gui/print.c:724
 msgid "Th"
 msgstr "四"
 
 #. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:731
+#: ../src/calendar/gui/print.c:725
 msgid "Fr"
 msgstr "五"
 
 #. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:732
+#: ../src/calendar/gui/print.c:726
 msgid "Sa"
 msgstr "六"
 
 #. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:727
 msgid "Su"
 msgstr "日"
 
@@ -8594,13 +8811,16 @@ msgid "Appointments and Meetings"
 msgstr "會議和會議"
 
 #: ../src/calendar/importers/icalendar-importer.c:306
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:181
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:480
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:76
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:280
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:178
 msgid "New Calendar"
 msgstr "新行事曆"
 
 #: ../src/calendar/importers/icalendar-importer.c:309
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:189
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:488
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:288
 #: ../src/modules/calendar/e-task-shell-view-actions.c:202
 msgid "New Task List"
 msgstr "新增工作列表"
@@ -8614,183 +8834,183 @@ msgid "Cre_ate new task list"
 msgstr "建立新工作列表(_A)"
 
 #: ../src/calendar/importers/icalendar-importer.c:501
-#: ../src/calendar/importers/icalendar-importer.c:944
+#: ../src/calendar/importers/icalendar-importer.c:940
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
-#: ../src/calendar/importers/icalendar-importer.c:652
+#: ../src/calendar/importers/icalendar-importer.c:648
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 檔案 (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:653
+#: ../src/calendar/importers/icalendar-importer.c:649
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸入器"
 
-#: ../src/calendar/importers/icalendar-importer.c:745
+#: ../src/calendar/importers/icalendar-importer.c:741
 msgid "Reminder!"
 msgstr "提醒!"
 
-#: ../src/calendar/importers/icalendar-importer.c:830
+#: ../src/calendar/importers/icalendar-importer.c:826
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar 檔案 (.vcs)"
 
-#: ../src/calendar/importers/icalendar-importer.c:831
+#: ../src/calendar/importers/icalendar-importer.c:827
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸入器"
 
-#: ../src/calendar/importers/icalendar-importer.c:1107
+#: ../src/calendar/importers/icalendar-importer.c:1103
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
-#: ../src/calendar/importers/icalendar-importer.c:1150
+#: ../src/calendar/importers/icalendar-importer.c:1146
 msgid "GNOME Calendar"
 msgstr "GNOME Calendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:1151
+#: ../src/calendar/importers/icalendar-importer.c:1147
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
 
-#: ../src/calendar/importers/icalendar-importer.c:1222
-#: ../src/calendar/importers/icalendar-importer.c:1536
+#: ../src/calendar/importers/icalendar-importer.c:1218
+#: ../src/calendar/importers/icalendar-importer.c:1532
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "會議"
 
-#: ../src/calendar/importers/icalendar-importer.c:1222
-#: ../src/calendar/importers/icalendar-importer.c:1536
+#: ../src/calendar/importers/icalendar-importer.c:1218
+#: ../src/calendar/importers/icalendar-importer.c:1532
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
-#: ../src/calendar/importers/icalendar-importer.c:1225
-#: ../src/calendar/importers/icalendar-importer.c:1537
+#: ../src/calendar/importers/icalendar-importer.c:1221
+#: ../src/calendar/importers/icalendar-importer.c:1533
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "工作"
 
-#: ../src/calendar/importers/icalendar-importer.c:1228
-#: ../src/calendar/importers/icalendar-importer.c:1538
+#: ../src/calendar/importers/icalendar-importer.c:1224
+#: ../src/calendar/importers/icalendar-importer.c:1534
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "備忘錄"
 
-#: ../src/calendar/importers/icalendar-importer.c:1237
+#: ../src/calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "具有週期性"
 
-#: ../src/calendar/importers/icalendar-importer.c:1242
+#: ../src/calendar/importers/icalendar-importer.c:1238
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "是一個實體"
 
-#: ../src/calendar/importers/icalendar-importer.c:1247
+#: ../src/calendar/importers/icalendar-importer.c:1243
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "具有提醒"
 
-#: ../src/calendar/importers/icalendar-importer.c:1252
+#: ../src/calendar/importers/icalendar-importer.c:1248
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "具有附件"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1265
+#: ../src/calendar/importers/icalendar-importer.c:1261
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "公開"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1268
+#: ../src/calendar/importers/icalendar-importer.c:1264
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "私人"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1271
+#: ../src/calendar/importers/icalendar-importer.c:1267
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "機密"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1275
+#: ../src/calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "歸類"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1280
-#: ../src/calendar/importers/icalendar-importer.c:1580
+#: ../src/calendar/importers/icalendar-importer.c:1276
+#: ../src/calendar/importers/icalendar-importer.c:1576
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "摘要"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1286
+#: ../src/calendar/importers/icalendar-importer.c:1282
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "位置"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../src/calendar/importers/icalendar-importer.c:1294
-#: ../src/calendar/importers/icalendar-importer.c:1575
+#: ../src/calendar/importers/icalendar-importer.c:1290
+#: ../src/calendar/importers/icalendar-importer.c:1571
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "開始"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1305
+#: ../src/calendar/importers/icalendar-importer.c:1301
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "到期"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1317
+#: ../src/calendar/importers/icalendar-importer.c:1313
 msgctxt "iCalImp"
 msgid "End"
 msgstr "結束"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1327
+#: ../src/calendar/importers/icalendar-importer.c:1323
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "分類"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../src/calendar/importers/icalendar-importer.c:1351
+#: ../src/calendar/importers/icalendar-importer.c:1347
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1359
+#: ../src/calendar/importers/icalendar-importer.c:1355
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1370
-#: ../src/calendar/importers/icalendar-importer.c:1373
+#: ../src/calendar/importers/icalendar-importer.c:1366
+#: ../src/calendar/importers/icalendar-importer.c:1369
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "會議召集人"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1393
-#: ../src/calendar/importers/icalendar-importer.c:1396
+#: ../src/calendar/importers/icalendar-importer.c:1389
+#: ../src/calendar/importers/icalendar-importer.c:1392
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../src/calendar/importers/icalendar-importer.c:1410
+#: ../src/calendar/importers/icalendar-importer.c:1406
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "描述"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../src/calendar/importers/icalendar-importer.c:1570
+#: ../src/calendar/importers/icalendar-importer.c:1566
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "類型"
@@ -10342,171 +10562,180 @@ msgstr "太平洋/瓦利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦島"
 
-#: ../src/composer/e-composer-actions.c:225
+#: ../src/composer/e-composer-actions.c:227
 msgid "Save as..."
 msgstr "另存新檔…"
 
-#: ../src/composer/e-composer-actions.c:329
+#: ../src/composer/e-composer-actions.c:331
 msgid "Close the current file"
 msgstr "關閉目前的檔案"
 
-#: ../src/composer/e-composer-actions.c:334
+#: ../src/composer/e-composer-actions.c:336
 msgid "New _Message"
 msgstr "撰寫新郵件(_M)"
 
-#: ../src/composer/e-composer-actions.c:336
+#: ../src/composer/e-composer-actions.c:338
 msgid "Open New Message window"
 msgstr "開啟新的郵件視窗"
 
-#: ../src/composer/e-composer-actions.c:341 ../src/shell/e-shell.c:1302
-#: ../src/shell/e-shell-window-actions.c:857
+#: ../src/composer/e-composer-actions.c:343 ../src/shell/e-shell.c:1302
+#: ../src/shell/e-shell-window-actions.c:887
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../src/composer/e-composer-actions.c:343
-#: ../src/shell/e-shell-window-actions.c:859
+#: ../src/composer/e-composer-actions.c:345
+#: ../src/shell/e-shell-window-actions.c:889
 msgid "Configure Evolution"
 msgstr "設定 Evolution"
 
-#: ../src/composer/e-composer-actions.c:350
+#: ../src/composer/e-composer-actions.c:352
 msgid "Save the current file"
 msgstr "儲存目前的檔案"
 
-#: ../src/composer/e-composer-actions.c:355
+#: ../src/composer/e-composer-actions.c:357
 msgid "Save _As..."
 msgstr "另存新檔(_A)…"
 
-#: ../src/composer/e-composer-actions.c:357
+#: ../src/composer/e-composer-actions.c:359
 msgid "Save the current file with a different name"
 msgstr "以另一個名稱儲存目前的檔案"
 
-#: ../src/composer/e-composer-actions.c:364
+#: ../src/composer/e-composer-actions.c:366
 msgid "Character _Encoding"
 msgstr "字元編碼(_E)"
 
-#: ../src/composer/e-composer-actions.c:388
+#: ../src/composer/e-composer-actions.c:390
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
 
-#: ../src/composer/e-composer-actions.c:395
+#: ../src/composer/e-composer-actions.c:397
 msgid "Save as _Draft"
 msgstr "儲存為草稿(_D)"
 
-#: ../src/composer/e-composer-actions.c:397
+#: ../src/composer/e-composer-actions.c:399
 msgid "Save as draft"
 msgstr "儲存為草稿"
 
-#: ../src/composer/e-composer-actions.c:402
+#: ../src/composer/e-composer-actions.c:404
 msgid "S_end"
 msgstr "傳送(_E)"
 
-#: ../src/composer/e-composer-actions.c:404
+#: ../src/composer/e-composer-actions.c:406
 msgid "Send this message"
 msgstr "傳送這個郵件"
 
-#: ../src/composer/e-composer-actions.c:412
+#: ../src/composer/e-composer-actions.c:414
 msgid "PGP _Encrypt"
 msgstr "PG_P 加密"
 
-#: ../src/composer/e-composer-actions.c:414
+#: ../src/composer/e-composer-actions.c:416
 msgid "Encrypt this message with PGP"
 msgstr "使用 PGP 將這封郵件加密"
 
-#: ../src/composer/e-composer-actions.c:420
+#: ../src/composer/e-composer-actions.c:422
 msgid "PGP _Sign"
 msgstr "P_GP 加簽"
 
-#: ../src/composer/e-composer-actions.c:422
+#: ../src/composer/e-composer-actions.c:424
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP 金鑰為郵件加上數位簽章"
 
-#: ../src/composer/e-composer-actions.c:428
+#: ../src/composer/e-composer-actions.c:430
 msgid "_Picture Gallery"
 msgstr "圖片集(_P)"
 
-#: ../src/composer/e-composer-actions.c:430
+#: ../src/composer/e-composer-actions.c:432
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "示您可以拖曳到郵件中的圖片集"
 
-#: ../src/composer/e-composer-actions.c:436
+#: ../src/composer/e-composer-actions.c:438
 msgid "_Prioritize Message"
 msgstr "郵件優先權(_P)"
 
-#: ../src/composer/e-composer-actions.c:438
+#: ../src/composer/e-composer-actions.c:440
 msgid "Set the message priority to high"
 msgstr "將郵件優先權設為「高」"
 
-#: ../src/composer/e-composer-actions.c:444
+#: ../src/composer/e-composer-actions.c:446
 msgid "Re_quest Read Receipt"
 msgstr "要求讀信回條(_Q)"
 
-#: ../src/composer/e-composer-actions.c:446
+#: ../src/composer/e-composer-actions.c:448
 msgid "Get delivery notification when your message is read"
 msgstr "在您的郵件被閱讀時取得送信通知"
 
-#: ../src/composer/e-composer-actions.c:452
+#: ../src/composer/e-composer-actions.c:454
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME 加密"
 
-#: ../src/composer/e-composer-actions.c:454
+#: ../src/composer/e-composer-actions.c:456
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使用您的 S/MIME 加密憑證將這封郵件加密"
 
-#: ../src/composer/e-composer-actions.c:460
+#: ../src/composer/e-composer-actions.c:462
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME 加簽"
 
-#: ../src/composer/e-composer-actions.c:462
+#: ../src/composer/e-composer-actions.c:464
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME 簽名憑證為郵件加上數位簽章"
 
-#: ../src/composer/e-composer-actions.c:516
+#: ../src/composer/e-composer-actions.c:518
 msgid "_Bcc Field"
 msgstr "密件副本欄位(_B)"
 
-#: ../src/composer/e-composer-actions.c:518
+#: ../src/composer/e-composer-actions.c:520
 msgid "Toggles whether the BCC field is displayed"
 msgstr "切換密件副本欄位的顯示狀態"
 
-#: ../src/composer/e-composer-actions.c:524
+#: ../src/composer/e-composer-actions.c:526
 msgid "_Cc Field"
 msgstr "副本欄位(_C)"
 
-#: ../src/composer/e-composer-actions.c:526
+#: ../src/composer/e-composer-actions.c:528
 msgid "Toggles whether the CC field is displayed"
 msgstr "切換副本欄位的顯示狀態"
 
-#: ../src/composer/e-composer-actions.c:532
+#: ../src/composer/e-composer-actions.c:534
 msgid "_From Override Field"
 msgstr "寄件人覆蓋欄位(_F)"
 
-#: ../src/composer/e-composer-actions.c:534
+#: ../src/composer/e-composer-actions.c:536
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
 msgstr "切換寄件人覆蓋欄位是否改變姓名或電子郵件的顯示"
 
-#: ../src/composer/e-composer-actions.c:540
+#: ../src/composer/e-composer-actions.c:542
 msgid "_Reply-To Field"
 msgstr "回覆欄位(_R)"
 
-#: ../src/composer/e-composer-actions.c:542
+#: ../src/composer/e-composer-actions.c:544
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
-#: ../src/composer/e-composer-actions.c:597
+#: ../src/composer/e-composer-actions.c:550
+#, fuzzy
+#| msgid "_Wrap Lines"
+msgid "Visually _Wrap Long Lines"
+msgstr "換列(_W)"
+
+#: ../src/composer/e-composer-actions.c:607
 msgid "Attach"
 msgstr "附加"
 
-#: ../src/composer/e-composer-actions.c:603
+#: ../src/composer/e-composer-actions.c:613
 msgid "Save Draft"
 msgstr "儲存草稿"
 
 #: ../src/composer/e-composer-from-header.c:108
+#: ../src/e-util/e-collection-account-wizard.c:1728
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
+#: ../src/e-util/e-webdav-browser.c:2408
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../src/mail/e-mail-config-identity-page.c:553
-#: ../src/mail/e-mail-config-summary-page.c:333
+#: ../src/mail/e-mail-config-identity-page.c:550
+#: ../src/mail/e-mail-config-summary-page.c:332
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "名稱(_N):"
 
@@ -10554,11 +10783,11 @@ msgid "S_ubject:"
 msgstr "主旨(_U):"
 
 #: ../src/composer/e-composer-header-table.c:883
-#: ../src/mail/e-mail-config-identity-page.c:746
+#: ../src/mail/e-mail-config-identity-page.c:743
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
-#: ../src/composer/e-composer-name-header.c:231
+#: ../src/composer/e-composer-name-header.c:237
 msgid "Click here for the address book"
 msgstr "按這裡新增目錄服務"
 
@@ -10566,24 +10795,24 @@ msgstr "按這裡新增目錄服務"
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡,選取要張貼的資料夾"
 
-#: ../src/composer/e-msg-composer.c:859
+#: ../src/composer/e-msg-composer.c:861
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署送出的郵件:此帳號沒有設定簽章憑證"
 
-#: ../src/composer/e-msg-composer.c:868
+#: ../src/composer/e-msg-composer.c:870
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "無法加密送出的郵件:沒有設定加密憑證(此帳號)"
 
-#: ../src/composer/e-msg-composer.c:1606 ../src/composer/e-msg-composer.c:2412
+#: ../src/composer/e-msg-composer.c:1639 ../src/composer/e-msg-composer.c:2311
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../src/composer/e-msg-composer.c:4767
+#: ../src/composer/e-msg-composer.c:4696
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "郵件編輯器包含不能編輯的非文字的郵件內文。"
 
@@ -10624,20 +10853,32 @@ msgid "_Recover"
 msgstr "復原(_R)"
 
 #: ../src/composer/mail-composer.error.xml.h:9
+#, fuzzy
+#| msgid "Do you want to recover unfinished messages?"
+msgid "Do you want to recover last saved version of the message?"
+msgstr "要復原未完成的郵件?"
+
+#: ../src/composer/mail-composer.error.xml.h:10
+msgid ""
+"Recovering the message will allow you to continue where it had been saved "
+"the last time."
+msgstr ""
+
+#: ../src/composer/mail-composer.error.xml.h:11
 msgid "Could not save to autosave file “{0}”."
 msgstr "無法儲存至自動儲存檔案「{0}」。"
 
-#: ../src/composer/mail-composer.error.xml.h:10
+#: ../src/composer/mail-composer.error.xml.h:12
 msgid "Error saving to autosave because “{1}”."
 msgstr "儲存至自動儲存時發生錯誤,因為「{1}」。"
 
-#: ../src/composer/mail-composer.error.xml.h:11
+#: ../src/composer/mail-composer.error.xml.h:13
 msgid ""
 "Are you sure you want to discard the message, titled “{0}”, you are "
 "composing?"
 msgstr "確定要放棄正在撰寫,標題為「{0}」的郵件?"
 
-#: ../src/composer/mail-composer.error.xml.h:12
+#: ../src/composer/mail-composer.error.xml.h:14
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -10647,23 +10888,23 @@ msgstr ""
 "稿可以讓您以後再繼續撰寫郵件。"
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../src/composer/mail-composer.error.xml.h:15
+#: ../src/composer/mail-composer.error.xml.h:17
 msgid "_Continue Editing"
 msgstr "繼續編輯(_C)"
 
-#: ../src/composer/mail-composer.error.xml.h:16
+#: ../src/composer/mail-composer.error.xml.h:18
 msgid "_Save Draft"
 msgstr "儲存草稿(_S)"
 
-#: ../src/composer/mail-composer.error.xml.h:17
+#: ../src/composer/mail-composer.error.xml.h:19
 msgid "Are you sure you want to discard the message you are composing?"
 msgstr "確定要放棄正在撰寫的郵件?"
 
-#: ../src/composer/mail-composer.error.xml.h:18
+#: ../src/composer/mail-composer.error.xml.h:20
 msgid "Could not create message."
 msgstr "無法建立郵件。"
 
-#: ../src/composer/mail-composer.error.xml.h:19
+#: ../src/composer/mail-composer.error.xml.h:21
 msgid ""
 "You may need to select different mail options.\n"
 "\n"
@@ -10673,61 +10914,62 @@ msgstr ""
 "\n"
 "詳細的錯誤:{0}"
 
-#: ../src/composer/mail-composer.error.xml.h:22
+#: ../src/composer/mail-composer.error.xml.h:24
 msgid "Could not read signature file “{0}”."
 msgstr "無法讀取簽名檔「{0}」。"
 
-#: ../src/composer/mail-composer.error.xml.h:23
+#: ../src/composer/mail-composer.error.xml.h:25
 msgid "All accounts have been removed."
 msgstr "所有帳號已經移除。"
 
-#: ../src/composer/mail-composer.error.xml.h:24
+#: ../src/composer/mail-composer.error.xml.h:26
 msgid "You need to configure an account before you can compose mail."
 msgstr "撰寫郵件前,您需要先設定帳號。"
 
-#: ../src/composer/mail-composer.error.xml.h:25
+#: ../src/composer/mail-composer.error.xml.h:27
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "當儲存到您的寄件資料夾時發生錯誤。"
 
-#: ../src/composer/mail-composer.error.xml.h:26
+#: ../src/composer/mail-composer.error.xml.h:28
 msgid "The reported error was “{0}”. The message has not been sent."
 msgstr "回報的錯誤為「{0}」。郵件尚未寄出。"
 
-#: ../src/composer/mail-composer.error.xml.h:27
+#: ../src/composer/mail-composer.error.xml.h:29
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "當儲存到您的草稿資料夾時發生錯誤。"
 
-#: ../src/composer/mail-composer.error.xml.h:28
+#: ../src/composer/mail-composer.error.xml.h:30
 msgid ""
 "The reported error was “{0}”. The message has most likely not been saved."
 msgstr "回報的錯誤為「{0}」。郵件很可能沒有儲存。"
 
-#: ../src/composer/mail-composer.error.xml.h:29
+#: ../src/composer/mail-composer.error.xml.h:31
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "在寄信時發生錯誤。您要如何繼續?"
 
-#: ../src/composer/mail-composer.error.xml.h:30
-#: ../src/mail/mail.error.xml.h:175
+#: ../src/composer/mail-composer.error.xml.h:32
+#: ../src/mail/mail.error.xml.h:177
 msgid "The reported error was “{0}”."
 msgstr "回報的錯誤為「{0}」。"
 
-#: ../src/composer/mail-composer.error.xml.h:31
+#: ../src/composer/mail-composer.error.xml.h:33
 msgid "_Save to Outbox"
 msgstr "儲存到寄件匣(_S)"
 
-#: ../src/composer/mail-composer.error.xml.h:32
+#: ../src/composer/mail-composer.error.xml.h:34
+#: ../src/e-util/e-collection-account-wizard.c:440
 msgid "_Try Again"
 msgstr "再試一次(_T)"
 
-#: ../src/composer/mail-composer.error.xml.h:33
+#: ../src/composer/mail-composer.error.xml.h:35
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "您的郵件已送出,但是在後續處理期間發生錯誤。"
 
-#: ../src/composer/mail-composer.error.xml.h:34
+#: ../src/composer/mail-composer.error.xml.h:36
 msgid "Saving message to Outbox."
 msgstr "儲存郵件到寄件匣。"
 
-#: ../src/composer/mail-composer.error.xml.h:35
+#: ../src/composer/mail-composer.error.xml.h:37
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -10736,11 +10978,11 @@ msgstr ""
 "因為目的端服務目前無法使用,這個郵件會儲存在您本地端的寄件資料夾裡。當您回到"
 "線上工作,您可以點選 Evolution 工具列的傳送/接收按鈕來寄出郵件。"
 
-#: ../src/composer/mail-composer.error.xml.h:36
+#: ../src/composer/mail-composer.error.xml.h:38
 msgid "Are you sure you want to send the message?"
 msgstr "確定要傳送郵件?"
 
-#: ../src/composer/mail-composer.error.xml.h:37
+#: ../src/composer/mail-composer.error.xml.h:39
 msgid ""
 "A keyboard accelerator to send the message has been pressed. Either cancel "
 "sending the message, if it was done by an accident, or send the message."
@@ -10748,81 +10990,81 @@ msgstr ""
 "用來傳送郵件的鍵盤快捷鍵已被按下。如果是不小心按下的,可以取消此郵件的傳送,"
 "如果不是則送出此郵件。"
 
-#: ../src/composer/mail-composer.error.xml.h:39
+#: ../src/composer/mail-composer.error.xml.h:41
 msgid "Are you sure you want to change the composer format?"
 msgstr "您確定要改變編輯器模式?"
 
-#: ../src/composer/mail-composer.error.xml.h:40
+#: ../src/composer/mail-composer.error.xml.h:42
 msgid ""
 "Switching to Plain Text format will cause the text to lose all the HTML "
 "formatting. Do you want to continue?"
 msgstr "切換為純文字模式會使得文字失去所有的格式。您想要繼續嗎?"
 
-#: ../src/composer/mail-composer.error.xml.h:41
+#: ../src/composer/mail-composer.error.xml.h:43
 msgid "_Don’t lose formatting"
 msgstr "不要失去格式(_D)"
 
-#: ../src/composer/mail-composer.error.xml.h:42
+#: ../src/composer/mail-composer.error.xml.h:44
 msgid "Lose _formatting"
 msgstr "失去格式(_F)"
 
-#: ../src/composer/mail-composer.error.xml.h:43
+#: ../src/composer/mail-composer.error.xml.h:45
 msgid "An error occurred while saving to your Templates folder."
 msgstr "當儲存到您的範本資料夾時發生錯誤。"
 
-#: ../src/composer/mail-composer.error.xml.h:44
+#: ../src/composer/mail-composer.error.xml.h:46
 msgid "Are you sure you want to convert the message into a meeting?"
 msgstr "確定要將郵件轉換為會議?"
 
-#: ../src/composer/mail-composer.error.xml.h:45
+#: ../src/composer/mail-composer.error.xml.h:47
 msgid ""
 "By converting the message into the meeting the composed message will be "
 "closed and the changes being done discarded."
 msgstr "要將郵件轉換為會議,已編輯的郵件會被關閉而所做過的變更都會被丟棄。"
 
-#: ../src/composer/mail-composer.error.xml.h:46
+#: ../src/composer/mail-composer.error.xml.h:48
 msgid "Convert to _Meeting"
 msgstr "轉換為會議(_M)"
 
-#: ../src/composer/mail-composer.error.xml.h:47
+#: ../src/composer/mail-composer.error.xml.h:49
 msgid "Are you sure you want to convert the event into a message?"
 msgstr "確定要將事件轉換為郵件?"
 
-#: ../src/composer/mail-composer.error.xml.h:48
+#: ../src/composer/mail-composer.error.xml.h:50
 msgid ""
 "By converting the event into the message the editing window will be closed "
 "and the changes being done discarded."
 msgstr "要將事件轉換為郵件,編輯視窗會被關閉而所做過的變更都會被丟棄。"
 
-#: ../src/composer/mail-composer.error.xml.h:49
+#: ../src/composer/mail-composer.error.xml.h:51
 msgid "Convert to _Message"
 msgstr "轉換為郵件(_M)"
 
-#: ../src/composer/mail-composer.error.xml.h:50
+#: ../src/composer/mail-composer.error.xml.h:52
 msgid "Are you sure you want to convert the memo into a message?"
 msgstr "確定要將備忘錄轉換為郵件?"
 
-#: ../src/composer/mail-composer.error.xml.h:51
+#: ../src/composer/mail-composer.error.xml.h:53
 msgid ""
 "By converting the memo into the message the editing window will be closed "
 "and the changes being done discarded."
 msgstr "要將備忘錄轉換為郵件,編輯視窗會被關閉而所做過的變更都會被丟棄。"
 
-#: ../src/composer/mail-composer.error.xml.h:52
+#: ../src/composer/mail-composer.error.xml.h:54
 msgid "Are you sure you want to convert the task into a message?"
 msgstr "確定要將工作轉換為郵件?"
 
-#: ../src/composer/mail-composer.error.xml.h:53
+#: ../src/composer/mail-composer.error.xml.h:55
 msgid ""
 "By converting the task into the message the editing window will be closed "
 "and the changes being done discarded."
 msgstr "要將工作轉換為郵件,編輯視窗會被關閉而所做過的變更都會被丟棄。"
 
-#: ../src/composer/mail-composer.error.xml.h:54
+#: ../src/composer/mail-composer.error.xml.h:56
 msgid "Something has gone wrong when editing the message"
 msgstr "編輯此郵件時發生錯誤"
 
-#: ../src/composer/mail-composer.error.xml.h:55
+#: ../src/composer/mail-composer.error.xml.h:57
 msgid ""
 "A WebKitWebProcess crashed when editing the message. You can try again by "
 "closing the composer window and opening a new one. If the issue persists, "
@@ -10831,15 +11073,15 @@ msgstr ""
 "編輯此郵件時 WebKitWebProcess 當掉了。您可以試著關閉編輯器視窗後再開一個新"
 "的。如果這個問題持續發生,請在 GNOME Bugzilla 發出一份程式錯誤報告。"
 
-#: ../src/em-format/e-mail-formatter-attachment.c:334
+#: ../src/em-format/e-mail-formatter-attachment.c:335
 msgid "Display as attachment"
 msgstr "顯示為附件"
 
-#: ../src/em-format/e-mail-formatter-audio.c:150
+#: ../src/em-format/e-mail-formatter-audio.c:151
 msgid "Audio Player"
 msgstr "音樂播放器"
 
-#: ../src/em-format/e-mail-formatter-audio.c:151
+#: ../src/em-format/e-mail-formatter-audio.c:152
 msgid "Play the attachment in embedded audio player"
 msgstr "在內嵌音樂播放器中播放附件"
 
@@ -10862,11 +11104,11 @@ msgstr "(沒有主旨)"
 msgid "This message was sent by %s on behalf of %s"
 msgstr "這封郵件是由 %s 代表 %s 寄出"
 
-#: ../src/em-format/e-mail-formatter-image.c:168
+#: ../src/em-format/e-mail-formatter-image.c:178
 msgid "Regular Image"
 msgstr "一般影像"
 
-#: ../src/em-format/e-mail-formatter-image.c:169
+#: ../src/em-format/e-mail-formatter-image.c:179
 msgid "Display part as an image"
 msgstr "將部分顯示為影像"
 
@@ -10879,6 +11121,7 @@ msgid "Format part as an RFC822 message"
 msgstr "將部分格式化 RFC822 郵件"
 
 #: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/e-util/e-webdav-browser.c:2352
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:92
 #: ../src/mail/e-mail-label-tree-view.c:96
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
@@ -10904,7 +11147,7 @@ msgstr "主旨"
 #. pseudo-header
 #: ../src/em-format/e-mail-formatter-quote-headers.c:197
 #: ../src/em-format/e-mail-formatter-utils.c:341
-#: ../src/modules/mail/em-mailer-prefs.c:1488
+#: ../src/modules/mail/em-mailer-prefs.c:1500
 msgid "Mailer"
 msgstr "寄件者"
 
@@ -10939,51 +11182,55 @@ msgstr "純文字"
 msgid "Format part as plain text"
 msgstr "將部分格式化為純文字"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:44
+#: ../src/em-format/e-mail-formatter-secure-button.c:45
 msgid "Unsigned"
 msgstr "未簽名"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:44
+#: ../src/em-format/e-mail-formatter-secure-button.c:47
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此郵件未簽名。不保證此郵件已核對。"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:45
+#: ../src/em-format/e-mail-formatter-secure-button.c:49
 msgid "Valid signature"
 msgstr "有效的簽名"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:45
+#: ../src/em-format/e-mail-formatter-secure-button.c:50
+msgid "Valid signature, but sender address and signer address do not match"
+msgstr ""
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:51
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "此郵件已簽名而且有效,表示它非常有可能是核對的郵件。"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:46
+#: ../src/em-format/e-mail-formatter-secure-button.c:53
 msgid "Invalid signature"
 msgstr "無效的簽名"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:46
+#: ../src/em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "郵件的簽名無法檢驗,可能已在傳送時被更動了。"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:57
 msgid "Valid signature, but cannot verify sender"
 msgstr "簽名有效,但是無法驗證寄件者"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:59
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "此郵件有一個有效的簽名,但是郵件的寄件者無法檢驗。"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:48
+#: ../src/em-format/e-mail-formatter-secure-button.c:61
 msgid "This message is signed, but the public key is not in your keyring"
 msgstr "此郵件已加簽,但是您的鑰匙圈中沒有對應的公開金鑰。"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:48
+#: ../src/em-format/e-mail-formatter-secure-button.c:63
 msgid ""
 "This message was digitally signed, but the corresponding public key is not "
 "present in your keyring. If you want to be able to verify the authenticity "
@@ -10995,21 +11242,21 @@ msgstr ""
 "證這個人的郵件真偽,您應該通過受信任的方法獲得公開金鑰,將它加入您的鑰匙圈"
 "裡。在那之前,沒有辦法保證這封郵件確實來自這個人以及它在抵達前沒有經過修改。"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:57
+#: ../src/em-format/e-mail-formatter-secure-button.c:72
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:57
+#: ../src/em-format/e-mail-formatter-secure-button.c:72
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "此郵件未加密。它的內容在透過網際網路傳送可能會被檢閱。"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:58
+#: ../src/em-format/e-mail-formatter-secure-button.c:73
 msgid "Encrypted, weak"
 msgstr "已加密,不嚴密"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:58
+#: ../src/em-format/e-mail-formatter-secure-button.c:73
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11018,21 +11265,21 @@ msgstr ""
 "此郵件已加密,但是使用不嚴密的加密演算法。外面的人很難檢閱內容,但只要一些時"
 "日,並不是無法檢視此郵件的內容。"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:74
 msgid "Encrypted"
 msgstr "已加密"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:74
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "此郵件已加密。外面的人難以檢視此郵件的內容。"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:60
+#: ../src/em-format/e-mail-formatter-secure-button.c:75
 msgid "Encrypted, strong"
 msgstr "已加密,嚴密"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:60
+#: ../src/em-format/e-mail-formatter-secure-button.c:75
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11085,13 +11332,13 @@ msgid "S/MIME encrypted"
 msgstr "S/MIME 加密"
 
 #: ../src/em-format/e-mail-formatter-utils.c:609
-#: ../src/mail/e-mail-config-security-page.c:716
+#: ../src/mail/e-mail-config-security-page.c:718
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:272
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:215
 msgid "Security"
 msgstr "安全性"
 
-#: ../src/em-format/e-mail-parser-application-mbox.c:85
+#: ../src/em-format/e-mail-parser-application-mbox.c:125
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "解析 MBOX 部分時出現錯誤:%s"
@@ -11181,16 +11428,28 @@ msgstr "新聞群組"
 msgid "Face"
 msgstr "面貌"
 
-#: ../src/em-format/e-mail-part-secure-button.c:116
+#: ../src/em-format/e-mail-part-secure-button.c:92
+#, fuzzy, c-format
+#| msgid "Failed to import certificate"
+msgid "Failed to import certificate: %s"
+msgstr "無法匯入憑證"
+
+#: ../src/em-format/e-mail-part-secure-button.c:185
 #: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
 msgid "_View Certificate"
 msgstr "檢視憑證(_V)"
 
-#: ../src/em-format/e-mail-part-secure-button.c:131
+#: ../src/em-format/e-mail-part-secure-button.c:198
+#, fuzzy
+#| msgid "Imported Certificate"
+msgid "_Import Certificate"
+msgstr "輸入的憑證"
+
+#: ../src/em-format/e-mail-part-secure-button.c:207
 msgid "This certificate is not viewable"
 msgstr "此憑證無法檢視"
 
-#: ../src/em-format/e-mail-part-utils.c:551
+#: ../src/em-format/e-mail-part-utils.c:556
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
@@ -11208,6 +11467,93 @@ msgstr "行事曆:從 %s 到 %s"
 msgid "evolution calendar item"
 msgstr "evolution 行事曆項目"
 
+#: ../src/e-util/e-accounts-window.c:523 ../src/e-util/e-accounts-window.c:640
+#: ../src/e-util/e-accounts-window.c:860
+#: ../src/modules/mail/e-mail-shell-backend.c:852
+msgid "Mail Accounts"
+msgstr "郵件帳號"
+
+#: ../src/e-util/e-accounts-window.c:530 ../src/e-util/e-accounts-window.c:669
+#: ../src/e-util/e-accounts-window.c:874
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address Books"
+msgstr "通訊錄"
+
+#: ../src/e-util/e-accounts-window.c:536 ../src/e-util/e-accounts-window.c:670
+#: ../src/e-util/e-accounts-window.c:875
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
+msgid "Calendars"
+msgstr "行事曆"
+
+#: ../src/e-util/e-accounts-window.c:542 ../src/e-util/e-accounts-window.c:671
+#: ../src/e-util/e-accounts-window.c:876
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+msgid "Memo Lists"
+msgstr "備忘錄列表"
+
+#: ../src/e-util/e-accounts-window.c:548 ../src/e-util/e-accounts-window.c:672
+#: ../src/e-util/e-accounts-window.c:877
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
+msgid "Task Lists"
+msgstr "工作列表"
+
+#: ../src/e-util/e-accounts-window.c:1363 ../src/e-util/filter.ui.h:23
+#: ../src/mail/e-mail-account-tree-view.c:84
+#: ../src/modules/mail/em-composer-prefs.c:1305
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
+#: ../src/plugins/publish-calendar/publish-calendar.c:854
+msgid "Enabled"
+msgstr "已啟用"
+
+#: ../src/e-util/e-accounts-window.c:1379
+#: ../src/mail/e-mail-account-tree-view.c:108
+msgid "Account Name"
+msgstr "帳號名稱"
+
+#: ../src/e-util/e-accounts-window.c:1446
+#, fuzzy
+#| msgid "Current Account"
+msgid "Collection _Account"
+msgstr "目前的帳號"
+
+#: ../src/e-util/e-accounts-window.c:1447
+#, fuzzy
+#| msgid "Mail Accounts"
+msgid "_Mail Account"
+msgstr "郵件帳號"
+
+#: ../src/e-util/e-accounts-window.c:1448
+#, fuzzy
+#| msgctxt "New"
+#| msgid "Address _Book"
+msgid "Address _Book"
+msgstr "通訊錄(_B)"
+
+#: ../src/e-util/e-accounts-window.c:1449
+#, fuzzy
+#| msgid "_Calendar:"
+msgid "_Calendar"
+msgstr "行事曆(_C):"
+
+#: ../src/e-util/e-accounts-window.c:1450
+#, fuzzy
+#| msgid "Memo Lists"
+msgid "M_emo List"
+msgstr "備忘錄列表"
+
+#: ../src/e-util/e-accounts-window.c:1451
+#, fuzzy
+#| msgid "Task List"
+msgid "_Task List"
+msgstr "工作列表"
+
+#: ../src/e-util/e-accounts-window.c:1646
+#, fuzzy
+#| msgid "Evolution Account Assistant"
+msgid "Evolution Accounts"
+msgstr "Evolution 帳號助理"
+
 #. Translators: This is a cancelled activity.
 #: ../src/e-util/e-activity.c:256
 #, c-format
@@ -11248,12 +11594,12 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1870
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1849
 msgid "Cancel"
 msgstr "取消"
 
 #. Translators: Escape is a keyboard binding.
-#: ../src/e-util/e-alert-bar.c:124
+#: ../src/e-util/e-alert-bar.c:125
 msgid "Close this message (Escape)"
 msgstr "關閉這個郵件 (Escape)"
 
@@ -11269,44 +11615,44 @@ msgstr "無法建立郵件群組:"
 msgid "Attached message"
 msgstr "附加的郵件"
 
-#: ../src/e-util/e-attachment.c:2040 ../src/e-util/e-attachment.c:3093
+#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3147
 msgid "Operation was cancelled"
 msgstr "操作已被取消"
 
 #. Translators: Default attachment filename.
-#: ../src/e-util/e-attachment.c:2224 ../src/e-util/e-attachment.c:2940
-#: ../src/e-util/e-attachment.c:3383 ../src/e-util/e-attachment-store.c:886
+#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2990
+#: ../src/e-util/e-attachment.c:3437 ../src/e-util/e-attachment-store.c:887
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../src/e-util/e-attachment.c:2302 ../src/e-util/e-attachment.c:3443
+#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3497
 msgid "A load operation is already in progress"
 msgstr "載入操作已在進行中"
 
-#: ../src/e-util/e-attachment.c:2310 ../src/e-util/e-attachment.c:3451
+#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3505
 msgid "A save operation is already in progress"
 msgstr "儲存操作已在進行中"
 
-#: ../src/e-util/e-attachment.c:2707
+#: ../src/e-util/e-attachment.c:2757
 #, c-format
 msgid "Could not open “%s”"
 msgstr "無法開啟「%s」"
 
-#: ../src/e-util/e-attachment.c:2710
+#: ../src/e-util/e-attachment.c:2760
 #, c-format
 msgid "Could not open the attachment"
 msgstr "無法開啟附件"
 
-#: ../src/e-util/e-attachment.c:3460
+#: ../src/e-util/e-attachment.c:3514
 msgid "Attachment contents not loaded"
 msgstr "無法載入附件內容"
 
-#: ../src/e-util/e-attachment.c:3551
+#: ../src/e-util/e-attachment.c:3605
 #, c-format
 msgid "Could not save “%s”"
 msgstr "無法儲存「%s」"
 
-#: ../src/e-util/e-attachment.c:3554
+#: ../src/e-util/e-attachment.c:3608
 #, c-format
 msgid "Could not save the attachment"
 msgstr "無法儲存附件"
@@ -11323,6 +11669,7 @@ msgstr "檔案名稱(_I):"
 #: ../src/e-util/e-attachment-dialog.c:354
 #: ../src/e-util/e-html-editor-image-dialog.c:508
 #: ../src/e-util/e-html-editor-link-dialog.c:241
+#: ../src/e-util/e-webdav-browser.c:2447
 msgid "_Description:"
 msgstr "描述(_D):"
 
@@ -11392,45 +11739,45 @@ msgstr "只儲存解壓縮檔案(_O)"
 msgid "Save extracted files and the original _archive"
 msgstr "儲存解壓縮檔案與原始的壓縮檔(_A)"
 
-#: ../src/e-util/e-attachment-view.c:308
+#: ../src/e-util/e-attachment-view.c:309
 msgid "Open With Other Application..."
 msgstr "以其他應用程式開啟…"
 
-#: ../src/e-util/e-attachment-view.c:315
+#: ../src/e-util/e-attachment-view.c:316
 msgid "S_ave All"
 msgstr "儲存全部(_A)"
 
-#: ../src/e-util/e-attachment-view.c:322
+#: ../src/e-util/e-attachment-view.c:323
 msgid "Sa_ve As"
 msgstr "儲存為(_V)"
 
-#: ../src/e-util/e-attachment-view.c:331
+#: ../src/e-util/e-attachment-view.c:332
 #: ../src/plugins/save-calendar/save-calendar.c:351
 #: ../src/plugins/save-calendar/save-calendar.c:382
 #: ../src/plugins/save-calendar/save-calendar.c:413
 msgid "Save _As"
 msgstr "儲存為(_A)"
 
-#: ../src/e-util/e-attachment-view.c:341
+#: ../src/e-util/e-attachment-view.c:342
 msgid "A_dd Attachment..."
 msgstr "加入附件(_A)…"
 
-#: ../src/e-util/e-attachment-view.c:348
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1095
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
+#: ../src/e-util/e-attachment-view.c:349
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1316
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:605
 #: ../src/modules/calendar/e-task-shell-view-actions.c:731
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1643
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1714
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-#: ../src/e-util/e-attachment-view.c:658
+#: ../src/e-util/e-attachment-view.c:778
 #, c-format
 msgid "Open With “%s”"
 msgstr "以「%s」開啟"
 
-#: ../src/e-util/e-attachment-view.c:661
+#: ../src/e-util/e-attachment-view.c:781
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "在 %s 中開啟這個附件"
@@ -11452,40 +11799,40 @@ msgstr "複製通訊錄內容至本地用於離線作業"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-單擊以開啟連結"
 
-#: ../src/e-util/e-calendar.c:272
+#: ../src/e-util/e-calendar.c:267
 msgid "Previous month"
 msgstr "上個月"
 
-#: ../src/e-util/e-calendar.c:291
+#: ../src/e-util/e-calendar.c:286
 msgid "Next month"
 msgstr "下個月"
 
-#: ../src/e-util/e-calendar.c:311
+#: ../src/e-util/e-calendar.c:306
 msgid "Previous year"
 msgstr "上一年"
 
-#: ../src/e-util/e-calendar.c:330
+#: ../src/e-util/e-calendar.c:325
 msgid "Next year"
 msgstr "下一年"
 
-#: ../src/e-util/e-calendar.c:354
+#: ../src/e-util/e-calendar.c:349
 msgid "Month Calendar"
 msgstr "月行事曆"
 
 #. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1338 ../src/e-util/e-calendar-item.c:2218
+#: ../src/e-util/e-calendar-item.c:1333 ../src/e-util/e-calendar-item.c:2216
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%m月"
 
 #. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1340
+#: ../src/e-util/e-calendar-item.c:1335
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y年"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1377
+#: ../src/e-util/e-calendar-item.c:1372
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y年%m月"
@@ -11518,25 +11865,25 @@ msgstr "複製工作列表內容至本地以便離線作業"
 msgid "Copy memo list contents locally for offline operation"
 msgstr "複製備忘錄列表內容至本地以便離線作業"
 
-#: ../src/e-util/e-categories-editor.c:224
+#: ../src/e-util/e-categories-editor.c:246
 msgid "Currently _used categories:"
 msgstr "目前使用的分類(_U):"
 
-#: ../src/e-util/e-categories-editor.c:235
+#: ../src/e-util/e-categories-editor.c:257
 msgid "_Available Categories:"
 msgstr "可用的分類(_A):"
 
-#: ../src/e-util/e-categories-editor.c:275
+#: ../src/e-util/e-categories-editor.c:297
 msgctxt "category"
 msgid "_New"
 msgstr "新增(_N)"
 
-#: ../src/e-util/e-categories-editor.c:279
+#: ../src/e-util/e-categories-editor.c:301
 msgctxt "category"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../src/e-util/e-categories-editor.c:283
+#: ../src/e-util/e-categories-editor.c:305
 msgctxt "category"
 msgid "_Delete"
 msgstr "刪除(_D)"
@@ -11550,27 +11897,27 @@ msgstr "圖示"
 msgid "Create category “%s”"
 msgstr "建立分類「%s」"
 
-#: ../src/e-util/e-category-editor.c:135
+#: ../src/e-util/e-category-editor.c:138
 msgid "Category Icon"
 msgstr "分類圖示"
 
-#: ../src/e-util/e-category-editor.c:139
+#: ../src/e-util/e-category-editor.c:142
 msgid "_No Image"
 msgstr "沒有影像(_N)"
 
-#: ../src/e-util/e-category-editor.c:172
+#: ../src/e-util/e-category-editor.c:175
 msgid "Category _Name"
 msgstr "分類名稱(_N)"
 
-#: ../src/e-util/e-category-editor.c:184
+#: ../src/e-util/e-category-editor.c:188
 msgid "Category _Icon"
 msgstr "分類圖示(_I)"
 
-#: ../src/e-util/e-category-editor.c:210
+#: ../src/e-util/e-category-editor.c:214
 msgid "Category Properties"
 msgstr "分類屬性"
 
-#: ../src/e-util/e-category-editor.c:271
+#: ../src/e-util/e-category-editor.c:275
 #, c-format
 msgid ""
 "There is already a category “%s” in the configuration. Please use another "
@@ -11582,7 +11929,7 @@ msgid "popup list"
 msgstr "彈出式列表"
 
 #: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2066
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2109
 msgid "?"
 msgstr "?"
 
@@ -11590,13 +11937,6 @@ msgstr "?"
 msgid "Now"
 msgstr "現在"
 
-#. strftime format of a weekday and a date.
-#: ../src/e-util/e-cell-date-edit.c:328 ../src/e-util/e-datetime-format.c:206
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1791
-#: ../src/modules/itip-formatter/itip-view.c:253
-msgid "Today"
-msgstr "今天"
-
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
 #: ../src/e-util/e-cell-date-edit.c:338
@@ -11608,7 +11948,7 @@ msgstr "沒有"
 msgid "OK"
 msgstr "確定"
 
-#: ../src/e-util/e-cell-date-edit.c:897
+#: ../src/e-util/e-cell-date-edit.c:901
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式:%s"
@@ -11712,6 +12052,141 @@ msgstr "其它…"
 msgid "Cannot create a client object from extension name “%s”"
 msgstr "不能從延伸名稱「%s」建立客戶端物件"
 
+#: ../src/e-util/e-collection-account-wizard.c:214
+msgid "Looking up details, please wait…"
+msgstr ""
+
+#. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
+#: ../src/e-util/e-collection-account-wizard.c:271
+#, c-format
+msgid "Requires password to continue. %s."
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:284
+#, fuzzy
+#| msgid "_View Certificate"
+msgid "View certificate"
+msgstr "檢視憑證(_V)"
+
+#. Translators: The first %s is replaced with actual error message about site certificate invalidity,
+#. like "The signing certificate authority is not known.", the second %s is replaced with a link "View 
certificate".
+#: ../src/e-util/e-collection-account-wizard.c:288
+#, c-format
+msgctxt "collection-account-wizard"
+msgid "%s %s."
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:326
+msgid ""
+"Found no candidates. It can also mean that the server doesn’t provide any "
+"information about its configuration using the selected lookup methods. Enter "
+"the account manually instead or change above settings."
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:328
+#, c-format
+msgid "Found one candidate"
+msgid_plural "Found %d candidates"
+msgstr[0] ""
+
+#: ../src/e-util/e-collection-account-wizard.c:423
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../src/smime/gui/certificate-manager.c:785
+msgid "_Password:"
+msgstr "密碼(_P):"
+
+#: ../src/e-util/e-collection-account-wizard.c:434
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "_Remember password"
+msgstr "記住密碼(_R)"
+
+#: ../src/e-util/e-collection-account-wizard.c:555
+#: ../src/e-util/e-webdav-browser.c:473
+#, fuzzy
+#| msgid "_Selection"
+msgid "Collection"
+msgstr "選擇範圍(_S) "
+
+#: ../src/e-util/e-collection-account-wizard.c:556
+#, fuzzy
+#| msgid "Mail Receipt"
+msgid "Mail Receive"
+msgstr "郵件回條"
+
+#: ../src/e-util/e-collection-account-wizard.c:557
+#, fuzzy
+#| msgid "Mailer"
+msgid "Mail Send"
+msgstr "寄件者"
+
+#: ../src/e-util/e-collection-account-wizard.c:558
+#: ../src/e-util/e-name-selector-dialog.c:445
+#: ../src/mail/importers/pine-importer.c:430
+msgid "Address Book"
+msgstr "通訊錄"
+
+#: ../src/e-util/e-collection-account-wizard.c:560
+#, fuzzy
+#| msgid "Memo Lists"
+msgid "Memo List"
+msgstr "備忘錄列表"
+
+#: ../src/e-util/e-collection-account-wizard.c:561
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+msgid "Task List"
+msgstr "工作列表"
+
+#: ../src/e-util/e-collection-account-wizard.c:896
+msgid "Looking up LDAP server’s search base…"
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:1193
+msgid "Saving account settings, please wait…"
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:1337
+#, fuzzy
+#| msgid "_Revise Details"
+msgid "User details"
+msgstr "修訂詳細資訊(_R)"
+
+#: ../src/e-util/e-collection-account-wizard.c:1350
+#, fuzzy
+#| msgid "Email Address cannot be empty"
+msgid "_Email Address or User name:"
+msgstr "電子郵件位址不能為空"
+
+#: ../src/e-util/e-collection-account-wizard.c:1380
+#, fuzzy
+#| msgid "Send Options"
+msgid "_Advanced Options"
+msgstr "傳送選項"
+
+#: ../src/e-util/e-collection-account-wizard.c:1385
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
+msgid "_Server:"
+msgstr "伺服器(_S):"
+
+#: ../src/e-util/e-collection-account-wizard.c:1403
+msgid ""
+"Semicolon (“;”) separated list of servers to look up information for, in "
+"addition to the domain of the e-mail address."
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:1595
+#, fuzzy
+#| msgid "Level beyond which the message should be logged."
+msgid "Select which parts should be configured:"
+msgstr "應記錄的郵件等級。"
+
+#: ../src/e-util/e-collection-account-wizard.c:1719
+#: ../src/mail/e-mail-config-identity-page.c:541
+#: ../src/mail/e-mail-config-summary-page.c:323
+msgid "Account Information"
+msgstr "帳號資訊"
+
 #: ../src/e-util/e-color-chooser-widget.c:122
 msgid "Choose custom color"
 msgstr "選擇自訂顏色"
@@ -11879,10 +12354,14 @@ msgstr "白色"
 #: ../src/e-util/e-color-combo.c:642 ../src/mail/e-mail-account-tree-view.c:135
 #: ../src/mail/e-mail-config-security-page.c:406
 #: ../src/mail/e-mail-config-security-page.c:570
-#: ../src/mail/e-mail-reader.c:4049 ../src/mail/mail-config.ui.h:75
+#: ../src/mail/e-mail-reader.c:4138 ../src/mail/mail-config.ui.h:76
 msgid "Default"
 msgstr "預設值"
 
+#: ../src/e-util/e-config-lookup.c:817
+msgid "Running…"
+msgstr ""
+
 #: ../src/e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "日期與時刻"
@@ -11895,50 +12374,44 @@ msgstr "用來輸入日期的文字項目"
 msgid "Click this button to show a calendar"
 msgstr "按此按鈕以顯示行事曆"
 
-#: ../src/e-util/e-dateedit.c:626
+#: ../src/e-util/e-dateedit.c:627
 msgid "Drop-down combination box to select time"
 msgstr "用以選擇時刻的下拉式組合方塊"
 
-#: ../src/e-util/e-dateedit.c:627
+#: ../src/e-util/e-dateedit.c:628
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "時間"
 
-#: ../src/e-util/e-dateedit.c:701
+#: ../src/e-util/e-dateedit.c:702
 msgid "No_w"
 msgstr "現在(_W)"
 
-#: ../src/e-util/e-dateedit.c:708
+#: ../src/e-util/e-dateedit.c:709
 msgid "_Today"
 msgstr "今天(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../src/e-util/e-dateedit.c:717
+#: ../src/e-util/e-dateedit.c:718
 msgid "_None"
 msgstr "沒有(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../src/e-util/e-dateedit.c:1839 ../src/e-util/e-dateedit.c:2087
+#: ../src/e-util/e-dateedit.c:1877 ../src/e-util/e-dateedit.c:2125
 msgctxt "date"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/e-util/e-dateedit.c:1979
+#: ../src/e-util/e-dateedit.c:2017
 msgid "Invalid Date Value"
 msgstr "無效的日期數值"
 
-#: ../src/e-util/e-dateedit.c:2024
+#: ../src/e-util/e-dateedit.c:2062
 msgid "Invalid Time Value"
 msgstr "無效的時刻數值"
 
-#. strftime format of a weekday and a date.
-#: ../src/e-util/e-datetime-format.c:217
-#: ../src/modules/itip-formatter/itip-view.c:281
-msgid "Tomorrow"
-msgstr "明天"
-
 #: ../src/e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "昨天"
@@ -12004,7 +12477,7 @@ msgstr "下週日"
 msgid "Use locale default"
 msgstr "使用地區設定預設值"
 
-#: ../src/e-util/e-datetime-format.c:573
+#: ../src/e-util/e-datetime-format.c:592
 msgid "Format:"
 msgstr "格式:"
 
@@ -12267,23 +12740,23 @@ msgstr "選擇要比對的時間"
 msgid "Choose a File"
 msgstr "選擇檔案"
 
-#: ../src/e-util/e-filter-rule.c:763
+#: ../src/e-util/e-filter-rule.c:978
 msgid "R_ule name:"
 msgstr "規則名稱(_U):"
 
-#: ../src/e-util/e-filter-rule.c:813
+#: ../src/e-util/e-filter-rule.c:1034
 msgid "all the following conditions"
 msgstr "如果全部條件符合"
 
-#: ../src/e-util/e-filter-rule.c:814
+#: ../src/e-util/e-filter-rule.c:1035
 msgid "any of the following conditions"
 msgstr "如果任何條件符合"
 
-#: ../src/e-util/e-filter-rule.c:820
+#: ../src/e-util/e-filter-rule.c:1041
 msgid "_Find items which match:"
 msgstr "尋找符合的項目(_F):"
 
-#: ../src/e-util/e-filter-rule.c:843
+#: ../src/e-util/e-filter-rule.c:1064
 msgid "Find items that meet the following conditions"
 msgstr "尋找符合下列條件的項目"
 
@@ -12291,46 +12764,48 @@ msgstr "尋找符合下列條件的項目"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../src/e-util/e-filter-rule.c:858
+#: ../src/e-util/e-filter-rule.c:1079
 #: ../src/e-util/e-html-editor-page-dialog.c:59
-#: ../src/e-util/e-mail-identity-combo-box.c:597
+#: ../src/e-util/e-mail-identity-combo-box.c:694
 #: ../src/e-util/e-mail-signature-combo-box.c:422
-#: ../src/libemail-engine/camel-null-store.c:28
-#: ../src/mail/e-mail-config-summary-page.c:140
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../src/libemail-engine/camel-null-store.c:29
+#: ../src/mail/e-mail-autoconfig.c:658
+#: ../src/mail/e-mail-config-summary-page.c:141
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:680
 msgid "None"
 msgstr "沒有"
 
-#: ../src/e-util/e-filter-rule.c:859
+#: ../src/e-util/e-filter-rule.c:1080
 msgid "All related"
 msgstr "所有相關的"
 
-#: ../src/e-util/e-filter-rule.c:860 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1081 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "回覆"
 
-#: ../src/e-util/e-filter-rule.c:861
+#: ../src/e-util/e-filter-rule.c:1082
 msgid "Replies and parents"
 msgstr "回覆和父代"
 
-#: ../src/e-util/e-filter-rule.c:862
+#: ../src/e-util/e-filter-rule.c:1083
 msgid "No reply or parent"
 msgstr "沒有回復或原始郵件"
 
-#: ../src/e-util/e-filter-rule.c:865
+#: ../src/e-util/e-filter-rule.c:1086
 msgid "I_nclude threads:"
 msgstr "包括郵件群組(_N):"
 
-#: ../src/e-util/e-filter-rule.c:944
+#: ../src/e-util/e-filter-rule.c:1164
 msgid "A_dd Condition"
 msgstr "加入條件(_D)"
 
-#: ../src/e-util/e-filter-rule.c:1258 ../src/e-util/filter.ui.h:1
-#: ../src/mail/em-utils.c:166
+#: ../src/e-util/e-filter-rule.c:1478 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-filter-rule.c:1043 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "內送"
 
-#: ../src/e-util/e-filter-rule.c:1258 ../src/mail/em-utils.c:167
+#: ../src/e-util/e-filter-rule.c:1478 ../src/mail/em-filter-rule.c:1044
+#: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -12831,19 +13306,19 @@ msgstr "水平線(_R)"
 msgid "_Table"
 msgstr "表格(_T)"
 
-#: ../src/e-util/e-html-editor.c:689
+#: ../src/e-util/e-html-editor.c:742
 msgid "Paragraph Style"
 msgstr "段落樣式"
 
-#: ../src/e-util/e-html-editor.c:703
+#: ../src/e-util/e-html-editor.c:756
 msgid "Editing Mode"
 msgstr "編輯模式"
 
-#: ../src/e-util/e-html-editor.c:715
+#: ../src/e-util/e-html-editor.c:768
 msgid "Font Color"
 msgstr "字型顏色"
 
-#: ../src/e-util/e-html-editor.c:725
+#: ../src/e-util/e-html-editor.c:778
 msgid "Font Size"
 msgstr "字型大小"
 
@@ -13140,7 +13615,7 @@ msgid "<b>Background Image</b>"
 msgstr "<b>背景影像</b>"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "_Template:"
 msgstr "範本(_T):"
 
@@ -13254,7 +13729,7 @@ msgid "Add word"
 msgstr "加入字詞"
 
 #: ../src/e-util/e-html-editor-spell-check-dialog.c:505
-#: ../src/mail/mail-config.ui.h:39
+#: ../src/mail/mail-config.ui.h:40
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
@@ -13276,6 +13751,7 @@ msgstr "留空(_P):"
 
 #: ../src/e-util/e-html-editor-table-dialog.c:686
 #: ../src/e-util/e-html-editor-text-dialog.c:248
+#: ../src/e-util/e-webdav-browser.c:2418
 msgid "_Color:"
 msgstr "顏色(_C):"
 
@@ -13307,7 +13783,7 @@ msgid "File _type:"
 msgstr "檔案類型(_T):"
 
 #: ../src/e-util/e-import-assistant.c:343
-#: ../src/e-util/e-import-assistant.c:923
+#: ../src/e-util/e-import-assistant.c:948
 msgid "Choose the destination for this import"
 msgstr "選擇此輸入的目的地"
 
@@ -13324,7 +13800,7 @@ msgid "Import a _single file"
 msgstr "匯入單一檔案(_S)"
 
 #: ../src/e-util/e-import-assistant.c:406
-#: ../src/modules/startup-wizard/e-mail-config-import-page.c:211
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇您想要匯入的資訊:"
 
@@ -13339,43 +13815,43 @@ msgstr ""
 "按鈕。"
 
 #: ../src/e-util/e-import-assistant.c:562
-#: ../src/modules/startup-wizard/e-mail-config-import-page.c:240
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:781
+#: ../src/e-util/e-import-assistant.c:808
 msgid "_Cancel Import"
 msgstr "取消匯入(_C)"
 
-#: ../src/e-util/e-import-assistant.c:922
+#: ../src/e-util/e-import-assistant.c:947
 msgid "Preview data to be imported"
 msgstr "預覽需要匯入的資料"
 
-#: ../src/e-util/e-import-assistant.c:928
-#: ../src/e-util/e-import-assistant.c:941
-#: ../src/e-util/e-import-assistant.c:1294
-#: ../src/e-util/e-import-assistant.c:1370
-#: ../src/e-util/e-import-assistant.c:1379
+#: ../src/e-util/e-import-assistant.c:953
+#: ../src/e-util/e-import-assistant.c:966
+#: ../src/e-util/e-import-assistant.c:1319
+#: ../src/e-util/e-import-assistant.c:1395
+#: ../src/e-util/e-import-assistant.c:1404
 msgid "Import Data"
 msgstr "匯入資料"
 
-#: ../src/e-util/e-import-assistant.c:936
+#: ../src/e-util/e-import-assistant.c:961
 msgid "Select what type of file you want to import from the list."
 msgstr "選擇您想要從列表中匯入的檔案類型。"
 
-#: ../src/e-util/e-import-assistant.c:1284
-#: ../src/e-util/e-import-assistant.c:1319
+#: ../src/e-util/e-import-assistant.c:1309
+#: ../src/e-util/e-import-assistant.c:1344
 msgid "Evolution Import Assistant"
 msgstr "Evolution 匯入助理"
 
-#: ../src/e-util/e-import-assistant.c:1301
-#: ../src/e-util/e-import-assistant.c:1357
+#: ../src/e-util/e-import-assistant.c:1326
+#: ../src/e-util/e-import-assistant.c:1382
 msgid "Import Location"
 msgstr "輸入位置"
 
-#: ../src/e-util/e-import-assistant.c:1312
+#: ../src/e-util/e-import-assistant.c:1337
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -13384,19 +13860,19 @@ msgstr ""
 "歡迎使用 Evolution 的匯入助理。\n"
 "這個精靈將會領導您如何將外部的檔案匯入到 Evolution。"
 
-#: ../src/e-util/e-import-assistant.c:1329
+#: ../src/e-util/e-import-assistant.c:1354
 msgid "Importer Type"
 msgstr "輸入器類型"
 
-#: ../src/e-util/e-import-assistant.c:1339
+#: ../src/e-util/e-import-assistant.c:1364
 msgid "Select Information to Import"
 msgstr "選擇要匯入的資訊"
 
-#: ../src/e-util/e-import-assistant.c:1348
+#: ../src/e-util/e-import-assistant.c:1373
 msgid "Select a File"
 msgstr "選取檔案"
 
-#: ../src/e-util/e-import-assistant.c:1365
+#: ../src/e-util/e-import-assistant.c:1390
 msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr "按「套用」開始將檔案匯入到 Evolution。"
 
@@ -13412,15 +13888,15 @@ msgstr "關閉"
 msgid "_Save and Close"
 msgstr "儲存後關閉(_S)"
 
-#: ../src/e-util/e-mail-signature-editor.c:559
+#: ../src/e-util/e-mail-signature-editor.c:558
 msgid "Edit Signature"
 msgstr "編輯簽名檔"
 
-#: ../src/e-util/e-mail-signature-editor.c:592
+#: ../src/e-util/e-mail-signature-editor.c:591
 msgid "_Signature Name:"
 msgstr "簽名檔名稱(_S):"
 
-#: ../src/e-util/e-mail-signature-editor.c:628
+#: ../src/e-util/e-mail-signature-editor.c:627
 msgid "Unnamed"
 msgstr "未命名的"
 
@@ -13466,39 +13942,85 @@ msgstr ""
 "用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的下拉式組合方"
 "塊來選擇時區。"
 
-#: ../src/e-util/e-misc-utils.c:253
+#: ../src/e-util/e-misc-utils.c:260
 msgid "Could not open the link."
 msgstr "無法開啟該連結。"
 
-#: ../src/e-util/e-misc-utils.c:336
+#: ../src/e-util/e-misc-utils.c:343
 msgid "Could not display help for Evolution."
 msgstr "無法顯示 Evolution 的求助文件。"
 
-#: ../src/e-util/e-misc-utils.c:2501
+#: ../src/e-util/e-misc-utils.c:2508
 #, c-format
 msgid "Opening calendar “%s”"
 msgstr "開啟行事曆「%s」"
 
-#: ../src/e-util/e-misc-utils.c:2504
+#: ../src/e-util/e-misc-utils.c:2511
 #, c-format
 msgid "Opening memo list “%s”"
 msgstr "開啟備忘錄列表「%s」"
 
-#: ../src/e-util/e-misc-utils.c:2507
+#: ../src/e-util/e-misc-utils.c:2514
 #, c-format
 msgid "Opening task list “%s”"
 msgstr "開啟工作列表「%s」"
 
-#: ../src/e-util/e-misc-utils.c:2510
+#: ../src/e-util/e-misc-utils.c:2517
 #, c-format
 msgid "Opening address book “%s”"
 msgstr "開啟通訊錄「%s」"
 
-#: ../src/e-util/e-misc-utils.c:3290
+#: ../src/e-util/e-misc-utils.c:3297
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "不要再顯示這個訊息(_D)"
 
+#: ../src/e-util/e-misc-utils.c:4123
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr "此通訊錄伺服器無法連線,或伺服器名稱可能拼錯,或您的網路連線已經停止。"
+
+#: ../src/e-util/e-misc-utils.c:4135
+#, c-format
+msgid "Failed to set protocol version to LDAPv3 (%d): %s"
+msgstr ""
+
+#: ../src/e-util/e-misc-utils.c:4147
+#, fuzzy, c-format
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to authenticate with LDAP server (%d): %s"
+msgstr "無法核對 LDAP 伺服器。"
+
+#: ../src/e-util/e-misc-utils.c:4161
+#, fuzzy, c-format
+#| msgid ""
+#| "This LDAP server may use an older version of LDAP, which does not support "
+#| "this functionality or it may be misconfigured. Ask your administrator for "
+#| "supported search bases."
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases.\n"
+"\n"
+"Detailed error (%d): %s"
+msgstr ""
+"此 LDAP 伺服器可能使用舊的 LDAP 版本,它不支援此功能,或可能設定錯誤。請洽詢"
+"管理員,瞭解支援的搜尋基礎。"
+
+#: ../src/e-util/e-misc-utils.c:4172
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"此 LDAP 伺服器可能使用舊的 LDAP 版本,它不支援此功能,或可能設定錯誤。請洽詢"
+"管理員,瞭解支援的搜尋基礎。"
+
+#: ../src/e-util/e-misc-utils.c:4205
+msgid "Evolution had not been compiled with LDAP support"
+msgstr ""
+
 #: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "顯示連絡人"
@@ -13517,14 +14039,15 @@ msgstr "搜尋(_S):"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
 #: ../src/e-util/e-name-selector-dialog.c:1330
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1187
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:758
 #: ../src/modules/calendar/e-task-shell-view-actions.c:931
 msgid "Any Category"
 msgstr "任何分類"
 
 #: ../src/e-util/e-name-selector-dialog.c:365
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:338
 msgid "Co_ntacts"
 msgstr "連絡人(_N)"
 
@@ -13532,35 +14055,30 @@ msgstr "連絡人(_N)"
 msgid "Search"
 msgstr "搜尋"
 
-#: ../src/e-util/e-name-selector-dialog.c:445
-#: ../src/mail/importers/pine-importer.c:430
-msgid "Address Book"
-msgstr "通訊錄"
-
 #: ../src/e-util/e-name-selector-dialog.c:573
 msgid "Select Contacts from Address Book"
 msgstr "從通訊錄選取連絡人"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3207
+#: ../src/e-util/e-name-selector-entry.c:3237
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "在行內展開 %s (_X)"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3223
+#: ../src/e-util/e-name-selector-entry.c:3253
 #, c-format
 msgid "Cop_y %s"
 msgstr "複製(_Y) %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3234
+#: ../src/e-util/e-name-selector-entry.c:3264
 #, c-format
 msgid "C_ut %s"
 msgstr "剪下(_U) %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3252
+#: ../src/e-util/e-name-selector-entry.c:3282
 #, c-format
 msgid "_Edit %s"
 msgstr "編輯 %s(_E)"
@@ -13606,19 +14124,19 @@ msgstr "記住這個密碼(_R)"
 msgid "_Remember this password for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
 
-#: ../src/e-util/e-preferences-window.c:319
+#: ../src/e-util/e-preferences-window.c:329
 msgid "Evolution Preferences"
 msgstr "Evolution 偏好設定"
 
-#: ../src/e-util/e-print.c:158
+#: ../src/e-util/e-print.c:164
 msgid "An error occurred while printing"
 msgstr "列印時發生錯誤"
 
-#: ../src/e-util/e-print.c:165
+#: ../src/e-util/e-print.c:171
 msgid "The printing system reported the following details about the error:"
 msgstr "列印系統回報下列關於此錯誤的詳細資訊:"
 
-#: ../src/e-util/e-print.c:171
+#: ../src/e-util/e-print.c:177
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "列印系統沒有回報任何關於此錯誤的額外資訊。"
@@ -13703,11 +14221,11 @@ msgstr "建立新的代理伺服器設定檔"
 msgid "Delete the selected proxy profile"
 msgstr "刪除選取的代理伺服器設定檔"
 
-#: ../src/e-util/e-rule-editor.c:182
+#: ../src/e-util/e-rule-editor.c:191
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: ../src/e-util/e-rule-editor.c:284
+#: ../src/e-util/e-rule-editor.c:302
 msgid "Edit Rule"
 msgstr "編輯規則"
 
@@ -13729,6 +14247,7 @@ msgid "Clear the search"
 msgstr "清除此搜尋"
 
 #: ../src/e-util/e-search-bar.c:653
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:73
 msgid "_Previous"
 msgstr "上一個(_P)"
 
@@ -13737,6 +14256,8 @@ msgid "Find the previous occurrence of the phrase"
 msgstr "尋找上一個出現的字詞"
 
 #: ../src/e-util/e-search-bar.c:665
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:80
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:224
 msgid "_Next"
 msgstr "下一個(_N)"
 
@@ -13913,26 +14434,28 @@ msgstr "類型:"
 msgid "Name:"
 msgstr "名稱:"
 
-#: ../src/e-util/e-source-config.c:814
+#: ../src/e-util/e-source-config.c:814 ../src/e-util/e-webdav-browser.c:1748
 msgid "Name cannot be empty"
 msgstr "名字不能為空"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../src/e-util/e-source-config.c:1314
+#: ../src/e-util/e-source-config.c:1359
 msgid "Refresh every"
 msgstr "重新整理於每"
 
-#: ../src/e-util/e-source-config.c:1344 ../src/e-util/e-source-config.c:1414
+#: ../src/e-util/e-source-config.c:1389 ../src/e-util/e-source-config.c:1459
 msgid "Use a secure connection"
 msgstr "使用安全連線"
 
-#: ../src/e-util/e-source-config.c:1440
+#: ../src/e-util/e-source-config.c:1485
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "取消設定 SSL/_TLS 憑證的信任"
 
-#: ../src/e-util/e-source-config.c:1476
-msgid "User"
+#: ../src/e-util/e-source-config.c:1521
+#, fuzzy
+#| msgid "User"
+msgid "User:"
 msgstr "使用者"
 
 #: ../src/e-util/e-source-selector.c:3212
@@ -13943,7 +14466,7 @@ msgstr "顯示"
 msgid "Group name"
 msgstr "群組名稱"
 
-#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:796
+#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:793
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
@@ -13969,7 +14492,7 @@ msgid "Select destination"
 msgstr "選擇目的地"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-spell-dictionary.c:264
+#: ../src/e-util/e-spell-dictionary.c:266
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -13977,8 +14500,8 @@ msgstr "不明 (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-spell-dictionary.c:279
-#: ../src/e-util/e-spell-dictionary.c:284
+#: ../src/e-util/e-spell-dictionary.c:281
+#: ../src/e-util/e-spell-dictionary.c:286
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -14104,6 +14627,22 @@ msgstr ""
 "顯示此內容時 WebKitWebProcess 當掉了。您可以試著重新開啟一個視窗。如果這個問"
 "題持續發生,請在 GNOME Bugzilla 發出一份程式錯誤報告。"
 
+#: ../src/e-util/e-system.error.xml.h:25
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete remote collection “{0}”?"
+msgstr "確定要刪除備忘錄「{0}」?"
+
+#: ../src/e-util/e-system.error.xml.h:26
+#, fuzzy
+#| msgid ""
+#| "This will permanently remove the calendar “{0}” from the server. Are you "
+#| "sure you want to proceed?"
+msgid ""
+"This will permanently remove the collection “{0}” from the server. Are you "
+"sure you want to proceed?"
+msgstr "這樣會從伺服器永遠刪除行事曆「{0}」。您確定要繼續嗎?"
+
 #: ../src/e-util/e-table-click-to-add.c:687
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
@@ -14162,11 +14701,11 @@ msgstr "全部清除(_A)"
 msgid "_Show field in View"
 msgstr "顯示檢視中的欄位(_S)"
 
-#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1783
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1779
 msgid "Ascending"
 msgstr "遞增"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1783
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1779
 msgid "Descending"
 msgstr "遞減"
 
@@ -14303,20 +14842,20 @@ msgstr "格式化欄(_S)…"
 msgid "Custo_mize Current View..."
 msgstr "自訂目前的檢視(_M)…"
 
-#: ../src/e-util/e-table-header-item.c:1733
+#: ../src/e-util/e-table-header-item.c:1729
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1756
+#: ../src/e-util/e-table-header-item.c:1752
 msgid "_Custom"
 msgstr "自訂(_C)"
 
-#: ../src/e-util/e-text.c:2135
+#: ../src/e-util/e-text.c:2100
 msgid "Select All"
 msgstr "全部選取"
 
-#: ../src/e-util/e-text.c:2148
+#: ../src/e-util/e-text.c:2113
 msgid "Input Methods"
 msgstr "輸入法"
 
@@ -14374,95 +14913,280 @@ msgid "Flags"
 msgstr "旗標"
 
 #: ../src/e-util/evolution-source-viewer.c:729
-#: ../src/mail/e-mail-config-identity-page.c:1148
+#: ../src/mail/e-mail-config-identity-page.c:1230
 msgid "Identity"
 msgstr "身分"
 
-#: ../src/e-util/e-web-view.c:346
+#: ../src/e-util/e-webdav-browser.c:447
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address book"
+msgstr "通訊錄"
+
+#: ../src/e-util/e-webdav-browser.c:458
+#, fuzzy
+#| msgctxt "iCalImp"
+#| msgid "Event"
+msgid "Events"
+msgstr "事件"
+
+#: ../src/e-util/e-webdav-browser.c:514
+#, fuzzy
+#| msgid "Loading"
+msgid "Loading…"
+msgstr "載入中"
+
+#: ../src/e-util/e-webdav-browser.c:1383
+msgid "Searching collection children…"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:1385
+msgid "Failed to search for collection children"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:1419
+msgid "Searching for user home, please wait…"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:1421
+#, fuzzy
+#| msgid "Unable to perform search."
+msgid "Failed to search for user home"
+msgstr "無法執行搜尋。"
+
+#: ../src/e-util/e-webdav-browser.c:1763
+msgid "At least one component type should be set"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:1781
+#, fuzzy
+#| msgid "Failed to delete selected attendee"
+#| msgid_plural "Failed to delete selected attendees"
+msgid "Failed to get selected collection HREF"
+msgstr "刪除選取的出席者失敗"
+
+#: ../src/e-util/e-webdav-browser.c:1812
+#, fuzzy
+#| msgid "Saving changes..."
+msgid "Saving changes…"
+msgstr "正在儲存變更…"
+
+#: ../src/e-util/e-webdav-browser.c:1813
+#, fuzzy
+#| msgid "Failed to save attachments"
+msgid "Failed to save changes"
+msgstr "無法儲存附件"
+
+#: ../src/e-util/e-webdav-browser.c:1815
+#, fuzzy
+#| msgid "Creating a memo"
+msgid "Creating new book…"
+msgstr "建立一份備忘錄"
+
+#: ../src/e-util/e-webdav-browser.c:1816
+#, fuzzy
+#| msgid "Failed to create a thread: "
+msgid "Failed to create new book"
+msgstr "無法建立郵件群組:"
+
+#: ../src/e-util/e-webdav-browser.c:1818
+#, fuzzy
+#| msgid "Cre_ate new calendar"
+msgid "Creating new calendar…"
+msgstr "建立新行事曆(_A)"
+
+#: ../src/e-util/e-webdav-browser.c:1819
+#, fuzzy
+#| msgid "Cre_ate new calendar"
+msgid "Failed to create new calendar"
+msgstr "建立新行事曆(_A)"
+
+#: ../src/e-util/e-webdav-browser.c:1821
+#, fuzzy
+#| msgid "Create a new contact"
+msgid "Creating new collection…"
+msgstr "建立新的連絡人"
+
+#: ../src/e-util/e-webdav-browser.c:1822
+#, fuzzy
+#| msgid "Failed to create a thread: "
+msgid "Failed to create new collection"
+msgstr "無法建立郵件群組:"
+
+#: ../src/e-util/e-webdav-browser.c:1961
+msgid "It is not allowed to create book under another book or calendar"
+msgstr ""
+
+#. if (button == webdav_browser->priv->create_calendar_button)
+#: ../src/e-util/e-webdav-browser.c:1963
+msgid "It is not allowed to create calendar under another book or calendar"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:2189
+#, fuzzy
+#| msgid "Deleting a memo"
+#| msgid_plural "Deleting %d memos"
+msgid "Deleting book…"
+msgstr "刪除 %d 份備忘錄"
+
+#: ../src/e-util/e-webdav-browser.c:2190
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete book"
+msgstr "刪除連絡人失敗"
+
+#: ../src/e-util/e-webdav-browser.c:2193
+#, fuzzy
+#| msgid "Opening calendar"
+msgid "Deleting calendar…"
+msgstr "開啟行事曆"
+
+#: ../src/e-util/e-webdav-browser.c:2194
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete calendar"
+msgstr "刪除連絡人失敗"
+
+#: ../src/e-util/e-webdav-browser.c:2197
+#, fuzzy
+#| msgid "Delete the selection"
+msgid "Deleting collection…"
+msgstr "刪除選取範圍"
+
+#: ../src/e-util/e-webdav-browser.c:2198
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete collection"
+msgstr "刪除連絡人失敗"
+
+#: ../src/e-util/e-webdav-browser.c:2429
+msgid "For Components:"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:2435
+#, fuzzy
+#| msgctxt "iCalImp"
+#| msgid "Event"
+msgid "_Events"
+msgstr "事件"
+
+#: ../src/e-util/e-webdav-browser.c:2625
+msgid "WebDAV server:"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:2660
+#, fuzzy
+#| msgid "Create a Mem_o"
+msgid "Create _Book"
+msgstr "建立備忘錄(_O)"
+
+#: ../src/e-util/e-webdav-browser.c:2667
+#, fuzzy
+#| msgid "Cre_ate new calendar"
+msgid "Create _Calendar"
+msgstr "建立新行事曆(_A)"
+
+#: ../src/e-util/e-webdav-browser.c:2674
+#, fuzzy
+#| msgid "Create Folder"
+msgid "Create Collectio_n"
+msgstr "建立資料夾"
+
+#. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
+#. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+#. webdav_browser->priv->permissions_button = widget;
+#: ../src/e-util/e-webdav-browser.c:2699
+#: ../src/mail/em-subscription-editor.c:1950
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1721
+msgid "_Refresh"
+msgstr "重新整理(_R)"
+
+#: ../src/e-util/e-web-view.c:348
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: ../src/e-util/e-web-view.c:348
+#: ../src/e-util/e-web-view.c:350
 msgid "Copy the link to the clipboard"
 msgstr "複製連結到剪貼薄"
 
-#: ../src/e-util/e-web-view.c:356
+#: ../src/e-util/e-web-view.c:358
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結(_O)"
 
-#: ../src/e-util/e-web-view.c:358
+#: ../src/e-util/e-web-view.c:360
 msgid "Open the link in a web browser"
 msgstr "在網頁瀏覽器中開啟此連結"
 
-#: ../src/e-util/e-web-view.c:366
+#: ../src/e-util/e-web-view.c:368
 msgid "_Copy Email Address"
 msgstr "複製電子郵件位址(_C)"
 
-#: ../src/e-util/e-web-view.c:373
+#: ../src/e-util/e-web-view.c:375
 msgid "Copy _Raw Email Address"
 msgstr "複製原始電子郵件位址(_R)"
 
-#: ../src/e-util/e-web-view.c:375
+#: ../src/e-util/e-web-view.c:377
 msgid "Copy the raw email address to the clipboard"
 msgstr "複製原始電子郵件位址到剪貼簿"
 
-#: ../src/e-util/e-web-view.c:390
+#: ../src/e-util/e-web-view.c:392
 msgid "_Copy Image"
 msgstr "複製影像(_C)"
 
-#: ../src/e-util/e-web-view.c:392
+#: ../src/e-util/e-web-view.c:394
 msgid "Copy the image to the clipboard"
 msgstr "複製影像到剪貼薄"
 
-#: ../src/e-util/e-web-view.c:397
+#: ../src/e-util/e-web-view.c:399
 msgid "Save _Image..."
 msgstr "儲存影像(_I)…"
 
-#: ../src/e-util/e-web-view.c:399
+#: ../src/e-util/e-web-view.c:401
 msgid "Save the image to a file"
 msgstr "將影像儲存為檔案"
 
-#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1964
+#: ../src/e-util/e-web-view.c:421 ../src/e-util/e-web-view.c:2025
 msgid "Select all text and images"
 msgstr "選擇所有文字和影像"
 
-#: ../src/e-util/e-web-view.c:1322
+#: ../src/e-util/e-web-view.c:1379
 #, c-format
 msgid "Click to call %s"
 msgstr "按一下播號給 %s"
 
-#: ../src/e-util/e-web-view.c:1324
+#: ../src/e-util/e-web-view.c:1381
 msgid "Click to hide/unhide addresses"
 msgstr "按這裡隱藏/解除隱藏位址"
 
-#: ../src/e-util/e-web-view.c:1335
+#: ../src/e-util/e-web-view.c:1392
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "移至郵件的第 %s 節"
 
-#: ../src/e-util/e-web-view.c:1337
+#: ../src/e-util/e-web-view.c:1394
 msgid "Go to the beginning of the message"
 msgstr "移至郵件的開頭處"
 
-#: ../src/e-util/e-web-view.c:1341
+#: ../src/e-util/e-web-view.c:1398
 #, c-format
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
 
-#: ../src/e-util/e-web-view.c:3875
+#: ../src/e-util/e-web-view.c:3943
 msgid "Copying image to clipboard"
 msgstr "複製影像到剪貼薄"
 
-#: ../src/e-util/e-web-view.c:4063
+#: ../src/e-util/e-web-view.c:4131
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../src/e-util/e-web-view.c:4104
+#: ../src/e-util/e-web-view.c:4172
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "儲存影像到「%s」"
 
-#: ../src/e-util/e-web-view.c:4199
+#: ../src/e-util/e-web-view.c:4267
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr "無法取得 URI「%s」,不知道如何下載它。"
@@ -14563,17 +15287,17 @@ msgstr "您指定的時刻"
 msgid "a time relative to the current time"
 msgstr "相對於目前時刻的時差"
 
-#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:92
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:93
 msgid "seconds"
 msgstr "秒"
 
 #: ../src/e-util/filter.ui.h:9
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "weeks"
 msgstr "週"
 
 #: ../src/e-util/filter.ui.h:10
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
 msgid "months"
 msgstr "個月"
 
@@ -14602,9 +15326,13 @@ msgstr ""
 "時間作比較。"
 
 #: ../src/e-util/filter.ui.h:17
+#, fuzzy
+#| msgid ""
+#| "The message’s date will be compared against\n"
+#| "12:00am of the date specified."
 msgid ""
 "The message’s date will be compared against\n"
-"12:00am of the date specified."
+"the beginning of the specified day."
 msgstr ""
 "郵件日期將會與您在這裡指定\n"
 "日期的 12:00am 做比較。"
@@ -14625,6 +15353,12 @@ msgstr "顯示郵件過濾器:"
 msgid "_Filter Rules"
 msgstr "過濾器規則(_F)"
 
+#: ../src/e-util/filter.ui.h:24
+#, fuzzy
+#| msgid "R_ule name:"
+msgid "Rule Name"
+msgstr "規則名稱(_U):"
+
 #: ../src/e-util/gal-a11y-e-cell.c:128
 msgid "Table Cell"
 msgstr "表格的儲存格"
@@ -14674,7 +15408,7 @@ msgstr "建立新的檢視(_C)"
 msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
-#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:201
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:203
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的變更?"
 
@@ -14682,7 +15416,7 @@ msgstr "要儲存所做的變更?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "此簽章已經變更,但尚未儲存。"
 
-#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:203
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:205
 msgid "_Discard changes"
 msgstr "放棄變更(_D)"
 
@@ -14710,24 +15444,6 @@ msgstr "無法載入簽章。"
 msgid "Could not save signature."
 msgstr "無法儲存簽章。"
 
-#: ../src/libemail-engine/camel-sasl-oauth2-google.c:27
-msgid "OAuth2 Google"
-msgstr "OAuth2 Google"
-
-#: ../src/libemail-engine/camel-sasl-oauth2-google.c:28
-msgid ""
-"This option will use an OAuth 2.0 access token to connect to the Google "
-"server"
-msgstr "這個選項會使用 OAuth 2.0 存取記號來連接 Google伺服器"
-
-#: ../src/libemail-engine/camel-sasl-xoauth2.c:27
-msgid "OAuth2"
-msgstr "OAuth2"
-
-#: ../src/libemail-engine/camel-sasl-xoauth2.c:28
-msgid "This option will use an OAuth 2.0 access token to connect to the server"
-msgstr "這個選項會使用 OAuth 2.0 存取記號來連接伺服器"
-
 #: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
 msgid "Saving message to folder “%s”"
@@ -14778,96 +15494,102 @@ msgid "Invalid folder URI “%s”"
 msgstr "無效的資料夾 URI「%s」"
 
 #. Some local folders
-#: ../src/libemail-engine/e-mail-session.c:125
+#: ../src/libemail-engine/e-mail-session.c:121
 #: ../src/mail/em-folder-properties.c:1150
-#: ../src/mail/em-folder-tree-model.c:1236
+#: ../src/mail/em-folder-tree-model.c:1237
 #: ../src/mail/importers/kmail-libs.c:139
-#: ../src/modules/mail/e-mail-shell-view-private.c:1026
-#: ../src/modules/mail/e-mail-shell-view-private.c:1037
+#: ../src/modules/mail/e-mail-shell-view-private.c:1035
+#: ../src/modules/mail/e-mail-shell-view-private.c:1046
 msgid "Inbox"
 msgstr "收件匣"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../src/libemail-engine/e-mail-session.c:126
-#: ../src/mail/em-folder-tree-model.c:1229
+#: ../src/libemail-engine/e-mail-session.c:122
+#: ../src/mail/em-folder-tree-model.c:1230
 #: ../src/mail/importers/kmail-libs.c:145
-#: ../src/modules/mail/e-mail-shell-view-private.c:1024
+#: ../src/modules/mail/e-mail-shell-view-private.c:1033
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../src/libemail-engine/e-mail-session.c:127
-#: ../src/mail/em-folder-tree-model.c:1240
+#: ../src/libemail-engine/e-mail-session.c:123
+#: ../src/mail/em-folder-tree-model.c:1241
 #: ../src/mail/importers/kmail-libs.c:141
-#: ../src/modules/mail/e-mail-shell-view-private.c:1028
+#: ../src/modules/mail/e-mail-shell-view-private.c:1037
 msgid "Outbox"
 msgstr "寄件匣"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../src/libemail-engine/e-mail-session.c:128
-#: ../src/mail/em-folder-tree-model.c:1244
+#: ../src/libemail-engine/e-mail-session.c:124
+#: ../src/mail/em-folder-tree-model.c:1245
 #: ../src/mail/importers/kmail-libs.c:143
-#: ../src/modules/mail/e-mail-shell-view-private.c:1030
+#: ../src/modules/mail/e-mail-shell-view-private.c:1039
 msgid "Sent"
 msgstr "已傳送"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../src/libemail-engine/e-mail-session.c:129
-#: ../src/mail/em-folder-tree-model.c:1232
+#: ../src/libemail-engine/e-mail-session.c:125
+#: ../src/mail/em-folder-tree-model.c:1233
 #: ../src/mail/importers/kmail-libs.c:147
-#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+#: ../src/modules/mail/e-mail-shell-view-private.c:1041
 #: ../src/plugins/templates/e-templates-store.c:2212
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "範本"
 
-#: ../src/libemail-engine/e-mail-session.c:1332
+#: ../src/libemail-engine/e-mail-session.c:1297
 #, c-format
 msgid "User cancelled operation"
 msgstr "使用者取消的操作"
 
-#: ../src/libemail-engine/e-mail-session.c:1389
+#: ../src/libemail-engine/e-mail-session.c:1354
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "沒有提供目的地位址,郵件的轉寄已經取消。"
 
-#: ../src/libemail-engine/e-mail-session.c:1402
+#: ../src/libemail-engine/e-mail-session.c:1367
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "找不到可使用的識別符,郵件的轉寄已經取消。"
 
-#: ../src/libemail-engine/e-mail-session.c:2444
+#: ../src/libemail-engine/e-mail-session.c:1519
+#, fuzzy, c-format
+#| msgid "Source with UID “%s” not found"
+msgid "Corresponding source for service with UID “%s” not found"
+msgstr "沒有 UID「%s」的資料來源"
+
+#: ../src/libemail-engine/e-mail-session.c:2460
 #, c-format
 msgid "Waiting for “%s”"
 msgstr "等待「%s」"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:524
+#: ../src/libemail-engine/e-mail-session-utils.c:526
 msgid "No mail transport service available"
 msgstr "沒有可用的郵件傳輸服務"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:614
-#: ../src/libemail-engine/mail-ops.c:706
+#: ../src/libemail-engine/e-mail-session-utils.c:616
+#: ../src/libemail-engine/mail-ops.c:708
 #, c-format
 msgid "Posting message to “%s”"
 msgstr "張貼郵件至「%s」"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:651
-#: ../src/libemail-engine/mail-ops.c:742
+#: ../src/libemail-engine/e-mail-session-utils.c:653
+#: ../src/libemail-engine/mail-ops.c:744
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器:%s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:681
-#: ../src/libemail-engine/e-mail-session-utils.c:716
-#: ../src/libemail-engine/mail-ops.c:766 ../src/libemail-engine/mail-ops.c:801
+#: ../src/libemail-engine/e-mail-session-utils.c:686
+#: ../src/libemail-engine/e-mail-session-utils.c:721
+#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
 #, c-format
 msgid "Storing sent message to “%s”"
 msgstr "儲存外寄郵件到「%s」"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:705
-#: ../src/libemail-engine/mail-ops.c:790
+#: ../src/libemail-engine/e-mail-session-utils.c:710
+#: ../src/libemail-engine/mail-ops.c:796
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14876,14 +15598,15 @@ msgstr ""
 "無法附加至 %s:%s\n"
 "改附加至本地「寄件匣」資料夾。"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:735
-#: ../src/libemail-engine/mail-ops.c:818
+#: ../src/libemail-engine/e-mail-session-utils.c:740
+#: ../src/libemail-engine/mail-ops.c:824
 #, c-format
 msgid "Failed to append to local “Sent” folder: %s"
 msgstr "無法附加至本地「寄件匣」資料夾:%s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:923
-#: ../src/libemail-engine/mail-ops.c:978 ../src/libemail-engine/mail-ops.c:1080
+#: ../src/libemail-engine/e-mail-session-utils.c:928
+#: ../src/libemail-engine/mail-ops.c:985 ../src/libemail-engine/mail-ops.c:1098
+#: ../src/mail/mail-send-recv.c:636
 msgid "Sending message"
 msgstr "正在傳送郵件"
 
@@ -14907,11 +15630,16 @@ msgid "Filtering Selected Messages"
 msgstr "過濾選擇的郵件"
 
 #: ../src/libemail-engine/mail-ops.c:146
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to filter selected messages. One reason can be that folder "
+#| "location set in one or more filters is invalid. Please check your filters "
+#| "in Edit->Message Filters.\n"
+#| "Original error was: %s"
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location "
-"set in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"set in one or more filters is invalid. Please check your filters in "
+"Edit→Message Filters.\n"
 "Original error was: %s"
 msgstr ""
 "無法過濾選取的郵件。其中一個原因可能是資料夾位置設定的一或多個過濾器是無效"
@@ -14923,19 +15651,24 @@ msgstr ""
 msgid "Fetching mail from “%s”"
 msgstr "從「%s」取回郵件"
 
-#: ../src/libemail-engine/mail-ops.c:736
-#, c-format
+#: ../src/libemail-engine/mail-ops.c:738
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to apply outgoing filters. One reason can be that folder location "
+#| "set in one or more filters is invalid. Please check your filters in Edit-"
+#| ">Message Filters.\n"
+#| "Original error was: %s"
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
-"in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"in one or more filters is invalid. Please check your filters in Edit→Message "
+"Filters.\n"
 "Original error was: %s"
 msgstr ""
 "無法套用外寄過濾器。其中一個原因可能是資料夾位置設定的一或多個過濾器是無效"
 "的。請在編輯->郵件規則中檢查您的過濾器。\n"
 "原始錯誤訊息是:%s"
 
-#: ../src/libemail-engine/mail-ops.c:989
+#: ../src/libemail-engine/mail-ops.c:996
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
@@ -14943,71 +15676,85 @@ msgstr "正在傳送郵件 %d / %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1041
+#: ../src/libemail-engine/mail-ops.c:1054
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "無法傳送 %d / %d 封郵件"
 
-#: ../src/libemail-engine/mail-ops.c:1047
+#: ../src/libemail-engine/mail-ops.c:1060
 msgid "Cancelled."
 msgstr "已取消。"
 
-#: ../src/libemail-engine/mail-ops.c:1049
+#: ../src/libemail-engine/mail-ops.c:1062
 msgid "Complete."
 msgstr "完成。"
 
-#: ../src/libemail-engine/mail-ops.c:1164
+#: ../src/libemail-engine/mail-ops.c:1184
 #, c-format
 msgid "Moving messages to “%s”"
 msgstr "將郵件移到「%s」"
 
-#: ../src/libemail-engine/mail-ops.c:1165
+#: ../src/libemail-engine/mail-ops.c:1185
 #, c-format
 msgid "Copying messages to “%s”"
 msgstr "將郵件複製到「%s」"
 
-#: ../src/libemail-engine/mail-ops.c:1284
+#: ../src/libemail-engine/mail-ops.c:1304
 #, c-format
 msgid "Storing folder “%s”"
 msgstr "正在儲存資料夾「%s」"
 
-#: ../src/libemail-engine/mail-ops.c:1412
+#: ../src/libemail-engine/mail-ops.c:1432
 #, c-format
 msgid "Expunging and storing account “%s”"
 msgstr "清空和儲存帳號「%s」"
 
-#: ../src/libemail-engine/mail-ops.c:1413
+#: ../src/libemail-engine/mail-ops.c:1433
 #, c-format
 msgid "Storing account “%s”"
 msgstr "儲存帳號「%s」"
 
-#: ../src/libemail-engine/mail-ops.c:1488
+#: ../src/libemail-engine/mail-ops.c:1508
 #, c-format
 msgid "Emptying trash in “%s”"
 msgstr "清空「%s」的回收筒"
 
-#: ../src/libemail-engine/mail-ops.c:1580
+#: ../src/libemail-engine/mail-ops.c:1600
 #, c-format
 msgid "Processing folder changes in “%s”"
 msgstr "處理「%s」中的資料夾變更"
 
-#: ../src/libemail-engine/mail-tools.c:68
+#: ../src/libemail-engine/mail-tools.c:69
 #, c-format
 msgid "Could not create spool directory “%s”: %s"
 msgstr "無法建立暫存序列目錄「%s」:%s"
 
-#: ../src/libemail-engine/mail-tools.c:108
+#: ../src/libemail-engine/mail-tools.c:109
 #, c-format
 msgid "Trying to movemail a non-mbox source “%s”"
 msgstr "正在嘗試移動非 mbox 來源「%s」的郵件"
 
-#: ../src/libemail-engine/mail-tools.c:257
+#. Translators: This is a subject attribution for forwarded messages. The %s is replaced with subject of the 
original message.
+#: ../src/libemail-engine/mail-tools.c:198
+#, c-format
+msgid "[Fwd: %s]"
+msgstr ""
+
+#. Translators: This is a subject attribution for forwarded messages, used when there could not be used any 
subject.
+#. It results in "[Fwd: No Subject]" being used as a subject of the forwarded message.
+#: ../src/libemail-engine/mail-tools.c:208
+#, fuzzy
+#| msgid "(No Subject)"
+msgid "No Subject"
+msgstr "(沒有主旨)"
+
+#: ../src/libemail-engine/mail-tools.c:283
 #, c-format
 msgid "Forwarded message — %s"
 msgstr "轉寄的郵件 — %s"
 
-#: ../src/libemail-engine/mail-tools.c:259
+#: ../src/libemail-engine/mail-tools.c:285
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
@@ -15061,218 +15808,274 @@ msgstr "您可以拖放帳號名稱來調整它們的順序。"
 msgid "De_fault"
 msgstr "預設值(_F)"
 
-#: ../src/mail/e-mail-account-tree-view.c:84
-#: ../src/modules/mail/em-composer-prefs.c:1299
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
-#: ../src/plugins/publish-calendar/publish-calendar.c:853
-msgid "Enabled"
-msgstr "已啟用"
+#: ../src/mail/e-mail-autoconfig.c:648
+#, c-format
+msgid "Host: %s:%d"
+msgstr ""
 
-#: ../src/mail/e-mail-account-tree-view.c:108
-msgid "Account Name"
-msgstr "帳號名稱"
+#: ../src/mail/e-mail-autoconfig.c:652
+#, fuzzy, c-format
+#| msgid "URL: %s"
+msgid "User: %s"
+msgstr "網址: %s"
+
+#: ../src/mail/e-mail-autoconfig.c:656
+#, fuzzy, c-format
+#| msgid "Security:"
+msgid "Security method: %s"
+msgstr "安全性:"
 
-#: ../src/mail/e-mail-autoconfig.c:620
+#: ../src/mail/e-mail-autoconfig.c:657
+#: ../src/mail/e-mail-config-summary-page.c:144
+msgid "TLS"
+msgstr "TLS"
+
+#: ../src/mail/e-mail-autoconfig.c:658
+#: ../src/mail/e-mail-config-summary-page.c:147
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: ../src/mail/e-mail-autoconfig.c:662
+#, fuzzy, c-format
+#| msgid "Authentication"
+msgid "Authentication mechanism: %s"
+msgstr "核對"
+
+#: ../src/mail/e-mail-autoconfig.c:821
 msgid "No email address provided"
 msgstr "沒有提供電子郵件位址"
 
-#: ../src/mail/e-mail-autoconfig.c:629
+#: ../src/mail/e-mail-autoconfig.c:830
 msgid "Missing domain in email address"
 msgstr "電子郵件位址缺乏網域"
 
-#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:782
-#: ../src/shell/e-shell-window-actions.c:789
-#: ../src/shell/e-shell-window-actions.c:796
+#: ../src/mail/e-mail-autoconfig.c:1169
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+msgid "IMAP server"
+msgstr ""
+
+#: ../src/mail/e-mail-autoconfig.c:1176
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+msgid "POP3 server"
+msgstr ""
+
+#: ../src/mail/e-mail-autoconfig.c:1183
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#, fuzzy
+#| msgid "Server:"
+msgid "SMTP server"
+msgstr "伺服器:"
+
+#: ../src/mail/e-mail-browser.c:130 ../src/shell/e-shell-window-actions.c:812
+#: ../src/shell/e-shell-window-actions.c:819
+#: ../src/shell/e-shell-window-actions.c:826
 msgid "Close this window"
 msgstr "關閉本視窗"
 
-#: ../src/mail/e-mail-browser.c:287
+#: ../src/mail/e-mail-browser.c:288
 msgid "(No Subject)"
 msgstr "(沒有主旨)"
 
 #. GtkAssistant's back button label.
-#: ../src/mail/e-mail-config-assistant.c:47
+#: ../src/mail/e-mail-config-assistant.c:48
 msgid "Go _Back"
 msgstr "移回(_B)"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../src/mail/e-mail-config-assistant.c:116
+#: ../src/mail/e-mail-config-assistant.c:130
 msgid "_Skip Lookup"
 msgstr "略過尋找(_S)"
 
-#: ../src/mail/e-mail-config-assistant.c:661
+#: ../src/mail/e-mail-config-assistant.c:725
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-#: ../src/mail/e-mail-config-assistant.c:955
+#: ../src/mail/e-mail-config-assistant.c:1032
 msgid "_Revise Details"
 msgstr "修訂詳細資訊(_R)"
 
-#: ../src/mail/e-mail-config-auth-check.c:178
+#: ../src/mail/e-mail-config-auth-check.c:180
 msgid "Querying authentication types..."
 msgstr "正在查詢核對類型…"
 
-#: ../src/mail/e-mail-config-auth-check.c:341
+#: ../src/mail/e-mail-config-auth-check.c:393
 msgid "Check for Supported Types"
 msgstr "檢查支援的類型"
 
-#: ../src/mail/e-mail-config-confirm-page.c:156
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click “Apply” to save your settings."
-msgstr ""
-"恭喜您,郵件設定已經完成。\n"
-"\n"
-"您現在可以開始使用 Evolution 收發電子郵件。\n"
-"\n"
-"請按一下「套用」儲存設定。"
-
-#: ../src/mail/e-mail-config-confirm-page.c:168
-msgid "Done"
-msgstr "完成"
-
-#: ../src/mail/e-mail-config-defaults-page.c:378
-msgid "Checking server settings..."
-msgstr "正在檢查伺服器設定值…"
-
-#: ../src/mail/e-mail-config-defaults-page.c:496
+#: ../src/mail/e-mail-config-composing-page.c:116
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "使用全域設定值"
 
-#: ../src/mail/e-mail-config-defaults-page.c:498
-#: ../src/mail/mail-config.ui.h:26
+#: ../src/mail/e-mail-config-composing-page.c:118
+#: ../src/mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "附件"
 
-#: ../src/mail/e-mail-config-defaults-page.c:500
-#: ../src/mail/mail-config.ui.h:27
+#: ../src/mail/e-mail-config-composing-page.c:120
+#: ../src/mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "行內 (Outlook 風格)"
 
-#: ../src/mail/e-mail-config-defaults-page.c:502
-#: ../src/mail/mail-config.ui.h:28
+#: ../src/mail/e-mail-config-composing-page.c:122
+#: ../src/mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "引文"
 
-#: ../src/mail/e-mail-config-defaults-page.c:504
-#: ../src/mail/mail-config.ui.h:29
+#: ../src/mail/e-mail-config-composing-page.c:124
+#: ../src/mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "不使用引文"
 
-#: ../src/mail/e-mail-config-defaults-page.c:830
+#: ../src/mail/e-mail-config-composing-page.c:397
+#: ../src/mail/e-mail-config-composing-page.c:606
+msgid "Composing Messages"
+msgstr "正在編輯郵件"
+
+#: ../src/mail/e-mail-config-composing-page.c:406
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "一定寄送副本 (cc) 給(_S):"
+
+#: ../src/mail/e-mail-config-composing-page.c:431
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "一定寄送密件副本 (bcc) 給(_B):"
+
+#: ../src/mail/e-mail-config-composing-page.c:462
+msgid "Re_ply style:"
+msgstr "回覆風格(_P):"
+
+#: ../src/mail/e-mail-config-composing-page.c:488
+#: ../src/mail/mail-config.ui.h:20
+#, fuzzy
+#| msgid "Start _typing at the bottom on replying"
+msgid "Start _typing at the bottom"
+msgstr "回覆時從底部開始輸入(_T)"
+
+#: ../src/mail/e-mail-config-composing-page.c:495
+#: ../src/mail/mail-config.ui.h:21
+#, fuzzy
+#| msgid "_Keep signature above the original message on replying"
+msgid "_Keep signature above the original message"
+msgstr "回信時保留原始郵件的簽名(_K)"
+
+#: ../src/mail/e-mail-config-composing-page.c:512
+msgid "Message Receipts"
+msgstr "郵件回條"
+
+#: ../src/mail/e-mail-config-composing-page.c:521
+msgid "S_end message receipts:"
+msgstr "傳送郵件回條(_E):"
+
+#: ../src/mail/e-mail-config-composing-page.c:546
+msgid "Never"
+msgstr "永不"
+
+#: ../src/mail/e-mail-config-composing-page.c:552
+msgid "Always"
+msgstr "永遠"
+
+#: ../src/mail/e-mail-config-composing-page.c:558
+msgid "Ask for each message"
+msgstr "每封郵件皆詢問"
+
+#: ../src/mail/e-mail-config-confirm-page.c:154
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click “Apply” to save your settings."
+msgstr ""
+"恭喜您,郵件設定已經完成。\n"
+"\n"
+"您現在可以開始使用 Evolution 收發電子郵件。\n"
+"\n"
+"請按一下「套用」儲存設定。"
+
+#: ../src/mail/e-mail-config-confirm-page.c:166
+msgid "Done"
+msgstr "完成"
+
+#: ../src/mail/e-mail-config-defaults-page.c:314
+msgid "Checking server settings..."
+msgstr "正在檢查伺服器設定值…"
+
+#: ../src/mail/e-mail-config-defaults-page.c:663
 msgid "Special Folders"
 msgstr "特殊資料夾"
 
-#: ../src/mail/e-mail-config-defaults-page.c:839
+#: ../src/mail/e-mail-config-defaults-page.c:672
 msgid "Draft Messages _Folder:"
 msgstr "草稿郵件資料夾(_F):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:849
+#: ../src/mail/e-mail-config-defaults-page.c:682
 msgid "Choose a folder for saving draft messages."
 msgstr "選擇儲存草稿郵件的資料夾。"
 
-#: ../src/mail/e-mail-config-defaults-page.c:863
+#: ../src/mail/e-mail-config-defaults-page.c:698
 msgid "Sent _Messages Folder:"
 msgstr "傳送郵件資料夾(_M):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:873
+#: ../src/mail/e-mail-config-defaults-page.c:726
 msgid "Choose a folder for saving sent messages."
 msgstr "選擇儲存傳送郵件的資料夾。"
 
-#: ../src/mail/e-mail-config-defaults-page.c:892
+#: ../src/mail/e-mail-config-defaults-page.c:752
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "將回信儲存在要回覆郵件的資料夾(_A)"
 
-#: ../src/mail/e-mail-config-defaults-page.c:909
+#: ../src/mail/e-mail-config-defaults-page.c:775
 msgid "Archi_ve Folder:"
 msgstr "封存資料夾(_V):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:919
-#: ../src/modules/mail/em-mailer-prefs.c:1401
+#: ../src/mail/e-mail-config-defaults-page.c:785
+#: ../src/modules/mail/em-mailer-prefs.c:1413
 msgid "Choose a folder to archive messages to."
 msgstr "選擇封存郵件的資料夾。"
 
-#: ../src/mail/e-mail-config-defaults-page.c:933
+#: ../src/mail/e-mail-config-defaults-page.c:799
 msgid "_Templates Folder:"
 msgstr "範本資料夾(_T):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:943
+#: ../src/mail/e-mail-config-defaults-page.c:809
 msgid "Choose a folder to use for template messages."
 msgstr "選擇範本郵件的資料夾。"
 
-#: ../src/mail/e-mail-config-defaults-page.c:965
+#: ../src/mail/e-mail-config-defaults-page.c:831
 msgid "_Restore Defaults"
 msgstr "還原為預設值(_R)"
 
-#: ../src/mail/e-mail-config-defaults-page.c:982
+#: ../src/mail/e-mail-config-defaults-page.c:848
 msgid "_Lookup Folders"
 msgstr "查詢資料夾(_L)"
 
-#: ../src/mail/e-mail-config-defaults-page.c:1000
+#: ../src/mail/e-mail-config-defaults-page.c:866
 msgid "Use a Real Folder for _Trash:"
 msgstr "回收桶使用真實資料夾(_T):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:1001
+#: ../src/mail/e-mail-config-defaults-page.c:867
 msgid "Choose a folder for deleted messages."
 msgstr "選擇删除郵件的資料夾。"
 
-#: ../src/mail/e-mail-config-defaults-page.c:1010
+#: ../src/mail/e-mail-config-defaults-page.c:876
 msgid "Use a Real Folder for _Junk:"
 msgstr "垃圾郵件使用真實資料夾(_J):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:1011
+#: ../src/mail/e-mail-config-defaults-page.c:877
 msgid "Choose a folder for junk messages."
 msgstr "選擇垃圾郵件的資料夾。"
 
-#: ../src/mail/e-mail-config-defaults-page.c:1028
-msgid "Composing Messages"
-msgstr "正在編輯郵件"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1037
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "一定寄送副本 (cc) 給(_S):"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1062
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "一定寄送密件副本 (bcc) 給(_B):"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1093
-msgid "Re_ply style:"
-msgstr "回覆風格(_P):"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1129
-msgid "Message Receipts"
-msgstr "郵件回條"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1138
-msgid "S_end message receipts:"
-msgstr "傳送郵件回條(_E):"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1163
-msgid "Never"
-msgstr "永不"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1169
-msgid "Always"
-msgstr "永遠"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1175
-msgid "Ask for each message"
-msgstr "每封郵件皆詢問"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1282
+#: ../src/mail/e-mail-config-defaults-page.c:981
 msgid "Defaults"
 msgstr "預設值"
 
-#: ../src/mail/e-mail-config-identity-page.c:516
+#: ../src/mail/e-mail-config-identity-page.c:513
 msgid ""
 "Please enter your name and email address below. The “optional” fields below "
 "do not need to be filled in, unless you wish to include this information in "
@@ -15281,13 +16084,8 @@ msgstr ""
 "請在下面輸入您的名稱及電郵地址。「選擇性」的欄位不一定要填,除非您希望在送出"
 "的郵件內包含這些資訊。"
 
-#: ../src/mail/e-mail-config-identity-page.c:544
-#: ../src/mail/e-mail-config-summary-page.c:324
-msgid "Account Information"
-msgstr "帳號資訊"
-
-#: ../src/mail/e-mail-config-identity-page.c:582
-#: ../src/mail/e-mail-config-summary-page.c:354
+#: ../src/mail/e-mail-config-identity-page.c:579
+#: ../src/mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, “Work” or “Personal”."
@@ -15295,54 +16093,44 @@ msgstr ""
 "上列是用來代表這個帳號的名稱。\n"
 "例如:「工作」或「個人」。"
 
-#: ../src/mail/e-mail-config-identity-page.c:599
+#: ../src/mail/e-mail-config-identity-page.c:596
 msgid "Required Information"
 msgstr "必要的資訊"
 
-#: ../src/mail/e-mail-config-identity-page.c:608
+#: ../src/mail/e-mail-config-identity-page.c:605
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
-#: ../src/mail/e-mail-config-identity-page.c:637
+#: ../src/mail/e-mail-config-identity-page.c:634
 msgid "Email _Address:"
 msgstr "電子郵件位址(_A):"
 
-#: ../src/mail/e-mail-config-identity-page.c:686
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
+#: ../src/mail/e-mail-config-identity-page.c:683
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "Optional Information"
 msgstr "選擇性的資訊"
 
-#: ../src/mail/e-mail-config-identity-page.c:695
+#: ../src/mail/e-mail-config-identity-page.c:692
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
-#: ../src/mail/e-mail-config-identity-page.c:724
+#: ../src/mail/e-mail-config-identity-page.c:721
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: ../src/mail/e-mail-config-identity-page.c:779
+#: ../src/mail/e-mail-config-identity-page.c:776
 msgid "Add Ne_w Signature..."
 msgstr "加入新的簽名檔(_W)…"
 
-#: ../src/mail/e-mail-config-identity-page.c:793
+#: ../src/mail/e-mail-config-identity-page.c:790
 msgid "A_liases:"
 msgstr "別名人(_L):"
 
-#: ../src/mail/e-mail-config-identity-page.c:855
-#: ../src/mail/mail-config.ui.h:113
-msgid "Add"
-msgstr "加入"
-
-#: ../src/mail/e-mail-config-identity-page.c:864
-msgid "Edit"
-msgstr "編輯"
-
-#: ../src/mail/e-mail-config-identity-page.c:873
-#: ../src/mail/mail-config.ui.h:114
-msgid "Remove"
-msgstr "移除"
+#: ../src/mail/e-mail-config-identity-page.c:862
+msgid "Edi_t"
+msgstr ""
 
-#: ../src/mail/e-mail-config-identity-page.c:887
+#: ../src/mail/e-mail-config-identity-page.c:885
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "以輸入的電子郵件位址尋找郵件伺服器詳細資料(_L)"
 
@@ -15365,23 +16153,23 @@ msgid "Reply To is not a valid email"
 msgstr "回信位址不是有效的電子郵件"
 
 #: ../src/mail/e-mail-config-identity-page.c:969
-#: ../src/mail/e-mail-config-summary-page.c:633
+#: ../src/mail/e-mail-config-summary-page.c:638
 msgid "Account Name cannot be empty"
 msgstr "帳號名稱不能為空"
 
-#: ../src/mail/e-mail-config-lookup-page.c:69
+#: ../src/mail/e-mail-config-lookup-page.c:65
 msgid "Looking up account details..."
 msgstr "尋找帳號詳細資料…"
 
-#: ../src/mail/e-mail-config-provider-page.c:529
+#: ../src/mail/e-mail-config-provider-page.c:537
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
 
-#: ../src/mail/e-mail-config-provider-page.c:545
+#: ../src/mail/e-mail-config-provider-page.c:553
 msgid "Check for _new messages every"
 msgstr "自動檢查新郵件每(_N)"
 
-#: ../src/mail/e-mail-config-provider-page.c:753
+#: ../src/mail/e-mail-config-provider-page.c:763
 msgid "Receiving Options"
 msgstr "接收選項"
 
@@ -15391,19 +16179,19 @@ msgstr "接收電子郵件"
 
 #. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
-#: ../src/mail/e-mail-config-security-page.c:231
+#: ../src/mail/e-mail-config-security-page.c:233
 #, c-format
 msgctxt "PGPKeyDescription"
 msgid "%s — %s"
 msgstr "%s — %s"
 
 #: ../src/mail/e-mail-config-security-page.c:320
-#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:31
-#: ../src/modules/addressbook/autocompletion-config.c:114
-#: ../src/modules/calendar/e-calendar-preferences.c:644
+#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:32
+#: ../src/modules/addressbook/autocompletion-config.c:115
+#: ../src/modules/calendar/e-calendar-preferences.c:643
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:729
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../src/modules/mail/e-mail-shell-backend.c:753
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "一般"
 
@@ -15425,25 +16213,25 @@ msgstr "簽章演算法(_G):"
 
 #: ../src/mail/e-mail-config-security-page.c:409
 #: ../src/mail/e-mail-config-security-page.c:573
-#: ../src/mail/mail-config.ui.h:76
+#: ../src/mail/mail-config.ui.h:77
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../src/mail/e-mail-config-security-page.c:412
 #: ../src/mail/e-mail-config-security-page.c:576
-#: ../src/mail/mail-config.ui.h:77
+#: ../src/mail/mail-config.ui.h:78
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../src/mail/e-mail-config-security-page.c:415
 #: ../src/mail/e-mail-config-security-page.c:579
-#: ../src/mail/mail-config.ui.h:78
+#: ../src/mail/mail-config.ui.h:79
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../src/mail/e-mail-config-security-page.c:418
 #: ../src/mail/e-mail-config-security-page.c:582
-#: ../src/mail/mail-config.ui.h:79
+#: ../src/mail/mail-config.ui.h:80
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -15482,7 +16270,7 @@ msgstr "選擇"
 
 #: ../src/mail/e-mail-config-security-page.c:548
 #: ../src/mail/e-mail-config-security-page.c:646
-#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:885
+#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:915
 msgid "_Clear"
 msgstr "清除(_C)"
 
@@ -15510,66 +16298,62 @@ msgstr "當傳送加密郵件時永遠自我加密"
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
-#: ../src/mail/e-mail-config-service-page.c:639
+#: ../src/mail/e-mail-config-service-page.c:499
 msgid "Server _Type:"
 msgstr "伺服器類型(_T):"
 
-#: ../src/mail/e-mail-config-summary-page.c:143
-msgid "TLS"
-msgstr "TLS"
-
-#: ../src/mail/e-mail-config-summary-page.c:146
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: ../src/mail/e-mail-config-summary-page.c:307
+#: ../src/mail/e-mail-config-summary-page.c:306
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr "這是用來存取您郵件的設定值的摘要。"
 
-#: ../src/mail/e-mail-config-summary-page.c:371
+#: ../src/mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "個人詳細資料"
 
-#: ../src/mail/e-mail-config-summary-page.c:380
+#: ../src/mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "全名:"
 
-#: ../src/mail/e-mail-config-summary-page.c:394
+#: ../src/mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "電子郵件位址:"
 
-#: ../src/mail/e-mail-config-summary-page.c:408
+#: ../src/mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "接收中"
 
-#: ../src/mail/e-mail-config-summary-page.c:420
+#: ../src/mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "傳送中"
 
-#: ../src/mail/e-mail-config-summary-page.c:432
+#: ../src/mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "伺服器類型:"
 
-#: ../src/mail/e-mail-config-summary-page.c:453
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:606
+#: ../src/mail/e-mail-config-summary-page.c:452
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:657
 msgid "Server:"
 msgstr "伺服器:"
 
-#: ../src/mail/e-mail-config-summary-page.c:474
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../src/mail/e-mail-config-summary-page.c:473
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: ../src/mail/e-mail-config-summary-page.c:495
+#: ../src/mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "安全性:"
 
-#: ../src/mail/e-mail-config-summary-page.c:788
+#: ../src/mail/e-mail-config-summary-page.c:651
+msgid "Cannot have both receiving and sending parts set to None"
+msgstr ""
+
+#: ../src/mail/e-mail-config-summary-page.c:807
 msgid "Account Summary"
 msgstr "帳號摘要"
 
-#: ../src/mail/e-mail-config-welcome-page.c:157
+#: ../src/mail/e-mail-config-welcome-page.c:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15579,64 +16363,64 @@ msgstr ""
 "\n"
 "按一下「下一步」開始。"
 
-#: ../src/mail/e-mail-config-welcome-page.c:167
-#: ../src/modules/startup-wizard/e-startup-assistant.c:152
+#: ../src/mail/e-mail-config-welcome-page.c:171
+#: ../src/modules/startup-wizard/e-startup-assistant.c:154
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../src/mail/e-mail-config-window.c:326
+#: ../src/mail/e-mail-config-window.c:329
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
-#: ../src/mail/e-mail-display.c:128
+#: ../src/mail/e-mail-display.c:126
 msgid "_Add to Address Book..."
 msgstr "加入到通訊錄(_A)…"
 
-#: ../src/mail/e-mail-display.c:135
+#: ../src/mail/e-mail-display.c:133
 msgid "_To This Address"
 msgstr "到這個位址(_T)"
 
-#: ../src/mail/e-mail-display.c:142
+#: ../src/mail/e-mail-display.c:140
 msgid "_From This Address"
 msgstr "從這個位址(_F)"
 
-#: ../src/mail/e-mail-display.c:149
+#: ../src/mail/e-mail-display.c:147
 msgid "Send _Reply To..."
 msgstr "傳送回覆到(_R)…"
 
-#: ../src/mail/e-mail-display.c:151
+#: ../src/mail/e-mail-display.c:149
 msgid "Send a reply message to this address"
 msgstr "傳送回覆郵件到這個位址"
 
-#: ../src/mail/e-mail-display.c:158
+#: ../src/mail/e-mail-display.c:156
 msgid "Create Search _Folder"
 msgstr "建立搜尋資料夾(_F)"
 
-#: ../src/mail/e-mail-display.c:803
+#: ../src/mail/e-mail-display.c:800
 msgid "Hid_e All"
 msgstr "全部隱藏(_E)"
 
-#: ../src/mail/e-mail-display.c:810
+#: ../src/mail/e-mail-display.c:807
 msgid "_View Inline"
 msgstr "檢視行內(_V)"
 
-#: ../src/mail/e-mail-display.c:817
+#: ../src/mail/e-mail-display.c:814
 msgid "Vie_w All Inline"
 msgstr "全部以行內檢視(_W)"
 
-#: ../src/mail/e-mail-display.c:824
+#: ../src/mail/e-mail-display.c:821
 msgid "_Zoom to 100%"
 msgstr "縮放到 100%(_Z)"
 
-#: ../src/mail/e-mail-display.c:826
+#: ../src/mail/e-mail-display.c:823
 msgid "Zoom the image to its natural size"
 msgstr "縮放為影像的原始尺寸"
 
-#: ../src/mail/e-mail-display.c:831
+#: ../src/mail/e-mail-display.c:828
 msgid "_Zoom to window"
 msgstr "縮放到視窗(_Z)"
 
-#: ../src/mail/e-mail-display.c:833
+#: ../src/mail/e-mail-display.c:830
 msgid "Zoom large images to not be wider than the window width"
 msgstr "縮小較大影像避免寬於視窗寬度"
 
@@ -15658,42 +16442,42 @@ msgstr "資料夾名稱(_N):"
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../src/mail/e-mail-free-form-exp.c:234
+#: ../src/mail/e-mail-free-form-exp.c:231
 msgctxt "ffe"
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../src/mail/e-mail-free-form-exp.c:235
+#: ../src/mail/e-mail-free-form-exp.c:232
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "已刪除"
 
-#: ../src/mail/e-mail-free-form-exp.c:236
+#: ../src/mail/e-mail-free-form-exp.c:233
 msgctxt "ffe"
 msgid "Draft"
 msgstr "草稿"
 
-#: ../src/mail/e-mail-free-form-exp.c:237
+#: ../src/mail/e-mail-free-form-exp.c:234
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "有標幟的"
 
-#: ../src/mail/e-mail-free-form-exp.c:238
+#: ../src/mail/e-mail-free-form-exp.c:235
 msgctxt "ffe"
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../src/mail/e-mail-free-form-exp.c:239
+#: ../src/mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "附件"
 
-#: ../src/mail/e-mail-free-form-exp.c:487
+#: ../src/mail/e-mail-free-form-exp.c:484
 msgctxt "ffe"
 msgid "no"
 msgstr "現在"
 
-#: ../src/mail/e-mail-free-form-exp.c:488
+#: ../src/mail/e-mail-free-form-exp.c:485
 msgctxt "ffe"
 msgid "false"
 msgstr "false"
@@ -15732,7 +16516,7 @@ msgstr "稍後(_L)"
 
 #: ../src/mail/e-mail-label-manager.c:169
 #: ../src/mail/em-folder-properties.c:842
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1198
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1243
 msgid "Add Label"
 msgstr "加入標籤"
 
@@ -15801,7 +16585,7 @@ msgstr "標頭名稱:"
 msgid "Header Value"
 msgstr "標頭數值"
 
-#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:125
+#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:128
 msgid "Headers"
 msgstr "檔頭"
 
@@ -15810,638 +16594,638 @@ msgstr "檔頭"
 msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
-#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
-#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:152
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../src/mail/e-mail-reader.c:485
+#: ../src/mail/e-mail-reader.c:529
 msgid "Deleting message note..."
 msgstr "正在刪除郵件備註…"
 
-#: ../src/mail/e-mail-reader.c:1307 ../src/mail/e-mail-reader.c:1519
-#: ../src/mail/e-mail-reader.c:1559
+#: ../src/mail/e-mail-reader.c:1386 ../src/mail/e-mail-reader.c:1598
+#: ../src/mail/e-mail-reader.c:1638
 msgid "_Do not ask me again."
 msgstr "不要再詢問我(_D)。"
 
-#: ../src/mail/e-mail-reader.c:1565
+#: ../src/mail/e-mail-reader.c:1644
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "永遠忽略通信論壇的回覆欄位(_A)"
 
-#: ../src/mail/e-mail-reader.c:1768
+#: ../src/mail/e-mail-reader.c:1847
 msgid "Failed to retrieve message:"
 msgstr "取回郵件失敗:"
 
-#: ../src/mail/e-mail-reader.c:1813 ../src/mail/e-mail-reader.c:3172
+#: ../src/mail/e-mail-reader.c:1892 ../src/mail/e-mail-reader.c:3251
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "正在取回郵件「%s」"
 
-#: ../src/mail/e-mail-reader.c:2001
+#: ../src/mail/e-mail-reader.c:2080
 msgid "A_dd Sender to Address Book"
 msgstr "加入寄件者到目錄服務(_D)"
 
-#: ../src/mail/e-mail-reader.c:2003
+#: ../src/mail/e-mail-reader.c:2082
 msgid "Add sender to address book"
 msgstr "新增寄件者至通訊錄"
 
-#: ../src/mail/e-mail-reader.c:2008
+#: ../src/mail/e-mail-reader.c:2087
 msgid "_Archive..."
 msgstr "封存(_A)…"
 
-#: ../src/mail/e-mail-reader.c:2010
+#: ../src/mail/e-mail-reader.c:2089
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "將選取的郵件移至這個帳號的封存資料夾"
 
-#: ../src/mail/e-mail-reader.c:2015
+#: ../src/mail/e-mail-reader.c:2094
 msgid "Check for _Junk"
 msgstr "檢查垃圾郵件(_J)"
 
-#: ../src/mail/e-mail-reader.c:2017
+#: ../src/mail/e-mail-reader.c:2096
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾郵件狀態"
 
-#: ../src/mail/e-mail-reader.c:2022
+#: ../src/mail/e-mail-reader.c:2101
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)…"
 
-#: ../src/mail/e-mail-reader.c:2024
+#: ../src/mail/e-mail-reader.c:2103
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
-#: ../src/mail/e-mail-reader.c:2029
+#: ../src/mail/e-mail-reader.c:2108
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
 
-#: ../src/mail/e-mail-reader.c:2031
+#: ../src/mail/e-mail-reader.c:2110
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
-#: ../src/mail/e-mail-reader.c:2036
+#: ../src/mail/e-mail-reader.c:2115
 msgid "_Add note..."
 msgstr "加入備註(_A)…"
 
-#: ../src/mail/e-mail-reader.c:2038
+#: ../src/mail/e-mail-reader.c:2117
 msgid "Add a note for the selected message"
 msgstr "為選取的郵件加入備註"
 
-#: ../src/mail/e-mail-reader.c:2043
+#: ../src/mail/e-mail-reader.c:2122
 msgid "Delete no_te"
 msgstr "刪除備註(_T)"
 
-#: ../src/mail/e-mail-reader.c:2045
+#: ../src/mail/e-mail-reader.c:2124
 msgid "Delete the note for the selected message"
 msgstr "刪除選取郵件的備註"
 
-#: ../src/mail/e-mail-reader.c:2050
+#: ../src/mail/e-mail-reader.c:2129
 msgid "_Edit note..."
 msgstr "編輯備註(_E)…"
 
-#: ../src/mail/e-mail-reader.c:2052
+#: ../src/mail/e-mail-reader.c:2131
 msgid "Edit a note for the selected message"
 msgstr "編輯選取的郵件備註"
 
-#: ../src/mail/e-mail-reader.c:2057
+#: ../src/mail/e-mail-reader.c:2136
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "從通信論壇建立過濾器規則(_L)…"
 
-#: ../src/mail/e-mail-reader.c:2059
+#: ../src/mail/e-mail-reader.c:2138
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個通信論壇建立過濾器規則"
 
-#: ../src/mail/e-mail-reader.c:2064
+#: ../src/mail/e-mail-reader.c:2143
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "從收件者建立過濾器規則(_R)…"
 
-#: ../src/mail/e-mail-reader.c:2066
+#: ../src/mail/e-mail-reader.c:2145
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
-#: ../src/mail/e-mail-reader.c:2071
+#: ../src/mail/e-mail-reader.c:2150
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "從寄件者建立過濾器規則(_N)…"
 
-#: ../src/mail/e-mail-reader.c:2073
+#: ../src/mail/e-mail-reader.c:2152
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
-#: ../src/mail/e-mail-reader.c:2078
+#: ../src/mail/e-mail-reader.c:2157
 msgid "Create a Filter Rule for _Subject..."
 msgstr "從主旨建立過濾器規則(_S)…"
 
-#: ../src/mail/e-mail-reader.c:2080
+#: ../src/mail/e-mail-reader.c:2159
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-#: ../src/mail/e-mail-reader.c:2085
+#: ../src/mail/e-mail-reader.c:2164
 msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
-#: ../src/mail/e-mail-reader.c:2087
+#: ../src/mail/e-mail-reader.c:2166
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的郵件"
 
-#: ../src/mail/e-mail-reader.c:2092
+#: ../src/mail/e-mail-reader.c:2171
 msgid "_Find in Message..."
 msgstr "在郵件內尋找(_F)…"
 
-#: ../src/mail/e-mail-reader.c:2094
+#: ../src/mail/e-mail-reader.c:2173
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
-#: ../src/mail/e-mail-reader.c:2099
+#: ../src/mail/e-mail-reader.c:2178
 msgid "_Clear Flag"
 msgstr "清除標幟(_C)"
 
-#: ../src/mail/e-mail-reader.c:2101
+#: ../src/mail/e-mail-reader.c:2180
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "移除選取郵件的跟隨旗標"
 
-#: ../src/mail/e-mail-reader.c:2106
+#: ../src/mail/e-mail-reader.c:2185
 msgid "_Flag Completed"
 msgstr "標記為已完成(_F)"
 
-#: ../src/mail/e-mail-reader.c:2108
+#: ../src/mail/e-mail-reader.c:2187
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "將已選取郵件的跟隨旗標設為已完成"
 
-#: ../src/mail/e-mail-reader.c:2113
+#: ../src/mail/e-mail-reader.c:2192
 msgid "Follow _Up..."
 msgstr "跟隨(_U)…"
 
-#: ../src/mail/e-mail-reader.c:2115
+#: ../src/mail/e-mail-reader.c:2194
 msgid "Flag the selected messages for follow-up"
 msgstr "將選定的郵件加上跟隨旗標"
 
-#: ../src/mail/e-mail-reader.c:2120
-#: ../src/modules/mail/e-mail-attachment-handler.c:430
+#: ../src/mail/e-mail-reader.c:2199
+#: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../src/mail/e-mail-reader.c:2122 ../src/mail/e-mail-reader.c:2129
-#: ../src/modules/mail/e-mail-attachment-handler.c:432
+#: ../src/mail/e-mail-reader.c:2201 ../src/mail/e-mail-reader.c:2208
+#: ../src/modules/mail/e-mail-attachment-handler.c:433
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附件形式轉寄給某人"
 
-#: ../src/mail/e-mail-reader.c:2127
+#: ../src/mail/e-mail-reader.c:2206
 msgid "Forward As _Attached"
 msgstr "以附件轉寄(_A)"
 
-#: ../src/mail/e-mail-reader.c:2134
-#: ../src/modules/mail/e-mail-attachment-handler.c:437
+#: ../src/mail/e-mail-reader.c:2213
+#: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "行內(_I)"
 
-#: ../src/mail/e-mail-reader.c:2136 ../src/mail/e-mail-reader.c:2143
-#: ../src/modules/mail/e-mail-attachment-handler.c:439
+#: ../src/mail/e-mail-reader.c:2215 ../src/mail/e-mail-reader.c:2222
+#: ../src/modules/mail/e-mail-attachment-handler.c:440
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
-#: ../src/mail/e-mail-reader.c:2141
+#: ../src/mail/e-mail-reader.c:2220
 msgid "Forward As _Inline"
 msgstr "以行內轉寄(_I)"
 
-#: ../src/mail/e-mail-reader.c:2148
-#: ../src/modules/mail/e-mail-attachment-handler.c:444
+#: ../src/mail/e-mail-reader.c:2227
+#: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
-#: ../src/mail/e-mail-reader.c:2150 ../src/mail/e-mail-reader.c:2157
-#: ../src/modules/mail/e-mail-attachment-handler.c:446
+#: ../src/mail/e-mail-reader.c:2229 ../src/mail/e-mail-reader.c:2236
+#: ../src/modules/mail/e-mail-attachment-handler.c:447
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
-#: ../src/mail/e-mail-reader.c:2155
+#: ../src/mail/e-mail-reader.c:2234
 msgid "Forward As _Quoted"
 msgstr "以引文轉寄(_Q)"
 
-#: ../src/mail/e-mail-reader.c:2162
+#: ../src/mail/e-mail-reader.c:2241
 msgid "_Load Images"
 msgstr "載入影像(_L)"
 
-#: ../src/mail/e-mail-reader.c:2164
+#: ../src/mail/e-mail-reader.c:2243
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML 格式的郵件時強迫載入影像"
 
-#: ../src/mail/e-mail-reader.c:2169 ../src/mail/e-mail-reader.c:2559
+#: ../src/mail/e-mail-reader.c:2248 ../src/mail/e-mail-reader.c:2638
 msgid "_Ignore Subthread"
 msgstr "忽略子群組(_I)"
 
-#: ../src/mail/e-mail-reader.c:2171
+#: ../src/mail/e-mail-reader.c:2250
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "自動將子群組中的新郵件標記為已閱讀"
 
-#: ../src/mail/e-mail-reader.c:2176 ../src/mail/e-mail-reader.c:2563
+#: ../src/mail/e-mail-reader.c:2255 ../src/mail/e-mail-reader.c:2642
 msgid "_Ignore Thread"
 msgstr "忽略群組(_I)"
 
-#: ../src/mail/e-mail-reader.c:2178
+#: ../src/mail/e-mail-reader.c:2257
 msgid "Mark new mails in this thread as read automatically"
 msgstr "自動將這個群組中的新郵件標記為已閱讀"
 
-#: ../src/mail/e-mail-reader.c:2183
+#: ../src/mail/e-mail-reader.c:2262
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../src/mail/e-mail-reader.c:2185
+#: ../src/mail/e-mail-reader.c:2264
 msgid "Mark the selected messages as important"
 msgstr "將選定的郵件標示成重要"
 
-#: ../src/mail/e-mail-reader.c:2190
+#: ../src/mail/e-mail-reader.c:2269
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
 
-#: ../src/mail/e-mail-reader.c:2192
+#: ../src/mail/e-mail-reader.c:2271
 msgid "Mark the selected messages as junk"
 msgstr "將選定的郵件標示成垃圾郵件"
 
-#: ../src/mail/e-mail-reader.c:2197
+#: ../src/mail/e-mail-reader.c:2276
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
 
-#: ../src/mail/e-mail-reader.c:2199
+#: ../src/mail/e-mail-reader.c:2278
 msgid "Mark the selected messages as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
-#: ../src/mail/e-mail-reader.c:2204
+#: ../src/mail/e-mail-reader.c:2283
 msgid "_Read"
 msgstr "已閱讀(_R)"
 
-#: ../src/mail/e-mail-reader.c:2206
+#: ../src/mail/e-mail-reader.c:2285
 msgid "Mark the selected messages as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
-#: ../src/mail/e-mail-reader.c:2211 ../src/mail/e-mail-reader.c:2583
+#: ../src/mail/e-mail-reader.c:2290 ../src/mail/e-mail-reader.c:2662
 msgid "Do not _Ignore Subthread"
 msgstr "不要忽略子群組(_I)"
 
-#: ../src/mail/e-mail-reader.c:2213
+#: ../src/mail/e-mail-reader.c:2292
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "不要自動將子群組中的新郵件標記為已閱讀"
 
-#: ../src/mail/e-mail-reader.c:2218 ../src/mail/e-mail-reader.c:2587
+#: ../src/mail/e-mail-reader.c:2297 ../src/mail/e-mail-reader.c:2666
 msgid "Do not _Ignore Thread"
 msgstr "不要忽略群組(_I)"
 
-#: ../src/mail/e-mail-reader.c:2220
+#: ../src/mail/e-mail-reader.c:2299
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "不要自動將這個群組中的新郵件標記為已閱讀"
 
-#: ../src/mail/e-mail-reader.c:2225
+#: ../src/mail/e-mail-reader.c:2304
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../src/mail/e-mail-reader.c:2227
+#: ../src/mail/e-mail-reader.c:2306
 msgid "Mark the selected messages as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
-#: ../src/mail/e-mail-reader.c:2232
+#: ../src/mail/e-mail-reader.c:2311
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../src/mail/e-mail-reader.c:2234
+#: ../src/mail/e-mail-reader.c:2313
 msgid "Mark the selected messages as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
-#: ../src/mail/e-mail-reader.c:2239
-#: ../src/modules/mail/e-mail-attachment-handler.c:416
+#: ../src/mail/e-mail-reader.c:2318
+#: ../src/modules/mail/e-mail-attachment-handler.c:417
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)…"
 
-#: ../src/mail/e-mail-reader.c:2241
-#: ../src/modules/mail/e-mail-attachment-handler.c:418
+#: ../src/mail/e-mail-reader.c:2320
+#: ../src/modules/mail/e-mail-attachment-handler.c:419
 msgid "Open the selected messages in the composer for editing"
 msgstr "在撰寫視窗開啟選取的郵件以便編輯"
 
-#: ../src/mail/e-mail-reader.c:2246
+#: ../src/mail/e-mail-reader.c:2325
 msgid "Compose _New Message"
 msgstr "撰寫新郵件(_N)"
 
-#: ../src/mail/e-mail-reader.c:2248
+#: ../src/mail/e-mail-reader.c:2327
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
-#: ../src/mail/e-mail-reader.c:2253
+#: ../src/mail/e-mail-reader.c:2332
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../src/mail/e-mail-reader.c:2255
+#: ../src/mail/e-mail-reader.c:2334
 msgid "Open the selected messages in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
-#: ../src/mail/e-mail-reader.c:2260
+#: ../src/mail/e-mail-reader.c:2339
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)…"
 
-#: ../src/mail/e-mail-reader.c:2262
+#: ../src/mail/e-mail-reader.c:2341
 msgid "Move selected messages to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
-#: ../src/mail/e-mail-reader.c:2267
+#: ../src/mail/e-mail-reader.c:2346
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
-#: ../src/mail/e-mail-reader.c:2269
+#: ../src/mail/e-mail-reader.c:2348
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
-#: ../src/mail/e-mail-reader.c:2274
+#: ../src/mail/e-mail-reader.c:2353
 msgid "Next _Important Message"
 msgstr "下一封重要郵件(_I)"
 
-#: ../src/mail/e-mail-reader.c:2276
+#: ../src/mail/e-mail-reader.c:2355
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
-#: ../src/mail/e-mail-reader.c:2281
+#: ../src/mail/e-mail-reader.c:2360
 msgid "Next _Thread"
 msgstr "下一封相關郵件(_T)"
 
-#: ../src/mail/e-mail-reader.c:2283
+#: ../src/mail/e-mail-reader.c:2362
 msgid "Display the next thread"
 msgstr "顯示下一封相關郵件"
 
-#: ../src/mail/e-mail-reader.c:2288
+#: ../src/mail/e-mail-reader.c:2367
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
-#: ../src/mail/e-mail-reader.c:2290
+#: ../src/mail/e-mail-reader.c:2369
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
-#: ../src/mail/e-mail-reader.c:2295
+#: ../src/mail/e-mail-reader.c:2374
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
-#: ../src/mail/e-mail-reader.c:2297
+#: ../src/mail/e-mail-reader.c:2376
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
-#: ../src/mail/e-mail-reader.c:2302
+#: ../src/mail/e-mail-reader.c:2381
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
-#: ../src/mail/e-mail-reader.c:2304
+#: ../src/mail/e-mail-reader.c:2383
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
-#: ../src/mail/e-mail-reader.c:2309
+#: ../src/mail/e-mail-reader.c:2388
 msgid "Previous T_hread"
 msgstr "上一封相關郵件(_H)"
 
-#: ../src/mail/e-mail-reader.c:2311
+#: ../src/mail/e-mail-reader.c:2390
 msgid "Display the previous thread"
 msgstr "顯示上一封相關郵件"
 
-#: ../src/mail/e-mail-reader.c:2316
+#: ../src/mail/e-mail-reader.c:2395
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
-#: ../src/mail/e-mail-reader.c:2318
+#: ../src/mail/e-mail-reader.c:2397
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
-#: ../src/mail/e-mail-reader.c:2325
+#: ../src/mail/e-mail-reader.c:2404
 msgid "Print this message"
 msgstr "列印郵件"
 
-#: ../src/mail/e-mail-reader.c:2332
+#: ../src/mail/e-mail-reader.c:2411
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
-#: ../src/mail/e-mail-reader.c:2337
-#: ../src/modules/mail/e-mail-attachment-handler.c:451
+#: ../src/mail/e-mail-reader.c:2416
+#: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
-#: ../src/mail/e-mail-reader.c:2339
-#: ../src/modules/mail/e-mail-attachment-handler.c:453
+#: ../src/mail/e-mail-reader.c:2418
+#: ../src/modules/mail/e-mail-attachment-handler.c:454
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ../src/mail/e-mail-reader.c:2344
+#: ../src/mail/e-mail-reader.c:2423
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../src/mail/e-mail-reader.c:2346
+#: ../src/mail/e-mail-reader.c:2425
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../src/mail/e-mail-reader.c:2351
+#: ../src/mail/e-mail-reader.c:2430
 msgid "Remove Du_plicate Messages"
 msgstr "移除重複的郵件(_P)"
 
-#: ../src/mail/e-mail-reader.c:2353
+#: ../src/mail/e-mail-reader.c:2432
 msgid "Checks selected messages for duplicates"
 msgstr "檢查選取的郵件是否有重複"
 
-#: ../src/mail/e-mail-reader.c:2358 ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
-#: ../src/modules/mail/e-mail-attachment-handler.c:395
+#: ../src/mail/e-mail-reader.c:2437 ../src/mail/mail.error.xml.h:28
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../src/mail/e-mail-reader.c:2360
-#: ../src/modules/mail/e-mail-attachment-handler.c:397
+#: ../src/mail/e-mail-reader.c:2439
+#: ../src/modules/mail/e-mail-attachment-handler.c:398
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "撰寫回郵給已選取郵件的全部收件者"
 
-#: ../src/mail/e-mail-reader.c:2365 ../src/mail/mail.error.xml.h:26
-#: ../src/modules/mail/e-mail-attachment-handler.c:402
+#: ../src/mail/e-mail-reader.c:2444 ../src/mail/mail.error.xml.h:26
+#: ../src/modules/mail/e-mail-attachment-handler.c:403
 msgid "Reply to _List"
 msgstr "回覆至列表(_L)"
 
-#: ../src/mail/e-mail-reader.c:2367
-#: ../src/modules/mail/e-mail-attachment-handler.c:404
+#: ../src/mail/e-mail-reader.c:2446
+#: ../src/modules/mail/e-mail-attachment-handler.c:405
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "撰寫回郵給所選定郵件的通信論壇"
 
-#: ../src/mail/e-mail-reader.c:2372
-#: ../src/modules/mail/e-mail-attachment-handler.c:409
+#: ../src/mail/e-mail-reader.c:2451
+#: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../src/mail/e-mail-reader.c:2374
-#: ../src/modules/mail/e-mail-attachment-handler.c:411
+#: ../src/mail/e-mail-reader.c:2453
+#: ../src/modules/mail/e-mail-attachment-handler.c:412
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
-#: ../src/mail/e-mail-reader.c:2379
+#: ../src/mail/e-mail-reader.c:2458
 msgid "_Save as mbox..."
 msgstr "儲存成 mbox(_S)…"
 
-#: ../src/mail/e-mail-reader.c:2381
+#: ../src/mail/e-mail-reader.c:2460
 msgid "Save selected messages as an mbox file"
 msgstr "將選定的郵件另存成 mbox 檔案"
 
-#: ../src/mail/e-mail-reader.c:2386
+#: ../src/mail/e-mail-reader.c:2465
 msgid "_Message Source"
 msgstr "郵件原始碼(_M)"
 
-#: ../src/mail/e-mail-reader.c:2388
+#: ../src/mail/e-mail-reader.c:2467
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-#: ../src/mail/e-mail-reader.c:2400
+#: ../src/mail/e-mail-reader.c:2479
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../src/mail/e-mail-reader.c:2402
+#: ../src/mail/e-mail-reader.c:2481
 msgid "Undelete the selected messages"
 msgstr "取消刪除選定的郵件"
 
-#: ../src/mail/e-mail-reader.c:2407
+#: ../src/mail/e-mail-reader.c:2486
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../src/mail/e-mail-reader.c:2409
+#: ../src/mail/e-mail-reader.c:2488
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
-#: ../src/mail/e-mail-reader.c:2414
+#: ../src/mail/e-mail-reader.c:2493
 msgid "_Zoom In"
 msgstr "拉近(_Z)"
 
-#: ../src/mail/e-mail-reader.c:2416
+#: ../src/mail/e-mail-reader.c:2495
 msgid "Increase the text size"
 msgstr "將文字放大"
 
-#: ../src/mail/e-mail-reader.c:2423
+#: ../src/mail/e-mail-reader.c:2502
 msgid "Decrease the text size"
 msgstr "將文字縮小"
 
-#: ../src/mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2509
 msgid "Cre_ate"
 msgstr "建立(_A)"
 
-#: ../src/mail/e-mail-reader.c:2437
+#: ../src/mail/e-mail-reader.c:2516
 msgid "Ch_aracter Encoding"
 msgstr "字元編碼(_A)"
 
-#: ../src/mail/e-mail-reader.c:2444
-#: ../src/modules/mail/e-mail-attachment-handler.c:423
+#: ../src/mail/e-mail-reader.c:2523
+#: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "轉寄為(_O)"
 
-#: ../src/mail/e-mail-reader.c:2451
+#: ../src/mail/e-mail-reader.c:2530
 msgid "_Group Reply"
 msgstr "群組回覆(_G)"
 
-#: ../src/mail/e-mail-reader.c:2458
+#: ../src/mail/e-mail-reader.c:2537
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../src/mail/e-mail-reader.c:2465
+#: ../src/mail/e-mail-reader.c:2544
 msgid "Mar_k As"
 msgstr "標示成(_K)"
 
-#: ../src/mail/e-mail-reader.c:2472
+#: ../src/mail/e-mail-reader.c:2551
 msgid "_Message"
 msgstr "郵件(_M)"
 
-#: ../src/mail/e-mail-reader.c:2479
+#: ../src/mail/e-mail-reader.c:2558
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../src/mail/e-mail-reader.c:2489
+#: ../src/mail/e-mail-reader.c:2568
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "從通信論壇建立搜尋資料夾(_L)…"
 
-#: ../src/mail/e-mail-reader.c:2491
+#: ../src/mail/e-mail-reader.c:2570
 msgid "Create a search folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
-#: ../src/mail/e-mail-reader.c:2496
+#: ../src/mail/e-mail-reader.c:2575
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "從收件者建立搜尋資料夾(_T)…"
 
-#: ../src/mail/e-mail-reader.c:2498
+#: ../src/mail/e-mail-reader.c:2577
 msgid "Create a search folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
-#: ../src/mail/e-mail-reader.c:2503
+#: ../src/mail/e-mail-reader.c:2582
 msgid "Create a Search Folder from Sen_der..."
 msgstr "從寄件者建立搜尋資料夾(_D)…"
 
-#: ../src/mail/e-mail-reader.c:2505
+#: ../src/mail/e-mail-reader.c:2584
 msgid "Create a search folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
-#: ../src/mail/e-mail-reader.c:2510
+#: ../src/mail/e-mail-reader.c:2589
 msgid "Create a Search Folder from S_ubject..."
 msgstr "從主旨建立搜尋資料夾(_U)…"
 
-#: ../src/mail/e-mail-reader.c:2512
+#: ../src/mail/e-mail-reader.c:2591
 msgid "Create a search folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
-#: ../src/mail/e-mail-reader.c:2551
+#: ../src/mail/e-mail-reader.c:2630
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)…"
 
-#: ../src/mail/e-mail-reader.c:2567
+#: ../src/mail/e-mail-reader.c:2646
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
-#: ../src/mail/e-mail-reader.c:2571
+#: ../src/mail/e-mail-reader.c:2650
 msgid "Mark as _Junk"
 msgstr "標示成垃圾郵件(_J)"
 
-#: ../src/mail/e-mail-reader.c:2575
+#: ../src/mail/e-mail-reader.c:2654
 msgid "Mark as _Not Junk"
 msgstr "標示成非垃圾郵件(_N)"
 
-#: ../src/mail/e-mail-reader.c:2579
+#: ../src/mail/e-mail-reader.c:2658
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:2670
 msgid "Mark as Uni_mportant"
 msgstr "標示成不重要(_M)"
 
-#: ../src/mail/e-mail-reader.c:2595
+#: ../src/mail/e-mail-reader.c:2674
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
-#: ../src/mail/e-mail-reader.c:2639
+#: ../src/mail/e-mail-reader.c:2718
 msgid "_Caret Mode"
 msgstr "鍵盤瀏覽模式(_C)"
 
-#: ../src/mail/e-mail-reader.c:2641
+#: ../src/mail/e-mail-reader.c:2720
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在顯示的郵件內文中顯示閃爍游標"
 
-#: ../src/mail/e-mail-reader.c:2647
+#: ../src/mail/e-mail-reader.c:2726
 msgid "All Message _Headers"
 msgstr "所有郵件檔頭(_H)"
 
-#: ../src/mail/e-mail-reader.c:2649
+#: ../src/mail/e-mail-reader.c:2728
 msgid "Show messages with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
-#: ../src/mail/e-mail-reader.c:3178
+#: ../src/mail/e-mail-reader.c:3257
 msgid "Retrieving message"
 msgstr "取回郵件"
 
-#: ../src/mail/e-mail-reader.c:4228
-#: ../src/modules/mail/e-mail-attachment-handler.c:388
+#: ../src/mail/e-mail-reader.c:4327
+#: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../src/mail/e-mail-reader.c:4229
-#: ../src/modules/mail/e-mail-attachment-handler.c:390
+#: ../src/mail/e-mail-reader.c:4328
+#: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
@@ -16449,52 +17233,52 @@ msgstr "將選定的郵件轉寄給某人"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:4248
+#: ../src/mail/e-mail-reader.c:4347
 msgid "Group Reply"
 msgstr "群組回覆"
 
-#: ../src/mail/e-mail-reader.c:4249
+#: ../src/mail/e-mail-reader.c:4348
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "回覆給通信論壇,或是給所有的收件者"
 
-#: ../src/mail/e-mail-reader.c:4315 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:4414 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "刪除"
 
-#: ../src/mail/e-mail-reader.c:4327
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1241
+#: ../src/mail/e-mail-reader.c:4426
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1281
 msgid "Next"
 msgstr "下一個"
 
-#: ../src/mail/e-mail-reader.c:4331
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1234
+#: ../src/mail/e-mail-reader.c:4430
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1274
 msgid "Previous"
 msgstr "上一個"
 
-#: ../src/mail/e-mail-reader.c:4340 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:4439 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "回覆"
 
-#: ../src/mail/e-mail-reader.c:5413
+#: ../src/mail/e-mail-reader.c:5517
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "允許任何寄件者為 %s 的遠端內容"
 
-#: ../src/mail/e-mail-reader.c:5415
+#: ../src/mail/e-mail-reader.c:5519
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "允許任何收件者為 %s 的遠端內容"
 
-#: ../src/mail/e-mail-reader.c:5432
+#: ../src/mail/e-mail-reader.c:5536
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "允許任何寄件者為 %s 的遠端內容"
 
-#: ../src/mail/e-mail-reader.c:5449
+#: ../src/mail/e-mail-reader.c:5553
 msgid "Do not show this message again"
 msgstr "不要再顯示這個訊息"
 
-#: ../src/mail/e-mail-reader.c:5497
+#: ../src/mail/e-mail-reader.c:5605
 msgid "Load remote content"
 msgstr "載入遠端內容"
 
@@ -16502,34 +17286,40 @@ msgstr "載入遠端內容"
 msgid "Do not warn me again"
 msgstr "不要再警告我"
 
-#: ../src/mail/e-mail-reader-utils.c:568
+#: ../src/mail/e-mail-reader-utils.c:633
+#, fuzzy, c-format
+#| msgid "Saving message to folder “%s”"
+msgid "Deleting messages in Junk folder “%s”…"
+msgstr "儲存郵件到資料夾「%s」"
+
+#: ../src/mail/e-mail-reader-utils.c:728
 #, c-format
 msgid "Refreshing folder “%s”"
 msgstr "重新整理資料夾「%s」"
 
-#: ../src/mail/e-mail-reader-utils.c:1175
+#: ../src/mail/e-mail-reader-utils.c:1335
 msgid "Marking thread to be ignored"
 msgstr "將群組標記為忽略"
 
-#: ../src/mail/e-mail-reader-utils.c:1179
+#: ../src/mail/e-mail-reader-utils.c:1339
 msgid "Unmarking thread from being ignored"
 msgstr "取消群組被忽略的標記"
 
-#: ../src/mail/e-mail-reader-utils.c:1183
+#: ../src/mail/e-mail-reader-utils.c:1343
 msgid "Marking subthread to be ignored"
 msgstr "將子群組標記為忽略"
 
-#: ../src/mail/e-mail-reader-utils.c:1187
+#: ../src/mail/e-mail-reader-utils.c:1347
 msgid "Unmarking subthread from being ignored"
 msgstr "取消子群組被忽略的標記"
 
-#: ../src/mail/e-mail-reader-utils.c:1439
+#: ../src/mail/e-mail-reader-utils.c:1599
 msgid "Printing"
 msgstr "列印"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../src/mail/e-mail-reader-utils.c:1676
+#: ../src/mail/e-mail-reader-utils.c:1836
 #, c-format
 msgid ""
 "Folder “%s” contains %u duplicate message. Are you sure you want to delete "
@@ -16539,7 +17329,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "資料夾「%s」包含 %u 封重複的郵件。您確定要刪除它?"
 
-#: ../src/mail/e-mail-reader-utils.c:2694
+#: ../src/mail/e-mail-reader-utils.c:2854
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "儲存郵件"
@@ -16549,12 +17339,12 @@ msgstr[0] "儲存郵件"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../src/mail/e-mail-reader-utils.c:2715
+#: ../src/mail/e-mail-reader-utils.c:2875
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "郵件"
 
-#: ../src/mail/e-mail-reader-utils.c:3088
+#: ../src/mail/e-mail-reader-utils.c:3271
 msgid "Parsing message"
 msgstr "解析郵件"
 
@@ -16566,12 +17356,12 @@ msgstr "這個郵件沒有文字內容。"
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
-#: ../src/mail/e-mail-ui-session.c:813
+#: ../src/mail/e-mail-ui-session.c:820
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 核對失敗"
 
-#: ../src/mail/e-mail-ui-session.c:863
+#: ../src/mail/e-mail-ui-session.c:870
 #, c-format
 msgid "No data source found for UID “%s”"
 msgstr "沒有 UID「%s」的資料來源"
@@ -16606,7 +17396,7 @@ msgstr[0] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../src/mail/em-composer-utils.c:790
+#: ../src/mail/em-composer-utils.c:800
 msgid "Waiting for attachments to load..."
 msgstr "正在等待載入附件"
 
@@ -16614,7 +17404,7 @@ msgstr "正在等待載入附件"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:1745
+#: ../src/mail/em-composer-utils.c:1991
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16622,24 +17412,32 @@ msgstr ""
 "於 ${WeekdayName},${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
 "${TimeZone},${Sender} 提到:"
 
-#: ../src/mail/em-composer-utils.c:1751
+#: ../src/mail/em-composer-utils.c:1997
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-#: ../src/mail/em-composer-utils.c:1756
+#: ../src/mail/em-composer-utils.c:2002
 msgid "-----Original Message-----"
 msgstr "-----原始郵件-----"
 
-#: ../src/mail/em-composer-utils.c:3074
+#. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
+#: ../src/mail/em-composer-utils.c:2711
+#, fuzzy, c-format
+#| msgid "URL: %s"
+msgctxt "reply-attribution"
+msgid "Re: %s"
+msgstr "網址: %s"
+
+#: ../src/mail/em-composer-utils.c:3257
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:3550
+#: ../src/mail/em-composer-utils.c:3741
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-#: ../src/mail/em-composer-utils.c:3555
+#: ../src/mail/em-composer-utils.c:3746
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
@@ -16647,12 +17445,32 @@ msgstr "選取資料夾來張貼郵件。"
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
+#. Translators: This is in a Mail filter rule editor, part of "For account: [ Any   ]" section
+#: ../src/mail/em-filter-rule.c:941
+#, fuzzy
+#| msgid "A_ngry"
+msgctxt "mail-filter-rule"
+msgid "Any"
+msgstr "生氣(_N)"
+
+#: ../src/mail/em-filter-rule.c:1038
+#, fuzzy
+#| msgid "File _type:"
+msgid "Rul_e type:"
+msgstr "檔案類型(_T):"
+
+#: ../src/mail/em-filter-rule.c:1056
+#, fuzzy
+#| msgid "_Account:"
+msgid "_For Account:"
+msgstr "帳號(_A):"
+
 #. and now for the action area
-#: ../src/mail/em-filter-rule.c:595
+#: ../src/mail/em-filter-rule.c:1068
 msgid "Then"
 msgstr "接著依"
 
-#: ../src/mail/em-filter-rule.c:660
+#: ../src/mail/em-filter-rule.c:1141
 msgid "Add Ac_tion"
 msgstr "加入動作(_T)"
 
@@ -16743,7 +17561,7 @@ msgstr "標籤"
 msgid "AutoArchive"
 msgstr "自動封存"
 
-#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:118
+#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:121
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "標籤"
@@ -16764,7 +17582,7 @@ msgstr "<按這裡選擇資料夾>"
 msgid "Create a new folder"
 msgstr "建立新資料夾"
 
-#: ../src/mail/em-folder-tree.c:683
+#: ../src/mail/em-folder-tree.c:682
 msgid "Folder names cannot contain “/”"
 msgstr "資料夾名稱不能包含斜線「/」。"
 
@@ -16786,37 +17604,37 @@ msgstr "資料夾名稱不能包含斜線「/」。"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:877
+#: ../src/mail/em-folder-tree.c:876
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1742
+#: ../src/mail/em-folder-tree.c:1731
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
 
-#: ../src/mail/em-folder-tree.c:2290 ../src/mail/em-folder-utils.c:83
+#: ../src/mail/em-folder-tree.c:2279
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移動資料夾 %s"
 
-#: ../src/mail/em-folder-tree.c:2293 ../src/mail/em-folder-utils.c:85
+#: ../src/mail/em-folder-tree.c:2282
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2508
+#: ../src/mail/em-folder-tree.c:2289 ../src/mail/message-list.c:2595
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2510
+#: ../src/mail/em-folder-tree.c:2293 ../src/mail/message-list.c:2597
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
 
-#: ../src/mail/em-folder-tree.c:2323
+#: ../src/mail/em-folder-tree.c:2312
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
@@ -16827,120 +17645,140 @@ msgstr "無法將郵件拖放到最上層的儲存區"
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../src/mail/em-folder-tree-model.c:1325
-#: ../src/mail/em-folder-tree-model.c:1701
+#: ../src/mail/em-folder-tree-model.c:1326
+#: ../src/mail/em-folder-tree-model.c:1703
 msgid "Loading..."
 msgstr "載入中…"
 
-#: ../src/mail/em-folder-utils.c:502
+#: ../src/mail/em-folder-utils.c:111
+#, fuzzy, c-format
+#| msgid "Removing folder “%s”"
+msgid "Moving folder “%s”"
+msgstr "移除資料夾「%s」"
+
+#: ../src/mail/em-folder-utils.c:113
+#, fuzzy, c-format
+#| msgid "Storing folder “%s”"
+msgid "Copying folder “%s”"
+msgstr "正在儲存資料夾「%s」"
+
+#: ../src/mail/em-folder-utils.c:252
+#, fuzzy, c-format
+#| msgid "Removing folder “%s”"
+msgid "Moving folder “%s” (%d/%d)"
+msgstr "移除資料夾「%s」"
+
+#: ../src/mail/em-folder-utils.c:252
+#, fuzzy, c-format
+#| msgid "Storing folder “%s”"
+msgid "Copying folder “%s” (%d/%d)"
+msgstr "正在儲存資料夾「%s」"
+
+#: ../src/mail/em-folder-utils.c:569
 msgid "Move Folder To"
 msgstr "移動資料夾到"
 
-#: ../src/mail/em-folder-utils.c:502
+#: ../src/mail/em-folder-utils.c:569
 msgid "Copy Folder To"
 msgstr "複製資料夾到"
 
-#: ../src/mail/em-subscription-editor.c:855
+#: ../src/mail/em-subscription-editor.c:813
 msgid "_Subscribe"
 msgstr "訂閱(_S)"
 
-#: ../src/mail/em-subscription-editor.c:864
+#: ../src/mail/em-subscription-editor.c:822
 msgid "Su_bscribe To Shown"
 msgstr "要顯示的訂閱(_B)"
 
-#: ../src/mail/em-subscription-editor.c:872
+#: ../src/mail/em-subscription-editor.c:830
 msgid "Subscribe To _All"
 msgstr "全部訂閱(_A)"
 
-#: ../src/mail/em-subscription-editor.c:970
-#: ../src/mail/em-subscription-editor.c:1914 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1770
+#: ../src/mail/em-subscription-editor.c:936
+#: ../src/mail/em-subscription-editor.c:1888 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-#: ../src/mail/em-subscription-editor.c:979
+#: ../src/mail/em-subscription-editor.c:945
 msgid "Unsu_bscribe From Hidden"
 msgstr "取消訂閱隱藏的(_B)"
 
-#: ../src/mail/em-subscription-editor.c:987
+#: ../src/mail/em-subscription-editor.c:953
 msgid "Unsubscribe From _All"
 msgstr "全部取消訂閱(_A)"
 
-#: ../src/mail/em-subscription-editor.c:1339
-#: ../src/modules/mail/e-mail-shell-view-private.c:1003
+#: ../src/mail/em-subscription-editor.c:1313
+#: ../src/modules/mail/e-mail-shell-view-private.c:936
+#: ../src/modules/mail/e-mail-shell-view-private.c:968
+#: ../src/modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d 封未讀,"
 
-#: ../src/mail/em-subscription-editor.c:1343
-#: ../src/modules/mail/e-mail-shell-view-private.c:1013
+#: ../src/mail/em-subscription-editor.c:1317
+#: ../src/modules/mail/e-mail-shell-view-private.c:1022
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "共 %d 封"
 
-#: ../src/mail/em-subscription-editor.c:1755
+#: ../src/mail/em-subscription-editor.c:1729
 msgid "Folder Subscriptions"
 msgstr "資料夾訂閱"
 
-#: ../src/mail/em-subscription-editor.c:1790
+#: ../src/mail/em-subscription-editor.c:1764
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../src/mail/em-subscription-editor.c:1803
+#: ../src/mail/em-subscription-editor.c:1777
 msgid "Clear Search"
 msgstr "清除搜尋"
 
-#: ../src/mail/em-subscription-editor.c:1820
+#: ../src/mail/em-subscription-editor.c:1794
 msgid "Sho_w items that contain:"
 msgstr "顯示項目包含(_W):"
 
-#: ../src/mail/em-subscription-editor.c:1867
+#: ../src/mail/em-subscription-editor.c:1841
 msgid "Subscribe to the selected folder"
 msgstr "訂閱選取的資料夾"
 
-#: ../src/mail/em-subscription-editor.c:1868
+#: ../src/mail/em-subscription-editor.c:1842
 msgid "Su_bscribe"
 msgstr "訂閱(_B)"
 
-#: ../src/mail/em-subscription-editor.c:1913
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
+#: ../src/mail/em-subscription-editor.c:1887
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Unsubscribe from the selected folder"
 msgstr "取消訂閱選取的資料夾"
 
-#: ../src/mail/em-subscription-editor.c:1953
+#: ../src/mail/em-subscription-editor.c:1927
 msgid "Collapse all folders"
 msgstr "收摺所有的資料夾"
 
-#: ../src/mail/em-subscription-editor.c:1954
+#: ../src/mail/em-subscription-editor.c:1928
 msgid "C_ollapse All"
 msgstr "全部收摺(_O)"
 
-#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1938
 msgid "Expand all folders"
 msgstr "展開所有的資料夾"
 
-#: ../src/mail/em-subscription-editor.c:1965
+#: ../src/mail/em-subscription-editor.c:1939
 msgid "E_xpand All"
 msgstr "全部展開(_X)"
 
-#: ../src/mail/em-subscription-editor.c:1975
+#: ../src/mail/em-subscription-editor.c:1949
 msgid "Refresh the folder list"
 msgstr "重新整理資料夾列表"
 
-#: ../src/mail/em-subscription-editor.c:1976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
-msgid "_Refresh"
-msgstr "重新整理(_R)"
-
-#: ../src/mail/em-subscription-editor.c:1987
+#: ../src/mail/em-subscription-editor.c:1961
 msgid "Stop the current operation"
 msgstr "停止目前的操作"
 
-#: ../src/mail/em-subscription-editor.c:1988
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:999
+#: ../src/mail/em-subscription-editor.c:1962
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1005
 msgid "_Stop"
 msgstr "停止(_S)"
 
@@ -16958,12 +17796,26 @@ msgstr[0] "您確定要一次開啟 %d 封郵件?"
 msgid "Message Filters"
 msgstr "郵件規則"
 
-#: ../src/mail/em-utils.c:950
+#: ../src/mail/em-utils.c:1004
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
 
-#: ../src/mail/em-utils.c:1764
+#. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the 
'reply-attribution' translation context should translate into the same string.
+#: ../src/mail/em-utils.c:1557
+#, fuzzy
+#| msgid "Redo"
+msgctxt "reply-attribution"
+msgid "Re"
+msgstr "取消復原"
+
+#. Translators: This is a reply attribution separator in the message reply subject. This should match the 
':' in 'Re: %s' in the 'reply-attribution' translation context.
+#: ../src/mail/em-utils.c:1560
+msgctxt "reply-attribution"
+msgid ":"
+msgstr ""
+
+#: ../src/mail/em-utils.c:1846
 msgid "Deleting old messages"
 msgstr "刪除舊的郵件"
 
@@ -17154,7 +18006,7 @@ msgstr "重要"
 msgid "Read"
 msgstr "已讀"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:132
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:135
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "垃圾郵件"
@@ -17365,7 +18217,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "從 KMail 匯入郵件與連絡人。"
 
 #: ../src/mail/importers/kmail-libs.c:150
-#: ../src/modules/mail/e-mail-shell-view-private.c:1034
+#: ../src/modules/mail/e-mail-shell-view-private.c:1043
 msgid "Trash"
 msgstr "回收筒"
 
@@ -17432,7 +18284,7 @@ msgstr "新增過濾器規則"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../src/mail/mail-autofilter.c:509
+#: ../src/mail/mail-autofilter.c:551
 #, c-format
 msgid ""
 "The filter rule “%s” has been modified to account for the deleted folder\n"
@@ -17445,6 +18297,12 @@ msgstr[0] ""
 "過濾器規則「%s」已經修改,因為它只用在剛剛刪除的資料夾\n"
 "「%s」。"
 
+#: ../src/mail/mail-autofilter.c:559
+#, fuzzy
+#| msgid "Message Filters"
+msgid "Open Message Filters"
+msgstr "郵件規則"
+
 #: ../src/mail/mail-config.ui.h:1
 msgid "Set custom junk header"
 msgstr "設定自訂垃圾郵件檔頭"
@@ -17511,62 +18369,58 @@ msgstr "回覆方式(_R):"
 msgid "_Forward style:"
 msgstr "轉寄方式(_F):"
 
-#: ../src/mail/mail-config.ui.h:20
-msgid "Start _typing at the bottom on replying"
-msgstr "回覆時從底部開始輸入(_T)"
-
-#: ../src/mail/mail-config.ui.h:21
-msgid "_Keep signature above the original message on replying"
-msgstr "回信時保留原始郵件的簽名(_K)"
-
 #: ../src/mail/mail-config.ui.h:22
+msgid "Include si_gnature in new messages only"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:23
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "永遠忽略通信論壇的回覆欄位(_N)"
 
-#: ../src/mail/mail-config.ui.h:23
+#: ../src/mail/mail-config.ui.h:24
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "如果可能,群組回覆只用於通信論壇(_U)"
 
-#: ../src/mail/mail-config.ui.h:24
+#: ../src/mail/mail-config.ui.h:25
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "當原始郵件已簽名 (PGP 或 S/MIME) 時也對郵件數位簽名(_S)"
 
-#: ../src/mail/mail-config.ui.h:25
+#: ../src/mail/mail-config.ui.h:26
 msgid "_Wrap quoted text in replies"
 msgstr "回信中引文換行(_W)"
 
-#: ../src/mail/mail-config.ui.h:30
+#: ../src/mail/mail-config.ui.h:31
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "行內"
 
-#: ../src/mail/mail-config.ui.h:32
+#: ../src/mail/mail-config.ui.h:33
 msgid "Sig_natures"
 msgstr "簽名檔(_N)"
 
-#: ../src/mail/mail-config.ui.h:33
+#: ../src/mail/mail-config.ui.h:34
 msgid "Signatures"
 msgstr "簽名檔"
 
-#: ../src/mail/mail-config.ui.h:34
+#: ../src/mail/mail-config.ui.h:35
 msgid "_Languages"
 msgstr "語言(_L)"
 
-#: ../src/mail/mail-config.ui.h:35
+#: ../src/mail/mail-config.ui.h:36
 msgid "Languages Table"
 msgstr "語言表"
 
-#: ../src/mail/mail-config.ui.h:36
+#: ../src/mail/mail-config.ui.h:37
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言列表只反映出已經安裝字典的語言。"
 
-#: ../src/mail/mail-config.ui.h:38
+#: ../src/mail/mail-config.ui.h:39
 msgid "Check spelling while I _type"
 msgstr "當我輸入時檢查拼字(_T)"
 
-#: ../src/mail/mail-config.ui.h:40
+#: ../src/mail/mail-config.ui.h:41
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -17575,74 +18429,74 @@ msgstr ""
 "得確認:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:42
+#: ../src/mail/mail-config.ui.h:43
 msgid "Sending a message with an _empty subject line"
 msgstr "傳送沒有主旨的郵件(_E)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:44
+#: ../src/mail/mail-config.ui.h:45
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "傳送只有指定密件副本收件者的郵件(_B)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:46
+#: ../src/mail/mail-config.ui.h:47
 msgid "Sending a message to many _To and CC recipients"
 msgstr "傳送郵件給大量收件者與副本(_T)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:48
+#: ../src/mail/mail-config.ui.h:49
 msgid "Sending a _private reply to a mailing list message"
 msgstr "傳送私人回覆到通信論壇(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:50
+#: ../src/mail/mail-config.ui.h:51
 msgid "Sending a reply to a large _number of recipients"
 msgstr "傳送有大量收件者的郵件(_N)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:52
+#: ../src/mail/mail-config.ui.h:53
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "允許當通信論壇將私人回覆導回論壇(_M)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:54
+#: ../src/mail/mail-config.ui.h:55
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "傳送給沒有輸入有效郵件位址的收件者(_R)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:56
+#: ../src/mail/mail-config.ui.h:57
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "使用快捷鍵傳送郵件時提示 (Ctrl+Enter) (_K)"
 
 #. Translators:
-#: ../src/mail/mail-config.ui.h:58
+#: ../src/mail/mail-config.ui.h:59
 msgid "Before composer _format changes from HTML to Plain Text"
 msgstr "在編輯器格式從 HTML 轉換為純文字之前(_F)"
 
-#: ../src/mail/mail-config.ui.h:59
+#: ../src/mail/mail-config.ui.h:60
 msgid "Confirmations"
 msgstr "確認"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:63
+#: ../src/mail/mail-config.ui.h:64
 msgid "Use for Folders"
 msgstr "用於資料夾"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:68
+#: ../src/mail/mail-config.ui.h:69
 msgid "Use for Recipients"
 msgstr "用於收件者"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../src/mail/mail-config.ui.h:70 ../src/modules/mail/em-composer-prefs.c:875
+#: ../src/mail/mail-config.ui.h:71 ../src/modules/mail/em-composer-prefs.c:875
 msgid "Account"
 msgstr "帳號"
 
-#: ../src/mail/mail-config.ui.h:71
+#: ../src/mail/mail-config.ui.h:72
 msgid "Send account overrides"
 msgstr "傳送帳號覆蓋"
 
-#: ../src/mail/mail-config.ui.h:72
+#: ../src/mail/mail-config.ui.h:73
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -17652,213 +18506,233 @@ msgstr ""
 "指派哪個帳號要用來做個別資料夾或收件者的傳送帳號,會覆蓋通常傳送帳號的偵測。"
 "收件者列表可以包含部分的位址或名稱。名稱與位址的部分會分別比對。"
 
-#: ../src/mail/mail-config.ui.h:73
+#: ../src/mail/mail-config.ui.h:74
 msgid "_Folder override has precedence over Recipient override"
 msgstr "資料夾覆蓋先於收件者覆蓋(_F)"
 
-#: ../src/mail/mail-config.ui.h:74
+#: ../src/mail/mail-config.ui.h:75
 msgid "Send Account"
 msgstr "傳送帳號"
 
-#: ../src/mail/mail-config.ui.h:80 ../src/smime/gui/smime-ui.ui.h:27
+#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:27
 msgid "a"
 msgstr "a"
 
-#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:28
+#: ../src/mail/mail-config.ui.h:82 ../src/smime/gui/smime-ui.ui.h:28
 msgid "b"
 msgstr "b"
 
-#: ../src/mail/mail-config.ui.h:82
+#: ../src/mail/mail-config.ui.h:83
 msgid "Start up"
 msgstr "啟動"
 
-#: ../src/mail/mail-config.ui.h:83
+#: ../src/mail/mail-config.ui.h:84
 msgid "Check for new _messages on start"
 msgstr "啟動時檢查新郵件(_M)"
 
-#: ../src/mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:85
 msgid "Check for new messa_ges in all active accounts"
 msgstr "檢查所有使用中帳號的新郵件(_G)"
 
-#: ../src/mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:86
 msgid "Message Display"
 msgstr "郵件顯示"
 
-#: ../src/mail/mail-config.ui.h:86
+#: ../src/mail/mail-config.ui.h:87
 msgid "_Use the same fonts as other applications"
 msgstr "使用與其他應用程式相同的字型(_U)"
 
-#: ../src/mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:88
 msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
-#: ../src/mail/mail-config.ui.h:88
+#: ../src/mail/mail-config.ui.h:89
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定寬度字型"
 
-#: ../src/mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:90
 msgid "Select HTML variable width font"
 msgstr "選擇 HTML 可變寬度字型"
 
-#: ../src/mail/mail-config.ui.h:90
+#: ../src/mail/mail-config.ui.h:91
 msgid "Fix_ed Width Font:"
 msgstr "固定寬度字型(_E):"
 
-#: ../src/mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:92
 msgid "_Mark messages as read after"
 msgstr "將郵件標示成已經閱讀於(_M)"
 
-#: ../src/mail/mail-config.ui.h:93
+#: ../src/mail/mail-config.ui.h:94
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
-#: ../src/mail/mail-config.ui.h:94
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/mail/mail-config.ui.h:95
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Pick a color"
 msgstr "挑選顏色"
 
-#: ../src/mail/mail-config.ui.h:95
+#: ../src/mail/mail-config.ui.h:96
 msgid "color"
 msgstr "色彩"
 
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:97
 msgid "Default character e_ncoding:"
 msgstr "預設字元編碼(_N):"
 
-#: ../src/mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:98
 msgid "Apply the same _view settings to all folders"
 msgstr "在所有資料夾套用相同的檢視設定值(_V)"
 
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:99
 msgid "F_all back to threading messages by subject"
 msgstr "退回到依主旨的相關郵件(_A)"
 
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:100
 msgid "Delete Mail"
 msgstr "刪除郵件"
 
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:101
 msgid "Empty _trash folders"
 msgstr "清空回收筒資料夾(_T)"
 
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:102
 msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_W)"
 
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:103
+#, fuzzy
+#| msgid "Confirm _when expunging a folder"
+msgid "Confirm when emptying a _Junk folder"
+msgstr "刪除資料夾時確認(_W)"
+
+#: ../src/mail/mail-config.ui.h:104
+#, fuzzy
+#| msgid "Go to the section %s of the message"
+msgid "Go to the previ_ous message after message deletion"
+msgstr "移至郵件的第 %s 節"
+
+#: ../src/mail/mail-config.ui.h:105
 msgid "Archive Mail"
 msgstr "封存郵件"
 
-#: ../src/mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:106
 msgid "Archive folder to use for On This Computer messages"
 msgstr "用於「這臺電腦上的郵件」的封存資料夾"
 
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:107
 msgid "On This Computer A_rchive folder:"
 msgstr "「這臺電腦上」的封存資料夾(_R):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:109
 msgid "_Show animated images"
 msgstr "播放動畫影像(_S)"
 
-#: ../src/mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:110
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "當傳送 HTML 郵件給不想收到這類郵件的連絡人時顯示提示(_P)"
 
-#: ../src/mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:111
 msgid "Loading Remote Content"
 msgstr "載入遠端內容"
 
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:112
 msgid "_Never load remote content from the Internet"
 msgstr "永不從網際網路載入遠端內容(_N)"
 
-#: ../src/mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:113
 msgid "_Load remote content only in messages from contacts"
 msgstr "只載入由連絡人寄出郵件中的遠端內容(_L)"
 
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:114
 msgid "_Always load remote content from the Internet"
 msgstr "永遠從網際網路載入遠端內容(_A)"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:115
 msgid "Notify about _missing remote content in the message preview"
 msgstr "通知在郵件預覽中遺失的遠端內容(_M)"
 
-#: ../src/mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:116
+msgid "Add"
+msgstr "加入"
+
+#: ../src/mail/mail-config.ui.h:117
+msgid "Remove"
+msgstr "移除"
+
+#: ../src/mail/mail-config.ui.h:118
 msgid "Allow for sites:"
 msgstr "允許網站:"
 
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:119
 msgid "Allow for senders:"
 msgstr "允許寄件者:"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:120
 msgid "HTML Messages"
 msgstr "HTML 郵件"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:122
 msgid "Sender Photograph"
 msgstr "寄件者相片"
 
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:123
 msgid "_Show the photograph of sender in the message preview"
 msgstr "在郵件預覽顯示寄件者相片(_S)"
 
-#: ../src/mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:124
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "搜尋寄件者在 gra_vatar.com 上的相片"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:125
 msgid "Displayed Message Headers"
 msgstr "顯示的郵件檔頭"
 
-#: ../src/mail/mail-config.ui.h:123
+#: ../src/mail/mail-config.ui.h:126
 msgid "Mail Headers Table"
 msgstr "郵件檔頭表"
 
-#: ../src/mail/mail-config.ui.h:124
-#: ../src/modules/addressbook/autocompletion-config.c:117
+#: ../src/mail/mail-config.ui.h:127
+#: ../src/modules/addressbook/autocompletion-config.c:118
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "日期/時刻格式"
 
-#: ../src/mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:129
 msgid "Check incoming _messages for junk"
 msgstr "檢查內送郵件是否為垃圾郵件(_M)"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:130
 msgid "_Delete junk messages"
 msgstr "刪除垃圾郵件(_D)"
 
-#: ../src/mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:131
 msgid "Junk Test Options"
 msgstr "垃圾郵件測試選項"
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:132
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "若寄件者在我的通訊錄中就不要將郵件標記為垃圾郵件(_K)"
 
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:133
 msgid "_Lookup in local address book only"
 msgstr "只在本地通訊錄查詢(_L)"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:134
 msgid "Check cu_stom headers for junk"
 msgstr "以自訂標頭檢查垃圾郵件(_S)"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:136
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
 msgid "No encryption"
 msgstr "沒有加密"
 
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:137
 msgid "TLS encryption"
 msgstr "TLS 加密"
 
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:138
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
@@ -18126,7 +19000,7 @@ msgid ""
 msgstr "要永久移除所有資料夾中所有刪除的郵件?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1657
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1629
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
@@ -18313,8 +19187,10 @@ msgid "You may not create two accounts with the same name."
 msgstr "您不能用相同的名稱建立兩個帳號。"
 
 #: ../src/mail/mail.error.xml.h:89
-msgid "Are you sure you want to delete this account?"
-msgstr "確定要刪除這個帳號?"
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo “{0}”?"
+msgid "Are you sure you want to delete account “{0}”?"
+msgstr "確定要刪除備忘錄「{0}」?"
 
 #: ../src/mail/mail.error.xml.h:90
 msgid "If you proceed, the account information will be deleted permanently."
@@ -18591,63 +19467,76 @@ msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳送。"
 
 #: ../src/mail/mail.error.xml.h:158
+#, fuzzy
+#| msgid ""
+#| "This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because there is no mail account configured"
+msgstr "因為您沒有指定任何收件者,所以無法傳送此郵件"
+
+#: ../src/mail/mail.error.xml.h:159
+msgid ""
+"There had not been found any active mail account to send the message. Create "
+"or enable one first, please."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:160
 msgid "Mail Deletion Failed"
 msgstr "刪除郵件失敗"
 
-#: ../src/mail/mail.error.xml.h:159
+#: ../src/mail/mail.error.xml.h:161
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您沒有足夠的權限刪除此封郵件。"
 
-#: ../src/mail/mail.error.xml.h:160
+#: ../src/mail/mail.error.xml.h:162
 msgid "“Check Junk” Failed"
 msgstr "「檢查垃圾郵件」失敗"
 
-#: ../src/mail/mail.error.xml.h:161
+#: ../src/mail/mail.error.xml.h:163
 msgid "“Report Junk” Failed"
 msgstr "「回報垃圾郵件」失敗"
 
-#: ../src/mail/mail.error.xml.h:162
+#: ../src/mail/mail.error.xml.h:164
 msgid "“Report Not Junk” Failed"
 msgstr "「回報為非垃圾郵件」失敗"
 
-#: ../src/mail/mail.error.xml.h:163
+#: ../src/mail/mail.error.xml.h:165
 msgid "Remove duplicate messages?"
 msgstr "是否移除重複的郵件?"
 
-#: ../src/mail/mail.error.xml.h:164
+#: ../src/mail/mail.error.xml.h:166
 msgid "No duplicate messages found."
 msgstr "找不到重複的郵件。"
 
 #. Translators: {0} is replaced with a folder name
-#: ../src/mail/mail.error.xml.h:166
+#: ../src/mail/mail.error.xml.h:168
 msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr "資料夾「{0}」並未包含任何重複的郵件。"
 
-#: ../src/mail/mail.error.xml.h:167
+#: ../src/mail/mail.error.xml.h:169
 msgid "Failed to connect account “{0}”."
 msgstr "無法連線至帳號「{0}」。"
 
-#: ../src/mail/mail.error.xml.h:168
+#: ../src/mail/mail.error.xml.h:170
 msgid "Failed to disconnect account “{0}”."
 msgstr "無法中斷與帳號「{0}」 的連線。"
 
-#: ../src/mail/mail.error.xml.h:169
+#: ../src/mail/mail.error.xml.h:171
 msgid "Failed to unsubscribe from folder “{0}”."
 msgstr "無法取消訂閱資料夾「{0}」。"
 
-#: ../src/mail/mail.error.xml.h:170
+#: ../src/mail/mail.error.xml.h:172
 msgid "Unable to retrieve message."
 msgstr "無法接收郵件。"
 
-#: ../src/mail/mail.error.xml.h:171
+#: ../src/mail/mail.error.xml.h:173
 msgid "{0}"
 msgstr "{0}"
 
-#: ../src/mail/mail.error.xml.h:172
+#: ../src/mail/mail.error.xml.h:174
 msgid "Message is not available in offline mode."
 msgstr "郵件無法在離線模式下使用。"
 
-#: ../src/mail/mail.error.xml.h:173
+#: ../src/mail/mail.error.xml.h:175
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
@@ -18659,85 +19548,85 @@ msgstr ""
 "號恢復上線時,選擇這個資料夾,使用「檔案→下載郵件供離線使用」,以確定資料夾中"
 "所有的郵件都能在離線模式中使用。"
 
-#: ../src/mail/mail.error.xml.h:174
+#: ../src/mail/mail.error.xml.h:176
 msgid "Failed to open folder."
 msgstr "無法開啟資料夾。"
 
-#: ../src/mail/mail.error.xml.h:176
+#: ../src/mail/mail.error.xml.h:178
 msgid "Failed to find duplicate messages."
 msgstr "找不到重複的郵件。"
 
-#: ../src/mail/mail.error.xml.h:177
+#: ../src/mail/mail.error.xml.h:179
 msgid "Failed to retrieve messages."
 msgstr "無法取回郵件。"
 
-#: ../src/mail/mail.error.xml.h:178
+#: ../src/mail/mail.error.xml.h:180
 msgid "Failed to mark messages as read."
 msgstr "無法將郵件標示成已經閱讀。"
 
-#: ../src/mail/mail.error.xml.h:179
+#: ../src/mail/mail.error.xml.h:181
 msgid "Failed to remove attachments from messages."
 msgstr "無法移除郵件中的附件。"
 
-#: ../src/mail/mail.error.xml.h:180
+#: ../src/mail/mail.error.xml.h:182
 msgid "Failed to download messages for offline viewing."
 msgstr "下載離線使用的郵件失敗。"
 
-#: ../src/mail/mail.error.xml.h:181
+#: ../src/mail/mail.error.xml.h:183
 msgid "Failed to save messages to disk."
 msgstr "無法將選取的郵件儲存至磁碟。"
 
-#: ../src/mail/mail.error.xml.h:182
+#: ../src/mail/mail.error.xml.h:184
 msgid "Hidden file is attached."
 msgstr "附加了隱藏的檔案。"
 
-#: ../src/mail/mail.error.xml.h:183
+#: ../src/mail/mail.error.xml.h:185
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 msgstr "名稱為 {0} 的附件是隱藏檔,可能包含敏感資料。請重新檢閱後再寄出。"
 
-#: ../src/mail/mail.error.xml.h:184
+#: ../src/mail/mail.error.xml.h:186
 msgid "Printing failed."
 msgstr "列印失敗。"
 
-#: ../src/mail/mail.error.xml.h:185
+#: ../src/mail/mail.error.xml.h:187
 msgid "The printer replied “{0}”."
 msgstr "印表機回覆「{0}」。"
 
-#: ../src/mail/mail.error.xml.h:186
+#: ../src/mail/mail.error.xml.h:188
 msgid "Could not perform this operation on {0}."
 msgstr "無法進行 {0} 上的操作。"
 
-#: ../src/mail/mail.error.xml.h:187
+#: ../src/mail/mail.error.xml.h:189
 msgid "You must be working online to complete this operation."
 msgstr "您必須於線上工作才能完成此操作。"
 
-#: ../src/mail/mail.error.xml.h:188
+#: ../src/mail/mail.error.xml.h:190
 msgid "Message from “{0}” account:"
 msgstr "來自「{0}」 帳號的郵件:"
 
-#: ../src/mail/mail.error.xml.h:189
+#: ../src/mail/mail.error.xml.h:191
 msgid "Failed to mark thread to be ignored in folder “{0}”"
 msgstr "無法將資料夾「{0}」中的郵件群組標記為已忽略"
 
-#: ../src/mail/mail.error.xml.h:190
+#: ../src/mail/mail.error.xml.h:192
 msgid "Failed to unmark thread from being ignored in folder “{0}”"
 msgstr "無法將資料夾「{0}」中的郵件群組取消已忽略標記"
 
-#: ../src/mail/mail.error.xml.h:191
+#: ../src/mail/mail.error.xml.h:193
 msgid "Failed to mark subthread to be ignored in folder “{0}”"
 msgstr "無法將資料夾「{0}」中的郵件子群組標記為已忽略"
 
-#: ../src/mail/mail.error.xml.h:192
+#: ../src/mail/mail.error.xml.h:194
 msgid "Failed to unmark subthread from being ignored in folder “{0}”"
 msgstr "無法將資料夾「{0}」中的郵件子群組取消已忽略標記"
 
-#: ../src/mail/mail.error.xml.h:193
+#: ../src/mail/mail.error.xml.h:195
 msgid "Remote content download had been blocked for this message."
 msgstr "已阻擋這封郵件的遠端內容下載。"
 
-#: ../src/mail/mail.error.xml.h:194
+#: ../src/mail/mail.error.xml.h:196
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -18745,39 +19634,39 @@ msgstr ""
 "您可以手動下載遠端內容,或設定為記住下載這個寄件者或使用過網站的遠端內容。"
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:196
+#: ../src/mail/mail.error.xml.h:198
 msgid "{0}, Completed on {1}"
 msgstr "{0} ,完成於 {1} "
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:198
+#: ../src/mail/mail.error.xml.h:200
 msgid "{0} by {1}"
 msgstr "{0} 自 {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:200
+#: ../src/mail/mail.error.xml.h:202
 msgid "Overdue: {0} by {1}"
 msgstr "逾期:{0} 自 {1}"
 
-#: ../src/mail/mail.error.xml.h:202
+#: ../src/mail/mail.error.xml.h:204
 msgid "This message note has been changed, but has not been saved."
 msgstr "此郵件備註已經變更,但尚未儲存。"
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../src/mail/mail.error.xml.h:205
+#: ../src/mail/mail.error.xml.h:207
 msgid "Failed to delete message note in folder “{0}”"
 msgstr "無法在資料夾「{0}」刪除郵件備註"
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../src/mail/mail.error.xml.h:207
+#: ../src/mail/mail.error.xml.h:209
 msgid "Failed to store message note in folder “{0}”"
 msgstr "無法在資料夾「{0}」儲存郵件備註"
 
-#: ../src/mail/mail.error.xml.h:208
+#: ../src/mail/mail.error.xml.h:210
 msgid "Something has gone wrong when displaying the message"
 msgstr "顯示此郵件時發生錯誤"
 
-#: ../src/mail/mail.error.xml.h:209
+#: ../src/mail/mail.error.xml.h:211
 msgid ""
 "A WebKitWebProcess crashed when displaying the message. You can try again by "
 "moving to another message and back. If the issue persists, please file a bug "
@@ -18786,11 +19675,11 @@ msgstr ""
 "顯示此郵件時 WebKitWebProcess 當掉了。您可以試著移動到另一封郵件再移回來。如"
 "果這個問題持續發生,請在 GNOME Bugzilla 發出一份程式錯誤報告。"
 
-#: ../src/mail/mail.error.xml.h:210
+#: ../src/mail/mail.error.xml.h:212
 msgid "Something has gone wrong when displaying the signature"
 msgstr "顯示簽名時發生錯誤"
 
-#: ../src/mail/mail.error.xml.h:211
+#: ../src/mail/mail.error.xml.h:213
 msgid ""
 "A WebKitWebProcess crashed when displaying the signature. You can try again "
 "by moving to another signature and back. If the issue persists, please file "
@@ -18799,42 +19688,80 @@ msgstr ""
 "顯示此簽名時 WebKitWebProcess 當掉了。您可以試著移動到另一個簽名再移回來。如"
 "果這個問題持續發生,請在 GNOME Bugzilla 發出一份程式錯誤報告。"
 
-#: ../src/mail/mail-send-recv.c:192
+#: ../src/mail/mail.error.xml.h:214
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to permanently remove all the deleted messages in "
+#| "all folders?"
+msgid "Are you sure you want to delete all the messages in the Junk folder?"
+msgstr "要永久移除所有資料夾中所有刪除的郵件?"
+
+#: ../src/mail/mail.error.xml.h:215
+msgid ""
+"These messages will be shown in the Trash folder, where they can be "
+"permanently deleted later."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:216
+#, fuzzy
+#| msgid "_Not Junk"
+msgid "_Empty Junk"
+msgstr "不是垃圾郵件(_N)"
+
+#: ../src/mail/mail.error.xml.h:217
+#, fuzzy
+#| msgid "Failed to expunge folder “{0}”."
+msgid "Failed to empty Junk folder “{0}”"
+msgstr "無法清除資料夾「{0}」。"
+
+#: ../src/mail/mail-send-recv.c:193
 msgid "Canceling..."
 msgstr "正在取消…"
 
-#: ../src/mail/mail-send-recv.c:640
+#: ../src/mail/mail-send-recv.c:581
+#, fuzzy
+#| msgid "_Edit Message"
+msgid "Edit Message"
+msgstr "編輯郵件(_E)"
+
+#: ../src/mail/mail-send-recv.c:586
+#, fuzzy
+#| msgid "Move to Folder"
+msgid "Open Outbox Folder"
+msgstr "移至資料夾"
+
+#: ../src/mail/mail-send-recv.c:760
 msgid "Send & Receive Mail"
 msgstr "傳送與接收郵件"
 
-#: ../src/mail/mail-send-recv.c:654
+#: ../src/mail/mail-send-recv.c:774
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:1262
+#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:1396
 msgid "Updating..."
 msgstr "更新中…"
 
-#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:826
+#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:946
 msgid "Waiting..."
 msgstr "正在等待…"
 
-#: ../src/mail/mail-send-recv.c:1228
+#: ../src/mail/mail-send-recv.c:1362
 #, c-format
 msgid "Checking for new mail at “%s”"
 msgstr "檢查「%s」的新郵件"
 
-#: ../src/mail/mail-send-recv.c:1455
+#: ../src/mail/mail-send-recv.c:1589
 #, c-format
 msgid "Deleting junk and expunging trash at “%s”"
 msgstr "正在刪除與清空「%s」的垃圾郵件"
 
-#: ../src/mail/mail-send-recv.c:1457
+#: ../src/mail/mail-send-recv.c:1591
 #, c-format
 msgid "Deleting junk at “%s”"
 msgstr "正在刪除「%s」的垃圾郵件"
 
-#: ../src/mail/mail-send-recv.c:1459
+#: ../src/mail/mail-send-recv.c:1593
 #, c-format
 msgid "Expunging trash at “%s”"
 msgstr "正在清空「%s」的回收筒"
@@ -18851,87 +19778,87 @@ msgstr "編輯搜尋資料夾"
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
-#: ../src/mail/message-list.c:300
+#: ../src/mail/message-list.c:305
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../src/mail/message-list.c:301
+#: ../src/mail/message-list.c:306
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../src/mail/message-list.c:302
+#: ../src/mail/message-list.c:307
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../src/mail/message-list.c:303
+#: ../src/mail/message-list.c:308
 msgid "Forwarded"
 msgstr "轉寄"
 
-#: ../src/mail/message-list.c:304
+#: ../src/mail/message-list.c:309
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../src/mail/message-list.c:305
+#: ../src/mail/message-list.c:310
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../src/mail/message-list.c:318
+#: ../src/mail/message-list.c:323
 msgid "Lowest"
 msgstr "最低"
 
-#: ../src/mail/message-list.c:319
+#: ../src/mail/message-list.c:324
 msgid "Lower"
 msgstr "低"
 
-#: ../src/mail/message-list.c:323
+#: ../src/mail/message-list.c:328
 msgid "Higher"
 msgstr "高"
 
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:329
 msgid "Highest"
 msgstr "最高"
 
-#: ../src/mail/message-list.c:470 ../src/mail/message-list.c:6286
+#: ../src/mail/message-list.c:478 ../src/mail/message-list.c:6508
 msgid "Generating message list"
 msgstr "產生郵件列表"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2074
-#: ../src/modules/itip-formatter/itip-view.c:267
+#: ../src/mail/message-list.c:2117
+#: ../src/modules/itip-formatter/itip-view.c:268
 msgid "Today %l:%M %p"
 msgstr "今天 %p %l:%M"
 
-#: ../src/mail/message-list.c:2083
+#: ../src/mail/message-list.c:2126
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %p %l:%M"
 
-#: ../src/mail/message-list.c:2095
+#: ../src/mail/message-list.c:2138
 msgid "%a %l:%M %p"
 msgstr "%A %p %l:%M"
 
-#: ../src/mail/message-list.c:2103
+#: ../src/mail/message-list.c:2146
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日 %p %l:%M"
 
-#: ../src/mail/message-list.c:2105
+#: ../src/mail/message-list.c:2148
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../src/mail/message-list.c:3062
+#: ../src/mail/message-list.c:3178
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../src/mail/message-list.c:3781 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:3923 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "郵件"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5213
+#: ../src/mail/message-list.c:5387
 msgid "Follow-up"
 msgstr "跟隨"
 
-#: ../src/mail/message-list.c:6225
+#: ../src/mail/message-list.c:6447
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -18941,7 +19868,7 @@ msgstr ""
 "沒有郵件滿足您的搜尋條件。請從上列下拉式選單選擇顯示郵件過濾器或執行新的搜"
 "尋,可從 搜尋→清除 選單項目清除它或改變上面的查詢。"
 
-#: ../src/mail/message-list.c:6233
+#: ../src/mail/message-list.c:6455
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -18978,6 +19905,18 @@ msgstr "主旨 — 已截短"
 msgid "UID"
 msgstr "UID"
 
+#: ../src/mail/message-list.etspec.h:22
+#, fuzzy
+#| msgid "Sender"
+msgid "Sender Mail"
+msgstr "寄件者"
+
+#: ../src/mail/message-list.etspec.h:23
+#, fuzzy
+#| msgid "Recipients"
+msgid "Recipients Mail"
+msgstr "收件者"
+
 #: ../src/mail/searchtypes.xml.in.h:23 ../src/mail/vfoldertypes.xml.in.h:23
 msgid "Any header"
 msgstr "任何標頭"
@@ -18987,54 +19926,152 @@ msgid "Subject or Addresses contains"
 msgstr "主旨或電子郵件位址包含"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2186
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2177
 msgid "Recipients contain"
 msgstr "收件者包含"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2179
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2170
 msgid "Message contains"
 msgstr "郵件包含"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2200
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2191
 msgid "Subject contains"
 msgstr "主旨包含"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2193
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2184
 msgid "Sender contains"
 msgstr "寄件者包含"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2165
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
 msgid "Body contains"
 msgstr "內文包含"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2172
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
 msgid "Free form expression"
 msgstr "自由形式表示式"
 
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:275
+#, fuzzy
+#| msgid "Edit Location"
+msgid "Edit Collection"
+msgstr "編輯位置"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:312
+#, fuzzy
+#| msgid "Use for Folders"
+msgid "Use for"
+msgstr "用於資料夾"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:316
+#: ../src/plugins/pst-import/pst-importer.c:522
+msgid "_Mail"
+msgstr "郵件(_M)"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:327
+#, fuzzy
+#| msgid "Calendar"
+msgid "C_alendar"
+msgstr "行事曆"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:476
+#: ../src/modules/addressbook/e-book-shell-backend.c:262
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
+msgid "New Address Book"
+msgstr "新通訊錄"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:484
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:284
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
+msgid "New Memo List"
+msgstr "新增備忘錄列表"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:532
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
+msgid "Address Book Properties"
+msgstr "通訊錄內容"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:536
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
+msgid "Calendar Properties"
+msgstr "iCalendar 錯誤"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:540
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
+msgid "Memo List Properties"
+msgstr "備忘錄列表屬性"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:544
+#: ../src/modules/calendar/e-task-shell-view-actions.c:274
+msgid "Task List Properties"
+msgstr "工作列表"
+
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:75
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:209
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:174
+#, fuzzy
+#| msgid "Back"
+msgid "_Back"
+msgstr "向後"
+
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:78
+#, fuzzy
+#| msgid "_Find"
+msgid "_Finish"
+msgstr "尋找(_F)"
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:195
+msgid "_Browse"
+msgstr ""
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:197
+msgid ""
+"Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete "
+"address books, calendars, memo lists or task lists there"
+msgstr ""
+
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../src/modules/addressbook/autocompletion-config.c:123
-#: ../src/modules/mail/em-mailer-prefs.c:1556
+#: ../src/modules/addressbook/autocompletion-config.c:124
+#: ../src/modules/mail/em-mailer-prefs.c:1568
 msgid "_Table column:"
 msgstr "表格欄(_T):"
 
-#: ../src/modules/addressbook/autocompletion-config.c:126
-msgid "Address formatting"
-msgstr "地址格式化"
-
-#: ../src/modules/addressbook/autocompletion-config.c:129
+#: ../src/modules/addressbook/autocompletion-config.c:130
 msgid "_Format address according to standard of its destination country"
 msgstr "地址是否要根據目的地國家的標準進行格式化(_F)"
 
-#: ../src/modules/addressbook/autocompletion-config.c:137
+#. Translators: This is part of a sentence "Open maps with OpenStreetMap" and "Open maps with Google"
+#: ../src/modules/addressbook/autocompletion-config.c:143
+#, fuzzy
+#| msgid "Open map"
+msgctxt "OpenMap"
+msgid "Open _maps with"
+msgstr "開啟地圖"
+
+#. Translators: This is part of "Open maps with OpenStreetMap"
+#: ../src/modules/addressbook/autocompletion-config.c:150
+msgctxt "OpenMap"
+msgid "OpenStreetMap"
+msgstr ""
+
+#. Translators: This is part of "Open maps with Google"
+#: ../src/modules/addressbook/autocompletion-config.c:153
+#, fuzzy
+#| msgctxt "addressbook-label"
+#| msgid "Google Talk"
+msgctxt "OpenMap"
+msgid "Google"
+msgstr "Google Talk"
+
+#: ../src/modules/addressbook/autocompletion-config.c:169
 msgid "Autocompletion"
 msgstr "自動完成"
 
-#: ../src/modules/addressbook/autocompletion-config.c:140
+#: ../src/modules/addressbook/autocompletion-config.c:172
 msgid "Always _show address of the autocompleted contact"
 msgstr "永遠顯示自動補齊的連絡人位址(_S)"
 
@@ -19058,296 +20095,287 @@ msgstr "連絡人資訊"
 msgid "Contact information for %s"
 msgstr "%s 的連絡人資訊"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:256
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
-msgid "New Address Book"
-msgstr "新通訊錄"
-
-#: ../src/modules/addressbook/e-book-shell-backend.c:265
+#: ../src/modules/addressbook/e-book-shell-backend.c:271
 msgctxt "New"
 msgid "_Contact"
 msgstr "連絡人(_C)"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:267
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1043
+#: ../src/modules/addressbook/e-book-shell-backend.c:273
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1049
 msgid "Create a new contact"
 msgstr "建立新的連絡人"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:272
+#: ../src/modules/addressbook/e-book-shell-backend.c:278
 msgctxt "New"
 msgid "Contact _List"
 msgstr "連絡人列表(_L)"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:274
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1050
+#: ../src/modules/addressbook/e-book-shell-backend.c:280
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1056
 msgid "Create a new contact list"
 msgstr "建立新的連絡人列表"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:282
+#: ../src/modules/addressbook/e-book-shell-backend.c:288
 msgctxt "New"
 msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:284
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:966
+#: ../src/modules/addressbook/e-book-shell-backend.c:290
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:972
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
-msgid "Address Book Properties"
-msgstr "通訊錄內容"
-
 #. Translators: This is a save dialog title
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:533
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:829
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:534
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Save as vCard"
 msgstr "儲存為 vCard"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:936
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:942
 msgid "Co_py All Contacts To..."
 msgstr "複製所有的連絡人到(_P)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:938
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Copy the contacts of the selected address book to another"
 msgstr "將已選取通訊錄中的連絡人複製到另一個通訊錄"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:943
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:949
 msgid "D_elete Address Book"
 msgstr "刪除通訊錄(_E)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:945
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Delete the selected address book"
 msgstr "刪除選取的通訊錄"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:950
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:956
 msgid "_Manage Address Book groups..."
 msgstr "管理通訊錄群組(_M)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:952
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:958
 #: ../src/modules/calendar/e-task-shell-view-actions.c:719
 msgid "Manage task list groups order and visibility"
 msgstr "管理工作列表群組順序與可見性"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:957
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:963
 msgid "Mo_ve All Contacts To..."
 msgstr "將所有的連絡人移到(_V)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:959
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Move the contacts of the selected address book to another"
 msgstr "將已選取通訊錄中的連絡人移動到另一個通訊錄"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:964
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:970
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:971
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:977
 msgid "Address _Book Properties"
 msgstr "通訊錄屬性(_B)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:973
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:979
 msgid "Show properties of the selected address book"
 msgstr "顯示選取通訊錄的屬性"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:978
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:984
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1330
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:612
 #: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "Re_fresh"
 msgstr "重新整理(_F)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:980
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:986
 msgid "Refresh the selected address book"
 msgstr "重新整理選取的通訊錄"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:985
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Address Book _Map"
 msgstr "通訊錄地圖(_M)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:987
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:993
 msgid "Show map with all contacts from selected address book"
 msgstr "顯示已選取通訊錄中所有連絡人的地圖"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:992
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:998
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1337
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:619
 #: ../src/modules/calendar/e-task-shell-view-actions.c:745
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
 msgid "_Rename..."
 msgstr "重新命名(_R)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:994
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "Rename the selected address book"
 msgstr "重新命名選取的通訊錄"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "Stop loading"
 msgstr "停止載入"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1006
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1012
 msgid "_Copy Contact To..."
 msgstr "複製連絡人到(_C)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1008
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "Copy selected contacts to another address book"
 msgstr "將選取的連絡人複製到另一個通訊錄"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1013
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1019
 msgid "_Delete Contact"
 msgstr "刪除連絡人(_D)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1020
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1026
 msgid "_Find in Contact..."
 msgstr "在連絡人內尋找(_F)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "Search for text in the displayed contact"
 msgstr "搜尋顯示的連絡人中的文字"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1027
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1033
 msgid "_Forward Contact..."
 msgstr "轉寄連絡人(_F)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "Send selected contacts to another person"
 msgstr "傳送選取連絡人給其他使用者。"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1040
 msgid "_Move Contact To..."
 msgstr "將連絡人移到(_M)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1036
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "Move selected contacts to another address book"
 msgstr "將選取的連絡人移至另一個通訊錄"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1041
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1047
 msgid "_New Contact..."
 msgstr "新增連絡人(_N)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1048
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1054
 msgid "New Contact _List..."
 msgstr "新增連絡人列表(_L)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1055
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1061
 msgid "_Open Contact"
 msgstr "開啟連絡人(_O)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1063
 msgid "View the current contact"
 msgstr "檢視目前的連絡人"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1062
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1068
 msgid "_Send Message to Contact..."
 msgstr "傳送郵件給連絡人(_S)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1064
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1070
 msgid "Send a message to the selected contacts"
 msgstr "傳送郵件至選取的連絡人"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1071
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1077
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
 #: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "_Actions"
 msgstr "動作(_A)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1084
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:663
 #: ../src/modules/calendar/e-task-shell-view-actions.c:817
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1921
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1900
 msgid "_Preview"
 msgstr "預覽(_P)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1091
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1536
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:680
 #: ../src/modules/calendar/e-task-shell-view-actions.c:834
 msgid "_Manage groups..."
 msgstr "管理群組(_M)…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1103
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1109
 msgid "Address Book Map"
 msgstr "通訊錄地圖"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1135
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
 msgid "Contact _Preview"
 msgstr "連絡人預覽(_P)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1137
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
 msgid "Show contact preview window"
 msgstr "顯示連絡人預覽視窗"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show _Maps"
 msgstr "顯示地圖(_M)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1145
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1151
 msgid "Show maps in contact preview window"
 msgstr "在連絡人預覽視窗顯示地圖"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1170
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:741
 #: ../src/modules/calendar/e-task-shell-view-actions.c:907
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1166
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1172
 msgid "Show contact preview below the contact list"
 msgstr "在連絡人列表下方顯示連絡人預覽"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1171
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:748
 #: ../src/modules/calendar/e-task-shell-view-actions.c:914
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2074
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1179
 msgid "Show contact preview alongside the contact list"
 msgstr "在連絡人列表旁邊顯示連絡人預覽"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1188
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1194
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1696
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:765
 #: ../src/modules/calendar/e-task-shell-view-actions.c:966
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1198
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1204
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:775
 #: ../src/modules/calendar/e-task-shell-view-actions.c:976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
-#: ../src/shell/e-shell-content.c:655
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
+#: ../src/shell/e-shell-content.c:637
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1231
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1237
 msgid "Print all shown contacts"
 msgstr "列印所有顯示的連絡人"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1244
 msgid "Preview the contacts to be printed"
 msgstr "預覽將要列印的連絡人"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1245
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1251
 msgid "Print selected contacts"
 msgstr "列印已選取的連絡人"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1260
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1266
 msgid "S_ave Address Book as vCard"
 msgstr "將通訊錄另存為 vC_ard"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1262
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1268
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "將已選取通訊錄中的連絡人儲存為 vCard"
 
 #. Translators: This is an action label
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1268
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1274
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1284
 msgid "_Save as vCard..."
 msgstr "儲存成 _vCard…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1276
 msgid "Save selected contacts as a vCard"
 msgstr "將選取的連絡人儲存為 vCard"
 
@@ -19371,7 +20399,7 @@ msgstr "傳送郵件給列表(_S)"
 msgid "_Send Message to Contact"
 msgstr "傳送郵件給連絡人(_S)"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:162
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -19381,55 +20409,55 @@ msgstr ""
 "\n"
 "它可以還原您所有的個人資料、設定值、郵件過濾器等。"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:177
 msgid "_Restore from a backup file:"
 msgstr "從備份檔案還原(_R):"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:188
 msgid "Choose a backup file to restore"
 msgstr "選擇要還原的備份檔案"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:291
 #: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "從備份檔案還原"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:233
+#: ../src/modules/backup-restore/evolution-backup-restore.c:304
 msgid "Select name of the Evolution backup file"
 msgstr "選擇 Evolution 備份檔案的名稱"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:266
+#: ../src/modules/backup-restore/evolution-backup-restore.c:349
 msgid "_Restart Evolution after backup"
 msgstr "備份後重新啟動 Evolution(_R)"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:301
+#: ../src/modules/backup-restore/evolution-backup-restore.c:384
 msgid "Re_start Evolution after restore"
 msgstr "還原後重新啟動 Evolution(_S)"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:343
+#: ../src/modules/backup-restore/evolution-backup-restore.c:426
 msgid "Select name of the Evolution backup file to restore"
 msgstr "選擇要還原的 Evolution 備份檔案名稱"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:352
+#: ../src/modules/backup-restore/evolution-backup-restore.c:435
 #, c-format
 msgid "Checking content of backup file “%s”, please wait..."
 msgstr "檢查備份檔案「%s」的內部,請稍候…"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:373
+#: ../src/modules/backup-restore/evolution-backup-restore.c:456
 msgid "_Back up Evolution Data..."
 msgstr "備份 Evolution 資料(_B)..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:375
+#: ../src/modules/backup-restore/evolution-backup-restore.c:458
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "將 Evolution 的資料與設定值備份為檔案庫"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:380
+#: ../src/modules/backup-restore/evolution-backup-restore.c:463
 msgid "R_estore Evolution Data..."
 msgstr "還原 Evolution 資料(_E)..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:382
+#: ../src/modules/backup-restore/evolution-backup-restore.c:465
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "從檔案庫還原 Evolution 的資料與設定值"
 
@@ -19496,41 +20524,41 @@ msgstr "移除暫存的備份檔案"
 msgid "Reloading registry service"
 msgstr "重新載入註冊表服務"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:899
+#: ../src/modules/backup-restore/evolution-backup-tool.c:903
 msgid "Evolution Back Up"
 msgstr "Evolution 備份"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:900
+#: ../src/modules/backup-restore/evolution-backup-tool.c:904
 #, c-format
 msgid "Backing up to the file %s"
 msgstr "正備份至檔案 %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:904
+#: ../src/modules/backup-restore/evolution-backup-tool.c:908
 msgid "Evolution Restore"
 msgstr "Evolution 還原"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:905
+#: ../src/modules/backup-restore/evolution-backup-tool.c:909
 #, c-format
 msgid "Restoring from the file %s"
 msgstr "從檔案還原 %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:974
+#: ../src/modules/backup-restore/evolution-backup-tool.c:978
 msgid "Backing up Evolution Data"
 msgstr "備份 Evolution 資料"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:975
+#: ../src/modules/backup-restore/evolution-backup-tool.c:979
 msgid "Please wait while Evolution is backing up your data."
 msgstr "在 Evolution 備份您的資料時請稍候。"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:977
+#: ../src/modules/backup-restore/evolution-backup-tool.c:981
 msgid "Restoring Evolution Data"
 msgstr "還原 Evolution 資料"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:978
+#: ../src/modules/backup-restore/evolution-backup-tool.c:982
 msgid "Please wait while Evolution is restoring your data."
 msgstr "在 Evolution 還原您的資料時請稍候。"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:1000
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1004
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "這個動作所花的時間取決於您的帳號中資料的多寡。"
 
@@ -19608,16 +20636,16 @@ msgid "Convert message text to _Unicode"
 msgstr "將郵件文字轉換為 _Unicode"
 
 #: ../src/modules/bogofilter/evolution-bogofilter.c:537
-#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
+#: ../src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#: ../src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in.h:2
 msgid "Junk filter using Bogofilter"
 msgstr "使用 Bogofilter 垃圾郵件過濾器"
 
 #: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:994
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1045
 #: ../src/modules/cal-config-google/e-cal-config-google.c:190
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
@@ -19625,73 +20653,77 @@ msgstr "使用 Bogofilter 垃圾郵件過濾器"
 msgid "User name cannot be empty"
 msgstr "使用者名稱不能為空"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:443
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:418
+msgid "Looking up server search bases, please wait…"
+msgstr ""
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:494
 msgid "Standard LDAP Port"
 msgstr "標準 LDAP 連接埠"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:449
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:632
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP 透過 SSL/TLS (已廢棄)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:455
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:506
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft 通用類別目錄"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:461
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:512
 msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "透過 SSL/TLS 的 Microsoft 通用類別目錄"
 
 #. Page 1
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:568
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:619
 msgid "Connecting to LDAP"
 msgstr "正在連線至 LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:585
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:636
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:612
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:663
 msgid "Port:"
 msgstr "連接埠:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:671
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
 msgid "Port number is not valid"
 msgstr "連接埠號無效"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:635
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (建議值)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:688
 msgid "Encryption:"
 msgstr "加密:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
 msgid "Authentication"
 msgstr "核對"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:735
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:738
 msgid "Using email address"
 msgstr "使用電子郵件地址"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:741
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:743
 msgid "Method:"
 msgstr "方法:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:697
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to “Using email address” requires anonymous access to your LDAP "
@@ -19701,36 +20733,36 @@ msgstr ""
 "能匿名存取您的 LDAP 伺服器。"
 
 #. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "Using LDAP"
 msgstr "使用 LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:729
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:780
 #: ../src/modules/mail/e-mail-shell-view.c:118
 msgid "Searching"
 msgstr "正在搜尋"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:751
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:802
 msgid "Search Base:"
 msgstr "搜尋起點:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:806
 msgid "Find Possible Search Bases"
 msgstr "尋找可能的搜尋起點"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:777
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
 msgid "One Level"
 msgstr "一層"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "Subtree"
 msgstr "子目錄"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:781
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:832
 msgid "Search Scope:"
 msgstr "搜尋範圍:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:786
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:837
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of “Subtree” will include all entries "
@@ -19741,27 +20773,27 @@ msgstr ""
 "圍會包括搜尋起點底下所有的項目。「One Level」(一層) 的搜尋範圍只會包括起點底"
 "下的一個層級。"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:795
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:846
 msgid "Search Filter:"
 msgstr "搜尋過濾器:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:807
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:858
 msgid "Downloading"
 msgstr "下載中"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:879
 msgid "Limit:"
 msgstr "限制:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:839
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:890
 msgid "contacts"
 msgstr "連絡人"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:844
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:895
 msgid "Browse until limit is reached"
 msgstr "瀏覽直到達到限制"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:979
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1030
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:415
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
 msgid "Server address cannot be empty"
@@ -19792,17 +20824,17 @@ msgid "URL is not a valid http:// nor https:// URL"
 msgstr "URL 不是有效的 http:// 或 https:// URL"
 
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:225
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:226
 msgid "Choose a Calendar"
 msgstr "選擇行事曆"
 
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:229
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:230
 msgid "Choose a Memo List"
 msgstr "選擇備忘錄列表"
 
 #: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:233
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:234
 msgid "Choose a Task List"
 msgstr "選擇工作列表"
 
@@ -19838,7 +20870,7 @@ msgstr "用於生日和週年紀念日行事曆"
 msgid "Enable Calendars to synchronize"
 msgstr "啟用要同步的行事曆"
 
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:144
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:145
 msgid "Default User Calendar"
 msgstr "預設使用者行事曆"
 
@@ -19939,11 +20971,6 @@ msgstr "匯入至備忘錄列表(_M)"
 msgid "I_mport to Task List"
 msgstr "匯入至工作列表(_M)"
 
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
-msgid "New Memo List"
-msgstr "新增備忘錄列表"
-
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:563
 #, c-format
 msgid "Copying an event into the calendar “%s”"
@@ -19986,41 +21013,41 @@ msgstr "備忘錄列表選擇器"
 msgid "Task List Selector"
 msgstr "工作列表選擇器"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:525
+#: ../src/modules/calendar/e-calendar-preferences.c:524
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "選擇提醒通知的行事曆"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:532
+#: ../src/modules/calendar/e-calendar-preferences.c:531
 msgid "Selected Memo Lists for Notifications of Reminders"
 msgstr "選擇提醒通知的備忘錄列表"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:539
+#: ../src/modules/calendar/e-calendar-preferences.c:538
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr "選擇提醒通知的工作列表"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:635
+#: ../src/modules/calendar/e-calendar-preferences.c:634
 msgid "Meeting Invitations"
 msgstr "會議邀請"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:661
+#: ../src/modules/calendar/e-calendar-preferences.c:660
 msgid "_Delete message after acting"
 msgstr "完成後刪除郵件(_D)"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:675
-#: ../src/modules/calendar/e-calendar-preferences.c:706
+#: ../src/modules/calendar/e-calendar-preferences.c:674
+#: ../src/modules/calendar/e-calendar-preferences.c:705
 msgid "Conflict Search"
 msgstr "衝突的搜尋"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:690
+#: ../src/modules/calendar/e-calendar-preferences.c:689
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "選擇要搜尋會議衝突的行事曆"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1102
+#: ../src/modules/calendar/e-calendar-preferences.c:1115
 msgid "Ti_me and date:"
 msgstr "時刻和日期(_M):"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1103
+#: ../src/modules/calendar/e-calendar-preferences.c:1116
 msgid "_Date only:"
 msgstr "只有日期(_D):"
 
@@ -20085,7 +21112,7 @@ msgid "_24 hour"
 msgstr "_24 小時"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1607
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "Work Week"
 msgstr "工作週"
 
@@ -20206,141 +21233,139 @@ msgid "Sc_roll Month View by a week"
 msgstr "以週捲動月檢視(_R)"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:57
+msgid "Order days in Week View from _left to right"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Alerts"
 msgstr "警示"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Display"
 msgstr "顯示"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
-msgid "Task List"
-msgstr "工作列表"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Highlight t_asks due today"
 msgstr "強調今天到期工作(_A)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Highlight _overdue tasks"
 msgstr "強調過期的工作(_O)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#, fuzzy
+#| msgid "_To Do"
+msgid "To Do bar"
+msgstr "待辦事項(_T)"
+
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+msgid "Show Tasks without _Due date"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Display reminders in _notification area only"
 msgstr "只在通知區域中顯示提醒(_N)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
 msgid "Keep reminder notification _window always on top"
 msgstr "讓提醒通知視窗永遠置頂(_W)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
 msgid "Display reminders for completed _tasks"
 msgstr "顯示已完成工作的提醒(_T)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Display reminders for _past events"
 msgstr "顯示已過去事件的提醒(_P)"
 
 #. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Set _default reminder"
 msgstr "設定預設提醒於每個新約會的(_D)"
 
 #. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
 msgid "before every new appointment"
 msgstr "前"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Show a _reminder"
 msgstr "顯示提醒(_R)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
 msgid "before every anniversary/birthday"
 msgstr "在每個週年紀念日/生日之前"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
 msgid "Default _snooze time (in minutes)"
 msgstr "預設小睡時間 [以分鐘計] (_S)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
 msgid "Select the sources for reminder notification:"
 msgstr "選擇提醒通知的來源︰"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
-msgid "Calendars"
-msgstr "行事曆"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
-msgid "Memo Lists"
-msgstr "備忘錄列表"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
-msgid "Task Lists"
-msgstr "工作列表"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Default Free/Busy Server"
 msgstr "預設的空閒/忙碌伺服器網址"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u 與 %d 會被替換為電子郵件位址中的使用者與網域名稱。"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
 msgid "Publishing Information"
 msgstr "發布資訊"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:112
+#: ../src/modules/calendar/e-cal-shell-backend.c:113
 msgctxt "New"
 msgid "_Appointment"
 msgstr "會議(_A)"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:114
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../src/modules/calendar/e-cal-shell-backend.c:115
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Create a new appointment"
 msgstr "建立一個新的會議"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:119
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "全日會議(_P)"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:121
+#: ../src/modules/calendar/e-cal-shell-backend.c:122
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日會議"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:126
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
 msgctxt "New"
 msgid "M_eeting"
 msgstr "會議(_E)"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:128
+#: ../src/modules/calendar/e-cal-shell-backend.c:129
 msgid "Create a new meeting request"
 msgstr "建立新會議要求"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:136
+#: ../src/modules/calendar/e-cal-shell-backend.c:137
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:138
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../src/modules/calendar/e-cal-shell-backend.c:139
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:255
+#: ../src/modules/calendar/e-cal-shell-backend.c:256
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
@@ -20348,10 +21373,6 @@ msgstr "行事曆與工作"
 msgid "Print"
 msgstr "列印"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
-msgid "Calendar Properties"
-msgstr "iCalendar 錯誤"
-
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:312
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -20372,11 +21393,11 @@ msgstr "將循環事件標示成可移動"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1084
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1124
 msgid "event"
 msgstr "事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1086
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1126
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:207
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:275
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:496
@@ -20384,142 +21405,154 @@ msgstr "事件"
 msgid "Save as iCalendar"
 msgstr "儲存為 iCalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1220
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1260
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:577
 #: ../src/modules/calendar/e-task-shell-view-actions.c:703
 msgid "_Copy..."
 msgstr "複製(_C)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1227
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1267
 msgid "D_elete Calendar"
 msgstr "刪除行事曆(_E)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1269
 msgid "Delete the selected calendar"
 msgstr "刪除選取的行事曆"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
 msgid "Go Back"
 msgstr "向後"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1243
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
 msgid "Go Forward"
 msgstr "向前"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
 msgid "Select today"
 msgstr "選取今日"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1255
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "Select _Date"
 msgstr "選擇日期(_D)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Select a specific date"
 msgstr "選取特定日期"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1262
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1302
 msgid "_Manage Calendar groups..."
 msgstr "管理行事曆群組(_M)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
 msgid "Manage Calendar groups order and visibility"
 msgstr "管理行事曆列表群組順序與可見性"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1269
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1309
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1323
 #: ../src/modules/calendar/e-task-shell-view-actions.c:801
 msgid "Purg_e"
 msgstr "清除(_E)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Purge old appointments and meetings"
 msgstr "刪除舊會議和會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Refresh the selected calendar"
 msgstr "重新整理選取的行事曆"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
 msgid "Rename the selected calendar"
 msgstr "重新命名選取的行事曆"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Find _Next"
 msgstr "尋找下一筆(_N)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Find next occurrence of the current search string"
 msgstr "尋找目前搜尋字詞下一個出現處"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Find _Previous"
 msgstr "尋找上一筆(_P)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
 msgid "Find previous occurrence of the current search string"
 msgstr "尋找目前搜尋字詞上一個出現處"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Stop _Running Search"
 msgstr "停止目前執行的搜尋(_R)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Stop currently running search"
 msgstr "停止目前執行的搜尋"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Sho_w All Calendars"
 msgstr "顯示所有行事曆(_W)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Show _Only This Calendar"
 msgstr "只顯示這個行事曆(_O)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_Delete Appointment"
 msgstr "刪除會議(_D)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Delete selected appointments"
 msgstr "刪除選取的會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Delete This _Occurrence"
 msgstr "刪除這次發生的事件(_O)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete this occurrence"
 msgstr "刪除此週期"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Delete All Occ_urrences"
 msgstr "刪除所有發生的事件(_U)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Delete all occurrences"
 msgstr "刪除全部週期"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1414
+#, fuzzy
+#| msgid "_Edit as New Message..."
+msgid "Edit as Ne_w..."
+msgstr "編輯為新郵件(_E)…"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#, fuzzy
+#| msgid "View the current appointment"
+msgid "Edit the current appointment as new"
+msgstr "檢視目前的會議"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New All Day _Event..."
 msgstr "新增全天事件(_E)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new all day event"
 msgstr "建立新的全天事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1428
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:241
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:315
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:570
@@ -20527,120 +21560,112 @@ msgstr "建立新的全天事件"
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1388
-msgid "New _Meeting..."
-msgstr "新增會議(_M)…"
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new meeting"
 msgstr "建立新的會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
-msgid "New _Appointment..."
-msgstr "新增會議(_A)…"
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Open Appointment"
 msgstr "開啟會議(_O)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
 msgid "View the current appointment"
 msgstr "檢視目前的會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts an appointment to a meeting"
 msgstr "將會議轉換為會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Conv_ert to Appointment..."
 msgstr "轉換為會議(_E)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Converts a meeting to an appointment"
 msgstr "將會議轉換為會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Quit"
 msgstr "結束"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1579
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Day"
 msgstr "天"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one day"
 msgstr "顯示一天"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1586
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "List"
 msgstr "列表"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show as list"
 msgstr "顯示成列表"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Month"
 msgstr "月"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Show one month"
 msgstr "顯示一個月"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1600
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Week"
 msgstr "週"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one week"
 msgstr "顯示一週"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show one work week"
 msgstr "顯示一個工作週"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
 msgid "Active Appointments"
 msgstr "進行中的會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1682
 msgid "Next 7 Days’ Appointments"
 msgstr "未來 7 天的約會"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Occurs Less Than 5 Times"
 msgstr "發生少於五次"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1720
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:789
 #: ../src/modules/calendar/e-task-shell-view-actions.c:990
 msgid "Description contains"
 msgstr "描述包含"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1676
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:796
 #: ../src/modules/calendar/e-task-shell-view-actions.c:997
 msgid "Summary contains"
 msgstr "主旨包含"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1700
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1737
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1751
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:272
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:360
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:806
@@ -20650,15 +21675,15 @@ msgstr "主旨包含"
 msgid "Print..."
 msgstr "列印…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1739
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1746
 msgid "Preview the calendar to be printed"
 msgstr "預覽將要列印的行事曆"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1768
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:282
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:370
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:837
@@ -20666,7 +21691,7 @@ msgstr "預覽將要列印的行事曆"
 msgid "_Save as iCalendar..."
 msgstr "儲存為 iCalendar[_S]…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1794
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1845
 msgid "Go To"
 msgstr "移至"
 
@@ -20822,10 +21847,6 @@ msgstr "建立新備忘錄列表"
 msgid "Print Memos"
 msgstr "列印備忘錄"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
-msgid "Memo List Properties"
-msgstr "備忘錄列表屬性"
-
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:556
 msgid "_Delete Memo"
 msgstr "刪除備忘錄(_D)"
@@ -20947,10 +21968,6 @@ msgstr "建立新工作列表"
 msgid "Print Tasks"
 msgstr "列印工作"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:274
-msgid "Task List Properties"
-msgstr "工作列表"
-
 #: ../src/modules/calendar/e-task-shell-view-actions.c:557
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -21077,11 +22094,11 @@ msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 項工作"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:319
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:324
 msgid "Convert to M_eeting"
 msgstr "轉換為會議(_E)"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:321
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
 msgid "Convert the message to a meeting request"
 msgstr "將郵件轉換為會議要求"
 
@@ -21093,6 +22110,79 @@ msgstr "轉換為郵件(_E)"
 msgid "Convert to the mail message"
 msgstr "轉換為電子郵件訊息"
 
+#: ../src/modules/config-lookup/e-gnome-config-lookup.c:67
+msgid "Look up e-mail domain on the GNOME server"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+msgid "Looking up IMAP server…"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+msgid "Looking up POP3 server…"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+msgid "Looking up SMTP server…"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
+msgid "CalDAV server"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+msgid "Looking up CalDAV server…"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
+msgid "CardDAV server"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+msgid "Looking up CardDAV server…"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+msgid "LDAP server"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+msgid "Looking up LDAP server…"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:234
+msgid "Look up in SRV records"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:104
+#, c-format
+msgid "CalDAV: %s"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:111
+#, fuzzy, c-format
+#| msgid "vCard for %s"
+msgid "CardDAV: %s"
+msgstr "%s 的 vCard"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:117
+msgid "CalDAV and CardDAV server"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:209
+msgid "Look up for a CalDAV/CardDAV server"
+msgstr ""
+
 #: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
 msgid "ITIP"
 msgstr "ITIP"
@@ -21103,482 +22193,482 @@ msgstr "將部分顯示為邀請"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:258
+#: ../src/modules/itip-formatter/itip-view.c:259
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:262
+#: ../src/modules/itip-formatter/itip-view.c:263
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:271
+#: ../src/modules/itip-formatter/itip-view.c:272
 msgid "Today %l:%M:%S %p"
 msgstr "今天 %p %l:%M:%S"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:286
+#: ../src/modules/itip-formatter/itip-view.c:287
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:290
+#: ../src/modules/itip-formatter/itip-view.c:291
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:295
+#: ../src/modules/itip-formatter/itip-view.c:296
 msgid "Tomorrow %l:%M %p"
 msgstr "明天 %p %l:%M"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:299
+#: ../src/modules/itip-formatter/itip-view.c:300
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天 %p %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:318
+#: ../src/modules/itip-formatter/itip-view.c:319
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:323
+#: ../src/modules/itip-formatter/itip-view.c:324
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:327
+#: ../src/modules/itip-formatter/itip-view.c:328
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:332
+#: ../src/modules/itip-formatter/itip-view.c:333
 msgid "%A %l:%M %p"
 msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:336
+#: ../src/modules/itip-formatter/itip-view.c:337
 msgid "%A %l:%M:%S %p"
 msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../src/modules/itip-formatter/itip-view.c:345
+#: ../src/modules/itip-formatter/itip-view.c:346
 msgid "%A, %B %e"
 msgstr "%b%e日%A"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:351
+#: ../src/modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e %H:%M"
 msgstr "%b%e日%A %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:355
+#: ../src/modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%b%e日%A %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:360
+#: ../src/modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e %l:%M %p"
 msgstr "%b%e日%A %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:364
+#: ../src/modules/itip-formatter/itip-view.c:365
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%b%e日%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../src/modules/itip-formatter/itip-view.c:370
+#: ../src/modules/itip-formatter/itip-view.c:371
 msgid "%A, %B %e, %Y"
 msgstr "%Y年%b%e日%A"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:375
+#: ../src/modules/itip-formatter/itip-view.c:376
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y年%b%e日%A %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:379
+#: ../src/modules/itip-formatter/itip-view.c:380
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y年%b%e日%A %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:384
+#: ../src/modules/itip-formatter/itip-view.c:385
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y年%b%e日%A %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:388
+#: ../src/modules/itip-formatter/itip-view.c:389
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%b%e日%A %p %l:%M:%S"
 
-#: ../src/modules/itip-formatter/itip-view.c:426
 #: ../src/modules/itip-formatter/itip-view.c:427
-#: ../src/modules/itip-formatter/itip-view.c:516
+#: ../src/modules/itip-formatter/itip-view.c:428
 #: ../src/modules/itip-formatter/itip-view.c:517
-#: ../src/modules/itip-formatter/itip-view.c:606
+#: ../src/modules/itip-formatter/itip-view.c:518
+#: ../src/modules/itip-formatter/itip-view.c:607
 msgid "An unknown person"
 msgstr "不明人士"
 
-#: ../src/modules/itip-formatter/itip-view.c:431
-#: ../src/modules/itip-formatter/itip-view.c:521
-#: ../src/modules/itip-formatter/itip-view.c:610
+#: ../src/modules/itip-formatter/itip-view.c:432
+#: ../src/modules/itip-formatter/itip-view.c:522
+#: ../src/modules/itip-formatter/itip-view.c:611
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "請代表 %s 回覆"
 
-#: ../src/modules/itip-formatter/itip-view.c:433
-#: ../src/modules/itip-formatter/itip-view.c:523
-#: ../src/modules/itip-formatter/itip-view.c:612
+#: ../src/modules/itip-formatter/itip-view.c:434
+#: ../src/modules/itip-formatter/itip-view.c:524
+#: ../src/modules/itip-formatter/itip-view.c:613
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "代表 %s 接收"
 
-#: ../src/modules/itip-formatter/itip-view.c:438
+#: ../src/modules/itip-formatter/itip-view.c:439
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s 透過 %s 已經發布下列會議資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s 已經發布下列會議資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:445
+#: ../src/modules/itip-formatter/itip-view.c:446
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s 已經委派下列會議給您:"
 
-#: ../src/modules/itip-formatter/itip-view.c:448
+#: ../src/modules/itip-formatter/itip-view.c:449
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s 透過 %s 邀請您出席下列會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:450
+#: ../src/modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s 邀請您出席下列會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:456
+#: ../src/modules/itip-formatter/itip-view.c:457
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s 透過 %s 希望加入一個既存的會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:458
+#: ../src/modules/itip-formatter/itip-view.c:459
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s 希望加入一個既存的會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:462
+#: ../src/modules/itip-formatter/itip-view.c:463
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s 透過 %s 希望收到下列會議的最新資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:465
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s 希望收到下列會議的最新資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:468
+#: ../src/modules/itip-formatter/itip-view.c:469
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s 透過 %s 傳送了下列會議的回覆:"
 
-#: ../src/modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:471
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s 傳送了下列會議的回覆:"
 
-#: ../src/modules/itip-formatter/itip-view.c:474
+#: ../src/modules/itip-formatter/itip-view.c:475
 #, c-format
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s 透過 %s 已經消取下列會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:476
+#: ../src/modules/itip-formatter/itip-view.c:477
 #, c-format
 msgid "%s has cancelled the following meeting:"
 msgstr "%s 已經消取下列會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:480
+#: ../src/modules/itip-formatter/itip-view.c:481
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s 透過 %s 已經答覆了下列會議變更。"
 
-#: ../src/modules/itip-formatter/itip-view.c:482
+#: ../src/modules/itip-formatter/itip-view.c:483
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s 已經答覆了下列會議變更:"
 
-#: ../src/modules/itip-formatter/itip-view.c:486
+#: ../src/modules/itip-formatter/itip-view.c:487
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s 透過 %s 已經婉拒了下列會議變更:"
 
-#: ../src/modules/itip-formatter/itip-view.c:488
+#: ../src/modules/itip-formatter/itip-view.c:489
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s 已經婉拒了下列會議變更:"
 
-#: ../src/modules/itip-formatter/itip-view.c:528
+#: ../src/modules/itip-formatter/itip-view.c:529
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s 透過 %s 已經發布了下列工作資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:530
+#: ../src/modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s 已經發布了下列工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:535
+#: ../src/modules/itip-formatter/itip-view.c:536
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s 指派 %s 加入下列工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:538
+#: ../src/modules/itip-formatter/itip-view.c:539
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s 透過 %s 已經指派您一項工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:540
+#: ../src/modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s 已經指派您一項工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:546
+#: ../src/modules/itip-formatter/itip-view.c:547
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s 透過 %s 希望加入一項既存的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s 希望加入一項既存的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:552
+#: ../src/modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "%s 透過 %s 希望收到下列指派工作的最新資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:555
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s 希望收到下列指派工作的最新資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:558
+#: ../src/modules/itip-formatter/itip-view.c:559
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s 透過 %s 傳送了下列指派工作的回覆:"
 
-#: ../src/modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:561
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s 傳送了下列指派工作的回覆:"
 
-#: ../src/modules/itip-formatter/itip-view.c:564
+#: ../src/modules/itip-formatter/itip-view.c:565
 #, c-format
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s 透過 %s 已經取消下列指派的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:566
+#: ../src/modules/itip-formatter/itip-view.c:567
 #, c-format
 msgid "%s has cancelled the following assigned task:"
 msgstr "%s 已經取消下列指派的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:570
+#: ../src/modules/itip-formatter/itip-view.c:571
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s 透過 %s 已經回覆下列指派工作的變更:"
 
-#: ../src/modules/itip-formatter/itip-view.c:572
+#: ../src/modules/itip-formatter/itip-view.c:573
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s 已經回覆下列指派工作的變更:"
 
-#: ../src/modules/itip-formatter/itip-view.c:576
+#: ../src/modules/itip-formatter/itip-view.c:577
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s 透過 %s 已婉拒了下列指派的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:578
+#: ../src/modules/itip-formatter/itip-view.c:579
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s 已經婉拒下列指派的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:617
+#: ../src/modules/itip-formatter/itip-view.c:618
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s 透過 %s 已經發布了下列備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:619
+#: ../src/modules/itip-formatter/itip-view.c:620
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s 已經發布了備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:624
+#: ../src/modules/itip-formatter/itip-view.c:625
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s 透過 %s 希望加入一個既存的備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:626
+#: ../src/modules/itip-formatter/itip-view.c:627
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s 希望加入一個既存的備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:630
+#: ../src/modules/itip-formatter/itip-view.c:631
 #, c-format
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s 透過 %s 已經消取下列共用備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:632
+#: ../src/modules/itip-formatter/itip-view.c:633
 #, c-format
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s 已經取消下列共用備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:857
+#: ../src/modules/itip-formatter/itip-view.c:858
 msgid "All day:"
 msgstr "整天:"
 
-#: ../src/modules/itip-formatter/itip-view.c:863
+#: ../src/modules/itip-formatter/itip-view.c:864
 msgid "Start day:"
 msgstr "開始日:"
 
-#: ../src/modules/itip-formatter/itip-view.c:863
-#: ../src/modules/itip-formatter/itip-view.c:1679
+#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:1682
 msgid "Start time:"
 msgstr "開始時間:"
 
-#: ../src/modules/itip-formatter/itip-view.c:872
+#: ../src/modules/itip-formatter/itip-view.c:873
 msgid "End day:"
 msgstr "結束日:"
 
-#: ../src/modules/itip-formatter/itip-view.c:872
-#: ../src/modules/itip-formatter/itip-view.c:1680
+#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:1683
 msgid "End time:"
 msgstr "結束時間:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1210
+#: ../src/modules/itip-formatter/itip-view.c:1213
 msgid "Ope_n Calendar"
 msgstr "開啟行事曆(_N)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1213
+#: ../src/modules/itip-formatter/itip-view.c:1216
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1216
+#: ../src/modules/itip-formatter/itip-view.c:1219
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1219
+#: ../src/modules/itip-formatter/itip-view.c:1222
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1222
+#: ../src/modules/itip-formatter/itip-view.c:1225
 msgid "_Tentative"
 msgstr "暫訂(_T)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1225
+#: ../src/modules/itip-formatter/itip-view.c:1228
 msgid "Acce_pt all"
 msgstr "全部接受(_P)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1228
+#: ../src/modules/itip-formatter/itip-view.c:1231
 msgid "Acce_pt"
 msgstr "接受(_P)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1231
+#: ../src/modules/itip-formatter/itip-view.c:1234
 msgid "Send _Information"
 msgstr "傳送資訊(_I)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1234
+#: ../src/modules/itip-formatter/itip-view.c:1237
 msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1237
+#: ../src/modules/itip-formatter/itip-view.c:1240
 #: ../src/smime/gui/certificate-manager.c:1677
 msgid "_Update"
 msgstr "更新(_U)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1682
-#: ../src/modules/itip-formatter/itip-view.c:1730
-#: ../src/modules/itip-formatter/itip-view.c:1801
+#: ../src/modules/itip-formatter/itip-view.c:1685
+#: ../src/modules/itip-formatter/itip-view.c:1733
+#: ../src/modules/itip-formatter/itip-view.c:1804
 msgid "Comment:"
 msgstr "註解:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1718
+#: ../src/modules/itip-formatter/itip-view.c:1721
 msgid "Send reply to sender"
 msgstr "回覆寄件者"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1733
+#: ../src/modules/itip-formatter/itip-view.c:1736
 msgid "Send _updates to attendees"
 msgstr "傳送更新給出席者(_U)"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1736
+#: ../src/modules/itip-formatter/itip-view.c:1739
 msgid "_Apply to all instances"
 msgstr "套用至所有實體(_A)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1737
+#: ../src/modules/itip-formatter/itip-view.c:1740
 msgid "Show time as _free"
 msgstr "顯示時間為空閒(_F)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1738
+#: ../src/modules/itip-formatter/itip-view.c:1741
 msgid "_Preserve my reminder"
 msgstr "保留我的提醒(_P)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1739
+#: ../src/modules/itip-formatter/itip-view.c:1742
 msgid "_Inherit reminder"
 msgstr "繼承提醒(_I)"
 
-#: ../src/modules/itip-formatter/itip-view.c:2048
+#: ../src/modules/itip-formatter/itip-view.c:2051
 msgid "_Tasks:"
 msgstr "工作(_T):"
 
-#: ../src/modules/itip-formatter/itip-view.c:2051
+#: ../src/modules/itip-formatter/itip-view.c:2054
 msgid "_Memos:"
 msgstr "備忘錄(_M):"
 
-#: ../src/modules/itip-formatter/itip-view.c:2964
+#: ../src/modules/itip-formatter/itip-view.c:3111
 msgid "Sa_ve"
 msgstr "儲存(_V)"
 
-#: ../src/modules/itip-formatter/itip-view.c:3486
-#: ../src/modules/itip-formatter/itip-view.c:5015
+#: ../src/modules/itip-formatter/itip-view.c:3633
+#: ../src/modules/itip-formatter/itip-view.c:5198
 msgid "Attendee status updated"
 msgstr "出席者狀態已更新"
 
-#: ../src/modules/itip-formatter/itip-view.c:3701
+#: ../src/modules/itip-formatter/itip-view.c:3848
 #, c-format
 msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgstr "行事曆「%2$s」中的會議「%1$s」和這個會議相衝突"
 
-#: ../src/modules/itip-formatter/itip-view.c:3707
+#: ../src/modules/itip-formatter/itip-view.c:3854
 #, c-format
 msgid ""
 "The calendar “%s” contains an appointment which conflicts with this meeting"
@@ -21586,193 +22676,193 @@ msgid_plural ""
 "The calendar “%s” contains %d appointments which conflict with this meeting"
 msgstr[0] "行事曆「%s」中的 %d 個約會和這個會議相衝突"
 
-#: ../src/modules/itip-formatter/itip-view.c:3740
+#: ../src/modules/itip-formatter/itip-view.c:3887
 #, c-format
 msgid "Found the appointment in the calendar “%s”"
 msgstr "在行事曆「%s」中找到約會"
 
-#: ../src/modules/itip-formatter/itip-view.c:3749
+#: ../src/modules/itip-formatter/itip-view.c:3896
 msgid "This meeting invitation is obsolete. It had been updated."
 msgstr "這個會議邀請是過時的。它已經更新。"
 
-#: ../src/modules/itip-formatter/itip-view.c:3891
+#: ../src/modules/itip-formatter/itip-view.c:4038
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
-#: ../src/modules/itip-formatter/itip-view.c:3899
+#: ../src/modules/itip-formatter/itip-view.c:4046
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個會議"
 
-#: ../src/modules/itip-formatter/itip-view.c:3904
+#: ../src/modules/itip-formatter/itip-view.c:4051
 msgid "Unable to find this task in any task list"
 msgstr "無法在任何工作列表中找到這項工作"
 
-#: ../src/modules/itip-formatter/itip-view.c:3909
+#: ../src/modules/itip-formatter/itip-view.c:4056
 msgid "Unable to find this memo in any memo list"
 msgstr "無法在任何備忘錄列表中找到這項備忘錄"
 
-#: ../src/modules/itip-formatter/itip-view.c:4250
+#: ../src/modules/itip-formatter/itip-view.c:4397
 msgid "Opening the calendar. Please wait..."
 msgstr "正在開啟行事曆。請稍候…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4255
+#: ../src/modules/itip-formatter/itip-view.c:4402
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個會議既存的版本"
 
-#: ../src/modules/itip-formatter/itip-view.c:4654
+#: ../src/modules/itip-formatter/itip-view.c:4810
 #, c-format
 msgid "Unable to send item to calendar “%s”.  %s"
 msgstr "無法傳送項目至行事曆「%s」。%s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4669
+#: ../src/modules/itip-formatter/itip-view.c:4825
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "傳送至行事曆「%s」並設為已接受"
 
-#: ../src/modules/itip-formatter/itip-view.c:4674
+#: ../src/modules/itip-formatter/itip-view.c:4830
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "傳送至行事曆「%s」並設為不確定的"
 
-#: ../src/modules/itip-formatter/itip-view.c:4680
+#: ../src/modules/itip-formatter/itip-view.c:4836
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "傳送至行事曆「%s」並設為已婉拒"
 
-#: ../src/modules/itip-formatter/itip-view.c:4686
+#: ../src/modules/itip-formatter/itip-view.c:4842
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "傳送至行事曆「%s」並設為已取消的"
 
-#: ../src/modules/itip-formatter/itip-view.c:4706
-#: ../src/modules/itip-formatter/itip-view.c:5152
-#: ../src/modules/itip-formatter/itip-view.c:5255
+#: ../src/modules/itip-formatter/itip-view.c:4878
+#: ../src/modules/itip-formatter/itip-view.c:5335
+#: ../src/modules/itip-formatter/itip-view.c:5438
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "正在將變更儲存到行事曆。請稍候…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4747
+#: ../src/modules/itip-formatter/itip-view.c:4930
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
-#: ../src/modules/itip-formatter/itip-view.c:4939
+#: ../src/modules/itip-formatter/itip-view.c:5122
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4956
+#: ../src/modules/itip-formatter/itip-view.c:5139
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-#: ../src/modules/itip-formatter/itip-view.c:4960
+#: ../src/modules/itip-formatter/itip-view.c:5143
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
 
-#: ../src/modules/itip-formatter/itip-view.c:5007
+#: ../src/modules/itip-formatter/itip-view.c:5190
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新出席者。%s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5042
+#: ../src/modules/itip-formatter/itip-view.c:5225
 msgid "The meeting is invalid and cannot be updated"
 msgstr "這個會議無效並且不能更新"
 
-#: ../src/modules/itip-formatter/itip-view.c:5117
+#: ../src/modules/itip-formatter/itip-view.c:5300
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得出席者狀態無法更新!"
 
-#: ../src/modules/itip-formatter/itip-view.c:5188
-#: ../src/modules/itip-formatter/itip-view.c:5226
+#: ../src/modules/itip-formatter/itip-view.c:5371
+#: ../src/modules/itip-formatter/itip-view.c:5409
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "出席者狀態不能更新,因為項目已經不存在"
 
-#: ../src/modules/itip-formatter/itip-view.c:5287
+#: ../src/modules/itip-formatter/itip-view.c:5470
 msgid "Meeting information sent"
 msgstr "會議資訊寄出"
 
-#: ../src/modules/itip-formatter/itip-view.c:5292
+#: ../src/modules/itip-formatter/itip-view.c:5475
 msgid "Task information sent"
 msgstr "工作資訊寄出"
 
-#: ../src/modules/itip-formatter/itip-view.c:5297
+#: ../src/modules/itip-formatter/itip-view.c:5480
 msgid "Memo information sent"
 msgstr "備忘錄資訊寄出"
 
-#: ../src/modules/itip-formatter/itip-view.c:5308
+#: ../src/modules/itip-formatter/itip-view.c:5491
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "無法寄出會議資訊,該會議並不存在"
 
-#: ../src/modules/itip-formatter/itip-view.c:5313
+#: ../src/modules/itip-formatter/itip-view.c:5496
 msgid "Unable to send task information, the task does not exist"
 msgstr "無法寄出工作資訊,該項工作不存在"
 
-#: ../src/modules/itip-formatter/itip-view.c:5318
+#: ../src/modules/itip-formatter/itip-view.c:5501
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "無法寄出備忘錄資訊,該備忘錄並不存在"
 
 #. Translators: This is a default filename for a calendar.
-#: ../src/modules/itip-formatter/itip-view.c:5383
+#: ../src/modules/itip-formatter/itip-view.c:5566
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5388
+#: ../src/modules/itip-formatter/itip-view.c:5571
 msgid "Save Calendar"
 msgstr "儲存行事曆"
 
-#: ../src/modules/itip-formatter/itip-view.c:5436
-#: ../src/modules/itip-formatter/itip-view.c:5449
+#: ../src/modules/itip-formatter/itip-view.c:5620
+#: ../src/modules/itip-formatter/itip-view.c:5633
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../src/modules/itip-formatter/itip-view.c:5437
-#: ../src/modules/itip-formatter/itip-view.c:5450
+#: ../src/modules/itip-formatter/itip-view.c:5621
+#: ../src/modules/itip-formatter/itip-view.c:5634
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "此郵件宣告其含有行事曆內容,但其行事曆並非有效的 iCalendar。"
 
-#: ../src/modules/itip-formatter/itip-view.c:5492
-#: ../src/modules/itip-formatter/itip-view.c:5522
-#: ../src/modules/itip-formatter/itip-view.c:5625
+#: ../src/modules/itip-formatter/itip-view.c:5676
+#: ../src/modules/itip-formatter/itip-view.c:5757
+#: ../src/modules/itip-formatter/itip-view.c:5853
 msgid "The item in the calendar is not valid"
 msgstr "行事曆中的項目是無效的"
 
-#: ../src/modules/itip-formatter/itip-view.c:5493
-#: ../src/modules/itip-formatter/itip-view.c:5523
-#: ../src/modules/itip-formatter/itip-view.c:5626
+#: ../src/modules/itip-formatter/itip-view.c:5677
+#: ../src/modules/itip-formatter/itip-view.c:5758
+#: ../src/modules/itip-formatter/itip-view.c:5854
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 "此郵件確實含有行事曆內容,但該內容並未包含任何事件、工作或空閒/忙碌資訊"
 
-#: ../src/modules/itip-formatter/itip-view.c:5538
+#: ../src/modules/itip-formatter/itip-view.c:5767
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容含有多個項目"
 
-#: ../src/modules/itip-formatter/itip-view.c:5539
+#: ../src/modules/itip-formatter/itip-view.c:5768
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要處理這些全部的項目,應該將此檔案儲存後匯入其中的行事曆"
 
-#: ../src/modules/itip-formatter/itip-view.c:6057
+#: ../src/modules/itip-formatter/itip-view.c:6291
 msgctxt "cal-itip"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/modules/itip-formatter/itip-view.c:6073
+#: ../src/modules/itip-formatter/itip-view.c:6307
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: ../src/modules/itip-formatter/itip-view.c:6239
+#: ../src/modules/itip-formatter/itip-view.c:6475
 msgid "This meeting recurs"
 msgstr "這個會議的週期規則為"
 
-#: ../src/modules/itip-formatter/itip-view.c:6242
+#: ../src/modules/itip-formatter/itip-view.c:6478
 msgid "This task recurs"
 msgstr "這項工作的週期規則為"
 
-#: ../src/modules/itip-formatter/itip-view.c:6245
+#: ../src/modules/itip-formatter/itip-view.c:6481
 msgid "This memo recurs"
 msgstr "這個備忘錄的週期規則為"
 
@@ -21789,35 +22879,35 @@ msgstr "這個會議已委派"
 msgid "“{0}” has delegated the meeting. Do you want to add the delegate “{1}”?"
 msgstr "「{0}」已代理此會議。是否還要加入代理人「{1}」?"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:283
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
 msgid "Google Features"
 msgstr "Google 功能"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:292
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:310
 msgid "Add Google Ca_lendar to this account"
 msgstr "將 Google 日曆加入這個帳號(_L)"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:319
 msgid "Add Google Con_tacts to this account"
 msgstr "將 Google 通訊錄加入這個帳號(_T)"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:312
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:330
 msgctxt "GoggleSummary"
 msgid "IMAP access"
 msgstr "IMAP 存取"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:333
 msgctxt "GoggleSummary"
 msgid "Calendars to synchronize"
 msgstr "要同步的行事曆"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:318
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:336
 #, c-format
 msgctxt "GoggleSummary"
 msgid "You may need to enable %s and %s"
@@ -21887,12 +22977,6 @@ msgstr "Mbox 排程器目錄不能為空"
 msgid "Configuration"
 msgstr "設定"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "伺服器(_S):"
-
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
 msgid "_Port:"
@@ -21975,446 +23059,464 @@ msgstr "Yahoo! 功能"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "將 Yahoo! 行事曆與工作加入這個帳號(_L)"
 
-#: ../src/modules/mail/e-mail-attachment-handler.c:671
+#: ../src/modules/mail/e-mail-attachment-handler.c:644
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d 封附加的郵件"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:375
+#: ../src/modules/mail/e-mail-shell-backend.c:399
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:377
+#: ../src/modules/mail/e-mail-shell-backend.c:401
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:385
+#: ../src/modules/mail/e-mail-shell-backend.c:409
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "郵件帳號(_U)"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:387
+#: ../src/modules/mail/e-mail-shell-backend.c:411
 msgid "Create a new mail account"
 msgstr "建立新郵件帳號"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:392
+#: ../src/modules/mail/e-mail-shell-backend.c:416
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "郵件資料夾(_F)"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:394
+#: ../src/modules/mail/e-mail-shell-backend.c:418
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:709
+#: ../src/modules/mail/e-mail-shell-backend.c:733
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr "基底"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:712
+#: ../src/modules/mail/e-mail-shell-backend.c:736
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr "netlink"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:715
+#: ../src/modules/mail/e-mail-shell-backend.c:739
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "網路管理"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:749
+#: ../src/modules/mail/e-mail-shell-backend.c:769
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "偵測上線狀態的方法(_O):"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:758
+#: ../src/modules/mail/e-mail-shell-backend.c:778
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "預設值"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:772
+#: ../src/modules/mail/e-mail-shell-backend.c:792
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "永遠上線"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:832
-msgid "Mail Accounts"
-msgstr "郵件帳號"
-
-#: ../src/modules/mail/e-mail-shell-backend.c:841
+#: ../src/modules/mail/e-mail-shell-backend.c:861
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:850
+#: ../src/modules/mail/e-mail-shell-backend.c:870
 msgid "Composer Preferences"
 msgstr "郵件編輯器偏好設定"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:859
+#: ../src/modules/mail/e-mail-shell-backend.c:879
 msgid "Network Preferences"
 msgstr "網路偏好設定"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1151
+#: ../src/modules/mail/e-mail-shell-backend.c:1240
 msgctxt "label"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:734
+#: ../src/modules/mail/e-mail-shell-view-actions.c:781
 msgid "Marking messages as read..."
 msgstr "將郵件標示成已經閱讀…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1093
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1140
 msgid "Go to Folder"
 msgstr "前往資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1097
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1144
 msgid "_Select"
 msgstr "選擇(_S)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1622
 msgid "_Disable Account"
 msgstr "停用帳號(_D)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Disable this account"
 msgstr "停用這個帳號"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的已刪除的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1636
+#, fuzzy
+#| msgid "_Junk"
+msgid "Empty _Junk"
+msgstr "垃圾郵件(_J)"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
+#, fuzzy
+#| msgid "Permanently remove all the deleted messages from all folders"
+msgid "Delete all Junk messages from all folders"
+msgstr "永久移除在所有資料夾內的已刪除的郵件"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
 msgid "Edit properties of this account"
 msgstr "編輯這個帳號的屬性"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Refresh list of folders of this account"
 msgstr "重新整理這個帳號的資料夾列表"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1657
 msgid "_Download Messages for Offline Usage"
 msgstr "下載離線使用的郵件(_D)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "下載標記為離線使用的帳號與資料夾之郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
 msgid "Fl_ush Outbox"
 msgstr "清理寄件匣(_U)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
 msgid "_Copy Folder To..."
 msgstr "複製資料夾到(_C)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Copy the selected folder into another folder"
 msgstr "複製已選定的資料夾到另一個資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
 msgid "E_xpunge"
 msgstr "刪除(_X)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
 msgid "Mar_k All Messages as Read"
 msgstr "標示所有郵件為已閱讀(_K)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mark all messages in the folder as read"
 msgstr "將資料夾中全部的郵件標示成已閱讀"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
 msgid "_Move Folder To..."
 msgstr "移動資料夾到(_M)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Move the selected folder into another folder"
 msgstr "將選定的資料夾移至另一個資料夾"
 
 #. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1707
 msgid "_New..."
 msgstr "新增(_N)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 msgid "Create a new folder for storing mail"
 msgstr "建立一個新資料夾以儲存郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
 msgid "Change the properties of this folder"
 msgstr "變更這個資料夾的屬性"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
 msgid "Refresh the folder"
 msgstr "重新載入資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
 msgid "Change the name of this folder"
 msgstr "變更這個資料夾的名稱"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
 msgid "Select Message _Thread"
 msgstr "選擇郵件檔頭(_T)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選擇所有相關的郵件為選定的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
 msgid "Select Message S_ubthread"
 msgstr "選擇郵件子群組(_U)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select all replies to the currently selected message"
 msgstr "選擇所有回覆選定郵件的信"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1777
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
 msgid "Empty _Trash"
 msgstr "清理回收筒(_T)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1779
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "永久移除在所有帳號內全部已刪除的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1784
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
 msgid "Go to _Folder"
 msgstr "前往資料夾(_F)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1786
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
 msgid "Opens a dialog to select a folder to go to"
 msgstr "開啟對話盒選取要移至的資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1791
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1770
 msgid "_New Label"
 msgstr "新增標籤(_N)"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1779
 msgid "N_one"
 msgstr "沒有(_O)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1793
 msgid "_Manage Subscriptions"
 msgstr "管理訂閱(_M)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1900
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1795
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "訂閱或取消訂閱在遠端伺服器的資料夾"
 
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1828
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1849
 msgid "Send / _Receive"
 msgstr "傳送/接收(_R)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1830
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1809
 msgid "Send queued items and retrieve new items"
 msgstr "傳送待送的項目並接收新的項目"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1835
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
 msgid "R_eceive All"
 msgstr "全部接收(_E)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1837
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
 msgid "Receive new items from all accounts"
 msgstr "接收在所有帳號內的新項目"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1842
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
 msgid "_Send All"
 msgstr "全部傳送(_S)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
 msgid "Send queued items in all accounts"
 msgstr "傳送在所有帳號內待送的項目"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Cancel the current mail operation"
 msgstr "取消目前郵件所作的行動"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1877
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1856
 msgid "Collapse All _Threads"
 msgstr "收摺所有相關郵件(_T)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse all message threads"
 msgstr "收摺所有的相關郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1884
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1863
 msgid "E_xpand All Threads"
 msgstr "展開所有相關郵件(_X)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
 msgid "Expand all message threads"
 msgstr "展開所有的相關郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1891
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1870
 msgid "_Message Filters"
 msgstr "郵件規則(_M)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1893
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
 msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1898
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1877
 msgid "_Subscriptions..."
 msgstr "訂閱(_S)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1907
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
 msgid "F_older"
 msgstr "資料夾(_O)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1914
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1893
 msgid "_Label"
 msgstr "標籤(_L)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1931
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1938
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1917
 msgid "Search F_olders"
 msgstr "搜尋資料夾(_O)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Create or edit search folder definitions"
 msgstr "建立或編輯搜尋資料夾的定義"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1979
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1962
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2007
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Show Message _Preview"
 msgstr "顯示郵件預覽(_P)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "Show message preview pane"
 msgstr "顯示郵件預覽窗格"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2015
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Show _Attachment Bar"
 msgstr "顯示附件列(_A)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
 msgstr "當郵件帶有附件時在郵件預覽窗格下方顯示附件列"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2006
 msgid "Show _Deleted Messages"
 msgstr "顯示已刪除郵件(_D)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2025
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2008
 msgid "Show deleted messages with a line through them"
 msgstr "顯示已刪除的郵件 (加上刪除線)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Show _Junk Messages"
 msgstr "顯示垃圾郵件(_J)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2033
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Show junk messages with a red line through them"
 msgstr "顯示垃圾郵件 (加上紅色刪除線)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2039
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2022
 msgid "_Group By Threads"
 msgstr "依相關郵件為群組(_G)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2041
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
 msgid "Threaded message list"
 msgstr "相關郵件列表"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2047
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
+#, fuzzy
+#| msgid "Show _Tool Bar"
+msgid "Show To _Do Bar"
+msgstr "顯示工具列(_T)"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
+msgid "Show To Do bar with appointments and tasks"
+msgstr ""
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2038
 msgid "_Unmatched Folder Enabled"
 msgstr "未符合資料夾已啟用(_U)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2049
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2040
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "切換是否啟用未符合搜尋資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2069
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2060
 msgid "Show message preview below the message list"
 msgstr "在郵件列表下方顯示郵件預覽"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2076
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
 msgid "Show message preview alongside the message list"
 msgstr "在郵件列表旁邊顯示郵件預覽"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2075
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2082
 msgid "Important Messages"
 msgstr "重要郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2089
 msgid "Last 5 Days’ Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2096
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
 msgid "Messages with Attachments"
 msgstr "有附件的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
 msgid "Messages with Notes"
 msgstr "有備註的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2133
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2124
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2140
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2131
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2147
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2138
 msgid "Message Thread"
 msgstr "相關郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2207
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2198
 msgid "Subject or Addresses contain"
 msgstr "主旨或電子郵件位址包含"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2217
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2208
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2224
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2215
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2231
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2222
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
@@ -22426,51 +23528,51 @@ msgstr "所有的帳號搜尋"
 msgid "Account Search"
 msgstr "帳號搜尋"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:931
+#: ../src/modules/mail/e-mail-shell-view-private.c:929
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已選擇 %d 個,"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:940
-#: ../src/modules/mail/e-mail-shell-view-private.c:957
+#: ../src/modules/mail/e-mail-shell-view-private.c:944
+#: ../src/modules/mail/e-mail-shell-view-private.c:961
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已刪除"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:966
-#: ../src/modules/mail/e-mail-shell-view-private.c:972
+#: ../src/modules/mail/e-mail-shell-view-private.c:975
+#: ../src/modules/mail/e-mail-shell-view-private.c:981
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:979
+#: ../src/modules/mail/e-mail-shell-view-private.c:988
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 個草稿"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:985
+#: ../src/modules/mail/e-mail-shell-view-private.c:994
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未傳送"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:991
+#: ../src/modules/mail/e-mail-shell-view-private.c:1000
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1008
+#: ../src/modules/mail/e-mail-shell-view-private.c:1017
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d 封未讀"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1526
+#: ../src/modules/mail/e-mail-shell-view-private.c:1535
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
@@ -22498,7 +23600,7 @@ msgstr "立刻傳送"
 msgid "Send after 5 minutes"
 msgstr "5 分鐘後傳送"
 
-#: ../src/modules/mail/em-composer-prefs.c:1303
+#: ../src/modules/mail/em-composer-prefs.c:1309
 msgid "Language(s)"
 msgstr "語言"
 
@@ -22531,14 +23633,26 @@ msgid "Contains Value"
 msgstr "包含數值"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../src/modules/mail/em-mailer-prefs.c:1558
+#: ../src/modules/mail/em-mailer-prefs.c:1570
 msgid "_Date header:"
 msgstr "日期標頭(_D):"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1559
+#: ../src/modules/mail/em-mailer-prefs.c:1571
 msgid "Show _original header value"
 msgstr "顯示原始標頭數值(_O)"
 
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
+#, fuzzy
+#| msgid "Do not warn me again"
+msgid "Do _not change settings"
+msgstr "不要再警告我"
+
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
+#, fuzzy
+#| msgid "Mark as default memo list"
+msgid "_Set as default email client"
+msgstr "標示為預設備忘錄列表"
+
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:138
 msgid "Do you want to make Evolution your default email client?"
 msgstr "是否要將 Evolution 設為您的預設電子郵件客戶端?"
@@ -22737,11 +23851,11 @@ msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "這會讓 SpamAssasin 更可靠,但速度變慢。"
 
 #: ../src/modules/spamassassin/evolution-spamassassin.c:740
-#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
+#: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:2
 msgid "Junk filter using SpamAssassin"
 msgstr "使用 SpamAssassin 垃圾郵件過濾器"
 
@@ -22752,15 +23866,15 @@ msgstr "使用 SpamAssassin 垃圾郵件過濾器"
 msgid "Importing Files"
 msgstr "正在匯入檔案"
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:257
 msgid "Import cancelled."
 msgstr "匯入已取消。"
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:274
 msgid "Import complete."
 msgstr "匯入完成。"
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:156
+#: ../src/modules/startup-wizard/e-startup-assistant.c:158
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -22771,7 +23885,13 @@ msgstr ""
 "\n"
 "以下畫面會讓 Evolution 連線至您的電子郵件帳號,以及從其他應用程式匯入檔案。"
 
-#: ../src/modules/startup-wizard/evolution-startup-wizard.c:226
+#: ../src/modules/startup-wizard/e-startup-assistant.c:165
+#, fuzzy
+#| msgid "Do not show this message again"
+msgid "Do not _show this wizard again"
+msgstr "不要再顯示這個訊息"
+
+#: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
 msgid "Loading accounts..."
 msgstr "正在載入帳號…"
 
@@ -22783,11 +23903,11 @@ msgstr "格式化為(_F)…"
 msgid "_Other languages"
 msgstr "其他的語言(_O)"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:436
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:453
 msgid "Text Highlight"
 msgstr "文字突顯"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:437
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:454
 msgid "Syntax highlighting of mail parts"
 msgstr "郵件部分的語法突顯"
 
@@ -23336,63 +24456,63 @@ msgstr "不是影像檔"
 msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "您選取的檔案似乎不是有效的 PNG 影像。錯誤:{0}"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:413
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:417
 msgid "Get List _Archive"
 msgstr "取得列表檔案庫(_A)"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:415
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:419
 msgid "Get an archive of the list this message belongs to"
 msgstr "取得此郵件所屬論壇的檔案庫"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:420
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:424
 msgid "Copy _Message Archive URL"
 msgstr "複製郵件檔案庫 URL(_M)"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:422
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:426
 msgid "Copy direct URL for the selected message in its archive"
 msgstr "複製郵件檔案庫中選定郵件的直接 URL"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:427
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:431
 msgid "Get List _Usage Information"
 msgstr "取得列表使用資訊(_U)"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:429
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:433
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "取得此郵件所屬論壇的使用方法相關資訊"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:434
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:438
 msgid "Contact List _Owner"
 msgstr "連絡人列表擁有者(_O)"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:436
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:440
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "連絡此郵件所屬通信論壇的管理者"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:441
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:445
 msgid "_Post Message to List"
 msgstr "傳送郵件給論壇(_P)"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:443
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:447
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "撰寫郵件給此郵件所屬的通信論壇"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:448
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:452
 msgid "_Subscribe to List"
 msgstr "訂閱論壇(_S)"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:450
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:454
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "訂閱此郵件所屬的通信論壇"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:455
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:459
 msgid "_Unsubscribe from List"
 msgstr "取消訂閱論壇(_U)"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:457
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:461
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "取消訂閱此郵件所屬的通信論壇"
 
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:464
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:468
 msgid "Mailing _List"
 msgstr "通信論壇(_L)"
 
@@ -23481,8 +24601,8 @@ msgstr ""
 "標頭: {0}"
 
 #. Translators: '%d' is the count of mails received.
-#: ../src/plugins/mail-notification/mail-notification.c:398
-#: ../src/plugins/mail-notification/mail-notification.c:434
+#: ../src/plugins/mail-notification/mail-notification.c:401
+#: ../src/plugins/mail-notification/mail-notification.c:437
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -23490,54 +24610,54 @@ msgstr[0] "您已經接收 %d 封郵件 。 "
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../src/plugins/mail-notification/mail-notification.c:409
+#: ../src/plugins/mail-notification/mail-notification.c:412
 #, c-format
 msgid "From: %s"
 msgstr "寄件者:%s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../src/plugins/mail-notification/mail-notification.c:423
+#: ../src/plugins/mail-notification/mail-notification.c:426
 #, c-format
 msgid "Subject: %s"
 msgstr "主旨:%s"
 
-#: ../src/plugins/mail-notification/mail-notification.c:440
+#: ../src/plugins/mail-notification/mail-notification.c:443
 msgid "New email in Evolution"
 msgstr "在 Evolution 中的新郵件"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../src/plugins/mail-notification/mail-notification.c:481
+#: ../src/plugins/mail-notification/mail-notification.c:483
 #, c-format
 msgid "Show %s"
 msgstr "顯示 %s"
 
-#: ../src/plugins/mail-notification/mail-notification.c:685
+#: ../src/plugins/mail-notification/mail-notification.c:687
 msgid "_Play sound when a new message arrives"
 msgstr "當新郵件到達時播放聲音檔案(_P)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:717
+#: ../src/plugins/mail-notification/mail-notification.c:719
 msgid "_Beep"
 msgstr "嗶聲(_B)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:730
+#: ../src/plugins/mail-notification/mail-notification.c:732
 msgid "Use sound _theme"
 msgstr "使用音效主題(_T)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:749
+#: ../src/plugins/mail-notification/mail-notification.c:751
 msgid "Play _file:"
 msgstr "播放檔案(_F):"
 
-#: ../src/plugins/mail-notification/mail-notification.c:758
+#: ../src/plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "選擇聲音檔案"
 
-#: ../src/plugins/mail-notification/mail-notification.c:835
+#: ../src/plugins/mail-notification/mail-notification.c:837
 msgid "Notify new messages for _Inbox only"
 msgstr "只通知收件匣的新郵件(_I)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:851
+#: ../src/plugins/mail-notification/mail-notification.c:853
 msgid "Show _notification when a new message arrives"
 msgstr "當新郵件到達時顯示通知(_N)"
 
@@ -23550,44 +24670,44 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "當新郵件到達時通知您。"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../src/plugins/mail-to-task/mail-to-task.c:194
+#: ../src/plugins/mail-to-task/mail-to-task.c:200
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "從 %s 的郵件所建立"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:576
+#: ../src/plugins/mail-to-task/mail-to-task.c:605
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:578
+#: ../src/plugins/mail-to-task/mail-to-task.c:607
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:580
+#: ../src/plugins/mail-to-task/mail-to-task.c:609
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "新增(_N)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:598
+#: ../src/plugins/mail-to-task/mail-to-task.c:627
 #, c-format
 msgid ""
 "Selected calendar contains event “%s” already. Would you like to edit the "
 "old event?"
 msgstr "選取的行事曆已經包含事件「%s」。是否要編輯此舊的事件?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:601
+#: ../src/plugins/mail-to-task/mail-to-task.c:630
 #, c-format
 msgid ""
 "Selected task list contains task “%s” already. Would you like to edit the "
 "old task?"
 msgstr "選取的工作列表已經包含工作「%s」。是否要編輯此舊的工作?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:604
+#: ../src/plugins/mail-to-task/mail-to-task.c:633
 #, c-format
 msgid ""
 "Selected memo list contains memo “%s” already. Would you like to edit the "
@@ -23595,7 +24715,7 @@ msgid ""
 msgstr "選取的備忘錄列表已經包含備忘錄「%s」。是否要編輯此舊的備忘錄?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:624
+#: ../src/plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -23606,7 +24726,7 @@ msgid_plural ""
 msgstr[0] "您已經選擇 %d 封郵件要轉換為事件。確定要把它們全部加入嗎?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:631
+#: ../src/plugins/mail-to-task/mail-to-task.c:660
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -23617,7 +24737,7 @@ msgid_plural ""
 msgstr[0] "您已經選擇 %d 封郵件要轉換為工作。確定要把它們全部加入嗎?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:638
+#: ../src/plugins/mail-to-task/mail-to-task.c:667
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -23627,76 +24747,76 @@ msgid_plural ""
 "add them all?"
 msgstr[0] "您已經選擇 %d 封郵件要轉換為備忘錄。確定要把它們全部加入嗎?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:659
+#: ../src/plugins/mail-to-task/mail-to-task.c:688
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "是否要繼續轉換剩餘的郵件?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:735
+#: ../src/plugins/mail-to-task/mail-to-task.c:764
 msgid "[No Summary]"
 msgstr "[沒有摘要]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:748
+#: ../src/plugins/mail-to-task/mail-to-task.c:777
 msgid "Invalid object returned from a server"
 msgstr "從伺服器傳回無效的物件"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:802
+#: ../src/plugins/mail-to-task/mail-to-task.c:831
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "在處理期間發生錯誤:%s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:838
+#: ../src/plugins/mail-to-task/mail-to-task.c:869
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "無法開啟行事曆。%s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:842
+#: ../src/plugins/mail-to-task/mail-to-task.c:873
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 msgstr "選取的行事曆是唯讀的,因此不能在這裡建立事件。請選擇其他的行事曆。"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:845
+#: ../src/plugins/mail-to-task/mail-to-task.c:876
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
 msgstr "選取的工件列表是唯讀的,因此不能在這裡建立工作。請選擇其他的工件列表。"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:848
+#: ../src/plugins/mail-to-task/mail-to-task.c:879
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
 msgstr ""
 "選取的備忘錄列表是唯讀的,因此不能在這裡建立備忘錄。請選擇其他的備忘錄列表。"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1252
+#: ../src/plugins/mail-to-task/mail-to-task.c:1301
 msgid "Create an _Appointment"
 msgstr "建立一個會議(_A)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1254
+#: ../src/plugins/mail-to-task/mail-to-task.c:1303
 msgid "Create a new event from the selected message"
 msgstr "以選取的郵件建立新的事件"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1259
+#: ../src/plugins/mail-to-task/mail-to-task.c:1308
 msgid "Create a Mem_o"
 msgstr "建立備忘錄(_O)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1261
+#: ../src/plugins/mail-to-task/mail-to-task.c:1310
 msgid "Create a new memo from the selected message"
 msgstr "以選取的郵件建立新的備忘錄"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1266
+#: ../src/plugins/mail-to-task/mail-to-task.c:1315
 msgid "Create a _Task"
 msgstr "建立工作(_T)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1268
+#: ../src/plugins/mail-to-task/mail-to-task.c:1317
 msgid "Create a new task from the selected message"
 msgstr "以選取的郵件建立新的工作"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1276
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
 msgid "Create a _Meeting"
 msgstr "建立會議(_M)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1278
+#: ../src/plugins/mail-to-task/mail-to-task.c:1327
 msgid "Create a new meeting from the selected message"
 msgstr "以選取的郵件建立新的會議"
 
@@ -23704,12 +24824,12 @@ msgstr "以選取的郵件建立新的會議"
 msgid "Convert a mail message to a task."
 msgstr "將郵件轉換為工作。"
 
-#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
+#: ../src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in.h:1
 #: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST 匯入"
 
-#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
+#: ../src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in.h:2
 #: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "從 PST 檔案匯入 Outlook 郵件"
@@ -23718,10 +24838,6 @@ msgstr "從 PST 檔案匯入 Outlook 郵件"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook 個人資料夾 (.pst)"
 
-#: ../src/plugins/pst-import/pst-importer.c:522
-msgid "_Mail"
-msgstr "郵件(_M)"
-
 #: ../src/plugins/pst-import/pst-importer.c:551
 msgid "Destination folder:"
 msgstr "目的地資料夾:"
@@ -23757,38 +24873,38 @@ msgid "Publish calendars to the web."
 msgstr "將行事曆發布為網頁。"
 
 #: ../src/plugins/publish-calendar/publish-calendar.c:215
-#: ../src/plugins/publish-calendar/publish-calendar.c:482
+#: ../src/plugins/publish-calendar/publish-calendar.c:483
 #, c-format
 msgid "Could not open %s:"
 msgstr "無法開啟 %s:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:234
+#: ../src/plugins/publish-calendar/publish-calendar.c:235
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "發布到 %s 時發生錯誤:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:240
+#: ../src/plugins/publish-calendar/publish-calendar.c:241
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "發布到 %s 已成功結束"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:288
+#: ../src/plugins/publish-calendar/publish-calendar.c:289
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "掛載 %s 失敗:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:787
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
 msgid "Are you sure you want to remove this location?"
 msgstr "確定要移除這個位置?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../src/plugins/publish-calendar/publish-calendar.c:1097
+#: ../src/plugins/publish-calendar/publish-calendar.c:1098
 msgid "Could not create publish thread."
 msgstr "無法建立發布執行緒。"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:1107
+#: ../src/plugins/publish-calendar/publish-calendar.c:1108
 msgid "_Publish Calendar Information"
 msgstr "發布行事曆資訊(_P)"
 
@@ -23797,91 +24913,88 @@ msgid "iCal"
 msgstr "iCal"
 
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:3
+#, fuzzy
+#| msgid "Free/Busy information"
+msgid "Free/Busy with Details"
+msgstr "空閒/忙碌資訊"
+
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "Daily"
 msgstr "每天"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Weekly"
 msgstr "每週"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Manual (via Actions menu)"
 msgstr "手動 (透過「動作」選單)"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Secure FTP (SFTP)"
 msgstr "安全式 FTP (SFTP)"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "Public FTP"
 msgstr "公共 FTP"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
 msgid "FTP (with login)"
 msgstr "FTP (需登入)"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Windows share"
 msgstr "Windows 分享"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Secure WebDAV (HTTPS)"
 msgstr "安全式 WebDAV (HTTPS)"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Custom Location"
 msgstr "自訂位置"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
 msgid "_Publish as:"
 msgstr "發布為(_P):"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Publishing _Frequency:"
 msgstr "發布頻率(_F):"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
 msgid "Time _duration:"
 msgstr "時間週期(_D):"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Sources"
 msgstr "來源"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "Service _type:"
 msgstr "服務類型(_T):"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_File:"
 msgstr "檔案(_F):"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "P_ort:"
 msgstr "連接埠(_O):"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "使用者名稱(_U):"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../src/smime/gui/certificate-manager.c:785
-msgid "_Password:"
-msgstr "密碼(_P):"
-
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "_Remember password"
-msgstr "記住密碼(_R)"
-
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
 msgid "Publishing Location"
 msgstr "發布位置"
 
-#: ../src/plugins/publish-calendar/publish-format-fb.c:82
+#: ../src/plugins/publish-calendar/publish-format-fb.c:83
 #: ../src/plugins/publish-calendar/publish-format-ical.c:102
 #, c-format
 msgid "Invalid source UID “%s”"
@@ -24069,7 +25182,7 @@ msgstr "開啟設定值(_O)"
 msgid "Credentials are required to connect to the destination host."
 msgstr "連線到目的端主機需要憑證。"
 
-#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:836
+#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:866
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
@@ -24077,19 +25190,19 @@ msgstr "開新視窗(_W)"
 msgid "Quick _Reference"
 msgstr "快捷鍵參照表(_R)"
 
-#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:773
+#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:796
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:871
+#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:901
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ../src/shell/e-shell-content.c:718 ../src/shell/e-shell-content.c:719
+#: ../src/shell/e-shell-content.c:700 ../src/shell/e-shell-content.c:701
 msgid "Searches"
 msgstr "搜尋"
 
-#: ../src/shell/e-shell-content.c:762
+#: ../src/shell/e-shell-content.c:744
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
@@ -24143,272 +25256,284 @@ msgstr "Evolution 網站"
 msgid "Saving user interface state"
 msgstr "儲存使用者介面狀態"
 
-#: ../src/shell/e-shell-window-actions.c:275
+#: ../src/shell/e-shell-window-actions.c:293
 msgid "Categories Editor"
 msgstr "分類編輯器"
 
-#: ../src/shell/e-shell-window-actions.c:594
+#: ../src/shell/e-shell-window-actions.c:612
 msgid "Bug Buddy is not installed."
 msgstr "尚未安裝 Bug Buddy。"
 
-#: ../src/shell/e-shell-window-actions.c:595
+#: ../src/shell/e-shell-window-actions.c:613
 msgid "Bug Buddy could not be run."
 msgstr "無法執行 Bug Buddy。"
 
-#: ../src/shell/e-shell-window-actions.c:775
+#: ../src/shell/e-shell-window-actions.c:798
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
-#: ../src/shell/e-shell-window-actions.c:780
-#: ../src/shell/e-shell-window-actions.c:794
+#: ../src/shell/e-shell-window-actions.c:803
+#, fuzzy
+#| msgid "_Account:"
+msgid "_Accounts"
+msgstr "帳號(_A):"
+
+#: ../src/shell/e-shell-window-actions.c:805
+#, fuzzy
+#| msgid "Configure Evolution"
+msgid "Configure Evolution Accounts"
+msgstr "設定 Evolution"
+
+#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/shell/e-shell-window-actions.c:824
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
 
-#: ../src/shell/e-shell-window-actions.c:801
+#: ../src/shell/e-shell-window-actions.c:831
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../src/shell/e-shell-window-actions.c:803
+#: ../src/shell/e-shell-window-actions.c:833
 msgid "Open the Evolution User Guide"
 msgstr "開啟 Evolution 使用者指南"
 
-#: ../src/shell/e-shell-window-actions.c:829
+#: ../src/shell/e-shell-window-actions.c:859
 msgid "I_mport..."
 msgstr "匯入(_M)…"
 
-#: ../src/shell/e-shell-window-actions.c:831
+#: ../src/shell/e-shell-window-actions.c:861
 msgid "Import data from other programs"
 msgstr "匯入其他程式的資料"
 
-#: ../src/shell/e-shell-window-actions.c:838
+#: ../src/shell/e-shell-window-actions.c:868
 msgid "Create a new window displaying this view"
 msgstr "建立一個新的視窗來顯示這個檢視"
 
-#: ../src/shell/e-shell-window-actions.c:850
+#: ../src/shell/e-shell-window-actions.c:880
 msgid "Available Cate_gories"
 msgstr "可用的分類(_G)"
 
-#: ../src/shell/e-shell-window-actions.c:852
+#: ../src/shell/e-shell-window-actions.c:882
 msgid "Manage available categories"
 msgstr "管理可用的分類"
 
-#: ../src/shell/e-shell-window-actions.c:864
+#: ../src/shell/e-shell-window-actions.c:894
 msgid "_Quick Reference"
 msgstr "快捷鍵參照表(_Q)"
 
-#: ../src/shell/e-shell-window-actions.c:866
+#: ../src/shell/e-shell-window-actions.c:896
 msgid "Show Evolution’s shortcut keys"
 msgstr "顯示 Evolution 的快捷鍵"
 
-#: ../src/shell/e-shell-window-actions.c:873
+#: ../src/shell/e-shell-window-actions.c:903
 msgid "Exit the program"
 msgstr "離開這個程式"
 
-#: ../src/shell/e-shell-window-actions.c:878
+#: ../src/shell/e-shell-window-actions.c:908
 msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)…"
 
-#: ../src/shell/e-shell-window-actions.c:880
+#: ../src/shell/e-shell-window-actions.c:910
 msgid "Construct a more advanced search"
 msgstr "建構更進階的搜尋"
 
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/shell/e-shell-window-actions.c:917
 msgid "Clear the current search parameters"
 msgstr "清除目前的搜尋參數"
 
-#: ../src/shell/e-shell-window-actions.c:892
+#: ../src/shell/e-shell-window-actions.c:922
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的搜尋結果(_E)…"
 
-#: ../src/shell/e-shell-window-actions.c:894
+#: ../src/shell/e-shell-window-actions.c:924
 msgid "Manage your saved searches"
 msgstr "管理您已儲存的搜尋"
 
-#: ../src/shell/e-shell-window-actions.c:901
+#: ../src/shell/e-shell-window-actions.c:931
 msgid "Click here to change the search type"
 msgstr "按這裡以改變搜尋類型"
 
-#: ../src/shell/e-shell-window-actions.c:906
+#: ../src/shell/e-shell-window-actions.c:936
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
-#: ../src/shell/e-shell-window-actions.c:908
+#: ../src/shell/e-shell-window-actions.c:938
 msgid "Execute the current search parameters"
 msgstr "執行目前的搜尋參數"
 
-#: ../src/shell/e-shell-window-actions.c:913
+#: ../src/shell/e-shell-window-actions.c:943
 msgid "_Save Search..."
 msgstr "儲存搜尋結果(_S)…"
 
-#: ../src/shell/e-shell-window-actions.c:915
+#: ../src/shell/e-shell-window-actions.c:945
 msgid "Save the current search parameters"
 msgstr "儲存目前的搜尋參數"
 
-#: ../src/shell/e-shell-window-actions.c:927
+#: ../src/shell/e-shell-window-actions.c:957
 msgid "Submit _Bug Report..."
 msgstr "傳送錯誤報告(_B)…"
 
-#: ../src/shell/e-shell-window-actions.c:929
+#: ../src/shell/e-shell-window-actions.c:959
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
-#: ../src/shell/e-shell-window-actions.c:934
+#: ../src/shell/e-shell-window-actions.c:964
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:936
+#: ../src/shell/e-shell-window-actions.c:966
 msgid "Put Evolution into offline mode"
 msgstr "讓 Evolution 進入離線模式"
 
-#: ../src/shell/e-shell-window-actions.c:941
+#: ../src/shell/e-shell-window-actions.c:971
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:943
+#: ../src/shell/e-shell-window-actions.c:973
 msgid "Put Evolution into online mode"
 msgstr "讓 Evolution 進入上線模式"
 
-#: ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell-window-actions.c:1001
 msgid "Lay_out"
 msgstr "佈局(_O)"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:979
+#: ../src/shell/e-shell-window-actions.c:1009
 msgid "_New"
 msgstr "新增(_N)"
 
-#: ../src/shell/e-shell-window-actions.c:986
+#: ../src/shell/e-shell-window-actions.c:1016
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:993
+#: ../src/shell/e-shell-window-actions.c:1023
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1007
+#: ../src/shell/e-shell-window-actions.c:1037
 msgid "_Window"
 msgstr "視窗(_O)"
 
-#: ../src/shell/e-shell-window-actions.c:1036
+#: ../src/shell/e-shell-window-actions.c:1066
 msgid "Show _Menu Bar"
 msgstr "顯示選單列(_M)"
 
-#: ../src/shell/e-shell-window-actions.c:1038
+#: ../src/shell/e-shell-window-actions.c:1068
 msgid "Show the menu bar"
 msgstr "顯示選單列"
 
-#: ../src/shell/e-shell-window-actions.c:1044
+#: ../src/shell/e-shell-window-actions.c:1074
 msgid "Show Side _Bar"
 msgstr "顯示側邊欄(_B)"
 
-#: ../src/shell/e-shell-window-actions.c:1046
+#: ../src/shell/e-shell-window-actions.c:1076
 msgid "Show the side bar"
 msgstr "顯示側邊欄"
 
-#: ../src/shell/e-shell-window-actions.c:1052
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "Show _Buttons"
 msgstr "顯示按鈕(_B)"
 
-#: ../src/shell/e-shell-window-actions.c:1054
+#: ../src/shell/e-shell-window-actions.c:1084
 msgid "Show the switcher buttons"
 msgstr "顯示切換程式按鈕"
 
-#: ../src/shell/e-shell-window-actions.c:1060
+#: ../src/shell/e-shell-window-actions.c:1090
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1062
+#: ../src/shell/e-shell-window-actions.c:1092
 msgid "Show the status bar"
 msgstr "顯示狀態列"
 
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1098
 msgid "Show _Tool Bar"
 msgstr "顯示工具列(_T)"
 
-#: ../src/shell/e-shell-window-actions.c:1070
+#: ../src/shell/e-shell-window-actions.c:1100
 msgid "Show the tool bar"
 msgstr "顯示工具列"
 
-#: ../src/shell/e-shell-window-actions.c:1092
+#: ../src/shell/e-shell-window-actions.c:1122
 msgid "_Icons Only"
 msgstr "只有圖示(_I)"
 
-#: ../src/shell/e-shell-window-actions.c:1094
+#: ../src/shell/e-shell-window-actions.c:1124
 msgid "Display window buttons with icons only"
 msgstr "只顯示視窗按鈕的圖示"
 
-#: ../src/shell/e-shell-window-actions.c:1099
+#: ../src/shell/e-shell-window-actions.c:1129
 msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../src/shell/e-shell-window-actions.c:1101
+#: ../src/shell/e-shell-window-actions.c:1131
 msgid "Display window buttons with text only"
 msgstr "只顯示視窗按鈕的文字"
 
-#: ../src/shell/e-shell-window-actions.c:1106
+#: ../src/shell/e-shell-window-actions.c:1136
 msgid "Icons _and Text"
 msgstr "圖示及文字(_A)"
 
-#: ../src/shell/e-shell-window-actions.c:1108
+#: ../src/shell/e-shell-window-actions.c:1138
 msgid "Display window buttons with icons and text"
 msgstr "顯示視窗按鈕的圖示及文字"
 
-#: ../src/shell/e-shell-window-actions.c:1113
+#: ../src/shell/e-shell-window-actions.c:1143
 msgid "Tool_bar Style"
 msgstr "工具列風格(_B)"
 
-#: ../src/shell/e-shell-window-actions.c:1115
+#: ../src/shell/e-shell-window-actions.c:1145
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使用桌面工具列設定值顯示視窗按鈕"
 
-#: ../src/shell/e-shell-window-actions.c:1123
+#: ../src/shell/e-shell-window-actions.c:1153
 msgid "Delete Current View"
 msgstr "刪除目前的檢視"
 
-#: ../src/shell/e-shell-window-actions.c:1130
+#: ../src/shell/e-shell-window-actions.c:1160
 msgid "Save Custom View..."
 msgstr "儲存自訂檢視…"
 
-#: ../src/shell/e-shell-window-actions.c:1132
+#: ../src/shell/e-shell-window-actions.c:1162
 msgid "Save current custom view"
 msgstr "儲存目前的自訂檢視"
 
-#: ../src/shell/e-shell-window-actions.c:1139
+#: ../src/shell/e-shell-window-actions.c:1169
 msgid "C_urrent View"
 msgstr "目前檢視(_U)"
 
-#: ../src/shell/e-shell-window-actions.c:1149
+#: ../src/shell/e-shell-window-actions.c:1179
 msgid "Custom View"
 msgstr "自訂檢視"
 
-#: ../src/shell/e-shell-window-actions.c:1151
+#: ../src/shell/e-shell-window-actions.c:1181
 msgid "Current view is a customized view"
 msgstr "目前的檢視方式是自訂的檢視"
 
-#: ../src/shell/e-shell-window-actions.c:1159
+#: ../src/shell/e-shell-window-actions.c:1189
 msgid "Page Set_up..."
 msgstr "頁面設定(_U)…"
 
-#: ../src/shell/e-shell-window-actions.c:1161
+#: ../src/shell/e-shell-window-actions.c:1191
 msgid "Change the page settings for your current printer"
 msgstr "修改目前印表機的頁面列印設定"
 
-#: ../src/shell/e-shell-window-actions.c:1530
+#: ../src/shell/e-shell-window-actions.c:1560
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
 
-#: ../src/shell/e-shell-window-actions.c:1653
+#: ../src/shell/e-shell-window-actions.c:1683
 #, c-format
 msgid "Select view: %s"
 msgstr "選擇檢視:%s"
 
-#: ../src/shell/e-shell-window-actions.c:1670
+#: ../src/shell/e-shell-window-actions.c:1700
 #, c-format
 msgid "Delete view: %s"
 msgstr "刪除檢視:%s"
 
-#: ../src/shell/e-shell-window-actions.c:1771
+#: ../src/shell/e-shell-window-actions.c:1804
 msgid "Execute these search parameters"
 msgstr "執行這些搜尋參數"
 
@@ -24420,13 +25545,13 @@ msgid "New"
 msgstr "新增"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:720
+#: ../src/shell/e-shell-window-private.c:756
 #, c-format
 msgid "%s — Evolution"
 msgstr "%s — Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../src/shell/main.c:195
+#: ../src/shell/main.c:192
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -24461,7 +25586,7 @@ msgstr ""
 "我們希望您享受工作成果,而且我們\n"
 "熱切希望您提供意見!\n"
 
-#: ../src/shell/main.c:219
+#: ../src/shell/main.c:216
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -24469,13 +25594,13 @@ msgstr ""
 "謝謝\n"
 "Evolution 小組敬上\n"
 
-#: ../src/shell/main.c:225
+#: ../src/shell/main.c:222
 msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../src/shell/main.c:314
+#: ../src/shell/main.c:311
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
@@ -24483,50 +25608,50 @@ msgstr ""
 "啟動 Evolution 時以指定的元件顯示。可用的選項有「mail」、「calendar」、"
 "「contacts」、「tasks」和「memos」"
 
-#: ../src/shell/main.c:318
+#: ../src/shell/main.c:315
 msgid "Apply the given geometry to the main window"
 msgstr "將指定的尺寸套用到主視窗"
 
-#: ../src/shell/main.c:322
+#: ../src/shell/main.c:319
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: ../src/shell/main.c:324
+#: ../src/shell/main.c:321
 msgid "Ignore network availability"
 msgstr "忽略網際網路是否可用"
 
-#: ../src/shell/main.c:327
+#: ../src/shell/main.c:324
 msgid "Forcibly shut down Evolution"
 msgstr "強制關閉 Evoultion"
 
-#: ../src/shell/main.c:330
+#: ../src/shell/main.c:327
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../src/shell/main.c:332
+#: ../src/shell/main.c:329
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "停用郵件、連絡人和工作的預覽窗格。"
 
-#: ../src/shell/main.c:336
+#: ../src/shell/main.c:333
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "將指定的 URI 或檔案名稱匯入為接下來的引數。"
 
-#: ../src/shell/main.c:338
+#: ../src/shell/main.c:335
 msgid "Request a running Evolution process to quit"
 msgstr "要求執行中的 Evolution 程序結束"
 
-#: ../src/shell/main.c:415
+#: ../src/shell/main.c:417
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 msgstr "不能啟動 Evolution。可能有另一個 Evolution 實體沒有回應。系統錯誤:%s"
 
-#: ../src/shell/main.c:466 ../src/shell/main.c:471
+#: ../src/shell/main.c:473 ../src/shell/main.c:478
 msgid "— The Evolution PIM and Email Client"
 msgstr " — Evolution PIM 與郵件客戶端"
 
-#: ../src/shell/main.c:533
+#: ../src/shell/main.c:540
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -24535,7 +25660,7 @@ msgstr ""
 "%s: --online 和 --offline 不能一起使用。\n"
 "  使用「%s --help」取得進一步資訊。\n"
 
-#: ../src/shell/main.c:539
+#: ../src/shell/main.c:546
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -25088,7 +26213,7 @@ msgstr "簽署"
 msgid "Encrypt"
 msgstr "加密"
 
-#: ../src/smime/lib/e-cert-db.c:786
+#: ../src/smime/lib/e-cert-db.c:788
 msgid "Certificate already exists"
 msgstr "憑證已經存在"
 
@@ -25129,6 +26254,155 @@ msgstr "無法將儲存區寫入至磁碟,錯誤代碼為:%i"
 msgid "Imported Certificate"
 msgstr "輸入的憑證"
 
+#~ msgid "Logfile to log filter actions."
+#~ msgstr "用於記錄過濾器動作的記錄檔案。"
+
+#~ msgid ""
+#~ "Check to make sure your password is spelled correctly and that you are "
+#~ "using a supported login method. Remember that many passwords are case "
+#~ "sensitive; your caps lock might be on."
+#~ msgstr ""
+#~ "請檢查來確定您的密碼拼法正確,而且您使用的是支援的登入方法。請記得許多密碼"
+#~ "有區分大小寫;您可能啟動了大寫鎖定鍵。"
+
+#~ msgid "Delete address book “{0}”?"
+#~ msgstr "刪除通訊錄「{0}」?"
+
+#~ msgid "Delete calendar “{0}”?"
+#~ msgstr "刪除行事曆「{0}」?"
+
+#~ msgid "Delete task list “{0}”?"
+#~ msgstr "刪除工作列表「{0}」?"
+
+#~ msgid "Delete memo list “{0}”?"
+#~ msgstr "刪除備忘錄列表「{0}」?"
+
+#~ msgid "Delete remote calendar “{0}”?"
+#~ msgstr "刪除遠端行事曆「{0}」?"
+
+#~ msgid "Delete remote task list “{0}”?"
+#~ msgstr "刪除遠端工作列表「{0}」?"
+
+#~ msgid "Delete remote memo list “{0}”?"
+#~ msgstr "刪除遠端備忘錄列表「{0}」?"
+
+#~ msgid "1st"
+#~ msgstr "1日"
+
+#~ msgid "2nd"
+#~ msgstr "2日"
+
+#~ msgid "3rd"
+#~ msgstr "3日"
+
+#~ msgid "4th"
+#~ msgstr "4日"
+
+#~ msgid "5th"
+#~ msgstr "5日"
+
+#~ msgid "6th"
+#~ msgstr "6日"
+
+#~ msgid "7th"
+#~ msgstr "7日"
+
+#~ msgid "8th"
+#~ msgstr "8日"
+
+#~ msgid "9th"
+#~ msgstr "9日"
+
+#~ msgid "10th"
+#~ msgstr "10日"
+
+#~ msgid "11th"
+#~ msgstr "11日"
+
+#~ msgid "12th"
+#~ msgstr "12日"
+
+#~ msgid "13th"
+#~ msgstr "13日"
+
+#~ msgid "14th"
+#~ msgstr "14日"
+
+#~ msgid "15th"
+#~ msgstr "15日"
+
+#~ msgid "16th"
+#~ msgstr "16日"
+
+#~ msgid "17th"
+#~ msgstr "17日"
+
+#~ msgid "18th"
+#~ msgstr "18日"
+
+#~ msgid "19th"
+#~ msgstr "19日"
+
+#~ msgid "20th"
+#~ msgstr "20日"
+
+#~ msgid "21st"
+#~ msgstr "21日"
+
+#~ msgid "22nd"
+#~ msgstr "22日"
+
+#~ msgid "23rd"
+#~ msgstr "23日"
+
+#~ msgid "24th"
+#~ msgstr "24日"
+
+#~ msgid "25th"
+#~ msgstr "25日"
+
+#~ msgid "26th"
+#~ msgstr "26日"
+
+#~ msgid "27th"
+#~ msgstr "27日"
+
+#~ msgid "28th"
+#~ msgstr "28日"
+
+#~ msgid "29th"
+#~ msgstr "29日"
+
+#~ msgid "30th"
+#~ msgstr "30日"
+
+#~ msgid "31st"
+#~ msgstr "31日"
+
+#~ msgid "OAuth2 Google"
+#~ msgstr "OAuth2 Google"
+
+#~ msgid ""
+#~ "This option will use an OAuth 2.0 access token to connect to the Google "
+#~ "server"
+#~ msgstr "這個選項會使用 OAuth 2.0 存取記號來連接 Google伺服器"
+
+#~ msgid "OAuth2"
+#~ msgstr "OAuth2"
+
+#~ msgid ""
+#~ "This option will use an OAuth 2.0 access token to connect to the server"
+#~ msgstr "這個選項會使用 OAuth 2.0 存取記號來連接伺服器"
+
+#~ msgid "Edit"
+#~ msgstr "編輯"
+
+#~ msgid "Are you sure you want to delete this account?"
+#~ msgstr "確定要刪除這個帳號?"
+
+#~ msgid "Address formatting"
+#~ msgstr "地址格式化"
+
 #~ msgid ""
 #~ "The calendar “%s” contains %d appointments which conflict with this "
 #~ "meeting"



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