[evolution] Updated Chinese (Taiwan) translation



commit 11c07574ad4e35c099a7eac036fa85c698240258
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Tue Aug 25 13:22:27 2015 +0000

    Updated Chinese (Taiwan) translation

 po/zh_TW.po | 4509 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 2366 insertions(+), 2143 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 34dffa8..e29ee29 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-04-26 04:29+0000\n"
-"PO-Revision-Date: 2015-04-26 12:37+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"POT-Creation-Date: 2015-08-25 12:07+0800\n"
+"PO-Revision-Date: 2015-08-25 12:19+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.7.5\n"
+"X-Generator: Poedit 1.8.4\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:66
+#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
+#: ../mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "不要刪除(_N)"
 
@@ -148,7 +148,7 @@ msgstr ""
 #: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
-msgstr "你所選擇的圖片太大。您是否要改變大小後才儲存它?"
+msgstr "你所選擇的影像太大。您是否要改變大小後才儲存它?"
 
 #: ../addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
@@ -191,8 +191,8 @@ msgstr "此連絡人的電子郵件地址已經存在。您無論如何都要加
 #: ../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:55 ../modules/mail/em-composer-prefs.c:417
-#: ../plugins/attachment-reminder/attachment-reminder.c:557
+#: ../mail/mail-config.ui.h:57 ../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
 #: ../plugins/templates/templates.c:453
@@ -228,7 +228,7 @@ msgid ""
 msgstr "以「{0}」為名的連絡人清單已經存在這個連絡人清單中。要強制加入它嗎?"
 
 #: ../addressbook/addressbook.error.xml.h:41
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1248
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1252
 msgid "Failed to delete contact"
 msgstr "刪除連絡人失敗"
 
@@ -263,9 +263,9 @@ msgstr ""
 "是選擇不同的通訊錄。"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:744
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:727
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:749
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -332,7 +332,7 @@ 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
-#: ../modules/itip-formatter/itip-view.c:1907
+#: ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
@@ -421,18 +421,15 @@ msgstr "週年紀念日(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
-#: ../calendar/gui/e-calendar-view.c:1996
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
+#: ../calendar/gui/e-calendar-view.c:2049
 msgid "Anniversary"
 msgstr "週年紀念日"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
-#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
+#: ../calendar/gui/e-calendar-view.c:2048
 msgid "Birthday"
 msgstr "生日"
 
@@ -488,7 +485,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:3034
+#: ../calendar/gui/e-cal-model.c:3791
 msgid "Other"
 msgstr "其他"
 
@@ -501,23 +498,80 @@ msgid "Notes"
 msgstr "備註"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+msgid "Add _PGP"
+msgstr "加入 _PGP"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+msgid "Add _X.509"
+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
+#: ../plugins/attachment-reminder/attachment-reminder.c:448
+#: ../plugins/email-custom-header/email-custom-header.c:849
+#: ../plugins/publish-calendar/publish-calendar.c:791
+#: ../plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../plugins/templates/templates.c:463
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+msgid "Load P_GP"
+msgstr "載入 P_GP"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "_Load X.509"
+msgstr "載入 X.509 (_L)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#: ../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
+#: ../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/gal-view-instance-save-as-dialog.c:270
+#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+#: ../smime/gui/certificate-manager.c:655
+#: ../smime/gui/certificate-manager.c:732
+msgid "_Save"
+msgstr "儲存(_S)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../modules/addressbook/e-book-shell-backend.c:314
+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
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
 #: ../shell/e-shell-window-actions.c:1085
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:36
 msgid "Options"
 msgstr "選項"
 
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3683
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4321
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
@@ -525,162 +579,207 @@ 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:1328
+#: ../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:2322
+#: ../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:406
+#: ../e-util/e-attachment-store.c:635 ../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
-#: ../e-util/e-html-editor-actions.c:614 ../e-util/e-html-editor-actions.c:708
+#: ../e-util/e-html-editor-actions.c:616 ../e-util/e-html-editor-actions.c:711
 #: ../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-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
-#: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
+#: ../e-util/e-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:3224
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3229
 #: ../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
-#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:738
-#: ../mail/mail-send-recv.c:820 ../mail/mail-vfolder-ui.c:148
-#: ../mail/mail-vfolder-ui.c:270
+#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:18
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
 #: ../modules/backup-restore/evolution-backup-tool.c:899
 #: ../modules/calendar/e-cal-attachment-handler.c:285
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../plugins/face/face.c:291
+#: ../plugins/face/face.c:297
 #: ../plugins/publish-calendar/publish-calendar.c:790
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
 #: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
-#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652
-#: ../smime/gui/certificate-manager.c:729
-#: ../smime/gui/certificate-manager.c:953
-#: ../smime/gui/certificate-manager.c:1335 ../smime/gui/e-cert-selector.c:237
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:654
+#: ../smime/gui/certificate-manager.c:731
+#: ../smime/gui/certificate-manager.c:955
+#: ../smime/gui/certificate-manager.c:1337 ../smime/gui/e-cert-selector.c:237
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
-#: ../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:1277
-#: ../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:3225
-#: ../e-util/gal-view-instance-save-as-dialog.c:270
-#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
-#: ../smime/gui/certificate-manager.c:653
-#: ../smime/gui/certificate-manager.c:730
-msgid "_Save"
-msgstr "儲存(_S)"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
 msgid "Show Telephone"
 msgstr "顯示電話"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
 msgid "Show SIP Address"
 msgstr "顯示 SIP 位址"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
 msgid "Show Instant Messaging"
 msgstr "顯示即時通訊"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
 msgid "Show Web Addresses"
 msgstr "顯示網址"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
 msgid "Show Job section"
 msgstr "顯示工作部門"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
 msgid "Show Miscellaneous"
 msgstr "顯示其他選項"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
 msgid "Show Home Mailing Address"
 msgstr "顯示住家郵寄地址"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
 msgid "Show Work Mailing Address"
 msgstr "顯示工作郵寄地址"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
 msgid "Show Other Mailing Address"
 msgstr "顯示其他郵寄地址"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
 msgid "Show Notes"
 msgstr "顯示備註"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
-#: ../calendar/gui/dialogs/comp-editor.c:1298
-#: ../e-util/e-html-editor-actions.c:1129
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
+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:1134
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
-#: ../calendar/gui/dialogs/comp-editor.c:1300 ../e-util/e-focus-tracker.c:122
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1328 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "復原"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/dialogs/comp-editor.c:1305
-#: ../e-util/e-html-editor-actions.c:1115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../e-util/e-html-editor-actions.c:1120
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
-#: ../calendar/gui/dialogs/comp-editor.c:1307 ../e-util/e-focus-tracker.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:1335 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "取消復原"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "新增連絡人時發生錯誤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:323
 msgid "Error modifying contact"
 msgstr "修改連絡人時發生錯誤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:343
 msgid "Error removing contact"
 msgstr "移除連絡人時發生錯誤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "連絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
-msgid "Please select an image for this contact"
-msgstr "請選取代表此連絡人的圖片"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
+msgid "X.509 certificates"
+msgstr "X.509 憑證"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+msgid "PGP keys"
+msgstr "PGP 金鑰"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
+#: ../smime/gui/certificate-manager.c:678
+#: ../smime/gui/certificate-manager.c:967
+msgid "All files"
+msgstr "所有檔案"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+msgid "Open PGP key"
+msgstr "開啟 PGP 金鑰"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+msgid "Open X.509 certificate"
+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-html-editor-actions.c:615 ../e-util/e-html-editor-actions.c:709
-#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
-#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
+#: ../e-util/e-html-editor-actions.c:617 ../e-util/e-html-editor-actions.c:712
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:956
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3522
+msgid "Chosen file is not a local file."
+msgstr "已選取的檔案不是本地檔案。"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
+#, c-format
+msgid "Failed to load certificate: %s"
+msgstr "無法載入憑證:%s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "X.509"
+msgstr "X.509"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "PGP"
+msgstr "PGP"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save PGP key"
+msgstr "儲存 PGP 金鑰"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save X.509 certificate"
+msgstr "儲存 X.509 憑證"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
+#, c-format
+msgid "Failed to save certificate: %s"
+msgstr "儲存憑證失敗:%s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4318
+msgid "Please select an image for this contact"
+msgstr "請選取代表此連絡人的影像"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4323
 msgid "_No image"
-msgstr "沒有圖片(_N)"
+msgstr "沒有影像(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4672
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -688,28 +787,28 @@ msgstr ""
 "連絡人資料無效:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4678
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "「%s」含有無效的格式"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4686
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "「%s」不能是未來日期"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4694
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s「%s」含有無效的格式"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4707
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4721
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s「%s」是空的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4736
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
@@ -720,15 +819,15 @@ msgstr "無效的連絡人。"
 #: ../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:2323
+#: ../calendar/gui/dialogs/recurrence-page.c:2327
 #: ../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:388 ../e-util/e-passwords.c:471
+#: ../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-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
-#: ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
+#: ../e-util/e-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
 #: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
 #: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
@@ -737,7 +836,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:168 ../smime/gui/certificate-manager.c:1336
+#: ../shell/main.c:184 ../smime/gui/certificate-manager.c:1338
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "OK"
@@ -861,23 +960,6 @@ msgstr "將電子郵件加入清單"
 msgid "Remove an email address from the List"
 msgstr "將電子郵件位址從清單移除"
 
-#: ../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:460
-#: ../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:56
-#: ../plugins/attachment-reminder/attachment-reminder.c:567
-#: ../plugins/email-custom-header/email-custom-header.c:849
-#: ../plugins/publish-calendar/publish-calendar.c:791
-#: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:463
-msgid "_Remove"
-msgstr "移除(_R)"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
 msgstr "從通訊錄插入電子郵件位址"
@@ -1069,7 +1151,7 @@ msgstr "視訊交談"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:827
 #: ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:181
