[evolution] Updated Chinese (Taiwan) translation



commit fb7ec69c12f51324b679cca1c2bd3c056cf7cc2d
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Jul 16 02:36:18 2016 +0000

    Updated Chinese (Taiwan) translation

 po/zh_TW.po | 3074 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1592 insertions(+), 1482 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 07637bd..d2710d4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: evolution 3.3.91\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2016-02-09 18:35+0800\n"
-"PO-Revision-Date: 2016-02-09 18:43+0800\n"
+"POT-Creation-Date: 2016-07-04 10:29+0000\n"
+"PO-Revision-Date: 2016-07-14 15:32+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"
@@ -84,7 +84,7 @@ msgid "This address book will be removed permanently."
 msgstr "此通訊錄將被永遠移除。"
 
 #: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Do _Not Delete"
 msgstr "不要刪除(_N)"
 
@@ -189,10 +189,10 @@ msgstr "此連絡人的電子郵件地址已經存在。您無論如何都要加
 #: ../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:58 ../modules/mail/em-composer-prefs.c:417
-#: ../plugins/attachment-reminder/attachment-reminder.c:438
+#: ../plugins/attachment-reminder/attachment-reminder.c:457
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../plugins/templates/templates.c:453
+#: ../plugins/templates/templates.c:470
 msgid "_Add"
 msgstr "加入(_A)"
 
@@ -315,7 +315,7 @@ msgid "Instant Messaging"
 msgstr "即時通訊"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:979
+#: ../addressbook/importers/evolution-vcard-importer.c:983
 msgid "Contact"
 msgstr "連絡人"
 
@@ -324,7 +324,7 @@ msgid "_Home Page:"
 msgstr "首頁(_H):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/e-comp-editor-event.c:621
+#: ../calendar/gui/e-comp-editor-event.c:631
 #: ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
@@ -415,18 +415,19 @@ msgstr "週年紀念日(_A):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../calendar/gui/e-calendar-view.c:2037
+#: ../calendar/gui/e-calendar-view.c:2044
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../calendar/gui/e-calendar-view.c:2036
+#: ../calendar/gui/e-calendar-view.c:2043
 msgid "Birthday"
 msgstr "生日"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "雜項"
 
@@ -478,7 +479,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:3807
+#: ../calendar/gui/e-cal-model.c:3825
 msgid "Other"
 msgstr "其他"
 
@@ -509,11 +510,11 @@ msgstr "加入 _X.509"
 #: ../e-util/filter.ui.h:18 ../mail/e-mail-label-manager.c:391
 #: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630
 #: ../mail/mail-config.ui.h:59
-#: ../plugins/attachment-reminder/attachment-reminder.c:448
+#: ../plugins/attachment-reminder/attachment-reminder.c:467
 #: ../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
+#: ../plugins/templates/templates.c:480
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -529,14 +530,14 @@ msgstr "載入 X.509 (_L)"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2103
+#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2106
 #: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
 #: ../e-util/e-attachment-store.c:641
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3318
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3334
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
-#: ../smime/gui/certificate-manager.c:655
-#: ../smime/gui/certificate-manager.c:732
+#: ../smime/gui/certificate-manager.c:668
+#: ../smime/gui/certificate-manager.c:745
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -546,15 +547,15 @@ msgid "Certificates"
 msgstr "憑證"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/e-comp-editor.c:2000 ../calendar/gui/e-comp-editor.c:2072
+#: ../calendar/gui/e-comp-editor.c:2003 ../calendar/gui/e-comp-editor.c:2075
 #: ../e-util/e-preferences-window.c:382 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell.c:1223 ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:955
 msgid "_Help"
 msgstr "求助(_H)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1997
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1998
 #: ../mail/mail-config.ui.h:37
 msgid "Options"
 msgstr "選項"
@@ -574,14 +575,14 @@ msgstr "選項"
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1365
 #: ../calendar/gui/e-cal-dialogs.c:689
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
 #: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:359
 #: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:496
 #: ../e-util/e-attachment-store.c:640 ../e-util/e-attachment-view.c:421
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:593 ../e-util/e-html-editor-actions.c:688
+#: ../e-util/e-html-editor-actions.c:589 ../e-util/e-html-editor-actions.c:684
 #: ../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
@@ -589,12 +590,12 @@ msgstr "選項"
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3317
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3333
 #: ../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.error.xml.h:18
-#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:16
+#: ../mail/mail-send-recv.c:746 ../mail/mail-send-recv.c:828
 #: ../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
@@ -604,10 +605,10 @@ msgstr "選項"
 #: ../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:72
-#: ../shell/e-shell-utils.c:136 ../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
+#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:667
+#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:968
+#: ../smime/gui/certificate-manager.c:1350 ../smime/gui/e-cert-selector.c:237
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -657,22 +658,22 @@ msgid "Show Certificates"
 msgstr "顯示憑證"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/e-comp-editor.c:2035 ../e-util/e-html-editor-actions.c:1111
+#: ../calendar/gui/e-comp-editor.c:2038 ../e-util/e-html-editor-actions.c:1108
 msgid "_Undo"
 msgstr "復原(_U)"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/e-comp-editor.c:2037 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2040 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "復原"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/e-comp-editor.c:2042 ../e-util/e-html-editor-actions.c:1097
+#: ../calendar/gui/e-comp-editor.c:2045 ../e-util/e-html-editor-actions.c:1094
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/e-comp-editor.c:2044 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2047 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "取消復原"
 
@@ -704,8 +705,8 @@ 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
+#: ../smime/gui/certificate-manager.c:691
+#: ../smime/gui/certificate-manager.c:980
 msgid "All files"
 msgstr "所有檔案"
 
@@ -720,9 +721,9 @@ 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:494 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:594 ../e-util/e-html-editor-actions.c:689
+#: ../e-util/e-html-editor-actions.c:590 ../e-util/e-html-editor-actions.c:685
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
-#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
+#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:969
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -804,7 +805,7 @@ msgstr "無效的連絡人。"
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:304
 #: ../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
@@ -821,7 +822,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:180 ../smime/gui/certificate-manager.c:1338
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1351
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "OK"
@@ -1015,7 +1016,7 @@ msgstr "任何欄位包含"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:94
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+#: ../addressbook/gui/widgets/ea-minicard-view.c:225
 msgid "evolution address book"
 msgstr "evolution 通訊錄"
 
@@ -1134,7 +1135,7 @@ msgid "Video Chat"
 msgstr "視訊交談"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:827
-#: ../e-util/e-send-options.c:546
+#: ../data/evolution.desktop.in.in.h:9 ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:199
 #: ../modules/calendar/e-cal-shell-view.c:579
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
@@ -1205,7 +1206,12 @@ msgid "Blog"
 msgstr "部落格"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:261
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-cal-component-preview.c:308
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3588 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/mail-send-recv.c:967
 msgid "Cancelled"
 msgstr "已取消"
 
@@ -1431,7 +1437,7 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "您確定要刪除這個連絡人 (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1366
-#: ../calendar/gui/e-comp-editor.c:1993 ../e-util/e-focus-tracker.c:785
+#: ../calendar/gui/e-comp-editor.c:1996 ../e-util/e-focus-tracker.c:785
 #: ../e-util/evolution-source-viewer.c:805 ../mail/e-mail-account-manager.c:736
 #: ../modules/addressbook/e-book-shell-view-actions.c:1089
 #: ../modules/calendar/e-cal-shell-view-actions.c:1479
@@ -1439,7 +1445,7 @@ msgstr "您確定要刪除這個連絡人 (%s)?"
 #: ../modules/calendar/e-task-shell-view-actions.c:832
 #: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:813
-#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/certificate-manager.c:1674 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "刪除(_D)"
 
@@ -1571,7 +1577,7 @@ msgid "Title"
 msgstr "頭銜"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:659
+#: ../calendar/gui/e-meeting-list-view.c:660
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "角色"
@@ -1603,7 +1609,7 @@ msgstr "連絡人列表: "
 msgid "Contact: "
 msgstr "連絡人: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:187
+#: ../addressbook/gui/widgets/ea-minicard.c:182
 msgid "evolution minicard"
 msgstr "Evolution 迷你名片"
 
