[evolution/wip/webkit2] Updated Chinese (Taiwan) translation



commit d242af43bb51f6f994e7954ab447279cc3f52c25
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Feb 9 10:44:40 2016 +0000

    Updated Chinese (Taiwan) translation

 po/zh_TW.po | 7890 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 4285 insertions(+), 3605 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 51d38eb..07637bd 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,16 +11,16 @@ 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: 2015-09-19 04:35+0000\n"
-"PO-Revision-Date: 2015-09-19 23:01+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"POT-Creation-Date: 2016-02-09 18:35+0800\n"
+"PO-Revision-Date: 2016-02-09 18:43+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.6\n"
 "X-Project-Style: gnome\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
@@ -83,8 +83,8 @@ msgstr "刪除通訊錄「{0}」?"
 msgid "This address book will be removed permanently."
 msgstr "此通訊錄將被永遠移除。"
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:69
+#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
+#: ../mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "不要刪除(_N)"
 
@@ -99,7 +99,7 @@ msgid ""
 msgstr "這樣會從伺服器永遠刪除通訊錄 &quot;{0}&quot;。您確定要繼續嗎?"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "_Delete From Server"
 msgstr "從伺服器刪除(_D)"
 
@@ -183,15 +183,12 @@ msgstr "此連絡人的電子郵件地址已經存在。您無論如何都要加
 #: ../addressbook/addressbook.error.xml.h:34
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 #: ../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
+#: ../calendar/gui/e-comp-editor-page-general.c:1357
 #: ../e-util/e-mail-signature-manager.c:327
 #: ../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:57 ../modules/mail/em-composer-prefs.c:417
+#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:417
 #: ../plugins/attachment-reminder/attachment-reminder.c:438
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -201,13 +198,13 @@ msgstr "加入(_A)"
 
 #: ../addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
-msgstr "有些位址已在這個連絡人清單中。"
+msgstr "有些位址已在這個連絡人列表中。"
 
 #: ../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 "您嘗試加入的位址已經是這個清單的一部分。要強制加入它們嗎?"
+msgstr "您嘗試加入的位址已經是這個列表的一部分。要強制加入它們嗎?"
 
 #: ../addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
@@ -219,16 +216,16 @@ msgstr "加入重複項目"
 
 #: ../addressbook/addressbook.error.xml.h:39
 msgid "List '{0}' is already in this contact list."
-msgstr "清單「{0}」已經在這個連絡人清單中。"
+msgstr "列表「{0}」已經在這個連絡人列表中。"
 
 #: ../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}」為名的連絡人清單已經存在這個連絡人清單中。要強制加入它嗎?"
+msgstr "以「{0}」為名的連絡人列表已經存在這個連絡人列表中。要強制加入它嗎?"
 
 #: ../addressbook/addressbook.error.xml.h:41
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1252
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 msgid "Failed to delete contact"
 msgstr "刪除連絡人失敗"
 
@@ -287,9 +284,6 @@ msgid "_Where:"
 msgstr "通訊錄(_W):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-#: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "分類(_T)…"
 
@@ -321,7 +315,7 @@ msgid "Instant Messaging"
 msgstr "即時通訊"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:971
+#: ../addressbook/importers/evolution-vcard-importer.c:979
 msgid "Contact"
 msgstr "連絡人"
 
@@ -330,8 +324,7 @@ msgid "_Home Page:"
 msgstr "首頁(_H):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../calendar/gui/e-comp-editor-event.c:621
 #: ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
@@ -349,7 +342,7 @@ msgid "Home Page:"
 msgstr "首頁:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:92
+#: ../modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "行事曆:"
 
@@ -422,14 +415,14 @@ msgstr "週年紀念日(_A):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../calendar/gui/e-calendar-view.c:2049
+#: ../calendar/gui/e-calendar-view.c:2037
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../calendar/gui/e-calendar-view.c:2048
+#: ../calendar/gui/e-calendar-view.c:2036
 msgid "Birthday"
 msgstr "生日"
 
@@ -485,7 +478,7 @@ msgstr "工作"
 #: ../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:3791
+#: ../calendar/gui/e-cal-model.c:3807
 msgid "Other"
 msgstr "其他"
 
@@ -494,6 +487,8 @@ msgid "Mailing Address"
 msgstr "郵寄地址"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
 msgid "Notes"
 msgstr "備註"
 
@@ -507,14 +502,13 @@ msgstr "加入 _X.509"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#: ../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/e-attachment-view.c:475
-#: ../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:58
+#: ../calendar/gui/e-comp-editor-page-general.c:1373
+#: ../e-util/e-attachment-view.c:475 ../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.error.xml.h:18
+#: ../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:59
 #: ../plugins/attachment-reminder/attachment-reminder.c:448
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:791
@@ -535,11 +529,10 @@ msgstr "載入 X.509 (_L)"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47
-#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2103
 #: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
-#: ../e-util/e-attachment-store.c:636
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3230
+#: ../e-util/e-attachment-store.c:641
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3318
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
 #: ../smime/gui/certificate-manager.c:655
@@ -553,16 +546,16 @@ msgid "Certificates"
 msgstr "憑證"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/dialogs/comp-editor.c:1277
-#: ../calendar/gui/dialogs/comp-editor.c:1363
-#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
+#: ../calendar/gui/e-comp-editor.c:2000 ../calendar/gui/e-comp-editor.c:2072
+#: ../e-util/e-preferences-window.c:382 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell.c:1215 ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell.c:1223 ../shell/e-shell-window-actions.c:955
 msgid "_Help"
 msgstr "求助(_H)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1997
+#: ../mail/mail-config.ui.h:37
 msgid "Options"
 msgstr "選項"
 
@@ -579,15 +572,12 @@ msgstr "選項"
 #: ../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:1332
-#: ../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:2326
-#: ../composer/e-composer-actions.c:214 ../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:421
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1365
+#: ../calendar/gui/e-cal-dialogs.c:689
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:359
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:496
+#: ../e-util/e-attachment-store.c:640 ../e-util/e-attachment-view.c:421
 #: ../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
@@ -595,11 +585,11 @@ msgstr "選項"
 #: ../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-rule-editor.c:282 ../e-util/e-rule-editor.c:791
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:372 ../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:3229
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3317
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../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
@@ -667,24 +657,22 @@ msgid "Show Certificates"
 msgstr "顯示憑證"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/dialogs/comp-editor.c:1326
-#: ../e-util/e-html-editor-actions.c:1111
+#: ../calendar/gui/e-comp-editor.c:2035 ../e-util/e-html-editor-actions.c:1111
 msgid "_Undo"
 msgstr "復原(_U)"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/dialogs/comp-editor.c:1328 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2037 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "復原"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/dialogs/comp-editor.c:1333
-#: ../e-util/e-html-editor-actions.c:1097
+#: ../calendar/gui/e-comp-editor.c:2042 ../e-util/e-html-editor-actions.c:1097
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1335 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2044 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "取消復原"
 
@@ -731,7 +719,7 @@ msgstr "開啟 X.509 憑證"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
-#: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
+#: ../e-util/e-attachment-store.c:494 ../e-util/e-category-editor.c:146
 #: ../e-util/e-html-editor-actions.c:594 ../e-util/e-html-editor-actions.c:689
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
 #: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
@@ -816,16 +804,13 @@ msgstr "無效的連絡人。"
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-#: ../calendar/gui/dialogs/recurrence-page.c:2327
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
 #: ../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:436 ../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-rule-editor.c:283 ../e-util/e-rule-editor.c:792
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
 #: ../e-util/e-source-selector-dialog.c:373 ../e-util/e-table-config.c:549
 #: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
@@ -836,7 +821,7 @@ msgstr "無效的連絡人。"
 #: ../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:184 ../smime/gui/certificate-manager.c:1338
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1338
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "OK"
@@ -934,7 +919,7 @@ msgstr "(_Suffix):"
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
-msgstr "連絡人清單編輯器"
+msgstr "連絡人列表編輯器"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
 msgid "_List name:"
@@ -946,19 +931,19 @@ msgstr "成員"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "輸入電子郵件地址或拖曳連絡人到以下清單(_T):"
+msgstr "輸入電子郵件地址或拖曳連絡人到以下列表(_T):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Hide addresses when sending mail to this list"
-msgstr "當傳送電子郵件至此清單時隱藏其位址(_H)"
+msgstr "當傳送電子郵件至此列表時隱藏其位址(_H)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "Add an email to the List"
-msgstr "將電子郵件加入清單"
+msgstr "將電子郵件加入列表"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 msgid "Remove an email address from the List"
-msgstr "將電子郵件位址從清單移除"
+msgstr "將電子郵件位址從列表移除"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
@@ -974,12 +959,12 @@ msgid "_Top"
 msgstr "頂端(_T)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
-#: ../e-util/filter.ui.h:20
+#: ../e-util/e-source-selector.c:3471 ../e-util/filter.ui.h:20
 msgid "_Up"
 msgstr "上(_U)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../e-util/filter.ui.h:21
+#: ../e-util/e-source-selector.c:3472 ../e-util/filter.ui.h:21
 msgid "_Down"
 msgstr "下(_D)"
 
@@ -990,7 +975,7 @@ msgstr "底部(_B)"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
 msgid "Contact List Members"
-msgstr "連絡人清單成員"
+msgstr "連絡人列表成員"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
@@ -998,33 +983,33 @@ msgstr "成員(_M)"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
-msgstr "新增清單時發生錯誤"
+msgstr "新增列表時發生錯誤"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
-msgstr "編輯清單時發生錯誤"
+msgstr "編輯列表時發生錯誤"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
-msgstr "移除清單時發生錯誤"
+msgstr "移除列表時發生錯誤"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Name contains"
 msgstr "名稱包含"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1188
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 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:1181
-#: ../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
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:985
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
@@ -1039,22 +1024,22 @@ msgid "Copy _Email Address"
 msgstr "複製電子郵件位址(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:338
+#: ../e-util/e-web-view.c:340
 msgid "Copy the email address to the clipboard"
 msgstr "複製電子郵件位址到剪貼簿"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:350
+#: ../e-util/e-web-view.c:352
 msgid "_Send New Message To..."
 msgstr "傳送新郵件至(_S)…"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:352
+#: ../e-util/e-web-view.c:354
 msgid "Send a mail message to this address"
 msgstr "傳送郵件到這個位址"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:1064
+#: ../e-util/e-web-view.c:1069
 #, c-format
 msgid "Click to mail %s"
 msgstr "按一下來傳送郵件 %s"
@@ -1069,7 +1054,7 @@ msgstr "SIP"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:681
 msgid "List Members:"
-msgstr "清單成員:"
+msgstr "列表成員:"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:753
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
@@ -1150,15 +1135,13 @@ 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:572
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
+#: ../modules/calendar/e-cal-shell-view.c:579
 #: ../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 "空閒/忙碌"
@@ -1207,7 +1190,7 @@ msgstr "備註"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
 msgid "List Members"
-msgstr "清單成員"
+msgstr "列表成員"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
 msgid "Job Title"
@@ -1360,7 +1343,7 @@ msgstr "選擇通訊錄"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:398
 msgid "list"
-msgstr "清單"
+msgstr "列表"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:587
 msgid "Move contact to"
@@ -1400,61 +1383,60 @@ msgstr "搜尋被中斷"
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:649
+#: ../addressbook/gui/widgets/e-addressbook-view.c:682
 msgid "Cut selected contacts to the clipboard"
 msgstr "剪下選取的連絡人至剪貼簿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../addressbook/gui/widgets/e-addressbook-view.c:688
 msgid "Copy selected contacts to the clipboard"
 msgstr "複製選取的連絡人至剪貼簿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:661
+#: ../addressbook/gui/widgets/e-addressbook-view.c:694
 msgid "Paste contacts from the clipboard"
 msgstr "從剪貼簿貼上連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:667
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../addressbook/gui/widgets/e-addressbook-view.c:700
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
 msgid "Delete selected contacts"
 msgstr "刪除選定的連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:673
+#: ../addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Select all visible contacts"
 msgstr "選擇全部可見的連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
 msgid "Are you sure you want to delete these contact lists?"
-msgstr "您確定要刪除這些連絡人清單?"
+msgstr "您確定要刪除這些連絡人列表?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1337
 msgid "Are you sure you want to delete this contact list?"
-msgstr "您確定要刪除這個連絡人清單?"
+msgstr "您確定要刪除這個連絡人列表?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1341
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr "您確定要刪除這個連絡人清單 (%s)?"
+msgstr "您確定要刪除這個連絡人列表 (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1347
 msgid "Are you sure you want to delete these contacts?"
 msgstr "您確定要刪除這些連絡人?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
 msgid "Are you sure you want to delete this contact?"
 msgstr "您確定要刪除這個連絡人?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1355
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "您確定要刪除這個連絡人 (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../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:1067
-#: ../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
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1366
+#: ../calendar/gui/e-comp-editor.c:1993 ../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:1089
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:832
 #: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:813
 #: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
@@ -1462,7 +1444,7 @@ msgid "_Delete"
 msgstr "刪除(_D)"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1480
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1474,11 +1456,11 @@ msgstr[0] ""
 "開啟 %d 個連絡人會同時開啟 %d 個新視窗。\n"
 "確定要顯示這裡所有的連絡人?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1521
 msgid "_Don't Display"
 msgstr "不要顯示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1489
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1522
 msgid "Display _All Contacts"
 msgstr "顯示所有的連絡人(_A)"
 
@@ -1589,7 +1571,7 @@ msgid "Title"
 msgstr "頭銜"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:684
+#: ../calendar/gui/e-meeting-list-view.c:659
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "角色"
@@ -1603,10 +1585,9 @@ msgid "Journal"
 msgstr "日誌"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-task-table.etspec.h:12 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "分類"
 
@@ -1616,7 +1597,7 @@ msgstr "開啟"
 
 #: ../addressbook/gui/widgets/ea-minicard.c:159
 msgid "Contact List: "
-msgstr "連絡人清單: "
+msgstr "連絡人列表: "
 
 #: ../addressbook/gui/widgets/ea-minicard.c:160
 msgid "Contact: "
@@ -1632,7 +1613,7 @@ msgstr "新增連絡人"
 
 #: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact List"
-msgstr "新增連絡人清單"
+msgstr "新增連絡人列表"
 
 #: ../addressbook/gui/widgets/ea-minicard-view.c:176
 #, c-format
@@ -1651,13 +1632,13 @@ msgstr "拉近(_I)"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2385
 msgid "Zoom _Out"
 msgstr "拉遠(_O)"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2090
+#: ../e-util/e-html-editor-actions.c:2106
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
@@ -1724,49 +1705,49 @@ msgstr ""
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:430
-#: ../calendar/importers/icalendar-importer.c:925
-#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:485
+#: ../calendar/importers/icalendar-importer.c:980
+#: ../calendar/importers/icalendar-importer.c:1019 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "匯入…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
+#: ../addressbook/importers/evolution-csv-importer.c:1089
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook 連絡人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook 連絡人 CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla 連絡人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla 連絡人 CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution 連絡人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution 連絡人 CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:814
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 資料交換格式 (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:815
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸入器"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:634
+#: ../addressbook/importers/evolution-vcard-importer.c:642
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf、.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:635
+#: ../addressbook/importers/evolution-vcard-importer.c:643
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard 匯入程式"
 
@@ -1948,11 +1929,7 @@ msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
-#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:131
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
@@ -1962,9 +1939,9 @@ msgid "Start time"
 msgstr "開始時刻"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1924
+#: ../calendar/alarm-notify/alarm-queue.c:1949
 msgid "Appointments"
-msgstr "約會"
+msgstr "會議"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
@@ -1975,15 +1952,12 @@ msgid "_Snooze"
 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:1349
-#: ../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/e-html-editor-actions.c:1120
+#: ../calendar/gui/e-comp-editor-page-general.c:1365
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2240
+#: ../calendar/gui/e-comp-editor.c:2058 ../e-util/e-html-editor-actions.c:1120
 #: ../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:171
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:62
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:173
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
 #: ../plugins/attachment-reminder/attachment-reminder.c:443
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
@@ -2001,8 +1975,8 @@ msgid "_Dismiss"
 msgstr "解除(_D)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1888
-#: ../calendar/alarm-notify/alarm-queue.c:1898
+#: ../calendar/alarm-notify/alarm-queue.c:1916
+#: ../calendar/alarm-notify/alarm-queue.c:1926
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
 #: ../modules/itip-formatter/itip-view.c:1514
 #: ../modules/itip-formatter/itip-view.c:1625
@@ -2011,7 +1985,7 @@ msgstr "位置:"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
-msgstr "約會的地點"
+msgstr "會議的地點"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:9
 msgid "Snooze _time:"
@@ -2020,30 +1994,25 @@ 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/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:326
+#: ../modules/calendar/e-cal-shell-view-actions.c:344
 #: ../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/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/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:1714
-#: ../calendar/alarm-notify/alarm-queue.c:1868
+#: ../calendar/alarm-notify/alarm-queue.c:1896
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
@@ -2057,8 +2026,8 @@ msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
 #: ../calendar/alarm-notify/alarm-queue.c:1738
-#: ../calendar/alarm-notify/alarm-queue.c:1859
-#: ../calendar/alarm-notify/alarm-queue.c:2214
+#: ../calendar/alarm-notify/alarm-queue.c:1887
+#: ../calendar/alarm-notify/alarm-queue.c:2240
 msgid "Evolution Reminders"
 msgstr "Evolution 提醒"
 
@@ -2068,21 +2037,21 @@ msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "您有 %d 個提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2032
+#: ../calendar/alarm-notify/alarm-queue.c:2058
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2033 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "否(_N)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2034
+#: ../calendar/alarm-notify/alarm-queue.c:2060
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2038
+#: ../calendar/alarm-notify/alarm-queue.c:2064
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2099,7 +2068,7 @@ msgstr ""
 "\n"
 "您確定要執行這個程式?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2053
+#: ../calendar/alarm-notify/alarm-queue.c:2079
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -2107,7 +2076,7 @@ msgstr "不要再詢問我關於這個程式。"
 msgid "invalid time"
 msgstr "失效時間"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d hours before start"
 #: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
@@ -2115,7 +2084,7 @@ msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d minutes before start"
 #: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
@@ -2124,7 +2093,7 @@ msgid_plural "%d minutes"
 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"
+#. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. 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:394
 #: ../calendar/gui/misc.c:113
@@ -2135,7 +2104,7 @@ msgstr[0] "%d 秒"
 
 #: ../calendar/calendar.error.xml.h:1
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "要傳送取消通知給所有的參與者?"
+msgstr "您是否要傳送取消通知給所有的參與者?"
 
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -2151,8 +2120,7 @@ msgstr "不要傳送(_N)"
 msgid "_Send Notice"
 msgstr "傳送通知(_S)"
 
-#: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/e-cal-dialogs.c:502
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "確定要刪除此會議?"
@@ -2168,8 +2136,7 @@ msgid ""
 "the task has been deleted."
 msgstr "如果未傳送取消通知,其他參與者可能不知道工作已經刪除。"
 
-#: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/e-cal-dialogs.c:505
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "確定要刪除此工作?"
@@ -2180,7 +2147,7 @@ msgstr "會刪除此工作的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:11
 msgid "Would you like to send a cancelation notice for this memo?"
-msgstr "是否要傳送此備忘錄的取消通知?"
+msgstr "您是否要傳送此備忘錄的取消通知?"
 
 #: ../calendar/calendar.error.xml.h:12
 msgid ""
@@ -2188,8 +2155,7 @@ msgid ""
 "the memo has been deleted."
 msgstr "如果未傳送取消通知,其他參與者可能不知道該備忘錄已經刪除。"
 
-#: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:198
+#: ../calendar/calendar.error.xml.h:13 ../calendar/gui/e-cal-dialogs.c:508
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "確定要刪除此備忘錄?"
@@ -2204,16 +2170,16 @@ msgstr "確定要刪除標題為「{0}」的會議?"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "確定要刪除標題為「{0}」的約會?"
+msgstr "確定要刪除標題為「{0}」的會議?"
 
 #: ../calendar/calendar.error.xml.h:17
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
-msgstr "會刪除此約會的所有資訊而且無法復原。"
+msgstr "會刪除此會議的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this appointment?"
-msgstr "確定要刪除此約會?"
+msgstr "確定要刪除此會議?"
 
 #: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -2229,13 +2195,13 @@ msgstr "會刪除此備忘錄中的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "確定要刪除這 {0} 約會?"
+msgstr "確定要刪除這 {0} 會議?"
 
 #: ../calendar/calendar.error.xml.h:23
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr "會刪除這些約會的所有資訊而且無法復原。"
+msgstr "會刪除這些會議的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete these {0} tasks?"
@@ -2265,18 +2231,17 @@ msgstr "您已經變更此會議,但尚未儲存它。"
 msgid "_Save Changes"
 msgstr "儲存變更(_S)"
 
-#: ../calendar/calendar.error.xml.h:31
-#: ../composer/mail-composer.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
 #: ../calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
-msgstr "要儲存對此約會所做的變更?"
+msgstr "要儲存對此會議所做的變更?"
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "您已經變更此約會,但尚未儲存它。"
+msgstr "您已經變更此會議,但尚未儲存它。"
 
 #: ../calendar/calendar.error.xml.h:34
 msgid "Would you like to save your changes to this task?"
@@ -2296,22 +2261,22 @@ msgstr "您已經變更此備忘錄,但尚未儲存它們。"
 
 #: ../calendar/calendar.error.xml.h:38
 msgid "Would you like to send meeting invitations to participants?"
-msgstr "要傳送會議邀請給參與者?"
+msgstr "您是否要傳送會議邀請給參與者?"
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr "電子郵件邀請函會傳送給所有參與者並讓他們回覆。"
 
-#: ../calendar/calendar.error.xml.h:40
-#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:36
+#: ../mail/mail.error.xml.h:8
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #: ../calendar/calendar.error.xml.h:41
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "要傳送會議更新資訊給參與者?"
+msgstr "您是否要傳送會議更新資訊給參與者?"
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
@@ -2321,7 +2286,7 @@ msgstr "傳送更新的資訊允許其他參與者保有最新的行事曆。"
 
 #: ../calendar/calendar.error.xml.h:43
 msgid "Would you like to send this task to participants?"
-msgstr "要傳送此工作給參與者?"
+msgstr "您是否要傳送此工作給參與者?"
 
 #: ../calendar/calendar.error.xml.h:44
 msgid ""
@@ -2341,342 +2306,386 @@ msgstr "這裡有一些需要下載的附件。儲存此工作將會失去這些
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr "下載尚在進行中。您是否要儲存此約會?"
+msgstr "下載尚在進行中。您是否要儲存此會議?"
 
 #: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
-msgstr "這裡有一些需要下載的附件。儲存此約會將會失去這些附件。"
+msgstr "這裡有一些需要下載的附件。儲存此會議將會失去這些附件。"
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "Would you like to send updated task information to participants?"
-msgstr "要傳送更新的工作資訊給參與者?"
+msgstr "您是否要傳送更新的工作資訊給參與者?"
 
 #: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
-msgstr "傳送更新的資訊讓其他參與者保有最新的工作清單。"
+msgstr "傳送更新的資訊讓其他參與者保有最新的工作列表。"
 
 #: ../calendar/calendar.error.xml.h:52
+msgid "Would you like to send this memo to participants?"
+msgstr "您是否要傳送這份備忘錄給參與者?"
+
+#: ../calendar/calendar.error.xml.h:53
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this memo."
+msgstr "電子郵件邀請會傳送給所有參與者並讓他們接受此備忘錄。"
+
+#: ../calendar/calendar.error.xml.h:54
+msgid "Would you like to send updated memo information to participants?"
+msgstr "您是否要傳送更新的備忘錄資訊給參與者?"
+
+#: ../calendar/calendar.error.xml.h:55
+msgid ""
+"Sending updated information allows other participants to keep their memo "
+"lists up to date."
+msgstr "傳送更新的資訊允許其他參與者保有最新的備忘錄列表。"
+
+#: ../calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "無法載入編輯器。"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "Delete calendar '{0}'?"
 msgstr "刪除行事曆「{0}」?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "這個行事曆將會被永遠移除。"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "Delete task list '{0}'?"
-msgstr "刪除工作清單「{0}」?"
+msgstr "刪除工作列表「{0}」?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
-msgstr "這項工作清單將會被永遠移除。"
+msgstr "這項工作列表將會被永遠移除。"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "Delete memo list '{0}'?"
-msgstr "刪除備忘錄清單「{0}」?"
+msgstr "刪除備忘錄列表「{0}」?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
-msgstr "這個備忘錄清單將會被永遠移除。"
+msgstr "這個備忘錄列表將會被永遠移除。"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Delete remote calendar '{0}'?"
 msgstr "刪除遠端行事曆「{0}」?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "This will permanently remove the calendar '{0}' from the server. Are you "
 "sure you want to proceed?"
 msgstr "這樣會從伺服器永遠刪除行事曆 &quot;{0}&quot;。您確定要繼續嗎?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Delete remote task list '{0}'?"
-msgstr "刪除遠端工作清單「{0}」?"
+msgstr "刪除遠端工作列表「{0}」?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid ""
 "This will permanently remove the task list '{0}' from the server. Are you "
 "sure you want to proceed?"
-msgstr "這樣會從伺服器永遠刪除工作清單 &quot;{0}&quot;。您確定要繼續嗎?"
+msgstr "這樣會從伺服器永遠刪除工作列表 &quot;{0}&quot;。您確定要繼續嗎?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Delete remote memo list '{0}'?"
-msgstr "刪除遠端備忘錄清單「{0}」?"
+msgstr "刪除遠端備忘錄列表「{0}」?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid ""
 "This will permanently remove the memo list '{0}' from the server. Are you "
 "sure you want to proceed?"
-msgstr "這樣會從伺服器永遠刪除備忘錄清單 &quot;{0}&quot;。您確定要繼續嗎?"
+msgstr "這樣會從伺服器永遠刪除備忘錄列表 &quot;{0}&quot;。您確定要繼續嗎?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the appointment without a summary?"
-msgstr "您確定要儲存沒有摘要的約會?"
+msgstr "您確定要儲存沒有摘要的會議?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
-msgstr "新增有意義的摘要到您的約會可以讓您知道這個約會和什麼事有關。"
+msgstr "新增有意義的摘要到您的會議可以讓您知道這個會議和什麼事有關。"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "您確定要儲存沒有摘要的工作?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
 msgstr "新增有意義的摘要到您的工作可以讓您知道這個工作和什麼事有關。"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "確定要儲存沒有摘要的備忘錄?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Error loading calendar '{0}'"
 msgstr "載入行事曆「{0}」時發生錯誤"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "The calendar is not marked for offline usage."
 msgstr "此行事曆尚未標記為離線使用。"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Cannot save event"
 msgstr "不能儲存事件"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:80
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
-msgstr "「{0}」是一個唯讀的行事曆來源。請選取一個能加入約會的行事曆。"
+msgstr "「{0}」是一個唯讀的行事曆來源。請選取一個能加入會議的行事曆。"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
 msgstr "不能儲存工作"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
-msgstr "「{0}」不支援指派工作,請選擇不同的工作清單。"
+msgstr "「{0}」不支援指派工作,請選擇不同的工作列表。"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:85
 msgid "Error loading task list '{0}'"
-msgstr "載入工作清單「{0}」時發生錯誤"
+msgstr "載入工作列表「{0}」時發生錯誤"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:86
 msgid "The task list is not marked for offline usage."
-msgstr "此工作清單尚未標記為離線使用。"
+msgstr "此工作列表尚未標記為離線使用。"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:88
 msgid "Error loading memo list '{0}'"
-msgstr "載入備忘錄清單「{0}」時發生錯誤"
+msgstr "載入備忘錄列表「{0}」時發生錯誤"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:89
 msgid "The memo list is not marked for offline usage."
-msgstr "此備忘錄清單尚未標記為離線使用。"
+msgstr "此備忘錄列表尚未標記為離線使用。"
+
+#. Translators: {0} is the name of the calendar/memo list/task list.
+#: ../calendar/calendar.error.xml.h:91
+msgid "Failed to add timezone to '{0}'"
+msgstr "不能加入時區到「{0}」"
+
+#. The {0} is a calendar/memo list/task list name, which is useless here
+#: ../calendar/calendar.error.xml.h:93
+msgid "Failed to save attachments"
+msgstr "無法儲存附件"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:95
 msgid "Failed to open calendar '{0}'"
 msgstr "無法開啟行事曆「{0}」"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:97
 msgid "Failed to open memo list '{0}'"
-msgstr "無法開啟備忘錄清單「{0}」"
+msgstr "無法開啟備忘錄列表「{0}」"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:99
 msgid "Failed to open task list '{0}'"
-msgstr "無法開啟工作清單「{0}」"
+msgstr "無法開啟工作列表「{0}」"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:101
 msgid "Failed to create an event in the calendar '{0}'"
 msgstr "無法在行事曆「{0}」建立事件"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:103
 msgid "Failed to create a memo in the memo list '{0}'"
-msgstr "無法在備忘錄清單「{0}」建立備忘錄"
+msgstr "無法在備忘錄列表「{0}」建立備忘錄"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:105
 msgid "Failed to create a task in the task list '{0}'"
-msgstr "無法在工作清單「{0}」建立工作"
+msgstr "無法在工作列表「{0}」建立工作"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:107
 msgid "Failed to modify an event in the calendar '{0}'"
 msgstr "無法在行事曆「{0}」修改事件"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:109
 msgid "Failed to modify a memo in the memo list '{0}'"
-msgstr "無法在備忘錄清單「{0}」修改備忘錄"
+msgstr "無法在備忘錄列表「{0}」修改備忘錄"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:111
 msgid "Failed to modify a task in the task list '{0}'"
-msgstr "無法在工作清單「{0}」修改工作"
+msgstr "無法在工作列表「{0}」修改工作"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:113
 msgid "Failed to delete an event in the calendar '{0}'"
 msgstr "無法在行事曆「{0}」刪除事件"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:115
 msgid "Failed to delete a memo in the memo list '{0}'"
-msgstr "無法在備忘錄清單「{0}」刪除備忘錄"
+msgstr "無法在備忘錄列表「{0}」刪除備忘錄"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:117
 msgid "Failed to delete a task in the task list '{0}'"
-msgstr "無法在工作清單「{0}」刪除工作"
+msgstr "無法在工作列表「{0}」刪除工作"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:111
+#: ../calendar/calendar.error.xml.h:119
 msgid "Failed to update an event in the calendar '{0}'"
 msgstr "無法在行事曆「{0}」更新事件"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:113
+#: ../calendar/calendar.error.xml.h:121
 msgid "Failed to update a memo in the memo list '{0}'"
-msgstr "無法在備忘錄清單「{0}」更新備忘錄"
+msgstr "無法在備忘錄列表「{0}」更新備忘錄"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:115
+#: ../calendar/calendar.error.xml.h:123
 msgid "Failed to update a task in the task list '{0}'"
-msgstr "無法在工作清單「{0}」更新工作"
+msgstr "無法在工作列表「{0}」更新工作"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:117
+#: ../calendar/calendar.error.xml.h:125
 msgid "Failed to send an event to the calendar '{0}'"
 msgstr "無法傳送事件到行事曆「{0}」"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:119
+#: ../calendar/calendar.error.xml.h:127
 msgid "Failed to send a memo to the memo list '{0}'"
-msgstr "無法傳送備忘錄到備忘錄清單「{0}」"
+msgstr "無法傳送備忘錄到備忘錄列表「{0}」"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:121
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to send a task to the task list '{0}'"
-msgstr "無法傳送工作到工作清單「{0}」"
+msgstr "無法傳送工作到工作列表「{0}」"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:123
+#: ../calendar/calendar.error.xml.h:131
 msgid "Error creating view for the calendar '{0}'"
 msgstr "建立行事曆「{0}」的檢視時發生錯誤"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:125
+#: ../calendar/calendar.error.xml.h:133
 msgid "Error creating view for the task list '{0}'"
-msgstr "建立工作清單「{0}」的檢視時發生錯誤"
+msgstr "建立工作列表「{0}」的檢視時發生錯誤"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:127
+#: ../calendar/calendar.error.xml.h:135
 msgid "Error creating view for the memo list '{0}'"
-msgstr "建立備忘錄清單「{0}」的檢視時發生錯誤"
+msgstr "建立備忘錄列表「{0}」的檢視時發生錯誤"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:129
+#: ../calendar/calendar.error.xml.h:137
 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:131
+#: ../calendar/calendar.error.xml.h:139
 msgid "Failed to copy a task into the task list '{0}'"
-msgstr "無法複製工作到工作清單「{0}」"
+msgstr "無法複製工作到工作列表「{0}」"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:133
+#: ../calendar/calendar.error.xml.h:141
 msgid "Failed to copy a memo into the memo list '{0}'"
-msgstr "無法複製備忘錄到備忘錄清單「{0}」"
+msgstr "無法複製備忘錄到備忘錄列表「{0}」"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:135
+#: ../calendar/calendar.error.xml.h:143
 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:137
+#: ../calendar/calendar.error.xml.h:145
 msgid "Failed to move a task into the task list '{0}'"
-msgstr "無法移動工作到工作清單「{0}」"
+msgstr "無法移動工作到工作列表「{0}」"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:139
+#: ../calendar/calendar.error.xml.h:147
 msgid "Failed to move a memo into the memo list '{0}'"
-msgstr "無法移動備忘錄到備忘錄清單「{0}」"
+msgstr "無法移動備忘錄到備忘錄列表「{0}」"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:141
+#: ../calendar/calendar.error.xml.h:149
+msgid "Failed to get an event from the calendar '{0}'"
+msgstr "無法從行事曆「{0}」取得事件"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:151
+msgid "Failed to get a task from the task list '{0}'"
+msgstr "無法從工作列表「{0}」取得工作"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:153
+msgid "Failed to get a memo from the memo list '{0}'"
+msgstr "無法從備忘錄列表「{0}」取得備忘錄"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:155
 msgid "Copying an event into the calendar '{0}'"
 msgstr "正在複製事件到行事曆「{0}」"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:143
+#: ../calendar/calendar.error.xml.h:157
 msgid "Copying a task into the task list '{0}'"
-msgstr "正在複製工作到工作清單「{0}」"
+msgstr "正在複製工作到工作列表「{0}」"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:145
+#: ../calendar/calendar.error.xml.h:159
 msgid "Copying a memo into the memo list '{0}'"
-msgstr "正在複製備忘錄到備忘錄清單「{0}」"
+msgstr "正在複製備忘錄到備忘錄列表「{0}」"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:147
+#: ../calendar/calendar.error.xml.h:161
 msgid "Moving an event into the calendar '{0}'"
 msgstr "正在移動事件到行事曆「{0}」"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:149
+#: ../calendar/calendar.error.xml.h:163
 msgid "Moving a task into the task list '{0}'"
-msgstr "正在移動工作到工作清單「{0}」"
+msgstr "正在移動工作到工作列表「{0}」"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:151
+#: ../calendar/calendar.error.xml.h:165
 msgid "Moving a memo into the memo list '{0}'"
-msgstr "正在移動工作到工作清單「{0}」"
+msgstr "正在移動工作到工作列表「{0}」"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:153
+#: ../calendar/calendar.error.xml.h:167
 msgid "Failed to refresh calendar '{0}'"
 msgstr "無法重新整理行事曆「{0}」"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:155
+#: ../calendar/calendar.error.xml.h:169
 msgid "Failed to refresh task list '{0}'"
-msgstr "無法重新整理工作清單「{0}」"
+msgstr "無法重新整理工作列表「{0}」"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:157
+#: ../calendar/calendar.error.xml.h:171
 msgid "Failed to refresh memo list '{0}'"
-msgstr "無法重新整理備忘錄清單「{0}」"
+msgstr "無法重新整理備忘錄列表「{0}」"
 
-#: ../calendar/calendar.error.xml.h:158
+#: ../calendar/calendar.error.xml.h:172
 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
-#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-task-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
 msgid "Summary"
 msgstr "摘要"
@@ -2695,7 +2704,7 @@ 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-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "說明"
@@ -2721,26 +2730,22 @@ msgstr "是"
 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:246 ../calendar/gui/e-cal-model.c:306
-#: ../calendar/gui/e-cal-model.c:313 ../calendar/gui/e-task-table.c:498
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:305 ../calendar/gui/e-cal-model.c:312
+#: ../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:247 ../calendar/gui/e-cal-model.c:315
-#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:314 ../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:248 ../calendar/gui/e-cal-model.c:317
-#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-html-editor-page-dialog.c:117 ../e-util/e-send-options.ui.h:7
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:316 ../calendar/gui/e-task-table.c:500
+#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-html-editor-page-dialog.c:117
+#: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "機密"
 
@@ -2753,10 +2758,10 @@ msgstr "會議召集人"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
 #: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
-msgstr "到會者"
+msgstr "出席者"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../mail/message-list.etspec.h:14
 #: ../plugins/publish-calendar/publish-calendar.c:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
@@ -2769,29 +2774,27 @@ 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
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:51
 #: ../em-format/e-mail-formatter-print-headers.c:157
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
+#: ../mail/filtertypes.xml.in.h:47 ../mail/searchtypes.xml.in.h:49
+#: ../mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
 msgstr "附件"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
-#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:48
+#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Exist"
 msgstr "存在"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
-#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:49
+#: ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
 msgid "Do Not Exist"
 msgstr "不存在"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:309
-#: ../calendar/gui/dialogs/event-editor.c:330
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2004
 msgid "Recurrence"
 msgstr "週期性"
 
@@ -2821,1281 +2824,23 @@ msgstr "摘要包含"
 msgid "Description Contains"
 msgstr "描述包含"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:668
-msgid "Edit Reminder"
-msgstr "編輯提醒"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../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:420
-msgid "Play a sound"
-msgstr "播放音效"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../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:428
-msgid "Send an email"
-msgstr "傳送電子郵件"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:908
-msgid "before"
-msgstr "早於"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
-msgid "after"
-msgstr "晚於"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:918
-msgid "start of appointment"
-msgstr "約會開始"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
-msgid "end of appointment"
-msgstr "約會結束"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "minute(s)"
-msgstr "分鐘"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "hour(s)"
-msgstr "小時"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "day(s)"
-msgstr "天"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Add Reminder"
-msgstr "加入提醒"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-#: ../calendar/gui/dialogs/event-editor.c:352
-msgid "Reminder"
-msgstr "提醒"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "Repeat"
-msgstr "重複"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "重複這個提醒(_R)"
-
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "extra times every"
-msgstr "提醒間隔每"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "Custom _message"
-msgstr "自訂訊息(_M)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-msgid "Mes_sage:"
-msgstr "訊息(_S):"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "Custom reminder sound"
-msgstr "自訂提醒聲音"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
-msgid "_Sound:"
-msgstr "聲音(_S):"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "Select A File"
-msgstr "請選取檔案"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "_Program:"
-msgstr "執行程式(_P):"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-msgid "_Arguments:"
-msgstr "引數(_A):"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "Send To:"
-msgstr "收件者:"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
-msgid "Action/Trigger"
-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:63
-msgid "Reminders"
-msgstr "提醒"
-
-#: ../calendar/gui/dialogs/changed-comp.c:59
-msgid "This event has been deleted."
-msgstr "這個事件已刪除。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:63
-msgid "This task has been deleted."
-msgstr "這項工作已刪除。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:67
-msgid "This memo has been deleted."
-msgstr "這個備忘錄已刪除。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:77
-#, c-format
-msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  您已經做了些變更。放棄這些變更並且關閉這個編輯器?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:79
-#, c-format
-msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  您沒有做任何變更,關閉這個編輯器?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:84
-msgid "This event has been changed."
-msgstr "這個事件已變更。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:88
-msgid "This task has been changed."
-msgstr "這項工作已變更。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This memo has been changed."
-msgstr "這個備忘錄已變更。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:102
-#, c-format
-msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編輯器?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:104
-#, c-format
-msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  您沒有做任何變更,更新這個編輯器?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:299
-msgid "Could not save attachments"
-msgstr "無法儲存附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:653
-msgid "Could not update object"
-msgstr "無法更新物件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:787
-msgid "Edit Appointment"
-msgstr "編輯約會"
-
-#: ../calendar/gui/dialogs/comp-editor.c:794
-#, c-format
-msgid "Meeting - %s"
-msgstr "會議 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:796
-#, c-format
-msgid "Appointment - %s"
-msgstr "約會 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:802
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "指派的工作 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:804
-#, c-format
-msgid "Task - %s"
-msgstr "工作 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:809
-#, c-format
-msgid "Memo - %s"
-msgstr "備忘錄 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:825
-msgid "No Summary"
-msgstr "沒有摘要"
-
-#: ../calendar/gui/dialogs/comp-editor.c:946
-msgid "Keep original item?"
-msgstr "是否保持原始項目?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1109
-#: ../calendar/gui/dialogs/comp-editor.c:1137
-msgid "Unable to synchronize with the server"
-msgstr "無法與伺服器同步"
-
-#. == Button box ==
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../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:334 ../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:127
-#: ../mail/em-folder-properties.c:688 ../mail/em-subscription-editor.c:1759
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
-#: ../smime/gui/certificate-manager.c:2066
-msgid "_Close"
-msgstr "關閉(_C)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1251
-msgid "Close the current window"
-msgstr "關閉目前的視窗"
-
-#. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
-#: ../e-util/e-web-view.c:377 ../mail/e-mail-browser.c:134
-#: ../mail/mail.error.xml.h:141 ../shell/e-shell-window-actions.c:799
-msgid "_Copy"
-msgstr "複製(_C)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1258 ../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:379
-#: ../e-util/e-web-view.c:1415 ../mail/e-mail-browser.c:136
-#: ../shell/e-shell-window-actions.c:801
-msgid "Copy the selection"
-msgstr "複製選取的內容"
-
-#. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1263 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
-#: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:806
-msgid "Cu_t"
-msgstr "剪下(_T)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1265 ../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:1409
-#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:808
-msgid "Cut the selection"
-msgstr "剪下選取範圍"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1272 ../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:815
-msgid "Delete the selection"
-msgstr "刪除選取範圍"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1279
-msgid "View help"
-msgstr "檢視求助"
-
-#. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
-#: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:834
-msgid "_Paste"
-msgstr "貼上(_P)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1286 ../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:1421
-#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:836
-msgid "Paste the clipboard"
-msgstr "貼上剪貼簿的內容"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1291
-#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2195
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
-#: ../modules/addressbook/e-book-shell-view-actions.c:1219
-msgid "_Print..."
-msgstr "列印(_P)…"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1298 ../mail/e-mail-reader.c:2202
-#: ../modules/addressbook/e-book-shell-view-actions.c:1212
-#: ../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:1307
-msgid "Save current changes"
-msgstr "儲存目前的變更"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1312
-#: ../e-util/e-mail-signature-editor.c:304
-msgid "Save and Close"
-msgstr "儲存並關閉"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1314
-msgid "Save current changes and close editor"
-msgstr "儲存目前的變更並且關閉編輯器"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1319 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:387
-#: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:911
-msgid "Select _All"
-msgstr "全部選取(_A)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1321 ../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:157 ../shell/e-shell-window-actions.c:913
-msgid "Select all text"
-msgstr "選取所有文字"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1342
-msgid "_Classification"
-msgstr "歸類(_C)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1127
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
-#: ../shell/e-shell-window-actions.c:948
-msgid "_File"
-msgstr "檔案(_F)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1370
-#: ../e-util/e-html-editor-actions.c:1148
-msgid "_Insert"
-msgstr "插入(_I)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:378
-msgid "_Options"
-msgstr "選項(_O)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1384
-#: ../e-util/e-html-editor-actions.c:1169 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
-msgid "_View"
-msgstr "檢視(_V)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1394
-#: ../composer/e-composer-actions.c:327
-msgid "_Attachment..."
-msgstr "附件(_A)…"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
-msgid "Attach a file"
-msgstr "附加檔案"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1404
-msgid "_Categories"
-msgstr "分類(_C)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1406
-msgid "Toggles whether to display categories"
-msgstr "切換是否顯示「分類」"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1412
-msgid "Time _Zone"
-msgstr "時區(_Z)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1414
-msgid "Toggles whether the time zone is displayed"
-msgstr "切換是否顯示「時區」"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1423
-msgid "Pu_blic"
-msgstr "公開(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1425
-msgid "Classify as public"
-msgstr "分類為公開"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1430
-msgid "_Private"
-msgstr "私人(_P)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1432
-msgid "Classify as private"
-msgstr "歸類為私人"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1437
-msgid "_Confidential"
-msgstr "機密(_C)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1439
-msgid "Classify as confidential"
-msgstr "歸類為機密"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1447
-msgid "R_ole Field"
-msgstr "角色欄位(_O)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1449
-msgid "Toggles whether the Role field is displayed"
-msgstr "切換是否顯示「角色」欄位"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1455
-msgid "_RSVP"
-msgstr "_RSVP"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1457
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "切換是否顯示「RSVP」欄位"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1463
-msgid "_Status Field"
-msgstr "狀態欄位(_S)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1465
-msgid "Toggles whether the Status field is displayed"
-msgstr "切換是否顯示「狀態」欄位"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1471
-msgid "_Type Field"
-msgstr "類型欄位(_T)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1473
-msgid "Toggles whether the Attendee Type is displayed"
-msgstr "切換是否顯示「到會者類型」欄位"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2596
-#: ../composer/e-composer-actions.c:612
-msgid "Attach"
-msgstr "附加"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2926
-#: ../calendar/gui/dialogs/comp-editor.c:3512
-#: ../calendar/gui/dialogs/comp-editor.c:4525
-msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "如果有新的更新,則會放棄對此項目所做的變更"
-
-#: ../calendar/gui/dialogs/comp-editor.c:4487
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
-msgid "attachment"
-msgstr "附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:4557
-msgid "Unable to use current version!"
-msgstr "無法使用目前的版本!"
-
-#: ../calendar/gui/dialogs/comp-editor-page.c:440
-#, c-format
-msgid "Validation error: %s"
-msgstr "確認上的錯誤: %s"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:129
-#: ../calendar/gui/e-cal-ops.c:1968
-msgid "Destination is read only"
-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: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?"
-msgstr "是否刪除其他所有收件者信箱中的這個項目(_D)?"
-
-#: ../calendar/gui/dialogs/delete-comp.c:218
-msgid "_Retract comment"
-msgstr "收回註解(_R)"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Enter Delegate"
-msgstr "輸入代表"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
-msgid "Delegate To:"
-msgstr "委託給:"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
-msgid "Contacts..."
-msgstr "連絡人…"
-
-#: ../calendar/gui/dialogs/event-editor.c:204
-msgid "_Reminders"
-msgstr "提醒(_R)"
-
-#: ../calendar/gui/dialogs/event-editor.c:206
-msgid "Set or unset reminders for this event"
-msgstr "設定或取消這個事件的提醒"
-
-#: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Show Time as _Busy"
-msgstr "顯示時間為忙碌(_B)"
-
-#: ../calendar/gui/dialogs/event-editor.c:216
-msgid "Toggles whether to show time as busy"
-msgstr "切換是否將時間顯示為忙碌"
-
-#: ../calendar/gui/dialogs/event-editor.c:225
-msgid "_Recurrence"
-msgstr "週期性(_R)"
-
-#: ../calendar/gui/dialogs/event-editor.c:227
-msgid "Make this a recurring event"
-msgstr "將此項設為週期性事件"
-
-#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
-msgid "Send Options"
-msgstr "傳送選項"
-
-#: ../calendar/gui/dialogs/event-editor.c:234
-#: ../calendar/gui/dialogs/task-editor.c:95
-msgid "Insert advanced send options"
-msgstr "插入進階傳送選項"
-
-#: ../calendar/gui/dialogs/event-editor.c:242
-msgid "All _Day Event"
-msgstr "全天事件(_D)"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
-msgid "Toggles whether to have All Day Event"
-msgstr "切換是否要有全天事件"
-
-#: ../calendar/gui/dialogs/event-editor.c:253
-msgid "_Free/Busy"
-msgstr "空閒/忙碌(_F)"
-
-#: ../calendar/gui/dialogs/event-editor.c:255
-msgid "Query free / busy information for the attendees"
-msgstr "查詢此到會者的空閒/忙碌資訊"
-
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
-msgid "Appointment"
-msgstr "約會"
-
-#: ../calendar/gui/dialogs/event-editor.c:376
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/e-meeting-list-view.c:164
-msgid "Attendees"
-msgstr "到會者"
-
-#: ../calendar/gui/dialogs/event-editor.c:573
-msgid "Print this event"
-msgstr "列印這個事件"
-
-#: ../calendar/gui/dialogs/event-page.c:557
-msgid "Event's start time is in the past"
-msgstr "事件的開始時刻在過去"
-
-#: ../calendar/gui/dialogs/event-page.c:634
-msgid "Event cannot be edited, because the selected calendar is read only"
-msgstr "不能編輯事件,因為選取的行事曆是唯讀的"
-
-#: ../calendar/gui/dialogs/event-page.c:638
-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:3198
-msgid "This event has reminders"
-msgstr "這個事件具有提醒"
-
-#: ../calendar/gui/dialogs/event-page.c:717
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "Or_ganizer:"
-msgstr "會議召集人(_G):"
-
-#: ../calendar/gui/dialogs/event-page.c:1309
-msgid "Event with no start date"
-msgstr "無開始日期的事件"
-
-#: ../calendar/gui/dialogs/event-page.c:1312
-msgid "Event with no end date"
-msgstr "無結束日期的事件"
-
-#: ../calendar/gui/dialogs/event-page.c:1490
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1032
-msgid "Start date is wrong"
-msgstr "開始日期錯誤"
-
-#: ../calendar/gui/dialogs/event-page.c:1501
-msgid "End date is wrong"
-msgstr "結束日期錯誤"
-
-#: ../calendar/gui/dialogs/event-page.c:1543
-msgid "Start time is wrong"
-msgstr "開始時間錯誤"
-
-#: ../calendar/gui/dialogs/event-page.c:1551
-msgid "End time is wrong"
-msgstr "結束時間錯誤"
-
-#: ../calendar/gui/dialogs/event-page.c:1715
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1086
-msgid "An organizer is required."
-msgstr "需要一個召集人。"
-
-#: ../calendar/gui/dialogs/event-page.c:1750
-#: ../calendar/gui/dialogs/task-page.c:1121
-msgid "At least one attendee is required."
-msgstr "最少需要一個到會者。"
-
-#: ../calendar/gui/dialogs/event-page.c:1956
-msgid "_Delegatees"
-msgstr "代理者(_D)"
-
-#: ../calendar/gui/dialogs/event-page.c:1958
-msgid "Atte_ndees"
-msgstr "到會者(_N)"
-
-#: ../calendar/gui/dialogs/event-page.c:3478
-#, c-format
-msgid "%d day before appointment"
-msgid_plural "%d days before appointment"
-msgstr[0] "在每個約會前 %d 天"
-
-#: ../calendar/gui/dialogs/event-page.c:3484
-#, c-format
-msgid "%d hour before appointment"
-msgid_plural "%d hours before appointment"
-msgstr[0] "約會前 %d 小時"
-
-#: ../calendar/gui/dialogs/event-page.c:3490
-#, c-format
-msgid "%d minute before appointment"
-msgid_plural "%d minutes before appointment"
-msgstr[0] "約會前 %d 分鐘"
-
-#: ../calendar/gui/dialogs/event-page.c:3511
-msgid "Custom"
-msgstr "自訂"
-
-#. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3518
-msgctxt "cal-reminders"
-msgid "None"
-msgstr "沒有"
-
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-msgctxt "eventpage"
-msgid "for"
-msgstr "共"
-
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgctxt "eventpage"
-msgid "until"
-msgstr "直到"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "約會前 15 分鐘"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "約會前 1 小時"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "約會前 1 天"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-msgid "_Location:"
-msgstr "位置(_L):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../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:558
-#: ../e-util/e-html-editor-link-dialog.c:422
-msgid "_Description:"
-msgstr "描述(_D):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Time:"
-msgstr "時刻(_T):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Time _zone:"
-msgstr "時區(_Z):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgid "_Summary:"
-msgstr "摘要(_S):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:21
-msgid "Event Description"
-msgstr "事件描述"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:26
-#: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:555
-msgid "Atte_ndees..."
-msgstr "到會者(_N)…"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:30
-msgid "_Reminder"
-msgstr "提醒(_R)"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "January"
-msgstr "一月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "February"
-msgstr "二月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "March"
-msgstr "三月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "April"
-msgstr "四月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "May"
-msgstr "五月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "June"
-msgstr "六月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
-msgid "July"
-msgstr "七月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "August"
-msgstr "八月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "September"
-msgstr "九月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "October"
-msgstr "十月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
-msgid "November"
-msgstr "十一月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
-msgid "December"
-msgstr "十二月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-msgid "Select Date"
-msgstr "選擇日期"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../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:3490
-msgid "Memo"
-msgstr "備忘錄"
-
-#: ../calendar/gui/dialogs/memo-editor.c:155
-msgid "Print this memo"
-msgstr "列印這個備忘錄"
-
-#: ../calendar/gui/dialogs/memo-page.c:424
-msgid "Memo's start date is in the past"
-msgstr "備忘錄的開始時刻在過去"
-
-#: ../calendar/gui/dialogs/memo-page.c:460
-msgid "Memo cannot be edited, because the selected memo list is read only"
-msgstr "不能編輯備忘錄,因為選取的備忘錄清單是唯讀的"
-
-#: ../calendar/gui/dialogs/memo-page.c:464
-msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr "不能完整的編輯備忘錄,因為您不是召集人"
-
-#: ../calendar/gui/dialogs/memo-page.c:1168
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../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 "收件者"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:426
-#: ../calendar/gui/dialogs/task-page.ui.h:34
-msgid "_List:"
-msgstr "清單(_L):"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:434
-#: ../calendar/gui/dialogs/task-page.ui.h:24
-msgid "Organi_zer:"
-msgstr "會議召集人(_Z):"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:5
-msgid "T_o:"
-msgstr "收件者(_O):"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:26
-msgid "Sta_rt date:"
-msgstr "開始日(_R):"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:23
-msgid "Su_mmary:"
-msgstr "摘要(_M):"
-
-#: ../calendar/gui/dialogs/recur-comp.c:52
-#, c-format
-msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "您正在修改週期性事件。您想要修改什麼?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:54
-#, c-format
-msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "您正在委任週期性事件。您想要委派什麼?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:58
-#, c-format
-msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "您正在修改週期性工作。您想要修改什麼?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:62
-#, c-format
-msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "您正在修改週期性備忘錄。您想要修改什麼?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:88
-msgid "This Instance Only"
-msgstr "限此例項"
-
-#: ../calendar/gui/dialogs/recur-comp.c:92
-msgid "This and Prior Instances"
-msgstr "此例項和先前的例項"
-
-#: ../calendar/gui/dialogs/recur-comp.c:98
-msgid "This and Future Instances"
-msgstr "此例項和以後的例項"
-
-#: ../calendar/gui/dialogs/recur-comp.c:103
-msgid "All Instances"
-msgstr "所有例項"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:574
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Evolution 無法編輯這個週期性約會。"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1005
-msgid "Recurrence date is invalid"
-msgstr "週期性日期無效"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-msgid "End time of the recurrence was before event's start"
-msgstr "週期性事件的結束時刻早於開始時刻"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1078
-msgid "on"
-msgstr "的"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1159
-msgid "first"
-msgstr "一"
-
-#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
-#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] 
[forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1165
-msgid "second"
-msgstr "二"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1170
-msgid "third"
-msgstr "三"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1175
-msgid "fourth"
-msgstr "四"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
-msgid "fifth"
-msgstr "第五"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1185
-msgid "last"
-msgstr "最後"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
-#. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1209
-msgid "Other Date"
-msgstr "其他日期"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1215
-msgid "1st to 10th"
-msgstr "1日至10日"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1221
-msgid "11th to 20th"
-msgstr "11日至20日"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1227
-msgid "21st to 31st"
-msgstr "21日至31日"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-msgid "Monday"
-msgstr "星期一"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
-msgid "Tuesday"
-msgstr "星期二"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Wednesday"
-msgstr "星期三"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1257
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
-msgid "Thursday"
-msgstr "星期四"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1258
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "Friday"
-msgstr "星期五"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1259
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
-msgid "Saturday"
-msgstr "星期六"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1260
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
-msgid "Sunday"
-msgstr "星期日"
-
-#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
-#. * (dropdown menu options are in [square brackets])."
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1391
-msgid "on the"
-msgstr "在第"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1576
-msgid "occurrences"
-msgstr "次"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2346
-msgid "Add exception"
-msgstr "加入例外"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2388
-msgid "Could not get a selection to modify."
-msgstr "無法取得要編輯的選取區。"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2394
-msgid "Modify exception"
-msgstr "編輯例外"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2440
-msgid "Could not get a selection to delete."
-msgstr "無法取得要刪除的選取區。"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2581
-msgid "Date/Time"
-msgstr "日期/時間"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgctxt "recurrpage"
-msgid "day(s)"
-msgstr "天"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "週"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
-msgctxt "recurrpage"
-msgid "month(s)"
-msgstr "個月"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "年"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-msgctxt "recurrpage"
-msgid "for"
-msgstr "共"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-msgctxt "recurrpage"
-msgid "until"
-msgstr "直到"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-msgctxt "recurrpage"
-msgid "forever"
-msgstr "永遠"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgid "This appointment rec_urs"
-msgstr "這個約會的週期性規則為(_U)"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
-msgid "Every"
-msgstr "每"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-msgid "Exceptions"
-msgstr "例外"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
-msgid "Preview"
-msgstr "預覽"
-
-#: ../calendar/gui/dialogs/send-comp.c:172
-#: ../calendar/gui/dialogs/send-comp.c:254
-msgid "Send my reminders with this event"
-msgstr "將我的提醒與這個事件一起送出"
-
-#: ../calendar/gui/dialogs/send-comp.c:174
-#: ../calendar/gui/dialogs/send-comp.c:256
-msgid "Notify new attendees _only"
-msgstr "只通知新的到會者(_O)"
-
-#: ../calendar/gui/dialogs/task-editor.c:93
-msgid "_Send Options"
-msgstr "傳送選項(_S)"
-
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
-#: ../e-util/e-send-options.c:553
-msgid "Task"
-msgstr "工作"
-
-#: ../calendar/gui/dialogs/task-editor.c:285
-msgid "Print this task"
-msgstr "列印這項工作"
-
-#: ../calendar/gui/dialogs/task-page.c:330
-msgid "Task's start date is in the past"
-msgstr "工作的開始時刻在過去"
-
-#: ../calendar/gui/dialogs/task-page.c:331
-msgid "Task's due date is in the past"
-msgstr "工作的結束時刻在過去"
-
-#: ../calendar/gui/dialogs/task-page.c:364
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "不能編輯工作,因為選取的工作清單是唯讀的"
-
-#: ../calendar/gui/dialogs/task-page.c:368
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "不能完整的編輯工作,因為您不是召集人"
-
-#: ../calendar/gui/dialogs/task-page.c:372
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr "不能編輯工作,因為選取的工作清單不支援指派工作"
-
-#: ../calendar/gui/dialogs/task-page.c:1013
-msgid "Due date is wrong"
-msgstr "到期日錯誤"
-
-#: ../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: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:340
-#: ../calendar/gui/e-cal-model.c:1856 ../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: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: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: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:323
-#: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../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: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: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: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: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"
-msgstr "已完成"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../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: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:963
-msgid "Canceled"
-msgstr "已取消"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:25
-msgid "D_ue date:"
-msgstr "到期日(_U):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:28
-msgid "Time zone:"
-msgstr "時區:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:35
-msgid "_Status:"
-msgstr "狀態(_S):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:36
-msgid "Date _completed:"
-msgstr "完成日期(_C):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:37
-msgid "_Percent complete:"
-msgstr "完成百分比(_P):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:38
-msgid "Priorit_y:"
-msgstr "優先等級(_Y):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:39
-msgid "C_lassification:"
-msgstr "歸類(_L):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:40
-msgid "_Web Page:"
-msgstr "網頁(_W):"
-
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../calendar/gui/ea-cal-view.c:283
 msgid "New Appointment"
-msgstr "新增約會"
+msgstr "新增會議"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New All Day Event"
 msgstr "新增全天事件"
 
-#: ../calendar/gui/ea-cal-view.c:286
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New Meeting"
 msgstr "新增會議"
 
-#: ../calendar/gui/ea-cal-view.c:287
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "Go to Today"
 msgstr "移至今日"
 
-#: ../calendar/gui/ea-cal-view.c:288
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Date"
 msgstr "移至日期"
 
@@ -4105,7 +2850,7 @@ msgstr "它具有提醒。"
 
 #: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
-msgstr "它是週期性約會。"
+msgstr "它是週期性會議。"
 
 #: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
@@ -4171,71 +2916,108 @@ msgstr "跳躍按鈕"
 msgid "Click here, you can find more events."
 msgstr "按這裡,您可以找到更多事件。"
 
-#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d days before start"
 #: ../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"
+#. Translator: Entire string is like "Pop up an alert %d weeks before start"
 #: ../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:438
+#. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:421
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1828
+msgctxt "cal-reminders"
+msgid "Play a sound"
+msgstr "播放音效"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:425
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1826
+msgctxt "cal-reminders"
+msgid "Pop up an alert"
+msgstr "彈出警告視窗"
+
+#. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:429
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1832
+msgctxt "cal-reminders"
+msgid "Send an email"
+msgstr "傳送郵件"
+
+#. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:433
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1830
+msgctxt "cal-reminders"
+msgid "Run a program"
+msgstr "執行程式"
+
+#: ../calendar/gui/e-alarm-list.c:439
+msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
-msgstr "要執行的未知動作"
+msgstr "要執行不明的動作"
 
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:454
 #, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "於約會開始前 %2$s%1$s"
+msgctxt "cal-reminders"
+msgid "%s %s before the start"
+msgstr "%s %s 先於開始"
 
-#: ../calendar/gui/e-alarm-list.c:459
+#: ../calendar/gui/e-alarm-list.c:460
 #, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "於約會開始後 %2$s%1$s"
+msgctxt "cal-reminders"
+msgid "%s %s after the start"
+msgstr "%s %s 慢於開始"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:466
+#: ../calendar/gui/e-alarm-list.c:467
 #, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s 於約會開始時"
+msgctxt "cal-reminders"
+msgid "%s at the start"
+msgstr "%s 於開始"
 
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "於約會結束前 %2$s%1$s"
+msgctxt "cal-reminders"
+msgid "%s %s before the end"
+msgstr "%s %s 先於結束"
 
-#: ../calendar/gui/e-alarm-list.c:484
+#: ../calendar/gui/e-alarm-list.c:485
 #, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "於約會結束後 %2$s%1$s"
+msgctxt "cal-reminders"
+msgid "%s %s after the end"
+msgstr "%s %s 慢於結束"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:492
 #, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s 於約會結束時"
+msgctxt "cal-reminders"
+msgid "%s at the end"
+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:515
+#: ../calendar/gui/e-alarm-list.c:516
 #, c-format
+msgctxt "cal-reminders"
 msgid "%s at %s"
-msgstr "%s 在 %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:523
+#: ../calendar/gui/e-alarm-list.c:524
 #, c-format
+msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
-msgstr "%s 為未知的觸發類型"
+msgstr "對不明的觸發類型 %s"
 
 #: ../calendar/gui/ea-week-view.c:114
 #, c-format
@@ -4255,47 +3037,101 @@ msgstr "用於月的行事曆檢視"
 msgid "calendar view for one or more weeks"
 msgstr "用於一或多週的行事曆檢視"
 
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:768
+#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:768
 #: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "無標題"
 
-#: ../calendar/gui/e-cal-component-preview.c:230
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Categories:"
 msgstr "分類:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:256
 msgid "Summary:"
 msgstr "摘要:"
 
-#: ../calendar/gui/e-cal-component-preview.c:273
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Start Date:"
 msgstr "開始日期:"
 
-#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "End Date:"
 msgstr "結束日期:"
 
-#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-component-preview.c:286
 msgid "Due Date:"
 msgstr "截止日期:"
 
-#: ../calendar/gui/e-cal-component-preview.c:309
+#: ../calendar/gui/e-cal-component-preview.c:298
 #: ../modules/itip-formatter/itip-view.c:1517
 #: ../modules/itip-formatter/itip-view.c:1634
 msgid "Status:"
 msgstr "狀態:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../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:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3576
+msgid "In Progress"
+msgstr "進行中"
+
+#: ../calendar/gui/e-cal-component-preview.c:305
+#: ../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: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"
+msgstr "已完成"
+
+#: ../calendar/gui/e-cal-component-preview.c:308
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../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:963
+msgid "Canceled"
+msgstr "已取消"
+
+#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:310
+#: ../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 "未開始"
+
+#: ../calendar/gui/e-cal-component-preview.c:325
 msgid "Priority:"
 msgstr "優先等級:"
 
-#: ../calendar/gui/e-cal-component-preview.c:361
+#: ../calendar/gui/e-cal-component-preview.c:327
+#: ../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:316
+msgid "High"
+msgstr "高"
+
+#: ../calendar/gui/e-cal-component-preview.c:329
+#: ../calendar/gui/e-cal-model.c:1872 ../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:315
+msgid "Normal"
+msgstr "一般"
+
+#: ../calendar/gui/e-cal-component-preview.c:331
+#: ../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:314
+msgid "Low"
+msgstr "低"
+
+#: ../calendar/gui/e-cal-component-preview.c:350
 #: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "描述:"
 
-#: ../calendar/gui/e-cal-component-preview.c:392
+#: ../calendar/gui/e-cal-component-preview.c:381
 msgid "Web Page:"
 msgstr "網頁:"
 
@@ -4307,122 +3143,185 @@ msgstr "正在建立行事曆「%s」的檢視"
 #: ../calendar/gui/e-cal-data-model.c:1637
 #, c-format
 msgid "Creating view for task list '%s'"
-msgstr "正在建立工作清單「%s」的檢視"
+msgstr "正在建立工作列表「%s」的檢視"
 
 #: ../calendar/gui/e-cal-data-model.c:1641
 #, c-format
 msgid "Creating view for memo list '%s'"
-msgstr "正在建立備忘錄清單「%s」的檢視"
+msgstr "正在建立備忘錄列表「%s」的檢視"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:1
-msgid "Click to add a task"
-msgstr "請按這裡增加新的工作"
+#: ../calendar/gui/e-cal-dialogs.c:214 ../calendar/gui/e-cal-ops.c:1939
+msgid "Destination is read only"
+msgstr "目的地是唯讀"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-msgid "Start date"
-msgstr "開始日期"
+#: ../calendar/gui/e-cal-dialogs.c:294
+#, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "正在複製事件到行事曆「%s」"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:670
-#: ../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:157
-msgid "Type"
-msgstr "類型"
+#: ../calendar/gui/e-cal-dialogs.c:300
+#, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "正在複製備忘錄到備忘錄列表「%s」"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Completion date"
-msgstr "完成日期"
+#: ../calendar/gui/e-cal-dialogs.c:306
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "正在複製工作到工作列表「%s」"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:965
-msgid "Complete"
-msgstr "完成"
+#: ../calendar/gui/e-cal-dialogs.c:525
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr "是否刪除其他所有收件者信箱中的這個項目(_D)?"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-msgid "Due date"
-msgstr "到期日"
+#: ../calendar/gui/e-cal-dialogs.c:528
+msgid "_Retract comment"
+msgstr "收回註解(_R)"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#, no-c-format
-msgid "% Complete"
-msgstr "% 完成"
+#: ../calendar/gui/e-cal-dialogs.c:687
+msgid "Select Date"
+msgstr "選擇日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:386
-msgid "Priority"
-msgstr "優先等級"
+#: ../calendar/gui/e-cal-dialogs.c:688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+msgid "Select _Today"
+msgstr "選擇今天(_T)"
 
-#. 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:3845
-#: ../calendar/gui/e-meeting-list-view.c:713
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../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 "狀態"
+#: ../calendar/gui/e-cal-dialogs.c:707
+msgid "January"
+msgstr "一月"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:380
-msgid "Created"
-msgstr "已建立"
+#: ../calendar/gui/e-cal-dialogs.c:708
+msgid "February"
+msgstr "二月"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
-msgid "Last modified"
-msgstr "修改日期"
+#: ../calendar/gui/e-cal-dialogs.c:709
+msgid "March"
+msgstr "三月"
+
+#: ../calendar/gui/e-cal-dialogs.c:710
+msgid "April"
+msgstr "四月"
+
+#: ../calendar/gui/e-cal-dialogs.c:711
+msgid "May"
+msgstr "五月"
+
+#: ../calendar/gui/e-cal-dialogs.c:712
+msgid "June"
+msgstr "六月"
+
+#: ../calendar/gui/e-cal-dialogs.c:713
+msgid "July"
+msgstr "七月"
+
+#: ../calendar/gui/e-cal-dialogs.c:714
+msgid "August"
+msgstr "八月"
+
+#: ../calendar/gui/e-cal-dialogs.c:715
+msgid "September"
+msgstr "九月"
+
+#: ../calendar/gui/e-cal-dialogs.c:716
+msgid "October"
+msgstr "十月"
+
+#: ../calendar/gui/e-cal-dialogs.c:717
+msgid "November"
+msgstr "十一月"
+
+#: ../calendar/gui/e-cal-dialogs.c:718
+msgid "December"
+msgstr "十二月"
+
+#: ../calendar/gui/e-cal-dialogs.c:868
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "您正在修改週期性事件。您想要修改什麼?"
+
+#: ../calendar/gui/e-cal-dialogs.c:870
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "您正在委任週期性事件。您想要委派什麼?"
+
+#: ../calendar/gui/e-cal-dialogs.c:874
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "您正在修改週期性工作。您想要修改什麼?"
+
+#: ../calendar/gui/e-cal-dialogs.c:878
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "您正在修改週期性備忘錄。您想要修改什麼?"
+
+#: ../calendar/gui/e-cal-dialogs.c:904
+msgid "This Instance Only"
+msgstr "限此例項"
 
-#: ../calendar/gui/e-calendar-view.c:459
+#: ../calendar/gui/e-cal-dialogs.c:908
+msgid "This and Prior Instances"
+msgstr "此例項和先前的例項"
+
+#: ../calendar/gui/e-cal-dialogs.c:914
+msgid "This and Future Instances"
+msgstr "此例項和以後的例項"
+
+#: ../calendar/gui/e-cal-dialogs.c:919
+msgid "All Instances"
+msgstr "所有例項"
+
+#: ../calendar/gui/e-cal-dialogs.c:1169 ../calendar/gui/e-cal-dialogs.c:1251
+msgid "Send my reminders with this event"
+msgstr "將我的提醒與這個事件一起送出"
+
+#: ../calendar/gui/e-cal-dialogs.c:1171 ../calendar/gui/e-cal-dialogs.c:1253
+msgid "Notify new attendees _only"
+msgstr "只通知新的出席者(_O)"
+
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Cut selected events to the clipboard"
 msgstr "剪下選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:465
+#: ../calendar/gui/e-calendar-view.c:458
 msgid "Copy selected events to the clipboard"
 msgstr "複製選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:471
+#: ../calendar/gui/e-calendar-view.c:464
 msgid "Paste events from the clipboard"
 msgstr "從剪貼簿貼上事件"
 
-#: ../calendar/gui/e-calendar-view.c:477
+#: ../calendar/gui/e-calendar-view.c:470
 msgid "Delete selected events"
 msgstr "刪除選取的事件"
 
-#: ../calendar/gui/e-calendar-view.c:859
+#: ../calendar/gui/e-calendar-view.c:852
 msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr "貼上的文字並未包含有效的 iCalendar 資料"
 
-#: ../calendar/gui/e-calendar-view.c:870 ../calendar/gui/e-cal-ops.c:1567
+#: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1536
 msgid "Default calendar not found"
 msgstr "找不到預設行事曆"
 
-#: ../calendar/gui/e-calendar-view.c:875 ../calendar/gui/e-cal-ops.c:1570
+#: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1539
 msgid "Default memo list not found"
-msgstr "找不到預設備忘錄清單"
+msgstr "找不到預設備忘錄列表"
 
-#: ../calendar/gui/e-calendar-view.c:880 ../calendar/gui/e-cal-ops.c:1573
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1542
 msgid "Default task list not found"
-msgstr "找不到預設工作清單"
+msgstr "找不到預設工作列表"
 
-#: ../calendar/gui/e-calendar-view.c:969
+#: ../calendar/gui/e-calendar-view.c:962
 msgid "No suitable component found"
 msgstr "找不到合適的元件"
 
-#: ../calendar/gui/e-calendar-view.c:1039
+#: ../calendar/gui/e-calendar-view.c:1032
 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:1842 ../calendar/gui/e-memo-table.c:493
+#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:492
 #: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4431,29 +3330,29 @@ 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:1846 ../calendar/gui/e-memo-table.c:498
+#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:497
 #: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1862
-#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3527
+#: ../calendar/gui/e-calendar-view.c:1850
+#: ../calendar/gui/e-meeting-time-sel.c:2731 ../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:1902
+#: ../calendar/gui/e-calendar-view.c:1890
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2281
-#: ../calendar/gui/e-calendar-view.c:2288
-#: ../calendar/gui/e-calendar-view.c:2295
-#: ../calendar/gui/e-calendar-view.c:2298
+#: ../calendar/gui/e-calendar-view.c:2269
+#: ../calendar/gui/e-calendar-view.c:2276
+#: ../calendar/gui/e-calendar-view.c:2283
+#: ../calendar/gui/e-calendar-view.c:2286
 msgid "%d %b %Y"
 msgstr "%Y年%m月%d日"
 
@@ -4462,13 +3361,13 @@ msgstr "%Y年%m月%d日"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2286 ../calendar/gui/e-day-view.c:3052
+#: ../calendar/gui/e-calendar-view.c:2274 ../calendar/gui/e-day-view.c:3047
 #: ../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:2308
+#: ../calendar/gui/e-calendar-view.c:2296
 msgid "%A %d %b %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -4478,15 +3377,15 @@ msgstr "%Y年%m月%d日%A"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2312 ../calendar/gui/e-day-view.c:3036
+#: ../calendar/gui/e-calendar-view.c:2300 ../calendar/gui/e-day-view.c:3031
 #: ../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:2315
-#: ../calendar/gui/e-calendar-view.c:2321
-#: ../calendar/gui/e-calendar-view.c:2324
+#: ../calendar/gui/e-calendar-view.c:2303
+#: ../calendar/gui/e-calendar-view.c:2309
+#: ../calendar/gui/e-calendar-view.c:2312
 msgid "%a %d %b %Y"
 msgstr "%Y年%m月%d日 (%a)"
 
@@ -4499,7 +3398,27 @@ msgstr "開始日期"
 msgid "End Date"
 msgstr "結束日期"
 
-#: ../calendar/gui/e-cal-model.c:319 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-task-table.etspec.h:13
+#: ../plugins/save-calendar/csv-format.c:380
+msgid "Created"
+msgstr "已建立"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../calendar/gui/e-task-table.etspec.h:14
+msgid "Last modified"
+msgstr "修改日期"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:8
+#: ../calendar/gui/e-task-table.etspec.h:15
+#: ../em-format/e-mail-formatter-source.c:120
+msgid "Source"
+msgstr "來源"
+
+#: ../calendar/gui/e-cal-model.c:318 ../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
@@ -4510,87 +3429,93 @@ msgstr "結束日期"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../calendar/gui/e-cal-model.c:1394 ../calendar/gui/e-cal-ops.c:596
-#: ../calendar/gui/e-cal-ops.c:1232
-#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#: ../calendar/gui/e-cal-model.c:1403 ../calendar/gui/e-cal-ops.c:597
+#: ../calendar/gui/e-cal-ops.c:1233
+#: ../modules/calendar/e-cal-base-shell-backend.c:291
 #, c-format
 msgid "Source with UID '%s' not found"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../calendar/gui/e-cal-model.c:1480 ../calendar/gui/e-cal-ops.c:185
-#: ../calendar/gui/e-cal-ops.c:1349
+#: ../calendar/gui/e-cal-model.c:1489 ../calendar/gui/e-cal-ops.c:186
+#: ../calendar/gui/e-cal-ops.c:1350
 msgid "Creating an event"
 msgstr "建立一個事件"
 
-#: ../calendar/gui/e-cal-model.c:1484 ../calendar/gui/e-cal-ops.c:189
-#: ../calendar/gui/e-cal-ops.c:1353
+#: ../calendar/gui/e-cal-model.c:1493 ../calendar/gui/e-cal-ops.c:190
+#: ../calendar/gui/e-cal-ops.c:1354
 msgid "Creating a memo"
 msgstr "建立一份備忘錄"
 
-#: ../calendar/gui/e-cal-model.c:1488 ../calendar/gui/e-cal-ops.c:193
-#: ../calendar/gui/e-cal-ops.c:1357
+#: ../calendar/gui/e-cal-model.c:1497 ../calendar/gui/e-cal-ops.c:194
+#: ../calendar/gui/e-cal-ops.c:1358
 msgid "Creating a task"
 msgstr "建立一項工作"
 
-#: ../calendar/gui/e-cal-model.c:1858
+#: ../calendar/gui/e-cal-model.c:1874
 msgid "Recurring"
 msgstr "週期性模式"
 
-#: ../calendar/gui/e-cal-model.c:1860
+#: ../calendar/gui/e-cal-model.c:1876
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-cal-model.c:1878 ../calendar/gui/e-cal-model-tasks.c:1138
 #: ../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:1862 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-cal-model.c:1878 ../calendar/gui/e-cal-model-tasks.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "否"
 
-#: ../calendar/gui/e-cal-model.c:3786
-#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3802 ../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:6206
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-cal-model.c:3787
-#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3803 ../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:6212
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-cal-model.c:3788
-#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3804 ../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:535
 msgid "Tentative"
 msgstr "暫訂"
 
-#: ../calendar/gui/e-cal-model.c:3789
-#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3805 ../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:6215
 msgid "Delegated"
 msgstr "已委派"
 
-#: ../calendar/gui/e-cal-model.c:3790
+#: ../calendar/gui/e-cal-model.c:3806
 msgid "Needs action"
 msgstr "需要動作"
 
-#: ../calendar/gui/e-cal-model-calendar.c:151
+#. 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-cal-model.c:3861 ../calendar/gui/e-meeting-list-view.c:688
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/e-task-table.etspec.h:11 ../calendar/gui/tasktypes.xml.h:8
+#: ../mail/filtertypes.xml.in.h:36 ../mail/message-list.etspec.h:1
+#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "狀態"
+
+#: ../calendar/gui/e-cal-model-calendar.c:150
 #: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "空閒"
 
-#: ../calendar/gui/e-cal-model-calendar.c:154
+#: ../calendar/gui/e-cal-model-calendar.c:153
 #: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "忙碌"
@@ -4611,155 +3536,155 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "沒有"
 
-#: ../calendar/gui/e-cal-ops.c:287
+#: ../calendar/gui/e-cal-ops.c:288
 msgid "Modifying an event"
 msgstr "修改一個事件"
 
-#: ../calendar/gui/e-cal-ops.c:291
+#: ../calendar/gui/e-cal-ops.c:292
 msgid "Modifying a memo"
 msgstr "修改一份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:295
+#: ../calendar/gui/e-cal-ops.c:296
 msgid "Modifying a task"
 msgstr "修改一項工作"
 
-#: ../calendar/gui/e-cal-ops.c:394
+#: ../calendar/gui/e-cal-ops.c:395
 msgid "Removing an event"
 msgstr "移除一個事件"
 
-#: ../calendar/gui/e-cal-ops.c:398
+#: ../calendar/gui/e-cal-ops.c:399
 msgid "Removing a memo"
 msgstr "移除一份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:402
+#: ../calendar/gui/e-cal-ops.c:403
 msgid "Removing a task"
 msgstr "移除一項工作"
 
-#: ../calendar/gui/e-cal-ops.c:493
+#: ../calendar/gui/e-cal-ops.c:494
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "刪除 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:497
+#: ../calendar/gui/e-cal-ops.c:498
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "刪除 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:501
+#: ../calendar/gui/e-cal-ops.c:502
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "刪除 %d 項工作"
 
-#: ../calendar/gui/e-cal-ops.c:704
+#: ../calendar/gui/e-cal-ops.c:705
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "貼上 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:719
+#: ../calendar/gui/e-cal-ops.c:720
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "貼上 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:734
+#: ../calendar/gui/e-cal-ops.c:735
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "貼上 %d 項工作"
 
-#: ../calendar/gui/e-cal-ops.c:833
+#: ../calendar/gui/e-cal-ops.c:834
 msgid "Updating an event"
 msgstr "更新一個事件"
 
-#: ../calendar/gui/e-cal-ops.c:837
+#: ../calendar/gui/e-cal-ops.c:838
 msgid "Updating a memo"
 msgstr "更新一則備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:841
+#: ../calendar/gui/e-cal-ops.c:842
 msgid "Updating a task"
 msgstr "更新一項工作"
 
-#: ../calendar/gui/e-cal-ops.c:949
+#: ../calendar/gui/e-cal-ops.c:950
 #, c-format
 msgid "Getting events to purge in the calendar '%s'"
 msgstr "正在取得在行事曆「%s」中要清空的事件"
 
-#: ../calendar/gui/e-cal-ops.c:953
+#: ../calendar/gui/e-cal-ops.c:954
 #, c-format
 msgid "Getting memos to purge in the memo list '%s'"
-msgstr "正在取得在備忘錄清單「%s」中要清空的備忘錄"
+msgstr "正在取得在備忘錄列表「%s」中要清空的備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:957
+#: ../calendar/gui/e-cal-ops.c:958
 #, c-format
 msgid "Getting tasks to purge in the task list '%s'"
-msgstr "正在取得在工作清單「%s」中要清空的工作"
+msgstr "正在取得在工作列表「%s」中要清空的工作"
 
-#: ../calendar/gui/e-cal-ops.c:983
+#: ../calendar/gui/e-cal-ops.c:984
 #, c-format
 msgid "Purging events in the calendar '%s'"
 msgstr "正在清空行事曆「%s」中的事件"
 
-#: ../calendar/gui/e-cal-ops.c:987
+#: ../calendar/gui/e-cal-ops.c:988
 #, c-format
 msgid "Purging memos in the memo list '%s'"
-msgstr "正在清空備忘錄清單「%s」中的備忘錄"
+msgstr "正在清空備忘錄列表「%s」中的備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:991
+#: ../calendar/gui/e-cal-ops.c:992
 #, c-format
 msgid "Purging tasks in the task list '%s'"
-msgstr "正在清空工作清單「%s」中的工作"
+msgstr "正在清空工作列表「%s」中的工作"
 
-#: ../calendar/gui/e-cal-ops.c:1091
+#: ../calendar/gui/e-cal-ops.c:1092
 msgid "Purging events"
 msgstr "正在清除事件"
 
-#: ../calendar/gui/e-cal-ops.c:1095
+#: ../calendar/gui/e-cal-ops.c:1096
 msgid "Purging memos"
 msgstr "正在清除備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:1099
+#: ../calendar/gui/e-cal-ops.c:1100
 msgid "Purging tasks"
 msgstr "正在清除工作"
 
-#: ../calendar/gui/e-cal-ops.c:1201
+#: ../calendar/gui/e-cal-ops.c:1202
 msgid "Expunging completed tasks"
 msgstr "清除已完成的工作"
 
-#: ../calendar/gui/e-cal-ops.c:2062
+#: ../calendar/gui/e-cal-ops.c:2033
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "移個 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:2063
+#: ../calendar/gui/e-cal-ops.c:2034
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "正在複製 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:2069
+#: ../calendar/gui/e-cal-ops.c:2040
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "正在移動 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:2070
+#: ../calendar/gui/e-cal-ops.c:2041
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "正在複製 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:2076
+#: ../calendar/gui/e-cal-ops.c:2047
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "正在移動 %d 項工作"
 
-#: ../calendar/gui/e-cal-ops.c:2077
+#: ../calendar/gui/e-cal-ops.c:2048
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -4784,15 +3709,1110 @@ msgstr ""
 "日期必須依此格式輸入:\n"
 "%s"
 
+#: ../calendar/gui/e-comp-editor-event.c:101
+msgid "Event's time is in the past"
+msgstr "事件的時刻在過去"
+
+#: ../calendar/gui/e-comp-editor-event.c:202
+msgid ""
+"Event cannot be edited, because the selected calendar could not be opened"
+msgstr "不能編輯事件,因為選取的行事曆無法開啟"
+
+#: ../calendar/gui/e-comp-editor-event.c:204
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "不能編輯事件,因為選取的行事曆是唯讀的"
+
+#: ../calendar/gui/e-comp-editor-event.c:206
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "不能完整的編輯事件,因為您不是召集人"
+
+#: ../calendar/gui/e-comp-editor-event.c:340
+#: ../calendar/gui/e-comp-editor-task.c:348
+msgid "Start date is not a valid date"
+msgstr "開始日期不是有效的日期"
+
+#: ../calendar/gui/e-comp-editor-event.c:342
+msgid "Start time is not a valid time"
+msgstr "開始時刻不是有效的時刻"
+
+#: ../calendar/gui/e-comp-editor-event.c:346
+#: ../calendar/gui/e-comp-editor-event.c:362
+#: ../calendar/gui/e-comp-editor-page-attachments.c:211
+#: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-reader-utils.c:650
+#: ../mail/mail-send-recv.c:486 ../mail/mail-send-recv.c:1285
+#: ../plugins/face/face.c:176 ../shell/e-shell.c:991 ../shell/e-shell.c:1013
+#: ../smime/gui/certificate-manager.c:346
+msgid "Unknown error"
+msgstr "不明的錯誤"
+
+#: ../calendar/gui/e-comp-editor-event.c:356
+msgid "End date is not a valid date"
+msgstr "結束日期不是有效的日期"
+
+#: ../calendar/gui/e-comp-editor-event.c:358
+msgid "End time is not a valid time"
+msgstr "結束時刻不是有效的時刻"
+
+#: ../calendar/gui/e-comp-editor-event.c:480
+#: ../calendar/gui/e-comp-editor-memo.c:106
+#: ../calendar/gui/e-comp-editor-task.c:406
+msgid "_Categories"
+msgstr "分類(_C)"
+
+#: ../calendar/gui/e-comp-editor-event.c:482
+#: ../calendar/gui/e-comp-editor-memo.c:108
+#: ../calendar/gui/e-comp-editor-task.c:408
+msgid "Toggles whether to display categories"
+msgstr "切換是否顯示「分類」"
+
+#: ../calendar/gui/e-comp-editor-event.c:488
+msgid "Time _Zone"
+msgstr "時區(_Z)"
+
+#: ../calendar/gui/e-comp-editor-event.c:490
+msgid "Toggles whether the time zone is displayed"
+msgstr "切換是否顯示「時區」"
+
+#: ../calendar/gui/e-comp-editor-event.c:496
+msgid "All _Day Event"
+msgstr "全天事件(_D)"
+
+#: ../calendar/gui/e-comp-editor-event.c:498
+msgid "Toggles whether to have All Day Event"
+msgstr "切換是否要有全天事件"
+
+#: ../calendar/gui/e-comp-editor-event.c:504
+msgid "Show Time as _Busy"
+msgstr "顯示時間為忙碌(_B)"
+
+#: ../calendar/gui/e-comp-editor-event.c:506
+msgid "Toggles whether to show time as busy"
+msgstr "切換是否將時間顯示為忙碌"
+
+#: ../calendar/gui/e-comp-editor-event.c:515
+msgid "Pu_blic"
+msgstr "公開(_B)"
+
+#: ../calendar/gui/e-comp-editor-event.c:517
+msgid "Classify as public"
+msgstr "分類為公開"
+
+#: ../calendar/gui/e-comp-editor-event.c:522
+msgid "_Private"
+msgstr "私人(_P)"
+
+#: ../calendar/gui/e-comp-editor-event.c:524
+msgid "Classify as private"
+msgstr "歸類為私人"
+
+#: ../calendar/gui/e-comp-editor-event.c:529
+msgid "_Confidential"
+msgstr "機密(_C)"
+
+#: ../calendar/gui/e-comp-editor-event.c:531
+msgid "Classify as confidential"
+msgstr "歸類為機密"
+
+#: ../calendar/gui/e-comp-editor-event.c:632
+msgctxt "ECompEditor"
+msgid "_Start time:"
+msgstr "開始時刻(_S):"
+
+#: ../calendar/gui/e-comp-editor-event.c:637
+msgctxt "ECompEditor"
+msgid "_End time:"
+msgstr "結束時刻(_E):"
+
+#: ../calendar/gui/e-comp-editor-event.c:647
+msgctxt "ECompEditor"
+msgid "All da_y event"
+msgstr "全天事件(_Y)"
+
+#: ../calendar/gui/e-comp-editor-event.c:700
+#: ../calendar/gui/e-comp-editor-memo.c:192
+#: ../calendar/gui/e-comp-editor-task.c:529
+msgctxt "ECompEditorPage"
+msgid "General"
+msgstr "一般"
+
+#: ../calendar/gui/e-comp-editor-event.c:703
+#: ../calendar/gui/e-comp-editor-task.c:535
+msgctxt "ECompEditorPage"
+msgid "Reminders"
+msgstr "提醒"
+
+#: ../calendar/gui/e-comp-editor-event.c:706
+msgctxt "ECompEditorPage"
+msgid "Recurrence"
+msgstr "週期性"
+
+#: ../calendar/gui/e-comp-editor-event.c:709
+#: ../calendar/gui/e-comp-editor-memo.c:195
+#: ../calendar/gui/e-comp-editor-task.c:538
+msgctxt "ECompEditorPage"
+msgid "Attachments"
+msgstr "附件"
+
+#: ../calendar/gui/e-comp-editor-event.c:719
+msgctxt "ECompEditorPage"
+msgid "Schedule"
+msgstr "排程"
+
+#: ../calendar/gui/e-comp-editor-event.c:748
+#, c-format
+msgid "Meeting - %s"
+msgstr "會議 - %s"
+
+#: ../calendar/gui/e-comp-editor-event.c:749
+#, c-format
+msgid "Appointment - %s"
+msgstr "會議 - %s"
+
+#: ../calendar/gui/e-comp-editor-memo.c:68
+msgid ""
+"Memo cannot be edited, because the selected memo list could not be opened"
+msgstr "不能編輯備忘錄,因為選取的備忘錄列表無法開啟"
+
+#: ../calendar/gui/e-comp-editor-memo.c:70
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "不能編輯備忘錄,因為選取的備忘錄列表是唯讀的"
+
+#: ../calendar/gui/e-comp-editor-memo.c:72
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "不能完整的編輯備忘錄,因為您不是召集人"
+
+#: ../calendar/gui/e-comp-editor-memo.c:168
+#: ../calendar/gui/e-comp-editor-task.c:468
+msgid "_List:"
+msgstr "列表(_L):"
+
+#: ../calendar/gui/e-comp-editor-memo.c:175
+#: ../calendar/gui/e-comp-editor-task.c:475
+msgctxt "ECompEditor"
+msgid "Sta_rt date:"
+msgstr "開始日期(_R):"
+
+#: ../calendar/gui/e-comp-editor-memo.c:223
+#, c-format
+msgid "Assigned Memo - %s"
+msgstr "指派的備忘錄 - %s"
+
+#: ../calendar/gui/e-comp-editor-memo.c:224
+#, c-format
+msgid "Memo - %s"
+msgstr "備忘錄 - %s"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:125
+#: ../calendar/gui/e-comp-editor-page-attachments.c:130
+#: ../em-format/e-mail-formatter-attachment.c:424
+#: ../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] "附件"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:206
+#: ../e-util/e-attachment.c:2542
+#, c-format
+msgid "Could not load '%s'"
+msgstr "無法載入「%s」"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:208
+#: ../e-util/e-attachment.c:2545
+#, c-format
+msgid "Could not load the attachment"
+msgstr "無法載入附件"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:413
+msgid ""
+"Some attachments are still being downloaded. Please wait until the download "
+"is finished."
+msgstr "還有一些需要下載的附件。請等候下載工作完成。"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:440
+#, c-format
+msgid "Attachment '%s' cannot be found, remove it from the list, please"
+msgstr "找不到附件「%s」,請將它從列表移除"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:457
+#, c-format
+msgid "Attachment '%s' doesn't have valid URI, remove it from the list, please"
+msgstr "附件「%s」沒有有效的 URI,請將它從列表移除"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:618
+#: ../composer/e-composer-actions.c:327
+msgid "_Attachment..."
+msgstr "附件(_A)…"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:620
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
+msgid "Attach a file"
+msgstr "附加檔案"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:627
+msgid "_Attachments"
+msgstr "附件(_A)"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:629
+msgid "Show attachments"
+msgstr "顯示附件"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:781
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
+msgid "Icon View"
+msgstr "圖示檢視"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:783
+#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
+msgid "List View"
+msgstr "列表檢視"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:313
+#, c-format
+msgid "Cannot find attendee '%s' in the list of attendees"
+msgstr "在出席者列表中找不到出席者 %s"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:320
+#, c-format
+msgid "Not enough rights to delete attendee '%s'"
+msgstr "沒有足夠的權限刪除出席者「%s」"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:350
+msgid "Failed to delete selected attendee"
+msgid_plural "Failed to delete selected attendees"
+msgstr[0] "刪除選取的出席者失敗"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:583
+msgid "A_ttendees"
+msgstr "出席者(_T)"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:585
+msgid "Toggles whether the Attendees are displayed"
+msgstr "切換是否顯示出席者"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:594
+msgid "R_ole Field"
+msgstr "角色欄位(_O)"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:596
+msgid "Toggles whether the Role field is displayed"
+msgstr "切換是否顯示「角色」欄位"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:602
+msgid "_RSVP"
+msgstr "_RSVP"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:604
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "切換是否顯示「RSVP」欄位"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:610
+msgid "_Status Field"
+msgstr "狀態欄位(_S)"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:612
+msgid "Toggles whether the Status field is displayed"
+msgstr "切換是否顯示「狀態」欄位"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:618
+msgid "_Type Field"
+msgstr "類型欄位(_T)"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:620
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "切換是否顯示「出席者類型」欄位"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:945
+msgid "An organizer is required."
+msgstr "需要一個召集人。"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:955
+#: ../calendar/gui/e-comp-editor-page-general.c:1086
+msgid "At least one attendee is required."
+msgstr "最少需要一個出席者。"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:1209
+msgid "Or_ganizer:"
+msgstr "會議召集人(_G):"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:1288
+msgctxt "ECompEditor"
+msgid "Atte_ndees..."
+msgstr "出席者(_N)…"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:326
+msgid "Add exception"
+msgstr "加入例外"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:364
+msgid "Modify exception"
+msgstr "編輯例外"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:489
+msgid "on"
+msgstr "的"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:570
+msgctxt "ECompEditorPageRecur"
+msgid "first"
+msgstr "第一個"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] 
[forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:576
+msgctxt "ECompEditorPageRecur"
+msgid "second"
+msgstr "第二個"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:581
+msgctxt "ECompEditorPageRecur"
+msgid "third"
+msgstr "第三個"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:586
+msgctxt "ECompEditorPageRecur"
+msgid "fourth"
+msgstr "第四個"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:591
+msgctxt "ECompEditorPageRecur"
+msgid "fifth"
+msgstr "第五個"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:596
+msgctxt "ECompEditorPageRecur"
+msgid "last"
+msgstr "最後一個"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:623
+msgctxt "ECompEditorPageRecur"
+msgid "Other Date"
+msgstr "其他日期"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:629
+msgctxt "ECompEditorPageRecur"
+msgid "1st to 10th"
+msgstr "1日到 10 日"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:635
+msgctxt "ECompEditorPageRecur"
+msgid "11th to 20th"
+msgstr "11日到 20 日"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:641
+msgctxt "ECompEditorPageRecur"
+msgid "21st to 31st"
+msgstr "21日到 31 日"
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:667
+msgctxt "ECompEditorPageRecur"
+msgid "day"
+msgstr "天"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+msgctxt "ECompEditorPageRecur"
+msgid "Monday"
+msgstr "星期一"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+msgctxt "ECompEditorPageRecur"
+msgid "Tuesday"
+msgstr "星期二"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+msgctxt "ECompEditorPageRecur"
+msgid "Wednesday"
+msgstr "星期三"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+msgctxt "ECompEditorPageRecur"
+msgid "Thursday"
+msgstr "星期四"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+msgctxt "ECompEditorPageRecur"
+msgid "Friday"
+msgstr "星期五"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+msgctxt "ECompEditorPageRecur"
+msgid "Saturday"
+msgstr "星期六"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+msgctxt "ECompEditorPageRecur"
+msgid "Sunday"
+msgstr "星期日"
+
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:803
+msgctxt "ECompEditorPageRecur"
+msgid "on the"
+msgstr "在"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:993
+msgctxt "ECompEditorPageRecur"
+msgid "occurrences"
+msgstr "次"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1486
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2016
+msgctxt "ECompEditorPageRecur"
+msgid "This appointment rec_urs"
+msgstr "這個會議的週期為(_U)"
+
+#. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1491
+msgctxt "ECompEditorPageRecur"
+msgid "This task rec_urs"
+msgstr "這個工作的週期為(_U)"
+
+#. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1496
+msgctxt "ECompEditorPageRecur"
+msgid "This memo rec_urs"
+msgstr "這個備忘錄的週期為(_U)"
+
+#. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1501
+msgctxt "ECompEditorPageRecur"
+msgid "This component rec_urs"
+msgstr "這個元件的週期為(_U)"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1862
+msgid "Recurrence exception date is invalid"
+msgstr "週期的例外日期是無效的"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1910
+msgid "End time of the recurrence is before the start"
+msgstr "週期性事件的結束時刻早於開始時刻"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1953
+msgid "R_ecurrence"
+msgstr "週期性(_E)"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1955
+msgid "Set or unset recurrence"
+msgstr "設定或取消設定週期性"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2056
+msgctxt "ECompEditorPageRecur"
+msgid "Every"
+msgstr "每"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2091
+msgctxt "ECompEditorPageRecur"
+msgid "day(s)"
+msgstr "天"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2093
+msgctxt "ECompEditorPageRecur"
+msgid "week(s)"
+msgstr "週"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2095
+msgctxt "ECompEditorPageRecur"
+msgid "month(s)"
+msgstr "個月"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2097
+msgctxt "ECompEditorPageRecur"
+msgid "year(s)"
+msgstr "年"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2126
+msgctxt "ECompEditorPageRecur"
+msgid "for"
+msgstr "共"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2128
+msgctxt "ECompEditorPageRecur"
+msgid "until"
+msgstr "直到"
+
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2130
+msgctxt "ECompEditorPageRecur"
+msgid "forever"
+msgstr "永遠"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2146
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Evolution 無法編輯這個週期性會議。"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2163
+msgid "Exceptions"
+msgstr "例外"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1778
+#: ../mail/mail-config.ui.h:62
+msgid "A_dd"
+msgstr "加入(_A)"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2248
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1786
+#: ../mail/mail-config.ui.h:64
+msgid "Re_move"
+msgstr "移除(_M)"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2256
+msgid "Preview"
+msgstr "預覽"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:41
+msgid "Send To"
+msgstr "傳送到"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1555
+msgid "_Reminders"
+msgstr "提醒(_R)"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1557
+msgid "Set or unset reminders"
+msgstr "設定或取消設定提醒"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1610
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
+msgid "Reminders"
+msgstr "提醒"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1639
+msgid "_Reminder"
+msgstr "提醒(_R)"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1672
+#, c-format
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "%d 天前"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1679
+#, c-format
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "%d 小時前"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1686
+#, c-format
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "%d 分鐘前"
+
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1694
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "沒有"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1696
+msgctxt "cal-reminders"
+msgid "15 minutes before"
+msgstr "15 分鐘前"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1698
+msgctxt "cal-reminders"
+msgid "1 hour before"
+msgstr "1 小時前"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1700
+msgctxt "cal-reminders"
+msgid "1 day before"
+msgstr "1 天前"
+
+#. Translators: "Custom" for "Custom reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1712
+msgctxt "cal-reminders"
+msgid "Custom"
+msgstr "自訂"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1863
+msgctxt "cal-reminders"
+msgid "minute(s)"
+msgstr "分鐘"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1865
+msgctxt "cal-reminders"
+msgid "hour(s)"
+msgstr "小时"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1867
+msgctxt "cal-reminders"
+msgid "day(s)"
+msgstr "天"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1884
+msgctxt "cal-reminders"
+msgid "before"
+msgstr "早於"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1886
+msgctxt "cal-reminders"
+msgid "after"
+msgstr "晚於"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1902
+msgctxt "cal-reminders"
+msgid "start"
+msgstr "開始"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1904
+msgctxt "cal-reminders"
+msgid "end"
+msgstr "結束"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1927
+msgid "Re_peat the reminder"
+msgstr "重複提醒(_P)"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1952
+msgctxt "cal-reminders"
+msgid "extra times every"
+msgstr "一次於每"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1989
+msgctxt "cal-reminders"
+msgid "minutes"
+msgstr "分鐘"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1991
+msgctxt "cal-reminders"
+msgid "hours"
+msgstr "小時"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1993
+msgctxt "cal-reminders"
+msgid "days"
+msgstr "天"
+
+#. page_reminders->priv->custom_email_entry is initialized on demand
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2034
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2191
+msgctxt "cal-reminders"
+msgid "Custom _message"
+msgstr "自訂訊息(_M)"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2078
+msgctxt "cal-reminders"
+msgid "Custom reminder _sound"
+msgstr "自訂提醒音效(_S)"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2089
+msgid "Select a sound file"
+msgstr "選擇聲音檔案"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2117
+msgid "_Program:"
+msgstr "執行程式(_P):"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2142
+msgid "_Arguments:"
+msgstr "引數(_A):"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2174
+msgid "_Send To:"
+msgstr "傳送到(_T):"
+
+#: ../calendar/gui/e-comp-editor-page-schedule.c:427
+msgid "_Schedule"
+msgstr "排程(_S)"
+
+#: ../calendar/gui/e-comp-editor-page-schedule.c:429
+msgid "Query free / busy information for the attendees"
+msgstr "查詢此出席者的空閒/忙碌資訊"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:81
+msgctxt "ECompEditor"
+msgid "_Summary:"
+msgstr "摘要(_S):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:325
+msgctxt "ECompEditor"
+msgid "_Location:"
+msgstr "位置(_L):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:458
+msgctxt "ECompEditor"
+msgid "_Categories..."
+msgstr "分類(_C)…"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:555
+msgctxt "ECompEditor"
+msgid "_Description:"
+msgstr "描述(_D):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:686
+msgctxt "ECompEditor"
+msgid "_Web page:"
+msgstr "網頁(_W):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1057
+msgctxt "ECompEditor"
+msgid "D_ue date:"
+msgstr "到期日(_U):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1117
+msgctxt "ECompEditor"
+msgid "Date _completed:"
+msgstr "完成日期(_C):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1133
+msgctxt "ECompEditor"
+msgid "Public"
+msgstr "公開"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1134
+msgctxt "ECompEditor"
+msgid "Private"
+msgstr "私人"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1135
+msgctxt "ECompEditor"
+msgid "Confidential"
+msgstr "機密"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1144
+msgctxt "ECompEditor"
+msgid "C_lassification:"
+msgstr "歸類(_L):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1157
+msgctxt "ECompEditor"
+msgid "Not Started"
+msgstr "未開始"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1158
+msgctxt "ECompEditor"
+msgid "In Progress"
+msgstr "進行中"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1159
+msgctxt "ECompEditor"
+msgid "Completed"
+msgstr "已完成"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1160
+msgctxt "ECompEditor"
+msgid "Canceled"
+msgstr "已取消"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1169
+msgctxt "ECompEditor"
+msgid "_Status:"
+msgstr "狀態(_S):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1199
+msgctxt "ECompEditor"
+msgid "Undefined"
+msgstr "未定義"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1200
+msgctxt "ECompEditor"
+msgid "High"
+msgstr "高"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1201
+msgctxt "ECompEditor"
+msgid "Normal"
+msgstr "普通"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1202
+msgctxt "ECompEditor"
+msgid "Low"
+msgstr "低"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1211
+msgctxt "ECompEditor"
+msgid "Priorit_y:"
+msgstr "優先等級(_Y):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1265
+msgctxt "ECompEditor"
+msgid "Percent complete:"
+msgstr "完成百分比:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1346
+msgctxt "ECompEditor"
+msgid "Time _zone:"
+msgstr "時區(_Z):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1471
+msgctxt "ECompEditor"
+msgid "Show time as _busy"
+msgstr "顯示時間為忙碌(_B)"
+
+#: ../calendar/gui/e-comp-editor-task.c:75
+msgid "Task's start date is in the past"
+msgstr "工作的開始時刻在過去"
+
+#: ../calendar/gui/e-comp-editor-task.c:83
+msgid "Task's due date is in the past"
+msgstr "工作的結束時刻在過去"
+
+#: ../calendar/gui/e-comp-editor-task.c:308
+msgid ""
+"Task cannot be edited, because the selected task list could not be opened"
+msgstr "不能編輯工作,因為選取的工作列表無法開啟"
+
+#: ../calendar/gui/e-comp-editor-task.c:310
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "不能編輯工作,因為選取的工作列表是唯讀的"
+
+#: ../calendar/gui/e-comp-editor-task.c:312
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "不能完整的編輯工作,因為您不是召集人"
+
+#: ../calendar/gui/e-comp-editor-task.c:359
+msgid "Due date is not a valid date"
+msgstr "到期日不是有效的日期"
+
+#: ../calendar/gui/e-comp-editor-task.c:370
+msgid "Completed date is not a valid date"
+msgstr "完成日不是有效的日期"
+
+#: ../calendar/gui/e-comp-editor-task.c:381
+msgid "Completed date cannot be in the future"
+msgstr "完成日期不能是未來日期"
+
+#: ../calendar/gui/e-comp-editor-task.c:566
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "指派的工作 - %s"
+
+#: ../calendar/gui/e-comp-editor-task.c:567
+#, c-format
+msgid "Task - %s"
+msgstr "工作 - %s"
+
+#: ../calendar/gui/e-comp-editor.c:254
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
+msgid "attachment"
+msgstr "附件"
+
+#: ../calendar/gui/e-comp-editor.c:609
+msgid "Sending notifications to attendees..."
+msgstr "傳送通知給出席者…"
+
+#: ../calendar/gui/e-comp-editor.c:991
+msgid "Saving changes..."
+msgstr "正在儲存變更…"
+
+#: ../calendar/gui/e-comp-editor.c:1247
+msgid "No Summary"
+msgstr "沒有摘要"
+
+#. == Button box ==
+#: ../calendar/gui/e-comp-editor.c:1972 ../composer/e-composer-actions.c:334
+#: ../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:391
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
+#: ../mail/e-mail-notes.c:903 ../mail/em-folder-properties.c:688
+#: ../mail/em-subscription-editor.c:1759
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
+#: ../smime/gui/certificate-manager.c:2068
+msgid "_Close"
+msgstr "關閉(_C)"
+
+#: ../calendar/gui/e-comp-editor.c:1974
+msgid "Close the current window"
+msgstr "關閉目前的視窗"
+
+#. copy menu item
+#: ../calendar/gui/e-comp-editor.c:1979 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
+#: ../e-util/e-web-view.c:379 ../mail/e-mail-browser.c:136
+#: ../mail/mail.error.xml.h:142 ../shell/e-shell-window-actions.c:799
+msgid "_Copy"
+msgstr "複製(_C)"
+
+#: ../calendar/gui/e-comp-editor.c:1981 ../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:381
+#: ../e-util/e-web-view.c:1420 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:801
+msgid "Copy the selection"
+msgstr "複製選取的內容"
+
+#. cut menu item
+#: ../calendar/gui/e-comp-editor.c:1986 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
+#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
+msgid "Cu_t"
+msgstr "剪下(_T)"
+
+#: ../calendar/gui/e-comp-editor.c:1988 ../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:1414
+#: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
+msgid "Cut the selection"
+msgstr "剪下選取範圍"
+
+#: ../calendar/gui/e-comp-editor.c:1995 ../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:815
+msgid "Delete the selection"
+msgstr "刪除選取範圍"
+
+#: ../calendar/gui/e-comp-editor.c:2002
+msgid "View help"
+msgstr "檢視求助"
+
+#. paste menu item
+#: ../calendar/gui/e-comp-editor.c:2007 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
+#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
+msgid "_Paste"
+msgstr "貼上(_P)"
+
+#: ../calendar/gui/e-comp-editor.c:2009 ../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:1426
+#: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
+msgid "Paste the clipboard"
+msgstr "貼上剪貼簿的內容"
+
+#: ../calendar/gui/e-comp-editor.c:2014 ../composer/e-composer-actions.c:388
+#: ../mail/e-mail-reader.c:2287
+#: ../modules/addressbook/e-book-shell-view-actions.c:1231
+#: ../modules/addressbook/e-book-shell-view-actions.c:1245
+msgid "_Print..."
+msgstr "列印(_P)…"
+
+#: ../calendar/gui/e-comp-editor.c:2021 ../mail/e-mail-reader.c:2294
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
+msgid "Pre_view..."
+msgstr "預覽(_V)…"
+
+#: ../calendar/gui/e-comp-editor.c:2028 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:389
+#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
+msgid "Select _All"
+msgstr "全部選取(_A)"
+
+#: ../calendar/gui/e-comp-editor.c:2030 ../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:159 ../shell/e-shell-window-actions.c:913
+msgid "Select all text"
+msgstr "選取所有文字"
+
+#: ../calendar/gui/e-comp-editor.c:2051
+msgid "_Classification"
+msgstr "歸類(_C)"
+
+#: ../calendar/gui/e-comp-editor.c:2065 ../e-util/e-html-editor-actions.c:1127
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:166
+#: ../mail/e-mail-notes.c:917 ../shell/e-shell-window-actions.c:948
+msgid "_File"
+msgstr "檔案(_F)"
+
+#: ../calendar/gui/e-comp-editor.c:2079 ../e-util/e-html-editor-actions.c:1148
+msgid "_Insert"
+msgstr "插入(_I)"
+
+#: ../calendar/gui/e-comp-editor.c:2086 ../composer/e-composer-actions.c:378
+msgid "_Options"
+msgstr "選項(_O)"
+
+#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1169
+#: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
+#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
+msgid "_View"
+msgstr "檢視(_V)"
+
+#: ../calendar/gui/e-comp-editor.c:2105
+msgid "Save current changes"
+msgstr "儲存目前的變更"
+
+#: ../calendar/gui/e-comp-editor.c:2110 ../e-util/e-mail-signature-editor.c:304
+#: ../mail/e-mail-notes.c:912
+msgid "Save and Close"
+msgstr "儲存並關閉"
+
+#: ../calendar/gui/e-comp-editor.c:2112
+msgid "Save current changes and close editor"
+msgstr "儲存目前的變更並且關閉編輯器"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2138 ../calendar/gui/e-week-view.c:1694
+#: ../calendar/gui/e-day-view.c:2133 ../calendar/gui/e-week-view.c:1728
 #: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
 #: ../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:2141 ../calendar/gui/e-week-view.c:1697
+#: ../calendar/gui/e-day-view.c:2136 ../calendar/gui/e-week-view.c:1731
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
 #: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
@@ -4804,13 +4824,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:3019 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-day-view.c:3014 ../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:3744
+#: ../calendar/gui/e-day-view.c:3739
 #, c-format
 msgid "Week %d"
 msgstr "第 %d 週"
@@ -4821,27 +4841,27 @@ 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:804
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "間隔 %02i 分鐘"
 
-#: ../calendar/gui/e-day-view-time-item.c:829
+#: ../calendar/gui/e-day-view-time-item.c:831
 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:846
-#: ../modules/calendar/e-calendar-preferences.c:308
-#: ../modules/calendar/e-calendar-preferences.c:360
+#: ../calendar/gui/e-day-view-time-item.c:848
+#: ../modules/calendar/e-calendar-preferences.c:303
+#: ../modules/calendar/e-calendar-preferences.c:355
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "沒有"
 
-#: ../calendar/gui/e-day-view-time-item.c:880
+#: ../calendar/gui/e-day-view-time-item.c:882
 #: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:391
+#: ../modules/calendar/e-calendar-preferences.c:386
 msgid "Select..."
 msgstr "選擇…"
 
@@ -4861,6 +4881,10 @@ msgstr "列席者"
 msgid "Resources"
 msgstr "資源"
 
+#: ../calendar/gui/e-meeting-list-view.c:164
+msgid "Attendees"
+msgstr "出席者"
+
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
 #: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
@@ -4915,11 +4939,20 @@ msgstr "缺席者"
 msgid "Needs Action"
 msgstr "需要動作"
 
-#: ../calendar/gui/e-meeting-list-view.c:644
+#: ../calendar/gui/e-meeting-list-view.c:619
 msgid "Attendee                          "
-msgstr "到會者"
+msgstr "出席者"
+
+#: ../calendar/gui/e-meeting-list-view.c:645
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-task-table.etspec.h:3
+#: ../e-util/e-attachment-tree-view.c:591
+#: ../mail/e-mail-account-tree-view.c:157
+msgid "Type"
+msgstr "類型"
 
-#: ../calendar/gui/e-meeting-list-view.c:699
+#: ../calendar/gui/e-meeting-list-view.c:674
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
@@ -4952,59 +4985,63 @@ msgstr "不在辦公室"
 msgid "No Information"
 msgstr "沒有資訊"
 
+#: ../calendar/gui/e-meeting-time-sel.c:555
+msgid "Atte_ndees..."
+msgstr "出席者(_N)…"
+
 #: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "選項(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:594
+#: ../calendar/gui/e-meeting-time-sel.c:595
 msgid "Show _only working hours"
 msgstr "只顯示工作時間(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "顯示縮小(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:625
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_Update free/busy"
 msgstr "更新空閒/忙碌(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:662
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:679
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:700
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:711
+#: ../calendar/gui/e-meeting-time-sel.c:713
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:722
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:732
+#: ../calendar/gui/e-meeting-time-sel.c:734
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:771
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:800
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2721
+#: ../calendar/gui/e-meeting-time-sel.c:2727
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5013,14 +5050,14 @@ msgstr ""
 "摘要:%s\n"
 "位置:%s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2723 ../calendar/gui/print.c:3516
+#: ../calendar/gui/e-meeting-time-sel.c:2729 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要:%s"
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
-msgstr "按這裡新增到會者"
+msgstr "按這裡新增出席者"
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Member"
@@ -5042,46 +5079,46 @@ msgstr "普通名稱"
 msgid "Language"
 msgstr "語言"
 
-#: ../calendar/gui/e-memo-table.c:371
-#: ../modules/calendar/e-cal-shell-content.c:1599
-#: ../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
+#: ../calendar/gui/e-memo-table.c:370
+#: ../modules/calendar/e-cal-shell-content.c:1632
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view.c:315
 msgid "Memos"
 msgstr "備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:455 ../calendar/gui/e-task-table.c:757
+#: ../calendar/gui/e-memo-table.c:454 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr "* 沒有摘要 *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:540 ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-memo-table.c:539 ../calendar/gui/e-task-table.c:839
 msgid "Start: "
 msgstr "開始:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:560 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:559 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "到期:"
 
-#: ../calendar/gui/e-memo-table.c:683
+#: ../calendar/gui/e-memo-table.c:682
 msgid "Cut selected memos to the clipboard"
 msgstr "剪下選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:689
+#: ../calendar/gui/e-memo-table.c:688
 msgid "Copy selected memos to the clipboard"
 msgstr "複製選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:695
+#: ../calendar/gui/e-memo-table.c:694
 msgid "Paste memos from the clipboard"
 msgstr "從剪貼簿貼上備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:701
-#: ../modules/calendar/e-memo-shell-view-actions.c:531
+#: ../calendar/gui/e-memo-table.c:700
+#: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "刪除選定的備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:706
 msgid "Select all visible memos"
 msgstr "選擇全部可見的備忘錄"
 
@@ -5089,6 +5126,11 @@ msgstr "選擇全部可見的備忘錄"
 msgid "Click to add a memo"
 msgstr "請按這裡增加新的備忘錄"
 
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "未指定"
+
 #. Translators: "%d%%" is the percentage of a task done.
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
@@ -5099,13 +5141,13 @@ msgid "%d%%"
 msgstr "%d%%"
 
 #: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
-#: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1062
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
-#: ../modules/calendar/e-cal-shell-content.c:1559
-#: ../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
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1117
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-cal-shell-content.c:1592
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view.c:473
 msgid "Tasks"
 msgstr "工作"
 
@@ -5122,7 +5164,7 @@ msgid "Paste tasks from the clipboard"
 msgstr "從剪貼簿貼上工作"
 
 #: ../calendar/gui/e-task-table.c:1016
-#: ../modules/calendar/e-task-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
 
@@ -5130,6 +5172,36 @@ msgstr "刪除選定的工作"
 msgid "Select all visible tasks"
 msgstr "選擇全部可見的工作"
 
+#: ../calendar/gui/e-task-table.etspec.h:1
+msgid "Click to add a task"
+msgstr "請按這裡增加新的工作"
+
+#: ../calendar/gui/e-task-table.etspec.h:2
+msgid "Start date"
+msgstr "開始日期"
+
+#: ../calendar/gui/e-task-table.etspec.h:5
+msgid "Completion date"
+msgstr "完成日期"
+
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:965
+msgid "Complete"
+msgstr "完成"
+
+#: ../calendar/gui/e-task-table.etspec.h:7
+msgid "Due date"
+msgstr "到期日"
+
+#: ../calendar/gui/e-task-table.etspec.h:9
+#, no-c-format
+msgid "% Complete"
+msgstr "% 完成"
+
+#: ../calendar/gui/e-task-table.etspec.h:10 ../calendar/gui/tasktypes.xml.h:18
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Priority"
+msgstr "優先等級"
+
 #: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "選擇一個時區"
@@ -5141,32 +5213,32 @@ msgstr "選擇一個時區"
 msgid "%d %B"
 msgstr "%m月%d日"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:842
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:699
 msgid "At least one attendee is necessary"
-msgstr "至少需要一個到會者"
+msgstr "至少需要一個出席者"
 
-#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:930 ../calendar/gui/itip-utils.c:1091
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
+#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
 msgid "Memo information"
 msgstr "備忘錄資訊"
 
-#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
+#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:942
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
@@ -5174,7 +5246,7 @@ msgstr "行事曆資訊"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:979
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "已接受"
@@ -5183,7 +5255,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:985
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
@@ -5195,7 +5267,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:992 ../calendar/gui/itip-utils.c:1040
+#: ../calendar/gui/itip-utils.c:993 ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "已拒絕"
@@ -5204,7 +5276,7 @@ msgstr "已拒絕"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:999
+#: ../calendar/gui/itip-utils.c:1000
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已委派"
@@ -5212,7 +5284,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:1012
+#: ../calendar/gui/itip-utils.c:1013
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已更新"
@@ -5220,7 +5292,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:1019
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -5228,7 +5300,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:1026
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "重新整理"
@@ -5236,42 +5308,42 @@ 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:1033
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:1111
+#: ../calendar/gui/itip-utils.c:1112
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:1119
+#: ../calendar/gui/itip-utils.c:1120
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: ../calendar/gui/itip-utils.c:1148
+#: ../calendar/gui/itip-utils.c:1149
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "無法取得資源,新的事件與其他事件有所重疊。"
 
-#: ../calendar/gui/itip-utils.c:1153
+#: ../calendar/gui/itip-utils.c:1154
 msgid "Unable to book a resource, error: "
 msgstr "無法預訂資源,錯誤為:"
 
-#: ../calendar/gui/itip-utils.c:1324
+#: ../calendar/gui/itip-utils.c:1325
 msgid "You must be an attendee of the event."
-msgstr "您必須是此事件的到會者。"
+msgstr "您必須是此事件的出席者。"
 
-#: ../calendar/gui/itip-utils.c:1918
+#: ../calendar/gui/itip-utils.c:1933
 msgid "Sending an event"
 msgstr "正在傳送事件"
 
-#: ../calendar/gui/itip-utils.c:1922
+#: ../calendar/gui/itip-utils.c:1937
 msgid "Sending a memo"
 msgstr "正在傳送備忘錄"
 
-#: ../calendar/gui/itip-utils.c:1926
+#: ../calendar/gui/itip-utils.c:1941
 msgid "Sending a task"
 msgstr "正在傳送工作"
 
@@ -5469,9 +5541,21 @@ msgstr "(期限 "
 msgid "Due "
 msgstr "期限 "
 
+#: ../calendar/gui/print.c:3486
+msgid "Appointment"
+msgstr "會議"
+
+#: ../calendar/gui/print.c:3488 ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "工作"
+
+#: ../calendar/gui/print.c:3490
+msgid "Memo"
+msgstr "備忘錄"
+
 #: ../calendar/gui/print.c:3546
 msgid "Attendees: "
-msgstr "到會者:"
+msgstr "出席者:"
 
 #: ../calendar/gui/print.c:3590
 #, c-format
@@ -5521,185 +5605,205 @@ msgstr "大於"
 msgid "is less than"
 msgstr "小於"
 
-#: ../calendar/importers/icalendar-importer.c:77
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
-msgstr "約會和會議"
+msgstr "會議和會議"
+
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../modules/calendar/e-cal-base-shell-backend.c:183
+#: ../modules/calendar/e-cal-shell-view-actions.c:180
+msgid "New Calendar"
+msgstr "新行事曆"
+
+#: ../calendar/importers/icalendar-importer.c:315
+#: ../modules/calendar/e-cal-base-shell-backend.c:191
+#: ../modules/calendar/e-task-shell-view-actions.c:204
+msgid "New Task List"
+msgstr "新增工作列表"
 
-#: ../calendar/importers/icalendar-importer.c:452
-#: ../calendar/importers/icalendar-importer.c:891
+#: ../calendar/importers/icalendar-importer.c:357
+msgid "Cre_ate new calendar"
+msgstr "建立新行事曆(_A)"
+
+#: ../calendar/importers/icalendar-importer.c:361
+msgid "Cre_ate new task list"
+msgstr "建立新工作列表(_A)"
+
+#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
-#: ../calendar/importers/icalendar-importer.c:600
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 檔案 (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:601
+#: ../calendar/importers/icalendar-importer.c:656
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸入器"
 
-#: ../calendar/importers/icalendar-importer.c:693
+#: ../calendar/importers/icalendar-importer.c:748
 msgid "Reminder!"
 msgstr "提醒!"
 
-#: ../calendar/importers/icalendar-importer.c:777
+#: ../calendar/importers/icalendar-importer.c:832
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar 檔案 (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:778
+#: ../calendar/importers/icalendar-importer.c:833
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸入器"
 
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../calendar/importers/icalendar-importer.c:1110
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
-#: ../calendar/importers/icalendar-importer.c:1098
-msgid "Gnome Calendar"
-msgstr "Gnome 行事曆"
+#: ../calendar/importers/icalendar-importer.c:1153
+msgid "GNOME Calendar"
+msgstr "GNOME Calendar"
 
-#: ../calendar/importers/icalendar-importer.c:1099
+#: ../calendar/importers/icalendar-importer.c:1154
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
 
-#: ../calendar/importers/icalendar-importer.c:1170
-#: ../calendar/importers/icalendar-importer.c:1484
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "會議"
 
-#: ../calendar/importers/icalendar-importer.c:1170
-#: ../calendar/importers/icalendar-importer.c:1484
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
-#: ../calendar/importers/icalendar-importer.c:1173
-#: ../calendar/importers/icalendar-importer.c:1485
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "工作"
 
-#: ../calendar/importers/icalendar-importer.c:1176
-#: ../calendar/importers/icalendar-importer.c:1486
+#: ../calendar/importers/icalendar-importer.c:1231
+#: ../calendar/importers/icalendar-importer.c:1541
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "備忘錄"
 
-#: ../calendar/importers/icalendar-importer.c:1185
+#: ../calendar/importers/icalendar-importer.c:1240
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "具有週期性"
 
-#: ../calendar/importers/icalendar-importer.c:1190
+#: ../calendar/importers/icalendar-importer.c:1245
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "是一個實體"
 
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1250
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "具有提醒"
 
-#: ../calendar/importers/icalendar-importer.c:1200
+#: ../calendar/importers/icalendar-importer.c:1255
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "具有附件"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1213
+#: ../calendar/importers/icalendar-importer.c:1268
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "公開"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1216
+#: ../calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "私人"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1219
+#: ../calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "機密"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1223
+#: ../calendar/importers/icalendar-importer.c:1278
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "歸類"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1228
-#: ../calendar/importers/icalendar-importer.c:1528
+#: ../calendar/importers/icalendar-importer.c:1283
+#: ../calendar/importers/icalendar-importer.c:1583
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "摘要"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1234
+#: ../calendar/importers/icalendar-importer.c:1289
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "位置"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1242
-#: ../calendar/importers/icalendar-importer.c:1523
+#: ../calendar/importers/icalendar-importer.c:1297
+#: ../calendar/importers/icalendar-importer.c:1578
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "開始"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1253
+#: ../calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "到期"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1265
+#: ../calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "End"
 msgstr "結束"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1330
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "分類"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1299
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1307
+#: ../calendar/importers/icalendar-importer.c:1362
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1318
-#: ../calendar/importers/icalendar-importer.c:1321
+#: ../calendar/importers/icalendar-importer.c:1373
+#: ../calendar/importers/icalendar-importer.c:1376
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "會議召集人"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1341
-#: ../calendar/importers/icalendar-importer.c:1344
+#: ../calendar/importers/icalendar-importer.c:1396
+#: ../calendar/importers/icalendar-importer.c:1399
 msgctxt "iCalImp"
 msgid "Attendees"
-msgstr "到會者"
+msgstr "出席者"
 
-#: ../calendar/importers/icalendar-importer.c:1358
+#: ../calendar/importers/icalendar-importer.c:1413
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "描述"
 
-#: ../calendar/importers/icalendar-importer.c:1518
+#: ../calendar/importers/icalendar-importer.c:1573
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "類型"
@@ -7267,7 +7371,7 @@ msgstr "撰寫新郵件(_M)"
 msgid "Open New Message window"
 msgstr "開啟新的郵件視窗"
 
-#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1208
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1216
 #: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
@@ -7412,6 +7516,10 @@ msgstr "回覆欄位(_R)"
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
+#: ../composer/e-composer-actions.c:612
+msgid "Attach"
+msgstr "附加"
+
 #: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr "儲存草稿"
@@ -7419,8 +7527,8 @@ msgstr "儲存草稿"
 #: ../composer/e-composer-from-header.c:109
 #: ../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:319
-#: ../mail/e-mail-config-summary-page.c:331
+#: ../mail/e-mail-config-identity-page.c:323
+#: ../mail/e-mail-config-summary-page.c:332
 msgid "_Name:"
 msgstr "名稱(_N):"
 
@@ -7437,7 +7545,7 @@ msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
-"輸入郵件密件副本的收件者,他們會收到這封郵件但不會出現在郵件的收件者清單"
+"輸入郵件密件副本的收件者,他們會收到這封郵件但不會出現在郵件的收件者列表"
 
 #: ../composer/e-composer-header-table.c:829
 msgid "Fr_om:"
@@ -7468,7 +7576,7 @@ msgid "S_ubject:"
 msgstr "主旨(_U):"
 
 #: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:504
+#: ../mail/e-mail-config-identity-page.c:516
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
@@ -7480,24 +7588,24 @@ msgstr "按這裡新增目錄服務"
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡,選取要張貼的資料夾"
 
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:874
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署送出的郵件:此帳號沒有設定簽章憑證"
 
-#: ../composer/e-msg-composer.c:881
+#: ../composer/e-msg-composer.c:883
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "無法加密送出的郵件:沒有設定加密憑證(此帳號)"
 
-#: ../composer/e-msg-composer.c:1595 ../composer/e-msg-composer.c:2367
+#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2645
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4710
+#: ../composer/e-msg-composer.c:4995
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "郵件編輯器包含不能編輯的非文字的郵件內文。"
 
@@ -7545,22 +7653,12 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "儲存至自動儲存時發生錯誤,因為「{1}」。"
 
 #: ../composer/mail-composer.error.xml.h:11
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "下載尚在進行中。是否寄出郵件?"
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr "這裡有一些附件要下載。傳送此郵件將無法一併寄出接下來的附件"
-
-#: ../composer/mail-composer.error.xml.h:14
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "確定要放棄正在撰寫,標題為 ‘{0}’ 的郵件?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:12
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -7570,81 +7668,81 @@ msgstr ""
 "稿可以讓您以後再繼續撰寫郵件。"
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:15
 msgid "_Continue Editing"
 msgstr "繼續編輯(_C)"
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 msgid "_Save Draft"
 msgstr "儲存草稿(_S)"
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:17
 msgid "Are you sure you want to discard the message you are composing?"
 msgstr "確定要放棄正在撰寫的郵件?"
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:18
 msgid "Could not create message."
 msgstr "無法建立郵件。"
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:19
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "因為「{0}」,所以您可能需要選取不同的郵件選項。"
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "無法讀取簽名檔「{0}」。"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:21
 msgid "All accounts have been removed."
 msgstr "所有帳號已經移除。"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "撰寫郵件前,您需要先設定帳號。"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:23
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "當儲存到您的寄件資料夾時發生錯誤。"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:24
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "回報的錯誤為 &quot;{0}&quot;。郵件尚未寄出。"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:25
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "當儲存到您的草稿資料夾時發生錯誤。"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:26
 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:30
+#: ../composer/mail-composer.error.xml.h:27
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "在寄信時發生錯誤。您要如何繼續?"
 
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:170
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:171
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "回報的錯誤為 &quot;{0}&quot;。"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Save to Outbox"
 msgstr "儲存到寄件匣(_S)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Try Again"
 msgstr "再試一次(_T)"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:31
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "您的郵件已送出,但是在後續處理期間發生錯誤。"
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:32
 msgid "Saving message to Outbox."
 msgstr "儲存郵件到寄件匣。"
 
-#: ../composer/mail-composer.error.xml.h:36
+#: ../composer/mail-composer.error.xml.h:33
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -7653,11 +7751,11 @@ msgstr ""
 "因為目的端服務目前無法使用,這個郵件會儲存在您本地端的寄件資料夾裡。當您回到"
 "線上工作,您可以點選 Evolution 工具列的傳送/接收按鈕來寄出郵件。"
 
-#: ../composer/mail-composer.error.xml.h:37
+#: ../composer/mail-composer.error.xml.h:34
 msgid "Are you sure you want to send the message?"
 msgstr "確定要傳送郵件?"
 
-#: ../composer/mail-composer.error.xml.h:38
+#: ../composer/mail-composer.error.xml.h:35
 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."
@@ -7665,21 +7763,21 @@ msgstr ""
 "用來傳送郵件的鍵盤快捷鍵已被按下。如果是不小心按下的,可以取消此郵件的傳送,"
 "如果不是則送出此郵件。"
 
-#: ../composer/mail-composer.error.xml.h:39
+#: ../composer/mail-composer.error.xml.h:37
 msgid "Are you sure you want to change the composer mode?"
 msgstr "您確定要改變編輯器模式?"
 
-#: ../composer/mail-composer.error.xml.h:40
+#: ../composer/mail-composer.error.xml.h:38
 msgid ""
 "Turning HTML mode off will cause the text to lose all formatting. Do you "
 "want to continue?"
 msgstr "關閉 HTML 模式會使得文字失去所有的格式。您想要繼續嗎?"
 
-#: ../composer/mail-composer.error.xml.h:41
+#: ../composer/mail-composer.error.xml.h:39
 msgid "_Don't lose formatting"
 msgstr "不要略去格式(_D)"
 
-#: ../composer/mail-composer.error.xml.h:42
+#: ../composer/mail-composer.error.xml.h:40
 msgid "Lose _formatting"
 msgstr "失去格式(_F)"
 
@@ -7691,7 +7789,8 @@ msgstr "Evolution 鬧鈴通知"
 msgid "Calendar event notifications"
 msgstr "行事曆事件通知"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1092
+#: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
+#: ../mail/e-mail-browser.c:1118
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -7705,7 +7804,7 @@ msgstr "Groupware 套裝軟體"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution 郵件與行事曆"
 
-#: ../data/evolution.desktop.in.in.h:4
+#: ../data/evolution.desktop.in.in.h:4 ../evolution.appdata.xml.in.h:2
 msgid "Manage your email, contacts and schedule"
 msgstr "管理您的郵件、連絡人和行程"
 
@@ -7714,6 +7813,10 @@ msgid "email;calendar;contact;addressbook;task;"
 msgstr ""
 "email;calendar;contact;addressbook;task;電子郵件;行事曆;連絡人;通訊錄;工作;"
 
+#: ../data/evolution.desktop.in.in.h:6
+msgid "New Window"
+msgstr "新增視窗"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "啟用地址格式化"
@@ -7763,8 +7866,8 @@ msgid ""
 "contact list. \"1\" (Vertical View) places the preview pane next to the "
 "contact list."
 msgstr ""
-"配置方式決定了在連絡人清單中預覽窗格的位置。「0」(標準檢視)將預覽窗格放在連"
-"絡人清單下方。「1」(垂直檢視)將預覽窗格放在連絡人清單旁邊。"
+"配置方式決定了在連絡人列表中預覽窗格的位置。「0」(標準檢視)將預覽窗格放在連"
+"絡人列表下方。「1」(垂直檢視)將預覽窗格放在連絡人列表旁邊。"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
 msgid "Contact preview pane position (horizontal)"
@@ -7922,7 +8025,7 @@ msgstr "當刪除項目時先確認"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
 msgid "Whether to ask for confirmation when deleting an appointment or task"
-msgstr "刪除約會或工作時是否要求確認"
+msgstr "刪除會議或工作時是否要求確認"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
 msgid "Confirm expunge"
@@ -7930,7 +8033,7 @@ msgstr "清空時確認"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
 msgid "Whether to ask for confirmation when expunging appointments and tasks"
-msgstr "清除約會和工作時是否要求確認"
+msgstr "清除會議和工作時是否要求確認"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
 msgid "Month view vertical pane position"
@@ -7940,7 +8043,7 @@ msgstr "月檢視的垂直窗格位置"
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar"
-msgstr "垂直窗格的位置,在行事曆清單與日期導覽行事曆之間"
+msgstr "垂直窗格的位置,在行事曆列表與日期導覽行事曆之間"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
 msgid "Workday end hour"
@@ -8070,7 +8173,7 @@ msgstr "最近在日檢視中使用的第二時區"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
 msgid "List of recently used second time zones in a Day View"
-msgstr "最近在日檢視中使用的第二時區清單"
+msgstr "最近在日檢視中使用的第二時區列表"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
 msgid "Maximum number of recently used timezones to remember"
@@ -8080,7 +8183,7 @@ msgstr "要記住的最近使用時區數目的最大值"
 msgid ""
 "Maximum number of recently used timezones to remember in a 'day-second-"
 "zones' list"
-msgstr "在「day_second_zones」清單中要記住的最近使用時區數目的最大值"
+msgstr "在「day_second_zones」列表中要記住的最近使用時區數目的最大值"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
 msgid "Default reminder value"
@@ -8191,7 +8294,7 @@ msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
 msgstr ""
-"水平窗格的位置,當不在月檢視中時,在日期導覽行事曆與工作清單之間,以像素計"
+"水平窗格的位置,當不在月檢視中時,在日期導覽行事曆與工作列表之間,以像素計"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 msgid "Last reminder time"
@@ -8244,8 +8347,8 @@ msgid ""
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list"
 msgstr ""
-"配置方式決定了在備忘錄清單中預覽窗格的位置。「0」 (標準檢視) 將預覽窗格放在備"
-"忘錄清單下方。「1」 (垂直檢視) 將預覽窗格放在備忘錄清單旁邊"
+"配置方式決定了在備忘錄列表中預覽窗格的位置。「0」 (標準檢視) 將預覽窗格放在備"
+"忘錄列表下方。「1」 (垂直檢視) 將預覽窗格放在備忘錄列表旁邊"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid "Memo preview pane position (vertical)"
@@ -8264,7 +8367,7 @@ msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels"
 msgstr ""
-"水平窗格的位置,在月檢視中的檢視視窗與日期導覽行事曆、工作清單之間,以像素計"
+"水平窗格的位置,在月檢視中的檢視視窗與日期導覽行事曆、工作列表之間,以像素計"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "Scroll Month View by a week, not by a month"
@@ -8310,23 +8413,23 @@ msgstr "「行事曆」檢視側邊欄中已選取(或「主要」)行事曆
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary memo list"
-msgstr "主要備忘錄清單"
+msgstr "主要備忘錄列表"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
-msgstr "「備忘錄」檢視側邊欄中已選取(或「主要」)備忘錄清單的 UID"
+msgstr "「備忘錄」檢視側邊欄中已選取(或「主要」)備忘錄列表的 UID"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary task list"
-msgstr "主要工作清單"
+msgstr "主要工作列表"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
-msgstr "「工作」檢視側邊欄中已選取(或「主要」)工作清單的 UID"
+msgstr "「工作」檢視側邊欄中已選取(或「主要」)工作列表的 UID"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Free/busy template URL"
@@ -8362,54 +8465,62 @@ msgstr "當搜尋另一個事件時以時間為基礎的搜尋可以往前或往
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Show appointment end times in week and month views"
-msgstr "在週及月的檢視內顯示約會的結束時間"
+msgstr "在週及月的檢視內顯示會議的結束時間"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "是否在週及月的檢視內顯示事件的結束時間"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+msgid "Show appointment icons in the month view"
+msgstr "在月檢視中顯示會議圖示"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+msgid "Whether to show icons of events in the month view"
+msgstr "是否在月檢視中顯示事件的圖示"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the memo preview pane"
 msgstr "顯示備忘錄預覽窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "如果為「true」,則在主視窗中顯示備忘錄預覽窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show the task preview pane"
 msgstr "顯示工作預覽窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "如果為「true」,則在主視窗中顯示工作預覽窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "在日檢視、工作週檢視和日期導覽顯示週數"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "是否在行事曆的多個位置顯示週數"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Vertical position for the tag pane"
 msgstr "標籤窗格垂直位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Highlight tasks due today"
 msgstr "強調今天到期工作"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr "是否以特別的顏色強調今天到期的工作 (task-due-today-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Tasks due today color"
 msgstr "今天到期工作的色彩"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8417,55 +8528,55 @@ msgstr ""
 "今天到期的工作背景顏色,使用 \"#rrggbb\" 格式。與 task-due-today-highlight 一"
 "起使用"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Task preview pane position (horizontal)"
 msgstr "工作預覽窗格位置(水平)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task layout style"
 msgstr "工作配置方式"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list"
 msgstr ""
-"配置方式決定了在工作清單中預覽窗格的位置。「0」 (標準檢視) 將預覽窗格放在工作"
-"清單下方。「1」 (垂直檢視) 將預覽窗格放在工作清單旁邊"
+"配置方式決定了在工作列表中預覽窗格的位置。「0」 (標準檢視) 將預覽窗格放在工作"
+"列表下方。「1」 (垂直檢視) 將預覽窗格放在工作列表旁邊"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Task preview pane position (vertical)"
 msgstr "工作預覽窗格位置(垂直)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "方向為垂直時工作預覽窗格的位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Show reminders for completed tasks"
 msgstr "顯示已完成工作的提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid ""
 "Whether to show reminders for completed tasks. When set to false, reminders "
 "for completed tasks are suppressed."
 msgstr "是否顯示已完成工作的提醒。設定為 false 時,會抑制已完成工作的提醒。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Highlight overdue tasks"
 msgstr "強調過期工作"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr "是否以特別的顏色強調逾期的工作 (task-overdue-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Overdue tasks color"
 msgstr "過期的工作色彩"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8473,19 +8584,19 @@ msgstr ""
 "過期工作的背景顏色,使用 \"#rrggbb\" 格式。與 task-overdue-highlight 一起使"
 "用。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Time divisions"
 msgstr "時間分隔"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "在「日」和「工作週」檢視中顯示間隔,以分鐘計"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Timezone"
 msgstr "時區"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8493,86 +8604,86 @@ msgstr ""
 "用於行事曆中日期與時刻的預設時區,未翻譯的 Olsen 時區資料庫位置就像 "
 "\"America/New York\""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Twenty four hour time format"
 msgstr "24 小時制格式"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "是否使用 24 小時制時間而不是使用上午/下午"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Birthday and anniversary reminder"
 msgstr "生日和週年紀念日提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "是否設定生日和週年紀念日的提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Default appointment reminder"
-msgstr "預設的約會提醒"
+msgstr "預設的會議提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Whether to set a default reminder for appointments"
-msgstr "是否設定約會的預設提醒"
+msgstr "是否設定會議的預設提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Use system timezone"
 msgstr "使用系統時區"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "使用系統時區取代在 Evolution 中選取的時區"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "First day of the week"
 msgstr "一週的第一天"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Monday is a work day"
 msgstr "星期一是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Tuesday is a work day"
 msgstr "星期二是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Wednesday is a work day"
 msgstr "星期三是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Thursday is a work day"
 msgstr "星期四是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Friday is a work day"
 msgstr "星期五是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "Saturday is a work day"
 msgstr "星期六是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid "Sunday is a work day"
 msgstr "星期日是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "(已廢棄) 每週的開始,從星期日 (0) 到星期六 (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"week-start-day-name\" instead."
 msgstr ""
 "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「week-start-day-name」代替。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid "(Deprecated) Work days"
 msgstr "(已廢棄) 工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key "
 "was deprecated in version 3.10 and should no longer be used. Use the \"work-"
@@ -8596,11 +8707,11 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
 msgid "List of disabled plugins"
-msgstr "已停用外掛程式清單"
+msgstr "已停用外掛程式列表"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:4
 msgid "The list of disabled plugins in Evolution"
-msgstr "在 Evolution 中停用的外掛程式清單"
+msgstr "在 Evolution 中停用的外掛程式列表"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:5
 msgid "The window's X coordinate"
@@ -8772,7 +8883,7 @@ msgstr "拼字檢查語言"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid "List of dictionary language codes used for spell checking."
-msgstr "用於拼字檢查的字典語言碼清單。"
+msgstr "用於拼字檢查的字典語言碼列表。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Show \"Bcc\" field when sending a mail message"
@@ -8918,7 +9029,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "List of localized 'Re'"
-msgstr "'Re' 本地化清單"
+msgstr "'Re' 本地化列表"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
@@ -8926,7 +9037,7 @@ msgid ""
 "text when replying to a message, as an addition to the standard \"Re\" "
 "prefix. An example is 'SV,AV'."
 msgstr ""
-"當回信時在主旨文字中要略過的本地化「Re」縮寫清單 (逗號分隔),做為標準「Re」的"
+"當回信時在主旨文字中要略過的本地化「Re」縮寫列表 (逗號分隔),做為標準「Re」的"
 "前綴。例如「SV,AV」。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
@@ -8970,18 +9081,26 @@ msgstr ""
 "上。否則它們只會在被使用時才顯示。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid "Wrap quoted text in replies"
+msgstr "回信中的引文是否換行"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid "If set to 'true' quoted text in replies will be wrapped."
+msgstr "如果設定為「true」回信中的引文㫅自動換列。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Save file format for drag-and-drop operation"
 msgstr "拖放操作時儲存的檔案格式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "可以是「mbox」或「pdf」。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Show image animations"
 msgstr "顯示動畫影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8989,91 +9108,104 @@ msgstr ""
 "啟用 HTML 郵件中的動畫影像。許多使用者認為動畫影像很煩人,因而偏好以靜態影像"
 "代替。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable or disable type ahead search feature"
 msgstr "啟用或停用隨打即查功能"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
-msgstr "啟用側邊列搜尋功能允許互動式搜尋資料夾名稱。"
+msgstr "啟用側邊欄搜尋功能允許互動式搜尋資料夾名稱。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Enable or disable magic space bar"
 msgstr "啟用或停用魔術空白鍵"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
-msgstr "啟用此選項可在郵件預覽、郵件清單和資料夾中使用空白鍵捲動畫面。"
+msgstr "啟用此選項可在郵件預覽、郵件列表和資料夾中使用空白鍵捲動畫面。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable to use a similar message list view settings for all folders"
-msgstr "啟用以在所有資料夾使用類似的郵件清單檢視設定值"
+msgstr "啟用以在所有資料夾使用類似的郵件列表檢視設定值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Enable to use a similar message list view settings for all folders."
-msgstr "啟用此選項會讓所有的資料夾使用類似的郵件清單檢視設定值。"
+msgstr "啟用此選項會讓所有的資料夾使用類似的郵件列表檢視設定值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Mark citations in the message \"Preview\""
 msgstr "在郵件「預覽」中標示引用"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在郵件「預覽」中標示引用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Citation highlight color"
 msgstr "引用反白色彩"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Citation highlight color."
 msgstr "引用反白色彩。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Enable/disable caret mode"
 msgstr "啟用/停用插入號模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "啟用插入號模式,如此您可以在閱讀郵件時看到游標。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Default charset in which to display messages"
 msgstr "用於顯示郵件的預設字元集"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Default charset in which to display messages."
 msgstr "用於顯示郵件的預設字元集。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "自動透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+msgid "Show notification about missing remote content"
+msgstr "顯示關於缺少的遠端內容的通知"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+msgid ""
+"When the message preview shows a message which requires to download remote "
+"content, while the download is not allowed for the user or the site, then "
+"show a notification about it on top of the preview panel."
+msgstr ""
+"當郵件預覽顯示一封郵件需要下載遠端內容,而使用者或網站不允許下載時,在預覽窗"
+"格上顯示關於它的通知。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show animated images as animations."
 msgstr "播放動畫影像。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show all message headers"
 msgstr "顯示所有郵件檔頭"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Show all the headers when viewing a messages."
 msgstr "檢視郵件時顯示檔頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "List of headers to show when viewing a message."
-msgstr "檢視郵件時顯示的檔頭清單。"
+msgstr "檢視郵件時顯示的檔頭列表。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 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 "
@@ -9082,193 +9214,201 @@ msgstr ""
 "每個檔頭都以配對方式呈現:檔頭的名稱,及一個布林值表示此檔頭是否啟用。停用的"
 "檔頭在檢視郵件時不會顯示,但仍會列在偏好設定中。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show photo of the sender"
 msgstr "顯示寄件者的相片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "在郵件閱讀窗格中顯示寄件者的相片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Search gravatar.com for photo of the sender"
 msgstr "在 gravatar.com 搜尋寄件者的相片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr "也允許在 gravatar.com 搜尋寄件者的相片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定的時限過後,標示成已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定的時限過後,標示成已閱讀。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Mark as Seen always after specified timeout"
 msgstr "在指定的時限過後永遠標示成已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
 msgstr "如果設定為 true,選取的郵件會在逾時時間或改變資料夾時設定為未讀。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Timeout for marking messages as seen"
 msgstr "將郵件標示成已閱讀的時限"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "將郵件標示成已閱讀的時限,以毫秒計。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Sender email-address column in the message list"
-msgstr "在郵件清單的寄件者電子郵件欄位"
+msgstr "在郵件列表的寄件者電子郵件欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
-msgstr "在郵件清單的中以分離的欄位顯示寄件者的電子郵件。"
+msgstr "在郵件列表的中以分離的欄位顯示寄件者的電子郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Show deleted messages in the message-list"
-msgstr "在郵件清單中顯示刪除的郵件"
+msgstr "在郵件列表中顯示刪除的郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "在郵件清單中顯示刪除的郵件 (加上刪除號)"
+msgstr "在郵件列表中顯示刪除的郵件 (加上刪除號)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+msgid "Show junk messages in the message-list"
+msgstr "在郵件列表中顯示垃圾的郵件"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+msgid "Show junk messages (with a red strike-through) in the message-list."
+msgstr "在郵件列表中顯示垃圾的郵件 (加上刪除號)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Enable Unmatched search folder"
 msgstr "啟用未符合搜尋資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 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:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "隱藏各資料夾預覽並移除選取區"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 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."
 msgstr ""
-"這個鍵值只能讀取一次,並會在讀取後設為「false」。這樣會取消在清單中對該郵件的"
+"這個鍵值只能讀取一次,並會在讀取後設為「false」。這樣會取消在列表中對該郵件的"
 "選取並移除對該資料夾的預覽。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Height of the message-list pane"
-msgstr "郵件清單窗格高度"
+msgstr "郵件列表窗格高度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Height of the message-list pane."
-msgstr "郵件清單窗格的高度。"
+msgstr "郵件列表窗格的高度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "郵件標題在使用者介面中是否摺疊"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Width of the message-list pane"
-msgstr "郵件清單窗格寬度"
+msgstr "郵件列表窗格寬度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Width of the message-list pane."
-msgstr "郵件清單窗格的寬度。"
+msgstr "郵件列表窗格的寬度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Layout style"
 msgstr "配置樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 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 "
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 msgstr ""
-"配置方式決定了在郵件清單中預覽窗格的位置。「0」(標準檢視)將預覽窗格放在郵件"
-"清單下方。「1」(垂直檢視)將預覽窗格放在郵件清單旁邊。"
+"配置方式決定了在郵件列表中預覽窗格的位置。「0」(標準檢視)將預覽窗格放在郵件"
+"列表下方。「1」(垂直檢視)將預覽窗格放在郵件列表旁邊。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Variable width font"
 msgstr "變動寬度字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "The variable width font for mail display."
 msgstr "用於顯示郵件的變動寬度字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Terminal font"
 msgstr "終端機字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "The terminal font for mail display."
 msgstr "用於顯示郵件的終端機字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Use custom fonts"
 msgstr "使用自訂字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自訂字型來顯示郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "壓縮在 TO/CC/BCC 中位址的顯示方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示於 TO/CC/BCC 中位址的長度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
-msgstr "這會設定在預設郵件清單檢視中顯示位址的長度,超過的部分會顯示「…」。"
+msgstr "這會設定在預設郵件列表檢視中顯示位址的長度,超過的部分會顯示「…」。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Thread the message-list based on Subject"
-msgstr "以主旨為基礎串接郵件清單"
+msgstr "以主旨為基礎串接郵件列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 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:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Default value for thread expand state"
 msgstr "相關郵件展開狀態的預設數值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否依郵件群組中最新的郵件來排序相關郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 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 "
@@ -9277,11 +9417,11 @@ msgstr ""
 "這個設定值指定相關郵件要依每個郵件群組最新的郵件排序,而非依照郵件的日期。"
 "Evolution 將需要重新啟動。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Whether sort thread children always ascending"
 msgstr "是否永遠遞增排序相關郵件子項"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
@@ -9289,11 +9429,11 @@ msgstr ""
 "這個設定值指定相關郵件的子項是否永遠遞增排序,而非依照相關郵件同樣的排序順"
 "序。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "在資料夾樹狀圖中以字母排序帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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 "
@@ -9303,27 +9443,27 @@ msgstr ""
 "告知在郵件檢視中如何排序資料夾樹狀圖中的帳號。當設定為 true 時帳號會以字母排"
 "序,但這臺電腦與搜尋資料夾例外,否則帳號會以使用者給予的順序排列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Log filter actions"
 msgstr "記錄過濾器動作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Log filter actions to the specified log file."
 msgstr "將過濾器動作記錄到指定的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Logfile to log filter actions"
 msgstr "用於記錄過濾器動作的記錄檔案"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Logfile to log filter actions."
 msgstr "用於記錄過濾器動作的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Flush Outbox after filtering"
 msgstr "過濾後清空寄件匣"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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 "
@@ -9332,100 +9472,100 @@ msgstr ""
 "是否在過濾完後清空寄件匣。寄件匣的清空只用在當使用了任何「轉寄至」過濾器動"
 "作,並且在這個動作後大約一分鐘開始進行。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Default forward style"
 msgstr "預設轉遞樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Default reply style"
 msgstr "預設回覆樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "使用快捷鍵傳送時提示 (Ctrl+Enter)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt on empty subject"
 msgstr "沒有主旨時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when emptying the trash"
 msgstr "使用者清空回收筒時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "當使用者嘗試清空回收筒時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user expunges"
 msgstr "使用者清空時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "寄信給沒有輸入有效郵件位址的收件者前先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "當使用者嘗試傳送不想要的 HTML 時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt while marking multiple messages"
 msgstr "當標記多個郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "啟用或停用標記多個郵件時的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when deleting messages in search folder"
 msgstr "當刪除搜尋資料夾中的郵件時顯示提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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 "
@@ -9434,11 +9574,11 @@ msgstr ""
 "它啟用/停用在從搜尋資料夾中刪除郵件時是否重複提示以警告那將會永久刪除郵件,而"
 "非僅是將郵件自搜尋結果中移除。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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 "
@@ -9448,11 +9588,11 @@ msgstr ""
 "可能的數值有:「never」- 不允許在資料夾樹狀圖中拖放複製、「 always」- 不詢問"
 "就允許在資料夾樹狀圖中拖放複製或「ask」- (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 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:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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 "
@@ -9462,21 +9602,21 @@ msgstr ""
 "可能的數值有:「never」- 不允許在資料夾樹狀圖中拖放移動、「 always」- 不詢問"
 "就允許在資料夾樹狀圖中拖放移動或「ask」- (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Prompt when replying privately to list messages"
 msgstr "當私人回覆通信論壇郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "當通信論壇劫持私人回覆時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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 "
@@ -9485,34 +9625,34 @@ msgstr ""
 "它會停用/啟用重覆提示警告您正試著回覆私人信件給透過通信論壇寄出的信。而通信論"
 "壇設定的 Reply-To: 標頭會將您的回信重新導向至通信論壇上的所有成員"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when replying to many recipients"
 msgstr "當回覆給許多收件者時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid ""
 "Prompt when switching composer mode and the content needs to lose its "
 "formatting"
 msgstr "當切換編輯器模式會導致內容失去現有格式時先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer mode and the content needs to lose its formatting."
 msgstr ""
 "它會停用/啟用重覆提示警告您正在切換編輯器模式而其中內容會失去先前的格式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "當回覆給許多收件者與副本時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "'composer-many-to-cc-recips-num' defines the threshold."
@@ -9520,56 +9660,56 @@ msgstr ""
 "當寄信給許多收件者與副本時啟用或停用提示。「composer-many-to-cc-recips-num」"
 "定義了這個界限值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 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:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Empty Trash folders on exit"
 msgstr "結束時清空垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "結束 Evolution 時清空所有垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Minimum days between emptying the trash on exit"
 msgstr "結束時清空回收筒最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "結束時清空回收筒最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Last time Empty Trash was run"
 msgstr "上次清空回收筒的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr "上次執行清單回收筒的時間,從 1970 年一月一日(電腦紀元)後算起的日數。"
+msgstr "上次執行列表回收筒的時間,從 1970 年一月一日(電腦紀元)後算起的日數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Level beyond which the message should be logged."
 msgstr "應記錄的郵件等級。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Show original \"Date\" header value."
 msgstr "顯示原始的「日期」標頭數值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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 "
@@ -9578,56 +9718,56 @@ msgstr ""
 "顯示原始的「日期」檔頭(若時區不同時會使用當地時間)。否則永遠以使用者偏好的"
 "格式和本地時區顯示「日期」檔頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "List of Labels and their associated colors"
-msgstr "標籤和相關色彩的清單"
+msgstr "標籤和相關色彩的列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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."
 msgstr ""
-"Evolution 的郵件元件已知的標籤清單。清單包含字串,其中包含 name:color,color "
+"Evolution 的郵件元件已知的標籤列表。列表包含字串,其中包含 name:color,color "
 "使用 HTML 十六進位編碼。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Check incoming mail being junk"
 msgstr "檢查內送的垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Run junk test on incoming mail."
 msgstr "在內送的郵件執行垃圾郵件檢查。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Empty Junk folders on exit"
 msgstr "離開時清空垃圾郵件資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "離開 Evolution 時清空所有垃圾郵件資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Minimum days between emptying the junk on exit"
 msgstr "結束時清空垃圾郵件最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "結束時清空垃圾郵件最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Last time Empty Junk was run"
 msgstr "上次清空垃圾郵件的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "The default plugin for Junk hook"
 msgstr "垃圾釣鉤的預設外掛程式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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 "
@@ -9636,11 +9776,11 @@ msgstr ""
 "這是預設的垃圾郵件外掛程式,即使已啟用了其他的外掛程式。如果停用這裡列出的預"
 "設外掛程式,並不會影響其他可用的外掛程式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "決定是否在通訊錄中尋找寄件者電子郵件帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 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 "
@@ -9651,13 +9791,13 @@ msgstr ""
 "會搜尋標記為自動補齊的通訊錄。但若標記為自動補齊的是遠端通訊錄(像 LDAP),則"
 "速度可能會很慢。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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 "
@@ -9666,11 +9806,11 @@ msgstr ""
 "這個選項相關於鍵值「lookup_addressbook」,是用來決定是否只在本地端通訊錄中查"
 "詢電子郵件位址以用於垃圾郵件過濾時「排除已知連絡人寄出的郵件」功能。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "決定是否使用自訂標頭來檢查垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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 "
@@ -9679,52 +9819,52 @@ msgstr ""
 "決定是否使用自訂標頭來檢查垃圾郵件。如果啟用這個選項並且提供標頭,將會提升垃"
 "圾郵件檢查的速度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Custom headers to use while checking for junk."
 msgstr "檢查垃圾郵件用的自訂標頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
-"檢查垃圾郵件用的自訂標頭。此清單中的元素格式為「headername=value」字串。"
+"檢查垃圾郵件用的自訂標頭。此列表中的元素格式為「headername=value」字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "UID string of the default account."
 msgstr "預設帳號的 UID 字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Save directory"
 msgstr "儲存目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Directory for saving mail component files."
 msgstr "用來儲存郵件元件檔的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Composer load/attach directory"
 msgstr "編輯器讀取/附加目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "Directory for loading/attaching files to composer."
 msgstr "用來郵件編輯器載入/附件的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Check for new messages on start"
 msgstr "啟動時檢查新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 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:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "Check for new messages in all active accounts"
 msgstr "檢查所有使用中帳號的新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 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 "
@@ -9733,21 +9873,21 @@ msgstr ""
 "當 Evolution 啟動時是否檢查所有使用中帳號的新郵件而不管「檢查新郵件於每 X 分"
 "鐘」選項。這個選項只能和「send_recv_on_start」選項一起使用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Server synchronization interval"
 msgstr "伺服器同步間隔"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 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:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Allow expunge in virtual folders"
 msgstr "允許在虛擬資料夾使用清空"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 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 "
@@ -9758,77 +9898,77 @@ msgstr ""
 "本身會對虛擬資料夾與所有資料夾中被刪除的郵件進行,並不只針對屬於虛擬資料夾中"
 "被刪除的郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 #: ../mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML mode"
 msgstr "繼承布景主題的顏色為 HTML 模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
 msgstr ""
 "當啟用時,背景、文字與連結的布景主題顏色會一併送出,產生 HTML 格式的郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "An Archive folder for On This Computer folders."
 msgstr "用於「這臺電腦上」的封存資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 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:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "(Deprecated) Default forward style"
 msgstr "(已廢棄) 預設轉寄樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 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:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "(Deprecated) Default reply style"
 msgstr "(已廢棄) 預設的回覆樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 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:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "(Deprecated) List of custom headers and whether they are enabled."
-msgstr "(已廢棄) 自訂檔頭以及它們是否啟用的清單"
+msgstr "(已廢棄) 自訂檔頭以及它們是否啟用的列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 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:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(已廢棄) 透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 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:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 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:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9847,13 +9987,13 @@ msgstr "['attachment','attaching','attached','enclosed','附加檔案','附件']
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
-msgstr "讓附件提醒外掛程式用來搜尋郵件內文的關鍵字清單"
+msgstr "讓附件提醒外掛程式用來搜尋郵件內文的關鍵字列表"
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
-msgstr "讓附件提醒外掛程式用來搜尋郵件內文的關鍵字清單。"
+msgstr "讓附件提醒外掛程式用來搜尋郵件內文的關鍵字列表。"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
 msgid "Address book source"
@@ -9915,7 +10055,7 @@ msgstr "Pidgin 上次同步時刻。"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
 msgid "List of Custom Headers"
-msgstr "自訂標頭的清單"
+msgstr "自訂標頭的列表"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
 msgid ""
@@ -9923,7 +10063,7 @@ msgid ""
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
-"這個鍵值指定的是您可以加到外寄郵件的自訂標頭清單。指定標頭與標頭數值的格式"
+"這個鍵值指定的是您可以加到外寄郵件的自訂標頭列表。指定標頭與標頭數值的格式"
 "為:自訂標頭名稱加上「=」,後面的數值則以「;」隔開"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
@@ -10054,10 +10194,12 @@ msgstr "顯示郵件時使用的模式"
 msgid ""
 "The mode to use for displaying mails. \"normal\" makes Evolution choose the "
 "best part to show, \"prefer_plain\" makes it use the text part, if present, "
-"and \"only_plain\" forces Evolution to only show plain text"
+"\"prefer_source\" makes it use the text part, if present, otherwise shows "
+"HTML source, and \"only_plain\" forces Evolution to only show plain text"
 msgstr ""
 "用來顯示郵件的模式。「normal」(一般)會讓 Evolution 選擇最佳的部分顯示,"
-"「prefer_plain」(偏好純文字)會讓它使用文字的部分,如果有的話,而"
+"「prefer_plain」(偏好純文字)會讓它使用文字的部分,如果有的話,"
+"「prefer_source」(偏好原始碼)會讓它使用文字部分,否則顯示 HTML 原始碼;而"
 "「only_plain」(只有純文字)則強迫 Evolution 只顯示純文字"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
@@ -10066,21 +10208,21 @@ msgstr "是否顯示抑制過的 HTML 輸出"
 
 #: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
 msgid "List of Destinations for publishing"
-msgstr "發佈目的地的清單"
+msgstr "發佈目的地的列表"
 
 #: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
 msgid ""
 "The key specifies the list of destinations to where publish calendars. Each "
 "values specifies an XML with setup for publishing to one destination."
 msgstr ""
-"這個設定鍵指定了要將行事曆發佈至何處的目的地清單。每個數值指定一個用來設定發"
+"這個設定鍵指定了要將行事曆發佈至何處的目的地列表。每個數值指定一個用來設定發"
 "佈目的地的 XML。"
 
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
-msgstr "使用郵件內文的範本外掛程式可用的關鍵字/數值組清單。"
+msgstr "使用郵件內文的範本外掛程式可用的關鍵字/數值組列表。"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
 msgid "Skip development warning dialog"
@@ -10099,7 +10241,7 @@ msgstr "初始附件檢視"
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
-msgstr "附件工具列元件的初始檢視。「0」是圖示,「1」是清單檢視。"
+msgstr "附件工具列元件的初始檢視。「0」是圖示,「1」是列表檢視。"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
 msgid "Initial file chooser folder"
@@ -10109,7 +10251,7 @@ msgstr "檔案選擇對話盒的初始資料夾"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser 對話盒的初始資料夾。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:324
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:320
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
@@ -10124,7 +10266,7 @@ msgstr "離線資料夾路徑"
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage."
-msgstr "要同步至磁碟供離線使用的資料夾路徑清單。"
+msgstr "要同步至磁碟供離線使用的資料夾路徑列表。"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
 msgid "Enable express mode"
@@ -10135,18 +10277,30 @@ msgid "Flag that enables a much simplified user interface."
 msgstr "用來啟用簡化使用者介面的旗標。"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+msgid "List of button names to hide in the window switcher"
+msgstr "在視窗切換器中隱藏的按鈕名稱列表"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+msgid ""
+"Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
+"Change of this requires restart of the application."
+msgstr ""
+"有效的數值為「mail」、「addressbook」、「calendar」、「tasks」和「memos」。這"
+"項變更需要重新啟動應用程式。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
 msgid "Window buttons are visible"
 msgstr "視窗按鈕是可視的"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
 msgid "Whether the window buttons should be visible."
 msgstr "是否可以看到視窗按鈕。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
 msgid "Window button style"
 msgstr "視窗按鈕風格"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -10156,39 +10310,39 @@ msgstr ""
 "「toolbar」(工具列)。如果設為「toolbar」(工具列),按鈕的風格會依 GNOME 工具列"
 "設定值決定。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Toolbar is visible"
 msgstr "工具列可以看到"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "是否可以看到工具列。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
 msgid "Sidebar is visible"
 msgstr "顯示側邊欄"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
 msgid "Whether the sidebar should be visible."
 msgstr "是否可以看到側邊欄。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "Statusbar is visible"
 msgstr "狀態列設為顯示"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 msgid "Whether the status bar should be visible."
 msgstr "是否顯示狀態列。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "啟動時預設顯示的元件相關 ID 或別名。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
 msgid "Default sidebar width"
 msgstr "預設側邊欄寬度"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
 msgid "The default width for the sidebar, in pixels."
 msgstr "側邊欄的預設寬度,以像素計。"
 
@@ -10226,14 +10380,6 @@ msgstr ""
 "執行 sa-learn 的完整路徑。如果沒有設定,就會使用編譯時期的路徑,通常是 /usr/"
 "bin/sa-learn。這個指令不應包含任何其他引數。"
 
-#: ../em-format/e-mail-formatter-attachment.c:424
-#: ../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:425
 msgid "Display as attachment"
 msgstr "顯示為附件"
@@ -10277,15 +10423,15 @@ msgstr "RFC822 郵件"
 msgid "Format part as an RFC822 message"
 msgstr "將部分格式化 RFC822 郵件"
 
-#: ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print.c:51
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "名稱"
 
-#: ../em-format/e-mail-formatter-print.c:53
-#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:51
+#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "大小"
 
@@ -10293,15 +10439,14 @@ msgstr "大小"
 #: ../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:1632
+#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1632
 msgid "Subject"
 msgstr "主旨"
 
 #. pseudo-header
 #: ../em-format/e-mail-formatter-quote-headers.c:199
 #: ../em-format/e-mail-formatter-utils.c:343
-#: ../modules/mail/em-mailer-prefs.c:1484
+#: ../modules/mail/em-mailer-prefs.c:1490
 msgid "Mailer"
 msgstr "寄件者"
 
@@ -10441,14 +10586,18 @@ msgstr "檢視憑證(_V)"
 msgid "This certificate is not viewable"
 msgstr "此憑證無法檢視"
 
-#: ../em-format/e-mail-formatter-source.c:120
-msgid "Source"
-msgstr "來源"
-
 #: ../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: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 "收件者"
+
 #: ../em-format/e-mail-formatter-utils.c:203
 #: ../em-format/e-mail-formatter-utils.c:220
 #: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
@@ -10478,9 +10627,9 @@ msgid "S/MIME encrypted"
 msgstr "S/MIME 加密"
 
 #: ../em-format/e-mail-formatter-utils.c:591
-#: ../mail/e-mail-config-security-page.c:748
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+#: ../mail/e-mail-config-security-page.c:760
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:204
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:154
 msgid "Security"
 msgstr "安全性"
 
@@ -10640,70 +10789,52 @@ msgstr "關閉這個郵件 (Escape)"
 msgid "Failed to create a thread: "
 msgstr "無法建立郵件群組:"
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
-msgid "Icon View"
-msgstr "圖示檢視"
-
-#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
-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:1223
+#: ../e-util/e-attachment.c:1227
 msgid "Attached message"
 msgstr "附加的郵件"
 
-#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
+#: ../e-util/e-attachment.c:2173 ../e-util/e-attachment.c:3170
 msgid "Operation was cancelled"
 msgstr "操作已被取消"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011
-#: ../e-util/e-attachment.c:3382 ../e-util/e-attachment-store.c:691
+#: ../e-util/e-attachment.c:2333 ../e-util/e-attachment.c:3032
+#: ../e-util/e-attachment.c:3403 ../e-util/e-attachment-store.c:696
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
+#: ../e-util/e-attachment.c:2414 ../e-util/e-attachment.c:3463
 msgid "A load operation is already in progress"
 msgstr "載入操作已在進行中"
 
-#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
+#: ../e-util/e-attachment.c:2422 ../e-util/e-attachment.c:3471
 msgid "A save operation is already in progress"
 msgstr "儲存操作已在進行中"
 
-#: ../e-util/e-attachment.c:2521
-#, c-format
-msgid "Could not load '%s'"
-msgstr "無法載入「%s」"
-
-#: ../e-util/e-attachment.c:2524
-#, c-format
-msgid "Could not load the attachment"
-msgstr "無法載入附件"
-
-#: ../e-util/e-attachment.c:2809
+#: ../e-util/e-attachment.c:2830
 #, c-format
 msgid "Could not open '%s'"
 msgstr "無法開啟「%s」"
 
-#: ../e-util/e-attachment.c:2812
+#: ../e-util/e-attachment.c:2833
 #, c-format
 msgid "Could not open the attachment"
 msgstr "無法開啟附件"
 
-#: ../e-util/e-attachment.c:3459
+#: ../e-util/e-attachment.c:3480
 msgid "Attachment contents not loaded"
 msgstr "無法載入附件內容"
 
-#: ../e-util/e-attachment.c:3550
+#: ../e-util/e-attachment.c:3571
 #, c-format
 msgid "Could not save '%s'"
 msgstr "無法儲存「%s」"
 
-#: ../e-util/e-attachment.c:3553
+#: ../e-util/e-attachment.c:3574
 #, c-format
 msgid "Could not save the attachment"
 msgstr "無法儲存附件"
@@ -10716,11 +10847,17 @@ msgstr "附件內容"
 msgid "F_ilename:"
 msgstr "檔案名稱(_I):"
 
+#: ../e-util/e-attachment-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-link-dialog.c:422
+msgid "_Description:"
+msgstr "描述(_D):"
+
 #: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "MIME 類型:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:526
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
 
@@ -10733,12 +10870,12 @@ msgid "Set as _Background"
 msgstr "設為背景(_B)"
 
 #: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:548
+#: ../e-util/e-attachment-tree-view.c:554
 msgid "Loading"
 msgstr "載入中"
 
 #: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:560
+#: ../e-util/e-attachment-tree-view.c:566
 msgid "Saving"
 msgstr "儲存中"
 
@@ -10750,32 +10887,32 @@ msgstr "隱藏附件列(_B)"
 msgid "Show Attachment _Bar"
 msgstr "顯示附件列(_B)"
 
-#: ../e-util/e-attachment-store.c:486
+#: ../e-util/e-attachment-store.c:491
 msgid "Add Attachment"
 msgstr "加入附件"
 
-#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
+#: ../e-util/e-attachment-store.c:498 ../e-util/e-attachment-store.c:500
 msgid "A_ttach"
 msgstr "附加(_T)"
 
-#: ../e-util/e-attachment-store.c:533
+#: ../e-util/e-attachment-store.c:538
 msgid "Archive selected directories using this format:"
 msgstr "使用這個格式壓縮選取的資料夾:"
 
-#: ../e-util/e-attachment-store.c:626
+#: ../e-util/e-attachment-store.c:631
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "儲存附件"
 
-#: ../e-util/e-attachment-store.c:653
+#: ../e-util/e-attachment-store.c:658
 msgid "Do _not extract files from the attachment"
 msgstr "不要從附件解壓縮檔案(_N)"
 
-#: ../e-util/e-attachment-store.c:658
+#: ../e-util/e-attachment-store.c:663
 msgid "Save extracted files _only"
 msgstr "只儲存解壓縮檔案(_O)"
 
-#: ../e-util/e-attachment-store.c:663
+#: ../e-util/e-attachment-store.c:668
 msgid "Save extracted files and the original _archive"
 msgstr "儲存解壓縮檔案與原始的壓縮檔(_A)"
 
@@ -10803,16 +10940,16 @@ msgid "A_dd Attachment..."
 msgstr "加入附件(_A)…"
 
 #: ../e-util/e-attachment-view.c:468
-#: ../modules/addressbook/e-book-shell-view-actions.c:1071
-#: ../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/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 #: ../modules/mail/e-mail-shell-view-actions.c:1645
 #: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-#: ../e-util/e-attachment-view.c:485
+#: ../e-util/e-attachment-view.c:485 ../e-util/e-source-selector.c:3376
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
@@ -10871,40 +11008,40 @@ msgstr "複製通訊錄內容至本地用於離線作業"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-單擊以開啟連結"
 
-#: ../e-util/e-calendar.c:195
+#: ../e-util/e-calendar.c:207
 msgid "Previous month"
 msgstr "上個月"
 
-#: ../e-util/e-calendar.c:220
+#: ../e-util/e-calendar.c:232
 msgid "Next month"
 msgstr "下個月"
 
-#: ../e-util/e-calendar.c:246
+#: ../e-util/e-calendar.c:258
 msgid "Previous year"
 msgstr "上一年"
 
-#: ../e-util/e-calendar.c:271
+#: ../e-util/e-calendar.c:283
 msgid "Next year"
 msgstr "下一年"
 
-#: ../e-util/e-calendar.c:295
+#: ../e-util/e-calendar.c:307
 msgid "Month Calendar"
 msgstr "月行事曆"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1322 ../e-util/e-calendar-item.c:2200
+#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%m月"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1324
+#: ../e-util/e-calendar-item.c:1339
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y年"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1361
+#: ../e-util/e-calendar-item.c:1376
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y年%m月"
@@ -10915,11 +11052,11 @@ msgstr "標示為預設行事曆"
 
 #: ../e-util/e-cal-source-config.c:172
 msgid "Mark as default task list"
-msgstr "標示為預設工作清單"
+msgstr "標示為預設工作列表"
 
 #: ../e-util/e-cal-source-config.c:175
 msgid "Mark as default memo list"
-msgstr "標示為預設備忘錄清單"
+msgstr "標示為預設備忘錄列表"
 
 #: ../e-util/e-cal-source-config.c:200
 msgid "Color:"
@@ -10931,11 +11068,11 @@ msgstr "複製行事曆內容至本地以便離線作業"
 
 #: ../e-util/e-cal-source-config.c:432
 msgid "Copy task list contents locally for offline operation"
-msgstr "複製工作清單內容至本地以便離線作業"
+msgstr "複製工作列表內容至本地以便離線作業"
 
 #: ../e-util/e-cal-source-config.c:436
 msgid "Copy memo list contents locally for offline operation"
-msgstr "複製備忘錄清單內容至本地以便離線作業"
+msgstr "複製備忘錄列表內容至本地以便離線作業"
 
 #: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
@@ -10998,10 +11135,10 @@ msgstr "在設定中已經有名為「%s」的分類。請使用另外的名稱"
 
 #: ../e-util/e-cell-combo.c:185
 msgid "popup list"
-msgstr "彈出式清單"
+msgstr "彈出式列表"
 
 #: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
-#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2033
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2049
 msgid "?"
 msgstr "?"
 
@@ -11011,7 +11148,7 @@ msgstr "現在"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 #: ../modules/itip-formatter/itip-view.c:221
 msgid "Today"
 msgstr "今天"
@@ -11296,8 +11433,8 @@ 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:578 ../mail/e-mail-reader.c:3899
-#: ../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4024
+#: ../mail/mail-config.ui.h:73
 msgid "Default"
 msgstr "預設值"
 
@@ -11317,8 +11454,7 @@ msgstr "按此按鈕以顯示行事曆"
 msgid "Drop-down combination box to select time"
 msgstr "用以選擇時刻的下拉式組合方塊"
 
-#: ../e-util/e-dateedit.c:629
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "時間"
 
@@ -11683,8 +11819,8 @@ msgstr "尋找符合下列條件的項目"
 #: ../e-util/e-mail-identity-combo-box.c:476
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
-#: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
 msgid "None"
 msgstr "沒有"
 
@@ -11937,19 +12073,19 @@ msgstr "區塊引用(_B)"
 
 #: ../e-util/e-html-editor-actions.c:1370
 msgid "_Bulleted List"
-msgstr "無序清單(_B)"
+msgstr "無序列表(_B)"
 
 #: ../e-util/e-html-editor-actions.c:1377
 msgid "_Roman Numeral List"
-msgstr "羅馬字有序清單(_R)"
+msgstr "羅馬字有序列表(_R)"
 
 #: ../e-util/e-html-editor-actions.c:1384
 msgid "Numbered _List"
-msgstr "有序清單(_L)"
+msgstr "有序列表(_L)"
 
 #: ../e-util/e-html-editor-actions.c:1391
 msgid "_Alphabetical List"
-msgstr "字母順序清單(_A)"
+msgstr "字母順序列表(_A)"
 
 #: ../e-util/e-html-editor-actions.c:1407
 #: ../e-util/e-html-editor-actions.c:1445
@@ -12196,37 +12332,37 @@ 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:1937
+#: ../e-util/e-html-editor-actions.c:1950
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s 字典"
 
-#: ../e-util/e-html-editor-actions.c:2024
+#: ../e-util/e-html-editor-actions.c:2040
 msgid "_Emoticon"
 msgstr "表情符號(_E)"
 
-#: ../e-util/e-html-editor-actions.c:2025
+#: ../e-util/e-html-editor-actions.c:2041
 msgid "Insert Emoticon"
 msgstr "插入表情符號"
 
-#: ../e-util/e-html-editor-actions.c:2093
+#: ../e-util/e-html-editor-actions.c:2109
 msgid "Re_place"
 msgstr "取代(_P)"
 
-#: ../e-util/e-html-editor-actions.c:2096
+#: ../e-util/e-html-editor-actions.c:2112
 msgid "_Image"
 msgstr "影像(_I)"
 
-#: ../e-util/e-html-editor-actions.c:2099
+#: ../e-util/e-html-editor-actions.c:2115
 msgid "_Link"
 msgstr "連結(_L)"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2103
+#: ../e-util/e-html-editor-actions.c:2119
 msgid "_Rule"
 msgstr "水平線(_R)"
 
-#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-actions.c:2122
 #: ../e-util/e-html-editor-cell-dialog.c:738
 msgid "_Table"
 msgstr "表格(_T)"
@@ -12506,8 +12642,8 @@ msgstr "緞帶"
 msgid "Midnight"
 msgstr "午夜"
 
-#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:36
-#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
+#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:38
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "草稿"
 
@@ -12540,12 +12676,11 @@ msgid "<b>Background Image</b>"
 msgstr "<b>背景影像</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:638
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 msgid "_Template:"
 msgstr "範本(_T):"
 
-#: ../e-util/e-html-editor-page-dialog.c:646
-#: ../e-util/e-import-assistant.c:283
+#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
@@ -12653,8 +12788,7 @@ msgstr "<b>字典</b>"
 msgid "Add word"
 msgstr "加入字詞"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:637
-#: ../mail/mail-config.ui.h:38
+#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
@@ -12695,11 +12829,11 @@ msgstr "大小(_Z):"
 msgid "Text Properties"
 msgstr "文字屬性"
 
-#: ../e-util/e-html-editor-view.c:5474
+#: ../e-util/e-html-editor-view.c:6255
 msgid "Changed property"
 msgstr "已變更屬性"
 
-#: ../e-util/e-html-editor-view.c:5475
+#: ../e-util/e-html-editor-view.c:6256
 msgid "Whether editor changed"
 msgstr "編輯器是否已改變"
 
@@ -12707,7 +12841,7 @@ msgstr "編輯器是否已改變"
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
-msgstr "選取要匯入 Evolution 的檔案,並且在清單內選取檔案類型。"
+msgstr "選取要匯入 Evolution 的檔案,並且在列表內選取檔案類型。"
 
 #: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
 msgid "File _type:"
@@ -12766,7 +12900,7 @@ msgstr "匯入資料"
 
 #: ../e-util/e-import-assistant.c:930
 msgid "Select what type of file you want to import from the list."
-msgstr "選擇您想要從清單中匯入的檔案類型。"
+msgstr "選擇您想要從列表中匯入的檔案類型。"
 
 #: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
 msgid "Evolution Import Assistant"
@@ -12805,11 +12939,11 @@ msgstr "按「套用」開始將檔案匯入到 Evolution。"
 msgid "Autogenerated"
 msgstr "自動產生的"
 
-#: ../e-util/e-mail-signature-editor.c:297
+#: ../e-util/e-mail-signature-editor.c:297 ../mail/e-mail-notes.c:905
 msgid "Close"
 msgstr "關閉"
 
-#: ../e-util/e-mail-signature-editor.c:302
+#: ../e-util/e-mail-signature-editor.c:302 ../mail/e-mail-notes.c:910
 msgid "_Save and Close"
 msgstr "儲存後關閉(_S)"
 
@@ -12883,12 +13017,12 @@ msgstr "開啟行事曆「%s」"
 #: ../e-util/e-misc-utils.c:2390
 #, c-format
 msgid "Opening memo list '%s'"
-msgstr "開啟備忘錄清單「%s」"
+msgstr "開啟備忘錄列表「%s」"
 
 #: ../e-util/e-misc-utils.c:2393
 #, c-format
 msgid "Opening task list '%s'"
-msgstr "開啟工作清單「%s」"
+msgstr "開啟工作列表「%s」"
 
 #: ../e-util/e-misc-utils.c:2396
 #, c-format
@@ -12918,10 +13052,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:1157
-#: ../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
+#: ../modules/addressbook/e-book-shell-view-actions.c:1183
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:933
 msgid "Any Category"
 msgstr "任何分類"
 
@@ -12933,8 +13067,7 @@ msgstr "連絡人(_N)"
 msgid "Search"
 msgstr "搜尋"
 
-#: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:429
+#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "通訊錄"
 
@@ -13013,7 +13146,7 @@ msgstr "記住這個密碼(_R)"
 msgid "_Remember this password for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
 
-#: ../e-util/e-preferences-window.c:318
+#: ../e-util/e-preferences-window.c:321
 msgid "Evolution Preferences"
 msgstr "Evolution 偏好設定"
 
@@ -13164,9 +13297,8 @@ msgid "Reached top of page, continued from bottom"
 msgstr "到達頁面頂端,從底部繼續"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:329
-#: ../mail/importers/kmail-importer.c:253
-#: ../mail/importers/pine-importer.c:422
-#: ../modules/mail/e-mail-shell-view.c:1172
+#: ../mail/importers/kmail-importer.c:253 ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1179
 #: ../smime/gui/certificate-manager.c:1671
 msgid "Mail"
 msgstr "郵件"
@@ -13205,6 +13337,10 @@ msgstr "沒有"
 msgid "Mail Receipt"
 msgstr "郵件回條"
 
+#: ../e-util/e-send-options.ui.h:14
+msgid "Send Options"
+msgstr "傳送選項"
+
 #: ../e-util/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "要求回覆(_E)"
@@ -13318,24 +13454,48 @@ msgstr "類型:"
 msgid "Name:"
 msgstr "名稱:"
 
+#: ../e-util/e-source-config.c:813
+msgid "Name cannot be empty"
+msgstr "名字不能為空"
+
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1311
+#: ../e-util/e-source-config.c:1313
 msgid "Refresh every"
 msgstr "重新整理於每"
 
-#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
+#: ../e-util/e-source-config.c:1343 ../e-util/e-source-config.c:1413
 msgid "Use a secure connection"
 msgstr "使用安全連線"
 
-#: ../e-util/e-source-config.c:1437
-msgid "Unset _trust for SSL certificate"
-msgstr "取消設定 SSL 憑證的信任(_T)"
+#: ../e-util/e-source-config.c:1439
+msgid "Unset _trust for SSL/TLS certificate"
+msgstr "取消設定 SSL/_TLS 憑證的信任"
 
-#: ../e-util/e-source-config.c:1473
+#: ../e-util/e-source-config.c:1475
 msgid "User"
 msgstr "使用者"
 
+#: ../e-util/e-source-selector.c:3214
+msgid "Show"
+msgstr "顯示"
+
+#: ../e-util/e-source-selector.c:3221
+msgid "Group name"
+msgstr "群組名稱"
+
+#: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
+msgid "_Show"
+msgstr "顯示(_S)"
+
+#: ../e-util/e-source-selector.c:3428
+msgid "Manage Groups"
+msgstr "管理群組"
+
+#: ../e-util/e-source-selector.c:3440
+msgid "Available Groups:"
+msgstr "可用的群組:"
+
 #: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "目的地(_D)"
@@ -13437,11 +13597,11 @@ msgstr "行事曆後端服務 &quot;{0}&quot; 已經意外結束。"
 #: ../e-util/e-system.error.xml.h:14
 msgid ""
 "Some of your appointments may not be available until Evolution is restarted."
-msgstr "重新啟動 Evolution 之前,無法使用您的部分約會。"
+msgstr "重新啟動 Evolution 之前,無法使用您的部分會議。"
 
 #: ../e-util/e-system.error.xml.h:15
 msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "備忘錄清單後端服務 &quot;{0}&quot; 已經意外結束。"
+msgstr "備忘錄列表後端服務 &quot;{0}&quot; 已經意外結束。"
 
 #: ../e-util/e-system.error.xml.h:16
 msgid "Some of your memos may not be available until Evolution is restarted."
@@ -13449,7 +13609,7 @@ msgstr "重新啟動 Evolution 之前,無法使用您的部分備忘錄。"
 
 #: ../e-util/e-system.error.xml.h:17
 msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "工作清單後端服務 &quot;{0}&quot; 已經意外結束。"
+msgstr "工作列表後端服務 &quot;{0}&quot; 已經意外結束。"
 
 #: ../e-util/e-system.error.xml.h:18
 msgid "Some of your tasks may not be available until Evolution is restarted."
@@ -13466,11 +13626,11 @@ msgstr "行事曆後端服務 &quot;{0}&quot; 遇到錯誤。"
 
 #: ../e-util/e-system.error.xml.h:21
 msgid "The memo list backend servicing &quot;{0}&quot; encountered an error."
-msgstr "備忘錄清單後端服務 &quot;{0}&quot; 遇到錯誤。"
+msgstr "備忘錄列表後端服務 &quot;{0}&quot; 遇到錯誤。"
 
 #: ../e-util/e-system.error.xml.h:22
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
-msgstr "工作清單後端服務 &quot;{0}&quot; 遇到錯誤。"
+msgstr "工作列表後端服務 &quot;{0}&quot; 遇到錯誤。"
 
 #: ../e-util/e-table-click-to-add.c:689
 #: ../e-util/gal-a11y-e-table-click-to-add.c:61
@@ -13520,7 +13680,7 @@ msgstr "顯示欄位"
 
 #: ../e-util/e-table-config.c:559
 msgid "Choose the order of information to appear in the message list."
-msgstr "請選擇在清單顯示模式時,顯示資訊的次序。"
+msgstr "請選擇在列表顯示模式時,顯示資訊的次序。"
 
 #: ../e-util/e-table-config.ui.h:2
 msgid "_Apply"
@@ -13725,90 +13885,90 @@ msgid "Flags"
 msgstr "旗標"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:721
+#: ../mail/e-mail-config-identity-page.c:760
 msgid "Identity"
 msgstr "身分"
 
-#: ../e-util/e-web-view.c:316
+#: ../e-util/e-web-view.c:318
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: ../e-util/e-web-view.c:318
+#: ../e-util/e-web-view.c:320
 msgid "Copy the link to the clipboard"
 msgstr "複製連結到剪貼薄"
 
-#: ../e-util/e-web-view.c:326
+#: ../e-util/e-web-view.c:328
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結(_O)"
 
-#: ../e-util/e-web-view.c:328
+#: ../e-util/e-web-view.c:330
 msgid "Open the link in a web browser"
 msgstr "在網頁瀏覽器中開啟此連結"
 
-#: ../e-util/e-web-view.c:336
+#: ../e-util/e-web-view.c:338
 msgid "_Copy Email Address"
 msgstr "複製電子郵件位址(_C)"
 
-#: ../e-util/e-web-view.c:343
+#: ../e-util/e-web-view.c:345
 msgid "Copy _Raw Email Address"
 msgstr "複製原始電子郵件位址(_R)"
 
-#: ../e-util/e-web-view.c:345
+#: ../e-util/e-web-view.c:347
 msgid "Copy the raw email address to the clipboard"
 msgstr "複製原始電子郵件位址到剪貼簿"
 
-#: ../e-util/e-web-view.c:360
+#: ../e-util/e-web-view.c:362
 msgid "_Copy Image"
 msgstr "複製影像(_C)"
 
-#: ../e-util/e-web-view.c:362
+#: ../e-util/e-web-view.c:364
 msgid "Copy the image to the clipboard"
 msgstr "複製影像到剪貼薄"
 
-#: ../e-util/e-web-view.c:367
+#: ../e-util/e-web-view.c:369
 msgid "Save _Image..."
 msgstr "儲存影像(_I)…"
 
-#: ../e-util/e-web-view.c:369
+#: ../e-util/e-web-view.c:371
 msgid "Save the image to a file"
 msgstr "將影像儲存為檔案"
 
-#: ../e-util/e-web-view.c:389 ../e-util/e-web-view.c:1427
+#: ../e-util/e-web-view.c:391 ../e-util/e-web-view.c:1432
 msgid "Select all text and images"
 msgstr "選擇所有文字和影像"
 
-#: ../e-util/e-web-view.c:1069
+#: ../e-util/e-web-view.c:1074
 #, c-format
 msgid "Click to call %s"
 msgstr "按一下播號給 %s"
 
-#: ../e-util/e-web-view.c:1071
+#: ../e-util/e-web-view.c:1076
 msgid "Click to hide/unhide addresses"
 msgstr "按這裡隱藏/解除隱藏位址"
 
-#: ../e-util/e-web-view.c:1082
+#: ../e-util/e-web-view.c:1087
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "移至郵件的第 %s 節"
 
-#: ../e-util/e-web-view.c:1084
+#: ../e-util/e-web-view.c:1089
 msgid "Go to the beginning of the message"
 msgstr "移至郵件的開頭處"
 
-#: ../e-util/e-web-view.c:1088
+#: ../e-util/e-web-view.c:1093
 #, c-format
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
 
-#: ../e-util/e-web-view.c:3039
+#: ../e-util/e-web-view.c:3127
 msgid "Copying image to clipboard"
 msgstr "複製影像到剪貼薄"
 
-#: ../e-util/e-web-view.c:3227
+#: ../e-util/e-web-view.c:3315
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../e-util/e-web-view.c:3263
+#: ../e-util/e-web-view.c:3351
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "儲存影像到「%s」"
@@ -13889,6 +14049,14 @@ msgstr "缺少數值。"
 msgid "One or more values cannot be empty."
 msgstr "一或多個數值不能為空。"
 
+#: ../e-util/filter.error.xml.h:16
+msgid "Are you sure you want to remove rule '{0}'?"
+msgstr "確定要移除規則「{0}」?"
+
+#: ../e-util/filter.error.xml.h:17
+msgid "_Keep"
+msgstr "保留(_K)"
+
 #: ../e-util/filter.ui.h:2
 msgid "the current time"
 msgstr "目前的時刻"
@@ -13901,7 +14069,7 @@ msgstr "您指定的時刻"
 msgid "a time relative to the current time"
 msgstr "相對於目前時刻的時差"
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:89
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:90
 msgid "seconds"
 msgstr "秒"
 
@@ -13909,8 +14077,7 @@ msgstr "秒"
 msgid "weeks"
 msgstr "週"
 
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../e-util/filter.ui.h:10 ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
 msgstr "個月"
 
@@ -14011,7 +14178,7 @@ msgstr "建立新的檢視(_C)"
 msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
-#: ../e-util/widgets.error.xml.h:1
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:197
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的變更?"
 
@@ -14019,7 +14186,7 @@ msgstr "要儲存所做的變更?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "此簽章已經變更,但尚未儲存。"
 
-#: ../e-util/widgets.error.xml.h:3
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:199
 msgid "_Discard changes"
 msgstr "放棄變更(_D)"
 
@@ -14047,14 +14214,14 @@ msgstr "無法載入簽章。"
 msgid "Could not save signature."
 msgstr "無法儲存簽章。"
 
-#: ../evolution.appdata.xml.in.h:1
+#: ../evolution.appdata.xml.in.h:3
 msgid ""
 "Evolution is a personal information management application that provides "
 "integrated mail, calendaring and address book functionality."
 msgstr ""
 "Evolution 是一套個人資訊管理應用程式,提供了整合郵件、行事曆和通訊錄等功能。"
 
-#: ../evolution.appdata.xml.in.h:2
+#: ../evolution.appdata.xml.in.h:4
 msgid ""
 "Evolution supports a wide range of industry standard data formats and "
 "network protocols for information exchange, with an emphasis on standards "
@@ -14065,6 +14232,16 @@ msgstr ""
 "的相容性與安全性。Evolution 也可以與 Microsoft Exchange 透過「交換網頁服務」"
 "(EWS)延伸功能平順的整合。"
 
+#: ../libemail-engine/camel-sasl-oauth2-google.c:29
+msgid "OAuth2 Google"
+msgstr "OAuth2 Google"
+
+#: ../libemail-engine/camel-sasl-oauth2-google.c:30
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr "這個選項會使用 OAuth 2.0 存取記號來連接 Google伺服器"
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -14123,7 +14300,7 @@ msgid "Invalid folder URI '%s'"
 msgstr "無效的資料夾 URI「%s」"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:680
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:680
 #: ../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
 #: ../modules/mail/e-mail-shell-view-private.c:1049
 #: ../modules/mail/e-mail-shell-view-private.c:1060
@@ -14131,28 +14308,28 @@ msgid "Inbox"
 msgstr "收件匣"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1222
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
 #: ../mail/importers/kmail-libs.c:147
 #: ../modules/mail/e-mail-shell-view-private.c:1047
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1233
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
 #: ../mail/importers/kmail-libs.c:143
 #: ../modules/mail/e-mail-shell-view-private.c:1051
 msgid "Outbox"
 msgstr "寄件匣"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1237
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
 #: ../mail/importers/kmail-libs.c:145
 #: ../modules/mail/e-mail-shell-view-private.c:1053
 msgid "Sent"
 msgstr "已傳送"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1225
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
 #: ../mail/importers/kmail-libs.c:149
 #: ../modules/mail/e-mail-shell-view-private.c:1055
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
@@ -14161,24 +14338,24 @@ msgstr "已傳送"
 msgid "Templates"
 msgstr "範本"
 
-#: ../libemail-engine/e-mail-session.c:1261
+#: ../libemail-engine/e-mail-session.c:1262
 #, c-format
 msgid "User cancelled operation"
 msgstr "使用者取消的操作"
 
-#: ../libemail-engine/e-mail-session.c:1318
+#: ../libemail-engine/e-mail-session.c:1319
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "沒有提供目的地位址,郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-session.c:1331
+#: ../libemail-engine/e-mail-session.c:1332
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "找不到可使用的識別符,郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-session.c:2360
+#: ../libemail-engine/e-mail-session.c:2362
 #, c-format
 msgid "Waiting for '%s'"
 msgstr "等待「%s」"
@@ -14227,17 +14404,17 @@ msgstr "無法附加至本地「寄件匣」資料夾:%s"
 msgid "Sending message"
 msgstr "正在傳送郵件"
 
-#: ../libemail-engine/e-mail-store-utils.c:189
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "中斷與「%s」的連線"
 
-#: ../libemail-engine/e-mail-store-utils.c:265
+#: ../libemail-engine/e-mail-store-utils.c:266
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "重新連線到「%s」"
 
-#: ../libemail-engine/e-mail-store-utils.c:350
+#: ../libemail-engine/e-mail-store-utils.c:351
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "準備帳號「%s」離線工作"
@@ -14398,7 +14575,7 @@ msgid "De_fault"
 msgstr "預設值(_F)"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1276
+#: ../modules/mail/em-composer-prefs.c:1282
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
@@ -14416,12 +14593,12 @@ msgstr "沒有提供電子郵件位址"
 msgid "Missing domain in email address"
 msgstr "電子郵件位址缺乏網域"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:773
+#: ../mail/e-mail-browser.c:131 ../shell/e-shell-window-actions.c:773
 #: ../shell/e-shell-window-actions.c:780 ../shell/e-shell-window-actions.c:787
 msgid "Close this window"
 msgstr "關閉本視窗"
 
-#: ../mail/e-mail-browser.c:286
+#: ../mail/e-mail-browser.c:288
 msgid "(No Subject)"
 msgstr "(沒有主旨)"
 
@@ -14443,7 +14620,11 @@ msgstr "Evolution 帳號助理"
 msgid "_Revise Details"
 msgstr "修訂詳細資訊(_R)"
 
-#: ../mail/e-mail-config-auth-check.c:339
+#: ../mail/e-mail-config-auth-check.c:177
+msgid "Querying authentication types..."
+msgstr "正在查詢核對類型…"
+
+#: ../mail/e-mail-config-auth-check.c:340
 msgid "Check for Supported Types"
 msgstr "檢查支援的類型"
 
@@ -14465,96 +14646,133 @@ msgstr ""
 msgid "Done"
 msgstr "完成"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../mail/e-mail-config-defaults-page.c:371
+msgid "Checking server settings..."
+msgstr "正在檢查伺服器設定值…"
+
+#: ../mail/e-mail-config-defaults-page.c:489
+msgctxt "ReplyForward"
+msgid "Use global setting"
+msgstr "使用全域設定值"
+
+#: ../mail/e-mail-config-defaults-page.c:491 ../mail/mail-config.ui.h:26
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "附件"
+
+#: ../mail/e-mail-config-defaults-page.c:493 ../mail/mail-config.ui.h:27
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "行內 (Outlook 風格)"
+
+#: ../mail/e-mail-config-defaults-page.c:495 ../mail/mail-config.ui.h:28
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "引文"
+
+#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:29
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "不使用引文"
+
+#: ../mail/e-mail-config-defaults-page.c:822
 msgid "Special Folders"
 msgstr "特殊資料夾"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:831
 msgid "Draft Messages _Folder:"
 msgstr "草稿郵件資料夾(_F):"
 
-#: ../mail/e-mail-config-defaults-page.c:568
+#: ../mail/e-mail-config-defaults-page.c:841
 msgid "Choose a folder for saving draft messages."
 msgstr "選擇儲存草稿郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:855
 msgid "Sent _Messages Folder:"
 msgstr "傳送郵件資料夾(_M):"
 
-#: ../mail/e-mail-config-defaults-page.c:592
+#: ../mail/e-mail-config-defaults-page.c:865
 msgid "Choose a folder for saving sent messages."
 msgstr "選擇儲存傳送郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:884
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "將回信儲存在要回覆郵件的資料夾(_A)"
 
-#: ../mail/e-mail-config-defaults-page.c:628
+#: ../mail/e-mail-config-defaults-page.c:901
 msgid "Archi_ve Folder:"
 msgstr "封存資料夾(_V):"
 
-#: ../mail/e-mail-config-defaults-page.c:638
-#: ../modules/mail/em-mailer-prefs.c:1397
+#: ../mail/e-mail-config-defaults-page.c:911
+#: ../modules/mail/em-mailer-prefs.c:1403
 msgid "Choose a folder to archive messages to."
 msgstr "選擇封存郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:929
 msgid "_Restore Defaults"
 msgstr "還原為預設值(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:666
+#: ../mail/e-mail-config-defaults-page.c:946
+msgid "_Lookup Folders"
+msgstr "查詢資料夾(_L)"
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "Use a Real Folder for _Trash:"
 msgstr "回收桶使用真實資料夾(_T):"
 
-#: ../mail/e-mail-config-defaults-page.c:667
+#: ../mail/e-mail-config-defaults-page.c:965
 msgid "Choose a folder for deleted messages."
 msgstr "選擇删除郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:676
+#: ../mail/e-mail-config-defaults-page.c:974
 msgid "Use a Real Folder for _Junk:"
 msgstr "垃圾郵件使用真實資料夾(_J):"
 
-#: ../mail/e-mail-config-defaults-page.c:677
+#: ../mail/e-mail-config-defaults-page.c:975
 msgid "Choose a folder for junk messages."
 msgstr "選擇垃圾郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:694
+#: ../mail/e-mail-config-defaults-page.c:992
 msgid "Composing Messages"
 msgstr "正在編輯郵件"
 
-#: ../mail/e-mail-config-defaults-page.c:703
+#: ../mail/e-mail-config-defaults-page.c:1001
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "一定寄送副本 (cc) 給(_S):"
 
-#: ../mail/e-mail-config-defaults-page.c:728
+#: ../mail/e-mail-config-defaults-page.c:1026
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "一定寄送密件副本 (bcc) 給(_B):"
 
-#: ../mail/e-mail-config-defaults-page.c:763
+#: ../mail/e-mail-config-defaults-page.c:1057
+msgid "Re_ply style:"
+msgstr "回覆風格(_P):"
+
+#: ../mail/e-mail-config-defaults-page.c:1093
 msgid "Message Receipts"
 msgstr "郵件回條"
 
-#: ../mail/e-mail-config-defaults-page.c:772
+#: ../mail/e-mail-config-defaults-page.c:1102
 msgid "S_end message receipts:"
 msgstr "傳送郵件回條(_E):"
 
-#: ../mail/e-mail-config-defaults-page.c:797
+#: ../mail/e-mail-config-defaults-page.c:1127
 msgid "Never"
 msgstr "永不"
 
-#: ../mail/e-mail-config-defaults-page.c:803
+#: ../mail/e-mail-config-defaults-page.c:1133
 msgid "Always"
 msgstr "永遠"
 
-#: ../mail/e-mail-config-defaults-page.c:809
+#: ../mail/e-mail-config-defaults-page.c:1139
 msgid "Ask for each message"
 msgstr "每封郵件皆詢問"
 
-#: ../mail/e-mail-config-defaults-page.c:880
+#: ../mail/e-mail-config-defaults-page.c:1246
 msgid "Defaults"
 msgstr "預設值"
 
-#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-identity-page.c:286
 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 "
@@ -14563,13 +14781,13 @@ msgstr ""
 "請在下面輸入您的名稱及電郵地址。「選擇性」的欄位不一定要填,除非您希望在送出"
 "的郵件內包含這些資訊。"
 
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:322
+#: ../mail/e-mail-config-identity-page.c:314
+#: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "帳號資訊"
 
-#: ../mail/e-mail-config-identity-page.c:346
-#: ../mail/e-mail-config-summary-page.c:352
+#: ../mail/e-mail-config-identity-page.c:352
+#: ../mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, \"Work\" or \"Personal\"."
@@ -14577,39 +14795,60 @@ msgstr ""
 "上列是用來代表這個帳號的名稱。\n"
 "例如:「工作」或「個人」。"
 
-#: ../mail/e-mail-config-identity-page.c:363
+#: ../mail/e-mail-config-identity-page.c:369
 msgid "Required Information"
 msgstr "必要的資訊"
 
-#: ../mail/e-mail-config-identity-page.c:372
+#: ../mail/e-mail-config-identity-page.c:378
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
-#: ../mail/e-mail-config-identity-page.c:399
+#: ../mail/e-mail-config-identity-page.c:407
 msgid "Email _Address:"
 msgstr "電子郵件位址(_A):"
 
-#: ../mail/e-mail-config-identity-page.c:446
+#: ../mail/e-mail-config-identity-page.c:456
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "選擇性的資訊"
 
-#: ../mail/e-mail-config-identity-page.c:455
+#: ../mail/e-mail-config-identity-page.c:465
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
-#: ../mail/e-mail-config-identity-page.c:482
+#: ../mail/e-mail-config-identity-page.c:494
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: ../mail/e-mail-config-identity-page.c:537
+#: ../mail/e-mail-config-identity-page.c:549
 msgid "Add Ne_w Signature..."
 msgstr "加入新的簽名檔(_W)…"
 
-#: ../mail/e-mail-config-identity-page.c:555
+#: ../mail/e-mail-config-identity-page.c:567
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "以輸入的電子郵件位址尋找郵件伺服器詳細資料(_L)"
 
+#: ../mail/e-mail-config-identity-page.c:611
+msgid "Full Name cannot be empty"
+msgstr "全名不能為空"
+
+#: ../mail/e-mail-config-identity-page.c:618
+msgid "Email Address cannot be empty"
+msgstr "電子郵件位址不能為空"
+
+#: ../mail/e-mail-config-identity-page.c:623
+msgid "Email Address is not a valid email"
+msgstr "電子郵件位址不是有效的電子郵件"
+
+#: ../mail/e-mail-config-identity-page.c:635
+msgid "Reply To is not a valid email"
+msgstr "回信位址不是有效的電子郵件"
+
+#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-summary-page.c:632
+msgid "Account Name cannot be empty"
+msgstr "帳號名稱不能為空"
+
 #: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "尋找帳號詳細資料…"
@@ -14638,10 +14877,10 @@ msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: ../mail/e-mail-config-security-page.c:340
-#: ../mail/em-folder-properties.c:603 ../mail/mail-config.ui.h:30
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
+#: ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.c:625
+#: ../modules/calendar/e-calendar-preferences.c:620
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
@@ -14664,22 +14903,22 @@ msgid "Si_gning algorithm:"
 msgstr "簽章演算法(_G):"
 
 #: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:581 ../mail/mail-config.ui.h:73
+#: ../mail/e-mail-config-security-page.c:593 ../mail/mail-config.ui.h:74
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:584 ../mail/mail-config.ui.h:74
+#: ../mail/e-mail-config-security-page.c:596 ../mail/mail-config.ui.h:75
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:587 ../mail/mail-config.ui.h:75
+#: ../mail/e-mail-config-security-page.c:599 ../mail/mail-config.ui.h:76
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:590 ../mail/mail-config.ui.h:76
+#: ../mail/e-mail-config-security-page.c:602 ../mail/mail-config.ui.h:77
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -14699,42 +14938,46 @@ msgstr "當傳送加密郵件時永遠自我加密(_M)"
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密時永遠信任我的鑰匙圈裡的金鑰(_T)"
 
-#: ../mail/e-mail-config-security-page.c:514
+#: ../mail/e-mail-config-security-page.c:502
+msgid "Prefer _inline sign/encrypt for plain text messages"
+msgstr "偏好在純文字郵件中使用行內簽署/加密(_I)"
+
+#: ../mail/e-mail-config-security-page.c:526
 msgid "Secure MIME (S/MIME)"
 msgstr "安全式 MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:523
+#: ../mail/e-mail-config-security-page.c:535
 msgid "Sig_ning certificate:"
 msgstr "簽名憑證(_N):"
 
-#: ../mail/e-mail-config-security-page.c:547
-#: ../mail/e-mail-config-security-page.c:653
+#: ../mail/e-mail-config-security-page.c:559
+#: ../mail/e-mail-config-security-page.c:665
 msgid "Select"
 msgstr "選擇"
 
-#: ../mail/e-mail-config-security-page.c:556
-#: ../mail/e-mail-config-security-page.c:662 ../mail/mail-dialogs.ui.h:5
+#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:674 ../mail/mail-dialogs.ui.h:5
 #: ../shell/e-shell-window-actions.c:876
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../mail/e-mail-config-security-page.c:565
+#: ../mail/e-mail-config-security-page.c:577
 msgid "Signing _algorithm:"
 msgstr "簽章演算法(_A):"
 
-#: ../mail/e-mail-config-security-page.c:606
+#: ../mail/e-mail-config-security-page.c:618
 msgid "Always sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽名"
 
-#: ../mail/e-mail-config-security-page.c:629
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Encryption certificate:"
 msgstr "加密憑證:"
 
-#: ../mail/e-mail-config-security-page.c:671
+#: ../mail/e-mail-config-security-page.c:683
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件加密"
 
-#: ../mail/e-mail-config-security-page.c:691
+#: ../mail/e-mail-config-security-page.c:703
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "當傳送加密郵件時永遠自我加密"
 
@@ -14746,58 +14989,58 @@ msgstr "傳送電子郵件"
 msgid "Server _Type:"
 msgstr "伺服器類型(_T):"
 
-#: ../mail/e-mail-config-summary-page.c:141
-msgid "SSL"
-msgstr "SSL"
-
-#: ../mail/e-mail-config-summary-page.c:144
+#: ../mail/e-mail-config-summary-page.c:142
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:305
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: ../mail/e-mail-config-summary-page.c:306
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr "這是用來存取您郵件的設定值的摘要。"
 
-#: ../mail/e-mail-config-summary-page.c:369
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "個人詳細資料"
 
-#: ../mail/e-mail-config-summary-page.c:378
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "全名:"
 
-#: ../mail/e-mail-config-summary-page.c:392
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "電子郵件位址:"
 
-#: ../mail/e-mail-config-summary-page.c:406
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "接收中"
 
-#: ../mail/e-mail-config-summary-page.c:418
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "傳送中"
 
-#: ../mail/e-mail-config-summary-page.c:430
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "伺服器類型:"
 
-#: ../mail/e-mail-config-summary-page.c:451
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:605
 msgid "Server:"
 msgstr "伺服器:"
 
-#: ../mail/e-mail-config-summary-page.c:472
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:703
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: ../mail/e-mail-config-summary-page.c:493
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "安全性:"
 
-#: ../mail/e-mail-config-summary-page.c:784
+#: ../mail/e-mail-config-summary-page.c:787
 msgid "Account Summary"
 msgstr "帳號摘要"
 
@@ -14820,27 +15063,27 @@ msgstr "歡迎使用"
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
-#: ../mail/e-mail-display.c:103
+#: ../mail/e-mail-display.c:104
 msgid "_Add to Address Book..."
 msgstr "加入到通訊錄(_A)…"
 
-#: ../mail/e-mail-display.c:110
+#: ../mail/e-mail-display.c:111
 msgid "_To This Address"
 msgstr "到這個位址(_T)"
 
-#: ../mail/e-mail-display.c:117
+#: ../mail/e-mail-display.c:118
 msgid "_From This Address"
 msgstr "從這個位址(_F)"
 
-#: ../mail/e-mail-display.c:124
+#: ../mail/e-mail-display.c:125
 msgid "Send _Reply To..."
 msgstr "傳送回覆到(_R)…"
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:127
 msgid "Send a reply message to this address"
 msgstr "傳送回覆郵件到這個位址"
 
-#: ../mail/e-mail-display.c:133
+#: ../mail/e-mail-display.c:134
 msgid "Create Search _Folder"
 msgstr "建立搜尋資料夾(_F)"
 
@@ -14955,6 +15198,26 @@ msgstr ""
 msgid "Color"
 msgstr "顏色"
 
+#: ../mail/e-mail-notes.c:310 ../mail/e-mail-notes.c:692
+msgid "Message Note"
+msgstr "郵件備註"
+
+#: ../mail/e-mail-notes.c:612
+msgid "Cannot find message in its folder summary"
+msgstr "在資料夾摘要中找不到郵件"
+
+#: ../mail/e-mail-notes.c:815
+msgid "Storing changes..."
+msgstr "正在儲存變更…"
+
+#: ../mail/e-mail-notes.c:940
+msgid "Edit Message Note"
+msgstr "編輯郵件備註"
+
+#: ../mail/e-mail-notes.c:1058
+msgid "Retrieving message..."
+msgstr "正在取回郵件…"
+
 #: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "將選取的檔頭移至頂端"
@@ -14983,648 +15246,678 @@ msgstr "標頭名稱:"
 msgid "Header Value"
 msgstr "標頭數值"
 
-#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:121
+#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:123
 msgid "Headers"
 msgstr "檔頭"
 
-#: ../mail/e-mail-printer.c:168
+#: ../mail/e-mail-printer.c:155
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
-#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:62
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:63
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
-#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:147
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:148
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../mail/e-mail-reader.c:1200 ../mail/e-mail-reader.c:1412
-#: ../mail/e-mail-reader.c:1452
+#: ../mail/e-mail-reader.c:488
+msgid "Deleting message note..."
+msgstr "正在刪除郵件備註…"
+
+#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1523
 msgid "_Do not ask me again."
 msgstr "不要再詢問我(_D)。"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1529
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "永遠忽略通信論壇的回覆欄位(_A)"
 
-#: ../mail/e-mail-reader.c:1661
+#: ../mail/e-mail-reader.c:1732
 msgid "Failed to retrieve message:"
 msgstr "取回郵件失敗:"
 
-#: ../mail/e-mail-reader.c:1706 ../mail/e-mail-reader.c:3041
+#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3145
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "正在取回郵件「%s」"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1965
 msgid "A_dd Sender to Address Book"
 msgstr "加入寄件者到目錄服務(_D)"
 
-#: ../mail/e-mail-reader.c:1896
+#: ../mail/e-mail-reader.c:1967
 msgid "Add sender to address book"
 msgstr "新增寄件者至通訊錄"
 
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1972
 msgid "_Archive..."
 msgstr "封存(_A)…"
 
-#: ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1974
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "將選取的郵件移至這個帳號的封存資料夾"
 
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1979
 msgid "Check for _Junk"
 msgstr "檢查垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1981
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾郵件狀態"
 
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:1986
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)…"
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1988
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:1993
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:2000
+msgid "_Add note..."
+msgstr "加入備註(_A)…"
+
+#: ../mail/e-mail-reader.c:2002
+msgid "Add a note for the selected message"
+msgstr "為選取的郵件加入備註"
+
+#: ../mail/e-mail-reader.c:2007
+msgid "Delete no_te"
+msgstr "刪除備註(_T)"
+
+#: ../mail/e-mail-reader.c:2009
+msgid "Delete the note for the selected message"
+msgstr "刪除選取郵件的備註"
+
+#: ../mail/e-mail-reader.c:2014
+msgid "_Edit note..."
+msgstr "編輯備註(_E)…"
+
+#: ../mail/e-mail-reader.c:2016
+msgid "Edit a note for the selected message"
+msgstr "編輯選取的郵件備註"
+
+#: ../mail/e-mail-reader.c:2021
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "從通信論壇建立過濾器規則(_L)…"
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:2023
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個通信論壇建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:1936
+#: ../mail/e-mail-reader.c:2028
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "從收件者建立過濾器規則(_R)…"
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:2030
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:2035
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "從寄件者建立過濾器規則(_N)…"
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:2037
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:1950
+#: ../mail/e-mail-reader.c:2042
 msgid "Create a Filter Rule for _Subject..."
 msgstr "從主旨建立過濾器規則(_S)…"
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:2044
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:2049
 msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:2051
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的郵件"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:2056
 msgid "_Find in Message..."
 msgstr "在郵件內尋找(_F)…"
 
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:2058
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:2063
 msgid "_Clear Flag"
 msgstr "清除標幟(_C)"
 
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:2065
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "移除選取郵件的跟隨旗標"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:2070
 msgid "_Flag Completed"
 msgstr "標記為已完成(_F)"
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:2072
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "將已選取郵件的跟隨旗標設為已完成"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:2077
 msgid "Follow _Up..."
 msgstr "跟隨(_U)…"
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:2079
 msgid "Flag the selected messages for follow-up"
 msgstr "將選定的郵件加上跟隨旗標"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2084
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../mail/e-mail-reader.c:1994 ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附件形式轉寄給某人"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2091
 msgid "Forward As _Attached"
 msgstr "以附件轉寄(_A)"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2098
 msgid "_Inline"
 msgstr "行內(_I)"
 
-#: ../mail/e-mail-reader.c:2008 ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2105
 msgid "Forward As _Inline"
 msgstr "以行內轉寄(_I)"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2112
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
-#: ../mail/e-mail-reader.c:2022 ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2119
 msgid "Forward As _Quoted"
 msgstr "以引文轉寄(_Q)"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2126
 msgid "_Load Images"
 msgstr "載入影像(_L)"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2128
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML 格式的郵件時強迫載入影像"
 
-#: ../mail/e-mail-reader.c:2041 ../mail/e-mail-reader.c:2419
+#: ../mail/e-mail-reader.c:2133 ../mail/e-mail-reader.c:2523
 msgid "_Ignore Subthread"
 msgstr "忽略子群組(_I)"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2135
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "自動將子群組中的新郵件標記為已閱讀"
 
-#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2423
+#: ../mail/e-mail-reader.c:2140 ../mail/e-mail-reader.c:2527
 msgid "_Ignore Thread"
 msgstr "忽略群組(_I)"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2142
 msgid "Mark new mails in this thread as read automatically"
 msgstr "自動將這個群組中的新郵件標記為已閱讀"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2147
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2149
 msgid "Mark the selected messages as important"
 msgstr "將選定的郵件標示成重要"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2154
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2156
 msgid "Mark the selected messages as junk"
 msgstr "將選定的郵件標示成垃圾郵件"
 
-#: ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2161
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2163
 msgid "Mark the selected messages as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
-#: ../mail/e-mail-reader.c:2076
+#: ../mail/e-mail-reader.c:2168
 msgid "_Read"
 msgstr "已閱讀(_R)"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2170
 msgid "Mark the selected messages as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
-#: ../mail/e-mail-reader.c:2083 ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2175 ../mail/e-mail-reader.c:2547
 msgid "Do not _Ignore Subthread"
 msgstr "不要忽略子群組(_I)"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2177
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "不要自動將子群組中的新郵件標記為已閱讀"
 
-#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2447
+#: ../mail/e-mail-reader.c:2182 ../mail/e-mail-reader.c:2551
 msgid "Do not _Ignore Thread"
 msgstr "不要忽略群組(_I)"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2184
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "不要自動將這個群組中的新郵件標記為已閱讀"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2189
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2191
 msgid "Mark the selected messages as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2196
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2198
 msgid "Mark the selected messages as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2203
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)…"
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2205
 msgid "Open the selected messages in the composer for editing"
 msgstr "在撰寫視窗開啟選取的郵件以便編輯"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2210
 msgid "Compose _New Message"
 msgstr "撰寫新郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2212
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2217
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2219
 msgid "Open the selected messages in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2224
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)…"
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2226
 msgid "Move selected messages to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2231
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2141
+#: ../mail/e-mail-reader.c:2233
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2238
 msgid "Next _Important Message"
 msgstr "下一封重要郵件(_I)"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2240
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2245
 msgid "Next _Thread"
 msgstr "下一封相關郵件(_T)"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2247
 msgid "Display the next thread"
 msgstr "顯示下一封相關郵件"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2252
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2254
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2259
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2261
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2266
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2268
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
-#: ../mail/e-mail-reader.c:2181
+#: ../mail/e-mail-reader.c:2273
 msgid "Previous T_hread"
 msgstr "上一封相關郵件(_H)"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2275
 msgid "Display the previous thread"
 msgstr "顯示上一封相關郵件"
 
-#: ../mail/e-mail-reader.c:2188
+#: ../mail/e-mail-reader.c:2280
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2282
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2289
 msgid "Print this message"
 msgstr "列印郵件"
 
-#: ../mail/e-mail-reader.c:2204
+#: ../mail/e-mail-reader.c:2296
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2301
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2303
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2308
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2310
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2315
 msgid "Remove Du_plicate Messages"
 msgstr "移除重複的郵件(_P)"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2317
 msgid "Checks selected messages for duplicates"
 msgstr "檢查選取的郵件是否有重複"
 
-#: ../mail/e-mail-reader.c:2230 ../mail/mail.error.xml.h:30
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:30
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../mail/e-mail-reader.c:2232
+#: ../mail/e-mail-reader.c:2324
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "撰寫回郵給已選取郵件的全部收件者"
 
-#: ../mail/e-mail-reader.c:2237 ../mail/mail.error.xml.h:28
+#: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:28
 msgid "Reply to _List"
-msgstr "回覆至清單(_L)"
+msgstr "回覆至列表(_L)"
 
-#: ../mail/e-mail-reader.c:2239
+#: ../mail/e-mail-reader.c:2331
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "撰寫回郵給所選定郵件的通信論壇"
 
-#: ../mail/e-mail-reader.c:2244
-#: ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2336 ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2338
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2343
 msgid "_Save as mbox..."
 msgstr "儲存成 mbox(_S)…"
 
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2345
 msgid "Save selected messages as an mbox file"
 msgstr "將選定的郵件另存成 mbox 檔案"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2350
 msgid "_Message Source"
 msgstr "郵件原始碼(_M)"
 
-#: ../mail/e-mail-reader.c:2260
+#: ../mail/e-mail-reader.c:2352
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../mail/e-mail-reader.c:2364
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../mail/e-mail-reader.c:2274
+#: ../mail/e-mail-reader.c:2366
 msgid "Undelete the selected messages"
 msgstr "取消刪除選定的郵件"
 
-#: ../mail/e-mail-reader.c:2279
+#: ../mail/e-mail-reader.c:2371
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2373
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../mail/e-mail-reader.c:2378
 msgid "_Zoom In"
 msgstr "拉近(_Z)"
 
-#: ../mail/e-mail-reader.c:2288
+#: ../mail/e-mail-reader.c:2380
 msgid "Increase the text size"
 msgstr "將文字放大"
 
-#: ../mail/e-mail-reader.c:2295
+#: ../mail/e-mail-reader.c:2387
 msgid "Decrease the text size"
 msgstr "將文字縮小"
 
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2394
 msgid "Cre_ate"
 msgstr "建立(_A)"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2401
 msgid "Ch_aracter Encoding"
 msgstr "字元編碼(_A)"
 
-#: ../mail/e-mail-reader.c:2316
+#: ../mail/e-mail-reader.c:2408
 msgid "F_orward As"
 msgstr "轉寄為(_O)"
 
-#: ../mail/e-mail-reader.c:2323
+#: ../mail/e-mail-reader.c:2415
 msgid "_Group Reply"
 msgstr "群組回覆(_G)"
 
-#: ../mail/e-mail-reader.c:2330
+#: ../mail/e-mail-reader.c:2422
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../mail/e-mail-reader.c:2337
+#: ../mail/e-mail-reader.c:2429
 msgid "Mar_k As"
 msgstr "標示成(_K)"
 
-#: ../mail/e-mail-reader.c:2344
+#: ../mail/e-mail-reader.c:2436
 msgid "_Message"
 msgstr "郵件(_M)"
 
-#: ../mail/e-mail-reader.c:2351
+#: ../mail/e-mail-reader.c:2443
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2453
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "從通信論壇建立搜尋資料夾(_L)…"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2455
 msgid "Create a search folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2460
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "從收件者建立搜尋資料夾(_T)…"
 
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2462
 msgid "Create a search folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2467
 msgid "Create a Search Folder from Sen_der..."
 msgstr "從寄件者建立搜尋資料夾(_D)…"
 
-#: ../mail/e-mail-reader.c:2377
+#: ../mail/e-mail-reader.c:2469
 msgid "Create a search folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2382
+#: ../mail/e-mail-reader.c:2474
 msgid "Create a Search Folder from S_ubject..."
 msgstr "從主旨建立搜尋資料夾(_U)…"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2476
 msgid "Create a search folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2515
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)…"
 
-#: ../mail/e-mail-reader.c:2427
+#: ../mail/e-mail-reader.c:2531
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
-#: ../mail/e-mail-reader.c:2431
+#: ../mail/e-mail-reader.c:2535
 msgid "Mark as _Junk"
 msgstr "標示成垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2539
 msgid "Mark as _Not Junk"
 msgstr "標示成非垃圾郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2439
+#: ../mail/e-mail-reader.c:2543
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2555
 msgid "Mark as Uni_mportant"
 msgstr "標示成不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2559
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../mail/e-mail-reader.c:2603
 msgid "_Caret Mode"
 msgstr "鍵盤瀏覽模式(_C)"
 
-#: ../mail/e-mail-reader.c:2501
+#: ../mail/e-mail-reader.c:2605
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在顯示的郵件內文中顯示閃爍游標"
 
-#: ../mail/e-mail-reader.c:2507
+#: ../mail/e-mail-reader.c:2611
 msgid "All Message _Headers"
 msgstr "所有郵件檔頭(_H)"
 
-#: ../mail/e-mail-reader.c:2509
+#: ../mail/e-mail-reader.c:2613
 msgid "Show messages with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
-#: ../mail/e-mail-reader.c:3047
+#: ../mail/e-mail-reader.c:3151
 msgid "Retrieving message"
 msgstr "取回郵件"
 
-#: ../mail/e-mail-reader.c:4078
-#: ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4203 ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/e-mail-reader.c:4079
+#: ../mail/e-mail-reader.c:4204
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
-#: ../mail/e-mail-reader.c:4098
+#: ../mail/e-mail-reader.c:4223
 msgid "Group Reply"
 msgstr "群組回覆"
 
-#: ../mail/e-mail-reader.c:4099
+#: ../mail/e-mail-reader.c:4224
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "回覆給通信論壇,或是給所有的收件者"
 
-#: ../mail/e-mail-reader.c:4165 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:4290 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "刪除"
 
-#: ../mail/e-mail-reader.c:4177
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
+#: ../mail/e-mail-reader.c:4302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "下一個"
 
-#: ../mail/e-mail-reader.c:4181
-#: ../modules/calendar/e-cal-shell-view-actions.c:1205
+#: ../mail/e-mail-reader.c:4306
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "上一個"
 
-#: ../mail/e-mail-reader.c:4190 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4315 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/e-mail-reader.c:5240
+#: ../mail/e-mail-reader.c:5389
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "允許任何寄件者為 %s 的遠端內容"
 
-#: ../mail/e-mail-reader.c:5242
+#: ../mail/e-mail-reader.c:5391
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "允許任何收件者為 %s 的遠端內容"
 
-#: ../mail/e-mail-reader.c:5259
+#: ../mail/e-mail-reader.c:5408
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "允許任何寄件者為 %s 的遠端內容"
 
-#: ../mail/e-mail-reader.c:5316
+#: ../mail/e-mail-reader.c:5425
+msgid "Do not show this message again"
+msgstr "不要再顯示這個訊息"
+
+#: ../mail/e-mail-reader.c:5473
 msgid "Load remote content"
 msgstr "載入遠端內容"
 
@@ -15637,13 +15930,6 @@ msgstr "不要再警告我"
 msgid "Refreshing folder '%s'"
 msgstr "重新整理資料夾「%s」"
 
-#: ../mail/e-mail-reader-utils.c:650 ../mail/mail-send-recv.c:486
-#: ../mail/mail-send-recv.c:1285 ../plugins/face/face.c:176
-#: ../shell/e-shell.c:972 ../shell/e-shell.c:994
-#: ../smime/gui/certificate-manager.c:346
-msgid "Unknown error"
-msgstr "不明的錯誤"
-
 #: ../mail/e-mail-reader-utils.c:1165
 msgid "Marking thread to be ignored"
 msgstr "將群組標記為忽略"
@@ -15660,13 +15946,13 @@ msgstr "將子群組標記為忽略"
 msgid "Unmarking subthread from being ignored"
 msgstr "取消子群組被忽略的標記"
 
-#: ../mail/e-mail-reader-utils.c:1417
+#: ../mail/e-mail-reader-utils.c:1421
 msgid "Printing"
 msgstr "列印"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1654
+#: ../mail/e-mail-reader-utils.c:1658
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -15676,7 +15962,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "資料夾「%s」包含 %u 封重複的郵件。您確定要刪除它?"
 
-#: ../mail/e-mail-reader-utils.c:2485
+#: ../mail/e-mail-reader-utils.c:2489
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "儲存郵件"
@@ -15686,16 +15972,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:2506
+#: ../mail/e-mail-reader-utils.c:2510
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "郵件"
 
-#: ../mail/e-mail-reader-utils.c:2879
+#: ../mail/e-mail-reader-utils.c:2883
 msgid "Parsing message"
 msgstr "解析郵件"
 
-#: ../mail/e-mail-request.c:204
+#: ../mail/e-mail-request.c:207
 msgid "The message has no text content."
 msgstr "這個郵件沒有文字內容。"
 
@@ -15713,11 +15999,17 @@ msgstr "%s 核對失敗"
 msgid "No data source found for UID '%s'"
 msgstr "沒有 UID「%s」的資料來源"
 
+#. This message is never removed from the camel operation, otherwise the GtkInfoBar
+#. hides itself and the user sees no feedback.
+#: ../mail/em-composer-utils.c:769
+msgid "Waiting for attachments to load..."
+msgstr "正在等待載入附件"
+
 #. Note to translators: this is the attribution string used
 #. * 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:1603
+#: ../mail/em-composer-utils.c:1665
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -15725,24 +16017,24 @@ msgstr ""
 "於 ${WeekdayName},${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
 "${TimeZone},${Sender} 提到:"
 
-#: ../mail/em-composer-utils.c:1609
+#: ../mail/em-composer-utils.c:1671
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-#: ../mail/em-composer-utils.c:1614
+#: ../mail/em-composer-utils.c:1676
 msgid "-----Original Message-----"
 msgstr "-----原始郵件-----"
 
-#: ../mail/em-composer-utils.c:2827
+#: ../mail/em-composer-utils.c:2963
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3265
+#: ../mail/em-composer-utils.c:3450
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-#: ../mail/em-composer-utils.c:3270
+#: ../mail/em-composer-utils.c:3455
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
@@ -15873,12 +16165,12 @@ msgstr "正在移動資料夾 %s"
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2467
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2491
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2469
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2493
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
@@ -15991,7 +16283,7 @@ msgstr "全部展開(_X)"
 
 #: ../mail/em-subscription-editor.c:1973
 msgid "Refresh the folder list"
-msgstr "重新整理資料夾清單"
+msgstr "重新整理資料夾列表"
 
 #: ../mail/em-subscription-editor.c:1974
 #: ../modules/mail/e-mail-shell-view-actions.c:1652
@@ -16004,7 +16296,7 @@ msgid "Stop the current operation"
 msgstr "停止目前的操作"
 
 #: ../mail/em-subscription-editor.c:1986
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "停止(_S)"
 
@@ -16197,162 +16489,172 @@ msgstr "分數"
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
+#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
+msgid "is greater than or equal to"
+msgstr "大於或等於"
+
 #: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
 #: ../mail/vfoldertypes.xml.in.h:37
+msgid "is less than or equal to"
+msgstr "小於或等於"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:39
+#: ../mail/vfoldertypes.xml.in.h:39
 msgid "Replied to"
 msgstr "回覆"
 
-#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
-#: ../mail/vfoldertypes.xml.in.h:40
+#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:42
 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
+#: ../mail/filtertypes.xml.in.h:40 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:43 ../mail/vfoldertypes.xml.in.h:43
 msgid "Read"
 msgstr "已讀"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:128
-#: ../mail/vfoldertypes.xml.in.h:42
+#: ../mail/filtertypes.xml.in.h:41 ../mail/mail-config.ui.h:130
+#: ../mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
-#: ../mail/vfoldertypes.xml.in.h:43
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
 msgstr "跟隨"
 
-#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
-#: ../mail/vfoldertypes.xml.in.h:44
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
 msgid "is Flagged"
 msgstr "有標幟"
 
-#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
-#: ../mail/vfoldertypes.xml.in.h:45
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
 msgid "is not Flagged"
 msgstr "沒有標幟"
 
-#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
-#: ../mail/vfoldertypes.xml.in.h:46
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
 msgid "is Completed"
 msgstr "已完成 "
 
-#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
-#: ../mail/vfoldertypes.xml.in.h:47
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 msgid "is not Completed"
 msgstr "未完成 "
 
-#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
-#: ../mail/vfoldertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
 msgid "Mailing list"
 msgstr "郵件列表"
 
-#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
-#: ../mail/vfoldertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:52 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:55
 msgid "Regex Match"
 msgstr "正規表示式相配"
 
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:53 ../mail/searchtypes.xml.in.h:55
+#: ../mail/vfoldertypes.xml.in.h:56
 msgid "Message Header"
 msgstr "郵件檔頭"
 
-#: ../mail/filtertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:54
 msgid "Source Account"
 msgstr "來源帳號"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:55
 msgid "Pipe to Program"
 msgstr "建立程式管道"
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns"
 msgstr "傳回"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:57
 msgid "does not return"
 msgstr "沒有傳回"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:58
 msgid "returns greater than"
 msgstr "傳回大於"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:59
 msgid "returns less than"
 msgstr "傳回小於"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:60
 msgid "Junk Test"
 msgstr "垃圾郵件測試"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:61
 msgid "Message is Junk"
 msgstr "垃圾郵件"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:62
 msgid "Message is not Junk"
 msgstr "非垃圾郵件"
 
-#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:63 ../mail/vfoldertypes.xml.in.h:57
 msgid "Message Location"
 msgstr "郵件位置"
 
-#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:64 ../mail/searchtypes.xml.in.h:56
+#: ../mail/vfoldertypes.xml.in.h:58
 msgid "Match All"
 msgstr "符合全部"
 
-#: ../mail/filtertypes.xml.in.h:65
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Stop Processing"
 msgstr "停止處理"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Set Label"
 msgstr "設定標籤"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Assign Color"
 msgstr "指定色彩"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Unset Color"
 msgstr "取消設定顏色"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:72
 msgid "Assign Score"
 msgstr "指定目標"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Adjust Score"
 msgstr "調整目標"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Set Status"
 msgstr "設定狀態"
 
-#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
-#: ../mail/vfoldertypes.xml.in.h:38
+#: ../mail/filtertypes.xml.in.h:75 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
 msgid "Deleted"
 msgstr "已刪除"
 
-#: ../mail/filtertypes.xml.in.h:73
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Unset Status"
 msgstr "取消設定狀態"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Beep"
 msgstr "嗶聲"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:78
 msgid "Play Sound"
 msgstr "播放音效"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:79
 msgid "Run Program"
 msgstr "執行程式"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:80
 msgid "Forward to"
 msgstr "轉寄至"
 
@@ -16398,8 +16700,7 @@ msgctxt "mboxImp"
 msgid "From"
 msgstr "寄件者"
 
-#: ../mail/importers/evolution-mbox-importer.c:568
-#: ../shell/e-shell-utils.c:173
+#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:173
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 郵件信箱 (mbox)"
 
@@ -16588,57 +16889,41 @@ msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "當原始郵件已簽名 (PGP 或 S/MIME) 時也對郵件數位簽名(_S)"
 
 #: ../mail/mail-config.ui.h:25
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "附件"
-
-#: ../mail/mail-config.ui.h:26
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "行內 (Outlook 風格)"
+msgid "_Wrap quoted text in replies"
+msgstr "回信中引文換行(_W)"
 
-#: ../mail/mail-config.ui.h:27
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "引文"
-
-#: ../mail/mail-config.ui.h:28
-msgctxt "ReplyForward"
-msgid "Do Not Quote"
-msgstr "不使用引文"
-
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "行內"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "Sig_natures"
 msgstr "簽名檔(_N)"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Signatures"
 msgstr "簽名檔"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "_Languages"
 msgstr "語言(_L)"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Languages Table"
 msgstr "語言表"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "這裡的語言清單只反映出已經安裝字典的語言。"
+msgstr "這裡的語言列表只反映出已經安裝字典的語言。"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Check spelling while I _type"
 msgstr "當我輸入時檢查拼字(_T)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -16647,77 +16932,69 @@ msgstr ""
 "得確認:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with an _empty subject line"
 msgstr "傳送沒有主旨的郵件(_E)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "傳送只有指定密件副本收件者的郵件(_B)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Sending a message to many _To and CC recipients"
 msgstr "傳送郵件給大量收件者與副本(_T)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Sending a _private reply to a mailing list message"
 msgstr "傳送私人回覆到通信論壇(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Sending a reply to a large _number of recipients"
 msgstr "傳送有大量收件者的郵件(_N)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "允許當通信論壇將私人回覆導回論壇(_M)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "傳送給沒有輸入有效郵件位址的收件者(_R)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "使用快捷鍵傳送郵件時提示 (Ctrl+Enter) (_K)"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 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:60
+#: ../mail/mail-config.ui.h:61
 msgid "Use for Folders"
 msgstr "用於資料夾"
 
-#: ../mail/mail-config.ui.h:61
-msgid "A_dd"
-msgstr "加入(_A)"
-
-#: ../mail/mail-config.ui.h:63
-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:65
+#: ../mail/mail-config.ui.h:66
 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:67 ../modules/mail/em-composer-prefs.c:864
+#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:864
 msgid "Account"
 msgstr "帳號"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Send account overrides"
 msgstr "傳送帳號覆蓋"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 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 "
@@ -16725,223 +17002,227 @@ msgid ""
 "parts are compared separately."
 msgstr ""
 "指派哪個帳號要用來做個別資料夾或收件者的傳送帳號,會覆蓋通常傳送帳號的偵測。"
-"收件者清單可以包含部分的位址或名稱。名稱與位址的部分會分別比對。"
+"收件者列表可以包含部分的位址或名稱。名稱與位址的部分會分別比對。"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "_Folder override has precedence over Recipient override"
 msgstr "資料夾覆蓋先於收件者覆蓋(_F)"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "Send Account"
 msgstr "傳送帳號"
 
-#: ../mail/mail-config.ui.h:77 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:79 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Start up"
 msgstr "啟動"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Check for new _messages on start"
 msgstr "啟動時檢查新郵件(_M)"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Check for new messa_ges in all active accounts"
 msgstr "檢查所有使用中帳號的新郵件(_G)"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Message Display"
 msgstr "郵件顯示"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "_Use the same fonts as other applications"
 msgstr "使用與其他應用程式相同的字型(_U)"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:85
 msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定寬度字型"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Select HTML variable width font"
 msgstr "選擇 HTML 可變寬度字型"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Fix_ed Width Font:"
 msgstr "固定寬度字型(_E):"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "_Mark messages as read after"
 msgstr "將郵件標示成已經閱讀於(_M)"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:91
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
-#: ../mail/mail-config.ui.h:91
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../mail/mail-config.ui.h:92
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Pick a color"
 msgstr "挑選顏色"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "color"
 msgstr "色彩"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:94
 msgid "Default character e_ncoding:"
 msgstr "預設字元編碼(_N):"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "Apply the same _view settings to all folders"
 msgstr "在所有資料夾套用相同的檢視設定值(_V)"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "F_all back to threading messages by subject"
 msgstr "退回到依主旨的相關郵件(_A)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "Delete Mail"
 msgstr "刪除郵件"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "Empty _trash folders"
 msgstr "清空回收筒資料夾(_T)"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_W)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Archive Mail"
 msgstr "封存郵件"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "On This Computer A_rchive folder:"
 msgstr "「這臺電腦上」的封存資料夾(_R):"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 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:103
+#: ../mail/mail-config.ui.h:104
 msgid "_Show animated images"
 msgstr "播放動畫影像(_S)"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "當傳送 HTML 郵件給不想收到這類郵件的連絡人時顯示提示(_P)"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Loading Remote Content"
 msgstr "載入遠端內容"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "_Never load remote content from the Internet"
 msgstr "永不從網際網路載入遠端內容(_N)"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "_Load remote content only in messages from contacts"
 msgstr "只載入由連絡人寄出郵件中的遠端內容(_L)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "_Always load remote content from the Internet"
 msgstr "永遠從網際網路載入遠端內容(_A)"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
+msgid "Notify about _missing remote content in the message preview"
+msgstr "通知在郵件預覽中遺失的遠端內容(_M)"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Add"
 msgstr "加入"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:112
 msgid "Remove"
 msgstr "移除"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:113
 msgid "Allow for sites:"
 msgstr "允許網站:"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:114
 msgid "Allow for senders:"
 msgstr "允許寄件者:"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
 msgid "HTML Messages"
 msgstr "HTML 郵件"
 
-#: ../mail/mail-config.ui.h:114 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:116 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "標籤"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Sender Photograph"
 msgstr "寄件者相片"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 msgid "_Show the photograph of sender in the message preview"
 msgstr "在郵件預覽顯示寄件者相片(_S)"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:119
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "搜尋寄件者在 gra_vatar.com 上的相片"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:120
 msgid "Displayed Message Headers"
 msgstr "顯示的郵件檔頭"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:121
 msgid "Mail Headers Table"
 msgstr "郵件檔頭表"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 #: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "日期/時刻格式"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:124
 msgid "Check incoming _messages for junk"
 msgstr "檢查內送郵件是否為垃圾郵件(_M)"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:125
 msgid "_Delete junk messages"
 msgstr "刪除垃圾郵件(_D)"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:126
 msgid "Junk Test Options"
 msgstr "垃圾郵件測試選項"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:127
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "若寄件者在我的通訊錄中就不要將郵件標記為垃圾郵件(_K)"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:128
 msgid "_Lookup in local address book only"
 msgstr "只在本地通訊錄查詢(_L)"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:129
 msgid "Check cu_stom headers for junk"
 msgstr "以自訂標頭檢查垃圾郵件(_S)"
 
-#: ../mail/mail-config.ui.h:129
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
+#: ../mail/mail-config.ui.h:131
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:234
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
 msgid "No encryption"
 msgstr "沒有加密"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:132
 msgid "TLS encryption"
 msgstr "TLS 加密"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:133
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
@@ -17045,7 +17326,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:5
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr "要傳送 HTML 格式的郵件?"
+msgstr "您是否要傳送 HTML 格式的郵件?"
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
@@ -17058,7 +17339,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to send a message without a subject?"
-msgstr "要傳送沒有主旨的郵件?"
+msgstr "您是否要傳送沒有主旨的郵件?"
 
 #: ../mail/mail.error.xml.h:10
 msgid ""
@@ -17068,7 +17349,7 @@ msgstr "為郵件加上有意義的主旨,可以讓收件者知道您的郵件
 
 #: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "要傳送只有密件副本收件者的郵件?"
+msgstr "您是否要傳送只有密件副本收件者的郵件?"
 
 #: ../mail/mail.error.xml.h:12
 msgid ""
@@ -17079,7 +17360,7 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"傳送的連絡人清單是設定成隱藏清單收件者。\n"
+"傳送的連絡人列表是設定成隱藏列表收件者。\n"
 "\n"
 "很多電子郵件系統會新增 Apparently-To 檔頭至只有密件副本收件者的郵件。如果新增"
 "此檔頭,會列示郵件中所有的收件者。要避免此情況,您應該至少新增一個「收件"
@@ -17114,7 +17395,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid address?"
-msgstr "要傳送電子郵件位址無效的郵件?"
+msgstr "您是否要傳送電子郵件位址無效的郵件?"
 
 #: ../mail/mail.error.xml.h:20
 msgid ""
@@ -17126,7 +17407,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:22
 msgid "Are you sure you want to send a message with invalid addresses?"
-msgstr "要傳送電子郵件位址無效的郵件?"
+msgstr "您是否要傳送電子郵件位址無效的郵件?"
 
 #: ../mail/mail.error.xml.h:23
 msgid ""
@@ -17219,8 +17500,7 @@ msgid ""
 "folders?"
 msgstr "要永久移除所有資料夾中所有刪除的郵件?"
 
-#: ../mail/mail.error.xml.h:42
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
@@ -17548,44 +17828,48 @@ msgstr "請稍候。"
 
 #: ../mail/mail.error.xml.h:124
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "向伺服器查詢支援的核對演算法清單。"
+msgstr "向伺服器查詢支援的核對演算法列表。"
 
 #: ../mail/mail.error.xml.h:125
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
-msgstr "無法向伺服器查詢支援的核對演算法清單。"
+msgstr "無法向伺服器查詢支援的核對演算法列表。"
 
 #: ../mail/mail.error.xml.h:126
+msgid "Failed to get server setup."
+msgstr "伺服器設定失敗。"
+
+#: ../mail/mail.error.xml.h:127
 msgid "Synchronize folders locally for offline usage?"
 msgstr "是否同步資料夾以供離線使用?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:128
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "是否要在本地端同步那些標記為離線使用的資料夾?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:129
 msgid "Do _Not Synchronize"
 msgstr "不要同步(_N)"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:130
 msgid "_Synchronize"
 msgstr "同步化(_S)"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:131
 msgid "Do you want to mark all messages as read?"
 msgstr "是否要將全部的郵件標示成已閱讀?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:132
 msgid "This will mark all messages as read in the selected folder."
 msgstr "這會將標示選取的資料夾中所有郵件為已閱讀。"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:133
 msgid "Also mark messages in subfolders?"
 msgstr "是否也標記子資料夾中的郵件?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:134
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -17593,134 +17877,134 @@ msgstr ""
 "您要將目前的資料夾中的郵件已閱讀,或是包含目前的資料夾及其子資料夾中所有郵"
 "件。"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:135
 msgid "In Current Folder and _Subfolders"
 msgstr "於目前的資料夾及其子資料夾(_S)"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:136
 msgid "In Current _Folder Only"
 msgstr "於目前的資料夾(_F)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:137
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr "當回覆或轉寄時 Evolution 是否應關閉這個視窗?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:138
 msgid "_Yes, Always"
 msgstr "是,總是使用(_Y)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:139
 msgid "_No, Never"
 msgstr "否,永不使用(_N)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
 msgid "Copy folder in folder tree."
 msgstr "於資料夾樹狀圖複製。"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:141
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "是否確定要將資料夾「{0}」複製到資料夾「{1}」?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:143
 msgid "Do _not copy"
 msgstr "不要複製(_N)"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:144
 msgid "_Always copy"
 msgstr "永遠複製(_A)"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:145
 msgid "N_ever copy"
 msgstr "永不複製(_E)"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:146
 msgid "Move folder in folder tree."
 msgstr "於資料夾樹狀圖移動。"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:147
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "是否確定要將資料夾「{0}」移動到資料夾「{1}」?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:149
 msgid "Do _not move"
 msgstr "不要移動(_N)"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:150
 msgid "_Always move"
 msgstr "永遠移動(_A)"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:151
 msgid "N_ever move"
 msgstr "永不移動(_E)"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:152
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "因為您沒有啟用選擇用來寄送的帳號,所以無法傳送此郵件。"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:153
 msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳送。"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:154
 msgid "Mail Deletion Failed"
 msgstr "刪除郵件失敗"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:155
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您沒有足夠的權限刪除此封郵件。"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:156
 msgid "\"Check Junk\" Failed"
 msgstr "「檢查垃圾郵件」失敗"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:157
 msgid "\"Report Junk\" Failed"
 msgstr "「回報垃圾郵件」失敗"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:158
 msgid "\"Report Not Junk\" Failed"
 msgstr "「回報為非垃圾郵件」失敗"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:159
 msgid "Remove duplicate messages?"
 msgstr "是否移除重複的郵件?"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:160
 msgid "No duplicate messages found."
 msgstr "找不到重複的郵件。"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:162
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "資料夾「{0}」並未包含任何重複的郵件。"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "無法與帳號 &quot;{0}&quot; 連線。"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "無法中斷與帳號 &quot;{0}&quot; 的連線。"
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "無法取消訂閱資料夾 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:166
 msgid "Unable to retrieve message."
 msgstr "無法接收郵件。"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:167
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:168
 msgid "Message is not available in offline mode."
 msgstr "郵件無法在離線模式下使用。"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:169
 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 "
@@ -17732,85 +18016,85 @@ msgstr ""
 "號恢復上線時,選擇這個資料夾,使用「檔案-&gt;下載郵件供離線使用」,以確定資料"
 "夾中所有的郵件都能在離線模式中使用。"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:170
 msgid "Failed to open folder."
 msgstr "無法開啟資料夾。"
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to find duplicate messages."
 msgstr "找不到重複的郵件。"
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to retrieve messages."
 msgstr "無法取回郵件。"
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to mark messages as read."
 msgstr "無法將郵件標示成已經閱讀。"
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:175
 msgid "Failed to remove attachments from messages."
 msgstr "無法移除郵件中的附件。"
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:176
 msgid "Failed to download messages for offline viewing."
 msgstr "下載離線使用的郵件失敗。"
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:177
 msgid "Failed to save messages to disk."
 msgstr "無法將選取的郵件儲存至磁碟。"
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:178
 msgid "Hidden file is attached."
 msgstr "附加了隱藏的檔案。"
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:179
 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:179
+#: ../mail/mail.error.xml.h:180
 msgid "Printing failed."
 msgstr "列印失敗。"
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:181
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "印表機回覆 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:181
+#: ../mail/mail.error.xml.h:182
 msgid "Could not perform this operation on {0}."
 msgstr "無法進行 {0} 上的操作。"
 
-#: ../mail/mail.error.xml.h:182
+#: ../mail/mail.error.xml.h:183
 msgid "You must be working online to complete this operation."
 msgstr "您必須於線上工作才能完成此操作。"
 
-#: ../mail/mail.error.xml.h:183
+#: ../mail/mail.error.xml.h:184
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "來自 &quot;{0}&quot; 帳號的郵件:"
 
-#: ../mail/mail.error.xml.h:184
+#: ../mail/mail.error.xml.h:185
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件群組標記為已忽略"
 
-#: ../mail/mail.error.xml.h:185
+#: ../mail/mail.error.xml.h:186
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件群組取消已忽略標記"
 
-#: ../mail/mail.error.xml.h:186
+#: ../mail/mail.error.xml.h:187
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件子群組標記為已忽略"
 
-#: ../mail/mail.error.xml.h:187
+#: ../mail/mail.error.xml.h:188
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件子群組取消已忽略標記"
 
-#: ../mail/mail.error.xml.h:188
+#: ../mail/mail.error.xml.h:189
 msgid "Remote content download had been blocked for this message."
 msgstr "已阻擋這封郵件的遠端內容下載。"
 
-#: ../mail/mail.error.xml.h:189
+#: ../mail/mail.error.xml.h:190
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -17818,20 +18102,34 @@ msgstr ""
 "您可以手動下載遠端內容,或設定為記住下載這個寄件者或使用過網站的遠端內容。"
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:191
+#: ../mail/mail.error.xml.h:192
 msgid "{0}, Completed on {1}"
 msgstr "{0} ,完成於 {1} "
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:193
+#: ../mail/mail.error.xml.h:194
 msgid "{0} by {1}"
 msgstr "{0} 自 {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:195
+#: ../mail/mail.error.xml.h:196
 msgid "Overdue: {0} by {1}"
 msgstr "逾期:{0} 自 {1}"
 
+#: ../mail/mail.error.xml.h:198
+msgid "This message note has been changed, but has not been saved."
+msgstr "此郵件備註已經變更,但尚未儲存。"
+
+#. Translators: {0} is the name of the folder where the delete of the message note failed.
+#: ../mail/mail.error.xml.h:201
+msgid "Failed to delete message note in folder '{0}'"
+msgstr "無法在資料夾「{0}」刪除郵件備註"
+
+#. Translators: {0} is the name of the folder where the store of the message note failed.
+#: ../mail/mail.error.xml.h:203
+msgid "Failed to store message note in folder '{0}'"
+msgstr "無法在資料夾「{0}」儲存郵件備註"
+
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "正在取消…"
@@ -17884,86 +18182,86 @@ msgstr "編輯搜尋資料夾"
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:294
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:295
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../mail/message-list.c:293
+#: ../mail/message-list.c:296
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../mail/message-list.c:294
+#: ../mail/message-list.c:297
 msgid "Forwarded"
 msgstr "轉寄"
 
-#: ../mail/message-list.c:295
+#: ../mail/message-list.c:298
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../mail/message-list.c:296
+#: ../mail/message-list.c:299
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../mail/message-list.c:309
+#: ../mail/message-list.c:312
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:313
 msgid "Lower"
 msgstr "低"
 
-#: ../mail/message-list.c:314
+#: ../mail/message-list.c:317
 msgid "Higher"
 msgstr "高"
 
-#: ../mail/message-list.c:315
+#: ../mail/message-list.c:318
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:6034
+#: ../mail/message-list.c:464 ../mail/message-list.c:6152
 msgid "Generating message list"
-msgstr "產生郵件清單"
+msgstr "產生郵件列表"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2057 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "今天 %p %l:%M"
 
-#: ../mail/message-list.c:2050
+#: ../mail/message-list.c:2066
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %p %l:%M"
 
-#: ../mail/message-list.c:2062
+#: ../mail/message-list.c:2078
 msgid "%a %l:%M %p"
 msgstr "%A %p %l:%M"
 
-#: ../mail/message-list.c:2070
+#: ../mail/message-list.c:2086
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日 %p %l:%M"
 
-#: ../mail/message-list.c:2072
+#: ../mail/message-list.c:2088
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2957
+#: ../mail/message-list.c:2994
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../mail/message-list.c:3622 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3686 ../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:4978
+#: ../mail/message-list.c:5089
 msgid "Follow-up"
 msgstr "跟隨"
 
-#: ../mail/message-list.c:5971
+#: ../mail/message-list.c:6091
 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 "
@@ -17973,7 +18271,7 @@ msgstr ""
 "沒有郵件滿足您的搜尋條件。請從上列下拉式選單選擇顯示郵件過濾器或執行新的搜"
 "尋,可從 搜尋->清除 選單項目清除它或改變上面的查詢。"
 
-#: ../mail/message-list.c:5979
+#: ../mail/message-list.c:6099
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -18009,43 +18307,43 @@ msgstr "主旨 - 已截短"
 msgid "Any header"
 msgstr "任何標頭"
 
-#: ../mail/searchtypes.xml.in.h:54
+#: ../mail/searchtypes.xml.in.h:57
 msgid "Subject or Addresses contains"
 msgstr "主旨或電子郵件位址包含"
 
-#: ../mail/searchtypes.xml.in.h:55
-#: ../modules/mail/e-mail-shell-view-actions.c:2136
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2151
 msgid "Recipients contain"
 msgstr "收件者包含"
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2129
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2144
 msgid "Message contains"
 msgstr "郵件包含"
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2150
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2165
 msgid "Subject contains"
 msgstr "主旨包含"
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2143
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2158
 msgid "Sender contains"
 msgstr "寄件者包含"
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2115
+#: ../mail/searchtypes.xml.in.h:62
+#: ../modules/mail/e-mail-shell-view-actions.c:2130
 msgid "Body contains"
 msgstr "內文包含"
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2122
+#: ../mail/searchtypes.xml.in.h:63
+#: ../modules/mail/e-mail-shell-view-actions.c:2137
 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:1552
+#: ../modules/mail/em-mailer-prefs.c:1558
 msgid "_Table column:"
 msgstr "表格欄(_T):"
 
@@ -18086,7 +18384,7 @@ msgid "Contact information for %s"
 msgstr "%s 的連絡人資訊"
 
 #: ../modules/addressbook/e-book-shell-backend.c:258
-#: ../modules/addressbook/e-book-shell-view-actions.c:124
+#: ../modules/addressbook/e-book-shell-view-actions.c:139
 msgid "New Address Book"
 msgstr "新通訊錄"
 
@@ -18096,19 +18394,19 @@ msgid "_Contact"
 msgstr "連絡人(_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/addressbook/e-book-shell-view-actions.c:1045
 msgid "Create a new contact"
 msgstr "建立新的連絡人"
 
 #: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
-msgstr "連絡人清單(_L)"
+msgstr "連絡人列表(_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
 msgid "Create a new contact list"
-msgstr "建立新的連絡人清單"
+msgstr "建立新的連絡人列表"
 
 #: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
@@ -18116,249 +18414,265 @@ msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:197
+#: ../modules/addressbook/e-book-shell-view-actions.c:212
 msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:520
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:535
+#: ../modules/addressbook/e-book-shell-view-actions.c:831
 msgid "Save as vCard"
 msgstr "儲存為 vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:938
 msgid "Co_py All Contacts To..."
 msgstr "複製所有的連絡人到(_P)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 msgid "Copy the contacts of the selected address book to another"
 msgstr "將已選取通訊錄中的連絡人複製到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:945
 msgid "D_elete Address Book"
 msgstr "刪除通訊錄(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "Delete the selected address book"
 msgstr "刪除選取的通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
+msgid "_Manage Address Book groups..."
+msgstr "管理通訊錄群組(_M)…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
+#: ../modules/calendar/e-task-shell-view-actions.c:721
+msgid "Manage task list groups order and visibility"
+msgstr "管理工作列表群組順序與可見性"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
 msgid "Mo_ve All Contacts To..."
 msgstr "將所有的連絡人移到(_V)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "Move the contacts of the selected address book to another"
 msgstr "將已選取通訊錄中的連絡人移動到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "Address _Book Properties"
 msgstr "通訊錄屬性(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "Show properties of the selected address book"
 msgstr "顯示選取通訊錄的屬性"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
-#: ../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
+#: ../modules/addressbook/e-book-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Re_fresh"
 msgstr "重新整理(_F)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "Refresh the selected address book"
 msgstr "重新整理選取的通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:965
+#: ../modules/addressbook/e-book-shell-view-actions.c:987
 msgid "Address Book _Map"
 msgstr "通訊錄地圖(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:967
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Show map with all contacts from selected address book"
 msgstr "顯示已選取通訊錄中所有連絡人的地圖"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:972
-#: ../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/addressbook/e-book-shell-view-actions.c:994
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 #: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Rename..."
 msgstr "重新命名(_R)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:974
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "Rename the selected address book"
 msgstr "重新命名選取的通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Stop loading"
 msgstr "停止載入"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:986
+#: ../modules/addressbook/e-book-shell-view-actions.c:1008
 msgid "_Copy Contact To..."
 msgstr "複製連絡人到(_C)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1010
 msgid "Copy selected contacts to another address book"
 msgstr "將選取的連絡人複製到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:1015
 msgid "_Delete Contact"
 msgstr "刪除連絡人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1000
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
 msgid "_Find in Contact..."
 msgstr "在連絡人內尋找(_F)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1002
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
 msgid "Search for text in the displayed contact"
 msgstr "搜尋顯示的連絡人中的文字"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1007
+#: ../modules/addressbook/e-book-shell-view-actions.c:1029
 msgid "_Forward Contact..."
 msgstr "轉寄連絡人(_F)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../modules/addressbook/e-book-shell-view-actions.c:1031
 msgid "Send selected contacts to another person"
 msgstr "傳送選取連絡人給其他使用者。"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1014
+#: ../modules/addressbook/e-book-shell-view-actions.c:1036
 msgid "_Move Contact To..."
 msgstr "將連絡人移到(_M)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Move selected contacts to another address book"
 msgstr "將選取的連絡人移至另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1021
+#: ../modules/addressbook/e-book-shell-view-actions.c:1043
 msgid "_New Contact..."
 msgstr "新增連絡人(_N)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../modules/addressbook/e-book-shell-view-actions.c:1050
 msgid "New Contact _List..."
-msgstr "新增連絡人清單(_L)…"
+msgstr "新增連絡人列表(_L)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/addressbook/e-book-shell-view-actions.c:1057
 msgid "_Open Contact"
 msgstr "開啟連絡人(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1037
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
 msgid "View the current contact"
 msgstr "檢視目前的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/addressbook/e-book-shell-view-actions.c:1064
 msgid "_Send Message to Contact..."
 msgstr "傳送郵件給連絡人(_S)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1044
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Send a message to the selected contacts"
 msgstr "傳送郵件至選取的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Actions"
 msgstr "動作(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
-#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/addressbook/e-book-shell-view-actions.c:1080
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-task-shell-view-actions.c:819
 #: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "預覽(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1079
+#: ../modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-memo-shell-view-actions.c:682
+#: ../modules/calendar/e-task-shell-view-actions.c:836
+msgid "_Manage groups..."
+msgstr "管理群組(_M)…"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1105
 msgid "Address Book Map"
 msgstr "通訊錄地圖"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1111
+#: ../modules/addressbook/e-book-shell-view-actions.c:1137
 msgid "Contact _Preview"
 msgstr "連絡人預覽(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
+#: ../modules/addressbook/e-book-shell-view-actions.c:1139
 msgid "Show contact preview window"
 msgstr "顯示連絡人預覽視窗"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
+#: ../modules/addressbook/e-book-shell-view-actions.c:1145
 msgid "Show _Maps"
 msgstr "顯示地圖(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1121
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 msgid "Show maps in contact preview window"
 msgstr "在連絡人預覽視窗顯示地圖"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1140
-#: ../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:2032
+#: ../modules/addressbook/e-book-shell-view-actions.c:1166
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/mail/e-mail-shell-view-actions.c:2040
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1142
+#: ../modules/addressbook/e-book-shell-view-actions.c:1168
 msgid "Show contact preview below the contact list"
-msgstr "在連絡人清單下方顯示連絡人預覽"
+msgstr "在連絡人列表下方顯示連絡人預覽"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
-#: ../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:2039
+#: ../modules/addressbook/e-book-shell-view-actions.c:1173
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/mail/e-mail-shell-view-actions.c:2047
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1149
+#: ../modules/addressbook/e-book-shell-view-actions.c:1175
 msgid "Show contact preview alongside the contact list"
-msgstr "在連絡人清單旁邊顯示連絡人預覽"
+msgstr "在連絡人列表旁邊顯示連絡人預覽"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1164
-#: ../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
+#: ../modules/addressbook/e-book-shell-view-actions.c:1190
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:968
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
-#: ../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:2108
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
+#: ../modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../modules/calendar/e-memo-shell-view-actions.c:777
+#: ../modules/calendar/e-task-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:2123
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/addressbook/e-book-shell-view-actions.c:1233
 msgid "Print all shown contacts"
 msgstr "列印所有顯示的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1214
+#: ../modules/addressbook/e-book-shell-view-actions.c:1240
 msgid "Preview the contacts to be printed"
 msgstr "預覽將要列印的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1221
+#: ../modules/addressbook/e-book-shell-view-actions.c:1247
 msgid "Print selected contacts"
 msgstr "列印已選取的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1236
+#: ../modules/addressbook/e-book-shell-view-actions.c:1262
 msgid "S_ave Address Book as vCard"
 msgstr "將通訊錄另存為 vC_ard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../modules/addressbook/e-book-shell-view-actions.c:1264
 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:1244
-#: ../modules/addressbook/e-book-shell-view-actions.c:1254
+#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../modules/addressbook/e-book-shell-view-actions.c:1280
 msgid "_Save as vCard..."
 msgstr "儲存成 _vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+#: ../modules/addressbook/e-book-shell-view-actions.c:1272
 msgid "Save selected contacts as a vCard"
 msgstr "將選取的連絡人儲存為 vCard"
 
@@ -18376,7 +18690,7 @@ msgstr "傳送郵件給連絡人(_S)"
 
 #: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
-msgstr "傳送郵件給清單(_S)"
+msgstr "傳送郵件給列表(_S)"
 
 #: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
@@ -18627,67 +18941,82 @@ msgstr "Bogofilter"
 msgid "Junk filter using Bogofilter"
 msgstr "使用 Bogofilter 垃圾郵件過濾器"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
+#: ../modules/book-config-google/evolution-book-config-google.c:92
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:993
+#: ../modules/cal-config-google/e-cal-config-google.c:177
+#: ../modules/cal-config-google/e-cal-config-gtasks.c:117
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:361
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:396
+msgid "User name cannot be empty"
+msgstr "使用者名稱不能為空"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
 msgid "Standard LDAP Port"
 msgstr "標準 LDAP 連接埠"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:618
-msgid "LDAP over SSL (deprecated)"
-msgstr "LDAP 透過 SSL (已廢棄)"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:631
+msgid "LDAP over SSL/TLS (deprecated)"
+msgstr "LDAP 透過 SSL/TLS (已廢棄)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft 通用類別目錄"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
-msgid "Microsoft Global Catalog over SSL"
-msgstr "透過 SSL 的 Microsoft 通用類別目錄"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+msgid "Microsoft Global Catalog over SSL/TLS"
+msgstr "透過 SSL/TLS 的 Microsoft 通用類別目錄"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:567
 msgid "Connecting to LDAP"
 msgstr "正在連線至 LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:584
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:611
 msgid "Port:"
 msgstr "連接埠:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:185
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:140
+msgid "Port number is not valid"
+msgstr "連接埠號無效"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:634
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (建議值)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:636
 msgid "Encryption:"
 msgstr "加密:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:660
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:255
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
 msgid "Authentication"
 msgstr "核對"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "Using email address"
 msgstr "使用電子郵件地址"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Method:"
 msgstr "方法:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -18697,36 +19026,36 @@ msgstr ""
 "能匿名存取您的 LDAP 伺服器。"
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:711
 msgid "Using LDAP"
 msgstr "使用 LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:728
 #: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "正在搜尋"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:750
 msgid "Search Base:"
 msgstr "搜尋起點:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:754
 msgid "Find Possible Search Bases"
 msgstr "尋找可能的搜尋起點"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "One Level"
 msgstr "一層"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Subtree"
 msgstr "子目錄"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
 msgid "Search Scope:"
 msgstr "搜尋範圍:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
 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 "
@@ -18737,26 +19066,32 @@ msgstr ""
 "圍會包括搜尋起點底下所有的項目。「One Level」(一層) 的搜尋範圍只會包括起點底"
 "下的一個層級。"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Search Filter:"
 msgstr "搜尋過濾器:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
 msgid "Downloading"
 msgstr "下載中"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Limit:"
 msgstr "限制:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
 msgid "contacts"
 msgstr "連絡人"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
 msgid "Browse until limit is reached"
 msgstr "瀏覽直到達到限制"
 
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:978
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:342
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:378
+msgid "Server address cannot be empty"
+msgstr "伺服器位址不能為空"
+
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
@@ -18767,20 +19102,26 @@ msgstr "網址:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "避免 IfMatch (需使用 Apache < 2.2.8)"
 
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:194
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:415
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:184
+msgid "URL is not a valid http:// nor https:// URL"
+msgstr "URL 不是有效的 http:// 或 https:// URL"
+
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
-#: ../modules/cal-config-google/e-google-chooser-button.c:213
+#: ../modules/cal-config-google/e-google-chooser-button.c:224
 msgid "Choose a Calendar"
 msgstr "選擇行事曆"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
-#: ../modules/cal-config-google/e-google-chooser-button.c:217
+#: ../modules/cal-config-google/e-google-chooser-button.c:228
 msgid "Choose a Memo List"
-msgstr "選擇備忘錄清單"
+msgstr "選擇備忘錄列表"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
-#: ../modules/cal-config-google/e-google-chooser-button.c:221
+#: ../modules/cal-config-google/e-google-chooser-button.c:232
 msgid "Choose a Task List"
-msgstr "選擇工作清單"
+msgstr "選擇工作列表"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Calendars"
@@ -18788,11 +19129,11 @@ msgstr "尋找行事曆"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Memo Lists"
-msgstr "尋找備忘錄清單"
+msgstr "尋找備忘錄列表"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
 msgid "Find Task Lists"
-msgstr "尋找工作清單"
+msgstr "尋找工作列表"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
 msgid "Email:"
@@ -18810,7 +19151,7 @@ msgstr "選擇要使用的通訊錄。"
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "用於生日和週年紀念日行事曆"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:145
+#: ../modules/cal-config-google/e-google-chooser-button.c:143
 msgid "Default User Calendar"
 msgstr "預設使用者行事曆"
 
@@ -18866,6 +19207,10 @@ msgstr "絕對溫度 (K)"
 msgid "Units:"
 msgstr "單位:"
 
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:321
+msgid "Location cannot be empty"
+msgstr "位置不能為空"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
@@ -18889,11 +19234,11 @@ msgstr "選擇行事曆"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:410
 msgid "Select a Memo List"
-msgstr "選擇備忘錄清單"
+msgstr "選擇備忘錄列表"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
-msgstr "選擇工作清單"
+msgstr "選擇工作列表"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
@@ -18901,96 +19246,86 @@ msgstr "匯入至行事曆(_M)"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:431
 msgid "I_mport to Memo List"
-msgstr "匯入至備忘錄清單(_M)"
+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 "新行事曆"
+msgstr "匯入至工作列表(_M)"
 
-#: ../modules/calendar/e-cal-base-shell-backend.c:190
-#: ../modules/calendar/e-memo-shell-view-actions.c:164
+#: ../modules/calendar/e-cal-base-shell-backend.c:187
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
-msgstr "新增備忘錄清單"
+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:554
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:556
 #, c-format
 msgid "Copying an event into the calendar '%s'"
 msgstr "正在複製事件到行事曆「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:557
 #, c-format
 msgid "Moving an event into the calendar '%s'"
 msgstr "正在移動事件到行事曆「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:562
 #, c-format
 msgid "Copying a memo into the memo list '%s'"
-msgstr "正在複製備忘錄到備忘錄清單「%s」"
+msgstr "正在複製備忘錄到備忘錄列表「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:563
 #, c-format
 msgid "Moving a memo into the memo list '%s'"
-msgstr "正在移動備忘錄到備忘錄清單「%s」"
+msgstr "正在移動備忘錄到備忘錄列表「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:566
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:568
 #, c-format
 msgid "Copying a task into the task list '%s'"
-msgstr "正在複製工作到工作清單「%s」"
+msgstr "正在複製工作到工作列表「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:567
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:569
 #, c-format
 msgid "Moving a task into the task list '%s'"
-msgstr "正在移動工作到工作清單「%s」"
+msgstr "正在移動工作到工作列表「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:684
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:686
 msgid "Calendar Selector"
 msgstr "行事曆選擇器"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:692
 msgid "Memo List Selector"
-msgstr "備忘錄清單選擇器"
+msgstr "備忘錄列表選擇器"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:697
 msgid "Task List Selector"
-msgstr "工作清單選擇器"
+msgstr "工作列表選擇器"
 
-#: ../modules/calendar/e-calendar-preferences.c:520
+#: ../modules/calendar/e-calendar-preferences.c:515
 msgid "Selected Calendars for Alarms"
 msgstr "選取的鬧鈴行事曆"
 
-#: ../modules/calendar/e-calendar-preferences.c:616
+#: ../modules/calendar/e-calendar-preferences.c:611
 msgid "Meeting Invitations"
 msgstr "會議邀請"
 
-#: ../modules/calendar/e-calendar-preferences.c:642
+#: ../modules/calendar/e-calendar-preferences.c:637
 msgid "_Delete message after acting"
 msgstr "完成後刪除郵件(_D)"
 
-#: ../modules/calendar/e-calendar-preferences.c:656
-#: ../modules/calendar/e-calendar-preferences.c:687
+#: ../modules/calendar/e-calendar-preferences.c:651
+#: ../modules/calendar/e-calendar-preferences.c:682
 msgid "Conflict Search"
 msgstr "衝突的搜尋"
 
 #. Source selector
-#: ../modules/calendar/e-calendar-preferences.c:671
+#: ../modules/calendar/e-calendar-preferences.c:666
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "選擇要搜尋會議衝突的行事曆"
 
-#: ../modules/calendar/e-calendar-preferences.c:1057
+#: ../modules/calendar/e-calendar-preferences.c:1058
 msgid "Ti_me and date:"
 msgstr "時刻和日期(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:1058
+#: ../modules/calendar/e-calendar-preferences.c:1059
 msgid "_Date only:"
 msgstr "只有日期(_D):"
 
@@ -19034,6 +19369,10 @@ msgstr "第二時區(_C):"
 msgid "(Shown in a Day View)"
 msgstr "(顯示於日檢視)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Time _zone:"
+msgstr "時區(_Z):"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "使用系統時區(_Y)"
@@ -19051,7 +19390,7 @@ msgid "_24 hour"
 msgstr "_24 小時"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Work Week"
 msgstr "工作週"
 
@@ -19073,36 +19412,64 @@ msgstr "一日開始於(_D):"
 msgid "_Mon"
 msgstr "週一(_M)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "Monday"
+msgstr "星期一"
+
 #. Tuesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "週二(_T)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Tuesday"
+msgstr "星期二"
+
 #. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "週三(_W)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Wednesday"
+msgstr "星期三"
+
 #. Thursday
 #: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "週四(_H)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Thursday"
+msgstr "星期四"
+
 #. Friday
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "週五(_F)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "Friday"
+msgstr "星期五"
+
 #. Saturday
 #: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "週六(_S)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Saturday"
+msgstr "星期六"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "週日(_U)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Sunday"
+msgstr "星期日"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Day _ends:"
 msgstr "一日結束於(_E):"
@@ -19117,119 +19484,123 @@ msgstr "時間間隔(_T):"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "_Show appointment end times in week and month view"
-msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
+msgstr "在週及月的檢視內顯示會議的結束時間(_S)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "Show appointment _icons in the month view"
+msgstr "在月檢視中顯示會議圖示(_I)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
 msgid "Show week _numbers"
 msgstr "顯示週數(_N)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr "在左下行事曆中將週期性事件以斜體顯示(_E)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Sc_roll Month View by a week"
 msgstr "以週捲動月檢視(_R)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Alerts"
 msgstr "警示"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Display"
 msgstr "顯示"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Task List"
-msgstr "工作清單"
+msgstr "工作列表"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Highlight t_asks due today"
 msgstr "強調今天到期工作(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Highlight _overdue tasks"
 msgstr "強調過期的工作(_O)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
 msgid "Display reminders in _notification area only"
 msgstr "只在通知區域中顯示提醒(_N)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Display reminders for completed _tasks"
 msgstr "顯示已完成工作的提醒(_T)"
 
 #. This is the first 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 "Sh_ow a reminder"
-msgstr "顯示提醒於約會(_O)"
+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:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 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:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 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:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "在每個週年紀念日/生日之前"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Default _snooze time (in minutes)"
 msgstr "預設小睡時間 [以分鐘計] (_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Select the calendars for reminder notification"
 msgstr "選擇提醒通知的行事曆"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 msgid "Default Free/Busy Server"
 msgstr "預設的空閒/忙碌伺服器網址"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
 #, 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:80
+#: ../modules/calendar/e-calendar-preferences.ui.h:81
 msgid "Publishing Information"
 msgstr "發布資訊"
 
 #: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
-msgstr "約會(_A)"
+msgstr "會議(_A)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:116
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Create a new appointment"
-msgstr "建立一個新的約會"
+msgstr "建立一個新的會議"
 
 #: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
-msgstr "全日約會(_P)"
+msgstr "全日會議(_P)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
-msgstr "建立新的全日約會"
+msgstr "建立新的全日會議"
 
 #: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
@@ -19246,7 +19617,7 @@ msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
@@ -19254,15 +19625,15 @@ msgstr "建立新行事曆"
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
 msgid "Print"
 msgstr "列印"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:267
+#: ../modules/calendar/e-cal-shell-view-actions.c:285
 msgid "Calendar Properties"
 msgstr "iCalendar 錯誤"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:296
+#: ../modules/calendar/e-cal-shell-view-actions.c:314
 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 "
@@ -19272,339 +19643,351 @@ 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:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:331
 msgid "Purge events older than"
 msgstr "清除早於這段時間的事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:895
+#: ../modules/calendar/e-cal-shell-view-actions.c:926
 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:1055
+#: ../modules/calendar/e-cal-shell-view-actions.c:1086
 msgid "event"
 msgstr "事件"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1088
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:498
+#: ../modules/calendar/e-task-shell-view-actions.c:617
 msgid "Save as iCalendar"
 msgstr "儲存為 iCalendar"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1222
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "_Copy..."
 msgstr "複製(_C)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1198
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
 msgid "D_elete Calendar"
 msgstr "刪除行事曆(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1200
+#: ../modules/calendar/e-cal-shell-view-actions.c:1231
 msgid "Delete the selected calendar"
 msgstr "刪除選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1207
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
 msgid "Go Back"
 msgstr "向後"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1214
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 msgid "Go Forward"
 msgstr "向前"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1221
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "Select today"
 msgstr "選取今日"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1226
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select _Date"
 msgstr "選擇日期(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Select a specific date"
 msgstr "選取特定日期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1233
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+msgid "_Manage Calendar groups..."
+msgstr "管理行事曆群組(_M)…"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Manage Calendar groups order and visibility"
+msgstr "管理行事曆列表群組順序與可見性"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1247
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "Purg_e"
 msgstr "清除(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Purge old appointments and meetings"
-msgstr "刪除舊約會和會議"
+msgstr "刪除舊會議和會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1256
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Refresh the selected calendar"
 msgstr "重新整理選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1263
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 msgid "Rename the selected calendar"
 msgstr "重新命名選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1268
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Find _Next"
 msgstr "尋找下一筆(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1270
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Find next occurrence of the current search string"
 msgstr "尋找目前搜尋字詞下一個出現處"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1275
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Find _Previous"
 msgstr "尋找上一筆(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1277
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Find previous occurrence of the current search string"
 msgstr "尋找目前搜尋字詞上一個出現處"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Stop _Running Search"
 msgstr "停止目前執行的搜尋(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Stop currently running search"
 msgstr "停止目前執行的搜尋"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+msgid "Sho_w All Calendars"
+msgstr "顯示所有行事曆(_W)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Show _Only This Calendar"
 msgstr "只顯示這個行事曆(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1296
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1303
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "_Delete Appointment"
-msgstr "刪除約會(_D)"
+msgstr "刪除會議(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete selected appointments"
-msgstr "刪除選取的約會"
+msgstr "刪除選取的會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1317
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete This _Occurrence"
 msgstr "刪除這次發生的事件(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete this occurrence"
 msgstr "刪除此週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Delete All Occ_urrences"
 msgstr "刪除所有發生的事件(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Delete all occurrences"
 msgstr "刪除全部週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1331
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "New All Day _Event..."
 msgstr "新增全天事件(_E)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new all day event"
 msgstr "建立新的全天事件"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../modules/calendar/e-task-shell-view-actions.c:698
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "New _Meeting..."
 msgstr "新增會議(_M)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Create a new meeting"
 msgstr "建立新的會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "New _Appointment..."
-msgstr "新增約會(_A)…"
+msgstr "新增會議(_A)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Open Appointment"
-msgstr "開啟約會(_O)"
+msgstr "開啟會議(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "View the current appointment"
-msgstr "檢視目前的約會"
+msgstr "檢視目前的會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
-msgstr "將約會轉換為會議"
+msgstr "將會議轉換為會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
-msgstr "轉換為約會(_E)…"
+msgstr "轉換為會議(_E)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
-msgstr "將會議轉換為約會"
+msgstr "將會議轉換為會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "Quit"
 msgstr "結束"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1528
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1530
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 msgid "Show one day"
 msgstr "顯示一天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1535
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "List"
-msgstr "清單"
+msgstr "列表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1537
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Show as list"
-msgstr "顯示成清單"
+msgstr "顯示成列表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1542
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1544
+#: ../modules/calendar/e-cal-shell-view-actions.c:1597
 msgid "Show one month"
 msgstr "顯示一個月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Week"
 msgstr "週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1551
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
 msgid "Show one week"
 msgstr "顯示一週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1558
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one work week"
 msgstr "顯示一個工作週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
 msgid "Active Appointments"
-msgstr "進行中的約會"
+msgstr "進行中的會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
 msgid "Next 7 Days' Appointments"
-msgstr "未來 7 天的約會(_P)"
+msgstr "未來 7 天的會議(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
 msgid "Occurs Less Than 5 Times"
 msgstr "發生少於五次"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:992
 msgid "Description contains"
 msgstr "描述包含"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Summary contains"
 msgstr "主旨包含"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1009
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Print..."
 msgstr "列印…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Preview the calendar to be printed"
 msgstr "預覽將要列印的行事曆"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
+#: ../modules/calendar/e-memo-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:1040
 msgid "_Save as iCalendar..."
 msgstr "儲存為 iCalendar[_S]…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 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:206
-#: ../modules/calendar/e-memo-shell-view-actions.c:467
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:496
 msgid "memo"
 msgstr "備忘錄"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:249
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "New _Memo"
 msgstr "新增備忘錄(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:65
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:256
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "_Open Memo"
 msgstr "開啟備忘錄(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
 msgid "View the selected memo"
 msgstr "檢視選取的備忘錄"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Open _Web Page"
 msgstr "開啟網頁(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-memopad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Print the selected memo"
 msgstr "列印選取的備忘錄"
 
@@ -19636,58 +20019,58 @@ 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:274
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:615
 msgid "task"
 msgstr "工作"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
-#: ../modules/calendar/e-task-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:677
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Mark selected tasks as complete"
 msgstr "將選取的工作標示成完成"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
 msgid "_Mark as Incomplete"
 msgstr "標示為未完成(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Mark selected tasks as incomplete"
 msgstr "將選取的工作標示成未完成"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "New _Task"
 msgstr "新增工作(_T)"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:63
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "_Open Task"
 msgstr "開啟工作(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 msgid "View the selected task"
 msgstr "檢視選取的工作"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:364
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "Print the selected task"
 msgstr "列印選取的工作"
 
@@ -19708,87 +20091,99 @@ msgstr "建立新的共用備忘錄"
 #: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
-msgstr "備忘錄清單(_S)"
+msgstr "備忘錄列表(_S)"
 
 #: ../modules/calendar/e-memo-shell-backend.c:82
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
-msgstr "建立新備忘錄清單"
+msgstr "建立新備忘錄列表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
 msgid "Print Memos"
 msgstr "列印備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:236
+#: ../modules/calendar/e-memo-shell-view-actions.c:252
 msgid "Memo List Properties"
-msgstr "備忘錄清單屬性"
+msgstr "備忘錄列表屬性"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:529
+#: ../modules/calendar/e-memo-shell-view-actions.c:558
 msgid "_Delete Memo"
 msgstr "刪除備忘錄(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:536
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
 msgid "_Find in Memo..."
 msgstr "在備忘錄內尋找(_F)…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:538
+#: ../modules/calendar/e-memo-shell-view-actions.c:567
 msgid "Search for text in the displayed memo"
 msgstr "搜尋顯示的備忘錄中的文字"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:557
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "D_elete Memo List"
-msgstr "刪除備忘錄清單(_E)"
+msgstr "刪除備忘錄列表(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:559
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete the selected memo list"
-msgstr "刪除選取的備忘錄清單"
+msgstr "刪除選取的備忘錄列表"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "_Manage Memo List groups..."
+msgstr "管理備忘錄列表群組(_M)…"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
+msgid "Manage Memo List groups order and visibility"
+msgstr "管理備忘錄列表群組順序與可見性"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "_New Memo List"
-msgstr "新增備忘錄清單(_N)"
+msgstr "新增備忘錄列表(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Refresh the selected memo list"
-msgstr "重新整理選取的備忘錄清單"
+msgstr "重新整理選取的備忘錄列表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
 msgid "Rename the selected memo list"
-msgstr "重新命名選取的備忘錄清單"
+msgstr "重新命名選取的備忘錄列表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Show _Only This Memo List"
-msgstr "只顯示此備忘錄清單(_O)"
+msgstr "只顯示此備忘錄列表(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+msgid "Sho_w All Memo Lists"
+msgstr "顯示所有備忘錄列表(_W)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:722
 msgid "Memo _Preview"
 msgstr "備忘錄預覽(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
 msgid "Show memo preview pane"
 msgstr "顯示備忘錄預覽窗格"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:694
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
 msgid "Show memo preview below the memo list"
-msgstr "在備忘錄清單下方顯示備忘錄預覽"
+msgstr "在備忘錄列表下方顯示備忘錄預覽"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:701
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview alongside the memo list"
-msgstr "在備忘錄清單旁邊顯示備忘錄預覽"
+msgstr "在備忘錄列表旁邊顯示備忘錄預覽"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:810
 msgid "Print the list of memos"
-msgstr "列印備忘錄清單"
+msgstr "列印備忘錄列表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Preview the list of memos to be printed"
-msgstr "預覽將要列印的備忘錄清單"
+msgstr "預覽將要列印的備忘錄列表"
 
-#: ../modules/calendar/e-memo-shell-view.c:212
+#: ../modules/calendar/e-memo-shell-view.c:219
 msgid "Delete Memos"
 msgstr "刪除備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view.c:214
+#: ../modules/calendar/e-memo-shell-view.c:221
 msgid "Delete Memo"
 msgstr "刪除備忘錄"
 
@@ -19799,45 +20194,45 @@ msgid_plural "%d memos"
 msgstr[0] "%d 項備忘錄"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:373
-#: ../modules/calendar/e-task-shell-view-private.c:539
+#: ../modules/calendar/e-task-shell-view-private.c:550
 #, c-format
 msgid "%d selected"
 msgstr "已選擇 %d 個"
 
-#: ../modules/calendar/e-task-shell-backend.c:62
+#: ../modules/calendar/e-task-shell-backend.c:61
 msgctxt "New"
 msgid "_Task"
 msgstr "工作(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:69
+#: ../modules/calendar/e-task-shell-backend.c:68
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "指派的工作(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:71
+#: ../modules/calendar/e-task-shell-backend.c:70
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
 
-#: ../modules/calendar/e-task-shell-backend.c:79
+#: ../modules/calendar/e-task-shell-backend.c:78
 msgctxt "New"
 msgid "Tas_k List"
-msgstr "工作清單(_K)"
+msgstr "工作列表(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:81
-#: ../modules/calendar/e-task-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-backend.c:80
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
-msgstr "建立新工作清單"
+msgstr "建立新工作列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:203
-#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
 msgid "Print Tasks"
 msgstr "列印工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:259
+#: ../modules/calendar/e-task-shell-view-actions.c:276
 msgid "Task List Properties"
-msgstr "工作清單"
+msgstr "工作列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:529
+#: ../modules/calendar/e-task-shell-view-actions.c:559
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -19849,107 +20244,115 @@ msgstr ""
 "\n"
 "確定清除這些工作?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:536
+#: ../modules/calendar/e-task-shell-view-actions.c:566
 msgid "Do not ask me again"
 msgstr "不要再詢問我"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:654
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "_Delete Task"
 msgstr "刪除工作(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:661
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "_Find in Task..."
 msgstr "在工作內尋找(_F)…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "Search for text in the displayed task"
 msgstr "搜尋顯示的工作中的文字"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:682
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "D_elete Task List"
-msgstr "刪除工作清單(_E)"
+msgstr "刪除工作列表(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:684
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "Delete the selected task list"
-msgstr "刪除選取的工作清單"
+msgstr "刪除選取的工作列表"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:719
+msgid "_Manage Task List groups..."
+msgstr "管理工作列表群組(_M)…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:689
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_New Task List"
-msgstr "新增工作清單(_N)"
+msgstr "新增工作列表(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:705
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Refresh the selected task list"
-msgstr "重新整理選取的工作清單"
+msgstr "重新整理選取的工作列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "Rename the selected task list"
-msgstr "重新命名選取的工作清單"
+msgstr "重新命名選取的工作列表"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:754
+msgid "Sho_w All Task Lists"
+msgstr "顯示所有工作列表(_W)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Show _Only This Task List"
-msgstr "只顯示此工作清單(_O)"
+msgstr "只顯示此工作列表(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-view-actions.c:775
 msgid "Mar_k as Incomplete"
 msgstr "標示為未完成(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "Delete completed tasks"
 msgstr "刪除已完成的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:836
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Task _Preview"
 msgstr "工作預覽(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:838
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Show task preview pane"
 msgstr "顯示工作預覽窗格"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:859
+#: ../modules/calendar/e-task-shell-view-actions.c:911
 msgid "Show task preview below the task list"
-msgstr "在工作清單下方顯示工作預覽"
+msgstr "在工作列表下方顯示工作預覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:866
+#: ../modules/calendar/e-task-shell-view-actions.c:918
 msgid "Show task preview alongside the task list"
-msgstr "在工作清單旁邊顯示工作預覽"
+msgstr "在工作列表旁邊顯示工作預覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:874
+#: ../modules/calendar/e-task-shell-view-actions.c:926
 msgid "Active Tasks"
 msgstr "進行中的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:888
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Completed Tasks"
 msgstr "已完成的工作 "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:895
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Next 7 Days' Tasks"
 msgstr "未來 7 天的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:902
+#: ../modules/calendar/e-task-shell-view-actions.c:954
 msgid "Overdue Tasks"
 msgstr "過期的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/calendar/e-task-shell-view-actions.c:961
 msgid "Tasks with Attachments"
 msgstr "有附件的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Print the list of tasks"
-msgstr "列印工作清單"
+msgstr "列印工作列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 msgid "Preview the list of tasks to be printed"
-msgstr "預覽將要列印的工作清單"
+msgstr "預覽將要列印的工作列表"
 
-#: ../modules/calendar/e-task-shell-view.c:316
+#: ../modules/calendar/e-task-shell-view.c:323
 msgid "Delete Tasks"
 msgstr "刪除工作"
 
-#: ../modules/calendar/e-task-shell-view.c:318
+#: ../modules/calendar/e-task-shell-view.c:325
 msgid "Delete Task"
 msgstr "刪除工作"
 
-#: ../modules/calendar/e-task-shell-view-private.c:535
+#: ../modules/calendar/e-task-shell-view-private.c:546
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -20399,7 +20802,7 @@ msgstr "回覆寄件者"
 #. Updates
 #: ../modules/itip-formatter/itip-view.c:1569
 msgid "Send _updates to attendees"
-msgstr "傳送更新給到會者(_U)"
+msgstr "傳送更新給出席者(_U)"
 
 #. The recurrence check button
 #: ../modules/itip-formatter/itip-view.c:1572
@@ -20433,17 +20836,17 @@ msgstr "儲存(_V)"
 #: ../modules/itip-formatter/itip-view.c:3679
 #: ../modules/itip-formatter/itip-view.c:5151
 msgid "Attendee status updated"
-msgstr "到會者狀態已更新"
+msgstr "出席者狀態已更新"
 
 #: ../modules/itip-formatter/itip-view.c:3859
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr "行事曆「%s」中的約會和這個會議相衝突"
+msgstr "行事曆「%s」中的會議和這個會議相衝突"
 
 #: ../modules/itip-formatter/itip-view.c:3889
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "尋找在行事曆「%s」中的約會"
+msgstr "尋找在行事曆「%s」中的會議"
 
 #: ../modules/itip-formatter/itip-view.c:4024
 msgid "Unable to find any calendars"
@@ -20451,15 +20854,15 @@ msgstr "找不到任何行事曆"
 
 #: ../modules/itip-formatter/itip-view.c:4032
 msgid "Unable to find this meeting in any calendar"
-msgstr "無法在任何行事曆中找到這個約會"
+msgstr "無法在任何行事曆中找到這個會議"
 
 #: ../modules/itip-formatter/itip-view.c:4037
 msgid "Unable to find this task in any task list"
-msgstr "無法在任何工作清單中找到這項工作"
+msgstr "無法在任何工作列表中找到這項工作"
 
 #: ../modules/itip-formatter/itip-view.c:4042
 msgid "Unable to find this memo in any memo list"
-msgstr "無法在任何備忘錄清單中找到這項備忘錄"
+msgstr "無法在任何備忘錄列表中找到這項備忘錄"
 
 #: ../modules/itip-formatter/itip-view.c:4387
 msgid "Opening the calendar. Please wait..."
@@ -20467,7 +20870,7 @@ msgstr "正在開啟行事曆。請稍候…"
 
 #: ../modules/itip-formatter/itip-view.c:4392
 msgid "Searching for an existing version of this appointment"
-msgstr "尋找這個約會既存的版本"
+msgstr "尋找這個會議既存的版本"
 
 #: ../modules/itip-formatter/itip-view.c:4787
 #, c-format
@@ -20520,7 +20923,7 @@ msgstr "無法傳送取消通知給代理人"
 #: ../modules/itip-formatter/itip-view.c:5143
 #, c-format
 msgid "Unable to update attendee. %s"
-msgstr "無法更新到會者。%s"
+msgstr "無法更新出席者。%s"
 
 #: ../modules/itip-formatter/itip-view.c:5187
 msgid "The meeting is invalid and cannot be updated"
@@ -20528,12 +20931,12 @@ msgstr "這個會議無效並且不能更新"
 
 #: ../modules/itip-formatter/itip-view.c:5263
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "由於不合法的狀態使得到會者狀態無法更新!"
+msgstr "由於不合法的狀態使得出席者狀態無法更新!"
 
 #: ../modules/itip-formatter/itip-view.c:5335
 #: ../modules/itip-formatter/itip-view.c:5374
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "到會者狀態不能更新,因為項目已經不存在"
+msgstr "出席者狀態不能更新,因為項目已經不存在"
 
 #: ../modules/itip-formatter/itip-view.c:5437
 msgid "Meeting information sent"
@@ -20629,7 +21032,7 @@ msgstr "這個備忘錄的週期規則為"
 #: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "這個回覆並非來自目前的到會者。將寄件人加入為到會者?"
+msgstr "這個回覆並非來自目前的出席者。將寄件人加入為出席者?"
 
 #: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
@@ -20639,114 +21042,135 @@ msgstr "這個會議已委派"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "「{0}」已代理此會議。是否還要加入代理人「{1}」?"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:259
+#: ../modules/mail-config/e-mail-config-google-summary.c:261
 msgid "Google Features"
 msgstr "Google 功能"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:270
 msgid "Add Google Ca_lendar to this account"
 msgstr "將 Google 日曆加入這個帳號(_L)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:277
+#: ../modules/mail-config/e-mail-config-google-summary.c:279
 msgid "Add Google Con_tacts to this account"
 msgstr "將 Google 通訊錄加入這個帳號(_T)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:286
+#: ../modules/mail-config/e-mail-config-google-summary.c:288
 msgid "You may need to enable IMAP access"
 msgstr "您可能需要啟用 IMAP 存取"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:245
-#: ../modules/mail-config/e-mail-config-local-accounts.c:291
+#: ../modules/mail-config/e-mail-config-local-accounts.c:267
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 msgid "Mail _Directory:"
 msgstr "郵件目錄(_D):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Choose a MH mail directory"
 msgstr "選擇 MH 郵件目錄"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+msgid "MH mail directory cannot be empty"
+msgstr "MH 郵件目錄不能為空"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
 msgid "Local Delivery _File:"
 msgstr "本地遞送檔案(_F):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Choose a local delivery file"
 msgstr "選擇本地遞送檔案"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:294
+msgid "Local delivery file cannot be empty"
+msgstr "本地遞送檔案不能為空"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
 msgid "Choose a Maildir mail directory"
 msgstr "選擇 Maildir 郵件目錄"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:314
+#: ../modules/mail-config/e-mail-config-local-accounts.c:318
+msgid "Maildir mail directory cannot be empty"
+msgstr "Maildir 郵件目錄不能為空"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
 msgid "Spool _File:"
 msgstr "排程郵件檔案(_F):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:340
 msgid "Choose a mbox spool file"
 msgstr "選擇 mbox 排程器檔案"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:337
+#: ../modules/mail-config/e-mail-config-local-accounts.c:342
+msgid "Mbox spool file cannot be empty"
+msgstr "Mbox 排程器檔案不能為空"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:363
 msgid "Spool _Directory:"
 msgstr "排程郵件目錄(_D):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:364
 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:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
+#: ../modules/mail-config/e-mail-config-local-accounts.c:366
+msgid "Mbox spool directory cannot be empty"
+msgstr "Mbox 排程器目錄不能為空"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:93
 #: ../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:110
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
 #: ../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:123
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
 msgid "_Port:"
 msgstr "連接埠(_P):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
+#. do not reference
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:190
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:223
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:173
 msgid "Encryption _method:"
 msgstr "加密方法(_M):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:238
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:188
 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:182
-msgid "SSL on a dedicated port"
-msgstr "SSL 於專用的連接埠"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:242
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:192
+msgid "TLS on a dedicated port"
+msgstr "TLS 專用連接埠"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:77
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "使用自訂的二元檔,取代「sendmail」(_U)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:81
 msgid "_Custom binary:"
 msgstr "自訂二元檔(_C):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:100
 msgid "U_se custom arguments"
 msgstr "使用自訂引數(_S)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:104
 msgid "Cus_tom arguments:"
 msgstr "自訂引數(_T):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:122
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -20756,15 +21180,20 @@ msgstr ""
 "   %F - 代表寄件者郵件位址\n"
 "   %R - 代表收件者郵件位址"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:137
 msgid "Send mail also when in offline _mode"
 msgstr "離線模式下仍傳送郵件(_M)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:210
+msgid "Custom binary cannot be empty"
+msgstr "自訂二元檔不能為空"
+
+#. do not reference
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:145
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求核對(_V)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:234
 msgid "T_ype:"
 msgstr "類型(_Y):"
 
@@ -20862,7 +21291,7 @@ msgstr "編輯這個帳號的屬性"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "Refresh list of folders of this account"
-msgstr "重新整理這個帳號的資料夾清單"
+msgstr "重新整理這個帳號的資料夾列表"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "_Download Messages for Offline Usage"
@@ -21082,82 +21511,94 @@ msgid "Show deleted messages with a line through them"
 msgstr "顯示已刪除的郵件 (加上刪除線)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:2004
+msgid "Show _Junk Messages"
+msgstr "顯示垃圾郵件(_J)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
+msgid "Show junk messages with a red line through them"
+msgstr "顯示垃圾郵件 (加上紅色刪除線)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Group By Threads"
 msgstr "依相關郵件為群組(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Threaded message list"
-msgstr "相關郵件清單"
+msgstr "相關郵件列表"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2020
 msgid "_Unmatched Folder Enabled"
 msgstr "未符合資料夾已啟用(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2014
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "切換是否啟用未符合搜尋資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2034
+#: ../modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Show message preview below the message list"
-msgstr "在郵件清單下方顯示郵件預覽"
+msgstr "在郵件列表下方顯示郵件預覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2041
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "Show message preview alongside the message list"
-msgstr "在郵件清單旁邊顯示郵件預覽"
+msgstr "在郵件列表旁邊顯示郵件預覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2049
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2056
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Important Messages"
 msgstr "重要郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2063
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2077
+#: ../modules/mail/e-mail-shell-view-actions.c:2085
 msgid "Messages with Attachments"
 msgstr "有附件的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2084
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
+msgid "Messages with Notes"
+msgstr "有備註的郵件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2099
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2091
+#: ../modules/mail/e-mail-shell-view-actions.c:2106
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2098
+#: ../modules/mail/e-mail-shell-view-actions.c:2113
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2157
+#: ../modules/mail/e-mail-shell-view-actions.c:2172
 msgid "Subject or Addresses contain"
 msgstr "主旨或電子郵件位址包含"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2167
+#: ../modules/mail/e-mail-shell-view-actions.c:2182
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2174
+#: ../modules/mail/e-mail-shell-view-actions.c:2189
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2181
+#: ../modules/mail/e-mail-shell-view-actions.c:2196
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-#: ../modules/mail/e-mail-shell-view.c:700
+#: ../modules/mail/e-mail-shell-view.c:707
 msgid "All Account Search"
 msgstr "所有的帳號搜尋"
 
-#: ../modules/mail/e-mail-shell-view.c:808
+#: ../modules/mail/e-mail-shell-view.c:815
 msgid "Account Search"
 msgstr "帳號搜尋"
 
@@ -21233,7 +21674,7 @@ msgstr "立刻傳送"
 msgid "Send after 5 minutes"
 msgstr "5 分鐘後傳送"
 
-#: ../modules/mail/em-composer-prefs.c:1280
+#: ../modules/mail/em-composer-prefs.c:1286
 msgid "Language(s)"
 msgstr "語言"
 
@@ -21266,11 +21707,11 @@ msgid "Contains Value"
 msgstr "包含數值"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1554
+#: ../modules/mail/em-mailer-prefs.c:1560
 msgid "_Date header:"
 msgstr "日期標頭(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1555
+#: ../modules/mail/em-mailer-prefs.c:1561
 msgid "Show _original header value"
 msgstr "顯示原始標頭數值(_O)"
 
@@ -21372,45 +21813,55 @@ msgstr "顯示 HTML 版本"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "顯示多部分/替代郵件的 HTML 版本"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:43
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:37
 msgid "Show HTML if present"
 msgstr "如提供 HTML 則顯示之"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
+#: ../modules/prefer-plain/plugin/config-ui.c:38
 msgid "Let Evolution choose the best part to show."
 msgstr "讓 Evolution 選擇最佳的部分來顯示。"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:41
 msgid "Show plain text if present"
 msgstr "如提供純文字則顯示它"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
+#: ../modules/prefer-plain/plugin/config-ui.c:42
 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:87
-#: ../modules/prefer-plain/plugin/config-ui.c:52
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:46
+msgid "Show plain text if present, or HTML source"
+msgstr "如提供純文字則顯示它,或 HTML 原始碼"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
+#: ../modules/prefer-plain/plugin/config-ui.c:47
+msgid "Show plain text part, if present, otherwise the HTML part source."
+msgstr "如果有純文字的部分就顯示它,否則顯示 HTML 部分原始碼。"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:93
+#: ../modules/prefer-plain/plugin/config-ui.c:51
 msgid "Only ever show plain text"
 msgstr "只以純文字顯示"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:94
+#: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "如果有要求時,永遠顯示純文字的部分並從其他的部分製作附件。"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:104
+#: ../modules/prefer-plain/plugin/config-ui.c:103
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "將抑制的 HTML 部分顯示為附件(_U)"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:126
+#: ../modules/prefer-plain/plugin/config-ui.c:125
 msgid "HTML _Mode"
 msgstr "HT_ML 模式"
 
@@ -21816,7 +22267,7 @@ msgstr "即時訊息連絡人"
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
-msgstr "從 Pidgin 的好友清單同步連絡人資訊和影像(_S)"
+msgstr "從 Pidgin 的好友列表同步連絡人資訊和影像(_S)"
 
 #: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
@@ -21825,7 +22276,7 @@ msgstr "選擇給 Pidgin 好友名單用的通訊錄"
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
-msgstr "立即與好友清單同步(_B)"
+msgstr "立即與好友列表同步(_B)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid "BBDB"
@@ -21841,7 +22292,7 @@ msgid ""
 msgstr ""
 "不用再大費周章管理您的通訊錄了。\n"
 "\n"
-"回覆郵件時自動在通訊錄中填入姓名與電子郵件位址。同時也會在好友清單中填入 IM "
+"回覆郵件時自動在通訊錄中填入姓名與電子郵件位址。同時也會在好友列表中填入 IM "
 "連絡人資訊。"
 
 #: ../plugins/dbx-import/dbx-importer.c:278
@@ -21951,8 +22402,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "當編輯新郵件時自動執行(_A)"
 
-#: ../plugins/external-editor/external-editor.c:484
-#: ../plugins/external-editor/external-editor.c:486
+#: ../plugins/external-editor/external-editor.c:530
+#: ../plugins/external-editor/external-editor.c:532
 msgid "Compose in External Editor"
 msgstr "在外部編輯器中撰寫"
 
@@ -22062,55 +22513,63 @@ msgstr "不是影像檔"
 msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "您選取的檔案似乎不是有效的 PNG 影像。錯誤:{0}"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Get List _Archive"
-msgstr "取得清單檔案庫(_A)"
+msgstr "取得列表檔案庫(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Get an archive of the list this message belongs to"
 msgstr "取得此郵件所屬論壇的檔案庫"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+msgid "Copy _Message Archive URL"
+msgstr "複製郵件檔案庫 URL(_M)"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+msgid "Copy direct URL for the selected message in its archive"
+msgstr "複製郵件檔案庫中選定郵件的直接 URL"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "Get List _Usage Information"
-msgstr "取得清單使用資訊(_U)"
+msgstr "取得列表使用資訊(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "取得此郵件所屬論壇的使用方法相關資訊"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "Contact List _Owner"
-msgstr "連絡人清單擁有者(_O)"
+msgstr "連絡人列表擁有者(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "連絡此郵件所屬通信論壇的管理者"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "_Post Message to List"
 msgstr "傳送郵件給論壇(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:410
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "撰寫郵件給此郵件所屬的通信論壇"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "_Subscribe to List"
 msgstr "訂閱論壇(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "訂閱此郵件所屬的通信論壇"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
 msgid "_Unsubscribe from List"
 msgstr "取消訂閱論壇(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "取消訂閱此郵件所屬的通信論壇"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
 msgid "Mailing _List"
 msgstr "通信論壇(_L)"
 
@@ -22230,31 +22689,31 @@ msgstr "在 Evolution 中的新郵件"
 msgid "Show %s"
 msgstr "顯示 %s"
 
-#: ../plugins/mail-notification/mail-notification.c:685
+#: ../plugins/mail-notification/mail-notification.c:687
 msgid "_Play sound when a new message arrives"
 msgstr "當新郵件到達時播放聲音檔案(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:717
+#: ../plugins/mail-notification/mail-notification.c:719
 msgid "_Beep"
 msgstr "嗶聲(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:730
+#: ../plugins/mail-notification/mail-notification.c:732
 msgid "Use sound _theme"
 msgstr "使用音效主題(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:749
+#: ../plugins/mail-notification/mail-notification.c:751
 msgid "Play _file:"
 msgstr "播放檔案(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "選擇聲音檔案"
 
-#: ../plugins/mail-notification/mail-notification.c:835
+#: ../plugins/mail-notification/mail-notification.c:837
 msgid "Notify new messages for _Inbox only"
 msgstr "只通知收件匣的新郵件(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:853
 msgid "Show _notification when a new message arrives"
 msgstr "當新郵件到達時顯示通知(_N)"
 
@@ -22267,51 +22726,51 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "當新郵件到達時通知您。"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:229
+#: ../plugins/mail-to-task/mail-to-task.c:196
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "從 %s 的郵件所建立"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/mail-to-task/mail-to-task.c:561
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:596
+#: ../plugins/mail-to-task/mail-to-task.c:563
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:598
+#: ../plugins/mail-to-task/mail-to-task.c:565
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "新增(_N)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:583
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr "選取的行事曆已經包含事件「%s」。是否要編輯此舊的事件?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:586
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
-msgstr "選取的工作清單已經包含工作「%s」。是否要編輯此舊的工作?"
+msgstr "選取的工作列表已經包含工作「%s」。是否要編輯此舊的工作?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:589
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
-msgstr "選取的備忘錄清單已經包含備忘錄「%s」。是否要編輯此舊的備忘錄?"
+msgstr "選取的備忘錄列表已經包含備忘錄「%s」。是否要編輯此舊的備忘錄?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -22321,7 +22780,7 @@ msgid_plural ""
 "add them all?"
 msgstr[0] "您已經選擇 %d 封郵件要轉換為事件。確定要把它們全部加入嗎?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -22331,7 +22790,7 @@ msgid_plural ""
 "add them all?"
 msgstr[0] "您已經選擇 %d 封郵件要轉換為工作。確定要把它們全部加入嗎?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:656
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -22341,76 +22800,76 @@ msgid_plural ""
 "add them all?"
 msgstr[0] "您已經選擇 %d 封郵件要轉換為備忘錄。確定要把它們全部加入嗎?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:677
+#: ../plugins/mail-to-task/mail-to-task.c:644
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "是否要繼續轉換剩餘的郵件?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:720
 msgid "[No Summary]"
 msgstr "[沒有摘要]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:766
+#: ../plugins/mail-to-task/mail-to-task.c:733
 msgid "Invalid object returned from a server"
 msgstr "從伺服器傳回無效的物件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:787
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "在處理期間發生錯誤:%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:857
+#: ../plugins/mail-to-task/mail-to-task.c:823
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "無法開啟行事曆。%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:861
+#: ../plugins/mail-to-task/mail-to-task.c:827
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 msgstr "選取的行事曆是唯讀的,因此不能在這裡建立事件。請選擇其他的行事曆。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:864
+#: ../plugins/mail-to-task/mail-to-task.c:830
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
-msgstr "選取的工件清單是唯讀的,因此不能在這裡建立工作。請選擇其他的工件清單。"
+msgstr "選取的工件列表是唯讀的,因此不能在這裡建立工作。請選擇其他的工件列表。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:867
+#: ../plugins/mail-to-task/mail-to-task.c:833
 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:1269
+#: ../plugins/mail-to-task/mail-to-task.c:1235
 msgid "Create an _Appointment"
-msgstr "建立一個約會(_A)"
+msgstr "建立一個會議(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 msgid "Create a new event from the selected message"
 msgstr "以選取的郵件建立新的事件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1276
+#: ../plugins/mail-to-task/mail-to-task.c:1242
 msgid "Create a Mem_o"
 msgstr "建立備忘錄(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1278
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 msgid "Create a new memo from the selected message"
 msgstr "以選取的郵件建立新的備忘錄"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1283
+#: ../plugins/mail-to-task/mail-to-task.c:1249
 msgid "Create a _Task"
 msgstr "建立工作(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1251
 msgid "Create a new task from the selected message"
 msgstr "以選取的郵件建立新的工作"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1293
+#: ../plugins/mail-to-task/mail-to-task.c:1259
 msgid "Create a _Meeting"
 msgstr "建立會議(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1295
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a new meeting from the selected message"
 msgstr "以選取的郵件建立新的會議"
 
@@ -22418,18 +22877,20 @@ msgstr "以選取的郵件建立新的會議"
 msgid "Convert a mail message to a task."
 msgstr "將郵件轉換為工作。"
 
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST 匯入"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-msgid "Outlook personal folders (.pst)"
-msgstr "Outlook 個人資料夾 (.pst)"
-
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "從 PST 檔案匯入 Outlook 郵件"
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook personal folders (.pst)"
+msgstr "Outlook 個人資料夾 (.pst)"
+
 #: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "郵件(_M)"
@@ -22444,7 +22905,7 @@ msgstr "通訊錄(_A)"
 
 #: ../plugins/pst-import/pst-importer.c:570
 msgid "A_ppointments"
-msgstr "約會(_P)"
+msgstr "會議(_P)"
 
 #: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
@@ -22624,19 +23085,19 @@ msgstr "UID"
 
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
-msgstr "描述清單"
+msgstr "描述列表"
 
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Categories List"
-msgstr "分類清單"
+msgstr "分類列表"
 
 #: ../plugins/save-calendar/csv-format.c:378
 msgid "Comment List"
-msgstr "註解清單"
+msgstr "註解列表"
 
 #: ../plugins/save-calendar/csv-format.c:381
 msgid "Contact List"
-msgstr "連絡人清單"
+msgstr "連絡人列表"
 
 #: ../plugins/save-calendar/csv-format.c:382
 msgid "Start"
@@ -22660,7 +23121,7 @@ msgstr "網址"
 
 #: ../plugins/save-calendar/csv-format.c:388
 msgid "Attendees List"
-msgstr "到會者清單"
+msgstr "出席者列表"
 
 #: ../plugins/save-calendar/csv-format.c:390
 msgid "Modified"
@@ -22733,11 +23194,11 @@ msgstr "將選取的行事曆儲存至磁碟"
 
 #: ../plugins/save-calendar/save-calendar.c:378
 msgid "Save the selected memo list to disk"
-msgstr "將選取的備忘錄清單儲存至磁碟"
+msgstr "將選取的備忘錄列表儲存至磁碟"
 
 #: ../plugins/save-calendar/save-calendar.c:409
 msgid "Save the selected task list to disk"
-msgstr "將選取的工作清單儲存至磁碟"
+msgstr "將選取的工作列表儲存至磁碟"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
@@ -22760,39 +23221,39 @@ msgstr "儲存為範本(_T)"
 msgid "Save as Template"
 msgstr "儲存為範本"
 
-#: ../shell/e-shell.c:337
+#: ../shell/e-shell.c:380
 msgid "Preparing to go offline..."
 msgstr "準備進入離線…"
 
-#: ../shell/e-shell.c:390
+#: ../shell/e-shell.c:409
 msgid "Preparing to go online..."
 msgstr "準備進入上線…"
 
-#: ../shell/e-shell.c:501
+#: ../shell/e-shell.c:520
 msgid "Preparing to quit"
 msgstr "準備結束"
 
-#: ../shell/e-shell.c:507
+#: ../shell/e-shell.c:526
 msgid "Preparing to quit..."
 msgstr "準備結束…"
 
-#: ../shell/e-shell.c:1024
+#: ../shell/e-shell.c:1043
 msgid "Credentials are required to connect to the destination host."
 msgstr "連線到目的端主機需要憑證。"
 
-#: ../shell/e-shell.c:1203 ../shell/e-shell-window-actions.c:827
+#: ../shell/e-shell.c:1211 ../shell/e-shell-window-actions.c:827
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-#: ../shell/e-shell.c:1214
+#: ../shell/e-shell.c:1222
 msgid "Quick _Reference"
 msgstr "快捷鍵參照表(_R)"
 
-#: ../shell/e-shell.c:1216 ../shell/e-shell-window-actions.c:764
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:764
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../shell/e-shell.c:1217 ../shell/e-shell-window-actions.c:862
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:862
 msgid "_Quit"
 msgstr "結束(_Q)"
 
@@ -23005,7 +23466,7 @@ msgstr "顯示側邊欄(_B)"
 
 #: ../shell/e-shell-window-actions.c:1029
 msgid "Show the side bar"
-msgstr "顯示側邊列"
+msgstr "顯示側邊欄"
 
 #: ../shell/e-shell-window-actions.c:1035
 msgid "Show _Buttons"
@@ -23110,13 +23571,13 @@ msgstr "選擇檢視:%s"
 msgid "Delete view: %s"
 msgstr "刪除檢視:%s"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1748
 msgid "Execute these search parameters"
 msgstr "執行這些搜尋參數"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../shell/e-shell-window.c:555
+#: ../shell/e-shell-window.c:567
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "新增"
@@ -23128,7 +23589,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:199
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -23163,7 +23624,7 @@ msgstr ""
 "我們希望您享受工作成果,而且我們\n"
 "熱切希望您提供意見!\n"
 
-#: ../shell/main.c:223
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -23171,13 +23632,13 @@ msgstr ""
 "謝謝\n"
 "Evolution 小組敬上\n"
 
-#: ../shell/main.c:229
+#: ../shell/main.c:225
 msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:318
+#: ../shell/main.c:314
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -23185,46 +23646,46 @@ msgstr ""
 "啟動 Evolution 時以指定的元件顯示。可用的選項有「mail」、「calendar」、"
 "「contacts」、「tasks」和「memos」"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:318
 msgid "Apply the given geometry to the main window"
 msgstr "將指定的尺寸套用到主視窗"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:322
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:324
 msgid "Ignore network availability"
 msgstr "忽略網際網路是否可用"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "強制關閉 Evoultion"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../shell/main.c:336
+#: ../shell/main.c:332
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "停用郵件、連絡人和工作的預覽窗格。"
 
-#: ../shell/main.c:340
+#: ../shell/main.c:336
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "將指定的 URI 或檔案名稱匯入為接下來的引數。"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:338
 msgid "Request a running Evolution process to quit"
 msgstr "要求執行中的 Evolution 程序結束"
 
-#: ../shell/main.c:419
+#: ../shell/main.c:415
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 msgstr "不能啟動 Evolution。可能有另一個 Evolution 實體沒有回應。系統錯誤:%s"
 
-#: ../shell/main.c:473 ../shell/main.c:478
+#: ../shell/main.c:469 ../shell/main.c:474
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
@@ -23333,11 +23794,11 @@ msgstr "無法連線至帳號「{0}」"
 
 #: ../shell/shell.error.xml.h:22
 msgid "Failed to connect memo list '{0}'"
-msgstr "無法連線至備忘錄清單「{0}」"
+msgstr "無法連線至備忘錄列表「{0}」"
 
 #: ../shell/shell.error.xml.h:23
 msgid "Failed to connect task list '{0}'"
-msgstr "無法連線至工作清單「{0}」"
+msgstr "無法連線至工作列表「{0}」"
 
 #: ../shell/shell.error.xml.h:24
 msgid "Failed to prompt for credentials for '{0}'"
@@ -23369,11 +23830,11 @@ msgstr "郵件帳號「{0}」的 SSL 憑證不受信任。"
 
 #: ../shell/shell.error.xml.h:32
 msgid "SSL certificate for memo list '{0}' is not trusted."
-msgstr "備忘錄清單「{0}」的 SSL 憑證不受信任。"
+msgstr "備忘錄列表「{0}」的 SSL 憑證不受信任。"
 
 #: ../shell/shell.error.xml.h:33
 msgid "SSL certificate for task list '{0}' is not trusted."
-msgstr "工作清單「{0}」的 SSL 憑證不受信任。"
+msgstr "工作列表「{0}」的 SSL 憑證不受信任。"
 
 #: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
@@ -23386,72 +23847,60 @@ msgstr ""
 "\n"
 "編輯信任設定值:"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:103
+#: ../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:85
-#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "發給組織"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "發給組織單位"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
+#: ../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:88
-#: ../smime/gui/certificate-manager.c:108
+#: ../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:89
-#: ../smime/gui/certificate-manager.c:109
+#: ../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:90
-#: ../smime/gui/certificate-manager.c:110
+#: ../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:91
-#: ../smime/gui/certificate-manager.c:111
+#: ../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:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../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:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../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:94
-#: ../smime/gui/certificate-manager.c:114
+#: ../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:95
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115
 #: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "MD5 指紋"
@@ -23642,15 +24091,15 @@ msgstr "信任"
 msgid "_Edit Trust"
 msgstr "編輯信任度(_E)"
 
-#: ../smime/gui/certificate-manager.c:1975
+#: ../smime/gui/certificate-manager.c:1977
 msgid "All PKCS12 files"
 msgstr "所有的 PKCS12 檔案"
 
-#: ../smime/gui/certificate-manager.c:1992
+#: ../smime/gui/certificate-manager.c:1994
 msgid "All email certificate files"
 msgstr "所有的電子郵件憑證檔案"
 
-#: ../smime/gui/certificate-manager.c:2009
+#: ../smime/gui/certificate-manager.c:2011
 msgid "All CA certificate files"
 msgstr "所有的 CA 憑證檔案"
 
@@ -23837,7 +24286,7 @@ msgstr "地址卡(_A)"
 
 #: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
 msgid "_List View"
-msgstr "清單檢視(_L)"
+msgstr "列表檢視(_L)"
 
 #: ../views/addressbook/galview.xml.h:3
 msgid "By _Company"
@@ -23902,3 +24351,234 @@ msgstr "到期日(_D):"
 #: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "設定狀態(_S)"
+
+#~ msgid "Unset _trust for SSL certificate"
+#~ msgstr "取消設定 SSL 憑證的信任(_T)"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "LDAP over SSL (deprecated)"
+#~ msgstr "LDAP 透過 SSL (已廢棄)"
+
+#~ msgid "Microsoft Global Catalog over SSL"
+#~ msgstr "透過 SSL 的 Microsoft 通用類別目錄"
+
+#~ msgid "SSL on a dedicated port"
+#~ msgstr "SSL 於專用的連接埠"
+
+#~ msgid "Edit Reminder"
+#~ msgstr "編輯提醒"
+
+#~ msgid "start of appointment"
+#~ msgstr "約會開始"
+
+#~ msgid "end of appointment"
+#~ msgstr "約會結束"
+
+#~ msgid "Add Reminder"
+#~ msgstr "加入提醒"
+
+#~ msgid "Reminder"
+#~ msgstr "提醒"
+
+#~ msgid "Repeat"
+#~ msgstr "重複"
+
+#~ msgid "Mes_sage:"
+#~ msgstr "訊息(_S):"
+
+#~ msgid "_Sound:"
+#~ msgstr "聲音(_S):"
+
+#~ msgid "Select A File"
+#~ msgstr "請選取檔案"
+
+#~ msgid "Action/Trigger"
+#~ msgstr "動作/觸發"
+
+#~ msgid "This event has been deleted."
+#~ msgstr "這個事件已刪除。"
+
+#~ msgid "This task has been deleted."
+#~ msgstr "這項工作已刪除。"
+
+#~ msgid "This memo has been deleted."
+#~ msgstr "這個備忘錄已刪除。"
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and close the editor?"
+#~ msgstr "%s  您已經做了些變更。放棄這些變更並且關閉這個編輯器?"
+
+#~ msgid "%s  You have made no changes, close the editor?"
+#~ msgstr "%s  您沒有做任何變更,關閉這個編輯器?"
+
+#~ msgid "This event has been changed."
+#~ msgstr "這個事件已變更。"
+
+#~ msgid "This task has been changed."
+#~ msgstr "這項工作已變更。"
+
+#~ msgid "This memo has been changed."
+#~ msgstr "這個備忘錄已變更。"
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and update the editor?"
+#~ msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編輯器?"
+
+#~ msgid "%s  You have made no changes, update the editor?"
+#~ msgstr "%s  您沒有做任何變更,更新這個編輯器?"
+
+#~ msgid "Could not update object"
+#~ msgstr "無法更新物件"
+
+#~ msgid "Edit Appointment"
+#~ msgstr "編輯約會"
+
+#~ msgid "Keep original item?"
+#~ msgstr "是否保持原始項目?"
+
+#~ msgid "Unable to synchronize with the server"
+#~ msgstr "無法與伺服器同步"
+
+#~ msgid "Changes made to this item may be discarded if an update arrives"
+#~ msgstr "如果有新的更新,則會放棄對此項目所做的變更"
+
+#~ msgid "Unable to use current version!"
+#~ msgstr "無法使用目前的版本!"
+
+#~ msgid "Validation error: %s"
+#~ msgstr "確認上的錯誤: %s"
+
+#~ msgid "Enter Delegate"
+#~ msgstr "輸入代表"
+
+#~ msgid "Delegate To:"
+#~ msgstr "委託給:"
+
+#~ msgid "Contacts..."
+#~ msgstr "連絡人…"
+
+#~ msgid "_Recurrence"
+#~ msgstr "週期性(_R)"
+
+#~ msgid "Make this a recurring event"
+#~ msgstr "將此項設為週期性事件"
+
+#~ msgid "Insert advanced send options"
+#~ msgstr "插入進階傳送選項"
+
+#~ msgid "_Free/Busy"
+#~ msgstr "空閒/忙碌(_F)"
+
+#~ msgid "Print this event"
+#~ msgstr "列印這個事件"
+
+#~ msgid "This event has reminders"
+#~ msgstr "這個事件具有提醒"
+
+#~ msgid "Event with no start date"
+#~ msgstr "無開始日期的事件"
+
+#~ msgid "Event with no end date"
+#~ msgstr "無結束日期的事件"
+
+#~ msgid "End date is wrong"
+#~ msgstr "結束日期錯誤"
+
+#~ msgid "End time is wrong"
+#~ msgstr "結束時間錯誤"
+
+#~ msgid "_Delegatees"
+#~ msgstr "代理者(_D)"
+
+#~ msgid "Atte_ndees"
+#~ msgstr "到會者(_N)"
+
+#~ msgctxt "eventpage"
+#~ msgid "15 minutes before appointment"
+#~ msgstr "約會前 15 分鐘"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 hour before appointment"
+#~ msgstr "約會前 1 小時"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 day before appointment"
+#~ msgstr "約會前 1 天"
+
+#~ msgid "_Time:"
+#~ msgstr "時刻(_T):"
+
+#~ msgid "Event Description"
+#~ msgstr "事件描述"
+
+#~ msgid "Print this memo"
+#~ msgstr "列印這個備忘錄"
+
+#~ msgid "Memo's start date is in the past"
+#~ msgstr "備忘錄的開始時刻在過去"
+
+#~ msgid "Organi_zer:"
+#~ msgstr "會議召集人(_Z):"
+
+#~ msgid "T_o:"
+#~ msgstr "收件者(_O):"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "摘要(_M):"
+
+#~ msgid "Could not get a selection to modify."
+#~ msgstr "無法取得要編輯的選取區。"
+
+#~ msgid "Could not get a selection to delete."
+#~ msgstr "無法取得要刪除的選取區。"
+
+#~ msgid "Date/Time"
+#~ msgstr "日期/時間"
+
+#~ msgctxt "recurrpage"
+#~ msgid "day(s)"
+#~ msgstr "天"
+
+#~ msgctxt "recurrpage"
+#~ msgid "for"
+#~ msgstr "共"
+
+#~ msgctxt "recurrpage"
+#~ msgid "until"
+#~ msgstr "直到"
+
+#~ msgid "_Send Options"
+#~ msgstr "傳送選項(_S)"
+
+#~ msgid "Print this task"
+#~ msgstr "列印這項工作"
+
+#~ msgid ""
+#~ "Task cannot be edited, because the selected task list does not support "
+#~ "assigned tasks"
+#~ msgstr "不能編輯工作,因為選取的工作清單不支援指派工作"
+
+#~ msgid "Due date is wrong"
+#~ msgstr "到期日錯誤"
+
+#~ msgid "Time zone:"
+#~ msgstr "時區:"
+
+#~ msgid "%s at the start of the appointment"
+#~ msgstr "%s 於約會開始時"
+
+#~ msgid "%s at the end of the appointment"
+#~ msgstr "%s 於約會結束時"
+
+#~ msgid "Gnome Calendar"
+#~ msgstr "Gnome 行事曆"
+
+#~ msgid "Download in progress. Do you want to send the mail?"
+#~ msgstr "下載尚在進行中。是否寄出郵件?"
+
+#~ msgid ""
+#~ " There are few attachments getting downloaded. Sending the mail will "
+#~ "cause the mail to be sent without those pending attachments "
+#~ msgstr "這裡有一些附件要下載。傳送此郵件將無法一併寄出接下來的附件"


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