-#: ../modules/calendar/e-cal-shell-view.c:570
+#: ../modules/calendar/e-cal-shell-view.c:572
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "行事曆"
@@ -1314,73 +1396,72 @@ msgstr "取得書本檢視時發生錯誤"
 msgid "Search Interrupted"
 msgstr "搜尋被中斷"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:221
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr "剪下選取的連絡人至剪貼簿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:654
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr "複製選取的連絡人至剪貼簿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:660
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr "從剪貼簿貼上連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667
 #: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "刪除選定的連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:672
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr "選擇全部可見的連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1296
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "您確定要刪除這些連絡人清單?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact list?"
 msgstr "您確定要刪除這個連絡人清單?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "您確定要刪除這個連絡人清單 (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 msgid "Are you sure you want to delete these contacts?"
 msgstr "您確定要刪除這些連絡人?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 msgid "Are you sure you want to delete this contact?"
 msgstr "您確定要刪除這個連絡人?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "您確定要刪除這個連絡人 (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1329
-#: ../calendar/gui/dialogs/comp-editor.c:1242 ../e-util/e-focus-tracker.c:785
-#: ../e-util/evolution-source-viewer.c:805
-#: ../mail/e-mail-account-manager.c:736
+#: ../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
 #: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:943
-#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "刪除(_D)"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1480
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1392,11 +1473,11 @@ msgstr[0] ""
 "開啟 %d 個連絡人會同時開啟 %d 個新視窗。\n"
 "確定要顯示這裡所有的連絡人?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
 msgid "_Don't Display"
 msgstr "不要顯示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1489
 msgid "Display _All Contacts"
 msgstr "顯示所有的連絡人(_A)"
 
@@ -1507,7 +1588,7 @@ msgid "Title"
 msgstr "頭銜"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:666
+#: ../calendar/gui/e-meeting-list-view.c:684
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "角色"
@@ -1569,19 +1650,19 @@ msgstr "拉近(_I)"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2365
+#: ../mail/e-mail-reader.c:2293
 msgid "Zoom _Out"
 msgstr "拉遠(_O)"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2108
+#: ../e-util/e-html-editor-actions.c:2113
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "尋找(_F)"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -1591,7 +1672,7 @@ msgstr ""
 "\n"
 "搜尋連絡人..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1605,7 +1686,7 @@ msgstr ""
 "\n"
 "雙擊這裡以建立新的連絡人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1619,7 +1700,7 @@ msgstr ""
 "\n"
 "雙擊這裡以建立新的連絡人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1629,7 +1710,7 @@ msgstr ""
 "\n"
 "尋找連絡人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1870,16 +1951,17 @@ msgstr[0] "小時"
 #. * (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:1249
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:358
 msgid "Start time"
 msgstr "開始時刻"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../calendar/alarm-notify/alarm-queue.c:1924
 msgid "Appointments"
 msgstr "約會"
 
@@ -1893,15 +1975,15 @@ 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:1321
+#: ../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:1138
+#: ../e-util/e-html-editor-actions.c:1143
 #: ../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:60
-#: ../plugins/attachment-reminder/attachment-reminder.c:562
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:62
+#: ../plugins/attachment-reminder/attachment-reminder.c:443
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
@@ -1918,11 +2000,11 @@ msgid "_Dismiss"
 msgstr "解除(_D)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1860
-#: ../calendar/alarm-notify/alarm-queue.c:1870
+#: ../calendar/alarm-notify/alarm-queue.c:1888
+#: ../calendar/alarm-notify/alarm-queue.c:1898
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
-#: ../modules/itip-formatter/itip-view.c:1516
-#: ../modules/itip-formatter/itip-view.c:1627
+#: ../modules/itip-formatter/itip-view.c:1514
+#: ../modules/itip-formatter/itip-view.c:1625
 msgid "Location:"
 msgstr "位置:"
 
@@ -1959,48 +2041,47 @@ msgstr "小時"
 msgid "minutes"
 msgstr "分鐘"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1703
-#: ../calendar/alarm-notify/alarm-queue.c:1840
+#: ../calendar/alarm-notify/alarm-queue.c:1714
+#: ../calendar/alarm-notify/alarm-queue.c:1868
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1712
-#: ../calendar/alarm-notify/alarm-queue.c:1714
+#: ../calendar/alarm-notify/alarm-queue.c:1723
+#: ../calendar/alarm-notify/alarm-queue.c:1725
 msgid "No description available."
 msgstr "沒有任何描述。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1722
+#: ../calendar/alarm-notify/alarm-queue.c:1733
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1727
-#: ../calendar/alarm-notify/alarm-queue.c:1831
-#: ../calendar/alarm-notify/alarm-queue.c:2178
+#: ../calendar/alarm-notify/alarm-queue.c:1738
+#: ../calendar/alarm-notify/alarm-queue.c:1859
+#: ../calendar/alarm-notify/alarm-queue.c:2214
 msgid "Evolution Reminders"
 msgstr "Evolution 提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1771
+#: ../calendar/alarm-notify/alarm-queue.c:1782
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "您有 %d 個提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1996
+#: ../calendar/alarm-notify/alarm-queue.c:2032
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1997 ../mail/mail-dialogs.ui.h:21
-#: ../mail/mail.error.xml.h:139
+#: ../calendar/alarm-notify/alarm-queue.c:2033 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "否(_N)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1998 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:2034
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2002
+#: ../calendar/alarm-notify/alarm-queue.c:2038
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2017,7 +2098,7 @@ msgstr ""
 "\n"
 "您確定要執行這個程式?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2017
+#: ../calendar/alarm-notify/alarm-queue.c:2053
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -2069,8 +2150,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/dialogs/delete-comp.c:192
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "確定要刪除此會議?"
@@ -2086,8 +2166,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/dialogs/delete-comp.c:195
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "確定要刪除此工作?"
@@ -2183,8 +2262,7 @@ 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:16
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
@@ -2221,8 +2299,8 @@ 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:13
+#: ../mail/mail.error.xml.h:8
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "傳送(_S)"
@@ -2591,8 +2669,7 @@ msgstr "無法重新整理備忘錄清單「{0}」"
 msgid "Failed to make an occurrence movable"
 msgstr "無法將循環事件標示成可移動"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../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/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
@@ -2641,22 +2718,22 @@ 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:278
-#: ../calendar/gui/e-cal-model.c:285 ../calendar/gui/e-task-table.c:498
+#: ../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
 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:287
+#: ../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
 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:289
+#: ../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
 msgid "Confidential"
@@ -2673,8 +2750,8 @@ msgstr "會議召集人"
 msgid "Attendee"
 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
@@ -2706,8 +2783,7 @@ msgstr "存在"
 msgid "Do Not Exist"
 msgstr "不存在"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:309
+#: ../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
 msgid "Recurrence"
@@ -2899,58 +2975,58 @@ msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您沒有做任何變更,更新這個編輯器?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:299
 msgid "Could not save attachments"
 msgstr "無法儲存附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:625
+#: ../calendar/gui/dialogs/comp-editor.c:653
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:759
+#: ../calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
-#: ../calendar/gui/dialogs/comp-editor.c:766
+#: ../calendar/gui/dialogs/comp-editor.c:794
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:768
+#: ../calendar/gui/dialogs/comp-editor.c:796
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:776
+#: ../calendar/gui/dialogs/comp-editor.c:804
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:781
+#: ../calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Memo - %s"
 msgstr "備忘錄 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:797
+#: ../calendar/gui/dialogs/comp-editor.c:825
 msgid "No Summary"
 msgstr "沒有摘要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:918
+#: ../calendar/gui/dialogs/comp-editor.c:946
 msgid "Keep original item?"
 msgstr "是否保持原始項目?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
 #: ../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:1221
+#: ../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
@@ -2958,26 +3034,26 @@ msgstr "無法與伺服器同步"
 #: ../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:418 ../mail/em-subscription-editor.c:1714
+#: ../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:342 ../shell/e-shell-window-actions.c:908
-#: ../smime/gui/certificate-manager.c:2064
+#: ../smime/gui/certificate-manager.c:2066
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "Close the current window"
 msgstr "關閉目前的視窗"
 
 #. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1094 ../e-util/e-text.c:2089
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:1099 ../e-util/e-text.c:2109
 #: ../e-util/e-web-view.c:377 ../mail/e-mail-browser.c:134
-#: ../shell/e-shell-window-actions.c:929
+#: ../mail/mail.error.xml.h:141 ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
+#: ../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
@@ -2986,51 +3062,51 @@ msgid "Copy the selection"
 msgstr "複製選取的內容"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1101 ../e-util/e-text.c:2075
+#: ../calendar/gui/dialogs/comp-editor.c:1263 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1106 ../e-util/e-text.c:2095
 #: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
+#: ../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:938
 msgid "Cut the selection"
 msgstr "剪下選取範圍"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
+#: ../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:945
 msgid "Delete the selection"
 msgstr "刪除選取範圍"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "View help"
 msgstr "檢視求助"
 
 #. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1108 ../e-util/e-text.c:2101
+#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:1113 ../e-util/e-text.c:2121
 #: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
+#: ../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:966
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿的內容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1263
-#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2267
+#: ../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:1270 ../mail/e-mail-reader.c:2274
+#: ../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
@@ -3038,158 +3114,158 @@ msgstr "列印(_P)…"
 msgid "Pre_view..."
 msgstr "預覽(_V)…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1279
+#: ../calendar/gui/dialogs/comp-editor.c:1307
 msgid "Save current changes"
 msgstr "儲存目前的變更"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../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:1286
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Save current changes and close editor"
 msgstr "儲存目前的變更並且關閉編輯器"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1122 ../e-util/e-web-view.c:387
+#: ../calendar/gui/dialogs/comp-editor.c:1319 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:1127 ../e-util/e-web-view.c:387
 #: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
+#: ../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:1043
 msgid "Select all text"
 msgstr "選取所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1314
+#: ../calendar/gui/dialogs/comp-editor.c:1342
 msgid "_Classification"
 msgstr "歸類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1328
-#: ../e-util/e-html-editor-actions.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1150
 #: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
 #: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1342
-#: ../e-util/e-html-editor-actions.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1370
+#: ../e-util/e-html-editor-actions.c:1171
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../calendar/gui/dialogs/comp-editor.c:1377
 #: ../composer/e-composer-actions.c:378
 msgid "_Options"
 msgstr "選項(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1187 ../mail/e-mail-browser.c:178
+#: ../calendar/gui/dialogs/comp-editor.c:1384
+#: ../e-util/e-html-editor-actions.c:1192 ../mail/e-mail-browser.c:178
 #: ../shell/e-shell-window-actions.c:1121
-#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../calendar/gui/dialogs/comp-editor.c:1394
 #: ../composer/e-composer-actions.c:327
 msgid "_Attachment..."
 msgstr "附件(_A)…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
-#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:448
+#: ../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:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1384
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1395
+#: ../calendar/gui/dialogs/comp-editor.c:1423
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1425
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1402
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1404
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Classify as private"
 msgstr "歸類為私人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1409
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1411
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Classify as confidential"
 msgstr "歸類為機密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1419
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1449
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
+#: ../calendar/gui/dialogs/comp-editor.c:1455
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1457
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1435
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1443
+#: ../calendar/gui/dialogs/comp-editor.c:1471
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1473
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../calendar/gui/dialogs/comp-editor.c:2596
 #: ../composer/e-composer-actions.c:612
 msgid "Attach"
 msgstr "附加"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2563
-#: ../calendar/gui/dialogs/comp-editor.c:2773
-#: ../calendar/gui/dialogs/comp-editor.c:3786
+#: ../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:3748
+#: ../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:3818
+#: ../calendar/gui/dialogs/comp-editor.c:4557
 msgid "Unable to use current version!"
 msgstr "無法使用目前的版本!"
 
@@ -3199,7 +3275,7 @@ msgid "Validation error: %s"
 msgstr "確認上的錯誤: %s"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:129
-#: ../calendar/gui/e-cal-ops.c:1940
+#: ../calendar/gui/e-cal-ops.c:1968
 msgid "Destination is read only"
 msgstr "目的地是唯讀"
 
@@ -3314,7 +3390,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "不能完整的編輯事件,因為您不是召集人"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3180
+#: ../calendar/gui/dialogs/event-page.c:3198
 msgid "This event has reminders"
 msgstr "這個事件具有提醒"
 
@@ -3341,57 +3417,57 @@ msgstr "開始日期錯誤"
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1525
+#: ../calendar/gui/dialogs/event-page.c:1543
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1533
+#: ../calendar/gui/dialogs/event-page.c:1551
 msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1697
+#: ../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:1732
+#: ../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:1938
+#: ../calendar/gui/dialogs/event-page.c:1956
 msgid "_Delegatees"
 msgstr "代理者(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1940
+#: ../calendar/gui/dialogs/event-page.c:1958
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:3460
+#: ../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:3466
+#: ../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:3472
+#: ../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:3493
+#: ../calendar/gui/dialogs/event-page.c:3511
 msgid "Custom"
 msgstr "自訂"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3500
+#: ../calendar/gui/dialogs/event-page.c:3518
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "沒有"
@@ -3435,7 +3511,7 @@ msgstr "位置(_L):"
 #: ../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:374
+#: ../e-util/e-html-editor-link-dialog.c:422
 msgid "_Description:"
 msgstr "描述(_D):"
 
@@ -3458,7 +3534,7 @@ msgstr "事件描述"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:26
 #: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/e-meeting-time-sel.c:555
 msgid "Atte_ndees..."
 msgstr "到會者(_N)…"
 
@@ -3618,17 +3694,17 @@ msgstr "所有例項"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1001
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Recurrence date is invalid"
 msgstr "週期性日期無效"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../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:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1078
 msgid "on"
 msgstr "的"
 
@@ -3636,7 +3712,7 @@ msgstr "的"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1155
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
 msgid "first"
 msgstr "一"
 
@@ -3645,7 +3721,7 @@ msgstr "一"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1161
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "second"
 msgstr "二"
 
@@ -3653,7 +3729,7 @@ msgstr "二"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "third"
 msgstr "三"
 
@@ -3661,7 +3737,7 @@ msgstr "三"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1171
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fourth"
 msgstr "四"
 
@@ -3669,7 +3745,7 @@ msgstr "四"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "fifth"
 msgstr "第五"
 
@@ -3677,13 +3753,13 @@ msgstr "第五"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1181
+#: ../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:1205
+#: ../calendar/gui/dialogs/recurrence-page.c:1209
 msgid "Other Date"
 msgstr "其他日期"
 
@@ -3691,7 +3767,7 @@ msgstr "其他日期"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
+#: ../calendar/gui/dialogs/recurrence-page.c:1215
 msgid "1st to 10th"
 msgstr "1日至10日"
 
@@ -3699,7 +3775,7 @@ msgstr "1日至10日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1217
+#: ../calendar/gui/dialogs/recurrence-page.c:1221
 msgid "11th to 20th"
 msgstr "11日至20日"
 
@@ -3707,41 +3783,41 @@ msgstr "11日至20日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1227
 msgid "21st to 31st"
 msgstr "21日至31日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
 #: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../calendar/gui/dialogs/recurrence-page.c:1256
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../calendar/gui/dialogs/recurrence-page.c:1257
 #: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../calendar/gui/dialogs/recurrence-page.c:1258
 #: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../calendar/gui/dialogs/recurrence-page.c:1259
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
+#: ../calendar/gui/dialogs/recurrence-page.c:1260
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "星期日"
@@ -3749,31 +3825,31 @@ 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:1387
+#: ../calendar/gui/dialogs/recurrence-page.c:1391
 msgid "on the"
 msgstr "在第"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1572
+#: ../calendar/gui/dialogs/recurrence-page.c:1576
 msgid "occurrences"
 msgstr "次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2342
+#: ../calendar/gui/dialogs/recurrence-page.c:2346
 msgid "Add exception"
 msgstr "加入例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2384
+#: ../calendar/gui/dialogs/recurrence-page.c:2388
 msgid "Could not get a selection to modify."
 msgstr "無法取得要編輯的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2390
+#: ../calendar/gui/dialogs/recurrence-page.c:2394
 msgid "Modify exception"
 msgstr "編輯例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2436
+#: ../calendar/gui/dialogs/recurrence-page.c:2440
 msgid "Could not get a selection to delete."
 msgstr "無法取得要刪除的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2577
+#: ../calendar/gui/dialogs/recurrence-page.c:2581
 msgid "Date/Time"
 msgstr "日期/時間"
 
@@ -3900,7 +3976,7 @@ 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:1643 ../calendar/gui/e-task-table.c:525
+#: ../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"
@@ -3915,9 +3991,8 @@ 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
+#: ../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 "未指定"
 
@@ -3950,8 +4025,7 @@ msgstr "進行中"
 #: ../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
+#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
 msgstr "已完成"
 
@@ -3961,7 +4035,7 @@ msgstr "已完成"
 #: ../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:958
+#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:963
 msgid "Canceled"
 msgstr "已取消"
 
@@ -4199,8 +4273,8 @@ msgid "Due Date:"
 msgstr "截止日期:"
 
 #: ../calendar/gui/e-cal-component-preview.c:309
-#: ../modules/itip-formatter/itip-view.c:1519
-#: ../modules/itip-formatter/itip-view.c:1636
+#: ../modules/itip-formatter/itip-view.c:1517
+#: ../modules/itip-formatter/itip-view.c:1634
 msgid "Status:"
 msgstr "狀態:"
 
@@ -4217,17 +4291,17 @@ msgstr "描述:"
 msgid "Web Page:"
 msgstr "網頁:"
 
-#: ../calendar/gui/e-cal-data-model.c:1625
+#: ../calendar/gui/e-cal-data-model.c:1633
 #, c-format
 msgid "Creating view for calendar '%s'"
 msgstr "正在建立行事曆「%s」的檢視"
 
-#: ../calendar/gui/e-cal-data-model.c:1629
+#: ../calendar/gui/e-cal-data-model.c:1637
 #, c-format
 msgid "Creating view for task list '%s'"
 msgstr "正在建立工作清單「%s」的檢視"
 
-#: ../calendar/gui/e-cal-data-model.c:1633
+#: ../calendar/gui/e-cal-data-model.c:1641
 #, c-format
 msgid "Creating view for memo list '%s'"
 msgstr "正在建立備忘錄清單「%s」的檢視"
@@ -4241,7 +4315,7 @@ msgid "Start date"
 msgstr "開始日期"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:652
+#: ../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
@@ -4253,7 +4327,7 @@ msgstr "類型"
 msgid "Completion date"
 msgstr "完成日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:965
 msgid "Complete"
 msgstr "完成"
 
@@ -4267,16 +4341,14 @@ msgid "% Complete"
 msgstr "% 完成"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/tasktypes.xml.h:18 ../plugins/save-calendar/csv-format.c:386
 msgid "Priority"
 msgstr "優先等級"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3088
-#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../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
@@ -4297,51 +4369,51 @@ msgstr "已建立"
 msgid "Last modified"
 msgstr "修改日期"
 
-#: ../calendar/gui/e-calendar-view.c:411
+#: ../calendar/gui/e-calendar-view.c:459
 msgid "Cut selected events to the clipboard"
 msgstr "剪下選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:417
+#: ../calendar/gui/e-calendar-view.c:465
 msgid "Copy selected events to the clipboard"
 msgstr "複製選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:423
+#: ../calendar/gui/e-calendar-view.c:471
 msgid "Paste events from the clipboard"
 msgstr "從剪貼簿貼上事件"
 
-#: ../calendar/gui/e-calendar-view.c:429
+#: ../calendar/gui/e-calendar-view.c:477
 msgid "Delete selected events"
 msgstr "刪除選取的事件"
 
-#: ../calendar/gui/e-calendar-view.c:810
+#: ../calendar/gui/e-calendar-view.c:859
 msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr "貼上的文字並未包含有效的 iCalendar 資料"
 
-#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
+#: ../calendar/gui/e-calendar-view.c:870 ../calendar/gui/e-cal-ops.c:1567
 msgid "Default calendar not found"
 msgstr "找不到預設行事曆"
 
-#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
+#: ../calendar/gui/e-calendar-view.c:875 ../calendar/gui/e-cal-ops.c:1570
 msgid "Default memo list not found"
 msgstr "找不到預設備忘錄清單"
 
-#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
+#: ../calendar/gui/e-calendar-view.c:880 ../calendar/gui/e-cal-ops.c:1573
 msgid "Default task list not found"
 msgstr "找不到預設工作清單"
 
-#: ../calendar/gui/e-calendar-view.c:918
+#: ../calendar/gui/e-calendar-view.c:969
 msgid "No suitable component found"
 msgstr "找不到合適的元件"
 
-#: ../calendar/gui/e-calendar-view.c:988
+#: ../calendar/gui/e-calendar-view.c:1039
 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:1791 ../calendar/gui/e-memo-table.c:495
-#: ../calendar/gui/e-task-table.c:796
+#: ../calendar/gui/e-calendar-view.c:1842 ../calendar/gui/e-memo-table.c:493
+#: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "召集人: %s <%s>"
@@ -4349,29 +4421,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:1795 ../calendar/gui/e-memo-table.c:500
-#: ../calendar/gui/e-task-table.c:800
+#: ../calendar/gui/e-calendar-view.c:1846 ../calendar/gui/e-memo-table.c:498
+#: ../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:1811
-#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3527
+#: ../calendar/gui/e-calendar-view.c:1862
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../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:1851
+#: ../calendar/gui/e-calendar-view.c:1902
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2228
-#: ../calendar/gui/e-calendar-view.c:2235
-#: ../calendar/gui/e-calendar-view.c:2242
-#: ../calendar/gui/e-calendar-view.c:2245
+#: ../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
 msgid "%d %b %Y"
 msgstr "%Y年%m月%d日"
 
@@ -4380,13 +4452,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:2233 ../calendar/gui/e-day-view.c:2978
+#: ../calendar/gui/e-calendar-view.c:2286 ../calendar/gui/e-day-view.c:3052
 #: ../calendar/gui/e-day-view-top-item.c:859
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%m月%d日"
 
-#: ../calendar/gui/e-calendar-view.c:2255
+#: ../calendar/gui/e-calendar-view.c:2308
 msgid "%A %d %b %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -4396,15 +4468,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:2259 ../calendar/gui/e-day-view.c:2962
+#: ../calendar/gui/e-calendar-view.c:2312 ../calendar/gui/e-day-view.c:3036
 #: ../calendar/gui/e-day-view-top-item.c:855
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%m月%d日 (%a)"
 
-#: ../calendar/gui/e-calendar-view.c:2262
-#: ../calendar/gui/e-calendar-view.c:2268
-#: ../calendar/gui/e-calendar-view.c:2271
+#: ../calendar/gui/e-calendar-view.c:2315
+#: ../calendar/gui/e-calendar-view.c:2321
+#: ../calendar/gui/e-calendar-view.c:2324
 msgid "%a %d %b %Y"
 msgstr "%Y年%m月%d日 (%a)"
 
@@ -4417,99 +4489,95 @@ msgstr "開始日期"
 msgid "End Date"
 msgstr "結束日期"
 
-#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-model.c:319 ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
 #: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3606
-#: ../modules/itip-formatter/itip-view.c:6196
+#: ../modules/itip-formatter/itip-view.c:3604
+#: ../modules/itip-formatter/itip-view.c:6218
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "不明"
 
-#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586
-#: ../calendar/gui/e-cal-ops.c:1209
+#: ../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
 #, c-format
 msgid "Source with UID '%s' not found"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184
-#: ../calendar/gui/e-cal-ops.c:1325
+#: ../calendar/gui/e-cal-model.c:1480 ../calendar/gui/e-cal-ops.c:185
+#: ../calendar/gui/e-cal-ops.c:1349
 msgid "Creating an event"
 msgstr "建立一個事件"
 
-#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188
-#: ../calendar/gui/e-cal-ops.c:1329
+#: ../calendar/gui/e-cal-model.c:1484 ../calendar/gui/e-cal-ops.c:189
+#: ../calendar/gui/e-cal-ops.c:1353
 msgid "Creating a memo"
 msgstr "建立一份備忘錄"
 
-#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192
-#: ../calendar/gui/e-cal-ops.c:1333
+#: ../calendar/gui/e-cal-model.c:1488 ../calendar/gui/e-cal-ops.c:193
+#: ../calendar/gui/e-cal-ops.c:1357
 msgid "Creating a task"
 msgstr "建立一項工作"
 
-#: ../calendar/gui/e-cal-model.c:1645
+#: ../calendar/gui/e-cal-model.c:1858
 msgid "Recurring"
 msgstr "週期性模式"
 
-#: ../calendar/gui/e-cal-model.c:1647
+#: ../calendar/gui/e-cal-model.c:1860
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
+#: ../calendar/gui/e-cal-model.c:1862 ../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:1649 ../calendar/gui/e-cal-model-tasks.c:1139
+#: ../calendar/gui/e-cal-model.c:1862 ../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:3029
-#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3786 ../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:6184
+#: ../modules/itip-formatter/itip-view.c:6206
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-cal-model.c:3030
-#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3787 ../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:6190
+#: ../modules/itip-formatter/itip-view.c:6212
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-cal-model.c:3031
-#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3788 ../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:529
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr "暫訂"
 
-#: ../calendar/gui/e-cal-model.c:3032
-#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3789 ../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:6193
+#: ../modules/itip-formatter/itip-view.c:6215
 msgid "Delegated"
 msgstr "已委派"
 
-#: ../calendar/gui/e-cal-model.c:3033
+#: ../calendar/gui/e-cal-model.c:3790
 msgid "Needs action"
 msgstr "需要動作"
 
-#: ../calendar/gui/e-cal-model-calendar.c:123
+#: ../calendar/gui/e-cal-model-calendar.c:151
 #: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "空閒"
 
-#: ../calendar/gui/e-cal-model-calendar.c:126
-#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/e-cal-model-calendar.c:154
+#: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "忙碌"
 
@@ -4529,155 +4597,155 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "沒有"
 
-#: ../calendar/gui/e-cal-ops.c:283
+#: ../calendar/gui/e-cal-ops.c:287
 msgid "Modifying an event"
 msgstr "修改一個事件"
 
-#: ../calendar/gui/e-cal-ops.c:287
+#: ../calendar/gui/e-cal-ops.c:291
 msgid "Modifying a memo"
 msgstr "修改一份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:291
+#: ../calendar/gui/e-cal-ops.c:295
 msgid "Modifying a task"
 msgstr "修改一項工作"
 
-#: ../calendar/gui/e-cal-ops.c:387
+#: ../calendar/gui/e-cal-ops.c:394
 msgid "Removing an event"
 msgstr "移除一個事件"
 
-#: ../calendar/gui/e-cal-ops.c:391
+#: ../calendar/gui/e-cal-ops.c:398
 msgid "Removing a memo"
 msgstr "移除一份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:395
+#: ../calendar/gui/e-cal-ops.c:402
 msgid "Removing a task"
 msgstr "移除一項工作"
 
-#: ../calendar/gui/e-cal-ops.c:484
+#: ../calendar/gui/e-cal-ops.c:493
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "刪除 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:488
+#: ../calendar/gui/e-cal-ops.c:497
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "刪除 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:492
+#: ../calendar/gui/e-cal-ops.c:501
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "刪除 %d 項工作"
 
-#: ../calendar/gui/e-cal-ops.c:692
+#: ../calendar/gui/e-cal-ops.c:704
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "貼上 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:707
+#: ../calendar/gui/e-cal-ops.c:719
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "貼上 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:722
+#: ../calendar/gui/e-cal-ops.c:734
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "貼上 %d 項工作"
 
-#: ../calendar/gui/e-cal-ops.c:820
+#: ../calendar/gui/e-cal-ops.c:833
 msgid "Updating an event"
 msgstr "更新一個事件"
 
-#: ../calendar/gui/e-cal-ops.c:824
+#: ../calendar/gui/e-cal-ops.c:837
 msgid "Updating a memo"
 msgstr "更新一則備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:828
+#: ../calendar/gui/e-cal-ops.c:841
 msgid "Updating a task"
 msgstr "更新一項工作"
 
-#: ../calendar/gui/e-cal-ops.c:933
+#: ../calendar/gui/e-cal-ops.c:949
 #, c-format
 msgid "Getting events to purge in the calendar '%s'"
 msgstr "正在取得在行事曆「%s」中要清空的事件"
 
-#: ../calendar/gui/e-cal-ops.c:937
+#: ../calendar/gui/e-cal-ops.c:953
 #, c-format
 msgid "Getting memos to purge in the memo list '%s'"
 msgstr "正在取得在備忘錄清單「%s」中要清空的備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:941
+#: ../calendar/gui/e-cal-ops.c:957
 #, c-format
 msgid "Getting tasks to purge in the task list '%s'"
 msgstr "正在取得在工作清單「%s」中要清空的工作"
 
-#: ../calendar/gui/e-cal-ops.c:962
+#: ../calendar/gui/e-cal-ops.c:983
 #, c-format
 msgid "Purging events in the calendar '%s'"
 msgstr "正在清空行事曆「%s」中的事件"
 
-#: ../calendar/gui/e-cal-ops.c:966
+#: ../calendar/gui/e-cal-ops.c:987
 #, c-format
 msgid "Purging memos in the memo list '%s'"
 msgstr "正在清空備忘錄清單「%s」中的備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:970
+#: ../calendar/gui/e-cal-ops.c:991
 #, c-format
 msgid "Purging tasks in the task list '%s'"
 msgstr "正在清空工作清單「%s」中的工作"
 
-#: ../calendar/gui/e-cal-ops.c:1068
+#: ../calendar/gui/e-cal-ops.c:1091
 msgid "Purging events"
 msgstr "正在清除事件"
 
-#: ../calendar/gui/e-cal-ops.c:1072
+#: ../calendar/gui/e-cal-ops.c:1095
 msgid "Purging memos"
 msgstr "正在清除備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:1076
+#: ../calendar/gui/e-cal-ops.c:1099
 msgid "Purging tasks"
 msgstr "正在清除工作"
 
-#: ../calendar/gui/e-cal-ops.c:1178
+#: ../calendar/gui/e-cal-ops.c:1201
 msgid "Expunging completed tasks"
 msgstr "清除已完成的工作"
 
-#: ../calendar/gui/e-cal-ops.c:2034
+#: ../calendar/gui/e-cal-ops.c:2062
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "移個 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:2035
+#: ../calendar/gui/e-cal-ops.c:2063
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "正在複製 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:2041
+#: ../calendar/gui/e-cal-ops.c:2069
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "正在移動 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:2042
+#: ../calendar/gui/e-cal-ops.c:2070
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "正在複製 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:2048
+#: ../calendar/gui/e-cal-ops.c:2076
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "正在移動 %d 項工作"
 
-#: ../calendar/gui/e-cal-ops.c:2049
+#: ../calendar/gui/e-cal-ops.c:2077
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -4703,14 +4771,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2066 ../calendar/gui/e-week-view.c:1692
+#: ../calendar/gui/e-day-view.c:2138 ../calendar/gui/e-week-view.c:1694
 #: ../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:2069 ../calendar/gui/e-week-view.c:1695
+#: ../calendar/gui/e-day-view.c:2141 ../calendar/gui/e-week-view.c:1697
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
 #: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
@@ -4722,13 +4790,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:2945 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-day-view.c:3019 ../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:3609
+#: ../calendar/gui/e-day-view.c:3744
 #, c-format
 msgid "Week %d"
 msgstr "第 %d 週"
@@ -4750,8 +4818,8 @@ 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:306
-#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../modules/calendar/e-calendar-preferences.c:308
+#: ../modules/calendar/e-calendar-preferences.c:360
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
@@ -4759,7 +4827,7 @@ msgstr "沒有"
 
 #: ../calendar/gui/e-day-view-time-item.c:880
 #: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:389
+#: ../modules/calendar/e-calendar-preferences.c:391
 msgid "Select..."
 msgstr "選擇…"
 
@@ -4833,11 +4901,11 @@ msgstr "缺席者"
 msgid "Needs Action"
 msgstr "需要動作"
 
-#: ../calendar/gui/e-meeting-list-view.c:626
+#: ../calendar/gui/e-meeting-list-view.c:644
 msgid "Attendee                          "
 msgstr "到會者"
 
-#: ../calendar/gui/e-meeting-list-view.c:681
+#: ../calendar/gui/e-meeting-list-view.c:699
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
@@ -4846,83 +4914,83 @@ msgstr "RSVP"
 msgid "In Process"
 msgstr "進行中"
 
-#: ../calendar/gui/e-meeting-store.c:1909
+#: ../calendar/gui/e-meeting-store.c:1881
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "輸入使用者 %2$s 在伺服器 %1$s 上存取空閒/忙碌資訊的密碼 "
 
-#: ../calendar/gui/e-meeting-store.c:1919
+#: ../calendar/gui/e-meeting-store.c:1891
 #, c-format
 msgid "Failure reason: %s"
 msgstr "失敗原因:%s"
 
-#: ../calendar/gui/e-meeting-store.c:1924
+#: ../calendar/gui/e-meeting-store.c:1896
 #: ../plugins/publish-calendar/publish-calendar.c:351
 #: ../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:537
 msgid "Out of Office"
 msgstr "不在辦公室"
 
-#: ../calendar/gui/e-meeting-time-sel.c:533
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid "No Information"
 msgstr "沒有資訊"
 
-#: ../calendar/gui/e-meeting-time-sel.c:568
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "選項(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:588
+#: ../calendar/gui/e-meeting-time-sel.c:594
 msgid "Show _only working hours"
 msgstr "只顯示工作時間(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:601
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "Show _zoomed out"
 msgstr "顯示縮小(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:625
 msgid "_Update free/busy"
 msgstr "更新空閒/忙碌(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:636
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:662
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:673
+#: ../calendar/gui/e-meeting-time-sel.c:679
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:694
+#: ../calendar/gui/e-meeting-time-sel.c:700
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:705
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:722
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:726
+#: ../calendar/gui/e-meeting-time-sel.c:732
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:765
+#: ../calendar/gui/e-meeting-time-sel.c:771
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:794
+#: ../calendar/gui/e-meeting-time-sel.c:800
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2659
+#: ../calendar/gui/e-meeting-time-sel.c:2721
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4931,7 +4999,7 @@ msgstr ""
 "摘要:%s\n"
 "位置:%s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
+#: ../calendar/gui/e-meeting-time-sel.c:2723 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要:%s"
@@ -4961,45 +5029,45 @@ msgid "Language"
 msgstr "語言"
 
 #: ../calendar/gui/e-memo-table.c:371
-#: ../modules/calendar/e-cal-shell-content.c:1600
+#: ../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
 msgid "Memos"
 msgstr "備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
+#: ../calendar/gui/e-memo-table.c:455 ../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:544 ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-memo-table.c:540 ../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:563 ../calendar/gui/e-task-table.c:861
+#: ../calendar/gui/e-memo-table.c:560 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "到期:"
 
-#: ../calendar/gui/e-memo-table.c:684
+#: ../calendar/gui/e-memo-table.c:683
 msgid "Cut selected memos to the clipboard"
 msgstr "剪下選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:690
+#: ../calendar/gui/e-memo-table.c:689
 msgid "Copy selected memos to the clipboard"
 msgstr "複製選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:696
+#: ../calendar/gui/e-memo-table.c:695
 msgid "Paste memos from the clipboard"
 msgstr "從剪貼簿貼上備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:702
+#: ../calendar/gui/e-memo-table.c:701
 #: ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "刪除選定的備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:708
+#: ../calendar/gui/e-memo-table.c:707
 msgid "Select all visible memos"
 msgstr "選擇全部可見的備忘錄"
 
@@ -5020,31 +5088,31 @@ msgstr "%d%%"
 #: ../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:1560
+#: ../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
 msgid "Tasks"
 msgstr "工作"
 
-#: ../calendar/gui/e-task-table.c:999
+#: ../calendar/gui/e-task-table.c:998
 msgid "Cut selected tasks to the clipboard"
 msgstr "剪下選取的工作至剪貼簿"
 
-#: ../calendar/gui/e-task-table.c:1005
+#: ../calendar/gui/e-task-table.c:1004
 msgid "Copy selected tasks to the clipboard"
 msgstr "複製選取的工作至剪貼簿"
 
-#: ../calendar/gui/e-task-table.c:1011
+#: ../calendar/gui/e-task-table.c:1010
 msgid "Paste tasks from the clipboard"
 msgstr "從剪貼簿貼上工作"
 
-#: ../calendar/gui/e-task-table.c:1017
+#: ../calendar/gui/e-task-table.c:1016
 #: ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
 
-#: ../calendar/gui/e-task-table.c:1023
+#: ../calendar/gui/e-task-table.c:1022
 msgid "Select all visible tasks"
 msgstr "選擇全部可見的工作"
 
@@ -5181,15 +5249,15 @@ msgstr "無法預訂資源,錯誤為:"
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的到會者。"
 
-#: ../calendar/gui/itip-utils.c:1917
+#: ../calendar/gui/itip-utils.c:1918
 msgid "Sending an event"
 msgstr "正在傳送事件"
 
-#: ../calendar/gui/itip-utils.c:1921
+#: ../calendar/gui/itip-utils.c:1922
 msgid "Sending a memo"
 msgstr "正在傳送備忘錄"
 
-#: ../calendar/gui/itip-utils.c:1925
+#: ../calendar/gui/itip-utils.c:1926
 msgid "Sending a task"
 msgstr "正在傳送工作"
 
@@ -6514,7 +6582,7 @@ msgid "Asia/Kashgar"
 msgstr "亞洲/Kashgar"
 
 #: ../calendar/zones.h:242
-msgid "Asia/Katmandu"
+msgid "Asia/Kathmandu"
 msgstr "亞洲/加德滿都"
 
 #: ../calendar/zones.h:243
@@ -7247,11 +7315,11 @@ msgstr "用您的 PGP 金鑰為郵件加上數位簽章"
 
 #: ../composer/e-composer-actions.c:435
 msgid "_Picture Gallery"
-msgstr "圖片集(_P)"
+msgstr "影像集(_P)"
 
 #: ../composer/e-composer-actions.c:437
 msgid "Show a collection of pictures that you can drag to your message"
-msgstr "示您可以拖曳到郵件中的圖片集"
+msgstr "示您可以拖曳到郵件中的影像集"
 
 #: ../composer/e-composer-actions.c:443
 msgid "_Prioritize Message"
@@ -7397,24 +7465,24 @@ msgstr "按這裡新增目錄服務"
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡,選取要張貼的資料夾"
 
-#: ../composer/e-msg-composer.c:871
+#: ../composer/e-msg-composer.c:872
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署送出的郵件:此帳號沒有設定簽章憑證"
 
-#: ../composer/e-msg-composer.c:880
+#: ../composer/e-msg-composer.c:881
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "無法加密送出的郵件:沒有設定加密憑證(此帳號)"
 
-#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2282
+#: ../composer/e-msg-composer.c:1595 ../composer/e-msg-composer.c:2363
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4605
+#: ../composer/e-msg-composer.c:4706
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "郵件編輯器包含不能編輯的非文字的郵件內文。"
 
@@ -7541,7 +7609,7 @@ msgstr "回報的錯誤為 &quot;{0}&quot;。郵件很可能沒有儲存。"
 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:163
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:170
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "回報的錯誤為 &quot;{0}&quot;。"
 
@@ -7572,7 +7640,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:37
 msgid "Are you sure you want to send the message?"
-msgstr "確要傳送郵件?"
+msgstr "確定要傳送郵件?"
 
 #: ../composer/mail-composer.error.xml.h:38
 msgid ""
@@ -7583,10 +7651,8 @@ msgstr ""
 "如果不是則送出此郵件。"
 
 #: ../composer/mail-composer.error.xml.h:39
-#, fuzzy
-#| msgid "Are you sure you want to send the message?"
 msgid "Are you sure you want to change the composer mode?"
-msgstr "確要傳送郵件?"
+msgstr "您確定要改變編輯器模式?"
 
 #: ../composer/mail-composer.error.xml.h:40
 msgid ""
@@ -7599,10 +7665,8 @@ msgid "_Don't lose formatting"
 msgstr "不要略去格式(_D)"
 
 #: ../composer/mail-composer.error.xml.h:42
-#, fuzzy
-#| msgid "_Lose formatting"
 msgid "Lose _formatting"
-msgstr "略去格式(_L)"
+msgstr "失去格式(_F)"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
@@ -7773,6 +7837,10 @@ msgstr "是否在編輯器中顯示 雜項資訊 欄位"
 msgid "Whether to show notes in the editor"
 msgstr "是否在編輯器中顯示 筆記 欄位"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
+msgid "Whether to show Certificates tab in the editor"
+msgstr "是否在編輯器中顯示憑證分頁"
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "將郵件轉換為 Unicode"
@@ -7892,180 +7960,270 @@ msgid "Minute the workday starts on, 0 to 59."
 msgstr "工作日開始分鐘,0 到 59。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+msgid "Workday start time for Monday"
+msgstr "工作日星期一開始時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+msgid ""
+"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
+"or -1 to use day-start-hour and day-start-minute"
+msgstr ""
+"工作日開始於何時,以 24 小時格式 HHMM,0000 至 2359,或 -1 以使用 day-start-"
+"hour 與 day-start-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+msgid "Workday end time for Monday"
+msgstr "工作日星期一結束時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-end-hour and day-end-minute"
+msgstr ""
+"工作日結束於何時,以 24 小時格式 HHMM,0000 至 2359,或 -1 以使用 day-end-"
+"hour 與 day-end-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+msgid "Workday start time for Tuesday"
+msgstr "工作日星期二開始時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-start-hour and day-start-minute"
+msgstr ""
+"工作日結束於何時,以 24 小時格式 HHMM,0000 至 2359,或 -1 以使用 day-start-"
+"hour 與 day-start-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+msgid "Workday end time for Tuesday"
+msgstr "工作日星期二結束時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+msgid "Workday start time for Wednesday"
+msgstr "工作日星期三開始時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+msgid "Workday end time for Wednesday"
+msgstr "工作日星期三結束時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+msgid "Workday start time for Thursday"
+msgstr "工作日星期四開始時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+msgid "Workday end time for Thursday"
+msgstr "工作日星期四結束時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+msgid "Workday start time for Friday"
+msgstr "工作日星期五開始時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+msgid "Workday end time for Friday"
+msgstr "工作日星期五結束時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+msgid "Workday start time for Saturday"
+msgstr "工作日星期六開始時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+msgid "Workday end time for Saturday"
+msgstr "工作日星期六結束時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+msgid "Workday start time for Sunday"
+msgstr "工作日星期日開始時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+msgid "Workday end time for Sunday"
+msgstr "工作日星期日結束時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
 msgid "The second timezone for a Day View"
 msgstr "用於日檢視的第二時區"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key"
 msgstr "如果設定則會在日檢視中顯示第二時區。數值類似於「timezone」設定鍵的用法"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
 msgid "Recently used second time zones in a Day View"
 msgstr "最近在日檢視中使用的第二時區"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
 msgid "List of recently used second time zones in a Day View"
 msgstr "最近在日檢視中使用的第二時區清單"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
 msgid "Maximum number of recently used timezones to remember"
 msgstr "要記住的最近使用時區數目的最大值"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
 msgid ""
 "Maximum number of recently used timezones to remember in a 'day-second-"
 "zones' list"
 msgstr "在「day_second_zones」清單中要記住的最近使用時區數目的最大值"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
 msgid "Default reminder value"
 msgstr "預設提醒的數值"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
 msgid "Number of units for determining a default reminder"
 msgstr "決定預設提醒的單位數目"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
 msgid "Default reminder units"
 msgstr "預設提醒的單位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "預設提醒單位,「minutes」(分鐘)、「hours」(小時)或「days」(日)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+msgid "Default reminder snooze interval, in minutes"
+msgstr "預覽提醒的小睡間隔,以分鐘計"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+msgid ""
+"Default reminder snooze interval, in minutes, to be filled in the reminder "
+"notification dialog"
+msgstr "預覽提醒的小睡間隔,以分鐘計,會用於提醒通知對話盒中"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "在事件/會議/工作編輯器中顯示 分類 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 狀態 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 角色 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 角色 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 RSVP 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 RSVP 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid "Show status field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 狀態 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 狀態 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
 msgid "Show timezone field in the event/meeting editor"
 msgstr "在事件/會議編輯器中顯示 時區 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 時區 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
 msgid "Show type field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 類型 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 類型 欄位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 msgid "Hide completed tasks"
 msgstr "隱藏已完成的工作"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
 msgid "Whether to hide completed tasks in the tasks view"
 msgstr "是否在工作檢視中隱藏完成的工作"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
 msgid "Hide task units"
 msgstr "隱藏工作單位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 msgstr ""
 "決定何時隱藏工作的單位,「minutes」(分鐘)、「hours」(小時)或「days」(日)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
 msgid "Hide task value"
 msgstr "隱藏工作數值"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
 msgid "Number of units for determining when to hide tasks"
 msgstr "決定何時隱藏工作的單位數目"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 msgid "Horizontal pane position"
 msgstr "水平窗格位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 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:53
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 msgid "Last reminder time"
 msgstr "上次提醒時刻"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
 msgid "Time the last reminder ran, in time_t"
 msgstr "上次提醒執行的時間(_T)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains 線色彩─日檢視"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "在日檢視中用來繪製 Marcus Bains 線的顏色"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains 線色彩─時刻列"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
 msgstr "在時刻列中用來繪製 Marcus Bains 線的顏色 (留空表示使用預設值)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains 線"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr "是否在行事曆中繪出 Marcus Bains 線 (代表目前時刻的直線)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid "Memo preview pane position (horizontal)"
 msgstr "備忘錄預覽窗格位置(水平)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr "方向為水平時工作預覽窗格的位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid "Memo layout style"
 msgstr "備忘錄配置方式"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -8074,92 +8232,92 @@ msgstr ""
 "配置方式決定了在備忘錄清單中預覽窗格的位置。「0」 (標準檢視) 將預覽窗格放在備"
 "忘錄清單下方。「1」 (垂直檢視) 將預覽窗格放在備忘錄清單旁邊"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid "Memo preview pane position (vertical)"
 msgstr "備忘錄預覽窗格位置(垂直)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr "方向為垂直時備忘錄預覽窗格的位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Month view horizontal pane position"
 msgstr "月檢視的水平窗格位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 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:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "Scroll Month View by a week, not by a month"
 msgstr "是否以週為單位捲動月檢視,而非以月為單位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "是否以週為單位捲動月檢視,而非以月為單位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Reminder programs"
 msgstr "提醒的外部程式"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "Programs that are allowed to be run by reminders"
 msgstr "用來做為提醒而執行的程式"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Show display reminders in notification tray"
 msgstr "在通知區中顯示提醒畫面"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "Whether or not to use the notification tray for display reminders"
 msgstr "是否使用通知區顯示提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Preferred New button item"
 msgstr "偏好的新按鈕項目"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "Name of the preferred New toolbar button item"
 msgstr "偏好的新工具列按鈕項目的名稱"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary calendar"
 msgstr "主要行事曆"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
 msgstr "「行事曆」檢視側邊欄中已選取(或「主要」)行事曆的 UID"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary memo list"
 msgstr "主要備忘錄清單"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../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"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary task list"
 msgstr "主要工作清單"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../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"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Free/busy template URL"
 msgstr "空閒/忙碌範本網址"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -8168,75 +8326,75 @@ msgstr ""
 "作為空閒/忙碌資料回饋之用的網址範本,%u 要以電子郵件位址的使用者名稱部分來取"
 "代,而 %d 要替換為網域名稱"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Recurrent Events in Italic"
 msgstr "週期性事件以斜體顯示"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr "在左下行事曆中將週期性事件那幾天以斜體顯示"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Search range for time-based searching in years"
 msgstr "以時間為基礎搜尋範圍(年)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid ""
 "How many years can the time-based search go forward or backward from "
 "currently selected day when searching for another occurrence; default is ten "
 "years"
 msgstr "當搜尋另一個事件時以時間為基礎的搜尋可以往前或往後多少年;預設是十年"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Show appointment end times in week and month views"
 msgstr "在週及月的檢視內顯示約會的結束時間"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../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:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Show the memo preview pane"
 msgstr "顯示備忘錄預覽窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "如果為「true」,則在主視窗中顯示備忘錄預覽窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the task preview pane"
 msgstr "顯示工作預覽窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "如果為「true」,則在主視窗中顯示工作預覽窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "在日檢視、工作週檢視和日期導覽顯示週數"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "是否在行事曆的多個位置顯示週數"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Vertical position for the tag pane"
 msgstr "標籤窗格垂直位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Highlight tasks due today"
 msgstr "強調今天到期工作"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 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:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Tasks due today color"
 msgstr "今天到期工作的色彩"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8244,15 +8402,15 @@ msgstr ""
 "今天到期的工作背景顏色,使用 \"#rrggbb\" 格式。與 task-due-today-highlight 一"
 "起使用"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Task preview pane position (horizontal)"
 msgstr "工作預覽窗格位置(水平)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Task layout style"
 msgstr "工作配置方式"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 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 "
@@ -8261,28 +8419,38 @@ msgstr ""
 "配置方式決定了在工作清單中預覽窗格的位置。「0」 (標準檢視) 將預覽窗格放在工作"
 "清單下方。「1」 (垂直檢視) 將預覽窗格放在工作清單旁邊"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task preview pane position (vertical)"
 msgstr "工作預覽窗格位置(垂直)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "方向為垂直時工作預覽窗格的位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+msgid "Show reminders for completed tasks"
+msgstr "顯示已完成工作的提醒"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+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
 msgid "Highlight overdue tasks"
 msgstr "強調過期工作"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 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:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Overdue tasks color"
 msgstr "過期的工作色彩"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8290,19 +8458,19 @@ msgstr ""
 "過期工作的背景顏色,使用 \"#rrggbb\" 格式。與 task-overdue-highlight 一起使"
 "用。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Time divisions"
 msgstr "時間分隔"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "在「日」和「工作週」檢視中顯示間隔,以分鐘計"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Timezone"
 msgstr "時區"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8310,86 +8478,86 @@ msgstr ""
 "用於行事曆中日期與時刻的預設時區,未翻譯的 Olsen 時區資料庫位置就像 "
 "\"America/New York\""
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Twenty four hour time format"
 msgstr "24 小時制格式"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 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:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Birthday and anniversary reminder"
 msgstr "生日和週年紀念日提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "是否設定生日和週年紀念日的提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Default appointment reminder"
 msgstr "預設的約會提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Whether to set a default reminder for appointments"
 msgstr "是否設定約會的預設提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Use system timezone"
 msgstr "使用系統時區"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "使用系統時區取代在 Evolution 中選取的時區"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "First day of the week"
 msgstr "一週的第一天"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Monday is a work day"
 msgstr "星期一是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Tuesday is a work day"
 msgstr "星期二是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Wednesday is a work day"
 msgstr "星期三是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Thursday is a work day"
 msgstr "星期四是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Friday is a work day"
 msgstr "星期五是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Saturday is a work day"
 msgstr "星期六是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Sunday is a work day"
 msgstr "星期日是工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 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:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 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:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid "(Deprecated) Work days"
 msgstr "(已廢棄) 工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 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-"
@@ -8474,7 +8642,7 @@ msgstr "用於撰寫郵件的預設字元集。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
 msgid "Path where picture gallery should search for its content"
-msgstr "圖片集用來搜尋內容的路徑"
+msgstr "影像集用來搜尋內容的路徑"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
 msgid ""
@@ -8482,7 +8650,7 @@ msgid ""
 "folder, usually set to ~/Pictures. This folder will be also used when the "
 "set path is not pointing to the existent folder"
 msgstr ""
-"這個數值可以是空字串,代表要使用系統圖片資料夾,通常設定在 ~/Pictures。這個資"
+"這個數值可以是空字串,代表要使用系統影像資料夾,通常設定在 ~/Pictures。這個資"
 "料夾也會在路徑指向不存在的資料夾時使用"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
@@ -8764,110 +8932,133 @@ msgid "Will autowrap lines after given number of characters."
 msgstr "在指定字元數後自動進行文字換列。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+msgid ""
+"Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
+msgstr "詢問「prompt-on-many-to-cc-recips」的收件者與副本數目"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+msgid ""
+"When to ask, when the number of To and CC recipients reaches this value."
+msgstr "當收件者與副本數目達到這個數值時,是否要詢問。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr "是否在工具列中顯示簽署與加密按鈕"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+msgid ""
+"If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME are "
+"always shown in the composer's toolbar. Otherwise they are shown only when "
+"being used."
+msgstr ""
+"如果設定為「true」,PGP 或 S/MIME 的簽署與加密按鈕會永遠顯示在編輯器的工具列"
+"上。否則它們只會在被使用時才顯示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Save file format for drag-and-drop operation"
 msgstr "拖放操作時儲存的檔案格式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "可以是「mbox」或「pdf」。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Show image animations"
-msgstr "顯示動畫圖片"
+msgstr "顯示動畫影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
-"啟用 HTML 郵件中的動畫圖片。許多使用者認為動畫圖片很煩人,因而偏好以靜態圖片"
+"啟用 HTML 郵件中的動畫影像。許多使用者認為動畫影像很煩人,因而偏好以靜態影像"
 "代替。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable or disable type ahead search feature"
 msgstr "啟用或停用隨打即查功能"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "啟用側邊列搜尋功能允許互動式搜尋資料夾名稱。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable or disable magic space bar"
 msgstr "啟用或停用魔術空白鍵"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "啟用此選項可在郵件預覽、郵件清單和資料夾中使用空白鍵捲動畫面。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "啟用以在所有資料夾使用類似的郵件清單檢視設定值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "啟用此選項會讓所有的資料夾使用類似的郵件清單檢視設定值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Mark citations in the message \"Preview\""
 msgstr "在郵件「預覽」中標示引用"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在郵件「預覽」中標示引用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Citation highlight color"
 msgstr "引用反白色彩"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Citation highlight color."
 msgstr "引用反白色彩。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Enable/disable caret mode"
 msgstr "啟用/停用插入號模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "啟用插入號模式,如此您可以在閱讀郵件時看到游標。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Default charset in which to display messages"
 msgstr "用於顯示郵件的預設字元集"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Default charset in which to display messages."
 msgstr "用於顯示郵件的預設字元集。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "自動透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Show animated images as animations."
-msgstr "播放動畫圖片。"
+msgstr "播放動畫影像。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Show all message headers"
 msgstr "顯示所有郵件檔頭"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Show all the headers when viewing a messages."
 msgstr "檢視郵件時顯示檔頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "List of headers to show when viewing a message."
 msgstr "檢視郵件時顯示的檔頭清單。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 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 "
@@ -8876,96 +9067,82 @@ msgstr ""
 "每個檔頭都以配對方式呈現:檔頭的名稱,及一個布林值表示此檔頭是否啟用。停用的"
 "檔頭在檢視郵件時不會顯示,但仍會列在偏好設定中。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show photo of the sender"
 msgstr "顯示寄件者的相片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "在郵件閱讀窗格中顯示寄件者的相片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Search gravatar.com for photo of the sender"
 msgstr "在 gravatar.com 搜尋寄件者的相片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr "也允許在 gravatar.com 搜尋寄件者的相片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定的時限過後,標示成已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定的時限過後,標示成已閱讀。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-#, fuzzy
-#| msgid "Mark as Seen after specified timeout"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Mark as Seen always after specified timeout"
-msgstr "在指定的時限過後,標示成已閱讀"
+msgstr "在指定的時限過後永遠標示成已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
-msgstr ""
+msgstr "如果設定為 true,選取的郵件會在逾時時間或改變資料夾時設定為未讀。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Timeout for marking messages as seen"
 msgstr "將郵件標示成已閱讀的時限"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "將郵件標示成已閱讀的時限,以毫秒計。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Sender email-address column in the message list"
 msgstr "在郵件清單的寄件者電子郵件欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "在郵件清單的中以分離的欄位顯示寄件者的電子郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
-msgstr "決定是否在垂直檢視的「郵件」裡的「寄件人」及「主旨」中使用同樣的字型"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr "決定是否在垂直檢視的「郵件」裡的「寄件人」及「主旨」中使用同樣的字型。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Show deleted messages in the message-list"
 msgstr "在郵件清單中顯示刪除的郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在郵件清單中顯示刪除的郵件 (加上刪除號)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Enable Unmatched search folder"
 msgstr "啟用未符合搜尋資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 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:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "隱藏各資料夾預覽並移除選取區"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 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."
@@ -8973,31 +9150,31 @@ msgstr ""
 "這個鍵值只能讀取一次,並會在讀取後設為「false」。這樣會取消在清單中對該郵件的"
 "選取並移除對該資料夾的預覽。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Height of the message-list pane"
 msgstr "郵件清單窗格高度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Height of the message-list pane."
 msgstr "郵件清單窗格的高度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "郵件標題在使用者介面中是否摺疊"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Width of the message-list pane"
 msgstr "郵件清單窗格寬度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Width of the message-list pane."
 msgstr "郵件清單窗格的寬度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Layout style"
 msgstr "配置樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 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 "
@@ -9007,76 +9184,76 @@ msgstr ""
 "配置方式決定了在郵件清單中預覽窗格的位置。「0」(標準檢視)將預覽窗格放在郵件"
 "清單下方。「1」(垂直檢視)將預覽窗格放在郵件清單旁邊。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Variable width font"
 msgstr "變動寬度字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "The variable width font for mail display."
 msgstr "用於顯示郵件的變動寬度字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Terminal font"
 msgstr "終端機字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "The terminal font for mail display."
 msgstr "用於顯示郵件的終端機字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Use custom fonts"
 msgstr "使用自訂字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自訂字型來顯示郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "壓縮在 TO/CC/BCC 中位址的顯示方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 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:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Number of addresses to display 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:124
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "這會設定在預設郵件清單檢視中顯示位址的長度,超過的部分會顯示「…」。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Thread the message-list based on Subject"
 msgstr "以主旨為基礎串接郵件清單"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Default value for thread expand state"
 msgstr "相關郵件展開狀態的預設數值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否依郵件群組中最新的郵件來排序相關郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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 "
@@ -9085,28 +9262,23 @@ msgstr ""
 "這個設定值指定相關郵件要依每個郵件群組最新的郵件排序,而非依照郵件的日期。"
 "Evolution 將需要重新啟動。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Whether sort thread children always ascending"
-msgstr ""
+msgstr "是否永遠遞增排序相關郵件子項"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
-#, fuzzy
-#| 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 restart."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 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."
 msgstr ""
-"這個設定值指定相關郵件要依每個郵件群組最新的郵件排序,而非依照郵件的日期。"
-"Evolution 將需要重新啟動。"
+"這個設定值指定相關郵件的子項是否永遠遞增排序,而非依照相關郵件同樣的排序順"
+"序。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "在資料夾樹狀圖中以字母排序帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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 "
@@ -9116,27 +9288,27 @@ msgstr ""
 "告知在郵件檢視中如何排序資料夾樹狀圖中的帳號。當設定為 true 時帳號會以字母排"
 "序,但這臺電腦與搜尋資料夾例外,否則帳號會以使用者給予的順序排列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Log filter actions"
 msgstr "記錄過濾器動作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Log filter actions to the specified log file."
 msgstr "將過濾器動作記錄到指定的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Logfile to log filter actions"
 msgstr "用於記錄過濾器動作的記錄檔案"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Logfile to log filter actions."
 msgstr "用於記錄過濾器動作的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Flush Outbox after filtering"
 msgstr "過濾後清空寄件匣"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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 "
@@ -9145,100 +9317,100 @@ msgstr ""
 "是否在過濾完後清空寄件匣。寄件匣的清空只用在當使用了任何「轉寄至」過濾器動"
 "作,並且在這個動作後大約一分鐘開始進行。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Default forward style"
 msgstr "預設轉遞樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Default reply style"
 msgstr "預設回覆樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "使用快捷鍵傳送時提示 (Ctrl+Enter)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 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:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt on empty subject"
 msgstr "沒有主旨時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt when emptying the trash"
 msgstr "使用者清空回收筒時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "當使用者嘗試清空回收筒時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when user expunges"
 msgstr "使用者清空時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時,提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "寄信給沒有輸入有效郵件位址的收件者前先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "當使用者嘗試傳送不想要的 HTML 時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt while marking multiple messages"
 msgstr "當標記多個郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "啟用或停用標記多個郵件時的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when deleting messages in search folder"
 msgstr "當刪除搜尋資料夾中的郵件時顯示提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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 "
@@ -9247,11 +9419,11 @@ msgstr ""
 "它啟用/停用在從搜尋資料夾中刪除郵件時是否重複提示以警告那將會永久刪除郵件,而"
 "非僅是將郵件自搜尋結果中移除。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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 "
@@ -9261,11 +9433,11 @@ msgstr ""
 "可能的數值有:「never」- 不允許在資料夾樹狀圖中拖放複製、「 always」- 不詢問"
 "就允許在資料夾樹狀圖中拖放複製或「ask」- (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 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:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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 "
@@ -9275,21 +9447,21 @@ msgstr ""
 "可能的數值有:「never」- 不允許在資料夾樹狀圖中拖放移動、「 always」- 不詢問"
 "就允許在資料夾樹狀圖中拖放移動或「ask」- (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when replying privately to list messages"
 msgstr "當私人回覆通信論壇郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "當通信論壇劫持私人回覆時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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 "
@@ -9298,82 +9470,91 @@ msgstr ""
 "它會停用/啟用重覆提示警告您正試著回覆私人信件給透過通信論壇寄出的信。而通信論"
 "壇設定的 Reply-To: 標頭會將您的回信重新導向至通信論壇上的所有成員"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt when replying to many recipients"
 msgstr "當回覆給許多收件者時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid ""
 "Prompt when switching composer mode and the content needs to lose its "
 "formatting"
-msgstr ""
+msgstr "當切換編輯器模式會導致內容失去現有格式時先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-#, fuzzy
-#| msgid ""
-#| "It disables/enables the repeated prompts to warn that you are trying to "
-#| "send a message to recipients not entered as mail addresses"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer mode and the content needs to lose its formatting."
-msgstr "它會停用/啟用重覆提示警告您正試著傳送郵件給沒有輸入郵件位址的收件者"
+msgstr ""
+"它會停用/啟用重覆提示警告您正在切換編輯器模式而其中內容會失去先前的格式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+msgid "Prompt when sending to many To and CC recipients"
+msgstr "當回覆給許多收件者與副本時提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+msgid ""
+"Enable or disable the prompt when sending to many To and CC recipients. The "
+"'composer-many-to-cc-recips-num' defines the threshold."
+msgstr ""
+"當寄信給許多收件者與副本時啟用或停用提示。「composer-many-to-cc-recips-num」"
+"定義了這個界限值。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 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:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Empty Trash folders on exit"
 msgstr "結束時清空垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "結束 Evolution 時清空所有垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Minimum days between emptying the trash on exit"
 msgstr "結束時清空回收筒最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "結束時清空回收筒最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Last time Empty Trash was run"
 msgstr "上次清空回收筒的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "上次執行清單回收筒的時間,從 1970 年一月一日(電腦紀元)後算起的日數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Level beyond which the message should be logged."
 msgstr "應記錄的郵件等級。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Show original \"Date\" header value."
 msgstr "顯示原始的「日期」標頭數值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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 "
@@ -9382,11 +9563,11 @@ msgstr ""
 "顯示原始的「日期」檔頭(若時區不同時會使用當地時間)。否則永遠以使用者偏好的"
 "格式和本地時區顯示「日期」檔頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "List of Labels and their associated colors"
 msgstr "標籤和相關色彩的清單"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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."
@@ -9394,44 +9575,44 @@ msgstr ""
 "Evolution 的郵件元件已知的標籤清單。清單包含字串,其中包含 name:color,color "
 "使用 HTML 十六進位編碼。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Check incoming mail being junk"
 msgstr "檢查內送的垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Run junk test on incoming mail."
 msgstr "在內送的郵件執行垃圾郵件檢查。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Empty Junk folders on exit"
 msgstr "離開時清空垃圾郵件資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "離開 Evolution 時清空所有垃圾郵件資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Minimum days between emptying the junk on exit"
 msgstr "結束時清空垃圾郵件最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "結束時清空垃圾郵件最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Last time Empty Junk was run"
 msgstr "上次清空垃圾郵件的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 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:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "The default plugin for Junk hook"
 msgstr "垃圾釣鉤的預設外掛程式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 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 "
@@ -9440,11 +9621,11 @@ msgstr ""
 "這是預設的垃圾郵件外掛程式,即使已啟用了其他的外掛程式。如果停用這裡列出的預"
 "設外掛程式,並不會影響其他可用的外掛程式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "決定是否在通訊錄中尋找寄件者電子郵件帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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 "
@@ -9455,13 +9636,13 @@ msgstr ""
 "會搜尋標記為自動補齊的通訊錄。但若標記為自動補齊的是遠端通訊錄(像 LDAP),則"
 "速度可能會很慢。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 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:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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 "
@@ -9470,11 +9651,11 @@ msgstr ""
 "這個選項相關於鍵值「lookup_addressbook」,是用來決定是否只在本地端通訊錄中查"
 "詢電子郵件位址以用於垃圾郵件過濾時「排除已知連絡人寄出的郵件」功能。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "決定是否使用自訂標頭來檢查垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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 "
@@ -9483,52 +9664,52 @@ msgstr ""
 "決定是否使用自訂標頭來檢查垃圾郵件。如果啟用這個選項並且提供標頭,將會提升垃"
 "圾郵件檢查的速度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Custom headers to use while checking for junk."
 msgstr "檢查垃圾郵件用的自訂標頭。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
 "檢查垃圾郵件用的自訂標頭。此清單中的元素格式為「headername=value」字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "UID string of the default account."
 msgstr "預設帳號的 UID 字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Save directory"
 msgstr "儲存目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Directory for saving mail component files."
 msgstr "用來儲存郵件元件檔的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Composer load/attach directory"
 msgstr "編輯器讀取/附加目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Directory for loading/attaching files to composer."
 msgstr "用來郵件編輯器載入/附件的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Check for new messages on start"
 msgstr "啟動時檢查新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 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:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Check for new messages in all active accounts"
 msgstr "檢查所有使用中帳號的新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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 "
@@ -9537,21 +9718,21 @@ msgstr ""
 "當 Evolution 啟動時是否檢查所有使用中帳號的新郵件而不管「檢查新郵件於每 X 分"
 "鐘」選項。這個選項只能和「send_recv_on_start」選項一起使用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Server synchronization interval"
 msgstr "伺服器同步間隔"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 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:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Allow expunge in virtual folders"
 msgstr "允許在虛擬資料夾使用清空"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 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 "
@@ -9562,76 +9743,77 @@ msgstr ""
 "本身會對虛擬資料夾與所有資料夾中被刪除的郵件進行,並不只針對屬於虛擬資料夾中"
 "被刪除的郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 #: ../mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML mode"
-msgstr ""
+msgstr "繼承布景主題的顏色為 HTML 模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 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:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "An Archive folder for On This Computer folders."
-msgstr "用於「這臺電腦上」的壓縮資料夾。"
+msgstr "用於「這臺電腦上」的封存資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
-msgstr "在「這臺電腦的資料夾」中用於「郵件|壓縮…」功能的壓縮檔資料夾。"
+msgstr "在「這臺電腦的資料夾」中用於「郵件|封存…」功能的封存資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "(Deprecated) Default forward style"
 msgstr "(已廢棄) 預設轉寄樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 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:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "(Deprecated) Default reply style"
 msgstr "(已廢棄) 預設的回覆樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 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:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(已廢棄) 自訂檔頭以及它們是否啟用的清單"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 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:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(已廢棄) 透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../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 "
 "\"image-loading-policy\" instead."
 msgstr ""
 "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「image-loading-policy」代替。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 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:231
+#: ../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 "
 "\"browser-close-on-reply-policy\" instead."
@@ -9754,7 +9936,7 @@ msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
 msgstr ""
-"是否預設在外寄郵件中插入大頭照。在核取這個選項之前必須先設定好相片,否則不會"
+"是否預設在外寄郵件中插入大頭照。在勾選這個選項之前必須先設定好相片,否則不會"
 "有任何效果。"
 
 #: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
@@ -9912,7 +10094,7 @@ msgstr "檔案選擇對話盒的初始資料夾"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser 對話盒的初始資料夾。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:324
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
@@ -10029,7 +10211,7 @@ msgstr ""
 "執行 sa-learn 的完整路徑。如果沒有設定,就會使用編譯時期的路徑,通常是 /usr/"
 "bin/sa-learn。這個指令不應包含任何其他引數。"
 
-#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../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
@@ -10037,7 +10219,7 @@ msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 
-#: ../em-format/e-mail-formatter-attachment.c:406
+#: ../em-format/e-mail-formatter-attachment.c:425
 msgid "Display as attachment"
 msgstr "顯示為附件"
 
@@ -10092,17 +10274,16 @@ msgstr "名稱"
 msgid "Size"
 msgstr "大小"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:174
+#: ../em-format/e-mail-formatter-quote-headers.c:180
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
 #: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
-#: ../modules/mail/em-mailer-prefs.c:67
-#: ../smime/gui/certificate-manager.c:1630
+#: ../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:193
+#: ../em-format/e-mail-formatter-quote-headers.c:199
 #: ../em-format/e-mail-formatter-utils.c:343
 #: ../modules/mail/em-mailer-prefs.c:1484
 msgid "Mailer"
@@ -10119,18 +10300,18 @@ msgid "Display part as enriched text"
 msgstr "將部分顯示為豐富文字"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:360
+#: ../em-format/e-mail-formatter-text-html.c:385
 msgid "HTML"
 msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:361
+#: ../em-format/e-mail-formatter-text-html.c:386
 msgid "Format part as HTML"
 msgstr "將部分格式化為 HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1544
+#: ../e-util/e-html-editor-actions.c:1549
 msgid "Plain Text"
 msgstr "純文字"
 
@@ -10236,7 +10417,7 @@ msgstr ""
 "的內容。"
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../shell/shell.error.xml.h:23 ../smime/gui/smime-ui.ui.h:22
+#: ../shell/shell.error.xml.h:28 ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "檢視憑證(_V)"
 
@@ -10281,7 +10462,7 @@ msgid "S/MIME encrypted"
 msgstr "S/MIME 加密"
 
 #: ../em-format/e-mail-formatter-utils.c:591
-#: ../mail/e-mail-config-security-page.c:736
+#: ../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
 msgid "Security"
@@ -10359,8 +10540,8 @@ msgstr "不支援的簽名格式"
 msgid "Reply-To"
 msgstr "回覆"
 
-#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:551
-#: ../e-util/e-dateedit.c:574 ../mail/message-list.etspec.h:7
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:552
+#: ../e-util/e-dateedit.c:575 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "日期"
@@ -10443,11 +10624,11 @@ msgstr "關閉這個郵件 (Escape)"
 msgid "Failed to create a thread: "
 msgstr "無法建立郵件群組:"
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:738
+#: ../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:740
+#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
 msgid "List View"
 msgstr "清單檢視"
 
@@ -10549,7 +10730,7 @@ msgstr "儲存中"
 msgid "Hide Attachment _Bar"
 msgstr "隱藏附件列(_B)"
 
-#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:754
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:751
 msgid "Show Attachment _Bar"
 msgstr "顯示附件列(_B)"
 
@@ -10582,30 +10763,30 @@ msgstr "只儲存解壓縮檔案(_O)"
 msgid "Save extracted files and the original _archive"
 msgstr "儲存解壓縮檔案與原始的壓縮檔(_A)"
 
-#: ../e-util/e-attachment-view.c:413
+#: ../e-util/e-attachment-view.c:428
 msgid "Open With Other Application..."
 msgstr "以其他應用程式開啟…"
 
-#: ../e-util/e-attachment-view.c:420
+#: ../e-util/e-attachment-view.c:435
 msgid "S_ave All"
 msgstr "儲存全部(_A)"
 
-#: ../e-util/e-attachment-view.c:427
+#: ../e-util/e-attachment-view.c:442
 msgid "Sa_ve As"
 msgstr "儲存為(_V)"
 
-#: ../e-util/e-attachment-view.c:436
+#: ../e-util/e-attachment-view.c:451
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
 msgid "Save _As"
 msgstr "儲存為(_A)"
 
-#: ../e-util/e-attachment-view.c:446
+#: ../e-util/e-attachment-view.c:461
 msgid "A_dd Attachment..."
 msgstr "加入附件(_A)…"
 
-#: ../e-util/e-attachment-view.c:453
+#: ../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
@@ -10615,48 +10796,44 @@ msgstr "加入附件(_A)…"
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-#: ../e-util/e-attachment-view.c:470
+#: ../e-util/e-attachment-view.c:485
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
-#: ../e-util/e-attachment-view.c:477
+#: ../e-util/e-attachment-view.c:492
 msgid "Hid_e All"
 msgstr "全部隱藏(_E)"
 
-#: ../e-util/e-attachment-view.c:484
+#: ../e-util/e-attachment-view.c:499
 msgid "_View Inline"
 msgstr "檢視行內(_V)"
 
-#: ../e-util/e-attachment-view.c:491
+#: ../e-util/e-attachment-view.c:506
 msgid "Vie_w All Inline"
 msgstr "全部以行內檢視(_W)"
 
-#: ../e-util/e-attachment-view.c:498
+#: ../e-util/e-attachment-view.c:513
 msgid "_Zoom to 100%"
-msgstr ""
+msgstr "縮放到 100%(_Z)"
 
-#: ../e-util/e-attachment-view.c:500
-#, fuzzy
-#| msgid "Reset the text to its original size"
+#: ../e-util/e-attachment-view.c:515
 msgid "Zoom the image to its natural size"
-msgstr "重設文字為原始大小"
+msgstr "縮放為影像的原始尺寸"
 
-#: ../e-util/e-attachment-view.c:505
-#, fuzzy
-#| msgid "Close this window"
+#: ../e-util/e-attachment-view.c:520
 msgid "_Zoom to window"
-msgstr "關閉本視窗"
+msgstr "縮放到視窗(_Z)"
 
-#: ../e-util/e-attachment-view.c:507
+#: ../e-util/e-attachment-view.c:522
 msgid "Zoom large images to not be wider than the window width"
-msgstr ""
+msgstr "縮小較大影像避免寬於視窗寬度"
 
-#: ../e-util/e-attachment-view.c:850
+#: ../e-util/e-attachment-view.c:880
 #, c-format
 msgid "Open With \"%s\""
 msgstr "以「%s」開啟"
 
-#: ../e-util/e-attachment-view.c:853
+#: ../e-util/e-attachment-view.c:883
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "在 %s 中開啟這個附件"
@@ -10674,7 +10851,7 @@ msgid "Copy book content locally for offline operation"
 msgstr "複製通訊錄內容至本地用於離線作業"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../e-util/e-buffer-tagger.c:407
+#: ../e-util/e-buffer-tagger.c:412
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-單擊以開啟連結"
 
@@ -10699,19 +10876,19 @@ msgid "Month Calendar"
 msgstr "月行事曆"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
+#: ../e-util/e-calendar-item.c:1322 ../e-util/e-calendar-item.c:2200
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%m月"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1325
+#: ../e-util/e-calendar-item.c:1324
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y年"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1362
+#: ../e-util/e-calendar-item.c:1361
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y年%m月"
@@ -10782,7 +10959,7 @@ msgstr "分類圖示"
 
 #: ../e-util/e-category-editor.c:140
 msgid "_No Image"
-msgstr "沒有圖片(_N)"
+msgstr "沒有影像(_N)"
 
 #: ../e-util/e-category-editor.c:173
 msgid "Category _Name"
@@ -10801,39 +10978,40 @@ msgstr "分類屬性"
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
-msgstr "在組態中已經有名為「%s」的分類。請使用另外的名稱"
+msgstr "在設定中已經有名為「%s」的分類。請使用另外的名稱"
 
 #: ../e-util/e-cell-combo.c:185
 msgid "popup list"
 msgstr "彈出式清單"
 
-#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+#: ../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
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-date-edit.c:298
+#: ../e-util/e-cell-date-edit.c:303
 msgid "Now"
 msgstr "現在"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
+#: ../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/itip-formatter/itip-view.c:223
+#: ../modules/itip-formatter/itip-view.c:221
 msgid "Today"
 msgstr "今天"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:316
+#: ../e-util/e-cell-date-edit.c:321
 msgctxt "table-date"
 msgid "None"
 msgstr "沒有"
 
-#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
+#: ../e-util/e-cell-date-edit.c:329 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
 msgstr "確定"
 
-#: ../e-util/e-cell-date-edit.c:873
+#: ../e-util/e-cell-date-edit.c:878
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式:%s"
@@ -10931,7 +11109,7 @@ msgstr "輸入要使用的字元集"
 msgid "Other..."
 msgstr "其它…"
 
-#: ../e-util/e-client-cache.c:1285
+#: ../e-util/e-client-cache.c:1148 ../e-util/e-client-cache.c:1279
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "不能從延伸名稱「%s」建立客戶端物件"
@@ -11102,63 +11280,62 @@ msgstr "白色"
 
 #: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3959
-#: ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:578 ../mail/e-mail-reader.c:3899
+#: ../mail/mail-config.ui.h:72
 msgid "Default"
 msgstr "預設值"
 
-#: ../e-util/e-dateedit.c:525
+#: ../e-util/e-dateedit.c:526
 msgid "Date and Time"
 msgstr "日期與時刻"
 
-#: ../e-util/e-dateedit.c:550
+#: ../e-util/e-dateedit.c:551
 msgid "Text entry to input date"
 msgstr "用來輸入日期的文字項目"
 
-#: ../e-util/e-dateedit.c:573
+#: ../e-util/e-dateedit.c:574
 msgid "Click this button to show a calendar"
 msgstr "按此按鈕以顯示行事曆"
 
-#: ../e-util/e-dateedit.c:627
+#: ../e-util/e-dateedit.c:628
 msgid "Drop-down combination box to select time"
 msgstr "用以選擇時刻的下拉式組合方塊"
 
-#: ../e-util/e-dateedit.c:628
-#: ../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 "時間"
 
-#: ../e-util/e-dateedit.c:702
+#: ../e-util/e-dateedit.c:703
 msgid "No_w"
 msgstr "現在(_W)"
 
-#: ../e-util/e-dateedit.c:709
+#: ../e-util/e-dateedit.c:710
 msgid "_Today"
 msgstr "今天(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:718
+#: ../e-util/e-dateedit.c:719
 msgid "_None"
 msgstr "沒有(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1840 ../e-util/e-dateedit.c:2088
+#: ../e-util/e-dateedit.c:1841 ../e-util/e-dateedit.c:2089
 msgctxt "date"
 msgid "None"
 msgstr "沒有"
 
-#: ../e-util/e-dateedit.c:1980
+#: ../e-util/e-dateedit.c:1981
 msgid "Invalid Date Value"
 msgstr "無效的日期數值"
 
-#: ../e-util/e-dateedit.c:2025
+#: ../e-util/e-dateedit.c:2026
 msgid "Invalid Time Value"
 msgstr "無效的時刻數值"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:249
 msgid "Tomorrow"
 msgstr "明天"
 
@@ -11487,7 +11664,7 @@ msgstr "尋找符合下列條件的項目"
 #. name:
 #: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:63
 #: ../e-util/e-mail-identity-combo-box.c:476
-#: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
+#: ../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
@@ -11519,11 +11696,11 @@ msgid "A_dd Condition"
 msgstr "加入條件(_D)"
 
 #: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
-#: ../mail/em-utils.c:164
+#: ../mail/em-utils.c:165
 msgid "Incoming"
 msgstr "內送"
 
-#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:165
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:166
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -11535,651 +11712,651 @@ msgstr "無法插入 HTML 檔案。"
 msgid "Failed to insert text file."
 msgstr "無法插入文字檔案。"
 
-#: ../e-util/e-html-editor-actions.c:612
+#: ../e-util/e-html-editor-actions.c:614
 msgid "Insert HTML File"
 msgstr "插入 HTML 檔案"
 
-#: ../e-util/e-html-editor-actions.c:618
+#: ../e-util/e-html-editor-actions.c:620
 msgid "HTML file"
 msgstr "HTML 檔案"
 
-#: ../e-util/e-html-editor-actions.c:645
+#: ../e-util/e-html-editor-actions.c:647
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "插入影像"
 
-#: ../e-util/e-html-editor-actions.c:706
+#: ../e-util/e-html-editor-actions.c:709
 msgid "Insert text file"
 msgstr "插入文字檔案"
 
-#: ../e-util/e-html-editor-actions.c:712
+#: ../e-util/e-html-editor-actions.c:715
 msgid "Text file"
 msgstr "文字檔案"
 
-#: ../e-util/e-html-editor-actions.c:1096
+#: ../e-util/e-html-editor-actions.c:1101
 msgid "Copy selected text to the clipboard"
 msgstr "將選取的文字複製至剪貼簿"
 
-#: ../e-util/e-html-editor-actions.c:1103
+#: ../e-util/e-html-editor-actions.c:1108
 msgid "Cut selected text to the clipboard"
 msgstr "將選定的文字剪貼至剪貼簿"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:1110
+#: ../e-util/e-html-editor-actions.c:1115
 msgid "Paste text from the clipboard"
 msgstr "從剪貼簿貼上文字"
 
-#: ../e-util/e-html-editor-actions.c:1117
+#: ../e-util/e-html-editor-actions.c:1122
 msgid "Redo the last undone action"
 msgstr "重複剛取消的動作"
 
-#: ../e-util/e-html-editor-actions.c:1131
+#: ../e-util/e-html-editor-actions.c:1136
 msgid "Undo the last action"
 msgstr "還原最後的動作"
 
-#: ../e-util/e-html-editor-actions.c:1152
+#: ../e-util/e-html-editor-actions.c:1157
 msgid "For_mat"
 msgstr "格式(_M)"
 
-#: ../e-util/e-html-editor-actions.c:1159
+#: ../e-util/e-html-editor-actions.c:1164
 msgid "_Paragraph Style"
 msgstr "段落樣式(_P)"
 
-#: ../e-util/e-html-editor-actions.c:1173
+#: ../e-util/e-html-editor-actions.c:1178
 #: ../e-util/e-html-editor-image-dialog.c:635
 msgid "_Alignment"
 msgstr "對齊(_A)"
 
-#: ../e-util/e-html-editor-actions.c:1180
+#: ../e-util/e-html-editor-actions.c:1185
 msgid "Current _Languages"
 msgstr "目前的語言(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1197
+#: ../e-util/e-html-editor-actions.c:1202
 msgid "_Increase Indent"
 msgstr "增加縮排(_I)"
 
-#: ../e-util/e-html-editor-actions.c:1199
+#: ../e-util/e-html-editor-actions.c:1204
 msgid "Increase Indent"
 msgstr "增加縮排"
 
-#: ../e-util/e-html-editor-actions.c:1204
+#: ../e-util/e-html-editor-actions.c:1209
 msgid "_HTML File..."
 msgstr "_HTML 檔案…"
 
-#: ../e-util/e-html-editor-actions.c:1211
+#: ../e-util/e-html-editor-actions.c:1216
 msgid "Te_xt File..."
 msgstr "文字檔案(_X)…"
 
-#: ../e-util/e-html-editor-actions.c:1218
+#: ../e-util/e-html-editor-actions.c:1223
 msgid "Paste _Quotation"
 msgstr "貼上引文(_Q)"
 
-#: ../e-util/e-html-editor-actions.c:1225
+#: ../e-util/e-html-editor-actions.c:1230
 msgid "_Find..."
 msgstr "尋找(_F)…"
 
-#: ../e-util/e-html-editor-actions.c:1227
+#: ../e-util/e-html-editor-actions.c:1232
 msgid "Search for text"
 msgstr "搜尋文字"
 
-#: ../e-util/e-html-editor-actions.c:1232
+#: ../e-util/e-html-editor-actions.c:1237
 msgid "Find A_gain"
 msgstr "再次尋找(_G)"
 
-#: ../e-util/e-html-editor-actions.c:1239
+#: ../e-util/e-html-editor-actions.c:1244
 msgid "Re_place..."
 msgstr "取代(_P)…"
 
-#: ../e-util/e-html-editor-actions.c:1241
+#: ../e-util/e-html-editor-actions.c:1246
 msgid "Search for and replace text"
 msgstr "搜尋及取代文字"
 
-#: ../e-util/e-html-editor-actions.c:1246
+#: ../e-util/e-html-editor-actions.c:1251
 msgid "Check _Spelling..."
 msgstr "檢查拼字(_S)…"
 
-#: ../e-util/e-html-editor-actions.c:1253
+#: ../e-util/e-html-editor-actions.c:1258
 msgid "_Decrease Indent"
 msgstr "減少縮排(_D)"
 
-#: ../e-util/e-html-editor-actions.c:1255
+#: ../e-util/e-html-editor-actions.c:1260
 msgid "Decrease Indent"
 msgstr "減少縮排"
 
-#: ../e-util/e-html-editor-actions.c:1260
+#: ../e-util/e-html-editor-actions.c:1265
 msgid "_Wrap Lines"
 msgstr "換列(_W)"
 
-#: ../e-util/e-html-editor-actions.c:1267
+#: ../e-util/e-html-editor-actions.c:1272
 msgid "Open Inspector"
 msgstr "開啟檢查器(_I)"
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1277
+#: ../e-util/e-html-editor-actions.c:1282
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "置中(_C)"
 
-#: ../e-util/e-html-editor-actions.c:1279
+#: ../e-util/e-html-editor-actions.c:1284
 msgid "Center Alignment"
 msgstr "置中對齊"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1284
+#: ../e-util/e-html-editor-actions.c:1289
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "靠左(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1286
+#: ../e-util/e-html-editor-actions.c:1291
 msgid "Left Alignment"
 msgstr "靠左對齊"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1291
+#: ../e-util/e-html-editor-actions.c:1296
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "靠右(_R)"
 
-#: ../e-util/e-html-editor-actions.c:1293
+#: ../e-util/e-html-editor-actions.c:1298
 msgid "Right Alignment"
 msgstr "靠右對齊"
 
-#: ../e-util/e-html-editor-actions.c:1301
+#: ../e-util/e-html-editor-actions.c:1306
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1303
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "HTML editing mode"
 msgstr "HTML 編輯模式"
 
-#: ../e-util/e-html-editor-actions.c:1308
+#: ../e-util/e-html-editor-actions.c:1313
 msgid "Plain _Text"
 msgstr "純文字(_T)"
 
-#: ../e-util/e-html-editor-actions.c:1310
+#: ../e-util/e-html-editor-actions.c:1315
 msgid "Plain text editing mode"
 msgstr "純文字編輯模式"
 
-#: ../e-util/e-html-editor-actions.c:1318
+#: ../e-util/e-html-editor-actions.c:1323
 msgid "_Normal"
 msgstr "一般(_N)"
 
-#: ../e-util/e-html-editor-actions.c:1325
+#: ../e-util/e-html-editor-actions.c:1330
 msgid "Header _1"
 msgstr "標題 _1"
 
-#: ../e-util/e-html-editor-actions.c:1332
+#: ../e-util/e-html-editor-actions.c:1337
 msgid "Header _2"
 msgstr "標題 _2"
 
-#: ../e-util/e-html-editor-actions.c:1339
+#: ../e-util/e-html-editor-actions.c:1344
 msgid "Header _3"
 msgstr "標題 _3"
 
-#: ../e-util/e-html-editor-actions.c:1346
+#: ../e-util/e-html-editor-actions.c:1351
 msgid "Header _4"
 msgstr "標題 _4"
 
-#: ../e-util/e-html-editor-actions.c:1353
+#: ../e-util/e-html-editor-actions.c:1358
 msgid "Header _5"
 msgstr "標題 _5"
 
-#: ../e-util/e-html-editor-actions.c:1360
+#: ../e-util/e-html-editor-actions.c:1365
 msgid "Header _6"
 msgstr "標題 _6"
 
-#: ../e-util/e-html-editor-actions.c:1367
+#: ../e-util/e-html-editor-actions.c:1372
 msgid "_Preformatted"
 msgstr "預先格式化(_P)"
 
-#: ../e-util/e-html-editor-actions.c:1374
+#: ../e-util/e-html-editor-actions.c:1379
 msgid "A_ddress"
 msgstr "位址(_D)"
 
-#: ../e-util/e-html-editor-actions.c:1381
+#: ../e-util/e-html-editor-actions.c:1386
 msgid "_Blockquote"
 msgstr "區塊引用(_B)"
 
-#: ../e-util/e-html-editor-actions.c:1388
+#: ../e-util/e-html-editor-actions.c:1393
 msgid "_Bulleted List"
 msgstr "無序清單(_B)"
 
-#: ../e-util/e-html-editor-actions.c:1395
+#: ../e-util/e-html-editor-actions.c:1400
 msgid "_Roman Numeral List"
 msgstr "羅馬字有序清單(_R)"
 
-#: ../e-util/e-html-editor-actions.c:1402
+#: ../e-util/e-html-editor-actions.c:1407
 msgid "Numbered _List"
 msgstr "有序清單(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1409
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "_Alphabetical List"
 msgstr "字母順序清單(_A)"
 
-#: ../e-util/e-html-editor-actions.c:1425
-#: ../e-util/e-html-editor-actions.c:1463
+#: ../e-util/e-html-editor-actions.c:1430
+#: ../e-util/e-html-editor-actions.c:1468
 msgid "_Image..."
 msgstr "影像(_I)…"
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1428
+#: ../e-util/e-html-editor-actions.c:1433
 msgid "Insert Image"
 msgstr "插入影像"
 
-#: ../e-util/e-html-editor-actions.c:1433
-#: ../e-util/e-html-editor-actions.c:1470
+#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1475
 msgid "_Link..."
 msgstr "連結(_L)…"
 
-#: ../e-util/e-html-editor-actions.c:1435
+#: ../e-util/e-html-editor-actions.c:1440
 msgid "Insert Link"
 msgstr "插入連結"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1441
-#: ../e-util/e-html-editor-actions.c:1485
+#: ../e-util/e-html-editor-actions.c:1446
+#: ../e-util/e-html-editor-actions.c:1490
 msgid "_Rule..."
 msgstr "水平線(_R)…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1444
+#: ../e-util/e-html-editor-actions.c:1449
 msgid "Insert Rule"
 msgstr "插入水平線"
 
-#: ../e-util/e-html-editor-actions.c:1449
-#: ../e-util/e-html-editor-actions.c:1492
+#: ../e-util/e-html-editor-actions.c:1454
+#: ../e-util/e-html-editor-actions.c:1497
 msgid "_Table..."
 msgstr "表格(_T)…"
 
-#: ../e-util/e-html-editor-actions.c:1451
+#: ../e-util/e-html-editor-actions.c:1456
 msgid "Insert Table"
 msgstr "插入表格"
 
-#: ../e-util/e-html-editor-actions.c:1456
+#: ../e-util/e-html-editor-actions.c:1461
 msgid "_Cell..."
 msgstr "儲存格(_C)…"
 
-#: ../e-util/e-html-editor-actions.c:1477
+#: ../e-util/e-html-editor-actions.c:1482
 msgid "Pa_ge..."
 msgstr "頁面(_G)…"
 
-#: ../e-util/e-html-editor-actions.c:1501
+#: ../e-util/e-html-editor-actions.c:1506
 msgid "Font _Size"
 msgstr "字型大小(_S)"
 
-#: ../e-util/e-html-editor-actions.c:1508
+#: ../e-util/e-html-editor-actions.c:1513
 msgid "_Font Style"
 msgstr "字型樣式(_F)"
 
-#: ../e-util/e-html-editor-actions.c:1515
+#: ../e-util/e-html-editor-actions.c:1520
 msgid "Paste As _Text"
 msgstr "貼上為純文字(_T)"
 
-#: ../e-util/e-html-editor-actions.c:1526
+#: ../e-util/e-html-editor-actions.c:1531
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr "粗體(_B)"
 
-#: ../e-util/e-html-editor-actions.c:1528
+#: ../e-util/e-html-editor-actions.c:1533
 msgid "Bold"
 msgstr "粗體"
 
-#: ../e-util/e-html-editor-actions.c:1534
+#: ../e-util/e-html-editor-actions.c:1539
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr "斜體(_I)"
 
-#: ../e-util/e-html-editor-actions.c:1536
+#: ../e-util/e-html-editor-actions.c:1541
 msgid "Italic"
 msgstr "斜體"
 
-#: ../e-util/e-html-editor-actions.c:1542
+#: ../e-util/e-html-editor-actions.c:1547
 msgid "_Plain Text"
 msgstr "純文字(_P)"
 
-#: ../e-util/e-html-editor-actions.c:1550
+#: ../e-util/e-html-editor-actions.c:1555
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr "刪除線(_S)"
 
-#: ../e-util/e-html-editor-actions.c:1552
+#: ../e-util/e-html-editor-actions.c:1557
 msgid "Strikethrough"
 msgstr "刪除線"
 
-#: ../e-util/e-html-editor-actions.c:1558
+#: ../e-util/e-html-editor-actions.c:1563
 #: ../e-util/e-html-editor-text-dialog.c:236
 msgid "_Underline"
 msgstr "底線(_U)"
 
-#: ../e-util/e-html-editor-actions.c:1560
+#: ../e-util/e-html-editor-actions.c:1565
 msgid "Underline"
 msgstr "底線"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1570
+#: ../e-util/e-html-editor-actions.c:1575
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1578
+#: ../e-util/e-html-editor-actions.c:1583
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1586
+#: ../e-util/e-html-editor-actions.c:1591
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1594
+#: ../e-util/e-html-editor-actions.c:1599
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1602
+#: ../e-util/e-html-editor-actions.c:1607
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1610
+#: ../e-util/e-html-editor-actions.c:1615
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1618
+#: ../e-util/e-html-editor-actions.c:1623
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1637
+#: ../e-util/e-html-editor-actions.c:1642
 msgid "Cell Contents"
 msgstr "儲存格內容"
 
-#: ../e-util/e-html-editor-actions.c:1644
+#: ../e-util/e-html-editor-actions.c:1649
 msgid "Column"
 msgstr "欄"
 
-#: ../e-util/e-html-editor-actions.c:1651
+#: ../e-util/e-html-editor-actions.c:1656
 msgid "Row"
 msgstr "列"
 
-#: ../e-util/e-html-editor-actions.c:1658
-#: ../e-util/e-html-editor-actions.c:1743
+#: ../e-util/e-html-editor-actions.c:1663
+#: ../e-util/e-html-editor-actions.c:1748
 msgid "Table"
 msgstr "表格"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1668
+#: ../e-util/e-html-editor-actions.c:1673
 msgid "Table Delete"
 msgstr "刪除表格"
 
-#: ../e-util/e-html-editor-actions.c:1675 ../e-util/e-text.c:2127
+#: ../e-util/e-html-editor-actions.c:1680 ../e-util/e-text.c:2147
 msgid "Input Methods"
 msgstr "輸入法"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1683
+#: ../e-util/e-html-editor-actions.c:1688
 msgid "Table Insert"
 msgstr "插入表格"
 
-#: ../e-util/e-html-editor-actions.c:1690
+#: ../e-util/e-html-editor-actions.c:1695
 msgid "Properties"
 msgstr "屬性"
 
-#: ../e-util/e-html-editor-actions.c:1708
+#: ../e-util/e-html-editor-actions.c:1713
 msgid "Column After"
 msgstr "欄之後"
 
-#: ../e-util/e-html-editor-actions.c:1715
+#: ../e-util/e-html-editor-actions.c:1720
 msgid "Column Before"
 msgstr "欄之前"
 
-#: ../e-util/e-html-editor-actions.c:1722
+#: ../e-util/e-html-editor-actions.c:1727
 msgid "Insert _Link"
 msgstr "插入連結(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1729
+#: ../e-util/e-html-editor-actions.c:1734
 msgid "Row Above"
 msgstr "列之上"
 
-#: ../e-util/e-html-editor-actions.c:1736
+#: ../e-util/e-html-editor-actions.c:1741
 msgid "Row Below"
 msgstr "列之下"
 
-#: ../e-util/e-html-editor-actions.c:1750
+#: ../e-util/e-html-editor-actions.c:1755
 msgid "Cell..."
 msgstr "儲存格…"
 
-#: ../e-util/e-html-editor-actions.c:1757
+#: ../e-util/e-html-editor-actions.c:1762
 msgid "Image..."
 msgstr "影像…"
 
-#: ../e-util/e-html-editor-actions.c:1764
+#: ../e-util/e-html-editor-actions.c:1769
 msgid "Link..."
 msgstr "連結…"
 
-#: ../e-util/e-html-editor-actions.c:1771
+#: ../e-util/e-html-editor-actions.c:1776
 msgid "Page..."
 msgstr "頁面…"
 
-#: ../e-util/e-html-editor-actions.c:1778
+#: ../e-util/e-html-editor-actions.c:1783
 msgid "Paragraph..."
 msgstr "段落…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1786
+#: ../e-util/e-html-editor-actions.c:1791
 msgid "Rule..."
 msgstr "水平線…"
 
-#: ../e-util/e-html-editor-actions.c:1793
+#: ../e-util/e-html-editor-actions.c:1798
 msgid "Table..."
 msgstr "表格…"
 
-#: ../e-util/e-html-editor-actions.c:1800
+#: ../e-util/e-html-editor-actions.c:1805
 msgid "Text..."
 msgstr "文字…"
 
-#: ../e-util/e-html-editor-actions.c:1807
+#: ../e-util/e-html-editor-actions.c:1812
 msgid "Remove Link"
 msgstr "移除連結"
 
-#: ../e-util/e-html-editor-actions.c:1824
+#: ../e-util/e-html-editor-actions.c:1829
 msgid "Add Word to Dictionary"
 msgstr "加入字詞至字典"
 
-#: ../e-util/e-html-editor-actions.c:1831
+#: ../e-util/e-html-editor-actions.c:1836
 msgid "Ignore Misspelled Word"
 msgstr "忽略拼錯的字詞"
 
-#: ../e-util/e-html-editor-actions.c:1838
+#: ../e-util/e-html-editor-actions.c:1843
 msgid "Add Word To"
 msgstr "加入字詞至"
 
-#: ../e-util/e-html-editor-actions.c:1847
+#: ../e-util/e-html-editor-actions.c:1852
 msgid "More Suggestions"
 msgstr "更多建議"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1955
+#: ../e-util/e-html-editor-actions.c:1960
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s 字典"
 
-#: ../e-util/e-html-editor-actions.c:2042
+#: ../e-util/e-html-editor-actions.c:2047
 msgid "_Emoticon"
 msgstr "表情符號(_E)"
 
-#: ../e-util/e-html-editor-actions.c:2043
+#: ../e-util/e-html-editor-actions.c:2048
 msgid "Insert Emoticon"
 msgstr "插入表情符號"
 
-#: ../e-util/e-html-editor-actions.c:2111
+#: ../e-util/e-html-editor-actions.c:2116
 msgid "Re_place"
 msgstr "取代(_P)"
 
-#: ../e-util/e-html-editor-actions.c:2114
+#: ../e-util/e-html-editor-actions.c:2119
 msgid "_Image"
 msgstr "影像(_I)"
 
-#: ../e-util/e-html-editor-actions.c:2117
+#: ../e-util/e-html-editor-actions.c:2122
 msgid "_Link"
 msgstr "連結(_L)"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2121
+#: ../e-util/e-html-editor-actions.c:2126
 msgid "_Rule"
 msgstr "水平線(_R)"
 
-#: ../e-util/e-html-editor-actions.c:2124
-#: ../e-util/e-html-editor-cell-dialog.c:732
+#: ../e-util/e-html-editor-actions.c:2129
+#: ../e-util/e-html-editor-cell-dialog.c:738
 msgid "_Table"
 msgstr "表格(_T)"
 
-#: ../e-util/e-html-editor.c:672
+#: ../e-util/e-html-editor.c:681
 msgid "Paragraph Style"
 msgstr "段落樣式"
 
-#: ../e-util/e-html-editor.c:686
+#: ../e-util/e-html-editor.c:695
 msgid "Editing Mode"
 msgstr "編輯模式"
 
-#: ../e-util/e-html-editor.c:698
+#: ../e-util/e-html-editor.c:707
 msgid "Font Color"
 msgstr "字型顏色"
 
-#: ../e-util/e-html-editor.c:716
+#: ../e-util/e-html-editor.c:725
 msgid "Font Size"
 msgstr "字型大小"
 
-#: ../e-util/e-html-editor-cell-dialog.c:692
+#: ../e-util/e-html-editor-cell-dialog.c:698
 msgid "<b>Scope</b>"
 msgstr "<b>範圍</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:706
+#: ../e-util/e-html-editor-cell-dialog.c:712
 msgid "C_ell"
 msgstr "儲存格(_E)"
 
-#: ../e-util/e-html-editor-cell-dialog.c:719
+#: ../e-util/e-html-editor-cell-dialog.c:725
 msgid "_Row"
 msgstr "列(_R)"
 
-#: ../e-util/e-html-editor-cell-dialog.c:745
+#: ../e-util/e-html-editor-cell-dialog.c:751
 msgid "Col_umn"
 msgstr "欄(_U)"
 
-#: ../e-util/e-html-editor-cell-dialog.c:755
+#: ../e-util/e-html-editor-cell-dialog.c:761
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b>對齊 &amp; 行為</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:768
-#: ../e-util/e-html-editor-hrule-dialog.c:407
-#: ../e-util/e-html-editor-table-dialog.c:894
+#: ../e-util/e-html-editor-cell-dialog.c:774
+#: ../e-util/e-html-editor-hrule-dialog.c:413
+#: ../e-util/e-html-editor-table-dialog.c:900
 msgid "Left"
 msgstr "靠左"
 
-#: ../e-util/e-html-editor-cell-dialog.c:769
-#: ../e-util/e-html-editor-hrule-dialog.c:409
-#: ../e-util/e-html-editor-table-dialog.c:895
+#: ../e-util/e-html-editor-cell-dialog.c:775
+#: ../e-util/e-html-editor-hrule-dialog.c:415
+#: ../e-util/e-html-editor-table-dialog.c:901
 msgid "Center"
 msgstr "置中"
 
-#: ../e-util/e-html-editor-cell-dialog.c:770
-#: ../e-util/e-html-editor-hrule-dialog.c:411
-#: ../e-util/e-html-editor-table-dialog.c:896
+#: ../e-util/e-html-editor-cell-dialog.c:776
+#: ../e-util/e-html-editor-hrule-dialog.c:417
+#: ../e-util/e-html-editor-table-dialog.c:902
 msgid "Right"
 msgstr "靠右"
 
-#: ../e-util/e-html-editor-cell-dialog.c:778
+#: ../e-util/e-html-editor-cell-dialog.c:784
 msgid "_Horizontal:"
 msgstr "水平(_H):"
 
-#: ../e-util/e-html-editor-cell-dialog.c:786
+#: ../e-util/e-html-editor-cell-dialog.c:792
 #: ../e-util/e-html-editor-image-dialog.c:625
 msgid "Top"
 msgstr "上"
 
-#: ../e-util/e-html-editor-cell-dialog.c:787
+#: ../e-util/e-html-editor-cell-dialog.c:793
 #: ../e-util/e-html-editor-image-dialog.c:626
 msgid "Middle"
 msgstr "中央"
 
-#: ../e-util/e-html-editor-cell-dialog.c:788
+#: ../e-util/e-html-editor-cell-dialog.c:794
 #: ../e-util/e-html-editor-image-dialog.c:627
 msgid "Bottom"
 msgstr "下"
 
-#: ../e-util/e-html-editor-cell-dialog.c:796
+#: ../e-util/e-html-editor-cell-dialog.c:802
 msgid "_Vertical:"
 msgstr "垂直(_V):"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:802
+#: ../e-util/e-html-editor-cell-dialog.c:808
 msgid "_Wrap Text"
 msgstr "文字換列(_W)"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:810
+#: ../e-util/e-html-editor-cell-dialog.c:816
 msgid "_Header Style"
 msgstr "標題樣式(_H)"
 
-#: ../e-util/e-html-editor-cell-dialog.c:824
+#: ../e-util/e-html-editor-cell-dialog.c:830
 #: ../e-util/e-html-editor-image-dialog.c:565
-#: ../e-util/e-html-editor-table-dialog.c:806
+#: ../e-util/e-html-editor-table-dialog.c:812
 msgid "<b>Layout</b>"
 msgstr "<b>配置</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:835
+#: ../e-util/e-html-editor-cell-dialog.c:841
 msgid "_Width"
 msgstr "寬度(_W)"
 
-#: ../e-util/e-html-editor-cell-dialog.c:874
+#: ../e-util/e-html-editor-cell-dialog.c:880
 msgid "Row S_pan:"
 msgstr "合併列(_P):"
 
-#: ../e-util/e-html-editor-cell-dialog.c:888
+#: ../e-util/e-html-editor-cell-dialog.c:894
 msgid "Co_lumn Span:"
 msgstr "合併欄(_L):"
 
-#: ../e-util/e-html-editor-cell-dialog.c:895
-#: ../e-util/e-html-editor-table-dialog.c:910
+#: ../e-util/e-html-editor-cell-dialog.c:901
+#: ../e-util/e-html-editor-table-dialog.c:916
 msgid "<b>Background</b>"
 msgstr "<b>背景</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:908
-#: ../e-util/e-html-editor-table-dialog.c:923
+#: ../e-util/e-html-editor-cell-dialog.c:914
+#: ../e-util/e-html-editor-table-dialog.c:929
 msgid "Transparent"
 msgstr "透明"
 
-#: ../e-util/e-html-editor-cell-dialog.c:916
+#: ../e-util/e-html-editor-cell-dialog.c:922
 msgid "C_olor:"
 msgstr "顏色(_O):"
 
-#: ../e-util/e-html-editor-cell-dialog.c:924
+#: ../e-util/e-html-editor-cell-dialog.c:930
 #: ../e-util/e-html-editor-image-dialog.c:527
-#: ../e-util/e-html-editor-table-dialog.c:939
+#: ../e-util/e-html-editor-table-dialog.c:945
 msgid "Choose Background Image"
 msgstr "選擇背景影像"
 
-#: ../e-util/e-html-editor-cell-dialog.c:929
+#: ../e-util/e-html-editor-cell-dialog.c:935
 #: ../e-util/e-html-editor-image-dialog.c:533
-#: ../e-util/e-html-editor-table-dialog.c:944
+#: ../e-util/e-html-editor-table-dialog.c:950
 msgid "Images"
 msgstr "影像"
 
-#: ../e-util/e-html-editor-cell-dialog.c:942
+#: ../e-util/e-html-editor-cell-dialog.c:948
 msgid "_Image:"
 msgstr "影像(_I):"
 
-#: ../e-util/e-html-editor-cell-dialog.c:949
-#: ../e-util/e-html-editor-page-dialog.c:654
-#: ../e-util/e-html-editor-table-dialog.c:964
+#: ../e-util/e-html-editor-cell-dialog.c:955
+#: ../e-util/e-html-editor-page-dialog.c:660
+#: ../e-util/e-html-editor-table-dialog.c:970
 msgid "_Remove image"
 msgstr "移除影像(_R)"
 
-#: ../e-util/e-html-editor-cell-dialog.c:969
+#: ../e-util/e-html-editor-cell-dialog.c:975
 msgid "Cell Properties"
 msgstr "儲存格屬性"
 
@@ -12206,42 +12383,42 @@ msgstr "反向搜尋(_W)"
 msgid "Find"
 msgstr "尋找"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:342
+#: ../e-util/e-html-editor-hrule-dialog.c:348
 msgid "<b>Size</b>"
 msgstr "<b>大小</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:362
+#: ../e-util/e-html-editor-hrule-dialog.c:368
 #: ../e-util/e-html-editor-image-dialog.c:583
-#: ../e-util/e-html-editor-table-dialog.c:817
+#: ../e-util/e-html-editor-table-dialog.c:823
 msgid "_Width:"
 msgstr "寬度(_W):"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:387
+#: ../e-util/e-html-editor-hrule-dialog.c:393
 msgid "_Size:"
 msgstr "大小(_S):"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:394
+#: ../e-util/e-html-editor-hrule-dialog.c:400
 msgid "<b>Style</b>"
 msgstr "<b>樣式</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:419
-#: ../e-util/e-html-editor-table-dialog.c:903
+#: ../e-util/e-html-editor-hrule-dialog.c:425
+#: ../e-util/e-html-editor-table-dialog.c:909
 msgid "_Alignment:"
 msgstr "對齊(_A):"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:425
+#: ../e-util/e-html-editor-hrule-dialog.c:431
 msgid "S_haded"
 msgstr "陰影(_H)"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:442
+#: ../e-util/e-html-editor-hrule-dialog.c:448
 msgid "Rule properties"
 msgstr "水平線屬性"
 
 #: ../e-util/e-html-editor-image-dialog.c:515
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:760
+#: ../e-util/e-html-editor-table-dialog.c:766
 msgid "<b>General</b>"
 msgstr "<b>一般</b>"
 
@@ -12262,7 +12439,7 @@ msgid "_Y-Padding:"
 msgstr "_Y 填充:"
 
 #: ../e-util/e-html-editor-image-dialog.c:680
-#: ../e-util/e-html-editor-table-dialog.c:884
+#: ../e-util/e-html-editor-table-dialog.c:890
 msgid "_Border:"
 msgstr "邊框(_B):"
 
@@ -12271,12 +12448,12 @@ msgid "<b>Link</b>"
 msgstr "<b>連結</b>"
 
 #: ../e-util/e-html-editor-image-dialog.c:708
-#: ../e-util/e-html-editor-link-dialog.c:352
+#: ../e-util/e-html-editor-link-dialog.c:400
 msgid "_URL:"
 msgstr "_URL:"
 
 #: ../e-util/e-html-editor-image-dialog.c:713
-#: ../e-util/e-html-editor-link-dialog.c:357
+#: ../e-util/e-html-editor-link-dialog.c:405
 msgid "_Test URL..."
 msgstr "測試 URL (_T)…"
 
@@ -12284,11 +12461,11 @@ msgstr "測試 URL (_T)…"
 msgid "Image Properties"
 msgstr "影像屬性"
 
-#: ../e-util/e-html-editor-link-dialog.c:381
+#: ../e-util/e-html-editor-link-dialog.c:429
 msgid "_Remove Link"
 msgstr "移除連結(_R)"
 
-#: ../e-util/e-html-editor-link-dialog.c:406
+#: ../e-util/e-html-editor-link-dialog.c:454
 msgid "Link Properties"
 msgstr "連結屬性"
 
@@ -12321,47 +12498,44 @@ msgstr "草稿"
 msgid "Graph Paper"
 msgstr "報表紙"
 
-#: ../e-util/e-html-editor-page-dialog.c:538
+#: ../e-util/e-html-editor-page-dialog.c:544
 msgid "<b>Colors</b>"
 msgstr "<b>顏色</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:557
+#: ../e-util/e-html-editor-page-dialog.c:563
 msgid "_Text:"
 msgstr "文字(_T):"
 
-#: ../e-util/e-html-editor-page-dialog.c:572
+#: ../e-util/e-html-editor-page-dialog.c:578
 msgid "_Link:"
 msgstr "連結(_L):"
 
-#: ../e-util/e-html-editor-page-dialog.c:587
-#, fuzzy
-#| msgid "_Link:"
+#: ../e-util/e-html-editor-page-dialog.c:593
 msgid "_Visited Link:"
-msgstr "連結(_L):"
+msgstr "已瀏覽連結(_V):"
 
-#: ../e-util/e-html-editor-page-dialog.c:602
+#: ../e-util/e-html-editor-page-dialog.c:608
 msgid "_Background:"
 msgstr "背景(_B):"
 
-#: ../e-util/e-html-editor-page-dialog.c:610
+#: ../e-util/e-html-editor-page-dialog.c:616
 msgid "<b>Background Image</b>"
 msgstr "<b>背景影像</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:632
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../e-util/e-html-editor-page-dialog.c:638
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 msgid "_Template:"
 msgstr "範本(_T):"
 
-#: ../e-util/e-html-editor-page-dialog.c:640
-#: ../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 "選擇一個檔案"
 
-#: ../e-util/e-html-editor-page-dialog.c:647
+#: ../e-util/e-html-editor-page-dialog.c:653
 msgid "_Custom:"
 msgstr "自訂(_C):"
 
-#: ../e-util/e-html-editor-page-dialog.c:674
+#: ../e-util/e-html-editor-page-dialog.c:680
 msgid "Page Properties"
 msgstr "紙張屬性"
 
@@ -12379,9 +12553,9 @@ msgstr "段落屬性"
 
 #: ../e-util/e-html-editor-replace-dialog.c:163
 #, c-format
-msgid "%d occurence replaced"
-msgid_plural "%d occurences replaced"
-msgstr[0] "已進行 %d 次取代"
+msgid "%d occurrence replaced"
+msgid_plural "%d occurrences replaced"
+msgstr[0] "已取代 %d 次出現處"
 
 #: ../e-util/e-html-editor-replace-dialog.c:227
 msgid "R_eplace:"
@@ -12417,81 +12591,80 @@ msgctxt "dialog-title"
 msgid "Replace"
 msgstr "取代"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:87
+#: ../e-util/e-html-editor-spell-check-dialog.c:88
 #, c-format
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>「%s」的建議</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:505
+#: ../e-util/e-html-editor-spell-check-dialog.c:520
 msgid "<b>Suggestions</b>"
 msgstr "<b>建議</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:540
+#: ../e-util/e-html-editor-spell-check-dialog.c:555
 msgid "Replace"
 msgstr "取代"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:549
+#: ../e-util/e-html-editor-spell-check-dialog.c:564
 msgid "Replace All"
 msgstr "全部取代"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:558
-#: ../mail/mail.error.xml.h:109
+#: ../e-util/e-html-editor-spell-check-dialog.c:573
+#: ../mail/mail.error.xml.h:112
 msgid "Ignore"
 msgstr "忽略"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:567
+#: ../e-util/e-html-editor-spell-check-dialog.c:582
 msgid "Skip"
 msgstr "略過"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:576
+#: ../e-util/e-html-editor-spell-check-dialog.c:591
 msgid "Back"
 msgstr "向後"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:585
+#: ../e-util/e-html-editor-spell-check-dialog.c:600
 msgid "<b>Dictionary</b>"
 msgstr "<b>字典</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:605
+#: ../e-util/e-html-editor-spell-check-dialog.c:620
 msgid "Add word"
 msgstr "加入字詞"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:622
-#: ../mail/mail-config.ui.h:38
+#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:38
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../e-util/e-html-editor-table-dialog.c:782
+#: ../e-util/e-html-editor-table-dialog.c:788
 msgid "_Rows:"
 msgstr "列(_R):"
 
-#: ../e-util/e-html-editor-table-dialog.c:799
+#: ../e-util/e-html-editor-table-dialog.c:805
 msgid "C_olumns:"
 msgstr "欄(_O):"
 
-#: ../e-util/e-html-editor-table-dialog.c:850
+#: ../e-util/e-html-editor-table-dialog.c:856
 msgid "_Spacing:"
 msgstr "間隔(_S):"
 
-#: ../e-util/e-html-editor-table-dialog.c:867
+#: ../e-util/e-html-editor-table-dialog.c:873
 msgid "_Padding:"
 msgstr "留空(_P):"
 
-#: ../e-util/e-html-editor-table-dialog.c:931
+#: ../e-util/e-html-editor-table-dialog.c:937
 #: ../e-util/e-html-editor-text-dialog.c:261
 msgid "_Color:"
 msgstr "顏色(_C):"
 
-#: ../e-util/e-html-editor-table-dialog.c:957
+#: ../e-util/e-html-editor-table-dialog.c:963
 msgid "Image:"
 msgstr "影像:"
 
-#: ../e-util/e-html-editor-table-dialog.c:984
+#: ../e-util/e-html-editor-table-dialog.c:990
 msgid "Table Properties"
 msgstr "表格屬性"
 
@@ -12503,11 +12676,11 @@ msgstr "大小(_Z):"
 msgid "Text Properties"
 msgstr "文字屬性"
 
-#: ../e-util/e-html-editor-view.c:5030
+#: ../e-util/e-html-editor-view.c:5344
 msgid "Changed property"
 msgstr "已變更屬性"
 
-#: ../e-util/e-html-editor-view.c:5031
+#: ../e-util/e-html-editor-view.c:5345
 msgid "Whether editor changed"
 msgstr "編輯器是否已改變"
 
@@ -12675,35 +12848,35 @@ msgstr ""
 "用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的下拉式組合方"
 "塊來選擇時區。"
 
-#: ../e-util/e-misc-utils.c:249
+#: ../e-util/e-misc-utils.c:251
 msgid "Could not open the link."
 msgstr "無法開啟該連結。"
 
-#: ../e-util/e-misc-utils.c:331
+#: ../e-util/e-misc-utils.c:334
 msgid "Could not display help for Evolution."
 msgstr "無法顯示 Evolution 的求助文件。"
 
-#: ../e-util/e-misc-utils.c:2384
+#: ../e-util/e-misc-utils.c:2387
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "開啟行事曆「%s」"
 
-#: ../e-util/e-misc-utils.c:2387
+#: ../e-util/e-misc-utils.c:2390
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "開啟備忘錄清單「%s」"
 
-#: ../e-util/e-misc-utils.c:2390
+#: ../e-util/e-misc-utils.c:2393
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "開啟工作清單「%s」"
 
-#: ../e-util/e-misc-utils.c:2393
+#: ../e-util/e-misc-utils.c:2396
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "正在開啟通訊錄「%s」"
 
-#: ../e-util/e-misc-utils.c:3127
+#: ../e-util/e-misc-utils.c:3138
 #: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "不要再顯示這個訊息(_D)"
@@ -12741,8 +12914,7 @@ msgstr "連絡人(_N)"
 msgid "Search"
 msgstr "搜尋"
 
-#: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:427
+#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "通訊錄"
 
@@ -12757,30 +12929,30 @@ msgid "Select Contacts from Address Book"
 msgstr "從通訊錄選取連絡人"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3183
+#: ../e-util/e-name-selector-entry.c:3186
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "在行內展開 %s (_X)"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3199
+#: ../e-util/e-name-selector-entry.c:3202
 #, c-format
 msgid "Cop_y %s"
 msgstr "複製(_Y) %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3210
+#: ../e-util/e-name-selector-entry.c:3213
 #, c-format
 msgid "C_ut %s"
 msgstr "剪下(_U) %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3228
+#: ../e-util/e-name-selector-entry.c:3231
 #, c-format
 msgid "_Edit %s"
 msgstr "編輯 %s(_E)"
 
-#: ../e-util/e-name-selector-list.c:583
+#: ../e-util/e-name-selector-list.c:584
 #, c-format
 msgid "_Delete %s"
 msgstr "刪除(_D) %s"
@@ -12876,7 +13048,11 @@ msgstr "自動"
 
 #: ../e-util/e-proxy-editor.c:534
 msgid "Configuration _URL:"
-msgstr "組態網址(_U):"
+msgstr "設定網址(_U):"
+
+#: ../e-util/e-proxy-editor.c:560
+msgid "No proxy"
+msgstr "沒有代理伺服器"
 
 #: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
@@ -12908,11 +13084,11 @@ msgstr "自訂代理伺服器"
 
 #: ../e-util/e-proxy-selector.c:487
 msgid "Create a new proxy profile"
-msgstr "建立新的代理伺服器設定組合"
+msgstr "建立新的代理伺服器設定檔"
 
 #: ../e-util/e-proxy-selector.c:492
 msgid "Delete the selected proxy profile"
-msgstr "刪除選取的代理伺服器設定組合"
+msgstr "刪除選取的代理伺服器設定檔"
 
 #: ../e-util/e-rule-editor.c:184
 msgid "Add Rule"
@@ -12927,51 +13103,50 @@ msgstr "編輯規則"
 msgid "Matches: %u"
 msgstr "符合項:%u"
 
-#: ../e-util/e-search-bar.c:568
+#: ../e-util/e-search-bar.c:569
 msgid "Close the find bar"
 msgstr "關閉搜尋工具列"
 
-#: ../e-util/e-search-bar.c:576
+#: ../e-util/e-search-bar.c:577
 msgid "Fin_d:"
 msgstr "尋找(_D):"
 
-#: ../e-util/e-search-bar.c:588
+#: ../e-util/e-search-bar.c:589
 msgid "Clear the search"
 msgstr "清除此搜尋"
 
-#: ../e-util/e-search-bar.c:612
+#: ../e-util/e-search-bar.c:613
 msgid "_Previous"
 msgstr "上一個(_P)"
 
-#: ../e-util/e-search-bar.c:615
+#: ../e-util/e-search-bar.c:616
 msgid "Find the previous occurrence of the phrase"
 msgstr "尋找上一個出現的字詞"
 
-#: ../e-util/e-search-bar.c:624
+#: ../e-util/e-search-bar.c:625
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: ../e-util/e-search-bar.c:627
+#: ../e-util/e-search-bar.c:628
 msgid "Find the next occurrence of the phrase"
 msgstr "尋找下一個出現的字詞"
 
-#: ../e-util/e-search-bar.c:636
+#: ../e-util/e-search-bar.c:637
 msgid "Mat_ch case"
 msgstr "區分大小寫(_C)"
 
-#: ../e-util/e-search-bar.c:664
+#: ../e-util/e-search-bar.c:665
 msgid "Reached bottom of page, continued from top"
 msgstr "到達頁面底部,從頂端繼續"
 
-#: ../e-util/e-search-bar.c:686
+#: ../e-util/e-search-bar.c:687
 msgid "Reached top of page, continued from bottom"
 msgstr "到達頁面頂端,從底部繼續"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
-#: ../mail/importers/kmail-importer.c:253
-#: ../mail/importers/pine-importer.c:420
+#: ../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
-#: ../smime/gui/certificate-manager.c:1669
+#: ../smime/gui/certificate-manager.c:1671
 msgid "Mail"
 msgstr "郵件"
 
@@ -13140,11 +13315,11 @@ msgstr "取消設定 SSL 憑證的信任(_T)"
 msgid "User"
 msgstr "使用者"
 
-#: ../e-util/e-source-selector-dialog.c:229
+#: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "目的地(_D)"
 
-#: ../e-util/e-source-selector-dialog.c:342
+#: ../e-util/e-source-selector-dialog.c:364
 msgid "Select destination"
 msgstr "選擇目的地"
 
@@ -13164,26 +13339,26 @@ msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:408
+#: ../e-util/e-spell-entry.c:410
 msgid "(no suggestions)"
 msgstr "(沒有建議)"
 
-#: ../e-util/e-spell-entry.c:432
+#: ../e-util/e-spell-entry.c:434
 msgid "More..."
 msgstr "更多…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:517
+#: ../e-util/e-spell-entry.c:519
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "加入「%s」至字典"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:566
+#: ../e-util/e-spell-entry.c:568
 msgid "Ignore All"
 msgstr "全部忽略"
 
-#: ../e-util/e-spell-entry.c:598
+#: ../e-util/e-spell-entry.c:600
 msgid "Spelling Suggestions"
 msgstr "拼字建議"
 
@@ -13212,7 +13387,7 @@ msgstr "不能開啟檔案「{0}」。"
 msgid "Failed to remove data source &quot;{0}&quot;."
 msgstr "無法移除資料來源 &quot;{0}&quot;。"
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:64
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "回報的錯誤為 &quot;{1}&quot;。"
 
@@ -13276,7 +13451,7 @@ msgstr "備忘錄清單後端服務 &quot;{0}&quot; 遇到錯誤。"
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "工作清單後端服務 &quot;{0}&quot; 遇到錯誤。"
 
-#: ../e-util/e-table-click-to-add.c:684
+#: ../e-util/e-table-click-to-add.c:689
 #: ../e-util/gal-a11y-e-table-click-to-add.c:61
 #: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
@@ -13471,7 +13646,7 @@ msgstr "排序方式(_S)"
 msgid "_Custom"
 msgstr "自訂(_C)"
 
-#: ../e-util/e-text.c:2114
+#: ../e-util/e-text.c:2134
 msgid "Select All"
 msgstr "全部選取"
 
@@ -13554,36 +13729,32 @@ msgid "_Copy Email Address"
 msgstr "複製電子郵件位址(_C)"
 
 #: ../e-util/e-web-view.c:343
-#, fuzzy
-#| msgid "Copy _Email Address"
 msgid "Copy _Raw Email Address"
-msgstr "複製電子郵件位址(_E)"
+msgstr "複製原始電子郵件位址(_R)"
 
 #: ../e-util/e-web-view.c:345
-#, fuzzy
-#| msgid "Copy the email address to the clipboard"
 msgid "Copy the raw email address to the clipboard"
-msgstr "複製電子郵件位址到剪貼簿"
+msgstr "複製原始電子郵件位址到剪貼簿"
 
 #: ../e-util/e-web-view.c:360
 msgid "_Copy Image"
-msgstr "複製圖片(_C)"
+msgstr "複製影像(_C)"
 
 #: ../e-util/e-web-view.c:362
 msgid "Copy the image to the clipboard"
-msgstr "複製圖片到剪貼薄"
+msgstr "複製影像到剪貼薄"
 
 #: ../e-util/e-web-view.c:367
 msgid "Save _Image..."
-msgstr "儲存圖片(_I)…"
+msgstr "儲存影像(_I)…"
 
 #: ../e-util/e-web-view.c:369
 msgid "Save the image to a file"
-msgstr "將圖片儲存為檔案"
+msgstr "將影像儲存為檔案"
 
 #: ../e-util/e-web-view.c:389 ../e-util/e-web-view.c:1427
 msgid "Select all text and images"
-msgstr "選擇所有文字和圖片"
+msgstr "選擇所有文字和影像"
 
 #: ../e-util/e-web-view.c:1069
 #, c-format
@@ -13608,15 +13779,15 @@ msgstr "移至郵件的開頭處"
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
 
-#: ../e-util/e-web-view.c:3034
+#: ../e-util/e-web-view.c:3039
 msgid "Copying image to clipboard"
 msgstr "複製影像到剪貼薄"
 
-#: ../e-util/e-web-view.c:3222
+#: ../e-util/e-web-view.c:3227
 msgid "Save Image"
-msgstr "儲存圖片"
+msgstr "儲存影像"
 
-#: ../e-util/e-web-view.c:3258
+#: ../e-util/e-web-view.c:3263
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "儲存影像到「%s」"
@@ -13665,7 +13836,7 @@ msgstr "錯誤的正規表示式「{0}」。"
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "無法編譯正規表示式「{1}」。"
 
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
 msgid "Missing name."
 msgstr "缺少名稱。"
 
@@ -13709,7 +13880,7 @@ msgstr "您指定的時刻"
 msgid "a time relative to the current time"
 msgstr "相對於目前時刻的時差"
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:87
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:89
 msgid "seconds"
 msgstr "秒"
 
@@ -13717,8 +13888,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 "個月"
 
@@ -13770,7 +13940,7 @@ msgstr ""
 "郵件日期將會與相對於過濾器執行\n"
 "的時間作比較。"
 
-#: ../e-util/gal-a11y-e-cell.c:122
+#: ../e-util/gal-a11y-e-cell.c:130
 msgid "Table Cell"
 msgstr "表格的儲存格"
 
@@ -13780,7 +13950,7 @@ msgid "popup a child"
 msgstr "彈出子選單"
 
 #. Translators: description of an "edit" action
-#: ../e-util/gal-a11y-e-cell-text.c:617
+#: ../e-util/gal-a11y-e-cell-text.c:631
 msgid "begin editing this cell"
 msgstr "開始編輯這個儲存格"
 
@@ -13881,86 +14051,86 @@ msgstr "OAuth2"
 msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr "這個選項會使用 OAuth 2.0 存取記號來連接伺服器"
 
-#: ../libemail-engine/e-mail-folder-utils.c:113
+#: ../libemail-engine/e-mail-folder-utils.c:115
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "儲存郵件到資料夾「%s」"
 
-#: ../libemail-engine/e-mail-folder-utils.c:571
+#: ../libemail-engine/e-mail-folder-utils.c:574
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:681
-#: ../libemail-engine/e-mail-folder-utils.c:932
+#: ../libemail-engine/e-mail-folder-utils.c:684
+#: ../libemail-engine/e-mail-folder-utils.c:935
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "取回 %d 封郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:775
+#: ../libemail-engine/e-mail-folder-utils.c:778
 msgid "Scanning messages for duplicates"
 msgstr "掃描郵件是否有重複"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1145
+#: ../libemail-engine/e-mail-folder-utils.c:1148
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移除資料夾「%s」"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1325
+#: ../libemail-engine/e-mail-folder-utils.c:1328
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "檔案「%s」已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1329
+#: ../libemail-engine/e-mail-folder-utils.c:1332
 msgid "File has been removed."
 msgstr "檔案已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1388
+#: ../libemail-engine/e-mail-folder-utils.c:1391
 msgid "Removing attachments"
 msgstr "正在移除附件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1552
+#: ../libemail-engine/e-mail-folder-utils.c:1555
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "儲存 %d 封郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1930
+#: ../libemail-engine/e-mail-folder-utils.c:1933
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "無效的資料夾 URI「%s」"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1174 ../mail/importers/kmail-libs.c:141
+#: ../libemail-engine/e-mail-session.c:124 ../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:1081
 #: ../modules/mail/e-mail-shell-view-private.c:1092
 msgid "Inbox"
 msgstr "收件匣"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1222
 #: ../mail/importers/kmail-libs.c:147
 #: ../modules/mail/e-mail-shell-view-private.c:1079
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1233
 #: ../mail/importers/kmail-libs.c:143
 #: ../modules/mail/e-mail-shell-view-private.c:1083
 msgid "Outbox"
 msgstr "寄件匣"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1237
 #: ../mail/importers/kmail-libs.c:145
 #: ../modules/mail/e-mail-shell-view-private.c:1085
 msgid "Sent"
 msgstr "已傳送"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1225
 #: ../mail/importers/kmail-libs.c:149
 #: ../modules/mail/e-mail-shell-view-private.c:1087
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
@@ -14206,8 +14376,8 @@ msgid "De_fault"
 msgstr "預設值(_F)"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1270
-#: ../modules/plugin-manager/evolution-plugin-manager.c:358
+#: ../modules/mail/em-composer-prefs.c:1276
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
 msgstr "已啟用"
@@ -14299,12 +14469,12 @@ msgstr "將回信儲存在要回覆郵件的資料夾(_A)"
 
 #: ../mail/e-mail-config-defaults-page.c:628
 msgid "Archi_ve Folder:"
-msgstr "壓縮檔資料夾(_V):"
+msgstr "封存資料夾(_V):"
 
 #: ../mail/e-mail-config-defaults-page.c:638
 #: ../modules/mail/em-mailer-prefs.c:1397
 msgid "Choose a folder to archive messages to."
-msgstr "選擇壓縮郵件的資料夾。"
+msgstr "選擇封存郵件的資料夾。"
 
 #: ../mail/e-mail-config-defaults-page.c:652
 msgid "_Restore Defaults"
@@ -14378,15 +14548,11 @@ msgstr "帳號資訊"
 
 #: ../mail/e-mail-config-identity-page.c:346
 #: ../mail/e-mail-config-summary-page.c:352
-#, fuzzy
-#| msgid ""
-#| "Type the name by which you would like to refer to this account.\n"
-#| "For example, \"Work\" or \"Personal\"."
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, \"Work\" or \"Personal\"."
 msgstr ""
-"輸入想用來代表這個帳號的名稱。\n"
+"上列是用來代表這個帳號的名稱。\n"
 "例如:「工作」或「個人」。"
 
 #: ../mail/e-mail-config-identity-page.c:363
@@ -14450,11 +14616,11 @@ msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: ../mail/e-mail-config-security-page.c:340
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:114
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:113
+#: ../modules/calendar/e-calendar-preferences.c:625
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
-#: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "一般"
@@ -14476,22 +14642,22 @@ msgid "Si_gning algorithm:"
 msgstr "簽章演算法(_G):"
 
 #: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:71
+#: ../mail/e-mail-config-security-page.c:581 ../mail/mail-config.ui.h:73
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:584 ../mail/mail-config.ui.h:74
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:73
+#: ../mail/e-mail-config-security-page.c:587 ../mail/mail-config.ui.h:75
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:74
+#: ../mail/e-mail-config-security-page.c:590 ../mail/mail-config.ui.h:76
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -14500,49 +14666,53 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽名(_W)"
 
 #: ../mail/e-mail-config-security-page.c:466
+msgid "Always enc_rypt outgoing messages when using this account"
+msgstr "使用此帳號時一定在外送的郵件加密(_R)"
+
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "當傳送加密郵件時永遠自我加密(_M)"
 
-#: ../mail/e-mail-config-security-page.c:478
+#: ../mail/e-mail-config-security-page.c:490
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密時永遠信任我的鑰匙圈裡的金鑰(_T)"
 
-#: ../mail/e-mail-config-security-page.c:502
+#: ../mail/e-mail-config-security-page.c:514
 msgid "Secure MIME (S/MIME)"
 msgstr "安全式 MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:511
+#: ../mail/e-mail-config-security-page.c:523
 msgid "Sig_ning certificate:"
 msgstr "簽名憑證(_N):"
 
-#: ../mail/e-mail-config-security-page.c:535
-#: ../mail/e-mail-config-security-page.c:641
+#: ../mail/e-mail-config-security-page.c:547
+#: ../mail/e-mail-config-security-page.c:653
 msgid "Select"
 msgstr "選擇"
 
-#: ../mail/e-mail-config-security-page.c:544
-#: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
+#: ../mail/e-mail-config-security-page.c:556
+#: ../mail/e-mail-config-security-page.c:662 ../mail/mail-dialogs.ui.h:5
 #: ../shell/e-shell-window-actions.c:1006
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../mail/e-mail-config-security-page.c:553
+#: ../mail/e-mail-config-security-page.c:565
 msgid "Signing _algorithm:"
 msgstr "簽章演算法(_A):"
 
-#: ../mail/e-mail-config-security-page.c:594
+#: ../mail/e-mail-config-security-page.c:606
 msgid "Always sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽名"
 
-#: ../mail/e-mail-config-security-page.c:617
+#: ../mail/e-mail-config-security-page.c:629
 msgid "Encryption certificate:"
 msgstr "加密憑證:"
 
-#: ../mail/e-mail-config-security-page.c:659
+#: ../mail/e-mail-config-security-page.c:671
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件加密"
 
-#: ../mail/e-mail-config-security-page.c:679
+#: ../mail/e-mail-config-security-page.c:691
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "當傳送加密郵件時永遠自我加密"
 
@@ -14615,7 +14785,7 @@ msgid ""
 "\n"
 "Click \"Next\" to begin."
 msgstr ""
-"歡迎使用 Evolution 郵件組態助理。\n"
+"歡迎使用 Evolution 郵件設定助理。\n"
 "\n"
 "按一下「下一步」開始。 "
 
@@ -14791,7 +14961,7 @@ msgstr "標頭名稱:"
 msgid "Header Value"
 msgstr "標頭數值"
 
-#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:119
+#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:121
 msgid "Headers"
 msgstr "檔頭"
 
@@ -14809,6 +14979,7 @@ msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
 #: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:147
 msgid "_Move"
 msgstr "移動(_M)"
 
@@ -14816,660 +14987,662 @@ msgstr "移動(_M)"
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../mail/e-mail-reader.c:1273 ../mail/e-mail-reader.c:1485
-#: ../mail/e-mail-reader.c:1525
+#: ../mail/e-mail-reader.c:1200 ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1452
 msgid "_Do not ask me again."
 msgstr "不要再詢問我(_D)。"
 
-#: ../mail/e-mail-reader.c:1531
+#: ../mail/e-mail-reader.c:1458
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "永遠忽略通信論壇的回覆欄位(_A)"
 
-#: ../mail/e-mail-reader.c:1733
+#: ../mail/e-mail-reader.c:1661
 msgid "Failed to retrieve message:"
 msgstr "取回郵件失敗:"
 
-#: ../mail/e-mail-reader.c:1778 ../mail/e-mail-reader.c:3110
+#: ../mail/e-mail-reader.c:1706 ../mail/e-mail-reader.c:3041
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "正在取回郵件「%s」"
 
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:1894
 msgid "A_dd Sender to Address Book"
 msgstr "加入寄件者到目錄服務(_D)"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1896
 msgid "Add sender to address book"
 msgstr "新增寄件者至通訊錄"
 
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:1901
 msgid "_Archive..."
-msgstr "壓縮檔(_A)…"
+msgstr "封存(_A)…"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1903
 msgid "Move selected messages to the Archive folder for the account"
-msgstr "將選取的郵件移至這個帳號的壓縮資料夾"
+msgstr "將選取的郵件移至這個帳號的封存資料夾"
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:1908
 msgid "Check for _Junk"
 msgstr "檢查垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1910
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾郵件狀態"
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:1915
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)…"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1917
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:1922
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
-#: ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:1929
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "從通信論壇建立過濾器規則(_L)…"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:1931
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個通信論壇建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2008
+#: ../mail/e-mail-reader.c:1936
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "從收件者建立過濾器規則(_R)…"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1938
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:1943
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "從寄件者建立過濾器規則(_N)…"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:1945
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2022
+#: ../mail/e-mail-reader.c:1950
 msgid "Create a Filter Rule for _Subject..."
 msgstr "從主旨建立過濾器規則(_S)…"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1952
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:1957
 msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1959
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的郵件"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:1964
 msgid "_Find in Message..."
 msgstr "在郵件內尋找(_F)…"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1966
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:1971
 msgid "_Clear Flag"
 msgstr "清除標幟(_C)"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1973
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "移除選取郵件的跟隨旗標"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:1978
 msgid "_Flag Completed"
 msgstr "標記為已完成(_F)"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1980
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "將已選取郵件的跟隨旗標設為已完成"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:1985
 msgid "Follow _Up..."
 msgstr "跟隨(_U)…"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1987
 msgid "Flag the selected messages for follow-up"
 msgstr "將選定的郵件加上跟隨旗標"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:1992
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../mail/e-mail-reader.c:2066 ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:1994 ../mail/e-mail-reader.c:2001
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附件形式轉寄給某人"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:1999
 msgid "Forward As _Attached"
 msgstr "以附件轉寄(_A)"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2006
 msgid "_Inline"
 msgstr "行內(_I)"
 
-#: ../mail/e-mail-reader.c:2080 ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2008 ../mail/e-mail-reader.c:2015
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2013
 msgid "Forward As _Inline"
 msgstr "以行內轉寄(_I)"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2020
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
-#: ../mail/e-mail-reader.c:2094 ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2022 ../mail/e-mail-reader.c:2029
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2027
 msgid "Forward As _Quoted"
 msgstr "以引文轉寄(_Q)"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2034
 msgid "_Load Images"
-msgstr "載入圖片(_L)"
+msgstr "載入影像(_L)"
 
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:2036
 msgid "Force images in HTML mail to be loaded"
-msgstr "閱讀 HTML 格式的郵件時強迫載入圖片"
+msgstr "閱讀 HTML 格式的郵件時強迫載入影像"
 
-#: ../mail/e-mail-reader.c:2113 ../mail/e-mail-reader.c:2491
+#: ../mail/e-mail-reader.c:2041 ../mail/e-mail-reader.c:2419
 msgid "_Ignore Subthread"
 msgstr "忽略子群組(_I)"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2043
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "自動將子群組中的新郵件標記為已閱讀"
 
-#: ../mail/e-mail-reader.c:2120 ../mail/e-mail-reader.c:2495
+#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2423
 msgid "_Ignore Thread"
 msgstr "忽略群組(_I)"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2050
 msgid "Mark new mails in this thread as read automatically"
 msgstr "自動將這個群組中的新郵件標記為已閱讀"
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2055
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2057
 msgid "Mark the selected messages as important"
 msgstr "將選定的郵件標示成重要"
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2062
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2064
 msgid "Mark the selected messages as junk"
 msgstr "將選定的郵件標示成垃圾郵件"
 
-#: ../mail/e-mail-reader.c:2141
+#: ../mail/e-mail-reader.c:2069
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2071
 msgid "Mark the selected messages as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2076
 msgid "_Read"
 msgstr "已閱讀(_R)"
 
-#: ../mail/e-mail-reader.c:2150
+#: ../mail/e-mail-reader.c:2078
 msgid "Mark the selected messages as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
-#: ../mail/e-mail-reader.c:2155 ../mail/e-mail-reader.c:2515
+#: ../mail/e-mail-reader.c:2083 ../mail/e-mail-reader.c:2443
 msgid "Do not _Ignore Subthread"
 msgstr "不要忽略子群組(_I)"
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2085
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "不要自動將子群組中的新郵件標記為已閱讀"
 
-#: ../mail/e-mail-reader.c:2162 ../mail/e-mail-reader.c:2519
+#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2447
 msgid "Do not _Ignore Thread"
 msgstr "不要忽略群組(_I)"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2092
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "不要自動將這個群組中的新郵件標記為已閱讀"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2097
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2099
 msgid "Mark the selected messages as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2104
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2106
 msgid "Mark the selected messages as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2111
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)…"
 
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2113
 msgid "Open the selected messages in the composer for editing"
 msgstr "在撰寫視窗開啟選取的郵件以便編輯"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2118
 msgid "Compose _New Message"
 msgstr "撰寫新郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2120
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2125
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2127
 msgid "Open the selected messages in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