@@ -1615,7 +1621,7 @@ msgstr "新增連絡人"
 msgid "New Contact List"
 msgstr "新增連絡人列表"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#: ../addressbook/gui/widgets/ea-minicard-view.c:208
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1638,7 +1644,7 @@ msgstr "拉遠(_O)"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-actions.c:2103
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
@@ -1702,52 +1708,60 @@ msgstr ""
 "\n"
 "沒有項目可供這種檢視方式顯示。"
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:548
+#: ../addressbook/importers/evolution-csv-importer.c:747
+#: ../addressbook/importers/evolution-ldif-importer.c:549
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:485
-#: ../calendar/importers/icalendar-importer.c:980
-#: ../calendar/importers/icalendar-importer.c:1019 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:481
+#: ../calendar/importers/icalendar-importer.c:978
+#: ../calendar/importers/icalendar-importer.c:1018 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "匯入…"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1089
+#: ../addressbook/importers/evolution-csv-importer.c:929
+msgid "Can't open .csv file"
+msgstr "不能開啟 .csv 檔案"
+
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook 連絡人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook 連絡人 CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1098
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla 連絡人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla 連絡人 CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1107
+#: ../addressbook/importers/evolution-csv-importer.c:1116
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution 連絡人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1108
+#: ../addressbook/importers/evolution-csv-importer.c:1117
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution 連絡人 CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:814
+#: ../addressbook/importers/evolution-ldif-importer.c:719
+msgid "Can't open .ldif file"
+msgstr "不能開啟 .ldif 檔案"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:821
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 資料交換格式 (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:815
+#: ../addressbook/importers/evolution-ldif-importer.c:822
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸入器"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:642
+#: ../addressbook/importers/evolution-vcard-importer.c:646
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf、.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:643
+#: ../addressbook/importers/evolution-vcard-importer.c:647
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard 匯入程式"
 
@@ -1758,49 +1772,6 @@ msgstr "Evolution vCard 匯入程式"
 msgid "Page %d"
 msgstr "第 %d 頁"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:54
-msgid "Specify the output file instead of standard output"
-msgstr "指定輸出檔案而不是標準輸出"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:55
-msgid "OUTPUTFILE"
-msgstr "輸出檔案"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:58
-msgid "List local address book folders"
-msgstr "列出本地通訊錄資料夾"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:61
-msgid "Show cards as vcard or csv file"
-msgstr "將名片顯示成 vcard 或 csv 檔案"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:62
-msgid "[vcard|csv]"
-msgstr "[vcard|csv]"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:111
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr "指令列引數錯誤,請使用 --help 選項來查看用法。"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:125
-msgid "Only support csv or vcard format."
-msgstr "僅支援 csv 或 vcard 格式。"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:156
-msgid "Unhandled error"
-msgstr "未處理的錯誤"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-msgid "Can not open file"
-msgstr "無法開啟檔案"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
-#, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "無法開啟客戶端「%s」:%s"
-
 #: ../addressbook/util/eab-book-util.c:36
 msgctxt "addressbook-label"
 msgid "Work Email"
@@ -1939,7 +1910,7 @@ msgid "Start time"
 msgstr "開始時刻"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1949
+#: ../calendar/alarm-notify/alarm-queue.c:1947
 msgid "Appointments"
 msgstr "會議"
 
@@ -1953,15 +1924,15 @@ msgstr "延期(_S)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/e-comp-editor-page-general.c:1365
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2240
-#: ../calendar/gui/e-comp-editor.c:2058 ../e-util/e-html-editor-actions.c:1120
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2241
+#: ../calendar/gui/e-comp-editor.c:2061 ../e-util/e-html-editor-actions.c:1117
 #: ../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:173
 #: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
-#: ../plugins/attachment-reminder/attachment-reminder.c:443
+#: ../plugins/attachment-reminder/attachment-reminder.c:462
 #: ../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:941
+#: ../plugins/templates/templates.c:475 ../shell/e-shell-window-actions.c:941
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "編輯(_E)"
@@ -1975,8 +1946,8 @@ msgid "_Dismiss"
 msgstr "解除(_D)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1916
-#: ../calendar/alarm-notify/alarm-queue.c:1926
+#: ../calendar/alarm-notify/alarm-queue.c:1914
+#: ../calendar/alarm-notify/alarm-queue.c:1924
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
 #: ../modules/itip-formatter/itip-view.c:1514
 #: ../modules/itip-formatter/itip-view.c:1625
@@ -2011,23 +1982,23 @@ msgstr "小時"
 msgid "minutes"
 msgstr "分鐘"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1714
-#: ../calendar/alarm-notify/alarm-queue.c:1896
+#: ../calendar/alarm-notify/alarm-queue.c:1715
+#: ../calendar/alarm-notify/alarm-queue.c:1895
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1723
-#: ../calendar/alarm-notify/alarm-queue.c:1725
+#: ../calendar/alarm-notify/alarm-queue.c:1724
+#: ../calendar/alarm-notify/alarm-queue.c:1726
 msgid "No description available."
 msgstr "沒有任何描述。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1733
+#: ../calendar/alarm-notify/alarm-queue.c:1734
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1738
-#: ../calendar/alarm-notify/alarm-queue.c:1887
-#: ../calendar/alarm-notify/alarm-queue.c:2240
+#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1886
+#: ../calendar/alarm-notify/alarm-queue.c:2237
 msgid "Evolution Reminders"
 msgstr "Evolution 提醒"
 
@@ -2037,21 +2008,21 @@ msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "您有 %d 個提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2058
+#: ../calendar/alarm-notify/alarm-queue.c:2055
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:2056 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "否(_N)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2060
+#: ../calendar/alarm-notify/alarm-queue.c:2057
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2064
+#: ../calendar/alarm-notify/alarm-queue.c:2061
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2068,16 +2039,24 @@ msgstr ""
 "\n"
 "您確定要執行這個程式?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2079
+#: ../calendar/alarm-notify/alarm-queue.c:2076
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
-#: ../calendar/alarm-notify/util.c:43
+#: ../calendar/alarm-notify/util.c:67
 msgid "invalid time"
 msgstr "失效時間"
 
+#. Translator: Entire string is like "Pop up an alert %d days before start"
+#: ../calendar/alarm-notify/util.c:93 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:97
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d 日"
+
 #. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/alarm-notify/util.c:99 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -2085,7 +2064,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d 時"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
+#: ../calendar/alarm-notify/util.c:105 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -2095,7 +2074,7 @@ msgstr[0] "%d 分"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/alarm-notify/util.c:109 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2704,7 +2683,7 @@ msgstr "不包含"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-attachment-tree-view.c:149 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "說明"
@@ -2794,7 +2773,7 @@ msgid "Do Not Exist"
 msgstr "不存在"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2004
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2005
 msgid "Recurrence"
 msgstr "週期性"
 
@@ -2916,13 +2895,6 @@ msgstr "跳躍按鈕"
 msgid "Click here, you can find more events."
 msgstr "按這裡,您可以找到更多事件。"
 
-#. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d 日"
-
 #. Translator: Entire string is like "Pop up an alert %d weeks before start"
 #: ../calendar/gui/e-alarm-list.c:376
 #, c-format
@@ -2932,28 +2904,28 @@ msgstr[0] "%d 週"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:421
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1828
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1829
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "播放音效"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:425
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1826
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1827
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "彈出警告視窗"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:429
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1832
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1833
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "傳送郵件"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:433
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1830
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1831
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "執行程式"
@@ -3073,7 +3045,7 @@ msgstr "狀態:"
 #: ../calendar/gui/e-cal-model-tasks.c:554
 #: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
 #: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
-#: ../calendar/gui/print.c:3576
+#: ../calendar/gui/print.c:3582
 msgid "In Progress"
 msgstr "進行中"
 
@@ -3082,24 +3054,16 @@ msgstr "進行中"
 #: ../calendar/gui/e-cal-model-tasks.c:556
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
 #: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
-#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3585
 #: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
 msgstr "已完成"
 
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
-#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:963
-msgid "Canceled"
-msgstr "已取消"
-
 #: ../calendar/gui/e-cal-component-preview.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:310
 #: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
 #: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
-#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/print.c:3579 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "未開始"
 
@@ -3109,20 +3073,20 @@ msgstr "優先等級:"
 
 #: ../calendar/gui/e-cal-component-preview.c:327
 #: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:316
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:318
 msgid "High"
 msgstr "高"
 
 #: ../calendar/gui/e-cal-component-preview.c:329
-#: ../calendar/gui/e-cal-model.c:1872 ../calendar/gui/e-task-table.c:525
+#: ../calendar/gui/e-cal-model.c:1890 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:315
+#: ../mail/message-list.c:317
 msgid "Normal"
 msgstr "一般"
 
 #: ../calendar/gui/e-cal-component-preview.c:331
 #: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:314
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:316
 msgid "Low"
 msgstr "低"
 
@@ -3150,7 +3114,7 @@ msgstr "正在建立工作列表「%s」的檢視"
 msgid "Creating view for memo list '%s'"
 msgstr "正在建立備忘錄列表「%s」的檢視"
 
-#: ../calendar/gui/e-cal-dialogs.c:214 ../calendar/gui/e-cal-ops.c:1939
+#: ../calendar/gui/e-cal-dialogs.c:214 ../calendar/gui/e-cal-ops.c:1957
 msgid "Destination is read only"
 msgstr "目的地是唯讀"
 
@@ -3298,15 +3262,15 @@ msgstr "刪除選取的事件"
 msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr "貼上的文字並未包含有效的 iCalendar 資料"
 
-#: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1536
+#: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1554
 msgid "Default calendar not found"
 msgstr "找不到預設行事曆"
 
-#: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1539
+#: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1557
 msgid "Default memo list not found"
 msgstr "找不到預設備忘錄列表"
 
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1542
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1560
 msgid "Default task list not found"
 msgstr "找不到預設工作列表"
 
@@ -3321,7 +3285,7 @@ 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:1830 ../calendar/gui/e-memo-table.c:492
+#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:495
 #: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -3330,7 +3294,7 @@ 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:1834 ../calendar/gui/e-memo-table.c:497
+#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:500
 #: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
@@ -3338,7 +3302,7 @@ msgstr "會議召集人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:1850
-#: ../calendar/gui/e-meeting-time-sel.c:2731 ../calendar/gui/print.c:3527
+#: ../calendar/gui/e-meeting-time-sel.c:2727 ../calendar/gui/print.c:3533
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
@@ -3349,10 +3313,10 @@ msgstr "位置:%s"
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2269
 #: ../calendar/gui/e-calendar-view.c:2276
 #: ../calendar/gui/e-calendar-view.c:2283
-#: ../calendar/gui/e-calendar-view.c:2286
+#: ../calendar/gui/e-calendar-view.c:2290
+#: ../calendar/gui/e-calendar-view.c:2293
 msgid "%d %b %Y"
 msgstr "%Y年%m月%d日"
 
@@ -3361,13 +3325,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:2274 ../calendar/gui/e-day-view.c:3047
-#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-calendar-view.c:2281 ../calendar/gui/e-day-view.c:3080
+#: ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%m月%d日"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2303
 msgid "%A %d %b %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -3377,15 +3341,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:2300 ../calendar/gui/e-day-view.c:3031
-#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-calendar-view.c:2307 ../calendar/gui/e-day-view.c:3064
+#: ../calendar/gui/e-day-view-top-item.c:847
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%m月%d日 (%a)"
 
-#: ../calendar/gui/e-calendar-view.c:2303
-#: ../calendar/gui/e-calendar-view.c:2309
-#: ../calendar/gui/e-calendar-view.c:2312
+#: ../calendar/gui/e-calendar-view.c:2310
+#: ../calendar/gui/e-calendar-view.c:2316
+#: ../calendar/gui/e-calendar-view.c:2319
 msgid "%a %d %b %Y"
 msgstr "%Y年%m月%d日 (%a)"
 
@@ -3418,91 +3382,91 @@ msgstr "修改日期"
 msgid "Source"
 msgstr "來源"
 
-#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1249
+#: ../calendar/gui/print.c:1266 ../e-util/e-charset.c:51
 #: ../modules/itip-formatter/itip-view.c:3604
-#: ../modules/itip-formatter/itip-view.c:6218
+#: ../modules/itip-formatter/itip-view.c:6213
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "不明"
 
-#: ../calendar/gui/e-cal-model.c:1403 ../calendar/gui/e-cal-ops.c:597
-#: ../calendar/gui/e-cal-ops.c:1233
+#: ../calendar/gui/e-cal-model.c:1404 ../calendar/gui/e-cal-ops.c:615
+#: ../calendar/gui/e-cal-ops.c:1251
 #: ../modules/calendar/e-cal-base-shell-backend.c:291
 #, c-format
 msgid "Source with UID '%s' not found"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../calendar/gui/e-cal-model.c:1489 ../calendar/gui/e-cal-ops.c:186
-#: ../calendar/gui/e-cal-ops.c:1350
+#: ../calendar/gui/e-cal-model.c:1507 ../calendar/gui/e-cal-ops.c:187
+#: ../calendar/gui/e-cal-ops.c:1368
 msgid "Creating an event"
 msgstr "建立一個事件"
 
-#: ../calendar/gui/e-cal-model.c:1493 ../calendar/gui/e-cal-ops.c:190
-#: ../calendar/gui/e-cal-ops.c:1354
+#: ../calendar/gui/e-cal-model.c:1511 ../calendar/gui/e-cal-ops.c:191
+#: ../calendar/gui/e-cal-ops.c:1372
 msgid "Creating a memo"
 msgstr "建立一份備忘錄"
 
-#: ../calendar/gui/e-cal-model.c:1497 ../calendar/gui/e-cal-ops.c:194
-#: ../calendar/gui/e-cal-ops.c:1358
+#: ../calendar/gui/e-cal-model.c:1515 ../calendar/gui/e-cal-ops.c:195
+#: ../calendar/gui/e-cal-ops.c:1376
 msgid "Creating a task"
 msgstr "建立一項工作"
 
-#: ../calendar/gui/e-cal-model.c:1874
+#: ../calendar/gui/e-cal-model.c:1892
 msgid "Recurring"
 msgstr "週期性模式"
 
-#: ../calendar/gui/e-cal-model.c:1876
+#: ../calendar/gui/e-cal-model.c:1894
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../calendar/gui/e-cal-model.c:1878 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-meeting-list-view.c:209
 #: ../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:1878 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-meeting-list-view.c:210
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "否"
 
-#: ../calendar/gui/e-cal-model.c:3802 ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6206
+#: ../modules/itip-formatter/itip-view.c:6201
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-cal-model.c:3803 ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6212
+#: ../modules/itip-formatter/itip-view.c:6207
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-cal-model.c:3804 ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3822 ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
 #: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr "暫訂"
 
-#: ../calendar/gui/e-cal-model.c:3805 ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:224
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6215
+#: ../modules/itip-formatter/itip-view.c:6210
 msgid "Delegated"
 msgstr "已委派"
 
-#: ../calendar/gui/e-cal-model.c:3806
+#: ../calendar/gui/e-cal-model.c:3824
 msgid "Needs action"
 msgstr "需要動作"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-cal-model.c:3861 ../calendar/gui/e-meeting-list-view.c:688
+#: ../calendar/gui/e-cal-model.c:3879 ../calendar/gui/e-meeting-list-view.c:689
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/e-task-table.etspec.h:11 ../calendar/gui/tasktypes.xml.h:8
 #: ../mail/filtertypes.xml.in.h:36 ../mail/message-list.etspec.h:1
@@ -3536,155 +3500,155 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "沒有"
 
-#: ../calendar/gui/e-cal-ops.c:288
+#: ../calendar/gui/e-cal-ops.c:306
 msgid "Modifying an event"
 msgstr "修改一個事件"
 
-#: ../calendar/gui/e-cal-ops.c:292
+#: ../calendar/gui/e-cal-ops.c:310
 msgid "Modifying a memo"
 msgstr "修改一份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:296
+#: ../calendar/gui/e-cal-ops.c:314
 msgid "Modifying a task"
 msgstr "修改一項工作"
 
-#: ../calendar/gui/e-cal-ops.c:395
+#: ../calendar/gui/e-cal-ops.c:413
 msgid "Removing an event"
 msgstr "移除一個事件"
 
-#: ../calendar/gui/e-cal-ops.c:399
+#: ../calendar/gui/e-cal-ops.c:417
 msgid "Removing a memo"
 msgstr "移除一份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:403
+#: ../calendar/gui/e-cal-ops.c:421
 msgid "Removing a task"
 msgstr "移除一項工作"
 
-#: ../calendar/gui/e-cal-ops.c:494
+#: ../calendar/gui/e-cal-ops.c:512
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "刪除 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:498
+#: ../calendar/gui/e-cal-ops.c:516
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "刪除 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:502
+#: ../calendar/gui/e-cal-ops.c:520
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "刪除 %d 項工作"
 
-#: ../calendar/gui/e-cal-ops.c:705
+#: ../calendar/gui/e-cal-ops.c:723
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "貼上 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:720
+#: ../calendar/gui/e-cal-ops.c:738
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "貼上 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:735
+#: ../calendar/gui/e-cal-ops.c:753
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "貼上 %d 項工作"
 
-#: ../calendar/gui/e-cal-ops.c:834
+#: ../calendar/gui/e-cal-ops.c:852
 msgid "Updating an event"
 msgstr "更新一個事件"
 
-#: ../calendar/gui/e-cal-ops.c:838
+#: ../calendar/gui/e-cal-ops.c:856
 msgid "Updating a memo"
 msgstr "更新一則備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:842
+#: ../calendar/gui/e-cal-ops.c:860
 msgid "Updating a task"
 msgstr "更新一項工作"
 
-#: ../calendar/gui/e-cal-ops.c:950
+#: ../calendar/gui/e-cal-ops.c:968
 #, c-format
 msgid "Getting events to purge in the calendar '%s'"
 msgstr "正在取得在行事曆「%s」中要清空的事件"
 
-#: ../calendar/gui/e-cal-ops.c:954
+#: ../calendar/gui/e-cal-ops.c:972
 #, c-format
 msgid "Getting memos to purge in the memo list '%s'"
 msgstr "正在取得在備忘錄列表「%s」中要清空的備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:958
+#: ../calendar/gui/e-cal-ops.c:976
 #, c-format
 msgid "Getting tasks to purge in the task list '%s'"
 msgstr "正在取得在工作列表「%s」中要清空的工作"
 
-#: ../calendar/gui/e-cal-ops.c:984
+#: ../calendar/gui/e-cal-ops.c:1002
 #, c-format
 msgid "Purging events in the calendar '%s'"
 msgstr "正在清空行事曆「%s」中的事件"
 
-#: ../calendar/gui/e-cal-ops.c:988
+#: ../calendar/gui/e-cal-ops.c:1006
 #, c-format
 msgid "Purging memos in the memo list '%s'"
 msgstr "正在清空備忘錄列表「%s」中的備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:992
+#: ../calendar/gui/e-cal-ops.c:1010
 #, c-format
 msgid "Purging tasks in the task list '%s'"
 msgstr "正在清空工作列表「%s」中的工作"
 
-#: ../calendar/gui/e-cal-ops.c:1092
+#: ../calendar/gui/e-cal-ops.c:1110
 msgid "Purging events"
 msgstr "正在清除事件"
 
-#: ../calendar/gui/e-cal-ops.c:1096
+#: ../calendar/gui/e-cal-ops.c:1114
 msgid "Purging memos"
 msgstr "正在清除備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:1100
+#: ../calendar/gui/e-cal-ops.c:1118
 msgid "Purging tasks"
 msgstr "正在清除工作"
 
-#: ../calendar/gui/e-cal-ops.c:1202
+#: ../calendar/gui/e-cal-ops.c:1220
 msgid "Expunging completed tasks"
 msgstr "清除已完成的工作"
 
-#: ../calendar/gui/e-cal-ops.c:2033
+#: ../calendar/gui/e-cal-ops.c:2051
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "移個 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:2034
+#: ../calendar/gui/e-cal-ops.c:2052
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "正在複製 %d 個事件"
 
-#: ../calendar/gui/e-cal-ops.c:2040
+#: ../calendar/gui/e-cal-ops.c:2058
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "正在移動 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:2041
+#: ../calendar/gui/e-cal-ops.c:2059
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "正在複製 %d 份備忘錄"
 
-#: ../calendar/gui/e-cal-ops.c:2047
+#: ../calendar/gui/e-cal-ops.c:2065
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "正在移動 %d 項工作"
 
-#: ../calendar/gui/e-cal-ops.c:2048
+#: ../calendar/gui/e-cal-ops.c:2066
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -3726,144 +3690,145 @@ msgstr "不能編輯事件,因為選取的行事曆是唯讀的"
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "不能完整的編輯事件,因為您不是召集人"
 
-#: ../calendar/gui/e-comp-editor-event.c:340
+#: ../calendar/gui/e-comp-editor-event.c:350
 #: ../calendar/gui/e-comp-editor-task.c:348
 msgid "Start date is not a valid date"
 msgstr "開始日期不是有效的日期"
 
-#: ../calendar/gui/e-comp-editor-event.c:342
+#: ../calendar/gui/e-comp-editor-event.c:352
 msgid "Start time is not a valid time"
 msgstr "開始時刻不是有效的時刻"
 
-#: ../calendar/gui/e-comp-editor-event.c:346
-#: ../calendar/gui/e-comp-editor-event.c:362
+#: ../calendar/gui/e-comp-editor-event.c:356
+#: ../calendar/gui/e-comp-editor-event.c:372
 #: ../calendar/gui/e-comp-editor-page-attachments.c:211
-#: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-reader-utils.c:650
-#: ../mail/mail-send-recv.c:486 ../mail/mail-send-recv.c:1285
-#: ../plugins/face/face.c:176 ../shell/e-shell.c:991 ../shell/e-shell.c:1013
-#: ../smime/gui/certificate-manager.c:346
+#: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-display.c:2057
+#: ../mail/e-mail-reader-utils.c:648 ../mail/mail-send-recv.c:489
+#: ../mail/mail-send-recv.c:1289 ../plugins/face/face.c:176
+#: ../shell/e-shell.c:992 ../shell/e-shell.c:1014
+#: ../smime/gui/certificate-manager.c:359
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../calendar/gui/e-comp-editor-event.c:356
+#: ../calendar/gui/e-comp-editor-event.c:366
 msgid "End date is not a valid date"
 msgstr "結束日期不是有效的日期"
 
-#: ../calendar/gui/e-comp-editor-event.c:358
+#: ../calendar/gui/e-comp-editor-event.c:368
 msgid "End time is not a valid time"
 msgstr "結束時刻不是有效的時刻"
 
-#: ../calendar/gui/e-comp-editor-event.c:480
+#: ../calendar/gui/e-comp-editor-event.c:490
 #: ../calendar/gui/e-comp-editor-memo.c:106
 #: ../calendar/gui/e-comp-editor-task.c:406
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../calendar/gui/e-comp-editor-event.c:482
+#: ../calendar/gui/e-comp-editor-event.c:492
 #: ../calendar/gui/e-comp-editor-memo.c:108
 #: ../calendar/gui/e-comp-editor-task.c:408
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-#: ../calendar/gui/e-comp-editor-event.c:488
+#: ../calendar/gui/e-comp-editor-event.c:498
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-#: ../calendar/gui/e-comp-editor-event.c:490
+#: ../calendar/gui/e-comp-editor-event.c:500
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-#: ../calendar/gui/e-comp-editor-event.c:496
+#: ../calendar/gui/e-comp-editor-event.c:506
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-#: ../calendar/gui/e-comp-editor-event.c:498
+#: ../calendar/gui/e-comp-editor-event.c:508
 msgid "Toggles whether to have All Day Event"
 msgstr "切換是否要有全天事件"
 
-#: ../calendar/gui/e-comp-editor-event.c:504
+#: ../calendar/gui/e-comp-editor-event.c:514
 msgid "Show Time as _Busy"
 msgstr "顯示時間為忙碌(_B)"
 
-#: ../calendar/gui/e-comp-editor-event.c:506
+#: ../calendar/gui/e-comp-editor-event.c:516
 msgid "Toggles whether to show time as busy"
 msgstr "切換是否將時間顯示為忙碌"
 
-#: ../calendar/gui/e-comp-editor-event.c:515
+#: ../calendar/gui/e-comp-editor-event.c:525
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../calendar/gui/e-comp-editor-event.c:517
+#: ../calendar/gui/e-comp-editor-event.c:527
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../calendar/gui/e-comp-editor-event.c:522
+#: ../calendar/gui/e-comp-editor-event.c:532
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../calendar/gui/e-comp-editor-event.c:524
+#: ../calendar/gui/e-comp-editor-event.c:534
 msgid "Classify as private"
 msgstr "歸類為私人"
 
-#: ../calendar/gui/e-comp-editor-event.c:529
+#: ../calendar/gui/e-comp-editor-event.c:539
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../calendar/gui/e-comp-editor-event.c:531
+#: ../calendar/gui/e-comp-editor-event.c:541
 msgid "Classify as confidential"
 msgstr "歸類為機密"
 
-#: ../calendar/gui/e-comp-editor-event.c:632
+#: ../calendar/gui/e-comp-editor-event.c:642
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/e-comp-editor-event.c:637
+#: ../calendar/gui/e-comp-editor-event.c:647
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../calendar/gui/e-comp-editor-event.c:647
+#: ../calendar/gui/e-comp-editor-event.c:657
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "全天事件(_Y)"
 
-#: ../calendar/gui/e-comp-editor-event.c:700
+#: ../calendar/gui/e-comp-editor-event.c:710
 #: ../calendar/gui/e-comp-editor-memo.c:192
 #: ../calendar/gui/e-comp-editor-task.c:529
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "一般"
 
-#: ../calendar/gui/e-comp-editor-event.c:703
+#: ../calendar/gui/e-comp-editor-event.c:713
 #: ../calendar/gui/e-comp-editor-task.c:535
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "提醒"
 
-#: ../calendar/gui/e-comp-editor-event.c:706
+#: ../calendar/gui/e-comp-editor-event.c:716
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "週期性"
 
-#: ../calendar/gui/e-comp-editor-event.c:709
+#: ../calendar/gui/e-comp-editor-event.c:719
 #: ../calendar/gui/e-comp-editor-memo.c:195
 #: ../calendar/gui/e-comp-editor-task.c:538
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "附件"
 
-#: ../calendar/gui/e-comp-editor-event.c:719
+#: ../calendar/gui/e-comp-editor-event.c:729
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "排程"
 
-#: ../calendar/gui/e-comp-editor-event.c:748
+#: ../calendar/gui/e-comp-editor-event.c:758
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-#: ../calendar/gui/e-comp-editor-event.c:749
+#: ../calendar/gui/e-comp-editor-event.c:759
 #, c-format
 msgid "Appointment - %s"
 msgstr "會議 - %s"
@@ -3958,13 +3923,13 @@ msgstr "附件(_A)"
 msgid "Show attachments"
 msgstr "顯示附件"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:781
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
+#: ../calendar/gui/e-comp-editor-page-attachments.c:782
+#: ../e-util/e-attachment-bar.c:701 ../e-util/e-attachment-paned.c:735
 msgid "Icon View"
 msgstr "圖示檢視"
 
-#: ../calendar/gui/e-comp-editor-page-attachments.c:783
-#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
+#: ../calendar/gui/e-comp-editor-page-attachments.c:784
+#: ../e-util/e-attachment-bar.c:703 ../e-util/e-attachment-paned.c:737
 msgid "List View"
 msgstr "列表檢視"
 
@@ -4041,17 +4006,17 @@ msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "出席者(_N)…"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:326
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:327
 msgid "Add exception"
 msgstr "加入例外"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:364
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:365
 msgid "Modify exception"
 msgstr "編輯例外"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:489
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:490
 msgid "on"
 msgstr "的"
 
@@ -4059,7 +4024,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/e-comp-editor-page-recurrence.c:570
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:571
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "第一個"
@@ -4069,7 +4034,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/e-comp-editor-page-recurrence.c:576
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:577
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "第二個"
@@ -4078,7 +4043,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/e-comp-editor-page-recurrence.c:581
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:582
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "第三個"
@@ -4087,7 +4052,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/e-comp-editor-page-recurrence.c:586
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:587
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "第四個"
@@ -4096,7 +4061,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/e-comp-editor-page-recurrence.c:591
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:592
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "第五個"
@@ -4105,14 +4070,14 @@ msgstr "第五個"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:596
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:597
 msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "最後一個"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:623
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:624
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "其他日期"
@@ -4121,7 +4086,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/e-comp-editor-page-recurrence.c:629
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:630
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "1日到 10 日"
@@ -4130,7 +4095,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/e-comp-editor-page-recurrence.c:635
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:636
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "11日到 20 日"
@@ -4139,7 +4104,7 @@ msgstr "11日到 20 日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:641
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:642
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "21日到 31 日"
@@ -4147,42 +4112,42 @@ msgstr "21日到 31 日"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:667
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "天"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:675
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "星期日"
@@ -4190,126 +4155,126 @@ msgstr "星期日"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:803
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:804
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "在"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:993
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:994
 msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "次"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1486
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2016
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1487
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2017
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "這個會議的週期為(_U)"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1491
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1492
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "這個工作的週期為(_U)"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1496
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1497
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "這個備忘錄的週期為(_U)"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1501
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1502
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "這個元件的週期為(_U)"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1862
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1863
 msgid "Recurrence exception date is invalid"
 msgstr "週期的例外日期是無效的"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1910
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1911
 msgid "End time of the recurrence is before the start"
 msgstr "週期性事件的結束時刻早於開始時刻"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1953
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1954
 msgid "R_ecurrence"
 msgstr "週期性(_E)"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:1955
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1956
 msgid "Set or unset recurrence"
 msgstr "設定或取消設定週期性"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2056
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2057
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "每"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2091
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2092
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "天"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2093
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2094
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "週"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2095
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2096
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "個月"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2097
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2098
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "年"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2126
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2127
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "共"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2128
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2129
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "直到"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2130
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2131
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "永遠"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2146
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2147
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性會議。"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2163
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2164
 msgid "Exceptions"
 msgstr "例外"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1778
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2233
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1779
 #: ../mail/mail-config.ui.h:62
 msgid "A_dd"
 msgstr "加入(_A)"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2248
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1786
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2249
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1787
 #: ../mail/mail-config.ui.h:64
 msgid "Re_move"
 msgstr "移除(_M)"
 
-#: ../calendar/gui/e-comp-editor-page-recurrence.c:2256
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2257
 msgid "Preview"
 msgstr "預覽"
 
@@ -4317,167 +4282,167 @@ msgstr "預覽"
 msgid "Send To"
 msgstr "傳送到"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1555
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1556
 msgid "_Reminders"
 msgstr "提醒(_R)"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1557
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1558
 msgid "Set or unset reminders"
 msgstr "設定或取消設定提醒"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1610
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1611
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Reminders"
 msgstr "提醒"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1639
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1640
 msgid "_Reminder"
 msgstr "提醒(_R)"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1672
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1673
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d 天前"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1679
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1680
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d 小時前"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1686
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1687
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
 msgstr[0] "%d 分鐘前"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1694
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1695
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "沒有"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1696
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1697
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "15 分鐘前"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1698
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1699
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "1 小時前"
 
 #. Translators: Predefined reminder's description
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1700
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1701
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "1 天前"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1712
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1713
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "自訂"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1863
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1864
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "分鐘"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1865
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1866
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "小时"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1867
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1868
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "天"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1884
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1885
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "早於"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1886
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1887
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "晚於"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1902
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1903
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "開始"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1904
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1905
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "結束"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1927
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1928
 msgid "Re_peat the reminder"
 msgstr "重複提醒(_P)"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1952
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1953
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "一次於每"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1989
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1990
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "分鐘"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1991
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1992
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "小時"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../calendar/gui/e-comp-editor-page-reminders.c:1993
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1994
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "天"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2034
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2191
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2035
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2192
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "自訂訊息(_M)"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2078
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2079
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "自訂提醒音效(_S)"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2089
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2090
 msgid "Select a sound file"
 msgstr "選擇聲音檔案"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2117
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2118
 msgid "_Program:"
 msgstr "執行程式(_P):"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2143
 msgid "_Arguments:"
 msgstr "引數(_A):"
 
-#: ../calendar/gui/e-comp-editor-page-reminders.c:2174
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2175
 msgid "_Send To:"
 msgstr "傳送到(_T):"
 
@@ -4539,72 +4504,72 @@ msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "機密"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1144
+#: ../calendar/gui/e-comp-editor-property-parts.c:1151
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "歸類(_L):"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1157
+#: ../calendar/gui/e-comp-editor-property-parts.c:1170
 msgctxt "ECompEditor"
 msgid "Not Started"
 msgstr "未開始"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1158
+#: ../calendar/gui/e-comp-editor-property-parts.c:1171
 msgctxt "ECompEditor"
 msgid "In Progress"
 msgstr "進行中"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1159
+#: ../calendar/gui/e-comp-editor-property-parts.c:1172
 msgctxt "ECompEditor"
 msgid "Completed"
 msgstr "已完成"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1160
+#: ../calendar/gui/e-comp-editor-property-parts.c:1173
 msgctxt "ECompEditor"
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已取消"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1169
+#: ../calendar/gui/e-comp-editor-property-parts.c:1182
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "狀態(_S):"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1199
+#: ../calendar/gui/e-comp-editor-property-parts.c:1212
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "未定義"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1200
+#: ../calendar/gui/e-comp-editor-property-parts.c:1213
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "高"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1201
+#: ../calendar/gui/e-comp-editor-property-parts.c:1214
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "普通"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1202
+#: ../calendar/gui/e-comp-editor-property-parts.c:1215
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "低"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1211
+#: ../calendar/gui/e-comp-editor-property-parts.c:1224
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "優先等級(_Y):"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1265
+#: ../calendar/gui/e-comp-editor-property-parts.c:1278
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "完成百分比:"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1346
+#: ../calendar/gui/e-comp-editor-property-parts.c:1359
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
-#: ../calendar/gui/e-comp-editor-property-parts.c:1471
+#: ../calendar/gui/e-comp-editor-property-parts.c:1484
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "顯示時間為忙碌(_B)"
@@ -4661,40 +4626,40 @@ msgstr "附件"
 msgid "Sending notifications to attendees..."
 msgstr "傳送通知給出席者…"
 
-#: ../calendar/gui/e-comp-editor.c:991
+#: ../calendar/gui/e-comp-editor.c:994
 msgid "Saving changes..."
 msgstr "正在儲存變更…"
 
-#: ../calendar/gui/e-comp-editor.c:1247
+#: ../calendar/gui/e-comp-editor.c:1250
 msgid "No Summary"
 msgstr "沒有摘要"
 
 #. == Button box ==
-#: ../calendar/gui/e-comp-editor.c:1972 ../composer/e-composer-actions.c:334
-#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:295
+#: ../calendar/gui/e-comp-editor.c:1975 ../composer/e-composer-actions.c:334
+#: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:299
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:391
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
-#: ../mail/e-mail-notes.c:903 ../mail/em-folder-properties.c:688
-#: ../mail/em-subscription-editor.c:1759
+#: ../mail/e-mail-notes.c:903 ../mail/em-folder-properties.c:786
+#: ../mail/em-subscription-editor.c:1765
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
 #: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
-#: ../smime/gui/certificate-manager.c:2068
+#: ../smime/gui/certificate-manager.c:2214
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../calendar/gui/e-comp-editor.c:1974
+#: ../calendar/gui/e-comp-editor.c:1977
 msgid "Close the current window"
 msgstr "關閉目前的視窗"
 
 #. copy menu item
-#: ../calendar/gui/e-comp-editor.c:1979 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
+#: ../calendar/gui/e-comp-editor.c:1982 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:1073 ../e-util/e-text.c:2109
 #: ../e-util/e-web-view.c:379 ../mail/e-mail-browser.c:136
-#: ../mail/mail.error.xml.h:142 ../shell/e-shell-window-actions.c:799
+#: ../mail/mail.error.xml.h:140 ../shell/e-shell-window-actions.c:799
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: ../calendar/gui/e-comp-editor.c:1981 ../e-util/e-focus-tracker.c:175
+#: ../calendar/gui/e-comp-editor.c:1984 ../e-util/e-focus-tracker.c:175
 #: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
 #: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:381
 #: ../e-util/e-web-view.c:1420 ../mail/e-mail-browser.c:138
@@ -4703,51 +4668,51 @@ msgid "Copy the selection"
 msgstr "複製選取的內容"
 
 #. cut menu item
-#: ../calendar/gui/e-comp-editor.c:1986 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
+#: ../calendar/gui/e-comp-editor.c:1989 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1080 ../e-util/e-text.c:2095
 #: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: ../calendar/gui/e-comp-editor.c:1988 ../e-util/e-focus-tracker.c:168
+#: ../calendar/gui/e-comp-editor.c:1991 ../e-util/e-focus-tracker.c:168
 #: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
 #: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1414
 #: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
 msgid "Cut the selection"
 msgstr "剪下選取範圍"
 
-#: ../calendar/gui/e-comp-editor.c:1995 ../e-util/e-focus-tracker.c:189
+#: ../calendar/gui/e-comp-editor.c:1998 ../e-util/e-focus-tracker.c:189
 #: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
 #: ../shell/e-shell-window-actions.c:815
 msgid "Delete the selection"
 msgstr "刪除選取範圍"
 
-#: ../calendar/gui/e-comp-editor.c:2002
+#: ../calendar/gui/e-comp-editor.c:2005
 msgid "View help"
 msgstr "檢視求助"
 
 #. paste menu item
-#: ../calendar/gui/e-comp-editor.c:2007 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
+#: ../calendar/gui/e-comp-editor.c:2010 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:1087 ../e-util/e-text.c:2121
 #: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../calendar/gui/e-comp-editor.c:2009 ../e-util/e-focus-tracker.c:182
+#: ../calendar/gui/e-comp-editor.c:2012 ../e-util/e-focus-tracker.c:182
 #: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
 #: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1426
 #: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿的內容"
 
-#: ../calendar/gui/e-comp-editor.c:2014 ../composer/e-composer-actions.c:388
+#: ../calendar/gui/e-comp-editor.c:2017 ../composer/e-composer-actions.c:388
 #: ../mail/e-mail-reader.c:2287
 #: ../modules/addressbook/e-book-shell-view-actions.c:1231
 #: ../modules/addressbook/e-book-shell-view-actions.c:1245
 msgid "_Print..."
 msgstr "列印(_P)…"
 
-#: ../calendar/gui/e-comp-editor.c:2021 ../mail/e-mail-reader.c:2294
+#: ../calendar/gui/e-comp-editor.c:2024 ../mail/e-mail-reader.c:2294
 #: ../modules/addressbook/e-book-shell-view-actions.c:1238
 #: ../modules/calendar/e-cal-shell-view-actions.c:1695
 #: ../modules/calendar/e-memo-shell-view-actions.c:815
@@ -4755,66 +4720,66 @@ msgstr "列印(_P)…"
 msgid "Pre_view..."
 msgstr "預覽(_V)…"
 
-#: ../calendar/gui/e-comp-editor.c:2028 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:389
+#: ../calendar/gui/e-comp-editor.c:2031 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:1101 ../e-util/e-web-view.c:389
 #: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
 msgid "Select _All"
 msgstr "全部選取(_A)"
 
-#: ../calendar/gui/e-comp-editor.c:2030 ../e-util/e-focus-tracker.c:196
+#: ../calendar/gui/e-comp-editor.c:2033 ../e-util/e-focus-tracker.c:196
 #: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
 #: ../mail/e-mail-browser.c:159 ../shell/e-shell-window-actions.c:913
 msgid "Select all text"
 msgstr "選取所有文字"
 
-#: ../calendar/gui/e-comp-editor.c:2051
+#: ../calendar/gui/e-comp-editor.c:2054
 msgid "_Classification"
 msgstr "歸類(_C)"
 
-#: ../calendar/gui/e-comp-editor.c:2065 ../e-util/e-html-editor-actions.c:1127
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:166
+#: ../calendar/gui/e-comp-editor.c:2068 ../e-util/e-html-editor-actions.c:1124
+#: ../e-util/e-mail-signature-editor.c:313 ../mail/e-mail-browser.c:166
 #: ../mail/e-mail-notes.c:917 ../shell/e-shell-window-actions.c:948
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../calendar/gui/e-comp-editor.c:2079 ../e-util/e-html-editor-actions.c:1148
+#: ../calendar/gui/e-comp-editor.c:2082 ../e-util/e-html-editor-actions.c:1145
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../calendar/gui/e-comp-editor.c:2086 ../composer/e-composer-actions.c:378
+#: ../calendar/gui/e-comp-editor.c:2089 ../composer/e-composer-actions.c:378
 msgid "_Options"
 msgstr "選項(_O)"
 
-#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1169
+#: ../calendar/gui/e-comp-editor.c:2096 ../e-util/e-html-editor-actions.c:1166
 #: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/certificate-manager.c:1664 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../calendar/gui/e-comp-editor.c:2105
+#: ../calendar/gui/e-comp-editor.c:2108
 msgid "Save current changes"
 msgstr "儲存目前的變更"
 
-#: ../calendar/gui/e-comp-editor.c:2110 ../e-util/e-mail-signature-editor.c:304
+#: ../calendar/gui/e-comp-editor.c:2113 ../e-util/e-mail-signature-editor.c:308
 #: ../mail/e-mail-notes.c:912
 msgid "Save and Close"
 msgstr "儲存並關閉"
 
-#: ../calendar/gui/e-comp-editor.c:2112
+#: ../calendar/gui/e-comp-editor.c:2115
 msgid "Save current changes and close editor"
 msgstr "儲存目前的變更並且關閉編輯器"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2133 ../calendar/gui/e-week-view.c:1728
-#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
+#: ../calendar/gui/e-day-view.c:2132 ../calendar/gui/e-week-view.c:1728
+#: ../calendar/gui/print.c:1072 ../calendar/gui/print.c:1091
+#: ../calendar/gui/print.c:2628 ../calendar/gui/print.c:2648
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2136 ../calendar/gui/e-week-view.c:1731
-#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
+#: ../calendar/gui/e-day-view.c:2135 ../calendar/gui/e-week-view.c:1731
+#: ../calendar/gui/print.c:1077 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2650
 msgid "pm"
 msgstr "下午"
 
@@ -4824,13 +4789,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:3014 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:3047 ../calendar/gui/e-day-view-top-item.c:843
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2095
 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:3739
+#: ../calendar/gui/e-day-view.c:3772
 #, c-format
 msgid "Week %d"
 msgstr "第 %d 週"
@@ -4865,94 +4830,94 @@ msgstr "沒有"
 msgid "Select..."
 msgstr "選擇…"
 
-#: ../calendar/gui/e-meeting-list-view.c:63
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "主席"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "列席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "資源"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
-#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
+#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1245
 msgid "Individual"
 msgstr "個別"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
+#: ../calendar/gui/print.c:1246 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "群組"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "資源"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "會議室"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-list-view.c:195
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/print.c:1263
+#: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "主席"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
+#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1263
 msgid "Required Participant"
 msgstr "出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1265
+#: ../calendar/gui/print.c:1264
 msgid "Optional Participant"
 msgstr "列席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "缺席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "需要動作"
 
-#: ../calendar/gui/e-meeting-list-view.c:619
+#: ../calendar/gui/e-meeting-list-view.c:620
 msgid "Attendee                          "
 msgstr "出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:645
+#: ../calendar/gui/e-meeting-list-view.c:646
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../calendar/gui/e-task-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:591
+#: ../e-util/e-attachment-tree-view.c:207
 #: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "類型"
 
-#: ../calendar/gui/e-meeting-list-view.c:674
+#: ../calendar/gui/e-meeting-list-view.c:675
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
@@ -5041,7 +5006,7 @@ msgstr "開始時刻(_S):"
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2727
+#: ../calendar/gui/e-meeting-time-sel.c:2723
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5050,7 +5015,7 @@ msgstr ""
 "摘要:%s\n"
 "位置:%s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2729 ../calendar/gui/print.c:3516
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要:%s"
@@ -5079,46 +5044,46 @@ msgstr "普通名稱"
 msgid "Language"
 msgstr "語言"
 
-#: ../calendar/gui/e-memo-table.c:370
-#: ../modules/calendar/e-cal-shell-content.c:1632
+#: ../calendar/gui/e-memo-table.c:370 ../data/evolution.desktop.in.in.h:11
+#: ../modules/calendar/e-cal-shell-content.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:196
 #: ../modules/calendar/e-memo-shell-view-actions.c:211
 #: ../modules/calendar/e-memo-shell-view.c:315
 msgid "Memos"
 msgstr "備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:454 ../calendar/gui/e-task-table.c:757
+#: ../calendar/gui/e-memo-table.c:457 ../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:539 ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-memo-table.c:542 ../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:559 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:562 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "到期:"
 
-#: ../calendar/gui/e-memo-table.c:682
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "剪下選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:688
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "複製選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:694
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "從剪貼簿貼上備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:700
+#: ../calendar/gui/e-memo-table.c:738
 #: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "刪除選定的備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:706
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "選擇全部可見的備忘錄"
 
@@ -5140,35 +5105,36 @@ msgstr "未指定"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
 #: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
-#: ../modules/calendar/e-cal-shell-content.c:1592
+#: ../calendar/importers/icalendar-importer.c:1116
+#: ../data/evolution.desktop.in.in.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-cal-shell-content.c:1627
 #: ../modules/calendar/e-task-shell-view-actions.c:220
 #: ../modules/calendar/e-task-shell-view-actions.c:235
 #: ../modules/calendar/e-task-shell-view.c:473
 msgid "Tasks"
 msgstr "工作"
 
-#: ../calendar/gui/e-task-table.c:998
+#: ../calendar/gui/e-task-table.c:1033
 msgid "Cut selected tasks to the clipboard"
 msgstr "剪下選取的工作至剪貼簿"
 
-#: ../calendar/gui/e-task-table.c:1004
+#: ../calendar/gui/e-task-table.c:1039
 msgid "Copy selected tasks to the clipboard"
 msgstr "複製選取的工作至剪貼簿"
 
-#: ../calendar/gui/e-task-table.c:1010
+#: ../calendar/gui/e-task-table.c:1045
 msgid "Paste tasks from the clipboard"
 msgstr "從剪貼簿貼上工作"
 
-#: ../calendar/gui/e-task-table.c:1016
+#: ../calendar/gui/e-task-table.c:1051
 #: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
 
-#: ../calendar/gui/e-task-table.c:1022
+#: ../calendar/gui/e-task-table.c:1057
 msgid "Select all visible tasks"
 msgstr "選擇全部可見的工作"
 
@@ -5184,7 +5150,7 @@ msgstr "開始日期"
 msgid "Completion date"
 msgstr "完成日期"
 
-#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:965
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:969
 msgid "Complete"
 msgstr "完成"
 
@@ -5209,36 +5175,36 @@ msgstr "選擇一個時區"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2074
 msgid "%d %B"
 msgstr "%m月%d日"
 
-#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
-#: ../calendar/gui/itip-utils.c:842
+#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:849
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: ../calendar/gui/itip-utils.c:699
+#: ../calendar/gui/itip-utils.c:706
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個出席者"
 
-#: ../calendar/gui/itip-utils.c:930 ../calendar/gui/itip-utils.c:1091
+#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1098
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
+#: ../calendar/gui/itip-utils.c:940 ../calendar/gui/itip-utils.c:1101
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
+#: ../calendar/gui/itip-utils.c:943 ../calendar/gui/itip-utils.c:1104
 msgid "Memo information"
 msgstr "備忘錄資訊"
 
-#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
+#: ../calendar/gui/itip-utils.c:946 ../calendar/gui/itip-utils.c:1122
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/itip-utils.c:942
+#: ../calendar/gui/itip-utils.c:949
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
@@ -5246,7 +5212,7 @@ msgstr "行事曆資訊"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:979
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "已接受"
@@ -5255,7 +5221,7 @@ msgstr "已接受"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:986
+#: ../calendar/gui/itip-utils.c:993
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
@@ -5267,7 +5233,7 @@ msgstr "暫時接受"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:993 ../calendar/gui/itip-utils.c:1041
+#: ../calendar/gui/itip-utils.c:1000 ../calendar/gui/itip-utils.c:1048
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "已拒絕"
@@ -5276,7 +5242,7 @@ msgstr "已拒絕"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1000
+#: ../calendar/gui/itip-utils.c:1007
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已委派"
@@ -5284,7 +5250,7 @@ msgstr "已委派"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1013
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已更新"
@@ -5292,7 +5258,7 @@ msgstr "已更新"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1020
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -5300,7 +5266,7 @@ msgstr "取消"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1027
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "重新整理"
@@ -5308,166 +5274,166 @@ msgstr "重新整理"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1034
+#: ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:1112
+#: ../calendar/gui/itip-utils.c:1119
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:1120
+#: ../calendar/gui/itip-utils.c:1127
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: ../calendar/gui/itip-utils.c:1149
+#: ../calendar/gui/itip-utils.c:1156
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "無法取得資源,新的事件與其他事件有所重疊。"
 
-#: ../calendar/gui/itip-utils.c:1154
+#: ../calendar/gui/itip-utils.c:1161
 msgid "Unable to book a resource, error: "
 msgstr "無法預訂資源,錯誤為:"
 
-#: ../calendar/gui/itip-utils.c:1325
+#: ../calendar/gui/itip-utils.c:1332
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的出席者。"
 
-#: ../calendar/gui/itip-utils.c:1933
+#: ../calendar/gui/itip-utils.c:1940
 msgid "Sending an event"
 msgstr "正在傳送事件"
 
-#: ../calendar/gui/itip-utils.c:1937
+#: ../calendar/gui/itip-utils.c:1944
 msgid "Sending a memo"
 msgstr "正在傳送備忘錄"
 
-#: ../calendar/gui/itip-utils.c:1941
+#: ../calendar/gui/itip-utils.c:1948
 msgid "Sending a task"
 msgstr "正在傳送工作"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:670
+#: ../calendar/gui/print.c:669
 msgid "31st"
 msgstr "31日"
 
@@ -5475,114 +5441,114 @@ msgstr "31日"
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:729
 msgid "Mo"
 msgstr "一"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:730
 msgid "Tu"
 msgstr "二"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:731
 msgid "We"
 msgstr "三"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:733
+#: ../calendar/gui/print.c:732
 msgid "Th"
 msgstr "四"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:734
+#: ../calendar/gui/print.c:733
 msgid "Fr"
 msgstr "五"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:734
 msgid "Sa"
 msgstr "六"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:735
 msgid "Su"
 msgstr "日"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3309
+#: ../calendar/gui/print.c:3315
 msgid " to "
 msgstr " 到 "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3319
+#: ../calendar/gui/print.c:3325
 msgid " (Completed "
 msgstr " (已完成 "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3325
+#: ../calendar/gui/print.c:3331
 msgid "Completed "
 msgstr "已完成 "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3341
 msgid " (Due "
 msgstr "(期限 "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3342
+#: ../calendar/gui/print.c:3348
 msgid "Due "
 msgstr "期限 "
 
-#: ../calendar/gui/print.c:3486
+#: ../calendar/gui/print.c:3492
 msgid "Appointment"
 msgstr "會議"
 
-#: ../calendar/gui/print.c:3488 ../e-util/e-send-options.c:553
+#: ../calendar/gui/print.c:3494 ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "工作"
 
-#: ../calendar/gui/print.c:3490
+#: ../calendar/gui/print.c:3496
 msgid "Memo"
 msgstr "備忘錄"
 
-#: ../calendar/gui/print.c:3546
+#: ../calendar/gui/print.c:3552
 msgid "Attendees: "
 msgstr "出席者:"
 
-#: ../calendar/gui/print.c:3590
+#: ../calendar/gui/print.c:3596
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
-#: ../calendar/gui/print.c:3606
+#: ../calendar/gui/print.c:3612
 #, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P): %s"
 
-#: ../calendar/gui/print.c:3624
+#: ../calendar/gui/print.c:3630
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
-#: ../calendar/gui/print.c:3638
+#: ../calendar/gui/print.c:3644
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
-#: ../calendar/gui/print.c:3652
+#: ../calendar/gui/print.c:3658
 #, c-format
 msgid "Categories: %s"
 msgstr "分類: %s"
 
-#: ../calendar/gui/print.c:3663
+#: ../calendar/gui/print.c:3669
 msgid "Contacts: "
 msgstr "連絡人: "
 
@@ -5609,40 +5575,40 @@ msgstr "小於"
 msgid "Appointments and Meetings"
 msgstr "會議和會議"
 
-#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:308
 #: ../modules/calendar/e-cal-base-shell-backend.c:183
 #: ../modules/calendar/e-cal-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "新行事曆"
 
-#: ../calendar/importers/icalendar-importer.c:315
+#: ../calendar/importers/icalendar-importer.c:311
 #: ../modules/calendar/e-cal-base-shell-backend.c:191
 #: ../modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "新增工作列表"
 
-#: ../calendar/importers/icalendar-importer.c:357
+#: ../calendar/importers/icalendar-importer.c:353
 msgid "Cre_ate new calendar"
 msgstr "建立新行事曆(_A)"
 
-#: ../calendar/importers/icalendar-importer.c:361
+#: ../calendar/importers/icalendar-importer.c:357
 msgid "Cre_ate new task list"
 msgstr "建立新工作列表(_A)"
 
-#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:503
 #: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
-#: ../calendar/importers/icalendar-importer.c:655
+#: ../calendar/importers/icalendar-importer.c:654
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 檔案 (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:656
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸入器"
 
-#: ../calendar/importers/icalendar-importer.c:748
+#: ../calendar/importers/icalendar-importer.c:747
 msgid "Reminder!"
 msgstr "提醒!"
 
@@ -5654,156 +5620,156 @@ msgstr "vCalendar 檔案 (.vcs)"
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸入器"
 
-#: ../calendar/importers/icalendar-importer.c:1110
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
-#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1152
 msgid "GNOME Calendar"
 msgstr "GNOME Calendar"
 
-#: ../calendar/importers/icalendar-importer.c:1154
+#: ../calendar/importers/icalendar-importer.c:1153
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "會議"
 
-#: ../calendar/importers/icalendar-importer.c:1225
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
-#: ../calendar/importers/icalendar-importer.c:1228
-#: ../calendar/importers/icalendar-importer.c:1540
+#: ../calendar/importers/icalendar-importer.c:1227
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "工作"
 
-#: ../calendar/importers/icalendar-importer.c:1231
-#: ../calendar/importers/icalendar-importer.c:1541
+#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "備忘錄"
 
-#: ../calendar/importers/icalendar-importer.c:1240
+#: ../calendar/importers/icalendar-importer.c:1239
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "具有週期性"
 
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "是一個實體"
 
-#: ../calendar/importers/icalendar-importer.c:1250
+#: ../calendar/importers/icalendar-importer.c:1249
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "具有提醒"
 
-#: ../calendar/importers/icalendar-importer.c:1255
+#: ../calendar/importers/icalendar-importer.c:1254
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "具有附件"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1268
+#: ../calendar/importers/icalendar-importer.c:1267
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "公開"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1271
+#: ../calendar/importers/icalendar-importer.c:1270
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "私人"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1273
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "機密"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1278
+#: ../calendar/importers/icalendar-importer.c:1277
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "歸類"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1283
-#: ../calendar/importers/icalendar-importer.c:1583
+#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "摘要"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1289
+#: ../calendar/importers/icalendar-importer.c:1288
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "位置"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1297
-#: ../calendar/importers/icalendar-importer.c:1578
+#: ../calendar/importers/icalendar-importer.c:1296
+#: ../calendar/importers/icalendar-importer.c:1577
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "開始"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "到期"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1320
+#: ../calendar/importers/icalendar-importer.c:1319
 msgctxt "iCalImp"
 msgid "End"
 msgstr "結束"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1329
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "分類"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1354
+#: ../calendar/importers/icalendar-importer.c:1353
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1362
+#: ../calendar/importers/icalendar-importer.c:1361
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1373
-#: ../calendar/importers/icalendar-importer.c:1376
+#: ../calendar/importers/icalendar-importer.c:1372
+#: ../calendar/importers/icalendar-importer.c:1375
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "會議召集人"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1396
-#: ../calendar/importers/icalendar-importer.c:1399
+#: ../calendar/importers/icalendar-importer.c:1395
+#: ../calendar/importers/icalendar-importer.c:1398
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/importers/icalendar-importer.c:1413
+#: ../calendar/importers/icalendar-importer.c:1412
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "描述"
 
-#: ../calendar/importers/icalendar-importer.c:1573
+#: ../calendar/importers/icalendar-importer.c:1572
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "類型"
@@ -7371,7 +7337,7 @@ msgstr "撰寫新郵件(_M)"
 msgid "Open New Message window"
 msgstr "開啟新的郵件視窗"
 
-#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1216
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1217
 #: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
@@ -7474,13 +7440,13 @@ msgstr "用您的 S/MIME 簽名憑證為郵件加上數位簽章"
 
 #: ../composer/e-composer-actions.c:523
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-msgid "Unicode smileys"
+msgid "Unicode emoticons"
 msgstr "萬國碼表情符號"
 
 #: ../composer/e-composer-actions.c:525
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid "Use Unicode characters for smileys."
-msgstr "使用萬國碼字元表情符號"
+msgid "Use Unicode characters for emoticons."
+msgstr "使用萬國碼字元表情符號。"
 
 #: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
@@ -7588,24 +7554,25 @@ msgstr "按這裡新增目錄服務"
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡,選取要張貼的資料夾"
 
-#: ../composer/e-msg-composer.c:874
+#: ../composer/e-msg-composer.c:876
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署送出的郵件:此帳號沒有設定簽章憑證"
 
-#: ../composer/e-msg-composer.c:883
+#: ../composer/e-msg-composer.c:885
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "無法加密送出的郵件:沒有設定加密憑證(此帳號)"
 
-#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2645
+#: ../composer/e-msg-composer.c:1601 ../composer/e-msg-composer.c:2600
+#: ../data/evolution.desktop.in.in.h:7
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4995
+#: ../composer/e-msg-composer.c:4895
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "郵件編輯器包含不能編輯的非文字的郵件內文。"
 
@@ -7722,7 +7689,7 @@ msgstr "回報的錯誤為 &quot;{0}&quot;。郵件很可能沒有儲存。"
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "在寄信時發生錯誤。您要如何繼續?"
 
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:171
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:169
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "回報的錯誤為 &quot;{0}&quot;。"
 
@@ -7781,6 +7748,10 @@ msgstr "不要略去格式(_D)"
 msgid "Lose _formatting"
 msgstr "失去格式(_F)"
 
+#: ../composer/mail-composer.error.xml.h:41
+msgid "An error occurred while saving to your Templates folder."
+msgstr "當儲存到您的範本資料夾時發生錯誤。"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Evolution 鬧鈴通知"
@@ -7817,6 +7788,20 @@ msgstr ""
 msgid "New Window"
 msgstr "新增視窗"
 
+#: ../data/evolution.desktop.in.in.h:8 ../e-util/e-name-selector-dialog.c:451
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:373
+msgid "Contacts"
+msgstr "連絡人"
+
+#: ../data/evolution.desktop.in.in.h:10 ../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:1242
+#: ../smime/gui/certificate-manager.c:1684
+msgid "Mail"
+msgstr "郵件"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "啟用地址格式化"
@@ -8669,21 +8654,25 @@ msgid "Sunday is a work day"
 msgstr "星期日是工作日"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+msgid "Create events, memos and tasks as Private by default"
+msgstr "預設建立的事件、備忘錄和工作都設為私人"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 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:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 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:157
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid "(Deprecated) Work days"
 msgstr "(已廢棄) 工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 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-"
@@ -8763,8 +8752,8 @@ msgid "Default charset in which to compose messages"
 msgstr "用於撰寫郵件的預設字元集"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Default charset in which to compose messages."
-msgstr "用於撰寫郵件的預設字元集。"
+msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
+msgstr "用於撰寫郵件的預設字元集。如果沒有設定,會使用 UTF-8。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
 msgid "Path where picture gallery should search for its content"
@@ -10431,7 +10420,7 @@ msgid "Name"
 msgstr "名稱"
 
 #: ../em-format/e-mail-formatter-print.c:51
-#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
+#: ../e-util/e-attachment-tree-view.c:195 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "大小"
 
@@ -10439,7 +10428,7 @@ msgstr "大小"
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
 #: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
-#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1632
+#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1645
 msgid "Subject"
 msgstr "主旨"
 
@@ -10461,18 +10450,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:385
+#: ../em-format/e-mail-formatter-text-html.c:387
 msgid "HTML"
 msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:386
+#: ../em-format/e-mail-formatter-text-html.c:388
 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:1526
+#: ../e-util/e-html-editor-actions.c:1523
 msgid "Plain Text"
 msgstr "純文字"
 
@@ -10610,26 +10599,26 @@ msgstr "副本"
 msgid "Bcc"
 msgstr "密件副本"
 
-#: ../em-format/e-mail-formatter-utils.c:564
+#: ../em-format/e-mail-formatter-utils.c:566
 msgid "GPG signed"
 msgstr "GPG 簽署"
 
-#: ../em-format/e-mail-formatter-utils.c:570
+#: ../em-format/e-mail-formatter-utils.c:572
 msgid "GPG encrypted"
 msgstr "GPG 加密"
 
-#: ../em-format/e-mail-formatter-utils.c:576
+#: ../em-format/e-mail-formatter-utils.c:578
 msgid "S/MIME signed"
 msgstr "S/MIME 簽署"
 
-#: ../em-format/e-mail-formatter-utils.c:582
+#: ../em-format/e-mail-formatter-utils.c:584
 msgid "S/MIME encrypted"
 msgstr "S/MIME 加密"
 
-#: ../em-format/e-mail-formatter-utils.c:591
+#: ../em-format/e-mail-formatter-utils.c:593
 #: ../mail/e-mail-config-security-page.c:760
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:204
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:154
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:271
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:214
 msgid "Security"
 msgstr "安全性"
 
@@ -10720,7 +10709,7 @@ msgstr "新聞群組"
 msgid "Face"
 msgstr "面貌"
 
-#: ../em-format/e-mail-part-utils.c:544
+#: ../em-format/e-mail-part-utils.c:547
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
@@ -10843,12 +10832,12 @@ msgstr "無法儲存附件"
 msgid "Attachment Properties"
 msgstr "附件內容"
 
-#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:278
 msgid "F_ilename:"
 msgstr "檔案名稱(_I):"
 
 #: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-image-dialog.c:568
 #: ../e-util/e-html-editor-link-dialog.c:422
 msgid "_Description:"
 msgstr "描述(_D):"
@@ -10869,13 +10858,13 @@ msgstr "無法設為背景"
 msgid "Set as _Background"
 msgstr "設為背景(_B)"
 
-#: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:554
+#: ../e-util/e-attachment-icon-view.c:170
+#: ../e-util/e-attachment-tree-view.c:170
 msgid "Loading"
 msgstr "載入中"
 
-#: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:566
+#: ../e-util/e-attachment-icon-view.c:182
+#: ../e-util/e-attachment-tree-view.c:182
 msgid "Saving"
 msgstr "儲存中"
 
@@ -11008,40 +10997,40 @@ msgstr "複製通訊錄內容至本地用於離線作業"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-單擊以開啟連結"
 
-#: ../e-util/e-calendar.c:207
+#: ../e-util/e-calendar.c:272
 msgid "Previous month"
 msgstr "上個月"
 
-#: ../e-util/e-calendar.c:232
+#: ../e-util/e-calendar.c:291
 msgid "Next month"
 msgstr "下個月"
 
-#: ../e-util/e-calendar.c:258
+#: ../e-util/e-calendar.c:311
 msgid "Previous year"
 msgstr "上一年"
 
-#: ../e-util/e-calendar.c:283
+#: ../e-util/e-calendar.c:330
 msgid "Next year"
 msgstr "下一年"
 
-#: ../e-util/e-calendar.c:307
+#: ../e-util/e-calendar.c:354
 msgid "Month Calendar"
 msgstr "月行事曆"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
+#: ../e-util/e-calendar-item.c:1340 ../e-util/e-calendar-item.c:2220
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%m月"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1339
+#: ../e-util/e-calendar-item.c:1342
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y年"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1376
+#: ../e-util/e-calendar-item.c:1379
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y年%m月"
@@ -11138,7 +11127,7 @@ msgid "popup list"
 msgstr "彈出式列表"
 
 #: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
-#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2049
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2054
 msgid "?"
 msgstr "?"
 
@@ -11431,9 +11420,9 @@ msgstr "淡紫色"
 msgid "white"
 msgstr "白色"
 
-#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../e-util/e-color-combo.c:644 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4024
+#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4037
 #: ../mail/mail-config.ui.h:73
 msgid "Default"
 msgstr "預設值"
@@ -11816,7 +11805,7 @@ msgstr "尋找符合下列條件的項目"
 #. protocol:
 #. name:
 #: ../e-util/e-filter-rule.c:856 ../e-util/e-html-editor-page-dialog.c:63
-#: ../e-util/e-mail-identity-combo-box.c:476
+#: ../e-util/e-mail-identity-combo-box.c:479
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:139
@@ -11865,521 +11854,521 @@ msgstr "無法插入 HTML 檔案。"
 msgid "Failed to insert text file."
 msgstr "無法插入文字檔案。"
 
-#: ../e-util/e-html-editor-actions.c:591
+#: ../e-util/e-html-editor-actions.c:587
 msgid "Insert HTML File"
 msgstr "插入 HTML 檔案"
 
-#: ../e-util/e-html-editor-actions.c:597
+#: ../e-util/e-html-editor-actions.c:593
 msgid "HTML file"
 msgstr "HTML 檔案"
 
-#: ../e-util/e-html-editor-actions.c:624
+#: ../e-util/e-html-editor-actions.c:620
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "插入影像"
 
-#: ../e-util/e-html-editor-actions.c:686
+#: ../e-util/e-html-editor-actions.c:682
 msgid "Insert text file"
 msgstr "插入文字檔案"
 
-#: ../e-util/e-html-editor-actions.c:692
+#: ../e-util/e-html-editor-actions.c:688
 msgid "Text file"
 msgstr "文字檔案"
 
-#: ../e-util/e-html-editor-actions.c:1078
+#: ../e-util/e-html-editor-actions.c:1075
 msgid "Copy selected text to the clipboard"
 msgstr "將選取的文字複製至剪貼簿"
 
-#: ../e-util/e-html-editor-actions.c:1085
+#: ../e-util/e-html-editor-actions.c:1082
 msgid "Cut selected text to the clipboard"
 msgstr "將選定的文字剪貼至剪貼簿"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:1092
+#: ../e-util/e-html-editor-actions.c:1089
 msgid "Paste text from the clipboard"
 msgstr "從剪貼簿貼上文字"
 
-#: ../e-util/e-html-editor-actions.c:1099
+#: ../e-util/e-html-editor-actions.c:1096
 msgid "Redo the last undone action"
 msgstr "重複剛取消的動作"
 
-#: ../e-util/e-html-editor-actions.c:1113
+#: ../e-util/e-html-editor-actions.c:1110
 msgid "Undo the last action"
 msgstr "還原最後的動作"
 
-#: ../e-util/e-html-editor-actions.c:1134
+#: ../e-util/e-html-editor-actions.c:1131
 msgid "For_mat"
 msgstr "格式(_M)"
 
-#: ../e-util/e-html-editor-actions.c:1141
+#: ../e-util/e-html-editor-actions.c:1138
 msgid "_Paragraph Style"
 msgstr "段落樣式(_P)"
 
-#: ../e-util/e-html-editor-actions.c:1155
-#: ../e-util/e-html-editor-image-dialog.c:635
+#: ../e-util/e-html-editor-actions.c:1152
+#: ../e-util/e-html-editor-image-dialog.c:645
 msgid "_Alignment"
 msgstr "對齊(_A)"
 
-#: ../e-util/e-html-editor-actions.c:1162
+#: ../e-util/e-html-editor-actions.c:1159
 msgid "Current _Languages"
 msgstr "目前的語言(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1179
+#: ../e-util/e-html-editor-actions.c:1176
 msgid "_Increase Indent"
 msgstr "增加縮排(_I)"
 
-#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:1178
 msgid "Increase Indent"
 msgstr "增加縮排"
 
-#: ../e-util/e-html-editor-actions.c:1186
+#: ../e-util/e-html-editor-actions.c:1183
 msgid "_HTML File..."
 msgstr "_HTML 檔案…"
 
-#: ../e-util/e-html-editor-actions.c:1193
+#: ../e-util/e-html-editor-actions.c:1190
 msgid "Te_xt File..."
 msgstr "文字檔案(_X)…"
 
-#: ../e-util/e-html-editor-actions.c:1200
+#: ../e-util/e-html-editor-actions.c:1197
 msgid "Paste _Quotation"
 msgstr "貼上引文(_Q)"
 
-#: ../e-util/e-html-editor-actions.c:1207
+#: ../e-util/e-html-editor-actions.c:1204
 msgid "_Find..."
 msgstr "尋找(_F)…"
 
-#: ../e-util/e-html-editor-actions.c:1209
+#: ../e-util/e-html-editor-actions.c:1206
 msgid "Search for text"
 msgstr "搜尋文字"
 
-#: ../e-util/e-html-editor-actions.c:1214
+#: ../e-util/e-html-editor-actions.c:1211
 msgid "Find A_gain"
 msgstr "再次尋找(_G)"
 
-#: ../e-util/e-html-editor-actions.c:1221
+#: ../e-util/e-html-editor-actions.c:1218
 msgid "Re_place..."
 msgstr "取代(_P)…"
 
-#: ../e-util/e-html-editor-actions.c:1223
+#: ../e-util/e-html-editor-actions.c:1220
 msgid "Search for and replace text"
 msgstr "搜尋及取代文字"
 
-#: ../e-util/e-html-editor-actions.c:1228
+#: ../e-util/e-html-editor-actions.c:1225
 msgid "Check _Spelling..."
 msgstr "檢查拼字(_S)…"
 
-#: ../e-util/e-html-editor-actions.c:1235
+#: ../e-util/e-html-editor-actions.c:1232
 msgid "_Decrease Indent"
 msgstr "減少縮排(_D)"
 
-#: ../e-util/e-html-editor-actions.c:1237
+#: ../e-util/e-html-editor-actions.c:1234
 msgid "Decrease Indent"
 msgstr "減少縮排"
 
-#: ../e-util/e-html-editor-actions.c:1242
+#: ../e-util/e-html-editor-actions.c:1239
 msgid "_Wrap Lines"
 msgstr "換列(_W)"
 
-#: ../e-util/e-html-editor-actions.c:1249
+#: ../e-util/e-html-editor-actions.c:1246
 msgid "Open Inspector"
 msgstr "開啟檢查器(_I)"
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1259
+#: ../e-util/e-html-editor-actions.c:1256
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "置中(_C)"
 
-#: ../e-util/e-html-editor-actions.c:1261
+#: ../e-util/e-html-editor-actions.c:1258
 msgid "Center Alignment"
 msgstr "置中對齊"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-actions.c:1263
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "靠左(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1268
+#: ../e-util/e-html-editor-actions.c:1265
 msgid "Left Alignment"
 msgstr "靠左對齊"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-actions.c:1270
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "靠右(_R)"
 
-#: ../e-util/e-html-editor-actions.c:1275
+#: ../e-util/e-html-editor-actions.c:1272
 msgid "Right Alignment"
 msgstr "靠右對齊"
 
-#: ../e-util/e-html-editor-actions.c:1283
+#: ../e-util/e-html-editor-actions.c:1280
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1285
+#: ../e-util/e-html-editor-actions.c:1282
 msgid "HTML editing mode"
 msgstr "HTML 編輯模式"
 
-#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-actions.c:1287
 msgid "Plain _Text"
 msgstr "純文字(_T)"
 
-#: ../e-util/e-html-editor-actions.c:1292
+#: ../e-util/e-html-editor-actions.c:1289
 msgid "Plain text editing mode"
 msgstr "純文字編輯模式"
 
-#: ../e-util/e-html-editor-actions.c:1300
+#: ../e-util/e-html-editor-actions.c:1297
 msgid "_Normal"
 msgstr "一般(_N)"
 
-#: ../e-util/e-html-editor-actions.c:1307
+#: ../e-util/e-html-editor-actions.c:1304
 msgid "Header _1"
 msgstr "標題 _1"
 
-#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-actions.c:1311
 msgid "Header _2"
 msgstr "標題 _2"
 
-#: ../e-util/e-html-editor-actions.c:1321
+#: ../e-util/e-html-editor-actions.c:1318
 msgid "Header _3"
 msgstr "標題 _3"
 
-#: ../e-util/e-html-editor-actions.c:1328
+#: ../e-util/e-html-editor-actions.c:1325
 msgid "Header _4"
 msgstr "標題 _4"
 
-#: ../e-util/e-html-editor-actions.c:1335
+#: ../e-util/e-html-editor-actions.c:1332
 msgid "Header _5"
 msgstr "標題 _5"
 
-#: ../e-util/e-html-editor-actions.c:1342
+#: ../e-util/e-html-editor-actions.c:1339
 msgid "Header _6"
 msgstr "標題 _6"
 
-#: ../e-util/e-html-editor-actions.c:1349
+#: ../e-util/e-html-editor-actions.c:1346
 msgid "_Preformatted"
 msgstr "預先格式化(_P)"
 
-#: ../e-util/e-html-editor-actions.c:1356
+#: ../e-util/e-html-editor-actions.c:1353
 msgid "A_ddress"
 msgstr "位址(_D)"
 
-#: ../e-util/e-html-editor-actions.c:1363
+#: ../e-util/e-html-editor-actions.c:1360
 msgid "_Blockquote"
 msgstr "區塊引用(_B)"
 
-#: ../e-util/e-html-editor-actions.c:1370
+#: ../e-util/e-html-editor-actions.c:1367
 msgid "_Bulleted List"
 msgstr "無序列表(_B)"
 
-#: ../e-util/e-html-editor-actions.c:1377
+#: ../e-util/e-html-editor-actions.c:1374
 msgid "_Roman Numeral List"
 msgstr "羅馬字有序列表(_R)"
 
-#: ../e-util/e-html-editor-actions.c:1384
+#: ../e-util/e-html-editor-actions.c:1381
 msgid "Numbered _List"
 msgstr "有序列表(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1391
+#: ../e-util/e-html-editor-actions.c:1388
 msgid "_Alphabetical List"
 msgstr "字母順序列表(_A)"
 
-#: ../e-util/e-html-editor-actions.c:1407
-#: ../e-util/e-html-editor-actions.c:1445
+#: ../e-util/e-html-editor-actions.c:1404
+#: ../e-util/e-html-editor-actions.c:1442
 msgid "_Image..."
 msgstr "影像(_I)…"
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1410
+#: ../e-util/e-html-editor-actions.c:1407
 msgid "Insert Image"
 msgstr "插入影像"
 
-#: ../e-util/e-html-editor-actions.c:1415
-#: ../e-util/e-html-editor-actions.c:1452
+#: ../e-util/e-html-editor-actions.c:1412
+#: ../e-util/e-html-editor-actions.c:1449
 msgid "_Link..."
 msgstr "連結(_L)…"
 
-#: ../e-util/e-html-editor-actions.c:1417
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "Insert Link"
 msgstr "插入連結"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1423
-#: ../e-util/e-html-editor-actions.c:1467
+#: ../e-util/e-html-editor-actions.c:1420
+#: ../e-util/e-html-editor-actions.c:1464
 msgid "_Rule..."
 msgstr "水平線(_R)…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1426
+#: ../e-util/e-html-editor-actions.c:1423
 msgid "Insert Rule"
 msgstr "插入水平線"
 
-#: ../e-util/e-html-editor-actions.c:1431
-#: ../e-util/e-html-editor-actions.c:1474
+#: ../e-util/e-html-editor-actions.c:1428
+#: ../e-util/e-html-editor-actions.c:1471
 msgid "_Table..."
 msgstr "表格(_T)…"
 
-#: ../e-util/e-html-editor-actions.c:1433
+#: ../e-util/e-html-editor-actions.c:1430
 msgid "Insert Table"
 msgstr "插入表格"
 
-#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1435
 msgid "_Cell..."
 msgstr "儲存格(_C)…"
 
-#: ../e-util/e-html-editor-actions.c:1459
+#: ../e-util/e-html-editor-actions.c:1456
 msgid "Pa_ge..."
 msgstr "頁面(_G)…"
 
-#: ../e-util/e-html-editor-actions.c:1483
+#: ../e-util/e-html-editor-actions.c:1480
 msgid "Font _Size"
 msgstr "字型大小(_S)"
 
-#: ../e-util/e-html-editor-actions.c:1490
+#: ../e-util/e-html-editor-actions.c:1487
 msgid "_Font Style"
 msgstr "字型樣式(_F)"
 
-#: ../e-util/e-html-editor-actions.c:1497
+#: ../e-util/e-html-editor-actions.c:1494
 msgid "Paste As _Text"
 msgstr "貼上為純文字(_T)"
 
-#: ../e-util/e-html-editor-actions.c:1508
+#: ../e-util/e-html-editor-actions.c:1505
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr "粗體(_B)"
 
-#: ../e-util/e-html-editor-actions.c:1510
+#: ../e-util/e-html-editor-actions.c:1507
 msgid "Bold"
 msgstr "粗體"
 
-#: ../e-util/e-html-editor-actions.c:1516
+#: ../e-util/e-html-editor-actions.c:1513
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr "斜體(_I)"
 
-#: ../e-util/e-html-editor-actions.c:1518
+#: ../e-util/e-html-editor-actions.c:1515
 msgid "Italic"
 msgstr "斜體"
 
-#: ../e-util/e-html-editor-actions.c:1524
+#: ../e-util/e-html-editor-actions.c:1521
 msgid "_Plain Text"
 msgstr "純文字(_P)"
 
-#: ../e-util/e-html-editor-actions.c:1532
+#: ../e-util/e-html-editor-actions.c:1529
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr "刪除線(_S)"
 
-#: ../e-util/e-html-editor-actions.c:1534
+#: ../e-util/e-html-editor-actions.c:1531
 msgid "Strikethrough"
 msgstr "刪除線"
 
-#: ../e-util/e-html-editor-actions.c:1540
+#: ../e-util/e-html-editor-actions.c:1537
 #: ../e-util/e-html-editor-text-dialog.c:236
 msgid "_Underline"
 msgstr "底線(_U)"
 
-#: ../e-util/e-html-editor-actions.c:1542
+#: ../e-util/e-html-editor-actions.c:1539
 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:1552
+#: ../e-util/e-html-editor-actions.c:1549
 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:1560
+#: ../e-util/e-html-editor-actions.c:1557
 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:1568
+#: ../e-util/e-html-editor-actions.c:1565
 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:1576
+#: ../e-util/e-html-editor-actions.c:1573
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1584
+#: ../e-util/e-html-editor-actions.c:1581
 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:1592
+#: ../e-util/e-html-editor-actions.c:1589
 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:1600
+#: ../e-util/e-html-editor-actions.c:1597
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1619
+#: ../e-util/e-html-editor-actions.c:1616
 msgid "Cell Contents"
 msgstr "儲存格內容"
 
-#: ../e-util/e-html-editor-actions.c:1626
+#: ../e-util/e-html-editor-actions.c:1623
 msgid "Column"
 msgstr "欄"
 
-#: ../e-util/e-html-editor-actions.c:1633
+#: ../e-util/e-html-editor-actions.c:1630
 msgid "Row"
 msgstr "列"
 
-#: ../e-util/e-html-editor-actions.c:1640
-#: ../e-util/e-html-editor-actions.c:1725
+#: ../e-util/e-html-editor-actions.c:1637
+#: ../e-util/e-html-editor-actions.c:1722
 msgid "Table"
 msgstr "表格"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1650
+#: ../e-util/e-html-editor-actions.c:1647
 msgid "Table Delete"
 msgstr "刪除表格"
 
-#: ../e-util/e-html-editor-actions.c:1657 ../e-util/e-text.c:2147
+#: ../e-util/e-html-editor-actions.c:1654 ../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:1665
+#: ../e-util/e-html-editor-actions.c:1662
 msgid "Table Insert"
 msgstr "插入表格"
 
-#: ../e-util/e-html-editor-actions.c:1672
+#: ../e-util/e-html-editor-actions.c:1669
 msgid "Properties"
 msgstr "屬性"
 
-#: ../e-util/e-html-editor-actions.c:1690
+#: ../e-util/e-html-editor-actions.c:1687
 msgid "Column After"
 msgstr "欄之後"
 
-#: ../e-util/e-html-editor-actions.c:1697
+#: ../e-util/e-html-editor-actions.c:1694
 msgid "Column Before"
 msgstr "欄之前"
 
-#: ../e-util/e-html-editor-actions.c:1704
+#: ../e-util/e-html-editor-actions.c:1701
 msgid "Insert _Link"
 msgstr "插入連結(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1711
+#: ../e-util/e-html-editor-actions.c:1708
 msgid "Row Above"
 msgstr "列之上"
 
-#: ../e-util/e-html-editor-actions.c:1718
+#: ../e-util/e-html-editor-actions.c:1715
 msgid "Row Below"
 msgstr "列之下"
 
-#: ../e-util/e-html-editor-actions.c:1732
+#: ../e-util/e-html-editor-actions.c:1729
 msgid "Cell..."
 msgstr "儲存格…"
 
-#: ../e-util/e-html-editor-actions.c:1739
+#: ../e-util/e-html-editor-actions.c:1736
 msgid "Image..."
 msgstr "影像…"
 
-#: ../e-util/e-html-editor-actions.c:1746
+#: ../e-util/e-html-editor-actions.c:1743
 msgid "Link..."
 msgstr "連結…"
 
-#: ../e-util/e-html-editor-actions.c:1753
+#: ../e-util/e-html-editor-actions.c:1750
 msgid "Page..."
 msgstr "頁面…"
 
-#: ../e-util/e-html-editor-actions.c:1760
+#: ../e-util/e-html-editor-actions.c:1757
 msgid "Paragraph..."
 msgstr "段落…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1768
+#: ../e-util/e-html-editor-actions.c:1765
 msgid "Rule..."
 msgstr "水平線…"
 
-#: ../e-util/e-html-editor-actions.c:1775
+#: ../e-util/e-html-editor-actions.c:1772
 msgid "Table..."
 msgstr "表格…"
 
-#: ../e-util/e-html-editor-actions.c:1782
+#: ../e-util/e-html-editor-actions.c:1779
 msgid "Text..."
 msgstr "文字…"
 
-#: ../e-util/e-html-editor-actions.c:1789
+#: ../e-util/e-html-editor-actions.c:1786
 msgid "Remove Link"
 msgstr "移除連結"
 
-#: ../e-util/e-html-editor-actions.c:1806
+#: ../e-util/e-html-editor-actions.c:1803
 msgid "Add Word to Dictionary"
 msgstr "加入字詞至字典"
 
-#: ../e-util/e-html-editor-actions.c:1813
+#: ../e-util/e-html-editor-actions.c:1810
 msgid "Ignore Misspelled Word"
 msgstr "忽略拼錯的字詞"
 
-#: ../e-util/e-html-editor-actions.c:1820
+#: ../e-util/e-html-editor-actions.c:1817
 msgid "Add Word To"
 msgstr "加入字詞至"
 
-#: ../e-util/e-html-editor-actions.c:1829
+#: ../e-util/e-html-editor-actions.c:1826
 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:1950
+#: ../e-util/e-html-editor-actions.c:1947
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s 字典"
 
-#: ../e-util/e-html-editor-actions.c:2040
+#: ../e-util/e-html-editor-actions.c:2037
 msgid "_Emoticon"
 msgstr "表情符號(_E)"
 
-#: ../e-util/e-html-editor-actions.c:2041
+#: ../e-util/e-html-editor-actions.c:2038
 msgid "Insert Emoticon"
 msgstr "插入表情符號"
 
-#: ../e-util/e-html-editor-actions.c:2109
+#: ../e-util/e-html-editor-actions.c:2106
 msgid "Re_place"
 msgstr "取代(_P)"
 
-#: ../e-util/e-html-editor-actions.c:2112
+#: ../e-util/e-html-editor-actions.c:2109
 msgid "_Image"
 msgstr "影像(_I)"
 
-#: ../e-util/e-html-editor-actions.c:2115
+#: ../e-util/e-html-editor-actions.c:2112
 msgid "_Link"
 msgstr "連結(_L)"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2119
+#: ../e-util/e-html-editor-actions.c:2116
 msgid "_Rule"
 msgstr "水平線(_R)"
 
-#: ../e-util/e-html-editor-actions.c:2122
+#: ../e-util/e-html-editor-actions.c:2119
 #: ../e-util/e-html-editor-cell-dialog.c:738
 msgid "_Table"
 msgstr "表格(_T)"
 
-#: ../e-util/e-html-editor.c:704
+#: ../e-util/e-html-editor.c:707
 msgid "Paragraph Style"
 msgstr "段落樣式"
 
-#: ../e-util/e-html-editor.c:718
+#: ../e-util/e-html-editor.c:721
 msgid "Editing Mode"
 msgstr "編輯模式"
 
-#: ../e-util/e-html-editor.c:730
+#: ../e-util/e-html-editor.c:733
 msgid "Font Color"
 msgstr "字型顏色"
 
-#: ../e-util/e-html-editor.c:748
+#: ../e-util/e-html-editor.c:751
 msgid "Font Size"
 msgstr "字型大小"
 
@@ -12426,17 +12415,17 @@ msgid "_Horizontal:"
 msgstr "水平(_H):"
 
 #: ../e-util/e-html-editor-cell-dialog.c:792
-#: ../e-util/e-html-editor-image-dialog.c:625
+#: ../e-util/e-html-editor-image-dialog.c:635
 msgid "Top"
 msgstr "上"
 
 #: ../e-util/e-html-editor-cell-dialog.c:793
-#: ../e-util/e-html-editor-image-dialog.c:626
+#: ../e-util/e-html-editor-image-dialog.c:636
 msgid "Middle"
 msgstr "中央"
 
 #: ../e-util/e-html-editor-cell-dialog.c:794
-#: ../e-util/e-html-editor-image-dialog.c:627
+#: ../e-util/e-html-editor-image-dialog.c:637
 msgid "Bottom"
 msgstr "下"
 
@@ -12455,7 +12444,7 @@ msgid "_Header Style"
 msgstr "標題樣式(_H)"
 
 #: ../e-util/e-html-editor-cell-dialog.c:830
-#: ../e-util/e-html-editor-image-dialog.c:565
+#: ../e-util/e-html-editor-image-dialog.c:575
 #: ../e-util/e-html-editor-table-dialog.c:812
 msgid "<b>Layout</b>"
 msgstr "<b>配置</b>"
@@ -12488,13 +12477,13 @@ msgid "C_olor:"
 msgstr "顏色(_O):"
 
 #: ../e-util/e-html-editor-cell-dialog.c:930
-#: ../e-util/e-html-editor-image-dialog.c:527
+#: ../e-util/e-html-editor-image-dialog.c:537
 #: ../e-util/e-html-editor-table-dialog.c:945
 msgid "Choose Background Image"
 msgstr "選擇背景影像"
 
 #: ../e-util/e-html-editor-cell-dialog.c:935
-#: ../e-util/e-html-editor-image-dialog.c:533
+#: ../e-util/e-html-editor-image-dialog.c:543
 #: ../e-util/e-html-editor-table-dialog.c:950
 msgid "Images"
 msgstr "影像"
@@ -12542,7 +12531,7 @@ msgstr "<b>大小</b>"
 
 #. Width
 #: ../e-util/e-html-editor-hrule-dialog.c:368
-#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-image-dialog.c:593
 #: ../e-util/e-html-editor-table-dialog.c:823
 msgid "_Width:"
 msgstr "寬度(_W):"
@@ -12569,48 +12558,48 @@ msgstr "陰影(_H)"
 msgid "Rule properties"
 msgstr "水平線屬性"
 
-#: ../e-util/e-html-editor-image-dialog.c:515
+#: ../e-util/e-html-editor-image-dialog.c:525
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
 #: ../e-util/e-html-editor-table-dialog.c:766
 msgid "<b>General</b>"
 msgstr "<b>一般</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:544
+#: ../e-util/e-html-editor-image-dialog.c:554
 msgid "_Source:"
 msgstr "來源:"
 
-#: ../e-util/e-html-editor-image-dialog.c:607
+#: ../e-util/e-html-editor-image-dialog.c:617
 msgid "_Height:"
 msgstr "高度(_H):"
 
-#: ../e-util/e-html-editor-image-dialog.c:648
+#: ../e-util/e-html-editor-image-dialog.c:658
 msgid "_X-Padding:"
 msgstr "_X 填充:"
 
-#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-image-dialog.c:674
 msgid "_Y-Padding:"
 msgstr "_Y 填充:"
 
-#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-image-dialog.c:690
 #: ../e-util/e-html-editor-table-dialog.c:890
 msgid "_Border:"
 msgstr "邊框(_B):"
 
-#: ../e-util/e-html-editor-image-dialog.c:690
+#: ../e-util/e-html-editor-image-dialog.c:700
 msgid "<b>Link</b>"
 msgstr "<b>連結</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:708
+#: ../e-util/e-html-editor-image-dialog.c:718
 #: ../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-image-dialog.c:723
 #: ../e-util/e-html-editor-link-dialog.c:405
 msgid "_Test URL..."
 msgstr "測試 URL (_T)…"
 
-#: ../e-util/e-html-editor-image-dialog.c:730
+#: ../e-util/e-html-editor-image-dialog.c:740
 msgid "Image Properties"
 msgstr "影像屬性"
 
@@ -12676,11 +12665,11 @@ msgid "<b>Background Image</b>"
 msgstr "<b>背景影像</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:638
-#: ../modules/calendar/e-calendar-preferences.ui.h:78
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
 msgid "_Template:"
 msgstr "範本(_T):"
 
-#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:283
+#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:288
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
@@ -12749,46 +12738,46 @@ msgstr "取代"
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>「%s」的建議</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:520
+#: ../e-util/e-html-editor-spell-check-dialog.c:522
 msgid "<b>Suggestions</b>"
 msgstr "<b>建議</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:555
+#: ../e-util/e-html-editor-spell-check-dialog.c:557
 msgid "Replace"
 msgstr "取代"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:564
+#: ../e-util/e-html-editor-spell-check-dialog.c:566
 msgid "Replace All"
 msgstr "全部取代"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:573
-#: ../mail/mail.error.xml.h:112
+#: ../e-util/e-html-editor-spell-check-dialog.c:575
+#: ../mail/mail.error.xml.h:110
 msgid "Ignore"
 msgstr "忽略"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:582
+#: ../e-util/e-html-editor-spell-check-dialog.c:584
 msgid "Skip"
 msgstr "略過"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:591
+#: ../e-util/e-html-editor-spell-check-dialog.c:593
 msgid "Back"
 msgstr "向後"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:600
+#: ../e-util/e-html-editor-spell-check-dialog.c:602
 msgid "<b>Dictionary</b>"
 msgstr "<b>字典</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:620
+#: ../e-util/e-html-editor-spell-check-dialog.c:622
 msgid "Add word"
 msgstr "加入字詞"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:39
+#: ../e-util/e-html-editor-spell-check-dialog.c:639 ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
@@ -12829,88 +12818,89 @@ msgstr "大小(_Z):"
 msgid "Text Properties"
 msgstr "文字屬性"
 
-#: ../e-util/e-html-editor-view.c:6255
+#: ../e-util/e-html-editor-view.c:6413
 msgid "Changed property"
 msgstr "已變更屬性"
 
-#: ../e-util/e-html-editor-view.c:6256
+#: ../e-util/e-html-editor-view.c:6414
 msgid "Whether editor changed"
 msgstr "編輯器是否已改變"
 
-#: ../e-util/e-import-assistant.c:256
+#: ../e-util/e-import-assistant.c:261
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "選取要匯入 Evolution 的檔案,並且在列表內選取檔案類型。"
 
-#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+#: ../e-util/e-import-assistant.c:302 ../e-util/e-import-assistant.c:477
 msgid "File _type:"
 msgstr "檔案類型(_T):"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
+#: ../e-util/e-import-assistant.c:345 ../e-util/e-import-assistant.c:925
 msgid "Choose the destination for this import"
 msgstr "選擇此輸入的目的地"
 
-#: ../e-util/e-import-assistant.c:365
+#: ../e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
 msgstr "選擇匯入服務要執行的類型:"
 
-#: ../e-util/e-import-assistant.c:373
+#: ../e-util/e-import-assistant.c:378
 msgid "Import data and settings from _older programs"
 msgstr "從舊程式輸入資料和設定值(_O)"
 
-#: ../e-util/e-import-assistant.c:381
+#: ../e-util/e-import-assistant.c:386
 msgid "Import a _single file"
 msgstr "匯入單一檔案(_S)"
 
-#: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:200
+#: ../e-util/e-import-assistant.c:408
+#: ../modules/startup-wizard/e-mail-config-import-page.c:210
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇您想要匯入的資訊:"
 
-#: ../e-util/e-import-assistant.c:533
+#: ../e-util/e-import-assistant.c:538
 msgid ""
 "Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+"Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
+"would like to try again, please click the \"Back\" button."
 msgstr ""
 "Evolution 已經檢查從以下應用程式輸入的設定值:Pine、Netscape、Elm、"
-"iCalendar。找不到可以輸入的設定值。如果您想再試一次,請按一下「向後」按鈕。"
+"iCalendar、KMail。找不到可以輸入的設定值。如果您想再試一次,請按一下「向後」"
+"按鈕。"
 
-#: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:229
+#: ../e-util/e-import-assistant.c:564
+#: ../modules/startup-wizard/e-mail-config-import-page.c:239
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:775
+#: ../e-util/e-import-assistant.c:783
 msgid "_Cancel Import"
 msgstr "取消匯入(_C)"
 
-#: ../e-util/e-import-assistant.c:916
+#: ../e-util/e-import-assistant.c:924
 msgid "Preview data to be imported"
 msgstr "預覽需要匯入的資料"
 
-#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
-#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
-#: ../e-util/e-import-assistant.c:1373
+#: ../e-util/e-import-assistant.c:930 ../e-util/e-import-assistant.c:943
+#: ../e-util/e-import-assistant.c:1296 ../e-util/e-import-assistant.c:1372
+#: ../e-util/e-import-assistant.c:1381
 msgid "Import Data"
 msgstr "匯入資料"
 
-#: ../e-util/e-import-assistant.c:930
+#: ../e-util/e-import-assistant.c:938
 msgid "Select what type of file you want to import from the list."
 msgstr "選擇您想要從列表中匯入的檔案類型。"
 
-#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
+#: ../e-util/e-import-assistant.c:1286 ../e-util/e-import-assistant.c:1321
 msgid "Evolution Import Assistant"
 msgstr "Evolution 匯入助理"
 
-#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
+#: ../e-util/e-import-assistant.c:1303 ../e-util/e-import-assistant.c:1359
 msgid "Import Location"
 msgstr "輸入位置"
 
-#: ../e-util/e-import-assistant.c:1306
+#: ../e-util/e-import-assistant.c:1314
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -12919,19 +12909,19 @@ msgstr ""
 "歡迎使用 Evolution 的匯入助理。\n"
 "這個精靈將會領導您如何將外部的檔案匯入到 Evolution。"
 
-#: ../e-util/e-import-assistant.c:1323
+#: ../e-util/e-import-assistant.c:1331
 msgid "Importer Type"
 msgstr "輸入器類型"
 
-#: ../e-util/e-import-assistant.c:1333
+#: ../e-util/e-import-assistant.c:1341
 msgid "Select Information to Import"
 msgstr "選擇要匯入的資訊"
 
-#: ../e-util/e-import-assistant.c:1342
+#: ../e-util/e-import-assistant.c:1350
 msgid "Select a File"
 msgstr "選取檔案"
 
-#: ../e-util/e-import-assistant.c:1359
+#: ../e-util/e-import-assistant.c:1367
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "按「套用」開始將檔案匯入到 Evolution。"
 
@@ -12939,23 +12929,23 @@ msgstr "按「套用」開始將檔案匯入到 Evolution。"
 msgid "Autogenerated"
 msgstr "自動產生的"
 
-#: ../e-util/e-mail-signature-editor.c:297 ../mail/e-mail-notes.c:905
+#: ../e-util/e-mail-signature-editor.c:301 ../mail/e-mail-notes.c:905
 msgid "Close"
 msgstr "關閉"
 
-#: ../e-util/e-mail-signature-editor.c:302 ../mail/e-mail-notes.c:910
+#: ../e-util/e-mail-signature-editor.c:306 ../mail/e-mail-notes.c:910
 msgid "_Save and Close"
 msgstr "儲存後關閉(_S)"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:533
 msgid "Edit Signature"
 msgstr "編輯簽名檔"
 
-#: ../e-util/e-mail-signature-editor.c:562
+#: ../e-util/e-mail-signature-editor.c:566
 msgid "_Signature Name:"
 msgstr "簽名檔名稱(_S):"
 
-#: ../e-util/e-mail-signature-editor.c:598
+#: ../e-util/e-mail-signature-editor.c:602
 msgid "Unnamed"
 msgstr "未命名的"
 
@@ -13001,35 +12991,35 @@ msgstr ""
 "用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的下拉式組合方"
 "塊來選擇時區。"
 
-#: ../e-util/e-misc-utils.c:251
+#: ../e-util/e-misc-utils.c:253
 msgid "Could not open the link."
 msgstr "無法開啟該連結。"
 
-#: ../e-util/e-misc-utils.c:334
+#: ../e-util/e-misc-utils.c:336
 msgid "Could not display help for Evolution."
 msgstr "無法顯示 Evolution 的求助文件。"
 
-#: ../e-util/e-misc-utils.c:2387
+#: ../e-util/e-misc-utils.c:2501
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "開啟行事曆「%s」"
 
-#: ../e-util/e-misc-utils.c:2390
+#: ../e-util/e-misc-utils.c:2504
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "開啟備忘錄列表「%s」"
 
-#: ../e-util/e-misc-utils.c:2393
+#: ../e-util/e-misc-utils.c:2507
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "開啟工作列表「%s」"
 
-#: ../e-util/e-misc-utils.c:2396
+#: ../e-util/e-misc-utils.c:2510
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "正在開啟通訊錄「%s」"
 
-#: ../e-util/e-misc-utils.c:3138
+#: ../e-util/e-misc-utils.c:3252
 #: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "不要再顯示這個訊息(_D)"
@@ -13071,12 +13061,6 @@ msgstr "搜尋"
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: ../e-util/e-name-selector-dialog.c:451
-#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:373
-msgid "Contacts"
-msgstr "連絡人"
-
 #: ../e-util/e-name-selector-dialog.c:576
 msgid "Select Contacts from Address Book"
 msgstr "從通訊錄選取連絡人"
@@ -13256,53 +13240,46 @@ msgstr "編輯規則"
 msgid "Matches: %u"
 msgstr "符合項:%u"
 
-#: ../e-util/e-search-bar.c:569
+#: ../e-util/e-search-bar.c:572
 msgid "Close the find bar"
 msgstr "關閉搜尋工具列"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:580
 msgid "Fin_d:"
 msgstr "尋找(_D):"
 
-#: ../e-util/e-search-bar.c:589
+#: ../e-util/e-search-bar.c:592
 msgid "Clear the search"
 msgstr "清除此搜尋"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:616
 msgid "_Previous"
 msgstr "上一個(_P)"
 
-#: ../e-util/e-search-bar.c:616
+#: ../e-util/e-search-bar.c:619
 msgid "Find the previous occurrence of the phrase"
 msgstr "尋找上一個出現的字詞"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:628
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: ../e-util/e-search-bar.c:628
+#: ../e-util/e-search-bar.c:631
 msgid "Find the next occurrence of the phrase"
 msgstr "尋找下一個出現的字詞"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:640
 msgid "Mat_ch case"
 msgstr "區分大小寫(_C)"
 
-#: ../e-util/e-search-bar.c:665
+#: ../e-util/e-search-bar.c:668
 msgid "Reached bottom of page, continued from top"
 msgstr "到達頁面底部,從頂端繼續"
 
-#: ../e-util/e-search-bar.c:687
+#: ../e-util/e-search-bar.c:690
 msgid "Reached top of page, continued from bottom"
 msgstr "到達頁面頂端,從底部繼續"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:329
-#: ../mail/importers/kmail-importer.c:253 ../mail/importers/pine-importer.c:422
-#: ../modules/mail/e-mail-shell-view.c:1179
-#: ../smime/gui/certificate-manager.c:1671
-msgid "Mail"
-msgstr "郵件"
-
 #: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "刪除時(_L):"
@@ -13520,26 +13497,26 @@ msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:457
+#: ../e-util/e-spell-entry.c:478
 msgid "(no suggestions)"
 msgstr "(沒有建議)"
 
-#: ../e-util/e-spell-entry.c:481
+#: ../e-util/e-spell-entry.c:502
 msgid "More..."
 msgstr "更多…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:566
+#: ../e-util/e-spell-entry.c:587
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "加入「%s」至字典"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:615
+#: ../e-util/e-spell-entry.c:636
 msgid "Ignore All"
 msgstr "全部忽略"
 
-#: ../e-util/e-spell-entry.c:647
+#: ../e-util/e-spell-entry.c:668
 msgid "Spelling Suggestions"
 msgstr "拼字建議"
 
@@ -13568,7 +13545,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:64
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:62
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "回報的錯誤為 &quot;{1}&quot;。"
 
@@ -13706,11 +13683,11 @@ msgstr "全部清除(_A)"
 msgid "_Show field in View"
 msgstr "顯示檢視中的欄位(_S)"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1784
 msgid "Ascending"
 msgstr "遞增"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1784
 msgid "Descending"
 msgstr "遞減"
 
@@ -13770,60 +13747,60 @@ msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 個項目)"
 
-#: ../e-util/e-table-header-item.c:1578
+#: ../e-util/e-table-header-item.c:1607
 msgid "Customize Current View"
 msgstr "自訂目前的檢視"
 
-#: ../e-util/e-table-header-item.c:1601
+#: ../e-util/e-table-header-item.c:1630
 msgid "Sort _Ascending"
 msgstr "遞增排序(_A)"
 
-#: ../e-util/e-table-header-item.c:1604
+#: ../e-util/e-table-header-item.c:1633
 msgid "Sort _Descending"
 msgstr "遞減排序(_D)"
 
-#: ../e-util/e-table-header-item.c:1607
-msgid "_Unsort"
-msgstr "不排序(_U)"
+#: ../e-util/e-table-header-item.c:1636
+msgid "_Reset sort"
+msgstr "重設排序(_R)"
 
-#: ../e-util/e-table-header-item.c:1610
+#: ../e-util/e-table-header-item.c:1639
 msgid "Group By This _Field"
 msgstr "依此欄位做群組(_F)"
 
-#: ../e-util/e-table-header-item.c:1613
+#: ../e-util/e-table-header-item.c:1642
 msgid "Group By _Box"
 msgstr "依方塊為群組(_B)"
 
-#: ../e-util/e-table-header-item.c:1617
+#: ../e-util/e-table-header-item.c:1646
 msgid "Remove This _Column"
 msgstr "移除此欄(_C)"
 
-#: ../e-util/e-table-header-item.c:1620
+#: ../e-util/e-table-header-item.c:1649
 msgid "Add a C_olumn..."
 msgstr "加入一欄(_O)…"
 
-#: ../e-util/e-table-header-item.c:1624
+#: ../e-util/e-table-header-item.c:1653
 msgid "A_lignment"
 msgstr "排列(_L)"
 
-#: ../e-util/e-table-header-item.c:1627
+#: ../e-util/e-table-header-item.c:1656
 msgid "B_est Fit"
 msgstr "最適填滿(_E)"
 
-#: ../e-util/e-table-header-item.c:1630
+#: ../e-util/e-table-header-item.c:1659
 msgid "Format Column_s..."
 msgstr "格式化欄(_S)…"
 
-#: ../e-util/e-table-header-item.c:1634
+#: ../e-util/e-table-header-item.c:1663
 msgid "Custo_mize Current View..."
 msgstr "自訂目前的檢視(_M)…"
 
-#: ../e-util/e-table-header-item.c:1705
+#: ../e-util/e-table-header-item.c:1734
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1728
+#: ../e-util/e-table-header-item.c:1757
 msgid "_Custom"
 msgstr "自訂(_C)"
 
@@ -13885,7 +13862,7 @@ msgid "Flags"
 msgstr "旗標"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:760
+#: ../mail/e-mail-config-identity-page.c:761
 msgid "Identity"
 msgstr "身分"
 
@@ -13960,15 +13937,15 @@ msgstr "移至郵件的開頭處"
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
 
-#: ../e-util/e-web-view.c:3127
+#: ../e-util/e-web-view.c:3143
 msgid "Copying image to clipboard"
 msgstr "複製影像到剪貼薄"
 
-#: ../e-util/e-web-view.c:3315
+#: ../e-util/e-web-view.c:3331
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../e-util/e-web-view.c:3351
+#: ../e-util/e-web-view.c:3367
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "儲存影像到「%s」"
@@ -14017,7 +13994,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:103
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:101
 msgid "Missing name."
 msgstr "缺少名稱。"
 
@@ -14149,12 +14126,12 @@ msgid "toggle the cell"
 msgstr "切換儲存格"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:213
+#: ../e-util/gal-a11y-e-cell-tree.c:215
 msgid "expands the row in the ETree containing this cell"
 msgstr "展開 ETree 中包含此儲存格的列"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:221
+#: ../e-util/gal-a11y-e-cell-tree.c:223
 msgid "collapses the row in the ETree containing this cell"
 msgstr "折疊 ETree 中包含此儲存格的列"
 
@@ -14178,7 +14155,7 @@ msgstr "建立新的檢視(_C)"
 msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
-#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:197
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:195
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的變更?"
 
@@ -14186,7 +14163,7 @@ msgstr "要儲存所做的變更?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "此簽章已經變更,但尚未儲存。"
 
-#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:199
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:197
 msgid "_Discard changes"
 msgstr "放棄變更(_D)"
 
@@ -14260,7 +14237,7 @@ msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
 #: ../libemail-engine/e-mail-folder-utils.c:684
-#: ../libemail-engine/e-mail-folder-utils.c:935
+#: ../libemail-engine/e-mail-folder-utils.c:938
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14270,92 +14247,91 @@ msgstr[0] "取回 %d 封郵件"
 msgid "Scanning messages for duplicates"
 msgstr "掃描郵件是否有重複"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1148
+#: ../libemail-engine/e-mail-folder-utils.c:1151
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移除資料夾「%s」"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1328
+#: ../libemail-engine/e-mail-folder-utils.c:1332
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "檔案「%s」已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1332
+#: ../libemail-engine/e-mail-folder-utils.c:1336
 msgid "File has been removed."
 msgstr "檔案已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1391
+#: ../libemail-engine/e-mail-folder-utils.c:1413
 msgid "Removing attachments"
 msgstr "正在移除附件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1555
+#: ../libemail-engine/e-mail-folder-utils.c:1577
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "儲存 %d 封郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1933
+#: ../libemail-engine/e-mail-folder-utils.c:1955
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "無效的資料夾 URI「%s」"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:680
-#: ../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1049
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-properties.c:778
+#: ../mail/em-folder-tree-model.c:1212 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1063
 msgid "Inbox"
 msgstr "收件匣"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1205
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1050
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1216
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1051
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 msgid "Outbox"
 msgstr "寄件匣"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
+#: ../libemail-engine/e-mail-session.c:130 ../mail/em-folder-tree-model.c:1220
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1056
 msgid "Sent"
 msgstr "已傳送"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
+#: ../libemail-engine/e-mail-session.c:131 ../mail/em-folder-tree-model.c:1208
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1055
+#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../plugins/templates/e-templates-store.c:2214
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
-#: ../plugins/templates/templates.c:1488
 msgid "Templates"
 msgstr "範本"
 
-#: ../libemail-engine/e-mail-session.c:1262
+#: ../libemail-engine/e-mail-session.c:1305
 #, c-format
 msgid "User cancelled operation"
 msgstr "使用者取消的操作"
 
-#: ../libemail-engine/e-mail-session.c:1319
+#: ../libemail-engine/e-mail-session.c:1362
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "沒有提供目的地位址,郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-session.c:1332
+#: ../libemail-engine/e-mail-session.c:1375
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "找不到可使用的識別符,郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-session.c:2362
+#: ../libemail-engine/e-mail-session.c:2405
 #, c-format
 msgid "Waiting for '%s'"
 msgstr "等待「%s」"
@@ -14365,26 +14341,26 @@ msgid "No mail transport service available"
 msgstr "沒有可用的郵件傳輸服務"
 
 #: ../libemail-engine/e-mail-session-utils.c:630
-#: ../libemail-engine/mail-ops.c:719
+#: ../libemail-engine/mail-ops.c:720
 #, c-format
 msgid "Posting message to '%s'"
 msgstr "張貼郵件至「%s」"
 
 #: ../libemail-engine/e-mail-session-utils.c:667
-#: ../libemail-engine/mail-ops.c:755
+#: ../libemail-engine/mail-ops.c:756
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器:%s"
 
 #: ../libemail-engine/e-mail-session-utils.c:697
 #: ../libemail-engine/e-mail-session-utils.c:732
-#: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
+#: ../libemail-engine/mail-ops.c:780 ../libemail-engine/mail-ops.c:815
 #, c-format
 msgid "Storing sent message to '%s'"
 msgstr "儲存外寄郵件到「%s」"
 
 #: ../libemail-engine/e-mail-session-utils.c:721
-#: ../libemail-engine/mail-ops.c:803
+#: ../libemail-engine/mail-ops.c:804
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14394,13 +14370,13 @@ msgstr ""
 "改附加至本地「寄件匣」資料夾。"
 
 #: ../libemail-engine/e-mail-session-utils.c:751
-#: ../libemail-engine/mail-ops.c:831
+#: ../libemail-engine/mail-ops.c:832
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "無法附加至本地「寄件匣」資料夾:%s"
 
 #: ../libemail-engine/e-mail-session-utils.c:953
-#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
+#: ../libemail-engine/mail-ops.c:995 ../libemail-engine/mail-ops.c:1097
 msgid "Sending message"
 msgstr "正在傳送郵件"
 
@@ -14440,7 +14416,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "從「%s」匯入郵件"
 
-#: ../libemail-engine/mail-ops.c:749
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -14452,56 +14428,56 @@ msgstr ""
 "的。請在編輯->郵件規則中檢查您的過濾器。\n"
 "原始錯誤訊息是:%s"
 
-#: ../libemail-engine/mail-ops.c:990
+#: ../libemail-engine/mail-ops.c:1006
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
 
-#: ../libemail-engine/mail-ops.c:1042
+#: ../libemail-engine/mail-ops.c:1058
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "無法傳送 %d / %d 封郵件"
 
-#: ../libemail-engine/mail-ops.c:1048
-msgid "Canceled."
+#: ../libemail-engine/mail-ops.c:1064
+msgid "Cancelled."
 msgstr "已取消。"
 
-#: ../libemail-engine/mail-ops.c:1050
+#: ../libemail-engine/mail-ops.c:1066
 msgid "Complete."
 msgstr "完成。"
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1182
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "將郵件移到「%s」"
 
-#: ../libemail-engine/mail-ops.c:1165
+#: ../libemail-engine/mail-ops.c:1183
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "將郵件複製到「%s」"
 
-#: ../libemail-engine/mail-ops.c:1284
+#: ../libemail-engine/mail-ops.c:1302
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在貯藏資料夾「%s」"
 
-#: ../libemail-engine/mail-ops.c:1412
+#: ../libemail-engine/mail-ops.c:1430
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "清空和儲存帳號「%s」"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1431
 #, c-format
 msgid "Storing account '%s'"
 msgstr "儲存帳號「%s」"
 
-#: ../libemail-engine/mail-ops.c:1488
+#: ../libemail-engine/mail-ops.c:1506
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空「%s」的回收筒"
 
-#: ../libemail-engine/mail-ops.c:1580
+#: ../libemail-engine/mail-ops.c:1598
 #, c-format
 msgid "Processing folder changes in '%s'"
 msgstr "處理「%s」中的資料夾變更"
@@ -14616,7 +14592,7 @@ msgstr "略過尋找(_S)"
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-#: ../mail/e-mail-config-assistant.c:952
+#: ../mail/e-mail-config-assistant.c:954
 msgid "_Revise Details"
 msgstr "修訂詳細資訊(_R)"
 
@@ -14646,129 +14622,137 @@ msgstr ""
 msgid "Done"
 msgstr "完成"
 
-#: ../mail/e-mail-config-defaults-page.c:371
+#: ../mail/e-mail-config-defaults-page.c:377
 msgid "Checking server settings..."
 msgstr "正在檢查伺服器設定值…"
 
-#: ../mail/e-mail-config-defaults-page.c:489
+#: ../mail/e-mail-config-defaults-page.c:495
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "使用全域設定值"
 
-#: ../mail/e-mail-config-defaults-page.c:491 ../mail/mail-config.ui.h:26
+#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "附件"
 
-#: ../mail/e-mail-config-defaults-page.c:493 ../mail/mail-config.ui.h:27
+#: ../mail/e-mail-config-defaults-page.c:499 ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "行內 (Outlook 風格)"
 
-#: ../mail/e-mail-config-defaults-page.c:495 ../mail/mail-config.ui.h:28
+#: ../mail/e-mail-config-defaults-page.c:501 ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "引文"
 
-#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:29
+#: ../mail/e-mail-config-defaults-page.c:503 ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "不使用引文"
 
-#: ../mail/e-mail-config-defaults-page.c:822
+#: ../mail/e-mail-config-defaults-page.c:829
 msgid "Special Folders"
 msgstr "特殊資料夾"
 
-#: ../mail/e-mail-config-defaults-page.c:831
+#: ../mail/e-mail-config-defaults-page.c:838
 msgid "Draft Messages _Folder:"
 msgstr "草稿郵件資料夾(_F):"
 
-#: ../mail/e-mail-config-defaults-page.c:841
+#: ../mail/e-mail-config-defaults-page.c:848
 msgid "Choose a folder for saving draft messages."
 msgstr "選擇儲存草稿郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:855
+#: ../mail/e-mail-config-defaults-page.c:862
 msgid "Sent _Messages Folder:"
 msgstr "傳送郵件資料夾(_M):"
 
-#: ../mail/e-mail-config-defaults-page.c:865
+#: ../mail/e-mail-config-defaults-page.c:872
 msgid "Choose a folder for saving sent messages."
 msgstr "選擇儲存傳送郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:884
+#: ../mail/e-mail-config-defaults-page.c:891
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "將回信儲存在要回覆郵件的資料夾(_A)"
 
-#: ../mail/e-mail-config-defaults-page.c:901
+#: ../mail/e-mail-config-defaults-page.c:908
 msgid "Archi_ve Folder:"
 msgstr "封存資料夾(_V):"
 
-#: ../mail/e-mail-config-defaults-page.c:911
+#: ../mail/e-mail-config-defaults-page.c:918
 #: ../modules/mail/em-mailer-prefs.c:1403
 msgid "Choose a folder to archive messages to."
 msgstr "選擇封存郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:929
+#: ../mail/e-mail-config-defaults-page.c:932
+msgid "_Templates Folder:"
+msgstr "範本資料夾(_T):"
+
+#: ../mail/e-mail-config-defaults-page.c:942
+msgid "Choose a folder to use for template messages."
+msgstr "選擇範本郵件的資料夾。"
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "_Restore Defaults"
 msgstr "還原為預設值(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:946
+#: ../mail/e-mail-config-defaults-page.c:981
 msgid "_Lookup Folders"
 msgstr "查詢資料夾(_L)"
 
-#: ../mail/e-mail-config-defaults-page.c:964
+#: ../mail/e-mail-config-defaults-page.c:999
 msgid "Use a Real Folder for _Trash:"
 msgstr "回收桶使用真實資料夾(_T):"
 
-#: ../mail/e-mail-config-defaults-page.c:965
+#: ../mail/e-mail-config-defaults-page.c:1000
 msgid "Choose a folder for deleted messages."
 msgstr "選擇删除郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:974
+#: ../mail/e-mail-config-defaults-page.c:1009
 msgid "Use a Real Folder for _Junk:"
 msgstr "垃圾郵件使用真實資料夾(_J):"
 
-#: ../mail/e-mail-config-defaults-page.c:975
+#: ../mail/e-mail-config-defaults-page.c:1010
 msgid "Choose a folder for junk messages."
 msgstr "選擇垃圾郵件的資料夾。"
 
-#: ../mail/e-mail-config-defaults-page.c:992
+#: ../mail/e-mail-config-defaults-page.c:1027
 msgid "Composing Messages"
 msgstr "正在編輯郵件"
 
-#: ../mail/e-mail-config-defaults-page.c:1001
+#: ../mail/e-mail-config-defaults-page.c:1036
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "一定寄送副本 (cc) 給(_S):"
 
-#: ../mail/e-mail-config-defaults-page.c:1026
+#: ../mail/e-mail-config-defaults-page.c:1061
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "一定寄送密件副本 (bcc) 給(_B):"
 
-#: ../mail/e-mail-config-defaults-page.c:1057
+#: ../mail/e-mail-config-defaults-page.c:1092
 msgid "Re_ply style:"
 msgstr "回覆風格(_P):"
 
-#: ../mail/e-mail-config-defaults-page.c:1093
+#: ../mail/e-mail-config-defaults-page.c:1128
 msgid "Message Receipts"
 msgstr "郵件回條"
 
-#: ../mail/e-mail-config-defaults-page.c:1102
+#: ../mail/e-mail-config-defaults-page.c:1137
 msgid "S_end message receipts:"
 msgstr "傳送郵件回條(_E):"
 
-#: ../mail/e-mail-config-defaults-page.c:1127
+#: ../mail/e-mail-config-defaults-page.c:1162
 msgid "Never"
 msgstr "永不"
 
-#: ../mail/e-mail-config-defaults-page.c:1133
+#: ../mail/e-mail-config-defaults-page.c:1168
 msgid "Always"
 msgstr "永遠"
 
-#: ../mail/e-mail-config-defaults-page.c:1139
+#: ../mail/e-mail-config-defaults-page.c:1174
 msgid "Ask for each message"
 msgstr "每封郵件皆詢問"
 
-#: ../mail/e-mail-config-defaults-page.c:1246
+#: ../mail/e-mail-config-defaults-page.c:1281
 msgid "Defaults"
 msgstr "預設值"
 
@@ -14828,23 +14812,25 @@ msgstr "加入新的簽名檔(_W)…"
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "以輸入的電子郵件位址尋找郵件伺服器詳細資料(_L)"
 
-#: ../mail/e-mail-config-identity-page.c:611
-msgid "Full Name cannot be empty"
-msgstr "全名不能為空"
+#. This is only a warning, not a blocker
+#. complete = complete && correct;
+#: ../mail/e-mail-config-identity-page.c:612
+msgid "Full Name should not be empty"
+msgstr "全名不應該是空的"
 
-#: ../mail/e-mail-config-identity-page.c:618
+#: ../mail/e-mail-config-identity-page.c:619
 msgid "Email Address cannot be empty"
 msgstr "電子郵件位址不能為空"
 
-#: ../mail/e-mail-config-identity-page.c:623
+#: ../mail/e-mail-config-identity-page.c:624
 msgid "Email Address is not a valid email"
 msgstr "電子郵件位址不是有效的電子郵件"
 
-#: ../mail/e-mail-config-identity-page.c:635
+#: ../mail/e-mail-config-identity-page.c:636
 msgid "Reply To is not a valid email"
 msgstr "回信位址不是有效的電子郵件"
 
-#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-identity-page.c:647
 #: ../mail/e-mail-config-summary-page.c:632
 msgid "Account Name cannot be empty"
 msgstr "帳號名稱不能為空"
@@ -14877,11 +14863,12 @@ msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:701
 #: ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:113
 #: ../modules/calendar/e-calendar-preferences.c:620
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/mail/e-mail-shell-backend.c:707
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "一般"
@@ -15264,7 +15251,7 @@ msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
 #: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:146
 msgid "_Move"
 msgstr "移動(_M)"
 
@@ -15289,7 +15276,7 @@ msgstr "永遠忽略通信論壇的回覆欄位(_A)"
 msgid "Failed to retrieve message:"
 msgstr "取回郵件失敗:"
 
-#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3145
+#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3158
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "正在取回郵件「%s」"
@@ -15430,11 +15417,12 @@ msgstr "跟隨(_U)…"
 msgid "Flag the selected messages for follow-up"
 msgstr "將選定的郵件加上跟隨旗標"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2084 ../modules/mail/e-mail-attachment-handler.c:364
 msgid "_Attached"
 msgstr "附件(_A)"
 
 #: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
+#: ../modules/mail/e-mail-attachment-handler.c:366
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附件形式轉寄給某人"
 
@@ -15442,11 +15430,12 @@ msgstr "將選定的郵件以附件形式轉寄給某人"
 msgid "Forward As _Attached"
 msgstr "以附件轉寄(_A)"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2098 ../modules/mail/e-mail-attachment-handler.c:371
 msgid "_Inline"
 msgstr "行內(_I)"
 
 #: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
+#: ../modules/mail/e-mail-attachment-handler.c:373
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
@@ -15454,11 +15443,12 @@ msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 msgid "Forward As _Inline"
 msgstr "以行內轉寄(_I)"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2112 ../modules/mail/e-mail-attachment-handler.c:378
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
 #: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
+#: ../modules/mail/e-mail-attachment-handler.c:380
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
@@ -15554,11 +15544,11 @@ msgstr "未閱讀(_U)"
 msgid "Mark the selected messages as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2203 ../modules/mail/e-mail-attachment-handler.c:350
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)…"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2205 ../modules/mail/e-mail-attachment-handler.c:352
 msgid "Open the selected messages in the composer for editing"
 msgstr "在撰寫視窗開啟選取的郵件以便編輯"
 
