[evolution/gnome-40] Update Chinese (Taiwan) translation



commit eb73b32aef29365010aa46c4f9e3287b48bc44a6
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Fri Apr 2 23:22:24 2021 +0000

    Update Chinese (Taiwan) translation

 po/zh_TW.po | 6790 ++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 3639 insertions(+), 3151 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0bfea2d54c..4c1b10c334 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,15 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2020-02-14 10:50+0000\n"
-"PO-Revision-Date: 2020-02-19 13:03+0800\n"
-"Last-Translator: Yi-Jyun Pan <pan93412 gmail com>\n"
+"POT-Creation-Date: 2021-03-19 17:52+0000\n"
+"PO-Revision-Date: 2021-04-02 23:54+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese <zh-l10n 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"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.4.2\n"
 "X-Pootle-Path: /zh_TW/gnome/evolution/zh_TW.po\n"
 "X-Pootle-Revision: 239\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -1392,30 +1392,42 @@ msgid "If set to “true” quoted text in replies will be wrapped."
 msgstr "如果設定為「true」回信中的引文會自動換列。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+msgid "Paste plain text as preformatted"
+msgstr "純文字貼上為預先格式化"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+msgid ""
+"When set, paste a plain text into the composer body as Preformatted "
+"paragraph. When not set, paste it as Normal paragraph."
+msgstr ""
+"設定時,貼至編輯器內文的純文字會成為預先格式化的段落。未設定時,會將它貼成一"
+"般段落。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Convert UTC time in reply credits to local time"
 msgstr "在回信中將 UTC 時刻轉換為本地時刻"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid ""
 "Whether the time in reply credits should be converted to local time when "
 "it’s in UTC in the message."
 msgstr "是否在回信時將郵件中的 UTC 時刻轉換為本地時刻。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Mark replied to messages as read"
 msgstr "將已回覆的郵件標示為已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid ""
 "When replying to a message and marking it as being replied to, then whether "
 "also mark it as read."
 msgstr "當回覆郵件時,將它標示為已回覆,同時標記為已閱讀。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Whether start Plain Text composer with Preformatted paragraph mode"
 msgstr "是否以預先格式化模式啟動純文字編輯器"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "When set to true, new Plain Text messages will have preselected Preformatted "
 "paragraph mode. The Normal paragraph mode will be used when set to false."
@@ -1423,29 +1435,29 @@ msgstr ""
 "當設定為 True 時,新的純文字郵件會具備預先選擇的預先格式化段落模式。當設定為 "
 "False 時則會使用一般段落模式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Whether to obey Content-Disposition:inline message header hint"
 msgstr "是否遵守 Content-Disposition:inline 郵件標頭提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 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:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Save file format for drag-and-drop operation"
 msgstr "拖放操作時儲存的檔案格式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Can be either “mbox” or “pdf”."
 msgstr "可以是「mbox」或「pdf」。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show image animations"
 msgstr "顯示動畫影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -1453,75 +1465,75 @@ msgstr ""
 "啟用 HTML 郵件中的動畫影像。許多使用者認為動畫影像很煩人,因而偏好以靜態影像"
 "代替。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Enable or disable type ahead search feature"
 msgstr "啟用或停用隨打即查功能"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "啟用側邊欄搜尋功能允許互動式搜尋資料夾名稱。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Enable or disable magic space bar"
 msgstr "啟用或停用魔術空白鍵"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 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:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "啟用以在所有資料夾使用類似的郵件列表檢視設定值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "啟用此選項會讓所有的資料夾使用類似的郵件列表檢視設定值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Mark citations in the message “Preview”"
 msgstr "在郵件「預覽」中標示引用"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Mark citations in the message “Preview”."
 msgstr "在郵件「預覽」中標示引用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Citation highlight color"
 msgstr "引用反白色彩"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Citation highlight color."
 msgstr "引用反白色彩。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Enable/disable caret mode"
 msgstr "啟用/停用插入號模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "啟用插入號模式,如此您可以在閱讀郵件時看到游標。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Default charset in which to display messages"
 msgstr "用於顯示郵件的預設字元集"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Default charset in which to display messages."
 msgstr "用於顯示郵件的預設字元集。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "自動透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Show notification about missing remote content"
 msgstr "顯示關於缺少的遠端內容的通知"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 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 "
@@ -1530,27 +1542,27 @@ msgstr ""
 "當郵件預覽顯示一封郵件需要下載遠端內容,而使用者或網站不允許下載時,在預覽窗"
 "格上顯示關於它的通知。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Show animated images as animations."
 msgstr "播放動畫影像。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Show all message headers"
 msgstr "顯示所有郵件檔頭"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Show all the headers when viewing a messages."
 msgstr "檢視郵件時顯示檔頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "List of headers to show when viewing a message."
 msgstr "檢視郵件時顯示的檔頭列表。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 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 "
@@ -1559,100 +1571,100 @@ msgstr ""
 "每個檔頭都以配對方式呈現:檔頭的名稱,及一個布林值表示此檔頭是否啟用。停用的"
 "檔頭在檢視郵件時不會顯示,但仍會列在偏好設定中。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Show photo of the sender"
 msgstr "顯示寄件者的相片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "在郵件閱讀窗格中顯示寄件者的相片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-msgid "Search gravatar.com for photo of the sender"
-msgstr "在 gravatar.com 搜尋寄件者的相片"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+msgid "Search libravatar.org for photo of the sender"
+msgstr "在 libravatar.org 搜尋寄件者的相片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-msgid "Allow searching also at gravatar.com for photo of the sender."
-msgstr "也允許在 gravatar.com 搜尋寄件者的相片。"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+msgid "Allow searching also at libravatar.org for photo of the sender."
+msgstr "也允許在 libravatar.org 搜尋寄件者的相片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定的時限過後,標示成已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定的時限過後,標示成已閱讀。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Mark as Seen always after specified timeout"
 msgstr "在指定的時限過後永遠標示成已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 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:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Timeout for marking messages as seen"
 msgstr "將郵件標示成已閱讀的時限"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "將郵件標示成已閱讀的時限,以毫秒計。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Show Attachment Bar"
 msgstr "顯示附件列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
 msgstr "當郵件帶有附件時在郵件預覽窗格下方顯示附件列。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Sender email-address column in the message list"
 msgstr "在郵件列表的寄件者電子郵件欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Show deleted messages in the message-list"
 msgstr "在郵件列表中顯示刪除的郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在郵件列表中顯示刪除的郵件 (加上刪除號)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Show junk messages in the message-list"
 msgstr "在郵件列表中顯示垃圾的郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "在郵件列表中顯示垃圾的郵件 (加上刪除號)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Enable Unmatched search folder"
 msgstr "啟用未符合搜尋資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "隱藏各資料夾預覽並移除選取區"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 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."
@@ -1660,31 +1672,31 @@ msgstr ""
 "這個鍵值只能讀取一次,並會在讀取後設為「false」。這樣會取消在列表中對該郵件的"
 "選取並移除對該資料夾的預覽。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Height of the message-list pane"
 msgstr "郵件列表窗格高度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Height of the message-list pane."
 msgstr "郵件列表窗格的高度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "郵件標題在使用者介面中是否摺疊"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Width of the message-list pane"
 msgstr "郵件列表窗格寬度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Width of the message-list pane."
 msgstr "郵件列表窗格的寬度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Layout style"
 msgstr "配置樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 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 "
@@ -1694,56 +1706,56 @@ msgstr ""
 "配置方式決定了在郵件列表中預覽窗格的位置。「0」(標準檢視)將預覽窗格放在郵件"
 "列表下方。「1」(垂直檢視)將預覽窗格放在郵件列表旁邊。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Variable width font"
 msgstr "變動寬度字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "The variable width font for mail display."
 msgstr "用於顯示郵件的變動寬度字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Terminal font"
 msgstr "終端機字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "The terminal font for mail display."
 msgstr "用於顯示郵件的終端機字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Use custom fonts"
 msgstr "使用自訂字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自訂字型來顯示郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "壓縮在 TO/CC/BCC 中位址的顯示方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 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:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示於 TO/CC/BCC 中位址的長度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 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:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid ""
 "Show mails in headers part of the message preview when name is available"
 msgstr "當名稱可用時在郵件預覽窗格的標頭部分顯示郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "When set to false, the mail addresses which contain both the name and the "
 "email parts in headers like To/Cc/Bcc will be shown only with the name part, "
@@ -1752,32 +1764,32 @@ msgstr ""
 "當設定為「false」時,郵件位址同時包含名稱和在像 To/Cc/Bcc 這類標頭中的郵件部"
 "分會只顯示名稱部分,不顯示實際電子郵件,而名稱會變成可點選的狀態。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Thread the message-list based on Subject"
 msgstr "以主旨為基礎串接郵件列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 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:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Default value for thread expand state"
 msgstr "相關郵件展開狀態的預設數值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否依郵件群組中最新的郵件來排序相關郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 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 "
@@ -1786,11 +1798,11 @@ msgstr ""
 "這個設定值指定相關郵件要依每個郵件群組最新的郵件排序,而非依照郵件的日期。"
 "Evolution 將需要重新啟動。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Whether sort thread children always ascending"
 msgstr "是否永遠遞增排序相關郵件子項"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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."
@@ -1798,11 +1810,21 @@ msgstr ""
 "這個設定值指定相關郵件的子項是否永遠遞增排序,而非依照相關郵件同樣的排序順"
 "序。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+msgid "Whether to compress thread level"
+msgstr "是否壓縮相關郵件層級"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+msgid ""
+"Set to true to compress thread levels for flat conversations, to make the "
+"level not so deep."
+msgstr "設定為「true」來限縮平坦對話的相關郵件層級,以使層級不至太深。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "在資料夾樹狀圖中以字母排序帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 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 "
@@ -1812,30 +1834,30 @@ msgstr ""
 "告知在郵件檢視中如何排序資料夾樹狀圖中的帳號。當設定為 true 時帳號會以字母排"
 "序,但這臺電腦與搜尋資料夾例外,否則帳號會以使用者給予的順序排列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Log filter actions"
 msgstr "記錄過濾器動作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Log filter actions to the specified log file."
 msgstr "將過濾器動作記錄到指定的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Logfile to log filter actions"
 msgstr "用於記錄過濾器動作的記錄檔案"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid ""
 "If not set, or being “stdout”, then the logging is done to stdout, instead "
 "to a file."
 msgstr ""
 "如果沒有設定,或是設定為“stdout”,紀錄會以標準輸出完成,而非輸出為檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Flush Outbox after filtering"
 msgstr "過濾後清空寄件匣"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 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 "
@@ -1844,15 +1866,15 @@ msgstr ""
 "是否在過濾完後清空寄件匣。寄件匣的清空只用在當使用了任何「轉寄至」過濾器動"
 "作,並且在這個動作後大約一分鐘開始進行。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Default forward style"
 msgstr "預設轉遞樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Default reply style"
 msgstr "預設回覆樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "Forward and reply attribution language tag, like en_US. Empty string means "
 "to use the same language as the user interface."
@@ -1860,100 +1882,100 @@ msgstr ""
 "轉傳與回覆屬性的語言標籤,例如 en_US。若字串留空代表使用跟使用者介面相同的語"
 "言。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "使用快捷鍵傳送時提示 (Ctrl+Enter)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt on empty subject"
 msgstr "沒有主旨時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when emptying the trash"
 msgstr "使用者清空垃圾桶時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "當使用者嘗試清空垃圾桶時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Prompt when user expunges"
 msgstr "使用者清空時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Prompt when user calls Empty Junk"
 msgstr "使用者清空垃圾郵件時提示使用者"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Prompt the user when he or she tries to Empty a Junk folder."
 msgstr "當使用者嘗試清空垃圾郵件資料夾時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "寄信給沒有輸入有效郵件位址的收件者前先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "當使用者嘗試傳送不想要的 HTML 時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Prompt while marking multiple messages"
 msgstr "當標記多個郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "啟用或停用標記多個郵件時的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Prompt when deleting messages in search folder"
 msgstr "當刪除搜尋資料夾中的郵件時顯示提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 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 "
@@ -1962,11 +1984,11 @@ msgstr ""
 "它啟用/停用在從搜尋資料夾中刪除郵件時是否重複提示以警告那將會永久刪除郵件,而"
 "非僅是將郵件自搜尋結果中移除。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 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 "
@@ -1976,11 +1998,11 @@ msgstr ""
 "可能的數值有:「never」 — 不允許在資料夾樹狀圖中拖放複製、「 always」 — 不詢"
 "問就允許在資料夾樹狀圖中拖放複製或「ask」 — (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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 "
@@ -1990,21 +2012,21 @@ msgstr ""
 "可能的數值有:「never」 — 不允許在資料夾樹狀圖中拖放移動、「 always」 — 不詢"
 "問就允許在資料夾樹狀圖中拖放移動或「ask」 — (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Prompt when replying privately to list messages"
 msgstr "當私人回覆通信論壇郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "當通信論壇劫持私人回覆時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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 "
@@ -2013,34 +2035,34 @@ msgstr ""
 "它會停用/啟用重覆提示警告您正試著回覆私人信件給透過通信論壇寄出的信。而通信論"
 "壇設定的 Reply-To: 標頭會將您的回信重新導向至通信論壇上的所有成員"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Prompt when replying to many recipients"
 msgstr "當回覆給許多收件者時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 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:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Prompt when switching composer format and the content needs to lose its "
 "formatting"
 msgstr "當切換編輯器模式會導致內容失去現有格式時先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "當回覆給許多收件者與副本時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
@@ -2048,56 +2070,56 @@ msgstr ""
 "當寄信給許多收件者與副本時啟用或停用提示。「composer-many-to-cc-recips-num」"
 "定義了這個界限值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 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:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Empty Trash folders on exit"
 msgstr "結束時清空垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "結束 Evolution 時清空所有垃圾資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Minimum days between emptying the trash on exit"
 msgstr "結束時清空垃圾桶最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "結束時清空垃圾桶最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Last time Empty Trash was run"
 msgstr "上次清空垃圾桶的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 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:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 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:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "Level beyond which the message should be logged."
 msgstr "應記錄的郵件等級。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 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:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "Show original “Date” header value."
 msgstr "顯示原始的「日期」標頭數值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 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 "
@@ -2106,11 +2128,11 @@ msgstr ""
 "顯示原始的「日期」檔頭(若時區不同時會使用當地時間)。否則永遠以使用者偏好的"
 "格式和本地時區顯示「日期」檔頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "List of Labels and their associated colors"
 msgstr "標籤和相關色彩的列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 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."
@@ -2118,44 +2140,44 @@ msgstr ""
 "Evolution 的郵件元件已知的標籤列表。列表包含字串,其中包含 name:color,color "
 "使用 HTML 十六進位編碼。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "Check incoming mail being junk"
 msgstr "檢查內送的垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Run junk test on incoming mail."
 msgstr "在內送的郵件執行垃圾郵件檢查。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "Empty Junk folders on exit"
 msgstr "離開時清空垃圾郵件資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "離開 Evolution 時清空所有垃圾郵件資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid "Minimum days between emptying the junk on exit"
 msgstr "結束時清空垃圾郵件最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "結束時清空垃圾郵件最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid "Last time Empty Junk was run"
 msgstr "上次清空垃圾郵件的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 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:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid "The default plugin for Junk hook"
 msgstr "垃圾釣鉤的預設外掛程式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 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 "
@@ -2164,11 +2186,11 @@ msgstr ""
 "這是預設的垃圾郵件外掛程式,即使已啟用了其他的外掛程式。如果停用這裡列出的預"
 "設外掛程式,並不會影響其他可用的外掛程式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "決定是否在通訊錄中尋找寄件者電子郵件帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 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 "
@@ -2179,13 +2201,13 @@ msgstr ""
 "會搜尋標記為自動補齊的通訊錄。但若標記為自動補齊的是遠端通訊錄(像 LDAP),則"
 "速度可能會很慢。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 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:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 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 "
@@ -2194,11 +2216,11 @@ msgstr ""
 "這個選項相關於鍵值「lookup_addressbook」,是用來決定是否只在本地端通訊錄中查"
 "詢電子郵件位址以用於垃圾郵件過濾時「排除已知連絡人寄出的郵件」功能。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "決定是否使用自訂標頭來檢查垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 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 "
@@ -2207,52 +2229,52 @@ msgstr ""
 "決定是否使用自訂標頭來檢查垃圾郵件。如果啟用這個選項並且提供標頭,將會提升垃"
 "圾郵件檢查的速度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid "Custom headers to use while checking for junk."
 msgstr "檢查垃圾郵件用的自訂標頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 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:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 msgid "UID string of the default account."
 msgstr "預設帳號的 UID 字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 msgid "Save directory"
 msgstr "儲存目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 msgid "Directory for saving mail component files."
 msgstr "用來儲存郵件元件檔的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 msgid "Composer load/attach directory"
 msgstr "編輯器讀取/附加目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
 msgid "Directory for loading/attaching files to composer."
 msgstr "用來郵件編輯器載入/附件的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 msgid "Check for new messages on start"
 msgstr "啟動時檢查新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
 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:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 msgid "Check for new messages in all active accounts"
 msgstr "檢查所有使用中帳號的新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
 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 "
@@ -2261,21 +2283,21 @@ msgstr ""
 "當 Evolution 啟動時是否檢查所有使用中帳號的新郵件而不管「檢查新郵件於每 X 分"
 "鐘」選項。這個選項只能和「send_recv_on_start」選項一起使用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 msgid "Server synchronization interval"
 msgstr "伺服器同步間隔"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
 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:252
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 msgid "Allow expunge in virtual folders"
 msgstr "允許在虛擬資料夾使用清空"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
 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 "
@@ -2286,89 +2308,89 @@ msgstr ""
 "本身會對虛擬資料夾與所有資料夾中被刪除的郵件進行,並不只針對屬於虛擬資料夾中"
 "被刪除的郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 #: ../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:255
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
 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:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 msgid "An Archive folder for On This Computer folders."
 msgstr "用於「這臺電腦上」的封存資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
 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:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
 msgid "Whether the To Do bar is visible in the main window"
 msgstr "待辦事項列是否在主視窗中顯示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
 msgid "Stores whether the To Do bar is visible in the main window."
 msgstr "儲存待辦事項工具列是否在主視窗中顯示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
 msgid "Width of the To Do bar in the main window"
 msgstr "待辦事項列在主視窗中的寬度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 msgid "Holds the width of the To Do bar for the main window."
 msgstr "儲存待辦事項列在主視窗中的寬度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 msgid "Whether the To Do bar is visible in a sub-window"
 msgstr "待辦事項列是否在副視窗中顯示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 msgid "Stores whether the To Do bar is visible in a sub-window."
 msgstr "儲存待辦事項工具列是否在副視窗中顯示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 msgid "Width of the To Do bar in a sub-window"
 msgstr "待辦事項工具列在副視窗中的寬度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 msgid "Holds the width of the To Do bar for a sub-window."
 msgstr "儲存待辦事項工具列在副視窗中的寬度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 msgid "Whether the To Do bar should show also completed tasks"
 msgstr "待辦事項列是否顯示已完成的工作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 msgid "Stores whether the To Do bar should show also completed tasks."
 msgstr "儲存待辦事項是否應同時顯示已完成的工作。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 msgid "Whether the To Do bar should show also tasks without Due date"
 msgstr "待辦事項列是否應同時顯示無到期日的工作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
 msgid "Stores whether the To Do bar should show also tasks without Due date."
 msgstr "儲存待辦事項列是否應同時顯示無到期日的工作。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
 msgid "Show start up wizard"
 msgstr "顯示啟動精靈"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
 msgid "Whether show start up wizard when there is no mail account configured."
 msgstr "當尚未設定郵件帳號時是否顯示啟動精靈。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
 msgid "Whether go to the previous message after message deletion"
 msgstr "刪除郵件後是否移至上一封郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
 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."
@@ -2376,11 +2398,11 @@ msgstr ""
 "如果設定為「true」,當刪除郵件後會移至上一封郵件;如果設定為「false」則會移至"
 "下一封郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
 msgid "Show Subject above Sender in Messages column"
 msgstr "在郵件欄位的寄件者上方顯示主旨"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
 msgid ""
 "Whether to show Subject above Sender (From/To) in the Messages column, "
 "usually shown in the Vertical/Wide view of the message list"
@@ -2388,53 +2410,63 @@ msgstr ""
 "是否在郵件欄位的寄件者 (From/To) 上方顯示主旨,通常會在郵件列表的垂直/寛檢視"
 "中顯示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
 msgid "Visually wrap long lines in composer"
 msgstr "在編輯器中自動換列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
-#: ../src/composer/e-composer-actions.c:542
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
+#: ../src/composer/e-composer-actions.c:556
 msgid ""
 "Whether to visually wrap long lines of text to avoid horizontal scrolling"
 msgstr "是否對過長的文字列自動換列以避免使用水平捲動"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
 msgid "Alternative reply style"
 msgstr "替代回覆樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
 msgid "Format message in HTML"
 msgstr "將郵件格式化為 HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
 msgid "Put the cursor at the bottom of alternative replies"
 msgstr "將游標置於替代回覆的底部"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
 msgid ""
 "This determines whether the cursor is placed at the top of the message or "
 "the bottom when using Alternative Reply."
 msgstr "這會決定在使用替代回覆時是否將游標置於郵件的頂端或底部。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+msgid "Put the signature at the top of the message"
+msgstr "將簽名檔置於郵件頂端"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
+msgid ""
+"This determines whether the signature is placed at the top of the message or "
+"the bottom when using Alternative Reply."
+msgstr "這會決定在使用替代回覆時是否將簽名檔置於郵件的頂端或底部。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
 msgid "Apply chosen template when using Alternative Reply"
 msgstr "當使用替代回覆時套用選取的範本"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
 msgid "Last chosen template’s folder URI for Alternative Reply"
 msgstr "上次選取的替代回覆範本資料夾 URI"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
 msgid "Last chosen template’s message UID for Alternative Reply"
 msgstr "上次選取的替代回覆範本郵件 UID"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
 msgid ""
 "Whether preserve original message subject when applying template for "
 "Alternative Reply"
 msgstr "當套用替代回覆的範本時是否保留原始主旨"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
 msgid ""
 "Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
 "“false”, then Normal paragraph style will be used."
@@ -2442,25 +2474,25 @@ msgstr ""
 "是否將 mailto: URI 中的 “body” 設定為「預先格式化」段落樣式。如果設定為 "
 "“false”,則會使用「一般」段落樣式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
 msgid ""
 "Close the message browser window when the selected message is deleted or "
 "marked as Junk."
 msgstr "當選取的郵件被刪除或標記為垃圾郵件時關閉郵件瀏覽器視窗。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
 msgid ""
 "Collapse archive folders in Move/Copy message to Folder and Go to Folder "
 "selectors."
 msgstr "折疊在移動/複製郵件到資料夾的封存資料夾並移至資料夾選擇器。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 msgid ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting "
 "messages."
 msgstr "當加密郵件時要在哪裡查詢收件者 S/MIME 憑證或 PGP 金鑰。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "The “off” value completely disables certificate lookup; the “autocompleted” "
 "value provides certificates only for auto-completed contacts; the “books” "
@@ -2470,86 +2502,100 @@ msgstr ""
 "數值 “off” 會完全停用憑證查詢;“autocompleted” 只會提供自動完成連絡人的憑"
 "證;“books” 會使用自動完成連絡人的憑證並搜尋標記為自動完成的通訊錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 msgid "Whether Send/Receive should also download of messages for offline."
 msgstr "傳送/接收是否也要下載郵件供離線使用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 msgid ""
 "If enabled, whenever Send/Receive is run it also runs synchronization of "
 "messages for offline use. The option is disabled by default."
 msgstr ""
 "如果啟用,當傳送/接收執行時也同時會同步郵件供離線使用。這個選項預設是停用的。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 msgid "Whether display delivery notification parts inline."
 msgstr "是否以行內顯示遞送通知部分。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid ""
 "If enabled, the message/delivery-status and message/disposition-notification "
 "parts are shown automatically inline."
 msgstr "如果啟用,則郵件/遞送狀態和郵件/處置通知部分將自動顯示為行內。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 msgid "Whether unset colors provided in HTML mails."
 msgstr "是否取消 HTML 郵件的色彩。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
+msgid ""
+"If enabled, unset colors in HTML messages, forcing use of desktop theme "
+"colors instead."
+msgstr "如果啟用,取消設定 HTML 郵件中的色彩,強制使用桌面主題色彩取代。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
+msgid ""
+"Whether to preserve expand state of the folders when calling Copy/Move to "
+"Folder."
+msgstr "當呼叫複製/移動到資料夾時是否保留資料夾的展開狀態。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
 msgid ""
-"If enabled, unset colors in HTML messages, forcing use of desktop theme "
-"colors instead."
-msgstr "如果啟用,取消設定 HTML 郵件中的色彩,強制使用桌面主題色彩取代。"
+"If enabled, the Copy/Move to Folder dialog will preserve the expand state of "
+"the folders in the dialog, otherwise all the folders will be expanded."
+msgstr ""
+"如果啟用,複製/移動到資料夾對話盒會保留資料夾的展開狀態,否則會將所有的資料夾"
+"展開。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
 msgid "(Deprecated) Default forward style"
 msgstr "(已廢棄) 預設轉寄樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:306
 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:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:307
 msgid "(Deprecated) Default reply style"
 msgstr "(已廢棄) 預設的回覆樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:308
 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:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:309
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(已廢棄) 自訂檔頭以及它們是否啟用的列表。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:310
 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:303
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:311
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(已廢棄) 透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:312
 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:305
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:313
 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:306
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:314
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“browser-close-on-reply-policy” instead."
@@ -2824,6 +2870,23 @@ msgstr ""
 "這個設定鍵指定了要將行事曆發佈至何處的目的地列表。每個數值指定一個用來設定發"
 "佈目的地的 XML。"
 
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:1
+msgid "[]"
+msgstr "[]"
+
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:2
+msgid "List of assignments for recipient and the address to be used with it"
+msgstr "要用於收件者與地址的指派列表"
+
+#: ../data/org.gnome.evolution.plugin.sender-validator.gschema.xml.in.h:3
+msgid ""
+"The list is of format 'recipient&lt;tab&gt;sender', where the recipient can "
+"be part of the address only and the sender is a full email address, which "
+"should match the From address precisely."
+msgstr ""
+"這個列表是「收件者&lt;tab&gt;寄件者」格式,收件者可以是部分的位址,而寄件者是"
+"完整的電子郵件位址,同時必須精確的符合寄件者欄位的位址。"
+
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -3009,6 +3072,32 @@ msgstr ""
 "用來以選取的文字搜尋網頁時使用的 URL 前綴。實際選取的文字會加在這個字串之後。"
 "URI 應該以 https:// 開頭。"
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:40
+msgid "Minimum font size to be used by WebKitGTK"
+msgstr "WebKitGTK 最小字型大小"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:41
+msgid ""
+"The minimum font size in pixels used to display text in WebKitGTK. This "
+"setting controls the absolute smallest size. Values other than 0 can "
+"potentially break page layouts. Negative values are treated as 0."
+msgstr ""
+"用來顯示在 WebKitGTK 文字的最小字型大小(以像素計)。這個設定值會控制最小的絕對"
+"大小。0 以外的數值可能會潛在破壞頁面佈局。負數值會被視為 0。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:42
+msgid "Set of additional illegal characters in the filename"
+msgstr "設定檔案名稱的額外不合格字元"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:43
+msgid ""
+"When generating file names from custom strings some non-printable or "
+"reserved characters are replaced with an underscore. Here's a set of "
+"additional characters to be replaced."
+msgstr ""
+"從自訂字串中產生檔案名稱時會把一些非列印字元或保留字元以底線取代。這裡是額外"
+"要被取代的字元設定。"
+
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
 msgstr "只使用本地垃圾郵件測試。"
@@ -3063,9 +3152,9 @@ msgstr ""
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:1
 #: ../data/org.gnome.Evolution.desktop.in.in.h:1
-#: ../src/mail/e-mail-browser.c:1295
+#: ../src/mail/e-mail-browser.c:1293
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
-#: ../src/shell/e-shell-window-private.c:240
+#: ../src/shell/e-shell-window-private.c:241
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -3121,32 +3210,32 @@ 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:314
-#: ../src/modules/addressbook/e-book-shell-view.c:416
+#: ../src/modules/addressbook/e-book-shell-view.c:421
 msgid "Contacts"
 msgstr "連絡人"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1009
-#: ../src/e-util/e-collection-account-wizard.c:815
-#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:470
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
+#: ../src/e-util/e-collection-account-wizard.c:855
+#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:532
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
-#: ../src/modules/calendar/e-cal-shell-view.c:599
+#: ../src/modules/calendar/e-cal-shell-view.c:620
 #: ../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/kmail-importer.c:249
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1493
-#: ../src/smime/gui/certificate-manager.c:1666
+#: ../src/modules/mail/e-mail-shell-view.c:1608
+#: ../src/smime/gui/certificate-manager.c:1664
 msgid "Mail"
 msgstr "郵件"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-cal-shell-content.c:1769
+#: ../src/calendar/gui/e-memo-table.c:446 ../src/e-util/e-webdav-browser.c:522
+#: ../src/modules/calendar/e-cal-shell-content.c:1887
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:196
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:211
 #: ../src/modules/calendar/e-memo-shell-view.c:335
@@ -3154,15 +3243,15 @@ msgid "Memos"
 msgstr "備忘錄"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2442
+#: ../src/calendar/gui/e-task-table.c:618 ../src/calendar/gui/print.c:2442
 #: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1141
-#: ../src/e-util/e-webdav-browser.c:461
+#: ../src/calendar/importers/icalendar-importer.c:1148
+#: ../src/e-util/e-webdav-browser.c:523
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-#: ../src/modules/calendar/e-cal-shell-content.c:1729
+#: ../src/modules/calendar/e-cal-shell-content.c:1847
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
-#: ../src/modules/calendar/e-task-shell-view.c:508
+#: ../src/modules/calendar/e-task-shell-view.c:530
 msgid "Tasks"
 msgstr "工作"
 
@@ -3467,11 +3556,11 @@ msgstr "用於寬檢視(_W)"
 msgid "As Sent Folder for Wi_de View"
 msgstr "做為寬檢視的寄送資料夾(_D)"
 
-#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2448
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2603
 msgid "_Memos"
 msgstr "備忘錄(_M)"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2452
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2607
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "工作(_T)"
@@ -3626,20 +3715,21 @@ msgstr "此連絡人的電子郵件地址已經存在。您無論如何都要加
 #: ../src/addressbook/addressbook.error.xml.h:32
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:757
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1525
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1493
 #: ../src/e-util/e-accounts-window.c:1563
-#: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1029 ../src/e-util/filter.ui.h:25
+#: ../src/e-util/e-mail-signature-manager.c:324
+#: ../src/e-util/e-name-selector-dialog.c:1026 ../src/e-util/filter.ui.h:25
 #: ../src/mail/e-mail-account-manager.c:721
-#: ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1330
-#: ../src/mail/em-vfolder-editor-rule.c:408
-#: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
-#: ../src/modules/mail/em-composer-prefs.c:423
+#: ../src/mail/e-mail-label-manager.c:355
+#: ../src/mail/em-folder-properties.c:1359
+#: ../src/mail/em-vfolder-editor-rule.c:405
+#: ../src/mail/em-vfolder-editor-rule.c:634 ../src/mail/mail-config.ui.h:63
+#: ../src/modules/mail/em-composer-prefs.c:420
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:544
-#: ../src/plugins/email-custom-header/email-custom-header.c:839
+#: ../src/plugins/email-custom-header/email-custom-header.c:826
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../src/plugins/templates/templates.c:464
+#: ../src/plugins/sender-validation/sender-validation.c:498
+#: ../src/plugins/templates/templates.c:470
 msgid "_Add"
 msgstr "加入(_A)"
 
@@ -3672,7 +3762,7 @@ msgid ""
 msgstr "以「{0}」為名的連絡人列表已經存在這個連絡人列表中。要強制加入它嗎?"
 
 #: ../src/addressbook/addressbook.error.xml.h:39
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1241
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1247
 msgid "Failed to delete contact"
 msgstr "刪除連絡人失敗"
 
@@ -3782,12 +3872,13 @@ msgstr "顯示憑證"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:724
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:746
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3111
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2353
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2416
+#: ../src/em-format/e-mail-formatter-attachment.c:277
 #: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "選項"
@@ -3795,103 +3886,103 @@ msgstr "選項"
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4346
-#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3274
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4336
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:212
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:516
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1327
 #: ../src/calendar/gui/e-cal-dialogs.c:690
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
-#: ../src/composer/e-composer-actions.c:228 ../src/e-util/e-activity-bar.c:357
-#: ../src/e-util/e-attachment-dialog.c:309
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
+#: ../src/composer/e-composer-actions.c:242 ../src/e-util/e-activity-bar.c:370
+#: ../src/e-util/e-attachment-dialog.c:289
 #: ../src/e-util/e-attachment-store.c:658
 #: ../src/e-util/e-attachment-store.c:668
 #: ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
 #: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:169
 #: ../src/e-util/e-category-editor.c:257 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-collection-account-wizard.c:238
-#: ../src/e-util/e-collection-account-wizard.c:1837
-#: ../src/e-util/e-collection-account-wizard.c:2073
+#: ../src/e-util/e-collection-account-wizard.c:240
+#: ../src/e-util/e-collection-account-wizard.c:1887
+#: ../src/e-util/e-collection-account-wizard.c:2134
 #: ../src/e-util/e-color-chooser-widget.c:125
 #: ../src/e-util/e-filter-datespec.c:300
 #: ../src/e-util/e-html-editor-actions.c:342
 #: ../src/e-util/e-html-editor-actions.c:386
 #: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:179
-#: ../src/e-util/e-mail-signature-script-dialog.c:366
+#: ../src/e-util/e-mail-signature-script-dialog.c:358
 #: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:816
-#: ../src/e-util/e-rule-editor.c:187 ../src/e-util/e-rule-editor.c:298
-#: ../src/e-util/e-rule-editor.c:933 ../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-rule-editor.c:184 ../src/e-util/e-rule-editor.c:295
+#: ../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:356
+#: ../src/e-util/e-source-selector-dialog.c:325
+#: ../src/e-util/e-table-config.c:540 ../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:3963
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:267
-#: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
-#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4044
-#: ../src/mail/em-folder-selector.c:318 ../src/mail/mail-config.ui.h:2
+#: ../src/e-util/evolution-source-viewer.c:829 ../src/e-util/e-web-view.c:3994
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:265
+#: ../src/mail/e-mail-config-window.c:310 ../src/mail/e-mail-label-dialog.c:186
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4031
+#: ../src/mail/em-folder-selector.c:333 ../src/mail/mail-config.ui.h:2
 #: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:874
 #: ../src/mail/mail-send-recv.c:955 ../src/mail/mail-vfolder-ui.c:149
 #: ../src/mail/mail-vfolder-ui.c:271
 #: ../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/backup-restore/evolution-backup-tool.c:989
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:406
 #: ../src/modules/calendar/e-cal-attachment-handler.c:281
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../src/plugins/face/face.c:298
-#: ../src/plugins/publish-calendar/publish-calendar.c:789
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:419
-#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:417
+#: ../src/plugins/save-calendar/save-calendar.c:184
 #: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:748
 #: ../src/shell/e-shell-utils.c:69 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:651
-#: ../src/smime/gui/certificate-manager.c:723
-#: ../src/smime/gui/certificate-manager.c:951
-#: ../src/smime/gui/certificate-manager.c:1332
+#: ../src/smime/gui/certificate-manager.c:653
+#: ../src/smime/gui/certificate-manager.c:721
+#: ../src/smime/gui/certificate-manager.c:949
+#: ../src/smime/gui/certificate-manager.c:1330
 #: ../src/smime/gui/e-cert-selector.c:235 ../src/smime/gui/smime-ui.ui.h:17
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:755
 #: ../src/calendar/calendar.error.xml.h:47
-#: ../src/calendar/gui/e-comp-editor.c:2158
-#: ../src/composer/e-composer-actions.c:228
-#: ../src/composer/e-composer-actions.c:340
+#: ../src/calendar/gui/e-comp-editor.c:2237
+#: ../src/composer/e-composer-actions.c:242
+#: ../src/composer/e-composer-actions.c:354
 #: ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:855
-#: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2476 ../src/e-util/e-web-view.c:3963
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:268
+#: ../src/e-util/e-mail-signature-script-dialog.c:362
+#: ../src/e-util/e-webdav-browser.c:2631 ../src/e-util/e-web-view.c:3994
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:266
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:651
-#: ../src/smime/gui/certificate-manager.c:724
+#: ../src/smime/gui/certificate-manager.c:653
+#: ../src/smime/gui/certificate-manager.c:722
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2055
-#: ../src/calendar/gui/e-comp-editor.c:2127
-#: ../src/e-util/e-preferences-window.c:390
+#: ../src/calendar/gui/e-comp-editor.c:2134
+#: ../src/calendar/gui/e-comp-editor.c:2206
+#: ../src/e-util/e-preferences-window.c:387
 #: ../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-window-actions.c:1053
+#: ../src/shell/e-shell-window-actions.c:1117
 msgid "_Help"
 msgstr "求助(_H)"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3574
+#: ../src/e-util/e-misc-utils.c:3585
 msgid "Image"
 msgstr "影像"
 
@@ -3917,8 +4008,8 @@ msgid "Full _Name..."
 msgstr "全名(_N)…"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1345
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:918
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1331
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "電子郵件"
@@ -3949,8 +4040,8 @@ msgid "_Home Page:"
 msgstr "首頁(_H):"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../src/calendar/gui/e-comp-editor-event.c:884
-#: ../src/modules/itip-formatter/itip-view.c:1907
+#: ../src/calendar/gui/e-comp-editor-event.c:871
+#: ../src/modules/itip-formatter/itip-view.c:1979
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
@@ -3967,7 +4058,7 @@ msgid "Home Page:"
 msgstr "首頁:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:34
-#: ../src/modules/cal-config-google/e-cal-config-google.c:97
+#: ../src/modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "行事曆:"
 
@@ -4038,22 +4129,22 @@ msgid "_Anniversary:"
 msgstr "週年紀念日(_A):"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1055
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1048
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2098
+#: ../src/calendar/gui/e-calendar-view.c:2214
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1054
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1047
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2097
+#: ../src/calendar/gui/e-calendar-view.c:2213
 msgid "Birthday"
 msgstr "生日"
 
 #. Other options
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../src/mail/e-mail-config-defaults-page.c:887
+#: ../src/mail/e-mail-config-defaults-page.c:888
 #: ../src/modules/addressbook/autocompletion-config.c:127
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
@@ -4096,7 +4187,7 @@ 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:1023
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1016
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "工作"
@@ -4104,8 +4195,8 @@ 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:526
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1089
-#: ../src/calendar/gui/e-cal-model.c:3792
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1082
+#: ../src/calendar/gui/e-cal-model.c:3793
 msgid "Other"
 msgstr "其他"
 
@@ -4129,20 +4220,21 @@ 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:1541
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1509
 #: ../src/e-util/e-attachment-view.c:355 ../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:1033
+#: ../src/e-util/e-mail-signature-manager.c:364
+#: ../src/e-util/e-name-selector-dialog.c:1030
 #: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:27
 #: ../src/mail/e-mail-config-identity-page.c:872
-#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1336
-#: ../src/mail/em-vfolder-editor-rule.c:642 ../src/mail/mail-config.ui.h:64
+#: ../src/mail/e-mail-label-manager.c:373 ../src/mail/em-filter-rule.c:678
+#: ../src/mail/em-folder-properties.c:1365
+#: ../src/mail/em-vfolder-editor-rule.c:639 ../src/mail/mail-config.ui.h:64
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:554
-#: ../src/plugins/email-custom-header/email-custom-header.c:849
-#: ../src/plugins/publish-calendar/publish-calendar.c:790
+#: ../src/plugins/email-custom-header/email-custom-header.c:836
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
-#: ../src/plugins/templates/templates.c:474
+#: ../src/plugins/sender-validation/sender-validation.c:508
+#: ../src/plugins/templates/templates.c:480
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -4160,25 +4252,25 @@ msgid "Certificates"
 msgstr "憑證"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../src/calendar/gui/e-comp-editor.c:2090
-#: ../src/e-util/e-html-editor-actions.c:1004
+#: ../src/calendar/gui/e-comp-editor.c:2169
+#: ../src/e-util/e-html-editor-actions.c:1109
 msgid "_Undo"
 msgstr "復原(_U)"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../src/calendar/gui/e-comp-editor.c:2092 ../src/e-util/e-focus-tracker.c:147
+#: ../src/calendar/gui/e-comp-editor.c:2171 ../src/e-util/e-focus-tracker.c:147
 #: ../src/e-util/e-focus-tracker.c:150
 msgid "Undo"
 msgstr "復原"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
-#: ../src/calendar/gui/e-comp-editor.c:2097
-#: ../src/e-util/e-html-editor-actions.c:990
+#: ../src/calendar/gui/e-comp-editor.c:2176
+#: ../src/e-util/e-html-editor-actions.c:1095
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
-#: ../src/calendar/gui/e-comp-editor.c:2099 ../src/e-util/e-focus-tracker.c:163
+#: ../src/calendar/gui/e-comp-editor.c:2178 ../src/e-util/e-focus-tracker.c:163
 #: ../src/e-util/e-focus-tracker.c:166
 msgid "Redo"
 msgstr "取消復原"
@@ -4197,90 +4289,90 @@ msgid "Error removing contact"
 msgstr "移除連絡人時發生錯誤"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:740
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3105
 #, c-format
 msgid "Contact Editor — %s"
 msgstr "連絡人編輯器 — %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3245
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3241
 msgid "X.509 certificates"
 msgstr "X.509 憑證"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3246
 msgid "PGP keys"
 msgstr "PGP 金鑰"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3252
 #: ../src/e-util/e-html-editor-actions.c:395
 #: ../src/e-util/e-image-chooser-dialog.c:193
-#: ../src/smime/gui/certificate-manager.c:672
-#: ../src/smime/gui/certificate-manager.c:961
+#: ../src/smime/gui/certificate-manager.c:674
+#: ../src/smime/gui/certificate-manager.c:959
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
 msgid "Open PGP key"
 msgstr "開啟 PGP 金鑰"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
 msgid "Open X.509 certificate"
 msgstr "開啟 X.509 憑證"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3274
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4336
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
 #: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
 #: ../src/e-util/e-html-editor-actions.c:342
 #: ../src/e-util/e-html-editor-actions.c:386
 #: ../src/e-util/e-html-editor-actions.c:489
 #: ../src/e-util/e-image-chooser-dialog.c:182 ../src/plugins/face/face.c:298
-#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:951
+#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:949
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3293
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3521
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3289
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3517
 msgid "Chosen file is not a local file."
 msgstr "已選取的檔案不是本地檔案。"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3306
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3302
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "無法載入憑證:%s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 msgid "Save PGP key"
 msgstr "儲存 PGP 金鑰"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
 msgid "Save X.509 certificate"
 msgstr "儲存 X.509 憑證"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3533
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3529
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "儲存憑證失敗:%s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4333
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4339
 msgid "Please select an image for this contact"
 msgstr "請選取代表此連絡人的影像"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4348
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4344
 msgid "_No image"
 msgstr "沒有影像(_N)"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4711
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4707
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4288,57 +4380,57 @@ msgstr ""
 "連絡人資料無效:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4717
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4713
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "「%s」含有無效的格式"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4725
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4721
 #, c-format
 msgid "“%s” cannot be a future date"
 msgstr "「%s」不能是未來日期"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4733
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4729
 #, c-format
 msgid "%s“%s” has an invalid format"
 msgstr "%s「%s」含有無效的格式"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4746
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4760
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4742
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4756
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s「%s」是空的"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4775
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4771
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:221
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:213
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
-#: ../src/e-util/e-attachment-dialog.c:311
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:306
+#: ../src/e-util/e-attachment-dialog.c:291
 #: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:258
 #: ../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:301
-#: ../src/e-util/e-html-editor-link-dialog.c:243
+#: ../src/e-util/e-html-editor-link-dialog.c:240
 #: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:817
-#: ../src/e-util/e-rule-editor.c:188 ../src/e-util/e-rule-editor.c:299
-#: ../src/e-util/e-rule-editor.c:934 ../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-rule-editor.c:185 ../src/e-util/e-rule-editor.c:296
+#: ../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:357
+#: ../src/e-util/e-source-selector-dialog.c:326
+#: ../src/e-util/e-table-config.c:541 ../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:335 ../src/mail/e-mail-tag-editor.c:162
+#: ../src/mail/e-mail-config-window.c:311 ../src/mail/e-mail-tag-editor.c:162
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
 #: ../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/plugins/publish-calendar/url-editor-dialog.c:418
 #: ../src/shell/e-shell-content.c:643 ../src/shell/e-shell-content.c:749
-#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1333
+#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1331
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "OK"
@@ -4434,7 +4526,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:822
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:825
 msgid "Contact List Editor"
 msgstr "連絡人列表編輯器"
 
@@ -4476,12 +4568,12 @@ msgid "_Top"
 msgstr "頂端(_T)"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3492 ../src/e-util/filter.ui.h:29
+#: ../src/e-util/e-source-selector.c:3673 ../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:3493 ../src/e-util/filter.ui.h:30
+#: ../src/e-util/e-source-selector.c:3674 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "下(_D)"
 
@@ -4490,23 +4582,23 @@ msgstr "下(_D)"
 msgid "_Bottom"
 msgstr "底部(_B)"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:947
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:950
 msgid "Contact List Members"
 msgstr "連絡人列表成員"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1506
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1502
 msgid "_Members"
 msgstr "成員(_M)"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1642
 msgid "Error adding list"
 msgstr "新增列表時發生錯誤"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1662
 msgid "Error modifying list"
 msgstr "編輯列表時發生錯誤"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1686
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1682
 msgid "Error removing list"
 msgstr "移除列表時發生錯誤"
 
@@ -4521,13 +4613,13 @@ msgid "Email begins with"
 msgstr "電子郵件開始於"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../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/calendar/gui/caltypes.xml.in.h:27
+#: ../src/calendar/gui/memotypes.xml.in.h:20
+#: ../src/calendar/gui/tasktypes.xml.in.h:38
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1790
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:807
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1036
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
@@ -4542,27 +4634,27 @@ msgid "Copy _Email Address"
 msgstr "複製電子郵件位址(_E)"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:187
-#: ../src/e-util/e-web-view.c:430
+#: ../src/e-util/e-web-view.c:428
 msgid "Copy the email address to the clipboard"
 msgstr "複製電子郵件位址到剪貼簿"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:192
-#: ../src/e-util/e-web-view.c:442
+#: ../src/e-util/e-web-view.c:440
 msgid "_Send New Message To…"
 msgstr "傳送新郵件至(_S)…"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:194
-#: ../src/e-util/e-web-view.c:444
+#: ../src/e-util/e-web-view.c:442
 msgid "Send a mail message to this address"
 msgstr "傳送郵件到這個位址"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:321
-#: ../src/e-util/e-web-view.c:1668
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:317
+#: ../src/e-util/e-misc-utils.c:4550
 #, c-format
 msgid "Click to mail %s"
 msgstr "按一下來傳送郵件 %s"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:331
 #, c-format
 msgid "Click to open map for %s"
 msgstr "點選以開啟 %s 地圖"
@@ -4575,141 +4667,141 @@ msgstr "開啟地圖"
 msgid "SIP"
 msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:690
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:683
 msgid "List Members:"
 msgstr "列表成員:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:784
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:777
 msgid "Fax"
 msgstr "傳真"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:786
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:779
 msgid "Phone"
 msgstr "電話"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:923
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "暱稱"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:924
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:933
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:926
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:934
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:935
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:928
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:936
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:929
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:938
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
 msgid "Skype"
 msgstr "Skype"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:939
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:994
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "公司"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:995
 msgid "Department"
 msgstr "部門"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:996
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "辦公室"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1004
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:997
 msgid "Profession"
 msgstr "職業"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1005
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:998
 msgid "Position"
 msgstr "位置"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:999
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "主管"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1007
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1000
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "助理"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1008
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
 msgid "Video Chat"
 msgstr "視訊交談"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1010
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1013
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1053
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1079
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1046
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1072
 msgid "Address"
 msgstr "地址"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1042
 msgid "Home Page"
 msgstr "首頁"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1050
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1043
 msgid "Web Log"
 msgstr "網誌"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1056
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "配偶"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1066
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1059
 msgid "Personal"
 msgstr "個人"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1111
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1104
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "備註"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1307
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1293
 msgid "List Members"
 msgstr "列表成員"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1330
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1316
 msgid "Job Title"
 msgstr "職稱"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1371
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1357
 msgid "Home page"
 msgstr "首頁"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1381
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1367
 msgid "Blog"
 msgstr "部落格"
 
@@ -4884,7 +4976,7 @@ msgstr[0] "%d 個連絡人"
 msgid "Error getting book view"
 msgstr "取得書本檢視時發生錯誤"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-model.c:817
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:814
 msgid "Search Interrupted"
 msgstr "搜尋被中斷"
 
@@ -4892,71 +4984,75 @@ msgstr "搜尋被中斷"
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:678
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Cut selected contacts to the clipboard"
 msgstr "剪下選取的連絡人至剪貼簿"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:684
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Copy selected contacts to the clipboard"
 msgstr "複製選取的連絡人至剪貼簿"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:690
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Paste contacts from the clipboard"
 msgstr "從剪貼簿貼上連絡人"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:696
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:675
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Delete selected contacts"
 msgstr "刪除選定的連絡人"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:702
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:681
 msgid "Select all visible contacts"
 msgstr "選擇全部可見的連絡人"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1289
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:922
+msgid "Searching for the Contacts…"
+msgstr "搜尋連絡人..."
+
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "您確定要刪除這些連絡人列表?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1293
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "您確定要刪除這個連絡人列表?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "您確定要刪除這個連絡人列表 (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "您確定要刪除這些連絡人?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "您確定要刪除這個連絡人?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1311
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "您確定要刪除這個連絡人 (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
-#: ../src/calendar/gui/e-comp-editor.c:2048
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../src/calendar/gui/e-comp-editor.c:2127
 #: ../src/e-util/e-accounts-window.c:1753 ../src/e-util/e-focus-tracker.c:816
-#: ../src/e-util/evolution-source-viewer.c:806
-#: ../src/e-util/e-webdav-browser.c:2697
+#: ../src/e-util/evolution-source-viewer.c:800
+#: ../src/e-util/e-webdav-browser.c:2855
 #: ../src/mail/e-mail-account-manager.c:739
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1597
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:697
 #: ../src/modules/calendar/e-task-shell-view-actions.c:851
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1628
-#: ../src/shell/e-shell-window-actions.c:911
-#: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1622
+#: ../src/shell/e-shell-window-actions.c:961
+#: ../src/smime/gui/certificate-manager.c:1654 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "刪除(_D)"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1470
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1476
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -4968,11 +5064,11 @@ msgstr[0] ""
 "開啟 %d 個連絡人會同時開啟 %d 個新視窗。\n"
 "確定要顯示這裡所有的連絡人?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don’t Display"
 msgstr "不要顯示(_D)"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "顯示所有的連絡人(_A)"
 
@@ -5087,7 +5183,7 @@ msgid "Title"
 msgstr "頭銜"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:663
+#: ../src/calendar/gui/e-meeting-list-view.c:660
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "角色"
@@ -5149,15 +5245,15 @@ msgstr "拉近(_I)"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2861
+#: ../src/mail/e-mail-reader.c:2878
 msgid "Zoom _Out"
 msgstr "拉遠(_O)"
 
 #. Search button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
-#: ../src/e-util/e-html-editor-actions.c:2081
+#: ../src/e-util/e-html-editor-actions.c:2206
 #: ../src/e-util/e-html-editor-find-dialog.c:244
-#: ../src/shell/e-shell-window-actions.c:981
+#: ../src/shell/e-shell-window-actions.c:1038
 msgid "_Find"
 msgstr "尋找(_F)"
 
@@ -5222,9 +5318,9 @@ msgstr ""
 #: ../src/addressbook/importers/evolution-csv-importer.c:796
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
-#: ../src/calendar/importers/icalendar-importer.c:499
-#: ../src/calendar/importers/icalendar-importer.c:1003
-#: ../src/calendar/importers/icalendar-importer.c:1043
+#: ../src/calendar/importers/icalendar-importer.c:506
+#: ../src/calendar/importers/icalendar-importer.c:1010
+#: ../src/calendar/importers/icalendar-importer.c:1050
 msgid "Importing…"
 msgstr "匯入…"
 
@@ -5402,13 +5498,13 @@ msgid "Phone"
 msgstr "電話"
 
 #: ../src/calendar/calendar.error.xml.h:1
-msgid "Would you like to send all the participants a cancelation notice?"
+msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "您是否要傳送取消通知給所有的參與者?"
 
 #: ../src/calendar/calendar.error.xml.h:2
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+"If you do not send a cancellation notice, the other participants may not "
+"know the meeting is canceled."
 msgstr "如果不傳送取消通知,其他參與者可能不知道會議已經取消。"
 
 #: ../src/calendar/calendar.error.xml.h:3
@@ -5432,9 +5528,9 @@ msgstr "會刪除此會議的所有資訊而且無法復原。"
 
 #: ../src/calendar/calendar.error.xml.h:8
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr "如果未傳送取消通知,其他參與者可能不知道工作已經刪除。"
+"If you do not send a cancellation notice, the other participants may not "
+"know the task has been deleted."
+msgstr "如果不傳送取消通知,其他參與者可能不知道工作已經刪除。"
 
 #: ../src/calendar/calendar.error.xml.h:9
 #: ../src/calendar/gui/e-cal-dialogs.c:507
@@ -5447,14 +5543,14 @@ msgid "All information on this task will be deleted and can not be restored."
 msgstr "會刪除此工作的所有資訊而且無法復原。"
 
 #: ../src/calendar/calendar.error.xml.h:11
-msgid "Would you like to send a cancelation notice for this memo?"
+msgid "Would you like to send a cancellation notice for this memo?"
 msgstr "您是否要傳送此備忘錄的取消通知?"
 
 #: ../src/calendar/calendar.error.xml.h:12
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
-msgstr "如果未傳送取消通知,其他參與者可能不知道該備忘錄已經刪除。"
+"If you do not send a cancellation notice, the other participants may not "
+"know the memo has been deleted."
+msgstr "如果不傳送取消通知,其他參與者可能不知道該備忘錄已經刪除。"
 
 #: ../src/calendar/calendar.error.xml.h:13
 #: ../src/calendar/gui/e-cal-dialogs.c:510
@@ -6054,7 +6150,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:1929
+#: ../src/e-util/e-collection-account-wizard.c:1985
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6086,25 +6182,25 @@ msgid "is not"
 msgstr "不是"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:9
-#: ../src/calendar/gui/e-cal-list-view.c:263
-#: ../src/calendar/gui/e-cal-model.c:296 ../src/calendar/gui/e-cal-model.c:304
-#: ../src/calendar/gui/e-task-table.c:445
+#: ../src/calendar/gui/e-cal-list-view.c:293
+#: ../src/calendar/gui/e-cal-model.c:293 ../src/calendar/gui/e-cal-model.c:301
+#: ../src/calendar/gui/e-task-table.c:438
 #: ../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:264
-#: ../src/calendar/gui/e-cal-model.c:306 ../src/calendar/gui/e-task-table.c:446
+#: ../src/calendar/gui/e-cal-list-view.c:294
+#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-task-table.c:439
 #: ../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:265
-#: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
+#: ../src/calendar/gui/e-cal-list-view.c:295
+#: ../src/calendar/gui/e-cal-model.c:305 ../src/calendar/gui/e-task-table.c:440
 #: ../src/calendar/gui/memotypes.xml.in.h:12
-#: ../src/e-util/e-html-editor-page-dialog.c:113
+#: ../src/e-util/e-html-editor-page-dialog.c:116
 #: ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "機密"
@@ -6116,7 +6212,7 @@ msgid "Organizer"
 msgstr "會議召集人"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:13
-#: ../src/calendar/gui/e-meeting-list-view.c:623
+#: ../src/calendar/gui/e-meeting-list-view.c:620
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
 #: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
@@ -6126,7 +6222,7 @@ msgstr "出席者"
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:5
 #: ../src/calendar/gui/e-task-table.etspec.h:13
 #: ../src/mail/message-list.etspec.h:14
-#: ../src/plugins/publish-calendar/publish-calendar.c:861
+#: ../src/plugins/publish-calendar/publish-calendar.c:860
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Location"
@@ -6135,7 +6231,7 @@ msgstr "位置"
 #: ../src/calendar/gui/caltypes.xml.in.h:15
 #: ../src/calendar/gui/memotypes.xml.in.h:13
 #: ../src/calendar/gui/tasktypes.xml.in.h:23
-#: ../src/e-util/e-categories-selector.c:328
+#: ../src/e-util/e-categories-selector.c:324
 msgid "Category"
 msgstr "分類"
 
@@ -6166,7 +6262,7 @@ msgid "Do Not Exist"
 msgstr "不存在"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2065
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2097
 msgid "Recurrence"
 msgstr "週期性"
 
@@ -6188,124 +6284,132 @@ msgstr "多於"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:24
 #: ../src/calendar/gui/memotypes.xml.in.h:17
-#: ../src/calendar/gui/tasktypes.xml.in.h:28
-msgid "Summary Contains"
-msgstr "摘要包含"
+#: ../src/calendar/gui/tasktypes.xml.in.h:35
+#: ../src/mail/filtertypes.xml.in.h:23 ../src/mail/searchtypes.xml.in.h:25
+#: ../src/mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "詞句"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:25
 #: ../src/calendar/gui/memotypes.xml.in.h:18
-#: ../src/calendar/gui/tasktypes.xml.in.h:29
+#: ../src/calendar/gui/tasktypes.xml.in.h:36
+msgid "Summary Contains"
+msgstr "摘要包含"
+
+#: ../src/calendar/gui/caltypes.xml.in.h:26
+#: ../src/calendar/gui/memotypes.xml.in.h:19
+#: ../src/calendar/gui/tasktypes.xml.in.h:37
 msgid "Description Contains"
 msgstr "描述包含"
 
-#: ../src/calendar/gui/comp-util.c:1544
-#: ../src/modules/itip-formatter/itip-view.c:2229
+#: ../src/calendar/gui/comp-util.c:1547
+#: ../src/modules/itip-formatter/itip-view.c:2313
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
 msgstr[0] "具有 %d 位客人"
 
-#: ../src/calendar/gui/comp-util.c:1603
+#: ../src/calendar/gui/comp-util.c:1606
 #, c-format
 msgid "Comments: %s"
 msgstr "評論:%s"
 
-#: ../src/calendar/gui/comp-util.c:1617 ../src/calendar/gui/comp-util.c:1620
+#: ../src/calendar/gui/comp-util.c:1620 ../src/calendar/gui/comp-util.c:1623
 msgctxt "iCalendarStatus"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/calendar/gui/comp-util.c:1618
+#: ../src/calendar/gui/comp-util.c:1621
 msgctxt "iCalendarStatus"
 msgid "Tentative"
 msgstr "暫訂"
 
-#: ../src/calendar/gui/comp-util.c:1619
+#: ../src/calendar/gui/comp-util.c:1622
 msgctxt "iCalendarStatus"
 msgid "Confirmed"
 msgstr "已確認"
 
-#: ../src/calendar/gui/comp-util.c:1621
+#: ../src/calendar/gui/comp-util.c:1624
 msgctxt "iCalendarStatus"
 msgid "Draft"
 msgstr "草稿"
 
-#: ../src/calendar/gui/comp-util.c:1622
+#: ../src/calendar/gui/comp-util.c:1625
 msgctxt "iCalendarStatus"
 msgid "Final"
 msgstr "最終"
 
-#: ../src/calendar/gui/comp-util.c:1623
+#: ../src/calendar/gui/comp-util.c:1626
 msgctxt "iCalendarStatus"
 msgid "Not Started"
 msgstr "未開始"
 
-#: ../src/calendar/gui/comp-util.c:1624
+#: ../src/calendar/gui/comp-util.c:1627
 msgctxt "iCalendarStatus"
 msgid "Needs Action"
 msgstr "需要動作"
 
-#: ../src/calendar/gui/comp-util.c:1625
+#: ../src/calendar/gui/comp-util.c:1628
 msgctxt "iCalendarStatus"
 msgid "In Progress"
 msgstr "進行中"
 
-#: ../src/calendar/gui/comp-util.c:1626
+#: ../src/calendar/gui/comp-util.c:1629
 msgctxt "iCalendarStatus"
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/calendar/gui/comp-util.c:1627
+#: ../src/calendar/gui/comp-util.c:1630
 msgctxt "iCalendarStatus"
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../src/calendar/gui/ea-cal-view.c:281
+#: ../src/calendar/gui/ea-cal-view.c:277
 msgid "New Appointment"
 msgstr "新增會議"
 
-#: ../src/calendar/gui/ea-cal-view.c:282
+#: ../src/calendar/gui/ea-cal-view.c:278
 msgid "New All Day Event"
 msgstr "新增全天事件"
 
-#: ../src/calendar/gui/ea-cal-view.c:283
+#: ../src/calendar/gui/ea-cal-view.c:279
 msgid "New Meeting"
 msgstr "新增會議"
 
-#: ../src/calendar/gui/ea-cal-view.c:284
+#: ../src/calendar/gui/ea-cal-view.c:280
 msgid "Go to Today"
 msgstr "移至今日"
 
-#: ../src/calendar/gui/ea-cal-view.c:285
+#: ../src/calendar/gui/ea-cal-view.c:281
 msgid "Go to Date"
 msgstr "移至日期"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:232
+#: ../src/calendar/gui/ea-cal-view-event.c:229
 msgid "It has reminders."
 msgstr "它具有提醒。"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:235
+#: ../src/calendar/gui/ea-cal-view-event.c:232
 msgid "It has recurrences."
 msgstr "它是週期性會議。"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:238
+#: ../src/calendar/gui/ea-cal-view-event.c:235
 msgid "It is a meeting."
 msgstr "這是一項會議。"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:242
+#: ../src/calendar/gui/ea-cal-view-event.c:239
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "行事曆事件:摘要為 %s。"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:246
+#: ../src/calendar/gui/ea-cal-view-event.c:243
 msgid "Calendar Event: It has no summary."
 msgstr "行事曆事件:沒有摘要。"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:269
+#: ../src/calendar/gui/ea-cal-view-event.c:266
 msgid "calendar view event"
 msgstr "行事曆檢視事件"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:501
+#: ../src/calendar/gui/ea-cal-view-event.c:498
 msgid "Grab Focus"
 msgstr "得到焦點"
 
@@ -6362,28 +6466,28 @@ msgstr "按這裡,您可以找到更多事件。"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:387
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2188
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2251
 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:391
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2186
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2249
 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:395
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2192
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2255
 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:399
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2253
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "執行程式"
@@ -6476,7 +6580,7 @@ msgid "calendar view for one or more weeks"
 msgstr "用於一或多週的行事曆檢視"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:237
-#: ../src/e-util/e-filter-rule.c:986 ../src/mail/e-mail-config-page.c:124
+#: ../src/e-util/e-filter-rule.c:1015 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "無標題"
 
@@ -6485,9 +6589,9 @@ msgid "Categories:"
 msgstr "分類:"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:288
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1635
-#: ../src/modules/itip-formatter/itip-view.c:1746
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:280
+#: ../src/modules/itip-formatter/itip-view.c:1703
+#: ../src/modules/itip-formatter/itip-view.c:1815
 msgid "Location:"
 msgstr "位置:"
 
@@ -6503,75 +6607,75 @@ msgstr "結束日期:"
 msgid "Due Date:"
 msgstr "截止日期:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:326
+#: ../src/calendar/gui/e-cal-component-preview.c:327
 msgid "Recurs:"
 msgstr "循環︰"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:338
-#: ../src/modules/itip-formatter/itip-view.c:1638
-#: ../src/modules/itip-formatter/itip-view.c:1755
+#: ../src/calendar/gui/e-cal-component-preview.c:339
+#: ../src/modules/itip-formatter/itip-view.c:1707
+#: ../src/modules/itip-formatter/itip-view.c:1827
 msgid "Status:"
 msgstr "狀態:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:347
-#: ../src/calendar/gui/e-task-table.c:471
+#: ../src/calendar/gui/e-cal-component-preview.c:348
+#: ../src/calendar/gui/e-task-table.c:464
 #: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:334
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:338
 msgid "High"
 msgstr "高"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:349
-#: ../src/calendar/gui/e-cal-model.c:1872
-#: ../src/calendar/gui/e-task-table.c:472
+#: ../src/calendar/gui/e-cal-component-preview.c:350
+#: ../src/calendar/gui/e-cal-model.c:1873
+#: ../src/calendar/gui/e-task-table.c:465
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
-#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:333
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:337
 msgid "Normal"
 msgstr "一般"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:351
-#: ../src/calendar/gui/e-task-table.c:473
+#: ../src/calendar/gui/e-cal-component-preview.c:352
+#: ../src/calendar/gui/e-task-table.c:466
 #: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:332
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:336
 msgid "Low"
 msgstr "低"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:353
+#: ../src/calendar/gui/e-cal-component-preview.c:354
 msgid "Priority:"
 msgstr "優先等級:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:365
+#: ../src/calendar/gui/e-cal-component-preview.c:366
 msgid "Organizer:"
 msgstr "會議召集人:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:406
+#: ../src/calendar/gui/e-cal-component-preview.c:407
 msgid "Attendees:"
 msgstr "出席者:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:453
-#: ../src/mail/e-mail-config-service-page.c:533
+#: ../src/calendar/gui/e-cal-component-preview.c:454
+#: ../src/mail/e-mail-config-service-page.c:522
 msgid "Description:"
 msgstr "描述:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:507
+#: ../src/calendar/gui/e-cal-component-preview.c:508
 msgid "Web Page:"
 msgstr "網頁:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1753
+#: ../src/calendar/gui/e-cal-data-model.c:1733
 #, c-format
 msgid "Creating view for calendar “%s”"
 msgstr "正在建立行事曆「%s」的檢視"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1757
+#: ../src/calendar/gui/e-cal-data-model.c:1737
 #, c-format
 msgid "Creating view for task list “%s”"
 msgstr "正在建立工作列表「%s」的檢視"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1761
+#: ../src/calendar/gui/e-cal-data-model.c:1741
 #, c-format
 msgid "Creating view for memo list “%s”"
 msgstr "正在建立備忘錄列表「%s」的檢視"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1976
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1994
 msgid "Destination is read only"
 msgstr "目的地是唯讀"
 
@@ -6603,7 +6707,7 @@ msgid "Select Date"
 msgstr "選擇日期"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:689
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
 msgid "Select _Today"
 msgstr "選擇今天(_T)"
 
@@ -6691,86 +6795,128 @@ msgstr "此例項和以後的例項"
 msgid "All Instances"
 msgstr "所有例項"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1173
-#: ../src/calendar/gui/e-cal-dialogs.c:1255
+#: ../src/calendar/gui/e-cal-dialogs.c:1171
+#: ../src/calendar/gui/e-cal-dialogs.c:1253
 msgid "Send my reminders with this event"
 msgstr "將我的提醒與這個事件一起送出"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1175
-#: ../src/calendar/gui/e-cal-dialogs.c:1257
+#: ../src/calendar/gui/e-cal-dialogs.c:1173
+#: ../src/calendar/gui/e-cal-dialogs.c:1255
 msgid "Notify new attendees _only"
 msgstr "只通知新的出席者(_O)"
 
-#: ../src/calendar/gui/e-calendar-view.c:478
+#: ../src/calendar/gui/e-calendar-view.c:481
 msgid "Cut selected events to the clipboard"
 msgstr "剪下選取的事件至剪貼簿"
 
-#: ../src/calendar/gui/e-calendar-view.c:484
+#: ../src/calendar/gui/e-calendar-view.c:487
 msgid "Copy selected events to the clipboard"
 msgstr "複製選取的事件至剪貼簿"
 
-#: ../src/calendar/gui/e-calendar-view.c:490
+#: ../src/calendar/gui/e-calendar-view.c:493
 msgid "Paste events from the clipboard"
 msgstr "從剪貼簿貼上事件"
 
-#: ../src/calendar/gui/e-calendar-view.c:496
+#: ../src/calendar/gui/e-calendar-view.c:499
 msgid "Delete selected events"
 msgstr "刪除選取的事件"
 
-#: ../src/calendar/gui/e-calendar-view.c:906
+#: ../src/calendar/gui/e-calendar-view.c:910
 msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr "貼上的文字並未包含有效的 iCalendar 資料"
 
-#: ../src/calendar/gui/e-calendar-view.c:917
-#: ../src/calendar/gui/e-cal-ops.c:1567
+#: ../src/calendar/gui/e-calendar-view.c:921
+#: ../src/calendar/gui/e-cal-ops.c:1585
 msgid "Default calendar not found"
 msgstr "找不到預設行事曆"
 
-#: ../src/calendar/gui/e-calendar-view.c:922
-#: ../src/calendar/gui/e-cal-ops.c:1570
+#: ../src/calendar/gui/e-calendar-view.c:926
+#: ../src/calendar/gui/e-cal-ops.c:1588
 msgid "Default memo list not found"
 msgstr "找不到預設備忘錄列表"
 
-#: ../src/calendar/gui/e-calendar-view.c:927
-#: ../src/calendar/gui/e-cal-ops.c:1573
+#: ../src/calendar/gui/e-calendar-view.c:931
+#: ../src/calendar/gui/e-cal-ops.c:1591
 msgid "Default task list not found"
 msgstr "找不到預設工作列表"
 
-#: ../src/calendar/gui/e-calendar-view.c:1019
+#: ../src/calendar/gui/e-calendar-view.c:1023
 msgid "No suitable component found"
 msgstr "找不到合適的元件"
 
-#: ../src/calendar/gui/e-calendar-view.c:1089
+#: ../src/calendar/gui/e-calendar-view.c:1093
 msgid "Pasting iCalendar data"
 msgstr "貼上 iCalendar 資料"
 
+#: ../src/calendar/gui/e-calendar-view.c:1154
+#: ../src/calendar/gui/e-calendar-view.c:1157
+#: ../src/calendar/gui/e-calendar-view.c:1160
+#: ../src/calendar/gui/e-calendar-view.c:1161
+msgid "%d %b %Y"
+msgstr "%Y年%m月%d日"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. 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:1156
+#: ../src/calendar/gui/e-day-view.c:3073
+#: ../src/calendar/gui/e-day-view-top-item.c:854
+#: ../src/calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%m月%d日"
+
+#: ../src/calendar/gui/e-calendar-view.c:1167
+msgid "%A %d %b %Y"
+msgstr "%Y年%m月%d日%A"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %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:1169
+#: ../src/calendar/gui/e-day-view.c:3057
+#: ../src/calendar/gui/e-day-view-top-item.c:850
+#: ../src/calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%m月%d日 (%a)"
+
+#: ../src/calendar/gui/e-calendar-view.c:1170
+#: ../src/calendar/gui/e-calendar-view.c:1172
+#: ../src/calendar/gui/e-calendar-view.c:1173
+msgid "%a %d %b %Y"
+msgstr "%Y年%m月%d日 (%a)"
+
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1889
-#: ../src/calendar/gui/e-memo-table.c:572
-#: ../src/calendar/gui/e-task-table.c:736
+#: ../src/calendar/gui/e-calendar-view.c:1965
+#: ../src/calendar/gui/e-memo-table.c:561
+#: ../src/calendar/gui/e-task-table.c:730
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "召集人: %s <%s>"
 
-#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1892
-#: ../src/calendar/gui/e-memo-table.c:577
-#: ../src/calendar/gui/e-task-table.c:740
+#: ../src/calendar/gui/e-calendar-view.c:1968
+#: ../src/calendar/gui/e-memo-table.c:566
+#: ../src/calendar/gui/e-task-table.c:734
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
 #. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
-#: ../src/calendar/gui/e-calendar-view.c:1911
+#: ../src/calendar/gui/e-calendar-view.c:1987
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-task-table.c:758
+#: ../src/calendar/gui/e-task-table.c:752
 #: ../src/calendar/gui/e-to-do-pane.c:377 ../src/calendar/gui/print.c:3627
 #, c-format
 msgid "Location: %s"
@@ -6778,63 +6924,43 @@ msgstr "位置:%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
 #. Translators: It will display "Time: StartDateAndTime (Duration)"
-#: ../src/calendar/gui/e-calendar-view.c:1970
+#: ../src/calendar/gui/e-calendar-view.c:2046
 #: ../src/calendar/gui/e-to-do-pane.c:480
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
 
+#: ../src/calendar/gui/e-calendar-view.c:2115
+#: ../src/calendar/gui/e-memo-table.c:660
+#: ../src/calendar/gui/e-task-table.c:882
+#: ../src/calendar/gui/e-to-do-pane.c:590 ../src/e-util/e-misc-utils.c:4614
+#: ../src/e-util/e-text.c:566 ../src/e-util/e-web-view.c:4175
+#| msgid "Cell…"
+msgid "…"
+msgstr "…"
+
 #. Translators: the '%s' stands for a component summary, the '%d' for the years.
 #. The string is used for Birthday & Anniversary events where the first year is
 #. know, constructing a summary which also shows how many years the birthday or
 #. anniversary is for. Example: "Birthday: John Doe (13)"
-#: ../src/calendar/gui/e-calendar-view.c:2117
+#: ../src/calendar/gui/e-calendar-view.c:2233
 #, c-format
 msgctxt "BirthdaySummary"
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: ../src/calendar/gui/e-calendar-view.c:2318
-#: ../src/calendar/gui/e-calendar-view.c:2321
-#: ../src/calendar/gui/e-calendar-view.c:2324
-#: ../src/calendar/gui/e-calendar-view.c:2325
-msgid "%d %b %Y"
-msgstr "%Y年%m月%d日"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. 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:2320
-#: ../src/calendar/gui/e-day-view.c:3079
-#: ../src/calendar/gui/e-day-view-top-item.c:858
-#: ../src/calendar/gui/e-week-view-main-item.c:228
-msgid "%d %b"
-msgstr "%m月%d日"
-
-#: ../src/calendar/gui/e-calendar-view.c:2331
-msgid "%A %d %b %Y"
-msgstr "%Y年%m月%d日%A"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %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:2333
-#: ../src/calendar/gui/e-day-view.c:3063
-#: ../src/calendar/gui/e-day-view-top-item.c:854
-#: ../src/calendar/gui/e-week-view-main-item.c:214
-msgid "%a %d %b"
-msgstr "%m月%d日 (%a)"
+#: ../src/calendar/gui/e-cal-list-view.c:116
+#, c-format
+msgid "%d appointment"
+msgid_plural "%d appointments"
+msgstr[0] "%d 會議"
 
-#: ../src/calendar/gui/e-calendar-view.c:2334
-#: ../src/calendar/gui/e-calendar-view.c:2336
-#: ../src/calendar/gui/e-calendar-view.c:2337
-msgid "%a %d %b %Y"
-msgstr "%Y年%m月%d日 (%a)"
+#: ../src/calendar/gui/e-cal-list-view.c:120
+#: ../src/modules/calendar/e-memo-shell-view-private.c:365
+#: ../src/modules/calendar/e-task-shell-view-private.c:574
+#, c-format
+msgid "%d selected"
+msgstr "已選擇 %d 個"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:1
 #: ../src/calendar/gui/e-memo-table.etspec.h:5
@@ -6868,8 +6994,8 @@ 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-list-view.etspec.h:10
-#: ../src/calendar/gui/e-cal-model.c:3846
-#: ../src/calendar/gui/e-meeting-list-view.c:692
+#: ../src/calendar/gui/e-cal-model.c:3847
+#: ../src/calendar/gui/e-meeting-list-view.c:689
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-memo-table.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -6880,115 +7006,115 @@ msgid "Status"
 msgstr "狀態"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:11
-#: ../src/calendar/gui/e-meeting-list-view.c:649
+#: ../src/calendar/gui/e-meeting-list-view.c:646
 #: ../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:1443
 #: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:1970
-#: ../src/e-util/e-webdav-browser.c:2390
+#: ../src/e-util/e-collection-account-wizard.c:2026
+#: ../src/e-util/e-webdav-browser.c:2528
 #: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "類型"
 
-#: ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-meeting-list-view.c:183
-#: ../src/calendar/gui/e-meeting-list-view.c:197
+#: ../src/calendar/gui/e-cal-model.c:307
+#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../src/calendar/gui/e-meeting-store.c:170
 #: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1265
 #: ../src/calendar/gui/print.c:1282 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3395
-#: ../src/modules/itip-formatter/itip-view.c:6440
+#: ../src/modules/itip-formatter/itip-view.c:3444
+#: ../src/modules/itip-formatter/itip-view.c:6436
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:615
-#: ../src/calendar/gui/e-cal-ops.c:1252
+#: ../src/calendar/gui/e-cal-model.c:1366 ../src/calendar/gui/e-cal-ops.c:629
+#: ../src/calendar/gui/e-cal-ops.c:1270
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:391
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:191
-#: ../src/calendar/gui/e-cal-ops.c:1369
+#: ../src/calendar/gui/e-cal-model.c:1477 ../src/calendar/gui/e-cal-ops.c:194
+#: ../src/calendar/gui/e-cal-ops.c:1387
 msgid "Creating an event"
 msgstr "建立一個事件"
 
-#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:195
-#: ../src/calendar/gui/e-cal-ops.c:1373
+#: ../src/calendar/gui/e-cal-model.c:1481 ../src/calendar/gui/e-cal-ops.c:198
+#: ../src/calendar/gui/e-cal-ops.c:1391
 msgid "Creating a memo"
 msgstr "建立一份備忘錄"
 
-#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:199
-#: ../src/calendar/gui/e-cal-ops.c:1377
+#: ../src/calendar/gui/e-cal-model.c:1485 ../src/calendar/gui/e-cal-ops.c:202
+#: ../src/calendar/gui/e-cal-ops.c:1395
 msgid "Creating a task"
 msgstr "建立一項工作"
 
-#: ../src/calendar/gui/e-cal-model.c:1874
+#: ../src/calendar/gui/e-cal-model.c:1875
 msgid "Recurring"
 msgstr "週期性模式"
 
-#: ../src/calendar/gui/e-cal-model.c:1876
+#: ../src/calendar/gui/e-cal-model.c:1877
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model.c:1880
 #: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "Yes"
 msgstr "是"
 
-#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model.c:1880
 #: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "No"
 msgstr "否"
 
-#: ../src/calendar/gui/e-cal-model.c:3787
-#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-cal-model.c:3788
+#: ../src/calendar/gui/e-meeting-list-view.c:205
 #: ../src/calendar/gui/e-meeting-store.c:179
 #: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/modules/itip-formatter/itip-view.c:6428
+#: ../src/modules/itip-formatter/itip-view.c:6424
 msgid "Accepted"
 msgstr "接受"
 
-#: ../src/calendar/gui/e-cal-model.c:3788
-#: ../src/calendar/gui/e-meeting-list-view.c:209
+#: ../src/calendar/gui/e-cal-model.c:3789
+#: ../src/calendar/gui/e-meeting-list-view.c:206
 #: ../src/calendar/gui/e-meeting-store.c:181
 #: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/modules/itip-formatter/itip-view.c:6434
+#: ../src/modules/itip-formatter/itip-view.c:6430
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../src/calendar/gui/e-cal-model.c:3789
-#: ../src/calendar/gui/e-meeting-list-view.c:210
+#: ../src/calendar/gui/e-cal-model.c:3790
+#: ../src/calendar/gui/e-meeting-list-view.c:207
 #: ../src/calendar/gui/e-meeting-store.c:183
 #: ../src/calendar/gui/e-meeting-store.c:206
 #: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "暫訂"
 
-#: ../src/calendar/gui/e-cal-model.c:3790
-#: ../src/calendar/gui/e-meeting-list-view.c:211
+#: ../src/calendar/gui/e-cal-model.c:3791
+#: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:185
 #: ../src/calendar/gui/e-meeting-store.c:208
-#: ../src/modules/itip-formatter/itip-view.c:6437
+#: ../src/modules/itip-formatter/itip-view.c:6433
 msgid "Delegated"
 msgstr "已委派"
 
-#: ../src/calendar/gui/e-cal-model.c:3791
+#: ../src/calendar/gui/e-cal-model.c:3792
 msgid "Needs action"
 msgstr "需要動作"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:91
-#: ../src/calendar/gui/e-task-table.c:529
+#: ../src/calendar/gui/e-task-table.c:523
 msgid "Free"
 msgstr "空閒"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:94
 #: ../src/calendar/gui/e-meeting-time-sel.c:524
-#: ../src/calendar/gui/e-task-table.c:530
+#: ../src/calendar/gui/e-task-table.c:524
 msgid "Busy"
 msgstr "忙碌"
 
@@ -7006,155 +7132,155 @@ msgstr ""
 msgid "In Progress"
 msgstr "進行中"
 
-#: ../src/calendar/gui/e-cal-ops.c:311
+#: ../src/calendar/gui/e-cal-ops.c:317
 msgid "Modifying an event"
 msgstr "修改一個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:315
+#: ../src/calendar/gui/e-cal-ops.c:321
 msgid "Modifying a memo"
 msgstr "修改一份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:319
+#: ../src/calendar/gui/e-cal-ops.c:325
 msgid "Modifying a task"
 msgstr "修改一項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:417 ../src/calendar/gui/e-to-do-pane.c:2074
+#: ../src/calendar/gui/e-cal-ops.c:426 ../src/calendar/gui/e-to-do-pane.c:2074
 msgid "Removing an event"
 msgstr "移除一個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:421 ../src/calendar/gui/e-to-do-pane.c:2078
+#: ../src/calendar/gui/e-cal-ops.c:430 ../src/calendar/gui/e-to-do-pane.c:2078
 msgid "Removing a memo"
 msgstr "移除一份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:425 ../src/calendar/gui/e-to-do-pane.c:2082
+#: ../src/calendar/gui/e-cal-ops.c:434 ../src/calendar/gui/e-to-do-pane.c:2082
 msgid "Removing a task"
 msgstr "移除一項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:513
+#: ../src/calendar/gui/e-cal-ops.c:522
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "刪除 %d 個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:517
+#: ../src/calendar/gui/e-cal-ops.c:526
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "刪除 %d 份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:521
+#: ../src/calendar/gui/e-cal-ops.c:530
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "刪除 %d 項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:727
+#: ../src/calendar/gui/e-cal-ops.c:741
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "貼上 %d 個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:742
+#: ../src/calendar/gui/e-cal-ops.c:756
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "貼上 %d 份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:757
+#: ../src/calendar/gui/e-cal-ops.c:771
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "貼上 %d 項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:853
+#: ../src/calendar/gui/e-cal-ops.c:871
 msgid "Updating an event"
 msgstr "更新一個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:857
+#: ../src/calendar/gui/e-cal-ops.c:875
 msgid "Updating a memo"
 msgstr "更新一則備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:861
+#: ../src/calendar/gui/e-cal-ops.c:879
 msgid "Updating a task"
 msgstr "更新一項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:974
+#: ../src/calendar/gui/e-cal-ops.c:992
 #, c-format
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "正在取得在行事曆「%s」中要清空的事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:978
+#: ../src/calendar/gui/e-cal-ops.c:996
 #, c-format
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "正在取得在備忘錄列表「%s」中要清空的備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:982
+#: ../src/calendar/gui/e-cal-ops.c:1000
 #, c-format
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "正在取得在工作列表「%s」中要清空的工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:1008
+#: ../src/calendar/gui/e-cal-ops.c:1026
 #, c-format
 msgid "Purging events in the calendar “%s”"
 msgstr "正在清空行事曆「%s」中的事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:1012
+#: ../src/calendar/gui/e-cal-ops.c:1030
 #, c-format
 msgid "Purging memos in the memo list “%s”"
 msgstr "正在清空備忘錄列表「%s」中的備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:1016
+#: ../src/calendar/gui/e-cal-ops.c:1034
 #, c-format
 msgid "Purging tasks in the task list “%s”"
 msgstr "正在清空工作列表「%s」中的工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:1111
+#: ../src/calendar/gui/e-cal-ops.c:1129
 msgid "Purging events"
 msgstr "正在清除事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:1115
+#: ../src/calendar/gui/e-cal-ops.c:1133
 msgid "Purging memos"
 msgstr "正在清除備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:1119
+#: ../src/calendar/gui/e-cal-ops.c:1137
 msgid "Purging tasks"
 msgstr "正在清除工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:1221
+#: ../src/calendar/gui/e-cal-ops.c:1239
 msgid "Expunging completed tasks"
 msgstr "清除已完成的工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:2069
+#: ../src/calendar/gui/e-cal-ops.c:2087
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "移個 %d 個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:2070
+#: ../src/calendar/gui/e-cal-ops.c:2088
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "正在複製 %d 個事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:2076
+#: ../src/calendar/gui/e-cal-ops.c:2094
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "正在移動 %d 份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:2077
+#: ../src/calendar/gui/e-cal-ops.c:2095
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "正在複製 %d 份備忘錄"
 
-#: ../src/calendar/gui/e-cal-ops.c:2083
+#: ../src/calendar/gui/e-cal-ops.c:2101
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "正在移動 %d 項工作"
 
-#: ../src/calendar/gui/e-cal-ops.c:2084
+#: ../src/calendar/gui/e-cal-ops.c:2102
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -7183,208 +7309,219 @@ msgstr ""
 msgid "Event’s time is in the past"
 msgstr "事件的時刻在過去"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:210
+#: ../src/calendar/gui/e-comp-editor-event.c:204
 msgid ""
 "Event cannot be edited, because the selected calendar could not be opened"
 msgstr "不能編輯事件,因為選取的行事曆無法開啟"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:212
+#: ../src/calendar/gui/e-comp-editor-event.c:206
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "不能編輯事件,因為選取的行事曆是唯讀的"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:214
-msgid "Event cannot be fully edited, because you are not the organizer"
-msgstr "不能完整的編輯事件,因為您不是召集人"
+#: ../src/calendar/gui/e-comp-editor-event.c:208
+msgid ""
+"Changes made to the event will not be sent to the attendees, because you are "
+"not the organizer"
+msgstr "對事件的變更不能傳送給出席者,因為您不是召集人"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:506
-#: ../src/calendar/gui/e-comp-editor-task.c:591
+#: ../src/calendar/gui/e-comp-editor-event.c:500
+#: ../src/calendar/gui/e-comp-editor-task.c:584
 msgid "Start date is not a valid date"
 msgstr "開始日期不是有效的日期"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:508
+#: ../src/calendar/gui/e-comp-editor-event.c:502
 msgid "Start time is not a valid time"
 msgstr "開始時刻不是有效的時刻"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:512
-#: ../src/calendar/gui/e-comp-editor-event.c:528
+#: ../src/calendar/gui/e-comp-editor-event.c:506
+#: ../src/calendar/gui/e-comp-editor-event.c:522
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:338
+#: ../src/calendar/gui/e-comp-editor.c:340
+#: ../src/composer/e-composer-actions.c:180
 #: ../src/em-format/e-mail-part-secure-button.c:97
-#: ../src/e-util/e-misc-utils.c:4262 ../src/e-util/e-misc-utils.c:4274
-#: ../src/e-util/e-misc-utils.c:4288 ../src/mail/e-mail-autoconfig.c:1041
-#: ../src/mail/e-mail-display.c:2359 ../src/mail/e-mail-reader-utils.c:805
-#: ../src/mail/em-composer-utils.c:3838 ../src/mail/em-composer-utils.c:3869
-#: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1493
+#: ../src/e-util/e-misc-utils.c:4003 ../src/e-util/e-misc-utils.c:4015
+#: ../src/e-util/e-misc-utils.c:4029 ../src/mail/e-mail-autoconfig.c:1041
+#: ../src/mail/e-mail-display.c:2449 ../src/mail/e-mail-notes.c:875
+#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3820
+#: ../src/mail/em-composer-utils.c:3851 ../src/mail/mail-send-recv.c:598
+#: ../src/mail/mail-send-recv.c:1493
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
 #: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
-#: ../src/shell/e-shell.c:1260 ../src/smime/gui/certificate-manager.c:357
+#: ../src/shell/e-shell.c:1260 ../src/smime/gui/certificate-manager.c:360
 #, c-format
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:522
+#: ../src/calendar/gui/e-comp-editor-event.c:516
 msgid "End date is not a valid date"
 msgstr "結束日期不是有效的日期"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:524
+#: ../src/calendar/gui/e-comp-editor-event.c:518
 msgid "End time is not a valid time"
 msgstr "結束時刻不是有效的時刻"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:726
-#: ../src/calendar/gui/e-comp-editor-memo.c:134
-#: ../src/calendar/gui/e-comp-editor-task.c:704
+#: ../src/calendar/gui/e-comp-editor-event.c:713
+#: ../src/calendar/gui/e-comp-editor-memo.c:249
+#: ../src/calendar/gui/e-comp-editor-task.c:697
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:728
-#: ../src/calendar/gui/e-comp-editor-memo.c:136
-#: ../src/calendar/gui/e-comp-editor-task.c:706
+#: ../src/calendar/gui/e-comp-editor-event.c:715
+#: ../src/calendar/gui/e-comp-editor-memo.c:251
+#: ../src/calendar/gui/e-comp-editor-task.c:699
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:734
-#: ../src/calendar/gui/e-comp-editor-task.c:712
+#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-task.c:705
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:736
-#: ../src/calendar/gui/e-comp-editor-task.c:714
+#: ../src/calendar/gui/e-comp-editor-event.c:723
+#: ../src/calendar/gui/e-comp-editor-task.c:707
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:742
+#: ../src/calendar/gui/e-comp-editor-event.c:729
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:744
+#: ../src/calendar/gui/e-comp-editor-event.c:731
 msgid "Toggles whether to have All Day Event"
 msgstr "切換是否要有全天事件"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:750
+#: ../src/calendar/gui/e-comp-editor-event.c:737
 msgid "Show Time as _Busy"
 msgstr "顯示時間為忙碌(_B)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:752
+#: ../src/calendar/gui/e-comp-editor-event.c:739
 msgid "Toggles whether to show time as busy"
 msgstr "切換是否將時間顯示為忙碌"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:761
+#: ../src/calendar/gui/e-comp-editor-event.c:748
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:763
+#: ../src/calendar/gui/e-comp-editor-event.c:750
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:768
+#: ../src/calendar/gui/e-comp-editor-event.c:755
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:770
+#: ../src/calendar/gui/e-comp-editor-event.c:757
 msgid "Classify as private"
 msgstr "歸類為私人"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:775
+#: ../src/calendar/gui/e-comp-editor-event.c:762
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:777
+#: ../src/calendar/gui/e-comp-editor-event.c:764
 msgid "Classify as confidential"
 msgstr "歸類為機密"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:895
+#: ../src/calendar/gui/e-comp-editor-event.c:882
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:900
+#: ../src/calendar/gui/e-comp-editor-event.c:887
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:910
+#: ../src/calendar/gui/e-comp-editor-event.c:897
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "全天事件(_Y)"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:978
-#: ../src/calendar/gui/e-comp-editor-memo.c:232
-#: ../src/calendar/gui/e-comp-editor-task.c:882
+#: ../src/calendar/gui/e-comp-editor-event.c:965
+#: ../src/calendar/gui/e-comp-editor-memo.c:350
+#: ../src/calendar/gui/e-comp-editor-task.c:875
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "一般"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:981
-#: ../src/calendar/gui/e-comp-editor-task.c:905
+#: ../src/calendar/gui/e-comp-editor-event.c:968
+#: ../src/calendar/gui/e-comp-editor-task.c:898
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "提醒"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:984
-#: ../src/calendar/gui/e-comp-editor-task.c:909
+#: ../src/calendar/gui/e-comp-editor-event.c:971
+#: ../src/calendar/gui/e-comp-editor-task.c:902
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "週期性"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:987
-#: ../src/calendar/gui/e-comp-editor-memo.c:235
-#: ../src/calendar/gui/e-comp-editor-task.c:913
+#: ../src/calendar/gui/e-comp-editor-event.c:974
+#: ../src/calendar/gui/e-comp-editor-memo.c:353
+#: ../src/calendar/gui/e-comp-editor-task.c:906
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "附件"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:997
+#: ../src/calendar/gui/e-comp-editor-event.c:984
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "排程"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1032
+#: ../src/calendar/gui/e-comp-editor-event.c:1019
 #, c-format
 msgid "Meeting — %s"
 msgstr "會議 — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1033
+#: ../src/calendar/gui/e-comp-editor-event.c:1020
 #, c-format
 msgid "Appointment — %s"
 msgstr "約會 — %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:96
+#: ../src/calendar/gui/e-comp-editor-memo.c:59
+#: ../src/calendar/gui/e-comp-editor-memo.c:88
+msgid "New note"
+msgstr "新增筆記"
+
+#: ../src/calendar/gui/e-comp-editor-memo.c:211
 msgid ""
 "Memo cannot be edited, because the selected memo list could not be opened"
 msgstr "不能編輯備忘錄,因為選取的備忘錄列表無法開啟"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:98
+#: ../src/calendar/gui/e-comp-editor-memo.c:213
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "不能編輯備忘錄,因為選取的備忘錄列表是唯讀的"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:100
-msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr "不能完整的編輯備忘錄,因為您不是召集人"
+#: ../src/calendar/gui/e-comp-editor-memo.c:215
+msgid ""
+"Changes made to the memo will not be sent to the attendees, because you are "
+"not the organizer"
+msgstr "對備忘錄的變更不能傳送給出席者,因為您不是召集人"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:196
-#: ../src/calendar/gui/e-comp-editor-task.c:813
+#: ../src/calendar/gui/e-comp-editor-memo.c:311
+#: ../src/calendar/gui/e-comp-editor-task.c:806
 msgid "_List:"
 msgstr "列表(_L):"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:203
-#: ../src/calendar/gui/e-comp-editor-task.c:823
+#: ../src/calendar/gui/e-comp-editor-memo.c:318
+#: ../src/calendar/gui/e-comp-editor-task.c:816
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "開始日期(_R):"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:266
+#: ../src/calendar/gui/e-comp-editor-memo.c:385
 #, c-format
 msgid "Assigned Memo — %s"
 msgstr "指派的備忘錄 — %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:267
+#: ../src/calendar/gui/e-comp-editor-memo.c:386
 #, c-format
 msgid "Memo — %s"
 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:334
+#: ../src/em-format/e-mail-formatter-attachment.c:336
 #: ../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
@@ -7404,173 +7541,174 @@ msgstr "無法載入「%s」"
 msgid "Could not load the attachment"
 msgstr "無法載入附件"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:416
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:411
 msgid ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
 msgstr "還有一些需要下載的附件。請等候下載工作完成。"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:443
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:438
 #, 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:460
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:455
 #, 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:633
-#: ../src/composer/e-composer-actions.c:312
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:628
+#: ../src/composer/e-composer-actions.c:326
 msgid "_Attachment…"
 msgstr "附件(_A)…"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
-#: ../src/composer/e-composer-actions.c:314
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:630
+#: ../src/composer/e-composer-actions.c:328
 #: ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "附加檔案"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:642
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:637
 msgid "_Attachments"
 msgstr "附件(_A)"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:644
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:639
 msgid "Show attachments"
 msgstr "顯示附件"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:797
-#: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:807
+#: ../src/e-util/e-attachment-bar.c:716 ../src/e-util/e-attachment-paned.c:690
 msgid "Icon View"
 msgstr "圖示檢視"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:799
-#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:809
+#: ../src/e-util/e-attachment-bar.c:718 ../src/e-util/e-attachment-paned.c:692
 msgid "List View"
 msgstr "列表檢視"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:392
+#: ../src/calendar/gui/e-comp-editor-page-general.c:322
 #, c-format
 msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr "在出席者列表中找不到出席者「%s」"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:399
+#: ../src/calendar/gui/e-comp-editor-page-general.c:329
 #, c-format
 msgid "Not enough rights to delete attendee “%s”"
 msgstr "沒有足夠的權限刪除出席者「%s」"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:429
+#: ../src/calendar/gui/e-comp-editor-page-general.c:359
 msgid "Failed to delete selected attendee"
 msgid_plural "Failed to delete selected attendees"
 msgstr[0] "刪除選取的出席者失敗"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:543
+#: ../src/calendar/gui/e-comp-editor-page-general.c:473
 msgid "Organizer address is not a valid user mail address"
 msgstr "組織位址不是有效的郵件位址"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:712
+#: ../src/calendar/gui/e-comp-editor-page-general.c:686
 msgid "A_ttendees"
 msgstr "出席者(_T)"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:714
+#: ../src/calendar/gui/e-comp-editor-page-general.c:688
 msgid "Toggles whether the Attendees are displayed"
 msgstr "切換是否顯示出席者"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:723
+#: ../src/calendar/gui/e-comp-editor-page-general.c:697
 msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:725
+#: ../src/calendar/gui/e-comp-editor-page-general.c:699
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:731
+#: ../src/calendar/gui/e-comp-editor-page-general.c:705
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:733
+#: ../src/calendar/gui/e-comp-editor-page-general.c:707
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:739
+#: ../src/calendar/gui/e-comp-editor-page-general.c:713
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:741
+#: ../src/calendar/gui/e-comp-editor-page-general.c:715
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:747
+#: ../src/calendar/gui/e-comp-editor-page-general.c:721
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:749
+#: ../src/calendar/gui/e-comp-editor-page-general.c:723
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切換是否顯示「出席者類型」欄位"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1064
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1032
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1074
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1216
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1042
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1184
 msgid "At least one attendee is required."
 msgstr "最少需要一個出席者。"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1340
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1308
 msgid "Or_ganizer:"
 msgstr "會議召集人(_G):"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1435
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1403
 msgid ""
 "Override color of the event. If not set, then color of the calendar is used."
 msgstr "覆蓋此事件的顏色。 如果沒有設定,會使用行事曆的顏色。"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1437
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1405
 msgid ""
 "Override color of the memo. If not set, then color of the memo list is used."
 msgstr "覆蓋此備忘錄的顏色。 如果沒有設定,會使用備忘錄列表的顏色。"
 
 #. E_SOURCE_EXTENSION_TASK_LIST
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1439
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1407
 msgid ""
 "Override color of the task. If not set, then color of the task list is used."
 msgstr "覆蓋此工作的顏色。 如果沒有設定,會使用工作列表的顏色。"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1450
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1418
 msgctxt "ECompEditor"
 msgid "Atte_ndees…"
 msgstr "出席者(_N)…"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1533
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2285
-#: ../src/calendar/gui/e-comp-editor.c:2113
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1501
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2317
+#: ../src/calendar/gui/e-comp-editor.c:2192
 #: ../src/e-util/e-accounts-window.c:1745
-#: ../src/e-util/e-html-editor-actions.c:1013
-#: ../src/e-util/e-mail-signature-manager.c:358
-#: ../src/e-util/e-webdav-browser.c:2690 ../src/e-util/filter.ui.h:26
+#: ../src/e-util/e-html-editor-actions.c:1118
+#: ../src/e-util/e-mail-signature-manager.c:354
+#: ../src/e-util/e-webdav-browser.c:2848 ../src/e-util/filter.ui.h:26
 #: ../src/mail/e-mail-account-manager.c:730 ../src/mail/e-mail-browser.c:217
-#: ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
+#: ../src/mail/e-mail-label-manager.c:364
+#: ../src/mail/em-folder-properties.c:1362 ../src/mail/mail-config.ui.h:68
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:549
-#: ../src/plugins/email-custom-header/email-custom-header.c:844
+#: ../src/plugins/email-custom-header/email-custom-header.c:831
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../src/plugins/templates/templates.c:469
-#: ../src/shell/e-shell-window-actions.c:1039 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/plugins/sender-validation/sender-validation.c:503
+#: ../src/plugins/templates/templates.c:475
+#: ../src/shell/e-shell-window-actions.c:1103 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:328
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:329
 msgid "Add exception"
 msgstr "加入例外"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:369
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:370
 msgid "Modify exception"
 msgstr "編輯例外"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:502
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:503
 msgid "on"
 msgstr "的"
 
@@ -7578,7 +7716,7 @@ msgstr "的"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:583
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:584
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "第一個"
@@ -7588,7 +7726,7 @@ msgstr "第一個"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:589
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "第二個"
@@ -7597,7 +7735,7 @@ msgstr "第二個"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:594
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "第三個"
@@ -7606,7 +7744,7 @@ msgstr "第三個"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:599
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:600
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "第四個"
@@ -7615,7 +7753,7 @@ msgstr "第四個"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:604
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:605
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "第五個"
@@ -7624,14 +7762,14 @@ msgstr "第五個"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:609
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:610
 msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "最後一個"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:636
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:637
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "其他日期"
@@ -7640,7 +7778,7 @@ msgstr "其他日期"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:642
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:643
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "1日到 10 日"
@@ -7649,7 +7787,7 @@ msgstr "1日到 10 日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:648
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:649
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "11日到 20 日"
@@ -7658,7 +7796,7 @@ msgstr "11日到 20 日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:654
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:655
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "21日到 31 日"
@@ -7666,42 +7804,42 @@ msgstr "21日到 31 日"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:680
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "天"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "星期一"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "星期五"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:688
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "星期日"
@@ -7709,127 +7847,127 @@ msgstr "星期日"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:816
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:817
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "在"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1011
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1091
 msgctxt "ECompEditorPageRecur"
 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:1520
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2077
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1552
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2109
 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:1525
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1557
 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:1530
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1562
 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:1535
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1567
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "這個元件的週期為(_U)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1906
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1938
 msgid "Recurrence exception date is invalid"
 msgstr "週期的例外日期是無效的"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1962
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1994
 msgid "End time of the recurrence is before the start"
 msgstr "週期性事件的結束時刻早於開始時刻"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2005
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2037
 msgid "R_ecurrence"
 msgstr "週期性(_E)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2007
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2039
 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:2109
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2141
 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:2144
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2176
 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:2146
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2178
 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:2148
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2180
 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:2150
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2182
 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:2179
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2211
 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:2181
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2213
 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:2183
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2215
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "永遠"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2199
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性會議。"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2212
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2244
 msgid "Exceptions"
 msgstr "例外"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2277
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2309
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2205
 #: ../src/mail/e-mail-config-identity-page.c:854
 #: ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "加入(_A)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2293
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2150
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2325
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2213
 #: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "移除(_M)"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2301
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2333
 msgid "Preview"
 msgstr "預覽"
 
@@ -7837,16 +7975,16 @@ msgstr "預覽"
 msgid "Send To"
 msgstr "傳送到"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1566
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1629
 msgid "_Reminders"
 msgstr "提醒(_R)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1568
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1631
 msgid "Set or unset reminders"
 msgstr "設定或取消設定提醒"
 
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1680
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1743
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "沒有"
@@ -7854,275 +7992,287 @@ msgstr "沒有"
 #. Translators: This constructs predefined reminder's description, for example "15 minutes before",
 #. "1 hour before", "1 day before", but, if user has set, also more complicated strings like
 #. "2 days 13 hours 1 minute before".
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1690
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1753
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s before"
 msgstr "%s 之前"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1758
 msgctxt "cal-reminders"
 msgid "at the start"
 msgstr "於開始"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1766
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "自訂"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1849
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1912
 msgid "Set a custom predefined time to"
 msgstr "設定自訂預先定義時間為"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1925
 msgctxt "cal-reminders"
 msgid "da_ys"
 msgstr "日(_Y)"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1941
 msgctxt "cal-reminders"
 msgid "_hours"
 msgstr "小時(_H)"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1957
 msgctxt "cal-reminders"
 msgid "_minutes"
 msgstr "分鐘(_M)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1900
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1963
 msgid "_Add time"
 msgstr "加入時間(_A)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1980
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2043
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Reminders"
 msgstr "提醒"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2005
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2068
 msgid "_Reminder"
 msgstr "提醒(_R)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2030
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2093
 msgid "Add custom predefined time"
 msgstr "加入自訂的預先定義時間"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2038
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2101
 msgid "Remove custom predefined times"
 msgstr "移除自訂的預先定義時間"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2223
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2286
 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:2225
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2288
 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:2227
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2290
 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:2244
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2307
 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:2246
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2309
 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:2262
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2325
 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:2264
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2327
 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:2283
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2346
 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:2308
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2371
 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:2345
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2408
 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:2347
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2410
 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:2349
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2412
 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:2386
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2543
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2449
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2606
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "自訂訊息(_M)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2430
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2493
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "自訂提醒音效(_S)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2441
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2504
 msgid "Select a sound file"
 msgstr "選擇聲音檔案"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2469
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2532
 msgid "_Program:"
 msgstr "執行程式(_P):"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2494
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2557
 msgid "_Arguments:"
 msgstr "引數(_A):"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2526
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2589
 msgid "_Send To:"
 msgstr "傳送到(_T):"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:471
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:484
 msgid "_Schedule"
 msgstr "排程(_S)"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:473
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:486
 msgid "Query free / busy information for the attendees"
 msgstr "查詢此出席者的空閒/忙碌資訊"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:91
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:92
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "摘要(_S):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:340
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:387
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "位置(_L):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:473
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:521
 msgctxt "ECompEditor"
 msgid "_Categories…"
 msgstr "分類(_C)…"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:572
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
+msgid "Edit as text"
+msgstr "編輯為文字"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
+msgid "View as text"
+msgstr "檢視為文字"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
+msgid "View as HTML"
+msgstr "檢視為 HTML"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:711
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:704
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1046
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "網頁(_W):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1075
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1417
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "到期日(_U):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1169
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1511
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "完成日期(_C):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1185
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1527
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "公開"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1186
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1528
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "私人"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1187
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1529
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "機密"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1545
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "歸類(_L):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1266
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1608
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "狀態(_S):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1296
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1638
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "未定義"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1297
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1639
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "高"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1298
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1640
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "普通"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1299
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1641
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "低"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1308
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1650
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "優先等級(_Y):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1362
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1704
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "完成百分比:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1443
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1785
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1539
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1881
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "顯示時間為忙碌(_B)"
 
 #. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1960
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2302
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "無"
@@ -8135,229 +8285,231 @@ msgstr "工作的開始時刻在過去"
 msgid "Task’s due date is in the past"
 msgstr "工作的結束時刻在過去"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:530
+#: ../src/calendar/gui/e-comp-editor-task.c:523
 msgid ""
 "Task cannot be edited, because the selected task list could not be opened"
 msgstr "不能編輯工作,因為選取的工作列表無法開啟"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:532
+#: ../src/calendar/gui/e-comp-editor-task.c:525
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "不能編輯工作,因為選取的工作列表是唯讀的"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:534
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "不能完整的編輯工作,因為您不是召集人"
+#: ../src/calendar/gui/e-comp-editor-task.c:527
+msgid ""
+"Changes made to the task will not be sent to the attendees, because you are "
+"not the organizer"
+msgstr "對工作的變更不能傳送給出席者,因為您不是召集人"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:605
+#: ../src/calendar/gui/e-comp-editor-task.c:598
 msgid "Start date is required for recurring tasks"
 msgstr "循環工作需要開始日期"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:621
+#: ../src/calendar/gui/e-comp-editor-task.c:614
 msgid "Due date is not a valid date"
 msgstr "到期日不是有效的日期"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:632
+#: ../src/calendar/gui/e-comp-editor-task.c:625
 msgid "Completed date is not a valid date"
 msgstr "完成日不是有效的日期"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:643
+#: ../src/calendar/gui/e-comp-editor-task.c:636
 msgid "Completed date cannot be in the future"
 msgstr "完成日期不能是未來日期"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:720
+#: ../src/calendar/gui/e-comp-editor-task.c:713
 msgid "All _Day Task"
 msgstr "全天事件(_D)"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:722
+#: ../src/calendar/gui/e-comp-editor-task.c:715
 msgid "Toggles whether to have All Day Task"
 msgstr "切換是否要有全天事件"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:946
+#: ../src/calendar/gui/e-comp-editor-task.c:939
 #, c-format
 msgid "Assigned Task — %s"
 msgstr "指派的工作 — %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:947
+#: ../src/calendar/gui/e-comp-editor-task.c:940
 #, c-format
 msgid "Task — %s"
 msgstr "工作 — %s"
 
-#: ../src/calendar/gui/e-comp-editor.c:253
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:141
+#: ../src/calendar/gui/e-comp-editor.c:255
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:133
 msgid "attachment"
 msgstr "附件"
 
-#: ../src/calendar/gui/e-comp-editor.c:610
+#: ../src/calendar/gui/e-comp-editor.c:613
 msgid "Sending notifications to attendees…"
 msgstr "傳送通知給出席者…"
 
-#: ../src/calendar/gui/e-comp-editor.c:985
-#: ../src/e-util/e-webdav-browser.c:1818
+#: ../src/calendar/gui/e-comp-editor.c:1025
+#: ../src/e-util/e-webdav-browser.c:1925
 msgid "Saving changes…"
 msgstr "正在儲存變更…"
 
-#: ../src/calendar/gui/e-comp-editor.c:1245
+#: ../src/calendar/gui/e-comp-editor.c:1296
 msgid "No Summary"
 msgstr "沒有摘要"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:2027
-#: ../src/composer/e-composer-actions.c:319
+#: ../src/calendar/gui/e-comp-editor.c:2106
+#: ../src/composer/e-composer-actions.c:333
 #: ../src/e-util/e-accounts-window.c:1778
 #: ../src/e-util/e-html-editor-dialog.c:194
-#: ../src/e-util/e-mail-signature-editor.c:309
+#: ../src/e-util/e-mail-signature-editor.c:319
 #: ../src/e-util/e-name-selector-dialog.c:548
-#: ../src/e-util/e-preferences-window.c:399
-#: ../src/e-util/e-table-field-chooser-dialog.c:205
+#: ../src/e-util/e-preferences-window.c:396
+#: ../src/e-util/e-table-field-chooser-dialog.c:197
 #: ../src/mail/e-mail-browser.c:166
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:758
-#: ../src/mail/e-mail-notes.c:964 ../src/mail/em-filter-editor.c:45
-#: ../src/mail/em-folder-properties.c:1458
-#: ../src/mail/em-subscription-editor.c:1741
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
-#: ../src/shell/e-shell-window-actions.c:348
-#: ../src/shell/e-shell-window-actions.c:876
-#: ../src/smime/gui/certificate-manager.c:2196
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:751
+#: ../src/mail/e-mail-notes.c:1015 ../src/mail/em-filter-editor.c:45
+#: ../src/mail/em-folder-properties.c:1487
+#: ../src/mail/em-subscription-editor.c:1734
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:307
+#: ../src/shell/e-shell-window-actions.c:354
+#: ../src/shell/e-shell-window-actions.c:926
+#: ../src/smime/gui/certificate-manager.c:2176
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2029
+#: ../src/calendar/gui/e-comp-editor.c:2108
 msgid "Close the current window"
 msgstr "關閉目前的視窗"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:806
-#: ../src/e-util/e-html-editor-actions.c:969 ../src/e-util/e-text.c:2080
-#: ../src/e-util/e-web-view.c:469 ../src/mail/e-mail-browser.c:173
-#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:897
+#: ../src/calendar/gui/e-comp-editor.c:2113 ../src/e-util/e-focus-tracker.c:806
+#: ../src/e-util/e-html-editor-actions.c:1074 ../src/e-util/e-text.c:2065
+#: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:173
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:947
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2036 ../src/e-util/e-focus-tracker.c:203
+#: ../src/calendar/gui/e-comp-editor.c:2115 ../src/e-util/e-focus-tracker.c:203
 #: ../src/e-util/e-focus-tracker.c:259 ../src/e-util/e-focus-tracker.c:312
-#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:471
-#: ../src/e-util/e-web-view.c:2044 ../src/mail/e-mail-browser.c:175
-#: ../src/shell/e-shell-window-actions.c:899
+#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:469
+#: ../src/e-util/e-web-view.c:2055 ../src/mail/e-mail-browser.c:175
+#: ../src/shell/e-shell-window-actions.c:949
 msgid "Copy the selection"
 msgstr "複製選取的內容"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:801
-#: ../src/e-util/e-html-editor-actions.c:976 ../src/e-util/e-text.c:2066
-#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:904
+#: ../src/calendar/gui/e-comp-editor.c:2120 ../src/e-util/e-focus-tracker.c:801
+#: ../src/e-util/e-html-editor-actions.c:1081 ../src/e-util/e-text.c:2051
+#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:954
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:196
+#: ../src/calendar/gui/e-comp-editor.c:2122 ../src/e-util/e-focus-tracker.c:196
 #: ../src/e-util/e-focus-tracker.c:252 ../src/e-util/e-focus-tracker.c:306
-#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2053
-#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:906
+#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2064
+#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:956
 msgid "Cut the selection"
 msgstr "剪下選取範圍"
 
-#: ../src/calendar/gui/e-comp-editor.c:2050 ../src/e-util/e-focus-tracker.c:217
+#: ../src/calendar/gui/e-comp-editor.c:2129 ../src/e-util/e-focus-tracker.c:217
 #: ../src/e-util/e-focus-tracker.c:273 ../src/e-util/e-focus-tracker.c:817
-#: ../src/shell/e-shell-window-actions.c:913
+#: ../src/shell/e-shell-window-actions.c:963
 msgid "Delete the selection"
 msgstr "刪除選取範圍"
 
-#: ../src/calendar/gui/e-comp-editor.c:2057
+#: ../src/calendar/gui/e-comp-editor.c:2136
 msgid "View help"
 msgstr "檢視求助"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:811
-#: ../src/e-util/e-html-editor-actions.c:983 ../src/e-util/e-text.c:2092
-#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:932
+#: ../src/calendar/gui/e-comp-editor.c:2141 ../src/e-util/e-focus-tracker.c:811
+#: ../src/e-util/e-html-editor-actions.c:1088 ../src/e-util/e-text.c:2077
+#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:982
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:210
+#: ../src/calendar/gui/e-comp-editor.c:2143 ../src/e-util/e-focus-tracker.c:210
 #: ../src/e-util/e-focus-tracker.c:266 ../src/e-util/e-focus-tracker.c:318
-#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2062
-#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:934
+#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2073
+#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:984
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿的內容"
 
-#: ../src/calendar/gui/e-comp-editor.c:2069
-#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2749
+#: ../src/calendar/gui/e-comp-editor.c:2148
+#: ../src/composer/e-composer-actions.c:387 ../src/mail/e-mail-reader.c:2759
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
 msgid "_Print…"
 msgstr "列印(_P)…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2076 ../src/mail/e-mail-reader.c:2756
+#: ../src/calendar/gui/e-comp-editor.c:2155 ../src/mail/e-mail-reader.c:2766
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:838
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1067
 msgid "Pre_view…"
 msgstr "預覽(_V)…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:821
-#: ../src/e-util/e-html-editor-actions.c:997 ../src/e-util/e-web-view.c:486
-#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1002
+#: ../src/calendar/gui/e-comp-editor.c:2162 ../src/e-util/e-focus-tracker.c:821
+#: ../src/e-util/e-html-editor-actions.c:1102 ../src/e-util/e-web-view.c:484
+#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1059
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2085 ../src/e-util/e-focus-tracker.c:224
+#: ../src/calendar/gui/e-comp-editor.c:2164 ../src/e-util/e-focus-tracker.c:224
 #: ../src/e-util/e-focus-tracker.c:280 ../src/e-util/e-focus-tracker.c:822
-#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1004
+#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1061
 msgid "Select all text"
 msgstr "選取所有文字"
 
-#: ../src/calendar/gui/e-comp-editor.c:2106
+#: ../src/calendar/gui/e-comp-editor.c:2185
 msgid "_Classification"
 msgstr "歸類(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2120
-#: ../src/e-util/e-html-editor-actions.c:1020
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:210
-#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:1046
+#: ../src/calendar/gui/e-comp-editor.c:2199
+#: ../src/e-util/e-html-editor-actions.c:1125
+#: ../src/e-util/e-mail-signature-editor.c:333 ../src/mail/e-mail-browser.c:210
+#: ../src/mail/e-mail-notes.c:1029 ../src/shell/e-shell-window-actions.c:1110
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2134
-#: ../src/e-util/e-html-editor-actions.c:1041
+#: ../src/calendar/gui/e-comp-editor.c:2213
+#: ../src/e-util/e-html-editor-actions.c:1146
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2141
-#: ../src/composer/e-composer-actions.c:363
+#: ../src/calendar/gui/e-comp-editor.c:2220
+#: ../src/composer/e-composer-actions.c:377
 msgid "_Options"
 msgstr "選項(_O)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2148
-#: ../src/e-util/e-html-editor-actions.c:1062 ../src/mail/e-mail-browser.c:224
-#: ../src/shell/e-shell-window-actions.c:1089
-#: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
+#: ../src/calendar/gui/e-comp-editor.c:2227
+#: ../src/e-util/e-html-editor-actions.c:1167 ../src/mail/e-mail-browser.c:224
+#: ../src/shell/e-shell-window-actions.c:1153
+#: ../src/smime/gui/certificate-manager.c:1644 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2160
+#: ../src/calendar/gui/e-comp-editor.c:2239
 msgid "Save current changes"
 msgstr "儲存目前的變更"
 
-#: ../src/calendar/gui/e-comp-editor.c:2165
-#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:973
+#: ../src/calendar/gui/e-comp-editor.c:2244
+#: ../src/e-util/e-mail-signature-editor.c:328 ../src/mail/e-mail-notes.c:1024
 msgid "Save and Close"
 msgstr "儲存並關閉"
 
-#: ../src/calendar/gui/e-comp-editor.c:2167
+#: ../src/calendar/gui/e-comp-editor.c:2246
 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:2152 ../src/calendar/gui/e-to-do-pane.c:245
-#: ../src/calendar/gui/e-week-view.c:1756 ../src/calendar/gui/print.c:1076
+#: ../src/calendar/gui/e-day-view.c:2146 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1761 ../src/calendar/gui/print.c:1076
 #: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2663
 #: ../src/calendar/gui/print.c:2683
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2155 ../src/calendar/gui/e-to-do-pane.c:249
-#: ../src/calendar/gui/e-week-view.c:1759 ../src/calendar/gui/print.c:1081
+#: ../src/calendar/gui/e-day-view.c:2149 ../src/calendar/gui/e-to-do-pane.c:249
+#: ../src/calendar/gui/e-week-view.c:1764 ../src/calendar/gui/print.c:1081
 #: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2668
 #: ../src/calendar/gui/print.c:2685
 msgid "pm"
@@ -8369,15 +8521,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:3046
-#: ../src/calendar/gui/e-day-view-top-item.c:850
-#: ../src/calendar/gui/e-week-view-main-item.c:205
+#: ../src/calendar/gui/e-day-view.c:3040
+#: ../src/calendar/gui/e-day-view-top-item.c:846
+#: ../src/calendar/gui/e-week-view-main-item.c:207
 #: ../src/calendar/gui/print.c:2117
 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:3787
+#: ../src/calendar/gui/e-day-view.c:3780
 #, c-format
 msgid "Week %d"
 msgstr "第 %d 週"
@@ -8388,17 +8540,17 @@ msgstr "第 %d 週"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../src/calendar/gui/e-day-view-time-item.c:811
+#: ../src/calendar/gui/e-day-view-time-item.c:817
 #, c-format
 msgid "%02i minute divisions"
 msgstr "間隔 %02i 分鐘"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:836
+#: ../src/calendar/gui/e-day-view-time-item.c:842
 msgid "Show the second time zone"
 msgstr "顯示第二時區"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../src/calendar/gui/e-day-view-time-item.c:853
+#: ../src/calendar/gui/e-day-view-time-item.c:859
 #: ../src/modules/calendar/e-calendar-preferences.c:310
 #: ../src/modules/calendar/e-calendar-preferences.c:362
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:11
@@ -8406,7 +8558,7 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:887
+#: ../src/calendar/gui/e-day-view-time-item.c:893
 #: ../src/calendar/gui/e-timezone-entry.c:346
 #: ../src/modules/calendar/e-calendar-preferences.c:393
 msgid "Select…"
@@ -8428,70 +8580,70 @@ msgstr "列席者"
 msgid "Resources"
 msgstr "資源"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:163
+#: ../src/calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:179
+#: ../src/calendar/gui/e-meeting-list-view.c:176
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
-#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1261
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1261
 msgid "Individual"
 msgstr "個別"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-list-view.c:177
 #: ../src/calendar/gui/e-meeting-store.c:112
 #: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1262
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "群組"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:181
+#: ../src/calendar/gui/e-meeting-list-view.c:178
 #: ../src/calendar/gui/e-meeting-store.c:114
 #: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1263
 msgid "Resource"
 msgstr "資源"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:182
+#: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:116
 #: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1264
 msgid "Room"
 msgstr "會議室"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:193
+#: ../src/calendar/gui/e-meeting-list-view.c:190
 #: ../src/calendar/gui/e-meeting-store.c:145
 #: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1278
 msgid "Chair"
 msgstr "主席"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:194
+#: ../src/calendar/gui/e-meeting-list-view.c:191
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
-#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1279
+#: ../src/calendar/gui/e-meeting-store.c:1074 ../src/calendar/gui/print.c:1279
 msgid "Required Participant"
 msgstr "出席者"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:195
+#: ../src/calendar/gui/e-meeting-list-view.c:192
 #: ../src/calendar/gui/e-meeting-store.c:149
 #: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1280
 msgid "Optional Participant"
 msgstr "列席者"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:196
+#: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:151
 #: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1281
 msgid "Non-Participant"
 msgstr "缺席者"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-list-view.c:204
 #: ../src/calendar/gui/e-meeting-store.c:177
 #: ../src/calendar/gui/e-meeting-store.c:200
-#: ../src/calendar/gui/e-meeting-store.c:1079
+#: ../src/calendar/gui/e-meeting-store.c:1080
 msgid "Needs Action"
 msgstr "需要動作"
 
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:678
+#: ../src/calendar/gui/e-meeting-list-view.c:675
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
@@ -8508,18 +8660,18 @@ msgstr "已完成"
 msgid "In Process"
 msgstr "進行中"
 
-#: ../src/calendar/gui/e-meeting-store.c:2003
+#: ../src/calendar/gui/e-meeting-store.c:2015
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "輸入使用者 %2$s 在伺服器 %1$s 上存取空閒/忙碌資訊的密碼 "
 
-#: ../src/calendar/gui/e-meeting-store.c:2013
+#: ../src/calendar/gui/e-meeting-store.c:2025
 #, c-format
 msgid "Failure reason: %s"
 msgstr "失敗原因:%s"
 
-#: ../src/calendar/gui/e-meeting-store.c:2018
-#: ../src/e-util/e-collection-account-wizard.c:493
+#: ../src/calendar/gui/e-meeting-store.c:2030
+#: ../src/e-util/e-collection-account-wizard.c:501
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -8628,41 +8780,41 @@ msgstr "普通名稱"
 msgid "Language"
 msgstr "語言"
 
-#: ../src/calendar/gui/e-memo-table.c:535
-#: ../src/calendar/gui/e-task-table.c:700
+#: ../src/calendar/gui/e-memo-table.c:524
+#: ../src/calendar/gui/e-task-table.c:694
 msgid "* No Summary *"
 msgstr "* 沒有摘要 *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:622
-#: ../src/calendar/gui/e-task-table.c:801
+#: ../src/calendar/gui/e-memo-table.c:611
+#: ../src/calendar/gui/e-task-table.c:795
 msgid "Start: "
 msgstr "開始:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:642
-#: ../src/calendar/gui/e-task-table.c:834
+#: ../src/calendar/gui/e-memo-table.c:631
+#: ../src/calendar/gui/e-task-table.c:828
 msgid "Due: "
 msgstr "到期:"
 
-#: ../src/calendar/gui/e-memo-table.c:850
+#: ../src/calendar/gui/e-memo-table.c:839
 msgid "Cut selected memos to the clipboard"
 msgstr "剪下選取的備忘錄至剪貼簿"
 
-#: ../src/calendar/gui/e-memo-table.c:856
+#: ../src/calendar/gui/e-memo-table.c:845
 msgid "Copy selected memos to the clipboard"
 msgstr "複製選取的備忘錄至剪貼簿"
 
-#: ../src/calendar/gui/e-memo-table.c:862
+#: ../src/calendar/gui/e-memo-table.c:851
 msgid "Paste memos from the clipboard"
 msgstr "從剪貼簿貼上備忘錄"
 
-#: ../src/calendar/gui/e-memo-table.c:868
+#: ../src/calendar/gui/e-memo-table.c:857
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "刪除選定的備忘錄"
 
-#: ../src/calendar/gui/e-memo-table.c:874
+#: ../src/calendar/gui/e-memo-table.c:863
 msgid "Select all visible memos"
 msgstr "選擇全部可見的備忘錄"
 
@@ -8670,7 +8822,7 @@ msgstr "選擇全部可見的備忘錄"
 msgid "Click to add a memo"
 msgstr "請按這裡增加新的備忘錄"
 
-#: ../src/calendar/gui/e-task-table.c:474
+#: ../src/calendar/gui/e-task-table.c:467
 #: ../src/calendar/gui/tasktypes.xml.in.h:22
 #: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
@@ -8680,29 +8832,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:502
+#: ../src/calendar/gui/e-task-table.c:496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/calendar/gui/e-task-table.c:1072
+#: ../src/calendar/gui/e-task-table.c:1066
 msgid "Cut selected tasks to the clipboard"
 msgstr "剪下選取的工作至剪貼簿"
 
-#: ../src/calendar/gui/e-task-table.c:1078
+#: ../src/calendar/gui/e-task-table.c:1072
 msgid "Copy selected tasks to the clipboard"
 msgstr "複製選取的工作至剪貼簿"
 
-#: ../src/calendar/gui/e-task-table.c:1084
+#: ../src/calendar/gui/e-task-table.c:1078
 msgid "Paste tasks from the clipboard"
 msgstr "從剪貼簿貼上工作"
 
-#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/calendar/gui/e-task-table.c:1084
 #: ../src/modules/calendar/e-task-shell-view-actions.c:698
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
 
-#: ../src/calendar/gui/e-task-table.c:1096
+#: ../src/calendar/gui/e-task-table.c:1090
 msgid "Select all visible tasks"
 msgstr "選擇全部可見的工作"
 
@@ -8768,17 +8920,17 @@ msgid "Completed: %s"
 msgstr "已完成:%s"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:338
 #: ../src/e-util/e-datetime-format.c:207
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
-#: ../src/modules/itip-formatter/itip-view.c:256
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1919
+#: ../src/modules/itip-formatter/itip-view.c:260
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a weekday and a date.
 #: ../src/calendar/gui/e-to-do-pane.c:1578
 #: ../src/e-util/e-datetime-format.c:218
-#: ../src/modules/itip-formatter/itip-view.c:284
+#: ../src/modules/itip-formatter/itip-view.c:288
 msgid "Tomorrow"
 msgstr "明天"
 
@@ -8787,12 +8939,12 @@ msgid "Tasks without Due date"
 msgstr "不具到期日的工作"
 
 #: ../src/calendar/gui/e-to-do-pane.c:2165
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1522
 msgid "New _Appointment…"
 msgstr "新增會議(_A)…"
 
 #: ../src/calendar/gui/e-to-do-pane.c:2173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
 msgid "New _Meeting…"
 msgstr "新增會議(_M)…"
 
@@ -8831,7 +8983,7 @@ msgstr "待辦事項"
 #. Translators: the first '%s' is replaced with a component summary;
 #. the second '%s' is replaced with an event location.
 #. Example: "Meet John Doe (Central Park)"
-#: ../src/calendar/gui/e-week-view.c:3705
+#: ../src/calendar/gui/e-week-view.c:3715
 #, c-format
 msgctxt "SummaryWithLocation"
 msgid "%s (%s)"
@@ -8840,37 +8992,37 @@ msgstr "%s (%s)"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-week-view-main-item.c:222
+#: ../src/calendar/gui/e-week-view-main-item.c:224
 #: ../src/calendar/gui/print.c:2096
 msgid "%d %B"
 msgstr "%m月%d日"
 
-#: ../src/calendar/gui/itip-utils.c:795 ../src/calendar/gui/itip-utils.c:861
-#: ../src/calendar/gui/itip-utils.c:1010
+#: ../src/calendar/gui/itip-utils.c:913 ../src/calendar/gui/itip-utils.c:979
+#: ../src/calendar/gui/itip-utils.c:1128
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: ../src/calendar/gui/itip-utils.c:851
+#: ../src/calendar/gui/itip-utils.c:969
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個出席者"
 
-#: ../src/calendar/gui/itip-utils.c:1108 ../src/calendar/gui/itip-utils.c:1274
+#: ../src/calendar/gui/itip-utils.c:1226 ../src/calendar/gui/itip-utils.c:1392
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../src/calendar/gui/itip-utils.c:1111 ../src/calendar/gui/itip-utils.c:1277
+#: ../src/calendar/gui/itip-utils.c:1229 ../src/calendar/gui/itip-utils.c:1395
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../src/calendar/gui/itip-utils.c:1114 ../src/calendar/gui/itip-utils.c:1280
+#: ../src/calendar/gui/itip-utils.c:1232 ../src/calendar/gui/itip-utils.c:1398
 msgid "Memo information"
 msgstr "備忘錄資訊"
 
-#: ../src/calendar/gui/itip-utils.c:1117 ../src/calendar/gui/itip-utils.c:1298
+#: ../src/calendar/gui/itip-utils.c:1235 ../src/calendar/gui/itip-utils.c:1416
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-#: ../src/calendar/gui/itip-utils.c:1120
+#: ../src/calendar/gui/itip-utils.c:1238
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
@@ -8878,7 +9030,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:1160
+#: ../src/calendar/gui/itip-utils.c:1278
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "已接受"
@@ -8887,7 +9039,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:1167
+#: ../src/calendar/gui/itip-utils.c:1285
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
@@ -8899,7 +9051,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:1174 ../src/calendar/gui/itip-utils.c:1222
+#: ../src/calendar/gui/itip-utils.c:1292 ../src/calendar/gui/itip-utils.c:1340
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "已拒絕"
@@ -8908,7 +9060,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:1181
+#: ../src/calendar/gui/itip-utils.c:1299
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已委派"
@@ -8916,7 +9068,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:1194
+#: ../src/calendar/gui/itip-utils.c:1312
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已更新"
@@ -8924,7 +9076,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:1201
+#: ../src/calendar/gui/itip-utils.c:1319
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -8932,7 +9084,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:1208
+#: ../src/calendar/gui/itip-utils.c:1326
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "重新整理"
@@ -8940,47 +9092,47 @@ 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:1215
+#: ../src/calendar/gui/itip-utils.c:1333
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../src/calendar/gui/itip-utils.c:1295
+#: ../src/calendar/gui/itip-utils.c:1413
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1303
+#: ../src/calendar/gui/itip-utils.c:1421
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: ../src/calendar/gui/itip-utils.c:1332
+#: ../src/calendar/gui/itip-utils.c:1450
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "無法取得資源,新的事件與其他事件有所重疊。"
 
-#: ../src/calendar/gui/itip-utils.c:1337
+#: ../src/calendar/gui/itip-utils.c:1455
 msgid "Unable to book a resource, error: "
 msgstr "無法預訂資源,錯誤為:"
 
-#: ../src/calendar/gui/itip-utils.c:1530
+#: ../src/calendar/gui/itip-utils.c:1648
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的出席者。"
 
-#: ../src/calendar/gui/itip-utils.c:2312
+#: ../src/calendar/gui/itip-utils.c:2527
 msgid "Sending an event"
 msgstr "正在傳送事件"
 
-#: ../src/calendar/gui/itip-utils.c:2316
+#: ../src/calendar/gui/itip-utils.c:2531
 msgid "Sending a memo"
 msgstr "正在傳送備忘錄"
 
-#: ../src/calendar/gui/itip-utils.c:2320
+#: ../src/calendar/gui/itip-utils.c:2535
 msgid "Sending a task"
 msgstr "正在傳送工作"
 
 #. Translator: This is used as a placeholder when an event doesn't have set a location
-#: ../src/calendar/gui/itip-utils.c:2572
+#: ../src/calendar/gui/itip-utils.c:2780
 msgctxt "Location"
 msgid "Unspecified"
 msgstr "未指定"
@@ -9150,11 +9302,39 @@ msgstr "大於"
 msgid "is less than"
 msgstr "小於"
 
+#: ../src/calendar/gui/tasktypes.xml.in.h:28
+msgid "Current State"
+msgstr "目前的狀態"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:29
+msgid "is Overdue"
+msgstr "已過期"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:30
+msgid "is Scheduled"
+msgstr "已有行程"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:31
+msgid "is not Scheduled"
+msgstr "未有行程"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:32
+msgid "Due In"
+msgstr "期限"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:33
+msgid "Next Days"
+msgstr "後幾天"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:34
+msgid "Previous Days"
+msgstr "前幾天"
+
 #: ../src/calendar/importers/icalendar-importer.c:76
 msgid "Appointments and Meetings"
 msgstr "會議和會議"
 
-#: ../src/calendar/importers/icalendar-importer.c:327
+#: ../src/calendar/importers/icalendar-importer.c:334
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:89
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:280
@@ -9162,200 +9342,200 @@ msgstr "會議和會議"
 msgid "New Calendar"
 msgstr "新行事曆"
 
-#: ../src/calendar/importers/icalendar-importer.c:330
+#: ../src/calendar/importers/icalendar-importer.c:337
 #: ../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:204
 msgid "New Task List"
 msgstr "新增工作列表"
 
-#: ../src/calendar/importers/icalendar-importer.c:372
+#: ../src/calendar/importers/icalendar-importer.c:379
 msgid "Cre_ate new calendar"
 msgstr "建立新行事曆(_A)"
 
-#: ../src/calendar/importers/icalendar-importer.c:376
+#: ../src/calendar/importers/icalendar-importer.c:383
 msgid "Cre_ate new task list"
 msgstr "建立新工作列表(_A)"
 
-#: ../src/calendar/importers/icalendar-importer.c:521
-#: ../src/calendar/importers/icalendar-importer.c:971
+#: ../src/calendar/importers/icalendar-importer.c:528
+#: ../src/calendar/importers/icalendar-importer.c:978
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
-#: ../src/calendar/importers/icalendar-importer.c:668
+#: ../src/calendar/importers/icalendar-importer.c:675
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 檔案 (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:669
+#: ../src/calendar/importers/icalendar-importer.c:676
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸入器"
 
-#: ../src/calendar/importers/icalendar-importer.c:764
+#: ../src/calendar/importers/icalendar-importer.c:771
 msgid "Reminder!"
 msgstr "提醒!"
 
-#: ../src/calendar/importers/icalendar-importer.c:859
+#: ../src/calendar/importers/icalendar-importer.c:866
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar 檔案 (.vcs)"
 
-#: ../src/calendar/importers/icalendar-importer.c:860
+#: ../src/calendar/importers/icalendar-importer.c:867
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸入器"
 
-#: ../src/calendar/importers/icalendar-importer.c:1134
+#: ../src/calendar/importers/icalendar-importer.c:1141
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
-#: ../src/calendar/importers/icalendar-importer.c:1177
+#: ../src/calendar/importers/icalendar-importer.c:1184
 msgid "GNOME Calendar"
 msgstr "GNOME Calendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:1178
+#: ../src/calendar/importers/icalendar-importer.c:1185
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
 
-#: ../src/calendar/importers/icalendar-importer.c:1254
-#: ../src/calendar/importers/icalendar-importer.c:1582
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1606
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "會議"
 
-#: ../src/calendar/importers/icalendar-importer.c:1254
-#: ../src/calendar/importers/icalendar-importer.c:1582
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1606
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
-#: ../src/calendar/importers/icalendar-importer.c:1257
-#: ../src/calendar/importers/icalendar-importer.c:1583
+#: ../src/calendar/importers/icalendar-importer.c:1283
+#: ../src/calendar/importers/icalendar-importer.c:1607
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "工作"
 
-#: ../src/calendar/importers/icalendar-importer.c:1260
-#: ../src/calendar/importers/icalendar-importer.c:1584
+#: ../src/calendar/importers/icalendar-importer.c:1286
+#: ../src/calendar/importers/icalendar-importer.c:1608
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "備忘錄"
 
+#: ../src/calendar/importers/icalendar-importer.c:1295
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "是一個實體"
+
 #. have ? NULL :
-#: ../src/calendar/importers/icalendar-importer.c:1269
+#: ../src/calendar/importers/icalendar-importer.c:1298
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "具有週期性"
 
-#: ../src/calendar/importers/icalendar-importer.c:1274
-msgctxt "iCalImp"
-msgid "is an instance"
-msgstr "是一個實體"
-
-#: ../src/calendar/importers/icalendar-importer.c:1279
+#: ../src/calendar/importers/icalendar-importer.c:1303
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "具有提醒"
 
-#: ../src/calendar/importers/icalendar-importer.c:1284
+#: ../src/calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "具有附件"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1296
+#: ../src/calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "公開"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1299
+#: ../src/calendar/importers/icalendar-importer.c:1323
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "私人"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1302
+#: ../src/calendar/importers/icalendar-importer.c:1326
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "機密"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1306
+#: ../src/calendar/importers/icalendar-importer.c:1330
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "歸類"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1311
-#: ../src/calendar/importers/icalendar-importer.c:1627
+#: ../src/calendar/importers/icalendar-importer.c:1335
+#: ../src/calendar/importers/icalendar-importer.c:1651
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "摘要"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1318
+#: ../src/calendar/importers/icalendar-importer.c:1342
 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:1326
-#: ../src/calendar/importers/icalendar-importer.c:1622
+#: ../src/calendar/importers/icalendar-importer.c:1350
+#: ../src/calendar/importers/icalendar-importer.c:1646
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "開始"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1336
+#: ../src/calendar/importers/icalendar-importer.c:1360
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "到期"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1347
+#: ../src/calendar/importers/icalendar-importer.c:1371
 msgctxt "iCalImp"
 msgid "End"
 msgstr "結束"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1356
+#: ../src/calendar/importers/icalendar-importer.c:1380
 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:1381
+#: ../src/calendar/importers/icalendar-importer.c:1405
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1388
+#: ../src/calendar/importers/icalendar-importer.c:1412
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1405
-#: ../src/calendar/importers/icalendar-importer.c:1408
+#: ../src/calendar/importers/icalendar-importer.c:1429
+#: ../src/calendar/importers/icalendar-importer.c:1432
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "會議召集人"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1437
-#: ../src/calendar/importers/icalendar-importer.c:1440
+#: ../src/calendar/importers/icalendar-importer.c:1461
+#: ../src/calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../src/calendar/importers/icalendar-importer.c:1456
+#: ../src/calendar/importers/icalendar-importer.c:1480
 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:1617
+#: ../src/calendar/importers/icalendar-importer.c:1641
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "類型"
@@ -10907,177 +11087,177 @@ msgstr "太平洋/瓦利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦島"
 
-#: ../src/composer/e-composer-actions.c:226
+#: ../src/composer/e-composer-actions.c:240
 msgid "Save as…"
 msgstr "另存新檔…"
 
-#: ../src/composer/e-composer-actions.c:321
+#: ../src/composer/e-composer-actions.c:335
 msgid "Close the current file"
 msgstr "關閉目前的檔案"
 
-#: ../src/composer/e-composer-actions.c:326
+#: ../src/composer/e-composer-actions.c:340
 msgid "New _Message"
 msgstr "撰寫新郵件(_M)"
 
-#: ../src/composer/e-composer-actions.c:328
+#: ../src/composer/e-composer-actions.c:342
 msgid "Open New Message window"
 msgstr "開啟新的郵件視窗"
 
-#: ../src/composer/e-composer-actions.c:333
-#: ../src/shell/e-shell-window-actions.c:946
+#: ../src/composer/e-composer-actions.c:347
+#: ../src/shell/e-shell-window-actions.c:996
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../src/composer/e-composer-actions.c:335
-#: ../src/shell/e-shell-window-actions.c:948
+#: ../src/composer/e-composer-actions.c:349
+#: ../src/shell/e-shell-window-actions.c:998
 msgid "Configure Evolution"
 msgstr "設定 Evolution"
 
-#: ../src/composer/e-composer-actions.c:342
+#: ../src/composer/e-composer-actions.c:356
 msgid "Save the current file"
 msgstr "儲存目前的檔案"
 
-#: ../src/composer/e-composer-actions.c:347
+#: ../src/composer/e-composer-actions.c:361
 msgid "Save _As…"
 msgstr "儲存為(_A)…"
 
-#: ../src/composer/e-composer-actions.c:349
+#: ../src/composer/e-composer-actions.c:363
 msgid "Save the current file with a different name"
 msgstr "以另一個名稱儲存目前的檔案"
 
-#: ../src/composer/e-composer-actions.c:356
+#: ../src/composer/e-composer-actions.c:370
 msgid "Character _Encoding"
 msgstr "字元編碼(_E)"
 
-#: ../src/composer/e-composer-actions.c:380
+#: ../src/composer/e-composer-actions.c:394
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
 
-#: ../src/composer/e-composer-actions.c:387
+#: ../src/composer/e-composer-actions.c:401
 msgid "Save as _Draft"
 msgstr "儲存為草稿(_D)"
 
-#: ../src/composer/e-composer-actions.c:389
+#: ../src/composer/e-composer-actions.c:403
 msgid "Save as draft"
 msgstr "儲存為草稿"
 
-#: ../src/composer/e-composer-actions.c:394
+#: ../src/composer/e-composer-actions.c:408
 msgid "S_end"
 msgstr "傳送(_E)"
 
-#: ../src/composer/e-composer-actions.c:396
+#: ../src/composer/e-composer-actions.c:410
 msgid "Send this message"
 msgstr "傳送這個郵件"
 
-#: ../src/composer/e-composer-actions.c:404
+#: ../src/composer/e-composer-actions.c:418
 msgid "PGP _Encrypt"
 msgstr "PG_P 加密"
 
-#: ../src/composer/e-composer-actions.c:406
+#: ../src/composer/e-composer-actions.c:420
 msgid "Encrypt this message with PGP"
 msgstr "使用 PGP 將這封郵件加密"
 
-#: ../src/composer/e-composer-actions.c:412
+#: ../src/composer/e-composer-actions.c:426
 msgid "PGP _Sign"
 msgstr "P_GP 加簽"
 
-#: ../src/composer/e-composer-actions.c:414
+#: ../src/composer/e-composer-actions.c:428
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP 金鑰為郵件加上數位簽章"
 
-#: ../src/composer/e-composer-actions.c:420
+#: ../src/composer/e-composer-actions.c:434
 msgid "_Picture Gallery"
 msgstr "圖片集(_P)"
 
-#: ../src/composer/e-composer-actions.c:422
+#: ../src/composer/e-composer-actions.c:436
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "示您可以拖曳到郵件中的圖片集"
 
-#: ../src/composer/e-composer-actions.c:428
+#: ../src/composer/e-composer-actions.c:442
 msgid "_Prioritize Message"
 msgstr "郵件優先權(_P)"
 
-#: ../src/composer/e-composer-actions.c:430
+#: ../src/composer/e-composer-actions.c:444
 msgid "Set the message priority to high"
 msgstr "將郵件優先權設為「高」"
 
-#: ../src/composer/e-composer-actions.c:436
+#: ../src/composer/e-composer-actions.c:450
 msgid "Re_quest Read Receipt"
 msgstr "要求讀信回條(_Q)"
 
-#: ../src/composer/e-composer-actions.c:438
+#: ../src/composer/e-composer-actions.c:452
 msgid "Get delivery notification when your message is read"
 msgstr "在您的郵件被閱讀時取得送信通知"
 
-#: ../src/composer/e-composer-actions.c:444
+#: ../src/composer/e-composer-actions.c:458
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME 加密"
 
-#: ../src/composer/e-composer-actions.c:446
+#: ../src/composer/e-composer-actions.c:460
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使用您的 S/MIME 加密憑證將這封郵件加密"
 
-#: ../src/composer/e-composer-actions.c:452
+#: ../src/composer/e-composer-actions.c:466
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME 加簽"
 
-#: ../src/composer/e-composer-actions.c:454
+#: ../src/composer/e-composer-actions.c:468
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME 簽名憑證為郵件加上數位簽章"
 
-#: ../src/composer/e-composer-actions.c:508
+#: ../src/composer/e-composer-actions.c:522
 msgid "_Bcc Field"
 msgstr "密件副本欄位(_B)"
 
-#: ../src/composer/e-composer-actions.c:510
+#: ../src/composer/e-composer-actions.c:524
 msgid "Toggles whether the BCC field is displayed"
 msgstr "切換密件副本欄位的顯示狀態"
 
-#: ../src/composer/e-composer-actions.c:516
+#: ../src/composer/e-composer-actions.c:530
 msgid "_Cc Field"
 msgstr "副本欄位(_C)"
 
-#: ../src/composer/e-composer-actions.c:518
+#: ../src/composer/e-composer-actions.c:532
 msgid "Toggles whether the CC field is displayed"
 msgstr "切換副本欄位的顯示狀態"
 
-#: ../src/composer/e-composer-actions.c:524
+#: ../src/composer/e-composer-actions.c:538
 msgid "_From Override Field"
 msgstr "寄件人覆蓋欄位(_F)"
 
-#: ../src/composer/e-composer-actions.c:526
+#: ../src/composer/e-composer-actions.c:540
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
 msgstr "切換寄件人覆蓋欄位是否改變姓名或電子郵件的顯示"
 
-#: ../src/composer/e-composer-actions.c:532
+#: ../src/composer/e-composer-actions.c:546
 msgid "_Reply-To Field"
 msgstr "回覆欄位(_R)"
 
-#: ../src/composer/e-composer-actions.c:534
+#: ../src/composer/e-composer-actions.c:548
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
-#: ../src/composer/e-composer-actions.c:540
+#: ../src/composer/e-composer-actions.c:554
 msgid "Visually _Wrap Long Lines"
 msgstr "自動換列(_W)"
 
-#: ../src/composer/e-composer-actions.c:597
+#: ../src/composer/e-composer-actions.c:611
 msgid "Attach"
 msgstr "附加"
 
-#: ../src/composer/e-composer-actions.c:603
+#: ../src/composer/e-composer-actions.c:617
 msgid "Save Draft"
 msgstr "儲存草稿"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:2002
-#: ../src/e-util/e-mail-signature-script-dialog.c:416
-#: ../src/e-util/e-webdav-browser.c:2417
+#: ../src/e-util/e-collection-account-wizard.c:2058
+#: ../src/e-util/e-mail-signature-script-dialog.c:408
+#: ../src/e-util/e-webdav-browser.c:2555
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
 #: ../src/mail/e-mail-config-identity-page.c:551
-#: ../src/mail/e-mail-config-summary-page.c:334
+#: ../src/mail/e-mail-config-summary-page.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "名稱(_N):"
@@ -11097,70 +11277,75 @@ msgid ""
 msgstr ""
 "輸入郵件密件副本的收件者,他們會收到這封郵件但不會出現在郵件的收件者列表"
 
-#: ../src/composer/e-composer-header-table.c:840
+#: ../src/composer/e-composer-header-table.c:831
 msgid "Fr_om:"
 msgstr "寄件者(_O):"
 
-#: ../src/composer/e-composer-header-table.c:847
+#: ../src/composer/e-composer-header-table.c:838
 msgid "_Reply-To:"
 msgstr "回覆(_R):"
 
-#: ../src/composer/e-composer-header-table.c:852
+#: ../src/composer/e-composer-header-table.c:843
 msgid "_To:"
 msgstr "收件者(_T):"
 
-#: ../src/composer/e-composer-header-table.c:858
+#: ../src/composer/e-composer-header-table.c:849
 msgid "_Cc:"
 msgstr "副本(_C):"
 
-#: ../src/composer/e-composer-header-table.c:864
+#: ../src/composer/e-composer-header-table.c:855
 msgid "_Bcc:"
 msgstr "密件副本(_B):"
 
-#: ../src/composer/e-composer-header-table.c:869
+#: ../src/composer/e-composer-header-table.c:860
 msgid "_Post To:"
 msgstr "張貼到(_P):"
 
-#: ../src/composer/e-composer-header-table.c:873
+#: ../src/composer/e-composer-header-table.c:864
 msgid "S_ubject:"
 msgstr "主旨(_U):"
 
-#: ../src/composer/e-composer-header-table.c:883
+#: ../src/composer/e-composer-header-table.c:874
 #: ../src/mail/e-mail-config-identity-page.c:744
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
-#: ../src/composer/e-composer-name-header.c:237
+#: ../src/composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "按這裡新增目錄服務"
 
-#: ../src/composer/e-composer-post-header.c:180
+#: ../src/composer/e-composer-post-header.c:176
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡,選取要張貼的資料夾"
 
-#: ../src/composer/e-msg-composer.c:1003
+#: ../src/composer/e-msg-composer.c:1036
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署送出的郵件:此帳號沒有設定簽章憑證"
 
-#: ../src/composer/e-msg-composer.c:1012
+#: ../src/composer/e-msg-composer.c:1045
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "無法加密送出的郵件:沒有設定加密憑證(此帳號)"
 
-#: ../src/composer/e-msg-composer.c:1802 ../src/composer/e-msg-composer.c:2476
+#: ../src/composer/e-msg-composer.c:1818 ../src/composer/e-msg-composer.c:2492
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../src/composer/e-msg-composer.c:4906
+#: ../src/composer/e-msg-composer.c:4381
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:352
+msgid "Reading text content…"
+msgstr "正在讀取文字內容…"
+
+#: ../src/composer/e-msg-composer.c:5191
 msgid "Review attachment before sending."
 msgid_plural "Review attachments before sending."
 msgstr[0] "寄件前先檢視附件。"
 
-#: ../src/composer/e-msg-composer.c:4911
+#: ../src/composer/e-msg-composer.c:5196
 #, c-format
 msgid ""
 "There had been added %d attachment. Make sure it does not contain any "
@@ -11170,7 +11355,7 @@ msgid_plural ""
 "sensitive information before sending the message."
 msgstr[0] "已加入 %d 個附件。在送出郵件前請確定沒有包含任何機敏資訊。"
 
-#: ../src/composer/e-msg-composer.c:5044
+#: ../src/composer/e-msg-composer.c:5329
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "郵件編輯器包含不能編輯的非文字的郵件內文。"
 
@@ -11313,7 +11498,7 @@ msgid "_Save to Outbox"
 msgstr "儲存到寄件匣(_S)"
 
 #: ../src/composer/mail-composer.error.xml.h:34
-#: ../src/e-util/e-collection-account-wizard.c:674
+#: ../src/e-util/e-collection-account-wizard.c:710
 msgid "_Try Again"
 msgstr "再試一次(_T)"
 
@@ -11433,7 +11618,15 @@ msgstr ""
 msgid "An error occurred while creating message composer."
 msgstr "建立郵件編輯器時發生錯誤。"
 
-#: ../src/em-format/e-mail-formatter-attachment.c:335
+#: ../src/em-format/e-mail-formatter-attachment.c:272
+msgid "Toggle View Inline"
+msgstr "切換檢視行內"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:272
+msgid "Open in default application"
+msgstr "以預設的應用程式開啟"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:337
 msgid "Display as attachment"
 msgstr "顯示為附件"
 
@@ -11462,7 +11655,7 @@ msgstr "(沒有主旨)"
 msgid "Remote content download had been blocked for this message."
 msgstr "已阻擋這封郵件的遠端內容下載。"
 
-#. Translators: This message suggests to the receipients
+#. Translators: This message suggests to the recipients
 #. * that the sender of the mail is different from the one
 #. * listed in From field.
 #: ../src/em-format/e-mail-formatter-headers.c:359
@@ -11487,7 +11680,7 @@ msgid "Format part as an RFC822 message"
 msgstr "將部分格式化 RFC822 郵件"
 
 #: ../src/em-format/e-mail-formatter-print.c:50
-#: ../src/e-util/e-webdav-browser.c:2361
+#: ../src/e-util/e-webdav-browser.c:2499
 #: ../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
@@ -11500,22 +11693,22 @@ msgstr "名稱"
 msgid "Size"
 msgstr "大小"
 
-#: ../src/em-format/e-mail-formatter-quote-headers.c:181
+#: ../src/em-format/e-mail-formatter-quote-headers.c:184
 #: ../src/em-format/e-mail-part-headers.c:51
 #: ../src/mail/e-mail-tag-editor.c:201 ../src/mail/filtertypes.xml.in.h:16
 #: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
 #: ../src/mail/vfoldertypes.xml.in.h:17
 #: ../src/modules/mail/em-mailer-prefs.c:65
-#: ../src/smime/gui/certificate-manager.c:1627
+#: ../src/smime/gui/certificate-manager.c:1625
 msgid "Subject"
 msgstr "主旨"
 
 #. pseudo-header
-#: ../src/em-format/e-mail-formatter-quote-headers.c:200
+#: ../src/em-format/e-mail-formatter-quote-headers.c:205
 #: ../src/em-format/e-mail-formatter-utils.c:360
 #: ../src/modules/mail/em-mailer-prefs.c:686
-#: ../src/modules/mail/em-mailer-prefs.c:1619
-#: ../src/modules/mail/em-mailer-prefs.c:1668
+#: ../src/modules/mail/em-mailer-prefs.c:1620
+#: ../src/modules/mail/em-mailer-prefs.c:1669
 msgid "Mailer"
 msgstr "寄件者"
 
@@ -11539,13 +11732,12 @@ msgstr "HTML"
 msgid "Format part as HTML"
 msgstr "將部分格式化為 HTML"
 
-#: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:130
 #: ../src/em-format/e-mail-formatter-text-plain.c:196
-#: ../src/e-util/e-html-editor-actions.c:1412
 msgid "Plain Text"
 msgstr "純文字"
 
-#: ../src/em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:131
 #: ../src/em-format/e-mail-formatter-text-plain.c:197
 msgid "Format part as plain text"
 msgstr "將部分格式化為純文字"
@@ -11745,7 +11937,7 @@ msgid "partially S/MIME encrypted"
 msgstr "部分以 S/MIME 加密"
 
 #: ../src/em-format/e-mail-formatter-utils.c:693
-#: ../src/mail/e-mail-config-security-page.c:856
+#: ../src/mail/e-mail-config-security-page.c:852
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
 msgid "Security"
@@ -11824,8 +12016,8 @@ msgstr "不支援的簽名格式"
 msgid "Reply-To"
 msgstr "回覆"
 
-#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:559
-#: ../src/e-util/e-dateedit.c:582 ../src/mail/message-list.etspec.h:7
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:558
+#: ../src/e-util/e-dateedit.c:581 ../src/mail/message-list.etspec.h:7
 #: ../src/modules/mail/em-mailer-prefs.c:66
 msgid "Date"
 msgstr "日期"
@@ -11866,7 +12058,7 @@ msgstr "evolution 行事曆項目"
 
 #: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
 #: ../src/e-util/e-accounts-window.c:894
-#: ../src/modules/mail/e-mail-shell-backend.c:910
+#: ../src/modules/mail/e-mail-shell-backend.c:1109
 msgid "Mail Accounts"
 msgstr "郵件帳號"
 
@@ -11894,16 +12086,16 @@ msgstr "工作列表"
 
 #: ../src/e-util/e-accounts-window.c:1399 ../src/e-util/filter.ui.h:23
 #: ../src/mail/e-mail-account-tree-view.c:84
-#: ../src/modules/mail/em-composer-prefs.c:1306
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:407
-#: ../src/plugins/mail-notification/mail-notification.c:1124
-#: ../src/plugins/publish-calendar/publish-calendar.c:854
+#: ../src/modules/mail/em-composer-prefs.c:1303
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:408
+#: ../src/plugins/mail-notification/mail-notification.c:1175
+#: ../src/plugins/publish-calendar/publish-calendar.c:853
 msgid "Enabled"
 msgstr "已啟用"
 
 #: ../src/e-util/e-accounts-window.c:1415
 #: ../src/mail/e-mail-account-tree-view.c:108
-#: ../src/plugins/mail-notification/mail-notification.c:1140
+#: ../src/plugins/mail-notification/mail-notification.c:1191
 msgid "Account Name"
 msgstr "帳號名稱"
 
@@ -11938,10 +12130,10 @@ msgstr "Evolution 帳號"
 #. 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-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2708
-#: ../src/mail/em-subscription-editor.c:1952
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1600
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2866
+#: ../src/mail/em-subscription-editor.c:1945
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1594
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1672
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
@@ -11950,31 +12142,31 @@ msgid "Initiates refresh of account sources"
 msgstr "初始重新整理帳號來源"
 
 #. Translators: This is a cancelled activity.
-#: ../src/e-util/e-activity.c:256
+#: ../src/e-util/e-activity.c:252
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (已取消)"
 
 #. Translators: This is a completed activity.
-#: ../src/e-util/e-activity.c:259
+#: ../src/e-util/e-activity.c:255
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (已完成)"
 
 #. Translators: This is an activity waiting to run.
-#: ../src/e-util/e-activity.c:262
+#: ../src/e-util/e-activity.c:258
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (正在等待)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../src/e-util/e-activity.c:266
+#: ../src/e-util/e-activity.c:262
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (正在取消)"
 
-#: ../src/e-util/e-activity.c:268
+#: ../src/e-util/e-activity.c:264
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -11982,7 +12174,7 @@ msgstr "%s"
 #. Translators: This is a running activity whose
 #. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
-#: ../src/e-util/e-activity.c:273
+#: ../src/e-util/e-activity.c:269
 #: ../src/modules/addressbook/e-book-shell-view-private.c:334
 #: ../src/modules/calendar/e-cal-base-shell-content.c:143
 #, c-format
@@ -11990,12 +12182,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:1790
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1784
 msgid "Cancel"
 msgstr "取消"
 
 #. Translators: Escape is a keyboard binding.
-#: ../src/e-util/e-alert-bar.c:125
+#: ../src/e-util/e-alert-bar.c:204
 msgid "Close this message (Escape)"
 msgstr "關閉這個郵件 (Escape)"
 
@@ -12015,21 +12207,21 @@ msgstr "無法建立郵件群組:"
 msgid "Attached message"
 msgstr "附加的郵件"
 
-#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3146
+#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3130
 msgid "Operation was cancelled"
 msgstr "操作已被取消"
 
 #. Translators: Default attachment filename.
-#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2990
-#: ../src/e-util/e-attachment.c:3442 ../src/e-util/e-attachment-store.c:914
+#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2974
+#: ../src/e-util/e-attachment.c:3426 ../src/e-util/e-attachment-store.c:914
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3502
+#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3486
 msgid "A load operation is already in progress"
 msgstr "載入操作已在進行中"
 
-#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3510
+#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3494
 msgid "A save operation is already in progress"
 msgstr "儲存操作已在進行中"
 
@@ -12043,41 +12235,41 @@ msgstr "無法開啟「%s」"
 msgid "Could not open the attachment"
 msgstr "無法開啟附件"
 
-#: ../src/e-util/e-attachment.c:3519
+#: ../src/e-util/e-attachment.c:3503
 msgid "Attachment contents not loaded"
 msgstr "無法載入附件內容"
 
-#: ../src/e-util/e-attachment.c:3610
+#: ../src/e-util/e-attachment.c:3594
 #, c-format
 msgid "Could not save “%s”"
 msgstr "無法儲存「%s」"
 
-#: ../src/e-util/e-attachment.c:3613
+#: ../src/e-util/e-attachment.c:3597
 #, c-format
 msgid "Could not save the attachment"
 msgstr "無法儲存附件"
 
-#: ../src/e-util/e-attachment-dialog.c:315
+#: ../src/e-util/e-attachment-dialog.c:295
 msgid "Attachment Properties"
 msgstr "附件內容"
 
-#: ../src/e-util/e-attachment-dialog.c:337
-#: ../src/e-util/e-import-assistant.c:277
+#: ../src/e-util/e-attachment-dialog.c:317
+#: ../src/e-util/e-import-assistant.c:303
 msgid "F_ilename:"
 msgstr "檔案名稱(_I):"
 
-#: ../src/e-util/e-attachment-dialog.c:354
-#: ../src/e-util/e-html-editor-image-dialog.c:513
-#: ../src/e-util/e-html-editor-link-dialog.c:229
-#: ../src/e-util/e-webdav-browser.c:2456
+#: ../src/e-util/e-attachment-dialog.c:334
+#: ../src/e-util/e-html-editor-image-dialog.c:602
+#: ../src/e-util/e-html-editor-link-dialog.c:226
+#: ../src/e-util/e-webdav-browser.c:2611
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: ../src/e-util/e-attachment-dialog.c:372
+#: ../src/e-util/e-attachment-dialog.c:352
 msgid "MIME Type:"
 msgstr "MIME 類型:"
 
-#: ../src/e-util/e-attachment-dialog.c:380
+#: ../src/e-util/e-attachment-dialog.c:360
 #: ../src/e-util/e-attachment-store.c:700
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
@@ -12105,7 +12297,7 @@ msgid "Hide Attachment _Bar"
 msgstr "隱藏附件列(_B)"
 
 #: ../src/e-util/e-attachment-paned.c:105
-#: ../src/e-util/e-attachment-paned.c:741
+#: ../src/e-util/e-attachment-paned.c:706
 msgid "Show Attachment _Bar"
 msgstr "顯示附件列(_B)"
 
@@ -12154,9 +12346,9 @@ msgid "Sa_ve As"
 msgstr "儲存為(_V)"
 
 #: ../src/e-util/e-attachment-view.c:331
-#: ../src/plugins/save-calendar/save-calendar.c:348
-#: ../src/plugins/save-calendar/save-calendar.c:387
-#: ../src/plugins/save-calendar/save-calendar.c:426
+#: ../src/plugins/save-calendar/save-calendar.c:345
+#: ../src/plugins/save-calendar/save-calendar.c:384
+#: ../src/plugins/save-calendar/save-calendar.c:423
 msgid "Save _As"
 msgstr "儲存為(_A)"
 
@@ -12166,49 +12358,44 @@ msgstr "加入附件(_D)…"
 
 #: ../src/e-util/e-attachment-view.c:348
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
 #: ../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:1593
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1587
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1665
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-#: ../src/e-util/e-attachment-view.c:786
+#: ../src/e-util/e-attachment-view.c:784
 #, c-format
 msgid "Open With “%s”"
 msgstr "以「%s」開啟"
 
-#: ../src/e-util/e-attachment-view.c:787
+#: ../src/e-util/e-attachment-view.c:785
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "在 %s 中開啟這個附件"
 
-#: ../src/e-util/e-attachment-view.c:789
+#: ../src/e-util/e-attachment-view.c:787
 msgid "Open With Default Application"
 msgstr "以預設應用程式開啟"
 
-#: ../src/e-util/e-attachment-view.c:790
+#: ../src/e-util/e-attachment-view.c:788
 msgid "Open this attachment in default application"
 msgstr "以預設應用程式開啟這個附件"
 
-#: ../src/e-util/e-book-source-config.c:98
+#: ../src/e-util/e-book-source-config.c:90
 msgid "Mark as default address book"
 msgstr "標示為預設通訊錄"
 
-#: ../src/e-util/e-book-source-config.c:103
+#: ../src/e-util/e-book-source-config.c:95
 msgid "Autocomplete with this address book"
 msgstr "用這個通訊錄進行自動完成"
 
-#: ../src/e-util/e-book-source-config.c:277
+#: ../src/e-util/e-book-source-config.c:269
 msgid "Copy book content locally for offline operation"
 msgstr "複製通訊錄內容至本地用於離線作業"
 
-#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../src/e-util/e-buffer-tagger.c:410
-msgid "Ctrl-click to open a link"
-msgstr "Ctrl-單擊以開啟連結"
-
 #: ../src/e-util/e-calendar.c:310
 msgid "Previous month"
 msgstr "上個月"
@@ -12230,48 +12417,48 @@ msgid "Month Calendar"
 msgstr "月行事曆"
 
 #. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1357 ../src/e-util/e-calendar-item.c:2240
+#: ../src/e-util/e-calendar-item.c:1368 ../src/e-util/e-calendar-item.c:2261
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%m月"
 
 #. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1359
+#: ../src/e-util/e-calendar-item.c:1370
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y年"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1396
+#: ../src/e-util/e-calendar-item.c:1407
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y年%m月"
 
-#: ../src/e-util/e-cal-source-config.c:169
+#: ../src/e-util/e-cal-source-config.c:161
 msgid "Mark as default calendar"
 msgstr "標示為預設行事曆"
 
-#: ../src/e-util/e-cal-source-config.c:172
+#: ../src/e-util/e-cal-source-config.c:164
 msgid "Mark as default task list"
 msgstr "標示為預設工作列表"
 
-#: ../src/e-util/e-cal-source-config.c:175
+#: ../src/e-util/e-cal-source-config.c:167
 msgid "Mark as default memo list"
 msgstr "標示為預設備忘錄列表"
 
-#: ../src/e-util/e-cal-source-config.c:200
+#: ../src/e-util/e-cal-source-config.c:192
 msgid "Color:"
 msgstr "顏色:"
 
-#: ../src/e-util/e-cal-source-config.c:428
+#: ../src/e-util/e-cal-source-config.c:420
 msgid "Copy calendar contents locally for offline operation"
 msgstr "複製行事曆內容至本地以便離線作業"
 
-#: ../src/e-util/e-cal-source-config.c:432
+#: ../src/e-util/e-cal-source-config.c:424
 msgid "Copy task list contents locally for offline operation"
 msgstr "複製工作列表內容至本地以便離線作業"
 
-#: ../src/e-util/e-cal-source-config.c:436
+#: ../src/e-util/e-cal-source-config.c:428
 msgid "Copy memo list contents locally for offline operation"
 msgstr "複製備忘錄列表內容至本地以便離線作業"
 
@@ -12298,7 +12485,7 @@ msgctxt "category"
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: ../src/e-util/e-categories-selector.c:323
+#: ../src/e-util/e-categories-selector.c:319
 msgid "Icon"
 msgstr "圖示"
 
@@ -12338,31 +12525,31 @@ msgid ""
 "name"
 msgstr "在設定中已經有名為「%s」的分類。請使用其他的名稱"
 
-#: ../src/e-util/e-cell-combo.c:183
+#: ../src/e-util/e-cell-combo.c:186
 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:2146
+#: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:138
+#: ../src/e-util/e-cell-date.c:158 ../src/mail/message-list.c:2146
 msgid "?"
 msgstr "?"
 
-#: ../src/e-util/e-cell-date-edit.c:320
+#: ../src/e-util/e-cell-date-edit.c:330
 msgid "Now"
 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
+#: ../src/e-util/e-cell-date-edit.c:348
 msgctxt "table-date"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/e-util/e-cell-date-edit.c:346 ../src/mail/e-mail-label-dialog.c:198
+#: ../src/e-util/e-cell-date-edit.c:356 ../src/mail/e-mail-label-dialog.c:190
 msgid "OK"
 msgstr "確定"
 
-#: ../src/e-util/e-cell-date-edit.c:901
+#: ../src/e-util/e-cell-date-edit.c:908
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式:%s"
@@ -12457,15 +12644,35 @@ msgstr "字元編碼"
 msgid "Enter the character set to use"
 msgstr "輸入要使用的字元集"
 
-#: ../src/e-util/e-charset-combo-box.c:364
+#: ../src/e-util/e-charset-combo-box.c:356
 msgid "Other…"
 msgstr "其他…"
 
-#: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
+#: ../src/e-util/e-client-cache.c:1146 ../src/e-util/e-client-cache.c:1277
 #, c-format
 msgid "Cannot create a client object from extension name “%s”"
 msgstr "不能從延伸名稱「%s」建立客戶端物件"
 
+#: ../src/e-util/e-client-selector.c:190 ../src/mail/em-folder-tree.c:1035
+msgctxt "Status"
+msgid "Offline"
+msgstr "離線"
+
+#: ../src/e-util/e-client-selector.c:193 ../src/mail/em-folder-tree.c:1038
+msgctxt "Status"
+msgid "Online"
+msgstr "上線"
+
+#: ../src/e-util/e-client-selector.c:196 ../src/mail/em-folder-tree.c:1041
+msgctxt "Status"
+msgid "Unreachable"
+msgstr "無法連接"
+
+#: ../src/e-util/e-client-selector.c:199 ../src/mail/em-folder-tree.c:1044
+msgctxt "Status"
+msgid "Failed to connect"
+msgstr "無法連線"
+
 #: ../src/e-util/e-collection-account-wizard.c:107
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:83
 msgid "_Finish"
@@ -12476,8 +12683,8 @@ msgid "_Look Up"
 msgstr "尋找(_L)"
 
 #: ../src/e-util/e-collection-account-wizard.c:112
-#: ../src/e-util/e-collection-account-wizard.c:273
-#: ../src/e-util/e-search-bar.c:680
+#: ../src/e-util/e-collection-account-wizard.c:275
+#: ../src/e-util/e-search-bar.c:653
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
@@ -12487,27 +12694,27 @@ msgstr "下一個(_N)"
 msgid "New Collection Account"
 msgstr "新增收藏帳號"
 
-#: ../src/e-util/e-collection-account-wizard.c:258
-#: ../src/e-util/e-search-bar.c:668
+#: ../src/e-util/e-collection-account-wizard.c:260
+#: ../src/e-util/e-search-bar.c:641
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "上一個(_P)"
 
-#: ../src/e-util/e-collection-account-wizard.c:439
+#: ../src/e-util/e-collection-account-wizard.c:447
 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:496
+#: ../src/e-util/e-collection-account-wizard.c:511
 #, c-format
 msgid "Requires password to continue. %s."
 msgstr "需要密碼才能繼續。%s。"
 
-#: ../src/e-util/e-collection-account-wizard.c:509
+#: ../src/e-util/e-collection-account-wizard.c:525
 msgid "View certificate"
 msgstr "檢視憑證"
 
-#: ../src/e-util/e-collection-account-wizard.c:550
+#: ../src/e-util/e-collection-account-wizard.c:566
 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 "
@@ -12516,91 +12723,104 @@ msgstr ""
 "找不到候選項目。這也表示對於已選取的查詢方法伺服器沒有提供任何設定資訊。請手"
 "動輸入帳號來代替,或是改變上列設定值。"
 
-#: ../src/e-util/e-collection-account-wizard.c:552
+#: ../src/e-util/e-collection-account-wizard.c:568
 #, c-format
 msgid "Found one candidate"
 msgid_plural "Found %d candidates"
 msgstr[0] "找到 %d 個候選項"
 
-#: ../src/e-util/e-collection-account-wizard.c:656
+#: ../src/e-util/e-collection-account-wizard.c:679
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
+msgid "_Username:"
+msgstr "使用者名稱(_U):"
+
+#: ../src/e-util/e-collection-account-wizard.c:691
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../src/smime/gui/certificate-manager.c:766
+#: ../src/smime/gui/certificate-manager.c:764
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: ../src/e-util/e-collection-account-wizard.c:668
+#: ../src/e-util/e-collection-account-wizard.c:704
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "記住密碼(_R)"
 
-#: ../src/e-util/e-collection-account-wizard.c:811
-#: ../src/e-util/e-webdav-browser.c:474
+#: ../src/e-util/e-collection-account-wizard.c:851
+#: ../src/e-util/e-webdav-browser.c:536
 msgid "Collection"
 msgstr "收藏"
 
-#: ../src/e-util/e-collection-account-wizard.c:812
+#: ../src/e-util/e-collection-account-wizard.c:852
 msgid "Mail Receive"
 msgstr "接收郵件"
 
-#: ../src/e-util/e-collection-account-wizard.c:813
+#: ../src/e-util/e-collection-account-wizard.c:853
 msgid "Mail Send"
 msgstr "寄送郵件"
 
-#: ../src/e-util/e-collection-account-wizard.c:814
+#: ../src/e-util/e-collection-account-wizard.c:854
 #: ../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:816
+#: ../src/e-util/e-collection-account-wizard.c:856
 msgid "Memo List"
 msgstr "備忘錄列表"
 
-#: ../src/e-util/e-collection-account-wizard.c:817
+#: ../src/e-util/e-collection-account-wizard.c:857
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Task List"
 msgstr "工作列表"
 
-#: ../src/e-util/e-collection-account-wizard.c:1153
+#: ../src/e-util/e-collection-account-wizard.c:1193
 msgid "Looking up LDAP server’s search base…"
 msgstr "查詢 LDAP 伺服器的搜尋基礎…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1460
+#: ../src/e-util/e-collection-account-wizard.c:1326
+msgid "Failed to store password: "
+msgstr "無法儲存密碼:"
+
+#: ../src/e-util/e-collection-account-wizard.c:1336
+msgid "Failed to create sources: "
+msgstr "無法建立來源:"
+
+#: ../src/e-util/e-collection-account-wizard.c:1503
 msgid "Saving account settings, please wait…"
 msgstr "正在儲存帳號設定值,請稍候…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1611
+#: ../src/e-util/e-collection-account-wizard.c:1655
 msgid "User details"
 msgstr "使用者詳細資料"
 
-#: ../src/e-util/e-collection-account-wizard.c:1624
+#: ../src/e-util/e-collection-account-wizard.c:1668
 msgid "_Email Address or User name:"
 msgstr "電子郵件位址或使用者名稱(_E):"
 
-#: ../src/e-util/e-collection-account-wizard.c:1655
+#: ../src/e-util/e-collection-account-wizard.c:1699
 msgid "_Advanced Options"
 msgstr "進階選項(_A)"
 
-#: ../src/e-util/e-collection-account-wizard.c:1660
+#: ../src/e-util/e-collection-account-wizard.c:1704
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "伺服器(_S):"
 
-#: ../src/e-util/e-collection-account-wizard.c:1679
+#: ../src/e-util/e-collection-account-wizard.c:1723
 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:1869
+#: ../src/e-util/e-collection-account-wizard.c:1925
 msgid "Select which parts should be configured:"
 msgstr "選擇要設定哪個部分:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1993
+#: ../src/e-util/e-collection-account-wizard.c:2049
 #: ../src/mail/e-mail-config-identity-page.c:542
-#: ../src/mail/e-mail-config-summary-page.c:325
+#: ../src/mail/e-mail-config-summary-page.c:318
 msgid "Account Information"
 msgstr "帳號資訊"
 
@@ -12608,170 +12828,171 @@ msgstr "帳號資訊"
 msgid "Choose custom color"
 msgstr "選擇自訂顏色"
 
-#: ../src/e-util/e-color-combo.c:488 ../src/mail/e-mail-account-tree-view.c:135
-#: ../src/mail/e-mail-config-security-page.c:544
-#: ../src/mail/e-mail-config-security-page.c:708
-#: ../src/mail/e-mail-reader.c:4870 ../src/mail/mail-config.ui.h:78
+#: ../src/e-util/e-color-combo.c:476 ../src/e-util/e-html-editor.c:128
+#: ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/mail/e-mail-config-security-page.c:540
+#: ../src/mail/e-mail-config-security-page.c:704
+#: ../src/mail/e-mail-reader.c:4891 ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "預設值"
 
-#: ../src/e-util/e-color-combo.c:576
+#: ../src/e-util/e-color-combo.c:564
 msgid "black"
 msgstr "黑色"
 
-#: ../src/e-util/e-color-combo.c:577
+#: ../src/e-util/e-color-combo.c:565
 msgid "light brown"
 msgstr "淡棕色"
 
-#: ../src/e-util/e-color-combo.c:578
+#: ../src/e-util/e-color-combo.c:566
 msgid "brown gold"
 msgstr "金棕色"
 
-#: ../src/e-util/e-color-combo.c:579
+#: ../src/e-util/e-color-combo.c:567
 msgid "dark green #2"
 msgstr "暗綠色 #2"
 
-#: ../src/e-util/e-color-combo.c:580
+#: ../src/e-util/e-color-combo.c:568
 msgid "navy"
 msgstr "海軍"
 
-#: ../src/e-util/e-color-combo.c:581
+#: ../src/e-util/e-color-combo.c:569
 msgid "dark blue"
 msgstr "暗藍色"
 
-#: ../src/e-util/e-color-combo.c:582
+#: ../src/e-util/e-color-combo.c:570
 msgid "purple #2"
 msgstr "紫色 #2"
 
-#: ../src/e-util/e-color-combo.c:583
+#: ../src/e-util/e-color-combo.c:571
 msgid "very dark gray"
 msgstr "深暗灰色"
 
-#: ../src/e-util/e-color-combo.c:585
+#: ../src/e-util/e-color-combo.c:573
 msgid "dark red"
 msgstr "暗紅色"
 
-#: ../src/e-util/e-color-combo.c:586
+#: ../src/e-util/e-color-combo.c:574
 msgid "red-orange"
 msgstr "橙紅色"
 
-#: ../src/e-util/e-color-combo.c:587
+#: ../src/e-util/e-color-combo.c:575
 msgid "gold"
 msgstr "金色"
 
-#: ../src/e-util/e-color-combo.c:588
+#: ../src/e-util/e-color-combo.c:576
 msgid "dark green"
 msgstr "暗綠色"
 
-#: ../src/e-util/e-color-combo.c:589
+#: ../src/e-util/e-color-combo.c:577
 msgid "dull blue"
 msgstr "沌藍色"
 
-#: ../src/e-util/e-color-combo.c:590
+#: ../src/e-util/e-color-combo.c:578
 msgid "blue"
 msgstr "藍色"
 
-#: ../src/e-util/e-color-combo.c:591
+#: ../src/e-util/e-color-combo.c:579
 msgid "dull purple"
 msgstr "沌紫色"
 
-#: ../src/e-util/e-color-combo.c:592
+#: ../src/e-util/e-color-combo.c:580
 msgid "dark grey"
 msgstr "暗灰色"
 
-#: ../src/e-util/e-color-combo.c:594
+#: ../src/e-util/e-color-combo.c:582
 msgid "red"
 msgstr "紅色"
 
-#: ../src/e-util/e-color-combo.c:595
+#: ../src/e-util/e-color-combo.c:583
 msgid "orange"
 msgstr "橙色"
 
-#: ../src/e-util/e-color-combo.c:596
+#: ../src/e-util/e-color-combo.c:584
 msgid "lime"
 msgstr "萊姆色"
 
-#: ../src/e-util/e-color-combo.c:597
+#: ../src/e-util/e-color-combo.c:585
 msgid "dull green"
 msgstr "沌綠色"
 
-#: ../src/e-util/e-color-combo.c:598
+#: ../src/e-util/e-color-combo.c:586
 msgid "dull blue #2"
 msgstr "沌綠色 #2"
 
-#: ../src/e-util/e-color-combo.c:599
+#: ../src/e-util/e-color-combo.c:587
 msgid "sky blue #2"
 msgstr "天藍色 #2"
 
-#: ../src/e-util/e-color-combo.c:600
+#: ../src/e-util/e-color-combo.c:588
 msgid "purple"
 msgstr "紫色"
 
-#: ../src/e-util/e-color-combo.c:601
+#: ../src/e-util/e-color-combo.c:589
 msgid "gray"
 msgstr "灰色"
 
-#: ../src/e-util/e-color-combo.c:603
+#: ../src/e-util/e-color-combo.c:591
 msgid "magenta"
 msgstr "洋紅色"
 
-#: ../src/e-util/e-color-combo.c:604
+#: ../src/e-util/e-color-combo.c:592
 msgid "bright orange"
 msgstr "亮橙色"
 
-#: ../src/e-util/e-color-combo.c:605
+#: ../src/e-util/e-color-combo.c:593
 msgid "yellow"
 msgstr "黃色"
 
-#: ../src/e-util/e-color-combo.c:606
+#: ../src/e-util/e-color-combo.c:594
 msgid "green"
 msgstr "綠色"
 
-#: ../src/e-util/e-color-combo.c:607
+#: ../src/e-util/e-color-combo.c:595
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/e-util/e-color-combo.c:608
+#: ../src/e-util/e-color-combo.c:596
 msgid "bright blue"
 msgstr "亮藍色"
 
-#: ../src/e-util/e-color-combo.c:609
+#: ../src/e-util/e-color-combo.c:597
 msgid "red purple"
 msgstr "紅紫色"
 
-#: ../src/e-util/e-color-combo.c:610
+#: ../src/e-util/e-color-combo.c:598
 msgid "light grey"
 msgstr "淡灰色"
 
-#: ../src/e-util/e-color-combo.c:612
+#: ../src/e-util/e-color-combo.c:600
 msgid "pink"
 msgstr "粉紅色"
 
-#: ../src/e-util/e-color-combo.c:613
+#: ../src/e-util/e-color-combo.c:601
 msgid "light orange"
 msgstr "淡橘色"
 
-#: ../src/e-util/e-color-combo.c:614
+#: ../src/e-util/e-color-combo.c:602
 msgid "light yellow"
 msgstr "淡黃色"
 
-#: ../src/e-util/e-color-combo.c:615
+#: ../src/e-util/e-color-combo.c:603
 msgid "light green"
 msgstr "淡綠色"
 
-#: ../src/e-util/e-color-combo.c:616
+#: ../src/e-util/e-color-combo.c:604
 msgid "light cyan"
 msgstr "淡青色"
 
-#: ../src/e-util/e-color-combo.c:617
+#: ../src/e-util/e-color-combo.c:605
 msgid "light blue"
 msgstr "淡藍色"
 
-#: ../src/e-util/e-color-combo.c:618
+#: ../src/e-util/e-color-combo.c:606
 msgid "light purple"
 msgstr "淡紫色"
 
-#: ../src/e-util/e-color-combo.c:619
+#: ../src/e-util/e-color-combo.c:607
 msgid "white"
 msgstr "白色"
 
@@ -12779,53 +13000,53 @@ msgstr "白色"
 msgid "Running…"
 msgstr "正在執行…"
 
-#: ../src/e-util/e-dateedit.c:526
+#: ../src/e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "日期與時刻"
 
-#: ../src/e-util/e-dateedit.c:558
+#: ../src/e-util/e-dateedit.c:557
 msgid "Text entry to input date"
 msgstr "用來輸入日期的文字項目"
 
-#: ../src/e-util/e-dateedit.c:581
+#: ../src/e-util/e-dateedit.c:580
 msgid "Click this button to show a calendar"
 msgstr "按此按鈕以顯示行事曆"
 
-#: ../src/e-util/e-dateedit.c:636
+#: ../src/e-util/e-dateedit.c:640
 msgid "Drop-down combination box to select time"
 msgstr "用以選擇時刻的下拉式組合方塊"
 
-#: ../src/e-util/e-dateedit.c:637
+#: ../src/e-util/e-dateedit.c:641
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "時間"
 
-#: ../src/e-util/e-dateedit.c:714
+#: ../src/e-util/e-dateedit.c:718
 msgid "No_w"
 msgstr "現在(_W)"
 
-#: ../src/e-util/e-dateedit.c:721
+#: ../src/e-util/e-dateedit.c:725
 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:730
+#: ../src/e-util/e-dateedit.c:734 ../src/mail/em-folder-selector.c:334
 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:1889 ../src/e-util/e-dateedit.c:2140
+#: ../src/e-util/e-dateedit.c:1893 ../src/e-util/e-dateedit.c:2146
 msgctxt "date"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/e-util/e-dateedit.c:2025 ../src/e-util/e-dateedit.c:2494
+#: ../src/e-util/e-dateedit.c:2029 ../src/e-util/e-dateedit.c:2500
 msgid "Invalid Date Value"
 msgstr "無效的日期數值"
 
-#: ../src/e-util/e-dateedit.c:2063 ../src/e-util/e-dateedit.c:2551
+#: ../src/e-util/e-dateedit.c:2069 ../src/e-util/e-dateedit.c:2557
 msgid "Invalid Time Value"
 msgstr "無效的時刻數值"
 
@@ -12889,8 +13110,8 @@ msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "下週日"
 
-#: ../src/e-util/e-datetime-format.c:367 ../src/e-util/e-datetime-format.c:377
-#: ../src/e-util/e-datetime-format.c:386
+#: ../src/e-util/e-datetime-format.c:368 ../src/e-util/e-datetime-format.c:378
+#: ../src/e-util/e-datetime-format.c:387
 msgid "Use locale default"
 msgstr "使用地區設定預設值"
 
@@ -13165,23 +13386,23 @@ msgstr "選擇要比對的時間"
 msgid "Choose a File"
 msgstr "選擇檔案"
 
-#: ../src/e-util/e-filter-rule.c:979
+#: ../src/e-util/e-filter-rule.c:1008
 msgid "R_ule name:"
 msgstr "規則名稱(_U):"
 
-#: ../src/e-util/e-filter-rule.c:1035
+#: ../src/e-util/e-filter-rule.c:1064
 msgid "all the following conditions"
 msgstr "如果全部條件符合"
 
-#: ../src/e-util/e-filter-rule.c:1036
+#: ../src/e-util/e-filter-rule.c:1065
 msgid "any of the following conditions"
 msgstr "如果任何條件符合"
 
-#: ../src/e-util/e-filter-rule.c:1042
+#: ../src/e-util/e-filter-rule.c:1071
 msgid "_Find items which match:"
 msgstr "尋找符合的項目(_F):"
 
-#: ../src/e-util/e-filter-rule.c:1065
+#: ../src/e-util/e-filter-rule.c:1094
 msgid "Find items that meet the following conditions"
 msgstr "尋找符合下列條件的項目"
 
@@ -13189,100 +13410,110 @@ msgstr "尋找符合下列條件的項目"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../src/e-util/e-filter-rule.c:1080
-#: ../src/e-util/e-html-editor-page-dialog.c:59
+#: ../src/e-util/e-filter-rule.c:1109
+#: ../src/e-util/e-html-editor-page-dialog.c:62
 #: ../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:29
 #: ../src/mail/e-mail-autoconfig.c:778
 #: ../src/mail/e-mail-config-summary-page.c:143
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:681
 msgid "None"
 msgstr "沒有"
 
-#: ../src/e-util/e-filter-rule.c:1081
+#: ../src/e-util/e-filter-rule.c:1110
 msgid "All related"
 msgstr "所有相關的"
 
-#: ../src/e-util/e-filter-rule.c:1082 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1111 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "回覆"
 
-#: ../src/e-util/e-filter-rule.c:1083
+#: ../src/e-util/e-filter-rule.c:1112
 msgid "Replies and parents"
 msgstr "回覆和父代"
 
-#: ../src/e-util/e-filter-rule.c:1084
+#: ../src/e-util/e-filter-rule.c:1113
 msgid "No reply or parent"
 msgstr "沒有回復或原始郵件"
 
-#: ../src/e-util/e-filter-rule.c:1087
+#: ../src/e-util/e-filter-rule.c:1116
 msgid "I_nclude threads:"
 msgstr "包括郵件群組(_N):"
 
-#: ../src/e-util/e-filter-rule.c:1165
+#: ../src/e-util/e-filter-rule.c:1194
 msgid "A_dd Condition"
 msgstr "加入條件(_D)"
 
-#: ../src/e-util/e-filter-rule.c:1485 ../src/e-util/filter.ui.h:1
-#: ../src/mail/em-filter-rule.c:1042 ../src/mail/em-utils.c:166
+#: ../src/e-util/e-filter-rule.c:1514 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-filter-rule.c:981 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "內送"
 
-#: ../src/e-util/e-filter-rule.c:1485 ../src/mail/em-filter-rule.c:1043
+#: ../src/e-util/e-filter-rule.c:1514 ../src/mail/em-filter-rule.c:982
 #: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "外寄"
 
 #: ../src/e-util/e-gtkemojichooser.c:753
+msgctxt "EmojiChooser"
 msgid "Recent"
-msgstr "最近選擇"
+msgstr "最近"
 
 #: ../src/e-util/e-gtkemojichooser.c:757
+msgctxt "EmojiChooser"
 msgid "Smileys & People"
-msgstr "微笑 & 人們"
+msgstr "表情和人物"
 
 #: ../src/e-util/e-gtkemojichooser.c:758
+msgctxt "EmojiChooser"
 msgid "Body & Clothing"
-msgstr "身體 & 衣料"
+msgstr "身體和衣物"
 
 #: ../src/e-util/e-gtkemojichooser.c:759
+msgctxt "EmojiChooser"
 msgid "Animals & Nature"
-msgstr "動物 & 大自然"
+msgstr "動物和自然"
 
 #: ../src/e-util/e-gtkemojichooser.c:760
+msgctxt "EmojiChooser"
 msgid "Food & Drink"
-msgstr "食物 & 飲料"
+msgstr "食物和飲品"
 
 #: ../src/e-util/e-gtkemojichooser.c:761
+msgctxt "EmojiChooser"
 msgid "Travel & Places"
-msgstr "旅行 & 地方"
+msgstr "旅行和地點"
 
 #: ../src/e-util/e-gtkemojichooser.c:762
+msgctxt "EmojiChooser"
 msgid "Activities"
 msgstr "活動"
 
 #: ../src/e-util/e-gtkemojichooser.c:763
-msgctxt "emoji category"
+msgctxt "EmojiChooser"
 msgid "Objects"
 msgstr "物件"
 
 #: ../src/e-util/e-gtkemojichooser.c:764
+msgctxt "EmojiChooser"
 msgid "Symbols"
 msgstr "符號"
 
 #: ../src/e-util/e-gtkemojichooser.c:765
-#: ../src/e-util/evolution-source-viewer.c:677
+msgctxt "EmojiChooser"
 msgid "Flags"
-msgstr "旗標"
+msgstr "旗幟"
 
 #: ../src/e-util/e-gtkemojichooser.c:789
+msgctxt "EmojiChooser"
 msgid "No Results Found"
-msgstr "未找到結果"
+msgstr "找不到結果"
 
 #: ../src/e-util/e-gtkemojichooser.c:797
+msgctxt "EmojiChooser"
 msgid "Try a different search"
-msgstr "試試不同搜尋"
+msgstr "嘗試不同的搜尋"
 
 #: ../src/e-util/e-html-editor-actions.c:81
 msgid "Failed to insert HTML file."
@@ -13320,499 +13551,537 @@ msgstr "插入文字檔案"
 msgid "Text file"
 msgstr "文字檔案"
 
-#: ../src/e-util/e-html-editor-actions.c:971
+#: ../src/e-util/e-html-editor-actions.c:1076
 msgid "Copy selected text to the clipboard"
 msgstr "將選取的文字複製至剪貼簿"
 
-#: ../src/e-util/e-html-editor-actions.c:978
+#: ../src/e-util/e-html-editor-actions.c:1083
 msgid "Cut selected text to the clipboard"
 msgstr "將選定的文字剪貼至剪貼簿"
 
-#. Widgets are treating Ctrl + v shortcut themselves
-#: ../src/e-util/e-html-editor-actions.c:985
+#: ../src/e-util/e-html-editor-actions.c:1090
 msgid "Paste text from the clipboard"
 msgstr "從剪貼簿貼上文字"
 
-#: ../src/e-util/e-html-editor-actions.c:992
+#: ../src/e-util/e-html-editor-actions.c:1097
 msgid "Redo the last undone action"
 msgstr "重複剛取消的動作"
 
-#: ../src/e-util/e-html-editor-actions.c:1006
+#: ../src/e-util/e-html-editor-actions.c:1111
 msgid "Undo the last action"
 msgstr "還原最後的動作"
 
-#: ../src/e-util/e-html-editor-actions.c:1027
+#: ../src/e-util/e-html-editor-actions.c:1132
 msgid "For_mat"
 msgstr "格式(_M)"
 
-#: ../src/e-util/e-html-editor-actions.c:1034
+#: ../src/e-util/e-html-editor-actions.c:1139
 msgid "_Paragraph Style"
 msgstr "段落樣式(_P)"
 
-#: ../src/e-util/e-html-editor-actions.c:1048
-#: ../src/e-util/e-html-editor-image-dialog.c:590
+#: ../src/e-util/e-html-editor-actions.c:1153
+#: ../src/e-util/e-html-editor-image-dialog.c:678
 msgid "_Alignment"
 msgstr "對齊(_A)"
 
-#: ../src/e-util/e-html-editor-actions.c:1055
+#: ../src/e-util/e-html-editor-actions.c:1160
 msgid "Current _Languages"
 msgstr "目前的語言(_L)"
 
-#: ../src/e-util/e-html-editor-actions.c:1072
+#: ../src/e-util/e-html-editor-actions.c:1177
 msgid "_Increase Indent"
 msgstr "增加縮排(_I)"
 
-#: ../src/e-util/e-html-editor-actions.c:1074
+#: ../src/e-util/e-html-editor-actions.c:1179
 msgid "Increase Indent"
 msgstr "增加縮排"
 
-#: ../src/e-util/e-html-editor-actions.c:1079
-#: ../src/e-util/e-html-editor-actions.c:2087
+#: ../src/e-util/e-html-editor-actions.c:1184
+#: ../src/e-util/e-html-editor-actions.c:2212
 msgid "E_moji"
 msgstr "顏文字(_M)"
 
-#: ../src/e-util/e-html-editor-actions.c:1081
+#: ../src/e-util/e-html-editor-actions.c:1186
+#: ../src/e-util/e-html-editor-actions.c:1193
 msgid "Insert Emoji"
 msgstr "插入顏文字"
 
-#: ../src/e-util/e-html-editor-actions.c:1086
+#: ../src/e-util/e-html-editor-actions.c:1191
+msgid "Insert E_moji"
+msgstr "插入繪文字(_M)"
+
+#: ../src/e-util/e-html-editor-actions.c:1198
 msgid "_HTML File…"
 msgstr "_HTML 檔案…"
 
-#: ../src/e-util/e-html-editor-actions.c:1093
+#: ../src/e-util/e-html-editor-actions.c:1205
 msgid "Te_xt File…"
 msgstr "文字檔案(_X)…"
 
-#: ../src/e-util/e-html-editor-actions.c:1100
+#: ../src/e-util/e-html-editor-actions.c:1212
 msgid "Paste _Quotation"
 msgstr "貼上引文(_Q)"
 
-#: ../src/e-util/e-html-editor-actions.c:1107
+#: ../src/e-util/e-html-editor-actions.c:1219
 msgid "_Find…"
 msgstr "尋找(_F)…"
 
-#: ../src/e-util/e-html-editor-actions.c:1109
+#: ../src/e-util/e-html-editor-actions.c:1221
 msgid "Search for text"
 msgstr "搜尋文字"
 
-#: ../src/e-util/e-html-editor-actions.c:1114
+#: ../src/e-util/e-html-editor-actions.c:1226
 msgid "Find A_gain"
 msgstr "再次尋找(_G)"
 
-#: ../src/e-util/e-html-editor-actions.c:1121
+#: ../src/e-util/e-html-editor-actions.c:1233
 msgid "Re_place…"
 msgstr "取代(_P)…"
 
-#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/e-util/e-html-editor-actions.c:1235
 msgid "Search for and replace text"
 msgstr "搜尋及取代文字"
 
-#: ../src/e-util/e-html-editor-actions.c:1128
+#: ../src/e-util/e-html-editor-actions.c:1240
 msgid "Check _Spelling…"
 msgstr "檢查拼字(_S)…"
 
-#: ../src/e-util/e-html-editor-actions.c:1135
+#: ../src/e-util/e-html-editor-actions.c:1247
 msgid "_Decrease Indent"
 msgstr "減少縮排(_D)"
 
-#: ../src/e-util/e-html-editor-actions.c:1137
+#: ../src/e-util/e-html-editor-actions.c:1249
 msgid "Decrease Indent"
 msgstr "減少縮排"
 
-#: ../src/e-util/e-html-editor-actions.c:1142
+#: ../src/e-util/e-html-editor-actions.c:1254
 msgid "_Wrap Lines"
 msgstr "換列(_W)"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1152
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:108
+#: ../src/e-util/e-html-editor-actions.c:1264
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:109
 msgid "_Center"
 msgstr "置中(_C)"
 
-#: ../src/e-util/e-html-editor-actions.c:1154
+#: ../src/e-util/e-html-editor-actions.c:1266
 msgid "Center Alignment"
 msgstr "置中對齊"
 
+#. Justified
+#: ../src/e-util/e-html-editor-actions.c:1271
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:127
+msgid "_Justified"
+msgstr "左右對齊(_J)"
+
+#: ../src/e-util/e-html-editor-actions.c:1273
+msgid "Align Justified"
+msgstr "向左右對齊"
+
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1159
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:99
+#: ../src/e-util/e-html-editor-actions.c:1278
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:100
 msgid "_Left"
 msgstr "靠左(_L)"
 
-#: ../src/e-util/e-html-editor-actions.c:1161
+#: ../src/e-util/e-html-editor-actions.c:1280
 msgid "Left Alignment"
 msgstr "靠左對齊"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1166
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:117
+#: ../src/e-util/e-html-editor-actions.c:1285
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:118
 msgid "_Right"
 msgstr "靠右(_R)"
 
-#: ../src/e-util/e-html-editor-actions.c:1168
+#: ../src/e-util/e-html-editor-actions.c:1287
 msgid "Right Alignment"
 msgstr "靠右對齊"
 
-#: ../src/e-util/e-html-editor-actions.c:1176
+#: ../src/e-util/e-html-editor-actions.c:1295
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1178
+#: ../src/e-util/e-html-editor-actions.c:1297
 msgid "HTML editing mode"
 msgstr "HTML 編輯模式"
 
-#: ../src/e-util/e-html-editor-actions.c:1183
+#: ../src/e-util/e-html-editor-actions.c:1302
 msgid "Plain _Text"
 msgstr "純文字(_T)"
 
-#: ../src/e-util/e-html-editor-actions.c:1185
+#: ../src/e-util/e-html-editor-actions.c:1304
 msgid "Plain text editing mode"
 msgstr "純文字編輯模式"
 
-#: ../src/e-util/e-html-editor-actions.c:1193
+#: ../src/e-util/e-html-editor-actions.c:1312
 msgid "_Normal"
 msgstr "一般(_N)"
 
-#: ../src/e-util/e-html-editor-actions.c:1200
+#: ../src/e-util/e-html-editor-actions.c:1319
 msgid "Heading _1"
 msgstr "標題 _1"
 
-#: ../src/e-util/e-html-editor-actions.c:1207
+#: ../src/e-util/e-html-editor-actions.c:1326
 msgid "Heading _2"
 msgstr "標題 _2"
 
-#: ../src/e-util/e-html-editor-actions.c:1214
+#: ../src/e-util/e-html-editor-actions.c:1333
 msgid "Heading _3"
 msgstr "標題 _3"
 
-#: ../src/e-util/e-html-editor-actions.c:1221
+#: ../src/e-util/e-html-editor-actions.c:1340
 msgid "Heading _4"
 msgstr "標題 _4"
 
-#: ../src/e-util/e-html-editor-actions.c:1228
+#: ../src/e-util/e-html-editor-actions.c:1347
 msgid "Heading _5"
 msgstr "標題 _5"
 
-#: ../src/e-util/e-html-editor-actions.c:1235
+#: ../src/e-util/e-html-editor-actions.c:1354
 msgid "Heading _6"
 msgstr "標題 _6"
 
-#: ../src/e-util/e-html-editor-actions.c:1242
+#: ../src/e-util/e-html-editor-actions.c:1361
 msgid "_Preformatted"
 msgstr "預先格式化(_P)"
 
-#: ../src/e-util/e-html-editor-actions.c:1249
+#: ../src/e-util/e-html-editor-actions.c:1368
 msgid "A_ddress"
 msgstr "位址(_D)"
 
-#: ../src/e-util/e-html-editor-actions.c:1256
+#: ../src/e-util/e-html-editor-actions.c:1375
 msgid "_Bulleted List"
 msgstr "無序列表(_B)"
 
-#: ../src/e-util/e-html-editor-actions.c:1263
+#: ../src/e-util/e-html-editor-actions.c:1382
 msgid "_Roman Numeral List"
 msgstr "羅馬字有序列表(_R)"
 
-#: ../src/e-util/e-html-editor-actions.c:1270
+#: ../src/e-util/e-html-editor-actions.c:1389
 msgid "Numbered _List"
 msgstr "有序列表(_L)"
 
-#: ../src/e-util/e-html-editor-actions.c:1277
+#: ../src/e-util/e-html-editor-actions.c:1396
 msgid "_Alphabetical List"
 msgstr "字母順序列表(_A)"
 
-#: ../src/e-util/e-html-editor-actions.c:1293
-#: ../src/e-util/e-html-editor-actions.c:1331
+#: ../src/e-util/e-html-editor-actions.c:1412
+#: ../src/e-util/e-html-editor-actions.c:1450
 msgid "_Image…"
 msgstr "影像(_I)…"
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-actions.c:1415
 msgid "Insert Image"
 msgstr "插入影像"
 
-#: ../src/e-util/e-html-editor-actions.c:1301
-#: ../src/e-util/e-html-editor-actions.c:1338
+#: ../src/e-util/e-html-editor-actions.c:1420
+#: ../src/e-util/e-html-editor-actions.c:1457
 msgid "_Link…"
 msgstr "連結(_L)…"
 
-#: ../src/e-util/e-html-editor-actions.c:1303
+#: ../src/e-util/e-html-editor-actions.c:1422
 msgid "Insert Link"
 msgstr "插入連結"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1309
-#: ../src/e-util/e-html-editor-actions.c:1353
+#: ../src/e-util/e-html-editor-actions.c:1428
+#: ../src/e-util/e-html-editor-actions.c:1472
 msgid "_Rule…"
 msgstr "水平線(_R)…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1312
+#: ../src/e-util/e-html-editor-actions.c:1431
 msgid "Insert Rule"
 msgstr "插入水平線"
 
-#: ../src/e-util/e-html-editor-actions.c:1317
-#: ../src/e-util/e-html-editor-actions.c:1360
+#: ../src/e-util/e-html-editor-actions.c:1436
+#: ../src/e-util/e-html-editor-actions.c:1479
 msgid "_Table…"
 msgstr "表格(_T)…"
 
-#: ../src/e-util/e-html-editor-actions.c:1319
+#: ../src/e-util/e-html-editor-actions.c:1438
 msgid "Insert Table"
 msgstr "插入表格"
 
-#: ../src/e-util/e-html-editor-actions.c:1324
+#: ../src/e-util/e-html-editor-actions.c:1443
 msgid "_Cell…"
 msgstr "儲存格(_C)…"
 
-#: ../src/e-util/e-html-editor-actions.c:1345
+#: ../src/e-util/e-html-editor-actions.c:1464
 msgid "Pa_ge…"
 msgstr "頁面(_G)…"
 
-#: ../src/e-util/e-html-editor-actions.c:1369
+#: ../src/e-util/e-html-editor-actions.c:1488
 msgid "Font _Size"
 msgstr "字型大小(_S)"
 
-#: ../src/e-util/e-html-editor-actions.c:1376
+#: ../src/e-util/e-html-editor-actions.c:1495
 msgid "_Font Style"
 msgstr "字型樣式(_F)"
 
-#: ../src/e-util/e-html-editor-actions.c:1383
+#: ../src/e-util/e-html-editor-actions.c:1502
 msgid "Paste As _Text"
 msgstr "貼上為純文字(_T)"
 
-#: ../src/e-util/e-html-editor-actions.c:1394
+#: ../src/e-util/e-html-editor-actions.c:1513
 #: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "粗體(_B)"
 
-#: ../src/e-util/e-html-editor-actions.c:1396
+#: ../src/e-util/e-html-editor-actions.c:1515
 msgid "Bold"
 msgstr "粗體"
 
-#: ../src/e-util/e-html-editor-actions.c:1402
+#: ../src/e-util/e-html-editor-actions.c:1521
 #: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "斜體(_I)"
 
-#: ../src/e-util/e-html-editor-actions.c:1404
+#: ../src/e-util/e-html-editor-actions.c:1523
 msgid "Italic"
 msgstr "斜體"
 
-#: ../src/e-util/e-html-editor-actions.c:1410
-msgid "_Plain Text"
-msgstr "純文字(_P)"
-
-#: ../src/e-util/e-html-editor-actions.c:1418
+#: ../src/e-util/e-html-editor-actions.c:1529
 #: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "刪除線(_S)"
 
-#: ../src/e-util/e-html-editor-actions.c:1420
+#: ../src/e-util/e-html-editor-actions.c:1531
 msgid "Strikethrough"
 msgstr "刪除線"
 
-#: ../src/e-util/e-html-editor-actions.c:1426
+#: ../src/e-util/e-html-editor-actions.c:1537
+msgid "Subs_cript"
+msgstr "下標(_C)"
+
+#: ../src/e-util/e-html-editor-actions.c:1539
+msgid "Subscript"
+msgstr "下標"
+
+#: ../src/e-util/e-html-editor-actions.c:1545
+msgid "Su_perscript"
+msgstr "上標(_P)"
+
+#: ../src/e-util/e-html-editor-actions.c:1547
+msgid "Superscript"
+msgstr "上標"
+
+#: ../src/e-util/e-html-editor-actions.c:1553
 #: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "底線(_U)"
 
-#: ../src/e-util/e-html-editor-actions.c:1428
+#: ../src/e-util/e-html-editor-actions.c:1555
 msgid "Underline"
 msgstr "底線"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1438
+#: ../src/e-util/e-html-editor-actions.c:1565
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1446
+#: ../src/e-util/e-html-editor-actions.c:1573
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1454
+#: ../src/e-util/e-html-editor-actions.c:1581
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1462
+#: ../src/e-util/e-html-editor-actions.c:1589
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1470
+#: ../src/e-util/e-html-editor-actions.c:1597
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1478
+#: ../src/e-util/e-html-editor-actions.c:1605
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1486
+#: ../src/e-util/e-html-editor-actions.c:1613
 msgid "+4"
 msgstr "+4"
 
-#: ../src/e-util/e-html-editor-actions.c:1505
+#: ../src/e-util/e-html-editor-actions.c:1632
 msgid "Cell Contents"
 msgstr "儲存格內容"
 
-#: ../src/e-util/e-html-editor-actions.c:1512
+#: ../src/e-util/e-html-editor-actions.c:1639
 msgid "Column"
 msgstr "欄"
 
-#: ../src/e-util/e-html-editor-actions.c:1519
+#: ../src/e-util/e-html-editor-actions.c:1646
 msgid "Row"
 msgstr "列"
 
-#: ../src/e-util/e-html-editor-actions.c:1526
+#: ../src/e-util/e-html-editor-actions.c:1653
 msgid "Table"
 msgstr "表格"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../src/e-util/e-html-editor-actions.c:1536
+#: ../src/e-util/e-html-editor-actions.c:1663
 msgid "Table Delete"
 msgstr "刪除表格"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../src/e-util/e-html-editor-actions.c:1544
+#: ../src/e-util/e-html-editor-actions.c:1671
 msgid "Table Insert"
 msgstr "插入表格"
 
-#: ../src/e-util/e-html-editor-actions.c:1551
+#: ../src/e-util/e-html-editor-actions.c:1678
 msgid "Properties"
 msgstr "屬性"
 
-#: ../src/e-util/e-html-editor-actions.c:1569
+#: ../src/e-util/e-html-editor-actions.c:1696
 msgid "Column After"
 msgstr "欄之後"
 
-#: ../src/e-util/e-html-editor-actions.c:1576
+#: ../src/e-util/e-html-editor-actions.c:1703
 msgid "Column Before"
 msgstr "欄之前"
 
-#: ../src/e-util/e-html-editor-actions.c:1583
+#: ../src/e-util/e-html-editor-actions.c:1710
 msgid "Insert _Link"
 msgstr "插入連結(_L)"
 
-#: ../src/e-util/e-html-editor-actions.c:1590
+#: ../src/e-util/e-html-editor-actions.c:1717
 msgid "Row Above"
 msgstr "列之上"
 
-#: ../src/e-util/e-html-editor-actions.c:1597
+#: ../src/e-util/e-html-editor-actions.c:1724
 msgid "Row Below"
 msgstr "列之下"
 
-#: ../src/e-util/e-html-editor-actions.c:1604
+#: ../src/e-util/e-html-editor-actions.c:1731
 msgid "Cell…"
 msgstr "儲存格…"
 
-#: ../src/e-util/e-html-editor-actions.c:1611
+#: ../src/e-util/e-html-editor-actions.c:1738
 msgid "Image…"
 msgstr "影像…"
 
-#: ../src/e-util/e-html-editor-actions.c:1618
+#: ../src/e-util/e-html-editor-actions.c:1745
 msgid "Link…"
 msgstr "連結(_L)…"
 
-#: ../src/e-util/e-html-editor-actions.c:1625
+#: ../src/e-util/e-html-editor-actions.c:1752
 msgid "Page…"
 msgstr "頁面…"
 
-#: ../src/e-util/e-html-editor-actions.c:1632
+#: ../src/e-util/e-html-editor-actions.c:1759
 msgid "Paragraph…"
 msgstr "段落…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1640
+#: ../src/e-util/e-html-editor-actions.c:1767
 msgid "Rule…"
 msgstr "水平線…"
 
-#: ../src/e-util/e-html-editor-actions.c:1647
+#: ../src/e-util/e-html-editor-actions.c:1774
 msgid "Table…"
 msgstr "表格…"
 
-#: ../src/e-util/e-html-editor-actions.c:1654
+#: ../src/e-util/e-html-editor-actions.c:1781
 msgid "Text…"
 msgstr "文字…"
 
-#: ../src/e-util/e-html-editor-actions.c:1661
+#: ../src/e-util/e-html-editor-actions.c:1788
 msgid "Remove Link"
 msgstr "移除連結"
 
-#: ../src/e-util/e-html-editor-actions.c:1678
+#: ../src/e-util/e-html-editor-actions.c:1805
 msgid "Add Word to Dictionary"
 msgstr "加入字詞至字典"
 
-#: ../src/e-util/e-html-editor-actions.c:1685
+#: ../src/e-util/e-html-editor-actions.c:1812
 msgid "Ignore Misspelled Word"
 msgstr "忽略拼錯的字詞"
 
-#: ../src/e-util/e-html-editor-actions.c:1692
+#: ../src/e-util/e-html-editor-actions.c:1819
 msgid "Add Word To"
 msgstr "加入字詞至"
 
-#: ../src/e-util/e-html-editor-actions.c:1701
+#: ../src/e-util/e-html-editor-actions.c:1828
 msgid "More Suggestions"
 msgstr "更多建議"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../src/e-util/e-html-editor-actions.c:1936
+#: ../src/e-util/e-html-editor-actions.c:2063
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s 字典"
 
-#: ../src/e-util/e-html-editor-actions.c:2015
+#: ../src/e-util/e-html-editor-actions.c:2140
 msgid "_Emoticon"
 msgstr "表情符號(_E)"
 
-#: ../src/e-util/e-html-editor-actions.c:2016
+#: ../src/e-util/e-html-editor-actions.c:2141
 msgid "Insert Emoticon"
 msgstr "插入表情符號"
 
-#: ../src/e-util/e-html-editor-actions.c:2084
+#: ../src/e-util/e-html-editor-actions.c:2209
 msgid "Re_place"
 msgstr "取代(_P)"
 
-#: ../src/e-util/e-html-editor-actions.c:2090
+#: ../src/e-util/e-html-editor-actions.c:2215
 msgid "_Image"
 msgstr "影像(_I)"
 
-#: ../src/e-util/e-html-editor-actions.c:2093
+#: ../src/e-util/e-html-editor-actions.c:2218
 msgid "_Link"
 msgstr "連結(_L)"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:2097
+#: ../src/e-util/e-html-editor-actions.c:2222
 msgid "_Rule"
 msgstr "水平線(_R)"
 
-#: ../src/e-util/e-html-editor-actions.c:2100
+#: ../src/e-util/e-html-editor-actions.c:2225
 #: ../src/e-util/e-html-editor-cell-dialog.c:448
 msgid "_Table"
 msgstr "表格(_T)"
 
-#: ../src/e-util/e-html-editor.c:743
+#: ../src/e-util/e-html-editor.c:897
 msgid "Paragraph Style"
 msgstr "段落樣式"
 
-#: ../src/e-util/e-html-editor.c:757
+#: ../src/e-util/e-html-editor.c:911
 msgid "Editing Mode"
 msgstr "編輯模式"
 
-#: ../src/e-util/e-html-editor.c:769
+#: ../src/e-util/e-html-editor.c:923
 msgid "Font Color"
 msgstr "字型顏色"
 
-#: ../src/e-util/e-html-editor.c:779
+#: ../src/e-util/e-html-editor.c:934
+msgid "Background Color"
+msgstr "背景顏色"
+
+#: ../src/e-util/e-html-editor.c:944
 msgid "Font Size"
 msgstr "字型大小"
 
+#: ../src/e-util/e-html-editor.c:953
+msgid "Font Name"
+msgstr "字型名稱"
+
+#: ../src/e-util/e-html-editor.c:1577
+msgid "Failed to obtain content of editor"
+msgstr "無法取得編輯器的內容"
+
 #: ../src/e-util/e-html-editor-cell-dialog.c:408
 msgid "<b>Scope</b>"
 msgstr "<b>範圍</b>"
@@ -13834,20 +14103,20 @@ msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b>對齊 &amp; 行為</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:484
-#: ../src/e-util/e-html-editor-hrule-dialog.c:328
-#: ../src/e-util/e-html-editor-table-dialog.c:648
+#: ../src/e-util/e-html-editor-hrule-dialog.c:306
+#: ../src/e-util/e-html-editor-table-dialog.c:639
 msgid "Left"
 msgstr "靠左"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:485
-#: ../src/e-util/e-html-editor-hrule-dialog.c:330
-#: ../src/e-util/e-html-editor-table-dialog.c:649
+#: ../src/e-util/e-html-editor-hrule-dialog.c:308
+#: ../src/e-util/e-html-editor-table-dialog.c:640
 msgid "Center"
 msgstr "置中"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:486
-#: ../src/e-util/e-html-editor-hrule-dialog.c:332
-#: ../src/e-util/e-html-editor-table-dialog.c:650
+#: ../src/e-util/e-html-editor-hrule-dialog.c:310
+#: ../src/e-util/e-html-editor-table-dialog.c:641
 msgid "Right"
 msgstr "靠右"
 
@@ -13856,17 +14125,17 @@ msgid "_Horizontal:"
 msgstr "水平(_H):"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:502
-#: ../src/e-util/e-html-editor-image-dialog.c:580
+#: ../src/e-util/e-html-editor-image-dialog.c:668
 msgid "Top"
 msgstr "上"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:503
-#: ../src/e-util/e-html-editor-image-dialog.c:581
+#: ../src/e-util/e-html-editor-image-dialog.c:669
 msgid "Middle"
 msgstr "中央"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:504
-#: ../src/e-util/e-html-editor-image-dialog.c:582
+#: ../src/e-util/e-html-editor-image-dialog.c:670
 msgid "Bottom"
 msgstr "下"
 
@@ -13885,8 +14154,8 @@ msgid "_Header Style"
 msgstr "標題樣式(_H)"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:540
-#: ../src/e-util/e-html-editor-image-dialog.c:520
-#: ../src/e-util/e-html-editor-table-dialog.c:560
+#: ../src/e-util/e-html-editor-image-dialog.c:609
+#: ../src/e-util/e-html-editor-table-dialog.c:551
 msgid "<b>Layout</b>"
 msgstr "<b>配置</b>"
 
@@ -13904,12 +14173,12 @@ msgid "Co_lumn Span:"
 msgstr "合併欄(_L):"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:612
-#: ../src/e-util/e-html-editor-table-dialog.c:664
+#: ../src/e-util/e-html-editor-table-dialog.c:655
 msgid "<b>Background</b>"
 msgstr "<b>背景</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:625
-#: ../src/e-util/e-html-editor-table-dialog.c:677
+#: ../src/e-util/e-html-editor-table-dialog.c:668
 msgid "Transparent"
 msgstr "透明"
 
@@ -13918,17 +14187,17 @@ msgid "C_olor:"
 msgstr "顏色(_O):"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:640
-#: ../src/e-util/e-html-editor-image-dialog.c:476
-#: ../src/e-util/e-html-editor-table-dialog.c:692
+#: ../src/e-util/e-html-editor-image-dialog.c:565
+#: ../src/e-util/e-html-editor-table-dialog.c:683
 msgid "Images"
 msgstr "影像"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:645
 #: ../src/e-util/e-html-editor-cell-dialog.c:648
-#: ../src/e-util/e-html-editor-image-dialog.c:481
-#: ../src/e-util/e-html-editor-image-dialog.c:484
-#: ../src/e-util/e-html-editor-table-dialog.c:697
-#: ../src/e-util/e-html-editor-table-dialog.c:702
+#: ../src/e-util/e-html-editor-image-dialog.c:570
+#: ../src/e-util/e-html-editor-image-dialog.c:573
+#: ../src/e-util/e-html-editor-table-dialog.c:688
+#: ../src/e-util/e-html-editor-table-dialog.c:693
 msgid "Choose Background Image"
 msgstr "選擇背景影像"
 
@@ -13937,8 +14206,8 @@ msgid "_Image:"
 msgstr "影像(_I):"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:669
-#: ../src/e-util/e-html-editor-page-dialog.c:495
-#: ../src/e-util/e-html-editor-table-dialog.c:723
+#: ../src/e-util/e-html-editor-page-dialog.c:545
+#: ../src/e-util/e-html-editor-table-dialog.c:714
 msgid "_Remove image"
 msgstr "移除影像(_R)"
 
@@ -13968,172 +14237,187 @@ msgstr "反向搜尋(_W)"
 msgid "Find"
 msgstr "尋找"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:263
+#: ../src/e-util/e-html-editor-hrule-dialog.c:241
 msgid "<b>Size</b>"
 msgstr "<b>大小</b>"
 
 #. Width
-#: ../src/e-util/e-html-editor-hrule-dialog.c:283
-#: ../src/e-util/e-html-editor-image-dialog.c:538
-#: ../src/e-util/e-html-editor-table-dialog.c:571
+#: ../src/e-util/e-html-editor-hrule-dialog.c:261
+#: ../src/e-util/e-html-editor-image-dialog.c:627
+#: ../src/e-util/e-html-editor-table-dialog.c:562
 msgid "_Width:"
 msgstr "寬度(_W):"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:308
+#: ../src/e-util/e-html-editor-hrule-dialog.c:286
 msgid "_Size:"
 msgstr "大小(_S):"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:315
+#: ../src/e-util/e-html-editor-hrule-dialog.c:293
 msgid "<b>Style</b>"
 msgstr "<b>樣式</b>"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:340
-#: ../src/e-util/e-html-editor-table-dialog.c:657
+#: ../src/e-util/e-html-editor-hrule-dialog.c:318
+#: ../src/e-util/e-html-editor-table-dialog.c:648
 msgid "_Alignment:"
 msgstr "對齊(_A):"
 
 #. Shaded
-#: ../src/e-util/e-html-editor-hrule-dialog.c:346
+#: ../src/e-util/e-html-editor-hrule-dialog.c:324
 msgid "S_haded"
 msgstr "陰影(_H)"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:363
+#: ../src/e-util/e-html-editor-hrule-dialog.c:341
 msgid "Rule properties"
 msgstr "水平線屬性"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:465
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:64
-#: ../src/e-util/e-html-editor-table-dialog.c:514
+#: ../src/e-util/e-html-editor-image-dialog.c:554
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:65
+#: ../src/e-util/e-html-editor-table-dialog.c:505
 msgid "<b>General</b>"
 msgstr "<b>一般</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:499
+#: ../src/e-util/e-html-editor-image-dialog.c:588
 msgid "_Source:"
 msgstr "來源:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:562
+#: ../src/e-util/e-html-editor-image-dialog.c:640
 msgid "_Height:"
 msgstr "高度(_H):"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:603
+#: ../src/e-util/e-html-editor-image-dialog.c:659
+msgid "Preserve aspect ratio"
+msgstr "保持長寬比"
+
+#: ../src/e-util/e-html-editor-image-dialog.c:691
 msgid "_X-Padding:"
 msgstr "_X 填充:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:619
+#: ../src/e-util/e-html-editor-image-dialog.c:707
 msgid "_Y-Padding:"
 msgstr "_Y 填充:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:635
-#: ../src/e-util/e-html-editor-table-dialog.c:638
+#: ../src/e-util/e-html-editor-image-dialog.c:723
+#: ../src/e-util/e-html-editor-table-dialog.c:629
 msgid "_Border:"
 msgstr "邊框(_B):"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:645
+#: ../src/e-util/e-html-editor-image-dialog.c:733
 msgid "<b>Link</b>"
 msgstr "<b>連結</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:663
-#: ../src/e-util/e-html-editor-link-dialog.c:213
+#: ../src/e-util/e-html-editor-image-dialog.c:751
+#: ../src/e-util/e-html-editor-link-dialog.c:210
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:668
+#: ../src/e-util/e-html-editor-image-dialog.c:756
 msgid "_Test URL…"
 msgstr "測試 URL(_T)…"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:685
+#: ../src/e-util/e-html-editor-image-dialog.c:773
 msgid "Image Properties"
 msgstr "影像屬性"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:236
+#: ../src/e-util/e-html-editor-link-dialog.c:233
 msgid "_Remove Link"
 msgstr "移除連結(_R)"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:261
+#: ../src/e-util/e-html-editor-link-dialog.c:258
 msgid "Link Properties"
 msgstr "連結屬性"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:68
+#: ../src/e-util/e-html-editor-page-dialog.c:71
 msgid "Perforated Paper"
 msgstr "打孔紙張"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:77
+#: ../src/e-util/e-html-editor-page-dialog.c:80
 msgid "Blue Ink"
 msgstr "藍色墨水"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:86
+#: ../src/e-util/e-html-editor-page-dialog.c:89
 msgid "Paper"
 msgstr "紙張"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:95
+#: ../src/e-util/e-html-editor-page-dialog.c:98
 msgid "Ribbon"
 msgstr "緞帶"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:104
+#: ../src/e-util/e-html-editor-page-dialog.c:107
 msgid "Midnight"
 msgstr "午夜"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:122
+#: ../src/e-util/e-html-editor-page-dialog.c:125
 #: ../src/mail/filtertypes.xml.in.h:38 ../src/mail/searchtypes.xml.in.h:41
 #: ../src/mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "草稿"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:131
+#: ../src/e-util/e-html-editor-page-dialog.c:134
 msgid "Graph Paper"
 msgstr "報表紙"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:379
-msgid "<b>Colors</b>"
-msgstr "<b>顏色</b>"
+#. == Colors ==
+#: ../src/e-util/e-html-editor-page-dialog.c:402
+msgid "Colors"
+msgstr "色彩"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:398
+#: ../src/e-util/e-html-editor-page-dialog.c:422
 msgid "_Text:"
 msgstr "文字(_T):"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:413
+#: ../src/e-util/e-html-editor-page-dialog.c:437
 msgid "_Link:"
 msgstr "連結(_L):"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:428
+#: ../src/e-util/e-html-editor-page-dialog.c:452
 msgid "_Visited Link:"
 msgstr "已瀏覽連結(_V):"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:443
+#: ../src/e-util/e-html-editor-page-dialog.c:467
 msgid "_Background:"
 msgstr "背景(_B):"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:451
-msgid "<b>Background Image</b>"
-msgstr "<b>背景影像</b>"
+#. == Text ==
+#: ../src/e-util/e-html-editor-page-dialog.c:475
+msgid "Text"
+msgstr "文字"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:493
+msgid "_Font Name:"
+msgstr "字型名稱(_F)︰"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:473
+#. == Background Image ==
+#: ../src/e-util/e-html-editor-page-dialog.c:500
+msgid "Background Image"
+msgstr "背景圖片"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:523
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:90
 msgid "_Template:"
 msgstr "範本(_T):"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:481
-#: ../src/e-util/e-import-assistant.c:287
+#: ../src/e-util/e-html-editor-page-dialog.c:531
+#: ../src/e-util/e-import-assistant.c:313
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:488
+#: ../src/e-util/e-html-editor-page-dialog.c:538
 msgid "_Custom:"
 msgstr "自訂(_C):"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:515
+#: ../src/e-util/e-html-editor-page-dialog.c:567
 msgid "Page Properties"
 msgstr "紙張屬性"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:81
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:82
 msgid "_Style:"
 msgstr "樣式(_S):"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:88
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:89
 msgid "<b>Alignment</b>"
 msgstr "<b>對齊</b>"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:153
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:163
 msgid "Paragraph Properties"
 msgstr "段落屬性"
 
@@ -14226,33 +14510,33 @@ msgstr "加入字詞"
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:536
+#: ../src/e-util/e-html-editor-table-dialog.c:527
 msgid "_Rows:"
 msgstr "列(_R):"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:553
+#: ../src/e-util/e-html-editor-table-dialog.c:544
 msgid "C_olumns:"
 msgstr "欄(_O):"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:604
+#: ../src/e-util/e-html-editor-table-dialog.c:595
 msgid "_Spacing:"
 msgstr "間隔(_S):"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:621
+#: ../src/e-util/e-html-editor-table-dialog.c:612
 msgid "_Padding:"
 msgstr "留空(_P):"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:685
+#: ../src/e-util/e-html-editor-table-dialog.c:676
 #: ../src/e-util/e-html-editor-text-dialog.c:248
-#: ../src/e-util/e-webdav-browser.c:2427
+#: ../src/e-util/e-webdav-browser.c:2565
 msgid "_Color:"
 msgstr "顏色(_C):"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:716
+#: ../src/e-util/e-html-editor-table-dialog.c:707
 msgid "Image:"
 msgstr "影像:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:743
+#: ../src/e-util/e-html-editor-table-dialog.c:734
 msgid "Table Properties"
 msgstr "表格屬性"
 
@@ -14264,40 +14548,44 @@ msgstr "大小(_Z):"
 msgid "Text Properties"
 msgstr "文字屬性"
 
-#: ../src/e-util/e-import-assistant.c:259
+#: ../src/e-util/e-import-assistant.c:285
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "選取要匯入 Evolution 的檔案,並且在列表內選取檔案類型。"
 
-#: ../src/e-util/e-import-assistant.c:301
-#: ../src/e-util/e-import-assistant.c:480
+#: ../src/e-util/e-import-assistant.c:327
+#: ../src/e-util/e-import-assistant.c:526
 msgid "File _type:"
 msgstr "檔案類型(_T):"
 
-#: ../src/e-util/e-import-assistant.c:344
-#: ../src/e-util/e-import-assistant.c:962
+#: ../src/e-util/e-import-assistant.c:355
+msgid "Pre_view:"
+msgstr "預覽(_V)︰"
+
+#: ../src/e-util/e-import-assistant.c:390
+#: ../src/e-util/e-import-assistant.c:1008
 msgid "Choose the destination for this import"
 msgstr "選擇此輸入的目的地"
 
-#: ../src/e-util/e-import-assistant.c:370
+#: ../src/e-util/e-import-assistant.c:416
 msgid "Choose the type of importer to run:"
 msgstr "選擇匯入服務要執行的類型:"
 
-#: ../src/e-util/e-import-assistant.c:379
+#: ../src/e-util/e-import-assistant.c:425
 msgid "Import data and settings from _older programs"
 msgstr "從舊程式輸入資料和設定值(_O)"
 
-#: ../src/e-util/e-import-assistant.c:387
+#: ../src/e-util/e-import-assistant.c:433
 msgid "Import a _single file"
 msgstr "匯入單一檔案(_S)"
 
-#: ../src/e-util/e-import-assistant.c:409
+#: ../src/e-util/e-import-assistant.c:455
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇您想要匯入的資訊:"
 
-#: ../src/e-util/e-import-assistant.c:541
+#: ../src/e-util/e-import-assistant.c:587
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
@@ -14307,44 +14595,44 @@ msgstr ""
 "iCalendar、KMail。找不到可以輸入的設定值。如果您想再試一次,請按一下「向後」"
 "按鈕。"
 
-#: ../src/e-util/e-import-assistant.c:568
+#: ../src/e-util/e-import-assistant.c:614
 #: ../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:814
+#: ../src/e-util/e-import-assistant.c:860
 msgid "_Cancel Import"
 msgstr "取消匯入(_C)"
 
-#: ../src/e-util/e-import-assistant.c:961
+#: ../src/e-util/e-import-assistant.c:1007
 msgid "Preview data to be imported"
 msgstr "預覽需要匯入的資料"
 
-#: ../src/e-util/e-import-assistant.c:967
-#: ../src/e-util/e-import-assistant.c:980
-#: ../src/e-util/e-import-assistant.c:1333
-#: ../src/e-util/e-import-assistant.c:1410
-#: ../src/e-util/e-import-assistant.c:1419
+#: ../src/e-util/e-import-assistant.c:1013
+#: ../src/e-util/e-import-assistant.c:1026
+#: ../src/e-util/e-import-assistant.c:1399
+#: ../src/e-util/e-import-assistant.c:1476
+#: ../src/e-util/e-import-assistant.c:1485
 msgid "Import Data"
 msgstr "匯入資料"
 
-#: ../src/e-util/e-import-assistant.c:975
+#: ../src/e-util/e-import-assistant.c:1021
 msgid "Select what type of file you want to import from the list."
 msgstr "選擇您想要從列表中匯入的檔案類型。"
 
-#: ../src/e-util/e-import-assistant.c:1323
-#: ../src/e-util/e-import-assistant.c:1359
+#: ../src/e-util/e-import-assistant.c:1389
+#: ../src/e-util/e-import-assistant.c:1425
 msgid "Evolution Import Assistant"
 msgstr "Evolution 匯入助理"
 
-#: ../src/e-util/e-import-assistant.c:1340
-#: ../src/e-util/e-import-assistant.c:1397
+#: ../src/e-util/e-import-assistant.c:1406
+#: ../src/e-util/e-import-assistant.c:1463
 msgid "Import Location"
 msgstr "輸入位置"
 
-#: ../src/e-util/e-import-assistant.c:1352
+#: ../src/e-util/e-import-assistant.c:1418
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -14353,19 +14641,19 @@ msgstr ""
 "歡迎使用 Evolution 的匯入助理。\n"
 "這個精靈將會領導您如何將外部的檔案匯入到 Evolution。"
 
-#: ../src/e-util/e-import-assistant.c:1369
+#: ../src/e-util/e-import-assistant.c:1435
 msgid "Importer Type"
 msgstr "輸入器類型"
 
-#: ../src/e-util/e-import-assistant.c:1379
+#: ../src/e-util/e-import-assistant.c:1445
 msgid "Select Information to Import"
 msgstr "選擇要匯入的資訊"
 
-#: ../src/e-util/e-import-assistant.c:1388
+#: ../src/e-util/e-import-assistant.c:1454
 msgid "Select a File"
 msgstr "選取檔案"
 
-#: ../src/e-util/e-import-assistant.c:1405
+#: ../src/e-util/e-import-assistant.c:1471
 msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr "按「套用」開始將檔案匯入到 Evolution。"
 
@@ -14390,39 +14678,39 @@ msgstr "天"
 msgid "Autogenerated"
 msgstr "自動產生的"
 
-#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:966
+#: ../src/e-util/e-mail-signature-editor.c:321 ../src/mail/e-mail-notes.c:1017
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:971
+#: ../src/e-util/e-mail-signature-editor.c:326 ../src/mail/e-mail-notes.c:1022
 msgid "_Save and Close"
 msgstr "儲存後關閉(_S)"
 
-#: ../src/e-util/e-mail-signature-editor.c:558
+#: ../src/e-util/e-mail-signature-editor.c:549
 msgid "Edit Signature"
 msgstr "編輯簽名檔"
 
-#: ../src/e-util/e-mail-signature-editor.c:591
+#: ../src/e-util/e-mail-signature-editor.c:582
 msgid "_Signature Name:"
 msgstr "簽名檔名稱(_S):"
 
-#: ../src/e-util/e-mail-signature-editor.c:627
+#: ../src/e-util/e-mail-signature-editor.c:618
 msgid "Unnamed"
 msgstr "未命名的"
 
-#: ../src/e-util/e-mail-signature-manager.c:338
+#: ../src/e-util/e-mail-signature-manager.c:334
 msgid "Add _Script"
 msgstr "新增命令稿(_S)"
 
-#: ../src/e-util/e-mail-signature-manager.c:444
+#: ../src/e-util/e-mail-signature-manager.c:440
 msgid "Add Signature Script"
 msgstr "新增簽名命令稿"
 
-#: ../src/e-util/e-mail-signature-manager.c:538
+#: ../src/e-util/e-mail-signature-manager.c:534
 msgid "Edit Signature Script"
 msgstr "編輯簽名命令稿"
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:394
+#: ../src/e-util/e-mail-signature-script-dialog.c:386
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14432,19 +14720,19 @@ msgstr ""
 "簽名檔。您指定的名稱只會作為\n"
 "顯示之用。"
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:445
+#: ../src/e-util/e-mail-signature-script-dialog.c:437
 msgid "S_cript:"
 msgstr "命令稿(_C):"
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:476
+#: ../src/e-util/e-mail-signature-script-dialog.c:468
 msgid "Script file must be executable."
 msgstr "命令稿必須為可執行檔。"
 
-#: ../src/e-util/e-map.c:886
+#: ../src/e-util/e-map.c:883
 msgid "World Map"
 msgstr "世界地圖"
 
-#: ../src/e-util/e-map.c:889
+#: ../src/e-util/e-map.c:886
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -14480,28 +14768,28 @@ msgstr "開啟工作列表「%s」"
 msgid "Opening address book “%s”"
 msgstr "開啟通訊錄「%s」"
 
-#: ../src/e-util/e-misc-utils.c:3351
+#: ../src/e-util/e-misc-utils.c:3348
 #: ../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:4249
+#: ../src/e-util/e-misc-utils.c:3990
 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:4261
+#: ../src/e-util/e-misc-utils.c:4002
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
 msgstr "無法設定通訊協定版本為 LDAPv3 (%d):%s"
 
-#: ../src/e-util/e-misc-utils.c:4273
+#: ../src/e-util/e-misc-utils.c:4014
 #, c-format
 msgid "Failed to authenticate with LDAP server (%d): %s"
 msgstr "無法核對 LDAP 伺服器(%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4287
+#: ../src/e-util/e-misc-utils.c:4028
 #, c-format
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
@@ -14515,7 +14803,7 @@ msgstr ""
 "\n"
 "詳細的錯誤資訊 (%d):%s"
 
-#: ../src/e-util/e-misc-utils.c:4298
+#: ../src/e-util/e-misc-utils.c:4039
 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 "
@@ -14524,12 +14812,12 @@ msgstr ""
 "此 LDAP 伺服器可能使用舊的 LDAP 版本,它不支援此功能,或可能設定錯誤。請洽詢"
 "管理員,瞭解支援的搜尋基礎。"
 
-#: ../src/e-util/e-misc-utils.c:4331
+#: ../src/e-util/e-misc-utils.c:4072
 msgid "Evolution had not been compiled with LDAP support"
 msgstr "Evolution 並未編譯 LDAP 支援功能"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-misc-utils.c:4654
+#: ../src/e-util/e-misc-utils.c:4395
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -14537,12 +14825,35 @@ msgstr "不明 (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-misc-utils.c:4663
+#: ../src/e-util/e-misc-utils.c:4404
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../src/e-util/e-misc-utils.c:4555
+#, c-format
+msgid "Click to call %s"
+msgstr "按一下播號給 %s"
+
+#: ../src/e-util/e-misc-utils.c:4557
+msgid "Click to hide/unhide addresses"
+msgstr "按這裡隱藏/解除隱藏位址"
+
+#: ../src/e-util/e-misc-utils.c:4570
+#, c-format
+msgid "Go to the section %s of the message"
+msgstr "移至郵件的第 %s 節"
+
+#: ../src/e-util/e-misc-utils.c:4572
+msgid "Go to the beginning of the message"
+msgstr "移至郵件的開頭處"
+
+#: ../src/e-util/e-misc-utils.c:4578
+#, c-format
+msgid "Click to open %s"
+msgstr "按一下來開啟 %s"
+
 #: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "顯示連絡人"
@@ -14560,9 +14871,9 @@ msgid "_Search:"
 msgstr "搜尋(_S):"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
-#: ../src/e-util/e-name-selector-dialog.c:1325
+#: ../src/e-util/e-name-selector-dialog.c:1322
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1752
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:783
 #: ../src/modules/calendar/e-task-shell-view-actions.c:956
 msgid "Any Category"
@@ -14582,25 +14893,25 @@ 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:3234
+#: ../src/e-util/e-name-selector-entry.c:3222
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "在行內展開 %s (_X)"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3250
+#: ../src/e-util/e-name-selector-entry.c:3238
 #, c-format
 msgid "Cop_y %s"
 msgstr "複製(_Y) %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3261
+#: ../src/e-util/e-name-selector-entry.c:3249
 #, c-format
 msgid "C_ut %s"
 msgstr "剪下(_U) %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3279
+#: ../src/e-util/e-name-selector-entry.c:3267
 #, c-format
 msgid "_Edit %s"
 msgstr "編輯 %s(_E)"
@@ -14646,7 +14957,7 @@ msgstr "記住這個密碼(_R)"
 msgid "_Remember this password for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
 
-#: ../src/e-util/e-preferences-window.c:329
+#: ../src/e-util/e-preferences-window.c:326
 msgid "Evolution Preferences"
 msgstr "Evolution 偏好設定"
 
@@ -14743,11 +15054,11 @@ msgstr "建立新的代理伺服器設定檔"
 msgid "Delete the selected proxy profile"
 msgstr "刪除選取的代理伺服器設定檔"
 
-#: ../src/e-util/e-rule-editor.c:191
+#: ../src/e-util/e-rule-editor.c:188
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: ../src/e-util/e-rule-editor.c:302
+#: ../src/e-util/e-rule-editor.c:299
 msgid "Edit Rule"
 msgstr "編輯規則"
 
@@ -14756,35 +15067,35 @@ msgstr "編輯規則"
 msgid "Matches: %u"
 msgstr "符合項:%u"
 
-#: ../src/e-util/e-search-bar.c:624
+#: ../src/e-util/e-search-bar.c:597
 msgid "Close the find bar"
 msgstr "關閉搜尋工具列"
 
-#: ../src/e-util/e-search-bar.c:632
+#: ../src/e-util/e-search-bar.c:605
 msgid "Fin_d:"
 msgstr "尋找(_D):"
 
-#: ../src/e-util/e-search-bar.c:644
+#: ../src/e-util/e-search-bar.c:617
 msgid "Clear the search"
 msgstr "清除此搜尋"
 
-#: ../src/e-util/e-search-bar.c:671
+#: ../src/e-util/e-search-bar.c:644
 msgid "Find the previous occurrence of the phrase"
 msgstr "尋找上一個出現的字詞"
 
-#: ../src/e-util/e-search-bar.c:683
+#: ../src/e-util/e-search-bar.c:656
 msgid "Find the next occurrence of the phrase"
 msgstr "尋找下一個出現的字詞"
 
-#: ../src/e-util/e-search-bar.c:692
+#: ../src/e-util/e-search-bar.c:665
 msgid "Mat_ch case"
 msgstr "區分大小寫(_C)"
 
-#: ../src/e-util/e-search-bar.c:720
+#: ../src/e-util/e-search-bar.c:693
 msgid "Reached bottom of page, continued from top"
 msgstr "到達頁面底部,從頂端繼續"
 
-#: ../src/e-util/e-search-bar.c:742
+#: ../src/e-util/e-search-bar.c:715
 msgid "Reached top of page, continued from bottom"
 msgstr "到達頁面頂端,從底部繼續"
 
@@ -14937,66 +15248,62 @@ msgstr "返回通知"
 msgid "Sta_tus Tracking"
 msgstr "狀態追蹤(_T)"
 
-#: ../src/e-util/e-source-config.c:725 ../src/e-util/e-source-config.c:729
+#: ../src/e-util/e-source-config.c:689 ../src/e-util/e-source-config.c:693
 msgid "Type:"
 msgstr "類型:"
 
-#: ../src/e-util/e-source-config.c:739 ../src/e-util/e-source-config.c:743
+#: ../src/e-util/e-source-config.c:703 ../src/e-util/e-source-config.c:707
 msgid "Name:"
 msgstr "名稱:"
 
-#: ../src/e-util/e-source-config.c:850 ../src/e-util/e-webdav-browser.c:1752
+#: ../src/e-util/e-source-config.c:814 ../src/e-util/e-webdav-browser.c:1858
 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:1417
+#: ../src/e-util/e-source-config.c:1381
 msgid "Refresh every"
 msgstr "重新整理於每"
 
-#: ../src/e-util/e-source-config.c:1447 ../src/e-util/e-source-config.c:1521
+#: ../src/e-util/e-source-config.c:1411 ../src/e-util/e-source-config.c:1485
 msgid "Use a secure connection"
 msgstr "使用安全連線"
 
-#: ../src/e-util/e-source-config.c:1548
+#: ../src/e-util/e-source-config.c:1512
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "取消設定 SSL/_TLS 憑證的信任"
 
-#: ../src/e-util/e-source-config.c:1584
+#: ../src/e-util/e-source-config.c:1548
 msgid "User:"
 msgstr "使用者:"
 
-#: ../src/e-util/e-source-selector.c:3236
+#: ../src/e-util/e-source-selector.c:3417
 msgid "Show"
 msgstr "顯示"
 
-#: ../src/e-util/e-source-selector.c:3242
+#: ../src/e-util/e-source-selector.c:3423
 msgid "Group name"
 msgstr "群組名稱"
 
-#: ../src/e-util/e-source-selector.c:3397 ../src/mail/e-mail-display.c:714
+#: ../src/e-util/e-source-selector.c:3578 ../src/mail/e-mail-display.c:717
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
-#: ../src/e-util/e-source-selector.c:3397
-#: ../src/e-util/e-source-selector.c:3495
+#: ../src/e-util/e-source-selector.c:3578
+#: ../src/e-util/e-source-selector.c:3676
 msgid "_Show"
 msgstr "顯示(_S)"
 
-#: ../src/e-util/e-source-selector.c:3449
+#: ../src/e-util/e-source-selector.c:3630
 msgid "Manage Groups"
 msgstr "管理群組"
 
-#: ../src/e-util/e-source-selector.c:3461
+#: ../src/e-util/e-source-selector.c:3642
 msgid "Available Groups:"
 msgstr "可用的群組:"
 
-#: ../src/e-util/e-source-selector-dialog.c:234
-msgid "_Destination"
-msgstr "目的地(_D)"
-
-#: ../src/e-util/e-source-selector-dialog.c:362
+#: ../src/e-util/e-source-selector-dialog.c:317
 msgid "Select destination"
 msgstr "選擇目的地"
 
@@ -15134,7 +15441,7 @@ msgstr "這樣會從伺服器永遠刪除收藏“{0}”。您確定要繼續嗎
 msgid "Failed to refresh list of account sources"
 msgstr "無法重新整理帳號來源列表"
 
-#: ../src/e-util/e-table-click-to-add.c:688
+#: ../src/e-util/e-table-click-to-add.c:686
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
 msgid "click to add"
@@ -15160,27 +15467,27 @@ msgstr "將選定的欄名稱移至底端"
 msgid "Select all column names"
 msgstr "選擇所有的欄名稱"
 
-#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:380 ../src/e-util/e-table-config.c:426
 msgid "(Ascending)"
 msgstr "(遞增)"
 
-#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:380 ../src/e-util/e-table-config.c:426
 msgid "(Descending)"
 msgstr "(遞減)"
 
-#: ../src/e-util/e-table-config.c:395
+#: ../src/e-util/e-table-config.c:387
 msgid "Not sorted"
 msgstr "未排序"
 
-#: ../src/e-util/e-table-config.c:440
+#: ../src/e-util/e-table-config.c:432
 msgid "No grouping"
 msgstr "未組成群組"
 
-#: ../src/e-util/e-table-config.c:545
+#: ../src/e-util/e-table-config.c:537
 msgid "Show Fields"
 msgstr "顯示欄位"
 
-#: ../src/e-util/e-table-config.c:559
+#: ../src/e-util/e-table-config.c:551
 msgid "Choose the order of information to appear in the message list."
 msgstr "請選擇在列表顯示模式時,顯示資訊的次序。"
 
@@ -15192,11 +15499,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:1792
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1778
 msgid "Ascending"
 msgstr "遞增"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1792
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1778
 msgid "Descending"
 msgstr "遞減"
 
@@ -15256,7 +15563,7 @@ msgstr ""
 "想在您的表格中加入欄位,只要將它\n"
 "拖曳至您希望它出現的位置即可。"
 
-#: ../src/e-util/e-table-field-chooser-dialog.c:224
+#: ../src/e-util/e-table-field-chooser-dialog.c:216
 msgid "Add a Column"
 msgstr "加入一欄"
 
@@ -15267,7 +15574,7 @@ msgstr "加入一欄"
 #. * Finally the %d is replaced with count of items in this group.
 #. * Example: "Family name: Smith (13 items)"
 #.
-#: ../src/e-util/e-table-group-container.c:366
+#: ../src/e-util/e-table-group-container.c:355
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -15279,82 +15586,82 @@ msgstr[0] "%s:%s (%d 個項目)"
 #. * The %d is replaced with count of items in this group.
 #. * Example: "Smith (13 items)"
 #.
-#: ../src/e-util/e-table-group-container.c:380
+#: ../src/e-util/e-table-group-container.c:369
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 個項目)"
 
-#: ../src/e-util/e-table-header-item.c:1610
+#: ../src/e-util/e-table-header-item.c:1596
 msgid "Customize Current View"
 msgstr "自訂目前的檢視"
 
-#: ../src/e-util/e-table-header-item.c:1642
+#: ../src/e-util/e-table-header-item.c:1628
 msgid "Sort _Ascending"
 msgstr "遞增排序(_A)"
 
-#: ../src/e-util/e-table-header-item.c:1645
+#: ../src/e-util/e-table-header-item.c:1631
 msgid "Sort _Descending"
 msgstr "遞減排序(_D)"
 
-#: ../src/e-util/e-table-header-item.c:1648
+#: ../src/e-util/e-table-header-item.c:1634
 msgid "_Reset sort"
 msgstr "重設排序(_R)"
 
-#: ../src/e-util/e-table-header-item.c:1651
+#: ../src/e-util/e-table-header-item.c:1637
 msgid "Group By This _Field"
 msgstr "依此欄位做群組(_F)"
 
-#: ../src/e-util/e-table-header-item.c:1654
+#: ../src/e-util/e-table-header-item.c:1640
 msgid "Group By _Box"
 msgstr "依方塊為群組(_B)"
 
-#: ../src/e-util/e-table-header-item.c:1658
+#: ../src/e-util/e-table-header-item.c:1644
 msgid "Remove This _Column"
 msgstr "移除此欄(_C)"
 
-#: ../src/e-util/e-table-header-item.c:1661
+#: ../src/e-util/e-table-header-item.c:1647
 msgid "Add a C_olumn…"
 msgstr "加入一欄(_O)…"
 
-#: ../src/e-util/e-table-header-item.c:1665
+#: ../src/e-util/e-table-header-item.c:1651
 msgid "A_lignment"
 msgstr "排列(_L)"
 
-#: ../src/e-util/e-table-header-item.c:1668
+#: ../src/e-util/e-table-header-item.c:1654
 msgid "B_est Fit"
 msgstr "最適填滿(_E)"
 
-#: ../src/e-util/e-table-header-item.c:1671
+#: ../src/e-util/e-table-header-item.c:1657
 msgid "Format Column_s…"
 msgstr "格式化欄(_S)…"
 
-#: ../src/e-util/e-table-header-item.c:1675
-#: ../src/shell/e-shell-window-actions.c:1226
+#: ../src/e-util/e-table-header-item.c:1661
+#: ../src/shell/e-shell-window-actions.c:1290
 msgid "Custo_mize Current View…"
 msgstr "自訂目前檢視(_M)…"
 
-#: ../src/e-util/e-table-header-item.c:1742
+#: ../src/e-util/e-table-header-item.c:1728
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1765
+#: ../src/e-util/e-table-header-item.c:1751
 msgid "_Custom"
 msgstr "自訂(_C)"
 
-#: ../src/e-util/e-text.c:2105
+#: ../src/e-util/e-text.c:2090
 msgid "Select All"
 msgstr "全部選取"
 
-#: ../src/e-util/e-text.c:2118
+#: ../src/e-util/e-text.c:2103
 msgid "Input Methods"
 msgstr "輸入法"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../src/e-util/e-timezone-dialog.c:280 ../src/e-util/e-timezone-dialog.c:520
-#: ../src/e-util/e-timezone-dialog.c:524 ../src/e-util/e-timezone-dialog.c:528
-#: ../src/e-util/e-timezone-dialog.c:1015
+#: ../src/e-util/e-timezone-dialog.c:270 ../src/e-util/e-timezone-dialog.c:510
+#: ../src/e-util/e-timezone-dialog.c:514 ../src/e-util/e-timezone-dialog.c:518
+#: ../src/e-util/e-timezone-dialog.c:1005
 msgid "UTC"
 msgstr "UTC"
 
@@ -15383,245 +15690,235 @@ msgstr "選擇範圍(_S) "
 msgid "Timezone drop-down combination box"
 msgstr "時區下拉式組合方塊"
 
-#: ../src/e-util/e-url-entry.c:102
+#: ../src/e-util/e-url-entry.c:155
 msgid "Click here to open the URL"
 msgstr "按這裡以開啟 URL"
 
-#: ../src/e-util/e-url-entry.c:104
+#: ../src/e-util/e-url-entry.c:192
 msgid "Enter a URL here"
 msgstr "請在這裡輸入 URL"
 
-#: ../src/e-util/evolution-source-viewer.c:638
+#: ../src/e-util/evolution-source-viewer.c:632
 msgid "Evolution Source Viewer"
 msgstr "Evolution 來源瀏覽程式"
 
 #. Translators: The name that is displayed in the user interface
-#: ../src/e-util/evolution-source-viewer.c:668
+#: ../src/e-util/evolution-source-viewer.c:662
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#: ../src/e-util/evolution-source-viewer.c:729
+#: ../src/e-util/evolution-source-viewer.c:671
+msgid "Flags"
+msgstr "旗標"
+
+#: ../src/e-util/evolution-source-viewer.c:723
 #: ../src/mail/e-mail-config-identity-page.c:1231
 msgid "Identity"
 msgstr "身分"
 
-#: ../src/e-util/e-webdav-browser.c:448
+#: ../src/e-util/e-webdav-browser.c:510
 msgid "Address book"
 msgstr "通訊錄"
 
-#: ../src/e-util/e-webdav-browser.c:459
+#: ../src/e-util/e-webdav-browser.c:521
 msgid "Events"
 msgstr "事件"
 
-#: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1555
-#: ../src/mail/em-folder-tree-model.c:1932
+#: ../src/e-util/e-webdav-browser.c:594 ../src/mail/em-folder-tree-model.c:1587
+#: ../src/mail/em-folder-tree-model.c:1975
 msgid "Loading…"
 msgstr "正在載入..."
 
-#: ../src/e-util/e-webdav-browser.c:1387
+#: ../src/e-util/e-webdav-browser.c:1447
 msgid "Searching collection children…"
 msgstr "正在搜尋收藏集子項…"
 
-#: ../src/e-util/e-webdav-browser.c:1389
+#: ../src/e-util/e-webdav-browser.c:1449
 msgid "Failed to search for collection children"
 msgstr "無法搜尋收藏集子項"
 
-#: ../src/e-util/e-webdav-browser.c:1423
+#: ../src/e-util/e-webdav-browser.c:1483
 msgid "Searching for user home, please wait…"
 msgstr "搜尋使用者的家目錄,請稍候…"
 
-#: ../src/e-util/e-webdav-browser.c:1425
+#: ../src/e-util/e-webdav-browser.c:1485
 msgid "Failed to search for user home"
 msgstr "無法搜尋使用者家目錄"
 
-#: ../src/e-util/e-webdav-browser.c:1768
+#: ../src/e-util/e-webdav-browser.c:1874
 msgid "At least one component type should be set"
 msgstr "至少應設定一個元件類型"
 
-#: ../src/e-util/e-webdav-browser.c:1787
+#: ../src/e-util/e-webdav-browser.c:1893
 msgid "Failed to get selected collection HREF"
 msgstr "無法取得選取的 HREF 收藏集"
 
-#: ../src/e-util/e-webdav-browser.c:1819
+#: ../src/e-util/e-webdav-browser.c:1926
 msgid "Failed to save changes"
 msgstr "無法儲存變更"
 
-#: ../src/e-util/e-webdav-browser.c:1821
+#: ../src/e-util/e-webdav-browser.c:1928
 msgid "Creating new book…"
 msgstr "建立新的通訊錄…"
 
-#: ../src/e-util/e-webdav-browser.c:1822
+#: ../src/e-util/e-webdav-browser.c:1929
 msgid "Failed to create new book"
 msgstr "無法建立新通訊錄"
 
-#: ../src/e-util/e-webdav-browser.c:1824
+#: ../src/e-util/e-webdav-browser.c:1931
 msgid "Creating new calendar…"
 msgstr "正在建立新的行事曆…"
 
-#: ../src/e-util/e-webdav-browser.c:1825
+#: ../src/e-util/e-webdav-browser.c:1932
 msgid "Failed to create new calendar"
 msgstr "無法建立新的行事曆"
 
-#: ../src/e-util/e-webdav-browser.c:1827
+#: ../src/e-util/e-webdav-browser.c:1934
 msgid "Creating new collection…"
 msgstr "建立新的收藏集…"
 
-#: ../src/e-util/e-webdav-browser.c:1828
+#: ../src/e-util/e-webdav-browser.c:1935
 msgid "Failed to create new collection"
 msgstr "無法建立新的收藏集"
 
-#: ../src/e-util/e-webdav-browser.c:1967
+#: ../src/e-util/e-webdav-browser.c:2085
 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:1969
+#: ../src/e-util/e-webdav-browser.c:2087
 msgid "It is not allowed to create calendar under another book or calendar"
 msgstr "不允許在下另一個通訊錄或行事曆中建立行事曆"
 
-#: ../src/e-util/e-webdav-browser.c:2198
+#: ../src/e-util/e-webdav-browser.c:2334
 msgid "Deleting book…"
 msgstr "正在刪除通訊錄…"
 
-#: ../src/e-util/e-webdav-browser.c:2199
+#: ../src/e-util/e-webdav-browser.c:2335
 msgid "Failed to delete book"
 msgstr "無法刪除通訊錄"
 
-#: ../src/e-util/e-webdav-browser.c:2202
+#: ../src/e-util/e-webdav-browser.c:2338
 msgid "Deleting calendar…"
 msgstr "正在刪除行事曆…"
 
-#: ../src/e-util/e-webdav-browser.c:2203
+#: ../src/e-util/e-webdav-browser.c:2339
 msgid "Failed to delete calendar"
 msgstr "無法刪除行事曆"
 
-#: ../src/e-util/e-webdav-browser.c:2206
+#: ../src/e-util/e-webdav-browser.c:2342
 msgid "Deleting collection…"
 msgstr "正在刪除收藏集…"
 
-#: ../src/e-util/e-webdav-browser.c:2207
+#: ../src/e-util/e-webdav-browser.c:2343
 msgid "Failed to delete collection"
 msgstr "無法刪除收藏集"
 
-#: ../src/e-util/e-webdav-browser.c:2438
+#. Translators: It's 'order' as 'sorting order'
+#: ../src/e-util/e-webdav-browser.c:2577
+msgid "_Order:"
+msgstr "排序(_O)︰"
+
+#: ../src/e-util/e-webdav-browser.c:2587
+msgid "Use -1 to not set the sort order"
+msgstr "使用 -1 表示不設定排序順序"
+
+#: ../src/e-util/e-webdav-browser.c:2593
 msgid "For Components:"
 msgstr "用於元件:"
 
-#: ../src/e-util/e-webdav-browser.c:2444
+#: ../src/e-util/e-webdav-browser.c:2599
 msgid "_Events"
 msgstr "事件(_E)"
 
-#: ../src/e-util/e-webdav-browser.c:2634
+#: ../src/e-util/e-webdav-browser.c:2792
 msgid "WebDAV server:"
 msgstr "WebDAV 伺服器:"
 
-#: ../src/e-util/e-webdav-browser.c:2669
+#: ../src/e-util/e-webdav-browser.c:2827
 msgid "Create _Book"
 msgstr "建立通訊錄(_B)"
 
-#: ../src/e-util/e-webdav-browser.c:2676
+#: ../src/e-util/e-webdav-browser.c:2834
 msgid "Create _Calendar"
 msgstr "建立行事曆(_C)"
 
-#: ../src/e-util/e-webdav-browser.c:2683
+#: ../src/e-util/e-webdav-browser.c:2841
 msgid "Create Collectio_n"
 msgstr "建立收藏集(_N)"
 
-#: ../src/e-util/e-web-view.c:408
+#: ../src/e-util/e-web-view.c:406
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: ../src/e-util/e-web-view.c:410
+#: ../src/e-util/e-web-view.c:408
 msgid "Copy the link to the clipboard"
 msgstr "複製連結到剪貼薄"
 
-#: ../src/e-util/e-web-view.c:418
+#: ../src/e-util/e-web-view.c:416
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結(_O)"
 
-#: ../src/e-util/e-web-view.c:420
+#: ../src/e-util/e-web-view.c:418
 msgid "Open the link in a web browser"
 msgstr "在網頁瀏覽器中開啟此連結"
 
-#: ../src/e-util/e-web-view.c:428
+#: ../src/e-util/e-web-view.c:426
 msgid "_Copy Email Address"
 msgstr "複製電子郵件位址(_C)"
 
-#: ../src/e-util/e-web-view.c:435
+#: ../src/e-util/e-web-view.c:433
 msgid "Copy _Raw Email Address"
 msgstr "複製原始電子郵件位址(_R)"
 
-#: ../src/e-util/e-web-view.c:437
+#: ../src/e-util/e-web-view.c:435
 msgid "Copy the raw email address to the clipboard"
 msgstr "複製原始電子郵件位址到剪貼簿"
 
-#: ../src/e-util/e-web-view.c:452
+#: ../src/e-util/e-web-view.c:450
 msgid "_Copy Image"
 msgstr "複製影像(_C)"
 
-#: ../src/e-util/e-web-view.c:454
+#: ../src/e-util/e-web-view.c:452
 msgid "Copy the image to the clipboard"
 msgstr "複製影像到剪貼薄"
 
-#: ../src/e-util/e-web-view.c:459
+#: ../src/e-util/e-web-view.c:457
 msgid "Save _Image…"
 msgstr "儲存影像(_I)…"
 
-#: ../src/e-util/e-web-view.c:461
+#: ../src/e-util/e-web-view.c:459
 msgid "Save the image to a file"
 msgstr "將影像儲存為檔案"
 
-#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:201
-#: ../src/mail/e-mail-reader.c:2819
+#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:201
+#: ../src/mail/e-mail-reader.c:2836
 msgid "Search _Web…"
 msgstr "搜尋網頁(_W)…"
 
-#: ../src/e-util/e-web-view.c:478 ../src/mail/e-mail-browser.c:203
-#: ../src/mail/e-mail-reader.c:2821
+#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:203
+#: ../src/mail/e-mail-reader.c:2838
 msgid "Search the Web with the selected text"
 msgstr "以選取的文字搜尋網頁"
 
-#: ../src/e-util/e-web-view.c:488 ../src/e-util/e-web-view.c:2066
+#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2077
 msgid "Select all text and images"
 msgstr "選擇所有文字和影像"
 
-#: ../src/e-util/e-web-view.c:1673
-#, c-format
-msgid "Click to call %s"
-msgstr "按一下播號給 %s"
-
-#: ../src/e-util/e-web-view.c:1675
-msgid "Click to hide/unhide addresses"
-msgstr "按這裡隱藏/解除隱藏位址"
-
-#: ../src/e-util/e-web-view.c:1686
-#, c-format
-msgid "Go to the section %s of the message"
-msgstr "移至郵件的第 %s 節"
-
-#: ../src/e-util/e-web-view.c:1688
-msgid "Go to the beginning of the message"
-msgstr "移至郵件的開頭處"
-
-#: ../src/e-util/e-web-view.c:1692
-#, c-format
-msgid "Click to open %s"
-msgstr "按一下來開啟 %s"
-
-#: ../src/e-util/e-web-view.c:3773
+#: ../src/e-util/e-web-view.c:3804
 msgid "Copying image to clipboard"
 msgstr "複製影像到剪貼薄"
 
-#: ../src/e-util/e-web-view.c:3961
+#: ../src/e-util/e-web-view.c:3992
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../src/e-util/e-web-view.c:3998
+#: ../src/e-util/e-web-view.c:4029
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "儲存影像到「%s」"
 
-#: ../src/e-util/e-web-view.c:4145
+#: ../src/e-util/e-web-view.c:4179
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr "無法取得 URI「%s」,不知道如何下載它。"
@@ -15722,7 +16019,7 @@ msgstr "您指定的時刻"
 msgid "a time relative to the current time"
 msgstr "相對於目前時刻的時差"
 
-#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:95
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:98
 msgid "seconds"
 msgstr "秒"
 
@@ -15788,7 +16085,7 @@ msgstr "過濾器規則(_F)"
 msgid "Rule Name"
 msgstr "規則名稱"
 
-#: ../src/e-util/gal-a11y-e-cell.c:128
+#: ../src/e-util/gal-a11y-e-cell.c:125
 msgid "Table Cell"
 msgstr "表格的儲存格"
 
@@ -15821,11 +16118,11 @@ msgstr "折疊 ETree 中包含此儲存格的列"
 msgid "click"
 msgstr "單擊"
 
-#: ../src/e-util/gal-a11y-e-table-column-header.c:161
+#: ../src/e-util/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "排序"
 
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:293
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:291
 msgid "Save Current View"
 msgstr "儲存目前檢視"
 
@@ -15854,7 +16151,7 @@ msgid "Blank Signature"
 msgstr "空白簽名檔"
 
 #: ../src/e-util/widgets.error.xml.h:5
-msgid "Please provide an unique name to identify this signature."
+msgid "Please provide a unique name to identify this signature."
 msgstr "請輸入可供辨識這個簽名檔的獨特名稱。"
 
 #: ../src/e-util/widgets.error.xml.h:6
@@ -15882,154 +16179,156 @@ msgstr "無法取得已選擇的文字。"
 msgid "Saving message to folder “%s”"
 msgstr "儲存郵件到資料夾「%s」"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:565
+#: ../src/libemail-engine/e-mail-folder-utils.c:567
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:675
-#: ../src/libemail-engine/e-mail-folder-utils.c:937
+#: ../src/libemail-engine/e-mail-folder-utils.c:677
+#: ../src/libemail-engine/e-mail-folder-utils.c:939
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "取回 %d 封郵件"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:777
+#: ../src/libemail-engine/e-mail-folder-utils.c:779
 msgid "Scanning messages for duplicates"
 msgstr "掃描郵件是否有重複"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1150
+#: ../src/libemail-engine/e-mail-folder-utils.c:1152
 #, c-format
 msgid "Removing folder “%s”"
 msgstr "移除資料夾「%s」"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1331
+#: ../src/libemail-engine/e-mail-folder-utils.c:1333
 #, c-format
 msgid "File “%s” has been removed."
 msgstr "檔案「%s」已經被移除。"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1335
+#: ../src/libemail-engine/e-mail-folder-utils.c:1337
 msgid "File has been removed."
 msgstr "檔案已經被移除。"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1411
+#: ../src/libemail-engine/e-mail-folder-utils.c:1413
 msgid "Removing attachments"
 msgstr "正在移除附件"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1583
+#: ../src/libemail-engine/e-mail-folder-utils.c:1585
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "儲存 %d 封郵件"
 
-#: ../src/libemail-engine/e-mail-folder-utils.c:1961
+#: ../src/libemail-engine/e-mail-folder-utils.c:1963
 #, c-format
 msgid "Invalid folder URI “%s”"
 msgstr "無效的資料夾 URI「%s」"
 
 #. Some local folders
 #: ../src/libemail-engine/e-mail-session.c:120
-#: ../src/mail/em-folder-properties.c:1444
-#: ../src/mail/em-folder-tree-model.c:1503
+#: ../src/mail/em-folder-properties.c:1473
+#: ../src/mail/em-folder-tree-model.c:1509
+#: ../src/mail/em-folder-tree-model.c:1533
 #: ../src/mail/importers/kmail-libs.c:138
-#: ../src/modules/mail/e-mail-shell-view-private.c:1015
-#: ../src/modules/mail/e-mail-shell-view-private.c:1026
+#: ../src/modules/mail/e-mail-shell-view-private.c:1024
+#: ../src/modules/mail/e-mail-shell-view-private.c:1035
 msgid "Inbox"
 msgstr "收件匣"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../src/libemail-engine/e-mail-session.c:121
-#: ../src/mail/em-folder-tree-model.c:1497
+#: ../src/mail/em-folder-tree-model.c:1503
+#: ../src/mail/em-folder-tree-model.c:1537
 #: ../src/mail/importers/kmail-libs.c:144
-#: ../src/modules/mail/e-mail-shell-view-private.c:1013
+#: ../src/modules/mail/e-mail-shell-view-private.c:1022
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../src/libemail-engine/e-mail-session.c:122
-#: ../src/mail/em-folder-tree-model.c:1507
+#: ../src/mail/em-folder-tree-model.c:1513
 #: ../src/mail/importers/kmail-libs.c:140
-#: ../src/modules/mail/e-mail-shell-view-private.c:1017
+#: ../src/modules/mail/e-mail-shell-view-private.c:1026
 msgid "Outbox"
 msgstr "寄件匣"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../src/libemail-engine/e-mail-session.c:123
-#: ../src/mail/em-folder-tree-model.c:1511
+#: ../src/mail/em-folder-tree-model.c:1516
+#: ../src/mail/em-folder-tree-model.c:1536
 #: ../src/mail/importers/kmail-libs.c:142
-#: ../src/modules/mail/e-mail-shell-view-private.c:1019
+#: ../src/modules/mail/e-mail-shell-view-private.c:1028
 msgid "Sent"
 msgstr "已傳送"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../src/libemail-engine/e-mail-session.c:124
-#: ../src/mail/e-mail-templates-store.c:2211
-#: ../src/mail/em-folder-tree-model.c:1499
+#: ../src/mail/em-folder-tree-model.c:1505
 #: ../src/mail/importers/kmail-libs.c:146
-#: ../src/modules/mail/e-mail-shell-view-private.c:1021
+#: ../src/modules/mail/e-mail-shell-view-private.c:1030
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "範本"
 
-#: ../src/libemail-engine/e-mail-session.c:1519
+#: ../src/libemail-engine/e-mail-session.c:1504
 #, c-format
 msgid "User cancelled operation"
 msgstr "使用者取消的操作"
 
-#: ../src/libemail-engine/e-mail-session.c:1580
+#: ../src/libemail-engine/e-mail-session.c:1565
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "沒有提供目的地位址,郵件的轉寄已經取消。"
 
-#: ../src/libemail-engine/e-mail-session.c:1593
+#: ../src/libemail-engine/e-mail-session.c:1578
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "找不到可使用的識別符,郵件的轉寄已經取消。"
 
-#: ../src/libemail-engine/e-mail-session.c:1794
+#: ../src/libemail-engine/e-mail-session.c:1779
 #, c-format
 msgid "Corresponding source for service with UID “%s” not found"
 msgstr "找不到 UID 為“%s”的服務的對應來源"
 
-#: ../src/libemail-engine/e-mail-session.c:1914
+#: ../src/libemail-engine/e-mail-session.c:1899
 msgid "Looking up recipient S/MIME certificates in address books…"
 msgstr "在通訊錄中查詢收件者 S/MIME 憑證…"
 
-#: ../src/libemail-engine/e-mail-session.c:1916
+#: ../src/libemail-engine/e-mail-session.c:1901
 msgid "Looking up recipient PGP keys in address books…"
 msgstr "在通訊錄中查詢收件者 PGP 金鑰…"
 
-#: ../src/libemail-engine/e-mail-session.c:2963
+#: ../src/libemail-engine/e-mail-session.c:2948
 #, c-format
 msgid "Waiting for “%s”"
 msgstr "等待「%s」"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:526
+#: ../src/libemail-engine/e-mail-session-utils.c:527
 msgid "No mail transport service available"
 msgstr "沒有可用的郵件傳輸服務"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:613
-#: ../src/libemail-engine/mail-ops.c:707
+#: ../src/libemail-engine/e-mail-session-utils.c:618
+#: ../src/libemail-engine/mail-ops.c:705
 #, c-format
 msgid "Posting message to “%s”"
 msgstr "張貼郵件至「%s」"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:650
-#: ../src/libemail-engine/mail-ops.c:743
+#: ../src/libemail-engine/e-mail-session-utils.c:656
+#: ../src/libemail-engine/mail-ops.c:741
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器:%s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:683
-#: ../src/libemail-engine/e-mail-session-utils.c:718
-#: ../src/libemail-engine/mail-ops.c:771 ../src/libemail-engine/mail-ops.c:806
+#: ../src/libemail-engine/e-mail-session-utils.c:689
+#: ../src/libemail-engine/e-mail-session-utils.c:724
+#: ../src/libemail-engine/mail-ops.c:769 ../src/libemail-engine/mail-ops.c:804
 #, c-format
 msgid "Storing sent message to “%s”"
 msgstr "儲存外寄郵件到「%s」"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:707
-#: ../src/libemail-engine/mail-ops.c:795
+#: ../src/libemail-engine/e-mail-session-utils.c:713
+#: ../src/libemail-engine/mail-ops.c:793
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16038,15 +16337,15 @@ msgstr ""
 "無法附加至 %s:%s\n"
 "改附加至本地「寄件匣」資料夾。"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:737
-#: ../src/libemail-engine/mail-ops.c:823
+#: ../src/libemail-engine/e-mail-session-utils.c:743
+#: ../src/libemail-engine/mail-ops.c:821
 #, c-format
 msgid "Failed to append to local “Sent” folder: %s"
 msgstr "無法附加至本地「寄件匣」資料夾:%s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:929
-#: ../src/libemail-engine/mail-ops.c:1019
-#: ../src/libemail-engine/mail-ops.c:1134 ../src/mail/mail-send-recv.c:665
+#: ../src/libemail-engine/e-mail-session-utils.c:936
+#: ../src/libemail-engine/mail-ops.c:1017
+#: ../src/libemail-engine/mail-ops.c:1129 ../src/mail/mail-send-recv.c:665
 msgid "Sending message"
 msgstr "正在傳送郵件"
 
@@ -16056,7 +16355,7 @@ msgid "Disconnecting from “%s”"
 msgstr "中斷與「%s」的連線"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:264
-#: ../src/mail/e-mail-backend.c:1048
+#: ../src/mail/e-mail-backend.c:1055
 #, c-format
 msgid "Reconnecting to “%s”"
 msgstr "重新連線到「%s」"
@@ -16088,7 +16387,7 @@ msgstr ""
 msgid "Fetching mail from “%s”"
 msgstr "從「%s」取回郵件"
 
-#: ../src/libemail-engine/mail-ops.c:737
+#: ../src/libemail-engine/mail-ops.c:735
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -16100,7 +16399,7 @@ msgstr ""
 "的。請在編輯→郵件規則中檢查您的過濾器。\n"
 "原始錯誤訊息是:%s"
 
-#: ../src/libemail-engine/mail-ops.c:1030
+#: ../src/libemail-engine/mail-ops.c:1028
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
@@ -16108,51 +16407,51 @@ 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:1088
+#: ../src/libemail-engine/mail-ops.c:1086
 #, 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:1094
+#: ../src/libemail-engine/mail-ops.c:1092
 msgid "Cancelled."
 msgstr "已取消。"
 
-#: ../src/libemail-engine/mail-ops.c:1096
+#: ../src/libemail-engine/mail-ops.c:1094
 msgid "Complete."
 msgstr "完成。"
 
-#: ../src/libemail-engine/mail-ops.c:1220
+#: ../src/libemail-engine/mail-ops.c:1215
 #, c-format
 msgid "Moving messages to “%s”"
 msgstr "將郵件移到「%s」"
 
-#: ../src/libemail-engine/mail-ops.c:1221
+#: ../src/libemail-engine/mail-ops.c:1216
 #, c-format
 msgid "Copying messages to “%s”"
 msgstr "將郵件複製到「%s」"
 
-#: ../src/libemail-engine/mail-ops.c:1340
+#: ../src/libemail-engine/mail-ops.c:1335
 #, c-format
 msgid "Storing folder “%s”"
 msgstr "正在儲存資料夾「%s」"
 
-#: ../src/libemail-engine/mail-ops.c:1468
+#: ../src/libemail-engine/mail-ops.c:1463
 #, c-format
 msgid "Expunging and storing account “%s”"
 msgstr "清空和儲存帳號「%s」"
 
-#: ../src/libemail-engine/mail-ops.c:1469
+#: ../src/libemail-engine/mail-ops.c:1464
 #, c-format
 msgid "Storing account “%s”"
 msgstr "儲存帳號「%s」"
 
-#: ../src/libemail-engine/mail-ops.c:1544
+#: ../src/libemail-engine/mail-ops.c:1539
 #, c-format
 msgid "Emptying trash in “%s”"
 msgstr "清空「%s」的垃圾桶"
 
-#: ../src/libemail-engine/mail-ops.c:1636
+#: ../src/libemail-engine/mail-ops.c:1638
 #, c-format
 msgid "Processing folder changes in “%s”"
 msgstr "處理「%s」中的資料夾變更"
@@ -16193,7 +16492,7 @@ msgstr "轉寄的郵件"
 msgid "Setting up Search Folder: %s"
 msgstr "設定搜尋資料夾: %s"
 
-#: ../src/libemail-engine/mail-vfolder.c:302
+#: ../src/libemail-engine/mail-vfolder.c:303
 #, c-format
 msgid "Updating Search Folders for “%s : %s”"
 msgstr "更新「%s:%s」的搜尋資料夾"
@@ -16203,7 +16502,7 @@ msgstr "更新「%s:%s」的搜尋資料夾"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../src/libemail-engine/mail-vfolder.c:666
+#: ../src/libemail-engine/mail-vfolder.c:667
 #, c-format
 msgid ""
 "The Search Folder “%s” has been modified to account for the deleted folder\n"
@@ -16283,25 +16582,26 @@ msgid "Missing domain in email address"
 msgstr "電子郵件位址缺乏網域"
 
 #: ../src/mail/e-mail-autoconfig.c:1321
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
 msgid "IMAP server"
 msgstr "IMAP 伺服器"
 
 #: ../src/mail/e-mail-autoconfig.c:1328
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
 msgid "POP3 server"
 msgstr "POP3 伺服器"
 
 #: ../src/mail/e-mail-autoconfig.c:1335
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
 msgid "SMTP server"
 msgstr "SMTP 伺服器"
 
-#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:871
-#: ../src/shell/e-shell-window-actions.c:878
-#: ../src/shell/e-shell-window-actions.c:885
+#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:921
+#: ../src/shell/e-shell-window-actions.c:928
+#: ../src/shell/e-shell-window-actions.c:935
 msgid "Close this window"
 msgstr "關閉本視窗"
 
@@ -16319,11 +16619,11 @@ msgstr "移回(_B)"
 msgid "_Skip Lookup"
 msgstr "略過尋找(_S)"
 
-#: ../src/mail/e-mail-config-assistant.c:725
+#: ../src/mail/e-mail-config-assistant.c:710
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-#: ../src/mail/e-mail-config-assistant.c:1032
+#: ../src/mail/e-mail-config-assistant.c:1021
 msgid "_Revise Details"
 msgstr "修訂詳細資訊(_R)"
 
@@ -16396,12 +16696,12 @@ msgid "Language for Reply and Forward attribution text"
 msgstr "回覆和轉傳屬性文字的語言"
 
 #: ../src/mail/e-mail-config-composing-page.c:524
-#: ../src/mail/em-composer-utils.c:4142 ../src/mail/mail-config.ui.h:22
+#: ../src/mail/em-composer-utils.c:4129 ../src/mail/mail-config.ui.h:22
 msgid "Start _typing at the bottom"
 msgstr "從底部開始輸入(_T)"
 
 #: ../src/mail/e-mail-config-composing-page.c:531
-#: ../src/mail/mail-config.ui.h:23
+#: ../src/mail/em-composer-utils.c:4132 ../src/mail/mail-config.ui.h:23
 msgid "_Keep signature above the original message"
 msgstr "保留原始郵件的簽名(_K)"
 
@@ -16480,39 +16780,39 @@ msgstr "封存資料夾(_V):"
 msgid "Choose a folder to archive messages to."
 msgstr "選擇封存郵件的資料夾。"
 
-#: ../src/mail/e-mail-config-defaults-page.c:799
+#: ../src/mail/e-mail-config-defaults-page.c:800
 msgid "_Templates Folder:"
 msgstr "範本資料夾(_T):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:809
+#: ../src/mail/e-mail-config-defaults-page.c:810
 msgid "Choose a folder to use for template messages."
 msgstr "選擇範本郵件的資料夾。"
 
-#: ../src/mail/e-mail-config-defaults-page.c:831
+#: ../src/mail/e-mail-config-defaults-page.c:832
 msgid "_Restore Defaults"
 msgstr "還原為預設值(_R)"
 
-#: ../src/mail/e-mail-config-defaults-page.c:848
+#: ../src/mail/e-mail-config-defaults-page.c:849
 msgid "_Lookup Folders"
 msgstr "查詢資料夾(_L)"
 
-#: ../src/mail/e-mail-config-defaults-page.c:866
+#: ../src/mail/e-mail-config-defaults-page.c:867
 msgid "Use a Real Folder for _Trash:"
 msgstr "垃圾桶使用真實資料夾(_T):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:867
+#: ../src/mail/e-mail-config-defaults-page.c:868
 msgid "Choose a folder for deleted messages."
 msgstr "選擇删除郵件的資料夾。"
 
-#: ../src/mail/e-mail-config-defaults-page.c:876
+#: ../src/mail/e-mail-config-defaults-page.c:877
 msgid "Use a Real Folder for _Junk:"
 msgstr "垃圾郵件使用真實資料夾(_J):"
 
-#: ../src/mail/e-mail-config-defaults-page.c:877
+#: ../src/mail/e-mail-config-defaults-page.c:878
 msgid "Choose a folder for junk messages."
 msgstr "選擇垃圾郵件的資料夾。"
 
-#: ../src/mail/e-mail-config-defaults-page.c:995
+#: ../src/mail/e-mail-config-defaults-page.c:996
 msgid "Defaults"
 msgstr "預設值"
 
@@ -16526,7 +16826,7 @@ msgstr ""
 "的郵件內包含這些資訊。"
 
 #: ../src/mail/e-mail-config-identity-page.c:580
-#: ../src/mail/e-mail-config-summary-page.c:355
+#: ../src/mail/e-mail-config-summary-page.c:348
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, “Work” or “Personal”."
@@ -16594,7 +16894,7 @@ msgid "Reply To is not a valid email"
 msgstr "回信位址不是有效的電子郵件"
 
 #: ../src/mail/e-mail-config-identity-page.c:970
-#: ../src/mail/e-mail-config-summary-page.c:637
+#: ../src/mail/e-mail-config-summary-page.c:630
 msgid "Account Name cannot be empty"
 msgstr "帳號名稱不能為空"
 
@@ -16610,7 +16910,7 @@ msgstr "檢查新郵件"
 msgid "Check for _new messages every"
 msgstr "自動檢查新郵件每(_N)"
 
-#: ../src/mail/e-mail-config-provider-page.c:767
+#: ../src/mail/e-mail-config-provider-page.c:763
 msgid "Receiving Options"
 msgstr "接收選項"
 
@@ -16620,118 +16920,118 @@ 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:379
+#: ../src/mail/e-mail-config-security-page.c:375
 #, c-format
 msgctxt "PGPKeyDescription"
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: ../src/mail/e-mail-config-security-page.c:460
-#: ../src/mail/em-folder-properties.c:1367 ../src/mail/mail-config.ui.h:34
+#: ../src/mail/e-mail-config-security-page.c:456
+#: ../src/mail/em-folder-properties.c:1396 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
 #: ../src/modules/calendar/e-calendar-preferences.c:621
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:802
+#: ../src/modules/mail/e-mail-shell-backend.c:1001
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "一般"
 
-#: ../src/mail/e-mail-config-security-page.c:469
+#: ../src/mail/e-mail-config-security-page.c:465
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不簽署會議邀請 (相容於 _Outlook)"
 
-#: ../src/mail/e-mail-config-security-page.c:491
+#: ../src/mail/e-mail-config-security-page.c:487
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "嚴密隱私權 (OpenPGP)"
 
-#: ../src/mail/e-mail-config-security-page.c:500
+#: ../src/mail/e-mail-config-security-page.c:496
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP 金鑰 ID(_K):"
 
-#: ../src/mail/e-mail-config-security-page.c:531
+#: ../src/mail/e-mail-config-security-page.c:527
 msgid "Si_gning algorithm:"
 msgstr "簽章演算法(_G):"
 
-#: ../src/mail/e-mail-config-security-page.c:547
-#: ../src/mail/e-mail-config-security-page.c:711
+#: ../src/mail/e-mail-config-security-page.c:543
+#: ../src/mail/e-mail-config-security-page.c:707
 #: ../src/mail/mail-config.ui.h:79
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../src/mail/e-mail-config-security-page.c:550
-#: ../src/mail/e-mail-config-security-page.c:714
+#: ../src/mail/e-mail-config-security-page.c:546
+#: ../src/mail/e-mail-config-security-page.c:710
 #: ../src/mail/mail-config.ui.h:80
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../src/mail/e-mail-config-security-page.c:553
-#: ../src/mail/e-mail-config-security-page.c:717
+#: ../src/mail/e-mail-config-security-page.c:549
+#: ../src/mail/e-mail-config-security-page.c:713
 #: ../src/mail/mail-config.ui.h:81
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../src/mail/e-mail-config-security-page.c:556
-#: ../src/mail/e-mail-config-security-page.c:720
+#: ../src/mail/e-mail-config-security-page.c:552
+#: ../src/mail/e-mail-config-security-page.c:716
 #: ../src/mail/mail-config.ui.h:82
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../src/mail/e-mail-config-security-page.c:572
+#: ../src/mail/e-mail-config-security-page.c:568
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽名(_W)"
 
-#: ../src/mail/e-mail-config-security-page.c:584
+#: ../src/mail/e-mail-config-security-page.c:580
 msgid "Always enc_rypt outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件加密(_R)"
 
-#: ../src/mail/e-mail-config-security-page.c:596
+#: ../src/mail/e-mail-config-security-page.c:592
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "當傳送加密郵件時永遠自我加密(_M)"
 
-#: ../src/mail/e-mail-config-security-page.c:608
+#: ../src/mail/e-mail-config-security-page.c:604
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密時永遠信任我的鑰匙圈裡的金鑰(_T)"
 
-#: ../src/mail/e-mail-config-security-page.c:620
+#: ../src/mail/e-mail-config-security-page.c:616
 msgid "Prefer _inline sign/encrypt for plain text messages"
 msgstr "偏好在純文字郵件中使用行內簽署/加密(_I)"
 
-#: ../src/mail/e-mail-config-security-page.c:644
+#: ../src/mail/e-mail-config-security-page.c:640
 msgid "Secure MIME (S/MIME)"
 msgstr "安全式 MIME (S/MIME)"
 
-#: ../src/mail/e-mail-config-security-page.c:653
+#: ../src/mail/e-mail-config-security-page.c:649
 msgid "Sig_ning certificate:"
 msgstr "簽名憑證(_N):"
 
-#: ../src/mail/e-mail-config-security-page.c:677
-#: ../src/mail/e-mail-config-security-page.c:775
+#: ../src/mail/e-mail-config-security-page.c:673
+#: ../src/mail/e-mail-config-security-page.c:771
 msgid "Select"
 msgstr "選擇"
 
-#: ../src/mail/e-mail-config-security-page.c:686
-#: ../src/mail/e-mail-config-security-page.c:784
-#: ../src/shell/e-shell-window-actions.c:967
+#: ../src/mail/e-mail-config-security-page.c:682
+#: ../src/mail/e-mail-config-security-page.c:780
+#: ../src/shell/e-shell-window-actions.c:1024
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../src/mail/e-mail-config-security-page.c:695
+#: ../src/mail/e-mail-config-security-page.c:691
 msgid "Signing _algorithm:"
 msgstr "簽章演算法(_A):"
 
-#: ../src/mail/e-mail-config-security-page.c:736
+#: ../src/mail/e-mail-config-security-page.c:732
 msgid "Always sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽名"
 
-#: ../src/mail/e-mail-config-security-page.c:751
+#: ../src/mail/e-mail-config-security-page.c:747
 msgid "Encryption certificate:"
 msgstr "加密憑證:"
 
-#: ../src/mail/e-mail-config-security-page.c:793
+#: ../src/mail/e-mail-config-security-page.c:789
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件加密"
 
-#: ../src/mail/e-mail-config-security-page.c:805
+#: ../src/mail/e-mail-config-security-page.c:801
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "當傳送加密郵件時永遠自我加密"
 
@@ -16739,58 +17039,58 @@ msgstr "當傳送加密郵件時永遠自我加密"
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
-#: ../src/mail/e-mail-config-service-page.c:501
+#: ../src/mail/e-mail-config-service-page.c:490
 msgid "Server _Type:"
 msgstr "伺服器類型(_T):"
 
-#: ../src/mail/e-mail-config-summary-page.c:308
+#: ../src/mail/e-mail-config-summary-page.c:301
 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:372
+#: ../src/mail/e-mail-config-summary-page.c:365
 msgid "Personal Details"
 msgstr "個人詳細資料"
 
-#: ../src/mail/e-mail-config-summary-page.c:381
+#: ../src/mail/e-mail-config-summary-page.c:374
 msgid "Full Name:"
 msgstr "全名:"
 
-#: ../src/mail/e-mail-config-summary-page.c:395
+#: ../src/mail/e-mail-config-summary-page.c:388
 msgid "Email Address:"
 msgstr "電子郵件位址:"
 
-#: ../src/mail/e-mail-config-summary-page.c:409
+#: ../src/mail/e-mail-config-summary-page.c:402
 msgid "Receiving"
 msgstr "接收中"
 
-#: ../src/mail/e-mail-config-summary-page.c:421
+#: ../src/mail/e-mail-config-summary-page.c:414
 msgid "Sending"
 msgstr "傳送中"
 
-#: ../src/mail/e-mail-config-summary-page.c:433
+#: ../src/mail/e-mail-config-summary-page.c:426
 msgid "Server Type:"
 msgstr "伺服器類型:"
 
-#: ../src/mail/e-mail-config-summary-page.c:454
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/mail/e-mail-config-summary-page.c:447
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:658
 msgid "Server:"
 msgstr "伺服器:"
 
-#: ../src/mail/e-mail-config-summary-page.c:475
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
+#: ../src/mail/e-mail-config-summary-page.c:468
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: ../src/mail/e-mail-config-summary-page.c:496
+#: ../src/mail/e-mail-config-summary-page.c:489
 msgid "Security:"
 msgstr "安全性:"
 
-#: ../src/mail/e-mail-config-summary-page.c:650
+#: ../src/mail/e-mail-config-summary-page.c:643
 msgid "Cannot have both receiving and sending parts set to None"
 msgstr "接收和傳送部分不能都設定為沒有"
 
-#: ../src/mail/e-mail-config-summary-page.c:806
+#: ../src/mail/e-mail-config-summary-page.c:799
 msgid "Account Summary"
 msgstr "帳號摘要"
 
@@ -16805,63 +17105,63 @@ msgstr ""
 "按一下「下一步」開始。"
 
 #: ../src/mail/e-mail-config-welcome-page.c:172
-#: ../src/modules/startup-wizard/e-startup-assistant.c:182
+#: ../src/modules/startup-wizard/e-startup-assistant.c:170
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../src/mail/e-mail-config-window.c:329
+#: ../src/mail/e-mail-config-window.c:305
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
-#: ../src/mail/e-mail-display.c:138
+#: ../src/mail/e-mail-display.c:141
 msgid "_Add to Address Book…"
 msgstr "加入到通訊錄(_A)…"
 
-#: ../src/mail/e-mail-display.c:145
+#: ../src/mail/e-mail-display.c:148
 msgid "_To This Address"
 msgstr "到這個位址(_T)"
 
-#: ../src/mail/e-mail-display.c:152
+#: ../src/mail/e-mail-display.c:155
 msgid "_From This Address"
 msgstr "從這個位址(_F)"
 
-#: ../src/mail/e-mail-display.c:159
+#: ../src/mail/e-mail-display.c:162
 msgid "Send _Reply To…"
 msgstr "傳送回覆到(_R)…"
 
-#: ../src/mail/e-mail-display.c:161
+#: ../src/mail/e-mail-display.c:164
 msgid "Send a reply message to this address"
 msgstr "傳送回覆郵件到這個位址"
 
-#: ../src/mail/e-mail-display.c:168
+#: ../src/mail/e-mail-display.c:171
 msgid "Create Search _Folder"
 msgstr "建立搜尋資料夾(_F)"
 
-#: ../src/mail/e-mail-display.c:721
+#: ../src/mail/e-mail-display.c:724
 msgid "Hid_e All"
 msgstr "全部隱藏(_E)"
 
-#: ../src/mail/e-mail-display.c:728
+#: ../src/mail/e-mail-display.c:731
 msgid "_View Inline"
 msgstr "檢視行內(_V)"
 
-#: ../src/mail/e-mail-display.c:735
+#: ../src/mail/e-mail-display.c:738
 msgid "Vie_w All Inline"
 msgstr "全部以行內檢視(_W)"
 
-#: ../src/mail/e-mail-display.c:742
+#: ../src/mail/e-mail-display.c:745
 msgid "_Zoom to 100%"
 msgstr "縮放到 100%(_Z)"
 
-#: ../src/mail/e-mail-display.c:744
+#: ../src/mail/e-mail-display.c:747
 msgid "Zoom the image to its natural size"
 msgstr "縮放為影像的原始尺寸"
 
-#: ../src/mail/e-mail-display.c:749
+#: ../src/mail/e-mail-display.c:752
 msgid "_Zoom to window"
 msgstr "縮放到視窗(_Z)"
 
-#: ../src/mail/e-mail-display.c:751
+#: ../src/mail/e-mail-display.c:754
 msgid "Zoom large images to not be wider than the window width"
 msgstr "縮小較大影像避免寬於視窗寬度"
 
@@ -16881,73 +17181,78 @@ msgstr "建立(_R)"
 msgid "Folder _name:"
 msgstr "資料夾名稱(_N):"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:694
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:687
 msgid "Folder Sort Order"
 msgstr "資料夾排序順序"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:735
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:728
 msgid "Reset c_urrent level"
 msgstr "重設目前的層級(_U)"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:736
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:729
 msgid "Reset sort order in the current level to the defaults"
 msgstr "重設目前層級的排序順序為預設值"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:746
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:739
 msgid "Reset _all levels"
 msgstr "重設所有的層級(_A)"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:747
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:740
 msgid "Reset sort order in all levels to their defaults"
 msgstr "重設所有層級的排序順序為預設值"
 
 #. 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:231
+#: ../src/mail/e-mail-free-form-exp.c:233
 msgctxt "ffe"
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../src/mail/e-mail-free-form-exp.c:232
+#: ../src/mail/e-mail-free-form-exp.c:234
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "已刪除"
 
-#: ../src/mail/e-mail-free-form-exp.c:233
+#: ../src/mail/e-mail-free-form-exp.c:235
 msgctxt "ffe"
 msgid "Draft"
 msgstr "草稿"
 
-#: ../src/mail/e-mail-free-form-exp.c:234
+#: ../src/mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "有標幟的"
 
-#: ../src/mail/e-mail-free-form-exp.c:235
+#: ../src/mail/e-mail-free-form-exp.c:237
 msgctxt "ffe"
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../src/mail/e-mail-free-form-exp.c:236
+#: ../src/mail/e-mail-free-form-exp.c:238
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "附件"
 
-#: ../src/mail/e-mail-free-form-exp.c:489
+#: ../src/mail/e-mail-free-form-exp.c:488
 msgctxt "ffe"
 msgid "no"
 msgstr "現在"
 
+#: ../src/mail/e-mail-free-form-exp.c:489
+msgctxt "ffe"
+msgid "not"
+msgstr "不是"
+
 #: ../src/mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr "false"
 
-#: ../src/mail/e-mail-junk-options.c:296
+#: ../src/mail/e-mail-junk-options.c:289
 msgid "Junk filtering software:"
 msgstr "垃圾郵件過濾軟體:"
 
-#: ../src/mail/e-mail-label-dialog.c:222
+#: ../src/mail/e-mail-label-dialog.c:214
 msgid "_Label name:"
 msgstr "標籤名稱(_L):"
 
@@ -16975,17 +17280,17 @@ msgstr "待辦事項(_T)"
 msgid "_Later"
 msgstr "稍後(_L)"
 
-#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:905
-#: ../src/mail/em-folder-properties.c:1141
+#: ../src/mail/e-mail-label-manager.c:153 ../src/mail/e-mail-reader.c:914
+#: ../src/mail/em-folder-properties.c:1170
 msgid "Add Label"
 msgstr "加入標籤"
 
-#: ../src/mail/e-mail-label-manager.c:220
-#: ../src/mail/em-folder-properties.c:1168
+#: ../src/mail/e-mail-label-manager.c:204
+#: ../src/mail/em-folder-properties.c:1197
 msgid "Edit Label"
 msgstr "編輯標籤"
 
-#: ../src/mail/e-mail-label-manager.c:352
+#: ../src/mail/e-mail-label-manager.c:336
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -16997,23 +17302,27 @@ msgstr ""
 msgid "Color"
 msgstr "顏色"
 
-#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:740
+#: ../src/mail/e-mail-notes.c:322 ../src/mail/e-mail-notes.c:725
 msgid "Message Note"
 msgstr "郵件備註"
 
-#: ../src/mail/e-mail-notes.c:660
+#: ../src/mail/e-mail-notes.c:645
 msgid "Cannot find message in its folder summary"
 msgstr "在資料夾摘要中找不到郵件"
 
-#: ../src/mail/e-mail-notes.c:863
+#: ../src/mail/e-mail-notes.c:870
+msgid "Failed to convert text to message"
+msgstr "無法將文字轉換為郵件"
+
+#: ../src/mail/e-mail-notes.c:884 ../src/mail/e-mail-notes.c:909
 msgid "Storing changes…"
 msgstr "正在儲存變更…"
 
-#: ../src/mail/e-mail-notes.c:1001
+#: ../src/mail/e-mail-notes.c:1052
 msgid "Edit Message Note"
 msgstr "編輯郵件備註"
 
-#: ../src/mail/e-mail-notes.c:1157
+#: ../src/mail/e-mail-notes.c:1207
 msgid "Retrieving message…"
 msgstr "正在取回郵件…"
 
@@ -17045,7 +17354,7 @@ msgstr "標頭名稱:"
 msgid "Header Value"
 msgstr "標頭數值"
 
-#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:132
+#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:135
 msgid "Headers"
 msgstr "檔頭"
 
@@ -17054,677 +17363,681 @@ msgstr "檔頭"
 msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
-#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:359 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:359 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
-#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:363 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:153
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:363 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../src/mail/e-mail-reader.c:609
+#: ../src/mail/e-mail-reader.c:618
 msgid "Deleting message note…"
 msgstr "正在刪除郵件備註…"
 
-#: ../src/mail/e-mail-reader.c:1609 ../src/mail/e-mail-reader.c:1900
-#: ../src/mail/e-mail-reader.c:1940
+#: ../src/mail/e-mail-reader.c:1618 ../src/mail/e-mail-reader.c:1910
+#: ../src/mail/e-mail-reader.c:1950
 msgid "_Do not ask me again."
 msgstr "不要再詢問我(_D)。"
 
-#: ../src/mail/e-mail-reader.c:1946
+#: ../src/mail/e-mail-reader.c:1956
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "永遠忽略通信論壇的回覆欄位(_A)"
 
-#: ../src/mail/e-mail-reader.c:2150
+#: ../src/mail/e-mail-reader.c:2160
 msgid "Failed to retrieve message:"
 msgstr "取回郵件失敗:"
 
-#: ../src/mail/e-mail-reader.c:2196 ../src/mail/e-mail-reader.c:3686
+#: ../src/mail/e-mail-reader.c:2206 ../src/mail/e-mail-reader.c:3707
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "正在取回郵件「%s」"
 
-#: ../src/mail/e-mail-reader.c:2397
+#: ../src/mail/e-mail-reader.c:2407
 msgid "A_dd Sender to Address Book"
 msgstr "加入寄件者到目錄服務(_D)"
 
-#: ../src/mail/e-mail-reader.c:2399
+#: ../src/mail/e-mail-reader.c:2409
 msgid "Add sender to address book"
 msgstr "新增寄件者至通訊錄"
 
-#: ../src/mail/e-mail-reader.c:2404
+#: ../src/mail/e-mail-reader.c:2414
 msgid "_Archive…"
 msgstr "封存(_A)…"
 
-#: ../src/mail/e-mail-reader.c:2406
+#: ../src/mail/e-mail-reader.c:2416
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "將選取的郵件移至這個帳號的封存資料夾"
 
-#: ../src/mail/e-mail-reader.c:2411
+#: ../src/mail/e-mail-reader.c:2421
 msgid "Check for _Junk"
 msgstr "檢查垃圾郵件(_J)"
 
-#: ../src/mail/e-mail-reader.c:2413
+#: ../src/mail/e-mail-reader.c:2423
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾郵件狀態"
 
-#: ../src/mail/e-mail-reader.c:2418
+#: ../src/mail/e-mail-reader.c:2428
 msgid "Assign C_olor…"
 msgstr "指定色彩(_O)…"
 
-#: ../src/mail/e-mail-reader.c:2420
+#: ../src/mail/e-mail-reader.c:2430
 msgid "Assign color for the selected messages"
 msgstr "指定選取郵件的色彩"
 
-#: ../src/mail/e-mail-reader.c:2425
+#: ../src/mail/e-mail-reader.c:2435
 msgid "Unse_t Color"
 msgstr "取消設定色彩(_T)"
 
-#: ../src/mail/e-mail-reader.c:2427
+#: ../src/mail/e-mail-reader.c:2437
 msgid "Unset color for the selected messages"
 msgstr "取消設定選取郵件的色彩"
 
-#: ../src/mail/e-mail-reader.c:2432
+#: ../src/mail/e-mail-reader.c:2442
 msgid "_Copy to Folder…"
 msgstr "複製至資料夾(_C)…"
 
-#: ../src/mail/e-mail-reader.c:2434
+#: ../src/mail/e-mail-reader.c:2444
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
-#: ../src/mail/e-mail-reader.c:2439
+#: ../src/mail/e-mail-reader.c:2449
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
 
-#: ../src/mail/e-mail-reader.c:2441
+#: ../src/mail/e-mail-reader.c:2451
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
-#: ../src/mail/e-mail-reader.c:2446
+#: ../src/mail/e-mail-reader.c:2456
 msgid "_Add note…"
 msgstr "加入備註(_A)…"
 
-#: ../src/mail/e-mail-reader.c:2448
+#: ../src/mail/e-mail-reader.c:2458
 msgid "Add a note for the selected message"
 msgstr "為選取的郵件加入備註"
 
-#: ../src/mail/e-mail-reader.c:2453
+#: ../src/mail/e-mail-reader.c:2463
 msgid "Delete no_te"
 msgstr "刪除備註(_T)"
 
-#: ../src/mail/e-mail-reader.c:2455
+#: ../src/mail/e-mail-reader.c:2465
 msgid "Delete the note for the selected message"
 msgstr "刪除選取郵件的備註"
 
-#: ../src/mail/e-mail-reader.c:2460
+#: ../src/mail/e-mail-reader.c:2470
 msgid "_Edit note…"
 msgstr "編輯備註(_E)…"
 
-#: ../src/mail/e-mail-reader.c:2462
+#: ../src/mail/e-mail-reader.c:2472
 msgid "Edit a note for the selected message"
 msgstr "編輯選取的郵件備註"
 
-#: ../src/mail/e-mail-reader.c:2467
+#: ../src/mail/e-mail-reader.c:2477
 msgid "Create a Filter Rule for Mailing _List…"
 msgstr "從通信論壇建立過濾器規則(_L)…"
 
-#: ../src/mail/e-mail-reader.c:2469
+#: ../src/mail/e-mail-reader.c:2479
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個通信論壇建立過濾器規則"
 
-#: ../src/mail/e-mail-reader.c:2474
+#: ../src/mail/e-mail-reader.c:2484
 msgid "Create a Filter Rule for _Recipients…"
 msgstr "從收件者建立過濾器規則(_R)…"
 
-#: ../src/mail/e-mail-reader.c:2476
+#: ../src/mail/e-mail-reader.c:2486
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
-#: ../src/mail/e-mail-reader.c:2481
+#: ../src/mail/e-mail-reader.c:2491
 msgid "Create a Filter Rule for Se_nder…"
 msgstr "從寄件者建立過濾器規則(_N)…"
 
-#: ../src/mail/e-mail-reader.c:2483
+#: ../src/mail/e-mail-reader.c:2493
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
-#: ../src/mail/e-mail-reader.c:2488
+#: ../src/mail/e-mail-reader.c:2498
 msgid "Create a Filter Rule for _Subject…"
 msgstr "從主旨建立過濾器規則(_S)…"
 
-#: ../src/mail/e-mail-reader.c:2490
+#: ../src/mail/e-mail-reader.c:2500
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-#: ../src/mail/e-mail-reader.c:2495
+#: ../src/mail/e-mail-reader.c:2505
 msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
-#: ../src/mail/e-mail-reader.c:2497
+#: ../src/mail/e-mail-reader.c:2507
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的郵件"
 
-#: ../src/mail/e-mail-reader.c:2502
+#: ../src/mail/e-mail-reader.c:2512
 msgid "_Find in Message…"
 msgstr "在郵件內尋找(_F)…"
 
-#: ../src/mail/e-mail-reader.c:2504
+#: ../src/mail/e-mail-reader.c:2514
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
-#: ../src/mail/e-mail-reader.c:2509
+#: ../src/mail/e-mail-reader.c:2519
 msgid "_Clear Flag"
 msgstr "清除標幟(_C)"
 
-#: ../src/mail/e-mail-reader.c:2511
+#: ../src/mail/e-mail-reader.c:2521
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "移除選取郵件的跟隨旗標"
 
-#: ../src/mail/e-mail-reader.c:2516
+#: ../src/mail/e-mail-reader.c:2526
 msgid "_Flag Completed"
 msgstr "標記為已完成(_F)"
 
-#: ../src/mail/e-mail-reader.c:2518
+#: ../src/mail/e-mail-reader.c:2528
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "將已選取郵件的跟隨旗標設為已完成"
 
-#: ../src/mail/e-mail-reader.c:2523
+#: ../src/mail/e-mail-reader.c:2533
 msgid "Follow _Up…"
 msgstr "跟隨(_U)…"
 
-#: ../src/mail/e-mail-reader.c:2525
+#: ../src/mail/e-mail-reader.c:2535
 msgid "Flag the selected messages for follow-up"
 msgstr "將選定的郵件加上跟隨旗標"
 
-#: ../src/mail/e-mail-reader.c:2530
+#: ../src/mail/e-mail-reader.c:2540
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../src/mail/e-mail-reader.c:2532 ../src/mail/e-mail-reader.c:2539
+#: ../src/mail/e-mail-reader.c:2542 ../src/mail/e-mail-reader.c:2549
 #: ../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:2537
+#: ../src/mail/e-mail-reader.c:2547
 msgid "Forward As _Attached"
 msgstr "以附件轉寄(_A)"
 
-#: ../src/mail/e-mail-reader.c:2544
+#: ../src/mail/e-mail-reader.c:2554
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "行內(_I)"
 
-#: ../src/mail/e-mail-reader.c:2546 ../src/mail/e-mail-reader.c:2553
+#: ../src/mail/e-mail-reader.c:2556 ../src/mail/e-mail-reader.c:2563
 #: ../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:2551
+#: ../src/mail/e-mail-reader.c:2561
 msgid "Forward As _Inline"
 msgstr "以行內轉寄(_I)"
 
-#: ../src/mail/e-mail-reader.c:2558
+#: ../src/mail/e-mail-reader.c:2568
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
-#: ../src/mail/e-mail-reader.c:2560 ../src/mail/e-mail-reader.c:2567
+#: ../src/mail/e-mail-reader.c:2570 ../src/mail/e-mail-reader.c:2577
 #: ../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:2565
+#: ../src/mail/e-mail-reader.c:2575
 msgid "Forward As _Quoted"
 msgstr "以引文轉寄(_Q)"
 
-#: ../src/mail/e-mail-reader.c:2572
+#: ../src/mail/e-mail-reader.c:2582
 msgid "_New Label"
 msgstr "新增標籤(_N)"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/mail/e-mail-reader.c:2581
+#: ../src/mail/e-mail-reader.c:2591
 msgid "N_one"
 msgstr "沒有(_O)"
 
-#: ../src/mail/e-mail-reader.c:2588
+#: ../src/mail/e-mail-reader.c:2598
 msgid "_Load Images"
 msgstr "載入影像(_L)"
 
-#: ../src/mail/e-mail-reader.c:2590
+#: ../src/mail/e-mail-reader.c:2600
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML 格式的郵件時強迫載入影像"
 
-#: ../src/mail/e-mail-reader.c:2595 ../src/mail/e-mail-reader.c:3014
+#: ../src/mail/e-mail-reader.c:2605 ../src/mail/e-mail-reader.c:3031
 msgid "_Ignore Subthread"
 msgstr "忽略子群組(_I)"
 
-#: ../src/mail/e-mail-reader.c:2597
+#: ../src/mail/e-mail-reader.c:2607
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "自動將子群組中的新郵件標記為已閱讀"
 
-#: ../src/mail/e-mail-reader.c:2602 ../src/mail/e-mail-reader.c:3018
+#: ../src/mail/e-mail-reader.c:2612 ../src/mail/e-mail-reader.c:3035
 msgid "_Ignore Thread"
 msgstr "忽略群組(_I)"
 
-#: ../src/mail/e-mail-reader.c:2604
+#: ../src/mail/e-mail-reader.c:2614
 msgid "Mark new mails in this thread as read automatically"
 msgstr "自動將這個群組中的新郵件標記為已閱讀"
 
-#: ../src/mail/e-mail-reader.c:2609
+#: ../src/mail/e-mail-reader.c:2619
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../src/mail/e-mail-reader.c:2611
+#: ../src/mail/e-mail-reader.c:2621
 msgid "Mark the selected messages as important"
 msgstr "將選定的郵件標示成重要"
 
-#: ../src/mail/e-mail-reader.c:2616
+#: ../src/mail/e-mail-reader.c:2626
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
 
-#: ../src/mail/e-mail-reader.c:2618
+#: ../src/mail/e-mail-reader.c:2628
 msgid "Mark the selected messages as junk"
 msgstr "將選定的郵件標示成垃圾郵件"
 
-#: ../src/mail/e-mail-reader.c:2623
+#: ../src/mail/e-mail-reader.c:2633
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
 
-#: ../src/mail/e-mail-reader.c:2625
+#: ../src/mail/e-mail-reader.c:2635
 msgid "Mark the selected messages as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
-#: ../src/mail/e-mail-reader.c:2630
+#: ../src/mail/e-mail-reader.c:2640
 msgid "_Read"
 msgstr "已閱讀(_R)"
 
-#: ../src/mail/e-mail-reader.c:2632
+#: ../src/mail/e-mail-reader.c:2642
 msgid "Mark the selected messages as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
-#: ../src/mail/e-mail-reader.c:2637 ../src/mail/e-mail-reader.c:3038
+#: ../src/mail/e-mail-reader.c:2647 ../src/mail/e-mail-reader.c:3055
 msgid "Do not _Ignore Subthread"
 msgstr "不要忽略子群組(_I)"
 
-#: ../src/mail/e-mail-reader.c:2639
+#: ../src/mail/e-mail-reader.c:2649
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "不要自動將子群組中的新郵件標記為已閱讀"
 
-#: ../src/mail/e-mail-reader.c:2644 ../src/mail/e-mail-reader.c:3042
+#: ../src/mail/e-mail-reader.c:2654 ../src/mail/e-mail-reader.c:3059
 msgid "Do not _Ignore Thread"
 msgstr "不要忽略群組(_I)"
 
-#: ../src/mail/e-mail-reader.c:2646
+#: ../src/mail/e-mail-reader.c:2656
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "不要自動將這個群組中的新郵件標記為已閱讀"
 
-#: ../src/mail/e-mail-reader.c:2651
+#: ../src/mail/e-mail-reader.c:2661
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../src/mail/e-mail-reader.c:2653
+#: ../src/mail/e-mail-reader.c:2663
 msgid "Mark the selected messages as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
-#: ../src/mail/e-mail-reader.c:2658
+#: ../src/mail/e-mail-reader.c:2668
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../src/mail/e-mail-reader.c:2660
+#: ../src/mail/e-mail-reader.c:2670
 msgid "Mark the selected messages as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
-#: ../src/mail/e-mail-reader.c:2665
+#: ../src/mail/e-mail-reader.c:2675
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
 msgid "_Edit as New Message…"
 msgstr "編輯為新郵件(_E)…"
 
-#: ../src/mail/e-mail-reader.c:2667
+#: ../src/mail/e-mail-reader.c:2677
 #: ../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:2672
+#: ../src/mail/e-mail-reader.c:2682
 msgid "Compose _New Message"
 msgstr "撰寫新郵件(_N)"
 
-#: ../src/mail/e-mail-reader.c:2674
+#: ../src/mail/e-mail-reader.c:2684
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
-#: ../src/mail/e-mail-reader.c:2679
+#: ../src/mail/e-mail-reader.c:2689
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../src/mail/e-mail-reader.c:2681
+#: ../src/mail/e-mail-reader.c:2691
 msgid "Open the selected messages in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
-#: ../src/mail/e-mail-reader.c:2686
+#: ../src/mail/e-mail-reader.c:2696
 msgid "_Move to Folder…"
 msgstr "移至資料夾(_M)…"
 
-#: ../src/mail/e-mail-reader.c:2688
+#: ../src/mail/e-mail-reader.c:2698
 msgid "Move selected messages to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
-#: ../src/mail/e-mail-reader.c:2693
+#: ../src/mail/e-mail-reader.c:2703
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
-#: ../src/mail/e-mail-reader.c:2695
+#: ../src/mail/e-mail-reader.c:2705
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
-#: ../src/mail/e-mail-reader.c:2700
+#: ../src/mail/e-mail-reader.c:2710
 msgid "Next _Important Message"
 msgstr "下一封重要郵件(_I)"
 
-#: ../src/mail/e-mail-reader.c:2702
+#: ../src/mail/e-mail-reader.c:2712
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
-#: ../src/mail/e-mail-reader.c:2707
+#: ../src/mail/e-mail-reader.c:2717
 msgid "Next _Thread"
 msgstr "下一封相關郵件(_T)"
 
-#: ../src/mail/e-mail-reader.c:2709
+#: ../src/mail/e-mail-reader.c:2719
 msgid "Display the next thread"
 msgstr "顯示下一封相關郵件"
 
-#: ../src/mail/e-mail-reader.c:2714
+#: ../src/mail/e-mail-reader.c:2724
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
-#: ../src/mail/e-mail-reader.c:2716
+#: ../src/mail/e-mail-reader.c:2726
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
-#: ../src/mail/e-mail-reader.c:2721
+#: ../src/mail/e-mail-reader.c:2731
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
-#: ../src/mail/e-mail-reader.c:2723
+#: ../src/mail/e-mail-reader.c:2733
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
-#: ../src/mail/e-mail-reader.c:2728
+#: ../src/mail/e-mail-reader.c:2738
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
-#: ../src/mail/e-mail-reader.c:2730
+#: ../src/mail/e-mail-reader.c:2740
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
-#: ../src/mail/e-mail-reader.c:2735
+#: ../src/mail/e-mail-reader.c:2745
 msgid "Previous T_hread"
 msgstr "上一封相關郵件(_H)"
 
-#: ../src/mail/e-mail-reader.c:2737
+#: ../src/mail/e-mail-reader.c:2747
 msgid "Display the previous thread"
 msgstr "顯示上一封相關郵件"
 
-#: ../src/mail/e-mail-reader.c:2742
+#: ../src/mail/e-mail-reader.c:2752
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
-#: ../src/mail/e-mail-reader.c:2744
+#: ../src/mail/e-mail-reader.c:2754
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
-#: ../src/mail/e-mail-reader.c:2751
+#: ../src/mail/e-mail-reader.c:2761
 msgid "Print this message"
 msgstr "列印郵件"
 
-#: ../src/mail/e-mail-reader.c:2758
+#: ../src/mail/e-mail-reader.c:2768
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
-#: ../src/mail/e-mail-reader.c:2763
+#: ../src/mail/e-mail-reader.c:2773
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
-#: ../src/mail/e-mail-reader.c:2765
+#: ../src/mail/e-mail-reader.c:2775
 #: ../src/modules/mail/e-mail-attachment-handler.c:454
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ../src/mail/e-mail-reader.c:2770
+#: ../src/mail/e-mail-reader.c:2780
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../src/mail/e-mail-reader.c:2772
+#: ../src/mail/e-mail-reader.c:2782
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../src/mail/e-mail-reader.c:2777
+#: ../src/mail/e-mail-reader.c:2787
 msgid "Remove Du_plicate Messages"
 msgstr "移除重複的郵件(_P)"
 
-#: ../src/mail/e-mail-reader.c:2779
+#: ../src/mail/e-mail-reader.c:2789
 msgid "Checks selected messages for duplicates"
 msgstr "檢查選取的郵件是否有重複"
 
-#: ../src/mail/e-mail-reader.c:2784 ../src/mail/em-composer-utils.c:4096
+#: ../src/mail/e-mail-reader.c:2794 ../src/mail/em-composer-utils.c:4083
 #: ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1550
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../src/mail/e-mail-reader.c:2786
+#: ../src/mail/e-mail-reader.c:2796
 #: ../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:2791
+#: ../src/mail/e-mail-reader.c:2801
 msgid "Al_ternative Reply…"
 msgstr "其他回覆方式(_T)…"
 
-#: ../src/mail/e-mail-reader.c:2793
+#: ../src/mail/e-mail-reader.c:2803
 msgid "Choose reply options for the selected message"
 msgstr "為選取的郵件選擇回覆選項"
 
-#: ../src/mail/e-mail-reader.c:2798 ../src/mail/em-composer-utils.c:4091
+#: ../src/mail/e-mail-reader.c:2808 ../src/mail/em-composer-utils.c:4078
 #: ../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:2800
+#: ../src/mail/e-mail-reader.c:2810
 #: ../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:2805
+#: ../src/mail/e-mail-reader.c:2815
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../src/mail/e-mail-reader.c:2807
+#: ../src/mail/e-mail-reader.c:2817
 #: ../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:2812
+#: ../src/mail/e-mail-reader.c:2822
+msgid "Repl_y with Template"
+msgstr "以範本回覆(_Y)"
+
+#: ../src/mail/e-mail-reader.c:2829
 msgid "_Save as mbox…"
 msgstr "儲存成 mbox(_S)…"
 
-#: ../src/mail/e-mail-reader.c:2814
+#: ../src/mail/e-mail-reader.c:2831
 msgid "Save selected messages as an mbox file"
 msgstr "將選定的郵件另存成 mbox 檔案"
 
-#: ../src/mail/e-mail-reader.c:2826
+#: ../src/mail/e-mail-reader.c:2843
 msgid "_Message Source"
 msgstr "郵件原始碼(_M)"
 
-#: ../src/mail/e-mail-reader.c:2828
+#: ../src/mail/e-mail-reader.c:2845
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-#: ../src/mail/e-mail-reader.c:2840
+#: ../src/mail/e-mail-reader.c:2857
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../src/mail/e-mail-reader.c:2842
+#: ../src/mail/e-mail-reader.c:2859
 msgid "Undelete the selected messages"
 msgstr "取消刪除選定的郵件"
 
-#: ../src/mail/e-mail-reader.c:2847
+#: ../src/mail/e-mail-reader.c:2864
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../src/mail/e-mail-reader.c:2849
+#: ../src/mail/e-mail-reader.c:2866
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
-#: ../src/mail/e-mail-reader.c:2854
+#: ../src/mail/e-mail-reader.c:2871
 msgid "_Zoom In"
 msgstr "拉近(_Z)"
 
-#: ../src/mail/e-mail-reader.c:2856
+#: ../src/mail/e-mail-reader.c:2873
 msgid "Increase the text size"
 msgstr "將文字放大"
 
-#: ../src/mail/e-mail-reader.c:2863
+#: ../src/mail/e-mail-reader.c:2880
 msgid "Decrease the text size"
 msgstr "將文字縮小"
 
-#: ../src/mail/e-mail-reader.c:2870
+#: ../src/mail/e-mail-reader.c:2887
 msgid "Cre_ate"
 msgstr "建立(_A)"
 
-#: ../src/mail/e-mail-reader.c:2877
+#: ../src/mail/e-mail-reader.c:2894
 msgid "Ch_aracter Encoding"
 msgstr "字元編碼(_A)"
 
-#: ../src/mail/e-mail-reader.c:2884
+#: ../src/mail/e-mail-reader.c:2901
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "轉寄為(_O)"
 
-#: ../src/mail/e-mail-reader.c:2891
+#: ../src/mail/e-mail-reader.c:2908
 msgid "_Label"
 msgstr "標籤(_L)"
 
-#: ../src/mail/e-mail-reader.c:2898
+#: ../src/mail/e-mail-reader.c:2915
 msgid "_Group Reply"
 msgstr "群組回覆(_G)"
 
-#: ../src/mail/e-mail-reader.c:2905
+#: ../src/mail/e-mail-reader.c:2922
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../src/mail/e-mail-reader.c:2912
+#: ../src/mail/e-mail-reader.c:2929
 msgid "Mar_k As"
 msgstr "標示成(_K)"
 
-#: ../src/mail/e-mail-reader.c:2919
+#: ../src/mail/e-mail-reader.c:2936
 msgid "_Message"
 msgstr "郵件(_M)"
 
-#: ../src/mail/e-mail-reader.c:2926
+#: ../src/mail/e-mail-reader.c:2943
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../src/mail/e-mail-reader.c:2936
+#: ../src/mail/e-mail-reader.c:2953
 msgid "Create a Search Folder from Mailing _List…"
 msgstr "從通信論壇建立搜尋資料夾(_L)…"
 
-#: ../src/mail/e-mail-reader.c:2938
+#: ../src/mail/e-mail-reader.c:2955
 msgid "Create a search folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
-#: ../src/mail/e-mail-reader.c:2943
+#: ../src/mail/e-mail-reader.c:2960
 msgid "Create a Search Folder from Recipien_ts…"
 msgstr "從收件者建立搜尋資料夾(_T)…"
 
-#: ../src/mail/e-mail-reader.c:2945
+#: ../src/mail/e-mail-reader.c:2962
 msgid "Create a search folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
-#: ../src/mail/e-mail-reader.c:2950
+#: ../src/mail/e-mail-reader.c:2967
 msgid "Create a Search Folder from Sen_der…"
 msgstr "從寄件者建立搜尋資料夾(_D)…"
 
-#: ../src/mail/e-mail-reader.c:2952
+#: ../src/mail/e-mail-reader.c:2969
 msgid "Create a search folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
-#: ../src/mail/e-mail-reader.c:2957
+#: ../src/mail/e-mail-reader.c:2974
 msgid "Create a Search Folder from S_ubject…"
 msgstr "從主旨建立搜尋資料夾(_U)…"
 
-#: ../src/mail/e-mail-reader.c:2959
+#: ../src/mail/e-mail-reader.c:2976
 msgid "Create a search folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
-#: ../src/mail/e-mail-reader.c:3006
+#: ../src/mail/e-mail-reader.c:3023
 msgid "Mark for Follo_w Up…"
 msgstr "標示為跟隨(_W)…"
 
-#: ../src/mail/e-mail-reader.c:3022
+#: ../src/mail/e-mail-reader.c:3039
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
-#: ../src/mail/e-mail-reader.c:3026
+#: ../src/mail/e-mail-reader.c:3043
 msgid "Mark as _Junk"
 msgstr "標示成垃圾郵件(_J)"
 
-#: ../src/mail/e-mail-reader.c:3030
+#: ../src/mail/e-mail-reader.c:3047
 msgid "Mark as _Not Junk"
 msgstr "標示成非垃圾郵件(_N)"
 
-#: ../src/mail/e-mail-reader.c:3034
+#: ../src/mail/e-mail-reader.c:3051
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
-#: ../src/mail/e-mail-reader.c:3046
+#: ../src/mail/e-mail-reader.c:3063
 msgid "Mark as Uni_mportant"
 msgstr "標示成不重要(_M)"
 
-#: ../src/mail/e-mail-reader.c:3050
+#: ../src/mail/e-mail-reader.c:3067
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
-#: ../src/mail/e-mail-reader.c:3098
+#: ../src/mail/e-mail-reader.c:3119
 msgid "_Caret Mode"
 msgstr "鍵盤瀏覽模式(_C)"
 
-#: ../src/mail/e-mail-reader.c:3100
+#: ../src/mail/e-mail-reader.c:3121
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在顯示的郵件內文中顯示閃爍游標"
 
-#: ../src/mail/e-mail-reader.c:3106
+#: ../src/mail/e-mail-reader.c:3127
 msgid "All Message _Headers"
 msgstr "所有郵件檔頭(_H)"
 
-#: ../src/mail/e-mail-reader.c:3108
+#: ../src/mail/e-mail-reader.c:3129
 msgid "Show messages with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
-#: ../src/mail/e-mail-reader.c:3692
+#: ../src/mail/e-mail-reader.c:3713
 msgid "Retrieving message"
 msgstr "取回郵件"
 
-#: ../src/mail/e-mail-reader.c:5062
+#: ../src/mail/e-mail-reader.c:5083
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../src/mail/e-mail-reader.c:5063
+#: ../src/mail/e-mail-reader.c:5084
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
@@ -17733,29 +18046,29 @@ 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:5082
+#: ../src/mail/e-mail-reader.c:5103
 msgid "Group Reply"
 msgstr "群組回覆"
 
-#: ../src/mail/e-mail-reader.c:5083
+#: ../src/mail/e-mail-reader.c:5104
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "回覆給通信論壇,或是給所有的收件者"
 
-#: ../src/mail/e-mail-reader.c:5149 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5170 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "刪除"
 
-#: ../src/mail/e-mail-reader.c:5161
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../src/mail/e-mail-reader.c:5182
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
 msgid "Next"
 msgstr "下一個"
 
-#: ../src/mail/e-mail-reader.c:5165
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
+#: ../src/mail/e-mail-reader.c:5186
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "Previous"
 msgstr "上一個"
 
-#: ../src/mail/e-mail-reader.c:5174 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5195 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "回覆"
 
@@ -17805,7 +18118,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "資料夾「%s」包含了 %u 條重複的訊息,確定移除?"
 
-#: ../src/mail/e-mail-reader-utils.c:3023
+#: ../src/mail/e-mail-reader-utils.c:2989
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "儲存郵件"
@@ -17815,12 +18128,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:3044
+#: ../src/mail/e-mail-reader-utils.c:3010
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "郵件"
 
-#: ../src/mail/e-mail-reader-utils.c:3458
+#: ../src/mail/e-mail-reader-utils.c:3424
 msgid "Parsing message"
 msgstr "解析郵件"
 
@@ -17854,7 +18167,7 @@ msgid ""
 msgstr ""
 "您可以手動下載遠端內容,或設定為記住下載這個寄件者或使用過網站的遠端內容。"
 
-#: ../src/mail/e-mail-request.c:288
+#: ../src/mail/e-mail-request.c:289
 msgid "The message has no text content."
 msgstr "這個郵件沒有文字內容。"
 
@@ -17870,16 +18183,16 @@ msgstr "清除(_E)"
 msgid "No Title"
 msgstr "沒有標題"
 
-#: ../src/mail/e-mail-ui-session.c:820
-#, c-format
-msgid "%s authentication failed"
-msgstr "%s 核對失敗"
-
-#: ../src/mail/e-mail-ui-session.c:870
+#: ../src/mail/e-mail-ui-session.c:857 ../src/mail/e-mail-ui-session.c:929
 #, c-format
 msgid "No data source found for UID “%s”"
 msgstr "沒有 UID「%s」的資料來源"
 
+#: ../src/mail/e-mail-ui-session.c:879
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s 核對失敗"
+
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
 #: ../src/mail/em-composer-utils.c:395
 #, c-format
@@ -17910,7 +18223,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:829
+#: ../src/mail/em-composer-utils.c:830
 msgid "Waiting for attachments to load…"
 msgstr "正在等待載入附件…"
 
@@ -17918,7 +18231,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:2027
+#: ../src/mail/em-composer-utils.c:2005
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -17926,90 +18239,90 @@ msgstr ""
 "於 ${WeekdayName},${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
 "${TimeZone},${Sender} 提到:"
 
-#: ../src/mail/em-composer-utils.c:2033
+#: ../src/mail/em-composer-utils.c:2011
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-#: ../src/mail/em-composer-utils.c:2038
+#: ../src/mail/em-composer-utils.c:2016
 msgid "-----Original Message-----"
 msgstr "-----原始郵件-----"
 
 #. 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:2799
+#: ../src/mail/em-composer-utils.c:2777
 #, c-format
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "Re: %s"
 
-#: ../src/mail/em-composer-utils.c:3417
+#: ../src/mail/em-composer-utils.c:3395
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
-#: ../src/mail/em-composer-utils.c:4042
+#: ../src/mail/em-composer-utils.c:4029
 msgid "Alternative Reply"
 msgstr "其他回覆"
 
-#: ../src/mail/em-composer-utils.c:4045
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../src/mail/em-composer-utils.c:4032
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1543
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../src/mail/em-composer-utils.c:4058
+#: ../src/mail/em-composer-utils.c:4045
 msgid "Recipients:"
 msgstr "收件者:"
 
-#: ../src/mail/em-composer-utils.c:4086
+#: ../src/mail/em-composer-utils.c:4073
 msgid "Reply to _Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../src/mail/em-composer-utils.c:4108
+#: ../src/mail/em-composer-utils.c:4095
 msgid "Reply style:"
 msgstr "回覆方式:"
 
-#: ../src/mail/em-composer-utils.c:4116
+#: ../src/mail/em-composer-utils.c:4103
 msgid "_Default"
 msgstr "預設(_D)"
 
-#: ../src/mail/em-composer-utils.c:4120
+#: ../src/mail/em-composer-utils.c:4107
 msgid "Attach_ment"
 msgstr "附件(_M)"
 
-#: ../src/mail/em-composer-utils.c:4124
+#: ../src/mail/em-composer-utils.c:4111
 msgid "Inline (_Outlook style)"
 msgstr "行內 (_Outlook 風格)"
 
-#: ../src/mail/em-composer-utils.c:4128
+#: ../src/mail/em-composer-utils.c:4115
 msgid "_Quote"
 msgstr "引文(_Q)"
 
-#: ../src/mail/em-composer-utils.c:4132
+#: ../src/mail/em-composer-utils.c:4119
 msgid "Do _Not Quote"
 msgstr "不使用引文(_N)"
 
-#: ../src/mail/em-composer-utils.c:4139
+#: ../src/mail/em-composer-utils.c:4126
 msgid "_Format message in HTML"
 msgstr "將郵件格式化為 HTML (_F)"
 
-#: ../src/mail/em-composer-utils.c:4149
+#: ../src/mail/em-composer-utils.c:4139
 msgid "Apply t_emplate"
 msgstr "套用範本(_E)"
 
-#: ../src/mail/em-composer-utils.c:4161
+#: ../src/mail/em-composer-utils.c:4151
 msgid "Preserve original message S_ubject"
 msgstr "保留原始郵件主旨(_U)"
 
-#: ../src/mail/em-composer-utils.c:4227
+#: ../src/mail/em-composer-utils.c:4217
 #, c-format
 msgid "one recipient"
 msgid_plural "%d recipients"
 msgstr[0] "%d 位收件者"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4636
+#: ../src/mail/em-composer-utils.c:4658
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-#: ../src/mail/em-composer-utils.c:4641
+#: ../src/mail/em-composer-utils.c:4663
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
@@ -18049,7 +18362,7 @@ msgid "If any of the following conditions are met"
 msgstr "如果滿足以下任何條件"
 
 #. and now for the action area
-#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1067
+#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1006
 msgid "Then"
 msgstr "接著依"
 
@@ -18057,25 +18370,25 @@ msgstr "接著依"
 msgid "De_scribe Filters…"
 msgstr "描述篩選器(_S)…"
 
-#: ../src/mail/em-filter-editor-folder-element.c:154
+#: ../src/mail/em-filter-editor-folder-element.c:151
 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:940
+#: ../src/mail/em-filter-rule.c:879
 msgctxt "mail-filter-rule"
 msgid "Any"
 msgstr "任何"
 
-#: ../src/mail/em-filter-rule.c:1037
+#: ../src/mail/em-filter-rule.c:976
 msgid "Rul_e type:"
 msgstr "規則類型(_E):"
 
-#: ../src/mail/em-filter-rule.c:1055
+#: ../src/mail/em-filter-rule.c:994
 msgid "_For Account:"
 msgstr "用於帳號(_F):"
 
-#: ../src/mail/em-filter-rule.c:1140
+#: ../src/mail/em-filter-rule.c:1079
 msgid "Add Ac_tion"
 msgstr "加入動作(_T)"
 
@@ -18091,116 +18404,120 @@ msgstr "使用自訂圖示(_U)"
 msgid "Use te_xt color"
 msgstr "使用文字色彩(_X)"
 
-#: ../src/mail/em-folder-properties.c:494
+#: ../src/mail/em-folder-properties.c:517
+msgid "Path:"
+msgstr "路徑:"
+
+#: ../src/mail/em-folder-properties.c:526
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "未讀郵件:"
 
-#: ../src/mail/em-folder-properties.c:505
+#: ../src/mail/em-folder-properties.c:537
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "所有郵件:"
 
-#: ../src/mail/em-folder-properties.c:526
+#: ../src/mail/em-folder-properties.c:558
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "配額使用量 (%s):"
 
-#: ../src/mail/em-folder-properties.c:528
+#: ../src/mail/em-folder-properties.c:560
 #, c-format
 msgid "Quota usage"
 msgstr "限制用量"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:701
 msgid "_Send Account Override:"
 msgstr "傳送帳號覆蓋(_S):"
 
-#: ../src/mail/em-folder-properties.c:912
+#: ../src/mail/em-folder-properties.c:941
 msgid "Archive this folder using these settings:"
 msgstr "使用這些設定值封存這個資料夾:"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:924
+#: ../src/mail/em-folder-properties.c:953
 msgctxt "autoarchive"
 msgid "Auto-_cleanup messages older than"
 msgstr "自動清理早於這段時間的郵件(_C)"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:937
+#: ../src/mail/em-folder-properties.c:966
 msgctxt "autoarchive"
 msgid "days"
 msgstr "天"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:939
+#: ../src/mail/em-folder-properties.c:968
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "週"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:941
+#: ../src/mail/em-folder-properties.c:970
 msgctxt "autoarchive"
 msgid "months"
 msgstr "個月"
 
-#: ../src/mail/em-folder-properties.c:947
+#: ../src/mail/em-folder-properties.c:976
 msgid "Move messages to the default archive _folder"
 msgstr "將郵件移至預設的封存資料夾(_F)"
 
-#: ../src/mail/em-folder-properties.c:954
+#: ../src/mail/em-folder-properties.c:983
 msgid "_Move messages to:"
 msgstr "移動郵件到(_M):"
 
-#: ../src/mail/em-folder-properties.c:958
+#: ../src/mail/em-folder-properties.c:987
 msgid "Archive folder"
 msgstr "封存資料夾"
 
-#: ../src/mail/em-folder-properties.c:958
+#: ../src/mail/em-folder-properties.c:987
 msgid "Select folder to use for Archive"
 msgstr "選擇用於封存的資料夾"
 
-#: ../src/mail/em-folder-properties.c:962
+#: ../src/mail/em-folder-properties.c:991
 msgid "_Delete messages"
 msgstr "刪除郵件(_D)"
 
-#: ../src/mail/em-folder-properties.c:1317
+#: ../src/mail/em-folder-properties.c:1346
 msgid "Server Tag"
 msgstr "伺服器標籤"
 
-#: ../src/mail/em-folder-properties.c:1321 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1350 ../src/mail/filtertypes.xml.in.h:29
 #: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "標籤"
 
-#: ../src/mail/em-folder-properties.c:1370
+#: ../src/mail/em-folder-properties.c:1399
 msgid "Appearance"
 msgstr "外觀"
 
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1374
+#: ../src/mail/em-folder-properties.c:1403
 msgid "Archive"
 msgstr "封存"
 
-#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:123
+#: ../src/mail/em-folder-properties.c:1406 ../src/mail/mail-config.ui.h:126
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "標籤"
 
-#: ../src/mail/em-folder-properties.c:1455
+#: ../src/mail/em-folder-properties.c:1484
 msgid "Folder Properties"
 msgstr "資料夾內容"
 
-#: ../src/mail/em-folder-properties.c:1694
+#: ../src/mail/em-folder-properties.c:1723
 msgid "Gathering folder properties"
 msgstr "收集資料夾屬性"
 
-#: ../src/mail/em-folder-selection-button.c:77
+#: ../src/mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<按這裡選擇資料夾>"
 
-#: ../src/mail/em-folder-selector.c:399
+#: ../src/mail/em-folder-selector.c:422
 msgid "Create a new folder"
 msgstr "建立新資料夾"
 
@@ -18226,37 +18543,37 @@ msgstr "資料夾名稱不能包含斜線「/」。"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:879
+#: ../src/mail/em-folder-tree.c:887
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1741
+#: ../src/mail/em-folder-tree.c:1822
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
 
-#: ../src/mail/em-folder-tree.c:2290
+#: ../src/mail/em-folder-tree.c:2371
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移動資料夾 %s"
 
-#: ../src/mail/em-folder-tree.c:2293
+#: ../src/mail/em-folder-tree.c:2374
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2632
+#: ../src/mail/em-folder-tree.c:2381 ../src/mail/message-list.c:2632
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2634
+#: ../src/mail/em-folder-tree.c:2385 ../src/mail/message-list.c:2634
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
 
-#: ../src/mail/em-folder-tree.c:2323
+#: ../src/mail/em-folder-tree.c:2404
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
@@ -18267,6 +18584,17 @@ msgstr "無法將郵件拖放到最上層的儲存區"
 msgid "UNMATCHED"
 msgstr "不符合"
 
+#: ../src/mail/em-folder-tree-model.c:1534
+#: ../src/mail/importers/kmail-libs.c:149
+#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+msgid "Trash"
+msgstr "垃圾桶"
+
+#: ../src/mail/em-folder-tree-model.c:1535 ../src/mail/filtertypes.xml.in.h:41
+#: ../src/mail/mail-config.ui.h:142 ../src/mail/vfoldertypes.xml.in.h:44
+msgid "Junk"
+msgstr "垃圾郵件"
+
 #: ../src/mail/em-folder-utils.c:111
 #, c-format
 msgid "Moving folder “%s”"
@@ -18308,8 +18636,8 @@ msgid "Subscribe To _All"
 msgstr "全部訂閱(_A)"
 
 #: ../src/mail/em-subscription-editor.c:936
-#: ../src/mail/em-subscription-editor.c:1890 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
+#: ../src/mail/em-subscription-editor.c:1883 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1700
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
@@ -18322,75 +18650,75 @@ msgid "Unsubscribe From _All"
 msgstr "全部取消訂閱(_A)"
 
 #: ../src/mail/em-subscription-editor.c:1315
-#: ../src/modules/mail/e-mail-shell-view-private.c:916
-#: ../src/modules/mail/e-mail-shell-view-private.c:948
-#: ../src/modules/mail/e-mail-shell-view-private.c:992
+#: ../src/modules/mail/e-mail-shell-view-private.c:925
+#: ../src/modules/mail/e-mail-shell-view-private.c:957
+#: ../src/modules/mail/e-mail-shell-view-private.c:1001
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d 封未讀,"
 
 #: ../src/mail/em-subscription-editor.c:1319
-#: ../src/modules/mail/e-mail-shell-view-private.c:1002
+#: ../src/modules/mail/e-mail-shell-view-private.c:1011
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "共 %d 封"
 
-#: ../src/mail/em-subscription-editor.c:1731
+#: ../src/mail/em-subscription-editor.c:1724
 msgid "Folder Subscriptions"
 msgstr "資料夾訂閱"
 
-#: ../src/mail/em-subscription-editor.c:1766
+#: ../src/mail/em-subscription-editor.c:1759
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../src/mail/em-subscription-editor.c:1779
+#: ../src/mail/em-subscription-editor.c:1772
 msgid "Clear Search"
 msgstr "清除搜尋"
 
-#: ../src/mail/em-subscription-editor.c:1796
+#: ../src/mail/em-subscription-editor.c:1789
 msgid "Sho_w items that contain:"
 msgstr "顯示項目包含(_W):"
 
-#: ../src/mail/em-subscription-editor.c:1843
+#: ../src/mail/em-subscription-editor.c:1836
 msgid "Subscribe to the selected folder"
 msgstr "訂閱選取的資料夾"
 
-#: ../src/mail/em-subscription-editor.c:1844
+#: ../src/mail/em-subscription-editor.c:1837
 msgid "Su_bscribe"
 msgstr "訂閱(_B)"
 
-#: ../src/mail/em-subscription-editor.c:1889
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
+#: ../src/mail/em-subscription-editor.c:1882
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
 msgid "Unsubscribe from the selected folder"
 msgstr "取消訂閱選取的資料夾"
 
-#: ../src/mail/em-subscription-editor.c:1929
+#: ../src/mail/em-subscription-editor.c:1922
 msgid "Collapse all folders"
 msgstr "收摺所有的資料夾"
 
-#: ../src/mail/em-subscription-editor.c:1930
+#: ../src/mail/em-subscription-editor.c:1923
 msgid "C_ollapse All"
 msgstr "全部收摺(_O)"
 
-#: ../src/mail/em-subscription-editor.c:1940
+#: ../src/mail/em-subscription-editor.c:1933
 msgid "Expand all folders"
 msgstr "展開所有的資料夾"
 
-#: ../src/mail/em-subscription-editor.c:1941
+#: ../src/mail/em-subscription-editor.c:1934
 msgid "E_xpand All"
 msgstr "全部展開(_X)"
 
-#: ../src/mail/em-subscription-editor.c:1951
+#: ../src/mail/em-subscription-editor.c:1944
 msgid "Refresh the folder list"
 msgstr "重新整理資料夾列表"
 
-#: ../src/mail/em-subscription-editor.c:1963
+#: ../src/mail/em-subscription-editor.c:1956
 msgid "Stop the current operation"
 msgstr "停止目前的操作"
 
-#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1957
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "停止(_S)"
@@ -18409,24 +18737,24 @@ msgstr[0] "您確定要一次開啟 %d 封郵件?"
 msgid "Message Filters"
 msgstr "郵件規則"
 
-#: ../src/mail/em-utils.c:1014
+#: ../src/mail/em-utils.c:1022
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
 
 #. 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:1575
+#: ../src/mail/em-utils.c:1583
 msgctxt "reply-attribution"
 msgid "Re"
 msgstr "Re"
 
 #. 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:1578
+#: ../src/mail/em-utils.c:1586
 msgctxt "reply-attribution"
 msgid ":"
 msgstr ":"
 
-#: ../src/mail/em-utils.c:1878
+#: ../src/mail/em-utils.c:1886
 msgid "Deleting old messages"
 msgstr "刪除舊的郵件"
 
@@ -18434,35 +18762,35 @@ msgstr "刪除舊的郵件"
 msgid "Search _Folders"
 msgstr "搜尋資料夾(_F)"
 
-#: ../src/mail/em-vfolder-editor-rule.c:404
+#: ../src/mail/em-vfolder-editor-rule.c:401
 msgid "Add Folder"
 msgstr "加入資料夾"
 
-#: ../src/mail/em-vfolder-editor-rule.c:533
+#: ../src/mail/em-vfolder-editor-rule.c:530
 msgid "Search Folder Sources"
 msgstr "搜尋資料夾來源"
 
-#: ../src/mail/em-vfolder-editor-rule.c:565
+#: ../src/mail/em-vfolder-editor-rule.c:562
 msgid "Automatically update on any _source folder change"
 msgstr "來源資料夾中有任何變更時自動更新(_S)"
 
-#: ../src/mail/em-vfolder-editor-rule.c:577
+#: ../src/mail/em-vfolder-editor-rule.c:574
 msgid "All local folders"
 msgstr "所有本地端資料夾"
 
-#: ../src/mail/em-vfolder-editor-rule.c:578
+#: ../src/mail/em-vfolder-editor-rule.c:575
 msgid "All active remote folders"
 msgstr "所有可用的遠端資料夾"
 
-#: ../src/mail/em-vfolder-editor-rule.c:579
+#: ../src/mail/em-vfolder-editor-rule.c:576
 msgid "All local and active remote folders"
 msgstr "所有本地端及可用的遠端資料夾"
 
-#: ../src/mail/em-vfolder-editor-rule.c:580
+#: ../src/mail/em-vfolder-editor-rule.c:577
 msgid "Specific folders"
 msgstr "指定的資料夾"
 
-#: ../src/mail/em-vfolder-editor-rule.c:618
+#: ../src/mail/em-vfolder-editor-rule.c:615
 msgid "include subfolders"
 msgstr "包括子目錄"
 
@@ -18551,11 +18879,6 @@ msgstr "不存在"
 msgid "Message Body"
 msgstr "郵件內容"
 
-#: ../src/mail/filtertypes.xml.in.h:23 ../src/mail/searchtypes.xml.in.h:25
-#: ../src/mail/vfoldertypes.xml.in.h:25
-msgid "Expression"
-msgstr "詞句"
-
 #: ../src/mail/filtertypes.xml.in.h:24 ../src/mail/searchtypes.xml.in.h:26
 #: ../src/mail/vfoldertypes.xml.in.h:26
 msgid "Free Form Expression"
@@ -18617,11 +18940,6 @@ msgstr "重要"
 msgid "Read"
 msgstr "已讀"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:139
-#: ../src/mail/vfoldertypes.xml.in.h:44
-msgid "Junk"
-msgstr "垃圾郵件"
-
 #: ../src/mail/filtertypes.xml.in.h:42 ../src/mail/searchtypes.xml.in.h:44
 #: ../src/mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
@@ -18773,20 +19091,20 @@ msgid "Import mail from Elm."
 msgstr "從 Elm 匯入郵件。"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:135
-#: ../src/mail/importers/kmail-importer.c:208
+#: ../src/mail/importers/kmail-importer.c:206
 #: ../src/plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "目的端資料夾(_D):"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:141
-#: ../src/mail/importers/kmail-importer.c:214
+#: ../src/mail/importers/kmail-importer.c:212
 #: ../src/plugins/dbx-import/dbx-importer.c:248
 #: ../src/plugins/pst-import/pst-importer.c:537
 msgid "Select folder"
 msgstr "選擇資料夾"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:142
-#: ../src/mail/importers/kmail-importer.c:215
+#: ../src/mail/importers/kmail-importer.c:213
 #: ../src/plugins/dbx-import/dbx-importer.c:249
 #: ../src/plugins/pst-import/pst-importer.c:538
 msgid "Select folder to import into"
@@ -18813,25 +19131,20 @@ msgstr "Berkeley 郵件信箱 (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "匯入 Berkeley 郵件信箱格式資料夾"
 
-#: ../src/mail/importers/kmail-importer.c:261
+#: ../src/mail/importers/kmail-importer.c:259
 #, c-format
 msgid "%d Address"
 msgid_plural "%d Addresses"
 msgstr[0] "%d 個地址"
 
-#: ../src/mail/importers/kmail-importer.c:352
+#: ../src/mail/importers/kmail-importer.c:350
 msgid "Evolution KMail importer"
 msgstr "Evolution KMail匯入程式"
 
-#: ../src/mail/importers/kmail-importer.c:353
+#: ../src/mail/importers/kmail-importer.c:351
 msgid "Import mail and contacts from KMail."
 msgstr "從 KMail 匯入郵件與連絡人。"
 
-#: ../src/mail/importers/kmail-libs.c:149
-#: ../src/modules/mail/e-mail-shell-view-private.c:1023
-msgid "Trash"
-msgstr "垃圾桶"
-
 #: ../src/mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr "正在匯入信箱"
@@ -19102,7 +19415,7 @@ 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:73 ../src/modules/mail/em-composer-prefs.c:876
+#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:873
 msgid "Account"
 msgstr "帳號"
 
@@ -19173,184 +19486,193 @@ msgid "Fix_ed Width Font:"
 msgstr "固定寬度字型(_E):"
 
 #: ../src/mail/mail-config.ui.h:94
+msgid "Minimum Font _Size:"
+msgstr "最小字型大小(_S)︰"
+
+#. Translators: This is part of 'Minimum Font Size: [ spin button ] (in pixels)'
+#: ../src/mail/mail-config.ui.h:96
+msgid "(in pixels)"
+msgstr "(以像素計)"
+
+#: ../src/mail/mail-config.ui.h:97
 msgid "_Mark messages as read after"
 msgstr "將郵件標示成已經閱讀於(_M)"
 
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:99
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
-#: ../src/mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:100
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Pick a color"
 msgstr "挑選顏色"
 
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:101
 msgid "color"
 msgstr "色彩"
 
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:102
 msgid "Default character e_ncoding:"
 msgstr "預設字元編碼(_N):"
 
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:103
 msgid "Apply the same _view settings to all folders"
 msgstr "在所有資料夾套用相同的檢視設定值(_V)"
 
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:104
 msgid "F_all back to threading messages by subject"
 msgstr "退回到依主旨的相關郵件(_A)"
 
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:105
 msgid "Delete Mail"
 msgstr "刪除郵件"
 
-#: ../src/mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:106
 msgid "Empty _trash folders"
 msgstr "清空垃圾桶資料夾(_T)"
 
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:107
 msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_W)"
 
-#: ../src/mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:108
 msgid "Confirm when emptying a _Junk folder"
 msgstr "清空垃圾郵件資料夾時確認(_J)"
 
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:109
 msgid "Go to the previ_ous message after message deletion"
 msgstr "刪除郵件後移至上一封郵件(_O)"
 
-#: ../src/mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:110
 msgid "Archive Mail"
 msgstr "封存郵件"
 
-#: ../src/mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:111
 msgid "Archive folder to use for On This Computer messages"
 msgstr "用於「這臺電腦上的郵件」的封存資料夾"
 
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:112
 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:111
+#: ../src/mail/mail-config.ui.h:114
 msgid "_Show animated images"
 msgstr "播放動畫影像(_S)"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:115
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "當傳送 HTML 郵件給不想收到這類郵件的連絡人時顯示提示(_P)"
 
-#: ../src/mail/mail-config.ui.h:113
+#: ../src/mail/mail-config.ui.h:116
 msgid "Loading Remote Content"
 msgstr "載入遠端內容"
 
-#: ../src/mail/mail-config.ui.h:114
+#: ../src/mail/mail-config.ui.h:117
 msgid "_Never load remote content from the Internet"
 msgstr "永不從網際網路載入遠端內容(_N)"
 
-#: ../src/mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:118
 msgid "_Load remote content only in messages from contacts"
 msgstr "只載入由連絡人寄出郵件中的遠端內容(_L)"
 
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:119
 msgid "_Always load remote content from the Internet"
 msgstr "永遠從網際網路載入遠端內容(_A)"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:120
 msgid "Notify about _missing remote content in the message preview"
 msgstr "通知在郵件預覽中遺失的遠端內容(_M)"
 
-#: ../src/mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:121
 msgid "Add"
 msgstr "加入"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:122
 msgid "Remove"
 msgstr "移除"
 
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:123
 msgid "Allow for sites:"
 msgstr "允許網站:"
 
-#: ../src/mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:124
 msgid "Allow for senders:"
 msgstr "允許寄件者:"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:125
 msgid "HTML Messages"
 msgstr "HTML 郵件"
 
-#: ../src/mail/mail-config.ui.h:124
+#: ../src/mail/mail-config.ui.h:127
 msgid "Sender Photograph"
 msgstr "寄件者相片"
 
-#: ../src/mail/mail-config.ui.h:125
+#: ../src/mail/mail-config.ui.h:128
 msgid "_Show the photograph of sender in the message preview"
 msgstr "在郵件預覽顯示寄件者相片(_S)"
 
-#: ../src/mail/mail-config.ui.h:126
-msgid "Search gra_vatar.com for the photograph of sender"
-msgstr "搜尋寄件者在 gra_vatar.com 上的相片"
+#: ../src/mail/mail-config.ui.h:129
+msgid "Search libra_vatar.org for the photograph of sender"
+msgstr "搜尋寄件者在 libra_vatar.org 上的相片"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:130
 msgid "Displayed Message Headers"
 msgstr "顯示的郵件檔頭"
 
-#: ../src/mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:131
 msgid "Show _full mail addresses in message preview"
 msgstr "在郵件預覽中顯示完整郵件位址(_F)"
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:132
 msgid "Mail Headers Table"
 msgstr "郵件檔頭表"
 
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:133
 msgid "Re_set"
 msgstr "重置(_S)"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:134
 #: ../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:133
+#: ../src/mail/mail-config.ui.h:136
 msgid "Check incoming _messages for junk"
 msgstr "檢查內送郵件是否為垃圾郵件(_M)"
 
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:137
 msgid "_Delete junk messages"
 msgstr "刪除垃圾郵件(_D)"
 
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:138
 msgid "Junk Test Options"
 msgstr "垃圾郵件測試選項"
 
-#: ../src/mail/mail-config.ui.h:136
+#: ../src/mail/mail-config.ui.h:139
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "若寄件者在我的通訊錄中就不要將郵件標記為垃圾郵件(_K)"
 
-#: ../src/mail/mail-config.ui.h:137
+#: ../src/mail/mail-config.ui.h:140
 msgid "_Lookup in local address book only"
 msgstr "只在本地通訊錄查詢(_L)"
 
-#: ../src/mail/mail-config.ui.h:138
+#: ../src/mail/mail-config.ui.h:141
 msgid "Check cu_stom headers for junk"
 msgstr "以自訂標頭檢查垃圾郵件(_S)"
 
-#: ../src/mail/mail-config.ui.h:140
+#: ../src/mail/mail-config.ui.h:143
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:303
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:246
 msgid "No encryption"
 msgstr "沒有加密"
 
-#: ../src/mail/mail-config.ui.h:141
+#: ../src/mail/mail-config.ui.h:144
 msgid "TLS encryption"
 msgstr "TLS 加密"
 
-#: ../src/mail/mail-config.ui.h:142
+#: ../src/mail/mail-config.ui.h:145
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
@@ -19610,7 +19932,7 @@ msgid ""
 msgstr "要永久移除所有資料夾中所有刪除的郵件?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Empty Trash"
 msgstr "清理垃圾桶(_E)"
 
@@ -20364,54 +20686,54 @@ msgstr "編輯搜尋資料夾"
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
-#: ../src/mail/message-list.c:312
+#: ../src/mail/message-list.c:316
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../src/mail/message-list.c:313
+#: ../src/mail/message-list.c:317
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../src/mail/message-list.c:314
+#: ../src/mail/message-list.c:318
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../src/mail/message-list.c:315
+#: ../src/mail/message-list.c:319
 msgid "Forwarded"
 msgstr "轉寄"
 
-#: ../src/mail/message-list.c:316
+#: ../src/mail/message-list.c:320
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../src/mail/message-list.c:317
+#: ../src/mail/message-list.c:321
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../src/mail/message-list.c:330
+#: ../src/mail/message-list.c:334
 msgid "Lowest"
 msgstr "最低"
 
-#: ../src/mail/message-list.c:331
+#: ../src/mail/message-list.c:335
 msgid "Lower"
 msgstr "低"
 
-#: ../src/mail/message-list.c:335
+#: ../src/mail/message-list.c:339
 msgid "Higher"
 msgstr "高"
 
-#: ../src/mail/message-list.c:336
+#: ../src/mail/message-list.c:340
 msgid "Highest"
 msgstr "最高"
 
-#: ../src/mail/message-list.c:485
+#: ../src/mail/message-list.c:489
 msgid "Generating message list"
 msgstr "產生郵件列表"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
 #: ../src/mail/message-list.c:2154
-#: ../src/modules/itip-formatter/itip-view.c:270
+#: ../src/modules/itip-formatter/itip-view.c:274
 msgid "Today %l:%M %p"
 msgstr "今天 %p %l:%M"
 
@@ -20431,20 +20753,24 @@ msgstr "%m月%d日 %p %l:%M"
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../src/mail/message-list.c:3311
+#: ../src/mail/message-list.c:3364
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../src/mail/message-list.c:4076 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4168 ../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:5645
+#: ../src/mail/message-list.c:5749
 msgid "Follow-up"
 msgstr "跟隨"
 
-#: ../src/mail/message-list.c:6708
+#: ../src/mail/message-list.c:6498 ../src/mail/message-list.c:6935
+msgid "Generating message list…"
+msgstr "產生郵件列表…"
+
+#: ../src/mail/message-list.c:6501
 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 "
@@ -20454,14 +20780,10 @@ msgstr ""
 "沒有郵件滿足您的搜尋條件。請從上列下拉式選單選擇顯示郵件過濾器或執行新的搜"
 "尋,可從 搜尋→清除 選單項目清除它或改變上面的查詢。"
 
-#: ../src/mail/message-list.c:6716
+#: ../src/mail/message-list.c:6508
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
-#: ../src/mail/message-list.c:6792
-msgid "Generating message list…"
-msgstr "產生郵件列表…"
-
 #: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "有標幟的"
@@ -20512,32 +20834,32 @@ msgid "Subject or Addresses contains"
 msgstr "主旨或電子郵件位址包含"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2111
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
 msgid "Recipients contain"
 msgstr "收件者包含"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2104
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Message contains"
 msgstr "郵件包含"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2125
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
 msgid "Subject contains"
 msgstr "主旨包含"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2118
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
 msgid "Sender contains"
 msgstr "寄件者包含"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2090
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Body contains"
 msgstr "內文包含"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2097
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Free form expression"
 msgstr "自由形式表示式"
 
@@ -20592,15 +20914,15 @@ msgstr "工作列表"
 
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:80
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:229
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:174
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:192
 msgid "_Back"
 msgstr "返回(_B)"
 
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:195
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:213
 msgid "_Browse"
 msgstr "瀏覽(_B)"
 
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:197
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:215
 msgid ""
 "Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete "
 "address books, calendars, memo lists or task lists there"
@@ -20610,7 +20932,7 @@ 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:124
-#: ../src/modules/mail/em-mailer-prefs.c:1696
+#: ../src/modules/mail/em-mailer-prefs.c:1697
 msgid "_Table column:"
 msgstr "表格欄(_T):"
 
@@ -20746,7 +21068,7 @@ msgid "Show properties of the selected address book"
 msgstr "顯示選取通訊錄的屬性"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:626
 #: ../src/modules/calendar/e-task-shell-view-actions.c:752
 msgid "Re_fresh"
@@ -20769,10 +21091,10 @@ msgid "Show map with all contacts from selected address book"
 msgstr "顯示已選取通訊錄中所有連絡人的地圖"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:640
 #: ../src/modules/calendar/e-task-shell-view-actions.c:766
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1679
 msgid "_Rename…"
 msgstr "重新命名(_R)…"
 
@@ -20845,7 +21167,7 @@ msgid "Send a message to the selected contacts"
 msgstr "傳送郵件至選取的連絡人"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1580
 #: ../src/modules/calendar/e-task-shell-view-actions.c:831
 msgid "_Actions"
 msgstr "動作(_A)"
@@ -20853,12 +21175,12 @@ msgstr "動作(_A)"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:684
 #: ../src/modules/calendar/e-task-shell-view-actions.c:838
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
 msgid "_Preview"
 msgstr "預覽(_P)"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:701
 #: ../src/modules/calendar/e-task-shell-view-actions.c:855
 msgid "_Manage groups…"
@@ -20887,7 +21209,7 @@ msgstr "在連絡人預覽視窗顯示地圖"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:766
 #: ../src/modules/calendar/e-task-shell-view-actions.c:932
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1986
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
 
@@ -20898,7 +21220,7 @@ msgstr "在連絡人列表下方顯示連絡人預覽"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:773
 #: ../src/modules/calendar/e-task-shell-view-actions.c:939
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1999
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1993
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
@@ -20907,17 +21229,17 @@ msgid "Show contact preview alongside the contact list"
 msgstr "在連絡人列表旁邊顯示連絡人預覽"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1773
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:790
-#: ../src/modules/calendar/e-task-shell-view-actions.c:998
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1012
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1783
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:800
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1008
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2083
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2077
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "進階搜尋"
@@ -20972,7 +21294,7 @@ msgstr "傳送郵件給列表(_S)"
 msgid "_Send Message to Contact"
 msgstr "傳送郵件給連絡人(_S)"
 
-#: ../src/modules/alarm-notify/alarm-notify.c:171
+#: ../src/modules/alarm-notify/alarm-notify.c:163
 #, c-format
 msgid "Failed to launch command “%s”:"
 msgstr "無法執行指令“%s”:"
@@ -21039,104 +21361,104 @@ msgstr "還原 Evolution 資料(_E)…"
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "從檔案庫還原 Evolution 的資料與設定值"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:73
+#: ../src/modules/backup-restore/evolution-backup-tool.c:72
 msgid "Back up Evolution directory"
 msgstr "備份 Evolution 資料夾"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:75
+#: ../src/modules/backup-restore/evolution-backup-tool.c:74
 msgid "Restore Evolution directory"
 msgstr "還原 Evolution 目錄"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:77
+#: ../src/modules/backup-restore/evolution-backup-tool.c:76
 msgid "Check Evolution Back up"
 msgstr "檢查 Evolution 備份"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:79
+#: ../src/modules/backup-restore/evolution-backup-tool.c:78
 msgid "Restart Evolution"
 msgstr "重新啟動 Evolution"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:81
+#: ../src/modules/backup-restore/evolution-backup-tool.c:80
 msgid "With Graphical User Interface"
 msgstr "使用圖形使用者介面"
 
 #. FIXME Will the versioned setting always work?
-#: ../src/modules/backup-restore/evolution-backup-tool.c:294
-#: ../src/modules/backup-restore/evolution-backup-tool.c:498
+#: ../src/modules/backup-restore/evolution-backup-tool.c:293
+#: ../src/modules/backup-restore/evolution-backup-tool.c:551
 msgid "Shutting down Evolution"
 msgstr "正在關閉 Evolution"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:303
+#: ../src/modules/backup-restore/evolution-backup-tool.c:302
 msgid "Backing Evolution accounts and settings"
 msgstr "備份 Evolution 的帳號與設定值"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:320
+#: ../src/modules/backup-restore/evolution-backup-tool.c:319
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "正在備份 Evolution 資料 (郵件、連絡人、行事曆、工作、備忘錄)"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:336
+#: ../src/modules/backup-restore/evolution-backup-tool.c:335
 msgid "Back up complete"
 msgstr "備份完成"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:343
-#: ../src/modules/backup-restore/evolution-backup-tool.c:705
+#: ../src/modules/backup-restore/evolution-backup-tool.c:342
+#: ../src/modules/backup-restore/evolution-backup-tool.c:758
 msgid "Restarting Evolution"
 msgstr "重新啟動 Evolution"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:504
+#: ../src/modules/backup-restore/evolution-backup-tool.c:557
 msgid "Back up current Evolution data"
 msgstr "備份目前的 Evolution 資料"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:511
+#: ../src/modules/backup-restore/evolution-backup-tool.c:564
 msgid "Extracting files from back up"
 msgstr "從備份解開檔案"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:606
+#: ../src/modules/backup-restore/evolution-backup-tool.c:659
 msgid "Loading Evolution settings"
 msgstr "正在讀取 Evolution 的設定值"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:676
+#: ../src/modules/backup-restore/evolution-backup-tool.c:729
 msgid "Removing temporary back up files"
 msgstr "移除暫存的備份檔案"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:690
+#: ../src/modules/backup-restore/evolution-backup-tool.c:743
 msgid "Reloading registry service"
 msgstr "重新載入註冊表服務"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:903
+#: ../src/modules/backup-restore/evolution-backup-tool.c:956
 msgid "Evolution Back Up"
 msgstr "Evolution 備份"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:904
+#: ../src/modules/backup-restore/evolution-backup-tool.c:957
 #, c-format
 msgid "Backing up to the file %s"
 msgstr "正備份至檔案 %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:908
+#: ../src/modules/backup-restore/evolution-backup-tool.c:961
 msgid "Evolution Restore"
 msgstr "Evolution 還原"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:909
+#: ../src/modules/backup-restore/evolution-backup-tool.c:962
 #, c-format
 msgid "Restoring from the file %s"
 msgstr "從檔案還原 %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:978
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1031
 msgid "Backing up Evolution Data"
 msgstr "備份 Evolution 資料"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:979
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1032
 msgid "Please wait while Evolution is backing up your data."
 msgstr "在 Evolution 備份您的資料時請稍候。"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:981
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1034
 msgid "Restoring Evolution Data"
 msgstr "還原 Evolution 資料"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:982
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1035
 msgid "Please wait while Evolution is restoring your data."
 msgstr "在 Evolution 還原您的資料時請稍候。"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:1004
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1057
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "這個動作所花的時間取決於您的帳號中資料的多寡。"
 
@@ -21226,156 +21548,161 @@ msgstr "使用 Bogofilter 垃圾郵件過濾器"
 msgid "Choose an Address Book"
 msgstr "請選擇一個通訊錄"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:264
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:277
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:313
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:334
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:147
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:168
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:268
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:281
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:312
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:333
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:144
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:165
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:301
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:322
+#: ../src/modules/itip-formatter/itip-view.c:1704
+#: ../src/modules/itip-formatter/itip-view.c:1818
 msgid "URL:"
 msgstr "網址:"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:288
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:292
 msgid "Find Address Books"
 msgstr "尋找通訊錄"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:299
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:303
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "避免 IfMatch (需使用 Apache < 2.2.8)"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:352
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:453
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:233
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:356
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:452
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:230
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:400
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "URL 不是有效的 http:// 或 https:// URL"
 
 #: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1069
-#: ../src/modules/cal-config-google/e-cal-config-google.c:190
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1066
+#: ../src/modules/cal-config-google/e-cal-config-google.c:187
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:444
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:479
 msgid "User name cannot be empty"
 msgstr "使用者名稱不能為空"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:418
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:415
 msgid "Looking up server search bases, please wait…"
 msgstr "正在查詣伺服器搜尋基礎,請稍候…"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:494
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:491
 msgid "Standard LDAP Port"
 msgstr "標準 LDAP 連接埠"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:497
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP 透過 SSL/TLS (已廢棄)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:506
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:503
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft 通用類別目錄"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:512
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:509
 msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "透過 SSL/TLS 的 Microsoft 通用類別目錄"
 
 #. Page 1
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:623
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
 msgid "Connecting to LDAP"
 msgstr "正在連線至 LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:640
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:667
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:664
 msgid "Port:"
 msgstr "連接埠:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:675
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:672
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:247
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:202
 msgid "Port number is not valid"
 msgstr "連接埠號無效"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (建議值)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Encryption:"
 msgstr "加密:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:713
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:324
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:267
 msgid "Authentication"
 msgstr "核對"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:745
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:749
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:746
 msgid "Username can be left empty"
 msgstr "使用者名稱可以留空"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:752
 msgid "Using email address"
 msgstr "使用電子郵件地址"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:756
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:753
 msgid "requires anonymous access to your LDAP server"
 msgstr "需要能匿名存取您的 LDAP 伺服器"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:762
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:759
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:760
 msgid "for example: uid=user,dc=example,dc=com"
 msgstr "例如:uid=user,dc=example,dc=com"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Method:"
 msgstr "方法:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:775
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:772
 msgid "This is the method Evolution will use to authenticate you."
 msgstr "這是 Evolution 將要用來核對您身分的方法。"
 
 #. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:784
 msgid "Using LDAP"
 msgstr "使用 LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:804
-#: ../src/modules/mail/e-mail-shell-view.c:118
-#: ../src/modules/mail/e-mail-shell-view.c:200
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:801
+#: ../src/modules/mail/e-mail-shell-view.c:119
+#: ../src/modules/mail/e-mail-shell-view.c:208
 msgid "Searching"
 msgstr "正在搜尋"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:823
 msgid "Search Base:"
 msgstr "搜尋起點:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Find Possible Search Bases"
 msgstr "尋找可能的搜尋起點"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:852
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:849
 msgid "One Level"
 msgstr "一層"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:854
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:851
 msgid "Subtree"
 msgstr "子目錄"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:856
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:853
 msgid "Search Scope:"
 msgstr "搜尋範圍:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:861
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:858
 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 "
@@ -21386,27 +21713,27 @@ msgstr ""
 "圍會包括搜尋起點底下所有的項目。「One Level」(一層) 的搜尋範圍只會包括起點底"
 "下的一個層級。"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:870
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:867
 msgid "Search Filter:"
 msgstr "搜尋過濾器:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:882
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:879
 msgid "Downloading"
 msgstr "下載中"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:903
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:900
 msgid "Limit:"
 msgstr "限制:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:914
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:911
 msgid "contacts"
 msgstr "連絡人"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:919
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:916
 msgid "Browse until limit is reached"
 msgstr "瀏覽直到達到限制"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1054
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1051
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:425
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:461
 msgid "Server address cannot be empty"
@@ -21427,23 +21754,24 @@ msgstr "選擇備忘錄列表"
 msgid "Choose a Task List"
 msgstr "選擇工作列表"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:349
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:348
 msgid "Find Calendars"
 msgstr "尋找行事曆"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:352
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:351
 msgid "Find Memo Lists"
 msgstr "尋找備忘錄列表"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:354
 msgid "Find Task Lists"
 msgstr "尋找工作列表"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:374
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:373
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:260
 msgid "Email:"
 msgstr "電子郵件:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:380
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:379
 msgid "Server handles meeting invitations"
 msgstr "伺服器處理會議邀請"
 
@@ -21451,11 +21779,11 @@ msgstr "伺服器處理會議邀請"
 msgid "Choose which address books to use."
 msgstr "選擇要使用的通訊錄。"
 
-#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:204
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:201
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "用於生日和週年紀念日行事曆"
 
-#: ../src/modules/cal-config-google/e-cal-config-google.c:101
+#: ../src/modules/cal-config-google/e-cal-config-google.c:98
 msgid "Enable Calendars to synchronize"
 msgstr "啟用要同步的行事曆"
 
@@ -21463,23 +21791,23 @@ msgstr "啟用要同步的行事曆"
 msgid "Default User Calendar"
 msgstr "預設使用者行事曆"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:177
 msgid "Use an existing iCalendar (ics) file"
 msgstr "使用現有的 iCalendar (ics) 檔案"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:202
 msgid "iCalendar File"
 msgstr "iCalendar 檔案"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Choose an iCalendar file"
 msgstr "選擇 iCalendar 檔案"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:217
 msgid "File:"
 msgstr "檔案:"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:232
 msgid "Allow Evolution to update the file"
 msgstr "允許 Evolution 更新檔案"
 
@@ -21489,36 +21817,44 @@ msgstr "允許 Evolution 更新檔案"
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:187
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:221
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:290
 msgid "Fahrenheit (°F)"
 msgstr "華氏 (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:264
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:295
 msgid "Centigrade (°C)"
 msgstr "攝氏 (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:299
 msgid "Kelvin (K)"
 msgstr "絕對溫度 (K)"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:301
 msgid "Units:"
 msgstr "單位:"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:322
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:357
 msgid "Location cannot be empty"
 msgstr "位置不能為空"
 
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:106
+msgid "Choose Notes"
+msgstr "選擇筆記"
+
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:336
+msgid "Find Notes"
+msgstr "尋找筆記"
+
 #: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
@@ -21560,45 +21896,45 @@ msgstr "匯入至備忘錄列表(_M)"
 msgid "I_mport to Task List"
 msgstr "匯入至工作列表(_M)"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
 #, c-format
 msgid "Copying an event into the calendar “%s”"
 msgstr "正在複製事件到行事曆「%s」"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:567
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:580
 #, c-format
 msgid "Moving an event into the calendar “%s”"
 msgstr "正在移動事件到行事曆「%s」"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:572
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:585
 #, c-format
 msgid "Copying a memo into the memo list “%s”"
 msgstr "正在複製備忘錄到備忘錄列表「%s」"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:573
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:586
 #, c-format
 msgid "Moving a memo into the memo list “%s”"
 msgstr "正在移動備忘錄到備忘錄列表「%s」"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:578
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:591
 #, c-format
 msgid "Copying a task into the task list “%s”"
 msgstr "正在複製工作到工作列表「%s」"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:592
 #, c-format
 msgid "Moving a task into the task list “%s”"
 msgstr "正在移動工作到工作列表「%s」"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:707
 msgid "Calendar Selector"
 msgstr "行事曆選擇器"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:700
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:713
 msgid "Memo List Selector"
 msgstr "備忘錄列表選擇器"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:718
 msgid "Task List Selector"
 msgstr "工作列表選擇器"
 
@@ -21701,7 +22037,7 @@ msgid "_24 hour"
 msgstr "_24 小時"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1735
 msgid "Work Week"
 msgstr "工作週"
 
@@ -21940,7 +22276,7 @@ msgid "_Appointment"
 msgstr "會議(_A)"
 
 #: ../src/modules/calendar/e-cal-shell-backend.c:120
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "Create a new appointment"
 msgstr "建立一個新的會議"
 
@@ -21968,7 +22304,7 @@ msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
 #: ../src/modules/calendar/e-cal-shell-backend.c:144
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1279
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
@@ -21994,17 +22330,17 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "清除早於這段時間的事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:919
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:968
 msgid "Making an occurrence movable"
 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:1112
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1161
 msgid "event"
 msgstr "事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1114
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1163
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:204
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:278
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:510
@@ -22012,154 +22348,154 @@ msgstr "事件"
 msgid "Save as iCalendar"
 msgstr "儲存為 iCalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:591
 #: ../src/modules/calendar/e-task-shell-view-actions.c:717
 msgid "_Copy…"
 msgstr "複製(_C)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "D_elete Calendar"
 msgstr "刪除行事曆(_E)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1286
 msgid "Delete the selected calendar"
 msgstr "刪除選取的行事曆"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Go Back"
 msgstr "向後"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Forward"
 msgstr "向前"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Select today"
 msgstr "選取今日"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1263
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Select _Date"
 msgstr "選擇日期(_D)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select a specific date"
 msgstr "選取特定日期"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1270
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "_Manage Calendar groups…"
 msgstr "管理行事曆群組(_M)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Manage Calendar groups order and visibility"
 msgstr "管理行事曆列表群組順序與可見性"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
 #: ../src/modules/calendar/e-task-shell-view-actions.c:822
 msgid "Purg_e"
 msgstr "清除(_E)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "刪除舊會議和會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "重新整理選取的行事曆"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
 msgid "Re_fresh list of account calendars"
 msgstr "重新整理帳號的行事曆列表(_F)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Rename the selected calendar"
 msgstr "重新命名選取的行事曆"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Find _Next"
 msgstr "尋找下一筆(_N)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Find next occurrence of the current search string"
 msgstr "尋找目前搜尋字詞下一個出現處"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "Find _Previous"
 msgstr "尋找上一筆(_P)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "Find previous occurrence of the current search string"
 msgstr "尋找目前搜尋字詞上一個出現處"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Stop _Running Search"
 msgstr "停止目前執行的搜尋(_R)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Stop currently running search"
 msgstr "停止目前執行的搜尋"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Sho_w All Calendars"
 msgstr "顯示所有行事曆(_W)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Show _Only This Calendar"
 msgstr "只顯示這個行事曆(_O)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Cop_y to Calendar…"
 msgstr "複製至行事曆(_Y)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
 msgid "_Delegate Meeting…"
 msgstr "委派會議(_D)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "_Delete Appointment"
 msgstr "刪除會議(_D)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Delete selected appointments"
 msgstr "刪除選取的會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Delete This _Occurrence"
 msgstr "刪除這次發生的事件(_O)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "Delete this occurrence"
 msgstr "刪除此週期"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Delete All Occ_urrences"
 msgstr "刪除所有發生的事件(_U)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Delete all occurrences"
 msgstr "刪除全部週期"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Edit as Ne_w…"
 msgstr "編輯為新增(_W)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "Edit the current appointment as new"
 msgstr "將目前的會議編輯為新項目"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "New All Day _Event…"
 msgstr "新增全天事件(_E)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "Create a new all day event"
 msgstr "建立新的全天事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:238
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:318
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:584
@@ -22167,134 +22503,191 @@ msgstr "建立新的全天事件"
 msgid "_Forward as iCalendar…"
 msgstr "以 iCalendar 轉寄(_F)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1412
-msgid "Create a new meeting"
-msgstr "建立新的會議"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
+msgid "Create a new meeting"
+msgstr "建立新的會議"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
+msgid "Send _RSVP"
+msgstr "傳送 _RSVP"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
+msgid "Send a meeting response"
+msgstr "傳送會議回應"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
+msgid "_Accept"
+msgstr "接受(_A)"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1475
+msgid "Accept meeting request"
+msgstr "接受會議要求"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1480
+msgid "A_ccept this instance"
+msgstr "接受這個實體(_C)"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+msgid "Accept meeting request for selected instance only"
+msgstr "只接受已選取實體的會議要求"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../src/modules/itip-formatter/itip-view.c:1255
+msgid "_Decline"
+msgstr "拒絕(_D)"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1489
+msgid "Decline meeting request"
+msgstr "婉拒會議要求"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1494
+msgid "D_ecline this instance"
+msgstr "婉拒這個實例(_E)"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1496
+msgid "Decline meeting request for selected instance only"
+msgstr "只婉拒已選取實體的會議要求"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1501
+msgid "_Tentatively accept"
+msgstr "暫時接受(_T)"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1503
+msgid "Tentatively accept meeting request"
+msgstr "暫時接受會議要求"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1508
+msgid "Te_ntatively accept this instance"
+msgstr "暫時接受這個實體(_N)"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1510
+msgid "Tentatively accept meeting request for selected instance only"
+msgstr "暫時接受已選取實體的會議要求"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1515
 msgid "Mo_ve to Calendar…"
 msgstr "移至行事曆(_V)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1529
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1536
 msgid "_Open Appointment"
 msgstr "開啟會議(_O)"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1538
 msgid "View the current appointment"
 msgstr "檢視目前的會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1557
 msgid "_Schedule Meeting…"
 msgstr "會議排程(_S)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "Converts an appointment to a meeting"
 msgstr "將會議轉換為會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1564
 msgid "Conv_ert to Appointment…"
 msgstr "轉換為會議(_E)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Converts a meeting to an appointment"
 msgstr "將會議轉換為會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1571
 msgid "Quit"
 msgstr "結束"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1707
 msgid "Day"
 msgstr "天"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1709
 msgid "Show one day"
 msgstr "顯示一天"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1616
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1714
 msgid "List"
 msgstr "列表"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Show as list"
 msgstr "顯示成列表"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1623
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1721
 msgid "Month"
 msgstr "月"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
 msgid "Show one month"
 msgstr "顯示一個月"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1728
 msgid "Week"
 msgstr "週"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
 msgid "Show one week"
 msgstr "顯示一週"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1737
 msgid "Show one work week"
 msgstr "顯示一個工作週"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1745
 msgid "Active Appointments"
 msgstr "進行中的會議"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1661
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Next 7 Days’ Appointments"
 msgstr "未來 7 天的約會"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1766
 msgid "Occurs Less Than 5 Times"
 msgstr "發生少於五次"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1797
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:814
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1043
 msgid "Description contains"
 msgstr "描述包含"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1804
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:821
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1050
 msgid "Summary contains"
 msgstr "主旨包含"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1814
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1828
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:269
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:363
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:831
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:845
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1039
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1060
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1074
 msgid "Print…"
 msgstr "列印…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1718
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1816
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1823
 msgid "Preview the calendar to be printed"
 msgstr "預覽將要列印的行事曆"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1845
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:279
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:862
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1070
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1091
 msgid "_Save as iCalendar…"
 msgstr "儲存為 iCalendar(_S)…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1824
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1922
 msgid "Go To"
 msgstr "移至"
 
@@ -22338,27 +22731,27 @@ msgstr "開啟網頁(_W)"
 msgid "Print the selected memo"
 msgstr "列印選取的備忘錄"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1019
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1038
 msgid "Searching next matching event"
 msgstr "搜尋下一個符合的事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1020
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1039
 msgid "Searching previous matching event"
 msgstr "搜尋前一個符合的事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1041
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1060
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "在下 %d 年中找不到符合的事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1045
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1064
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "在前 %d 年中找不到符合的事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1068
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1087
 msgid "Cannot search with no active calendar"
 msgstr "不能搜尋未使用的行事曆"
 
@@ -22417,7 +22810,7 @@ msgid "View the selected task"
 msgstr "檢視選取的工作"
 
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1076
 msgid "Print the selected task"
 msgstr "列印選取的工作"
 
@@ -22540,12 +22933,6 @@ msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 項備忘錄"
 
-#: ../src/modules/calendar/e-memo-shell-view-private.c:365
-#: ../src/modules/calendar/e-task-shell-view-private.c:577
-#, c-format
-msgid "%d selected"
-msgstr "已選擇 %d 個"
-
 #: ../src/modules/calendar/e-task-shell-backend.c:75
 msgctxt "New"
 msgid "_Task"
@@ -22676,44 +23063,66 @@ msgid "Completed Tasks"
 msgstr "已完成的工作 "
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:977
+msgid "Uncompleted Tasks"
+msgstr "未完成的工作"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:984
+msgid "Scheduled Tasks"
+msgstr "已排程的工作"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:986
+msgid "Show scheduled tasks, aka those with a Due date"
+msgstr "顯示已排程的工作,即具有到期日的"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Next 7 Days’ Tasks"
 msgstr "未來 7 天的工作"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:984
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
 msgid "Overdue Tasks"
 msgstr "過期的工作"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:991
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1005
 msgid "Tasks with Attachments"
 msgstr "有附件的工作"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1019
+msgid "Started Tasks"
+msgstr "已開始的工作"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1021
+msgid ""
+"Filters for tasks that either do not have a start date or the start date is "
+"earlier than the time the filter is selected at"
+msgstr "用於沒有開始日期或開始日期早於選取過濾器時刻工作的過濾器"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1062
 msgid "Print the list of tasks"
 msgstr "列印工作列表"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1069
 msgid "Preview the list of tasks to be printed"
 msgstr "預覽將要列印的工作列表"
 
-#: ../src/modules/calendar/e-task-shell-view.c:346
+#: ../src/modules/calendar/e-task-shell-view.c:368
 msgid "Delete Tasks"
 msgstr "刪除工作"
 
-#: ../src/modules/calendar/e-task-shell-view.c:348
+#: ../src/modules/calendar/e-task-shell-view.c:370
 msgid "Delete Task"
 msgstr "刪除工作"
 
-#: ../src/modules/calendar/e-task-shell-view-private.c:573
+#: ../src/modules/calendar/e-task-shell-view-private.c:570
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 項工作"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:380
 msgid "Convert to M_eeting"
 msgstr "轉換為會議(_E)"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:328
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:382
 msgid "Convert the message to a meeting request"
 msgstr "將郵件轉換為會議要求"
 
@@ -22729,53 +23138,54 @@ msgstr "轉換為電子郵件訊息"
 msgid "Look up configuration with e-mail domain"
 msgstr "以電子郵件網域查詢設定"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
 msgid "Looking up IMAP server…"
 msgstr "正在查詢 IMAP 伺服器…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
 msgid "Looking up POP3 server…"
 msgstr "正在查詢 POP3 伺服器…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
 msgid "Looking up SMTP server…"
 msgstr "正在查詢 SMTP 伺服器…"
 
-#: ../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-srv-config-lookup.c:93
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:94
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
 msgid "CalDAV server"
 msgstr "CalDAV 伺服器"
 
-#: ../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-srv-config-lookup.c:93
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:94
 msgid "Looking up CalDAV server…"
 msgstr "正在查詢 CalDAV 伺服器…"
 
-#: ../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-srv-config-lookup.c:95
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:96
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
 msgid "CardDAV server"
 msgstr "CardDAV 伺服器"
 
-#: ../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-srv-config-lookup.c:95
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:96
 msgid "Looking up CardDAV server…"
 msgstr "正在查詢 CardDAV 伺服器…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:97
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:98
 msgid "LDAP server"
 msgstr "LDAP 伺服器"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:97
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:98
 msgid "Looking up LDAP server…"
 msgstr "正在查詢 LDAP 伺服器…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:279
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:285
 msgid "Look up in SRV records"
 msgstr "正在查詢 SRV 紀錄"
 
@@ -22793,506 +23203,517 @@ msgstr "CardDAV:%s"
 msgid "CalDAV and CardDAV server"
 msgstr "CalDAV 與 CardDAV 伺服器"
 
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:162
+msgid "Requires password to continue."
+msgstr "需要密碼才能繼續。"
+
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:213
 msgid "Look up for a CalDAV/CardDAV server"
 msgstr "查詢 CalDAV/CardDAV 伺服器"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:165
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:164
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:166
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:165
 msgid "Display part as an invitation"
 msgstr "將部分顯示為邀請"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:261
+#: ../src/modules/itip-formatter/itip-view.c:265
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:265
+#: ../src/modules/itip-formatter/itip-view.c:269
 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:274
+#: ../src/modules/itip-formatter/itip-view.c:278
 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:289
+#: ../src/modules/itip-formatter/itip-view.c:293
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:293
+#: ../src/modules/itip-formatter/itip-view.c:297
 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:298
+#: ../src/modules/itip-formatter/itip-view.c:302
 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:302
+#: ../src/modules/itip-formatter/itip-view.c:306
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天 %p %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:321
+#: ../src/modules/itip-formatter/itip-view.c:325
 #, 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:326
+#: ../src/modules/itip-formatter/itip-view.c:330
 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:330
+#: ../src/modules/itip-formatter/itip-view.c:334
 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:335
+#: ../src/modules/itip-formatter/itip-view.c:339
 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:339
+#: ../src/modules/itip-formatter/itip-view.c:343
 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:348
+#: ../src/modules/itip-formatter/itip-view.c:354
 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:354
+#: ../src/modules/itip-formatter/itip-view.c:360
 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:358
+#: ../src/modules/itip-formatter/itip-view.c:364
 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:363
+#: ../src/modules/itip-formatter/itip-view.c:369
 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:367
+#: ../src/modules/itip-formatter/itip-view.c:373
 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:373
+#: ../src/modules/itip-formatter/itip-view.c:381
 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:378
+#: ../src/modules/itip-formatter/itip-view.c:386
 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:382
+#: ../src/modules/itip-formatter/itip-view.c:390
 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:387
+#: ../src/modules/itip-formatter/itip-view.c:395
 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:391
+#: ../src/modules/itip-formatter/itip-view.c:399
 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:429
-#: ../src/modules/itip-formatter/itip-view.c:430
-#: ../src/modules/itip-formatter/itip-view.c:519
-#: ../src/modules/itip-formatter/itip-view.c:520
-#: ../src/modules/itip-formatter/itip-view.c:609
+#. Translators: The first '%s' is replaced with an abbreviated date/time of an appointment start or end, 
like "Tomorrow" or "Tomorrow 10:30";
+#. the second '%s' is replaced with the actual date, to know what the 'Tomorrow' means. What the date looks 
like depends on the user settings.
+#. Example: 'Tomorrow 10:30 (20.2.2020)'
+#: ../src/modules/itip-formatter/itip-view.c:426
+#, c-format
+#| msgctxt "SummaryWithLocation"
+#| msgid "%s (%s)"
+msgctxt "cal-itip"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:465
+#: ../src/modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:555
+#: ../src/modules/itip-formatter/itip-view.c:644
 msgid "An unknown person"
 msgstr "不明人士"
 
-#: ../src/modules/itip-formatter/itip-view.c:434
-#: ../src/modules/itip-formatter/itip-view.c:524
-#: ../src/modules/itip-formatter/itip-view.c:613
+#: ../src/modules/itip-formatter/itip-view.c:469
+#: ../src/modules/itip-formatter/itip-view.c:559
+#: ../src/modules/itip-formatter/itip-view.c:648
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "請代表 %s 回覆"
 
-#: ../src/modules/itip-formatter/itip-view.c:436
-#: ../src/modules/itip-formatter/itip-view.c:526
-#: ../src/modules/itip-formatter/itip-view.c:615
+#: ../src/modules/itip-formatter/itip-view.c:471
+#: ../src/modules/itip-formatter/itip-view.c:561
+#: ../src/modules/itip-formatter/itip-view.c:650
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "代表 %s 接收"
 
-#: ../src/modules/itip-formatter/itip-view.c:441
+#: ../src/modules/itip-formatter/itip-view.c:476
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s 透過 %s 已經發布下列會議資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:443
+#: ../src/modules/itip-formatter/itip-view.c:478
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s 已經發布下列會議資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:448
+#: ../src/modules/itip-formatter/itip-view.c:483
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s 已經委派下列會議給您:"
 
-#: ../src/modules/itip-formatter/itip-view.c:451
+#: ../src/modules/itip-formatter/itip-view.c:486
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s 透過 %s 邀請您出席下列會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:453
+#: ../src/modules/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s 邀請您出席下列會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:459
+#: ../src/modules/itip-formatter/itip-view.c:494
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s 透過 %s 希望加入一個既存的會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:461
+#: ../src/modules/itip-formatter/itip-view.c:496
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s 希望加入一個既存的會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:465
+#: ../src/modules/itip-formatter/itip-view.c:500
 #, 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:467
+#: ../src/modules/itip-formatter/itip-view.c:502
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s 希望收到下列會議的最新資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:471
+#: ../src/modules/itip-formatter/itip-view.c:506
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s 透過 %s 傳送了下列會議的回覆:"
 
-#: ../src/modules/itip-formatter/itip-view.c:473
+#: ../src/modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s 傳送了下列會議的回覆:"
 
-#: ../src/modules/itip-formatter/itip-view.c:477
+#: ../src/modules/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s 透過 %s 已經消取下列會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:479
+#: ../src/modules/itip-formatter/itip-view.c:514
 #, c-format
 msgid "%s has cancelled the following meeting:"
 msgstr "%s 已經消取下列會議:"
 
-#: ../src/modules/itip-formatter/itip-view.c:483
+#: ../src/modules/itip-formatter/itip-view.c:518
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s 透過 %s 已經答覆了下列會議變更。"
 
-#: ../src/modules/itip-formatter/itip-view.c:485
+#: ../src/modules/itip-formatter/itip-view.c:520
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s 已經答覆了下列會議變更:"
 
-#: ../src/modules/itip-formatter/itip-view.c:489
+#: ../src/modules/itip-formatter/itip-view.c:524
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s 透過 %s 已經婉拒了下列會議變更:"
 
-#: ../src/modules/itip-formatter/itip-view.c:491
+#: ../src/modules/itip-formatter/itip-view.c:526
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s 已經婉拒了下列會議變更:"
 
-#: ../src/modules/itip-formatter/itip-view.c:531
+#: ../src/modules/itip-formatter/itip-view.c:566
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s 透過 %s 已經發布了下列工作資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:533
+#: ../src/modules/itip-formatter/itip-view.c:568
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s 已經發布了下列工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:538
+#: ../src/modules/itip-formatter/itip-view.c:573
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s 指派 %s 加入下列工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:541
+#: ../src/modules/itip-formatter/itip-view.c:576
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s 透過 %s 已經指派您一項工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:543
+#: ../src/modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s 已經指派您一項工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:549
+#: ../src/modules/itip-formatter/itip-view.c:584
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s 透過 %s 希望加入一項既存的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:551
+#: ../src/modules/itip-formatter/itip-view.c:586
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s 希望加入一項既存的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:555
+#: ../src/modules/itip-formatter/itip-view.c:590
 #, 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:557
+#: ../src/modules/itip-formatter/itip-view.c:592
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s 希望收到下列指派工作的最新資訊:"
 
-#: ../src/modules/itip-formatter/itip-view.c:561
+#: ../src/modules/itip-formatter/itip-view.c:596
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s 透過 %s 傳送了下列指派工作的回覆:"
 
-#: ../src/modules/itip-formatter/itip-view.c:563
+#: ../src/modules/itip-formatter/itip-view.c:598
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s 傳送了下列指派工作的回覆:"
 
-#: ../src/modules/itip-formatter/itip-view.c:567
+#: ../src/modules/itip-formatter/itip-view.c:602
 #, c-format
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s 透過 %s 已經取消下列指派的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:569
+#: ../src/modules/itip-formatter/itip-view.c:604
 #, c-format
 msgid "%s has cancelled the following assigned task:"
 msgstr "%s 已經取消下列指派的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:573
+#: ../src/modules/itip-formatter/itip-view.c:608
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s 透過 %s 已經回覆下列指派工作的變更:"
 
-#: ../src/modules/itip-formatter/itip-view.c:575
+#: ../src/modules/itip-formatter/itip-view.c:610
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s 已經回覆下列指派工作的變更:"
 
-#: ../src/modules/itip-formatter/itip-view.c:579
+#: ../src/modules/itip-formatter/itip-view.c:614
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s 透過 %s 已婉拒了下列指派的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:581
+#: ../src/modules/itip-formatter/itip-view.c:616
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s 已經婉拒下列指派的工作:"
 
-#: ../src/modules/itip-formatter/itip-view.c:620
+#: ../src/modules/itip-formatter/itip-view.c:655
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s 透過 %s 已經發布了下列備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:622
+#: ../src/modules/itip-formatter/itip-view.c:657
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s 已經發布了備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:627
+#: ../src/modules/itip-formatter/itip-view.c:662
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s 透過 %s 希望加入一個既存的備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:629
+#: ../src/modules/itip-formatter/itip-view.c:664
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s 希望加入一個既存的備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:633
+#: ../src/modules/itip-formatter/itip-view.c:668
 #, c-format
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s 透過 %s 已經消取下列共用備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:635
+#: ../src/modules/itip-formatter/itip-view.c:670
 #, c-format
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s 已經取消下列共用備忘錄:"
 
-#: ../src/modules/itip-formatter/itip-view.c:798
+#: ../src/modules/itip-formatter/itip-view.c:858
 msgid "All day:"
 msgstr "整天:"
 
-#: ../src/modules/itip-formatter/itip-view.c:804
+#: ../src/modules/itip-formatter/itip-view.c:864
 msgid "Start day:"
 msgstr "開始日:"
 
-#: ../src/modules/itip-formatter/itip-view.c:804
-#: ../src/modules/itip-formatter/itip-view.c:1636
+#: ../src/modules/itip-formatter/itip-view.c:864
+#: ../src/modules/itip-formatter/itip-view.c:1705
 msgid "Start time:"
 msgstr "開始時間:"
 
-#: ../src/modules/itip-formatter/itip-view.c:813
+#: ../src/modules/itip-formatter/itip-view.c:873
 msgid "End day:"
 msgstr "結束日:"
 
-#: ../src/modules/itip-formatter/itip-view.c:813
-#: ../src/modules/itip-formatter/itip-view.c:1637
+#: ../src/modules/itip-formatter/itip-view.c:873
+#: ../src/modules/itip-formatter/itip-view.c:1706
 msgid "End time:"
 msgstr "結束時間:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1183
+#: ../src/modules/itip-formatter/itip-view.c:1249
 msgid "Ope_n Calendar"
 msgstr "開啟行事曆(_N)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1186
+#: ../src/modules/itip-formatter/itip-view.c:1252
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1189
-msgid "_Decline"
-msgstr "拒絕(_D)"
-
-#: ../src/modules/itip-formatter/itip-view.c:1192
+#: ../src/modules/itip-formatter/itip-view.c:1258
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1195
+#: ../src/modules/itip-formatter/itip-view.c:1261
 msgid "_Tentative"
 msgstr "暫訂(_T)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1198
+#: ../src/modules/itip-formatter/itip-view.c:1264
 msgid "Acce_pt all"
 msgstr "全部接受(_P)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1201
+#: ../src/modules/itip-formatter/itip-view.c:1267
 msgid "Acce_pt"
 msgstr "接受(_P)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1204
+#: ../src/modules/itip-formatter/itip-view.c:1270
 msgid "Send _Information"
 msgstr "傳送資訊(_I)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1207
+#: ../src/modules/itip-formatter/itip-view.c:1273
 msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1210
-#: ../src/smime/gui/certificate-manager.c:1661
+#: ../src/modules/itip-formatter/itip-view.c:1276
+#: ../src/smime/gui/certificate-manager.c:1659
 msgid "_Update"
 msgstr "更新(_U)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1639
-#: ../src/modules/itip-formatter/itip-view.c:1687
-#: ../src/modules/itip-formatter/itip-view.c:1758
+#: ../src/modules/itip-formatter/itip-view.c:1708
+#: ../src/modules/itip-formatter/itip-view.c:1756
+#: ../src/modules/itip-formatter/itip-view.c:1830
 msgid "Comment:"
 msgstr "註解:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1675
+#: ../src/modules/itip-formatter/itip-view.c:1744
 msgid "Send reply to sender"
 msgstr "回覆寄件者"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1690
+#: ../src/modules/itip-formatter/itip-view.c:1759
 msgid "Send _updates to attendees"
 msgstr "傳送更新給出席者(_U)"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1693
+#: ../src/modules/itip-formatter/itip-view.c:1762
 msgid "_Apply to all instances"
 msgstr "套用至所有實體(_A)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1694
+#: ../src/modules/itip-formatter/itip-view.c:1763
 msgid "Show time as _free"
 msgstr "顯示時間為空閒(_F)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1695
+#: ../src/modules/itip-formatter/itip-view.c:1764
 msgid "_Preserve my reminder"
 msgstr "保留我的提醒(_P)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1696
+#: ../src/modules/itip-formatter/itip-view.c:1765
 msgid "_Inherit reminder"
 msgstr "繼承提醒(_I)"
 
-#: ../src/modules/itip-formatter/itip-view.c:1910
+#: ../src/modules/itip-formatter/itip-view.c:1982
 msgid "_Tasks:"
 msgstr "工作(_T):"
 
-#: ../src/modules/itip-formatter/itip-view.c:1913
+#: ../src/modules/itip-formatter/itip-view.c:1985
 msgid "_Memos:"
 msgstr "備忘錄(_M):"
 
-#: ../src/modules/itip-formatter/itip-view.c:2909
+#: ../src/modules/itip-formatter/itip-view.c:2992
 msgid "Sa_ve"
 msgstr "儲存(_V)"
 
-#: ../src/modules/itip-formatter/itip-view.c:3470
-#: ../src/modules/itip-formatter/itip-view.c:5222
+#: ../src/modules/itip-formatter/itip-view.c:3519
+#: ../src/modules/itip-formatter/itip-view.c:5220
 msgid "Attendee status updated"
 msgstr "出席者狀態已更新"
 
-#: ../src/modules/itip-formatter/itip-view.c:3680
+#: ../src/modules/itip-formatter/itip-view.c:3750
 #, 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:3687
+#: ../src/modules/itip-formatter/itip-view.c:3757
 #, c-format
 msgid "A task “%s” in the task list “%s” conflicts with this task"
 msgstr "工作列表「%2$s」中的工作「%1$s」和這個工作相衝突"
 
-#: ../src/modules/itip-formatter/itip-view.c:3694
+#: ../src/modules/itip-formatter/itip-view.c:3764
 #, c-format
 msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
 msgstr "備忘錄列表「%2$s」中的備忘錄「%1$s」和這個備忘錄相衝突"
 
-#: ../src/modules/itip-formatter/itip-view.c:3705
+#: ../src/modules/itip-formatter/itip-view.c:3775
 #, c-format
 msgid ""
 "The calendar “%s” contains an appointment which conflicts with this meeting"
@@ -23300,269 +23721,269 @@ msgid_plural ""
 "The calendar “%s” contains %d appointments which conflict with this meeting"
 msgstr[0] "行事曆「%s」其中的 %d 個會議和這個會議相衝突"
 
-#: ../src/modules/itip-formatter/itip-view.c:3714
+#: ../src/modules/itip-formatter/itip-view.c:3784
 #, c-format
 msgid "The task list “%s” contains a task which conflicts with this task"
 msgid_plural ""
 "The task list “%s” contains %d tasks which conflict with this task"
 msgstr[0] "工作列表「%s」中有 %d 個工作和這個工作相衝突"
 
-#: ../src/modules/itip-formatter/itip-view.c:3723
+#: ../src/modules/itip-formatter/itip-view.c:3793
 #, c-format
 msgid "The memo list “%s” contains a memo which conflicts with this memo"
 msgid_plural ""
 "The memo list “%s” contains %d memos which conflict with this memo"
 msgstr[0] "備忘錄列表「%s」中有 %d 個備忘錄和這個備忘錄相衝突"
 
-#: ../src/modules/itip-formatter/itip-view.c:3761
+#: ../src/modules/itip-formatter/itip-view.c:3831
 #, c-format
 msgid "Found the appointment in the calendar “%s”"
 msgstr "在行事曆「%s」中找到約會"
 
-#: ../src/modules/itip-formatter/itip-view.c:3766
+#: ../src/modules/itip-formatter/itip-view.c:3836
 #, c-format
 msgid "Found the task in the task list “%s”"
 msgstr "在工作列表「%s」中找到工作"
 
-#: ../src/modules/itip-formatter/itip-view.c:3771
+#: ../src/modules/itip-formatter/itip-view.c:3841
 #, c-format
 msgid "Found the memo in the memo list “%s”"
 msgstr "在備忘錄列表「%s」中找到備忘錄"
 
-#: ../src/modules/itip-formatter/itip-view.c:3782
+#: ../src/modules/itip-formatter/itip-view.c:3852
 msgid "This meeting invitation is obsolete. It had been updated."
 msgstr "這個會議邀請是過時的。它已經更新。"
 
-#: ../src/modules/itip-formatter/itip-view.c:3924
+#: ../src/modules/itip-formatter/itip-view.c:3997
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
-#: ../src/modules/itip-formatter/itip-view.c:3932
+#: ../src/modules/itip-formatter/itip-view.c:4005
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個會議"
 
-#: ../src/modules/itip-formatter/itip-view.c:3937
+#: ../src/modules/itip-formatter/itip-view.c:4010
 msgid "Unable to find this task in any task list"
 msgstr "無法在任何工作列表中找到這項工作"
 
-#: ../src/modules/itip-formatter/itip-view.c:3942
+#: ../src/modules/itip-formatter/itip-view.c:4015
 msgid "Unable to find this memo in any memo list"
 msgstr "無法在任何備忘錄列表中找到這項備忘錄"
 
-#: ../src/modules/itip-formatter/itip-view.c:4236
+#: ../src/modules/itip-formatter/itip-view.c:4328
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個會議既存的版本"
 
-#: ../src/modules/itip-formatter/itip-view.c:4240
+#: ../src/modules/itip-formatter/itip-view.c:4332
 msgid "Searching for an existing version of this task"
 msgstr "尋找這個工作既存的版本"
 
-#: ../src/modules/itip-formatter/itip-view.c:4244
+#: ../src/modules/itip-formatter/itip-view.c:4336
 msgid "Searching for an existing version of this memo"
 msgstr "尋找這個備忘錄既存的版本"
 
-#: ../src/modules/itip-formatter/itip-view.c:4302
+#: ../src/modules/itip-formatter/itip-view.c:4394
 msgid "Opening the calendar. Please wait…"
 msgstr "正在開啟行事曆。請稍候…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4718
+#: ../src/modules/itip-formatter/itip-view.c:4744
 #, c-format
 msgid "Unable to send item to calendar “%s”. %s"
 msgstr "無法傳送項目至行事曆「%s」。%s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4726
+#: ../src/modules/itip-formatter/itip-view.c:4752
 #, c-format
 msgid "Unable to send item to task list “%s”. %s"
 msgstr "無法傳送項目至工作列表「%s」。%s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4734
+#: ../src/modules/itip-formatter/itip-view.c:4760
 #, c-format
 msgid "Unable to send item to memo list “%s”. %s"
 msgstr "無法傳送項目至備忘錄列表「%s」。%s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4754
+#: ../src/modules/itip-formatter/itip-view.c:4781
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "傳送至行事曆「%s」並設為已接受"
 
-#: ../src/modules/itip-formatter/itip-view.c:4759
+#: ../src/modules/itip-formatter/itip-view.c:4786
 #, c-format
 msgid "Sent to task list “%s” as accepted"
 msgstr "傳送至工作列表「%s」並設為已接受"
 
-#: ../src/modules/itip-formatter/itip-view.c:4764
+#: ../src/modules/itip-formatter/itip-view.c:4791
 #, c-format
 msgid "Sent to memo list “%s” as accepted"
 msgstr "傳送至備忘錄列表「%s」並設為已接受"
 
-#: ../src/modules/itip-formatter/itip-view.c:4774
+#: ../src/modules/itip-formatter/itip-view.c:4801
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
 msgstr "傳送至行事曆「%s」並設為不確定的"
 
-#: ../src/modules/itip-formatter/itip-view.c:4779
+#: ../src/modules/itip-formatter/itip-view.c:4806
 #, c-format
 msgid "Sent to task list “%s” as tentative"
 msgstr "傳送至工作列表「%s」並設為暫定的"
 
-#: ../src/modules/itip-formatter/itip-view.c:4784
+#: ../src/modules/itip-formatter/itip-view.c:4811
 #, c-format
 msgid "Sent to memo list “%s” as tentative"
 msgstr "傳送至備忘錄列表「%s」並設為暫定的"
 
-#: ../src/modules/itip-formatter/itip-view.c:4794
+#: ../src/modules/itip-formatter/itip-view.c:4821
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "傳送至行事曆「%s」並設為已婉拒"
 
-#: ../src/modules/itip-formatter/itip-view.c:4799
+#: ../src/modules/itip-formatter/itip-view.c:4826
 #, c-format
 msgid "Sent to task list “%s” as declined"
 msgstr "傳送至工作列表「%s」並設為已婉拒"
 
-#: ../src/modules/itip-formatter/itip-view.c:4804
+#: ../src/modules/itip-formatter/itip-view.c:4831
 #, c-format
 msgid "Sent to memo list “%s” as declined"
 msgstr "傳送至備忘錄列表「%s」並設為已婉拒"
 
-#: ../src/modules/itip-formatter/itip-view.c:4814
+#: ../src/modules/itip-formatter/itip-view.c:4841
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "傳送至行事曆「%s」並設為已取消的"
 
-#: ../src/modules/itip-formatter/itip-view.c:4819
+#: ../src/modules/itip-formatter/itip-view.c:4846
 #, c-format
 msgid "Sent to task list “%s” as cancelled"
 msgstr "傳送至工作列表「%s」並設為已取消的"
 
-#: ../src/modules/itip-formatter/itip-view.c:4824
+#: ../src/modules/itip-formatter/itip-view.c:4851
 #, c-format
 msgid "Sent to memo list “%s” as cancelled"
 msgstr "傳送至備忘錄列表「%s」並設為已取消的"
 
-#: ../src/modules/itip-formatter/itip-view.c:4842
+#: ../src/modules/itip-formatter/itip-view.c:4870
 msgid "Saving changes to the calendar. Please wait…"
 msgstr "正在將變更儲存到行事曆。請稍候…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4845
+#: ../src/modules/itip-formatter/itip-view.c:4873
 msgid "Saving changes to the task list. Please wait…"
 msgstr "正在將變更儲存到工作列表。請稍候…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4848
+#: ../src/modules/itip-formatter/itip-view.c:4876
 msgid "Saving changes to the memo list. Please wait…"
 msgstr "正在將變更儲存到備忘錄列表。請稍候…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4939
+#: ../src/modules/itip-formatter/itip-view.c:4947
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
-#: ../src/modules/itip-formatter/itip-view.c:5147
+#: ../src/modules/itip-formatter/itip-view.c:5145
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5164
-msgid "Sent a cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5162
+msgid "Sent a cancellation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-#: ../src/modules/itip-formatter/itip-view.c:5168
-msgid "Could not send the cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5166
+msgid "Could not send the cancellation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
 
-#: ../src/modules/itip-formatter/itip-view.c:5214
+#: ../src/modules/itip-formatter/itip-view.c:5212
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新出席者。%s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5247
+#: ../src/modules/itip-formatter/itip-view.c:5245
 msgid "The meeting is invalid and cannot be updated"
 msgstr "這個會議無效並且不能更新"
 
-#: ../src/modules/itip-formatter/itip-view.c:5332
+#: ../src/modules/itip-formatter/itip-view.c:5330
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得出席者狀態無法更新!"
 
-#: ../src/modules/itip-formatter/itip-view.c:5407
-#: ../src/modules/itip-formatter/itip-view.c:5445
+#: ../src/modules/itip-formatter/itip-view.c:5406
+#: ../src/modules/itip-formatter/itip-view.c:5444
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "出席者狀態不能更新,因為項目已經不存在"
 
-#: ../src/modules/itip-formatter/itip-view.c:5506
+#: ../src/modules/itip-formatter/itip-view.c:5505
 msgid "Meeting information sent"
 msgstr "會議資訊寄出"
 
-#: ../src/modules/itip-formatter/itip-view.c:5511
+#: ../src/modules/itip-formatter/itip-view.c:5510
 msgid "Task information sent"
 msgstr "工作資訊寄出"
 
-#: ../src/modules/itip-formatter/itip-view.c:5516
+#: ../src/modules/itip-formatter/itip-view.c:5515
 msgid "Memo information sent"
 msgstr "備忘錄資訊寄出"
 
-#: ../src/modules/itip-formatter/itip-view.c:5527
+#: ../src/modules/itip-formatter/itip-view.c:5526
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "無法寄出會議資訊,該會議並不存在"
 
-#: ../src/modules/itip-formatter/itip-view.c:5532
+#: ../src/modules/itip-formatter/itip-view.c:5531
 msgid "Unable to send task information, the task does not exist"
 msgstr "無法寄出工作資訊,該項工作不存在"
 
-#: ../src/modules/itip-formatter/itip-view.c:5537
+#: ../src/modules/itip-formatter/itip-view.c:5536
 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:5582
+#: ../src/modules/itip-formatter/itip-view.c:5581
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5587
+#: ../src/modules/itip-formatter/itip-view.c:5586
 msgid "Save Calendar"
 msgstr "儲存行事曆"
 
-#: ../src/modules/itip-formatter/itip-view.c:5635
-#: ../src/modules/itip-formatter/itip-view.c:5648
+#: ../src/modules/itip-formatter/itip-view.c:5634
+#: ../src/modules/itip-formatter/itip-view.c:5647
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../src/modules/itip-formatter/itip-view.c:5636
-#: ../src/modules/itip-formatter/itip-view.c:5649
+#: ../src/modules/itip-formatter/itip-view.c:5635
+#: ../src/modules/itip-formatter/itip-view.c:5648
 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:5731
-#: ../src/modules/itip-formatter/itip-view.c:5815
-#: ../src/modules/itip-formatter/itip-view.c:5919
+#: ../src/modules/itip-formatter/itip-view.c:5730
+#: ../src/modules/itip-formatter/itip-view.c:5814
+#: ../src/modules/itip-formatter/itip-view.c:5918
 msgid "The item in the calendar is not valid"
 msgstr "行事曆中的項目是無效的"
 
-#: ../src/modules/itip-formatter/itip-view.c:5732
-#: ../src/modules/itip-formatter/itip-view.c:5816
-#: ../src/modules/itip-formatter/itip-view.c:5920
+#: ../src/modules/itip-formatter/itip-view.c:5731
+#: ../src/modules/itip-formatter/itip-view.c:5815
+#: ../src/modules/itip-formatter/itip-view.c:5919
 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:5825
+#: ../src/modules/itip-formatter/itip-view.c:5824
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容含有多個項目"
 
-#: ../src/modules/itip-formatter/itip-view.c:5826
+#: ../src/modules/itip-formatter/itip-view.c:5825
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要處理這些全部的項目,應該將此檔案儲存後匯入其中的行事曆"
 
-#: ../src/modules/itip-formatter/itip-view.c:6413
+#: ../src/modules/itip-formatter/itip-view.c:6405
 msgctxt "cal-itip"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/modules/itip-formatter/itip-view.c:6431
+#: ../src/modules/itip-formatter/itip-view.c:6427
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
@@ -23579,35 +24000,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:301
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:297
 msgid "Google Features"
 msgstr "Google 功能"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:310
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:306
 msgid "Add Google Ca_lendar to this account"
 msgstr "將 Google 日曆加入這個帳號(_L)"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:319
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
 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:330
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:326
 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:333
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:329
 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:336
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:332
 #, c-format
 msgctxt "GoggleSummary"
 msgid "You may need to enable %s and %s"
@@ -23673,8 +24094,8 @@ msgstr "Mbox 排程器目錄不能為空"
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:199
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:155
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:193
-#: ../src/plugins/mail-notification/mail-notification.c:1220
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:194
+#: ../src/plugins/mail-notification/mail-notification.c:1271
 msgid "Configuration"
 msgstr "設定"
 
@@ -23752,11 +24173,11 @@ msgstr "伺服器要求核對(_V)"
 msgid "T_ype:"
 msgstr "類型(_Y):"
 
-#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:252
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:248
 msgid "Yahoo! Features"
 msgstr "Yahoo! 功能"
 
-#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:261
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:257
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "將 Yahoo! 行事曆與工作加入這個帳號(_L)"
 
@@ -23766,93 +24187,93 @@ msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d 封附加的郵件"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:399
+#: ../src/modules/mail/e-mail-shell-backend.c:420
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:401
+#: ../src/modules/mail/e-mail-shell-backend.c:422
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:409
+#: ../src/modules/mail/e-mail-shell-backend.c:430
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "郵件帳號(_U)"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:411
+#: ../src/modules/mail/e-mail-shell-backend.c:432
 msgid "Create a new mail account"
 msgstr "建立新郵件帳號"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:416
+#: ../src/modules/mail/e-mail-shell-backend.c:437
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "郵件資料夾(_F)"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:418
+#: ../src/modules/mail/e-mail-shell-backend.c:439
 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:782
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:981
 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:785
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:984
 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:788
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:987
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "網路管理"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:818
+#: ../src/modules/mail/e-mail-shell-backend.c:1017
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "偵測上線狀態的方法(_O):"
 
 #. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
-#: ../src/modules/mail/e-mail-shell-backend.c:829
+#: ../src/modules/mail/e-mail-shell-backend.c:1028
 #, c-format
 msgctxt "NetworkMonitor"
 msgid "Default (%s)"
 msgstr "預設值 (%s)"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:833
+#: ../src/modules/mail/e-mail-shell-backend.c:1032
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "預設值"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:850
+#: ../src/modules/mail/e-mail-shell-backend.c:1049
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "永遠上線"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:919
+#: ../src/modules/mail/e-mail-shell-backend.c:1118
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:928
+#: ../src/modules/mail/e-mail-shell-backend.c:1127
 msgid "Composer Preferences"
 msgstr "郵件編輯器偏好設定"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:937
+#: ../src/modules/mail/e-mail-shell-backend.c:1136
 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:1298
+#: ../src/modules/mail/e-mail-shell-backend.c:1497
 msgctxt "label"
 msgid "None"
 msgstr "沒有"
@@ -23861,454 +24282,454 @@ msgstr "沒有"
 msgid "Marking messages as read…"
 msgstr "將郵件標示成已讀…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1258
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Go to Folder"
 msgstr "前往資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1262
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1256
 msgid "_Select"
 msgstr "選擇(_S)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1572
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1566
 msgid "_Disable Account"
 msgstr "停用帳號(_D)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1568
 msgid "Disable this account"
 msgstr "停用這個帳號"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的已刪除的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1580
 msgid "Empty _Junk"
 msgstr "清空垃圾郵件(_J)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Delete all Junk messages from all folders"
 msgstr "刪除在所有資料夾內的垃圾郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1595
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1589
 msgid "Edit properties of this account"
 msgstr "編輯這個帳號的屬性"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1596
 msgid "Refresh list of folders of this account"
 msgstr "重新整理這個帳號的資料夾列表"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1607
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1601
 msgid "_Download Messages for Offline Usage"
 msgstr "下載離線使用的郵件(_D)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1603
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "下載標記為離線使用的帳號與資料夾之郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1614
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Fl_ush Outbox"
 msgstr "清理寄件匣(_U)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1615
 msgid "_Copy Folder To…"
 msgstr "複製資料夾到(_C)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Copy the selected folder into another folder"
 msgstr "複製已選定的資料夾到另一個資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1629
 msgid "Edit Sort _Order…"
 msgstr "編輯排序順序(_O)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
 msgid "Change sort order of the folders in the folder tree"
 msgstr "改變資料夾樹狀圖的排序順序"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1636
 msgid "E_xpunge"
 msgstr "刪除(_X)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1644
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1649
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1643
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
 msgid "Mar_k All Messages as Read"
 msgstr "標示所有郵件為已閱讀(_K)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1651
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Mark all messages in the folder as read"
 msgstr "將資料夾中全部的郵件標示成已閱讀"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1656
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
 msgid "_Move Folder To…"
 msgstr "移動資料夾到(_M)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
 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:1664
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
 msgid "_New…"
 msgstr "新增(_N)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Create a new folder for storing mail"
 msgstr "建立一個新資料夾以儲存郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Change the properties of this folder"
 msgstr "變更這個資料夾的屬性"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Refresh the folder"
 msgstr "重新載入資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1681
 msgid "Change the name of this folder"
 msgstr "變更這個資料夾的名稱"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1686
 msgid "Select Message _Thread"
 msgstr "選擇郵件檔頭(_T)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選擇所有相關的郵件為選定的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1693
 msgid "Select Message S_ubthread"
 msgstr "選擇郵件子群組(_U)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
 msgid "Select all replies to the currently selected message"
 msgstr "選擇所有回覆選定郵件的信"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1707
 msgid "Empty _Trash"
 msgstr "清理垃圾桶(_T)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "永久移除在所有帳號內全部已刪除的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1714
 msgid "Go to _Folder"
 msgstr "前往資料夾(_F)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
 msgid "Opens a dialog to select a folder to go to"
 msgstr "開啟對話盒選取要移至的資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1734
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
 msgid "_Manage Subscriptions"
 msgstr "管理訂閱(_M)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1736
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "訂閱或取消訂閱在遠端伺服器的資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1748
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
 msgid "Send / _Receive"
 msgstr "傳送/接收(_R)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Send queued items and retrieve new items"
 msgstr "傳送待送的項目並接收新的項目"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1755
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
 msgid "R_eceive All"
 msgstr "全部接收(_E)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Receive new items from all accounts"
 msgstr "接收在所有帳號內的新項目"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
 msgid "_Send All"
 msgstr "全部傳送(_S)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Send queued items in all accounts"
 msgstr "傳送在所有帳號內待送的項目"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1786
 msgid "Cancel the current mail operation"
 msgstr "取消目前郵件所作的行動"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1791
 msgid "Collapse All _Threads"
 msgstr "收摺所有相關郵件(_T)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1793
 msgid "Collapse all message threads"
 msgstr "收摺所有的相關郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1798
 msgid "E_xpand All Threads"
 msgstr "展開所有相關郵件(_X)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
 msgid "Expand all message threads"
 msgstr "展開所有的相關郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1805
 msgid "_Message Filters"
 msgstr "郵件規則(_M)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
 msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1812
 msgid "_Subscriptions…"
 msgstr "訂閱(_S)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
 msgid "F_older"
 msgstr "資料夾(_O)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1838
 msgid "C_reate Search Folder From Search…"
 msgstr "從搜尋建立搜尋資料夾(_R)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1845
 msgid "Search F_olders"
 msgstr "搜尋資料夾(_O)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1847
 msgid "Create or edit search folder definitions"
 msgstr "建立或編輯搜尋資料夾的定義"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1890
 msgid "_New Folder…"
 msgstr "新增資料夾(_N)…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1924
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1918
 msgid "Show Message _Preview"
 msgstr "顯示郵件預覽(_P)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1920
 msgid "Show message preview pane"
 msgstr "顯示郵件預覽窗格"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show _Attachment Bar"
 msgstr "顯示附件列(_A)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1928
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
 msgstr "當郵件帶有附件時在郵件預覽窗格下方顯示附件列"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
 msgid "Show _Deleted Messages"
 msgstr "顯示已刪除郵件(_D)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1936
 msgid "Show deleted messages with a line through them"
 msgstr "顯示已刪除的郵件 (加上刪除線)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Show _Junk Messages"
 msgstr "顯示垃圾郵件(_J)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1944
 msgid "Show junk messages with a red line through them"
 msgstr "顯示垃圾郵件 (加上紅色刪除線)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1956
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
 msgid "_Group By Threads"
 msgstr "依相關郵件為群組(_G)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1952
 msgid "Threaded message list"
 msgstr "相關郵件列表"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
 msgid "Show To _Do Bar"
 msgstr "顯示待辦事項列(_D)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1960
 msgid "Show To Do bar with appointments and tasks"
 msgstr "待辦事項列顯示約會和工作"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
 msgid "_Unmatched Folder Enabled"
 msgstr "未符合資料夾已啟用(_U)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1968
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "切換是否啟用未符合搜尋資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Show message preview below the message list"
 msgstr "在郵件列表下方顯示郵件預覽"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1995
 msgid "Show message preview alongside the message list"
 msgstr "在郵件列表旁邊顯示郵件預覽"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2003
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
 msgid "Important Messages"
 msgstr "重要郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
 msgid "Last 5 Days’ Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
 msgid "Messages with Attachments"
 msgstr "有附件的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2038
 msgid "Messages with Notes"
 msgstr "有備註的郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2045
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2052
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2059
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2066
 msgid "Message Thread"
 msgstr "相關郵件"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2132
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
 msgid "Subject or Addresses contain"
 msgstr "主旨或電子郵件位址包含"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2142
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2136
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2143
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2150
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2157
 msgid "Current Folder and Subfolders"
 msgstr "目前的資料夾及其子資料夾"
 
-#: ../src/modules/mail/e-mail-shell-view.c:895
+#: ../src/modules/mail/e-mail-shell-view.c:1039
 msgid "Current Folder and Subfolders Search"
 msgstr "目前的資料夾及其子資料夾搜尋"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1017
+#: ../src/modules/mail/e-mail-shell-view.c:1159
 msgid "All Account Search"
 msgstr "所有的帳號搜尋"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1127
+#: ../src/modules/mail/e-mail-shell-view.c:1267
 msgid "Account Search"
 msgstr "帳號搜尋"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:909
+#: ../src/modules/mail/e-mail-shell-view-private.c:918
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已選擇 %d 個,"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:924
-#: ../src/modules/mail/e-mail-shell-view-private.c:941
+#: ../src/modules/mail/e-mail-shell-view-private.c:933
+#: ../src/modules/mail/e-mail-shell-view-private.c:950
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已刪除"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:955
-#: ../src/modules/mail/e-mail-shell-view-private.c:961
+#: ../src/modules/mail/e-mail-shell-view-private.c:964
+#: ../src/modules/mail/e-mail-shell-view-private.c:970
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:968
+#: ../src/modules/mail/e-mail-shell-view-private.c:977
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 個草稿"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:974
+#: ../src/modules/mail/e-mail-shell-view-private.c:983
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未傳送"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:980
+#: ../src/modules/mail/e-mail-shell-view-private.c:989
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:997
+#: ../src/modules/mail/e-mail-shell-view-private.c:1006
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d 封未讀"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1515
+#: ../src/modules/mail/e-mail-shell-view-private.c:1524
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
-#: ../src/modules/mail/em-composer-prefs.c:420
+#: ../src/modules/mail/em-composer-prefs.c:417
 msgid "Select Folder to Add"
 msgstr "選擇要加入的資料夾"
 
-#: ../src/modules/mail/em-composer-prefs.c:896
+#: ../src/modules/mail/em-composer-prefs.c:893
 msgid "Folder"
 msgstr "資料夾"
 
-#: ../src/modules/mail/em-composer-prefs.c:932
+#: ../src/modules/mail/em-composer-prefs.c:929
 msgid "Recipient"
 msgstr "收件人"
 
-#: ../src/modules/mail/em-composer-prefs.c:1223
+#: ../src/modules/mail/em-composer-prefs.c:1220
 msgid "Keep in Outbox"
 msgstr "保留在寄件匣"
 
-#: ../src/modules/mail/em-composer-prefs.c:1224
+#: ../src/modules/mail/em-composer-prefs.c:1221
 msgid "Send immediately"
 msgstr "立刻傳送"
 
-#: ../src/modules/mail/em-composer-prefs.c:1225
+#: ../src/modules/mail/em-composer-prefs.c:1222
 msgid "Send after 5 minutes"
 msgstr "5 分鐘後傳送"
 
-#: ../src/modules/mail/em-composer-prefs.c:1310
+#: ../src/modules/mail/em-composer-prefs.c:1307
 msgid "Language(s)"
 msgstr "語言"
 
-#: ../src/modules/mail/em-composer-prefs.c:1340
+#: ../src/modules/mail/em-composer-prefs.c:1337
 msgid "Same as user interface"
 msgstr "與使用者介面相同"
 
@@ -24341,11 +24762,11 @@ 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:1698
+#: ../src/modules/mail/em-mailer-prefs.c:1699
 msgid "_Date header:"
 msgstr "日期標頭(_D):"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1699
+#: ../src/modules/mail/em-mailer-prefs.c:1700
 msgid "Show _original header value"
 msgstr "顯示原始標頭數值(_O)"
 
@@ -24418,28 +24839,28 @@ msgstr "一旦網路連線建立,Evolution 就會回到線上模式。"
 msgid "Author(s)"
 msgstr "作者"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:303
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:304
 msgid "Plugin Manager"
 msgstr "外掛程式管理員"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:318
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:319
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意:某些變更在重新啟動後才會生效"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:346
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:347
 msgid "Overview"
 msgstr "概覽"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:415
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:498
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:416
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:499
 msgid "Plugin"
 msgstr "外掛程式"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:536
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
 msgid "_Plugins"
 msgstr "外掛程式(_P)"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:538
 msgid "Enable and disable plugins"
 msgstr "啟用與停用外掛程式"
 
@@ -24459,44 +24880,44 @@ msgstr "顯示 HTML 版本"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "顯示多部分/替代郵件的 HTML 版本"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:69
 #: ../src/modules/prefer-plain/plugin/config-ui.c:35
 msgid "Show HTML if present"
 msgstr "如提供 HTML 則顯示之"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:70
 #: ../src/modules/prefer-plain/plugin/config-ui.c:36
 msgid "Let Evolution choose the best part to show."
 msgstr "讓 Evolution 選擇最佳的部分來顯示。"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:73
 #: ../src/modules/prefer-plain/plugin/config-ui.c:39
 msgid "Show plain text if present"
 msgstr "如提供純文字則顯示它"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:74
 #: ../src/modules/prefer-plain/plugin/config-ui.c:40
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "如果有純文字的部分就顯示它,否則讓 Evolution 選擇最佳的部分來顯示。"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:78
 #: ../src/modules/prefer-plain/plugin/config-ui.c:44
 msgid "Show plain text if present, or HTML source"
 msgstr "如提供純文字則顯示它,或 HTML 原始碼"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../src/modules/prefer-plain/plugin/config-ui.c:45
 msgid "Show plain text part, if present, otherwise the HTML part source."
 msgstr "如果有純文字的部分就顯示它,否則顯示 HTML 部分原始碼。"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:91
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../src/modules/prefer-plain/plugin/config-ui.c:49
 msgid "Only ever show plain text"
 msgstr "只以純文字顯示"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:92
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:84
 #: ../src/modules/prefer-plain/plugin/config-ui.c:50
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -24570,19 +24991,19 @@ msgstr "使用 SpamAssassin 垃圾郵件過濾器"
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:271
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:336
 msgid "Importing Files"
 msgstr "正在匯入檔案"
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:257
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:253
 msgid "Import cancelled."
 msgstr "匯入已取消。"
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:274
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:270
 msgid "Import complete."
 msgstr "匯入完成。"
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:186
+#: ../src/modules/startup-wizard/e-startup-assistant.c:174
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -24593,18 +25014,18 @@ msgstr ""
 "\n"
 "以下畫面會讓 Evolution 連線至您的電子郵件帳號,以及從其他應用程式匯入檔案。"
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:193
+#: ../src/modules/startup-wizard/e-startup-assistant.c:181
 msgid "Do not _show this wizard again"
 msgstr "不要再顯示這個精靈(_S)"
 
 #. Translators: This is part of "Alternatively, you can %s (email, contacts and calendaring) instead." 
sentence from the same translation context.
-#: ../src/modules/startup-wizard/e-startup-assistant.c:206
+#: ../src/modules/startup-wizard/e-startup-assistant.c:194
 msgctxt "wizard-ca-note"
 msgid "create a collection account"
 msgstr "建立新的收藏帳號"
 
 #. Translators: The '%s' is replaced with "create a collection account" from the same translation context.
-#: ../src/modules/startup-wizard/e-startup-assistant.c:208
+#: ../src/modules/startup-wizard/e-startup-assistant.c:196
 #, c-format
 msgctxt "wizard-ca-note"
 msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
@@ -24874,7 +25295,7 @@ msgid "_Do not show this message again."
 msgstr "不要再顯示這個訊息(_D)"
 
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:571
-#: ../src/plugins/templates/templates.c:489
+#: ../src/plugins/templates/templates.c:495
 msgid "Keywords"
 msgstr "關鍵字"
 
@@ -24893,6 +25314,7 @@ msgid "_Add Attachment..."
 msgstr "加入附件(_A)…"
 
 #: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:3
 msgid "_Edit Message"
 msgstr "編輯郵件(_E)"
 
@@ -24904,40 +25326,40 @@ msgstr "附件提醒程式"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "當您忘記將附件加入郵件時提醒您。"
 
-#: ../src/plugins/bbdb/bbdb.c:756 ../src/plugins/bbdb/bbdb.c:879
+#: ../src/plugins/bbdb/bbdb.c:715 ../src/plugins/bbdb/bbdb.c:838
 #: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自動加入的連絡人"
 
 #. Enable BBDB checkbox
-#: ../src/plugins/bbdb/bbdb.c:771
+#: ../src/plugins/bbdb/bbdb.c:730
 msgid "Create _address book entries when sending mails"
 msgstr "在傳送郵件時自動建立通訊錄項目(_A)"
 
 #. File Under setting
-#: ../src/plugins/bbdb/bbdb.c:782
+#: ../src/plugins/bbdb/bbdb.c:741
 msgid "Set File _under as “First Last”, instead of “Last, First”"
 msgstr "設定 “歸檔為” 欄位為 “名-姓”,而非 “姓-名”(_U)"
 
-#: ../src/plugins/bbdb/bbdb.c:793
+#: ../src/plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Automatic Contacts"
 msgstr "選擇給自動加入連絡人用的通訊錄"
 
-#: ../src/plugins/bbdb/bbdb.c:813
+#: ../src/plugins/bbdb/bbdb.c:772
 msgid "Instant Messaging Contacts"
 msgstr "即時訊息連絡人"
 
 #. Enable Gaim Checkbox
-#: ../src/plugins/bbdb/bbdb.c:828
+#: ../src/plugins/bbdb/bbdb.c:787
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "從 Pidgin 的好友列表同步連絡人資訊和影像(_S)"
 
-#: ../src/plugins/bbdb/bbdb.c:838
+#: ../src/plugins/bbdb/bbdb.c:797
 msgid "Select Address book for Pidgin buddy list"
 msgstr "選擇給 Pidgin 好友名單用的通訊錄"
 
 #. Synchronize now button.
-#: ../src/plugins/bbdb/bbdb.c:854
+#: ../src/plugins/bbdb/bbdb.c:813
 msgid "Synchronize with _buddy list now"
 msgstr "立即與好友列表同步(_B)"
 
@@ -25016,12 +25438,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:538
+#: ../src/plugins/email-custom-header/email-custom-header.c:528
 msgid "_Custom Header"
 msgstr "自訂標頭(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../src/plugins/email-custom-header/email-custom-header.c:808
+#: ../src/plugins/email-custom-header/email-custom-header.c:795
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by “;”."
@@ -25029,12 +25451,12 @@ msgstr ""
 "指定自訂標頭鍵值的格式:\n"
 "自訂標頭鍵值的名稱請以「;」隔開。"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:862
+#: ../src/plugins/email-custom-header/email-custom-header.c:849
 msgid "Key"
 msgstr "設定鍵"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:879
-#: ../src/plugins/templates/templates.c:498
+#: ../src/plugins/email-custom-header/email-custom-header.c:866
+#: ../src/plugins/templates/templates.c:504
 msgid "Values"
 msgstr "數值"
 
@@ -25051,11 +25473,11 @@ msgstr "在外寄郵件中加入自訂標頭。"
 msgid "Email Custom Header"
 msgstr "電子郵件自訂標頭"
 
-#: ../src/plugins/external-editor/external-editor.c:111
+#: ../src/plugins/external-editor/external-editor.c:108
 msgid "Command to be executed to launch the editor: "
 msgstr "用來啟動編輯器的指令: "
 
-#: ../src/plugins/external-editor/external-editor.c:112
+#: ../src/plugins/external-editor/external-editor.c:109
 msgid ""
 "For XEmacs use “xemacs”\n"
 "For Vim use “gvim -f”"
@@ -25063,12 +25485,12 @@ msgstr ""
 "XEmacs 使用「xemacs」\n"
 "Vim 使用「gvim -f」"
 
-#: ../src/plugins/external-editor/external-editor.c:122
+#: ../src/plugins/external-editor/external-editor.c:119
 msgid "_Automatically launch when a new mail is edited"
 msgstr "當編輯新郵件時自動執行(_A)"
 
-#: ../src/plugins/external-editor/external-editor.c:455
-#: ../src/plugins/external-editor/external-editor.c:457
+#: ../src/plugins/external-editor/external-editor.c:489
+#: ../src/plugins/external-editor/external-editor.c:491
 msgid "Compose in External Editor"
 msgstr "在外部編輯器中撰寫"
 
@@ -25319,83 +25741,90 @@ msgstr ""
 "標頭: {0}"
 
 #. Translators: '%d' is the count of mails received.
-#: ../src/plugins/mail-notification/mail-notification.c:462
+#: ../src/plugins/mail-notification/mail-notification.c:500
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "您已經接收 %d 封郵件 。 "
 
+#. Translators: The '%s' is replaced by the folder name, where a new
+#. * mail message arrived. Example: "Folder: On This Computer : Inbox"
+#: ../src/plugins/mail-notification/mail-notification.c:509
+#, c-format
+msgid "Folder: %s"
+msgstr "資料夾:%s"
+
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../src/plugins/mail-notification/mail-notification.c:471
+#: ../src/plugins/mail-notification/mail-notification.c:517
 #, 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:485
+#: ../src/plugins/mail-notification/mail-notification.c:525
 #, c-format
 msgid "Subject: %s"
 msgstr "主旨:%s"
 
 #. Translators: %d is the count of mails received in addition
 #. * to the one displayed in this notification.
-#: ../src/plugins/mail-notification/mail-notification.c:501
+#: ../src/plugins/mail-notification/mail-notification.c:536
 #, c-format
 msgid "(and %d more)"
 msgid_plural "(and %d more)"
 msgstr[0] "(與其他 %d 項)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:513
+#: ../src/plugins/mail-notification/mail-notification.c:542
 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:553
+#: ../src/plugins/mail-notification/mail-notification.c:583
 #, c-format
 msgid "Show %s"
 msgstr "顯示 %s"
 
-#: ../src/plugins/mail-notification/mail-notification.c:792
+#: ../src/plugins/mail-notification/mail-notification.c:843
 msgid "_Play sound when a new message arrives"
 msgstr "當新郵件到達時播放聲音檔案(_P)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:824
+#: ../src/plugins/mail-notification/mail-notification.c:875
 msgid "_Beep"
 msgstr "嗶聲(_B)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:837
+#: ../src/plugins/mail-notification/mail-notification.c:888
 msgid "Use sound _theme"
 msgstr "使用音效主題(_T)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:856
+#: ../src/plugins/mail-notification/mail-notification.c:907
 msgid "Play _file:"
 msgstr "播放檔案(_F):"
 
-#: ../src/plugins/mail-notification/mail-notification.c:865
+#: ../src/plugins/mail-notification/mail-notification.c:916
 msgid "Select sound file"
 msgstr "選擇聲音檔案"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1014
+#: ../src/plugins/mail-notification/mail-notification.c:1065
 msgid "Select _accounts for which enable notifications:"
 msgstr "選擇啟用通知的帳號(_A)︰"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1176
+#: ../src/plugins/mail-notification/mail-notification.c:1227
 #: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "郵件通知"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1190
+#: ../src/plugins/mail-notification/mail-notification.c:1241
 msgid "Notify new messages for _Inbox only"
 msgstr "只通知收件匣的新郵件(_I)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1206
+#: ../src/plugins/mail-notification/mail-notification.c:1257
 msgid "Show _notification when a new message arrives"
 msgstr "當新郵件到達時顯示通知(_N)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1224
+#: ../src/plugins/mail-notification/mail-notification.c:1275
 msgid "Accounts"
 msgstr "帳號"
 
@@ -25410,38 +25839,38 @@ 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:600
+#: ../src/plugins/mail-to-task/mail-to-task.c:598
 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:602
+#: ../src/plugins/mail-to-task/mail-to-task.c:600
 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:604
+#: ../src/plugins/mail-to-task/mail-to-task.c:602
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "新增(_N)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:622
+#: ../src/plugins/mail-to-task/mail-to-task.c:620
 #, 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:625
+#: ../src/plugins/mail-to-task/mail-to-task.c:623
 #, 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:628
+#: ../src/plugins/mail-to-task/mail-to-task.c:626
 #, c-format
 msgid ""
 "Selected memo list contains memo “%s” already. Would you like to edit the "
@@ -25449,7 +25878,7 @@ msgid ""
 msgstr "選取的備忘錄列表已經包含備忘錄「%s」。是否要編輯此舊的備忘錄?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:648
+#: ../src/plugins/mail-to-task/mail-to-task.c:646
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -25460,7 +25889,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:655
+#: ../src/plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -25471,7 +25900,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:662
+#: ../src/plugins/mail-to-task/mail-to-task.c:660
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -25481,76 +25910,76 @@ msgid_plural ""
 "add them all?"
 msgstr[0] "您已經選擇 %d 封郵件要轉換為備忘錄。確定要把它們全部加入嗎?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:683
+#: ../src/plugins/mail-to-task/mail-to-task.c:681
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "是否要繼續轉換剩餘的郵件?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:759
+#: ../src/plugins/mail-to-task/mail-to-task.c:756
 msgid "[No Summary]"
 msgstr "[沒有摘要]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:772
+#: ../src/plugins/mail-to-task/mail-to-task.c:769
 msgid "Invalid object returned from a server"
 msgstr "從伺服器傳回無效的物件"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:826
+#: ../src/plugins/mail-to-task/mail-to-task.c:823
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "在處理期間發生錯誤:%s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:877
+#: ../src/plugins/mail-to-task/mail-to-task.c:874
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "無法開啟行事曆。%s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:881
+#: ../src/plugins/mail-to-task/mail-to-task.c:878
 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:884
+#: ../src/plugins/mail-to-task/mail-to-task.c:881
 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:887
+#: ../src/plugins/mail-to-task/mail-to-task.c:884
 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:1328
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
 msgid "Create an _Appointment"
 msgstr "建立一個會議(_A)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1330
+#: ../src/plugins/mail-to-task/mail-to-task.c:1327
 msgid "Create a new event from the selected message"
 msgstr "以選取的郵件建立新的事件"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1335
+#: ../src/plugins/mail-to-task/mail-to-task.c:1332
 msgid "Create a Mem_o"
 msgstr "建立備忘錄(_O)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1337
+#: ../src/plugins/mail-to-task/mail-to-task.c:1334
 msgid "Create a new memo from the selected message"
 msgstr "以選取的郵件建立新的備忘錄"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1342
+#: ../src/plugins/mail-to-task/mail-to-task.c:1339
 msgid "Create a _Task"
 msgstr "建立工作(_T)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1344
+#: ../src/plugins/mail-to-task/mail-to-task.c:1341
 msgid "Create a new task from the selected message"
 msgstr "以選取的郵件建立新的工作"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1352
+#: ../src/plugins/mail-to-task/mail-to-task.c:1349
 msgid "Create a _Meeting"
 msgstr "建立會議(_M)"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1354
+#: ../src/plugins/mail-to-task/mail-to-task.c:1351
 msgid "Create a new meeting from the selected message"
 msgstr "以選取的郵件建立新的會議"
 
@@ -25631,18 +26060,18 @@ msgstr "發布到 %s 已成功結束"
 msgid "Mount of %s failed:"
 msgstr "掛載 %s 失敗:"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/publish-calendar.c:787
 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:1098
+#: ../src/plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr "無法建立發布執行緒。"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:1108
+#: ../src/plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "發布行事曆資訊(_P)"
 
@@ -25722,10 +26151,6 @@ msgstr "檔案(_F):"
 msgid "P_ort:"
 msgstr "連接埠(_O):"
 
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Username:"
-msgstr "使用者名稱(_U):"
-
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
 msgid "Publishing Location"
 msgstr "發布位置"
@@ -25736,11 +26161,11 @@ msgstr "發布位置"
 msgid "Invalid source UID “%s”"
 msgstr "無效的來源 UID「%s」"
 
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:540
 msgid "New Location"
 msgstr "新的位置"
 
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:544
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
 msgid "Edit Location"
 msgstr "編輯位置"
 
@@ -25845,30 +26270,62 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../src/plugins/save-calendar/save-calendar.c:116
+#: ../src/plugins/save-calendar/save-calendar.c:114
 msgid "_Format:"
 msgstr "格式(_F):"
 
-#: ../src/plugins/save-calendar/save-calendar.c:183
+#: ../src/plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "選取目的檔案"
 
-#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../src/plugins/save-calendar/save-calendar.c:184
 msgid "_Save As"
 msgstr "儲存為(_A)"
 
-#: ../src/plugins/save-calendar/save-calendar.c:346
+#: ../src/plugins/save-calendar/save-calendar.c:343
 msgid "Save the selected calendar to disk"
 msgstr "將選取的行事曆儲存至磁碟"
 
-#: ../src/plugins/save-calendar/save-calendar.c:385
+#: ../src/plugins/save-calendar/save-calendar.c:382
 msgid "Save the selected memo list to disk"
 msgstr "將選取的備忘錄列表儲存至磁碟"
 
-#: ../src/plugins/save-calendar/save-calendar.c:424
+#: ../src/plugins/save-calendar/save-calendar.c:421
 msgid "Save the selected task list to disk"
 msgstr "將選取的工作列表儲存至磁碟"
 
+#: ../src/plugins/sender-validation/org-gnome-evolution-sender-validation.eplug.xml.h:1
+msgid "Sender Validation"
+msgstr "寄件者驗證"
+
+#: ../src/plugins/sender-validation/org-gnome-evolution-sender-validation.eplug.xml.h:2
+msgid ""
+"Validates sender before sending an e-mail against a list of recipients and "
+"for them assigned expected send account."
+msgstr "在寄送電子郵件給列表中收件者前驗證寄件者,並指派他們,寄件者帳號除外"
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:1
+msgid "Confirm sender address"
+msgstr "確認寄件者位址"
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:2
+msgid ""
+"The message contains recipient “{0}” for which it is set up to use sender "
+"account “{1}”, but the account “{2}” is used instead."
+msgstr "郵件包含設定為使用寄件者帳號“{1}”的收件者 “{0}”,但使用帳號“{2}”代替。"
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:4
+msgid "_Send Anyway"
+msgstr "無論如何都傳送(_S)"
+
+#: ../src/plugins/sender-validation/sender-validation.c:520
+msgid "Recipient Contains"
+msgstr "收件者包含"
+
+#: ../src/plugins/sender-validation/sender-validation.c:530
+msgid "Account to Use"
+msgstr "要使用的帳號"
+
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -25879,15 +26336,15 @@ msgstr ""
 "$ORIG[to], $ORIG[body], $ORIG[quoted-body] 或 $ORIG[reply-credits],它們會以"
 "您所回覆的郵件中的數值取代。"
 
-#: ../src/plugins/templates/templates.c:878
+#: ../src/plugins/templates/templates.c:887
 msgid "Saving message template"
 msgstr "儲存郵件範本"
 
-#: ../src/plugins/templates/templates.c:899
+#: ../src/plugins/templates/templates.c:908
 msgid "Save as _Template"
 msgstr "儲存為範本(_T)"
 
-#: ../src/plugins/templates/templates.c:901
+#: ../src/plugins/templates/templates.c:910
 msgid "Save as Template"
 msgstr "儲存為範本"
 
@@ -25927,19 +26384,19 @@ msgstr "儲存搜尋結果"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../src/shell/e-shell-searchbar.c:925
+#: ../src/shell/e-shell-searchbar.c:924
 msgid "Sho_w:"
 msgstr "顯示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:951
+#: ../src/shell/e-shell-searchbar.c:950
 msgid "Sear_ch:"
 msgstr "搜尋(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:1019
+#: ../src/shell/e-shell-searchbar.c:1018
 msgid "i_n"
 msgstr "於(_N)"
 
@@ -25969,304 +26426,316 @@ msgstr ""
 msgid "Website"
 msgstr "網站"
 
-#: ../src/shell/e-shell-view.c:295
+#: ../src/shell/e-shell-view.c:296
 msgid "Saving user interface state"
 msgstr "儲存使用者介面狀態"
 
-#: ../src/shell/e-shell-window-actions.c:345
+#: ../src/shell/e-shell-window-actions.c:351
 msgid "Categories Editor"
 msgstr "分類編輯器"
 
-#: ../src/shell/e-shell-window-actions.c:648
+#: ../src/shell/e-shell-window-actions.c:654
 msgid "Bug Buddy is not installed."
 msgstr "尚未安裝 Bug Buddy。"
 
-#: ../src/shell/e-shell-window-actions.c:649
+#: ../src/shell/e-shell-window-actions.c:655
 msgid "Bug Buddy could not be run."
 msgstr "無法執行 Bug Buddy。"
 
-#: ../src/shell/e-shell-window-actions.c:845
+#: ../src/shell/e-shell-window-actions.c:895
 msgid "Collect_ion Account"
 msgstr "收藏帳號(_I)"
 
-#: ../src/shell/e-shell-window-actions.c:847
+#: ../src/shell/e-shell-window-actions.c:897
 msgid "Create a new collection account"
 msgstr "建立新的收藏帳號"
 
-#: ../src/shell/e-shell-window-actions.c:855
+#: ../src/shell/e-shell-window-actions.c:905
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/shell/e-shell-window-actions.c:857
+#: ../src/shell/e-shell-window-actions.c:907
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
-#: ../src/shell/e-shell-window-actions.c:862
+#: ../src/shell/e-shell-window-actions.c:912
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: ../src/shell/e-shell-window-actions.c:864
+#: ../src/shell/e-shell-window-actions.c:914
 msgid "Configure Evolution Accounts"
 msgstr "設定 Evolution 帳號"
 
-#: ../src/shell/e-shell-window-actions.c:869
-#: ../src/shell/e-shell-window-actions.c:883
+#: ../src/shell/e-shell-window-actions.c:919
+#: ../src/shell/e-shell-window-actions.c:933
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
 
-#: ../src/shell/e-shell-window-actions.c:890
+#: ../src/shell/e-shell-window-actions.c:940
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../src/shell/e-shell-window-actions.c:892
+#: ../src/shell/e-shell-window-actions.c:942
 msgid "Open the Evolution User Guide"
 msgstr "開啟 Evolution 使用者指南"
 
-#: ../src/shell/e-shell-window-actions.c:918
+#: ../src/shell/e-shell-window-actions.c:968
 msgid "I_mport…"
 msgstr "匯入(_M)…"
 
-#: ../src/shell/e-shell-window-actions.c:920
+#: ../src/shell/e-shell-window-actions.c:970
 msgid "Import data from other programs"
 msgstr "匯入其他程式的資料"
 
-#: ../src/shell/e-shell-window-actions.c:925
+#: ../src/shell/e-shell-window-actions.c:975
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:927
+#: ../src/shell/e-shell-window-actions.c:977
 msgid "Create a new window displaying this view"
 msgstr "建立一個新的視窗來顯示這個檢視"
 
-#: ../src/shell/e-shell-window-actions.c:939
+#: ../src/shell/e-shell-window-actions.c:989
 msgid "Available Cate_gories"
 msgstr "可用的分類(_G)"
 
-#: ../src/shell/e-shell-window-actions.c:941
+#: ../src/shell/e-shell-window-actions.c:991
 msgid "Manage available categories"
 msgstr "管理可用的分類"
 
-#: ../src/shell/e-shell-window-actions.c:953
+#: ../src/shell/e-shell-window-actions.c:1003
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ../src/shell/e-shell-window-actions.c:955
+#: ../src/shell/e-shell-window-actions.c:1005
 msgid "Exit the program"
 msgstr "離開這個程式"
 
-#: ../src/shell/e-shell-window-actions.c:960
+#: ../src/shell/e-shell-window-actions.c:1010
+msgid "_Saved Searches"
+msgstr "已儲存的搜尋(_S)"
+
+#: ../src/shell/e-shell-window-actions.c:1017
 msgid "_Advanced Search…"
 msgstr "進階搜尋(_A)…"
 
-#: ../src/shell/e-shell-window-actions.c:962
+#: ../src/shell/e-shell-window-actions.c:1019
 msgid "Construct a more advanced search"
 msgstr "建構更進階的搜尋"
 
-#: ../src/shell/e-shell-window-actions.c:969
+#: ../src/shell/e-shell-window-actions.c:1026
 msgid "Clear the current search parameters"
 msgstr "清除目前的搜尋參數"
 
-#: ../src/shell/e-shell-window-actions.c:974
+#: ../src/shell/e-shell-window-actions.c:1031
 msgid "_Edit Saved Searches…"
 msgstr "編輯儲存的搜尋結果(_E)…"
 
-#: ../src/shell/e-shell-window-actions.c:976
+#: ../src/shell/e-shell-window-actions.c:1033
 msgid "Manage your saved searches"
 msgstr "管理您已儲存的搜尋"
 
-#: ../src/shell/e-shell-window-actions.c:983
+#: ../src/shell/e-shell-window-actions.c:1040
 msgid "Click here to change the search type"
 msgstr "按這裡以改變搜尋類型"
 
-#: ../src/shell/e-shell-window-actions.c:988
+#: ../src/shell/e-shell-window-actions.c:1045
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
-#: ../src/shell/e-shell-window-actions.c:990
+#: ../src/shell/e-shell-window-actions.c:1047
 msgid "Execute the current search parameters"
 msgstr "執行目前的搜尋參數"
 
-#: ../src/shell/e-shell-window-actions.c:995
+#: ../src/shell/e-shell-window-actions.c:1052
 msgid "_Save Search…"
 msgstr "儲存搜尋結果(_S)…"
 
-#: ../src/shell/e-shell-window-actions.c:997
+#: ../src/shell/e-shell-window-actions.c:1054
 msgid "Save the current search parameters"
 msgstr "儲存目前的搜尋參數"
 
-#: ../src/shell/e-shell-window-actions.c:1009
+#: ../src/shell/e-shell-window-actions.c:1066
 msgid "_Keyboard Shortcuts"
 msgstr "鍵盤快捷鍵(_K)"
 
-#: ../src/shell/e-shell-window-actions.c:1011
+#: ../src/shell/e-shell-window-actions.c:1068
 msgid "Show keyboard shortcuts"
 msgstr "顯示鍵盤快捷鍵"
 
-#: ../src/shell/e-shell-window-actions.c:1016
+#: ../src/shell/e-shell-window-actions.c:1073
+msgid "Show _WebKit GPU information"
+msgstr "顯示 _WebKit GPU 資訊"
+
+#: ../src/shell/e-shell-window-actions.c:1075
+msgid "Show WebKit GPU information page in the preview panel"
+msgstr "在預覽窗格中顯示 WebKit GPU 資訊頁"
+
+#: ../src/shell/e-shell-window-actions.c:1080
 msgid "Submit _Bug Report…"
 msgstr "傳送錯誤報告(_B)…"
 
-#: ../src/shell/e-shell-window-actions.c:1018
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
-#: ../src/shell/e-shell-window-actions.c:1023
+#: ../src/shell/e-shell-window-actions.c:1087
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:1025
+#: ../src/shell/e-shell-window-actions.c:1089
 msgid "Put Evolution into offline mode"
 msgstr "讓 Evolution 進入離線模式"
 
-#: ../src/shell/e-shell-window-actions.c:1030
+#: ../src/shell/e-shell-window-actions.c:1094
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:1032
+#: ../src/shell/e-shell-window-actions.c:1096
 msgid "Put Evolution into online mode"
 msgstr "讓 Evolution 進入上線模式"
 
-#: ../src/shell/e-shell-window-actions.c:1060
+#: ../src/shell/e-shell-window-actions.c:1124
 msgid "Lay_out"
 msgstr "佈局(_O)"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1132
 msgid "_New"
 msgstr "新增(_N)"
 
-#: ../src/shell/e-shell-window-actions.c:1075
+#: ../src/shell/e-shell-window-actions.c:1139
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1146
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1096
+#: ../src/shell/e-shell-window-actions.c:1160
 msgid "_Window"
 msgstr "視窗(_O)"
 
-#: ../src/shell/e-shell-window-actions.c:1125
+#: ../src/shell/e-shell-window-actions.c:1189
 msgid "Show _Menu Bar"
 msgstr "顯示選單列(_M)"
 
-#: ../src/shell/e-shell-window-actions.c:1127
+#: ../src/shell/e-shell-window-actions.c:1191
 msgid "Show the menu bar"
 msgstr "顯示選單列"
 
-#: ../src/shell/e-shell-window-actions.c:1133
+#: ../src/shell/e-shell-window-actions.c:1197
 msgid "Show Side _Bar"
 msgstr "顯示側邊欄(_B)"
 
-#: ../src/shell/e-shell-window-actions.c:1135
+#: ../src/shell/e-shell-window-actions.c:1199
 msgid "Show the side bar"
 msgstr "顯示側邊欄"
 
-#: ../src/shell/e-shell-window-actions.c:1141
+#: ../src/shell/e-shell-window-actions.c:1205
 msgid "Show _Buttons"
 msgstr "顯示按鈕(_B)"
 
-#: ../src/shell/e-shell-window-actions.c:1143
+#: ../src/shell/e-shell-window-actions.c:1207
 msgid "Show the switcher buttons"
 msgstr "顯示切換程式按鈕"
 
-#: ../src/shell/e-shell-window-actions.c:1149
+#: ../src/shell/e-shell-window-actions.c:1213
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1151
+#: ../src/shell/e-shell-window-actions.c:1215
 msgid "Show the status bar"
 msgstr "顯示狀態列"
 
-#: ../src/shell/e-shell-window-actions.c:1157
+#: ../src/shell/e-shell-window-actions.c:1221
 msgid "Show _Tool Bar"
 msgstr "顯示工具列(_T)"
 
-#: ../src/shell/e-shell-window-actions.c:1159
+#: ../src/shell/e-shell-window-actions.c:1223
 msgid "Show the tool bar"
 msgstr "顯示工具列"
 
-#: ../src/shell/e-shell-window-actions.c:1181
+#: ../src/shell/e-shell-window-actions.c:1245
 msgid "_Icons Only"
 msgstr "只有圖示(_I)"
 
-#: ../src/shell/e-shell-window-actions.c:1183
+#: ../src/shell/e-shell-window-actions.c:1247
 msgid "Display window buttons with icons only"
 msgstr "只顯示視窗按鈕的圖示"
 
-#: ../src/shell/e-shell-window-actions.c:1188
+#: ../src/shell/e-shell-window-actions.c:1252
 msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../src/shell/e-shell-window-actions.c:1190
+#: ../src/shell/e-shell-window-actions.c:1254
 msgid "Display window buttons with text only"
 msgstr "只顯示視窗按鈕的文字"
 
-#: ../src/shell/e-shell-window-actions.c:1195
+#: ../src/shell/e-shell-window-actions.c:1259
 msgid "Icons _and Text"
 msgstr "圖示及文字(_A)"
 
-#: ../src/shell/e-shell-window-actions.c:1197
+#: ../src/shell/e-shell-window-actions.c:1261
 msgid "Display window buttons with icons and text"
 msgstr "顯示視窗按鈕的圖示及文字"
 
-#: ../src/shell/e-shell-window-actions.c:1202
+#: ../src/shell/e-shell-window-actions.c:1266
 msgid "Tool_bar Style"
 msgstr "工具列風格(_B)"
 
-#: ../src/shell/e-shell-window-actions.c:1204
+#: ../src/shell/e-shell-window-actions.c:1268
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使用桌面工具列設定值顯示視窗按鈕"
 
-#: ../src/shell/e-shell-window-actions.c:1212
+#: ../src/shell/e-shell-window-actions.c:1276
 msgid "Delete Current View"
 msgstr "刪除目前的檢視"
 
-#: ../src/shell/e-shell-window-actions.c:1219
+#: ../src/shell/e-shell-window-actions.c:1283
 msgid "Save Custom View…"
 msgstr "儲存自訂檢視…"
 
-#: ../src/shell/e-shell-window-actions.c:1221
+#: ../src/shell/e-shell-window-actions.c:1285
 msgid "Save current custom view"
 msgstr "儲存目前的自訂檢視"
 
-#: ../src/shell/e-shell-window-actions.c:1235
+#: ../src/shell/e-shell-window-actions.c:1299
 msgid "C_urrent View"
 msgstr "目前檢視(_U)"
 
-#: ../src/shell/e-shell-window-actions.c:1245
+#: ../src/shell/e-shell-window-actions.c:1309
 msgid "Custom View"
 msgstr "自訂檢視"
 
-#: ../src/shell/e-shell-window-actions.c:1247
+#: ../src/shell/e-shell-window-actions.c:1311
 msgid "Current view is a customized view"
 msgstr "目前的檢視方式是自訂的檢視"
 
-#: ../src/shell/e-shell-window-actions.c:1255
+#: ../src/shell/e-shell-window-actions.c:1319
 msgid "Page Set_up…"
 msgstr "頁面設定(_U)…"
 
-#: ../src/shell/e-shell-window-actions.c:1257
+#: ../src/shell/e-shell-window-actions.c:1321
 msgid "Change the page settings for your current printer"
 msgstr "修改目前印表機的頁面列印設定"
 
-#: ../src/shell/e-shell-window-actions.c:1627
+#: ../src/shell/e-shell-window-actions.c:1696
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
 
-#: ../src/shell/e-shell-window-actions.c:1751
+#: ../src/shell/e-shell-window-actions.c:1820
 #, c-format
 msgid "Select view: %s"
 msgstr "選擇檢視:%s"
 
-#: ../src/shell/e-shell-window-actions.c:1768
+#: ../src/shell/e-shell-window-actions.c:1837
 #, c-format
 msgid "Delete view: %s"
 msgstr "刪除檢視:%s"
 
-#: ../src/shell/e-shell-window-actions.c:1878
+#: ../src/shell/e-shell-window-actions.c:1952
 msgid "Execute these search parameters"
 msgstr "執行這些搜尋參數"
 
@@ -26278,7 +26747,7 @@ msgid "New"
 msgstr "新增"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:786
+#: ../src/shell/e-shell-window-private.c:822
 #, c-format
 msgid "%s — Evolution"
 msgstr "%s — Evolution"
@@ -26565,81 +27034,82 @@ msgstr ""
 "編輯信任設定值:"
 
 #: ../src/smime/gui/certificate-manager.c:82
-#: ../src/smime/gui/certificate-manager.c:101
-#: ../src/smime/gui/certificate-manager.c:121
+#: ../src/smime/gui/certificate-manager.c:102
+#: ../src/smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "憑證名稱"
 
 #: ../src/smime/gui/certificate-manager.c:83
-#: ../src/smime/gui/certificate-manager.c:103
+#: ../src/smime/gui/certificate-manager.c:104
 msgid "Issued To Organization"
 msgstr "發給組織"
 
 #: ../src/smime/gui/certificate-manager.c:84
-#: ../src/smime/gui/certificate-manager.c:104
+#: ../src/smime/gui/certificate-manager.c:105
 msgid "Issued To Organizational Unit"
 msgstr "發給組織單位"
 
 #: ../src/smime/gui/certificate-manager.c:85
-#: ../src/smime/gui/certificate-manager.c:105
-#: ../src/smime/gui/certificate-manager.c:123
+#: ../src/smime/gui/certificate-manager.c:106
+#: ../src/smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "序號"
 
 #: ../src/smime/gui/certificate-manager.c:86
-#: ../src/smime/gui/certificate-manager.c:106
-#: ../src/smime/gui/certificate-manager.c:124
+#: ../src/smime/gui/certificate-manager.c:107
+#: ../src/smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "用途"
 
 #: ../src/smime/gui/certificate-manager.c:87
-#: ../src/smime/gui/certificate-manager.c:107
-#: ../src/smime/gui/certificate-manager.c:125
+#: ../src/smime/gui/certificate-manager.c:108
+#: ../src/smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "發照者"
 
 #: ../src/smime/gui/certificate-manager.c:88
-#: ../src/smime/gui/certificate-manager.c:108
-#: ../src/smime/gui/certificate-manager.c:126
+#: ../src/smime/gui/certificate-manager.c:109
+#: ../src/smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "發照組織"
 
 #: ../src/smime/gui/certificate-manager.c:89
-#: ../src/smime/gui/certificate-manager.c:109
-#: ../src/smime/gui/certificate-manager.c:127
+#: ../src/smime/gui/certificate-manager.c:110
+#: ../src/smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "發照組織單位"
 
 #: ../src/smime/gui/certificate-manager.c:90
-#: ../src/smime/gui/certificate-manager.c:110
-#: ../src/smime/gui/certificate-manager.c:128
+#: ../src/smime/gui/certificate-manager.c:111
+#: ../src/smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "發行者"
 
 #: ../src/smime/gui/certificate-manager.c:91
-#: ../src/smime/gui/certificate-manager.c:111
-#: ../src/smime/gui/certificate-manager.c:129
+#: ../src/smime/gui/certificate-manager.c:112
+#: ../src/smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "到期"
 
-#: ../src/smime/gui/certificate-manager.c:92
-#: ../src/smime/gui/certificate-manager.c:112
-#: ../src/smime/gui/certificate-manager.c:130
+#. { G_TYPE_STRING, N_("SHA256 Fingerprint"),          e_cert_get_sha256_fingerprint,  FALSE },
+#: ../src/smime/gui/certificate-manager.c:93
+#: ../src/smime/gui/certificate-manager.c:114
+#: ../src/smime/gui/certificate-manager.c:133
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-#: ../src/smime/gui/certificate-manager.c:93
-#: ../src/smime/gui/certificate-manager.c:113
-#: ../src/smime/gui/certificate-manager.c:131
+#: ../src/smime/gui/certificate-manager.c:94
+#: ../src/smime/gui/certificate-manager.c:115
+#: ../src/smime/gui/certificate-manager.c:134
 msgid "MD5 Fingerprint"
 msgstr "MD5 指紋"
 
-#: ../src/smime/gui/certificate-manager.c:102
-#: ../src/smime/gui/certificate-manager.c:122
+#: ../src/smime/gui/certificate-manager.c:103
+#: ../src/smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "電子郵件位址"
 
-#: ../src/smime/gui/certificate-manager.c:648
+#: ../src/smime/gui/certificate-manager.c:650
 msgid "Select a file to backup your key and certificate…"
 msgstr "選擇用來備份您的金鑰與憑證的檔案…"
 
@@ -26648,31 +27118,31 @@ msgstr "選擇用來備份您的金鑰與憑證的檔案…"
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../src/smime/gui/certificate-manager.c:658
+#: ../src/smime/gui/certificate-manager.c:660
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-backup.p12"
 
-#: ../src/smime/gui/certificate-manager.c:721
+#: ../src/smime/gui/certificate-manager.c:719
 msgid "Backup Certificate"
 msgstr "備份憑證"
 
 #. filename selection
-#: ../src/smime/gui/certificate-manager.c:736
+#: ../src/smime/gui/certificate-manager.c:734
 msgid "_File name:"
 msgstr "檔案名稱(_F):"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../src/smime/gui/certificate-manager.c:741
+#: ../src/smime/gui/certificate-manager.c:739
 msgid "Please select a file…"
 msgstr "請選擇檔案…"
 
-#: ../src/smime/gui/certificate-manager.c:755
+#: ../src/smime/gui/certificate-manager.c:753
 msgid "_Include certificate chain in the backup"
 msgstr "備份中包含憑證鏈(_I)"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:761
+#: ../src/smime/gui/certificate-manager.c:759
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -26681,16 +27151,16 @@ msgstr ""
 "您在這裡設定的憑證備份密碼可以保護即將建立的備份檔案。\n"
 "您必須設定這個密碼才能繼續備份。"
 
-#: ../src/smime/gui/certificate-manager.c:780
+#: ../src/smime/gui/certificate-manager.c:778
 msgid "_Repeat Password:"
 msgstr "重複密碼(_R):"
 
-#: ../src/smime/gui/certificate-manager.c:799
+#: ../src/smime/gui/certificate-manager.c:797
 msgid "Passwords do not match"
 msgstr "密碼不相符"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:807
+#: ../src/smime/gui/certificate-manager.c:805
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -26701,134 +27171,134 @@ msgstr ""
 "如果您忘記您的憑證備份密碼,您將無法在稍後還原這個備份。\n"
 "請將它保存在安全的地方。"
 
-#: ../src/smime/gui/certificate-manager.c:852
+#: ../src/smime/gui/certificate-manager.c:850
 msgid "No file name provided"
 msgstr "沒有提供檔案名稱"
 
-#: ../src/smime/gui/certificate-manager.c:856
+#: ../src/smime/gui/certificate-manager.c:854
 msgid "Failed to backup key and certificate"
 msgstr "無法備份您的金鑰與憑證"
 
-#: ../src/smime/gui/certificate-manager.c:948
+#: ../src/smime/gui/certificate-manager.c:946
 msgid "Select a certificate to import…"
 msgstr "選取要匯入的憑證…"
 
-#: ../src/smime/gui/certificate-manager.c:997
+#: ../src/smime/gui/certificate-manager.c:995
 msgid "Failed to import certificate"
 msgstr "無法匯入憑證"
 
-#: ../src/smime/gui/certificate-manager.c:1114
+#: ../src/smime/gui/certificate-manager.c:1112
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "使用時詢問"
 
-#: ../src/smime/gui/certificate-manager.c:1116
+#: ../src/smime/gui/certificate-manager.c:1114
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "永不"
 
-#: ../src/smime/gui/certificate-manager.c:1118
+#: ../src/smime/gui/certificate-manager.c:1116
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "勉強的"
 
-#: ../src/smime/gui/certificate-manager.c:1120
+#: ../src/smime/gui/certificate-manager.c:1118
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "完全"
 
-#: ../src/smime/gui/certificate-manager.c:1122
+#: ../src/smime/gui/certificate-manager.c:1120
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "徹底的"
 
-#: ../src/smime/gui/certificate-manager.c:1124
+#: ../src/smime/gui/certificate-manager.c:1122
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "暫時的"
 
-#: ../src/smime/gui/certificate-manager.c:1330
+#: ../src/smime/gui/certificate-manager.c:1328
 msgid "Change certificate trust"
 msgstr "改變憑證信任度"
 
-#: ../src/smime/gui/certificate-manager.c:1342
+#: ../src/smime/gui/certificate-manager.c:1340
 #, c-format
 msgid "Change trust for the host “%s”:"
 msgstr "改變主機「%s」的憑證信任度:"
 
-#: ../src/smime/gui/certificate-manager.c:1366
+#: ../src/smime/gui/certificate-manager.c:1364
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "使用時詢問(_A)"
 
-#: ../src/smime/gui/certificate-manager.c:1367
+#: ../src/smime/gui/certificate-manager.c:1365
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "永遠不信任憑證(_N)"
 
-#: ../src/smime/gui/certificate-manager.c:1368
+#: ../src/smime/gui/certificate-manager.c:1366
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "暫時信任(只在此作業階段) (_T)"
 
-#: ../src/smime/gui/certificate-manager.c:1369
+#: ../src/smime/gui/certificate-manager.c:1367
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "最低限度信任(_M)"
 
-#: ../src/smime/gui/certificate-manager.c:1370
+#: ../src/smime/gui/certificate-manager.c:1368
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "完整信任(_F)"
 
-#: ../src/smime/gui/certificate-manager.c:1371
+#: ../src/smime/gui/certificate-manager.c:1369
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "絕對信任(_U)"
 
-#: ../src/smime/gui/certificate-manager.c:1375
+#: ../src/smime/gui/certificate-manager.c:1373
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
 msgstr "信任此網站之前,如果可以的話,您應該先檢查它的憑證以及它的政策和程序。"
 
-#: ../src/smime/gui/certificate-manager.c:1390
+#: ../src/smime/gui/certificate-manager.c:1388
 msgid "_Display certificate"
 msgstr "顯示憑證(_D)"
 
-#: ../src/smime/gui/certificate-manager.c:1595
+#: ../src/smime/gui/certificate-manager.c:1593
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "您已經擁有相關憑證檔案的,可以識別這些郵件伺服器:"
 
-#: ../src/smime/gui/certificate-manager.c:1626
+#: ../src/smime/gui/certificate-manager.c:1624
 msgid "Host name"
 msgstr "主機名稱"
 
-#: ../src/smime/gui/certificate-manager.c:1628
+#: ../src/smime/gui/certificate-manager.c:1626
 msgid "Issuer"
 msgstr "簽發者"
 
-#: ../src/smime/gui/certificate-manager.c:1629
+#: ../src/smime/gui/certificate-manager.c:1627
 msgid "Fingerprint"
 msgstr "指紋"
 
-#: ../src/smime/gui/certificate-manager.c:1630
+#: ../src/smime/gui/certificate-manager.c:1628
 msgid "Trust"
 msgstr "信任"
 
-#: ../src/smime/gui/certificate-manager.c:1651
+#: ../src/smime/gui/certificate-manager.c:1649
 msgid "_Edit Trust"
 msgstr "編輯信任度(_E)"
 
-#: ../src/smime/gui/certificate-manager.c:2105
+#: ../src/smime/gui/certificate-manager.c:2085
 msgid "All PKCS12 files"
 msgstr "所有的 PKCS12 檔案"
 
-#: ../src/smime/gui/certificate-manager.c:2122
+#: ../src/smime/gui/certificate-manager.c:2102
 msgid "All email certificate files"
 msgstr "所有的電子郵件憑證檔案"
 
-#: ../src/smime/gui/certificate-manager.c:2139
+#: ../src/smime/gui/certificate-manager.c:2119
 msgid "All CA certificate files"
 msgstr "所有的 CA 憑證檔案"
 
@@ -26956,11 +27426,11 @@ msgid "C_ertificate:"
 msgstr "憑證(_E):"
 
 #. x509 certificate usage types
-#: ../src/smime/lib/e-cert.c:402
+#: ../src/smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "簽署"
 
-#: ../src/smime/lib/e-cert.c:403
+#: ../src/smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "加密"
 
@@ -27005,6 +27475,27 @@ msgstr "無法將儲存區寫入至磁碟,錯誤代碼為:%i"
 msgid "Imported Certificate"
 msgstr "輸入的憑證"
 
+#~ msgid "Event cannot be fully edited, because you are not the organizer"
+#~ msgstr "不能完整的編輯事件,因為您不是召集人"
+
+#~ msgid "Task cannot be fully edited, because you are not the organizer"
+#~ msgstr "不能完整的編輯工作,因為您不是召集人"
+
+#~ msgid "Ctrl-click to open a link"
+#~ msgstr "Ctrl-單擊以開啟連結"
+
+#~ msgid "_Plain Text"
+#~ msgstr "純文字(_P)"
+
+#~ msgid "<b>Colors</b>"
+#~ msgstr "<b>顏色</b>"
+
+#~ msgid "<b>Background Image</b>"
+#~ msgstr "<b>背景影像</b>"
+
+#~ msgid "_Destination"
+#~ msgstr "目的地(_D)"
+
 #~ msgid "Image file"
 #~ msgstr "影像檔案"
 
@@ -27021,9 +27512,6 @@ msgstr "輸入的憑證"
 #~ msgid "%s %s."
 #~ msgstr "%s %s。"
 
-#~ msgid "Security Information"
-#~ msgstr "保全性資訊"
-
 #~ msgid "Preserve exiting reminder by default"
 #~ msgstr "預設保留離開的提醒"
 


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