-#: ../mail/e-mail-reader.c:2204
+#: ../mail/e-mail-reader.c:2132
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)…"
 
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2134
 msgid "Move selected messages to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2139
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2141
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2146
 msgid "Next _Important Message"
 msgstr "下一封重要郵件(_I)"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2148
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2153
 msgid "Next _Thread"
 msgstr "下一封相關郵件(_T)"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2155
 msgid "Display the next thread"
 msgstr "顯示下一封相關郵件"
 
-#: ../mail/e-mail-reader.c:2232
+#: ../mail/e-mail-reader.c:2160
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2162
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
-#: ../mail/e-mail-reader.c:2239
+#: ../mail/e-mail-reader.c:2167
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2169
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2174
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2176
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2181
 msgid "Previous T_hread"
 msgstr "上一封相關郵件(_H)"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2183
 msgid "Display the previous thread"
 msgstr "顯示上一封相關郵件"
 
-#: ../mail/e-mail-reader.c:2260
+#: ../mail/e-mail-reader.c:2188
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
-#: ../mail/e-mail-reader.c:2262
+#: ../mail/e-mail-reader.c:2190
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2197
 msgid "Print this message"
 msgstr "列印郵件"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2204
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2209
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2211
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ../mail/e-mail-reader.c:2288
+#: ../mail/e-mail-reader.c:2216
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2218
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../mail/e-mail-reader.c:2295
+#: ../mail/e-mail-reader.c:2223
 msgid "Remove Du_plicate Messages"
 msgstr "移除重複的郵件(_P)"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2225
 msgid "Checks selected messages for duplicates"
 msgstr "檢查選取的郵件是否有重複"
 