@@ -15658,11 +15648,11 @@ msgstr "列印郵件"
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2301 ../modules/mail/e-mail-attachment-handler.c:385
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2303 ../modules/mail/e-mail-attachment-handler.c:387
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
@@ -15682,29 +15672,30 @@ msgstr "移除重複的郵件(_P)"
 msgid "Checks selected messages for duplicates"
 msgstr "檢查選取的郵件是否有重複"
 
-#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:30
+#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
 #: ../modules/calendar/e-cal-shell-view-actions.c:1432
-#: ../modules/mail/e-mail-attachment-handler.c:213
+#: ../modules/mail/e-mail-attachment-handler.c:329
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../mail/e-mail-reader.c:2324
+#: ../mail/e-mail-reader.c:2324 ../modules/mail/e-mail-attachment-handler.c:331
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "撰寫回郵給已選取郵件的全部收件者"
 
-#: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:28
+#: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:26
+#: ../modules/mail/e-mail-attachment-handler.c:336
 msgid "Reply to _List"
 msgstr "回覆至列表(_L)"
 
-#: ../mail/e-mail-reader.c:2331
+#: ../mail/e-mail-reader.c:2331 ../modules/mail/e-mail-attachment-handler.c:338
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "撰寫回郵給所選定郵件的通信論壇"
 
