[evolution] Updated Chinese (Taiwan) translation



commit 2e548c4ad2c287d9cab56244b816afe94d2ff20e
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Feb 21 10:34:55 2015 +0000

    Updated Chinese (Taiwan) translation

 po/zh_TW.po |10231 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 6280 insertions(+), 3951 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9deca75..dc674d1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: evolution 3.3.91\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2014-02-24 17:56+0000\n"
-"PO-Revision-Date: 2014-03-04 15:17+0800\n"
+"POT-Creation-Date: 2015-01-30 17:22+0000\n"
+"PO-Revision-Date: 2015-02-17 21:31+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "Language: zh_TW\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.7.4\n"
 "X-Project-Style: gnome\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
@@ -116,24 +116,28 @@ msgid "Unable to perform search."
 msgstr "無法執行搜尋。"
 
 #: ../addressbook/addressbook.error.xml.h:20
+msgid "Failed to refresh address book '{0}'"
+msgstr "無法重新整理通訊錄「{0}」"
+
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "要儲存所做的變更?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "您已經修改此連絡人。要儲存這些變更?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "放棄(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
 msgstr "無法移動連絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -141,103 +145,103 @@ msgstr ""
 "您正在嘗試從某一個通訊錄,將連絡人移至另一個通訊錄,但是它無法從來源移除。您"
 "想要儲存一個副本來代替嗎?"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "你所選擇的圖片太大。您是否要改變大小後才儲存它?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "調整大小(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "將它視為(_U)"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "不要儲存(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "無法儲存 {0}。"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "將 {0} 儲存至 {1} 發生錯誤: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Address '{0}' already exists."
 msgstr "通訊錄「{0}」已存在"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
 msgstr "此連絡人的電子郵件地址已經存在。您無論如何都要加入同樣位址的新名片嗎?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-merging.c:625
+#: ../addressbook/gui/widgets/eab-contact-merging.c:723
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
+#: ../calendar/gui/dialogs/task-page.ui.h:30
 #: ../e-util/e-mail-signature-manager.c:327
-#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
-#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
-#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
+#: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
+#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
+#: ../mail/mail-config.ui.h:53 ../modules/mail/em-composer-prefs.c:397
 #: ../plugins/attachment-reminder/attachment-reminder.c:557
-#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "有些位址已在這個連絡人清單中。"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
 msgstr "您嘗試加入的位址已經是這個清單的一部分。要強制加入它們嗎?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "略過重複項目"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "加入重複項目"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "List '{0}' is already in this contact list."
 msgstr "清單「{0}」已經在這個連絡人清單中。"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
 msgstr "以「{0}」為名的連絡人清單已經存在這個連絡人清單中。要強制加入它嗎?"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1250
 msgid "Failed to delete contact"
 msgstr "刪除連絡人失敗"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "您沒有足夠的權限刪除這個通訊錄中的連絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "不能加入新的連絡人"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:45
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -245,12 +249,12 @@ msgstr ""
 "「{0}」是一個唯讀的通訊錄,不能被修改。請從連絡人檢視的側邊欄中選擇不同的通訊"
 "錄。"
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "Cannot save a contact, address book is still opening"
 msgstr "無法儲存連絡人,通訊錄仍在開啟中"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:47
+#: ../addressbook/addressbook.error.xml.h:48
 msgid ""
 "Cannot save a contact to the address book '{0}', because it is still "
 "opening. Either wait till it's opened, or select a different address book."
@@ -259,9 +263,9 @@ msgstr ""
 "是選擇不同的通訊錄。"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:734
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:744
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -294,81 +298,80 @@ msgid "Full _Name..."
 msgstr "全名(_N)…"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "可接受 H_TML 郵件"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/widgets/eab-contact-merging.c:408
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:589
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:966
 msgid "Email"
 msgstr "電子郵件"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "可接受 H_TML 郵件"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
 msgstr "電話"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "SIP Address"
+msgstr "SIP 位址"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Instant Messaging"
 msgstr "即時通訊"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1002
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "連絡人"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "_Home Page:"
 msgstr "首頁(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/itip-formatter/itip-view.c:1891
+#: ../modules/itip-formatter/itip-view.c:1881
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "_Free/Busy:"
 msgstr "空閒/忙碌(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "_Video Chat:"
 msgstr "視訊交談(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Home Page:"
 msgstr "首頁:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:96
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../modules/cal-config-google/e-cal-config-google.c:93
 msgid "Calendar:"
 msgstr "行事曆:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Free/Busy:"
 msgstr "空閒/忙碌:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Video Chat:"
 msgstr "視訊聊天:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "_Blog:"
 msgstr "部落格(_B):"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Blog:"
 msgstr "部落格:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Addresses"
-msgstr "網址"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-msgid "Web addresses"
+msgid "Web Addresses"
 msgstr "網址"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
@@ -417,8 +420,8 @@ msgid "_Anniversary:"
 msgstr "週年紀念日(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
-#: ../calendar/gui/e-calendar-view.c:2277
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../calendar/gui/e-calendar-view.c:1996
 msgid "Anniversary"
 msgstr "週年紀念日"
 
@@ -428,8 +431,8 @@ msgstr "週年紀念日"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
-#: ../calendar/gui/e-calendar-view.c:2276 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
 msgid "Birthday"
 msgstr "生日"
 
@@ -466,28 +469,25 @@ msgid "_Address:"
 msgstr "地址(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/e-contact-map.c:371
 #: ../addressbook/gui/widgets/eab-contact-display.c:356
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:369
 msgid "Home"
 msgstr "住家"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:384
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../addressbook/gui/widgets/e-contact-map.c:382
 msgid "Work"
 msgstr "工作"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:367
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:719
-#: ../calendar/gui/e-cal-model.c:3957
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:512
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:909
+#: ../calendar/gui/e-cal-model.c:3034
 msgid "Other"
 msgstr "其他"
 
@@ -500,168 +500,188 @@ msgid "Notes"
 msgstr "備註"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../calendar/gui/dialogs/comp-editor.c:1250
-#: ../calendar/gui/dialogs/comp-editor.c:1337 ../e-util/e-send-options.ui.h:41
-#: ../e-util/e-preferences-window.c:379
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell-window-actions.c:1041
+#: ../shell/e-shell-window-actions.c:1085
 msgid "_Help"
 msgstr "求助(_H)"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:34
+msgid "Options"
+msgstr "選項"
+
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3575
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3683
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../addressbook/gui/widgets/eab-contact-merging.c:362
-#: ../addressbook/gui/widgets/eab-contact-merging.c:620
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/eab-contact-merging.c:474
+#: ../addressbook/gui/widgets/eab-contact-merging.c:718
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:15
 #: ../calendar/gui/dialogs/recurrence-page.c:2322
-#: ../composer/e-composer-actions.c:204 ../e-util/e-send-options.ui.h:42
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/e-activity-bar.c:299 ../e-util/e-attachment-dialog.c:311
-#: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
-#: ../e-util/e-attachment-view.c:370 ../e-util/e-categories-dialog.c:82
-#: ../e-util/e-category-editor.c:138 ../e-util/e-category-editor.c:208
-#: ../e-util/e-charset-combo-box.c:101 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-mail-signature-script-dialog.c:366 ../e-util/e-passwords.c:468
+#: ../composer/e-composer-actions.c:267 ../e-util/e-activity-bar.c:340
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
+#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:370
+#: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
+#: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
+#: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-html-editor-actions.c:480 ../e-util/e-html-editor-actions.c:573
+#: ../e-util/e-image-chooser-dialog.c:171
+#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
 #: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
-#: ../e-util/e-source-config-dialog.c:375
-#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
-#: ../e-util/e-web-view.c:3081 ../e-util/evolution-source-viewer.c:832
+#: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
+#: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3044
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
-#: ../mail/e-mail-tag-editor.c:241 ../mail/em-folder-selector.c:278
-#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
-#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
+#: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
+#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
+#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:820 ../mail/mail-vfolder-ui.c:148
 #: ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:949
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:278
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:188
-#: ../modules/calendar/e-cal-attachment-handler.c:317
+#: ../modules/backup-restore/evolution-backup-tool.c:886
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:277
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:187
+#: ../modules/calendar/e-cal-attachment-handler.c:285
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
 #: ../plugins/publish-calendar/publish-calendar.c:806
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
-#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
+#: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
-#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
-#: ../smime/gui/e-cert-selector.c:232 ../smime/gui/smime-ui.ui.h:23
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:729
+#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:1335 ../smime/gui/e-cert-selector.c:237
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../addressbook/gui/widgets/eab-contact-merging.c:623
+#: ../addressbook/gui/widgets/eab-contact-merging.c:721
 #: ../calendar/calendar.error.xml.h:47
-#: ../calendar/gui/dialogs/comp-editor.c:1278
-#: ../composer/e-composer-actions.c:205 ../composer/e-composer-actions.c:296
-#: ../e-util/e-attachment-store.c:546
-#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3082
+#: ../calendar/gui/dialogs/comp-editor.c:1277
+#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:395
+#: ../e-util/e-attachment-store.c:636
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3045
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+#: ../smime/gui/certificate-manager.c:653
+#: ../smime/gui/certificate-manager.c:730
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
-msgid "AIM"
-msgstr "AIM"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "Show Telephone"
+msgstr "顯示電話"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
-msgid "Jabber"
-msgstr "Jabber"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+msgid "Show SIP Address"
+msgstr "顯示 SIP 位址"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
-msgid "Yahoo"
-msgstr "Yahoo"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+msgid "Show Instant Messaging"
+msgstr "顯示即時通訊"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+msgid "Show Web Addresses"
+msgstr "顯示網址"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
-msgid "MSN"
-msgstr "MSN"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+msgid "Show Job section"
+msgstr "顯示工作部門"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
-msgid "ICQ"
-msgstr "ICQ"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+msgid "Show Miscellaneous"
+msgstr "顯示其他選項"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+msgid "Show Home Mailing Address"
+msgstr "顯示住家郵寄地址"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
-msgid "Skype"
-msgstr "Skype"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+msgid "Show Work Mailing Address"
+msgstr "顯示工作郵寄地址"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
-msgid "Twitter"
-msgstr "Twitter"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+msgid "Show Other Mailing Address"
+msgstr "顯示其他郵寄地址"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+msgid "Show Notes"
+msgstr "顯示備註"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../e-util/e-html-editor-actions.c:994
+msgid "_Undo"
+msgstr "復原(_U)"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../calendar/gui/dialogs/comp-editor.c:1300 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "復原"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
-#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../e-util/e-html-editor-actions.c:980
+msgid "_Redo"
+msgstr "取消復原(_R)"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:1307 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "取消復原"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "新增連絡人時發生錯誤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Error modifying contact"
 msgstr "修改連絡人時發生錯誤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
 msgid "Error removing contact"
 msgstr "移除連絡人時發生錯誤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "連絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
 msgid "Please select an image for this contact"
 msgstr "請選取代表此連絡人的圖片"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
-#: ../e-util/e-category-editor.c:146 ../plugins/face/face.c:292
-#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
-#| msgid "Open"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
+#: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:481 ../e-util/e-html-editor-actions.c:574
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
 msgid "_No image"
 msgstr "沒有圖片(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -669,28 +689,28 @@ msgstr ""
 "連絡人資料無效:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "「%s」含有無效的格式"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "「%s」不能是未來日期"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s「%s」含有無效的格式"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s「%s」是空的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
@@ -702,24 +722,24 @@ msgstr "無效的連絡人。"
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 #: ../calendar/gui/dialogs/recurrence-page.c:2323
-#: ../e-util/e-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
-#: ../e-util/e-timezone-dialog.ui.h:3 ../e-util/e-attachment-dialog.c:313
-#: ../e-util/e-categories-dialog.c:83 ../e-util/e-category-editor.c:209
-#: ../e-util/e-charset-combo-box.c:102 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-passwords.c:469 ../e-util/e-rule-context.c:816
-#: ../e-util/e-rule-editor.c:181 ../e-util/e-rule-editor.c:283
-#: ../e-util/e-rule-editor.c:777 ../e-util/e-source-config-dialog.c:376
-#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
-#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:242
-#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
+#: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
+#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
+#: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
+#: ../e-util/e-html-editor-link-dialog.c:370 ../e-util/e-passwords.c:471
+#: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
+#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
+#: ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
+#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
 #: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
 #: ../mail/mail-vfolder-ui.c:271
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:167 ../smime/gui/e-cert-selector.c:233
-#: ../smime/gui/smime-ui.ui.h:24
-#| msgid "OK"
+#: ../shell/main.c:168 ../smime/gui/certificate-manager.c:1336
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "OK"
 
@@ -731,15 +751,15 @@ msgstr "快速新增連絡人"
 msgid "_Edit Full"
 msgstr "編輯全部(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "電子郵件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
 msgid "_Select Address Book"
 msgstr "選擇通訊錄(_S)"
 
@@ -846,14 +866,13 @@ msgstr "將電子郵件位址從清單移除"
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:23
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/filter.ui.h:18
-#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:224
-#: ../e-util/e-mail-signature-manager.c:367
-#: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
-#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:627
-#: ../mail/mail-config.ui.h:52
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:424
+#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
+#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
+#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:54
 #: ../plugins/attachment-reminder/attachment-reminder.c:567
-#: ../plugins/email-custom-header/email-custom-header.c:848
+#: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:807
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../plugins/templates/templates.c:463
@@ -875,7 +894,6 @@ msgstr "頂端(_T)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
 #: ../e-util/filter.ui.h:20
-#| msgid "_Update"
 msgid "_Up"
 msgstr "上(_U)"
 
@@ -893,41 +911,254 @@ msgstr "底部(_B)"
 msgid "Contact List Members"
 msgstr "連絡人清單成員"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
 msgstr "成員(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../modules/addressbook/e-book-shell-view-actions.c:1253
+msgid "Name contains"
+msgstr "名稱包含"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+msgid "Email begins with"
+msgstr "電子郵件開始於"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Any field contains"
+msgstr "任何欄位包含"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+msgid "evolution address book"
+msgstr "evolution 通訊錄"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "複製電子郵件位址(_E)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view.c:307
+msgid "Copy the email address to the clipboard"
+msgstr "複製電子郵件位址到剪貼簿"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view.c:312
+msgid "_Send New Message To..."
+msgstr "傳送新郵件至(_S)…"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view.c:314
+msgid "Send a mail message to this address"
+msgstr "傳送郵件到這個位址"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:290
+#: ../e-util/e-web-view.c:997
+#, c-format
+msgid "Click to mail %s"
+msgstr "按一下來傳送郵件 %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "開啟地圖"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr "SIP"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "清單成員:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "暱稱"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "公司"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "部門"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "辦公室"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "職業"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "位置"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "主管"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "助理"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+msgid "Video Chat"
+msgstr "視訊交談"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view.c:570
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "行事曆"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "空閒/忙碌"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "電話"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+msgid "Fax"
+msgstr "傳真"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+msgid "Address"
+msgstr "地址"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "首頁"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "網誌"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "行動電話"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "配偶"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "個人"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "備註"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "清單成員"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "職稱"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "首頁"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+msgid "Blog"
+msgstr "部落格"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:261
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+#: ../addressbook/gui/widgets/eab-contact-merging.c:457
 msgid "Merge Contact"
 msgstr "合併連絡人"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:363
-#: ../addressbook/gui/widgets/eab-contact-merging.c:626
+#: ../addressbook/gui/widgets/eab-contact-merging.c:475
+#: ../addressbook/gui/widgets/eab-contact-merging.c:724
 msgid "_Merge"
 msgstr "合併(_M)"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:615
+#: ../addressbook/gui/widgets/eab-contact-merging.c:713
 msgid "Duplicate Contact Detected"
 msgstr "偵測到重複的連絡人"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:670
+#: ../addressbook/gui/widgets/eab-contact-merging.c:771
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -935,7 +1166,7 @@ msgstr ""
 "此連絡人的名稱或電子郵件地址已經存在\n"
 "於此資料夾。要強制儲存變更嗎?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:673
+#: ../addressbook/gui/widgets/eab-contact-merging.c:774
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -943,41 +1174,128 @@ msgstr ""
 "此連絡人的名稱或電子郵件地址已經存在\n"
 "於此資料夾。您無論如何都要新增它嗎?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:687
+#: ../addressbook/gui/widgets/eab-contact-merging.c:789
 msgid "Changed Contact:"
 msgstr "變更後的連絡人:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:689
+#: ../addressbook/gui/widgets/eab-contact-merging.c:791
 msgid "New Contact:"
 msgstr "新的連絡人:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:725
+#: ../addressbook/gui/widgets/eab-contact-merging.c:830
 msgid "Conflicting Contact:"
 msgstr "衝突的連絡人:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:727
+#: ../addressbook/gui/widgets/eab-contact-merging.c:832
 msgid "Old Contact:"
 msgstr "舊的連絡人:"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1150
-msgid "Name contains"
-msgstr "名稱包含"
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"我們無法開啟這個目錄服務。這可能表示此目錄服務未標記為離線用途或者尚未下載以"
+"供離線使用。請於上線模式再次讀取目錄服務以下載它的內容。"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1143
-msgid "Email begins with"
-msgstr "電子郵件開始於"
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"我們無法開啟這個目錄服務。請檢查路徑 %s 是否存在而且權限已設定可以存取它。"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1136
-#: ../modules/calendar/e-cal-shell-view-actions.c:1770
-#: ../modules/calendar/e-memo-shell-view-actions.c:790
-#: ../modules/calendar/e-task-shell-view-actions.c:989
-msgid "Any field contains"
-msgstr "任何欄位包含"
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"此 Evolution 版本未將 LDAP 支援編譯進去。如果您想在 Evolution 使用 LDAP,必須"
+"安裝啟用 LDAP 的 Evolution 套件。"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr "我們無法開啟這個目錄服務。這表示您輸入錯誤的URI,或伺服器無法連線。"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "Detailed error message:"
+msgstr "詳細的錯誤訊息:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"符合此次查詢的名片超過伺服器設定傳回\n"
+"或是 Evolution 設定顯示的數量。\n"
+"請使用更加明確的查詢或是提高此目錄服務的目錄\n"
+"伺服器偏好設定中的結果限制。"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"執行此次查詢的時間超過了伺服器的限制或是您為\n"
+"此目錄服務所設定的上限。請使用更加明確的查詢\n"
+"或是提高此目錄服務的目錄伺服器偏好設定中的\n"
+"時間上限。"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "此目錄服務的後端程式無法解析這次的查詢。%s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "此目錄服務的後端程式拒絕執行這次的查詢。%s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "這次的查詢並未完全成功。%s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "選擇通訊錄"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "清單"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "將連絡人移到"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "複製連絡人到"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "將連絡人移到"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "複製連絡人到"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
@@ -1014,7 +1332,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "從剪貼簿貼上連絡人"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:1053
 msgid "Delete selected contacts"
 msgstr "刪除選定的連絡人"
 
@@ -1049,16 +1367,17 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "您確定要刪除這個連絡人 (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1331
-#: ../calendar/gui/dialogs/comp-editor.c:1243
-#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:742
-#: ../e-util/evolution-source-viewer.c:803
-#: ../mail/e-mail-account-manager.c:737
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:844
-#: ../modules/mail/e-mail-shell-view-actions.c:1561
-#: ../shell/e-shell-window-actions.c:899 ../smime/gui/smime-ui.ui.h:10
+#: ../calendar/gui/dialogs/comp-editor.c:1242
+#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:785
+#: ../e-util/evolution-source-viewer.c:805
+#: ../mail/e-mail-account-manager.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:1125
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/mail/e-mail-shell-view-actions.c:1661
+#: ../shell/e-shell-window-actions.c:943
+#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "刪除(_D)"
 
@@ -1095,11 +1414,6 @@ msgstr "名"
 msgid "Family Name"
 msgstr "姓"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:591
-msgid "Nickname"
-msgstr "暱稱"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "電子郵件 2"
@@ -1152,11 +1466,6 @@ msgstr "住家傳真"
 msgid "ISDN Phone"
 msgstr "ISDN 電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
-msgid "Mobile Phone"
-msgstr "行動電話"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "其它電話"
@@ -1191,20 +1500,10 @@ msgstr "電報"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:644
-msgid "Company"
-msgstr "公司"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "單位"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
-msgid "Office"
-msgstr "辦公室"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "頭銜"
@@ -1215,16 +1514,6 @@ msgstr "頭銜"
 msgid "Role"
 msgstr "角色"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
-msgid "Manager"
-msgstr "主管"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
-msgid "Assistant"
-msgstr "助理"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "網址"
@@ -1241,36 +1530,56 @@ msgstr "日誌"
 msgid "Categories"
 msgstr "分類"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
-msgid "Spouse"
-msgstr "配偶"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "開啟"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
-msgid "Note"
-msgstr "備註"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "連絡人清單: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "連絡人: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:187
+msgid "evolution minicard"
+msgstr "Evolution 迷你名片"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "新增連絡人"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:375
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "新增連絡人清單"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "目前的通訊錄資料夾 %s 有 %d 張名片"
+
+#: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
 msgstr "連絡人地圖"
 
 #. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:410
-#| msgid "_Zoom In"
+#: ../addressbook/gui/widgets/e-contact-map-window.c:412
 msgid "Zoom _In"
 msgstr "拉近(_I)"
 
 #. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:418
-#: ../mail/e-mail-reader.c:2226
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420
+#: ../mail/e-mail-reader.c:2360
 msgid "Zoom _Out"
 msgstr "拉遠(_O)"
 
 #. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:448
-#: ../shell/e-shell-window-actions.c:976
-#| msgid "_Find Now"
+#: ../addressbook/gui/widgets/e-contact-map-window.c:450
+#: ../e-util/e-html-editor-actions.c:1972
+#: ../e-util/e-html-editor-find-dialog.c:195
+#: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "尋找(_F)"
 
@@ -1332,276 +1641,12 @@ msgstr ""
 "\n"
 "沒有項目可供這種檢視方式顯示。"
 
-#: ../addressbook/gui/widgets/e-minicard.c:92
-msgid "Work Email"
-msgstr "工作電子郵件"
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Home Email"
-msgstr "住家電子郵件"
-
-#: ../addressbook/gui/widgets/e-minicard.c:94
-#: ../addressbook/gui/widgets/e-minicard.c:827
-msgid "Other Email"
-msgstr "其它電子郵件"
-
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
-msgid "evolution address book"
-msgstr "evolution 通訊錄"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
-msgid "New Contact"
-msgstr "新增連絡人"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact List"
-msgstr "新增連絡人清單"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "目前的通訊錄資料夾 %s 有 %d 張名片"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:33
-msgid "Open"
-msgstr "開啟"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:159
-msgid "Contact List: "
-msgstr "連絡人清單: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact: "
-msgstr "連絡人: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:187
-msgid "evolution minicard"
-msgstr "Evolution 迷你名片"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
-msgid "Copy _Email Address"
-msgstr "複製電子郵件位址(_E)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
-msgid "Copy the email address to the clipboard"
-msgstr "複製電子郵件位址到剪貼簿"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:309
-msgid "_Send New Message To..."
-msgstr "傳送新郵件至(_S)…"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:311
-msgid "Send a mail message to this address"
-msgstr "傳送郵件到這個位址"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:987
-#, c-format
-msgid "Click to mail %s"
-msgstr "按一下來傳送郵件 %s"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
-msgid "Open map"
-msgstr "開啟地圖"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:528
-msgid "List Members:"
-msgstr "清單成員:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
-msgid "Department"
-msgstr "部門"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
-msgid "Profession"
-msgstr "職業"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
-msgid "Position"
-msgstr "位置"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
-msgid "Video Chat"
-msgstr "視訊交談"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-#: ../e-util/e-send-options.c:545
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
-#: ../modules/calendar/e-cal-shell-view.c:590
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "行事曆"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../calendar/gui/dialogs/event-editor.c:342
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "空閒/忙碌"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
-msgid "Phone"
-msgstr "電話"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
-msgid "Fax"
-msgstr "傳真"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:709
-msgid "Address"
-msgstr "地址"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
-msgid "Home Page"
-msgstr "首頁"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
-msgid "Web Log"
-msgstr "網誌"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
-msgid "Personal"
-msgstr "個人"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:930
-msgid "List Members"
-msgstr "清單成員"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:951
-msgid "Job Title"
-msgstr "職稱"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:992
-msgid "Home page"
-msgstr "首頁"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1002
-msgid "Blog"
-msgstr "部落格"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:121
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"我們無法開啟這個目錄服務。這可能表示此目錄服務未標記為離線用途或者尚未下載以"
-"供離線使用。請於上線模式再次讀取目錄服務以下載它的內容。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"我們無法開啟這個目錄服務。請檢查路徑 %s 是否存在而且權限已設定可以存取它。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"此 Evolution 版本未將 LDAP 支援編譯進去。如果您想在 Evolution 使用 LDAP,必須"
-"安裝啟用 LDAP 的 Evolution 套件。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr "我們無法開啟這個目錄服務。這表示您輸入錯誤的URI,或伺服器無法連線。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
-msgid "Detailed error message:"
-msgstr "詳細的錯誤訊息:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"符合此次查詢的名片超過伺服器設定傳回\n"
-"或是 Evolution 設定顯示的數量。\n"
-"請使用更加明確的查詢或是提高此目錄服務的目錄\n"
-"伺服器偏好設定中的結果限制。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:218
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"執行此次查詢的時間超過了伺服器的限制或是您為\n"
-"此目錄服務所設定的上限。請使用更加明確的查詢\n"
-"或是提高此目錄服務的目錄伺服器偏好設定中的\n"
-"時間上限。"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr "此目錄服務的後端程式無法解析這次的查詢。%s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr "此目錄服務的後端程式拒絕執行這次的查詢。%s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:237
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "這次的查詢並未完全成功。%s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:265
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-msgid "Select Address Book"
-msgstr "選擇通訊錄"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
-msgid "list"
-msgstr "清單"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
-msgid "Move contact to"
-msgstr "將連絡人移到"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Copy contact to"
-msgstr "複製連絡人到"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
-msgid "Move contacts to"
-msgstr "將連絡人移到"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Copy contacts to"
-msgstr "複製連絡人到"
-
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
-#: ../addressbook/importers/evolution-vcard-importer.c:280
-#: ../calendar/importers/icalendar-importer.c:439
-#: ../calendar/importers/icalendar-importer.c:934
-#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
+#: ../addressbook/importers/evolution-vcard-importer.c:249
+#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:935
+#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "匯入…"
 
@@ -1637,55 +1682,55 @@ msgstr "LDAP 資料交換格式 (.ldif)"
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸入器"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:665
+#: ../addressbook/importers/evolution-vcard-importer.c:634
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf、.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:666
+#: ../addressbook/importers/evolution-vcard-importer.c:635
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard 匯入程式"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:763
+#: ../addressbook/printing/e-contact-print.c:874
 #, c-format
 msgid "Page %d"
 msgstr "第 %d 頁"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:54
 msgid "Specify the output file instead of standard output"
 msgstr "指定輸出檔案而不是標準輸出"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "OUTPUTFILE"
 msgstr "輸出檔案"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local address book folders"
 msgstr "列出本地通訊錄資料夾"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Show cards as vcard or csv file"
 msgstr "將名片顯示成 vcard 或 csv 檔案"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:111
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "指令列引數錯誤,請使用 --help 選項來查看用法。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:147
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "Only support csv or vcard format."
 msgstr "僅支援 csv 或 vcard 格式。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:178
+#: ../addressbook/tools/evolution-addressbook-export.c:156
 msgid "Unhandled error"
 msgstr "未處理的錯誤"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 msgid "Can not open file"
 msgstr "無法開啟檔案"
@@ -1695,6 +1740,127 @@ msgstr "無法開啟檔案"
 msgid "Failed to open client '%s': %s"
 msgstr "無法開啟客戶端「%s」:%s"
 
+#: ../addressbook/util/eab-book-util.c:36
+msgctxt "addressbook-label"
+msgid "Work Email"
+msgstr "工作電子郵件"
+
+#: ../addressbook/util/eab-book-util.c:37
+msgctxt "addressbook-label"
+msgid "Home Email"
+msgstr "住家電子郵件"
+
+#: ../addressbook/util/eab-book-util.c:38
+msgctxt "addressbook-label"
+msgid "Other Email"
+msgstr "其他電子郵件"
+
+#: ../addressbook/util/eab-book-util.c:44
+#| msgid "Work"
+msgctxt "addressbook-label"
+msgid "Work SIP"
+msgstr "工作 SIP"
+
+#: ../addressbook/util/eab-book-util.c:45
+#| msgid "Home Page"
+msgctxt "addressbook-label"
+msgid "Home SIP"
+msgstr "住家 SIP"
+
+#: ../addressbook/util/eab-book-util.c:46
+#| msgid "Other"
+msgctxt "addressbook-label"
+msgid "Other SIP"
+msgstr "其他 SIP"
+
+#: ../addressbook/util/eab-book-util.c:74
+msgctxt "addressbook-label"
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/util/eab-book-util.c:75
+msgctxt "addressbook-label"
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/util/eab-book-util.c:76
+msgctxt "addressbook-label"
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/util/eab-book-util.c:77
+msgctxt "addressbook-label"
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/util/eab-book-util.c:78
+msgctxt "addressbook-label"
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/util/eab-book-util.c:79
+msgctxt "addressbook-label"
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/util/eab-book-util.c:80
+msgctxt "addressbook-label"
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/util/eab-book-util.c:81
+msgctxt "addressbook-label"
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/util/eab-book-util.c:82
+msgctxt "addressbook-label"
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/util/eab-book-util.c:83
+msgctxt "addressbook-label"
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#. To Translators:
+#. * if an email address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:126
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "電子郵件"
+
+#. To Translators:
+#. * if a SIP address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * SIP=Session Initiation Protocol, used for voice over IP
+#.
+#: ../addressbook/util/eab-book-util.c:173
+msgctxt "addressbook-label"
+msgid "SIP"
+msgstr "SIP"
+
+#. To Translators:
+#. * if an IM address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * IM=Instant Messaging
+#.
+#: ../addressbook/util/eab-book-util.c:216
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "即時通訊"
+
+#. To Translators:
+#. * if a phone number type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:271
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "電話"
+
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
@@ -1732,38 +1898,37 @@ msgstr "延期(_S)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../calendar/gui/dialogs/comp-editor.c:1321
 #: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#: ../calendar/gui/dialogs/task-page.ui.h:32 ../e-util/filter.ui.h:17
-#: ../e-util/e-categories-editor.c:278
-#: ../e-util/e-mail-signature-manager.c:357
-#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:56
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../e-util/e-categories-editor.c:278 ../e-util/e-html-editor-actions.c:1003
+#: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:58
 #: ../plugins/attachment-reminder/attachment-reminder.c:562
-#: ../plugins/email-custom-header/email-custom-header.c:843
+#: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/mail-to-task/mail-to-task.c:594
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1027
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#| msgid "Print"
 msgid "_Print"
 msgstr "列印(_P)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
 msgid "_Dismiss"
 msgstr "解除(_D)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1835
-#: ../calendar/alarm-notify/alarm-queue.c:1845
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:250
-#: ../modules/itip-formatter/itip-view.c:1503
-#: ../modules/itip-formatter/itip-view.c:1614
+#: ../calendar/alarm-notify/alarm-queue.c:1844
+#: ../calendar/alarm-notify/alarm-queue.c:1854
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../modules/itip-formatter/itip-view.c:1493
+#: ../modules/itip-formatter/itip-view.c:1604
 msgid "Location:"
 msgstr "位置:"
 
@@ -1778,70 +1943,70 @@ msgstr "忽略時間(_T):"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:142
-#: ../modules/calendar/e-cal-shell-view-actions.c:351
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:326
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "天"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:11
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:140
+#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "小時"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:138
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "分鐘"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1824
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1696
+#: ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No description available."
 msgstr "沒有任何描述。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1706
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1702
-#: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2147
+#: ../calendar/alarm-notify/alarm-queue.c:1711
+#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:2156
 msgid "Evolution Reminders"
 msgstr "Evolution 提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1755
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "您有 %d 個提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1965
+#: ../calendar/alarm-notify/alarm-queue.c:1974
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21
 #: ../mail/mail.error.xml.h:139
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "否(_N)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1971
+#: ../calendar/alarm-notify/alarm-queue.c:1980
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1858,7 +2023,7 @@ msgstr ""
 "\n"
 "您確定要執行這個程式?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../calendar/alarm-notify/alarm-queue.c:1995
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -1867,7 +2032,7 @@ msgid "invalid time"
 msgstr "失效時間"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:369
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -1875,7 +2040,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d 時"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:375
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -1885,7 +2050,7 @@ msgstr[0] "%d 分"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2250,64 +2415,188 @@ msgstr "此備忘錄清單尚未標記為離線使用。"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:87
+msgid "Failed to open calendar '{0}'"
+msgstr "無法開啟行事曆「{0}」"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:89
+msgid "Failed to open memo list '{0}'"
+msgstr "無法開啟備忘錄清單「{0}」"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:91
+msgid "Failed to open task list '{0}'"
+msgstr "無法開啟工作清單「{0}」"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+msgid "Failed to create an event in a calendar '{0}'"
+msgstr "無法在行事曆「{0}」建立事件"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:95
+msgid "Failed to create a memo in a memo list '{0}'"
+msgstr "無法在備忘錄清單「{0}」建立備忘錄"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:97
+msgid "Failed to create a task in a task list '{0}'"
+msgstr "無法在工作清單「{0}」建立工作"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+msgid "Failed to modify an event in a calendar '{0}'"
+msgstr "無法在行事曆「{0}」修改事件"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:101
+msgid "Failed to modify a memo in a memo list '{0}'"
+msgstr "無法在備忘錄清單「{0}」修改備忘錄"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:103
+msgid "Failed to modify a task in a task list '{0}'"
+msgstr "無法在工作清單「{0}」修改工作"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+msgid "Failed to delete an event in a calendar '{0}'"
+msgstr "無法在行事曆「{0}」刪除事件"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:107
+msgid "Failed to delete a memo in a memo list '{0}'"
+msgstr "無法在備忘錄清單「{0}」刪除備忘錄"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:109
+msgid "Failed to delete a task in a task list '{0}'"
+msgstr "無法在工作清單「{0}」刪除工作"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:111
+msgid "Failed to update an event in a calendar '{0}'"
+msgstr "無法在行事曆「{0}」更新事件"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:113
+msgid "Failed to update a memo in a memo list '{0}'"
+msgstr "無法在備忘錄清單「{0}」更新備忘錄"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:115
+msgid "Failed to update a task in a task list '{0}'"
+msgstr "無法在工作清單「{0}」更新工作"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:117
+msgid "Failed to send an event to a calendar '{0}'"
+msgstr "無法傳送事件到行事曆「{0}」"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:119
+msgid "Failed to send a memo to a memo list '{0}'"
+msgstr "無法傳送備忘錄到備忘錄清單「{0}」"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:121
+msgid "Failed to send a task to a task list '{0}'"
+msgstr "無法傳送工作到工作清單「{0}」"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:123
+msgid "Error creating view for a calendar '{0}'"
+msgstr "建立行事曆「{0}」的檢視時發生錯誤"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:125
+msgid "Error creating view for a task list '{0}'"
+msgstr "建立工作清單「{0}」的檢視時發生錯誤"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:127
+msgid "Error creating view for a memo list '{0}'"
+msgstr "建立備忘錄清單「{0}」的檢視時發生錯誤"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "無法複製事件到行事曆「{0}」"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:131
 msgid "Failed to copy a task into the task list '{0}'"
 msgstr "無法複製工作到工作清單「{0}」"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:133
 msgid "Failed to copy a memo into the memo list '{0}'"
 msgstr "無法複製備忘錄到備忘錄清單「{0}」"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:135
 msgid "Failed to move an event into the calendar '{0}'"
 msgstr "無法移動事件到行事曆「{0}」"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to move a task into the task list '{0}'"
 msgstr "無法移動工作到工作清單「{0}」"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:139
 msgid "Failed to move a memo into the memo list '{0}'"
 msgstr "無法移動備忘錄到備忘錄清單「{0}」"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:141
 msgid "Copying an event into the calendar '{0}'"
 msgstr "正在複製事件到行事曆「{0}」"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:143
 msgid "Copying a task into the task list '{0}'"
 msgstr "正在複製工作到工作清單「{0}」"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:145
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "正在複製備忘錄到備忘錄清單「{0}」"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:147
 msgid "Moving an event into the calendar '{0}'"
 msgstr "正在移動事件到行事曆「{0}」"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:149
 msgid "Moving a task into the task list '{0}'"
 msgstr "正在移動工作到工作清單「{0}」"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:151
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "正在移動工作到工作清單「{0}」"
 
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:153
+msgid "Failed to refresh calendar '{0}'"
+msgstr "無法重新整理行事曆「{0}」"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:155
+msgid "Failed to refresh task list '{0}'"
+msgstr "無法重新整理工作清單「{0}」"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:157
+msgid "Failed to refresh memo list '{0}'"
+msgstr "無法重新整理備忘錄清單「{0}」"
+
+#: ../calendar/calendar.error.xml.h:158
+msgid "Failed to make an occurrence movable"
+msgstr "無法將循環事件標示成可移動"
+
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
@@ -2317,18 +2606,20 @@ msgid "Summary"
 msgstr "摘要"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:55
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
+#: ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
 msgid "contains"
 msgstr "包含"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:56
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
+#: ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
 msgid "does not contain"
 msgstr "不包含"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
+#: ../e-util/e-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "說明"
@@ -2343,35 +2634,37 @@ msgid "Classification"
 msgstr "歸類"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:75
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
+#: ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
 msgid "is"
 msgstr "是"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:73
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
+#: ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
 msgid "is not"
 msgstr "不是"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:249 ../calendar/gui/e-cal-model.c:453
-#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
+#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278
+#: ../calendar/gui/e-cal-model.c:285 ../calendar/gui/e-task-table.c:498
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "公開"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287
+#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "私人"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:464
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-send-options.ui.h:7
+#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289
+#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-html-editor-page-dialog.c:114 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "機密"
 
@@ -2395,24 +2688,27 @@ msgid "Location"
 msgstr "位置"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:326
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
 msgid "Category"
 msgstr "分類"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
 #: ../em-format/e-mail-formatter-print-headers.c:203
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 msgid "Attachments"
 msgstr "附件"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:18
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 msgid "Exist"
 msgstr "存在"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:48
+#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Do Not Exist"
 msgstr "不存在"
 
@@ -2454,22 +2750,22 @@ msgid "Edit Reminder"
 msgstr "編輯提醒"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/e-alarm-list.c:424
 msgid "Pop up an alert"
 msgstr "顯示提示"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:407
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Play a sound"
 msgstr "播放音效"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:419
+#: ../calendar/gui/e-alarm-list.c:432
 msgid "Run a program"
 msgstr "執行外部程式"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:428
 msgid "Send an email"
 msgstr "傳送電子郵件"
 
@@ -2523,10 +2819,6 @@ msgstr "重複這個提醒(_R)"
 msgid "extra times every"
 msgstr "提醒間隔每"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
-msgid "Options"
-msgstr "選項"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "自訂訊息(_M)"
@@ -2565,7 +2857,7 @@ msgstr "動作/觸發"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 #: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Reminders"
 msgstr "提醒"
 
@@ -2617,292 +2909,293 @@ msgstr "%s  您沒有做任何變更,更新這個編輯器?"
 msgid "Could not save attachments"
 msgstr "無法儲存附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:625
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:759
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:768
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/dialogs/comp-editor.c:781
 #, c-format
 msgid "Memo - %s"
 msgstr "備忘錄 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:798
+#: ../calendar/gui/dialogs/comp-editor.c:797
 msgid "No Summary"
 msgstr "沒有摘要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:919
+#: ../calendar/gui/dialogs/comp-editor.c:918
 msgid "Keep original item?"
 msgstr "是否保持原始項目?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Unable to synchronize with the server"
 msgstr "無法與伺服器同步"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#. == Button box ==
+#: ../calendar/gui/dialogs/comp-editor.c:1221
 #: ../calendar/gui/dialogs/event-editor.c:116
 #: ../calendar/gui/dialogs/event-editor.c:310
 #: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:275
-#: ../e-util/e-mail-signature-editor.c:307
+#: ../composer/e-composer-actions.c:374 ../e-util/e-html-editor-dialog.c:196
+#: ../e-util/e-mail-signature-editor.c:295
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
-#: ../mail/em-folder-properties.c:416 ../mail/em-subscription-editor.c:1714
+#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:864
-#: ../smime/gui/certificate-manager.c:1182
+#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
+#: ../smime/gui/certificate-manager.c:2064
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1223
 msgid "Close the current window"
 msgstr "關閉目前的視窗"
 
 #. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:732
-#: ../e-util/e-text.c:2084 ../e-util/e-web-view-gtkhtml.c:452
-#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
-#: ../shell/e-shell-window-actions.c:885
-#| msgid "_Copy..."
+#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:959 ../e-util/e-text.c:2089
+#: ../e-util/e-web-view.c:339 ../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
-#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:733
-#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
-#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1302
-#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:887
+#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
+#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1326 ../mail/e-mail-browser.c:135
+#: ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "複製選取的內容"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:727
-#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
-#: ../shell/e-shell-window-actions.c:892
+#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:966 ../e-util/e-text.c:2075
+#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
-#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:728
-#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1296
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:894
+#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
+#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1320
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "剪下選取範圍"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
-#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:743
-#: ../shell/e-shell-window-actions.c:901
+#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
+#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
+#: ../shell/e-shell-window-actions.c:945
 msgid "Delete the selection"
 msgstr "刪除選取範圍"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "View help"
 msgstr "檢視求助"
 
 #. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:737
-#: ../e-util/e-text.c:2095 ../mail/e-mail-browser.c:147
-#: ../shell/e-shell-window-actions.c:920
-#| msgid "_Pascal"
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:973 ../e-util/e-text.c:2101
+#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
-#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:738
-#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1308
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:922
+#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
+#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1332
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿的內容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
-#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2128
-#: ../modules/addressbook/e-book-shell-view-actions.c:1160
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1263
+#: ../composer/e-composer-actions.c:428 ../mail/e-mail-reader.c:2262
+#: ../modules/addressbook/e-book-shell-view-actions.c:1263
+#: ../modules/addressbook/e-book-shell-view-actions.c:1277
 msgid "_Print..."
 msgstr "列印(_P)…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2135
-#: ../modules/addressbook/e-book-shell-view-actions.c:1167
-#: ../modules/calendar/e-cal-shell-view-actions.c:1801
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
-#| msgid "Preview"
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269
+#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../modules/calendar/e-cal-shell-view-actions.c:1642
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Pre_view..."
 msgstr "預覽(_V)…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "Save current changes"
 msgstr "儲存目前的變更"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
-#: ../e-util/e-mail-signature-editor.c:316
+#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
 msgstr "儲存並關閉"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Save current changes and close editor"
 msgstr "儲存目前的變更並且關閉編輯器"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:747
-#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:997
-#| msgid "Select All"
+#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:987 ../e-util/e-web-view.c:349
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
-#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:748
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:999
+#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
+#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "選取所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1316
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "_Classification"
 msgstr "歸類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1330
-#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1034
+#: ../calendar/gui/dialogs/comp-editor.c:1328
+#: ../e-util/e-html-editor-actions.c:1010
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
+#: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1344
+#: ../calendar/gui/dialogs/comp-editor.c:1342
+#: ../e-util/e-html-editor-actions.c:1031
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
-#: ../composer/e-composer-actions.c:319
+#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../composer/e-composer-actions.c:418
 msgid "_Options"
 msgstr "選項(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1358 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1076 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1052 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1120
+#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
-#: ../composer/e-composer-actions.c:268
+#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../composer/e-composer-actions.c:367
 msgid "_Attachment..."
 msgstr "附件(_A)…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1370
-#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../composer/e-composer-actions.c:369 ../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "附加檔案"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1376
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1380
+#: ../calendar/gui/dialogs/comp-editor.c:1378
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1384
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1386
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1399
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1404
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "Classify as private"
 msgstr "歸類為私人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1411
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1411
 msgid "Classify as confidential"
 msgstr "歸類為機密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1423
+#: ../calendar/gui/dialogs/comp-editor.c:1421
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1431
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1435
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1443
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2234
-#: ../composer/e-composer-actions.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../composer/e-composer-actions.c:636
 msgid "Attach"
 msgstr "附加"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2564
-#: ../calendar/gui/dialogs/comp-editor.c:2774
-#: ../calendar/gui/dialogs/comp-editor.c:3787
+#: ../calendar/gui/dialogs/comp-editor.c:2563
+#: ../calendar/gui/dialogs/comp-editor.c:2773
+#: ../calendar/gui/dialogs/comp-editor.c:3786
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有新的更新,則會放棄對此項目所做的變更"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3749
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
+#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3819
+#: ../calendar/gui/dialogs/comp-editor.c:3818
 msgid "Unable to use current version!"
 msgstr "無法使用目前的版本!"
 
@@ -2911,21 +3204,25 @@ msgstr "無法使用目前的版本!"
 msgid "Validation error: %s"
 msgstr "確認上的錯誤: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:120
-msgid "Could not open destination"
-msgstr "無法開啟目的地"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:129
+#: ../calendar/gui/e-cal-ops.c:1940
 msgid "Destination is read only"
 msgstr "目的地是唯讀"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:172
-msgid "Cannot create object"
-msgstr "不能建立物件"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:209
+#, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "正在複製事件到行事曆「%s」"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:215
+#, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "正在複製備忘錄到備忘錄清單「%s」"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:203
-msgid "Could not open source"
-msgstr "無法開啟來源"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:221
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "正在複製工作到工作清單「%s」"
 
 #: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Delete this item from all other recipient's mailboxes?"
@@ -2935,70 +3232,6 @@ msgstr "是否刪除其他所有收件者信箱中的這個項目(_D)?"
 msgid "_Retract comment"
 msgstr "收回註解(_R)"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:54
-#, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "由於 dbus 錯誤,所以無法刪除事件:%s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:58
-#, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "由於 dbus 錯誤,所以無法刪除工作:%s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:62
-#, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "由於 dbus 錯誤,所以無法刪除該備忘錄:%s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:66
-#, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "由於 dbus 錯誤,所以無法刪除項目:%s"
-
-#: ../calendar/gui/dialogs/delete-error.c:73
-msgid "The event could not be deleted because permission was denied"
-msgstr "因為權限被拒絕,所以無法刪除事件。"
-
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The task could not be deleted because permission was denied"
-msgstr "因為權限被拒絕,所以無法刪除工作。"
-
-#: ../calendar/gui/dialogs/delete-error.c:79
-msgid "The memo could not be deleted because permission was denied"
-msgstr "因為權限被拒絕,所以無法刪除該備忘錄。"
-
-#: ../calendar/gui/dialogs/delete-error.c:82
-msgid "The item could not be deleted because permission was denied"
-msgstr "因為權限被拒絕,所以無法刪除項目。"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:90
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "由於發生錯誤,所以無法刪除事件:%s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:94
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "由於發生錯誤,所以無法刪除工作:%s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:98
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "由於發生錯誤,所以無法刪除該備忘錄:%s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:102
-#, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "由於發生錯誤,所以無法刪除項目:%s"
-
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Enter Delegate"
 msgstr "輸入代表"
@@ -3060,7 +3293,7 @@ msgstr "空閒/忙碌(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "查詢此到會者的空閒/忙碌資訊"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
 msgid "Appointment"
 msgstr "約會"
 
@@ -3087,7 +3320,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "不能完整的編輯事件,因為您不是召集人"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3171
+#: ../calendar/gui/dialogs/event-page.c:3178
 msgid "This event has reminders"
 msgstr "這個事件具有提醒"
 
@@ -3096,75 +3329,75 @@ msgstr "這個事件具有提醒"
 msgid "Or_ganizer:"
 msgstr "會議召集人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:1302
+#: ../calendar/gui/dialogs/event-page.c:1309
 msgid "Event with no start date"
 msgstr "無開始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "Event with no end date"
 msgstr "無結束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/event-page.c:1490
 #: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1030
+#: ../calendar/gui/dialogs/task-page.c:1032
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1494
+#: ../calendar/gui/dialogs/event-page.c:1501
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1518
+#: ../calendar/gui/dialogs/event-page.c:1525
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1526
+#: ../calendar/gui/dialogs/event-page.c:1533
 msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/event-page.c:1697
 #: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1084
+#: ../calendar/gui/dialogs/task-page.c:1086
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
-#: ../calendar/gui/dialogs/event-page.c:1725
-#: ../calendar/gui/dialogs/task-page.c:1119
+#: ../calendar/gui/dialogs/event-page.c:1732
+#: ../calendar/gui/dialogs/task-page.c:1121
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1931
+#: ../calendar/gui/dialogs/event-page.c:1938
 msgid "_Delegatees"
 msgstr "代理者(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1933
+#: ../calendar/gui/dialogs/event-page.c:1940
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:3451
+#: ../calendar/gui/dialogs/event-page.c:3458
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "在每個約會前 %d 天"
 
-#: ../calendar/gui/dialogs/event-page.c:3457
+#: ../calendar/gui/dialogs/event-page.c:3464
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "約會前 %d 小時"
 
-#: ../calendar/gui/dialogs/event-page.c:3463
+#: ../calendar/gui/dialogs/event-page.c:3470
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "約會前 %d 分鐘"
 
-#: ../calendar/gui/dialogs/event-page.c:3484
-msgid "Customize"
+#: ../calendar/gui/dialogs/event-page.c:3491
+msgid "Custom"
 msgstr "自訂"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3491
+#: ../calendar/gui/dialogs/event-page.c:3498
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "沒有"
@@ -3207,6 +3440,8 @@ msgstr "位置(_L):"
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:29
 #: ../e-util/e-attachment-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:514
+#: ../e-util/e-html-editor-link-dialog.c:356
 msgid "_Description:"
 msgstr "描述(_D):"
 
@@ -3229,7 +3464,7 @@ msgstr "事件描述"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:26
 #: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Atte_ndees..."
 msgstr "到會者(_N)…"
 
@@ -3237,10 +3472,6 @@ msgstr "到會者(_N)…"
 msgid "_Reminder"
 msgstr "提醒(_R)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:31
-msgid "Custom Reminder:"
-msgstr "自訂提醒:"
-
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
 msgid "January"
 msgstr "一月"
@@ -3294,11 +3525,11 @@ msgid "Select Date"
 msgstr "選擇日期"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
 msgid "Select _Today"
 msgstr "選擇今天(_T)"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
 msgid "Memo"
 msgstr "備忘錄"
 
@@ -3321,8 +3552,9 @@ msgstr "不能完整的編輯備忘錄,因為您不是召集人"
 #: ../calendar/gui/dialogs/memo-page.c:1166
 #: ../em-format/e-mail-formatter-utils.c:201
 #: ../em-format/e-mail-formatter-utils.c:218
-#: ../em-format/e-mail-part-headers.c:48 ../mail/em-filter-i18n.h:52
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:65
+#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
+#: ../modules/mail/em-mailer-prefs.c:64
 msgid "To"
 msgstr "收件者"
 
@@ -3623,8 +3855,8 @@ msgstr "只通知新的到會者(_O)"
 msgid "_Send Options"
 msgstr "傳送選項(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
-#: ../e-util/e-send-options.c:552
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "工作"
 
@@ -3654,76 +3886,76 @@ msgid ""
 "assigned tasks"
 msgstr "不能編輯工作,因為選取的工作清單不支援指派工作"
 
-#: ../calendar/gui/dialogs/task-page.c:1011
+#: ../calendar/gui/dialogs/task-page.c:1013
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
-#: ../calendar/gui/dialogs/task-page.c:1179
-#: ../calendar/gui/dialogs/task-page.c:1204
+#: ../calendar/gui/dialogs/task-page.c:1181
+#: ../calendar/gui/dialogs/task-page.c:1206
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
+#: ../calendar/gui/e-cal-component-preview.c:338
+#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:313
 msgid "High"
 msgstr "高"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-cal-model.c:1643 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:308
+#: ../mail/message-list.c:312
 msgid "Normal"
 msgstr "一般"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
+#: ../calendar/gui/e-cal-component-preview.c:342
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
 msgid "Low"
 msgstr "低"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "未指定"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-component-preview.c:323
 #: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "未開始"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:313
 #: ../calendar/gui/e-cal-model-tasks.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3585
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3576
 msgid "In Progress"
 msgstr "進行中"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-component-preview.c:316
 #: ../calendar/gui/e-cal-model-tasks.c:314
 #: ../calendar/gui/e-cal-model-tasks.c:556
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
@@ -3731,11 +3963,11 @@ msgstr "已完成"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:319
 #: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
-#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:958
 msgid "Canceled"
 msgstr "已取消"
 
@@ -3771,56 +4003,56 @@ msgstr "歸類(_L):"
 msgid "_Web Page:"
 msgstr "網頁(_W):"
 
-#: ../calendar/gui/ea-cal-view.c:323
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New Appointment"
 msgstr "新增約會"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New All Day Event"
 msgstr "新增全天事件"
 
-#: ../calendar/gui/ea-cal-view.c:325
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "New Meeting"
 msgstr "新增會議"
 
-#: ../calendar/gui/ea-cal-view.c:326
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Today"
 msgstr "移至今日"
 
-#: ../calendar/gui/ea-cal-view.c:327
+#: ../calendar/gui/ea-cal-view.c:288
 msgid "Go to Date"
 msgstr "移至日期"
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:234
 msgid "It has reminders."
 msgstr "它具有提醒。"
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
 msgstr "它是週期性約會。"
 
-#: ../calendar/gui/ea-cal-view-event.c:303
+#: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
 msgstr "這是一項會議。"
 
-#: ../calendar/gui/ea-cal-view-event.c:310
+#: ../calendar/gui/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "行事曆事件:摘要為 %s。"
 
-#: ../calendar/gui/ea-cal-view-event.c:313
+#: ../calendar/gui/ea-cal-view-event.c:250
 msgid "Calendar Event: It has no summary."
 msgstr "行事曆事件:沒有摘要。"
 
-#: ../calendar/gui/ea-cal-view-event.c:336
+#: ../calendar/gui/ea-cal-view-event.c:273
 msgid "calendar view event"
 msgstr "行事曆檢視事件"
 
-#: ../calendar/gui/ea-cal-view-event.c:568
+#: ../calendar/gui/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "得到焦點"
 
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3828,89 +4060,33 @@ msgstr[0] "它有 %d 個事件。"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:160 ../calendar/gui/ea-week-view.c:156
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
 msgid "It has no events."
 msgstr "它沒有事件。"
 
-#: ../calendar/gui/ea-day-view.c:168
+#: ../calendar/gui/ea-day-view.c:121
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "工作週檢視:%s。%s"
 
-#: ../calendar/gui/ea-day-view.c:175
+#: ../calendar/gui/ea-day-view.c:128
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "日檢視:%s。%s"
 
-#: ../calendar/gui/ea-day-view.c:209
+#: ../calendar/gui/ea-day-view.c:157
 msgid "calendar view for a work week"
 msgstr "工作週的行事曆檢視"
 
-#: ../calendar/gui/ea-day-view.c:211
+#: ../calendar/gui/ea-day-view.c:159
 msgid "calendar view for one or more days"
 msgstr "用於一或多日的行事曆檢視"
 
-#: ../calendar/gui/ea-day-view-main-item.c:326
-#: ../calendar/gui/ea-week-view-main-item.c:353
+#: ../calendar/gui/ea-day-view-main-item.c:266
+#: ../calendar/gui/ea-week-view-main-item.c:295
 msgid "a table to view and select the current time range"
 msgstr "用來檢視與選擇時刻範圍的表格"
 
-#: ../calendar/gui/ea-gnome-calendar.c:47
-#: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1107
-msgid "Gnome Calendar"
-msgstr "Gnome 行事曆"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../modules/calendar/e-cal-shell-view-private.c:1190
-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.
-#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2795
-#: ../calendar/gui/e-day-view-top-item.c:858
-#: ../calendar/gui/e-week-view-main-item.c:218
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-msgid "%a %d %b"
-msgstr "%m月%d日 (%a)"
-
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../calendar/gui/ea-gnome-calendar.c:222
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
-#: ../modules/calendar/e-cal-shell-view-private.c:1203
-#: ../modules/calendar/e-cal-shell-view-private.c:1206
-msgid "%a %d %b %Y"
-msgstr "%Y年%m月%d日 (%a)"
-
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:249
-#: ../calendar/gui/ea-gnome-calendar.c:256
-#: ../calendar/gui/ea-gnome-calendar.c:259
-#: ../modules/calendar/e-cal-shell-view-private.c:1223
-#: ../modules/calendar/e-cal-shell-view-private.c:1234
-#: ../modules/calendar/e-cal-shell-view-private.c:1241
-#: ../modules/calendar/e-cal-shell-view-private.c:1244
-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.
-#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2811
-#: ../calendar/gui/e-day-view-top-item.c:862
-#: ../calendar/gui/e-week-view-main-item.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1230
-msgid "%d %b"
-msgstr "%m月%d日"
-
 #: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "跳躍按鈕"
@@ -3920,90 +4096,90 @@ msgid "Click here, you can find more events."
 msgstr "按這裡,您可以找到更多事件。"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:357 ../calendar/gui/misc.c:97
+#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:363
+#: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d 週"
 
-#: ../calendar/gui/e-alarm-list.c:425
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Unknown action to be performed"
 msgstr "要執行的未知動作"
 
-#: ../calendar/gui/e-alarm-list.c:440
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "於約會開始前 %2$s%1$s"
 
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:459
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "於約會開始後 %2$s%1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s 於約會開始時"
 
-#: ../calendar/gui/e-alarm-list.c:465
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "於約會結束前 %2$s%1$s"
 
-#: ../calendar/gui/e-alarm-list.c:471
+#: ../calendar/gui/e-alarm-list.c:484
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "於約會結束後 %2$s%1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s 於約會結束時"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:515
 #, c-format
 msgid "%s at %s"
 msgstr "%s 在 %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:510
+#: ../calendar/gui/e-alarm-list.c:523
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
-#: ../calendar/gui/ea-week-view.c:162
+#: ../calendar/gui/ea-week-view.c:114
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "月檢視:%s。%s"
 
-#: ../calendar/gui/ea-week-view.c:167
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "週檢視:%s。%s"
 
-#: ../calendar/gui/ea-week-view.c:201
+#: ../calendar/gui/ea-week-view.c:148
 msgid "calendar view for a month"
 msgstr "用於月的行事曆檢視"
 
-#: ../calendar/gui/ea-week-view.c:203
+#: ../calendar/gui/ea-week-view.c:150
 msgid "calendar view for one or more weeks"
 msgstr "用於一或多週的行事曆檢視"
 
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:758
 #: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "無標題"
@@ -4012,52 +4188,55 @@ msgstr "無標題"
 msgid "Categories:"
 msgstr "分類:"
 
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Summary:"
 msgstr "摘要:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:273
 msgid "Start Date:"
 msgstr "開始日期:"
 
-#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-cal-component-preview.c:285
 msgid "End Date:"
 msgstr "結束日期:"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:297
 msgid "Due Date:"
 msgstr "截止日期:"
 
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../modules/itip-formatter/itip-view.c:1506
-#: ../modules/itip-formatter/itip-view.c:1623
+#: ../calendar/gui/e-cal-component-preview.c:309
+#: ../modules/itip-formatter/itip-view.c:1496
+#: ../modules/itip-formatter/itip-view.c:1613
 msgid "Status:"
 msgstr "狀態:"
 
-#: ../calendar/gui/e-cal-component-preview.c:334
+#: ../calendar/gui/e-cal-component-preview.c:336
 msgid "Priority:"
 msgstr "優先等級:"
 
-#: ../calendar/gui/e-cal-component-preview.c:359
-#: ../mail/e-mail-config-service-page.c:671
+#: ../calendar/gui/e-cal-component-preview.c:361
+#: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "描述:"
 
-#: ../calendar/gui/e-cal-component-preview.c:390
+#: ../calendar/gui/e-cal-component-preview.c:392
 msgid "Web Page:"
 msgstr "網頁:"
 
-#: ../calendar/gui/e-calendar-selector.c:356
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../calendar/gui/e-cal-data-model.c:1608
 #, c-format
-msgid "Copying an event into the calendar %s"
-msgstr "正在複製事件到行事曆 %s"
+msgid "Creating view for calendar '%s'"
+msgstr "正在建立行事曆「%s」的檢視"
 
-#: ../calendar/gui/e-calendar-selector.c:357
-#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#: ../calendar/gui/e-cal-data-model.c:1612
 #, c-format
-msgid "Moving an event into the calendar %s"
-msgstr "正在移動事件到行事曆 %s"
+msgid "Creating view for task list '%s'"
+msgstr "正在建立工作清單「%s」的檢視"
+
+#: ../calendar/gui/e-cal-data-model.c:1616
+#, c-format
+msgid "Creating view for memo list '%s'"
+msgstr "正在建立備忘錄清單「%s」的檢視"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
@@ -4072,7 +4251,7 @@ msgstr "開始日期"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:158
+#: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "類型"
 
@@ -4080,7 +4259,7 @@ msgstr "類型"
 msgid "Completion date"
 msgstr "完成日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
 msgid "Complete"
 msgstr "完成"
 
@@ -4102,11 +4281,12 @@ msgstr "優先等級"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:4011
+#: ../calendar/gui/e-cal-model.c:3088
 #: ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:49
-#: ../mail/message-list.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
+#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
 msgid "Status"
 msgstr "狀態"
 
@@ -4123,37 +4303,51 @@ msgstr "已建立"
 msgid "Last modified"
 msgstr "修改日期"
 
-#: ../calendar/gui/e-calendar-view.c:445
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "剪下選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:451
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "複製選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:457
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "從剪貼簿貼上事件"
 
-#: ../calendar/gui/e-calendar-view.c:463
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "刪除選取的事件"
 
-#: ../calendar/gui/e-calendar-view.c:483 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:269
-msgid "Deleting selected objects"
-msgstr "刪除選定的物件"
+#: ../calendar/gui/e-calendar-view.c:810
+msgid "Pasted text doesn't contain valid iCalendar data"
+msgstr "貼上的文字並未包含有效的 iCalendar 資料"
+
+#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
+msgid "Default calendar not found"
+msgstr "找不到預設行事曆"
+
+#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
+msgid "Default memo list not found"
+msgstr "找不到預設備忘錄清單"
 
-#: ../calendar/gui/e-calendar-view.c:645 ../calendar/gui/e-memo-table.c:877
-#: ../calendar/gui/e-task-table.c:1175
-msgid "Updating objects"
-msgstr "更新物件"
+#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
+msgid "Default task list not found"
+msgstr "找不到預設工作清單"
+
+#: ../calendar/gui/e-calendar-view.c:918
+msgid "No suitable component found"
+msgstr "找不到合適的元件"
+
+#: ../calendar/gui/e-calendar-view.c:988
+msgid "Pasting iCalendar data"
+msgstr "貼上 iCalendar 資料"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:2083 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-calendar-view.c:1791 ../calendar/gui/e-memo-table.c:495
+#: ../calendar/gui/e-task-table.c:796
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "召集人: %s <%s>"
@@ -4161,25 +4355,65 @@ msgstr "召集人: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:2087 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:800
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2103
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
+#: ../calendar/gui/e-calendar-view.c:1811
+#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3527
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2134
+#: ../calendar/gui/e-calendar-view.c:1851
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
 
+#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/e-calendar-view.c:2242
+#: ../calendar/gui/e-calendar-view.c:2245
+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.
+#: ../calendar/gui/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2943
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%m月%d日"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+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.
+#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2927
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%m月%d日 (%a)"
+
+#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2268
+#: ../calendar/gui/e-calendar-view.c:2271
+msgid "%a %d %b %Y"
+msgstr "%Y年%m月%d日 (%a)"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
@@ -4189,77 +4423,99 @@ msgstr "開始日期"
 msgid "End Date"
 msgstr "結束日期"
 
-#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
 #: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3510
-#: ../modules/itip-formatter/itip-view.c:6097
+#: ../modules/itip-formatter/itip-view.c:3500
+#: ../modules/itip-formatter/itip-view.c:6087
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "不明"
 
-#: ../calendar/gui/e-cal-model.c:1667
+#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586
+#: ../calendar/gui/e-cal-ops.c:1209
+#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#, c-format
+msgid "Source with UID '%s' not found"
+msgstr "沒有 UID「%s」的資料來源"
+
+#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184
+#: ../calendar/gui/e-cal-ops.c:1325
+msgid "Creating an event"
+msgstr "建立一個事件"
+
+#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188
+#: ../calendar/gui/e-cal-ops.c:1329
+msgid "Creating a memo"
+msgstr "建立一份備忘錄"
+
+#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192
+#: ../calendar/gui/e-cal-ops.c:1333
+msgid "Creating a task"
+msgstr "建立一項工作"
+
+#: ../calendar/gui/e-cal-model.c:1645
 msgid "Recurring"
 msgstr "週期性模式"
 
-#: ../calendar/gui/e-cal-model.c:1669
+#: ../calendar/gui/e-cal-model.c:1647
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "否"
 
-#: ../calendar/gui/e-cal-model.c:3952
+#: ../calendar/gui/e-cal-model.c:3029
 #: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6085
+#: ../modules/itip-formatter/itip-view.c:6075
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-cal-model.c:3953
+#: ../calendar/gui/e-cal-model.c:3030
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6091
+#: ../modules/itip-formatter/itip-view.c:6081
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-cal-model.c:3954
+#: ../calendar/gui/e-cal-model.c:3031
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Tentative"
 msgstr "暫訂"
 
-#: ../calendar/gui/e-cal-model.c:3955
+#: ../calendar/gui/e-cal-model.c:3032
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6094
+#: ../modules/itip-formatter/itip-view.c:6084
 msgid "Delegated"
 msgstr "已委派"
 
-#: ../calendar/gui/e-cal-model.c:3956
+#: ../calendar/gui/e-cal-model.c:3033
 msgid "Needs action"
 msgstr "需要動作"
 
-#: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-cal-model-calendar.c:123
+#: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "空閒"
 
-#: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:126
+#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "忙碌"
 
@@ -4279,17 +4535,171 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "沒有"
 
+#: ../calendar/gui/e-cal-ops.c:283
+msgid "Modifying an event"
+msgstr "修改一個事件"
+
+#: ../calendar/gui/e-cal-ops.c:287
+msgid "Modifying a memo"
+msgstr "修改一份備忘錄"
+
+#: ../calendar/gui/e-cal-ops.c:291
+msgid "Modifying a task"
+msgstr "修改一項工作"
+
+#: ../calendar/gui/e-cal-ops.c:387
+msgid "Removing an event"
+msgstr "移除一個事件"
+
+#: ../calendar/gui/e-cal-ops.c:391
+msgid "Removing a memo"
+msgstr "移除一份備忘錄"
+
+#: ../calendar/gui/e-cal-ops.c:395
+msgid "Removing a task"
+msgstr "移除一項工作"
+
+#: ../calendar/gui/e-cal-ops.c:484
+#, c-format
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "刪除 %d 個事件"
+
+#: ../calendar/gui/e-cal-ops.c:488
+#, c-format
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "刪除 %d 份備忘錄"
+
+#: ../calendar/gui/e-cal-ops.c:492
+#, c-format
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "刪除 %d 項工作"
+
+#: ../calendar/gui/e-cal-ops.c:692
+#, c-format
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "貼上 %d 個事件"
+
+#: ../calendar/gui/e-cal-ops.c:707
+#, c-format
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "貼上 %d 份備忘錄"
+
+#: ../calendar/gui/e-cal-ops.c:722
+#, c-format
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "貼上 %d 項工作"
+
+#: ../calendar/gui/e-cal-ops.c:820
+msgid "Updating an event"
+msgstr "更新一個事件"
+
+#: ../calendar/gui/e-cal-ops.c:824
+msgid "Updating a memo"
+msgstr "更新一則備忘錄"
+
+#: ../calendar/gui/e-cal-ops.c:828
+msgid "Updating a task"
+msgstr "更新一項工作"
+
+#: ../calendar/gui/e-cal-ops.c:933
+#, c-format
+msgid "Getting events to purge in the calendar '%s'"
+msgstr "正在取得在行事曆「%s」中要清空的事件"
+
+#: ../calendar/gui/e-cal-ops.c:937
+#, c-format
+msgid "Getting memos to purge in the memo list '%s'"
+msgstr "正在取得在備忘錄清單「%s」中要清空的備忘錄"
+
+#: ../calendar/gui/e-cal-ops.c:941
+#, c-format
+msgid "Getting tasks to purge in the task list '%s'"
+msgstr "正在取得在工作清單「%s」中要清空的工作"
+
+#: ../calendar/gui/e-cal-ops.c:962
+#, c-format
+msgid "Purging events in the calendar '%s'"
+msgstr "正在清空行事曆「%s」中的事件"
+
+#: ../calendar/gui/e-cal-ops.c:966
+#, c-format
+msgid "Purging memos in the memo list '%s'"
+msgstr "正在清空備忘錄清單「%s」中的備忘錄"
+
+#: ../calendar/gui/e-cal-ops.c:970
+#, c-format
+msgid "Purging tasks in the task list '%s'"
+msgstr "正在清空工作清單「%s」中的工作"
+
+#: ../calendar/gui/e-cal-ops.c:1068
+msgid "Purging events"
+msgstr "正在清除事件"
+
+#: ../calendar/gui/e-cal-ops.c:1072
+msgid "Purging memos"
+msgstr "正在清除備忘錄"
+
+#: ../calendar/gui/e-cal-ops.c:1076
+msgid "Purging tasks"
+msgstr "正在清除工作"
+
+#: ../calendar/gui/e-cal-ops.c:1178
+msgid "Expunging completed tasks"
+msgstr "清除已完成的工作"
+
+#: ../calendar/gui/e-cal-ops.c:2034
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] "移個 %d 個事件"
+
+#: ../calendar/gui/e-cal-ops.c:2035
+#, c-format
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "正在複製 %d 個事件"
+
+#: ../calendar/gui/e-cal-ops.c:2041
+#, c-format
+msgid "Moving an memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "正在移動 %d 份備忘錄"
+
+#: ../calendar/gui/e-cal-ops.c:2042
+#, c-format
+msgid "Copying an memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "正在複製 %d 份備忘錄"
+
+#: ../calendar/gui/e-cal-ops.c:2048
+#, c-format
+msgid "Moving an task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "正在移動 %d 項工作"
+
+#: ../calendar/gui/e-cal-ops.c:2049
+#, c-format
+msgid "Copying an task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "正在複製 %d 項工作"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:158
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:161
+#: ../calendar/gui/e-cell-date-edit-text.c:168
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:169
+#: ../calendar/gui/e-cell-date-edit-text.c:176
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4299,16 +4709,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1985 ../calendar/gui/e-week-view.c:1539
+#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692
 #: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
+#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1988 ../calendar/gui/e-week-view.c:1542
+#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
 msgstr "下午"
 
@@ -4318,13 +4728,13 @@ msgstr "下午"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:2778 ../calendar/gui/e-day-view-top-item.c:854
-#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:2910 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 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
-#: ../calendar/gui/e-day-view.c:3442
+#: ../calendar/gui/e-day-view.c:3574
 #, c-format
 msgid "Week %d"
 msgstr "第 %d 週"
@@ -4335,17 +4745,17 @@ msgstr "第 %d 週"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:800
+#: ../calendar/gui/e-day-view-time-item.c:802
 #, c-format
 msgid "%02i minute divisions"
 msgstr "間隔 %02i 分鐘"
 
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 msgstr "顯示第二時區"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:842
+#: ../calendar/gui/e-day-view-time-item.c:844
 #: ../modules/calendar/e-calendar-preferences.c:305
 #: ../modules/calendar/e-calendar-preferences.c:357
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
@@ -4353,7 +4763,7 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "沒有"
 
-#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-day-view-time-item.c:878
 #: ../calendar/gui/e-timezone-entry.c:323
 #: ../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
@@ -4458,67 +4868,67 @@ msgstr "失敗原因:%s"
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "Out of Office"
 msgstr "不在辦公室"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:533
 msgid "No Information"
 msgstr "沒有資訊"
 
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "O_ptions"
 msgstr "選項(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:588
 msgid "Show _only working hours"
 msgstr "只顯示工作時間(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:601
 msgid "Show _zoomed out"
 msgstr "顯示縮小(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "_Update free/busy"
 msgstr "更新空閒/忙碌(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:636
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:654
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:673
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:694
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:726
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:763
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:792
+#: ../calendar/gui/e-meeting-time-sel.c:794
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2660
+#: ../calendar/gui/e-meeting-time-sel.c:2659
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4527,7 +4937,7 @@ msgstr ""
 "摘要:%s\n"
 "位置:%s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
+#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要:%s"
@@ -4556,46 +4966,46 @@ msgstr "普通名稱"
 msgid "Language"
 msgstr "語言"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:481
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:371
+#: ../modules/calendar/e-cal-shell-content.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view.c:308
 msgid "Memos"
 msgstr "備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
 msgid "* No Summary *"
 msgstr "* 沒有摘要 *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
+#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
 msgid "Start: "
 msgstr "開始:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
+#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
 msgid "Due: "
 msgstr "到期:"
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:684
 msgid "Cut selected memos to the clipboard"
 msgstr "剪下選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:747
+#: ../calendar/gui/e-memo-table.c:690
 msgid "Copy selected memos to the clipboard"
 msgstr "複製選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:753
+#: ../calendar/gui/e-memo-table.c:696
 msgid "Paste memos from the clipboard"
 msgstr "從剪貼簿貼上備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:759
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../calendar/gui/e-memo-table.c:702
+#: ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "刪除選定的備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:765
+#: ../calendar/gui/e-memo-table.c:708
 msgid "Select all visible memos"
 msgstr "選擇全部可見的備忘錄"
 
@@ -4607,40 +5017,40 @@ msgstr "請按這裡增加新的備忘錄"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
 #: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1071
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:438
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../calendar/importers/icalendar-importer.c:1072
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-cal-shell-content.c:1531
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view.c:466
 msgid "Tasks"
 msgstr "工作"
 
-#: ../calendar/gui/e-task-table.c:1039
+#: ../calendar/gui/e-task-table.c:999
 msgid "Cut selected tasks to the clipboard"
 msgstr "剪下選取的工作至剪貼簿"
 
-#: ../calendar/gui/e-task-table.c:1045
+#: ../calendar/gui/e-task-table.c:1005
 msgid "Copy selected tasks to the clipboard"
 msgstr "複製選取的工作至剪貼簿"
 
-#: ../calendar/gui/e-task-table.c:1051
+#: ../calendar/gui/e-task-table.c:1011
 msgid "Paste tasks from the clipboard"
 msgstr "從剪貼簿貼上工作"
 
-#: ../calendar/gui/e-task-table.c:1057
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../calendar/gui/e-task-table.c:1017
+#: ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
 
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-task-table.c:1023
 msgid "Select all visible tasks"
 msgstr "選擇全部可見的工作"
 
@@ -4651,40 +5061,36 @@ msgstr "選擇一個時區"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:226 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%m月%d日"
 
-#: ../calendar/gui/gnome-cal.c:2371
-msgid "Purging"
-msgstr "清除"
-
-#: ../calendar/gui/itip-utils.c:648 ../calendar/gui/itip-utils.c:706
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: ../calendar/gui/itip-utils.c:697
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
-#: ../calendar/gui/itip-utils.c:928 ../calendar/gui/itip-utils.c:1089
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../calendar/gui/itip-utils.c:931 ../calendar/gui/itip-utils.c:1092
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/itip-utils.c:934 ../calendar/gui/itip-utils.c:1095
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
 msgid "Memo information"
 msgstr "備忘錄資訊"
 
-#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1113
+#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:941
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
@@ -4692,7 +5098,7 @@ msgstr "行事曆資訊"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:977
+#: ../calendar/gui/itip-utils.c:978
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "已接受"
@@ -4701,7 +5107,7 @@ msgstr "已接受"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:984
+#: ../calendar/gui/itip-utils.c:985
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
@@ -4713,7 +5119,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".
-#: ../calendar/gui/itip-utils.c:991 ../calendar/gui/itip-utils.c:1039
+#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "已拒絕"
@@ -4722,7 +5128,7 @@ msgstr "已拒絕"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:998
+#: ../calendar/gui/itip-utils.c:999
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已委派"
@@ -4730,7 +5136,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".
-#: ../calendar/gui/itip-utils.c:1011
+#: ../calendar/gui/itip-utils.c:1012
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已更新"
@@ -4738,7 +5144,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".
-#: ../calendar/gui/itip-utils.c:1018
+#: ../calendar/gui/itip-utils.c:1019
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -4746,7 +5152,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".
-#: ../calendar/gui/itip-utils.c:1025
+#: ../calendar/gui/itip-utils.c:1026
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "重新整理"
@@ -4754,154 +5160,166 @@ 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".
-#: ../calendar/gui/itip-utils.c:1032
+#: ../calendar/gui/itip-utils.c:1033
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:1110
+#: ../calendar/gui/itip-utils.c:1111
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:1118
+#: ../calendar/gui/itip-utils.c:1119
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: ../calendar/gui/itip-utils.c:1146
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "無法取得資源,新的事件與其他事件有所重疊。"
 
-#: ../calendar/gui/itip-utils.c:1154
-#, c-format
-msgid "Unable to book a resource, error: %s"
-msgstr "無法取得資源,錯誤為:%s"
+#: ../calendar/gui/itip-utils.c:1153
+msgid "Unable to book a resource, error: "
+msgstr "無法預訂資源,錯誤為:"
 
-#: ../calendar/gui/itip-utils.c:1326
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的到會者。"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/itip-utils.c:1917
+msgid "Sending an event"
+msgstr "正在傳送事件"
+
+#: ../calendar/gui/itip-utils.c:1921
+msgid "Sending a memo"
+msgstr "正在傳送備忘錄"
+
+#: ../calendar/gui/itip-utils.c:1925
+msgid "Sending a task"
+msgstr "正在傳送工作"
+
+#: ../calendar/gui/print.c:664
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:670
 msgid "31st"
 msgstr "31日"
 
@@ -4909,102 +5327,102 @@ msgstr "31日"
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:726
+#: ../calendar/gui/print.c:730
 msgid "Mo"
 msgstr "一"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:731
 msgid "Tu"
 msgstr "二"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:732
 msgid "We"
 msgstr "三"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:733
 msgid "Th"
 msgstr "四"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:734
 msgid "Fr"
 msgstr "五"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:735
 msgid "Sa"
 msgstr "六"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:736
 msgid "Su"
 msgstr "日"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3319
+#: ../calendar/gui/print.c:3309
 msgid " to "
 msgstr " 到 "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3329
+#: ../calendar/gui/print.c:3319
 msgid " (Completed "
 msgstr " (已完成 "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3325
 msgid "Completed "
 msgstr "已完成 "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3345
+#: ../calendar/gui/print.c:3335
 msgid " (Due "
 msgstr "(期限 "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3352
+#: ../calendar/gui/print.c:3342
 msgid "Due "
 msgstr "期限 "
 
-#: ../calendar/gui/print.c:3555
+#: ../calendar/gui/print.c:3546
 msgid "Attendees: "
 msgstr "到會者:"
 
-#: ../calendar/gui/print.c:3599
+#: ../calendar/gui/print.c:3590
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
-#: ../calendar/gui/print.c:3615
+#: ../calendar/gui/print.c:3606
 #, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P): %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
-#: ../calendar/gui/print.c:3647
+#: ../calendar/gui/print.c:3638
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
-#: ../calendar/gui/print.c:3661
+#: ../calendar/gui/print.c:3652
 #, c-format
 msgid "Categories: %s"
 msgstr "分類: %s"
 
-#: ../calendar/gui/print.c:3672
+#: ../calendar/gui/print.c:3663
 msgid "Contacts: "
 msgstr "連絡人: "
 
@@ -5017,11 +5435,13 @@ msgstr "正在進行"
 msgid "% Completed"
 msgstr "% 已完成"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "大於"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
+#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "小於"
 
@@ -5029,177 +5449,181 @@ msgstr "小於"
 msgid "Appointments and Meetings"
 msgstr "約會和會議"
 
-#: ../calendar/importers/icalendar-importer.c:461
-#: ../calendar/importers/icalendar-importer.c:900
+#: ../calendar/importers/icalendar-importer.c:462
+#: ../calendar/importers/icalendar-importer.c:901
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
-#: ../calendar/importers/icalendar-importer.c:609
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 檔案 (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸入器"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:703
 msgid "Reminder!"
 msgstr "提醒!"
 
-#: ../calendar/importers/icalendar-importer.c:786
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar 檔案 (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸入器"
 
-#: ../calendar/importers/icalendar-importer.c:1064
+#: ../calendar/importers/icalendar-importer.c:1065
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
 #: ../calendar/importers/icalendar-importer.c:1108
+msgid "Gnome Calendar"
+msgstr "Gnome 行事曆"
+
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "會議"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
-#: ../calendar/importers/icalendar-importer.c:1182
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1183
+#: ../calendar/importers/icalendar-importer.c:1495
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "工作"
 
-#: ../calendar/importers/icalendar-importer.c:1185
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1496
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "備忘錄"
 
-#: ../calendar/importers/icalendar-importer.c:1194
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "具有週期性"
 
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "是一個實體"
 
-#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1205
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "具有提醒"
 
-#: ../calendar/importers/icalendar-importer.c:1209
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "具有附件"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1222
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "公開"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1226
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "私人"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "機密"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "歸類"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1237
-#: ../calendar/importers/icalendar-importer.c:1537
+#: ../calendar/importers/icalendar-importer.c:1238
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "摘要"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "位置"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1251
-#: ../calendar/importers/icalendar-importer.c:1532
+#: ../calendar/importers/icalendar-importer.c:1252
+#: ../calendar/importers/icalendar-importer.c:1533
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "開始"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1262
+#: ../calendar/importers/icalendar-importer.c:1263
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "到期"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "End"
 msgstr "結束"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1285
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "分類"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1309
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1316
+#: ../calendar/importers/icalendar-importer.c:1317
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1327
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1328
+#: ../calendar/importers/icalendar-importer.c:1331
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "會議召集人"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1350
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../calendar/importers/icalendar-importer.c:1351
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "到會者"
 
-#: ../calendar/importers/icalendar-importer.c:1367
+#: ../calendar/importers/icalendar-importer.c:1368
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "描述"
 
-#: ../calendar/importers/icalendar-importer.c:1527
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "類型"
@@ -6751,148 +7175,152 @@ msgstr "太平洋/瓦利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦島"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:63 ../mail/em-utils.c:131
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "不要再顯示這個訊息(_D)"
+
+#: ../composer/e-composer-actions.c:265
 msgid "Save as..."
 msgstr "另存新檔…"
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:376
 msgid "Close the current file"
 msgstr "關閉目前的檔案"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:381
 msgid "New _Message"
 msgstr "撰寫新郵件(_M)"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:383
 msgid "Open New Message window"
 msgstr "開啟新的郵件視窗"
 
-#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:934
-#| msgid "Mail Preferences"
+#: ../composer/e-composer-actions.c:388 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:936
+#: ../composer/e-composer-actions.c:390 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "設定 Evolution"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:397
 msgid "Save the current file"
 msgstr "儲存目前的檔案"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:402
 msgid "Save _As..."
 msgstr "另存新檔(_A)…"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:404
 msgid "Save the current file with a different name"
 msgstr "以另一個名稱儲存目前的檔案"
 
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:411
 msgid "Character _Encoding"
 msgstr "字元編碼(_E)"
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:435
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:442
 msgid "Save as _Draft"
 msgstr "儲存為草稿(_D)"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:444
 msgid "Save as draft"
 msgstr "儲存為草稿"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:449
 msgid "S_end"
 msgstr "傳送(_E)"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:451
 msgid "Send this message"
 msgstr "傳送這個郵件"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:459
 msgid "PGP _Encrypt"
 msgstr "PG_P 加密"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with PGP"
 msgstr "使用 PGP 將這封郵件加密"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:467
 msgid "PGP _Sign"
 msgstr "P_GP 加簽"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP 金鑰為郵件加上數位簽章"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:475
 msgid "_Picture Gallery"
 msgstr "圖片集(_P)"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:477
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "示您可以拖曳到郵件中的圖片集"
 
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:483
 msgid "_Prioritize Message"
 msgstr "郵件優先權(_P)"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:485
 msgid "Set the message priority to high"
 msgstr "將郵件優先權設為「高」"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:491
 msgid "Re_quest Read Receipt"
 msgstr "要求讀信回條(_Q)"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:493
 msgid "Get delivery notification when your message is read"
 msgstr "在您的郵件被閱讀時取得送信通知"
 
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:499
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME 加密"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:501
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使用您的 S/MIME 加密憑證將這封郵件加密"
 
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:507
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME 加簽"
 
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:509
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME 簽名憑證為郵件加上數位簽章"
 
-#: ../composer/e-composer-actions.c:416
+#: ../composer/e-composer-actions.c:563
 msgid "_Bcc Field"
 msgstr "密件副本欄位(_B)"
 
-#: ../composer/e-composer-actions.c:418
+#: ../composer/e-composer-actions.c:565
 msgid "Toggles whether the BCC field is displayed"
 msgstr "切換密件副本欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:571
 msgid "_Cc Field"
 msgstr "副本欄位(_C)"
 
-#: ../composer/e-composer-actions.c:426
+#: ../composer/e-composer-actions.c:573
 msgid "Toggles whether the CC field is displayed"
 msgstr "切換副本欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:432
+#: ../composer/e-composer-actions.c:579
 msgid "_Reply-To Field"
 msgstr "回覆欄位(_R)"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:581
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:642
 msgid "Save Draft"
 msgstr "儲存草稿"
 
@@ -6911,72 +7339,68 @@ msgid ""
 msgstr ""
 "輸入郵件密件副本的收件者,他們會收到這封郵件但不會出現在郵件的收件者清單"
 
-#: ../composer/e-composer-header-table.c:771
+#: ../composer/e-composer-header-table.c:770
 msgid "Fr_om:"
 msgstr "寄件者(_O):"
 
-#: ../composer/e-composer-header-table.c:778
+#: ../composer/e-composer-header-table.c:777
 msgid "_Reply-To:"
 msgstr "回覆(_R):"
 
-#: ../composer/e-composer-header-table.c:783
+#: ../composer/e-composer-header-table.c:782
 msgid "_To:"
 msgstr "收件者(_T):"
 
-#: ../composer/e-composer-header-table.c:789
+#: ../composer/e-composer-header-table.c:788
 msgid "_Cc:"
 msgstr "副本(_C):"
 
-#: ../composer/e-composer-header-table.c:795
+#: ../composer/e-composer-header-table.c:794
 msgid "_Bcc:"
 msgstr "密件副本(_B):"
 
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:799
 msgid "_Post To:"
 msgstr "張貼到(_P):"
 
-#: ../composer/e-composer-header-table.c:804
+#: ../composer/e-composer-header-table.c:803
 msgid "S_ubject:"
 msgstr "主旨(_U):"
 
-#: ../composer/e-composer-header-table.c:812
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../composer/e-composer-header-table.c:811
+#: ../mail/e-mail-config-identity-page.c:505
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
-#: ../composer/e-composer-name-header.c:234
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "按這裡新增目錄服務"
 
-#: ../composer/e-composer-post-header.c:183
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡,選取要張貼的資料夾"
 
-#: ../composer/e-msg-composer.c:878
+#: ../composer/e-msg-composer.c:858
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署送出的郵件:此帳號沒有設定簽章憑證"
 
-#: ../composer/e-msg-composer.c:887
+#: ../composer/e-msg-composer.c:867
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "無法加密送出的郵件:沒有設定加密憑證(此帳號)"
 
-#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:1980
+#: ../composer/e-msg-composer.c:1582 ../composer/e-msg-composer.c:2148
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4242
+#: ../composer/e-msg-composer.c:4391
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "郵件編輯器包含不能編輯的非文字的郵件內文。"
 
-#: ../composer/e-msg-composer.c:4942
-msgid "Untitled Message"
-msgstr "未命名的郵件"
-
 #: ../composer/mail-composer.error.xml.h:1
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "您無法將檔案 &quot;{0}&quot; 附加到這封郵件。"
@@ -7055,68 +7479,72 @@ msgid "_Save Draft"
 msgstr "儲存草稿(_S)"
 
 #: ../composer/mail-composer.error.xml.h:20
+msgid "Are you sure you want to discard the message you are composing?"
+msgstr "確定要放棄正在撰寫的郵件?"
+
+#: ../composer/mail-composer.error.xml.h:21
 msgid "Could not create message."
 msgstr "無法建立郵件。"
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "因為「{0}」,所以您可能需要選取不同的郵件選項。"
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "無法讀取簽名檔「{0}」。"
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:24
 msgid "All accounts have been removed."
 msgstr "所有帳號已經移除。"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "撰寫郵件前,您需要先設定帳號。"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:26
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "當儲存到您的寄件資料夾時發生錯誤。"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:27
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "回報的錯誤為 &quot;{0}&quot;。郵件尚未寄出。"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:28
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "當儲存到您的草稿資料夾時發生錯誤。"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
 msgstr "回報的錯誤為 &quot;{0}&quot;。郵件很可能沒有儲存。"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "在寄信時發生錯誤。您要如何繼續?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "回報的錯誤為 &quot;{0}&quot;。"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save to Outbox"
 msgstr "儲存到寄件匣(_S)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Try Again"
 msgstr "再試一次(_T)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:34
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "您的郵件已送出,但是在後續處理期間發生錯誤。"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
 msgid "Saving message to Outbox."
 msgstr "儲存郵件到寄件匣。"
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:36
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -7125,6 +7553,18 @@ msgstr ""
 "因為目的端服務目前無法使用,這個郵件會儲存在您本地端的寄件資料夾裡。當您回到"
 "線上工作,您可以點選 Evolution 工具列的傳送/接收按鈕來寄出郵件。"
 
+#: ../composer/mail-composer.error.xml.h:37
+msgid "Are you sure you want to send the message?"
+msgstr "確要傳送郵件?"
+
+#: ../composer/mail-composer.error.xml.h:38
+msgid ""
+"A keyboard accelerator to send the message has been pressed. Either cancel "
+"sending the message, if it was done by an accident, or send the message."
+msgstr ""
+"用來傳送郵件的鍵盤快捷鍵已被按下。如果是不小心按下的,可以取消此郵件的傳送,"
+"如果不是則送出此郵件。"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Evolution 鬧鈴通知"
@@ -7133,31 +7573,13 @@ msgstr "Evolution 鬧鈴通知"
 msgid "Calendar event notifications"
 msgstr "行事曆事件通知"
 
-#: ../data/evolution.appdata.xml.h:1
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolution 是一套個人資訊管理應用程式,提供了整合郵件、行事曆和通訊錄等功能。"
-
-#: ../data/evolution.appdata.xml.h:2
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr ""
-"Evolution 支援了用於資訊交換的廣範圍的工業標準資料格式與網路協定,著重於標準"
-"的相容性與安全性。Evolution 也可以與 Microsoft Exchange 透過「交換網頁服務」"
-"(EWS)延伸功能平順的整合。"
-
 #: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:81
 msgid "Groupware Suite"
 msgstr "Groupware 套裝軟體"
 
@@ -7268,6 +7690,50 @@ msgstr "顯示預覽窗格"
 msgid "Whether to show the preview pane."
 msgstr "是否顯示預覽窗格。"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr "true"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+msgid "Whether to show phone numbers in the editor"
+msgstr "是否在編輯器中顯示 電話號碼 欄位"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+msgid "Whether to show SIP addresses in the editor"
+msgstr "是否在編輯器中顯示 SIP 位址 欄位"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+msgid "Whether to show IM addresses in the editor"
+msgstr "是否在編輯器中顯示 IM 位址 欄位"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "是否在編輯器中顯示 住家地址 欄位"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "是否在編輯器中顯示 工作郵寄地址 欄位"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "是否在編輯器中顯示 其他郵寄地址 欄位"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+msgid "Whether to show Web Addresses in the editor"
+msgstr "是否在編輯器中顯示 網頁位址 欄位"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+msgid "Whether to show job information in the editor"
+msgstr "是否在編輯器中顯示 職業資訊 欄位"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "是否在編輯器中顯示 雜項資訊 欄位"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+msgid "Whether to show notes in the editor"
+msgstr "是否在編輯器中顯示 筆記 欄位"
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "將郵件轉換為 Unicode"
@@ -8064,89 +8530,81 @@ msgid "Send HTML mail by default."
 msgstr "預設傳送 HTML 郵件。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Spell checking color"
-msgstr "拼字檢查顏色"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr "使用行內拼字檢查時對拼錯字的底線顏色。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Spell checking languages"
 msgstr "拼字檢查語言"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "List of dictionary language codes used for spell checking."
 msgstr "用於拼字檢查的字典語言碼清單。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "傳送郵件訊息時顯示「密件副本」欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 "傳送郵件訊息時顯示「密件副本」欄位。這是在選取郵件帳號時由檢視選單所控制。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "傳送郵件訊息時顯示「副本」欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr "傳送郵件訊息時顯示「副本」欄位。這是在選取郵件帳號時由檢視選單所控制。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "傳送郵件訊息時顯示「回覆」欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr "傳送郵件訊息時顯示「回覆」欄位。這是在選取郵件帳號時由檢視選單所控制。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "張貼到新聞群組時顯示「寄件者」欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
 "張貼到新聞群組時顯示「寄件者」欄位。這是在選取郵件帳號時由檢視選單所控制。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "張貼到新聞群組時顯示「回覆」欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
 "張貼到新聞群組時顯示「回覆」欄位。這是在選取郵件帳號時由檢視選單所控制。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Digitally sign replies when the original message is signed"
 msgstr "當原始郵件已簽名時也對回信數位簽名"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
 msgstr "當回覆以 PGP 或 S/MIME 簽署的郵件時自動啟用 PGP 或 S/MIME 簽署。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "將檔案名稱編碼為 Outlook/GMail 形式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8157,6 +8615,16 @@ msgstr ""
 "Evolution 寄出的 UTF-8 字元檔案名稱,因為它們並未遵循 RFC 2231 規範,而用了不"
 "正確的 RFC 2047 標準。"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+msgid "Send messages through Outbox folder"
+msgstr "透過寄件匣傳送郵件"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr "傳送時永遠將郵件儲存至寄件匣,讓使用者選擇郵件何時可送出。"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Put personalized signatures at the top of replies"
 msgstr "將個人化簽名檔置於回信頂端"
@@ -8214,18 +8682,35 @@ msgstr ""
 "前綴。例如「SV,AV」。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+msgid "Enable developer mode"
+msgstr "啟用開發者模式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid ""
+"Enables some hidden actions and tools aimed for development and debugging."
+msgstr "啟用某些用於開發與除錯而隱藏起來的動作與工具。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Number of characters for wrapping"
+msgstr "文字換列的字元數"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+msgid "Will autowrap lines after given number of characters."
+msgstr "在指定字元數後自動進行文字換列。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Save file format for drag-and-drop operation"
 msgstr "拖放操作時儲存的檔案格式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "可以是「mbox」或「pdf」。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Show image animations"
 msgstr "顯示動畫圖片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8233,91 +8718,91 @@ msgstr ""
 "啟用 HTML 郵件中的動畫圖片。許多使用者認為動畫圖片很煩人,因而偏好以靜態圖片"
 "代替。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Enable or disable type ahead search feature"
 msgstr "啟用或停用隨打即查功能"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "啟用側邊列搜尋功能允許互動式搜尋資料夾名稱。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "啟用或停用魔術空白鍵"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 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:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "啟用以在所有資料夾使用類似的郵件清單檢視設定值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "啟用此選項會讓所有的資料夾使用類似的郵件清單檢視設定值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Mark citations in the message \"Preview\""
 msgstr "在郵件「預覽」中標示引用"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在郵件「預覽」中標示引用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Citation highlight color"
 msgstr "引用反白色彩"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Citation highlight color."
 msgstr "引用反白色彩。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable/disable caret mode"
 msgstr "啟用/停用插入號模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "啟用插入號模式,如此您可以在閱讀郵件時看到游標。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Default charset in which to display messages"
 msgstr "用於顯示郵件的預設字元集"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Default charset in which to display messages."
 msgstr "用於顯示郵件的預設字元集。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "自動透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Show animated images as animations."
 msgstr "播放動畫圖片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show all message headers"
 msgstr "顯示所有郵件檔頭"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show all the headers when viewing a messages."
 msgstr "檢視郵件時顯示檔頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "List of headers to show when viewing a message."
 msgstr "檢視郵件時顯示的檔頭清單。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 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 "
@@ -8326,76 +8811,84 @@ msgstr ""
 "每個檔頭都以配對方式呈現:檔頭的名稱,及一個布林值表示此檔頭是否啟用。停用的"
 "檔頭在檢視郵件時不會顯示,但仍會列在偏好設定中。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Show photo of the sender"
 msgstr "顯示寄件者的相片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "在郵件閱讀窗格中顯示寄件者的相片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+msgid "Search gravatar.com for photo of the sender"
+msgstr "在 gravatar.com 搜尋寄件者的相片"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+msgid "Allow searching also at gravatar.com for photo of the sender."
+msgstr "也允許在 gravatar.com 搜尋寄件者的相片。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定的時限過後,標示成已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定的時限過後,標示成已閱讀。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Timeout for marking messages as seen"
 msgstr "將郵件標示成已閱讀的時限"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "將郵件標示成已閱讀的時限,以毫秒計。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Sender email-address column in the message list"
 msgstr "在郵件清單的寄件者電子郵件欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 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:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
 msgstr "決定是否在垂直檢視的「郵件」裡的「寄件人」及「主旨」中使用同樣的字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr "決定是否在垂直檢視的「郵件」裡的「寄件人」及「主旨」中使用同樣的字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show deleted messages in the message-list"
 msgstr "在郵件清單中顯示刪除的郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在郵件清單中顯示刪除的郵件 (加上刪除號)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Enable Unmatched search folder"
 msgstr "啟用未符合搜尋資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 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:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "隱藏各資料夾預覽並移除選取區"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 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."
@@ -8403,31 +8896,31 @@ msgstr ""
 "這個鍵值只能讀取一次,並會在讀取後設為「false」。這樣會取消在清單中對該郵件的"
 "選取並移除對該資料夾的預覽。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Height of the message-list pane"
 msgstr "郵件清單窗格高度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Height of the message-list pane."
 msgstr "郵件清單窗格的高度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "郵件標題在使用者介面中是否摺疊"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Width of the message-list pane"
 msgstr "郵件清單窗格寬度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Width of the message-list pane."
 msgstr "郵件清單窗格的寬度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Layout style"
 msgstr "配置樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 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 "
@@ -8437,76 +8930,76 @@ msgstr ""
 "配置方式決定了在郵件清單中預覽窗格的位置。「0」(標準檢視)將預覽窗格放在郵件"
 "清單下方。「1」(垂直檢視)將預覽窗格放在郵件清單旁邊。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Variable width font"
 msgstr "變動寬度字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "The variable width font for mail display."
 msgstr "用於顯示郵件的變動寬度字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Terminal font"
 msgstr "終端機字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "The terminal font for mail display."
 msgstr "用於顯示郵件的終端機字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Use custom fonts"
 msgstr "使用自訂字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自訂字型來顯示郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "壓縮在 TO/CC/BCC 中位址的顯示方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 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:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示於 TO/CC/BCC 中位址的長度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 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:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Thread the message-list based on Subject"
 msgstr "以主旨為基礎串接郵件清單"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 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:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Default value for thread expand state"
 msgstr "相關郵件展開狀態的預設數值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 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:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否依郵件群組中最新的郵件來排序相關郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 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 "
@@ -8515,11 +9008,11 @@ msgstr ""
 "這個設定值指定相關郵件要依每個郵件群組最新的郵件排序,而非依照郵件的日期。"
 "Evolution 將需要重新啟動。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "在資料夾樹狀圖中以字母排序帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 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 "
@@ -8529,27 +9022,27 @@ msgstr ""
 "告知在郵件檢視中如何排序資料夾樹狀圖中的帳號。當設定為 true 時帳號會以字母排"
 "序,但這臺電腦與搜尋資料夾例外,否則帳號會以使用者給予的順序排列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Log filter actions"
 msgstr "記錄過濾器動作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Log filter actions to the specified log file."
 msgstr "將過濾器動作記錄到指定的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Logfile to log filter actions"
 msgstr "用於記錄過濾器動作的記錄檔案"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Logfile to log filter actions."
 msgstr "用於記錄過濾器動作的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Flush Outbox after filtering"
 msgstr "過濾後清空寄件匣"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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 "
@@ -8558,90 +9051,100 @@ msgstr ""
 "是否在過濾完後清空寄件匣。寄件匣的清空只用在當使用了任何「轉寄至」過濾器動"
 "作,並且在這個動作後大約一分鐘開始進行。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Default forward style"
 msgstr "預設轉遞樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Default reply style"
 msgstr "預設回覆樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr "使用快捷鍵傳送時提示 (Ctrl+Enter)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+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:135
 msgid "Prompt on empty subject"
 msgstr "沒有主旨時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when emptying the trash"
 msgstr "使用者清空回收筒時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "當使用者嘗試清空回收筒時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt when user expunges"
 msgstr "使用者清空時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "寄信給沒有輸入有效郵件位址的收件者前先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 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:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 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:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "當使用者嘗試傳送不想要的 HTML 時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt while marking multiple messages"
 msgstr "當標記多個郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "啟用或停用標記多個郵件時的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when deleting messages in search folder"
 msgstr "當刪除搜尋資料夾中的郵件時顯示提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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 "
@@ -8650,11 +9153,11 @@ msgstr ""
 "它啟用/停用在從搜尋資料夾中刪除郵件時是否重複提示以警告那將會永久刪除郵件,而"
 "非僅是將郵件自搜尋結果中移除。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 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:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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 "
@@ -8664,11 +9167,11 @@ msgstr ""
 "可能的數值有:「never」- 不允許在資料夾樹狀圖中拖放複製、「 always」- 不詢問"
 "就允許在資料夾樹狀圖中拖放複製或「ask」- (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 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:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 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 "
@@ -8678,21 +9181,21 @@ msgstr ""
 "可能的數值有:「never」- 不允許在資料夾樹狀圖中拖放移動、「 always」- 不詢問"
 "就允許在資料夾樹狀圖中拖放移動或「ask」- (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when replying privately to list messages"
 msgstr "當私人回覆通信論壇郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "當通信論壇劫持私人回覆時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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 "
@@ -8701,66 +9204,66 @@ msgstr ""
 "它會停用/啟用重覆提示警告您正試著回覆私人信件給透過通信論壇寄出的信。而通信論"
 "壇設定的 Reply-To: 標頭會將您的回信重新導向至通信論壇上的所有成員"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when replying to many recipients"
 msgstr "當回覆給許多收件者時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Empty Trash folders on exit"
 msgstr "結束時清空垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "結束 Evolution 時清空所有垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Minimum days between emptying the trash on exit"
 msgstr "結束時清空回收筒最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "結束時清空回收筒最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Last time Empty Trash was run"
 msgstr "上次清空回收筒的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Level beyond which the message should be logged."
 msgstr "應記錄的郵件等級。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Show original \"Date\" header value."
 msgstr "顯示原始的「日期」標頭數值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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 "
@@ -8769,11 +9272,11 @@ msgstr ""
 "顯示原始的「日期」檔頭(若時區不同時會使用當地時間)。否則永遠以使用者偏好的"
 "格式和本地時區顯示「日期」檔頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "List of Labels and their associated colors"
 msgstr "標籤和相關色彩的清單"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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."
@@ -8781,44 +9284,44 @@ msgstr ""
 "Evolution 的郵件元件已知的標籤清單。清單包含字串,其中包含 name:color,color "
 "使用 HTML 十六進位編碼。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Check incoming mail being junk"
 msgstr "檢查內送的垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Run junk test on incoming mail."
 msgstr "在內送的郵件執行垃圾郵件檢查。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Empty Junk folders on exit"
 msgstr "離開時清空垃圾郵件資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "離開 Evolution 時清空所有垃圾郵件資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Minimum days between emptying the junk on exit"
 msgstr "結束時清空垃圾郵件最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "結束時清空垃圾郵件最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Last time Empty Junk was run"
 msgstr "上次清空垃圾郵件的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "The default plugin for Junk hook"
 msgstr "垃圾釣鉤的預設外掛程式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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 "
@@ -8827,11 +9330,11 @@ msgstr ""
 "這是預設的垃圾郵件外掛程式,即使已啟用了其他的外掛程式。如果停用這裡列出的預"
 "設外掛程式,並不會影響其他可用的外掛程式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "決定是否在通訊錄中尋找寄件者電子郵件帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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 "
@@ -8842,13 +9345,13 @@ msgstr ""
 "會搜尋標記為自動補齊的通訊錄。但若標記為自動補齊的是遠端通訊錄(像 LDAP),則"
 "速度可能會很慢。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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 "
@@ -8857,11 +9360,11 @@ msgstr ""
 "這個選項相關於鍵值「lookup_addressbook」,是用來決定是否只在本地端通訊錄中查"
 "詢電子郵件位址以用於垃圾郵件過濾時「排除已知連絡人寄出的郵件」功能。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "決定是否使用自訂標頭來檢查垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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 "
@@ -8870,52 +9373,52 @@ msgstr ""
 "決定是否使用自訂標頭來檢查垃圾郵件。如果啟用這個選項並且提供標頭,將會提升垃"
 "圾郵件檢查的速度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Custom headers to use while checking for junk."
 msgstr "檢查垃圾郵件用的自訂標頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "UID string of the default account."
 msgstr "預設帳號的 UID 字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Save directory"
 msgstr "儲存目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Directory for saving mail component files."
 msgstr "用來儲存郵件元件檔的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Composer load/attach directory"
 msgstr "編輯器讀取/附加目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Directory for loading/attaching files to composer."
 msgstr "用來郵件編輯器載入/附件的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Check for new messages on start"
 msgstr "啟動時檢查新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Check for new messages in all active accounts"
 msgstr "檢查所有使用中帳號的新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 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 "
@@ -8924,65 +9427,90 @@ msgstr ""
 "當 Evolution 啟動時是否檢查所有使用中帳號的新郵件而不管「檢查新郵件於每 X 分"
 "鐘」選項。這個選項只能和「send_recv_on_start」選項一起使用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Server synchronization interval"
 msgstr "伺服器同步間隔"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 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:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid "Allow expunge in virtual folders"
+msgstr "允許在虛擬資料夾使用清空"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+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 folders for all deleted messages within the virtual folder, not only "
+"for deleted messages belonging to the virtual folder."
+msgstr ""
+"啟用對虛擬資料夾的清空,表示使用資料夾 ->清空會作用於虛擬資料夾,即清空的動作"
+"本身會對虛擬資料夾與所有資料夾中被刪除的郵件進行,並不只針對屬於虛擬資料夾中"
+"被刪除的郵件。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid "An Archive folder for On This Computer folders."
+msgstr "用於「這臺電腦上」的壓縮資料夾。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+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:210
 msgid "(Deprecated) Default forward style"
 msgstr "(已廢棄) 預設轉寄樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 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:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "(Deprecated) Default reply style"
 msgstr "(已廢棄) 預設的回覆樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(已廢棄) 自訂檔頭以及它們是否啟用的清單"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(已廢棄) 透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 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:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9263,7 +9791,7 @@ msgstr "檔案選擇對話盒的初始資料夾"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser 對話盒的初始資料夾。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
@@ -9354,29 +9882,29 @@ msgstr "只使用本地垃圾郵件測試。"
 msgid "Use only the local spam tests (no DNS)."
 msgstr "只使用本地垃圾郵件測試 (沒有 DNS)。"
 
-#: ../em-format/e-mail-formatter-attachment.c:396
-#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
-#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
+#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 
-#: ../em-format/e-mail-formatter-attachment.c:397
+#: ../em-format/e-mail-formatter-attachment.c:406
 msgid "Display as attachment"
 msgstr "顯示為附件"
 
-#: ../em-format/e-mail-formatter-audio.c:143
+#: ../em-format/e-mail-formatter-audio.c:152
 msgid "Audio Player"
 msgstr "音樂播放器"
 
-#: ../em-format/e-mail-formatter-audio.c:144
+#: ../em-format/e-mail-formatter-audio.c:153
 msgid "Play the attachment in embedded audio player"
 msgstr "在內嵌音樂播放器中播放附件"
 
 #: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:272
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
 msgid "From"
 msgstr "寄件者"
 
@@ -9389,26 +9917,26 @@ msgstr "(沒有主旨)"
 msgid "This message was sent by %s on behalf of %s"
 msgstr "這封郵件是由 %s 代表 %s 寄出"
 
-#: ../em-format/e-mail-formatter-image.c:151
+#: ../em-format/e-mail-formatter-image.c:170
 msgid "Regular Image"
 msgstr "一般影像"
 
-#: ../em-format/e-mail-formatter-image.c:152
+#: ../em-format/e-mail-formatter-image.c:171
 msgid "Display part as an image"
 msgstr "將部分顯示為影像"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:245
+#: ../em-format/e-mail-formatter-message-rfc822.c:254
 msgid "RFC822 message"
 msgstr "RFC822 郵件"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:246
+#: ../em-format/e-mail-formatter-message-rfc822.c:255
 msgid "Format part as an RFC822 message"
 msgstr "將部分格式化 RFC822 郵件"
 
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1322
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1271
 #: ../modules/cal-config-google/e-google-chooser.c:236
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
@@ -9436,53 +9964,56 @@ msgid "S/MIME encrpyted"
 msgstr "S/MIME 加密"
 
 #: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../mail/e-mail-config-security-page.c:645
+#: ../mail/e-mail-config-security-page.c:736
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
 msgid "Security"
 msgstr "安全性"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:167
-#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:277
-#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter-quote-headers.c:174
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
+#: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
+#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
+#: ../modules/mail/em-mailer-prefs.c:67
+#: ../smime/gui/certificate-manager.c:1630
 msgid "Subject"
 msgstr "主旨"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:186
+#: ../em-format/e-mail-formatter-quote-headers.c:193
 #: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../modules/mail/em-mailer-prefs.c:1166
 msgid "Mailer"
 msgstr "寄件者"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:90
-#: ../em-format/e-mail-formatter-text-enriched.c:97
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
+#: ../em-format/e-mail-formatter-text-enriched.c:98
 msgid "Richtext"
 msgstr "豐富文字"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
-#: ../em-format/e-mail-formatter-text-enriched.c:98
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
+#: ../em-format/e-mail-formatter-text-enriched.c:99
 msgid "Display part as enriched text"
 msgstr "將部分顯示為豐富文字"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:89
-#: ../em-format/e-mail-formatter-text-html.c:348
+#: ../em-format/e-mail-formatter-quote-text-html.c:95
+#: ../em-format/e-mail-formatter-text-html.c:359
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:90
-#: ../em-format/e-mail-formatter-text-html.c:349
+#: ../em-format/e-mail-formatter-quote-text-html.c:96
+#: ../em-format/e-mail-formatter-text-html.c:360
 msgid "Format part as HTML"
 msgstr "將部分格式化為 HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:114
-#: ../em-format/e-mail-formatter-text-plain.c:184
+#: ../em-format/e-mail-formatter-quote-text-plain.c:123
+#: ../em-format/e-mail-formatter-text-plain.c:197
+#: ../e-util/e-html-editor-actions.c:1408
 msgid "Plain Text"
 msgstr "純文字"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:115
-#: ../em-format/e-mail-formatter-text-plain.c:185
+#: ../em-format/e-mail-formatter-quote-text-plain.c:124
+#: ../em-format/e-mail-formatter-text-plain.c:198
 msgid "Format part as plain text"
 msgstr "將部分格式化為純文字"
 
@@ -9582,32 +10113,32 @@ msgstr ""
 "此郵件已加密,使用嚴密的加密演算法。縱使經過一段時間,外面的人很難檢閱此郵件"
 "的內容。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:186
+#: ../em-format/e-mail-formatter-secure-button.c:187
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "檢視憑證(_V)"
 
-#: ../em-format/e-mail-formatter-secure-button.c:201
+#: ../em-format/e-mail-formatter-secure-button.c:202
 msgid "This certificate is not viewable"
 msgstr "此憑證無法檢視"
 
-#: ../em-format/e-mail-formatter-source.c:114
+#: ../em-format/e-mail-formatter-source.c:120
 msgid "Source"
 msgstr "來源"
 
-#: ../em-format/e-mail-formatter-source.c:115
+#: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "顯示 MIME 部分的來源"
 
 #: ../em-format/e-mail-formatter-utils.c:202
 #: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:66
+#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
 msgid "Cc"
 msgstr "副本"
 
 #: ../em-format/e-mail-formatter-utils.c:203
 #: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
 msgid "Bcc"
 msgstr "密件副本"
 
@@ -9621,12 +10152,12 @@ msgstr "解析 MBOX 部分時出現錯誤:%s"
 msgid "Could not parse S/MIME message: %s"
 msgstr "無法解析 S/MIME 郵件:%s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "無法解析 PGP 郵件:%s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
 #: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
@@ -9679,358 +10210,42 @@ msgstr "無法解析 PGP/MIME 郵件:%s"
 msgid "Unsupported signature format"
 msgstr "不支援的簽名格式"
 
-#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
 msgid "Reply-To"
 msgstr "回覆"
 
 #: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
 #: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:69
+#: ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "日期"
 
-#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
 msgid "Newsgroups"
 msgstr "新聞群組"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "面貌"
 
-#: ../em-format/e-mail-part-utils.c:499
+#: ../em-format/e-mail-part-utils.c:508
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
 
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "標準"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "專利"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "密"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "最高機密"
-
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "最高機密"
-
-#. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "沒有"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "郵件回條"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "要求回覆(_E)"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "於內(_T)"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "天"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "當有空時(_W)"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
-msgid "Replies"
-msgstr "回覆"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "延遲郵件遞送(_D)"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "晚於(_A)"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "天"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "設定逾期日期(_S)"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "直到(_U)"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "遞送選項"
-
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "優先順序(_P):"
-
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "歸類(_C):"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "一般選項(_R)"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "建立新的傳送項目至追蹤資訊(_E)"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "已遞送(_D)"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "已遞送與已開啟(_V)"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "全部資訊(_A)"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "自動刪除項目(_U)"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "狀態追蹤"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "當開啟時(_W):"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "當拒絕時(_N):"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "當完成時(_M):"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "當接受時(_P):"
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "返回通知"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "狀態追蹤(_T)"
-
-#: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
-#| msgid "_Append"
-msgid "_Apply"
-msgstr "套用(_A)"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "排序(_S)…"
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "群組依(_G)…"
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "欄位顯示(_F)…"
-
-#: ../e-util/e-table-config.ui.h:9
-msgid "Clear _All"
-msgstr "全部清除(_A)"
-
-#: ../e-util/e-table-config.ui.h:10
-msgid "_Show field in View"
-msgstr "顯示檢視中的欄位(_S)"
-
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1753
-msgid "Ascending"
-msgstr "遞增"
-
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
-msgid "Descending"
-msgstr "遞減"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Group Items By"
-msgstr "將項目組成群組,依"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show _field in View"
-msgstr "顯示檢視中的欄位(_F)"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Then By"
-msgstr "接著依"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field i_n View"
-msgstr "顯示檢視中的欄位(_N)"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Show field in _View"
-msgstr "顯示檢視中的欄位(_V)"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "排序"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Clear All"
-msgstr "全部清除"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Sort Items By"
-msgstr "排序項目依"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "選擇一個時區"
-
-#: ../e-util/e-timezone-dialog.ui.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"使用滑鼠左鍵拉近地圖的區域,然後選取時區。\n"
-"使用滑鼠右鍵拉遠。"
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Time Zones"
-msgstr "時區"
-
-#: ../e-util/e-timezone-dialog.ui.h:7
-msgid "_Selection"
-msgstr "選擇範圍(_S) "
-
-#: ../e-util/e-timezone-dialog.ui.h:8
-msgid "Timezone drop-down combination box"
-msgstr "時區下拉式組合方塊"
-
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
-#: ../mail/em-utils.c:230
-msgid "Incoming"
-msgstr "內送"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "目前的時刻"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "您指定的時刻"
-
-#: ../e-util/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "相對於目前時刻的時差"
-
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
-msgid "seconds"
-msgstr "秒"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "週"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "個月"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "年"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "前"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "後"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "顯示郵件過濾器:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "過濾器規則(_F)"
-
-#: ../e-util/filter.ui.h:23
-msgid "Compare against"
-msgstr "比較"
-
-#: ../e-util/filter.ui.h:24
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"郵件日期將會與過濾器執行時的\n"
-"時間作比較。"
-
-#: ../e-util/filter.ui.h:26
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"郵件日期將會與您在這裡指定\n"
-"日期的 12:00am 做比較。"
-
-#: ../e-util/filter.ui.h:28
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"郵件日期將會與相對於過濾器執行\n"
-"的時間作比較。"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "建立新的檢視(_C)"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:416
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:340
-msgid "_Name:"
-msgstr "名稱(_N):"
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+msgid "%d %B %Y"
+msgstr "%Y年%m月%d日"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "置換現存的檢視(_R)"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "行事曆:從 %s 到 %s"
 
-#: ../e-util/e-activity-proxy.c:308
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
-msgid "Cancel"
-msgstr "取消"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "evolution 行事曆項目"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:258
@@ -10062,24 +10277,95 @@ msgstr "%s (正在取消)"
 msgid "%s"
 msgstr "%s"
 
+#. Translators: This is a running activity whose percent complete is known.
 #: ../e-util/e-activity.c:275
+#: ../modules/calendar/e-cal-base-shell-content.c:144
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1824
+msgid "Cancel"
+msgstr "取消"
+
 #. Translators: Escape is a keyboard binding.
 #: ../e-util/e-alert-bar.c:118
 msgid "Close this message (Escape)"
 msgstr "關閉這個郵件 (Escape)"
 
-#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
+#: ../e-util/e-alert-sink.c:246
+msgid "Failed to create a thread: "
+msgstr "無法建立郵件群組:"
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
 msgid "Icon View"
 msgstr "圖示檢視"
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
 msgid "List View"
 msgstr "清單檢視"
 
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../e-util/e-attachment.c:1197
+msgid "Attached message"
+msgstr "附加的郵件"
+
+#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+msgid "Operation was cancelled"
+msgstr "操作已被取消"
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment.c:2264 ../e-util/e-attachment.c:2963
+#: ../e-util/e-attachment.c:3334 ../e-util/e-attachment-store.c:691
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+msgid "A load operation is already in progress"
+msgstr "載入操作已在進行中"
+
+#: ../e-util/e-attachment.c:2353 ../e-util/e-attachment.c:3402
+msgid "A save operation is already in progress"
+msgstr "儲存操作已在進行中"
+
+#: ../e-util/e-attachment.c:2473
+#, c-format
+msgid "Could not load '%s'"
+msgstr "無法載入「%s」"
+
+#: ../e-util/e-attachment.c:2476
+#, c-format
+msgid "Could not load the attachment"
+msgstr "無法載入附件"
+
+#: ../e-util/e-attachment.c:2761
+#, c-format
+msgid "Could not open '%s'"
+msgstr "無法開啟「%s」"
+
+#: ../e-util/e-attachment.c:2764
+#, c-format
+msgid "Could not open the attachment"
+msgstr "無法開啟附件"
+
+#: ../e-util/e-attachment.c:3411
+msgid "Attachment contents not loaded"
+msgstr "無法載入附件內容"
+
+#: ../e-util/e-attachment.c:3502
+#, c-format
+msgid "Could not save '%s'"
+msgstr "無法儲存「%s」"
+
+#: ../e-util/e-attachment.c:3505
+#, c-format
+msgid "Could not save the attachment"
+msgstr "無法儲存附件"
+
 #: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "附件內容"
@@ -10092,54 +10378,64 @@ msgstr "檔案名稱(_I):"
 msgid "MIME Type:"
 msgstr "MIME 類型:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
 
-#: ../e-util/e-attachment-handler-image.c:96
+#: ../e-util/e-attachment-handler-image.c:98
 msgid "Could not set as background"
 msgstr "無法設為背景"
 
-#: ../e-util/e-attachment-handler-image.c:146
+#: ../e-util/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "設為背景(_B)"
 
-#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-icon-view.c:168
 #: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "載入中"
 
-#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-icon-view.c:180
 #: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "儲存中"
 
-#: ../e-util/e-attachment-paned.c:103
+#: ../e-util/e-attachment-paned.c:107
 msgid "Hide Attachment _Bar"
 msgstr "隱藏附件列(_B)"
 
-#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
 msgid "Show Attachment _Bar"
 msgstr "顯示附件列(_B)"
 
-#: ../e-util/e-attachment-store.c:462
+#: ../e-util/e-attachment-store.c:486
 msgid "Add Attachment"
 msgstr "加入附件"
 
-#: ../e-util/e-attachment-store.c:465
+#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
 msgid "A_ttach"
 msgstr "附加(_T)"
 
-#: ../e-util/e-attachment-store.c:536
+#: ../e-util/e-attachment-store.c:533
+msgid "Archive selected directories using this format:"
+msgstr "使用這個格式壓縮選取的資料夾:"
+
+#: ../e-util/e-attachment-store.c:626
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "儲存附件"
 
-#. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
-#: ../e-util/e-attachment.c:2721
-msgid "attachment.dat"
-msgstr "attachment.dat"
+#: ../e-util/e-attachment-store.c:653
+msgid "Do _not extract files from the attachment"
+msgstr "無法從附件解壓縮檔案(_N)"
+
+#: ../e-util/e-attachment-store.c:658
+msgid "Save extracted files _only"
+msgstr "只儲存解壓縮檔案(_O)"
+
+#: ../e-util/e-attachment-store.c:663
+msgid "Save extracted files and the original _archive"
+msgstr "儲存解壓縮檔案與原始的壓縮檔(_A)"
 
 #: ../e-util/e-attachment-view.c:377
 msgid "Open With Other Application..."
@@ -10150,7 +10446,6 @@ msgid "S_ave All"
 msgstr "儲存全部(_A)"
 
 #: ../e-util/e-attachment-view.c:391
-#| msgid "Sa_ve"
 msgid "Sa_ve As"
 msgstr "儲存為(_V)"
 
@@ -10158,7 +10453,6 @@ msgstr "儲存為(_V)"
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
-#| msgid "Save _As..."
 msgid "Save _As"
 msgstr "儲存為(_A)"
 
@@ -10167,12 +10461,12 @@ msgid "A_dd Attachment..."
 msgstr "加入附件(_A)…"
 
 #: ../e-util/e-attachment-view.c:417
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
-#: ../modules/calendar/e-task-shell-view-actions.c:752
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#: ../modules/addressbook/e-book-shell-view-actions.c:1129
+#: ../modules/calendar/e-cal-shell-view-actions.c:1240
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "_Properties"
 msgstr "屬性(_P)"
 
@@ -10202,56 +10496,6 @@ msgstr "以「%s」開啟"
 msgid "Open this attachment in %s"
 msgstr "在 %s 中開啟這個附件"
 
-#. To Translators: This text is set as a description of an attached
-#. * message when, for example, attaching it to a composer. When the
-#. * message to be attached has also filled Subject, then this text is
-#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1108
-msgid "Attached message"
-msgstr "附加的郵件"
-
-#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
-msgid "A load operation is already in progress"
-msgstr "載入操作已在進行中"
-
-#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
-msgid "A save operation is already in progress"
-msgstr "儲存操作已在進行中"
-
-#: ../e-util/e-attachment.c:2267
-#, c-format
-msgid "Could not load '%s'"
-msgstr "無法載入「%s」"
-
-#: ../e-util/e-attachment.c:2270
-#, c-format
-msgid "Could not load the attachment"
-msgstr "無法載入附件"
-
-#: ../e-util/e-attachment.c:2574
-#, c-format
-msgid "Could not open '%s'"
-msgstr "無法開啟「%s」"
-
-#: ../e-util/e-attachment.c:2577
-#, c-format
-msgid "Could not open the attachment"
-msgstr "無法開啟附件"
-
-#: ../e-util/e-attachment.c:3044
-msgid "Attachment contents not loaded"
-msgstr "無法載入附件內容"
-
-#: ../e-util/e-attachment.c:3124
-#, c-format
-msgid "Could not save '%s'"
-msgstr "無法儲存「%s」"
-
-#: ../e-util/e-attachment.c:3127
-#, c-format
-msgid "Could not save the attachment"
-msgstr "無法儲存附件"
-
 #: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "標示為預設通訊錄"
@@ -10265,10 +10509,48 @@ 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";
-#: ../e-util/e-buffer-tagger.c:409
+#: ../e-util/e-buffer-tagger.c:407
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-單擊以開啟連結"
 
+#: ../e-util/e-calendar.c:195
+msgid "Previous month"
+msgstr "上個月"
+
+#: ../e-util/e-calendar.c:220
+msgid "Next month"
+msgstr "下個月"
+
+#: ../e-util/e-calendar.c:246
+msgid "Previous year"
+msgstr "上一年"
+
+#: ../e-util/e-calendar.c:271
+msgid "Next year"
+msgstr "下一年"
+
+#: ../e-util/e-calendar.c:295
+msgid "Month Calendar"
+msgstr "月行事曆"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%m月"
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1325
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y年"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1362
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%Y年%m月"
+
 #: ../e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "標示為預設行事曆"
@@ -10297,44 +10579,6 @@ msgstr "複製工作清單內容至本地以便離線作業"
 msgid "Copy memo list contents locally for offline operation"
 msgstr "複製備忘錄清單內容至本地以便離線作業"
 
-#. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
-msgctxt "CalItem"
-msgid "%B"
-msgstr "%m月"
-
-#. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1328
-msgctxt "CalItem"
-msgid "%Y"
-msgstr "%Y年"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1365
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%Y年%m月"
-
-#: ../e-util/e-calendar.c:189
-msgid "Previous month"
-msgstr "上個月"
-
-#: ../e-util/e-calendar.c:214
-msgid "Next month"
-msgstr "下個月"
-
-#: ../e-util/e-calendar.c:240
-msgid "Previous year"
-msgstr "上一年"
-
-#: ../e-util/e-calendar.c:265
-msgid "Next year"
-msgstr "下一年"
-
-#: ../e-util/e-calendar.c:289
-msgid "Month Calendar"
-msgstr "月行事曆"
-
 #: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "目前使用的分類(_U):"
@@ -10343,17 +10587,17 @@ msgstr "目前使用的分類(_U):"
 msgid "_Available Categories:"
 msgstr "可用的分類(_A):"
 
-#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
+#: ../e-util/e-categories-editor.c:274
 #: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1055
+#: ../shell/e-shell-window-actions.c:1099
 msgid "_New"
 msgstr "新增(_N)"
 
-#: ../e-util/e-categories-selector.c:321
+#: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "圖示"
 
-#: ../e-util/e-category-completion.c:299
+#: ../e-util/e-category-completion.c:307
 #, c-format
 msgid "Create category \"%s\""
 msgstr "建立分類「%s」"
@@ -10389,13 +10633,17 @@ msgstr "在組態中已經有名為「%s」的分類。請使用另外的名稱"
 msgid "popup list"
 msgstr "彈出式清單"
 
+#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+msgid "?"
+msgstr "?"
+
 #: ../e-util/e-cell-date-edit.c:298
 msgid "Now"
 msgstr "現在"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1899
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
 #: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "今天"
@@ -10411,31 +10659,15 @@ msgstr "沒有"
 msgid "OK"
 msgstr "確定"
 
-#: ../e-util/e-cell-date-edit.c:872
+#: ../e-util/e-cell-date-edit.c:873
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式:%s"
 
-#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1839
-msgid "?"
-msgstr "?"
-
-#: ../e-util/e-cell-percent.c:79
+#: ../e-util/e-cell-percent.c:81
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "數值必須是由 0 到 100 的數字"
 
-#: ../e-util/e-charset-combo-box.c:99
-msgid "Character Encoding"
-msgstr "字元編碼"
-
-#: ../e-util/e-charset-combo-box.c:122
-msgid "Enter the character set to use"
-msgstr "輸入要使用的字元集"
-
-#: ../e-util/e-charset-combo-box.c:368
-msgid "Other..."
-msgstr "其它…"
-
 #: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "阿拉伯語"
@@ -10513,11 +10745,194 @@ msgstr "烏克蘭語"
 msgid "Visual"
 msgstr "視覺"
 
-#: ../e-util/e-client-cache.c:1161
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "字元編碼"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "輸入要使用的字元集"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "其它…"
+
+#: ../e-util/e-client-cache.c:1242
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "不能從延伸名稱「%s」建立客戶端物件"
 
+#: ../e-util/e-color-chooser-widget.c:124
+msgid "Choose custom color"
+msgstr "選擇自訂顏色"
+
+#: ../e-util/e-color-combo.c:81
+msgid "black"
+msgstr "黑色"
+
+#: ../e-util/e-color-combo.c:82
+msgid "light brown"
+msgstr "淡棕色"
+
+#: ../e-util/e-color-combo.c:83
+msgid "brown gold"
+msgstr "金棕色"
+
+#: ../e-util/e-color-combo.c:84
+msgid "dark green #2"
+msgstr "暗綠色 #2"
+
+#: ../e-util/e-color-combo.c:85
+msgid "navy"
+msgstr "海軍"
+
+#: ../e-util/e-color-combo.c:86
+msgid "dark blue"
+msgstr "暗藍色"
+
+#: ../e-util/e-color-combo.c:87
+msgid "purple #2"
+msgstr "紫色 #2"
+
+#: ../e-util/e-color-combo.c:88
+msgid "very dark gray"
+msgstr "深暗灰色"
+
+#: ../e-util/e-color-combo.c:90
+msgid "dark red"
+msgstr "暗紅色"
+
+#: ../e-util/e-color-combo.c:91
+msgid "red-orange"
+msgstr "橙紅色"
+
+#: ../e-util/e-color-combo.c:92
+msgid "gold"
+msgstr "金色"
+
+#: ../e-util/e-color-combo.c:93
+msgid "dark green"
+msgstr "暗綠色"
+
+#: ../e-util/e-color-combo.c:94
+msgid "dull blue"
+msgstr "沌藍色"
+
+#: ../e-util/e-color-combo.c:95
+msgid "blue"
+msgstr "藍色"
+
+#: ../e-util/e-color-combo.c:96
+msgid "dull purple"
+msgstr "沌紫色"
+
+#: ../e-util/e-color-combo.c:97
+msgid "dark grey"
+msgstr "暗灰色"
+
+#: ../e-util/e-color-combo.c:99
+msgid "red"
+msgstr "紅色"
+
+#: ../e-util/e-color-combo.c:100
+msgid "orange"
+msgstr "橙色"
+
+#: ../e-util/e-color-combo.c:101
+msgid "lime"
+msgstr "萊姆色"
+
+#: ../e-util/e-color-combo.c:102
+msgid "dull green"
+msgstr "沌綠色"
+
+#: ../e-util/e-color-combo.c:103
+msgid "dull blue #2"
+msgstr "沌綠色 #2"
+
+#: ../e-util/e-color-combo.c:104
+msgid "sky blue #2"
+msgstr "天藍色 #2"
+
+#: ../e-util/e-color-combo.c:105
+msgid "purple"
+msgstr "紫色"
+
+#: ../e-util/e-color-combo.c:106
+msgid "gray"
+msgstr "灰色"
+
+#: ../e-util/e-color-combo.c:108
+msgid "magenta"
+msgstr "洋紅色"
+
+#: ../e-util/e-color-combo.c:109
+msgid "bright orange"
+msgstr "亮橙色"
+
+#: ../e-util/e-color-combo.c:110
+msgid "yellow"
+msgstr "黃色"
+
+#: ../e-util/e-color-combo.c:111
+msgid "green"
+msgstr "綠色"
+
+#: ../e-util/e-color-combo.c:112
+msgid "cyan"
+msgstr "青色"
+
+#: ../e-util/e-color-combo.c:113
+msgid "bright blue"
+msgstr "亮藍色"
+
+#: ../e-util/e-color-combo.c:114
+msgid "red purple"
+msgstr "紅紫色"
+
+#: ../e-util/e-color-combo.c:115
+msgid "light grey"
+msgstr "淡灰色"
+
+#: ../e-util/e-color-combo.c:117
+msgid "pink"
+msgstr "粉紅色"
+
+#: ../e-util/e-color-combo.c:118
+msgid "light orange"
+msgstr "淡橘色"
+
+#: ../e-util/e-color-combo.c:119
+msgid "light yellow"
+msgstr "淡黃色"
+
+#: ../e-util/e-color-combo.c:120
+msgid "light green"
+msgstr "淡綠色"
+
+#: ../e-util/e-color-combo.c:121
+msgid "light cyan"
+msgstr "淡青色"
+
+#: ../e-util/e-color-combo.c:122
+msgid "light blue"
+msgstr "淡藍色"
+
+#: ../e-util/e-color-combo.c:123
+msgid "light purple"
+msgstr "淡紫色"
+
+#: ../e-util/e-color-combo.c:124
+msgid "white"
+msgstr "白色"
+
+#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../mail/e-mail-config-security-page.c:426
+#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3857
+#: ../mail/mail-config.ui.h:68
+msgid "Default"
+msgstr "預設值"
+
 #: ../e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "日期與時刻"
@@ -10642,6 +11057,111 @@ msgstr "使用地區設定預設值"
 msgid "Format:"
 msgstr "格式:"
 
+#. Translators: :-)
+#: ../e-util/e-emoticon-chooser.c:39
+msgid "_Smile"
+msgstr "微笑(_S)"
+
+#. Translators: :-(
+#: ../e-util/e-emoticon-chooser.c:41
+msgid "S_ad"
+msgstr "悲傷(_A)"
+
+#. Translators: ;-)
+#: ../e-util/e-emoticon-chooser.c:43
+msgid "_Wink"
+msgstr "眨眼(_W)"
+
+#. Translators: :-P
+#: ../e-util/e-emoticon-chooser.c:45
+msgid "Ton_gue"
+msgstr "吐舌頭(_G)"
+
+#. Translators: :-))
+#: ../e-util/e-emoticon-chooser.c:47
+msgid "Laug_h"
+msgstr "大笑(_H)"
+
+#. Translators: :-|
+#: ../e-util/e-emoticon-chooser.c:49
+msgid "_Plain"
+msgstr "面無表情(_P)"
+
+#. Translators: :-!
+#: ../e-util/e-emoticon-chooser.c:51
+msgid "Smi_rk"
+msgstr "傻笑(_R)"
+
+#. Translators: :"-)
+#: ../e-util/e-emoticon-chooser.c:53
+msgid "_Embarrassed"
+msgstr "不好意思(_E)"
+
+#. Translators: :-D
+#: ../e-util/e-emoticon-chooser.c:55
+msgid "_Big Smile"
+msgstr "大微笑(_B)"
+
+#. Translators: :-/
+#: ../e-util/e-emoticon-chooser.c:57
+msgid "Uncer_tain"
+msgstr "不確定(_T)"
+
+#. Translators: :-O
+#: ../e-util/e-emoticon-chooser.c:59
+msgid "S_urprise"
+msgstr "驚訝(_U)"
+
+#. Translators: :-S
+#: ../e-util/e-emoticon-chooser.c:61
+msgid "W_orried"
+msgstr "擔心(_O)"
+
+#. Translators: :-*
+#: ../e-util/e-emoticon-chooser.c:63
+msgid "_Kiss"
+msgstr "親吻(_K)"
+
+#. Translators: X-(
+#: ../e-util/e-emoticon-chooser.c:65
+msgid "A_ngry"
+msgstr "生氣(_N)"
+
+#. Translators: B-)
+#: ../e-util/e-emoticon-chooser.c:67
+msgid "_Cool"
+msgstr "耍酷(_C)"
+
+#. Translators: O:-)
+#: ../e-util/e-emoticon-chooser.c:69
+msgid "Ange_l"
+msgstr "天使(_L)"
+
+#. Translators: :'(
+#: ../e-util/e-emoticon-chooser.c:71
+msgid "Cr_ying"
+msgstr "哭泣(_Y)"
+
+#. Translators: :-Q
+#: ../e-util/e-emoticon-chooser.c:73
+msgid "S_ick"
+msgstr "生病(_I)"
+
+#. Translators: |-)
+#: ../e-util/e-emoticon-chooser.c:75
+msgid "Tire_d"
+msgstr "疲勞(_D)"
+
+#. Translators: >:-)
+#: ../e-util/e-emoticon-chooser.c:77
+msgid "De_vilish"
+msgstr "惡魔(_V)"
+
+#. Translators: :-(|)
+#: ../e-util/e-emoticon-chooser.c:79
+msgid "_Monkey"
+msgstr "猴子(_M)"
+
 #: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(不明的檔案名稱)"
@@ -10767,23 +11287,23 @@ msgstr "選擇要比對的時間"
 msgid "Choose a File"
 msgstr "選擇檔案"
 
-#: ../e-util/e-filter-rule.c:750
+#: ../e-util/e-filter-rule.c:751
 msgid "R_ule name:"
 msgstr "規則名稱(_U):"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:801
 msgid "all the following conditions"
 msgstr "如果全部條件符合"
 
-#: ../e-util/e-filter-rule.c:801
+#: ../e-util/e-filter-rule.c:802
 msgid "any of the following conditions"
 msgstr "如果任何條件符合"
 
-#: ../e-util/e-filter-rule.c:807
+#: ../e-util/e-filter-rule.c:808
 msgid "_Find items which match:"
 msgstr "尋找符合的項目(_F):"
 
-#: ../e-util/e-filter-rule.c:830
+#: ../e-util/e-filter-rule.c:831
 msgid "Find items that meet the following conditions"
 msgstr "尋找符合下列條件的項目"
 
@@ -10791,48 +11311,1037 @@ msgstr "尋找符合下列條件的項目"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
-#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:60
+#: ../e-util/e-mail-identity-combo-box.c:472
+#: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
 msgid "None"
 msgstr "沒有"
 
-#: ../e-util/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:847
 msgid "All related"
 msgstr "所有相關的"
 
-#: ../e-util/e-filter-rule.c:848
+#: ../e-util/e-filter-rule.c:848 ../e-util/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "回覆"
+
+#: ../e-util/e-filter-rule.c:849
 msgid "Replies and parents"
 msgstr "回覆和父代"
 
-#: ../e-util/e-filter-rule.c:849
+#: ../e-util/e-filter-rule.c:850
 msgid "No reply or parent"
 msgstr "沒有回復或原始郵件"
 
-#: ../e-util/e-filter-rule.c:852
+#: ../e-util/e-filter-rule.c:853
 msgid "I_nclude threads:"
 msgstr "包括郵件群組(_N):"
 
-#: ../e-util/e-filter-rule.c:929
+#: ../e-util/e-filter-rule.c:930
 msgid "A_dd Condition"
 msgstr "加入條件(_D)"
 
-#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:231
+#: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
+#: ../mail/em-utils.c:229
+msgid "Incoming"
+msgstr "內送"
+
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "外寄"
 
+#: ../e-util/e-html-editor-actions.c:57
+msgid "Failed to insert HTML file."
+msgstr "無法插入 HTML 檔案。"
+
+#: ../e-util/e-html-editor-actions.c:94
+msgid "Failed to insert text file."
+msgstr "無法插入文字檔案。"
+
+#: ../e-util/e-html-editor-actions.c:478
+msgid "Insert HTML File"
+msgstr "插入 HTML 檔案"
+
+#: ../e-util/e-html-editor-actions.c:484
+msgid "HTML file"
+msgstr "HTML 檔案"
+
+#: ../e-util/e-html-editor-actions.c:511
+#: ../e-util/e-html-editor-actions.c:1292
+msgid "Insert Image"
+msgstr "插入影像"
+
+#: ../e-util/e-html-editor-actions.c:571
+msgid "Insert text file"
+msgstr "插入文字檔案"
+
+#: ../e-util/e-html-editor-actions.c:577
+msgid "Text file"
+msgstr "文字檔案"
+
+#: ../e-util/e-html-editor-actions.c:961
+msgid "Copy selected text to the clipboard"
+msgstr "將選取的文字複製至剪貼簿"
+
+#: ../e-util/e-html-editor-actions.c:968
+msgid "Cut selected text to the clipboard"
+msgstr "將選定的文字剪貼至剪貼簿"
+
+#. Widgets are treating Ctrl + v shortcut themselves
+#: ../e-util/e-html-editor-actions.c:975
+msgid "Paste text from the clipboard"
+msgstr "從剪貼簿貼上文字"
+
+#: ../e-util/e-html-editor-actions.c:982
+msgid "Redo the last undone action"
+msgstr "重複剛取消的動作"
+
+#: ../e-util/e-html-editor-actions.c:996
+msgid "Undo the last action"
+msgstr "還原最後的動作"
+
+#: ../e-util/e-html-editor-actions.c:1017
+msgid "For_mat"
+msgstr "格式(_M)"
+
+#: ../e-util/e-html-editor-actions.c:1024
+msgid "_Paragraph Style"
+msgstr "段落樣式(_P)"
+
+#: ../e-util/e-html-editor-actions.c:1038
+#: ../e-util/e-html-editor-image-dialog.c:591
+msgid "_Alignment"
+msgstr "對齊(_A)"
+
+#: ../e-util/e-html-editor-actions.c:1045
+msgid "Current _Languages"
+msgstr "目前的語言(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1062
+msgid "_Increase Indent"
+msgstr "增加縮排(_I)"
+
+#: ../e-util/e-html-editor-actions.c:1064
+msgid "Increase Indent"
+msgstr "增加縮排"
+
+#: ../e-util/e-html-editor-actions.c:1069
+msgid "_HTML File..."
+msgstr "_HTML 檔案…"
+
+#: ../e-util/e-html-editor-actions.c:1076
+msgid "Te_xt File..."
+msgstr "文字檔案(_X)…"
+
+#: ../e-util/e-html-editor-actions.c:1083
+msgid "Paste _Quotation"
+msgstr "貼上引文(_Q)"
+
+#: ../e-util/e-html-editor-actions.c:1090
+msgid "_Find..."
+msgstr "尋找(_F)…"
+
+#: ../e-util/e-html-editor-actions.c:1092
+msgid "Search for text"
+msgstr "搜尋文字"
+
+#: ../e-util/e-html-editor-actions.c:1097
+msgid "Find A_gain"
+msgstr "再次尋找(_G)"
+
+#: ../e-util/e-html-editor-actions.c:1104
+msgid "Re_place..."
+msgstr "取代(_P)…"
+
+#: ../e-util/e-html-editor-actions.c:1106
+msgid "Search for and replace text"
+msgstr "搜尋及取代文字"
+
+#: ../e-util/e-html-editor-actions.c:1111
+msgid "Check _Spelling..."
+msgstr "檢查拼字(_S)…"
+
+#: ../e-util/e-html-editor-actions.c:1118
+msgid "_Decrease Indent"
+msgstr "減少縮排(_D)"
+
+#: ../e-util/e-html-editor-actions.c:1120
+msgid "Decrease Indent"
+msgstr "減少縮排"
+
+#: ../e-util/e-html-editor-actions.c:1125
+msgid "_Wrap Lines"
+msgstr "換列(_W)"
+
+#: ../e-util/e-html-editor-actions.c:1132
+msgid "Open Inspector"
+msgstr "開啟檢查器(_I)"
+
+#. Center
+#: ../e-util/e-html-editor-actions.c:1142
+#: ../e-util/e-html-editor-paragraph-dialog.c:110
+msgid "_Center"
+msgstr "置中(_C)"
+
+#: ../e-util/e-html-editor-actions.c:1144
+msgid "Center Alignment"
+msgstr "置中對齊"
+
+#. Left
+#: ../e-util/e-html-editor-actions.c:1149
+#: ../e-util/e-html-editor-paragraph-dialog.c:101
+msgid "_Left"
+msgstr "靠左(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1151
+msgid "Left Alignment"
+msgstr "靠左對齊"
+
+#. Right
+#: ../e-util/e-html-editor-actions.c:1156
+#: ../e-util/e-html-editor-paragraph-dialog.c:119
+msgid "_Right"
+msgstr "靠右(_R)"
+
+#: ../e-util/e-html-editor-actions.c:1158
+msgid "Right Alignment"
+msgstr "靠右對齊"
+
+#: ../e-util/e-html-editor-actions.c:1166
+#: ../modules/text-highlight/languages.c:72
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../e-util/e-html-editor-actions.c:1168
+msgid "HTML editing mode"
+msgstr "HTML 編輯模式"
+
+#: ../e-util/e-html-editor-actions.c:1173
+msgid "Plain _Text"
+msgstr "純文字(_T)"
+
+#: ../e-util/e-html-editor-actions.c:1175
+msgid "Plain text editing mode"
+msgstr "純文字編輯模式"
+
+#: ../e-util/e-html-editor-actions.c:1183
+msgid "_Normal"
+msgstr "一般(_N)"
+
+#: ../e-util/e-html-editor-actions.c:1190
+msgid "Header _1"
+msgstr "標題 _1"
+
+#: ../e-util/e-html-editor-actions.c:1197
+msgid "Header _2"
+msgstr "標題 _2"
+
+#: ../e-util/e-html-editor-actions.c:1204
+msgid "Header _3"
+msgstr "標題 _3"
+
+#: ../e-util/e-html-editor-actions.c:1211
+msgid "Header _4"
+msgstr "標題 _4"
+
+#: ../e-util/e-html-editor-actions.c:1218
+msgid "Header _5"
+msgstr "標題 _5"
+
+#: ../e-util/e-html-editor-actions.c:1225
+msgid "Header _6"
+msgstr "標題 _6"
+
+#: ../e-util/e-html-editor-actions.c:1232
+msgid "_Preformatted"
+msgstr "預先格式化(_P)"
+
+#: ../e-util/e-html-editor-actions.c:1239
+msgid "A_ddress"
+msgstr "位址(_D)"
+
+#: ../e-util/e-html-editor-actions.c:1246
+msgid "_Blockquote"
+msgstr "區塊引用(_B)"
+
+#: ../e-util/e-html-editor-actions.c:1253
+msgid "_Bulleted List"
+msgstr "無序清單(_B)"
+
+#: ../e-util/e-html-editor-actions.c:1260
+msgid "_Roman Numeral List"
+msgstr "羅馬字有序清單(_R)"
+
+#: ../e-util/e-html-editor-actions.c:1267
+msgid "Numbered _List"
+msgstr "有序清單(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1274
+msgid "_Alphabetical List"
+msgstr "字母順序清單(_A)"
+
+#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-actions.c:1327
+msgid "_Image..."
+msgstr "影像(_I)…"
+
+#: ../e-util/e-html-editor-actions.c:1297
+#: ../e-util/e-html-editor-actions.c:1334
+msgid "_Link..."
+msgstr "連結(_L)…"
+
+#: ../e-util/e-html-editor-actions.c:1299
+msgid "Insert Link"
+msgstr "插入連結"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1305
+#: ../e-util/e-html-editor-actions.c:1349
+msgid "_Rule..."
+msgstr "水平線(_R)…"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1308
+msgid "Insert Rule"
+msgstr "插入水平線"
+
+#: ../e-util/e-html-editor-actions.c:1313
+#: ../e-util/e-html-editor-actions.c:1356
+msgid "_Table..."
+msgstr "表格(_T)…"
+
+#: ../e-util/e-html-editor-actions.c:1315
+msgid "Insert Table"
+msgstr "插入表格"
+
+#: ../e-util/e-html-editor-actions.c:1320
+msgid "_Cell..."
+msgstr "儲存格(_C)…"
+
+#: ../e-util/e-html-editor-actions.c:1341
+msgid "Pa_ge..."
+msgstr "頁面(_G)…"
+
+#: ../e-util/e-html-editor-actions.c:1365
+msgid "Font _Size"
+msgstr "字型大小(_S)"
+
+#: ../e-util/e-html-editor-actions.c:1372
+msgid "_Font Style"
+msgstr "字型樣式(_F)"
+
+#: ../e-util/e-html-editor-actions.c:1379
+msgid "Paste As _Text"
+msgstr "貼上為純文字(_T)"
+
+#: ../e-util/e-html-editor-actions.c:1390
+#: ../e-util/e-html-editor-text-dialog.c:214
+msgid "_Bold"
+msgstr "粗體(_B)"
+
+#: ../e-util/e-html-editor-actions.c:1392
+msgid "Bold"
+msgstr "粗體"
+
+#: ../e-util/e-html-editor-actions.c:1398
+#: ../e-util/e-html-editor-text-dialog.c:225
+msgid "_Italic"
+msgstr "斜體(_I)"
+
+#: ../e-util/e-html-editor-actions.c:1400
+msgid "Italic"
+msgstr "斜體"
+
+#: ../e-util/e-html-editor-actions.c:1406
+msgid "_Plain Text"
+msgstr "純文字(_P)"
+
+#: ../e-util/e-html-editor-actions.c:1414
+#: ../e-util/e-html-editor-text-dialog.c:246
+msgid "_Strikethrough"
+msgstr "刪除線(_S)"
+
+#: ../e-util/e-html-editor-actions.c:1416
+msgid "Strikethrough"
+msgstr "刪除線"
+
+#: ../e-util/e-html-editor-actions.c:1422
+#: ../e-util/e-html-editor-text-dialog.c:236
+msgid "_Underline"
+msgstr "底線(_U)"
+
+#: ../e-util/e-html-editor-actions.c:1424
+msgid "Underline"
+msgstr "底線"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1434
+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.
+#: ../e-util/e-html-editor-actions.c:1442
+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.
+#: ../e-util/e-html-editor-actions.c:1450
+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.
+#: ../e-util/e-html-editor-actions.c:1458
+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.
+#: ../e-util/e-html-editor-actions.c:1466
+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.
+#: ../e-util/e-html-editor-actions.c:1474
+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.
+#: ../e-util/e-html-editor-actions.c:1482
+msgid "+4"
+msgstr "+4"
+
+#: ../e-util/e-html-editor-actions.c:1501
+msgid "Cell Contents"
+msgstr "儲存格內容"
+
+#: ../e-util/e-html-editor-actions.c:1508
+msgid "Column"
+msgstr "欄"
+
+#: ../e-util/e-html-editor-actions.c:1515
+msgid "Row"
+msgstr "列"
+
+#: ../e-util/e-html-editor-actions.c:1522
+#: ../e-util/e-html-editor-actions.c:1607
+msgid "Table"
+msgstr "表格"
+
+#. Translators: Popup menu item caption, containing all the Delete options for a table
+#: ../e-util/e-html-editor-actions.c:1532
+msgid "Table Delete"
+msgstr "刪除表格"
+
+#: ../e-util/e-html-editor-actions.c:1539 ../e-util/e-text.c:2127
+msgid "Input Methods"
+msgstr "輸入法"
+
+#. Translators: Popup menu item caption, containing all the Insert options for a table
+#: ../e-util/e-html-editor-actions.c:1547
+msgid "Table Insert"
+msgstr "插入表格"
+
+#: ../e-util/e-html-editor-actions.c:1554
+msgid "Properties"
+msgstr "屬性"
+
+#: ../e-util/e-html-editor-actions.c:1572
+msgid "Column After"
+msgstr "欄之後"
+
+#: ../e-util/e-html-editor-actions.c:1579
+msgid "Column Before"
+msgstr "欄之前"
+
+#: ../e-util/e-html-editor-actions.c:1586
+msgid "Insert _Link"
+msgstr "插入連結(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1593
+msgid "Row Above"
+msgstr "列之上"
+
+#: ../e-util/e-html-editor-actions.c:1600
+msgid "Row Below"
+msgstr "列之下"
+
+#: ../e-util/e-html-editor-actions.c:1614
+msgid "Cell..."
+msgstr "儲存格…"
+
+#: ../e-util/e-html-editor-actions.c:1621
+msgid "Image..."
+msgstr "影像…"
+
+#: ../e-util/e-html-editor-actions.c:1628
+msgid "Link..."
+msgstr "連結…"
+
+#: ../e-util/e-html-editor-actions.c:1635
+msgid "Page..."
+msgstr "頁面…"
+
+#: ../e-util/e-html-editor-actions.c:1642
+msgid "Paragraph..."
+msgstr "段落…"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1650
+msgid "Rule..."
+msgstr "水平線…"
+
+#: ../e-util/e-html-editor-actions.c:1657
+msgid "Table..."
+msgstr "表格…"
+
+#: ../e-util/e-html-editor-actions.c:1664
+msgid "Text..."
+msgstr "文字…"
+
+#: ../e-util/e-html-editor-actions.c:1671
+msgid "Remove Link"
+msgstr "移除連結"
+
+#: ../e-util/e-html-editor-actions.c:1688
+msgid "Add Word to Dictionary"
+msgstr "加入字詞至字典"
+
+#: ../e-util/e-html-editor-actions.c:1695
+msgid "Ignore Misspelled Word"
+msgstr "忽略拼錯的字詞"
+
+#: ../e-util/e-html-editor-actions.c:1702
+msgid "Add Word To"
+msgstr "加入字詞至"
+
+#: ../e-util/e-html-editor-actions.c:1711
+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.
+#: ../e-util/e-html-editor-actions.c:1819
+#, c-format
+msgid "%s Dictionary"
+msgstr "%s 字典"
+
+#: ../e-util/e-html-editor-actions.c:1906
+msgid "_Emoticon"
+msgstr "表情符號(_E)"
+
+#: ../e-util/e-html-editor-actions.c:1907
+msgid "Insert Emoticon"
+msgstr "插入表情符號"
+
+#: ../e-util/e-html-editor-actions.c:1975
+msgid "Re_place"
+msgstr "取代(_P)"
+
+#: ../e-util/e-html-editor-actions.c:1978
+msgid "_Image"
+msgstr "影像(_I)"
+
+#: ../e-util/e-html-editor-actions.c:1981
+msgid "_Link"
+msgstr "連結(_L)"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1985
+msgid "_Rule"
+msgstr "水平線(_R)"
+
+#: ../e-util/e-html-editor-actions.c:1988
+#: ../e-util/e-html-editor-cell-dialog.c:658
+msgid "_Table"
+msgstr "表格(_T)"
+
+#: ../e-util/e-html-editor.c:669
+msgid "Paragraph Style"
+msgstr "段落樣式"
+
+#: ../e-util/e-html-editor.c:683
+msgid "Editing Mode"
+msgstr "編輯模式"
+
+#: ../e-util/e-html-editor.c:695
+msgid "Font Color"
+msgstr "字型顏色"
+
+#: ../e-util/e-html-editor.c:713
+msgid "Font Size"
+msgstr "字型大小"
+
+#: ../e-util/e-html-editor-cell-dialog.c:618
+msgid "<b>Scope</b>"
+msgstr "<b>範圍</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:632
+msgid "C_ell"
+msgstr "儲存格(_E)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:645
+msgid "_Row"
+msgstr "列(_R)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:671
+msgid "Col_umn"
+msgstr "欄(_U)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:681
+msgid "<b>Alignment &amp; Behavior</b>"
+msgstr "<b>對齊 &amp; 行為</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:694
+#: ../e-util/e-html-editor-hrule-dialog.c:384
+#: ../e-util/e-html-editor-table-dialog.c:819
+msgid "Left"
+msgstr "靠左"
+
+#: ../e-util/e-html-editor-cell-dialog.c:695
+#: ../e-util/e-html-editor-hrule-dialog.c:386
+#: ../e-util/e-html-editor-table-dialog.c:820
+msgid "Center"
+msgstr "置中"
+
+#: ../e-util/e-html-editor-cell-dialog.c:696
+#: ../e-util/e-html-editor-hrule-dialog.c:388
+#: ../e-util/e-html-editor-table-dialog.c:821
+msgid "Right"
+msgstr "靠右"
+
+#: ../e-util/e-html-editor-cell-dialog.c:704
+msgid "_Horizontal:"
+msgstr "水平(_H):"
+
+#: ../e-util/e-html-editor-cell-dialog.c:712
+#: ../e-util/e-html-editor-image-dialog.c:581
+msgid "Top"
+msgstr "上"
+
+#: ../e-util/e-html-editor-cell-dialog.c:713
+#: ../e-util/e-html-editor-image-dialog.c:582
+msgid "Middle"
+msgstr "中央"
+
+#: ../e-util/e-html-editor-cell-dialog.c:714
+#: ../e-util/e-html-editor-image-dialog.c:583
+msgid "Bottom"
+msgstr "下"
+
+#: ../e-util/e-html-editor-cell-dialog.c:722
+msgid "_Vertical:"
+msgstr "垂直(_V):"
+
+#. Wrap Text
+#: ../e-util/e-html-editor-cell-dialog.c:728
+msgid "_Wrap Text"
+msgstr "文字換列(_W)"
+
+#. Header Style
+#: ../e-util/e-html-editor-cell-dialog.c:736
+msgid "_Header Style"
+msgstr "標題樣式(_H)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:750
+#: ../e-util/e-html-editor-image-dialog.c:521
+#: ../e-util/e-html-editor-table-dialog.c:731
+msgid "<b>Layout</b>"
+msgstr "<b>配置</b>"
+
+#. Width
+#: ../e-util/e-html-editor-cell-dialog.c:761
+msgid "_Width"
+msgstr "寬度(_W)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:800
+msgid "Row S_pan:"
+msgstr "合併列(_P):"
+
+#: ../e-util/e-html-editor-cell-dialog.c:814
+msgid "Co_lumn Span:"
+msgstr "合併欄(_L):"
+
+#: ../e-util/e-html-editor-cell-dialog.c:821
+#: ../e-util/e-html-editor-table-dialog.c:835
+msgid "<b>Background</b>"
+msgstr "<b>背景</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:834
+#: ../e-util/e-html-editor-table-dialog.c:848
+msgid "Transparent"
+msgstr "透明"
+
+#: ../e-util/e-html-editor-cell-dialog.c:842
+msgid "C_olor:"
+msgstr "顏色(_O):"
+
+#: ../e-util/e-html-editor-cell-dialog.c:850
+#: ../e-util/e-html-editor-image-dialog.c:483
+#: ../e-util/e-html-editor-table-dialog.c:864
+msgid "Choose Background Image"
+msgstr "選擇背景影像"
+
+#: ../e-util/e-html-editor-cell-dialog.c:855
+#: ../e-util/e-html-editor-image-dialog.c:489
+#: ../e-util/e-html-editor-table-dialog.c:869
+msgid "Images"
+msgstr "影像"
+
+#: ../e-util/e-html-editor-cell-dialog.c:868
+msgid "_Image:"
+msgstr "影像(_I):"
+
+#: ../e-util/e-html-editor-cell-dialog.c:875
+#: ../e-util/e-html-editor-page-dialog.c:516
+#: ../e-util/e-html-editor-table-dialog.c:889
+msgid "_Remove image"
+msgstr "移除影像(_R)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:895
+msgid "Cell Properties"
+msgstr "儲存格屬性"
+
+#: ../e-util/e-html-editor-find-dialog.c:105
+#: ../e-util/e-html-editor-replace-dialog.c:90
+#: ../e-util/e-html-editor-replace-dialog.c:108
+msgid "No match found"
+msgstr "找不到符合項目"
+
+#: ../e-util/e-html-editor-find-dialog.c:160
+#: ../e-util/e-html-editor-replace-dialog.c:229
+msgid "Search _backwards"
+msgstr "往後搜尋(_B)"
+
+#: ../e-util/e-html-editor-find-dialog.c:167
+msgid "Case _Sensitive"
+msgstr "區分大小寫(_S)"
+
+#: ../e-util/e-html-editor-find-dialog.c:174
+msgid "_Wrap Search"
+msgstr "反向搜尋(_W)"
+
+#: ../e-util/e-html-editor-find-dialog.c:213
+msgid "Find"
+msgstr "尋找"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:319
+msgid "<b>Size</b>"
+msgstr "<b>大小</b>"
+
+#. Width
+#: ../e-util/e-html-editor-hrule-dialog.c:339
+#: ../e-util/e-html-editor-image-dialog.c:539
+#: ../e-util/e-html-editor-table-dialog.c:742
+msgid "_Width:"
+msgstr "寬度(_W):"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:364
+msgid "_Size:"
+msgstr "大小(_S):"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:371
+msgid "<b>Style</b>"
+msgstr "<b>樣式</b>"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:396
+#: ../e-util/e-html-editor-table-dialog.c:828
+msgid "_Alignment:"
+msgstr "對齊(_A):"
+
+#. Shaded
+#: ../e-util/e-html-editor-hrule-dialog.c:402
+msgid "S_haded"
+msgstr "陰影(_H)"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:419
+msgid "Rule properties"
+msgstr "水平線屬性"
+
+#: ../e-util/e-html-editor-image-dialog.c:471
+#: ../e-util/e-html-editor-paragraph-dialog.c:66
+#: ../e-util/e-html-editor-table-dialog.c:685
+#| msgid "General"
+msgid "<b>General</b>"
+msgstr "<b>一般</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:500
+msgid "_Source:"
+msgstr "來源:"
+
+#: ../e-util/e-html-editor-image-dialog.c:563
+msgid "_Height:"
+msgstr "高度(_H):"
+
+#: ../e-util/e-html-editor-image-dialog.c:604
+msgid "_X-Padding:"
+msgstr "_X 填充:"
+
+#: ../e-util/e-html-editor-image-dialog.c:620
+msgid "_Y-Padding:"
+msgstr "_Y 填充:"
+
+#: ../e-util/e-html-editor-image-dialog.c:636
+#: ../e-util/e-html-editor-table-dialog.c:809
+msgid "_Border:"
+msgstr "邊框(_B):"
+
+#: ../e-util/e-html-editor-image-dialog.c:646
+msgid "<b>Link</b>"
+msgstr "<b>連結</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-link-dialog.c:334
+#| msgid "URL:"
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../e-util/e-html-editor-image-dialog.c:669
+#: ../e-util/e-html-editor-link-dialog.c:339
+msgid "_Test URL..."
+msgstr "測試 URL (_T)…"
+
+#: ../e-util/e-html-editor-image-dialog.c:686
+msgid "Image Properties"
+msgstr "影像屬性"
+
+#: ../e-util/e-html-editor-link-dialog.c:363
+msgid "_Remove Link"
+msgstr "移除連結(_R)"
+
+#: ../e-util/e-html-editor-link-dialog.c:388
+msgid "Link Properties"
+msgstr "連結屬性"
+
+#: ../e-util/e-html-editor-page-dialog.c:69
+msgid "Perforated Paper"
+msgstr "打孔紙張"
+
+#: ../e-util/e-html-editor-page-dialog.c:78
+msgid "Blue Ink"
+msgstr "藍色墨水"
+
+#: ../e-util/e-html-editor-page-dialog.c:87
+msgid "Paper"
+msgstr "紙張"
+
+#: ../e-util/e-html-editor-page-dialog.c:96
+msgid "Ribbon"
+msgstr "緞帶"
+
+#: ../e-util/e-html-editor-page-dialog.c:105
+msgid "Midnight"
+msgstr "午夜"
+
+#: ../e-util/e-html-editor-page-dialog.c:123 ../mail/filtertypes.xml.in.h:36
+#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
+msgid "Draft"
+msgstr "草稿"
+
+#: ../e-util/e-html-editor-page-dialog.c:132
+msgid "Graph Paper"
+msgstr "報表紙"
+
+#: ../e-util/e-html-editor-page-dialog.c:415
+msgid "<b>Colors</b>"
+msgstr "<b>顏色</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:434
+msgid "_Text:"
+msgstr "文字(_T):"
+
+#: ../e-util/e-html-editor-page-dialog.c:449
+msgid "_Link:"
+msgstr "連結(_L):"
+
+#: ../e-util/e-html-editor-page-dialog.c:464
+msgid "_Background:"
+msgstr "背景(_B):"
+
+#: ../e-util/e-html-editor-page-dialog.c:472
+msgid "<b>Background Image</b>"
+msgstr "<b>背景影像</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:494
+msgid "_Template:"
+msgstr "範本(_T):"
+
+#: ../e-util/e-html-editor-page-dialog.c:502
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "選擇一個檔案"
+
+#: ../e-util/e-html-editor-page-dialog.c:509
+msgid "_Custom:"
+msgstr "自訂(_C):"
+
+#: ../e-util/e-html-editor-page-dialog.c:536
+msgid "Page Properties"
+msgstr "紙張屬性"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:83
+msgid "_Style:"
+msgstr "樣式(_S):"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:90
+msgid "<b>Alignment</b>"
+msgstr "<b>對齊</b>"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:155
+msgid "Paragraph Properties"
+msgstr "段落屬性"
+
+#: ../e-util/e-html-editor-replace-dialog.c:148
+#, c-format
+msgid "%d occurences replaced"
+msgstr "已進行 %d 次取代"
+
+#: ../e-util/e-html-editor-replace-dialog.c:209
+msgid "R_eplace:"
+msgstr "取代(_E):"
+
+#: ../e-util/e-html-editor-replace-dialog.c:221
+msgid "_With:"
+msgstr "以(_W):"
+
+#: ../e-util/e-html-editor-replace-dialog.c:233
+msgid "_Case sensitive"
+msgstr "區分大小寫(_C)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:237
+msgid "Wra_p search"
+msgstr "反向搜尋(_P)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:247
+msgid "_Skip"
+msgstr "略過(_S)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:255
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "取代(_R)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:263
+msgid "Replace _All"
+msgstr "全部取代(_A)"
+
+#. Replace
+#: ../e-util/e-html-editor-replace-dialog.c:283
+#: ../e-util/e-html-editor-spell-check-dialog.c:536
+msgid "Replace"
+msgstr "取代"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:87
+#, c-format
+msgid "<b>Suggestions for '%s'</b>"
+msgstr "<b>「%s」的建議</b>"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:501
+msgid "<b>Suggestions</b>"
+msgstr "<b>建議</b>"
+
+#. Replace All
+#: ../e-util/e-html-editor-spell-check-dialog.c:545
+msgid "Replace All"
+msgstr "全部取代"
+
+#. Ignore
+#: ../e-util/e-html-editor-spell-check-dialog.c:554
+#: ../mail/mail.error.xml.h:109
+msgid "Ignore"
+msgstr "忽略"
+
+#. Skip
+#: ../e-util/e-html-editor-spell-check-dialog.c:563
+msgid "Skip"
+msgstr "略過"
+
+#. Back
+#: ../e-util/e-html-editor-spell-check-dialog.c:572
+msgid "Back"
+msgstr "向後"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:581
+msgid "<b>Dictionary</b>"
+msgstr "<b>字典</b>"
+
+#. Add Word button
+#: ../e-util/e-html-editor-spell-check-dialog.c:601
+msgid "Add word"
+msgstr "加入字詞"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:618
+#: ../mail/mail-config.ui.h:36
+msgid "Spell Checking"
+msgstr "拼字檢查"
+
+#: ../e-util/e-html-editor-table-dialog.c:707
+msgid "_Rows:"
+msgstr "列(_R):"
+
+#: ../e-util/e-html-editor-table-dialog.c:724
+msgid "C_olumns:"
+msgstr "欄(_O):"
+
+#: ../e-util/e-html-editor-table-dialog.c:775
+msgid "_Spacing:"
+msgstr "間隔(_S):"
+
+#: ../e-util/e-html-editor-table-dialog.c:792
+msgid "_Padding:"
+msgstr "留空(_P):"
+
+#: ../e-util/e-html-editor-table-dialog.c:856
+#: ../e-util/e-html-editor-text-dialog.c:261
+msgid "_Color:"
+msgstr "顏色(_C):"
+
+#: ../e-util/e-html-editor-table-dialog.c:882
+msgid "Image:"
+msgstr "影像:"
+
+#: ../e-util/e-html-editor-table-dialog.c:909
+msgid "Table Properties"
+msgstr "表格屬性"
+
+#: ../e-util/e-html-editor-text-dialog.c:281
+msgid "Si_ze:"
+msgstr "大小(_Z):"
+
+#: ../e-util/e-html-editor-text-dialog.c:296
+msgid "Text Properties"
+msgstr "文字屬性"
+
+#: ../e-util/e-html-editor-view.c:3350
+msgid "Changed property"
+msgstr "已變更屬性"
+
+#: ../e-util/e-html-editor-view.c:3351
+msgid "Whether editor changed"
+msgstr "編輯器是否已改變"
+
+#: ../e-util/e-html-editor-view.c:7121
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr "關閉 HTML 模式會使得文字失去所有的格式。您想要繼續嗎?"
+
+#: ../e-util/e-html-editor-view.c:7125
+msgid "_Don't lose formatting"
+msgstr "不要略去格式(_D)"
+
+#: ../e-util/e-html-editor-view.c:7126
+msgid "_Lose formatting"
+msgstr "略去格式(_L)"
+
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "選取要匯入 Evolution 的檔案,並且在清單內選取檔案類型。"
 
-#: ../e-util/e-import-assistant.c:283
-msgid "Select a file"
-msgstr "選擇一個檔案"
-
 #: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
 msgid "File _type:"
 msgstr "檔案類型(_T):"
@@ -10854,7 +12363,7 @@ msgid "Import a _single file"
 msgstr "匯入單一檔案(_S)"
 
 #: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:201
+#: ../modules/startup-wizard/e-mail-config-import-page.c:200
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇您想要匯入的資訊:"
 
@@ -10868,7 +12377,7 @@ msgstr ""
 "iCalendar。找不到可以輸入的設定值。如果您想再試一次,請按一下「向後」按鈕。"
 
 #: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:230
+#: ../modules/startup-wizard/e-mail-config-import-page.c:229
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s:"
@@ -10925,27 +12434,27 @@ msgstr "選取檔案"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "按「套用」開始將檔案匯入到 Evolution。"
 
-#: ../e-util/e-mail-signature-combo-box.c:377
+#: ../e-util/e-mail-signature-combo-box.c:376
 msgid "Autogenerated"
 msgstr "自動產生的"
 
-#: ../e-util/e-mail-signature-editor.c:309
+#: ../e-util/e-mail-signature-editor.c:297
 msgid "Close"
 msgstr "關閉"
 
-#: ../e-util/e-mail-signature-editor.c:314
+#: ../e-util/e-mail-signature-editor.c:302
 msgid "_Save and Close"
 msgstr "儲存後關閉(_S)"
 
-#: ../e-util/e-mail-signature-editor.c:528
+#: ../e-util/e-mail-signature-editor.c:531
 msgid "Edit Signature"
 msgstr "編輯簽名檔"
 
-#: ../e-util/e-mail-signature-editor.c:548
+#: ../e-util/e-mail-signature-editor.c:564
 msgid "_Signature Name:"
 msgstr "簽名檔名稱(_S):"
 
-#: ../e-util/e-mail-signature-editor.c:594
+#: ../e-util/e-mail-signature-editor.c:600
 msgid "Unnamed"
 msgstr "未命名的"
 
@@ -10953,15 +12462,15 @@ msgstr "未命名的"
 msgid "Add _Script"
 msgstr "新增命令稿(_S)"
 
-#: ../e-util/e-mail-signature-manager.c:419
+#: ../e-util/e-mail-signature-manager.c:426
 msgid "Add Signature Script"
 msgstr "新增簽名命令稿"
 
-#: ../e-util/e-mail-signature-manager.c:489
+#: ../e-util/e-mail-signature-manager.c:497
 msgid "Edit Signature Script"
 msgstr "編輯簽名命令稿"
 
-#: ../e-util/e-mail-signature-script-dialog.c:394
+#: ../e-util/e-mail-signature-script-dialog.c:393
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -10971,11 +12480,18 @@ msgstr ""
 "簽名檔。您指定的名稱只會作為\n"
 "顯示之用。"
 
-#: ../e-util/e-mail-signature-script-dialog.c:445
+#: ../e-util/e-mail-signature-script-dialog.c:415
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../mail/e-mail-config-identity-page.c:327
+#: ../mail/e-mail-config-summary-page.c:339
+msgid "_Name:"
+msgstr "名稱(_N):"
+
+#: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "命令稿(_C):"
 
-#: ../e-util/e-mail-signature-script-dialog.c:476
+#: ../e-util/e-mail-signature-script-dialog.c:475
 msgid "Script file must be executable."
 msgstr "命令稿必須為可執行檔。"
 
@@ -10991,14 +12507,34 @@ msgstr ""
 "用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的下拉式組合方"
 "塊來選擇時區。"
 
-#: ../e-util/e-misc-utils.c:246
+#: ../e-util/e-misc-utils.c:248
 msgid "Could not open the link."
 msgstr "無法開啟該連結。"
 
-#: ../e-util/e-misc-utils.c:293
+#: ../e-util/e-misc-utils.c:295
 msgid "Could not display help for Evolution."
 msgstr "無法顯示 Evolution 的求助文件。"
 
+#: ../e-util/e-misc-utils.c:2415
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "開啟行事曆「%s」"
+
+#: ../e-util/e-misc-utils.c:2418
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "開啟備忘錄清單「%s」"
+
+#: ../e-util/e-misc-utils.c:2421
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "開啟工作清單「%s」"
+
+#: ../e-util/e-misc-utils.c:2424
+#, c-format
+msgid "Opening address book '%s'"
+msgstr "正在開啟通訊錄「%s」"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "顯示連絡人"
@@ -11017,10 +12553,10 @@ msgstr "搜尋(_S):"
 
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1112
-#: ../modules/calendar/e-cal-shell-view-actions.c:1732
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:1215
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:881
 msgid "Any Category"
 msgstr "任何分類"
 
@@ -11039,7 +12575,7 @@ msgstr "通訊錄"
 
 #: ../e-util/e-name-selector-dialog.c:451
 #: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:373
 msgid "Contacts"
 msgstr "連絡人"
 
@@ -11048,25 +12584,25 @@ msgid "Select Contacts from Address Book"
 msgstr "從通訊錄選取連絡人"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3038
+#: ../e-util/e-name-selector-entry.c:3183
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "在行內展開 %s (_X)"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3054
+#: ../e-util/e-name-selector-entry.c:3199
 #, c-format
 msgid "Cop_y %s"
 msgstr "複製(_Y) %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3065
+#: ../e-util/e-name-selector-entry.c:3210
 #, c-format
 msgid "C_ut %s"
 msgstr "剪下(_U) %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3083
+#: ../e-util/e-name-selector-entry.c:3228
 #, c-format
 msgid "_Edit %s"
 msgstr "編輯 %s(_E)"
@@ -11076,39 +12612,39 @@ msgstr "編輯 %s(_E)"
 msgid "_Delete %s"
 msgstr "刪除(_D) %s"
 
-#: ../e-util/e-online-button.c:30
+#: ../e-util/e-online-button.c:32
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
 
-#: ../e-util/e-online-button.c:33
+#: ../e-util/e-online-button.c:35
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
 
-#: ../e-util/e-online-button.c:36
+#: ../e-util/e-online-button.c:38
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "因為網路無法使用,Evolution 目前為離線模式。"
 
-#: ../e-util/e-passwords.c:125
+#: ../e-util/e-passwords.c:127
 msgid "Keyring key is unusable: no user or host name"
 msgstr "鑰匙圈金鑰無法使用:沒有使用者或主機名稱"
 
-#: ../e-util/e-passwords.c:445
+#: ../e-util/e-passwords.c:447
 msgid "You have the Caps Lock key on."
 msgstr "您的 Caps Lock 是開啟的。"
 
-#: ../e-util/e-passwords.c:576
+#: ../e-util/e-passwords.c:578
 msgid "_Remember this passphrase"
 msgstr "記住這個密語(_R)"
 
-#: ../e-util/e-passwords.c:577
+#: ../e-util/e-passwords.c:579
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密語(_R)"
 
-#: ../e-util/e-passwords.c:582
+#: ../e-util/e-passwords.c:584
 msgid "_Remember this password"
 msgstr "記住這個密碼(_R)"
 
-#: ../e-util/e-passwords.c:583
+#: ../e-util/e-passwords.c:585
 msgid "_Remember this password for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
 
@@ -11129,63 +12665,63 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "列印系統沒有回報任何關於此錯誤的額外資訊。"
 
-#: ../e-util/e-proxy-editor.c:314
+#: ../e-util/e-proxy-editor.c:325
 msgid "_Method:"
 msgstr "方法(_M):"
 
-#: ../e-util/e-proxy-editor.c:336
+#: ../e-util/e-proxy-editor.c:347
 msgid "Defer to Desktop Settings"
 msgstr "使用桌面設定值"
 
-#: ../e-util/e-proxy-editor.c:340
+#: ../e-util/e-proxy-editor.c:351
 msgid "_Open Desktop Settings"
 msgstr "開啟桌面設定值(_O)"
 
-#: ../e-util/e-proxy-editor.c:366
+#: ../e-util/e-proxy-editor.c:377
 msgid "Manual"
 msgstr "手動"
 
-#: ../e-util/e-proxy-editor.c:385
+#: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
 msgstr "_HTTP 代理伺服器:"
 
-#: ../e-util/e-proxy-editor.c:416
+#: ../e-util/e-proxy-editor.c:427
 msgid "H_TTPS Proxy:"
 msgstr "H_TTPS 代理伺服器:"
 
-#: ../e-util/e-proxy-editor.c:447
+#: ../e-util/e-proxy-editor.c:458
 msgid "_Socks Proxy:"
 msgstr "_Socks 代理伺服器:"
 
-#: ../e-util/e-proxy-editor.c:478
+#: ../e-util/e-proxy-editor.c:489
 msgid "_Ignore Hosts:"
 msgstr "忽略主機(_I):"
 
-#: ../e-util/e-proxy-editor.c:504
+#: ../e-util/e-proxy-editor.c:515
 msgid "Automatic"
 msgstr "自動"
 
-#: ../e-util/e-proxy-editor.c:523
+#: ../e-util/e-proxy-editor.c:534
 msgid "Configuration _URL:"
 msgstr "組態網址(_U):"
 
-#: ../e-util/e-proxy-editor.c:552
+#: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "使用直接連線,不需要代理伺服器。"
 
-#: ../e-util/e-proxy-preferences.c:177
+#: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
 msgstr "切換到基礎代理伺服器偏好設定"
 
-#: ../e-util/e-proxy-preferences.c:179
+#: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "切換到進階代理伺服器偏好設定"
 
-#: ../e-util/e-proxy-preferences.c:463
+#: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
 msgstr "套用自訂代理伺服器設定值到這些帳號:"
 
-#: ../e-util/e-proxy-preferences.c:498
+#: ../e-util/e-proxy-preferences.c:561
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
@@ -11213,116 +12749,269 @@ msgstr "新增規則"
 msgid "Edit Rule"
 msgstr "編輯規則"
 
-#: ../e-util/e-search-bar.c:82
+#: ../e-util/e-search-bar.c:83
 #, c-format
 msgid "Matches: %u"
 msgstr "符合項:%u"
 
-#: ../e-util/e-search-bar.c:566
+#: ../e-util/e-search-bar.c:567
 msgid "Close the find bar"
 msgstr "關閉搜尋工具列"
 
-#: ../e-util/e-search-bar.c:574
+#: ../e-util/e-search-bar.c:575
 msgid "Fin_d:"
 msgstr "尋找(_D):"
 
-#: ../e-util/e-search-bar.c:586
+#: ../e-util/e-search-bar.c:587
 msgid "Clear the search"
 msgstr "清除此搜尋"
 
-#: ../e-util/e-search-bar.c:610
+#: ../e-util/e-search-bar.c:611
 msgid "_Previous"
 msgstr "上一個(_P)"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:614
 msgid "Find the previous occurrence of the phrase"
 msgstr "尋找上一個出現的字詞"
 
-#: ../e-util/e-search-bar.c:622
+#: ../e-util/e-search-bar.c:623
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:626
 msgid "Find the next occurrence of the phrase"
 msgstr "尋找下一個出現的字詞"
 
-#: ../e-util/e-search-bar.c:634
+#: ../e-util/e-search-bar.c:635
 msgid "Mat_ch case"
 msgstr "區分大小寫(_C)"
 
-#: ../e-util/e-search-bar.c:662
+#: ../e-util/e-search-bar.c:663
 msgid "Reached bottom of page, continued from top"
 msgstr "到達頁面底部,從頂端繼續"
 
-#: ../e-util/e-search-bar.c:684
+#: ../e-util/e-search-bar.c:685
 msgid "Reached top of page, continued from bottom"
 msgstr "到達頁面頂端,從底部繼續"
 
-#: ../e-util/e-send-options.c:537 ../mail/importers/elm-importer.c:327
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
 #: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1097
+#: ../modules/mail/e-mail-shell-view.c:1163
+#: ../smime/gui/certificate-manager.c:1669
 msgid "Mail"
 msgstr "郵件"
 
-#: ../e-util/e-send-options.c:569
+#: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "刪除時(_L):"
 
-#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "標準"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "專利"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "密"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "最高機密"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "最高機密"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "沒有"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "郵件回條"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "要求回覆(_E)"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "於內(_T)"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "天"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "當有空時(_W)"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "延遲郵件遞送(_D)"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "晚於(_A)"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "天"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "設定逾期日期(_S)"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "直到(_U)"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "遞送選項"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "優先順序(_P):"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "歸類(_C):"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "一般選項(_R)"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "建立新的傳送項目至追蹤資訊(_E)"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "已遞送(_D)"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "已遞送與已開啟(_V)"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "全部資訊(_A)"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "自動刪除項目(_U)"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "狀態追蹤"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "當開啟時(_W):"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "當拒絕時(_N):"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "當完成時(_M):"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "當接受時(_P):"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "返回通知"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "狀態追蹤(_T)"
+
+#: ../e-util/e-source-config.c:684 ../e-util/e-source-config.c:688
 msgid "Type:"
 msgstr "類型:"
 
-#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
+#: ../e-util/e-source-config.c:696 ../e-util/e-source-config.c:700
 msgid "Name:"
 msgstr "名稱:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1301
+#: ../e-util/e-source-config.c:1305
 msgid "Refresh every"
 msgstr "重新整理於每"
 
-#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
+#: ../e-util/e-source-config.c:1335 ../e-util/e-source-config.c:1405
 msgid "Use a secure connection"
 msgstr "使用安全連線"
 
-#: ../e-util/e-source-config.c:1427
+#: ../e-util/e-source-config.c:1431
 msgid "Unset _trust for SSL certificate"
 msgstr "取消設定 SSL 憑證的信任(_T)"
 
-#: ../e-util/e-source-config.c:1463
+#: ../e-util/e-source-config.c:1467
 msgid "User"
 msgstr "使用者"
 
-#: ../e-util/e-source-selector-dialog.c:226
+#: ../e-util/e-source-selector-dialog.c:229
 msgid "_Destination"
 msgstr "目的地(_D)"
 
-#: ../e-util/e-source-selector-dialog.c:339
+#: ../e-util/e-source-selector-dialog.c:342
 msgid "Select destination"
 msgstr "選擇目的地"
 
+#. Translators: %s is the language ISO code.
+#: ../e-util/e-spell-dictionary.c:266
+#, c-format
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "不明 (%s)"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u%s)"
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:383
+#: ../e-util/e-spell-entry.c:379
 msgid "(no suggestions)"
 msgstr "(沒有建議)"
 
-#: ../e-util/e-spell-entry.c:407
+#: ../e-util/e-spell-entry.c:403
 msgid "More..."
 msgstr "更多…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:478
+#: ../e-util/e-spell-entry.c:488
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "加入「%s」至字典"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:529
+#: ../e-util/e-spell-entry.c:537
 msgid "Ignore All"
 msgstr "全部忽略"
 
-#: ../e-util/e-spell-entry.c:557
+#: ../e-util/e-spell-entry.c:569
 msgid "Spelling Suggestions"
 msgstr "拼字建議"
 
@@ -11335,10 +13024,6 @@ msgid ""
 "The file already exists in \"{0}\". Replacing it will overwrite its contents."
 msgstr "該檔案已存在於「{0}」。取代它會覆蓋它的內容。"
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "取代(_R)"
-
 #: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
 msgstr "不能儲存檔案「{0}」。"
@@ -11419,29 +13104,29 @@ msgstr "備忘錄清單後端服務 &quot;{0}&quot; 遇到錯誤。"
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "工作清單後端服務 &quot;{0}&quot; 遇到錯誤。"
 
-#: ../e-util/e-table-click-to-add.c:680
+#: ../e-util/e-table-click-to-add.c:684
 #: ../e-util/gal-a11y-e-table-click-to-add.c:61
 #: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
 msgstr "請按這裡加入"
 
-#: ../e-util/e-table-column-selector.c:265
+#: ../e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "將選定的欄名稱移至頂端"
 
-#: ../e-util/e-table-column-selector.c:270
+#: ../e-util/e-table-column-selector.c:269
 msgid "Move selected column names up one row"
 msgstr "將選定的欄名稱上移一列"
 
-#: ../e-util/e-table-column-selector.c:275
+#: ../e-util/e-table-column-selector.c:274
 msgid "Move selected column names down one row"
 msgstr "將選定的欄名稱下移一列"
 
-#: ../e-util/e-table-column-selector.c:280
+#: ../e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "將選定的欄名稱移至底端"
 
-#: ../e-util/e-table-column-selector.c:285
+#: ../e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "選擇所有的欄名稱"
 
@@ -11469,9 +13154,71 @@ msgstr "顯示欄位"
 msgid "Choose the order of information to appear in the message list."
 msgstr "請選擇在清單顯示模式時,顯示資訊的次序。"
 
-#: ../e-util/e-table-field-chooser-dialog.c:226
-msgid "Add a Column"
-msgstr "加入一欄"
+#: ../e-util/e-table-config.ui.h:2
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:281
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:191
+msgid "_Apply"
+msgstr "套用(_A)"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "排序(_S)…"
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr "群組依(_G)…"
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr "欄位顯示(_F)…"
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "全部清除(_A)"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr "顯示檢視中的欄位(_S)"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+msgid "Ascending"
+msgstr "遞增"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "遞減"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "將項目組成群組,依"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "顯示檢視中的欄位(_F)"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "接著依"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "顯示檢視中的欄位(_N)"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "顯示檢視中的欄位(_V)"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "排序"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "全部清除"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "排序項目依"
 
 #: ../e-util/e-table-field-chooser.c:166
 msgid ""
@@ -11481,6 +13228,10 @@ msgstr ""
 "想在您的表格中加入欄位,只要將它\n"
 "拖曳至您希望它出現的位置即可。"
 
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "加入一欄"
+
 #: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
@@ -11493,71 +13244,67 @@ msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 個項目)"
 
-#: ../e-util/e-table-header-item.c:1576
+#: ../e-util/e-table-header-item.c:1578
 msgid "Customize Current View"
 msgstr "自訂目前的檢視"
 
-#: ../e-util/e-table-header-item.c:1599
+#: ../e-util/e-table-header-item.c:1601
 msgid "Sort _Ascending"
 msgstr "遞增排序(_A)"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1604
 msgid "Sort _Descending"
 msgstr "遞減排序(_D)"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1607
 msgid "_Unsort"
 msgstr "不排序(_U)"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1610
 msgid "Group By This _Field"
 msgstr "依此欄位做群組(_F)"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1613
 msgid "Group By _Box"
 msgstr "依方塊為群組(_B)"
 
-#: ../e-util/e-table-header-item.c:1615
+#: ../e-util/e-table-header-item.c:1617
 msgid "Remove This _Column"
 msgstr "移除此欄(_C)"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1620
 msgid "Add a C_olumn..."
 msgstr "加入一欄(_O)…"
 
-#: ../e-util/e-table-header-item.c:1622
+#: ../e-util/e-table-header-item.c:1624
 msgid "A_lignment"
 msgstr "排列(_L)"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1627
 msgid "B_est Fit"
 msgstr "最適填滿(_E)"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1630
 msgid "Format Column_s..."
 msgstr "格式化欄(_S)…"
 
-#: ../e-util/e-table-header-item.c:1632
+#: ../e-util/e-table-header-item.c:1634
 msgid "Custo_mize Current View..."
 msgstr "自訂目前的檢視(_M)…"
 
-#: ../e-util/e-table-header-item.c:1703
+#: ../e-util/e-table-header-item.c:1705
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1726
+#: ../e-util/e-table-header-item.c:1728
 msgid "_Custom"
 msgstr "自訂(_C)"
 
-#: ../e-util/e-text.c:2107
+#: ../e-util/e-text.c:2114
 msgid "Select All"
 msgstr "全部選取"
 
-#: ../e-util/e-text.c:2120
-msgid "Input Methods"
-msgstr "輸入法"
-
 #. Put the "UTC" entry at the top of the combo's list.
 #: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
 #: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
@@ -11565,6 +13312,31 @@ msgstr "輸入法"
 msgid "UTC"
 msgstr "UTC"
 
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "選擇一個時區"
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"使用滑鼠左鍵拉近地圖的區域,然後選取時區。\n"
+"使用滑鼠右鍵拉遠。"
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "時區"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "選擇範圍(_S) "
+
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "時區下拉式組合方塊"
+
 #: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "按這裡以開啟 URL"
@@ -11573,123 +13345,116 @@ msgstr "按這裡以開啟 URL"
 msgid "Enter a URL here"
 msgstr "請在這裡輸入 URL"
 
-#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
+#: ../e-util/evolution-source-viewer.c:637
+msgid "Evolution Source Viewer"
+msgstr "Evolution 來源瀏覽程式"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:667
+msgid "Display Name"
+msgstr "顯示名稱"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "旗標"
+
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:722
+msgid "Identity"
+msgstr "身分"
+
+#: ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
+#: ../e-util/e-web-view.c:287
 msgid "Copy the link to the clipboard"
 msgstr "複製連結到剪貼薄"
 
-#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
+#: ../e-util/e-web-view.c:295
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結(_O)"
 
-#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
+#: ../e-util/e-web-view.c:297
 msgid "Open the link in a web browser"
 msgstr "在網頁瀏覽器中開啟此連結"
 
-#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
+#: ../e-util/e-web-view.c:305
 msgid "_Copy Email Address"
 msgstr "複製電子郵件位址(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
+#: ../e-util/e-web-view.c:322
 msgid "_Copy Image"
 msgstr "複製圖片(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
+#: ../e-util/e-web-view.c:324
 msgid "Copy the image to the clipboard"
 msgstr "複製圖片到剪貼薄"
 
-#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
-#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1314
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "儲存圖片(_I)…"
+
+#: ../e-util/e-web-view.c:331
+msgid "Save the image to a file"
+msgstr "將圖片儲存為檔案"
+
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1338
 msgid "Select all text and images"
 msgstr "選擇所有文字和圖片"
 
-#: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
-#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:989
-#: ../e-util/e-web-view.c:991 ../e-util/e-web-view.c:993
+#: ../e-util/e-web-view.c:1002
 #, c-format
 msgid "Click to call %s"
 msgstr "按一下播號給 %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:995
+#: ../e-util/e-web-view.c:1004
 msgid "Click to hide/unhide addresses"
 msgstr "按這裡隱藏/解除隱藏位址"
 
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:997
+#: ../e-util/e-web-view.c:1015
 #, c-format
-msgid "Click to open %s"
-msgstr "按一下來開啟 %s"
+msgid "Go to the section %s of the message"
+msgstr "移至郵件的第 %s 節"
 
-#: ../e-util/e-web-view.c:326
-msgid "Save _Image..."
-msgstr "儲存圖片(_I)…"
+#: ../e-util/e-web-view.c:1017
+msgid "Go to the beginning of the message"
+msgstr "移至郵件的開頭處"
 
-#: ../e-util/e-web-view.c:328
-msgid "Save the image to a file"
-msgstr "將圖片儲存為檔案"
+#: ../e-util/e-web-view.c:1021
+#, c-format
+msgid "Click to open %s"
+msgstr "按一下來開啟 %s"
 
-#: ../e-util/e-web-view.c:2891
+#: ../e-util/e-web-view.c:2854
 msgid "Copying image to clipboard"
 msgstr "複製影像到剪貼薄"
 
-#: ../e-util/e-web-view.c:3079
+#: ../e-util/e-web-view.c:3042
 msgid "Save Image"
 msgstr "儲存圖片"
 
-#: ../e-util/e-web-view.c:3115
+#: ../e-util/e-web-view.c:3078
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "儲存影像到「%s」"
 
-#: ../e-util/e-widget-undo.c:424
+#: ../e-util/e-widget-undo.c:429
 msgid "Undo 'Insert text'"
 msgstr "復原「插入文字」"
 
-#: ../e-util/e-widget-undo.c:426
+#: ../e-util/e-widget-undo.c:431
 msgid "Redo 'Insert text'"
 msgstr "取消復原「插入文字」"
 
-#: ../e-util/e-widget-undo.c:440
+#: ../e-util/e-widget-undo.c:445
 msgid "Undo 'Delete text'"
 msgstr "復原「刪除文字」"
 
-#: ../e-util/e-widget-undo.c:442
+#: ../e-util/e-widget-undo.c:447
 msgid "Redo 'Delete text'"
 msgstr "取消復原「刪除文字」"
 
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
-msgid "%d %B %Y"
-msgstr "%Y年%m月%d日"
-
-#: ../e-util/ea-calendar-item.c:326
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "行事曆:從 %s 到 %s"
-
-#: ../e-util/ea-calendar-item.c:363
-msgid "evolution calendar item"
-msgstr "evolution 行事曆項目"
-
-#: ../e-util/evolution-source-viewer.c:636
-msgid "Evolution Source Viewer"
-msgstr "Evolution 來源瀏覽程式"
-
-#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:666
-msgid "Display Name"
-msgstr "顯示名稱"
-
-#: ../e-util/evolution-source-viewer.c:675
-msgid "Flags"
-msgstr "旗標"
-
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:677
-msgid "Identity"
-msgstr "身分"
-
 #: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "缺少日期。"
@@ -11750,13 +13515,95 @@ msgstr "缺少數值。"
 msgid "One or more values cannot be empty."
 msgstr "一或多個數值不能為空。"
 
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "目前的時刻"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "您指定的時刻"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "相對於目前時刻的時差"
+
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:85
+msgid "seconds"
+msgstr "秒"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "週"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "個月"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "年"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "前"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "後"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "顯示郵件過濾器:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "過濾器規則(_F)"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "比較"
+
+#: ../e-util/filter.ui.h:24
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"郵件日期將會與過濾器執行時的\n"
+"時間作比較。"
+
+#: ../e-util/filter.ui.h:26
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"郵件日期將會與您在這裡指定\n"
+"日期的 12:00am 做比較。"
+
+#: ../e-util/filter.ui.h:28
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"郵件日期將會與相對於過濾器執行\n"
+"的時間作比較。"
+
+#: ../e-util/gal-a11y-e-cell.c:122
+msgid "Table Cell"
+msgstr "表格的儲存格"
+
 #. Translators: description of a "popup" action
 #: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "彈出子選單"
 
+#. Translators: description of an "edit" action
+#: ../e-util/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "開始編輯這個儲存格"
+
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:179
+#: ../e-util/gal-a11y-e-cell-toggle.c:177
 msgid "toggle the cell"
 msgstr "切換儲存格"
 
@@ -11770,10 +13617,6 @@ msgstr "展開 ETree 中包含此儲存格的列"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "折疊 ETree 中包含此儲存格的列"
 
-#: ../e-util/gal-a11y-e-cell.c:122
-msgid "Table Cell"
-msgstr "表格的儲存格"
-
 #: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "單擊"
@@ -11786,6 +13629,14 @@ msgstr "排序"
 msgid "Save Current View"
 msgstr "儲存目前檢視"
 
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "建立新的檢視(_C)"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "置換現存的檢視(_R)"
+
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的變更?"
@@ -11822,6 +13673,24 @@ msgstr "無法載入簽章。"
 msgid "Could not save signature."
 msgstr "無法儲存簽章。"
 
+#: ../evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution 是一套個人資訊管理應用程式,提供了整合郵件、行事曆和通訊錄等功能。"
+
+#: ../evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+"Evolution 支援了用於資訊交換的廣範圍的工業標準資料格式與網路協定,著重於標準"
+"的相容性與安全性。Evolution 也可以與 Microsoft Exchange 透過「交換網頁服務」"
+"(EWS)延伸功能平順的整合。"
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -11884,98 +13753,116 @@ msgstr[0] "儲存 %d 封郵件"
 msgid "Invalid folder URI '%s'"
 msgstr "無效的資料夾 URI「%s」"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
-msgid "No mail transport service available"
-msgstr "沒有可用的郵件傳輸服務"
-
-#: ../libemail-engine/e-mail-session-utils.c:639
-#: ../libemail-engine/mail-ops.c:707
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "無法套用外寄過濾器:%s"
-
-#: ../libemail-engine/e-mail-session-utils.c:688
-#: ../libemail-engine/mail-ops.c:750
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"無法附加至 %s:%s\n"
-"改附加至本地「寄件匣」資料夾。"
-
-#: ../libemail-engine/e-mail-session-utils.c:714
-#: ../libemail-engine/mail-ops.c:774
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "無法附加至本地「寄件匣」資料夾:%s"
-
-#: ../libemail-engine/e-mail-session-utils.c:915
-#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
-msgid "Sending message"
-msgstr "正在傳送郵件"
-
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:408
-#: ../mail/em-folder-tree-model.c:1160
-#: ../modules/mail/e-mail-shell-view-private.c:1057
-#: ../modules/mail/e-mail-shell-view-private.c:1068
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1174
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 msgid "Inbox"
 msgstr "收件匣"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
-#: ../modules/mail/e-mail-shell-view-private.c:1055
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1167
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
-#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1178
+#: ../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Outbox"
 msgstr "寄件匣"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
-#: ../modules/mail/e-mail-shell-view-private.c:1061
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1182
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Sent"
 msgstr "已傳送"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1170
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
-#: ../plugins/templates/templates.c:1389
+#: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432
+#: ../plugins/templates/templates.c:1442
 msgid "Templates"
 msgstr "範本"
 
-#: ../libemail-engine/e-mail-session.c:1245
+#: ../libemail-engine/e-mail-session.c:1261
 #, c-format
 msgid "User cancelled operation"
 msgstr "使用者取消的操作"
 
-#: ../libemail-engine/e-mail-session.c:1373
+#: ../libemail-engine/e-mail-session.c:1389
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 核對失敗"
 
-#: ../libemail-engine/e-mail-session.c:1423
+#: ../libemail-engine/e-mail-session.c:1439
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../libemail-engine/e-mail-session.c:1486
+#: ../libemail-engine/e-mail-session.c:1502
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "沒有提供目的地位址,郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-session.c:1499
+#: ../libemail-engine/e-mail-session.c:1515
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "找不到可使用的識別符,郵件的轉寄已經取消。"
 
+#: ../libemail-engine/e-mail-session.c:2509
+#, c-format
+msgid "Waiting for '%s'"
+msgstr "等待「%s」"
+
+#: ../libemail-engine/e-mail-session-utils.c:539
+msgid "No mail transport service available"
+msgstr "沒有可用的郵件傳輸服務"
+
+#: ../libemail-engine/e-mail-session-utils.c:635
+#: ../libemail-engine/mail-ops.c:723
+#, c-format
+msgid "Posting message to '%s'"
+msgstr "張貼郵件至「%s」"
+
+#: ../libemail-engine/e-mail-session-utils.c:672
+#: ../libemail-engine/mail-ops.c:759
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "無法套用外寄過濾器:%s"
+
+#: ../libemail-engine/e-mail-session-utils.c:702
+#: ../libemail-engine/e-mail-session-utils.c:737
+#: ../libemail-engine/mail-ops.c:783 ../libemail-engine/mail-ops.c:818
+#, c-format
+msgid "Storing sent message to '%s'"
+msgstr "儲存外寄郵件到「%s」"
+
+#: ../libemail-engine/e-mail-session-utils.c:726
+#: ../libemail-engine/mail-ops.c:807
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"無法附加至 %s:%s\n"
+"改附加至本地「寄件匣」資料夾。"
+
+#: ../libemail-engine/e-mail-session-utils.c:756
+#: ../libemail-engine/mail-ops.c:835
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "無法附加至本地「寄件匣」資料夾:%s"
+
+#: ../libemail-engine/e-mail-session-utils.c:958
+#: ../libemail-engine/mail-ops.c:983 ../libemail-engine/mail-ops.c:1085
+msgid "Sending message"
+msgstr "正在傳送郵件"
+
 #: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -12012,7 +13899,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "從「%s」匯入郵件"
 
-#: ../libemail-engine/mail-ops.c:701
+#: ../libemail-engine/mail-ops.c:753
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12024,55 +13911,60 @@ msgstr ""
 "的。請在編輯->郵件規則中檢查您的過濾器。\n"
 "原始錯誤訊息是:%s"
 
-#: ../libemail-engine/mail-ops.c:917
+#: ../libemail-engine/mail-ops.c:994
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
 
-#: ../libemail-engine/mail-ops.c:969
+#: ../libemail-engine/mail-ops.c:1046
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "無法傳送 %d / %d 封郵件"
 
-#: ../libemail-engine/mail-ops.c:975
+#: ../libemail-engine/mail-ops.c:1052
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../libemail-engine/mail-ops.c:977
+#: ../libemail-engine/mail-ops.c:1054
 msgid "Complete."
 msgstr "完成。"
 
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1168
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "將郵件移到「%s」"
 
-#: ../libemail-engine/mail-ops.c:1090
+#: ../libemail-engine/mail-ops.c:1169
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "將郵件複製到「%s」"
 
-#: ../libemail-engine/mail-ops.c:1209
+#: ../libemail-engine/mail-ops.c:1288
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在貯藏資料夾「%s」"
 
-#: ../libemail-engine/mail-ops.c:1337
+#: ../libemail-engine/mail-ops.c:1416
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "清空和儲存帳號 '%s'"
 
-#: ../libemail-engine/mail-ops.c:1338
+#: ../libemail-engine/mail-ops.c:1417
 #, c-format
 msgid "Storing account '%s'"
 msgstr "儲存帳號 '%s'"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1492
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空「%s」的回收筒"
 
+#: ../libemail-engine/mail-ops.c:1584
+#, c-format
+msgid "Processing folder changes in '%s'"
+msgstr "處理「%s」中的資料夾變更"
+
 #: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
@@ -12129,50 +14021,43 @@ msgstr "開啟線上帳號(_O)"
 msgid "This account was created through the Online Accounts service."
 msgstr "這個帳號是透過 Online Accounts 服務建立的。"
 
-#: ../mail/e-mail-account-manager.c:690
+#: ../mail/e-mail-account-manager.c:689
 msgid "_Reset Order"
 msgstr "重設順序(_R)"
 
-#: ../mail/e-mail-account-manager.c:703
+#: ../mail/e-mail-account-manager.c:702
 msgid "You can drag and drop account names to reorder them."
 msgstr "您可以拖放帳號名稱來調整它們的順序。"
 
-#: ../mail/e-mail-account-manager.c:746
+#: ../mail/e-mail-account-manager.c:745
 msgid "De_fault"
 msgstr "預設值(_F)"
 
-#: ../mail/e-mail-account-tree-view.c:84
-#: ../modules/mail/em-composer-prefs.c:1191
+#: ../mail/e-mail-account-tree-view.c:83
+#: ../modules/mail/em-composer-prefs.c:1228
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
 #: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../mail/e-mail-account-tree-view.c:108
+#: ../mail/e-mail-account-tree-view.c:107
 msgid "Account Name"
 msgstr "帳號名稱"
 
-#: ../mail/e-mail-account-tree-view.c:135
-#: ../mail/e-mail-config-security-page.c:335
-#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3601
-#: ../mail/mail-config.ui.h:66
-msgid "Default"
-msgstr "預設值"
-
-#: ../mail/e-mail-autoconfig.c:611
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "沒有提供電子郵件位址"
 
-#: ../mail/e-mail-autoconfig.c:620
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "電子郵件位址缺乏網域"
 
-#: ../mail/e-mail-backend.c:815
+#: ../mail/e-mail-backend.c:855
 msgid "Unknown background operation"
 msgstr "不明的背景操作"
 
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:859
-#: ../shell/e-shell-window-actions.c:866 ../shell/e-shell-window-actions.c:873
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
+#: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "關閉本視窗"
 
@@ -12182,29 +14067,27 @@ msgstr "(沒有主旨)"
 
 #. GtkAssistant's back button label.
 #: ../mail/e-mail-config-assistant.c:46
-#| msgid "Go Back"
 msgid "Go _Back"
 msgstr "移回(_B)"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:114
+#: ../mail/e-mail-config-assistant.c:115
 msgid "_Skip Lookup"
 msgstr "略過尋找(_S)"
 
-#: ../mail/e-mail-config-assistant.c:648
+#: ../mail/e-mail-config-assistant.c:660
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-#: ../mail/e-mail-config-assistant.c:929
-#| msgid "_Restore Defaults"
+#: ../mail/e-mail-config-assistant.c:952
 msgid "_Revise Details"
 msgstr "修訂詳細資訊(_R)"
 
-#: ../mail/e-mail-config-auth-check.c:350
+#: ../mail/e-mail-config-auth-check.c:349
 msgid "Check for Supported Types"
 msgstr "檢查支援的類型"
 
-#: ../mail/e-mail-config-confirm-page.c:156
+#: ../mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12218,7 +14101,7 @@ msgstr ""
 "\n"
 "請按一下「套用」儲存設定。"
 
-#: ../mail/e-mail-config-confirm-page.c:168
+#: ../mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "完成"
 
@@ -12247,62 +14130,71 @@ msgid "S_ave replies in the folder of the message being replied to"
 msgstr "將回信儲存在要回覆郵件的資料夾(_A)"
 
 #: ../mail/e-mail-config-defaults-page.c:628
+msgid "Archi_ve Folder:"
+msgstr "壓縮檔資料夾(_V):"
+
+#: ../mail/e-mail-config-defaults-page.c:638
+#: ../modules/mail/em-mailer-prefs.c:1079
+msgid "Choose a folder to archive messages to."
+msgstr "選擇壓縮郵件的資料夾。"
+
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "_Restore Defaults"
 msgstr "還原為預設值(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:666
 msgid "Use a Real Folder for _Trash:"
 msgstr "回收桶使用真實資料夾(_T):"
 
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../mail/e-mail-config-defaults-page.c:667
 msgid "Choose a folder for deleted messages."
 msgstr "選擇删除郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:676
 msgid "Use a Real Folder for _Junk:"
 msgstr "垃圾郵件使用真實資料夾(_J):"
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:677
 msgid "Choose a folder for junk messages."
 msgstr "選擇垃圾郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:670
+#: ../mail/e-mail-config-defaults-page.c:694
 msgid "Composing Messages"
 msgstr "正在編輯郵件"
 
-#: ../mail/e-mail-config-defaults-page.c:679
+#: ../mail/e-mail-config-defaults-page.c:703
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "一定寄送副本 (cc) 給(_S):"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:728
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "一定寄送密件副本 (bcc) 給(_B):"
 
-#: ../mail/e-mail-config-defaults-page.c:739
+#: ../mail/e-mail-config-defaults-page.c:763
 msgid "Message Receipts"
 msgstr "郵件回條"
 
-#: ../mail/e-mail-config-defaults-page.c:748
+#: ../mail/e-mail-config-defaults-page.c:772
 msgid "S_end message receipts:"
 msgstr "傳送郵件回條(_E):"
 
-#: ../mail/e-mail-config-defaults-page.c:773
+#: ../mail/e-mail-config-defaults-page.c:797
 msgid "Never"
 msgstr "永不"
 
-#: ../mail/e-mail-config-defaults-page.c:779
+#: ../mail/e-mail-config-defaults-page.c:803
 msgid "Always"
 msgstr "永遠"
 
-#: ../mail/e-mail-config-defaults-page.c:785
+#: ../mail/e-mail-config-defaults-page.c:809
 msgid "Ask for each message"
 msgstr "每封郵件皆詢問"
 
-#: ../mail/e-mail-config-defaults-page.c:856
+#: ../mail/e-mail-config-defaults-page.c:880
 msgid "Defaults"
 msgstr "預設值"
 
-#: ../mail/e-mail-config-identity-page.c:265
+#: ../mail/e-mail-config-identity-page.c:282
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12311,13 +14203,13 @@ msgstr ""
 "請在下面輸入您的名稱及電郵地址。「選擇性」的欄位不一定要填,除非您希望在送出"
 "的郵件內包含這些資訊。"
 
-#: ../mail/e-mail-config-identity-page.c:293
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:322
 msgid "Account Information"
 msgstr "帳號資訊"
 
-#: ../mail/e-mail-config-identity-page.c:302
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -12325,36 +14217,40 @@ msgstr ""
 "輸入想用來代表這個帳號的名稱。\n"
 "例如:「工作」或「個人」。"
 
-#: ../mail/e-mail-config-identity-page.c:347
+#: ../mail/e-mail-config-identity-page.c:364
 msgid "Required Information"
 msgstr "必要的資訊"
 
-#: ../mail/e-mail-config-identity-page.c:356
+#: ../mail/e-mail-config-identity-page.c:373
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
-#: ../mail/e-mail-config-identity-page.c:383
+#: ../mail/e-mail-config-identity-page.c:400
 msgid "Email _Address:"
 msgstr "電子郵件位址(_A):"
 
-#: ../mail/e-mail-config-identity-page.c:430
+#: ../mail/e-mail-config-identity-page.c:447
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "選擇性的資訊"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:456
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:538
 msgid "Add Ne_w Signature..."
 msgstr "加入新的簽名檔(_W)…"
 
-#: ../mail/e-mail-config-lookup-page.c:67
+#: ../mail/e-mail-config-identity-page.c:556
+msgid "Try _setup account automatically, based on Email Address"
+msgstr "嘗試以電子郵件位址自動設定帳號(_S)"
+
+#: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "尋找帳號詳細資料…"
 
@@ -12366,7 +14262,7 @@ msgstr "檢查新郵件"
 msgid "Check for _new messages every"
 msgstr "自動檢查新郵件每(_N)"
 
-#: ../mail/e-mail-config-provider-page.c:699
+#: ../mail/e-mail-config-provider-page.c:698
 msgid "Receiving Options"
 msgstr "接收選項"
 
@@ -12374,100 +14270,108 @@ msgstr "接收選項"
 msgid "Receiving Email"
 msgstr "接收電子郵件"
 
-#: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:332 ../mail/mail-config.ui.h:26
-#: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#. 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.
+#: ../mail/e-mail-config-security-page.c:251
+#, c-format
+#| msgid "Task - %s"
+msgctxt "PGPKeyDescription"
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: ../mail/e-mail-config-security-page.c:340
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:114
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "一般"
 
-#: ../mail/e-mail-config-security-page.c:269
+#: ../mail/e-mail-config-security-page.c:349
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不簽署會議邀請 (相容於 _Outlook)"
 
-#: ../mail/e-mail-config-security-page.c:291
+#: ../mail/e-mail-config-security-page.c:371
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "嚴密隱私權 (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:300
+#: ../mail/e-mail-config-security-page.c:380
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP 金鑰 ID(_K):"
 
-#: ../mail/e-mail-config-security-page.c:322
+#: ../mail/e-mail-config-security-page.c:413
 msgid "Si_gning algorithm:"
 msgstr "簽章演算法(_G):"
 
-#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
+#: ../mail/e-mail-config-security-page.c:429
+#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:69
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
+#: ../mail/e-mail-config-security-page.c:432
+#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:70
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:435
+#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:71
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:438
+#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:72
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:363
+#: ../mail/e-mail-config-security-page.c:454
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽名(_W)"
 
-#: ../mail/e-mail-config-security-page.c:375
+#: ../mail/e-mail-config-security-page.c:466
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "當傳送加密郵件時永遠自我加密(_M)"
 
-#: ../mail/e-mail-config-security-page.c:387
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密時永遠信任我的鑰匙圈裡的金鑰(_T)"
 
-#: ../mail/e-mail-config-security-page.c:411
+#: ../mail/e-mail-config-security-page.c:502
 msgid "Secure MIME (S/MIME)"
 msgstr "安全式 MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:420
+#: ../mail/e-mail-config-security-page.c:511
 msgid "Sig_ning certificate:"
 msgstr "簽名憑證(_N):"
 
-#: ../mail/e-mail-config-security-page.c:444
-#: ../mail/e-mail-config-security-page.c:550
+#: ../mail/e-mail-config-security-page.c:535
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Select"
 msgstr "選擇"
 
-#: ../mail/e-mail-config-security-page.c:453
-#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:962
-#| msgid "_Clear Flag"
+#: ../mail/e-mail-config-security-page.c:544
+#: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:1006
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../mail/e-mail-config-security-page.c:462
+#: ../mail/e-mail-config-security-page.c:553
 msgid "Signing _algorithm:"
 msgstr "簽章演算法(_A):"
 
-#: ../mail/e-mail-config-security-page.c:503
+#: ../mail/e-mail-config-security-page.c:594
 msgid "Always sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽名"
 
-#: ../mail/e-mail-config-security-page.c:526
+#: ../mail/e-mail-config-security-page.c:617
 msgid "Encryption certificate:"
 msgstr "加密憑證:"
 
-#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:659
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件加密"
 
-#: ../mail/e-mail-config-security-page.c:588
+#: ../mail/e-mail-config-security-page.c:679
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "當傳送加密郵件時永遠自我加密"
 
@@ -12475,7 +14379,7 @@ msgstr "當傳送加密郵件時永遠自我加密"
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
-#: ../mail/e-mail-config-service-page.c:639
+#: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "伺服器類型(_T):"
 
@@ -12487,50 +14391,50 @@ msgstr "SSL"
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:306
+#: ../mail/e-mail-config-summary-page.c:305
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr "這是用來存取您郵件的設定值的摘要。"
 
-#: ../mail/e-mail-config-summary-page.c:371
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "個人詳細資料"
 
-#: ../mail/e-mail-config-summary-page.c:380
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "全名:"
 
-#: ../mail/e-mail-config-summary-page.c:394
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "電子郵件位址:"
 
-#: ../mail/e-mail-config-summary-page.c:408
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "接收中"
 
-#: ../mail/e-mail-config-summary-page.c:420
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "傳送中"
 
-#: ../mail/e-mail-config-summary-page.c:432
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "伺服器類型:"
 
-#: ../mail/e-mail-config-summary-page.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
 msgid "Server:"
 msgstr "伺服器:"
 
-#: ../mail/e-mail-config-summary-page.c:474
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: ../mail/e-mail-config-summary-page.c:495
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "安全性:"
 
-#: ../mail/e-mail-config-summary-page.c:786
+#: ../mail/e-mail-config-summary-page.c:785
 msgid "Account Summary"
 msgstr "帳號摘要"
 
@@ -12538,48 +14442,104 @@ msgstr "帳號摘要"
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 msgstr ""
 "歡迎使用 Evolution 郵件組態助理。\n"
 "\n"
-"按一下「繼續」開始。 "
+"按一下「下一步」開始。 "
 
 #: ../mail/e-mail-config-welcome-page.c:166
 #: ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../mail/e-mail-config-window.c:326
+#: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
-#: ../mail/e-mail-display.c:95
+#: ../mail/e-mail-display.c:97
 msgid "_Add to Address Book..."
 msgstr "加入到通訊錄(_A)…"
 
-#: ../mail/e-mail-display.c:102
+#: ../mail/e-mail-display.c:104
 msgid "_To This Address"
 msgstr "到這個位址(_T)"
 
-#: ../mail/e-mail-display.c:109
+#: ../mail/e-mail-display.c:111
 msgid "_From This Address"
 msgstr "從這個位址(_F)"
 
-#: ../mail/e-mail-display.c:116
+#: ../mail/e-mail-display.c:118
 msgid "Send _Reply To..."
 msgstr "傳送回覆到(_R)…"
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:120
 msgid "Send a reply message to this address"
 msgstr "傳送回覆郵件到這個位址"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:127
 msgid "Create Search _Folder"
 msgstr "建立搜尋資料夾(_F)"
 
-#. Label + combo box has a 12px left margin so it's
-#. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:297
+#: ../mail/e-mail-folder-create-dialog.c:327
+msgid "Create Folder"
+msgstr "建立資料夾"
+
+#: ../mail/e-mail-folder-create-dialog.c:331
+msgid "Specify where to create the folder:"
+msgstr "指定要建立資料夾的位置:"
+
+#: ../mail/e-mail-folder-create-dialog.c:334
+msgid "C_reate"
+msgstr "建立(_R)"
+
+#: ../mail/e-mail-folder-create-dialog.c:351
+msgid "Folder _name:"
+msgstr "資料夾名稱(_N):"
+
+#. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
+#. The translated value should not contain spaces.
+#: ../mail/e-mail-free-form-exp.c:226
+msgctxt "ffe"
+msgid "Answered"
+msgstr "已回覆"
+
+#: ../mail/e-mail-free-form-exp.c:227
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "已刪除"
+
+#: ../mail/e-mail-free-form-exp.c:228
+msgctxt "ffe"
+msgid "Draft"
+msgstr "草稿"
+
+#: ../mail/e-mail-free-form-exp.c:229
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "有標幟的"
+
+#: ../mail/e-mail-free-form-exp.c:230
+msgctxt "ffe"
+msgid "Seen"
+msgstr "已閱讀"
+
+#: ../mail/e-mail-free-form-exp.c:231
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "附件"
+
+#: ../mail/e-mail-free-form-exp.c:479
+msgctxt "ffe"
+msgid "no"
+msgstr "現在"
+
+#: ../mail/e-mail-free-form-exp.c:480
+msgctxt "ffe"
+msgid "false"
+msgstr "false"
+
+#: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "垃圾郵件過濾軟體:"
 
@@ -12587,32 +14547,32 @@ msgstr "垃圾郵件過濾軟體:"
 msgid "_Label name:"
 msgstr "標籤名稱(_L):"
 
-#: ../mail/e-mail-label-list-store.c:56
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "重要(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "工作(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "個人(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "待辦事項(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "稍後(_L)"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Add Label"
 msgstr "加入標籤"
 
@@ -12632,35 +14592,35 @@ msgstr ""
 msgid "Color"
 msgstr "顏色"
 
-#: ../mail/e-mail-print-config-headers.c:166
+#: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "將選取的檔頭移至頂端"
 
-#: ../mail/e-mail-print-config-headers.c:171
+#: ../mail/e-mail-print-config-headers.c:170
 msgid "Move selected headers up one row"
 msgstr "將選取的檔頭上移一列"
 
-#: ../mail/e-mail-print-config-headers.c:176
+#: ../mail/e-mail-print-config-headers.c:175
 msgid "Move selected headers down one row"
 msgstr "將選取的檔頭下移一列"
 
-#: ../mail/e-mail-print-config-headers.c:181
+#: ../mail/e-mail-print-config-headers.c:180
 msgid "Move selected headers to bottom"
 msgstr "將選取的檔頭移至底部"
 
-#: ../mail/e-mail-print-config-headers.c:186
+#: ../mail/e-mail-print-config-headers.c:185
 msgid "Select all headers"
 msgstr "選取所有的檔頭"
 
-#: ../mail/e-mail-print-config-headers.c:205
+#: ../mail/e-mail-print-config-headers.c:204
 msgid "Header Name"
 msgstr "標頭名稱:"
 
-#: ../mail/e-mail-print-config-headers.c:214
+#: ../mail/e-mail-print-config-headers.c:213
 msgid "Header Value"
 msgstr "標頭數值"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:113
 msgid "Headers"
 msgstr "檔頭"
 
@@ -12669,598 +14629,654 @@ msgstr "檔頭"
 msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "複製至資料夾"
-
-#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
-msgid "C_opy"
-msgstr "複製(_O)"
-
-#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
+msgid "Copy to Folder"
+msgstr "複製至資料夾"
+
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "複製(_O)"
+
+#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480
+#: ../mail/e-mail-reader.c:1520
 msgid "_Do not ask me again."
 msgstr "不要再詢問我(_D)。"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1526
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "永遠忽略通信論壇的回覆欄位(_A)"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1728
 msgid "Failed to retrieve message:"
 msgstr "取回郵件失敗:"
 
-#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
+#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3013
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "正在取回郵件「%s」"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1961
 msgid "A_dd Sender to Address Book"
 msgstr "加入寄件者到目錄服務(_D)"
 
-#: ../mail/e-mail-reader.c:1864
+#: ../mail/e-mail-reader.c:1963
 msgid "Add sender to address book"
 msgstr "新增寄件者至通訊錄"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1968
+msgid "_Archive..."
+msgstr "壓縮檔(_A)…"
+
+#: ../mail/e-mail-reader.c:1970
+msgid "Move selected messages to the Archive folder for the account"
+msgstr "將選取的郵件移至這個帳號的壓縮資料夾"
+
+#: ../mail/e-mail-reader.c:1975
 msgid "Check for _Junk"
 msgstr "檢查垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:1871
+#: ../mail/e-mail-reader.c:1977
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾郵件狀態"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1982
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)…"
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1984
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1989
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1991
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1996
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "從通信論壇建立過濾器規則(_L)…"
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1998
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個通信論壇建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "從收件者建立過濾器規則(_R)…"
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:2005
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "從寄件者建立過濾器規則(_N)…"
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:2012
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a Filter Rule for _Subject..."
 msgstr "從主旨建立過濾器規則(_S)…"
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:2019
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:2024
 msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:2026
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的郵件"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:2031
 msgid "_Find in Message..."
 msgstr "在郵件內尋找(_F)…"
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:2033
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:2038
 msgid "_Clear Flag"
 msgstr "清除標幟(_C)"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:2040
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "移除選取郵件的跟隨旗標"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:2045
 msgid "_Flag Completed"
 msgstr "標記為已完成(_F)"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:2047
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "將已選取郵件的跟隨旗標設為已完成"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:2052
 msgid "Follow _Up..."
 msgstr "跟隨(_U)…"
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:2054
 msgid "Flag the selected messages for follow-up"
 msgstr "將選定的郵件加上跟隨旗標"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:2059
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附件形式轉寄給某人"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:2066
 msgid "Forward As _Attached"
 msgstr "以附件轉寄(_A)"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:2073
 msgid "_Inline"
 msgstr "行內(_I)"
 
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2080
 msgid "Forward As _Inline"
 msgstr "以行內轉寄(_I)"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:2087
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2094
 msgid "Forward As _Quoted"
 msgstr "以引文轉寄(_Q)"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2101
 msgid "_Load Images"
 msgstr "載入圖片(_L)"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2103
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML 格式的郵件時強迫載入圖片"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+msgid "_Ignore Subthread"
+msgstr "忽略子群組(_I)"
+
+#: ../mail/e-mail-reader.c:2110
+msgid "Mark new mails in a subthread as read automatically"
+msgstr "自動將子群組中的新郵件標記為已閱讀"
+
+#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+msgid "_Ignore Thread"
+msgstr "忽略群組(_I)"
+
+#: ../mail/e-mail-reader.c:2117
+msgid "Mark new mails in this thread as read automatically"
+msgstr "自動將這個群組中的新郵件標記為已閱讀"
+
+#: ../mail/e-mail-reader.c:2122
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2124
 msgid "Mark the selected messages as important"
 msgstr "將選定的郵件標示成重要"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2129
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2131
 msgid "Mark the selected messages as junk"
 msgstr "將選定的郵件標示成垃圾郵件"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2136
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2138
 msgid "Mark the selected messages as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2143
 msgid "_Read"
 msgstr "已閱讀(_R)"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2145
 msgid "Mark the selected messages as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+msgid "Do not _Ignore Subthread"
+msgstr "不要忽略子群組(_I)"
+
+#: ../mail/e-mail-reader.c:2152
+msgid "Do not mark new mails in a subthread as read automatically"
+msgstr "不要自動將子群組中的新郵件標記為已閱讀"
+
+#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+msgid "Do not _Ignore Thread"
+msgstr "不要忽略群組(_I)"
+
+#: ../mail/e-mail-reader.c:2159
+msgid "Do not mark new mails in this thread as read automatically"
+msgstr "不要自動將這個群組中的新郵件標記為已閱讀"
+
+#: ../mail/e-mail-reader.c:2164
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2166
 msgid "Mark the selected messages as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2171
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2173
 msgid "Mark the selected messages as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2178
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)…"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2180
 msgid "Open the selected messages in the composer for editing"
 msgstr "在撰寫視窗開啟選取的郵件以便編輯"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2185
 msgid "Compose _New Message"
 msgstr "撰寫新郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2187
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2192
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2194
 msgid "Open the selected messages in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2199
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)…"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2201
 msgid "Move selected messages to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2206
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2208
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2213
 msgid "Next _Important Message"
 msgstr "下一封重要郵件(_I)"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2215
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2220
 msgid "Next _Thread"
 msgstr "下一封相關郵件(_T)"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2222
 msgid "Display the next thread"
 msgstr "顯示下一封相關郵件"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2227
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2229
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2234
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2236
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2241
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2243
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2248
 msgid "Previous T_hread"
 msgstr "上一封相關郵件(_H)"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2250
 msgid "Display the previous thread"
 msgstr "顯示上一封相關郵件"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2255
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2257
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2264
 msgid "Print this message"
 msgstr "列印郵件"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2271
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2276
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2278
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2283
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2285
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2290
 msgid "Remove Du_plicate Messages"
 msgstr "移除重複的郵件(_P)"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2292
 msgid "Checks selected messages for duplicates"
 msgstr "檢查選取的郵件是否有重複"
 
-#: ../mail/e-mail-reader.c:2163 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2299
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "撰寫回郵給已選取郵件的全部收件者"
 
-#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2306
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "撰寫回郵給所選定郵件的通信論壇"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2311
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2313
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2318
 msgid "_Save as mbox..."
 msgstr "儲存成 mbox(_S)…"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2320
 msgid "Save selected messages as an mbox file"
 msgstr "將選定的郵件另存成 mbox 檔案"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2325
 msgid "_Message Source"
 msgstr "郵件來源(_M)"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2327
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2339
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2341
 msgid "Undelete the selected messages"
 msgstr "取消刪除選定的郵件"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2346
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2348
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2353
 msgid "_Zoom In"
 msgstr "拉近(_Z)"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2355
 msgid "Increase the text size"
 msgstr "將文字放大"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2362
 msgid "Decrease the text size"
 msgstr "將文字縮小"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2369
 msgid "Cre_ate"
 msgstr "建立(_A)"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2376
 msgid "Ch_aracter Encoding"
 msgstr "字元編碼(_A)"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2383
 msgid "F_orward As"
 msgstr "轉寄為(_O)"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2390
 msgid "_Group Reply"
 msgstr "群組回覆(_G)"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2397
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../mail/e-mail-reader.c:2404
 msgid "Mar_k As"
 msgstr "標示成(_K)"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2411
 msgid "_Message"
 msgstr "郵件(_M)"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2418
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2428
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "從通信論壇建立搜尋資料夾(_L)…"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a search folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "從收件者建立搜尋資料夾(_T)…"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2437
 msgid "Create a search folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a Search Folder from Sen_der..."
 msgstr "從寄件者建立搜尋資料夾(_D)…"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2444
 msgid "Create a search folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a Search Folder from S_ubject..."
 msgstr "從主旨建立搜尋資料夾(_U)…"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2451
 msgid "Create a search folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2478
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)…"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2494
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2498
 msgid "Mark as _Junk"
 msgstr "標示成垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2502
 msgid "Mark as _Not Junk"
 msgstr "標示成非垃圾郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2506
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2518
 msgid "Mark as Uni_mportant"
 msgstr "標示成不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2522
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2566
 msgid "_Caret Mode"
 msgstr "漏字模式(_C)"
 
-#: ../mail/e-mail-reader.c:2414
+#: ../mail/e-mail-reader.c:2568
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在顯示的郵件內文中顯示閃爍游標"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2574
 msgid "All Message _Headers"
 msgstr "所有郵件檔頭(_H)"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2576
 msgid "Show messages with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
-#: ../mail/e-mail-reader.c:2849
+#: ../mail/e-mail-reader.c:3019
 msgid "Retrieving message"
 msgstr "取回郵件"
 
-#: ../mail/e-mail-reader.c:3771
+#: ../mail/e-mail-reader.c:4027
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/e-mail-reader.c:3772
+#: ../mail/e-mail-reader.c:4028
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
-#: ../mail/e-mail-reader.c:3791
+#: ../mail/e-mail-reader.c:4047
 msgid "Group Reply"
 msgstr "群組回覆"
 
-#: ../mail/e-mail-reader.c:3792
+#: ../mail/e-mail-reader.c:4048
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "回覆給通信論壇,或是給所有的收件者"
 
-#: ../mail/e-mail-reader.c:3858 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:4114 ../mail/filtertypes.xml.in.h:65
 msgid "Delete"
 msgstr "刪除"
 
-#: ../mail/e-mail-reader.c:3870
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../mail/e-mail-reader.c:4126
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "下一個"
 
-#: ../mail/e-mail-reader.c:3874
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../mail/e-mail-reader.c:4130
+#: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "上一個"
 
-#: ../mail/e-mail-reader.c:3883 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4139 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/e-mail-reader-utils.c:147
+#: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "不要再警告我"
 
-#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
-#: ../smime/gui/certificate-manager.c:329
+#: ../mail/e-mail-reader-utils.c:556 ../plugins/face/face.c:170
+#: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../mail/e-mail-reader-utils.c:976
+#: ../mail/e-mail-reader-utils.c:1033
+msgid "Marking thread to be ignored"
+msgstr "將群組標記為忽略"
+
+#: ../mail/e-mail-reader-utils.c:1037
+msgid "Unmarking thread from being ignored"
+msgstr "取消群組被忽略的標記"
+
+#: ../mail/e-mail-reader-utils.c:1041
+msgid "Marking subthread to be ignored"
+msgstr "將子群組標記為忽略"
+
+#: ../mail/e-mail-reader-utils.c:1045
+msgid "Unmarking subthread from being ignored"
+msgstr "取消子群組被忽略的標記"
+
+#: ../mail/e-mail-reader-utils.c:1280
 msgid "Printing"
 msgstr "列印"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1211
+#: ../mail/e-mail-reader-utils.c:1515
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13270,7 +15286,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "資料夾「%s」包含 %u 封重複的郵件。您確定要刪除它?"
 
-#: ../mail/e-mail-reader-utils.c:2026
+#: ../mail/e-mail-reader-utils.c:2345
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "儲存郵件"
@@ -13280,16 +15296,16 @@ 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".
-#: ../mail/e-mail-reader-utils.c:2047
+#: ../mail/e-mail-reader-utils.c:2366
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "郵件"
 
-#: ../mail/e-mail-reader-utils.c:2416
+#: ../mail/e-mail-reader-utils.c:2739
 msgid "Parsing message"
 msgstr "解析郵件"
 
-#: ../mail/e-mail-request.c:196
+#: ../mail/e-mail-request.c:199
 msgid "The message has no text content."
 msgstr "這個郵件沒有文字內容。"
 
@@ -13301,7 +15317,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.
-#: ../mail/em-composer-utils.c:1454
+#: ../mail/em-composer-utils.c:1507
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13309,23 +15325,24 @@ msgstr ""
 "於 ${AbbrevWeekdayName},${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
 "${TimeZone},${Sender} 提到:"
 
-#: ../mail/em-composer-utils.c:1460
+#: ../mail/em-composer-utils.c:1513
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-#: ../mail/em-composer-utils.c:1465
+#: ../mail/em-composer-utils.c:1518
 msgid "-----Original Message-----"
 msgstr "-----原始郵件-----"
 
-#: ../mail/em-composer-utils.c:2615
+#: ../mail/em-composer-utils.c:2668
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
-#: ../mail/em-composer-utils.c:3040
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3076
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-#: ../mail/em-composer-utils.c:3041
+#: ../mail/em-composer-utils.c:3081
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
@@ -13333,264 +15350,6 @@ msgstr "選取資料夾來張貼郵件。"
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "調整目標"
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Any header"
-msgstr "任何標頭"
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Color"
-msgstr "指定色彩"
-
-#: ../mail/em-filter-i18n.h:5
-msgid "Assign Score"
-msgstr "指定目標"
-
-#: ../mail/em-filter-i18n.h:7
-msgid "BCC"
-msgstr "密件副本(BCC)"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Beep"
-msgstr "嗶聲"
-
-#: ../mail/em-filter-i18n.h:9
-msgid "CC"
-msgstr "副本(CC)"
-
-#: ../mail/em-filter-i18n.h:10
-msgid "Completed On"
-msgstr "已完成於"
-
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr "收件日期"
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr "送件日期"
-
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "已刪除"
-
-#: ../mail/em-filter-i18n.h:17
-msgid "Draft"
-msgstr "草稿"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "Expression"
-msgstr "詞句"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "Follow Up"
-msgstr "跟隨"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "Forward to"
-msgstr "轉寄至"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "Important"
-msgstr "重要"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "Junk Test"
-msgstr "垃圾郵件測試"
-
-#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
-msgid "Junk"
-msgstr "垃圾郵件"
-
-#: ../mail/em-filter-i18n.h:25
-msgid "Label"
-msgstr "標籤"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "Mailing list"
-msgstr "郵件列表"
-
-#: ../mail/em-filter-i18n.h:27
-msgid "Match All"
-msgstr "符合全部"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "Message Body"
-msgstr "郵件內容"
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Message Header"
-msgstr "郵件檔頭"
-
-#: ../mail/em-filter-i18n.h:30
-msgid "Message Location"
-msgstr "郵件位置"
-
-#: ../mail/em-filter-i18n.h:31
-msgid "Message is Junk"
-msgstr "垃圾郵件"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "Message is not Junk"
-msgstr "非垃圾郵件"
-
-#: ../mail/em-filter-i18n.h:34
-msgid "Pipe to Program"
-msgstr "建立程式管道"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "Play Sound"
-msgstr "播放音效"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
-msgid "Read"
-msgstr "已讀"
-
-#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "收件者"
-
-#: ../mail/em-filter-i18n.h:38
-msgid "Regex Match"
-msgstr "正規表示式相配"
-
-#: ../mail/em-filter-i18n.h:39
-msgid "Replied to"
-msgstr "回覆"
-
-#: ../mail/em-filter-i18n.h:40
-msgid "Run Program"
-msgstr "執行程式"
-
-#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "分數"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "Sender or Recipients"
-msgstr "寄件者或收件者"
-
-#: ../mail/em-filter-i18n.h:43 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "寄件者"
-
-#: ../mail/em-filter-i18n.h:44
-msgid "Set Label"
-msgstr "設定標籤"
-
-#: ../mail/em-filter-i18n.h:45
-msgid "Set Status"
-msgstr "設定狀態"
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Size (kB)"
-msgstr "大小 (kB)"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Source Account"
-msgstr "來源帳號"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Specific header"
-msgstr "指定檔頭"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Stop Processing"
-msgstr "停止處理"
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Unset Color"
-msgstr "取消設定顏色"
-
-#: ../mail/em-filter-i18n.h:54
-msgid "Unset Status"
-msgstr "取消設定狀態"
-
-#: ../mail/em-filter-i18n.h:57
-msgid "does not end with"
-msgstr "不是以此結束"
-
-#: ../mail/em-filter-i18n.h:58
-msgid "does not exist"
-msgstr "不存在"
-
-#: ../mail/em-filter-i18n.h:59
-msgid "does not have words"
-msgstr "不包含文字"
-
-#: ../mail/em-filter-i18n.h:60
-msgid "does not return"
-msgstr "沒有傳回"
-
-#: ../mail/em-filter-i18n.h:61
-msgid "does not sound like"
-msgstr "不類似"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "does not start with"
-msgstr "不是以此開始"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "ends with"
-msgstr "以此終結"
-
-#: ../mail/em-filter-i18n.h:64
-msgid "exists"
-msgstr "存在"
-
-#: ../mail/em-filter-i18n.h:65
-msgid "has words"
-msgstr "包含文字"
-
-#: ../mail/em-filter-i18n.h:66
-msgid "is Flagged"
-msgstr "有標幟"
-
-#: ../mail/em-filter-i18n.h:67
-msgid "is after"
-msgstr "是之後的"
-
-#: ../mail/em-filter-i18n.h:68
-msgid "is before"
-msgstr "是之前的"
-
-#: ../mail/em-filter-i18n.h:71
-msgid "is not Flagged"
-msgstr "沒有標幟"
-
-#: ../mail/em-filter-i18n.h:72
-msgid "is not set"
-msgstr "未設定"
-
-#: ../mail/em-filter-i18n.h:74
-msgid "is set"
-msgstr "設定"
-
-#: ../mail/em-filter-i18n.h:76
-msgid "returns greater than"
-msgstr "傳回大於"
-
-#: ../mail/em-filter-i18n.h:77
-msgid "returns less than"
-msgstr "傳回小於"
-
-#: ../mail/em-filter-i18n.h:78
-msgid "returns"
-msgstr "傳回"
-
-#: ../mail/em-filter-i18n.h:79
-msgid "sounds like"
-msgstr "類似"
-
-#: ../mail/em-filter-i18n.h:80
-msgid "starts with"
-msgstr "以此開始"
-
 #. and now for the action area
 #: ../mail/em-filter-rule.c:587
 msgid "Then"
@@ -13620,11 +15379,13 @@ msgstr "配額使用量 (%s):"
 msgid "Quota usage"
 msgstr "限制用量"
 
-#: ../mail/em-folder-properties.c:284
+#. 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
+#: ../mail/em-folder-properties.c:286
 msgid "_Send Account Override:"
 msgstr "傳送帳號覆蓋(_S):"
 
-#: ../mail/em-folder-properties.c:413
+#: ../mail/em-folder-properties.c:415
 msgid "Folder Properties"
 msgstr "資料夾內容"
 
@@ -13632,49 +15393,45 @@ msgstr "資料夾內容"
 msgid "<click here to select a folder>"
 msgstr "<按這裡選擇資料夾>"
 
-#: ../mail/em-folder-selector.c:387
-msgid "C_reate"
-msgstr "建立(_R)"
-
-#: ../mail/em-folder-selector.c:393
-msgid "Folder _name:"
-msgstr "資料夾名稱(_N):"
+#: ../mail/em-folder-selector.c:398
+msgid "Create a new folder"
+msgstr "建立新資料夾"
 
-#: ../mail/em-folder-tree.c:668
+#: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
 msgstr "資料夾名稱不能包含斜線。"
 
-#: ../mail/em-folder-tree.c:805
+#: ../mail/em-folder-tree.c:819
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1654
+#: ../mail/em-folder-tree.c:1668
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
 
-#: ../mail/em-folder-tree.c:2202 ../mail/em-folder-utils.c:100
+#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移動資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2205 ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2212 ../mail/message-list.c:2268
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2470
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2216 ../mail/message-list.c:2270
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2472
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2235
+#: ../mail/em-folder-tree.c:2249
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
@@ -13684,26 +15441,18 @@ msgstr "無法將郵件拖放到最上層的儲存區"
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
+#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
 msgid "Loading..."
 msgstr "載入中…"
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "移動資料夾到"
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "複製資料夾到"
 
-#: ../mail/em-folder-utils.c:604
-msgid "Create Folder"
-msgstr "建立資料夾"
-
-#: ../mail/em-folder-utils.c:605
-msgid "Specify where to create the folder:"
-msgstr "指定要建立資料夾的位置:"
-
 #: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "訂閱(_S)"
@@ -13717,7 +15466,7 @@ msgid "Subscribe To _All"
 msgstr "全部訂閱(_A)"
 
 #: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
@@ -13754,7 +15503,7 @@ msgid "Su_bscribe"
 msgstr "訂閱(_B)"
 
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "Unsubscribe from the selected folder"
 msgstr "取消訂閱選取的資料夾"
 
@@ -13779,8 +15528,8 @@ msgid "Refresh the folder list"
 msgstr "重新整理資料夾清單"
 
 #: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
@@ -13789,7 +15538,7 @@ msgid "Stop the current operation"
 msgstr "停止目前的操作"
 
 #: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "_Stop"
 msgstr "停止(_S)"
 
@@ -13797,22 +15546,17 @@ msgstr "停止(_S)"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:76
+#: ../mail/em-utils.c:75
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "您確定要一次開啟 %d 封郵件?"
 
-#: ../mail/em-utils.c:132
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "不要再顯示這個訊息(_D)"
-
-#: ../mail/em-utils.c:242
+#: ../mail/em-utils.c:241
 msgid "Message Filters"
 msgstr "郵件規則"
 
-#: ../mail/em-utils.c:971
+#: ../mail/em-utils.c:970
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
@@ -13825,34 +15569,328 @@ msgstr "搜尋資料夾(_F)"
 msgid "Add Folder"
 msgstr "加入資料夾"
 
-#: ../mail/em-vfolder-editor-rule.c:518
+#: ../mail/em-vfolder-editor-rule.c:521
 msgid "Search Folder Sources"
 msgstr "搜尋資料夾來源"
 
-#: ../mail/em-vfolder-editor-rule.c:550
+#: ../mail/em-vfolder-editor-rule.c:553
 msgid "Automatically update on any _source folder change"
 msgstr "來源資料夾中有任何變更時自動更新(_S)"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "All local folders"
 msgstr "所有本地端資料夾"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:566
 msgid "All active remote folders"
 msgstr "所有可用的遠端資料夾"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local and active remote folders"
 msgstr "所有本地端及可用的遠端資料夾"
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "Specific folders"
 msgstr "指定的資料夾"
 
-#: ../mail/em-vfolder-editor-rule.c:603
+#: ../mail/em-vfolder-editor-rule.c:606
 msgid "include subfolders"
 msgstr "包括子目錄"
 
+#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
+#: ../mail/searchtypes.xml.in.h:1 ../mail/vfoldertypes.xml.in.h:1
+msgid "Sender"
+msgstr "寄件者"
+
+#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
+#: ../mail/vfoldertypes.xml.in.h:6
+msgid "starts with"
+msgstr "以此開始"
+
+#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
+#: ../mail/vfoldertypes.xml.in.h:7
+msgid "does not start with"
+msgstr "不是以此開始"
+
+#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
+#: ../mail/vfoldertypes.xml.in.h:8
+msgid "ends with"
+msgstr "以此終結"
+
+#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
+#: ../mail/vfoldertypes.xml.in.h:9
+msgid "does not end with"
+msgstr "不是以此結束"
+
+#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
+#: ../mail/vfoldertypes.xml.in.h:12
+msgid "sounds like"
+msgstr "類似"
+
+#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
+#: ../mail/vfoldertypes.xml.in.h:13
+msgid "does not sound like"
+msgstr "不類似"
+
+#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16
+#: ../mail/searchtypes.xml.in.h:10 ../mail/vfoldertypes.xml.in.h:10
+msgid "Recipients"
+msgstr "收件者"
+
+#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
+#: ../mail/vfoldertypes.xml.in.h:14
+msgid "CC"
+msgstr "副本(CC)"
+
+#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
+#: ../mail/vfoldertypes.xml.in.h:15
+msgid "BCC"
+msgstr "密件副本(BCC)"
+
+#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
+#: ../mail/vfoldertypes.xml.in.h:16
+msgid "Sender or Recipients"
+msgstr "寄件者或收件者"
+
+#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
+#: ../mail/vfoldertypes.xml.in.h:18
+msgid "has words"
+msgstr "包含文字"
+
+#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
+#: ../mail/vfoldertypes.xml.in.h:19
+msgid "does not have words"
+msgstr "不包含文字"
+
+#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
+#: ../mail/vfoldertypes.xml.in.h:20
+msgid "Specific header"
+msgstr "指定檔頭"
+
+#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
+#: ../mail/vfoldertypes.xml.in.h:21
+msgid "exists"
+msgstr "存在"
+
+#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
+#: ../mail/vfoldertypes.xml.in.h:22
+msgid "does not exist"
+msgstr "不存在"
+
+#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
+#: ../mail/vfoldertypes.xml.in.h:24
+msgid "Message Body"
+msgstr "郵件內容"
+
+#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
+#: ../mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "詞句"
+
+#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
+#: ../mail/vfoldertypes.xml.in.h:26
+msgid "Free Form Expression"
+msgstr "自由形式表示式"
+
+#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
+#: ../mail/vfoldertypes.xml.in.h:27
+msgid "Date sent"
+msgstr "送件日期"
+
+#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
+#: ../mail/vfoldertypes.xml.in.h:28
+msgid "is before"
+msgstr "是之前的"
+
+#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
+#: ../mail/vfoldertypes.xml.in.h:29
+msgid "is after"
+msgstr "是之後的"
+
+#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
+#: ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "收件日期"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
+#: ../mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "標籤"
+
+#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
+#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+msgid "Score"
+msgstr "分數"
+
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
+msgid "Size (kB)"
+msgstr "大小 (kB)"
+
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
+msgid "Replied to"
+msgstr "回覆"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
+msgid "Important"
+msgstr "重要"
+
+#. Past tense, as in "has been read".
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+msgid "Read"
+msgstr "已讀"
+
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:120
+#: ../mail/vfoldertypes.xml.in.h:42
+msgid "Junk"
+msgstr "垃圾郵件"
+
+#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:43
+msgid "Follow Up"
+msgstr "跟隨"
+
+#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
+#: ../mail/vfoldertypes.xml.in.h:44
+msgid "is Flagged"
+msgstr "有標幟"
+
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
+msgid "is not Flagged"
+msgstr "沒有標幟"
+
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
+msgid "Completed On"
+msgstr "已完成於"
+
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
+msgid "is set"
+msgstr "設定"
+
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
+msgid "is not set"
+msgstr "未設定"
+
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
+msgid "Mailing list"
+msgstr "郵件列表"
+
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
+msgid "Regex Match"
+msgstr "正規表示式相配"
+
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
+msgid "Message Header"
+msgstr "郵件檔頭"
+
+#: ../mail/filtertypes.xml.in.h:52
+msgid "Source Account"
+msgstr "來源帳號"
+
+#: ../mail/filtertypes.xml.in.h:53
+msgid "Pipe to Program"
+msgstr "建立程式管道"
+
+#: ../mail/filtertypes.xml.in.h:54
+msgid "returns"
+msgstr "傳回"
+
+#: ../mail/filtertypes.xml.in.h:55
+msgid "does not return"
+msgstr "沒有傳回"
+
+#: ../mail/filtertypes.xml.in.h:56
+msgid "returns greater than"
+msgstr "傳回大於"
+
+#: ../mail/filtertypes.xml.in.h:57
+msgid "returns less than"
+msgstr "傳回小於"
+
+#: ../mail/filtertypes.xml.in.h:58
+msgid "Junk Test"
+msgstr "垃圾郵件測試"
+
+#: ../mail/filtertypes.xml.in.h:59
+msgid "Message is Junk"
+msgstr "垃圾郵件"
+
+#: ../mail/filtertypes.xml.in.h:60
+msgid "Message is not Junk"
+msgstr "非垃圾郵件"
+
+#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
+msgid "Message Location"
+msgstr "郵件位置"
+
+#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:56
+msgid "Match All"
+msgstr "符合全部"
+
+#: ../mail/filtertypes.xml.in.h:66
+msgid "Stop Processing"
+msgstr "停止處理"
+
+#: ../mail/filtertypes.xml.in.h:67
+msgid "Set Label"
+msgstr "設定標籤"
+
+#: ../mail/filtertypes.xml.in.h:68
+msgid "Assign Color"
+msgstr "指定色彩"
+
+#: ../mail/filtertypes.xml.in.h:69
+msgid "Unset Color"
+msgstr "取消設定顏色"
+
+#: ../mail/filtertypes.xml.in.h:70
+msgid "Assign Score"
+msgstr "指定目標"
+
+#: ../mail/filtertypes.xml.in.h:71
+msgid "Adjust Score"
+msgstr "調整目標"
+
+#: ../mail/filtertypes.xml.in.h:72
+msgid "Set Status"
+msgstr "設定狀態"
+
+#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38
+#: ../mail/vfoldertypes.xml.in.h:38
+msgid "Deleted"
+msgstr "已刪除"
+
+#: ../mail/filtertypes.xml.in.h:74
+msgid "Unset Status"
+msgstr "取消設定狀態"
+
+#: ../mail/filtertypes.xml.in.h:75
+msgid "Beep"
+msgstr "嗶聲"
+
+#: ../mail/filtertypes.xml.in.h:76
+msgid "Play Sound"
+msgstr "播放音效"
+
+#: ../mail/filtertypes.xml.in.h:77
+msgid "Run Program"
+msgstr "執行程式"
+
+#: ../mail/filtertypes.xml.in.h:78
+msgid "Forward to"
+msgstr "轉寄至"
+
 #: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "輸入 Elm 資料"
@@ -14011,105 +16049,100 @@ msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "將檔案名稱編碼為 _Outlook/GMail 形式"
 
 #: ../mail/mail-config.ui.h:12
+msgid "Send messages through Outbo_x folder"
+msgstr "透過寄件匣資料夾傳送郵件(_X)"
+
+#: ../mail/mail-config.ui.h:13
+msgid "Number of characters for word w_rapping:"
+msgstr "文字換列的字元數(_R):"
+
+#: ../mail/mail-config.ui.h:14
 msgid "Ch_aracter encoding:"
 msgstr "字元編碼(_A):"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:15
 msgid "Replies and Forwards"
 msgstr "回覆和轉寄"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:16
 msgid "_Reply style:"
 msgstr "回覆方式(_R):"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "_Forward style:"
 msgstr "轉寄方式(_F):"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "Start _typing at the bottom on replying"
 msgstr "回覆時從底部開始輸入(_T)"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "_Keep signature above the original message on replying"
 msgstr "回信時保留原始郵件的簽名(_K)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "永遠忽略通信論壇的回覆欄位(_N)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "如果可能,群組回覆只用於通信論壇(_U)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "當原始郵件已簽名 (PGP 或 S/MIME) 時也對郵件數位簽名(_S)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "附件"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "行內 (Outlook 風格)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "引文"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "不使用引文"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "行內"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "Sig_natures"
 msgstr "簽名檔(_N)"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
 msgid "Signatures"
 msgstr "簽名檔"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 msgid "_Languages"
 msgstr "語言(_L)"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:32
 msgid "Languages Table"
 msgstr "語言表"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:33
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言清單只反映出已經安裝字典的語言。"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 msgid "Check spelling while I _type"
 msgstr "當我輸入時檢查拼字(_T)"
 
-#: ../mail/mail-config.ui.h:34
-msgid "Color for _misspelled words:"
-msgstr "拼錯字的顏色(_M):"
-
-#: ../mail/mail-config.ui.h:35
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "挑選顏色"
-
-#: ../mail/mail-config.ui.h:36
-msgid "Spell Checking"
-msgstr "拼字檢查"
-
 #: ../mail/mail-config.ui.h:37
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
@@ -14148,41 +16181,43 @@ msgstr "允許當通信論壇將私人回覆導回論壇(_M)"
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "傳送給沒有輸入有效郵件位址的收件者(_R)"
 
-#: ../mail/mail-config.ui.h:50
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:51
+msgid "Sending a message using _key accelerator (Ctrl+Enter)"
+msgstr "使用快捷鍵傳送郵件時提示 (Ctrl+Enter) (_K)"
+
+#: ../mail/mail-config.ui.h:52
 msgid "Confirmations"
 msgstr "確認"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:54
-#| msgid " Use for Folders "
+#: ../mail/mail-config.ui.h:56
 msgid "Use for Folders"
 msgstr "用於資料夾"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:57
 msgid "A_dd"
 msgstr "加入(_A)"
 
-#: ../mail/mail-config.ui.h:57
-#| msgid "Remove"
+#: ../mail/mail-config.ui.h:59
 msgid "Re_move"
 msgstr "移除(_M)"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:59
-#| msgid " Use for Recipients "
+#: ../mail/mail-config.ui.h:61
 msgid "Use for Recipients"
 msgstr "用於收件者"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:61 ../modules/mail/em-composer-prefs.c:870
+#: ../mail/mail-config.ui.h:63 ../modules/mail/em-composer-prefs.c:836
 msgid "Account"
 msgstr "帳號"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:64
 msgid "Send account overrides"
 msgstr "傳送帳號覆蓋"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:65
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -14192,185 +16227,205 @@ msgstr ""
 "指派哪個帳號要用來做個別資料夾或收件者的傳送帳號,會覆蓋通常傳送帳號的偵測。"
 "收件者清單可以包含部分的位址或名稱。名稱與位址的部分會分別比對。"
 
-#: ../mail/mail-config.ui.h:64
-#| msgid "Folder override has precedence over Recipient override"
+#: ../mail/mail-config.ui.h:66
 msgid "_Folder override has precedence over Recipient override"
 msgstr "資料夾覆蓋先於收件者覆蓋(_F)"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:67
 msgid "Send Account"
 msgstr "傳送帳號"
 
-#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:73 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:75
 msgid "Start up"
 msgstr "啟動"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:76
 msgid "Check for new _messages on start"
 msgstr "啟動時檢查新郵件(_M)"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:77
 msgid "Check for new messa_ges in all active accounts"
 msgstr "檢查所有使用中帳號的新郵件(_G)"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:78
 msgid "Message Display"
 msgstr "郵件顯示"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:79
 msgid "_Use the same fonts as other applications"
 msgstr "使用與其他應用程式相同的字型(_U)"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定寬度字型"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Select HTML variable width font"
 msgstr "選擇 HTML 可變寬度字型"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "Fix_ed Width Font:"
 msgstr "固定寬度字型(_E):"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "_Mark messages as read after"
 msgstr "將郵件標示成已經閱讀於(_M)"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:86
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:87
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Pick a color"
+msgstr "挑選顏色"
+
+#: ../mail/mail-config.ui.h:88
 msgid "color"
 msgstr "色彩"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Default character e_ncoding:"
 msgstr "預設字元編碼(_N):"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "Apply the same _view settings to all folders"
 msgstr "在所有資料夾套用相同的檢視設定值(_V)"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "F_all back to threading messages by subject"
 msgstr "退回到依主旨的相關郵件(_A)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "Delete Mail"
 msgstr "刪除郵件"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "Empty _trash folders"
 msgstr "清空回收筒資料夾(_T)"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:94
 msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_W)"
 
+#: ../mail/mail-config.ui.h:95
+msgid "Archive Mail"
+msgstr "壓縮郵件"
+
+#: ../mail/mail-config.ui.h:96
+msgid "On This Computer A_rchive folder:"
+msgstr "「這臺電腦上」的壓縮資料夾(_R):"
+
+#: ../mail/mail-config.ui.h:97
+msgid "Archive folder to use for On This Computer messages"
+msgstr "用於「這臺電腦上的郵件」的壓縮資料夾"
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:99
 msgid "_Show animated images"
 msgstr "播放動畫圖片(_S)"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:100
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "當傳送 HTML 郵件給不想收到這類郵件的連絡人時顯示提示(_P)"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:101
 msgid "Loading Images"
 msgstr "正在載入圖片"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:102
 msgid "_Never load images from the Internet"
 msgstr "一定不自網路下載圖片(_N)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:103
 msgid "_Load images only in messages from contacts"
 msgstr "只載入由連絡人寄出郵件中的圖片(_L)"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:104
 msgid "_Always load images from the Internet"
 msgstr "一定自網路下載圖片(_A)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:105
 msgid "HTML Messages"
 msgstr "HTML 郵件"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:106 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "標籤"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:107
 msgid "Sender Photograph"
 msgstr "寄件者相片"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:108
 msgid "_Show the photograph of sender in the message preview"
 msgstr "在郵件預覽顯示寄件者相片(_S)"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:109
+msgid "Search gra_vatar.com for the photograph of sender"
+msgstr "搜尋寄件者在 gra_vatar.com 上的相片"
+
+#: ../mail/mail-config.ui.h:110
 msgid "Displayed Message Headers"
 msgstr "顯示的郵件檔頭"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:111
 msgid "Mail Headers Table"
 msgstr "郵件檔頭表"
 
-#: ../mail/mail-config.ui.h:105
-#: ../modules/addressbook/autocompletion-config.c:116
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../mail/mail-config.ui.h:112
+#: ../modules/addressbook/autocompletion-config.c:117
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "日期/時刻格式"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:114
 msgid "Check incoming _messages for junk"
 msgstr "檢查內送郵件是否為垃圾郵件(_M)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:115
 msgid "_Delete junk messages"
 msgstr "刪除垃圾郵件(_D)"
 
-#: ../mail/mail-config.ui.h:109
-msgid "Check cu_stom headers for junk"
-msgstr "以自訂標頭檢查垃圾郵件(_S)"
+#: ../mail/mail-config.ui.h:116
+msgid "Just Test Options"
+msgstr "只測試選項"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:117
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "若寄件者在我的通訊錄中就不要將郵件標記為垃圾郵件(_K)"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:118
 msgid "_Lookup in local address book only"
 msgstr "只在本地通訊錄查詢(_L)"
 
-#: ../mail/mail-config.ui.h:112
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "如果找到符合的自訂垃圾郵件標頭這個選項就會被忽略。"
+#: ../mail/mail-config.ui.h:119
+msgid "Check cu_stom headers for junk"
+msgstr "以自訂標頭檢查垃圾郵件(_S)"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:121
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "沒有加密"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:122
 msgid "TLS encryption"
 msgstr "TLS 加密"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:123
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
@@ -14633,7 +16688,7 @@ msgid ""
 msgstr "要永久移除所有資料夾中所有刪除的郵件?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
@@ -14908,10 +16963,6 @@ msgstr ""
 "\n"
 "您可以選擇忽略此資料夾、覆寫或附加它的內容或者結束。"
 
-#: ../mail/mail.error.xml.h:109
-msgid "Ignore"
-msgstr "忽略"
-
 #: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
@@ -15099,6 +17150,10 @@ msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "資料夾「{0}」並未包含任何重複的郵件。"
 
 #: ../mail/mail.error.xml.h:155
+msgid "Failed to connect account &quot;{0}&quot;."
+msgstr "無法與帳號 &quot;{0}&quot; 連線。"
+
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "無法中斷與帳號 &quot;{0}&quot; 的連線。"
 
@@ -15115,88 +17170,135 @@ msgid "{0}"
 msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
+msgid "Message is not available in offline mode."
+msgstr "郵件無法在離線模式下使用。"
+
+#: ../mail/mail.error.xml.h:161
+msgid ""
+"This can be due to the message not being downloaded yet. The folder, or the "
+"account, can be marked for offline synchronization. Then, once the account "
+"is online again, use File-&gt;Download Messages for Offline Usage, when this "
+"folder is selected, to make sure that all the messages in the folder will be "
+"available in offline mode."
+msgstr ""
+"這可能是因為郵件尚未下載。資料夾,或是帳號可能被標記為離線同步。往後,當此帳"
+"號恢復上線時,選擇這個資料夾,使用「檔案-&gt;下載郵件供離線使用」,以確定資料"
+"夾中所有的郵件都能在離線模式中使用。"
+
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to open folder."
 msgstr "無法開啟資料夾。"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to find duplicate messages."
 msgstr "找不到重複的郵件。"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to retrieve messages."
 msgstr "無法取回郵件。"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to mark messages as read."
 msgstr "無法將郵件標示成已經閱讀。"
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to remove attachments from messages."
 msgstr "無法移除郵件中的附件。"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to download messages for offline viewing."
 msgstr "下載離線使用的郵件失敗。"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to save messages to disk."
 msgstr "無法將選取的郵件儲存至磁碟。"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:170
 msgid "Hidden file is attached."
 msgstr "附加了隱藏的檔案。"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:171
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 msgstr "名稱為 {0} 的附件是隱藏檔,可能包含敏感資料。請重新檢閱後再寄出。"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:172
 msgid "Printing failed."
 msgstr "列印失敗。"
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:173
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "印表機回覆 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:174
 msgid "Could not perform this operation on {0}."
 msgstr "無法進行 {0} 上的操作。"
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:175
 msgid "You must be working online to complete this operation."
 msgstr "您必須於線上工作才能完成此操作。"
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:176
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "來自 &quot;{0}&quot; 帳號的郵件:"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail.error.xml.h:177
+msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgstr "無法將資料夾「{0}」中的郵件群組標記為已忽略"
+
+#: ../mail/mail.error.xml.h:178
+msgid "Failed to unmark thread from being ignored in folder '{0}'"
+msgstr "無法將資料夾「{0}」中的郵件群組取消已忽略標記"
+
+#: ../mail/mail.error.xml.h:179
+msgid "Failed to mark subthread to be ignored in folder '{0}'"
+msgstr "無法將資料夾「{0}」中的郵件子群組標記為已忽略"
+
+#: ../mail/mail.error.xml.h:180
+msgid "Failed to unmark subthread from being ignored in folder '{0}'"
+msgstr "無法將資料夾「{0}」中的郵件子群組取消已忽略標記"
+
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "正在取消…"
 
-#: ../mail/mail-send-recv.c:526
+#: ../mail/mail-send-recv.c:631
 msgid "Send & Receive Mail"
 msgstr "傳送與接收郵件"
 
-#: ../mail/mail-send-recv.c:542
+#: ../mail/mail-send-recv.c:645
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1248
 msgid "Updating..."
 msgstr "更新中…"
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
 msgid "Waiting..."
 msgstr "正在等待…"
 
-#: ../mail/mail-send-recv.c:997
+#: ../mail/mail-send-recv.c:1220
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "檢查「%s」的新郵件"
 
+#: ../mail/mail-send-recv.c:1421
+#, c-format
+msgid "Deleting junk and expunging trash at '%s'"
+msgstr "正在刪除與清空「%s」的垃圾郵件"
+
+#: ../mail/mail-send-recv.c:1423
+#, c-format
+msgid "Deleting junk at '%s'"
+msgstr "正在刪除「%s」的垃圾郵件"
+
+#: ../mail/mail-send-recv.c:1425
+#, c-format
+msgid "Expunging trash at '%s'"
+msgstr "正在清空「%s」的回收筒"
+
 #: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "搜尋資料夾"
@@ -15209,86 +17311,86 @@ msgstr "編輯搜尋資料夾"
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
-#: ../mail/message-list.c:287
+#: ../mail/message-list.c:291
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:292
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:293
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:294
 msgid "Forwarded"
 msgstr "轉寄"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:295
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:296
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../mail/message-list.c:305
+#: ../mail/message-list.c:309
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:310
 msgid "Lower"
 msgstr "低"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:314
 msgid "Higher"
 msgstr "高"
 
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:315
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5716
+#: ../mail/message-list.c:459 ../mail/message-list.c:5971
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1846 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "今天 %p %l:%M"
 
-#: ../mail/message-list.c:1855
+#: ../mail/message-list.c:2050
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %p %l:%M"
 
-#: ../mail/message-list.c:1867
+#: ../mail/message-list.c:2062
 msgid "%a %l:%M %p"
 msgstr "%A %p %l:%M"
 
-#: ../mail/message-list.c:1875
+#: ../mail/message-list.c:2070
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日 %p %l:%M"
 
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:2072
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2755
+#: ../mail/message-list.c:2960
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../mail/message-list.c:3383 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3610 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "郵件"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4759
+#: ../mail/message-list.c:4918
 msgid "Follow-up"
 msgstr "跟隨"
 
-#: ../mail/message-list.c:5654
+#: ../mail/message-list.c:5908
 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 "
@@ -15298,7 +17400,7 @@ msgstr ""
 "沒有郵件滿足您的搜尋條件。請從上列下拉式選單選擇顯示郵件過濾器或執行新的搜"
 "尋,可從 搜尋->清除 選單項目清除它或改變上面的查詢。"
 
-#: ../mail/message-list.c:5662
+#: ../mail/message-list.c:5916
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -15330,54 +17432,63 @@ msgstr "郵件寄給"
 msgid "Subject - Trimmed"
 msgstr "主旨 - 已截短"
 
-#: ../mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+msgid "Any header"
+msgstr "任何標頭"
+
+#: ../mail/searchtypes.xml.in.h:55
 msgid "Subject or Addresses contains"
 msgstr "主旨或電子郵件位址包含"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2002
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2109
 msgid "Recipients contain"
 msgstr "收件者包含"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1995
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "Message contains"
 msgstr "郵件包含"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2016
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2123
 msgid "Subject contains"
 msgstr "主旨包含"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2009
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2116
 msgid "Sender contains"
 msgstr "寄件者包含"
 
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2088
 msgid "Body contains"
 msgstr "內文包含"
 
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2095
+msgid "Free form expression"
+msgstr "自由形式表示式"
+
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:122
-#: ../modules/mail/em-mailer-prefs.c:1212
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1234
 msgid "_Table column:"
 msgstr "表格欄(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:125
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "地址格式化"
 
-#: ../modules/addressbook/autocompletion-config.c:128
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr "地址是否要根據目的地國家的標準進行格式化(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:136
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "自動完成"
 
-#: ../modules/addressbook/autocompletion-config.c:139
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "永遠顯示自動補齊的連絡人位址(_S)"
 
@@ -15412,7 +17523,7 @@ msgid "_Contact"
 msgstr "連絡人(_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1081
 msgid "Create a new contact"
 msgstr "建立新的連絡人"
 
@@ -15422,7 +17533,7 @@ msgid "Contact _List"
 msgstr "連絡人清單(_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:985
+#: ../modules/addressbook/e-book-shell-view-actions.c:1088
 msgid "Create a new contact list"
 msgstr "建立新的連絡人清單"
 
@@ -15432,7 +17543,7 @@ msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/addressbook/e-book-shell-view-actions.c:1004
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
@@ -15445,264 +17556,264 @@ msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:475
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:578
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
 msgid "Save as vCard"
 msgstr "儲存為 vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Co_py All Contacts To..."
 msgstr "複製所有的連絡人到(_P)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:983
 msgid "Copy the contacts of the selected address book to another"
 msgstr "將已選取通訊錄中的連絡人複製到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "D_elete Address Book"
 msgstr "刪除通訊錄(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Delete the selected address book"
 msgstr "刪除選取的通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Mo_ve All Contacts To..."
 msgstr "將所有的連絡人移到(_V)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
 msgid "Move the contacts of the selected address book to another"
 msgstr "將已選取通訊錄中的連絡人移動到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Address _Book Properties"
 msgstr "通訊錄屬性(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:1011
 msgid "Show properties of the selected address book"
 msgstr "顯示選取通訊錄的屬性"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../modules/calendar/e-cal-shell-view-actions.c:1254
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Re_fresh"
 msgstr "重新整理(_F)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
 msgid "Refresh the selected address book"
 msgstr "重新整理選取的通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Address Book _Map"
 msgstr "通訊錄地圖(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
 msgid "Show map with all contacts from selected address book"
 msgstr "顯示已選取通訊錄中所有連絡人的地圖"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
-#: ../modules/calendar/e-task-shell-view-actions.c:766
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/calendar/e-cal-shell-view-actions.c:1261
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "_Rename..."
 msgstr "重新命名(_R)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:1032
 msgid "Rename the selected address book"
 msgstr "重新命名選取的通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-view-actions.c:1039
 msgid "Stop loading"
 msgstr "停止載入"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "_Copy Contact To..."
 msgstr "複製連絡人到(_C)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-view-actions.c:1046
 msgid "Copy selected contacts to another address book"
 msgstr "將選取的連絡人複製到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
 msgid "_Delete Contact"
 msgstr "刪除連絡人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
 msgid "_Find in Contact..."
 msgstr "在連絡人內尋找(_F)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:1060
 msgid "Search for text in the displayed contact"
 msgstr "搜尋顯示的連絡人中的文字"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:1065
 msgid "_Forward Contact..."
 msgstr "轉寄連絡人(_F)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
 msgid "Send selected contacts to another person"
 msgstr "傳送選取連絡人給其他使用者。"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:969
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "_Move Contact To..."
 msgstr "將連絡人移到(_M)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
+#: ../modules/addressbook/e-book-shell-view-actions.c:1074
 msgid "Move selected contacts to another address book"
 msgstr "將選取的連絡人移至另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "_New Contact..."
 msgstr "新增連絡人(_N)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:1086
 msgid "New Contact _List..."
 msgstr "新增連絡人清單(_L)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1093
 msgid "_Open Contact"
 msgstr "開啟連絡人(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:992
+#: ../modules/addressbook/e-book-shell-view-actions.c:1095
 msgid "View the current contact"
 msgstr "檢視目前的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:1100
 msgid "_Send Message to Contact..."
 msgstr "傳送郵件給連絡人(_S)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../modules/addressbook/e-book-shell-view-actions.c:1102
 msgid "Send a message to the selected contacts"
 msgstr "傳送郵件至選取的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1006
-#: ../modules/calendar/e-cal-shell-view-actions.c:1576
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/addressbook/e-book-shell-view-actions.c:1109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Actions"
 msgstr "動作(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1013
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
-#: ../modules/calendar/e-task-shell-view-actions.c:831
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/mail/e-mail-shell-view-actions.c:1875
 msgid "_Preview"
 msgstr "預覽(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../modules/addressbook/e-book-shell-view-actions.c:1137
 msgid "Address Book Map"
 msgstr "通訊錄地圖"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1169
 msgid "Contact _Preview"
 msgstr "連絡人預覽(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1068
+#: ../modules/addressbook/e-book-shell-view-actions.c:1171
 msgid "Show contact preview window"
 msgstr "顯示連絡人預覽視窗"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1177
 msgid "Show _Maps"
 msgstr "顯示地圖(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1076
+#: ../modules/addressbook/e-book-shell-view-actions.c:1179
 msgid "Show maps in contact preview window"
 msgstr "在連絡人預覽視窗顯示地圖"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1095
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
-#: ../modules/calendar/e-task-shell-view-actions.c:913
-#: ../modules/mail/e-mail-shell-view-actions.c:1905
+#: ../modules/addressbook/e-book-shell-view-actions.c:1198
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:2005
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
 msgid "Show contact preview below the contact list"
 msgstr "在連絡人清單下方顯示連絡人預覽"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1102
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
-#: ../modules/calendar/e-task-shell-view-actions.c:920
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/calendar/e-memo-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Show contact preview alongside the contact list"
 msgstr "在連絡人清單旁邊顯示連絡人預覽"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
-#: ../modules/calendar/e-task-shell-view-actions.c:972
+#: ../modules/addressbook/e-book-shell-view-actions.c:1222
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1129
-#: ../modules/calendar/e-cal-shell-view-actions.c:1763
-#: ../modules/calendar/e-memo-shell-view-actions.c:783
-#: ../modules/calendar/e-task-shell-view-actions.c:982
-#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1232
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/mail/e-mail-shell-view-actions.c:2081
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1162
+#: ../modules/addressbook/e-book-shell-view-actions.c:1265
 msgid "Print all shown contacts"
 msgstr "列印所有顯示的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1272
 msgid "Preview the contacts to be printed"
 msgstr "預覽將要列印的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1176
+#: ../modules/addressbook/e-book-shell-view-actions.c:1279
 msgid "Print selected contacts"
 msgstr "列印已選取的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1191
+#: ../modules/addressbook/e-book-shell-view-actions.c:1294
 msgid "S_ave Address Book as vCard"
 msgstr "將通訊錄另存為 vC_ard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1193
+#: ../modules/addressbook/e-book-shell-view-actions.c:1296
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "將已選取通訊錄中的連絡人儲存為 vCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1199
-#: ../modules/addressbook/e-book-shell-view-actions.c:1209
+#: ../modules/addressbook/e-book-shell-view-actions.c:1302
+#: ../modules/addressbook/e-book-shell-view-actions.c:1312
 msgid "_Save as vCard..."
 msgstr "儲存成 _vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1201
+#: ../modules/addressbook/e-book-shell-view-actions.c:1304
 msgid "Save selected contacts as a vCard"
 msgstr "將選取的連絡人儲存為 vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:311
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr "轉寄連絡人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr "轉寄連絡人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "傳送郵件給連絡人(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "傳送郵件給清單(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "傳送郵件給連絡人(_S)"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -15712,17 +17823,17 @@ msgstr ""
 "\n"
 "它可以還原您所有的個人資料、設定值、郵件過濾器等。"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "從備份檔案還原(_R):"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "選擇要還原的備份檔案"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "從備份檔案還原"
@@ -15759,104 +17870,104 @@ msgstr "還原 Evolution 資料(_E)..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "從檔案庫還原 Evolution 的資料與設定值"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:75
 msgid "Back up Evolution directory"
 msgstr "備份 Evolution 資料夾"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:77
 msgid "Restore Evolution directory"
 msgstr "還原 Evolution 目錄"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:79
 msgid "Check Evolution Back up"
 msgstr "檢查 Evolution 備份"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Restart Evolution"
 msgstr "重新啟動 Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "With Graphical User Interface"
 msgstr "使用圖形使用者介面"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:321
-#: ../modules/backup-restore/evolution-backup-tool.c:515
+#: ../modules/backup-restore/evolution-backup-tool.c:281
+#: ../modules/backup-restore/evolution-backup-tool.c:475
 msgid "Shutting down Evolution"
 msgstr "正在關閉 Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:290
 msgid "Backing Evolution accounts and settings"
 msgstr "備份 Evolution 的帳號與設定值"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:347
+#: ../modules/backup-restore/evolution-backup-tool.c:307
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "正在備份 Evolution 資料 (郵件、連絡人、行事曆、工作、備忘錄)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:363
+#: ../modules/backup-restore/evolution-backup-tool.c:323
 msgid "Back up complete"
 msgstr "備份完成"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:370
-#: ../modules/backup-restore/evolution-backup-tool.c:702
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:665
 msgid "Restarting Evolution"
 msgstr "重新啟動 Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:521
+#: ../modules/backup-restore/evolution-backup-tool.c:481
 msgid "Back up current Evolution data"
 msgstr "備份目前的 Evolution 資料"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:528
+#: ../modules/backup-restore/evolution-backup-tool.c:488
 msgid "Extracting files from back up"
 msgstr "從備份解開檔案"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:610
+#: ../modules/backup-restore/evolution-backup-tool.c:570
 msgid "Loading Evolution settings"
 msgstr "正在讀取 Evolution 的設定值"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:676
+#: ../modules/backup-restore/evolution-backup-tool.c:636
 msgid "Removing temporary back up files"
 msgstr "移除暫存的備份檔案"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:687
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Reloading registry service"
 msgstr "重新載入註冊表服務"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:853
 msgid "Evolution Back Up"
 msgstr "Evolution 備份"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:917
+#: ../modules/backup-restore/evolution-backup-tool.c:854
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "正備份至資料夾 %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:858
 msgid "Evolution Restore"
 msgstr "Evolution 還原"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:922
+#: ../modules/backup-restore/evolution-backup-tool.c:859
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "從資料夾還原 %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:991
+#: ../modules/backup-restore/evolution-backup-tool.c:928
 msgid "Backing up Evolution Data"
 msgstr "備份 Evolution 資料"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:992
+#: ../modules/backup-restore/evolution-backup-tool.c:929
 msgid "Please wait while Evolution is backing up your data."
 msgstr "在 Evolution 備份您的資料時請稍候。"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:994
+#: ../modules/backup-restore/evolution-backup-tool.c:931
 msgid "Restoring Evolution Data"
 msgstr "還原 Evolution 資料"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:995
+#: ../modules/backup-restore/evolution-backup-tool.c:932
 msgid "Please wait while Evolution is restoring your data."
 msgstr "在 Evolution 還原您的資料時請稍候。"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1017
+#: ../modules/backup-restore/evolution-backup-tool.c:954
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "這個動作所花的時間取決於您的帳號中資料的多寡。"
 
@@ -15934,70 +18045,75 @@ msgid "Convert message text to _Unicode"
 msgstr "將郵件文字轉換為 _Unicode"
 
 #: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+msgid "Junk filter using Bogofilter"
+msgstr "使用 Bogofilter 垃圾郵件過濾器"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
 msgid "Standard LDAP Port"
 msgstr "標準 LDAP 連接埠"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP 透過 SSL (已廢棄)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft 通用類別目錄"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
 msgid "Microsoft Global Catalog over SSL"
 msgstr "透過 SSL 的 Microsoft 通用類別目錄"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
 msgid "Connecting to LDAP"
 msgstr "正在連線至 LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Port:"
 msgstr "連接埠:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (建議值)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 msgid "Encryption:"
 msgstr "加密:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "核對"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "使用電子郵件地址"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Method:"
 msgstr "方法:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -16007,36 +18123,36 @@ msgstr ""
 "能匿名存取您的 LDAP 伺服器。"
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
 msgid "Using LDAP"
 msgstr "使用 LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "正在搜尋"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
 msgid "Search Base:"
 msgstr "搜尋起點:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
 msgid "Find Possible Search Bases"
 msgstr "尋找可能的搜尋起點"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
 msgid "One Level"
 msgstr "一層"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
 msgid "Subtree"
 msgstr "子目錄"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Search Scope:"
 msgstr "搜尋範圍:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 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 "
@@ -16047,23 +18163,23 @@ msgstr ""
 "圍會包括搜尋起點底下所有的項目。「One Level」(一層) 的搜尋範圍只會包括起點底"
 "下的一個層級。"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
 msgid "Search Filter:"
 msgstr "搜尋過濾器:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Downloading"
 msgstr "下載中"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
 msgid "Limit:"
 msgstr "限制:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
 msgid "contacts"
 msgstr "連絡人"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "Browse until limit is reached"
 msgstr "瀏覽直到達到限制"
 
@@ -16077,41 +18193,41 @@ msgstr "網址:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "避免 IfMatch (需使用 Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:413
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP 錯誤: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
 msgid "Could not parse response"
 msgstr "無法解析回應"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:450
 msgid "Empty response"
 msgstr "空白的回應"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:458
 msgid "Unexpected reply from server"
 msgstr "來自伺服器未預期的回應"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1065
 msgid "Could not locate user's calendars"
 msgstr "無法定位使用者行事曆"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1342
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1291
 msgid "Path"
 msgstr "路徑"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:262
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:198
 msgid "Choose a Calendar"
 msgstr "選擇行事曆"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:265
 msgid "Choose a Memo List"
 msgstr "選擇備忘錄清單"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:268
 msgid "Choose a Task List"
 msgstr "選擇工作清單"
 
@@ -16139,11 +18255,11 @@ msgstr "伺服器處理會議邀請"
 msgid "Choose which address books to use."
 msgstr "選擇要使用的通訊錄。"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "用於生日和週年紀念日行事曆"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:126
+#: ../modules/cal-config-google/e-google-chooser-button.c:125
 msgid "Default User Calendar"
 msgstr "預設使用者行事曆"
 
@@ -16176,59 +18292,135 @@ msgstr "檔案:"
 msgid "Allow Evolution to update the file"
 msgstr "允許 Evolution 更新檔案"
 
-#. Translators: Translate to the default units to use for presenting
-#. * temperature units to the user. The value can be only "default:inch"
-#. * or "default:mm", any other value is treated as "default:mm" (quotes
-#. * for clarity only). Note the value is used only if the system this
-#. * is running on doesn't provide other ways for figuring out temperature
-#. * units for the current locale.
-#.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:188
+#. Translators: Please indicate whether your locale uses the
+#. * metric or imperial measurement system by changing this to
+#. * either "default:mm" or "default:inch", respectively.
+#. *
+#. * This string is just a fallback mechanism for systems on
+#. * which _NL_MEASUREMENT_MEASUREMENT is not available.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "預設值:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:260
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
 msgid "Fahrenheit (°F)"
 msgstr "華氏 (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:265
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
 msgid "Centigrade (°C)"
 msgstr "攝氏 (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
 msgid "Kelvin (K)"
 msgstr "絕對溫度 (K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:271
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
 msgid "Units:"
 msgstr "單位:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:319
+#: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "匯入(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:405
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+msgid "Importing an event"
+msgstr "匯入事件"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Importing a memo"
+msgstr "匯入備忘錄"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+msgid "Importing a task"
+msgstr "匯入工作"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "選擇行事曆"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+msgid "Select a Memo List"
+msgstr "選擇備忘錄清單"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
 msgstr "選擇工作清單"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "匯入至行事曆(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:449
-msgid "I_mport to Tasks"
-msgstr "匯入至工作(_M)"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+msgid "I_mport to Memo List"
+msgstr "匯入至備忘錄清單(_M)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+msgid "I_mport to Task List"
+msgstr "匯入至工作清單(_M)"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:186
+#: ../modules/calendar/e-cal-shell-view-actions.c:162
+msgid "New Calendar"
+msgstr "新行事曆"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:190
+#: ../modules/calendar/e-memo-shell-view-actions.c:164
+msgid "New Memo List"
+msgstr "新增備忘錄清單"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:194
+#: ../modules/calendar/e-task-shell-view-actions.c:187
+msgid "New Task List"
+msgstr "新增工作清單"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#, c-format
+msgid "Copying an event into the calendar '%s'"
+msgstr "正在複製事件到行事曆「%s」"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:541
+#, c-format
+msgid "Moving an event into the calendar '%s'"
+msgstr "正在移動事件到行事曆「%s」"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+#, c-format
+msgid "Copying a memo into the memo list '%s'"
+msgstr "正在複製備忘錄到備忘錄清單「%s」"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+#, c-format
+msgid "Moving a memo into the memo list '%s'"
+msgstr "正在移動備忘錄到備忘錄清單「%s」"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+#, c-format
+msgid "Copying a task into the task list '%s'"
+msgstr "正在複製工作到工作清單「%s」"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+#, c-format
+msgid "Moving a task into the task list '%s'"
+msgstr "正在移動工作到工作清單「%s」"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+msgid "Calendar Selector"
+msgstr "行事曆選擇器"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+msgid "Memo List Selector"
+msgstr "備忘錄清單選擇器"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+msgid "Task List Selector"
+msgstr "工作清單選擇器"
 
 #: ../modules/calendar/e-calendar-preferences.c:516
 msgid "Selected Calendars for Alarms"
@@ -16299,7 +18491,7 @@ msgid "_24 hour"
 msgstr "_24 小時"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Work Week"
 msgstr "工作週"
 
@@ -16355,13 +18547,9 @@ msgstr "週日(_U)"
 msgid "Day _ends:"
 msgstr "一日結束於(_E):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "警示"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "當刪除項目時先確認(_A)"
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "View Options"
+msgstr "檢視選項"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "_Time divisions:"
@@ -16387,137 +18575,130 @@ msgstr "在左下行事曆中將週期性事件以斜體顯示(_E)"
 msgid "Sc_roll Month View by a week"
 msgstr "以週捲動月檢視(_R)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Alerts"
+msgstr "警示"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "當刪除項目時先確認(_A)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Display"
 msgstr "顯示"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Task List"
 msgstr "工作清單"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Highlight t_asks due today"
 msgstr "強調今天到期工作(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Highlight _overdue tasks"
 msgstr "強調過期的工作(_O)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Display reminders in _notification area only"
 msgstr "只在通知區域中顯示提醒(_N)"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Sh_ow a reminder"
 msgstr "顯示提醒於約會(_O)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "before every appointment"
 msgstr "前"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Show a _reminder"
 msgstr "顯示提醒(_R)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "在每個週年紀念日/生日之前"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Select the calendars for reminder notification"
 msgstr "選擇提醒通知的行事曆"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Default Free/Busy Server"
 msgstr "預設的空閒/忙碌伺服器網址"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Template:"
 msgstr "樣板:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u 與 %d 會被替換為電子郵件位址中的使用者與網域名稱。"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Publishing Information"
 msgstr "發布資訊"
 
-#: ../modules/calendar/e-cal-shell-backend.c:312
-#: ../modules/calendar/e-cal-shell-view-actions.c:190
-msgid "New Calendar"
-msgstr "新行事曆"
-
-#: ../modules/calendar/e-cal-shell-backend.c:321
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "約會(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:323
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "全日約會(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:330
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "會議(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:337
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr "建立新會議要求"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:347
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-backend.c:140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
-#: ../modules/calendar/e-cal-shell-backend.c:702
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "開啟行事曆「%s」"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
-msgid "Calendar Selector"
-msgstr "行事曆選擇器"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
 msgid "Print"
 msgstr "列印"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:290
+#: ../modules/calendar/e-cal-shell-view-actions.c:267
 msgid "Calendar Properties"
 msgstr "iCalendar 錯誤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:296
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -16527,368 +18708,363 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:338
+#: ../modules/calendar/e-cal-shell-view-actions.c:313
 msgid "Purge events older than"
 msgstr "清除早於這段時間的事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:584
-msgid "Copying Items"
-msgstr "複製項目"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:877
-msgid "Moving Items"
-msgstr "移動項目"
+#: ../modules/calendar/e-cal-shell-view-actions.c:895
+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.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1210
+#: ../modules/calendar/e-cal-shell-view-actions.c:1055
 msgid "event"
 msgstr "事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-memopad.c:230
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:526
-#: ../modules/calendar/e-task-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-actions.c:1057
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:469
+#: ../modules/calendar/e-task-shell-view-actions.c:587
 msgid "Save as iCalendar"
 msgstr "儲存為 iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1191
+#: ../modules/calendar/e-memo-shell-view-actions.c:550
+#: ../modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Copy..."
 msgstr "複製(_C)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 msgid "D_elete Calendar"
 msgstr "刪除行事曆(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Delete the selected calendar"
 msgstr "刪除選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
 msgid "Go Back"
 msgstr "向後"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 msgid "Go Forward"
 msgstr "向前"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
 msgid "Select today"
 msgstr "選取今日"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
 msgid "Select _Date"
 msgstr "選擇日期(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
 msgid "Select a specific date"
 msgstr "選取特定日期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-cal-shell-view-actions.c:1247
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Purg_e"
 msgstr "清除(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Purge old appointments and meetings"
 msgstr "刪除舊約會和會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Refresh the selected calendar"
 msgstr "重新整理選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Rename the selected calendar"
 msgstr "重新命名選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Find _Next"
 msgstr "尋找下一筆(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
 msgid "Find next occurrence of the current search string"
 msgstr "尋找目前搜尋字詞下一個出現處"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "Find _Previous"
 msgstr "尋找上一筆(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "Find previous occurrence of the current search string"
 msgstr "尋找目前搜尋字詞上一個出現處"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 msgid "Stop _Running Search"
 msgstr "停止目前執行的搜尋(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "Stop currently running search"
 msgstr "停止目前執行的搜尋"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Show _Only This Calendar"
 msgstr "只顯示這個行事曆(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "_Delete Appointment"
 msgstr "刪除約會(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Delete selected appointments"
 msgstr "刪除選取的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Delete This _Occurrence"
 msgstr "刪除這次發生的事件(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Delete this occurrence"
 msgstr "刪除此週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Delete All Occ_urrences"
 msgstr "刪除所有發生的事件(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Delete all occurrences"
 msgstr "刪除全部週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "New All Day _Event..."
 msgstr "新增全天事件(_E)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1492
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new all day event"
 msgstr "建立新的全天事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-cal-shell-view-memopad.c:242
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-memo-shell-view-actions.c:543
+#: ../modules/calendar/e-task-shell-view-actions.c:668
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "New _Meeting..."
 msgstr "新增會議(_M)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Create a new meeting"
 msgstr "建立新的會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "New _Appointment..."
 msgstr "新增約會(_A)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Open Appointment"
 msgstr "開啟約會(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "View the current appointment"
 msgstr "檢視目前的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Converts an appointment to a meeting"
 msgstr "將約會轉換為會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Conv_ert to Appointment..."
 msgstr "轉換為約會(_E)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Converts a meeting to an appointment"
 msgstr "將會議轉換為約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Quit"
 msgstr "結束"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Show one day"
 msgstr "顯示一天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "List"
 msgstr "清單"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-cal-shell-view-actions.c:1537
 msgid "Show as list"
 msgstr "顯示成清單"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1544
 msgid "Show one month"
 msgstr "顯示一個月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Week"
 msgstr "週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one week"
 msgstr "顯示一週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show one work week"
 msgstr "顯示一個工作週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Active Appointments"
 msgstr "進行中的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1739
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Next 7 Days' Appointments"
 msgstr "未來 7 天的約會(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Occurs Less Than 5 Times"
 msgstr "發生少於五次"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1777
-#: ../modules/calendar/e-memo-shell-view-actions.c:797
-#: ../modules/calendar/e-task-shell-view-actions.c:996
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Description contains"
 msgstr "描述包含"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1784
-#: ../modules/calendar/e-memo-shell-view-actions.c:804
-#: ../modules/calendar/e-task-shell-view-actions.c:1003
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Summary contains"
 msgstr "主旨包含"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1794
-#: ../modules/calendar/e-cal-shell-view-actions.c:1808
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
-#| msgid "_Print..."
+#: ../modules/calendar/e-cal-shell-view-actions.c:1635
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Print..."
 msgstr "列印…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Preview the calendar to be printed"
 msgstr "預覽將要列印的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1825
-#: ../modules/calendar/e-cal-shell-view-memopad.c:305
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "_Save as iCalendar..."
 msgstr "儲存為 iCalendar[_S]…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Go To"
 msgstr "移至"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:228
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-cal-shell-view-memopad.c:206
+#: ../modules/calendar/e-memo-shell-view-actions.c:467
 msgid "memo"
 msgstr "備忘錄"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:249
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "New _Memo"
 msgstr "新增備忘錄(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-memo-shell-backend.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:256
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Open Memo"
 msgstr "開啟備忘錄(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:280
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "View the selected memo"
 msgstr "檢視選取的備忘錄"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:285
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Open _Web Page"
 msgstr "開啟網頁(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Print the selected memo"
 msgstr "列印選取的備忘錄"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1561
+#: ../modules/calendar/e-cal-shell-view-private.c:810
 msgid "Searching next matching event"
 msgstr "搜尋下一個符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching previous matching event"
 msgstr "搜尋前一個符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1583
+#: ../modules/calendar/e-cal-shell-view-private.c:832
 #, 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 年中找不到符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1587
+#: ../modules/calendar/e-cal-shell-view-private.c:836
 #, 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 年中找不到符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1612
+#: ../modules/calendar/e-cal-shell-view-private.c:859
 msgid "Cannot search with no active calendar"
 msgstr "不能搜尋未使用的行事曆"
 
@@ -16896,236 +19072,208 @@ msgstr "不能搜尋未使用的行事曆"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid "task"
 msgstr "工作"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
+#: ../modules/calendar/e-task-shell-view-actions.c:647
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "Mark selected tasks as complete"
 msgstr "將選取的工作標示成完成"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
 msgid "_Mark as Incomplete"
 msgstr "標示為未完成(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "Mark selected tasks as incomplete"
 msgstr "將選取的工作標示成未完成"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "New _Task"
 msgstr "新增工作(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../modules/calendar/e-task-shell-backend.c:215
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-backend.c:64
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Open Task"
 msgstr "開啟工作(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "View the selected task"
 msgstr "檢視選取的工作"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Print the selected task"
 msgstr "列印選取的工作"
 
-#: ../modules/calendar/e-memo-shell-backend.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-msgid "New Memo List"
-msgstr "新增備忘錄清單"
-
-#: ../modules/calendar/e-memo-shell-backend.c:216
+#: ../modules/calendar/e-memo-shell-backend.c:63
 msgctxt "New"
 msgid "Mem_o"
 msgstr "備忘錄(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:223
+#: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "共用備忘錄(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:225
+#: ../modules/calendar/e-memo-shell-backend.c:72
 msgid "Create a new shared memo"
 msgstr "建立新的共用備忘錄"
 
-#: ../modules/calendar/e-memo-shell-backend.c:233
+#: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "備忘錄清單(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:235
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "開啟備忘錄清單「%s」"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
-msgid "Memo List Selector"
-msgstr "備忘錄清單選擇器"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "Print Memos"
 msgstr "列印備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:236
 msgid "Memo List Properties"
 msgstr "備忘錄清單屬性"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../modules/calendar/e-memo-shell-view-actions.c:529
 msgid "_Delete Memo"
 msgstr "刪除備忘錄(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:536
 msgid "_Find in Memo..."
 msgstr "在備忘錄內尋找(_F)…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../modules/calendar/e-memo-shell-view-actions.c:538
 msgid "Search for text in the displayed memo"
 msgstr "搜尋顯示的備忘錄中的文字"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:557
 msgid "D_elete Memo List"
 msgstr "刪除備忘錄清單(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:559
 msgid "Delete the selected memo list"
 msgstr "刪除選取的備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_New Memo List"
 msgstr "新增備忘錄清單(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Refresh the selected memo list"
 msgstr "重新整理選取的備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Rename the selected memo list"
 msgstr "重新命名選取的備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "Show _Only This Memo List"
 msgstr "只顯示此備忘錄清單(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Memo _Preview"
 msgstr "備忘錄預覽(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
 msgid "Show memo preview pane"
 msgstr "顯示備忘錄預覽窗格"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
 msgid "Show memo preview below the memo list"
 msgstr "在備忘錄清單下方顯示備忘錄預覽"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
 msgid "Show memo preview alongside the memo list"
 msgstr "在備忘錄清單旁邊顯示備忘錄預覽"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:816
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Print the list of memos"
 msgstr "列印備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
 msgid "Preview the list of memos to be printed"
 msgstr "預覽將要列印的備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:212
 msgid "Delete Memos"
 msgstr "刪除備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view.c:240
+#: ../modules/calendar/e-memo-shell-view.c:214
 msgid "Delete Memo"
 msgstr "刪除備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:537
+#: ../modules/calendar/e-memo-shell-view-private.c:369
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 項備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:541
-#: ../modules/calendar/e-task-shell-view-private.c:747
+#: ../modules/calendar/e-memo-shell-view-private.c:373
+#: ../modules/calendar/e-task-shell-view-private.c:539
 #, c-format
 msgid "%d selected"
 msgstr "已選擇 %d 個"
 
-#: ../modules/calendar/e-task-shell-backend.c:204
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-msgid "New Task List"
-msgstr "新增工作清單"
-
-#: ../modules/calendar/e-task-shell-backend.c:213
+#: ../modules/calendar/e-task-shell-backend.c:62
 msgctxt "New"
 msgid "_Task"
 msgstr "工作(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:220
+#: ../modules/calendar/e-task-shell-backend.c:69
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "指派的工作(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:222
+#: ../modules/calendar/e-task-shell-backend.c:71
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
 
-#: ../modules/calendar/e-task-shell-backend.c:230
+#: ../modules/calendar/e-task-shell-backend.c:79
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "工作清單(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:232
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-backend.c:81
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "Create a new task list"
 msgstr "建立新工作清單"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:116
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "開啟工作清單「%s」"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:545
-msgid "Task List Selector"
-msgstr "工作清單選擇器"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "Print Tasks"
 msgstr "列印工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:290
+#: ../modules/calendar/e-task-shell-view-actions.c:259
 msgid "Task List Properties"
 msgstr "工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:529
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17137,121 +19285,117 @@ msgstr ""
 "\n"
 "確定清除這些工作?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:592
+#: ../modules/calendar/e-task-shell-view-actions.c:536
 msgid "Do not ask me again"
 msgstr "不要再詢問我"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/calendar/e-task-shell-view-actions.c:654
 msgid "_Delete Task"
 msgstr "刪除工作(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:661
 msgid "_Find in Task..."
 msgstr "在工作內尋找(_F)…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "Search for text in the displayed task"
 msgstr "搜尋顯示的工作中的文字"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:682
 msgid "D_elete Task List"
 msgstr "刪除工作清單(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete the selected task list"
 msgstr "刪除選取的工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:689
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "Refresh the selected task list"
 msgstr "重新整理選取的工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Rename the selected task list"
 msgstr "重新命名選取的工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Show _Only This Task List"
 msgstr "只顯示此工作清單(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Mar_k as Incomplete"
 msgstr "標示為未完成(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Delete completed tasks"
 msgstr "刪除已完成的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:836
 msgid "Task _Preview"
 msgstr "工作預覽(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Show task preview pane"
 msgstr "顯示工作預覽窗格"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:859
 msgid "Show task preview below the task list"
 msgstr "在工作清單下方顯示工作預覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "Show task preview alongside the task list"
 msgstr "在工作清單旁邊顯示工作預覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:930
+#: ../modules/calendar/e-task-shell-view-actions.c:874
 msgid "Active Tasks"
 msgstr "進行中的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Completed Tasks"
 msgstr "已完成的工作 "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Next 7 Days' Tasks"
 msgstr "未來 7 天的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:902
 msgid "Overdue Tasks"
 msgstr "過期的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:909
 msgid "Tasks with Attachments"
 msgstr "有附件的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1015
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Print the list of tasks"
 msgstr "列印工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Preview the list of tasks to be printed"
 msgstr "預覽將要列印的工作清單"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:316
 msgid "Delete Tasks"
 msgstr "刪除工作"
 
-#: ../modules/calendar/e-task-shell-view.c:375
+#: ../modules/calendar/e-task-shell-view.c:318
 msgid "Delete Task"
 msgstr "刪除工作"
 
-#: ../modules/calendar/e-task-shell-view-private.c:632
-msgid "Expunging"
-msgstr "除去中"
-
-#: ../modules/calendar/e-task-shell-view-private.c:743
+#: ../modules/calendar/e-task-shell-view-private.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 項工作"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:148
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
 msgid "Display part as an invitation"
 msgstr "將部分顯示為邀請"
 
@@ -17623,7 +19767,7 @@ msgid "Start day:"
 msgstr "開始日:"
 
 #: ../modules/itip-formatter/itip-view.c:681
-#: ../modules/itip-formatter/itip-view.c:1504
+#: ../modules/itip-formatter/itip-view.c:1494
 msgid "Start time:"
 msgstr "開始時間:"
 
@@ -17632,288 +19776,289 @@ msgid "End day:"
 msgstr "結束日:"
 
 #: ../modules/itip-formatter/itip-view.c:690
-#: ../modules/itip-formatter/itip-view.c:1505
+#: ../modules/itip-formatter/itip-view.c:1495
 msgid "End time:"
 msgstr "結束時間:"
 
-#: ../modules/itip-formatter/itip-view.c:1030
+#: ../modules/itip-formatter/itip-view.c:1020
 msgid "Ope_n Calendar"
 msgstr "開啟行事曆(_N)"
 
-#: ../modules/itip-formatter/itip-view.c:1033
+#: ../modules/itip-formatter/itip-view.c:1023
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1036
+#: ../modules/itip-formatter/itip-view.c:1026
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1029
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1032
 msgid "_Tentative"
 msgstr "暫訂(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1035
 msgid "Acce_pt all"
 msgstr "全部接受(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1038
 msgid "Acce_pt"
 msgstr "接受(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1041
 msgid "Send _Information"
 msgstr "傳送資訊(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1044
 msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1047
+#: ../smime/gui/certificate-manager.c:1664
 msgid "_Update"
 msgstr "更新(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1507
-#: ../modules/itip-formatter/itip-view.c:1555
-#: ../modules/itip-formatter/itip-view.c:1626
+#: ../modules/itip-formatter/itip-view.c:1497
+#: ../modules/itip-formatter/itip-view.c:1545
+#: ../modules/itip-formatter/itip-view.c:1616
 msgid "Comment:"
 msgstr "註解:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1543
+#: ../modules/itip-formatter/itip-view.c:1533
 msgid "Send reply to sender"
 msgstr "回覆寄件者"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1548
 msgid "Send _updates to attendees"
 msgstr "傳送更新給到會者(_U)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1561
+#: ../modules/itip-formatter/itip-view.c:1551
 msgid "_Apply to all instances"
 msgstr "套用至所有實體(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1562
+#: ../modules/itip-formatter/itip-view.c:1552
 msgid "Show time as _free"
 msgstr "顯示時間為空閒(_F)"
 
-#: ../modules/itip-formatter/itip-view.c:1563
+#: ../modules/itip-formatter/itip-view.c:1553
 msgid "_Preserve my reminder"
 msgstr "保留我的提醒(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1564
+#: ../modules/itip-formatter/itip-view.c:1554
 msgid "_Inherit reminder"
 msgstr "繼承提醒(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1894
+#: ../modules/itip-formatter/itip-view.c:1884
 msgid "_Tasks:"
 msgstr "工作(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1897
+#: ../modules/itip-formatter/itip-view.c:1887
 msgid "_Memos:"
 msgstr "備忘錄(_M):"
 
-#: ../modules/itip-formatter/itip-view.c:3125
+#: ../modules/itip-formatter/itip-view.c:3115
 msgid "Sa_ve"
 msgstr "儲存(_V)"
 
-#: ../modules/itip-formatter/itip-view.c:3585
-#: ../modules/itip-formatter/itip-view.c:5032
+#: ../modules/itip-formatter/itip-view.c:3575
+#: ../modules/itip-formatter/itip-view.c:5022
 msgid "Attendee status updated"
 msgstr "到會者狀態已更新"
 
-#: ../modules/itip-formatter/itip-view.c:3764
+#: ../modules/itip-formatter/itip-view.c:3754
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "行事曆 '%s' 中的約會和這個會議相衝突"
 
-#: ../modules/itip-formatter/itip-view.c:3793
+#: ../modules/itip-formatter/itip-view.c:3783
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s」中的約會"
 
-#: ../modules/itip-formatter/itip-view.c:3906
+#: ../modules/itip-formatter/itip-view.c:3896
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../modules/itip-formatter/itip-view.c:3904
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個約會"
 
-#: ../modules/itip-formatter/itip-view.c:3919
+#: ../modules/itip-formatter/itip-view.c:3909
 msgid "Unable to find this task in any task list"
 msgstr "無法在任何工作清單中找到這項工作"
 
-#: ../modules/itip-formatter/itip-view.c:3924
+#: ../modules/itip-formatter/itip-view.c:3914
 msgid "Unable to find this memo in any memo list"
 msgstr "無法在任何備忘錄清單中找到這項備忘錄"
 
-#: ../modules/itip-formatter/itip-view.c:4268
+#: ../modules/itip-formatter/itip-view.c:4258
 msgid "Opening the calendar. Please wait..."
 msgstr "正在開啟行事曆。請稍候…"
 
-#: ../modules/itip-formatter/itip-view.c:4273
+#: ../modules/itip-formatter/itip-view.c:4263
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個約會既存的版本"
 
-#: ../modules/itip-formatter/itip-view.c:4668
+#: ../modules/itip-formatter/itip-view.c:4658
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "無法傳送項目至行事曆「%s」。%s"
 
-#: ../modules/itip-formatter/itip-view.c:4683
+#: ../modules/itip-formatter/itip-view.c:4673
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "傳送至行事曆 '%s' 並設為已接受"
 
-#: ../modules/itip-formatter/itip-view.c:4688
+#: ../modules/itip-formatter/itip-view.c:4678
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "傳送至行事曆 '%s' 並設為不確定的"
 
-#: ../modules/itip-formatter/itip-view.c:4694
+#: ../modules/itip-formatter/itip-view.c:4684
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "傳送至行事曆 '%s' 並設為已婉拒"
 
-#: ../modules/itip-formatter/itip-view.c:4700
+#: ../modules/itip-formatter/itip-view.c:4690
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "傳送至行事曆「%s」並設為已取消"
 
-#: ../modules/itip-formatter/itip-view.c:4721
-#: ../modules/itip-formatter/itip-view.c:5178
-#: ../modules/itip-formatter/itip-view.c:5284
+#: ../modules/itip-formatter/itip-view.c:4711
+#: ../modules/itip-formatter/itip-view.c:5168
+#: ../modules/itip-formatter/itip-view.c:5274
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "正在將變更儲存到行事曆。請稍候…"
 
-#: ../modules/itip-formatter/itip-view.c:4762
+#: ../modules/itip-formatter/itip-view.c:4752
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
-#: ../modules/itip-formatter/itip-view.c:4955
+#: ../modules/itip-formatter/itip-view.c:4945
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-#: ../modules/itip-formatter/itip-view.c:4972
+#: ../modules/itip-formatter/itip-view.c:4962
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-#: ../modules/itip-formatter/itip-view.c:4976
+#: ../modules/itip-formatter/itip-view.c:4966
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
 
-#: ../modules/itip-formatter/itip-view.c:5024
+#: ../modules/itip-formatter/itip-view.c:5014
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新到會者。%s"
 
-#: ../modules/itip-formatter/itip-view.c:5067
+#: ../modules/itip-formatter/itip-view.c:5057
 msgid "The meeting is invalid and cannot be updated"
 msgstr "這個會議無效並且不能更新"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:5133
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得到會者狀態無法更新!"
 
-#: ../modules/itip-formatter/itip-view.c:5215
-#: ../modules/itip-formatter/itip-view.c:5254
+#: ../modules/itip-formatter/itip-view.c:5205
+#: ../modules/itip-formatter/itip-view.c:5244
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "到會者狀態不能更新,因為項目已經不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5317
+#: ../modules/itip-formatter/itip-view.c:5307
 msgid "Meeting information sent"
 msgstr "會議資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5312
 msgid "Task information sent"
 msgstr "工作資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5327
+#: ../modules/itip-formatter/itip-view.c:5317
 msgid "Memo information sent"
 msgstr "備忘錄資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../modules/itip-formatter/itip-view.c:5328
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "無法寄出會議資訊,該會議並不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5343
+#: ../modules/itip-formatter/itip-view.c:5333
 msgid "Unable to send task information, the task does not exist"
 msgstr "無法寄出工作資訊,該項工作不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5348
+#: ../modules/itip-formatter/itip-view.c:5338
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "無法寄出備忘錄資訊,該備忘錄並不存在"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5413
+#: ../modules/itip-formatter/itip-view.c:5403
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5418
+#: ../modules/itip-formatter/itip-view.c:5408
 msgid "Save Calendar"
 msgstr "儲存行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:5467
-#: ../modules/itip-formatter/itip-view.c:5480
+#: ../modules/itip-formatter/itip-view.c:5457
+#: ../modules/itip-formatter/itip-view.c:5470
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../modules/itip-formatter/itip-view.c:5468
-#: ../modules/itip-formatter/itip-view.c:5481
+#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5471
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "此郵件宣告其含有行事曆內容,但其行事曆並非有效的 iCalendar。"
 
-#: ../modules/itip-formatter/itip-view.c:5523
-#: ../modules/itip-formatter/itip-view.c:5553
-#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5513
+#: ../modules/itip-formatter/itip-view.c:5543
+#: ../modules/itip-formatter/itip-view.c:5644
 msgid "The item in the calendar is not valid"
 msgstr "行事曆中的項目是無效的"
 
-#: ../modules/itip-formatter/itip-view.c:5524
-#: ../modules/itip-formatter/itip-view.c:5554
-#: ../modules/itip-formatter/itip-view.c:5655
+#: ../modules/itip-formatter/itip-view.c:5514
+#: ../modules/itip-formatter/itip-view.c:5544
+#: ../modules/itip-formatter/itip-view.c:5645
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 "此郵件確實含有行事曆內容,但該內容並未包含任何事件、工作或空閒/忙碌資訊"
 
-#: ../modules/itip-formatter/itip-view.c:5569
+#: ../modules/itip-formatter/itip-view.c:5559
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容含有多個項目"
 
-#: ../modules/itip-formatter/itip-view.c:5570
+#: ../modules/itip-formatter/itip-view.c:5560
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要處理這些全部的項目,應該將此檔案儲存後匯入其中的行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:6072
+#: ../modules/itip-formatter/itip-view.c:6062
 msgctxt "cal-itip"
 msgid "None"
 msgstr "沒有"
 
-#: ../modules/itip-formatter/itip-view.c:6088
+#: ../modules/itip-formatter/itip-view.c:6078
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: ../modules/itip-formatter/itip-view.c:6248
+#: ../modules/itip-formatter/itip-view.c:6238
 msgid "This meeting recurs"
 msgstr "這個會議的週期規則為"
 
-#: ../modules/itip-formatter/itip-view.c:6251
+#: ../modules/itip-formatter/itip-view.c:6241
 msgid "This task recurs"
 msgstr "這項工作的週期規則為"
 
-#: ../modules/itip-formatter/itip-view.c:6254
+#: ../modules/itip-formatter/itip-view.c:6244
 msgid "This memo recurs"
 msgstr "這個備忘錄的週期規則為"
 
@@ -17956,19 +20101,19 @@ msgstr "Itip 格式器"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "顯示郵件中的「text/calendar」 MIME 部分。"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:251
+#: ../modules/mail-config/e-mail-config-google-summary.c:250
 msgid "Google Features"
 msgstr "Google 功能"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:260
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Add Google Ca_lendar to this account"
 msgstr "將 Google 日曆加入這個帳號(_L)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:267
 msgid "Add Google Con_tacts to this account"
 msgstr "將 Google 通訊錄加入這個帳號(_T)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:276
+#: ../modules/mail-config/e-mail-config-google-summary.c:275
 msgid "You may need to enable IMAP access"
 msgstr "您可能需要啟用 IMAP 存取"
 
@@ -18010,60 +20155,60 @@ msgid "Choose a mbox spool directory"
 msgstr "選擇 mbox 排程器目錄"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:136
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "組態"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "伺服器(_S):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "_Port:"
 msgstr "連接埠(_P):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "Encryption _method:"
 msgstr "加密方法(_M):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
 msgid "STARTTLS after connecting"
 msgstr "連線後使用 STARTTLS"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
 msgid "SSL on a dedicated port"
 msgstr "SSL 於專用的連接埠"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "使用自訂的二元檔,取代「sendmail」(_U)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
 msgid "_Custom binary:"
 msgstr "自訂二元檔(_C):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
 msgid "U_se custom arguments"
 msgstr "使用自訂引數(_S)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
 msgid "Cus_tom arguments:"
 msgstr "自訂引數(_T):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -18073,23 +20218,23 @@ msgstr ""
 "   %F - 代表寄件者郵件位址\n"
 "   %R - 代表收件者郵件位址"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
 msgid "Send mail also when in offline _mode"
 msgstr "離線模式下仍傳送郵件(_M)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求核對(_V)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
 msgid "T_ype:"
 msgstr "類型(_Y):"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
 msgid "Yahoo! Features"
 msgstr "Yahoo! 功能"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "將 Yahoo! 行事曆與工作加入這個帳號(_L)"
 
@@ -18099,476 +20244,488 @@ msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d 封附加的郵件"
 
-#: ../modules/mail/e-mail-shell-backend.c:314
+#: ../modules/mail/e-mail-shell-backend.c:348
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:316
+#: ../modules/mail/e-mail-shell-backend.c:350
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
-#: ../modules/mail/e-mail-shell-backend.c:324
+#: ../modules/mail/e-mail-shell-backend.c:358
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "郵件帳號(_U)"
 
-#: ../modules/mail/e-mail-shell-backend.c:326
+#: ../modules/mail/e-mail-shell-backend.c:360
 msgid "Create a new mail account"
 msgstr "建立新郵件帳號"
 
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "郵件資料夾(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../modules/mail/e-mail-shell-backend.c:367
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
-#: ../modules/mail/e-mail-shell-backend.c:644
+#: ../modules/mail/e-mail-shell-backend.c:682
 msgid "Mail Accounts"
 msgstr "郵件帳號"
 
-#: ../modules/mail/e-mail-shell-backend.c:653
+#: ../modules/mail/e-mail-shell-backend.c:691
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:662
+#: ../modules/mail/e-mail-shell-backend.c:700
 msgid "Composer Preferences"
 msgstr "郵件編輯器偏好設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:672
+#: ../modules/mail/e-mail-shell-backend.c:710
 msgid "Network Preferences"
 msgstr "網路偏好設定"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:964
+#: ../modules/mail/e-mail-shell-backend.c:1002
 msgctxt "label"
 msgid "None"
 msgstr "沒有"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:670
+#: ../modules/mail/e-mail-shell-view-actions.c:752
 msgid "Marking messages as read..."
 msgstr "將郵件標示成已經閱讀…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "_Disable Account"
 msgstr "停用帳號(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Disable this account"
 msgstr "停用這個帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "Edit properties of this account"
 msgstr "編輯這個帳號的屬性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Refresh list of folders of this account"
 msgstr "重新整理這個帳號的資料夾清單"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "_Download Messages for Offline Usage"
 msgstr "下載離線使用的郵件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1642
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "下載標記為離線使用的帳號與資料夾之郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Fl_ush Outbox"
 msgstr "清理寄件匣(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "_Copy Folder To..."
 msgstr "複製資料夾到(_C)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../modules/mail/e-mail-shell-view-actions.c:1656
 msgid "Copy the selected folder into another folder"
 msgstr "複製已選定的資料夾到另一個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1663
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1668
 msgid "E_xpunge"
 msgstr "刪除(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1670
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1575
 #: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "Mar_k All Messages as Read"
 msgstr "標示所有郵件為已閱讀(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
 #: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1777
 msgid "Mark all messages in the folder as read"
 msgstr "將資料夾中全部的郵件標示成已閱讀"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "_Move Folder To..."
 msgstr "移動資料夾到(_M)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Move the selected folder into another folder"
 msgstr "將選定的資料夾移至另一個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "_New..."
 msgstr "新增(_N)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1591
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Create a new folder for storing mail"
 msgstr "建立一個新資料夾以儲存郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Change the properties of this folder"
 msgstr "變更這個資料夾的屬性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Refresh the folder"
 msgstr "重新載入資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Change the name of this folder"
 msgstr "變更這個資料夾的名稱"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
 msgid "Select Message _Thread"
 msgstr "選擇郵件檔頭(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選擇所有相關的郵件為選定的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "Select Message S_ubthread"
 msgstr "選擇郵件子群組(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Select all replies to the currently selected message"
 msgstr "選擇所有回覆選定郵件的信"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Empty _Trash"
 msgstr "清理回收筒(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1740
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "永久移除在所有帳號內全部已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_New Label"
 msgstr "新增標籤(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "N_one"
 msgstr "沒有(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
 msgid "_Manage Subscriptions"
 msgstr "管理訂閱(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../modules/mail/e-mail-shell-view-actions.c:1770
+#: ../modules/mail/e-mail-shell-view-actions.c:1854
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "訂閱或取消訂閱在遠端伺服器的資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1782
+#: ../modules/mail/e-mail-shell-view-actions.c:1803
 msgid "Send / _Receive"
 msgstr "傳送/接收(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1784
 msgid "Send queued items and retrieve new items"
 msgstr "傳送待送的項目並接收新的項目"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1789
 msgid "R_eceive All"
 msgstr "全部接收(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1791
 msgid "Receive new items from all accounts"
 msgstr "接收在所有帳號內的新項目"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1796
 msgid "_Send All"
 msgstr "全部傳送(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1798
 msgid "Send queued items in all accounts"
 msgstr "傳送在所有帳號內待送的項目"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1826
 msgid "Cancel the current mail operation"
 msgstr "取消目前郵件所作的行動"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1831
 msgid "Collapse All _Threads"
 msgstr "收摺所有相關郵件(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1833
 msgid "Collapse all message threads"
 msgstr "收摺所有的相關郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1838
 msgid "E_xpand All Threads"
 msgstr "展開所有相關郵件(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1840
 msgid "Expand all message threads"
 msgstr "展開所有的相關郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1845
 msgid "_Message Filters"
 msgstr "郵件規則(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1847
 msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1852
 msgid "_Subscriptions..."
 msgstr "訂閱(_S)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1861
 msgid "F_older"
 msgstr "資料夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1868
 msgid "_Label"
 msgstr "標籤(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/mail/e-mail-shell-view-actions.c:1885
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1892
 msgid "Search F_olders"
 msgstr "搜尋資料夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1894
 msgid "Create or edit search folder definitions"
 msgstr "建立或編輯搜尋資料夾的定義"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1933
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1961
 msgid "Show Message _Preview"
 msgstr "顯示郵件預覽(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1863
+#: ../modules/mail/e-mail-shell-view-actions.c:1963
 msgid "Show message preview pane"
 msgstr "顯示郵件預覽窗格"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1969
 msgid "Show _Deleted Messages"
 msgstr "顯示已刪除郵件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../modules/mail/e-mail-shell-view-actions.c:1971
 msgid "Show deleted messages with a line through them"
 msgstr "顯示已刪除的郵件 (加上刪除線)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1877
+#: ../modules/mail/e-mail-shell-view-actions.c:1977
 msgid "_Group By Threads"
 msgstr "依相關郵件為群組(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1979
 msgid "Threaded message list"
 msgstr "相關郵件清單"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1985
 msgid "_Unmatched Folder Enabled"
 msgstr "未符合資料夾已啟用(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1987
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "切換是否啟用未符合搜尋資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1907
+#: ../modules/mail/e-mail-shell-view-actions.c:2007
 msgid "Show message preview below the message list"
 msgstr "在郵件清單下方顯示郵件預覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1914
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Show message preview alongside the message list"
 msgstr "在郵件清單旁邊顯示郵件預覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:2029
 msgid "Important Messages"
 msgstr "重要郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1936
+#: ../modules/mail/e-mail-shell-view-actions.c:2036
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1943
+#: ../modules/mail/e-mail-shell-view-actions.c:2043
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1950
+#: ../modules/mail/e-mail-shell-view-actions.c:2050
 msgid "Messages with Attachments"
 msgstr "有附件的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1957
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2023
+#: ../modules/mail/e-mail-shell-view-actions.c:2130
 msgid "Subject or Addresses contain"
 msgstr "主旨或電子郵件位址包含"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2140
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2147
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2154
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-#: ../modules/mail/e-mail-shell-view.c:636
+#: ../modules/mail/e-mail-shell-view.c:700
 msgid "All Account Search"
 msgstr "所有的帳號搜尋"
 
-#: ../modules/mail/e-mail-shell-view.c:744
+#: ../modules/mail/e-mail-shell-view.c:808
 msgid "Account Search"
 msgstr "帳號搜尋"
 
-#: ../modules/mail/e-mail-shell-view-private.c:969
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已選擇 %d 個,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
 #: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已刪除"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1004
-#: ../modules/mail/e-mail-shell-view-private.c:1010
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1017
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 個草稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未傳送"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1046
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d 封未讀,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "共 %d 封"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1065
+#: ../modules/mail/e-mail-shell-view-private.c:1082
 msgid "Trash"
 msgstr "回收筒"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1502
+#: ../modules/mail/e-mail-shell-view-private.c:1569
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../modules/mail/em-composer-prefs.c:394
 msgid "Select Folder to Add"
 msgstr "選擇要加入的資料夾"
 
-#: ../modules/mail/em-composer-prefs.c:888
+#: ../modules/mail/em-composer-prefs.c:854
 msgid "Folder"
 msgstr "資料夾"
 
-#: ../modules/mail/em-composer-prefs.c:924
+#: ../modules/mail/em-composer-prefs.c:890
 msgid "Recipient"
 msgstr "收件人"
 
-#: ../modules/mail/em-composer-prefs.c:1195
+#: ../modules/mail/em-composer-prefs.c:1157
+msgid "Keep in Outbox"
+msgstr "保留在寄件匣"
+
+#: ../modules/mail/em-composer-prefs.c:1158
+msgid "Send immediately"
+msgstr "立刻傳送"
+
+#: ../modules/mail/em-composer-prefs.c:1159
+msgid "Send after 5 minutes"
+msgstr "5 分鐘後傳送"
+
+#: ../modules/mail/em-composer-prefs.c:1232
 msgid "Language(s)"
 msgstr "語言"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "On exit, every time"
 msgstr "結束時,每次"
 
+#: ../modules/mail/em-mailer-prefs.c:80
+msgid "Once per day"
+msgstr "每天一次"
+
 #: ../modules/mail/em-mailer-prefs.c:81
-msgid "On exit, once per day"
-msgstr "結束時,每天一次"
+msgid "Once per week"
+msgstr "每週一次"
 
 #: ../modules/mail/em-mailer-prefs.c:82
-msgid "On exit, once per week"
-msgstr "結束時,每週一次"
+msgid "Once per month"
+msgstr "每月一次"
 
 #: ../modules/mail/em-mailer-prefs.c:83
-msgid "On exit, once per month"
-msgstr "結束時,每月一次"
-
-#: ../modules/mail/em-mailer-prefs.c:84
 msgid "Immediately, on folder leave"
 msgstr "立即,在離開資料夾時"
 
-#: ../modules/mail/em-mailer-prefs.c:355
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "頁首"
 
-#: ../modules/mail/em-mailer-prefs.c:359
+#: ../modules/mail/em-mailer-prefs.c:360
 msgid "Contains Value"
 msgstr "包含數值"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1214
+#: ../modules/mail/em-mailer-prefs.c:1236
 msgid "_Date header:"
 msgstr "日期標頭(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1237
 msgid "Show _original header value"
 msgstr "顯示原始標頭數值(_O)"
 
@@ -18578,24 +20735,24 @@ msgstr "是否要將 Evolution 設為您的預設電子郵件客戶端?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:307
+#: ../modules/mdn/evolution-mdn.c:304
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "您寄給 %s 主旨「%s」 (%s) 的郵件已被閱讀。"
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:374
+#: ../modules/mdn/evolution-mdn.c:370
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "「%s」的遞送通知"
 
-#: ../modules/mdn/evolution-mdn.c:539
+#: ../modules/mdn/evolution-mdn.c:531
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "傳送郵件回條給「%s」"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:544
+#: ../modules/mdn/evolution-mdn.c:536
 msgid "_Notify Sender"
 msgstr "通知寄件者(_N)"
 
@@ -18670,34 +20827,34 @@ msgstr "顯示 HTML 版本"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "顯示多部分/替代郵件的 HTML 版本"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
 #: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "如提供 HTML 則顯示之"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "讓 Evolution 選擇最佳的部分來顯示。"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "如提供純文字則顯示它"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "如果有純文字的部分就顯示它,否則讓 Evolution 選擇最佳的部分來顯示。"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
 #: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "只以純文字顯示"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
 #: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -18760,21 +20917,26 @@ msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "這會讓 SpamAssasin 更可靠,但速度變慢。"
 
 #: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+msgid "Junk filter using SpamAssassin"
+msgstr "使用 SpamAssassin 垃圾郵件過濾器"
+
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:261
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "正在匯入檔案"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
 msgid "Import cancelled."
 msgstr "匯入已取消。"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
 msgid "Import complete."
 msgstr "匯入完成。"
 
@@ -18801,11 +20963,11 @@ msgstr "格式化為(_F)…"
 msgid "_Other languages"
 msgstr "其他的語言(_O)"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:336
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:437
 msgid "Text Highlight"
 msgstr "文字突顯"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:337
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Syntax highlighting of mail parts"
 msgstr "郵件部分的語法突顯"
 
@@ -18833,10 +20995,6 @@ msgstr "_C#"
 msgid "_Cascade Style Sheet"
 msgstr "樣式表(_C)"
 
-#: ../modules/text-highlight/languages.c:72
-msgid "_HTML"
-msgstr "_HTML"
-
 #: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Java"
@@ -19025,35 +21183,35 @@ msgstr "_TCSH"
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:128
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
 #: ../modules/vcard-inline/e-mail-part-vcard.c:151
 msgid "Show F_ull vCard"
 msgstr "顯示完整的 vCard (_U)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
 #: ../modules/vcard-inline/e-mail-part-vcard.c:169
 msgid "Show Com_pact vCard"
 msgstr "顯示精簡的 vCard (_P)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:156
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
 msgid "Save _To Addressbook"
 msgstr "儲存到通訊錄(_T)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:177
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 msgid "There is one other contact."
 msgstr "還有連絡人。"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:183
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "還有 %d 個其他連絡人。"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:208
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
 msgid "Addressbook Contact"
 msgstr "通訊錄連絡人"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
 msgid "Display the part as an addressbook contact"
 msgstr "將部分顯示為通訊錄連絡人"
 
@@ -19061,7 +21219,7 @@ msgstr "將部分顯示為通訊錄連絡人"
 msgid "Evolution Web Inspector"
 msgstr "Evolution 網頁檢查器"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#: ../plugins/attachment-reminder/attachment-reminder.c:123
 msgid "_Do not show this message again."
 msgstr "不要再顯示這個訊息(_D)"
 
@@ -19096,35 +21254,35 @@ msgstr "附件提醒程式"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "當您忘記將附件加入郵件時提醒您。"
 
-#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自動加入的連絡人"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr "在傳送郵件時自動建立通訊錄項目(_A)"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr "選擇給自動加入連絡人用的通訊錄"
 
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr "即時訊息連絡人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "從 Pidgin 的好友清單同步連絡人資訊和圖片(_S)"
 
-#: ../plugins/bbdb/bbdb.c:706
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr "選擇給 Pidgin 好友名單用的通訊錄"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:719
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr "立即與好友清單同步(_B)"
 
@@ -19201,12 +21359,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "沒有"
 
-#: ../plugins/email-custom-header/email-custom-header.c:538
+#: ../plugins/email-custom-header/email-custom-header.c:539
 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
-#: ../plugins/email-custom-header/email-custom-header.c:808
+#: ../plugins/email-custom-header/email-custom-header.c:809
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -19214,11 +21372,11 @@ msgstr ""
 "指定自訂標頭鍵值的格式:\n"
 "自訂標頭鍵值的名稱請以「;」隔開。"
 
-#: ../plugins/email-custom-header/email-custom-header.c:861
+#: ../plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "設定鍵"
 
-#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/email-custom-header/email-custom-header.c:879
 #: ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "數值"
@@ -19252,8 +21410,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "當編輯新郵件時自動執行(_A)"
 
-#: ../plugins/external-editor/external-editor.c:417
-#: ../plugins/external-editor/external-editor.c:419
+#: ../plugins/external-editor/external-editor.c:467
+#: ../plugins/external-editor/external-editor.c:469
 msgid "Compose in External Editor"
 msgstr "在外部編輯器中撰寫"
 
@@ -19344,14 +21502,6 @@ msgstr "不是圖片檔"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "您選取的檔案似乎不是有效的 .png 圖片。錯誤:{0}"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "行內圖片"
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "直接在郵件中顯示圖片。"
-
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
 msgstr "取得清單檔案庫(_A)"
@@ -19630,59 +21780,59 @@ msgstr "從伺服器傳回無效的物件"
 msgid "An error occurred during processing: %s"
 msgstr "在處理期間發生錯誤:%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:854
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "無法開啟行事曆。%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:856
+#: ../plugins/mail-to-task/mail-to-task.c:858
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 msgstr "選取的行事曆是唯讀的,因此不能在這裡建立事件。請選擇其他的行事曆。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:859
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
 msgstr "選取的工件清單是唯讀的,因此不能在這裡建立工作。請選擇其他的工件清單。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
 msgstr ""
 "選取的備忘錄清單是唯讀的,因此不能在這裡建立備忘錄。請選擇其他的備忘錄清單。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1266
 msgid "Create an _Appointment"
 msgstr "建立一個約會(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a new event from the selected message"
 msgstr "以選取的郵件建立新的事件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1273
 msgid "Create a Mem_o"
 msgstr "建立備忘錄(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a new memo from the selected message"
 msgstr "以選取的郵件建立新的備忘錄"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a _Task"
 msgstr "建立工作(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new task from the selected message"
 msgstr "以選取的郵件建立新的工作"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1290
 msgid "Create a _Meeting"
 msgstr "建立會議(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1292
 msgid "Create a new meeting from the selected message"
 msgstr "以選取的郵件建立新的會議"
 
@@ -19777,11 +21927,11 @@ 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.
-#: ../plugins/publish-calendar/publish-calendar.c:1142
+#: ../plugins/publish-calendar/publish-calendar.c:1144
 msgid "Could not create publish thread."
 msgstr "無法建立發布執行緒。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1152
+#: ../plugins/publish-calendar/publish-calendar.c:1154
 msgid "_Publish Calendar Information"
 msgstr "發布行事曆資訊(_P)"
 
@@ -19862,6 +22012,7 @@ msgid "_Username:"
 msgstr "使用者名稱(_U):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:772
 msgid "_Password:"
 msgstr "密碼(_P):"
 
@@ -19873,8 +22024,8 @@ msgstr "記住密碼(_R)"
 msgid "Publishing Location"
 msgstr "發布位置"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:99
-#: ../plugins/publish-calendar/publish-format-ical.c:102
+#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "無效的來源 UID「%s」"
@@ -19991,16 +22142,15 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "格式(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "選取目的檔案"
 
-#: ../plugins/save-calendar/save-calendar.c:190
-#| msgid "_Save"
+#: ../plugins/save-calendar/save-calendar.c:188
 msgid "_Save As"
 msgstr "儲存為(_A)"
 
@@ -20025,31 +22175,31 @@ msgstr ""
 "基於草稿的範本外掛程式。您可以使用的變數有 $ORIG[subject], $ORIG[from], "
 "$ORIG[to] 或 $ORIG[body],它們會以您所回覆的郵件中的數值取代。"
 
-#: ../plugins/templates/templates.c:1146
+#: ../plugins/templates/templates.c:1199
 msgid "No Title"
 msgstr "沒有標題"
 
-#: ../plugins/templates/templates.c:1255
+#: ../plugins/templates/templates.c:1308
 msgid "Save as _Template"
 msgstr "儲存為範本(_T)"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1310
 msgid "Save as Template"
 msgstr "儲存為範本"
 
-#: ../shell/e-shell.c:302
+#: ../shell/e-shell.c:320
 msgid "Preparing to go offline..."
 msgstr "準備進入離線…"
 
-#: ../shell/e-shell.c:355
+#: ../shell/e-shell.c:373
 msgid "Preparing to go online..."
 msgstr "準備進入上線…"
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:480
 msgid "Preparing to quit"
 msgstr "準備結束"
 
-#: ../shell/e-shell.c:442
+#: ../shell/e-shell.c:486
 msgid "Preparing to quit..."
 msgstr "準備結束…"
 
@@ -20065,19 +22215,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".
-#: ../shell/e-shell-searchbar.c:938
+#: ../shell/e-shell-searchbar.c:930
 msgid "Sho_w:"
 msgstr "顯示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:963
+#: ../shell/e-shell-searchbar.c:955
 msgid "Sear_ch:"
 msgstr "搜尋(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1031
+#: ../shell/e-shell-searchbar.c:1023
 msgid "i_n"
 msgstr "於(_N)"
 
@@ -20089,14 +22239,14 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "所有檔案 (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr "儲存使用者介面狀態"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:73
+#: ../shell/e-shell-window-actions.c:72
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見,請送一封電子郵件給\n"
@@ -20107,275 +22257,274 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../shell/e-shell-window-actions.c:84
+#: ../shell/e-shell-window-actions.c:83
 msgid "Evolution Website"
 msgstr "Evolution 網站"
 
-#: ../shell/e-shell-window-actions.c:340
+#: ../shell/e-shell-window-actions.c:339
 msgid "Categories Editor"
 msgstr "分類編輯器"
 
-#: ../shell/e-shell-window-actions.c:671
+#: ../shell/e-shell-window-actions.c:715
 msgid "Bug Buddy is not installed."
 msgstr "尚未安裝 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:672
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy could not be run."
 msgstr "無法執行 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:850
+#: ../shell/e-shell-window-actions.c:894
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../shell/e-shell-window-actions.c:852
+#: ../shell/e-shell-window-actions.c:896
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
-#: ../shell/e-shell-window-actions.c:857 ../shell/e-shell-window-actions.c:871
+#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
 
-#: ../shell/e-shell-window-actions.c:878
+#: ../shell/e-shell-window-actions.c:922
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../shell/e-shell-window-actions.c:880
+#: ../shell/e-shell-window-actions.c:924
 msgid "Open the Evolution User Guide"
 msgstr "開啟 Evolution 使用者指南"
 
-#: ../shell/e-shell-window-actions.c:906
+#: ../shell/e-shell-window-actions.c:950
 msgid "I_mport..."
 msgstr "匯入(_M)…"
 
-#: ../shell/e-shell-window-actions.c:908
+#: ../shell/e-shell-window-actions.c:952
 msgid "Import data from other programs"
 msgstr "匯入其他程式的資料"
 
-#: ../shell/e-shell-window-actions.c:913
+#: ../shell/e-shell-window-actions.c:957
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-#: ../shell/e-shell-window-actions.c:915
+#: ../shell/e-shell-window-actions.c:959
 msgid "Create a new window displaying this view"
 msgstr "建立一個新的視窗來顯示這個檢視"
 
-#: ../shell/e-shell-window-actions.c:927
+#: ../shell/e-shell-window-actions.c:971
 msgid "Available Cate_gories"
 msgstr "可用的分類(_G)"
 
-#: ../shell/e-shell-window-actions.c:929
+#: ../shell/e-shell-window-actions.c:973
 msgid "Manage available categories"
 msgstr "管理可用的分類"
 
-#: ../shell/e-shell-window-actions.c:941
+#: ../shell/e-shell-window-actions.c:985
 msgid "_Quick Reference"
 msgstr "快捷鍵參照表(_Q)"
 
-#: ../shell/e-shell-window-actions.c:943
+#: ../shell/e-shell-window-actions.c:987
 msgid "Show Evolution's shortcut keys"
 msgstr "顯示 Evolution 的捷徑鍵"
 
-#: ../shell/e-shell-window-actions.c:948
-#| msgid "Quit"
+#: ../shell/e-shell-window-actions.c:992
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ../shell/e-shell-window-actions.c:950
+#: ../shell/e-shell-window-actions.c:994
 msgid "Exit the program"
 msgstr "離開這個程式"
 
-#: ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell-window-actions.c:999
 msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)…"
 
-#: ../shell/e-shell-window-actions.c:957
+#: ../shell/e-shell-window-actions.c:1001
 msgid "Construct a more advanced search"
 msgstr "建構更進階的搜尋"
 
-#: ../shell/e-shell-window-actions.c:964
+#: ../shell/e-shell-window-actions.c:1008
 msgid "Clear the current search parameters"
 msgstr "清除目前的搜尋參數"
 
-#: ../shell/e-shell-window-actions.c:969
+#: ../shell/e-shell-window-actions.c:1013
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的搜尋結果(_E)…"
 
-#: ../shell/e-shell-window-actions.c:971
+#: ../shell/e-shell-window-actions.c:1015
 msgid "Manage your saved searches"
 msgstr "管理您已儲存的搜尋"
 
-#: ../shell/e-shell-window-actions.c:978
+#: ../shell/e-shell-window-actions.c:1022
 msgid "Click here to change the search type"
 msgstr "按這裡以改變搜尋類型"
 
-#: ../shell/e-shell-window-actions.c:983
+#: ../shell/e-shell-window-actions.c:1027
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
-#: ../shell/e-shell-window-actions.c:985
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Execute the current search parameters"
 msgstr "執行目前的搜尋參數"
 
-#: ../shell/e-shell-window-actions.c:990
+#: ../shell/e-shell-window-actions.c:1034
 msgid "_Save Search..."
 msgstr "儲存搜尋結果(_S)…"
 
-#: ../shell/e-shell-window-actions.c:992
+#: ../shell/e-shell-window-actions.c:1036
 msgid "Save the current search parameters"
 msgstr "儲存目前的搜尋參數"
 
-#: ../shell/e-shell-window-actions.c:1004
+#: ../shell/e-shell-window-actions.c:1048
 msgid "Submit _Bug Report..."
 msgstr "傳送錯誤報告(_B)…"
 
-#: ../shell/e-shell-window-actions.c:1006
+#: ../shell/e-shell-window-actions.c:1050
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
-#: ../shell/e-shell-window-actions.c:1011
+#: ../shell/e-shell-window-actions.c:1055
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1013
+#: ../shell/e-shell-window-actions.c:1057
 msgid "Put Evolution into offline mode"
 msgstr "讓 Evolution 進入離線模式"
 
-#: ../shell/e-shell-window-actions.c:1018
+#: ../shell/e-shell-window-actions.c:1062
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1020
+#: ../shell/e-shell-window-actions.c:1064
 msgid "Put Evolution into online mode"
 msgstr "讓 Evolution 進入上線模式"
 
-#: ../shell/e-shell-window-actions.c:1048
+#: ../shell/e-shell-window-actions.c:1092
 msgid "Lay_out"
 msgstr "佈局(_O)"
 
-#: ../shell/e-shell-window-actions.c:1062
+#: ../shell/e-shell-window-actions.c:1106
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../shell/e-shell-window-actions.c:1069
+#: ../shell/e-shell-window-actions.c:1113
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
 
-#: ../shell/e-shell-window-actions.c:1083
+#: ../shell/e-shell-window-actions.c:1127
 msgid "_Window"
 msgstr "視窗(_O)"
 
-#: ../shell/e-shell-window-actions.c:1112
+#: ../shell/e-shell-window-actions.c:1156
 msgid "Show Side _Bar"
 msgstr "顯示側邊欄(_B)"
 
-#: ../shell/e-shell-window-actions.c:1114
+#: ../shell/e-shell-window-actions.c:1158
 msgid "Show the side bar"
 msgstr "顯示側邊列"
 
-#: ../shell/e-shell-window-actions.c:1120
+#: ../shell/e-shell-window-actions.c:1164
 msgid "Show _Buttons"
 msgstr "顯示按鈕(_B)"
 
-#: ../shell/e-shell-window-actions.c:1122
+#: ../shell/e-shell-window-actions.c:1166
 msgid "Show the switcher buttons"
 msgstr "顯示切換程式按鈕"
 
-#: ../shell/e-shell-window-actions.c:1128
+#: ../shell/e-shell-window-actions.c:1172
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: ../shell/e-shell-window-actions.c:1130
+#: ../shell/e-shell-window-actions.c:1174
 msgid "Show the status bar"
 msgstr "顯示狀態列"
 
-#: ../shell/e-shell-window-actions.c:1136
+#: ../shell/e-shell-window-actions.c:1180
 msgid "Show _Tool Bar"
 msgstr "顯示工具列(_T)"
 
-#: ../shell/e-shell-window-actions.c:1138
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Show the tool bar"
 msgstr "顯示工具列"
 
-#: ../shell/e-shell-window-actions.c:1160
+#: ../shell/e-shell-window-actions.c:1204
 msgid "_Icons Only"
 msgstr "只有圖示(_I)"
 
-#: ../shell/e-shell-window-actions.c:1162
+#: ../shell/e-shell-window-actions.c:1206
 msgid "Display window buttons with icons only"
 msgstr "只顯示視窗按鈕的圖示"
 
-#: ../shell/e-shell-window-actions.c:1167
+#: ../shell/e-shell-window-actions.c:1211
 msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../shell/e-shell-window-actions.c:1169
+#: ../shell/e-shell-window-actions.c:1213
 msgid "Display window buttons with text only"
 msgstr "只顯示視窗按鈕的文字"
 
-#: ../shell/e-shell-window-actions.c:1174
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Icons _and Text"
 msgstr "圖示及文字(_A)"
 
-#: ../shell/e-shell-window-actions.c:1176
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Display window buttons with icons and text"
 msgstr "顯示視窗按鈕的圖示及文字"
 
-#: ../shell/e-shell-window-actions.c:1181
+#: ../shell/e-shell-window-actions.c:1225
 msgid "Tool_bar Style"
 msgstr "工具列風格(_B)"
 
-#: ../shell/e-shell-window-actions.c:1183
+#: ../shell/e-shell-window-actions.c:1227
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使用桌面工具列設定值顯示視窗按鈕"
 
-#: ../shell/e-shell-window-actions.c:1191
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Delete Current View"
 msgstr "刪除目前的檢視"
 
-#: ../shell/e-shell-window-actions.c:1198
+#: ../shell/e-shell-window-actions.c:1242
 msgid "Save Custom View..."
 msgstr "儲存自訂檢視…"
 
-#: ../shell/e-shell-window-actions.c:1200
+#: ../shell/e-shell-window-actions.c:1244
 msgid "Save current custom view"
 msgstr "儲存目前的自訂檢視"
 
-#: ../shell/e-shell-window-actions.c:1207
+#: ../shell/e-shell-window-actions.c:1251
 msgid "C_urrent View"
 msgstr "目前檢視(_U)"
 
-#: ../shell/e-shell-window-actions.c:1217
+#: ../shell/e-shell-window-actions.c:1261
 msgid "Custom View"
 msgstr "自訂檢視"
 
-#: ../shell/e-shell-window-actions.c:1219
+#: ../shell/e-shell-window-actions.c:1263
 msgid "Current view is a customized view"
 msgstr "目前的檢視方式是自訂的檢視"
 
-#: ../shell/e-shell-window-actions.c:1227
+#: ../shell/e-shell-window-actions.c:1271
 msgid "Page Set_up..."
 msgstr "頁面設定(_U)…"
 
-#: ../shell/e-shell-window-actions.c:1229
+#: ../shell/e-shell-window-actions.c:1273
 msgid "Change the page settings for your current printer"
 msgstr "修改目前印表機的頁面列印設定"
 
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1634
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1757
 #, c-format
 msgid "Select view: %s"
 msgstr "選擇檢視:%s"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1774
 #, c-format
 msgid "Delete view: %s"
 msgstr "刪除檢視:%s"
 
-#: ../shell/e-shell-window-actions.c:1824
+#: ../shell/e-shell-window-actions.c:1868
 msgid "Execute these search parameters"
 msgstr "執行這些搜尋參數"
 
@@ -20390,7 +22539,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20425,7 +22574,7 @@ msgstr ""
 "我們希望您享受工作成果,而且我們\n"
 "熱切希望您提供意見!\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20433,13 +22582,13 @@ msgstr ""
 "謝謝\n"
 "Evolution 小組敬上\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:213
 msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:301
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20447,50 +22596,50 @@ msgstr ""
 "啟動 Evolution 時以指定的元件顯示。可用的選項有「mail」、「calendar」、"
 "「contacts」、「tasks」和「memos」"
 
-#: ../shell/main.c:305
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "將指定的尺寸套用到主視窗"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "忽略網際網路是否可用"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:315
 msgid "Forcibly shut down Evolution"
 msgstr "強制關閉 Evoultion"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../shell/main.c:319
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "停用郵件、連絡人和工作的預覽窗格。"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:324
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "將指定的 URI 或檔案名稱匯入為接下來的引數。"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "要求執行中的 Evolution 程序結束"
 
-#: ../shell/main.c:402
+#: ../shell/main.c:403
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 msgstr "不能啟動 Evolution。可能有另一個 Evolution 實體沒有回應。系統錯誤:%s"
 
-#: ../shell/main.c:496 ../shell/main.c:501
+#: ../shell/main.c:454 ../shell/main.c:459
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
-#: ../shell/main.c:568
+#: ../shell/main.c:517
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20499,7 +22648,7 @@ msgstr ""
 "%s: --online 和 --offline 不能一起使用。\n"
 "  使用 '%s --help' 取得進一步資訊。\n"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:523
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20544,7 +22693,28 @@ msgstr ""
 "Evolution 不再支援從 {0} 版直接升級。然而變通的方法是您可以試著先升級到 "
 "Evolution 2,接著再升級到 Evolution 3。"
 
-#: ../smime/gui/ca-trust-dialog.c:108
+#: ../shell/shell.error.xml.h:11
+msgid "Close Evolution with pending background operations?"
+msgstr "關閉尚有背景操作進行中的 Evolution?"
+
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
+msgstr ""
+"Evolution 花費很多時間關閉,可能是因為網路連線的問題。您想要取消所有未完成的"
+"操作並立即關閉,或是繼續等待?"
+
+#: ../shell/shell.error.xml.h:13
+msgid "_Close Immediately"
+msgstr "立刻關閉(_C)"
+
+#: ../shell/shell.error.xml.h:14
+msgid "Keep _Waiting"
+msgstr "繼續等待(_W)"
+
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20555,101 +22725,276 @@ msgstr ""
 "\n"
 "編輯信任設定值:"
 
-#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "憑證名稱"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "發給組織"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "發給組織單位"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "序號"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "發照者"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "發照組織"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "發照組織單位"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "發行者"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "到期"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "MD5 指紋"
 
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "電子郵件位址"
 
-#: ../smime/gui/certificate-manager.c:621
-msgid "Select a certificate to import..."
-msgstr "選取要匯入的憑證…"
+#: ../smime/gui/certificate-manager.c:650
+msgid "Select a file to backup your key and certificate..."
+msgstr "選擇用來備份您的金鑰與憑證的檔案…"
 
-#: ../smime/gui/certificate-manager.c:635
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:662
+#, c-format
+msgid "%s-backup.p12"
+msgstr "%s-backup.p12"
+
+#: ../smime/gui/certificate-manager.c:676
+#: ../smime/gui/certificate-manager.c:965
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../smime/gui/certificate-manager.c:671
+#: ../smime/gui/certificate-manager.c:728
+msgid "Backup Certificate"
+msgstr "備份憑證"
+
+#. filename selection
+#: ../smime/gui/certificate-manager.c:742
+msgid "_File name:"
+msgstr "檔案名稱(_F):"
+
+#. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
+#: ../smime/gui/certificate-manager.c:747
+msgid "Please select a file..."
+msgstr "請選擇檔案…"
+
+#: ../smime/gui/certificate-manager.c:761
+msgid "_Include certificate chain in the backup"
+msgstr "備份中包含憑證鏈(_I)"
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:767
+msgid ""
+"The certificate backup password you set here protects the backup file that "
+"you are about to create.\n"
+"You must set this password to proceed with the backup."
+msgstr ""
+"您在這裡設定的憑證備份密碼可以保護即將建立的備份檔案。\n"
+"您必須設定這個密碼才能繼續備份。"
+
+#: ../smime/gui/certificate-manager.c:786
+msgid "_Repeat Password:"
+msgstr "重複密碼(_R):"
+
+#: ../smime/gui/certificate-manager.c:805
+msgid "Passwords do not match"
+msgstr "密碼不相符"
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:813
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
+msgstr ""
+"重要:\n"
+"如果您忘記您的憑證備份密碼,您將無法在稍後還原這個備份。\n"
+"請將它保存在安全的地方。"
+
+#: ../smime/gui/certificate-manager.c:858
+msgid "No file name provided"
+msgstr "沒有提供檔案名稱"
+
+#: ../smime/gui/certificate-manager.c:862
+msgid "Failed to backup key and certificate"
+msgstr "無法備份您的金鑰與憑證"
+
+#: ../smime/gui/certificate-manager.c:951
+msgid "Select a certificate to import..."
+msgstr "選取要匯入的憑證…"
+
+#: ../smime/gui/certificate-manager.c:1001
 msgid "Failed to import certificate"
 msgstr "無法匯入憑證"
 
-#: ../smime/gui/certificate-manager.c:1053
+#: ../smime/gui/certificate-manager.c:1117
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr "使用時詢問"
+
+#: ../smime/gui/certificate-manager.c:1119
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "永不"
+
+#: ../smime/gui/certificate-manager.c:1121
+msgctxt "CamelTrust"
+msgid "Marginal"
+msgstr "勉強"
+
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr "完全"
+
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Ultimate"
+msgstr "徹底"
+
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Temporary"
+msgstr "暫時"
+
+#: ../smime/gui/certificate-manager.c:1333
+msgid "Change certificate trust"
+msgstr "改變憑證信任度"
+
+#: ../smime/gui/certificate-manager.c:1345
+#, c-format
+msgid "Change trust for the host '%s':"
+msgstr "改變主機「%s」的憑證信任度:"
+
+#: ../smime/gui/certificate-manager.c:1369
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr "使用時詢問(_A)"
+
+#: ../smime/gui/certificate-manager.c:1370
+msgctxt "CamelTrust"
+msgid "_Temporary (this session only)"
+msgstr "暫時(只在此作業階段) (_T)"
+
+#: ../smime/gui/certificate-manager.c:1371
+msgctxt "CamelTrust"
+msgid "_Never"
+msgstr "永不(_N)"
+
+#: ../smime/gui/certificate-manager.c:1372
+msgctxt "CamelTrust"
+msgid "_Marginal"
+msgstr "勉強(_M)"
+
+#: ../smime/gui/certificate-manager.c:1373
+msgctxt "CamelTrust"
+msgid "_Fully"
+msgstr "完全(_F)"
+
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+msgid "_Ultimate"
+msgstr "徹底(_U)"
+
+#: ../smime/gui/certificate-manager.c:1378
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+msgstr "信任此網站之前,如果可以的話,您應該先檢查它的憑證以及它的政策和程序。"
+
+#: ../smime/gui/certificate-manager.c:1393
+msgid "_Display certificate"
+msgstr "顯示憑證(_D)"
+
+#: ../smime/gui/certificate-manager.c:1598
+msgid "You have certificates on file that identify these mail servers:"
+msgstr "您已經擁有相關憑證檔案的,可以識別這些郵件伺服器:"
+
+#: ../smime/gui/certificate-manager.c:1629
+msgid "Host name"
+msgstr "主機名稱"
+
+#: ../smime/gui/certificate-manager.c:1631
+msgid "Issuer"
+msgstr "簽發者"
+
+#: ../smime/gui/certificate-manager.c:1632
+msgid "Fingerprint"
+msgstr "指紋"
+
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Trust"
+msgstr "信任"
+
+#: ../smime/gui/certificate-manager.c:1654
+msgid "_Edit Trust"
+msgstr "編輯信任度(_E)"
+
+#: ../smime/gui/certificate-manager.c:1973
 msgid "All PKCS12 files"
 msgstr "所有的 PKCS12 檔案"
 
-#: ../smime/gui/certificate-manager.c:1070
+#: ../smime/gui/certificate-manager.c:1990
 msgid "All email certificate files"
 msgstr "所有的電子郵件憑證檔案"
 
-#: ../smime/gui/certificate-manager.c:1087
+#: ../smime/gui/certificate-manager.c:2007
 msgid "All CA certificate files"
 msgstr "所有的 CA 憑證檔案"
 
@@ -20690,26 +23035,7 @@ msgstr "輸入憑證資料庫的新密碼"
 msgid "Enter new password"
 msgstr "輸入新密碼"
 
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
-#, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"發給:\n"
-"  主旨:%s\n"
-
-#: ../smime/gui/e-cert-selector.c:122
-#, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"發照者:\n"
-"  主旨:%s\n"
-
-#: ../smime/gui/e-cert-selector.c:175
+#: ../smime/gui/e-cert-selector.c:180
 msgid "Select certificate"
 msgstr "選取憑證"
 
@@ -20780,22 +23106,18 @@ msgid "Certificate"
 msgstr "憑證"
 
 #: ../smime/gui/smime-ui.ui.h:26
-msgid "Certificate details"
-msgstr "憑證詳細資訊"
-
-#: ../smime/gui/smime-ui.ui.h:27
 msgid "Email Certificate Trust Settings"
 msgstr "電子郵件憑證信任設定值"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Trust the authenticity of this certificate"
 msgstr "信任此憑證的有效性"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Do not trust the authenticity of this certificate"
 msgstr "不信任此憑證的有效性"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "_Edit CA Trust"
 msgstr "編輯憑證管理中心 (CA) 信任度(_E)"
 
@@ -20812,19 +23134,44 @@ msgstr "簽署"
 msgid "Encrypt"
 msgstr "加密"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
 msgstr "憑證已經存在"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
 msgstr "PKCS12 檔案密碼"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
 msgid "Enter password for PKCS12 file:"
 msgstr "輸入 PKCS12 檔案的密碼:"
 
-#: ../smime/lib/e-pkcs12.c:307
+#: ../smime/lib/e-pkcs12.c:329
+#, c-format
+msgid "Unable to create export context, err_code: %i"
+msgstr "無法建立匯出脈絡,錯誤代碼為:%i"
+
+#: ../smime/lib/e-pkcs12.c:336
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr "無法設定密碼完整性,err_code: %i"
+
+#: ../smime/lib/e-pkcs12.c:346
+#, c-format
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "無法建立安全袋,錯誤代碼為:%i"
+
+#: ../smime/lib/e-pkcs12.c:364
+#, c-format
+msgid "Unable to add key/cert to the store, err_code: %i"
+msgstr "無法將金鑰/憑證加入儲存區,錯誤代碼為:%i"
+
+#: ../smime/lib/e-pkcs12.c:382
+#, c-format
+msgid "Unable to write store to disk, err_code: %i"
+msgstr "無法將儲存區寫入至磁碟,錯誤代碼為:%i"
+
+#: ../smime/lib/e-pkcs12.c:409
 msgid "Imported Certificate"
 msgstr "輸入的憑證"
 
@@ -20899,21 +23246,3 @@ msgstr "到期日(_D):"
 #: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "設定狀態(_S)"
-
-#~ msgid "Add"
-#~ msgstr "加入"
-
-#~ msgid "Edit"
-#~ msgstr "編輯"
-
-#~ msgid " Account "
-#~ msgstr "帳號"
-
-#~ msgid "Copy..."
-#~ msgstr "複製…"
-
-#~ msgid "Original Contact:"
-#~ msgstr "原本的連絡人:"
-
-#~ msgid "Pinging %s"
-#~ msgstr "Pinging %s"


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