-#: ../mail/e-mail-reader.c:2302 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2230 ../mail/mail.error.xml.h:30
 #: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../mail/e-mail-reader.c:2304
+#: ../mail/e-mail-reader.c:2232
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "撰寫回郵給已選取郵件的全部收件者"
 
-#: ../mail/e-mail-reader.c:2309 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2237 ../mail/mail.error.xml.h:28
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2239
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "撰寫回郵給所選定郵件的通信論壇"
 
-#: ../mail/e-mail-reader.c:2316
-#: ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/e-mail-reader.c:2318
+#: ../mail/e-mail-reader.c:2246
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
-#: ../mail/e-mail-reader.c:2323
+#: ../mail/e-mail-reader.c:2251
 msgid "_Save as mbox..."
 msgstr "儲存成 mbox(_S)…"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2253
 msgid "Save selected messages as an mbox file"
 msgstr "將選定的郵件另存成 mbox 檔案"
 
-#: ../mail/e-mail-reader.c:2330
+#: ../mail/e-mail-reader.c:2258
 msgid "_Message Source"
-msgstr "郵件源始碼(_M)"
+msgstr "郵件原始碼(_M)"
 
-#: ../mail/e-mail-reader.c:2332
+#: ../mail/e-mail-reader.c:2260
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-#: ../mail/e-mail-reader.c:2344
+#: ../mail/e-mail-reader.c:2272
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2274
 msgid "Undelete the selected messages"
 msgstr "取消刪除選定的郵件"
 