-#: ../mail/e-mail-reader.c:2336 ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2336 ../modules/mail/e-mail-attachment-handler.c:343
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/e-mail-reader.c:2338
+#: ../mail/e-mail-reader.c:2338 ../modules/mail/e-mail-attachment-handler.c:345
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
@@ -15760,7 +15751,7 @@ msgstr "建立(_A)"
 msgid "Ch_aracter Encoding"
 msgstr "字元編碼(_A)"
 
-#: ../mail/e-mail-reader.c:2408
+#: ../mail/e-mail-reader.c:2408 ../modules/mail/e-mail-attachment-handler.c:357
 msgid "F_orward As"
 msgstr "轉寄為(_O)"
 
@@ -15860,64 +15851,64 @@ msgstr "所有郵件檔頭(_H)"
 msgid "Show messages with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
-#: ../mail/e-mail-reader.c:3151
+#: ../mail/e-mail-reader.c:3164
 msgid "Retrieving message"
 msgstr "取回郵件"
 
-#: ../mail/e-mail-reader.c:4203 ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4216 ../modules/mail/e-mail-attachment-handler.c:322
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/e-mail-reader.c:4204
+#: ../mail/e-mail-reader.c:4217 ../modules/mail/e-mail-attachment-handler.c:324
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
-#: ../mail/e-mail-reader.c:4223
+#: ../mail/e-mail-reader.c:4236
 msgid "Group Reply"
 msgstr "群組回覆"
 