-#: ../mail/e-mail-reader.c:2351
+#: ../mail/e-mail-reader.c:2279
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2281
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
-#: ../mail/e-mail-reader.c:2358
+#: ../mail/e-mail-reader.c:2286
 msgid "_Zoom In"
 msgstr "拉近(_Z)"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2288
 msgid "Increase the text size"
 msgstr "將文字放大"
 
-#: ../mail/e-mail-reader.c:2367
+#: ../mail/e-mail-reader.c:2295
 msgid "Decrease the text size"
 msgstr "將文字縮小"
 
-#: ../mail/e-mail-reader.c:2374
+#: ../mail/e-mail-reader.c:2302
 msgid "Cre_ate"
 msgstr "建立(_A)"
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2309
 msgid "Ch_aracter Encoding"
 msgstr "字元編碼(_A)"
 
-#: ../mail/e-mail-reader.c:2388
+#: ../mail/e-mail-reader.c:2316
 msgid "F_orward As"
 msgstr "轉寄為(_O)"
 
-#: ../mail/e-mail-reader.c:2395
+#: ../mail/e-mail-reader.c:2323
 msgid "_Group Reply"
 msgstr "群組回覆(_G)"
 
-#: ../mail/e-mail-reader.c:2402
+#: ../mail/e-mail-reader.c:2330
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../mail/e-mail-reader.c:2409
+#: ../mail/e-mail-reader.c:2337
 msgid "Mar_k As"
 msgstr "標示成(_K)"
 
-#: ../mail/e-mail-reader.c:2416
+#: ../mail/e-mail-reader.c:2344
 msgid "_Message"
 msgstr "郵件(_M)"
 
-#: ../mail/e-mail-reader.c:2423
+#: ../mail/e-mail-reader.c:2351
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../mail/e-mail-reader.c:2433
+#: ../mail/e-mail-reader.c:2361
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "從通信論壇建立搜尋資料夾(_L)…"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2363
 msgid "Create a search folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2440
+#: ../mail/e-mail-reader.c:2368
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "從收件者建立搜尋資料夾(_T)…"
 
-#: ../mail/e-mail-reader.c:2442
+#: ../mail/e-mail-reader.c:2370
 msgid "Create a search folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2447
+#: ../mail/e-mail-reader.c:2375
 msgid "Create a Search Folder from Sen_der..."
 msgstr "從寄件者建立搜尋資料夾(_D)…"
 
-#: ../mail/e-mail-reader.c:2449
+#: ../mail/e-mail-reader.c:2377
 msgid "Create a search folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2454
+#: ../mail/e-mail-reader.c:2382
 msgid "Create a Search Folder from S_ubject..."
 msgstr "從主旨建立搜尋資料夾(_U)…"
 
-#: ../mail/e-mail-reader.c:2456
+#: ../mail/e-mail-reader.c:2384
 msgid "Create a search folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2483
+#: ../mail/e-mail-reader.c:2411
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)…"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../mail/e-mail-reader.c:2427
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
-#: ../mail/e-mail-reader.c:2503
+#: ../mail/e-mail-reader.c:2431
 msgid "Mark as _Junk"
 msgstr "標示成垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:2507
+#: ../mail/e-mail-reader.c:2435
 msgid "Mark as _Not Junk"
 msgstr "標示成非垃圾郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2511
+#: ../mail/e-mail-reader.c:2439
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
-#: ../mail/e-mail-reader.c:2523
+#: ../mail/e-mail-reader.c:2451
 msgid "Mark as Uni_mportant"
 msgstr "標示成不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2527
+#: ../mail/e-mail-reader.c:2455
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
-#: ../mail/e-mail-reader.c:2571
+#: ../mail/e-mail-reader.c:2499
 msgid "_Caret Mode"
 msgstr "鍵盤瀏覽模式(_C)"
 
-#: ../mail/e-mail-reader.c:2573
+#: ../mail/e-mail-reader.c:2501
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在顯示的郵件內文中顯示閃爍游標"
 
-#: ../mail/e-mail-reader.c:2579
+#: ../mail/e-mail-reader.c:2507
 msgid "All Message _Headers"
 msgstr "所有郵件檔頭(_H)"
 
-#: ../mail/e-mail-reader.c:2581
+#: ../mail/e-mail-reader.c:2509
 msgid "Show messages with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
-#: ../mail/e-mail-reader.c:3116
+#: ../mail/e-mail-reader.c:3047
 msgid "Retrieving message"
 msgstr "取回郵件"
 
-#: ../mail/e-mail-reader.c:4138
-#: ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4078 ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/e-mail-reader.c:4139
+#: ../mail/e-mail-reader.c:4079
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
-#: ../mail/e-mail-reader.c:4158
+#: ../mail/e-mail-reader.c:4098
 msgid "Group Reply"
 msgstr "群組回覆"
 
-#: ../mail/e-mail-reader.c:4159
+#: ../mail/e-mail-reader.c:4099
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "回覆給通信論壇,或是給所有的收件者"
 
-#: ../mail/e-mail-reader.c:4225 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:4165 ../mail/filtertypes.xml.in.h:64
 msgid "Delete"
 msgstr "刪除"
 
-#: ../mail/e-mail-reader.c:4237
+#: ../mail/e-mail-reader.c:4177
 #: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "下一個"
 
-#: ../mail/e-mail-reader.c:4241
+#: ../mail/e-mail-reader.c:4181
 #: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "上一個"
 
-#: ../mail/e-mail-reader.c:4250 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4190 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/e-mail-reader.c:5303
+#: ../mail/e-mail-reader.c:5249
 #, c-format
 msgid "Allow remote content for anyone from %s"
-msgstr ""
+msgstr "允許任何寄件者為 %s 的遠端內容"
 
-#: ../mail/e-mail-reader.c:5305
+#: ../mail/e-mail-reader.c:5251
 #, c-format
 msgid "Allow remote content for %s"
-msgstr ""
+msgstr "允許任何收件者為 %s 的遠端內容"
 
-#: ../mail/e-mail-reader.c:5322
+#: ../mail/e-mail-reader.c:5268
 #, c-format
 msgid "Allow remote content from %s"
-msgstr ""
+msgstr "允許任何寄件者為 %s 的遠端內容"
 
-#: ../mail/e-mail-reader.c:5378
-#, fuzzy
-#| msgid "Header content"
+#: ../mail/e-mail-reader.c:5325
 msgid "Load remote content"
-msgstr "檔頭內容"
+msgstr "載入遠端內容"
 
 #: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "不要再警告我"
 
-#: ../mail/e-mail-reader-utils.c:556 ../plugins/face/face.c:170
-#: ../shell/e-shell.c:867 ../shell/e-shell.c:888
+#: ../mail/e-mail-reader-utils.c:572
+#, c-format
+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:1045
+#: ../mail/e-mail-reader-utils.c:1165
 msgid "Marking thread to be ignored"
 msgstr "將群組標記為忽略"
 
-#: ../mail/e-mail-reader-utils.c:1049
+#: ../mail/e-mail-reader-utils.c:1169
 msgid "Unmarking thread from being ignored"
 msgstr "取消群組被忽略的標記"
 
-#: ../mail/e-mail-reader-utils.c:1053
+#: ../mail/e-mail-reader-utils.c:1173
 msgid "Marking subthread to be ignored"
 msgstr "將子群組標記為忽略"
 
-#: ../mail/e-mail-reader-utils.c:1057
+#: ../mail/e-mail-reader-utils.c:1177
 msgid "Unmarking subthread from being ignored"
 msgstr "取消子群組被忽略的標記"
 
-#: ../mail/e-mail-reader-utils.c:1296
+#: ../mail/e-mail-reader-utils.c:1417
 msgid "Printing"
 msgstr "列印"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1531
+#: ../mail/e-mail-reader-utils.c:1654
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -15479,7 +15652,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "資料夾「%s」包含 %u 封重複的郵件。您確定要刪除它?"
 
-#: ../mail/e-mail-reader-utils.c:2361
+#: ../mail/e-mail-reader-utils.c:2485
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "儲存郵件"
@@ -15489,16 +15662,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:2382
+#: ../mail/e-mail-reader-utils.c:2506
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "郵件"
 
-#: ../mail/e-mail-reader-utils.c:2755
+#: ../mail/e-mail-reader-utils.c:2879
 msgid "Parsing message"
 msgstr "解析郵件"
 
-#: ../mail/e-mail-request.c:199
+#: ../mail/e-mail-request.c:204
 msgid "The message has no text content."
 msgstr "這個郵件沒有文字內容。"
 
@@ -15520,7 +15693,7 @@ msgstr "沒有 UID「%s」的資料來源"
 #. * 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:1542
+#: ../mail/em-composer-utils.c:1603
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -15528,24 +15701,24 @@ msgstr ""
 "於 ${AbbrevWeekdayName},${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
 "${TimeZone},${Sender} 提到:"
 
-#: ../mail/em-composer-utils.c:1548
+#: ../mail/em-composer-utils.c:1609
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-#: ../mail/em-composer-utils.c:1553
+#: ../mail/em-composer-utils.c:1614
 msgid "-----Original Message-----"
 msgstr "-----原始郵件-----"
 
-#: ../mail/em-composer-utils.c:2766
+#: ../mail/em-composer-utils.c:2827
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3204
+#: ../mail/em-composer-utils.c:3265
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-#: ../mail/em-composer-utils.c:3209
+#: ../mail/em-composer-utils.c:3270
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
@@ -15562,33 +15735,85 @@ msgstr "接著依"
 msgid "Add Ac_tion"
 msgstr "加入動作(_T)"
 
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:178
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "未讀郵件:"
 
-#: ../mail/em-folder-properties.c:188
+#: ../mail/em-folder-properties.c:189
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "所有郵件:"
 
-#: ../mail/em-folder-properties.c:209
+#: ../mail/em-folder-properties.c:210
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "配額使用量 (%s):"
 
-#: ../mail/em-folder-properties.c:211
+#: ../mail/em-folder-properties.c:212
 #, c-format
 msgid "Quota usage"
 msgstr "限制用量"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../mail/em-folder-properties.c:286
+#: ../mail/em-folder-properties.c:287
 msgid "_Send Account Override:"
 msgstr "傳送帳號覆蓋(_S):"
 
-#: ../mail/em-folder-properties.c:415
+#: ../mail/em-folder-properties.c:491
+msgid "_Archive this folder using these settings:"
+msgstr "使用這些設定值封存這個資料夾(_A):"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:500
+msgctxt "autoarchive"
+msgid "_Cleanup messages older than"
+msgstr "清理早於這段時間的郵件(_C)"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:516
+msgctxt "autoarchive"
+msgid "days"
+msgstr "天"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:518
+msgctxt "autoarchive"
+msgid "weeks"
+msgstr "週"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:520
+msgctxt "autoarchive"
+msgid "months"
+msgstr "個月"
+
+#: ../mail/em-folder-properties.c:526
+msgid "Move old messages to the default archive _folder"
+msgstr "將舊的郵件移至預設的封存資料夾(_F)"
+
+#: ../mail/em-folder-properties.c:537
+msgid "_Move old messages to:"
+msgstr "移動舊的郵件到(_M):"
+
+#: ../mail/em-folder-properties.c:541
+msgid "AutoArchive folder"
+msgstr "自動封存資料夾"
+
+#: ../mail/em-folder-properties.c:541
+msgid "Select folder to use for AutoArchive"
+msgstr "選擇用於自動封存的資料夾"
+
+#: ../mail/em-folder-properties.c:547
+msgid "_Delete old messages"
+msgstr "刪除舊的郵件(_D)"
+
+#: ../mail/em-folder-properties.c:606
+msgid "AutoArchive"
+msgstr "自動封存"
+
+#: ../mail/em-folder-properties.c:685
 msgid "Folder Properties"
 msgstr "資料夾內容"
 
@@ -15604,47 +15829,47 @@ msgstr "建立新資料夾"
 msgid "Folder names cannot contain '/'"
 msgstr "資料夾名稱不能包含斜線。"
 
-#: ../mail/em-folder-tree.c:819
+#: ../mail/em-folder-tree.c:845
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1668
+#: ../mail/em-folder-tree.c:1703
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
 
-#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:82
+#: ../mail/em-folder-tree.c:2251 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移動資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:84
+#: ../mail/em-folder-tree.c:2254 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2477
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2467
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2479
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2469
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2249
+#: ../mail/em-folder-tree.c:2284
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
+#: ../mail/em-folder-tree-model.c:444 ../mail/em-folder-tree-model.c:446
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
+#: ../mail/em-folder-tree-model.c:1313 ../mail/em-folder-tree-model.c:1689
 msgid "Loading..."
 msgstr "載入中…"
 
@@ -15668,79 +15893,93 @@ msgstr "要顯示的訂閱(_B)"
 msgid "Subscribe To _All"
 msgstr "全部訂閱(_A)"
 
-#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1912
 #: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-#: ../mail/em-subscription-editor.c:978
+#: ../mail/em-subscription-editor.c:979
 msgid "Unsu_bscribe From Hidden"
 msgstr "取消訂閱隱藏的(_B)"
 
-#: ../mail/em-subscription-editor.c:986
+#: ../mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr "全部取消訂閱(_A)"
 
-#: ../mail/em-subscription-editor.c:1704
+#: ../mail/em-subscription-editor.c:1339
+#: ../modules/mail/e-mail-shell-view-private.c:1058
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d 封未讀,"
+
+#: ../mail/em-subscription-editor.c:1343
+#: ../modules/mail/e-mail-shell-view-private.c:1068
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "共 %d 封"
+
+#: ../mail/em-subscription-editor.c:1749
 msgid "Folder Subscriptions"
 msgstr "資料夾訂閱"
 
-#: ../mail/em-subscription-editor.c:1743
+#: ../mail/em-subscription-editor.c:1788
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../mail/em-subscription-editor.c:1756
+#: ../mail/em-subscription-editor.c:1801
 msgid "Clear Search"
 msgstr "清除搜尋"
 
-#: ../mail/em-subscription-editor.c:1773
+#: ../mail/em-subscription-editor.c:1818
 msgid "Sho_w items that contain:"
 msgstr "顯示項目包含(_W):"
 
-#: ../mail/em-subscription-editor.c:1820
+#: ../mail/em-subscription-editor.c:1865
 msgid "Subscribe to the selected folder"
 msgstr "訂閱選取的資料夾"
 
-#: ../mail/em-subscription-editor.c:1821
+#: ../mail/em-subscription-editor.c:1866
 msgid "Su_bscribe"
 msgstr "訂閱(_B)"
 
-#: ../mail/em-subscription-editor.c:1866
+#: ../mail/em-subscription-editor.c:1911
 #: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "取消訂閱選取的資料夾"
 
-#: ../mail/em-subscription-editor.c:1906
+#: ../mail/em-subscription-editor.c:1951
 msgid "Collapse all folders"
 msgstr "收摺所有的資料夾"
 
-#: ../mail/em-subscription-editor.c:1907
+#: ../mail/em-subscription-editor.c:1952
 msgid "C_ollapse All"
 msgstr "全部收摺(_O)"
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../mail/em-subscription-editor.c:1962
 msgid "Expand all folders"
 msgstr "展開所有的資料夾"
 
-#: ../mail/em-subscription-editor.c:1918
+#: ../mail/em-subscription-editor.c:1963
 msgid "E_xpand All"
 msgstr "全部展開(_X)"
 
-#: ../mail/em-subscription-editor.c:1928
+#: ../mail/em-subscription-editor.c:1973
 msgid "Refresh the folder list"
 msgstr "重新整理資料夾清單"
 
-#: ../mail/em-subscription-editor.c:1929
+#: ../mail/em-subscription-editor.c:1974
 #: ../modules/mail/e-mail-shell-view-actions.c:1652
 #: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: ../mail/em-subscription-editor.c:1940
+#: ../mail/em-subscription-editor.c:1985
 msgid "Stop the current operation"
 msgstr "停止目前的操作"
 
-#: ../mail/em-subscription-editor.c:1941
+#: ../mail/em-subscription-editor.c:1986
 #: ../modules/addressbook/e-book-shell-view-actions.c:979
 msgid "_Stop"
 msgstr "停止(_S)"
@@ -15749,21 +15988,25 @@ msgstr "停止(_S)"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:75
+#: ../mail/em-utils.c:76
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "您確定要一次開啟 %d 封郵件?"
 
-#: ../mail/em-utils.c:176
+#: ../mail/em-utils.c:177
 msgid "Message Filters"
 msgstr "郵件規則"
 
-#: ../mail/em-utils.c:922
+#: ../mail/em-utils.c:923
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
 
+#: ../mail/em-utils.c:1680
+msgid "Deleting old messages"
+msgstr "刪除舊的郵件"
+
 #: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "搜尋資料夾(_F)"
@@ -15946,7 +16189,7 @@ msgstr "重要"
 msgid "Read"
 msgstr "已讀"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:126
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:128
 #: ../mail/vfoldertypes.xml.in.h:42
 msgid "Junk"
 msgstr "垃圾郵件"
@@ -15968,17 +16211,13 @@ msgstr "沒有標幟"
 
 #: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
 #: ../mail/vfoldertypes.xml.in.h:46
-#, fuzzy
-#| msgid "% Completed"
 msgid "is Completed"
-msgstr "% 已完成"
+msgstr "已完成 "
 
 #: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
 #: ../mail/vfoldertypes.xml.in.h:47
-#, fuzzy
-#| msgid "% Completed"
 msgid "is not Completed"
-msgstr "% 已完成"
+msgstr "未完成 "
 
 #: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
 #: ../mail/vfoldertypes.xml.in.h:51
@@ -16097,11 +16336,11 @@ msgstr "轉寄至"
 msgid "Importing Elm data"
 msgstr "輸入 Elm 資料"
 
-#: ../mail/importers/elm-importer.c:374
+#: ../mail/importers/elm-importer.c:376
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 輸入器"
 
-#: ../mail/importers/elm-importer.c:375
+#: ../mail/importers/elm-importer.c:377
 msgid "Import mail from Elm."
 msgstr "從 Elm 匯入郵件。"
 
@@ -16135,8 +16374,7 @@ msgctxt "mboxImp"
 msgid "From"
 msgstr "寄件者"
 
-#: ../mail/importers/evolution-mbox-importer.c:568
-#: ../shell/e-shell-utils.c:171
+#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 郵件信箱 (mbox)"
 
@@ -16163,23 +16401,23 @@ msgstr "從 KMail 匯入郵件與連絡人。"
 msgid "Trash"
 msgstr "回收筒"
 
-#: ../mail/importers/mail-importer.c:55
+#: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 msgstr "正在匯入信箱"
 
-#: ../mail/importers/mail-importer.c:61
+#: ../mail/importers/mail-importer.c:60
 msgid "Importing mail and contacts from KMail"
 msgstr "正在從 KMail 匯入郵件與連絡人"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:187 ../mail/importers/mail-importer.c:314
+#: ../mail/importers/mail-importer.c:186 ../mail/importers/mail-importer.c:311
 #: ../plugins/dbx-import/dbx-importer.c:609
 #: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "正在匯入「%s」"
 
-#: ../mail/importers/mail-importer.c:570
+#: ../mail/importers/mail-importer.c:555
 #, c-format
 msgid "Scanning %s"
 msgstr "掃描 %s"
@@ -16188,11 +16426,11 @@ msgstr "掃描 %s"
 msgid "Importing Pine data"
 msgstr "輸入管道資料"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:477
 msgid "Evolution Pine importer"
 msgstr "Evolution 管道輸入器"
 
-#: ../mail/importers/pine-importer.c:476
+#: ../mail/importers/pine-importer.c:478
 msgid "Import mail from Pine."
 msgstr "從 Pine 匯入郵件。"
 
@@ -16380,7 +16618,7 @@ msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
-"要避免電子郵件出現意外或令人難堪的情況,在進行下列已核取動作時詢問使用者以取"
+"要避免電子郵件出現意外或令人難堪的情況,在進行下列已勾選動作時詢問使用者以取"
 "得確認:"
 
 #. This is in the context of: Ask for confirmation before...
@@ -16395,61 +16633,66 @@ msgstr "傳送只有指定密件副本收件者的郵件(_B)"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:45
+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
 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:47
+#: ../mail/mail-config.ui.h:49
 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:49
+#: ../mail/mail-config.ui.h:51
 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:51
+#: ../mail/mail-config.ui.h:53
 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:53
+#: ../mail/mail-config.ui.h:55
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "使用快捷鍵傳送郵件時提示 (Ctrl+Enter) (_K)"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:56
 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:58
+#: ../mail/mail-config.ui.h:60
 msgid "Use for Folders"
 msgstr "用於資料夾"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:61
 msgid "A_dd"
 msgstr "加入(_A)"
 
-#: ../mail/mail-config.ui.h:61
+#: ../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:63
+#: ../mail/mail-config.ui.h:65
 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:65 ../modules/mail/em-composer-prefs.c:864
+#: ../mail/mail-config.ui.h:67 ../modules/mail/em-composer-prefs.c:864
 msgid "Account"
 msgstr "帳號"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:68
 msgid "Send account overrides"
 msgstr "傳送帳號覆蓋"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:69
 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 "
@@ -16459,233 +16702,221 @@ msgstr ""
 "指派哪個帳號要用來做個別資料夾或收件者的傳送帳號,會覆蓋通常傳送帳號的偵測。"
 "收件者清單可以包含部分的位址或名稱。名稱與位址的部分會分別比對。"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:70
 msgid "_Folder override has precedence over Recipient override"
 msgstr "資料夾覆蓋先於收件者覆蓋(_F)"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:71
 msgid "Send Account"
 msgstr "傳送帳號"
 
-#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:77 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:76 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:79
 msgid "Start up"
 msgstr "啟動"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "Check for new _messages on start"
 msgstr "啟動時檢查新郵件(_M)"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Check for new messa_ges in all active accounts"
 msgstr "檢查所有使用中帳號的新郵件(_G)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Message Display"
 msgstr "郵件顯示"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "_Use the same fonts as other applications"
 msgstr "使用與其他應用程式相同的字型(_U)"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:85
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定寬度字型"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:86
 msgid "Select HTML variable width font"
 msgstr "選擇 HTML 可變寬度字型"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:87
 msgid "Fix_ed Width Font:"
 msgstr "固定寬度字型(_E):"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:88
 msgid "_Mark messages as read after"
 msgstr "將郵件標示成已經閱讀於(_M)"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:90
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:91
 #: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Pick a color"
 msgstr "挑選顏色"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:92
 msgid "color"
 msgstr "色彩"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:93
 msgid "Default character e_ncoding:"
 msgstr "預設字元編碼(_N):"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94
 msgid "Apply the same _view settings to all folders"
 msgstr "在所有資料夾套用相同的檢視設定值(_V)"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:95
 msgid "F_all back to threading messages by subject"
 msgstr "退回到依主旨的相關郵件(_A)"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:96
 msgid "Delete Mail"
 msgstr "刪除郵件"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:97
 msgid "Empty _trash folders"
 msgstr "清空回收筒資料夾(_T)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:98
 msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_W)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:99
 msgid "Archive Mail"
-msgstr "壓縮郵件"
+msgstr "封存郵件"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:100
 msgid "On This Computer A_rchive folder:"
-msgstr "「這臺電腦上」的壓縮資料夾(_R):"
+msgstr "「這臺電腦上」的封存資料夾(_R):"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:101
 msgid "Archive folder to use for On This Computer messages"
-msgstr "用於「這臺電腦上的郵件」的壓縮資料夾"
+msgstr "用於「這臺電腦上的郵件」的封存資料夾"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:103
 msgid "_Show animated images"
-msgstr "播放動畫圖片(_S)"
+msgstr "播放動畫影像(_S)"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:104
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "當傳送 HTML 郵件給不想收到這類郵件的連絡人時顯示提示(_P)"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:105
 msgid "Loading Remote Content"
-msgstr ""
+msgstr "載入遠端內容"
 
-#: ../mail/mail-config.ui.h:104
-#, fuzzy
-#| msgid "_Never load images from the Internet"
+#: ../mail/mail-config.ui.h:106
 msgid "_Never load remote content from the Internet"
-msgstr "一定不自網路下載圖片(_N)"
+msgstr "永不從網際網路載入遠端內容(_N)"
 
-#: ../mail/mail-config.ui.h:105
-#, fuzzy
-#| msgid "_Load images only in messages from contacts"
+#: ../mail/mail-config.ui.h:107
 msgid "_Load remote content only in messages from contacts"
-msgstr "只載入由連絡人寄出郵件中的圖片(_L)"
+msgstr "只載入由連絡人寄出郵件中的遠端內容(_L)"
 
-#: ../mail/mail-config.ui.h:106
-#, fuzzy
-#| msgid "_Always load images from the Internet"
+#: ../mail/mail-config.ui.h:108
 msgid "_Always load remote content from the Internet"
-msgstr "一定自網路下載圖片(_A)"
+msgstr "永遠從網際網路載入遠端內容(_A)"
 
-#: ../mail/mail-config.ui.h:107
-#, fuzzy
-#| msgid "_Add"
+#: ../mail/mail-config.ui.h:109
 msgid "Add"
-msgstr "加入(_A)"
+msgstr "加入"
 
-#: ../mail/mail-config.ui.h:108
-#, fuzzy
-#| msgid "_Remove"
+#: ../mail/mail-config.ui.h:110
 msgid "Remove"
-msgstr "移除(_R)"
+msgstr "移除"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:111
 msgid "Allow for sites:"
-msgstr ""
+msgstr "允許網站:"
 
-#: ../mail/mail-config.ui.h:110
-#, fuzzy
-#| msgid "All local folders"
+#: ../mail/mail-config.ui.h:112
 msgid "Allow for senders:"
-msgstr "所有本地端資料夾"
+msgstr "允許寄件者:"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:113
 msgid "HTML Messages"
 msgstr "HTML 郵件"
 
-#: ../mail/mail-config.ui.h:112 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:114 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "標籤"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
 msgid "Sender Photograph"
 msgstr "寄件者相片"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:116
 msgid "_Show the photograph of sender in the message preview"
 msgstr "在郵件預覽顯示寄件者相片(_S)"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "搜尋寄件者在 gra_vatar.com 上的相片"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 msgid "Displayed Message Headers"
 msgstr "顯示的郵件檔頭"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:119
 msgid "Mail Headers Table"
 msgstr "郵件檔頭表"
 
-#: ../mail/mail-config.ui.h:118
-#: ../modules/addressbook/autocompletion-config.c:117
+#: ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "日期/時刻格式"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 msgid "Check incoming _messages for junk"
 msgstr "檢查內送郵件是否為垃圾郵件(_M)"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:123
 msgid "_Delete junk messages"
 msgstr "刪除垃圾郵件(_D)"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:124
 msgid "Junk Test Options"
 msgstr "垃圾郵件測試選項"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:125
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "若寄件者在我的通訊錄中就不要將郵件標記為垃圾郵件(_K)"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:126
 msgid "_Lookup in local address book only"
 msgstr "只在本地通訊錄查詢(_L)"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:127
 msgid "Check cu_stom headers for junk"
 msgstr "以自訂標頭檢查垃圾郵件(_S)"
 
-#: ../mail/mail-config.ui.h:127
+#: ../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
 msgid "No encryption"
 msgstr "沒有加密"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:130
 msgid "TLS encryption"
 msgstr "TLS 加密"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:131
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
@@ -16841,10 +17072,26 @@ msgstr ""
 "者:」或「副本:」收件者。"
 
 #: ../mail/mail.error.xml.h:16
+msgid "Are you sure you want to send a message with {0} To and CC recipients?"
+msgstr "您確定要寄信給 {0} 個收件者與副本?"
+
+#: ../mail/mail.error.xml.h:17
+msgid ""
+"You are trying to send a message to {0} recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr ""
+"您正在嘗試寄信給 {0} 位收件者和副本。這會導致所有收件者看到對方的電子郵件位"
+"址。在某些情況下這種行為是不受歡迎,特別是如果他們不認識對方或認為隱私權是一"
+"個問題時。請考慮將收件者加入到密件副本欄位。"
+
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "要傳送電子郵件位址無效的郵件?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:20
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -16852,11 +17099,11 @@ msgstr ""
 "下列收件者無法辨認為有效的郵件位址:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:22
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "要傳送電子郵件位址無效的郵件?"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:23
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -16864,11 +17111,11 @@ msgstr ""
 "下列收件者無法辨認為有效的郵件位址:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:25
 msgid "Send private reply?"
 msgstr "是否傳送私人回覆?"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:26
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -16877,11 +17124,11 @@ msgstr ""
 "您正以私人回覆來自通信論壇的郵件,但是這個通信論壇嘗試將您的回信導回論壇。您"
 "確定要繼續嗎?"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:27
 msgid "Reply _Privately"
 msgstr "私人回覆(_P)"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:29
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -16890,22 +17137,22 @@ msgstr ""
 "您正在回覆來自通信論壇的郵件,但是您以私人回覆方式寄給原寄件者;而非寄回通信"
 "論壇。您確定要繼續嗎?"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:31
 msgid "Send reply to all recipients?"
 msgstr "是否回覆給所有的收件者?"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:32
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr "您正在回覆的信件會傳送給許多收件者。您確定回信給他們全部?"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "因為您沒有指定任何收件者,所以無法傳送此郵件"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -16913,58 +17160,57 @@ msgstr ""
 "請在「收件者:」欄位輸入一個有效的電子郵件地址。您可以按一下輸入方塊旁邊的"
 "「收件者:」按鈕,搜尋電子郵件地址。"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:35
 msgid "Use default drafts folder?"
 msgstr "使用預設的草稿資料夾?"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "無法開啟此帳號的草稿資料夾。是否使用系統草稿資料夾代替?"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "使用預設值(_D)"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr "確定要永久移除資料夾「{0}」中所有刪除的郵件?"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:39
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "如果您選擇繼續,將無法復原這些郵件。"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr "清除(_E)"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "要永久移除所有資料夾中所有刪除的郵件?"
 