-#: ../mail/e-mail-reader.c:4224
+#: ../mail/e-mail-reader.c:4237
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "回覆給通信論壇,或是給所有的收件者"
 
-#: ../mail/e-mail-reader.c:4290 ../mail/filtertypes.xml.in.h:67
+#: ../mail/e-mail-reader.c:4303 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "刪除"
 
-#: ../mail/e-mail-reader.c:4302
+#: ../mail/e-mail-reader.c:4315
 #: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "下一個"
 
-#: ../mail/e-mail-reader.c:4306
+#: ../mail/e-mail-reader.c:4319
 #: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "上一個"
 
-#: ../mail/e-mail-reader.c:4315 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4328 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/e-mail-reader.c:5389
+#: ../mail/e-mail-reader.c:5406
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "允許任何寄件者為 %s 的遠端內容"
 
-#: ../mail/e-mail-reader.c:5391
+#: ../mail/e-mail-reader.c:5408
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "允許任何收件者為 %s 的遠端內容"
 
-#: ../mail/e-mail-reader.c:5408
+#: ../mail/e-mail-reader.c:5425
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "允許任何寄件者為 %s 的遠端內容"
 
-#: ../mail/e-mail-reader.c:5425
+#: ../mail/e-mail-reader.c:5442
 msgid "Do not show this message again"
 msgstr "不要再顯示這個訊息"
 