-#: ../mail/mail.error.xml.h:39
-#: ../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)"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:43
 msgid "Opening too many messages at once may take a long time."
 msgstr "一次開啟過多郵件可能會花費許多時間。"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "開啟郵件(_O)"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:45
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "您有未寄出的郵件,您無論如何都要離開嗎?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -16973,55 +17219,55 @@ msgstr "如果您選擇結束,再次啟動 Evolution 之前,不會傳送這
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:50
 msgid "Error while {0}."
 msgstr "當 {0} 時發生錯誤。"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr "執行作業時,發生錯誤。"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "輸入密碼。"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "載入過濾器定義時發生錯誤。"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot save to directory \"{0}\"."
 msgstr "不能儲存至目錄「{0}」。"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot save to file \"{0}\"."
 msgstr "不能儲存至檔案「{0}」。"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:56
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "不能建立儲存目錄,因為「{1}」"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr "無法建立暫時儲存目錄。"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "檔案存在但無法覆寫。"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "檔案存在但不是一般檔案。"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:60
 msgid "Cannot delete folder \"{0}\"."
 msgstr "不能刪除資料夾「{0}」。"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "不能刪除系統資料夾「{0}」。"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -17029,42 +17275,42 @@ msgstr ""
 "Evolution 需要系統資料夾才能正常作業,而且該資料夾不可以重新命名、移動或刪"
 "除。"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "無法清除資料夾 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "無法重新整理資料夾 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "不能重新命名或移動系統資料夾「{0}」。"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "確定要刪除資料夾「{0}」以及它所有的子資料夾?"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "如果您刪除資料夾,它的所有內容和子資料夾內容會永遠刪除。"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
 msgid "Really delete folder \"{0}\"?"
 msgstr "確定要刪除資料夾「{0}」?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "如果您選擇刪除資料夾,它的所有內容會永遠消失。"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "These messages are not copies."
 msgstr "這些郵件不是複本。"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -17073,63 +17319,63 @@ msgstr ""
 "在搜尋資料夾中顯示的郵件並不是複本。從搜尋資料夾中刪除郵件將會自您的本地或遠"
 "端資料夾刪除實際的郵件。是否確定要刪除這些郵件?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "不能將「{0}」重新命名成「{1}」。"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "已經有名稱為「{1}」的資料夾存在。請使用不同的名稱。"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "不能將資料夾「{0}」移至「{1}」。"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot open source folder. Error: {2}"
 msgstr "不能開啟來源資料夾。錯誤:{2}"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot open target folder. Error: {2}"
 msgstr "不能開啟目標資料夾。錯誤:{2}"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "無法將「{0}」資料夾複製至「{1}」。"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot create folder \"{0}\"."
 msgstr "不能建立資料夾「{0}」。"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "Cannot open folder. Error: {1}"
 msgstr "不能開啟資料夾。錯誤:{1}"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Cannot save changes to account."
 msgstr "無法儲存帳號變更。"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "You have not filled in all of the required information."
 msgstr "您沒有填入所有必須的資訊。"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "You may not create two accounts with the same name."
 msgstr "您不能用相同的名稱建立兩個帳號。"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid "Are you sure you want to delete this account?"
 msgstr "確定要刪除這個帳號?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果繼續,帳號資訊會永久刪除。"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "確定要刪除這個帳號以及它所有的代理伺服器?"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -17137,28 +17383,28 @@ msgstr ""
 "如果繼續,該帳號的資訊以及\n"
 "它所有的代理伺服器會永遠刪除。"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "確定要刪除這個帳號以及它所有的代理伺服器?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "如果繼續,所有的代理伺服器帳號會永久刪除。"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
 msgid "Do _Not Disable"
 msgstr "不要停用(_N)"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:93
 msgid "_Disable"
 msgstr "停用(_D)"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "不能編輯搜尋資料夾「{0}」,因為它不存在。"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -17166,39 +17412,39 @@ msgstr ""
 "此資料夾可能已經自動新增。\n"
 "需要時,請移至搜尋資料夾編輯器,以手動方式新增它。"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "不能加入搜尋資料夾「{0}」。"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "已經有名稱為「{0}」的資料夾存在。請使用不同的名稱。"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid "Search Folders automatically updated."
 msgstr "搜尋資料夾自動更新。"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:100
 msgid "Mail filters automatically updated."
 msgstr "郵件過濾器自動更新。"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:101
 msgid "Missing folder."
 msgstr "遺漏資料夾。"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:102
 msgid "You must specify a folder."
 msgstr "您必須指定一個資料夾。"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:104
 msgid "You must name this Search Folder."
 msgstr "您必須命名此搜尋資料夾。"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
 msgid "No folder selected."
 msgstr "尚未選取資料夾。"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -17207,11 +17453,11 @@ msgstr ""
 "您必須至少指定一個資料夾當成來源。\n"
 "個別選取資料夾,然後/或選取所有本地資料夾、所有遠端資料夾或二者皆選。"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:108
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "轉移舊郵件資料夾「{0}」發生問題。"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -17222,19 +17468,19 @@ msgstr ""
 "\n"
 "您可以選擇忽略此資料夾、覆寫或附加它的內容或者結束。"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
 msgid "_Append"
 msgstr "添加(_A)"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
 msgid "Evolution's local mail format has changed."
 msgstr "Evolution 的本地端郵件格式已經改變了。"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -17250,19 +17496,19 @@ msgstr ""
 "程式會建立一個 mbox 帳號來保留舊的 mbox 資料夾。您可以在確認資料都安全轉換後"
 "再將它刪除。如果您選擇轉換,請確定有足夠的空間。"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid "_Exit Evolution"
 msgstr "結束 _Evolution "
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "_Migrate Now"
 msgstr "立即轉移(_M)"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "無法讀取授權檔案。"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -17270,50 +17516,50 @@ msgstr ""
 "不能讀取授權條款檔案「{0}」,應該是安裝問題造成的。在您同意這項授權之前將無法"
 "使用它。"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
 msgid "Please wait."
 msgstr "請稍候。"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "向伺服器查詢支援的核對演算法清單。"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:125
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr "無法向伺服器查詢支援的核對演算法清單。"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid "Synchronize folders locally for offline usage?"
 msgstr "是否同步資料夾以供離線使用?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "是否要在本地端同步那些標記為離線使用的資料夾?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
 msgid "Do _Not Synchronize"
 msgstr "不要同步(_N)"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
 msgid "_Synchronize"
 msgstr "同步化(_S)"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
 msgid "Do you want to mark all messages as read?"
 msgstr "是否要將全部的郵件標示成已閱讀?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
 msgid "This will mark all messages as read in the selected folder."
 msgstr "這會將標示選取的資料夾中所有郵件為已閱讀。"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
 msgid "Also mark messages in subfolders?"
 msgstr "是否也標記子資料夾中的郵件?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -17321,118 +17567,134 @@ msgstr ""
 "您要將目前的資料夾中的郵件已閱讀,或是包含目前的資料夾及其子資料夾中所有郵"
 "件。"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
 msgid "In Current Folder and _Subfolders"
 msgstr "於目前的資料夾及其子資料夾(_S)"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
 msgid "In Current _Folder Only"
 msgstr "於目前的資料夾(_F)"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr "當回覆或轉寄時 Evolution 是否應關閉這個視窗?"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
 msgid "_Yes, Always"
 msgstr "是,總是使用(_Y)"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:138
 msgid "_No, Never"
 msgstr "否,永不使用(_N)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
 msgid "Copy folder in folder tree."
 msgstr "於資料夾樹狀圖複製。"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "是否確定要將資料夾「{0}」複製到資料夾「{1}」?"
 
-#: ../mail/mail.error.xml.h:140
-msgid "_Always"
-msgstr "總是(_A)"
+#: ../mail/mail.error.xml.h:142
+msgid "Do _not copy"
+msgstr "不要複製(_N)"
 
-#: ../mail/mail.error.xml.h:141
-msgid "N_ever"
-msgstr "永不(_E)"
+#: ../mail/mail.error.xml.h:143
+msgid "_Always copy"
+msgstr "永遠複製(_A)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:144
+msgid "N_ever copy"
+msgstr "永不複製(_E)"
+
+#: ../mail/mail.error.xml.h:145
 msgid "Move folder in folder tree."
 msgstr "於資料夾樹狀圖移動。"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:146
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "是否確定要將資料夾「{0}」移動到資料夾「{1}」?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
+msgid "Do _not move"
+msgstr "不要移動(_N)"
+
+#: ../mail/mail.error.xml.h:149
+msgid "_Always move"
+msgstr "永遠移動(_A)"
+
+#: ../mail/mail.error.xml.h:150
+msgid "N_ever move"
+msgstr "永不移動(_E)"
+
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "因為您沒有啟用選擇用來寄送的帳號,所以無法傳送此郵件。"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:152
 msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳送。"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:153
 msgid "Mail Deletion Failed"
 msgstr "刪除郵件失敗"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:154
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您沒有足夠的權限刪除此封郵件。"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:155
 msgid "\"Check Junk\" Failed"
 msgstr "「檢查垃圾郵件」失敗"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:156
 msgid "\"Report Junk\" Failed"
 msgstr "「回報垃圾郵件」失敗"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:157
 msgid "\"Report Not Junk\" Failed"
 msgstr "「回報為非垃圾郵件」失敗"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:158
 msgid "Remove duplicate messages?"
 msgstr "是否移除重複的郵件?"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:159
 msgid "No duplicate messages found."
 msgstr "找不到重複的郵件。"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:161
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "資料夾「{0}」並未包含任何重複的郵件。"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "無法與帳號 &quot;{0}&quot; 連線。"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "無法中斷與帳號 &quot;{0}&quot; 的連線。"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "無法取消訂閱資料夾 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:165
 msgid "Unable to retrieve message."
 msgstr "無法接收郵件。"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:166
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:167
 msgid "Message is not available in offline mode."
 msgstr "郵件無法在離線模式下使用。"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:168
 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 "
@@ -17444,143 +17706,142 @@ msgstr ""
 "號恢復上線時,選擇這個資料夾,使用「檔案-&gt;下載郵件供離線使用」,以確定資料"
 "夾中所有的郵件都能在離線模式中使用。"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to open folder."
 msgstr "無法開啟資料夾。"
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to find duplicate messages."
 msgstr "找不到重複的郵件。"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to retrieve messages."
 msgstr "無法取回郵件。"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to mark messages as read."
 msgstr "無法將郵件標示成已經閱讀。"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to remove attachments from messages."
 msgstr "無法移除郵件中的附件。"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:175
 msgid "Failed to download messages for offline viewing."
 msgstr "下載離線使用的郵件失敗。"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:176
 msgid "Failed to save messages to disk."
 msgstr "無法將選取的郵件儲存至磁碟。"
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:177
 msgid "Hidden file is attached."
 msgstr "附加了隱藏的檔案。"
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:178
 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:172
+#: ../mail/mail.error.xml.h:179
 msgid "Printing failed."
 msgstr "列印失敗。"
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:180
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "印表機回覆 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:181
 msgid "Could not perform this operation on {0}."
 msgstr "無法進行 {0} 上的操作。"
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:182
 msgid "You must be working online to complete this operation."
 msgstr "您必須於線上工作才能完成此操作。"
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:183
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "來自 &quot;{0}&quot; 帳號的郵件:"
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:184
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件群組標記為已忽略"
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:185
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件群組取消已忽略標記"
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:186
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件子群組標記為已忽略"
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:187
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件子群組取消已忽略標記"
 
-#: ../mail/mail.error.xml.h:181
+#: ../mail/mail.error.xml.h:188
 msgid "Remote content download had been blocked for this message."
-msgstr ""
+msgstr "已阻擋這封郵件的遠端內容下載。"
 
-#: ../mail/mail.error.xml.h:182
+#: ../mail/mail.error.xml.h:189
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
 msgstr ""
+"您可以手動下載遠端內容,或設定為記住下載這個寄件者或使用過網站的遠端內容。"
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:184
-#, fuzzy
-#| msgid " (Completed "
+#: ../mail/mail.error.xml.h:191
 msgid "{0}, Completed on {1}"
-msgstr " (已完成 "
+msgstr "{0} ,完成於 {1} "
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:186
+#: ../mail/mail.error.xml.h:193
 msgid "{0} by {1}"
-msgstr ""
+msgstr "{0} 自 {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:188
+#: ../mail/mail.error.xml.h:195
 msgid "Overdue: {0} by {1}"
-msgstr ""
+msgstr "逾期:{0} 自 {1}"
 
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "正在取消…"
 
-#: ../mail/mail-send-recv.c:631
+#: ../mail/mail-send-recv.c:636
 msgid "Send & Receive Mail"
 msgstr "傳送與接收郵件"
 
-#: ../mail/mail-send-recv.c:645
+#: ../mail/mail-send-recv.c:650
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1249
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
 msgid "Updating..."
 msgstr "更新中…"
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
 msgid "Waiting..."
 msgstr "正在等待…"
 
-#: ../mail/mail-send-recv.c:1220
+#: ../mail/mail-send-recv.c:1225
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "檢查「%s」的新郵件"
 
-#: ../mail/mail-send-recv.c:1434
+#: ../mail/mail-send-recv.c:1452
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr "正在刪除與清空「%s」的垃圾郵件"
 
-#: ../mail/mail-send-recv.c:1436
+#: ../mail/mail-send-recv.c:1454
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr "正在刪除「%s」的垃圾郵件"
 
-#: ../mail/mail-send-recv.c:1438
+#: ../mail/mail-send-recv.c:1456
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr "正在清空「%s」的回收筒"
@@ -17637,13 +17898,13 @@ msgstr "高"
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:6044
+#: ../mail/message-list.c:459 ../mail/message-list.c:6034
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "今天 %p %l:%M"
 
@@ -17663,20 +17924,20 @@ msgstr "%m月%d日 %p %l:%M"
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2967
+#: ../mail/message-list.c:2957
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../mail/message-list.c:3632 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3622 ../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:4988
+#: ../mail/message-list.c:4978
 msgid "Follow-up"
 msgstr "跟隨"
 
-#: ../mail/message-list.c:5981
+#: ../mail/message-list.c:5971
 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 "
@@ -17686,7 +17947,7 @@ msgstr ""
 "沒有郵件滿足您的搜尋條件。請從上列下拉式選單選擇顯示郵件過濾器或執行新的搜"
 "尋,可從 搜尋->清除 選單項目清除它或改變上面的查詢。"
 
-#: ../mail/message-list.c:5989
+#: ../mail/message-list.c:5979
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -17757,24 +18018,24 @@ 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:123
+#: ../modules/addressbook/autocompletion-config.c:122
 #: ../modules/mail/em-mailer-prefs.c:1552
 msgid "_Table column:"
 msgstr "表格欄(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:126
+#: ../modules/addressbook/autocompletion-config.c:125
 msgid "Address formatting"
 msgstr "地址格式化"
 
-#: ../modules/addressbook/autocompletion-config.c:129
+#: ../modules/addressbook/autocompletion-config.c:128
 msgid "_Format address according to standard of its destination country"
 msgstr "地址是否要根據目的地國家的標準進行格式化(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:137
+#: ../modules/addressbook/autocompletion-config.c:136
 msgid "Autocompletion"
 msgstr "自動完成"
 
-#: ../modules/addressbook/autocompletion-config.c:140
+#: ../modules/addressbook/autocompletion-config.c:139
 msgid "Always _show address of the autocompleted contact"
 msgstr "永遠顯示自動補齊的連絡人位址(_S)"
 
@@ -17833,10 +18094,6 @@ msgstr "通訊錄(_B)"
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-#: ../modules/addressbook/e-book-shell-backend.c:314
-msgid "Certificates"
-msgstr "憑證"
-
 #: ../modules/addressbook/e-book-shell-view-actions.c:197
 msgid "Address Book Properties"
 msgstr "通訊錄內容"
@@ -18143,7 +18400,7 @@ msgstr "選擇要還原的 Evolution 備份檔案名稱"
 #: ../modules/backup-restore/evolution-backup-restore.c:336
 #, c-format
 msgid "Checking content of backup file '%s', please wait..."
-msgstr ""
+msgstr "檢查備份檔案「%s」的內部,請稍候…"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:357
 msgid "_Back up Evolution Data..."
@@ -18267,10 +18524,8 @@ msgid "Invalid Evolution backup file"
 msgstr "無效的 Evolution 備份檔案"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#, fuzzy
-#| msgid "Invalid Evolution backup file"
 msgid "File '{0}' is not a valid Evolution backup file."
-msgstr "無效的 Evolution 備份檔案"
+msgstr "檔案「{0}」不是有效的 Evolution 備份檔案。"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Are you sure you want to close Evolution?"
@@ -18641,57 +18896,75 @@ msgstr "新增備忘錄清單"
 msgid "New Task List"
 msgstr "新增工作清單"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:548
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:554
 #, c-format
 msgid "Copying an event into the calendar '%s'"
 msgstr "正在複製事件到行事曆「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:549
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
 #, c-format
 msgid "Moving an event into the calendar '%s'"
 msgstr "正在移動事件到行事曆「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:554
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
 #, c-format
 msgid "Copying a memo into the memo list '%s'"
 msgstr "正在複製備忘錄到備忘錄清單「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
 #, c-format
 msgid "Moving a memo into the memo list '%s'"
 msgstr "正在移動備忘錄到備忘錄清單「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:566
 #, c-format
 msgid "Copying a task into the task list '%s'"
 msgstr "正在複製工作到工作清單「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:567
 #, c-format
 msgid "Moving a task into the task list '%s'"
 msgstr "正在移動工作到工作清單「%s」"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:658
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:684
 msgid "Calendar Selector"
 msgstr "行事曆選擇器"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:664
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
 msgid "Memo List Selector"
 msgstr "備忘錄清單選擇器"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:669
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
 msgid "Task List Selector"
 msgstr "工作清單選擇器"
 
-#: ../modules/calendar/e-calendar-preferences.c:517
+#: ../modules/calendar/e-calendar-preferences.c:520
 msgid "Selected Calendars for Alarms"
 msgstr "選取的鬧鈴行事曆"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:616
+msgid "Meeting Invitations"
+msgstr "會議邀請"
+
+#: ../modules/calendar/e-calendar-preferences.c:642
+msgid "_Delete message after acting"
+msgstr "完成後刪除郵件(_D)"
+
+#: ../modules/calendar/e-calendar-preferences.c:656
+#: ../modules/calendar/e-calendar-preferences.c:687
+msgid "Conflict Search"
+msgstr "衝突的搜尋"
+
+#. Source selector
+#: ../modules/calendar/e-calendar-preferences.c:671
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "選擇要搜尋會議衝突的行事曆"
+
+#: ../modules/calendar/e-calendar-preferences.c:1057
 msgid "Ti_me and date:"
 msgstr "時刻和日期(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:926
+#: ../modules/calendar/e-calendar-preferences.c:1058
 msgid "_Date only:"
 msgstr "只有日期(_D):"
 
@@ -18868,40 +19141,48 @@ msgstr "隱藏已完成的工作(_H)"
 msgid "Display reminders in _notification area only"
 msgstr "只在通知區域中顯示提醒(_N)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+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:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Sh_ow a reminder"
 msgstr "顯示提醒於約會(_O)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:68
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
 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:70
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
 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:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
 msgid "before every anniversary/birthday"
 msgstr "在每個週年紀念日/生日之前"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "Default _snooze time (in minutes)"
+msgstr "預設小睡時間 [以分鐘計] (_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Select the calendars for reminder notification"
 msgstr "選擇提醒通知的行事曆"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Default Free/Busy Server"
 msgstr "預設的空閒/忙碌伺服器網址"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:79
 #, 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:78
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
 msgid "Publishing Information"
 msgstr "發布資訊"
 
@@ -19658,664 +19939,664 @@ msgstr "將部分顯示為邀請"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:228
+#: ../modules/itip-formatter/itip-view.c:226
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:232
+#: ../modules/itip-formatter/itip-view.c:230
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:241
+#: ../modules/itip-formatter/itip-view.c:239
 msgid "Today %l:%M:%S %p"
 msgstr "今天 %p %l:%M:%S"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:256
+#: ../modules/itip-formatter/itip-view.c:254
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:260
+#: ../modules/itip-formatter/itip-view.c:258
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:265
+#: ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow %l:%M %p"
 msgstr "明天 %p %l:%M"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:269
+#: ../modules/itip-formatter/itip-view.c:267
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天 %p %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:288
+#: ../modules/itip-formatter/itip-view.c:286
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:293
+#: ../modules/itip-formatter/itip-view.c:291
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:297
+#: ../modules/itip-formatter/itip-view.c:295
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:302
+#: ../modules/itip-formatter/itip-view.c:300
 msgid "%A %l:%M %p"
 msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:306
+#: ../modules/itip-formatter/itip-view.c:304
 msgid "%A %l:%M:%S %p"
 msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:315
+#: ../modules/itip-formatter/itip-view.c:313
 msgid "%A, %B %e"
 msgstr "%b%e日%A"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:321
+#: ../modules/itip-formatter/itip-view.c:319
 msgid "%A, %B %e %H:%M"
 msgstr "%b%e日%A %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:325
+#: ../modules/itip-formatter/itip-view.c:323
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%b%e日%A %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:330
+#: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %l:%M %p"
 msgstr "%b%e日%A %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:334
+#: ../modules/itip-formatter/itip-view.c:332
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%b%e日%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:340
+#: ../modules/itip-formatter/itip-view.c:338
 msgid "%A, %B %e, %Y"
 msgstr "%Y年%b%e日%A"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:345
+#: ../modules/itip-formatter/itip-view.c:343
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y年%b%e日%A %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:349
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y年%b%e日%A %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:354
+#: ../modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y年%b%e日%A %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:358
+#: ../modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%b%e日%A %p %l:%M:%S"
 
-#: ../modules/itip-formatter/itip-view.c:396
-#: ../modules/itip-formatter/itip-view.c:397
-#: ../modules/itip-formatter/itip-view.c:486
-#: ../modules/itip-formatter/itip-view.c:487
-#: ../modules/itip-formatter/itip-view.c:576
+#: ../modules/itip-formatter/itip-view.c:394
+#: ../modules/itip-formatter/itip-view.c:395
+#: ../modules/itip-formatter/itip-view.c:484
+#: ../modules/itip-formatter/itip-view.c:485
+#: ../modules/itip-formatter/itip-view.c:574
 msgid "An unknown person"
 msgstr "不明人士"
 
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:580
+#: ../modules/itip-formatter/itip-view.c:399
+#: ../modules/itip-formatter/itip-view.c:489
+#: ../modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "請代表 %s 回覆"
 
-#: ../modules/itip-formatter/itip-view.c:403
-#: ../modules/itip-formatter/itip-view.c:493
-#: ../modules/itip-formatter/itip-view.c:582
+#: ../modules/itip-formatter/itip-view.c:401
+#: ../modules/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "代表 %s 接收"
 
-#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:406
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s 透過 %s 已經發布下列會議資訊:"
 
-#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s 已經發布下列會議資訊:"
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:413
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s 已經委派下列會議給您:"
 
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../modules/itip-formatter/itip-view.c:416
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s 透過 %s 邀請您出席下列會議:"
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s 邀請您出席下列會議:"
 
-#: ../modules/itip-formatter/itip-view.c:426
+#: ../modules/itip-formatter/itip-view.c:424
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s 透過 %s 希望加入一個既存的會議:"
 
-#: ../modules/itip-formatter/itip-view.c:428
+#: ../modules/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s 希望加入一個既存的會議:"
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:430
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s 透過 %s 希望收到下列會議的最新資訊:"
 
-#: ../modules/itip-formatter/itip-view.c:434
+#: ../modules/itip-formatter/itip-view.c:432
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s 希望收到下列會議的最新資訊:"
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:436
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s 透過 %s 傳送了下列會議的回覆:"
 
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../modules/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s 傳送了下列會議的回覆:"
 
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../modules/itip-formatter/itip-view.c:442
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s 透過 %s 已經消取下列會議:"
 
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../modules/itip-formatter/itip-view.c:444
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s 已經消取下列會議:"
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:448
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s 透過 %s 已經答覆了下列會議變更。"
 
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s 已經答覆了下列會議變更:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:454
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s 透過 %s 已經婉拒了下列會議變更:"
 
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s 已經婉拒了下列會議變更:"
 
-#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:496
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s 透過 %s 已經發布了下列工作資訊:"
 
-#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:498
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s 已經發布了下列工作:"
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:503
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s 指派 %s 加入下列工作:"
 
-#: ../modules/itip-formatter/itip-view.c:508
+#: ../modules/itip-formatter/itip-view.c:506
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s 透過 %s 已經指派您一項工作:"
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s 已經指派您一項工作:"
 
-#: ../modules/itip-formatter/itip-view.c:516
+#: ../modules/itip-formatter/itip-view.c:514
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s 透過 %s 希望加入一項既存的工作:"
 
-#: ../modules/itip-formatter/itip-view.c:518
+#: ../modules/itip-formatter/itip-view.c:516
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s 希望加入一項既存的工作:"
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:520
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "%s 透過 %s 希望收到下列指派工作的最新資訊:"
 
-#: ../modules/itip-formatter/itip-view.c:524
+#: ../modules/itip-formatter/itip-view.c:522
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s 希望收到下列指派工作的最新資訊:"
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:526
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s 透過 %s 傳送了下列指派工作的回覆:"
 
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../modules/itip-formatter/itip-view.c:528
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s 傳送了下列指派工作的回覆:"
 
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../modules/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s 透過 %s 已經取消下列指派的工作:"
 
-#: ../modules/itip-formatter/itip-view.c:536
+#: ../modules/itip-formatter/itip-view.c:534
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s 已經取消下列指派的工作:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:538
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s 透過 %s 已經回覆下列指派工作的變更:"
 
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s 已經回覆下列指派工作的變更:"
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:544
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s 透過 %s 已婉拒了下列指派的工作:"
 
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../modules/itip-formatter/itip-view.c:546
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s 已經婉拒下列指派的工作:"
 
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:585
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s 透過 %s 已經發布了下列備忘錄:"
 
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s 已經發布了備忘錄:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:592
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s 透過 %s 希望加入一個既存的備忘錄:"
 
-#: ../modules/itip-formatter/itip-view.c:596
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s 希望加入一個既存的備忘錄:"
 
-#: ../modules/itip-formatter/itip-view.c:600
+#: ../modules/itip-formatter/itip-view.c:598
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s 透過 %s 已經消取下列共用備忘錄:"
 
-#: ../modules/itip-formatter/itip-view.c:602
+#: ../modules/itip-formatter/itip-view.c:600
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s 已經取消下列共用備忘錄:"
 
-#: ../modules/itip-formatter/itip-view.c:676
+#: ../modules/itip-formatter/itip-view.c:674
 msgid "All day:"
 msgstr "整天:"
 
-#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:680
 msgid "Start day:"
 msgstr "開始日:"
 
-#: ../modules/itip-formatter/itip-view.c:682
-#: ../modules/itip-formatter/itip-view.c:1517
+#: ../modules/itip-formatter/itip-view.c:680
+#: ../modules/itip-formatter/itip-view.c:1515
 msgid "Start time:"
 msgstr "開始時間:"
 
-#: ../modules/itip-formatter/itip-view.c:691
+#: ../modules/itip-formatter/itip-view.c:689
 msgid "End day:"
 msgstr "結束日:"
 
-#: ../modules/itip-formatter/itip-view.c:691
-#: ../modules/itip-formatter/itip-view.c:1518
+#: ../modules/itip-formatter/itip-view.c:689
+#: ../modules/itip-formatter/itip-view.c:1516
 msgid "End time:"
 msgstr "結束時間:"
 
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../modules/itip-formatter/itip-view.c:1039
 msgid "Ope_n Calendar"
 msgstr "開啟行事曆(_N)"
 
-#: ../modules/itip-formatter/itip-view.c:1044
+#: ../modules/itip-formatter/itip-view.c:1042
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1047
+#: ../modules/itip-formatter/itip-view.c:1045
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1050
+#: ../modules/itip-formatter/itip-view.c:1048
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1053
+#: ../modules/itip-formatter/itip-view.c:1051
 msgid "_Tentative"
 msgstr "暫訂(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1056
+#: ../modules/itip-formatter/itip-view.c:1054
 msgid "Acce_pt all"
 msgstr "全部接受(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1059
+#: ../modules/itip-formatter/itip-view.c:1057
 msgid "Acce_pt"
 msgstr "接受(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1062
+#: ../modules/itip-formatter/itip-view.c:1060
 msgid "Send _Information"
 msgstr "傳送資訊(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1065
+#: ../modules/itip-formatter/itip-view.c:1063
 msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1068
-#: ../smime/gui/certificate-manager.c:1664
+#: ../modules/itip-formatter/itip-view.c:1066
+#: ../smime/gui/certificate-manager.c:1666
 msgid "_Update"
 msgstr "更新(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1520
-#: ../modules/itip-formatter/itip-view.c:1568
-#: ../modules/itip-formatter/itip-view.c:1639
+#: ../modules/itip-formatter/itip-view.c:1518
+#: ../modules/itip-formatter/itip-view.c:1566
+#: ../modules/itip-formatter/itip-view.c:1637
 msgid "Comment:"
 msgstr "註解:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1556
+#: ../modules/itip-formatter/itip-view.c:1554
 msgid "Send reply to sender"
 msgstr "回覆寄件者"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1571
+#: ../modules/itip-formatter/itip-view.c:1569
 msgid "Send _updates to attendees"
 msgstr "傳送更新給到會者(_U)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1574
+#: ../modules/itip-formatter/itip-view.c:1572
 msgid "_Apply to all instances"
 msgstr "套用至所有實體(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../modules/itip-formatter/itip-view.c:1573
 msgid "Show time as _free"
 msgstr "顯示時間為空閒(_F)"
 
-#: ../modules/itip-formatter/itip-view.c:1576
+#: ../modules/itip-formatter/itip-view.c:1574
 msgid "_Preserve my reminder"
 msgstr "保留我的提醒(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1577
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "_Inherit reminder"
 msgstr "繼承提醒(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1910
+#: ../modules/itip-formatter/itip-view.c:1908
 msgid "_Tasks:"
 msgstr "工作(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1913
+#: ../modules/itip-formatter/itip-view.c:1911
 msgid "_Memos:"
 msgstr "備忘錄(_M):"
 
-#: ../modules/itip-formatter/itip-view.c:3219
+#: ../modules/itip-formatter/itip-view.c:3217
 msgid "Sa_ve"
 msgstr "儲存(_V)"
 
-#: ../modules/itip-formatter/itip-view.c:3681
-#: ../modules/itip-formatter/itip-view.c:5130
+#: ../modules/itip-formatter/itip-view.c:3679
+#: ../modules/itip-formatter/itip-view.c:5151
 msgid "Attendee status updated"
 msgstr "到會者狀態已更新"
 
-#: ../modules/itip-formatter/itip-view.c:3861
+#: ../modules/itip-formatter/itip-view.c:3859
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "行事曆 '%s' 中的約會和這個會議相衝突"
 
-#: ../modules/itip-formatter/itip-view.c:3890
+#: ../modules/itip-formatter/itip-view.c:3889
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s」中的約會"
 
-#: ../modules/itip-formatter/itip-view.c:4003
+#: ../modules/itip-formatter/itip-view.c:4024
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:4011
+#: ../modules/itip-formatter/itip-view.c:4032
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個約會"
 
-#: ../modules/itip-formatter/itip-view.c:4016
+#: ../modules/itip-formatter/itip-view.c:4037
 msgid "Unable to find this task in any task list"
 msgstr "無法在任何工作清單中找到這項工作"
 
-#: ../modules/itip-formatter/itip-view.c:4021
+#: ../modules/itip-formatter/itip-view.c:4042
 msgid "Unable to find this memo in any memo list"
 msgstr "無法在任何備忘錄清單中找到這項備忘錄"
 
-#: ../modules/itip-formatter/itip-view.c:4366
+#: ../modules/itip-formatter/itip-view.c:4387
 msgid "Opening the calendar. Please wait..."
 msgstr "正在開啟行事曆。請稍候…"
 