-#: ../mail/e-mail-reader.c:5473
+#: ../mail/e-mail-reader.c:5490
 msgid "Load remote content"
 msgstr "載入遠端內容"
 
@@ -15925,34 +15916,34 @@ msgstr "載入遠端內容"
 msgid "Do not warn me again"
 msgstr "不要再警告我"
 
-#: ../mail/e-mail-reader-utils.c:572
+#: ../mail/e-mail-reader-utils.c:570
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "重新整理資料夾「%s」"
 
-#: ../mail/e-mail-reader-utils.c:1165
+#: ../mail/e-mail-reader-utils.c:1163
 msgid "Marking thread to be ignored"
 msgstr "將群組標記為忽略"
 
-#: ../mail/e-mail-reader-utils.c:1169
+#: ../mail/e-mail-reader-utils.c:1167
 msgid "Unmarking thread from being ignored"
 msgstr "取消群組被忽略的標記"
 
-#: ../mail/e-mail-reader-utils.c:1173
+#: ../mail/e-mail-reader-utils.c:1171
 msgid "Marking subthread to be ignored"
 msgstr "將子群組標記為忽略"
 
-#: ../mail/e-mail-reader-utils.c:1177
+#: ../mail/e-mail-reader-utils.c:1175
 msgid "Unmarking subthread from being ignored"
 msgstr "取消子群組被忽略的標記"
 
-#: ../mail/e-mail-reader-utils.c:1421
+#: ../mail/e-mail-reader-utils.c:1419
 msgid "Printing"
 msgstr "列印"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1658
+#: ../mail/e-mail-reader-utils.c:1656
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -15962,7 +15953,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "資料夾「%s」包含 %u 封重複的郵件。您確定要刪除它?"
 
-#: ../mail/e-mail-reader-utils.c:2489
+#: ../mail/e-mail-reader-utils.c:2487
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "儲存郵件"
@@ -15972,12 +15963,12 @@ msgstr[0] "儲存郵件"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2510
+#: ../mail/e-mail-reader-utils.c:2508
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "郵件"
 
-#: ../mail/e-mail-reader-utils.c:2883
+#: ../mail/e-mail-reader-utils.c:2881
 msgid "Parsing message"
 msgstr "解析郵件"
 
@@ -15999,9 +15990,37 @@ msgstr "%s 核對失敗"
 msgid "No data source found for UID '%s'"
 msgstr "沒有 UID「%s」的資料來源"
 
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../mail/em-composer-utils.c:390
+#, c-format
+msgid "Are you sure you want to send a message with %d To and CC recipients?"
+msgid_plural ""
+"Are you sure you want to send a message with %d To and CC recipients?"
+msgstr[0] "您確定要寄信給 %d 個收件者與副本?"
+
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../mail/em-composer-utils.c:396
+#, c-format
+msgid ""
+"You are trying to send a message to %d 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."
+msgid_plural ""
+"You are trying to send a message to %d 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] ""
+"您正在嘗試寄信給 %d 位收件者和副本。這會導致所有收件者看到對方的電子郵件位"
+"址。在某些情況下這種行為是不受歡迎,特別是如果他們不認識對方或認為隱私權是一"
+"個問題時。請考慮將收件者加入到密件副本欄位。"
+
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../mail/em-composer-utils.c:769
+#: ../mail/em-composer-utils.c:790
 msgid "Waiting for attachments to load..."
 msgstr "正在等待載入附件"
 
@@ -16009,7 +16028,7 @@ msgstr "正在等待載入附件"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1692
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16017,24 +16036,24 @@ msgstr ""
 "於 ${WeekdayName},${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
 "${TimeZone},${Sender} 提到:"
 
-#: ../mail/em-composer-utils.c:1671
+#: ../mail/em-composer-utils.c:1698
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-#: ../mail/em-composer-utils.c:1676
+#: ../mail/em-composer-utils.c:1703
 msgid "-----Original Message-----"
 msgstr "-----原始郵件-----"
 
-#: ../mail/em-composer-utils.c:2963
+#: ../mail/em-composer-utils.c:3008
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3450
+#: ../mail/em-composer-utils.c:3495
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-#: ../mail/em-composer-utils.c:3455
+#: ../mail/em-composer-utils.c:3500
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
@@ -16051,85 +16070,85 @@ msgstr "接著依"
 msgid "Add Ac_tion"
 msgstr "加入動作(_T)"
 
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:227
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "未讀郵件:"
 
-#: ../mail/em-folder-properties.c:189
+#: ../mail/em-folder-properties.c:238
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "所有郵件:"
 
-#: ../mail/em-folder-properties.c:210
+#: ../mail/em-folder-properties.c:259
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "配額使用量 (%s):"
 
-#: ../mail/em-folder-properties.c:212
+#: ../mail/em-folder-properties.c:261
 #, 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:287
+#: ../mail/em-folder-properties.c:385
 msgid "_Send Account Override:"
 msgstr "傳送帳號覆蓋(_S):"
 
-#: ../mail/em-folder-properties.c:491
+#: ../mail/em-folder-properties.c:589
 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
+#: ../mail/em-folder-properties.c:598
 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
+#: ../mail/em-folder-properties.c:614
 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
+#: ../mail/em-folder-properties.c:616
 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
+#: ../mail/em-folder-properties.c:618
 msgctxt "autoarchive"
 msgid "months"
 msgstr "個月"
 
-#: ../mail/em-folder-properties.c:526
+#: ../mail/em-folder-properties.c:624
 msgid "Move old messages to the default archive _folder"
 msgstr "將舊的郵件移至預設的封存資料夾(_F)"
 
-#: ../mail/em-folder-properties.c:537
+#: ../mail/em-folder-properties.c:635
 msgid "_Move old messages to:"
 msgstr "移動舊的郵件到(_M):"
 
-#: ../mail/em-folder-properties.c:541
+#: ../mail/em-folder-properties.c:639
 msgid "AutoArchive folder"
 msgstr "自動封存資料夾"
 
-#: ../mail/em-folder-properties.c:541
+#: ../mail/em-folder-properties.c:639
 msgid "Select folder to use for AutoArchive"
 msgstr "選擇用於自動封存的資料夾"
 
-#: ../mail/em-folder-properties.c:547
+#: ../mail/em-folder-properties.c:645
 msgid "_Delete old messages"
 msgstr "刪除舊的郵件(_D)"
 
-#: ../mail/em-folder-properties.c:606
+#: ../mail/em-folder-properties.c:704
 msgid "AutoArchive"
 msgstr "自動封存"
 
-#: ../mail/em-folder-properties.c:685
+#: ../mail/em-folder-properties.c:783
 msgid "Folder Properties"
 msgstr "資料夾內容"
 
@@ -16165,12 +16184,12 @@ msgstr "正在移動資料夾 %s"
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2491
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2496
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2493
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2498
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
@@ -16185,7 +16204,7 @@ msgstr "無法將郵件拖放到最上層的儲存區"
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../mail/em-folder-tree-model.c:1313 ../mail/em-folder-tree-model.c:1689
+#: ../mail/em-folder-tree-model.c:1301 ../mail/em-folder-tree-model.c:1677
 msgid "Loading..."
 msgstr "載入中…"
 
@@ -16209,7 +16228,7 @@ msgstr "要顯示的訂閱(_B)"
 msgid "Subscribe To _All"
 msgstr "全部訂閱(_A)"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1912
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1914
 #: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
@@ -16223,79 +16242,79 @@ msgid "Unsubscribe From _All"
 msgstr "全部取消訂閱(_A)"
 
 #: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1029
 #, 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:1036
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "共 %d 封"
 
-#: ../mail/em-subscription-editor.c:1749
+#: ../mail/em-subscription-editor.c:1755
 msgid "Folder Subscriptions"
 msgstr "資料夾訂閱"
 
-#: ../mail/em-subscription-editor.c:1788
+#: ../mail/em-subscription-editor.c:1790
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../mail/em-subscription-editor.c:1801
+#: ../mail/em-subscription-editor.c:1803
 msgid "Clear Search"
 msgstr "清除搜尋"
 
-#: ../mail/em-subscription-editor.c:1818
+#: ../mail/em-subscription-editor.c:1820
 msgid "Sho_w items that contain:"
 msgstr "顯示項目包含(_W):"
 
-#: ../mail/em-subscription-editor.c:1865
+#: ../mail/em-subscription-editor.c:1867
 msgid "Subscribe to the selected folder"
 msgstr "訂閱選取的資料夾"
 
-#: ../mail/em-subscription-editor.c:1866
+#: ../mail/em-subscription-editor.c:1868
 msgid "Su_bscribe"
 msgstr "訂閱(_B)"
 
-#: ../mail/em-subscription-editor.c:1911
+#: ../mail/em-subscription-editor.c:1913
 #: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "取消訂閱選取的資料夾"
 
-#: ../mail/em-subscription-editor.c:1951
+#: ../mail/em-subscription-editor.c:1953
 msgid "Collapse all folders"
 msgstr "收摺所有的資料夾"
 
-#: ../mail/em-subscription-editor.c:1952
+#: ../mail/em-subscription-editor.c:1954
 msgid "C_ollapse All"
 msgstr "全部收摺(_O)"
 
-#: ../mail/em-subscription-editor.c:1962
+#: ../mail/em-subscription-editor.c:1964
 msgid "Expand all folders"
 msgstr "展開所有的資料夾"
 
-#: ../mail/em-subscription-editor.c:1963
+#: ../mail/em-subscription-editor.c:1965
 msgid "E_xpand All"
 msgstr "全部展開(_X)"
 
-#: ../mail/em-subscription-editor.c:1973
+#: ../mail/em-subscription-editor.c:1975
 msgid "Refresh the folder list"
 msgstr "重新整理資料夾列表"
 
-#: ../mail/em-subscription-editor.c:1974
+#: ../mail/em-subscription-editor.c:1976
 #: ../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:1985
+#: ../mail/em-subscription-editor.c:1987
 msgid "Stop the current operation"
 msgstr "停止目前的操作"
 
-#: ../mail/em-subscription-editor.c:1986
+#: ../mail/em-subscription-editor.c:1988
 #: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "停止(_S)"
@@ -16723,7 +16742,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "從 KMail 匯入郵件與連絡人。"
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1057
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 msgid "Trash"
 msgstr "回收筒"
 
@@ -16833,8 +16852,8 @@ msgid "Automatically insert _emoticons"
 msgstr "自動插入表情符號(_E)"
 
 #: ../mail/mail-config.ui.h:11
-msgid "Use Unicode characters for smile_ys"
-msgstr "使用萬國碼字元表示表情符號(_Y)"
+msgid "Use Un_icode characters for emoticons"
+msgstr "使用萬國碼字元表情符號(_I)"
 
 #: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
@@ -17065,7 +17084,7 @@ msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
 #: ../mail/mail-config.ui.h:92
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Pick a color"
 msgstr "挑選顏色"
 
@@ -17213,8 +17232,8 @@ msgid "Check cu_stom headers for junk"
 msgstr "以自訂標頭檢查垃圾郵件(_S)"
 
 #: ../mail/mail-config.ui.h:131
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:234
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:301
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:244
 msgid "No encryption"
 msgstr "沒有加密"
 
@@ -17377,27 +17396,11 @@ 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:20
+#: ../mail/mail.error.xml.h:18
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -17405,11 +17408,11 @@ msgstr ""
 "下列收件者無法辨認為有效的郵件位址:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "您是否要傳送電子郵件位址無效的郵件?"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -17417,11 +17420,11 @@ msgstr ""
 "下列收件者無法辨認為有效的郵件位址:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Send private reply?"
 msgstr "是否傳送私人回覆?"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 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 "
@@ -17430,11 +17433,11 @@ msgstr ""
 "您正以私人回覆來自通信論壇的郵件,但是這個通信論壇嘗試將您的回信導回論壇。您"
 "確定要繼續嗎?"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Reply _Privately"
 msgstr "私人回覆(_P)"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 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 "
@@ -17443,22 +17446,22 @@ msgstr ""
 "您正在回覆來自通信論壇的郵件,但是您以私人回覆方式寄給原寄件者;而非寄回通信"
 "論壇。您確定要繼續嗎?"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
 msgstr "是否回覆給所有的收件者?"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 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:33
+#: ../mail/mail.error.xml.h:31
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "因為您沒有指定任何收件者,所以無法傳送此郵件"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 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."
@@ -17466,57 +17469,57 @@ msgstr ""
 "請在「收件者:」欄位輸入一個有效的電子郵件地址。您可以按一下輸入方塊旁邊的"
 "「收件者:」按鈕,搜尋電子郵件地址。"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "使用預設的草稿資料夾?"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "無法開啟此帳號的草稿資料夾。是否使用系統草稿資料夾代替?"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Use _Default"
 msgstr "使用預設值(_D)"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr "確定要永久移除資料夾「{0}」中所有刪除的郵件?"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "如果您選擇繼續,將無法復原這些郵件。"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
 msgid "_Expunge"
 msgstr "清除(_E)"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "要永久移除所有資料夾中所有刪除的郵件?"
 
-#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../mail/mail.error.xml.h:40 ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Opening too many messages at once may take a long time."
 msgstr "一次開啟過多郵件可能會花費許多時間。"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "_Open Messages"
 msgstr "開啟郵件(_O)"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "您有未寄出的郵件,您無論如何都要離開嗎?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -17525,55 +17528,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:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while {0}."
 msgstr "當 {0} 時發生錯誤。"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while performing operation."
 msgstr "執行作業時,發生錯誤。"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "輸入密碼。"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "載入過濾器定義時發生錯誤。"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Cannot save to directory \"{0}\"."
 msgstr "不能儲存至目錄「{0}」。"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Cannot save to file \"{0}\"."
 msgstr "不能儲存至檔案「{0}」。"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "不能建立儲存目錄,因為「{1}」"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot create temporary save directory."
 msgstr "無法建立暫時儲存目錄。"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but cannot overwrite it."
 msgstr "檔案存在但無法覆寫。"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but is not a regular file."
 msgstr "檔案存在但不是一般檔案。"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Cannot delete folder \"{0}\"."
 msgstr "不能刪除資料夾「{0}」。"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "不能刪除系統資料夾「{0}」。"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -17581,42 +17584,42 @@ msgstr ""
 "Evolution 需要系統資料夾才能正常作業,而且該資料夾不可以重新命名、移動或刪"
 "除。"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "無法清除資料夾 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "無法重新整理資料夾 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "不能重新命名或移動系統資料夾「{0}」。"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:65
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "確定要刪除資料夾「{0}」以及它所有的子資料夾?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "如果您刪除資料夾,它的所有內容和子資料夾內容會永遠刪除。"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Really delete folder \"{0}\"?"
 msgstr "確定要刪除資料夾「{0}」?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "如果您選擇刪除資料夾,它的所有內容會永遠消失。"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid "These messages are not copies."
 msgstr "這些郵件不是複本。"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:71
 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 "
@@ -17625,63 +17628,63 @@ msgstr ""
 "在搜尋資料夾中顯示的郵件並不是複本。從搜尋資料夾中刪除郵件將會自您的本地或遠"
 "端資料夾刪除實際的郵件。是否確定要刪除這些郵件?"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:72
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "不能將「{0}」重新命名成「{1}」。"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:73
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "已經有名稱為「{1}」的資料夾存在。請使用不同的名稱。"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "不能將資料夾「{0}」移至「{1}」。"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open source folder. Error: {2}"
 msgstr "不能開啟來源資料夾。錯誤:{2}"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot open target folder. Error: {2}"
 msgstr "不能開啟目標資料夾。錯誤:{2}"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "無法將「{0}」資料夾複製至「{1}」。"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot create folder \"{0}\"."
 msgstr "不能建立資料夾「{0}」。"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot open folder. Error: {1}"
 msgstr "不能開啟資料夾。錯誤:{1}"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot save changes to account."
 msgstr "無法儲存帳號變更。"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid "You have not filled in all of the required information."
 msgstr "您沒有填入所有必須的資訊。"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:82
 msgid "You may not create two accounts with the same name."
 msgstr "您不能用相同的名稱建立兩個帳號。"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Are you sure you want to delete this account?"
 msgstr "確定要刪除這個帳號?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果繼續,帳號資訊會永久刪除。"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:85
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "確定要刪除這個帳號以及它所有的代理伺服器?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -17689,28 +17692,28 @@ msgstr ""
 "如果繼續,該帳號的資訊以及\n"
 "它所有的代理伺服器會永遠刪除。"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "確定要刪除這個帳號以及它所有的代理伺服器?"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:89
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "如果繼續,所有的代理伺服器帳號會永久刪除。"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:90
 msgid "Do _Not Disable"
 msgstr "不要停用(_N)"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:91
 msgid "_Disable"
 msgstr "停用(_D)"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "不能編輯搜尋資料夾「{0}」,因為它不存在。"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -17718,39 +17721,39 @@ msgstr ""
 "此資料夾可能已經自動新增。\n"
 "需要時,請移至搜尋資料夾編輯器,以手動方式新增它。"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:95
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "不能加入搜尋資料夾「{0}」。"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:96
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "已經有名稱為「{0}」的資料夾存在。請使用不同的名稱。"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:97
 msgid "Search Folders automatically updated."
 msgstr "搜尋資料夾自動更新。"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:98
 msgid "Mail filters automatically updated."
 msgstr "郵件過濾器自動更新。"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:99
 msgid "Missing folder."
 msgstr "遺漏資料夾。"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:100
 msgid "You must specify a folder."
 msgstr "您必須指定一個資料夾。"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:102
 msgid "You must name this Search Folder."
 msgstr "您必須命名此搜尋資料夾。"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:103
 msgid "No folder selected."
 msgstr "尚未選取資料夾。"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -17759,11 +17762,11 @@ msgstr ""
 "您必須至少指定一個資料夾當成來源。\n"
 "個別選取資料夾,然後/或選取所有本地資料夾、所有遠端資料夾或二者皆選。"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:106
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "轉移舊郵件資料夾「{0}」發生問題。"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -17774,19 +17777,19 @@ msgstr ""
 "\n"
 "您可以選擇忽略此資料夾、覆寫或附加它的內容或者結束。"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:111
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:112
 msgid "_Append"
 msgstr "添加(_A)"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:113
 msgid "Evolution's local mail format has changed."
 msgstr "Evolution 的本地端郵件格式已經改變了。"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:114
 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 "
@@ -17802,19 +17805,19 @@ msgstr ""
 "程式會建立一個 mbox 帳號來保留舊的 mbox 資料夾。您可以在確認資料都安全轉換後"
 "再將它刪除。如果您選擇轉換,請確定有足夠的空間。"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:117
 msgid "_Exit Evolution"
 msgstr "結束 _Evolution "
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:118
 msgid "_Migrate Now"
 msgstr "立即轉移(_M)"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to read license file."
 msgstr "無法讀取授權檔案。"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:120
 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."
@@ -17822,54 +17825,54 @@ msgstr ""
 "不能讀取授權條款檔案「{0}」,應該是安裝問題造成的。在您同意這項授權之前將無法"
 "使用它。"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:121
 msgid "Please wait."
 msgstr "請稍候。"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:122
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "向伺服器查詢支援的核對演算法列表。"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr "無法向伺服器查詢支援的核對演算法列表。"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:124
 msgid "Failed to get server setup."
 msgstr "伺服器設定失敗。"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:125
 msgid "Synchronize folders locally for offline usage?"
 msgstr "是否同步資料夾以供離線使用?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "是否要在本地端同步那些標記為離線使用的資料夾?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:127
 msgid "Do _Not Synchronize"
 msgstr "不要同步(_N)"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:128
 msgid "_Synchronize"
 msgstr "同步化(_S)"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:129
 msgid "Do you want to mark all messages as read?"
 msgstr "是否要將全部的郵件標示成已閱讀?"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:130
 msgid "This will mark all messages as read in the selected folder."
 msgstr "這會將標示選取的資料夾中所有郵件為已閱讀。"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:131
 msgid "Also mark messages in subfolders?"
 msgstr "是否也標記子資料夾中的郵件?"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -17877,134 +17880,134 @@ msgstr ""
 "您要將目前的資料夾中的郵件已閱讀,或是包含目前的資料夾及其子資料夾中所有郵"
 "件。"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:133
 msgid "In Current Folder and _Subfolders"
 msgstr "於目前的資料夾及其子資料夾(_S)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:134
 msgid "In Current _Folder Only"
 msgstr "於目前的資料夾(_F)"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:135
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr "當回覆或轉寄時 Evolution 是否應關閉這個視窗?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:136
 msgid "_Yes, Always"
 msgstr "是,總是使用(_Y)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:137
 msgid "_No, Never"
 msgstr "否,永不使用(_N)"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:138
 msgid "Copy folder in folder tree."
 msgstr "於資料夾樹狀圖複製。"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:139
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "是否確定要將資料夾「{0}」複製到資料夾「{1}」?"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:141
 msgid "Do _not copy"
 msgstr "不要複製(_N)"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:142
 msgid "_Always copy"
 msgstr "永遠複製(_A)"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:143
 msgid "N_ever copy"
 msgstr "永不複製(_E)"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:144
 msgid "Move folder in folder tree."
 msgstr "於資料夾樹狀圖移動。"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:145
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "是否確定要將資料夾「{0}」移動到資料夾「{1}」?"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:147
 msgid "Do _not move"
 msgstr "不要移動(_N)"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:148
 msgid "_Always move"
 msgstr "永遠移動(_A)"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:149
 msgid "N_ever move"
 msgstr "永不移動(_E)"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:150
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "因為您沒有啟用選擇用來寄送的帳號,所以無法傳送此郵件。"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:151
 msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳送。"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:152
 msgid "Mail Deletion Failed"
 msgstr "刪除郵件失敗"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:153
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您沒有足夠的權限刪除此封郵件。"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:154
 msgid "\"Check Junk\" Failed"
 msgstr "「檢查垃圾郵件」失敗"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:155
 msgid "\"Report Junk\" Failed"
 msgstr "「回報垃圾郵件」失敗"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:156
 msgid "\"Report Not Junk\" Failed"
 msgstr "「回報為非垃圾郵件」失敗"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:157
 msgid "Remove duplicate messages?"
 msgstr "是否移除重複的郵件?"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:158
 msgid "No duplicate messages found."
 msgstr "找不到重複的郵件。"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:160
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "資料夾「{0}」並未包含任何重複的郵件。"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "無法與帳號 &quot;{0}&quot; 連線。"
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "無法中斷與帳號 &quot;{0}&quot; 的連線。"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "無法取消訂閱資料夾 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:164
 msgid "Unable to retrieve message."
 msgstr "無法接收郵件。"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:165
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:166
 msgid "Message is not available in offline mode."
 msgstr "郵件無法在離線模式下使用。"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:167
 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 "
@@ -18016,85 +18019,85 @@ msgstr ""
 "號恢復上線時,選擇這個資料夾,使用「檔案-&gt;下載郵件供離線使用」,以確定資料"
 "夾中所有的郵件都能在離線模式中使用。"
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to open folder."
 msgstr "無法開啟資料夾。"
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:170
 msgid "Failed to find duplicate messages."
 msgstr "找不到重複的郵件。"
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to retrieve messages."
 msgstr "無法取回郵件。"
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to mark messages as read."
 msgstr "無法將郵件標示成已經閱讀。"
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to remove attachments from messages."
 msgstr "無法移除郵件中的附件。"
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to download messages for offline viewing."
 msgstr "下載離線使用的郵件失敗。"
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:175
 msgid "Failed to save messages to disk."
 msgstr "無法將選取的郵件儲存至磁碟。"
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:176
 msgid "Hidden file is attached."
 msgstr "附加了隱藏的檔案。"
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:177
 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:180
+#: ../mail/mail.error.xml.h:178
 msgid "Printing failed."
 msgstr "列印失敗。"
 
-#: ../mail/mail.error.xml.h:181
+#: ../mail/mail.error.xml.h:179
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "印表機回覆 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:182
+#: ../mail/mail.error.xml.h:180
 msgid "Could not perform this operation on {0}."
 msgstr "無法進行 {0} 上的操作。"
 
-#: ../mail/mail.error.xml.h:183
+#: ../mail/mail.error.xml.h:181
 msgid "You must be working online to complete this operation."
 msgstr "您必須於線上工作才能完成此操作。"
 
-#: ../mail/mail.error.xml.h:184
+#: ../mail/mail.error.xml.h:182
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "來自 &quot;{0}&quot; 帳號的郵件:"
 
-#: ../mail/mail.error.xml.h:185
+#: ../mail/mail.error.xml.h:183
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件群組標記為已忽略"
 
-#: ../mail/mail.error.xml.h:186
+#: ../mail/mail.error.xml.h:184
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件群組取消已忽略標記"
 
-#: ../mail/mail.error.xml.h:187
+#: ../mail/mail.error.xml.h:185
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件子群組標記為已忽略"
 
-#: ../mail/mail.error.xml.h:188
+#: ../mail/mail.error.xml.h:186
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr "無法將資料夾「{0}」中的郵件子群組取消已忽略標記"
 
-#: ../mail/mail.error.xml.h:189
+#: ../mail/mail.error.xml.h:187
 msgid "Remote content download had been blocked for this message."
 msgstr "已阻擋這封郵件的遠端內容下載。"
 
-#: ../mail/mail.error.xml.h:190
+#: ../mail/mail.error.xml.h:188
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -18102,31 +18105,31 @@ msgstr ""
 "您可以手動下載遠端內容,或設定為記住下載這個寄件者或使用過網站的遠端內容。"
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:192
+#: ../mail/mail.error.xml.h:190
 msgid "{0}, Completed on {1}"
 msgstr "{0} ,完成於 {1} "
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:194
+#: ../mail/mail.error.xml.h:192
 msgid "{0} by {1}"
 msgstr "{0} 自 {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:196
+#: ../mail/mail.error.xml.h:194
 msgid "Overdue: {0} by {1}"
 msgstr "逾期:{0} 自 {1}"
 
-#: ../mail/mail.error.xml.h:198
+#: ../mail/mail.error.xml.h:196
 msgid "This message note has been changed, but has not been saved."
 msgstr "此郵件備註已經變更,但尚未儲存。"
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../mail/mail.error.xml.h:201
+#: ../mail/mail.error.xml.h:199
 msgid "Failed to delete message note in folder '{0}'"
 msgstr "無法在資料夾「{0}」刪除郵件備註"
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../mail/mail.error.xml.h:203
+#: ../mail/mail.error.xml.h:201
 msgid "Failed to store message note in folder '{0}'"
 msgstr "無法在資料夾「{0}」儲存郵件備註"
 
@@ -18134,38 +18137,38 @@ msgstr "無法在資料夾「{0}」儲存郵件備註"
 msgid "Canceling..."
 msgstr "正在取消…"
 
-#: ../mail/mail-send-recv.c:636
+#: ../mail/mail-send-recv.c:639
 msgid "Send & Receive Mail"
 msgstr "傳送與接收郵件"
 
-#: ../mail/mail-send-recv.c:650
+#: ../mail/mail-send-recv.c:653
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:1263
 msgid "Updating..."
 msgstr "更新中…"
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
 msgid "Waiting..."
 msgstr "正在等待…"
 
-#: ../mail/mail-send-recv.c:1225
+#: ../mail/mail-send-recv.c:1229
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "檢查「%s」的新郵件"
 
-#: ../mail/mail-send-recv.c:1452
+#: ../mail/mail-send-recv.c:1456
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr "正在刪除與清空「%s」的垃圾郵件"
 
-#: ../mail/mail-send-recv.c:1454
+#: ../mail/mail-send-recv.c:1458
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr "正在刪除「%s」的垃圾郵件"
 
-#: ../mail/mail-send-recv.c:1456
+#: ../mail/mail-send-recv.c:1460
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr "正在清空「%s」的回收筒"
@@ -18182,86 +18185,86 @@ msgstr "編輯搜尋資料夾"
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
-#: ../mail/message-list.c:294
+#: ../mail/message-list.c:296
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../mail/message-list.c:295
+#: ../mail/message-list.c:297
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../mail/message-list.c:296
+#: ../mail/message-list.c:298
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../mail/message-list.c:297
+#: ../mail/message-list.c:299
 msgid "Forwarded"
 msgstr "轉寄"
 
-#: ../mail/message-list.c:298
+#: ../mail/message-list.c:300
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../mail/message-list.c:299
+#: ../mail/message-list.c:301
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../mail/message-list.c:312
+#: ../mail/message-list.c:314
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:313
+#: ../mail/message-list.c:315
 msgid "Lower"
 msgstr "低"
 
-#: ../mail/message-list.c:317
+#: ../mail/message-list.c:319
 msgid "Higher"
 msgstr "高"
 
-#: ../mail/message-list.c:318
+#: ../mail/message-list.c:320
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:464 ../mail/message-list.c:6152
+#: ../mail/message-list.c:466 ../mail/message-list.c:6186
 msgid "Generating message list"
 msgstr "產生郵件列表"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2057 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "今天 %p %l:%M"
 
-#: ../mail/message-list.c:2066
+#: ../mail/message-list.c:2071
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %p %l:%M"
 
-#: ../mail/message-list.c:2078
+#: ../mail/message-list.c:2083
 msgid "%a %l:%M %p"
 msgstr "%A %p %l:%M"
 
-#: ../mail/message-list.c:2086
+#: ../mail/message-list.c:2091
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日 %p %l:%M"
 
-#: ../mail/message-list.c:2088
+#: ../mail/message-list.c:2093
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2994
+#: ../mail/message-list.c:3001
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../mail/message-list.c:3686 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3703 ../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:5089
+#: ../mail/message-list.c:5117
 msgid "Follow-up"
 msgstr "跟隨"
 
-#: ../mail/message-list.c:6091
+#: ../mail/message-list.c:6125
 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 "
@@ -18271,7 +18274,7 @@ msgstr ""
 "沒有郵件滿足您的搜尋條件。請從上列下拉式選單選擇顯示郵件過濾器或執行新的搜"
 "尋,可從 搜尋->清除 選單項目清除它或改變上面的查詢。"
 
-#: ../mail/message-list.c:6099
+#: ../mail/message-list.c:6133
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -18303,6 +18306,10 @@ msgstr "郵件寄給"
 msgid "Subject - Trimmed"
 msgstr "主旨 - 已截短"
 
+#: ../mail/message-list.etspec.h:21 ../plugins/save-calendar/csv-format.c:374
+msgid "UID"
+msgstr "UID"
+
 #: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
 msgid "Any header"
 msgstr "任何標頭"
@@ -18312,32 +18319,32 @@ msgid "Subject or Addresses contains"
 msgstr "主旨或電子郵件位址包含"
 
 #: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2151
+#: ../modules/mail/e-mail-shell-view-actions.c:2159
 msgid "Recipients contain"
 msgstr "收件者包含"
 
 #: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2144
+#: ../modules/mail/e-mail-shell-view-actions.c:2152
 msgid "Message contains"
 msgstr "郵件包含"
 
 #: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2165
+#: ../modules/mail/e-mail-shell-view-actions.c:2173
 msgid "Subject contains"
 msgstr "主旨包含"
 
 #: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2158
+#: ../modules/mail/e-mail-shell-view-actions.c:2166
 msgid "Sender contains"
 msgstr "寄件者包含"
 
 #: ../mail/searchtypes.xml.in.h:62
-#: ../modules/mail/e-mail-shell-view-actions.c:2130
+#: ../modules/mail/e-mail-shell-view-actions.c:2138
 msgid "Body contains"
 msgstr "內文包含"
 
 #: ../mail/searchtypes.xml.in.h:63
-#: ../modules/mail/e-mail-shell-view-actions.c:2137
+#: ../modules/mail/e-mail-shell-view-actions.c:2145
 msgid "Free form expression"
 msgstr "自由形式表示式"
 
@@ -18641,7 +18648,7 @@ msgstr "沒有相符資料"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1657
 #: ../modules/calendar/e-memo-shell-view-actions.c:777
 #: ../modules/calendar/e-task-shell-view-actions.c:978
-#: ../modules/mail/e-mail-shell-view-actions.c:2123
+#: ../modules/mail/e-mail-shell-view-actions.c:2131
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "進階搜尋"
@@ -18945,8 +18952,8 @@ msgstr "使用 Bogofilter 垃圾郵件過濾器"
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:993
 #: ../modules/cal-config-google/e-cal-config-google.c:177
 #: ../modules/cal-config-google/e-cal-config-gtasks.c:117
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:361
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:396
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:433
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:468
 msgid "User name cannot be empty"
 msgstr "使用者名稱不能為空"
 
@@ -18981,8 +18988,8 @@ msgid "Port:"
 msgstr "連接埠:"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:185
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:140
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:200
 msgid "Port number is not valid"
 msgstr "連接埠號無效"
 
@@ -18995,8 +19002,8 @@ msgid "Encryption:"
 msgstr "加密:"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:660
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:255
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:322
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:265
 msgid "Authentication"
 msgstr "核對"
 
@@ -19087,59 +19094,67 @@ msgid "Browse until limit is reached"
 msgstr "瀏覽直到達到限制"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:978
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:342
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:378
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:414
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:450
 msgid "Server address cannot be empty"
 msgstr "伺服器位址不能為空"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:92
+msgid "Choose an Address Book"
+msgstr "請選擇一個通訊錄"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:240
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:296
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "網址:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:249
+msgid "Find Address Books"
+msgstr "尋找通訊錄"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:259
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "避免 IfMatch (需使用 Apache < 2.2.8)"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:194
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:415
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:308
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:412
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:184
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "URL 不是有效的 http:// 或 https:// URL"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:109
 #: ../modules/cal-config-google/e-google-chooser-button.c:224
 msgid "Choose a Calendar"
 msgstr "選擇行事曆"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:113
 #: ../modules/cal-config-google/e-google-chooser-button.c:228
 msgid "Choose a Memo List"
 msgstr "選擇備忘錄列表"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:117
 #: ../modules/cal-config-google/e-google-chooser-button.c:232
 msgid "Choose a Task List"
 msgstr "選擇工作列表"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:310
 msgid "Find Calendars"
 msgstr "尋找行事曆"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Memo Lists"
 msgstr "尋找備忘錄列表"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Task Lists"
 msgstr "尋找工作列表"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:334
 msgid "Email:"
 msgstr "電子郵件:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:339
 msgid "Server handles meeting invitations"
 msgstr "伺服器處理會議邀請"
 
@@ -19321,11 +19336,11 @@ msgstr "衝突的搜尋"
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "選擇要搜尋會議衝突的行事曆"
 
-#: ../modules/calendar/e-calendar-preferences.c:1058
+#: ../modules/calendar/e-calendar-preferences.c:1064
 msgid "Ti_me and date:"
 msgstr "時刻和日期(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:1059
+#: ../modules/calendar/e-calendar-preferences.c:1065
 msgid "_Date only:"
 msgstr "只有日期(_D):"
 
@@ -19475,111 +19490,115 @@ msgid "Day _ends:"
 msgstr "一日結束於(_E):"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Create events, memos and tasks as _Private by default"
+msgstr "預設建立的事件、備忘錄和工作都設為私人(_P)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "View Options"
 msgstr "檢視選項"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
 msgid "_Time divisions:"
 msgstr "時間間隔(_T):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Show appointment end times in week and month view"
 msgstr "在週及月的檢視內顯示會議的結束時間(_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
 msgid "Show appointment _icons in the month view"
 msgstr "在月檢視中顯示會議圖示(_I)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Show week _numbers"
 msgstr "顯示週數(_N)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr "在左下行事曆中將週期性事件以斜體顯示(_E)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Sc_roll Month View by a week"
 msgstr "以週捲動月檢視(_R)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Alerts"
 msgstr "警示"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Display"
 msgstr "顯示"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Task List"
 msgstr "工作列表"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Highlight t_asks due today"
 msgstr "強調今天到期工作(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Highlight _overdue tasks"
 msgstr "強調過期的工作(_O)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Display reminders in _notification area only"
 msgstr "只在通知區域中顯示提醒(_N)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 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:68
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 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:70
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 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:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 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:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every anniversary/birthday"
 msgstr "在每個週年紀念日/生日之前"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 msgid "Default _snooze time (in minutes)"
 msgstr "預設小睡時間 [以分鐘計] (_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Select the calendars for reminder notification"
 msgstr "選擇提醒通知的行事曆"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Default Free/Busy Server"
 msgstr "預設的空閒/忙碌伺服器網址"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:80
+#: ../modules/calendar/e-calendar-preferences.ui.h:82
 #, 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:81
+#: ../modules/calendar/e-calendar-preferences.ui.h:83
 msgid "Publishing Information"
 msgstr "發布資訊"
 
@@ -19964,7 +19983,7 @@ msgid "New _Memo"
 msgstr "新增備忘錄(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-backend.c:81
 #: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
@@ -19991,27 +20010,27 @@ msgstr "開啟網頁(_W)"
 msgid "Print the selected memo"
 msgstr "列印選取的備忘錄"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:810
+#: ../modules/calendar/e-cal-shell-view-private.c:816
 msgid "Searching next matching event"
 msgstr "搜尋下一個符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:811
+#: ../modules/calendar/e-cal-shell-view-private.c:817
 msgid "Searching previous matching event"
 msgstr "搜尋前一個符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:832
+#: ../modules/calendar/e-cal-shell-view-private.c:838
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "在下 %d 年中找不到符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:836
+#: ../modules/calendar/e-cal-shell-view-private.c:842
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "在前 %d 年中找不到符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:859
+#: ../modules/calendar/e-cal-shell-view-private.c:865
 msgid "Cannot search with no active calendar"
 msgstr "不能搜尋未使用的行事曆"
 
@@ -20054,7 +20073,7 @@ msgid "New _Task"
 msgstr "新增工作(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:63
+#: ../modules/calendar/e-task-shell-backend.c:79
 #: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Create a new task"
 msgstr "建立一個新的工作"
@@ -20074,26 +20093,26 @@ msgstr "檢視選取的工作"
 msgid "Print the selected task"
 msgstr "列印選取的工作"
 
-#: ../modules/calendar/e-memo-shell-backend.c:63
+#: ../modules/calendar/e-memo-shell-backend.c:79
 msgctxt "New"
 msgid "Mem_o"
 msgstr "備忘錄(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:70
+#: ../modules/calendar/e-memo-shell-backend.c:86
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "共用備忘錄(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:72
+#: ../modules/calendar/e-memo-shell-backend.c:88
 msgid "Create a new shared memo"
 msgstr "建立新的共用備忘錄"
 
-#: ../modules/calendar/e-memo-shell-backend.c:80
+#: ../modules/calendar/e-memo-shell-backend.c:96
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "備忘錄列表(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-backend.c:98
 #: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
 msgstr "建立新備忘錄列表"
@@ -20199,26 +20218,26 @@ msgstr[0] "%d 項備忘錄"
 msgid "%d selected"
 msgstr "已選擇 %d 個"
 
-#: ../modules/calendar/e-task-shell-backend.c:61
+#: ../modules/calendar/e-task-shell-backend.c:77
 msgctxt "New"
 msgid "_Task"
 msgstr "工作(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:68
+#: ../modules/calendar/e-task-shell-backend.c:84
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "指派的工作(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:70
+#: ../modules/calendar/e-task-shell-backend.c:86
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
 
-#: ../modules/calendar/e-task-shell-backend.c:78
+#: ../modules/calendar/e-task-shell-backend.c:94
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "工作列表(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:80
+#: ../modules/calendar/e-task-shell-backend.c:96
 #: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "建立新工作列表"
@@ -20579,12 +20598,12 @@ msgstr "%s 傳送了下列會議的回覆:"
 
 #: ../modules/itip-formatter/itip-view.c:442
 #, c-format
-msgid "%s through %s has canceled the following meeting:"
+msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s 透過 %s 已經消取下列會議:"
 
 #: ../modules/itip-formatter/itip-view.c:444
 #, c-format
-msgid "%s has canceled the following meeting:"
+msgid "%s has cancelled the following meeting:"
 msgstr "%s 已經消取下列會議:"
 
 #: ../modules/itip-formatter/itip-view.c:448
@@ -20667,12 +20686,12 @@ msgstr "%s 傳送了下列指派工作的回覆:"
 
 #: ../modules/itip-formatter/itip-view.c:532
 #, c-format
-msgid "%s through %s has canceled the following assigned task:"
+msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s 透過 %s 已經取消下列指派的工作:"
 
 #: ../modules/itip-formatter/itip-view.c:534
 #, c-format