-#: ../modules/itip-formatter/itip-view.c:4371
+#: ../modules/itip-formatter/itip-view.c:4392
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個約會既存的版本"
 
-#: ../modules/itip-formatter/itip-view.c:4766
+#: ../modules/itip-formatter/itip-view.c:4787
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "無法傳送項目至行事曆「%s」。%s"
 
-#: ../modules/itip-formatter/itip-view.c:4781
+#: ../modules/itip-formatter/itip-view.c:4802
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "傳送至行事曆 '%s' 並設為已接受"
 
-#: ../modules/itip-formatter/itip-view.c:4786
+#: ../modules/itip-formatter/itip-view.c:4807
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "傳送至行事曆 '%s' 並設為不確定的"
 
-#: ../modules/itip-formatter/itip-view.c:4792
+#: ../modules/itip-formatter/itip-view.c:4813
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "傳送至行事曆 '%s' 並設為已婉拒"
 
-#: ../modules/itip-formatter/itip-view.c:4798
+#: ../modules/itip-formatter/itip-view.c:4819
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "傳送至行事曆「%s」並設為已取消"
 
-#: ../modules/itip-formatter/itip-view.c:4819
-#: ../modules/itip-formatter/itip-view.c:5277
-#: ../modules/itip-formatter/itip-view.c:5383
+#: ../modules/itip-formatter/itip-view.c:4840
+#: ../modules/itip-formatter/itip-view.c:5298
+#: ../modules/itip-formatter/itip-view.c:5404
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "正在將變更儲存到行事曆。請稍候…"
 
-#: ../modules/itip-formatter/itip-view.c:4860
+#: ../modules/itip-formatter/itip-view.c:4881
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
-#: ../modules/itip-formatter/itip-view.c:5053
+#: ../modules/itip-formatter/itip-view.c:5074
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-#: ../modules/itip-formatter/itip-view.c:5070
+#: ../modules/itip-formatter/itip-view.c:5091
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-#: ../modules/itip-formatter/itip-view.c:5074
+#: ../modules/itip-formatter/itip-view.c:5095
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
 
-#: ../modules/itip-formatter/itip-view.c:5122
+#: ../modules/itip-formatter/itip-view.c:5143
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新到會者。%s"
 
-#: ../modules/itip-formatter/itip-view.c:5166
+#: ../modules/itip-formatter/itip-view.c:5187
 msgid "The meeting is invalid and cannot be updated"
 msgstr "這個會議無效並且不能更新"
 
-#: ../modules/itip-formatter/itip-view.c:5242
+#: ../modules/itip-formatter/itip-view.c:5263
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得到會者狀態無法更新!"
 
-#: ../modules/itip-formatter/itip-view.c:5314
-#: ../modules/itip-formatter/itip-view.c:5353
+#: ../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 "到會者狀態不能更新,因為項目已經不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5416
+#: ../modules/itip-formatter/itip-view.c:5437
 msgid "Meeting information sent"
 msgstr "會議資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5421
+#: ../modules/itip-formatter/itip-view.c:5442
 msgid "Task information sent"
 msgstr "工作資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5426
+#: ../modules/itip-formatter/itip-view.c:5447
 msgid "Memo information sent"
 msgstr "備忘錄資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5437
+#: ../modules/itip-formatter/itip-view.c:5458
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "無法寄出會議資訊,該會議並不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5442
+#: ../modules/itip-formatter/itip-view.c:5463
 msgid "Unable to send task information, the task does not exist"
 msgstr "無法寄出工作資訊,該項工作不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5447
+#: ../modules/itip-formatter/itip-view.c:5468
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "無法寄出備忘錄資訊,該備忘錄並不存在"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5512
+#: ../modules/itip-formatter/itip-view.c:5533
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5517
+#: ../modules/itip-formatter/itip-view.c:5538
 msgid "Save Calendar"
 msgstr "儲存行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:5566
-#: ../modules/itip-formatter/itip-view.c:5579
+#: ../modules/itip-formatter/itip-view.c:5587
+#: ../modules/itip-formatter/itip-view.c:5600
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../modules/itip-formatter/itip-view.c:5567
-#: ../modules/itip-formatter/itip-view.c:5580
+#: ../modules/itip-formatter/itip-view.c:5588
+#: ../modules/itip-formatter/itip-view.c:5601
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "此郵件宣告其含有行事曆內容,但其行事曆並非有效的 iCalendar。"
 
-#: ../modules/itip-formatter/itip-view.c:5622
-#: ../modules/itip-formatter/itip-view.c:5652
-#: ../modules/itip-formatter/itip-view.c:5753
+#: ../modules/itip-formatter/itip-view.c:5643
+#: ../modules/itip-formatter/itip-view.c:5673
+#: ../modules/itip-formatter/itip-view.c:5774
 msgid "The item in the calendar is not valid"
 msgstr "行事曆中的項目是無效的"
 
-#: ../modules/itip-formatter/itip-view.c:5623
-#: ../modules/itip-formatter/itip-view.c:5653
-#: ../modules/itip-formatter/itip-view.c:5754
+#: ../modules/itip-formatter/itip-view.c:5644
+#: ../modules/itip-formatter/itip-view.c:5674
+#: ../modules/itip-formatter/itip-view.c:5775
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 "此郵件確實含有行事曆內容,但該內容並未包含任何事件、工作或空閒/忙碌資訊"
 
-#: ../modules/itip-formatter/itip-view.c:5668
+#: ../modules/itip-formatter/itip-view.c:5689
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容含有多個項目"
 
-#: ../modules/itip-formatter/itip-view.c:5669
+#: ../modules/itip-formatter/itip-view.c:5690
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要處理這些全部的項目,應該將此檔案儲存後匯入其中的行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:6171
+#: ../modules/itip-formatter/itip-view.c:6193
 msgctxt "cal-itip"
 msgid "None"
 msgstr "沒有"
 
-#: ../modules/itip-formatter/itip-view.c:6187
+#: ../modules/itip-formatter/itip-view.c:6209
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: ../modules/itip-formatter/itip-view.c:6347
+#: ../modules/itip-formatter/itip-view.c:6369
 msgid "This meeting recurs"
 msgstr "這個會議的週期規則為"
 
-#: ../modules/itip-formatter/itip-view.c:6350
+#: ../modules/itip-formatter/itip-view.c:6372
 msgid "This task recurs"
 msgstr "這項工作的週期規則為"
 
-#: ../modules/itip-formatter/itip-view.c:6353
+#: ../modules/itip-formatter/itip-view.c:6375
 msgid "This memo recurs"
 msgstr "這個備忘錄的週期規則為"
 
@@ -20332,45 +20613,19 @@ msgstr "這個會議已委派"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "「{0}」已代理此會議。是否還要加入代理人「{1}」?"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:81
-msgid "Meeting Invitations"
-msgstr "會議邀請"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:107
-msgid "_Delete message after acting"
-msgstr "完成後刪除郵件(_D)"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:121
-#: ../modules/itip-formatter/plugin/config-ui.c:152
-msgid "Conflict Search"
-msgstr "衝突的搜尋"
-
-#. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:136
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "選擇要搜尋會議衝突的行事曆"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Itip 格式器"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "顯示郵件中的「text/calendar」 MIME 部分。"
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:250
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Google Features"
 msgstr "Google 功能"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:259
+#: ../modules/mail-config/e-mail-config-google-summary.c:268
 msgid "Add Google Ca_lendar to this account"
 msgstr "將 Google 日曆加入這個帳號(_L)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:267
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
 msgid "Add Google Con_tacts to this account"
 msgstr "將 Google 通訊錄加入這個帳號(_T)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:275
+#: ../modules/mail-config/e-mail-config-google-summary.c:286
 msgid "You may need to enable IMAP access"
 msgstr "您可能需要啟用 IMAP 存取"
 
@@ -20416,7 +20671,7 @@ msgstr "選擇 mbox 排程器目錄"
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:92
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
-msgstr "組態"
+msgstr "設定"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:154
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:110
@@ -20495,7 +20750,7 @@ msgstr "Yahoo! 功能"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "將 Yahoo! 行事曆與工作加入這個帳號(_L)"
 
-#: ../modules/mail/e-mail-attachment-handler.c:424
+#: ../modules/mail/e-mail-attachment-handler.c:440
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -20683,10 +20938,8 @@ msgid "Go to _Folder"
 msgstr "前往資料夾(_F)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1767
-#, fuzzy
-#| msgid "Click here to select folders to post to"
 msgid "Opens a dialog to select a folder to go to"
-msgstr "按一下這裡,選取要張貼的資料夾"
+msgstr "開啟對話盒選取要移至的資料夾"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
@@ -20920,24 +21173,12 @@ msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1058
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d 封未讀,"
-
 #: ../modules/mail/e-mail-shell-view-private.c:1063
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d 封未讀"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1068
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "共 %d 封"
-
 #: ../modules/mail/e-mail-shell-view-private.c:1581
 msgid "Send / Receive"
 msgstr "傳送/接收"
@@ -20954,19 +21195,19 @@ msgstr "資料夾"
 msgid "Recipient"
 msgstr "收件人"
 
-#: ../modules/mail/em-composer-prefs.c:1199
+#: ../modules/mail/em-composer-prefs.c:1205
 msgid "Keep in Outbox"
 msgstr "保留在寄件匣"
 
-#: ../modules/mail/em-composer-prefs.c:1200
+#: ../modules/mail/em-composer-prefs.c:1206
 msgid "Send immediately"
 msgstr "立刻傳送"
 
-#: ../modules/mail/em-composer-prefs.c:1201
+#: ../modules/mail/em-composer-prefs.c:1207
 msgid "Send after 5 minutes"
 msgstr "5 分鐘後傳送"
 
-#: ../modules/mail/em-composer-prefs.c:1274
+#: ../modules/mail/em-composer-prefs.c:1280
 msgid "Language(s)"
 msgstr "語言"
 
@@ -21072,20 +21313,20 @@ msgstr "外掛程式管理員"
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意:某些變更在重新啟動後才會生效"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:297
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
 msgid "Overview"
 msgstr "概覽"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:366
-#: ../modules/plugin-manager/evolution-plugin-manager.c:449
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
 msgid "Plugin"
 msgstr "外掛程式"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
 msgid "_Plugins"
 msgstr "外掛程式(_P)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "Enable and disable plugins"
 msgstr "啟用與停用外掛程式"
 
@@ -21493,11 +21734,11 @@ msgstr "將部分顯示為通訊錄連絡人"
 msgid "Evolution Web Inspector"
 msgstr "Evolution 網頁檢查器"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:123
+#: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "不要再顯示這個訊息(_D)"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/attachment-reminder/attachment-reminder.c:465
 #: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "關鍵字"
@@ -21549,7 +21790,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"
@@ -21684,8 +21925,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "當編輯新郵件時自動執行(_A)"
 
-#: ../plugins/external-editor/external-editor.c:469
-#: ../plugins/external-editor/external-editor.c:471
+#: ../plugins/external-editor/external-editor.c:484
+#: ../plugins/external-editor/external-editor.c:486
 msgid "Compose in External Editor"
 msgstr "在外部編輯器中撰寫"
 
@@ -21728,23 +21969,27 @@ msgid ""
 "closed as long as the editor is active."
 msgstr "外部編輯器仍在執行中。只要該編輯器仍在使用,郵件編輯器視窗就不能關閉。"
 
-#: ../plugins/face/face.c:288
+#: ../plugins/face/face.c:294
 msgid "Select a Face Picture"
-msgstr "選擇一張大頭照圖片"
+msgstr "選擇一張大頭照影像"
 
-#: ../plugins/face/face.c:298
+#: ../plugins/face/face.c:304
 msgid "Image files"
-msgstr "圖片檔案"
+msgstr "影像檔案"
 
-#: ../plugins/face/face.c:357
+#: ../plugins/face/face.c:392
 msgid "_Insert Face picture by default"
 msgstr "預設插入大頭照(_I)"
 
-#: ../plugins/face/face.c:370
+#: ../plugins/face/face.c:405
 msgid "Load new _Face picture"
 msgstr "載入新的大頭照(_F)"
 
-#: ../plugins/face/face.c:431
+#: ../plugins/face/face.c:449
+msgid "Change Face Image"
+msgstr "改變大頭照"
+
+#: ../plugins/face/face.c:537
 msgid "Include _Face"
 msgstr "包含大頭照(_F)"
 
@@ -21762,19 +22007,34 @@ msgstr "不能讀取這個檔案"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
 msgid "Invalid Image Size"
-msgstr "無效的圖片大小"
+msgstr "無效的影像大小"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
-msgstr "請選擇尺寸為 48*48 的圖片"
+msgid ""
+"Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+"exceed 723 bytes."
+msgstr "請選擇尺寸為 48 * 48 像素的 PNG 影像,整個檔案容量不超過 723 位元組。"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "Not an image"
-msgstr "不是圖片檔"
+msgid "Incorrect Face Image Byte Size"
+msgstr "不正確的大頭照位元組容量"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
-msgstr "您選取的檔案似乎不是有效的 .png 圖片。錯誤:{0}"
+msgid ""
+"The Face image size is {0} bytes, while it should not be more than 723 "
+"bytes. Please select a PNG image of size 48 * 48 pixels, whose file size "
+"doesn't exceed 723 bytes."
+msgstr ""
+"大頭照影像容量為 {0} 位元組,但它不能超過 723 位元組。請選擇尺寸為 48 * 48 像"
+"素的 PNG 影像,整個檔案容量不超過 723 位元組。"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:7
+msgid "Not an image"
+msgstr "不是影像檔"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:8
+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
 msgid "Get List _Archive"
@@ -21912,8 +22172,8 @@ msgstr ""
 "\n"
 "標頭: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:394
-#: ../plugins/mail-notification/mail-notification.c:430
+#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:436
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -21921,54 +22181,54 @@ msgstr[0] "您已經接收 %d 封郵件 。 "
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:405
+#: ../plugins/mail-notification/mail-notification.c:411
 #, c-format
 msgid "From: %s"
 msgstr "寄件者:%s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:419
+#: ../plugins/mail-notification/mail-notification.c:425
 #, c-format
 msgid "Subject: %s"
 msgstr "主旨:%s"
 
-#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:442
 msgid "New email in Evolution"
 msgstr "在 Evolution 中的新郵件"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:471
+#: ../plugins/mail-notification/mail-notification.c:483
 #, c-format
 msgid "Show %s"
 msgstr "顯示 %s"
 
-#: ../plugins/mail-notification/mail-notification.c:673
+#: ../plugins/mail-notification/mail-notification.c:685
 msgid "_Play sound when a new message arrives"
 msgstr "當新郵件到達時播放聲音檔案(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:705
+#: ../plugins/mail-notification/mail-notification.c:717
 msgid "_Beep"
 msgstr "嗶聲(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:718
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "Use sound _theme"
 msgstr "使用音效主題(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:737
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Play _file:"
 msgstr "播放檔案(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:746
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Select sound file"
 msgstr "選擇聲音檔案"
 
-#: ../plugins/mail-notification/mail-notification.c:802
+#: ../plugins/mail-notification/mail-notification.c:835
 msgid "Notify new messages for _Inbox only"
 msgstr "只通知收件匣的新郵件(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:812
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Show _notification when a new message arrives"
 msgstr "當新郵件到達時顯示通知(_N)"
 
@@ -22299,7 +22559,7 @@ msgid "_Username:"
 msgstr "使用者名稱(_U):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:772
+#: ../smime/gui/certificate-manager.c:774
 msgid "_Password:"
 msgstr "密碼(_P):"
 
@@ -22311,7 +22571,7 @@ msgstr "記住密碼(_R)"
 msgid "Publishing Location"
 msgstr "發布位置"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-fb.c:84
 #: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
@@ -22490,7 +22750,7 @@ msgstr "準備結束"
 msgid "Preparing to quit..."
 msgstr "準備結束…"
 
-#: ../shell/e-shell.c:915
+#: ../shell/e-shell.c:1024
 msgid "Credentials are required to connect to the destination host."
 msgstr "連線到目的端主機需要憑證。"
 
@@ -22506,19 +22766,19 @@ msgstr "儲存搜尋結果"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:930
+#: ../shell/e-shell-searchbar.c:926
 msgid "Sho_w:"
 msgstr "顯示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:955
+#: ../shell/e-shell-searchbar.c:951
 msgid "Sear_ch:"
 msgstr "搜尋(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1023
+#: ../shell/e-shell-searchbar.c:1019
 msgid "i_n"
 msgstr "於(_N)"
 
@@ -22826,19 +23086,19 @@ 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:505
+#: ../shell/e-shell-window.c:555
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "新增"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:640
+#: ../shell/e-shell-window-private.c:632
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:183
+#: ../shell/main.c:199
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -22873,7 +23133,7 @@ msgstr ""
 "我們希望您享受工作成果,而且我們\n"
 "熱切希望您提供意見!\n"
 
-#: ../shell/main.c:207
+#: ../shell/main.c:223
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -22881,13 +23141,13 @@ msgstr ""
 "謝謝\n"
 "Evolution 小組敬上\n"
 
-#: ../shell/main.c:213
+#: ../shell/main.c:229
 msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:302
+#: ../shell/main.c:318
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -22895,50 +23155,50 @@ msgstr ""
 "啟動 Evolution 時以指定的元件顯示。可用的選項有「mail」、「calendar」、"
 "「contacts」、「tasks」和「memos」"
 
-#: ../shell/main.c:306
+#: ../shell/main.c:322
 msgid "Apply the given geometry to the main window"
 msgstr "將指定的尺寸套用到主視窗"
 
-#: ../shell/main.c:310
+#: ../shell/main.c:326
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:328
 msgid "Ignore network availability"
 msgstr "忽略網際網路是否可用"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:331
 msgid "Forcibly shut down Evolution"
 msgstr "強制關閉 Evoultion"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:334
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:336
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "停用郵件、連絡人和工作的預覽窗格。"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:340
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "將指定的 URI 或檔案名稱匯入為接下來的引數。"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:342
 msgid "Request a running Evolution process to quit"
 msgstr "要求執行中的 Evolution 程序結束"
 
-#: ../shell/main.c:403
+#: ../shell/main.c:419
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 msgstr "不能啟動 Evolution。可能有另一個 Evolution 實體沒有回應。系統錯誤:%s"
 
-#: ../shell/main.c:457 ../shell/main.c:462
+#: ../shell/main.c:473 ../shell/main.c:478
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
-#: ../shell/main.c:520
+#: ../shell/main.c:536
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -22947,7 +23207,7 @@ msgstr ""
 "%s: --online 和 --offline 不能一起使用。\n"
 "  使用 '%s --help' 取得進一步資訊。\n"
 
-#: ../shell/main.c:526
+#: ../shell/main.c:542
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -23022,7 +23282,7 @@ msgid "Failed to invoke authenticate for '{0}'"
 msgstr "無法呼叫「{0}」的核對"
 
 #: ../shell/shell.error.xml.h:17
-msgid "Failed to connect to '{0}'"
+msgid "Failed to connect '{0}'"
 msgstr "無法連線至「{0}」"
 
 #: ../shell/shell.error.xml.h:18
@@ -23030,21 +23290,61 @@ msgid "_Reconnect"
 msgstr "重新連接(_R)"
 
 #: ../shell/shell.error.xml.h:19
+msgid "Failed to connect address book '{0}'"
+msgstr "無法連線至通訊錄「{0}」"
+
+#: ../shell/shell.error.xml.h:20
+msgid "Failed to connect calendar '{0}'"
+msgstr "無法連線至行事曆「{0}」"
+
+#: ../shell/shell.error.xml.h:21
+msgid "Failed to connect mail account '{0}'"
+msgstr "無法連線至帳號「{0}」"
+
+#: ../shell/shell.error.xml.h:22
+msgid "Failed to connect memo list '{0}'"
+msgstr "無法連線至備忘錄清單「{0}」"
+
+#: ../shell/shell.error.xml.h:23
+msgid "Failed to connect task list '{0}'"
+msgstr "無法連線至工作清單「{0}」"
+
+#: ../shell/shell.error.xml.h:24
 msgid "Failed to prompt for credentials for '{0}'"
 msgstr "無法提示「{0}」的憑證"
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:25
 msgid "Failed to finish trust prompt for '{0}'"
 msgstr "無法結束「{0}」的信任提示"
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:26
 msgid "SSL certificate for '{0}' is not trusted."
 msgstr "「{0}」的 SSL 憑證不受信任。"
 
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:27
 msgid "Reason: {1}"
 msgstr "原因:{1}"
 
+#: ../shell/shell.error.xml.h:29
+msgid "SSL certificate for address book '{0}' is not trusted."
+msgstr "通訊錄「{0}」的 SSL 憑證不受信任。"
+
+#: ../shell/shell.error.xml.h:30
+msgid "SSL certificate for calendar '{0}' is not trusted."
+msgstr "行事曆「{0}」的 SSL 憑證不受信任。"
+
+#: ../shell/shell.error.xml.h:31
+msgid "SSL certificate for mail account '{0}' is not trusted."
+msgstr "郵件帳號「{0}」的 SSL 憑證不受信任。"
+
+#: ../shell/shell.error.xml.h:32
+msgid "SSL certificate for memo list '{0}' is not trusted."
+msgstr "備忘錄清單「{0}」的 SSL 憑證不受信任。"
+
+#: ../shell/shell.error.xml.h:33
+msgid "SSL certificate for task list '{0}' is not trusted."
+msgstr "工作清單「{0}」的 SSL 憑證不受信任。"
+
 #: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
@@ -23056,72 +23356,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 指紋"
@@ -23131,7 +23419,7 @@ msgstr "MD5 指紋"
 msgid "Email Address"
 msgstr "電子郵件位址"
 
-#: ../smime/gui/certificate-manager.c:650
+#: ../smime/gui/certificate-manager.c:652
 msgid "Select a file to backup your key and certificate..."
 msgstr "選擇用來備份您的金鑰與憑證的檔案…"
 
@@ -23140,36 +23428,31 @@ msgstr "選擇用來備份您的金鑰與憑證的檔案…"
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:662
+#: ../smime/gui/certificate-manager.c:664
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-backup.p12"
 
-#: ../smime/gui/certificate-manager.c:676
-#: ../smime/gui/certificate-manager.c:965
-msgid "All files"
-msgstr "所有檔案"
-
-#: ../smime/gui/certificate-manager.c:728
+#: ../smime/gui/certificate-manager.c:730
 msgid "Backup Certificate"
 msgstr "備份憑證"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:742
+#: ../smime/gui/certificate-manager.c:744
 msgid "_File name:"
 msgstr "檔案名稱(_F):"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:747
+#: ../smime/gui/certificate-manager.c:749
 msgid "Please select a file..."
 msgstr "請選擇檔案…"
 
-#: ../smime/gui/certificate-manager.c:761
+#: ../smime/gui/certificate-manager.c:763
 msgid "_Include certificate chain in the backup"
 msgstr "備份中包含憑證鏈(_I)"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:767
+#: ../smime/gui/certificate-manager.c:769
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -23178,16 +23461,16 @@ msgstr ""
 "您在這裡設定的憑證備份密碼可以保護即將建立的備份檔案。\n"
 "您必須設定這個密碼才能繼續備份。"
 
-#: ../smime/gui/certificate-manager.c:786
+#: ../smime/gui/certificate-manager.c:788
 msgid "_Repeat Password:"
 msgstr "重複密碼(_R):"
 
-#: ../smime/gui/certificate-manager.c:805
+#: ../smime/gui/certificate-manager.c:807
 msgid "Passwords do not match"
 msgstr "密碼不相符"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:813
+#: ../smime/gui/certificate-manager.c:815
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -23198,134 +23481,134 @@ msgstr ""
 "如果您忘記您的憑證備份密碼,您將無法在稍後還原這個備份。\n"
 "請將它保存在安全的地方。"
 
-#: ../smime/gui/certificate-manager.c:858
+#: ../smime/gui/certificate-manager.c:860
 msgid "No file name provided"
 msgstr "沒有提供檔案名稱"
 
-#: ../smime/gui/certificate-manager.c:862
+#: ../smime/gui/certificate-manager.c:864
 msgid "Failed to backup key and certificate"
 msgstr "無法備份您的金鑰與憑證"
 
-#: ../smime/gui/certificate-manager.c:951
+#: ../smime/gui/certificate-manager.c:953
 msgid "Select a certificate to import..."
 msgstr "選取要匯入的憑證…"
 
-#: ../smime/gui/certificate-manager.c:1001
+#: ../smime/gui/certificate-manager.c:1003
 msgid "Failed to import certificate"
 msgstr "無法匯入憑證"
 
-#: ../smime/gui/certificate-manager.c:1117
+#: ../smime/gui/certificate-manager.c:1119
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "使用時詢問"
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1121
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "永不"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1123
 msgctxt "CamelTrust"
-msgid "Marginal"
-msgstr "勉強"
+msgid "Marginally"
+msgstr "勉強的"
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1125
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "完全"
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1127
 msgctxt "CamelTrust"
-msgid "Ultimate"
-msgstr "徹底"
+msgid "Ultimately"
+msgstr "徹底的"
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1129
 msgctxt "CamelTrust"
-msgid "Temporary"
-msgstr "暫時"
+msgid "Temporarily"
+msgstr "暫時的"
 
-#: ../smime/gui/certificate-manager.c:1333
+#: ../smime/gui/certificate-manager.c:1335
 msgid "Change certificate trust"
 msgstr "改變憑證信任度"
 
-#: ../smime/gui/certificate-manager.c:1345
+#: ../smime/gui/certificate-manager.c:1347
 #, c-format
 msgid "Change trust for the host '%s':"
 msgstr "改變主機「%s」的憑證信任度:"
 
-#: ../smime/gui/certificate-manager.c:1369
+#: ../smime/gui/certificate-manager.c:1371
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "使用時詢問(_A)"
 
-#: ../smime/gui/certificate-manager.c:1370
+#: ../smime/gui/certificate-manager.c:1372
 msgctxt "CamelTrust"
-msgid "_Temporary (this session only)"
-msgstr "暫時(只在此作業階段) (_T)"
+msgid "_Never trust this certificate"
+msgstr "永遠不信任憑證(_N)"
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1373
 msgctxt "CamelTrust"
-msgid "_Never"
-msgstr "永不(_N)"
+msgid "_Temporarily trusted (this session only)"
+msgstr "暫時信任(只在此作業階段) (_T)"
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1374
 msgctxt "CamelTrust"
-msgid "_Marginal"
-msgstr "勉強(_M)"
+msgid "_Marginally trusted"
+msgstr "最低限度信任(_M)"
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../smime/gui/certificate-manager.c:1375
 msgctxt "CamelTrust"
-msgid "_Fully"
-msgstr "完全(_F)"
+msgid "_Fully trusted"
+msgstr "完整信任(_F)"
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1376
 msgctxt "CamelTrust"
-msgid "_Ultimate"
-msgstr "徹底(_U)"
+msgid "_Ultimately trusted"
+msgstr "絕對信任(_U)"
 
-#: ../smime/gui/certificate-manager.c:1378
+#: ../smime/gui/certificate-manager.c:1380
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
 msgstr "信任此網站之前,如果可以的話,您應該先檢查它的憑證以及它的政策和程序。"
 
-#: ../smime/gui/certificate-manager.c:1393
+#: ../smime/gui/certificate-manager.c:1395
 msgid "_Display certificate"
 msgstr "顯示憑證(_D)"
 
-#: ../smime/gui/certificate-manager.c:1598
+#: ../smime/gui/certificate-manager.c:1600
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "您已經擁有相關憑證檔案的,可以識別這些郵件伺服器:"
 
-#: ../smime/gui/certificate-manager.c:1629
+#: ../smime/gui/certificate-manager.c:1631
 msgid "Host name"
 msgstr "主機名稱"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../smime/gui/certificate-manager.c:1633
 msgid "Issuer"
 msgstr "簽發者"
 
-#: ../smime/gui/certificate-manager.c:1632
+#: ../smime/gui/certificate-manager.c:1634
 msgid "Fingerprint"
 msgstr "指紋"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1635
 msgid "Trust"
 msgstr "信任"
 
-#: ../smime/gui/certificate-manager.c:1654
+#: ../smime/gui/certificate-manager.c:1656
 msgid "_Edit Trust"
 msgstr "編輯信任度(_E)"
 
-#: ../smime/gui/certificate-manager.c:1973
+#: ../smime/gui/certificate-manager.c:1975
 msgid "All PKCS12 files"
 msgstr "所有的 PKCS12 檔案"
 
-#: ../smime/gui/certificate-manager.c:1990
+#: ../smime/gui/certificate-manager.c:1992
 msgid "All email certificate files"
 msgstr "所有的電子郵件憑證檔案"
 
-#: ../smime/gui/certificate-manager.c:2007
+#: ../smime/gui/certificate-manager.c:2009
 msgid "All CA certificate files"
 msgstr "所有的 CA 憑證檔案"
 
@@ -23577,63 +23860,3 @@ msgstr "到期日(_D):"
 #: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "設定狀態(_S)"
-
-#~ msgid "Completed On"
-#~ msgstr "已完成於"
-
-#~ msgid "is set"
-#~ msgstr "設定"
-
-#~ msgid "is not set"
-#~ msgstr "未設定"
-
-#~ msgid "Loading Images"
-#~ msgstr "正在載入圖片"
-
-#~ msgid "Please select a valid backup file to restore."
-#~ msgstr "請選擇有效的備份檔案來還原。"
-
-#~ msgid "HTTP Error: %s"
-#~ msgstr "HTTP 錯誤: %s"
-
-#~ msgid "Could not parse response"
-#~ msgstr "無法解析回應"
-
-#~ msgid "Empty response"
-#~ msgstr "空白的回應"
-
-#~ msgid "Unexpected reply from server"
-#~ msgstr "來自伺服器未預期的回應"
-
-#~ msgid "Could not locate user's calendars"
-#~ msgstr "無法定位使用者行事曆"
-
-#~ msgid "Path"
-#~ msgstr "路徑"
-
-#~ msgid "Template:"
-#~ msgstr "樣板:"
-
-#~ msgid "E_nable"
-#~ msgstr "啟用(_E)"
-
-#~ msgid "Unicode smilyes"
-#~ msgstr "萬國碼表情符號"
-
-#~ msgid "Invalid authentication result code (%d)"
-#~ msgstr "無效的核對結果代碼 (%d)"
-
-#~ msgid "Unknown background operation"
-#~ msgstr "不明的背景操作"
-
-#~ msgid "Try _setup account automatically, based on Email Address"
-#~ msgstr "嘗試以電子郵件位址自動設定帳號(_S)"
-
-#~ msgid "Enter Google password for user '%s'."
-#~ msgstr "輸入使用者「%s」的 Google 密碼。"
-
-#~ msgid "User declined to provide a password"
-#~ msgstr "使用者需要輸入密碼"
-
-#~ msgid "_PostScript"
-#~ msgstr "_PostScript"


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