-msgid "%s has canceled the following assigned task:"
+msgid "%s has cancelled the following assigned task:"
 msgstr "%s 已經取消下列指派的工作:"
 
 #: ../modules/itip-formatter/itip-view.c:538
@@ -20717,12 +20736,12 @@ msgstr "%s 希望加入一個既存的備忘錄:"
 
 #: ../modules/itip-formatter/itip-view.c:598
 #, c-format
-msgid "%s through %s has canceled the following shared memo:"
+msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s 透過 %s 已經消取下列共用備忘錄:"
 
 #: ../modules/itip-formatter/itip-view.c:600
 #, c-format
-msgid "%s has canceled the following shared memo:"
+msgid "%s has cancelled the following shared memo:"
 msgstr "%s 已經取消下列共用備忘錄:"
 
 #: ../modules/itip-formatter/itip-view.c:674
@@ -20784,7 +20803,7 @@ msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
 #: ../modules/itip-formatter/itip-view.c:1066
-#: ../smime/gui/certificate-manager.c:1666
+#: ../smime/gui/certificate-manager.c:1679
 msgid "_Update"
 msgstr "更新(_U)"
 
@@ -20834,7 +20853,7 @@ msgid "Sa_ve"
 msgstr "儲存(_V)"
 
 #: ../modules/itip-formatter/itip-view.c:3679
-#: ../modules/itip-formatter/itip-view.c:5151
+#: ../modules/itip-formatter/itip-view.c:5146
 msgid "Attendee status updated"
 msgstr "出席者狀態已更新"
 
@@ -20872,160 +20891,160 @@ msgstr "正在開啟行事曆。請稍候…"
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個會議既存的版本"
 
-#: ../modules/itip-formatter/itip-view.c:4787
+#: ../modules/itip-formatter/itip-view.c:4782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "無法傳送項目至行事曆「%s」。%s"
 
-#: ../modules/itip-formatter/itip-view.c:4802
+#: ../modules/itip-formatter/itip-view.c:4797
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "傳送至行事曆「%s」並設為已接受"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4802
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "傳送至行事曆「%s」並設為不確定的"
 
-#: ../modules/itip-formatter/itip-view.c:4813
+#: ../modules/itip-formatter/itip-view.c:4808
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "傳送至行事曆「%s」並設為已婉拒"
 
-#: ../modules/itip-formatter/itip-view.c:4819
+#: ../modules/itip-formatter/itip-view.c:4814
 #, c-format
-msgid "Sent to calendar '%s' as canceled"
-msgstr "傳送至行事曆「%s」並設為已取消"
+msgid "Sent to calendar '%s' as cancelled"
+msgstr "傳送至行事曆「%s」並設為已取消的"
 
-#: ../modules/itip-formatter/itip-view.c:4840
-#: ../modules/itip-formatter/itip-view.c:5298
-#: ../modules/itip-formatter/itip-view.c:5404
+#: ../modules/itip-formatter/itip-view.c:4835
+#: ../modules/itip-formatter/itip-view.c:5293
+#: ../modules/itip-formatter/itip-view.c:5399
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "正在將變更儲存到行事曆。請稍候…"
 
-#: ../modules/itip-formatter/itip-view.c:4881
+#: ../modules/itip-formatter/itip-view.c:4876
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
-#: ../modules/itip-formatter/itip-view.c:5074
+#: ../modules/itip-formatter/itip-view.c:5069
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-#: ../modules/itip-formatter/itip-view.c:5091
+#: ../modules/itip-formatter/itip-view.c:5086
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-#: ../modules/itip-formatter/itip-view.c:5095
+#: ../modules/itip-formatter/itip-view.c:5090
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:5138
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新出席者。%s"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:5182
 msgid "The meeting is invalid and cannot be updated"
 msgstr "這個會議無效並且不能更新"
 
-#: ../modules/itip-formatter/itip-view.c:5263
+#: ../modules/itip-formatter/itip-view.c:5258
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得出席者狀態無法更新!"
 
-#: ../modules/itip-formatter/itip-view.c:5335
-#: ../modules/itip-formatter/itip-view.c:5374
+#: ../modules/itip-formatter/itip-view.c:5330
+#: ../modules/itip-formatter/itip-view.c:5369
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "出席者狀態不能更新,因為項目已經不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5437
+#: ../modules/itip-formatter/itip-view.c:5432
 msgid "Meeting information sent"
 msgstr "會議資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5442
+#: ../modules/itip-formatter/itip-view.c:5437
 msgid "Task information sent"
 msgstr "工作資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5447
+#: ../modules/itip-formatter/itip-view.c:5442
 msgid "Memo information sent"
 msgstr "備忘錄資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5453
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "無法寄出會議資訊,該會議並不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5463
+#: ../modules/itip-formatter/itip-view.c:5458
 msgid "Unable to send task information, the task does not exist"
 msgstr "無法寄出工作資訊,該項工作不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5463
 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:5533
+#: ../modules/itip-formatter/itip-view.c:5528
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5538
+#: ../modules/itip-formatter/itip-view.c:5533
 msgid "Save Calendar"
 msgstr "儲存行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:5587
-#: ../modules/itip-formatter/itip-view.c:5600
+#: ../modules/itip-formatter/itip-view.c:5582
+#: ../modules/itip-formatter/itip-view.c:5595
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../modules/itip-formatter/itip-view.c:5588
-#: ../modules/itip-formatter/itip-view.c:5601
+#: ../modules/itip-formatter/itip-view.c:5583
+#: ../modules/itip-formatter/itip-view.c:5596
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "此郵件宣告其含有行事曆內容,但其行事曆並非有效的 iCalendar。"
 
-#: ../modules/itip-formatter/itip-view.c:5643
-#: ../modules/itip-formatter/itip-view.c:5673
-#: ../modules/itip-formatter/itip-view.c:5774
+#: ../modules/itip-formatter/itip-view.c:5638
+#: ../modules/itip-formatter/itip-view.c:5668
+#: ../modules/itip-formatter/itip-view.c:5769
 msgid "The item in the calendar is not valid"
 msgstr "行事曆中的項目是無效的"
 
-#: ../modules/itip-formatter/itip-view.c:5644
-#: ../modules/itip-formatter/itip-view.c:5674
-#: ../modules/itip-formatter/itip-view.c:5775
+#: ../modules/itip-formatter/itip-view.c:5639
+#: ../modules/itip-formatter/itip-view.c:5669
+#: ../modules/itip-formatter/itip-view.c:5770
 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:5689
+#: ../modules/itip-formatter/itip-view.c:5684
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容含有多個項目"
 
-#: ../modules/itip-formatter/itip-view.c:5690
+#: ../modules/itip-formatter/itip-view.c:5685
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要處理這些全部的項目,應該將此檔案儲存後匯入其中的行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:6193
+#: ../modules/itip-formatter/itip-view.c:6188
 msgctxt "cal-itip"
 msgid "None"
 msgstr "沒有"
 
-#: ../modules/itip-formatter/itip-view.c:6209
+#: ../modules/itip-formatter/itip-view.c:6204
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: ../modules/itip-formatter/itip-view.c:6369
+#: ../modules/itip-formatter/itip-view.c:6364
 msgid "This meeting recurs"
 msgstr "這個會議的週期規則為"
 
-#: ../modules/itip-formatter/itip-view.c:6372
+#: ../modules/itip-formatter/itip-view.c:6367
 msgid "This task recurs"
 msgstr "這項工作的週期規則為"
 
-#: ../modules/itip-formatter/itip-view.c:6375
+#: ../modules/itip-formatter/itip-view.c:6370
 msgid "This memo recurs"
 msgstr "這個備忘錄的週期規則為"
 
@@ -21042,19 +21061,19 @@ msgstr "這個會議已委派"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "「{0}」已代理此會議。是否還要加入代理人「{1}」?"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:265
 msgid "Google Features"
 msgstr "Google 功能"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:270
+#: ../modules/mail-config/e-mail-config-google-summary.c:274
 msgid "Add Google Ca_lendar to this account"
 msgstr "將 Google 日曆加入這個帳號(_L)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:279
+#: ../modules/mail-config/e-mail-config-google-summary.c:283
 msgid "Add Google Con_tacts to this account"
 msgstr "將 Google 通訊錄加入這個帳號(_T)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:288
+#: ../modules/mail-config/e-mail-config-google-summary.c:292
 msgid "You may need to enable IMAP access"
 msgstr "您可能需要啟用 IMAP 存取"
 
@@ -21115,42 +21134,47 @@ msgstr "選擇 mbox 排程器目錄"
 msgid "Mbox spool directory cannot be empty"
 msgstr "Mbox 排程器目錄不能為空"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:197
 #: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:93
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:153
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "設定"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:215
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "伺服器(_S):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
 msgid "_Port:"
 msgstr "連接埠(_P):"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:190
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:250
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:312
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:223
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:173
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:264
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:326
+msgid "_Forget password"
+msgstr "忘記密碼(_F)"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:290
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:233
 msgid "Encryption _method:"
 msgstr "加密方法(_M):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:238
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:188
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:305
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:248
 msgid "STARTTLS after connecting"
 msgstr "連線後使用 STARTTLS"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:242
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:192
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:309
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
 msgid "TLS on a dedicated port"
 msgstr "TLS 專用連接埠"
 
@@ -21189,23 +21213,23 @@ msgid "Custom binary cannot be empty"
 msgstr "自訂二元檔不能為空"
 
 #. do not reference
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:145
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求核對(_V)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:234
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:294
 msgid "T_ype:"
 msgstr "類型(_Y):"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
 msgid "Yahoo! Features"
 msgstr "Yahoo! 功能"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:260
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "將 Yahoo! 行事曆與工作加入這個帳號(_L)"
 
-#: ../modules/mail/e-mail-attachment-handler.c:440
+#: ../modules/mail/e-mail-attachment-handler.c:605
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -21238,25 +21262,63 @@ msgstr "郵件資料夾(_F)"
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
 #: ../modules/mail/e-mail-shell-backend.c:687
+msgctxt "NetworkMonitor"
+msgid "base"
+msgstr "基底"
+
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../modules/mail/e-mail-shell-backend.c:690
+msgctxt "NetworkMonitor"
+msgid "netlink"
+msgstr "netlink"
+
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../modules/mail/e-mail-shell-backend.c:693
+msgctxt "NetworkMonitor"
+msgid "networkmanager"
+msgstr "網路管理"
+
+#: ../modules/mail/e-mail-shell-backend.c:725
+msgctxt "NetworkMonitor"
+msgid "Method to detect _online state:"
+msgstr "偵測上線狀態的方法(_O):"
+
+#. Always as the first
+#: ../modules/mail/e-mail-shell-backend.c:734
+msgctxt "NetworkMonitor"
+msgid "Default"
+msgstr "預設值"
+
+#. Always as the last
+#: ../modules/mail/e-mail-shell-backend.c:748
+msgctxt "NetworkMonitor"
+msgid "Always Online"
+msgstr "永遠上線"
+
+#: ../modules/mail/e-mail-shell-backend.c:808
 msgid "Mail Accounts"
 msgstr "郵件帳號"
 
-#: ../modules/mail/e-mail-shell-backend.c:696
+#: ../modules/mail/e-mail-shell-backend.c:817
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:705
+#: ../modules/mail/e-mail-shell-backend.c:826
 msgid "Composer Preferences"
 msgstr "郵件編輯器偏好設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:715
+#: ../modules/mail/e-mail-shell-backend.c:835
 msgid "Network Preferences"
 msgstr "網路偏好設定"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1007
+#: ../modules/mail/e-mail-shell-backend.c:1127
 msgctxt "label"
 msgid "None"
 msgstr "沒有"
@@ -21578,75 +21640,79 @@ msgstr "已讀郵件"
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2172
+#: ../modules/mail/e-mail-shell-view-actions.c:2120
+msgid "Message Thread"
+msgstr "相關郵件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2180
 msgid "Subject or Addresses contain"
 msgstr "主旨或電子郵件位址包含"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2182
+#: ../modules/mail/e-mail-shell-view-actions.c:2190
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2189
+#: ../modules/mail/e-mail-shell-view-actions.c:2197
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2196
+#: ../modules/mail/e-mail-shell-view-actions.c:2204
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-#: ../modules/mail/e-mail-shell-view.c:707
+#: ../modules/mail/e-mail-shell-view.c:779
 msgid "All Account Search"
 msgstr "所有的帳號搜尋"
 
-#: ../modules/mail/e-mail-shell-view.c:815
+#: ../modules/mail/e-mail-shell-view.c:887
 msgid "Account Search"
 msgstr "帳號搜尋"
 
-#: ../modules/mail/e-mail-shell-view-private.c:954
+#: ../modules/mail/e-mail-shell-view-private.c:957
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已選擇 %d 個,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:963
-#: ../modules/mail/e-mail-shell-view-private.c:980
+#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:983
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已刪除"
 
-#: ../modules/mail/e-mail-shell-view-private.c:989
-#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:992
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1002
+#: ../modules/mail/e-mail-shell-view-private.c:1005
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 個草稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../modules/mail/e-mail-shell-view-private.c:1011
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未傳送"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1017
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1031
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d 封未讀"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1549
+#: ../modules/mail/e-mail-shell-view-private.c:1552
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
@@ -21732,13 +21798,13 @@ msgstr "您寄給 %s 主旨「%s」 (%s) 的郵件已被閱讀。"
 msgid "Delivery Notification for \"%s\""
 msgstr "「%s」的遞送通知"
 
-#: ../modules/mdn/evolution-mdn.c:531
+#: ../modules/mdn/evolution-mdn.c:534
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "傳送郵件回條給「%s」"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../modules/mdn/evolution-mdn.c:539
 msgid "_Notify Sender"
 msgstr "通知寄件者(_N)"
 
@@ -21923,7 +21989,7 @@ msgstr "使用 SpamAssassin 垃圾郵件過濾器"
 
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-page.c:270
 #: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "正在匯入檔案"
@@ -22215,8 +22281,8 @@ msgstr "Evolution 網頁檢查器"
 msgid "_Do not show this message again."
 msgstr "不要再顯示這個訊息(_D)"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:465
-#: ../plugins/templates/templates.c:478
+#: ../plugins/attachment-reminder/attachment-reminder.c:484
+#: ../plugins/templates/templates.c:495
 msgid "Keywords"
 msgstr "關鍵字"
 
@@ -22369,7 +22435,7 @@ msgid "Key"
 msgstr "設定鍵"
 
 #: ../plugins/email-custom-header/email-custom-header.c:879
-#: ../plugins/templates/templates.c:487
+#: ../plugins/templates/templates.c:504
 msgid "Values"
 msgstr "數值"
 
@@ -23046,7 +23112,7 @@ msgid "_Username:"
 msgstr "使用者名稱(_U):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:774
+#: ../smime/gui/certificate-manager.c:787
 msgid "_Password:"
 msgstr "密碼(_P):"
 
@@ -23079,10 +23145,6 @@ msgstr "編輯位置"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:374
-msgid "UID"
-msgstr "UID"
-
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "描述列表"
@@ -23200,6 +23262,10 @@ msgstr "將選取的備忘錄列表儲存至磁碟"
 msgid "Save the selected task list to disk"
 msgstr "將選取的工作列表儲存至磁碟"
 
+#: ../plugins/templates/e-templates-store.c:117
+msgid "No Title"
+msgstr "沒有標題"
+
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -23209,51 +23275,51 @@ msgstr ""
 "基於草稿的範本外掛程式。您可以使用的變數有 $ORIG[subject], $ORIG[from], "
 "$ORIG[to] 或 $ORIG[body],它們會以您所回覆的郵件中的數值取代。"
 
-#: ../plugins/templates/templates.c:1245
-msgid "No Title"
-msgstr "沒有標題"
+#: ../plugins/templates/templates.c:1247
+msgid "Saving message template"
+msgstr "儲存郵件範本"
 
-#: ../plugins/templates/templates.c:1354
+#: ../plugins/templates/templates.c:1268
 msgid "Save as _Template"
 msgstr "儲存為範本(_T)"
 
-#: ../plugins/templates/templates.c:1356
+#: ../plugins/templates/templates.c:1270
 msgid "Save as Template"
 msgstr "儲存為範本"
 
-#: ../shell/e-shell.c:380
+#: ../shell/e-shell.c:381
 msgid "Preparing to go offline..."
 msgstr "準備進入離線…"
 
-#: ../shell/e-shell.c:409
+#: ../shell/e-shell.c:410
 msgid "Preparing to go online..."
 msgstr "準備進入上線…"
 
-#: ../shell/e-shell.c:520
+#: ../shell/e-shell.c:521
 msgid "Preparing to quit"
 msgstr "準備結束"
 
-#: ../shell/e-shell.c:526
+#: ../shell/e-shell.c:527
 msgid "Preparing to quit..."
 msgstr "準備結束…"
 
-#: ../shell/e-shell.c:1043
+#: ../shell/e-shell.c:1044
 msgid "Credentials are required to connect to the destination host."
 msgstr "連線到目的端主機需要憑證。"
 
-#: ../shell/e-shell.c:1211 ../shell/e-shell-window-actions.c:827
+#: ../shell/e-shell.c:1212 ../shell/e-shell-window-actions.c:827
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-#: ../shell/e-shell.c:1222
+#: ../shell/e-shell.c:1223
 msgid "Quick _Reference"
 msgstr "快捷鍵參照表(_R)"
 
-#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:764
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:764
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:862
+#: ../shell/e-shell.c:1226 ../shell/e-shell-window-actions.c:862
 msgid "_Quit"
 msgstr "結束(_Q)"
 
@@ -23910,7 +23976,7 @@ msgstr "MD5 指紋"
 msgid "Email Address"
 msgstr "電子郵件位址"
 
-#: ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:665
 msgid "Select a file to backup your key and certificate..."
 msgstr "選擇用來備份您的金鑰與憑證的檔案…"
 
@@ -23919,31 +23985,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:664
+#: ../smime/gui/certificate-manager.c:677
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-backup.p12"
 
-#: ../smime/gui/certificate-manager.c:730
+#: ../smime/gui/certificate-manager.c:743
 msgid "Backup Certificate"
 msgstr "備份憑證"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:757
 msgid "_File name:"
 msgstr "檔案名稱(_F):"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:749
+#: ../smime/gui/certificate-manager.c:762
 msgid "Please select a file..."
 msgstr "請選擇檔案…"
 
-#: ../smime/gui/certificate-manager.c:763
+#: ../smime/gui/certificate-manager.c:776
 msgid "_Include certificate chain in the backup"
 msgstr "備份中包含憑證鏈(_I)"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:769
+#: ../smime/gui/certificate-manager.c:782
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -23952,16 +24018,16 @@ msgstr ""
 "您在這裡設定的憑證備份密碼可以保護即將建立的備份檔案。\n"
 "您必須設定這個密碼才能繼續備份。"
 
-#: ../smime/gui/certificate-manager.c:788
+#: ../smime/gui/certificate-manager.c:801
 msgid "_Repeat Password:"
 msgstr "重複密碼(_R):"
 
-#: ../smime/gui/certificate-manager.c:807
+#: ../smime/gui/certificate-manager.c:820
 msgid "Passwords do not match"
 msgstr "密碼不相符"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:815
+#: ../smime/gui/certificate-manager.c:828
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -23972,134 +24038,134 @@ msgstr ""
 "如果您忘記您的憑證備份密碼,您將無法在稍後還原這個備份。\n"
 "請將它保存在安全的地方。"
 
-#: ../smime/gui/certificate-manager.c:860
+#: ../smime/gui/certificate-manager.c:873
 msgid "No file name provided"
 msgstr "沒有提供檔案名稱"
 
-#: ../smime/gui/certificate-manager.c:864
+#: ../smime/gui/certificate-manager.c:877
 msgid "Failed to backup key and certificate"
 msgstr "無法備份您的金鑰與憑證"
 
-#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:966
 msgid "Select a certificate to import..."
 msgstr "選取要匯入的憑證…"
 
-#: ../smime/gui/certificate-manager.c:1003
+#: ../smime/gui/certificate-manager.c:1016
 msgid "Failed to import certificate"
 msgstr "無法匯入憑證"
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1132
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "使用時詢問"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1134
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "永不"
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1136
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "勉強的"
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1138
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "完全"
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1140
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "徹底的"
 
-#: ../smime/gui/certificate-manager.c:1129
+#: ../smime/gui/certificate-manager.c:1142
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "暫時的"
 
-#: ../smime/gui/certificate-manager.c:1335
+#: ../smime/gui/certificate-manager.c:1348
 msgid "Change certificate trust"
 msgstr "改變憑證信任度"
 
-#: ../smime/gui/certificate-manager.c:1347
+#: ../smime/gui/certificate-manager.c:1360
 #, c-format
 msgid "Change trust for the host '%s':"
 msgstr "改變主機「%s」的憑證信任度:"
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1384
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "使用時詢問(_A)"
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1385
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "永遠不信任憑證(_N)"
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../smime/gui/certificate-manager.c:1386
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "暫時信任(只在此作業階段) (_T)"
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1387
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "最低限度信任(_M)"
 
-#: ../smime/gui/certificate-manager.c:1375
+#: ../smime/gui/certificate-manager.c:1388
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "完整信任(_F)"
 
-#: ../smime/gui/certificate-manager.c:1376
+#: ../smime/gui/certificate-manager.c:1389
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "絕對信任(_U)"
 
-#: ../smime/gui/certificate-manager.c:1380
+#: ../smime/gui/certificate-manager.c:1393
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
 msgstr "信任此網站之前,如果可以的話,您應該先檢查它的憑證以及它的政策和程序。"
 
-#: ../smime/gui/certificate-manager.c:1395
+#: ../smime/gui/certificate-manager.c:1408
 msgid "_Display certificate"
 msgstr "顯示憑證(_D)"
 
-#: ../smime/gui/certificate-manager.c:1600
+#: ../smime/gui/certificate-manager.c:1613
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "您已經擁有相關憑證檔案的,可以識別這些郵件伺服器:"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../smime/gui/certificate-manager.c:1644
 msgid "Host name"
 msgstr "主機名稱"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1646
 msgid "Issuer"
 msgstr "簽發者"
 
-#: ../smime/gui/certificate-manager.c:1634
+#: ../smime/gui/certificate-manager.c:1647
 msgid "Fingerprint"
 msgstr "指紋"
 
-#: ../smime/gui/certificate-manager.c:1635
+#: ../smime/gui/certificate-manager.c:1648
 msgid "Trust"
 msgstr "信任"
 
-#: ../smime/gui/certificate-manager.c:1656
+#: ../smime/gui/certificate-manager.c:1669
 msgid "_Edit Trust"
 msgstr "編輯信任度(_E)"
 
-#: ../smime/gui/certificate-manager.c:1977
+#: ../smime/gui/certificate-manager.c:2123
 msgid "All PKCS12 files"
 msgstr "所有的 PKCS12 檔案"
 
-#: ../smime/gui/certificate-manager.c:1994
+#: ../smime/gui/certificate-manager.c:2140
 msgid "All email certificate files"
 msgstr "所有的電子郵件憑證檔案"
 
-#: ../smime/gui/certificate-manager.c:2011
+#: ../smime/gui/certificate-manager.c:2157
 msgid "All CA certificate files"
 msgstr "所有的 CA 憑證檔案"
 
@@ -24352,6 +24418,50 @@ msgstr "到期日(_D):"
 msgid "With _Status"
 msgstr "設定狀態(_S)"
 
+#~ msgid "Specify the output file instead of standard output"
+#~ msgstr "指定輸出檔案而不是標準輸出"
+
+#~ msgid "OUTPUTFILE"
+#~ msgstr "輸出檔案"
+
+#~ msgid "List local address book folders"
+#~ msgstr "列出本地通訊錄資料夾"
+
+#~ msgid "Show cards as vcard or csv file"
+#~ msgstr "將名片顯示成 vcard 或 csv 檔案"
+
+#~ msgid "[vcard|csv]"
+#~ msgstr "[vcard|csv]"
+
+#~ msgid ""
+#~ "Command line arguments error, please use --help option to see the usage."
+#~ msgstr "指令列引數錯誤,請使用 --help 選項來查看用法。"
+
+#~ msgid "Only support csv or vcard format."
+#~ msgstr "僅支援 csv 或 vcard 格式。"
+
+#~ msgid "Unhandled error"
+#~ msgstr "未處理的錯誤"
+
+#~ msgid "Failed to open client '%s': %s"
+#~ msgstr "無法開啟客戶端「%s」:%s"
+
+#~ msgid "Canceled"
+#~ msgstr "已取消"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Canceled"
+#~ msgstr "已取消"
+
+#~ msgid "_Unsort"
+#~ msgstr "不排序(_U)"
+
+#~ msgid "Canceled."
+#~ msgstr "已取消。"
+
+#~ msgid "Use Unicode characters for smile_ys"
+#~ msgstr "使用萬國碼字元表示表情符號(_Y)"
+
 #~ msgid "Unset _trust for SSL certificate"
 #~ msgstr "取消設定 SSL 憑證的信任(_T)"
 


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