[evolution] Updated Traditional Chinese translation(Hong Kong and Taiwan)

[Chao-Hsiung Liao <chliao src gnome org>]

commit 662f8793b05823f6cc422c1bd5d7bbfd31fd5b4f
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Fri Aug 2 10:47:07 2013 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 5604 ++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 5630 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 5813 insertions(+), 5421 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 767a4a9..ab4ef7b 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,13 +6,13 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010, 2012.
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
-#: ../shell/main.c:573
+#: ../shell/main.c:557
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.3.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 22:29+0800\n"
-"PO-Revision-Date: 2013-02-27 22:29+0800\n"
+"POT-Creation-Date: 2013-08-02 10:46+0800\n"
+"PO-Revision-Date: 2013-08-02 10:46+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: Poedit 1.5.3\n"
 "X-Project-Style: gnome\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
@@ -170,8 +170,8 @@ msgid ""
 "with the same address anyway?"
 msgstr "æ­¤è¯çµ¡äººçš„é›»å­éƒµä»¶åœ°å€å·²ç¶“å­˜åœ¨ã€‚ä½ ç„¡è«–å¦‚ä½•éƒ½è¦åŠ å…¥åŒæ¨£ä½å€çš„æ–°å¡ç‰‡å—Žï¼Ÿ"
 
-#: ../addressbook/addressbook.error.xml.h:33 ../e-util/e-table-config.ui.h:6
-#: ../e-util/e-name-selector-dialog.c:965 ../mail/em-vfolder-editor-rule.c:397
+#: ../addressbook/addressbook.error.xml.h:33
+#: ../e-util/e-name-selector-dialog.c:977 ../mail/em-vfolder-editor-rule.c:397
 msgid "_Add"
 msgstr "åŠ å…¥(_A)"
 
@@ -204,7 +204,7 @@ msgid ""
 msgstr "以「{0}ã€ç‚ºåçš„è¯çµ¡äººæ¸…å–®å·²ç¶“å­˜åœ¨é€™å€‹è¯çµ¡äººæ¸…å–®ä¸­ã€‚è¦å¼·åˆ¶åŠ å…¥å®ƒå—Žï¼Ÿ"
 
 #: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1252
 msgid "Failed to delete contact"
 msgstr "刪除聯絡人失敗"
 
@@ -226,7 +226,7 @@ msgstr "「{0}」是一個唯讀的通訊錄，不能被修改。請從聯絡人
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:635
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:657
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2949
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
 msgid "Contact Editor"
 msgstr "聯絡人編輯器"
 
@@ -250,7 +250,7 @@ msgstr "通訊錄(_W):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:5
+#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "分類(_T)…"
 
@@ -263,10 +263,10 @@ msgid "_Wants to receive HTML mail"
 msgstr "可接受 H_TML 郵件"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:396
+#: ../addressbook/gui/merging/eab-contact-merging.c:407
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:971
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:942
 #: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "電子郵件"
@@ -291,7 +291,7 @@ msgstr "é¦–é (_H):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1850
+#: ../modules/itip-formatter/itip-view.c:1877
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
@@ -383,8 +383,8 @@ msgid "_Anniversary:"
 msgstr "週年紀念日(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-#: ../calendar/gui/e-calendar-view.c:2193
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
+#: ../calendar/gui/e-calendar-view.c:2241
 msgid "Anniversary"
 msgstr "週年紀念日"
 
@@ -394,13 +394,12 @@ msgstr "週年紀念日"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
-#: ../calendar/gui/e-calendar-view.c:2192 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../calendar/gui/e-calendar-view.c:2240 ../shell/main.c:128
 msgid "Birthday"
 msgstr "生日"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
 msgid "Miscellaneous"
 msgstr "é›œé …"
 
@@ -435,25 +434,25 @@ msgstr "地址(_A):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/e-contact-map.c:308
-#: ../addressbook/gui/widgets/eab-contact-display.c:389
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:357
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
 msgid "Home"
 msgstr "住家"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/e-contact-map.c:316
-#: ../addressbook/gui/widgets/eab-contact-display.c:386
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:68
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../addressbook/gui/widgets/eab-contact-display.c:354
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
 msgid "Work"
 msgstr "工作"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:70
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:379
-#: ../calendar/gui/e-cal-model.c:3466
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
+#: ../calendar/gui/e-cal-model.c:3963
 msgid "Other"
 msgstr "其他"
 
@@ -466,47 +465,47 @@ msgid "Notes"
 msgstr "備註"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:609
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:612
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:610
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
 msgid "Twitter"
 msgstr "Twitter"
 
@@ -524,20 +523,20 @@ msgid "Error removing contact"
 msgstr "移除聯絡人時發生錯誤"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:651
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "聯絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3474
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3471
 msgid "Please select an image for this contact"
 msgstr "請選取代表此聯絡人的圖片"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3475
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3472
 msgid "_No image"
 msgstr "沒有圖片(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3813
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -545,48 +544,48 @@ msgstr ""
 "聯絡人資料無效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3819
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "「%sã€å«æœ‰ç„¡æ•ˆçš„æ ¼å¼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3827
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "「%s」不能是未來日期"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3830
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3835
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s「%sã€å«æœ‰ç„¡æ•ˆçš„æ ¼å¼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3843
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3857
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3848
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3862
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s「%s」是空的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3872
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3877
 msgid "Invalid contact."
 msgstr "無效的聯絡人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:434
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "Contact Quick-Add"
 msgstr "快速新增聯絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:457
 msgid "_Edit Full"
 msgstr "編輯全部(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:487
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:500
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:523
 msgid "E_mail"
 msgstr "電子郵件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:536
 msgid "_Select Address Book"
 msgstr "選擇通訊錄(_S)"
 
@@ -661,7 +660,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:814
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
 msgid "Contact List Editor"
 msgstr "聯絡人清單編輯器"
 
@@ -697,23 +696,23 @@ msgstr "從通訊錄插入電子郵件位址"
 msgid "_Select..."
 msgstr "選取(_S)…"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:937
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
 msgid "Contact List Members"
 msgstr "聯絡人清單成員"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1463
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
 msgid "_Members"
 msgstr "成員(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1582
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1594
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1597
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1609
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1612
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1624
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
@@ -738,7 +737,7 @@ msgid "Changed Contact:"
 msgstr "更改後的聯絡人:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:342
+#: ../addressbook/gui/merging/eab-contact-merging.c:362
 msgid "_Merge"
 msgstr "合併(_M)"
 
@@ -758,27 +757,27 @@ msgstr "原本的聯絡人:"
 msgid "New Contact:"
 msgstr "新的聯絡人:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:324
+#: ../addressbook/gui/merging/eab-contact-merging.c:344
 msgid "Merge Contact"
 msgstr "合併聯絡人"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Name contains"
 msgstr "名稱包含"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Email begins with"
 msgstr "電子郵件開始於"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1090
-#: ../modules/calendar/e-cal-shell-view-actions.c:1795
-#: ../modules/calendar/e-memo-shell-view-actions.c:812
-#: ../modules/calendar/e-task-shell-view-actions.c:1011
+#: ../modules/addressbook/e-book-shell-view-actions.c:1135
+#: ../modules/calendar/e-cal-shell-view-actions.c:1772
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:990
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
@@ -800,59 +799,59 @@ msgstr "取得書本檢視時發生錯誤"
 msgid "Search Interrupted"
 msgstr "搜尋被中斷"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:161
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
 msgid "Error modifying card"
 msgstr "編輯卡片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr "剪下選取的聯絡人至剪貼簿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr "複製選取的聯絡人至剪貼簿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr "從剪貼簿貼上聯絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
 msgid "Delete selected contacts"
 msgstr "刪除選定的聯絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:658
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr "選擇全部可見的聯絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "ä½ ç¢ºå®šè¦åˆªé™¤é€™äº›è¯çµ¡äººæ¸…å–®ï¼Ÿ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact list?"
 msgstr "ä½ ç¢ºå®šè¦åˆªé™¤é€™å€‹è¯çµ¡äººæ¸…å–®ï¼Ÿ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "ä½ ç¢ºå®šè¦åˆªé™¤é€™å€‹è¯çµ¡äººæ¸…å–® (%s)？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 msgid "Are you sure you want to delete these contacts?"
 msgstr "ä½ ç¢ºå®šè¦åˆªé™¤é€™äº›è¯çµ¡äººï¼Ÿ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 msgid "Are you sure you want to delete this contact?"
 msgstr "ä½ ç¢ºå®šè¦åˆªé™¤é€™å€‹è¯çµ¡äººï¼Ÿ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "ä½ ç¢ºå®šè¦åˆªé™¤é€™å€‹è¯çµ¡äºº (%s)？"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1463
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -864,11 +863,11 @@ msgstr[0] ""
 "開啟 %d 個聯絡人會同時開啟 %d 個新視窗。\n"
 "確定要顯示這裏所有的聯絡人？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1471
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
 msgid "_Don't Display"
 msgstr "不要顯示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1487
 msgid "Display _All Contacts"
 msgstr "顯示所有的聯絡人(_A)"
 
@@ -885,7 +884,7 @@ msgid "Family Name"
 msgstr "姓"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:608
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
 msgid "Nickname"
 msgstr "網名"
 
@@ -942,7 +941,7 @@ msgid "ISDN Phone"
 msgstr "ISDN 電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
 msgid "Mobile Phone"
 msgstr "流動電話"
 
@@ -981,7 +980,7 @@ msgid "TTYTDD"
 msgstr "TTYTDD"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
 msgid "Company"
 msgstr "公司"
 
@@ -998,18 +997,18 @@ msgid "Title"
 msgstr "éŠœé ­"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:663
+#: ../calendar/gui/e-meeting-list-view.c:666
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "角色"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
 msgid "Manager"
 msgstr "主管"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
 msgid "Assistant"
 msgstr "助理"
 
@@ -1030,12 +1029,12 @@ msgid "Categories"
 msgstr "分類"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
 msgid "Spouse"
 msgstr "配偶"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:738
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
 msgid "Note"
 msgstr "備註"
 
@@ -1150,110 +1149,110 @@ msgstr "聯絡人: "
 msgid "evolution minicard"
 msgstr "Evolution è¿·ä½ å¡ç‰‡"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../addressbook/gui/widgets/eab-contact-display.c:150
 msgid "Copy _Email Address"
 msgstr "複製電子郵件位址(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:154
-#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:295
+#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:307
 msgid "Copy the email address to the clipboard"
 msgstr "複製電子郵件位址到剪貼簿"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:159
-#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:300
+#: ../addressbook/gui/widgets/eab-contact-display.c:157
+#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:312
 msgid "_Send New Message To..."
 msgstr "傳送新郵件至(_S)…"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:161
-#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:302
+#: ../addressbook/gui/widgets/eab-contact-display.c:159
+#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:314
 msgid "Send a mail message to this address"
 msgstr "傳送郵件到這個位址"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:323
-#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:1084
+#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:934
 #, c-format
 msgid "Click to mail %s"
 msgstr "按一下來傳送郵件 %s"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:148
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
 msgid "Open map"
 msgstr "開啟地圖"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:544
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
 msgid "List Members:"
 msgstr "清單成員："
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:664
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
 msgid "Department"
 msgstr "部門"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:665
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
 msgid "Profession"
 msgstr "職業"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
 msgid "Position"
 msgstr "位置"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
 msgid "Video Chat"
 msgstr "視像交談"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
 #: ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:216
 #: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:548
+#: ../modules/calendar/e-cal-shell-view.c:591
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "行事曆"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
-#: ../calendar/gui/dialogs/event-editor.c:122
-#: ../calendar/gui/dialogs/event-editor.c:349
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:699
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
 msgid "Phone"
 msgstr "電話"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
 msgid "Fax"
 msgstr "傳真"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
 msgid "Address"
 msgstr "地址"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:697
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
 msgid "Home Page"
 msgstr "é¦–é "
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:698
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
 msgid "Web Log"
 msgstr "網誌"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:714
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
 msgid "Personal"
 msgstr "個人"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:935
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:906
 msgid "List Members"
 msgstr "清單成員"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:956
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:927
 msgid "Job Title"
 msgstr "職稱"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:997
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:968
 msgid "Home page"
 msgstr "é¦–é "
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1007
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:978
 msgid "Blog"
 msgstr "éƒ¨è½æ ¼"
 
@@ -1359,10 +1358,6 @@ msgstr "將聯絡人移到"
 msgid "Copy contacts to"
 msgstr "複製聯絡人到"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
-msgid "Card View"
-msgstr "卡片檢視模式"
-
 #: ../addressbook/importers/evolution-csv-importer.c:744
 #: ../addressbook/importers/evolution-ldif-importer.c:543
 #: ../addressbook/importers/evolution-vcard-importer.c:279
@@ -1476,7 +1471,7 @@ msgstr[0] "小時"
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:132
-#: ../calendar/gui/dialogs/recurrence-page.c:1204
+#: ../calendar/gui/dialogs/recurrence-page.c:1248
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
@@ -1497,16 +1492,16 @@ msgstr "全部解除(_A)"
 msgid "_Snooze"
 msgstr "延期(_S)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:162
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:165
 msgid "_Dismiss"
 msgstr "解除(_D)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1766
-#: ../calendar/alarm-notify/alarm-queue.c:1776
+#: ../calendar/alarm-notify/alarm-queue.c:1819
+#: ../calendar/alarm-notify/alarm-queue.c:1829
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
-#: ../modules/itip-formatter/itip-view.c:1464
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../modules/itip-formatter/itip-view.c:1489
+#: ../modules/itip-formatter/itip-view.c:1600
 msgid "Location:"
 msgstr "位置:"
 
@@ -1521,7 +1516,7 @@ msgstr "忽略時間(_T):"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/filter.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
 #: ../e-util/e-interval-chooser.c:143
 #: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
@@ -1529,64 +1524,51 @@ msgid "days"
 msgstr "天"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
 #: ../e-util/e-interval-chooser.c:141
 msgid "hours"
 msgstr "小時"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
 #: ../e-util/e-interval-chooser.c:139
 #: ../mail/e-mail-config-provider-page.c:527
 msgid "minutes"
 msgstr "分鐘"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1612
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1661
+#: ../calendar/alarm-notify/alarm-queue.c:1799
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1621
-#: ../calendar/alarm-notify/alarm-queue.c:1623
+#: ../calendar/alarm-notify/alarm-queue.c:1670
+#: ../calendar/alarm-notify/alarm-queue.c:1672
 msgid "No description available."
 msgstr "沒有任何描述。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1631
+#: ../calendar/alarm-notify/alarm-queue.c:1680
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1636
-#: ../calendar/alarm-notify/alarm-queue.c:1737
-#: ../calendar/alarm-notify/alarm-queue.c:2099
+#: ../calendar/alarm-notify/alarm-queue.c:1685
+#: ../calendar/alarm-notify/alarm-queue.c:1790
+#: ../calendar/alarm-notify/alarm-queue.c:2131
 msgid "Evolution Reminders"
 msgstr "Evolution 提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1679
+#: ../calendar/alarm-notify/alarm-queue.c:1729
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "ä½ æœ‰ %d 個提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1884
-#: ../calendar/alarm-notify/alarm-queue.c:1919
+#: ../calendar/alarm-notify/alarm-queue.c:1951
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1888
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
-"Evolution 尚未支援使用電子郵件通知的\n"
-"行事曆提醒，但是這個提醒被設定為\n"
-"送出電子郵件。  Evolution 會顯示\n"
-"普通的提醒對話盒來代替。"
-
-#: ../calendar/alarm-notify/alarm-queue.c:1925
+#: ../calendar/alarm-notify/alarm-queue.c:1957
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1603,7 +1585,7 @@ msgstr ""
 "\n"
 "ä½ ç¢ºå®šè¦åŸ·è¡Œé€™å€‹ç¨‹å¼ï¼Ÿ"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1940
+#: ../calendar/alarm-notify/alarm-queue.c:1972
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -1766,14 +1748,14 @@ msgid "You have changed this meeting, but not yet saved it."
 msgstr "ä½ å·²ç¶“æ›´æ”¹æ­¤æœƒè­°ï¼Œä½†å°šæœªå„²å­˜å®ƒã€‚"
 
 #: ../calendar/calendar.error.xml.h:30
+msgid "_Save Changes"
+msgstr "儲存更改(_S)"
+
+#: ../calendar/calendar.error.xml.h:31
 #: ../composer/mail-composer.error.xml.h:16
 msgid "_Discard Changes"
 msgstr "放棄更改(_D)"
 
-#: ../calendar/calendar.error.xml.h:31
-msgid "_Save Changes"
-msgstr "儲存更改(_S)"
-
 #: ../calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
 msgstr "要儲存對此約會所做的更改？"
@@ -1843,7 +1825,7 @@ msgid ""
 "loss of these attachments."
 msgstr "這裏有一些需要下載的附件。儲存此工作將會失去這些附件。"
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:315
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:297
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -1997,22 +1979,6 @@ msgstr "載入備忘錄清單「{0}」時發生錯誤"
 msgid "The memo list is not marked for offline usage."
 msgstr "此備忘錄清單尚未標記為離線使用。"
 
-#: ../calendar/gui/calendar-view-factory.c:88
-msgid "Day View"
-msgstr "日檢視"
-
-#: ../calendar/gui/calendar-view-factory.c:91
-msgid "Work Week View"
-msgstr "工作週檢視"
-
-#: ../calendar/gui/calendar-view-factory.c:94
-msgid "Week View"
-msgstr "週檢視"
-
-#: ../calendar/gui/calendar-view-factory.c:97
-msgid "Month View"
-msgstr "月檢視"
-
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
@@ -2033,7 +1999,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-table-config.ui.h:24 ../e-util/e-attachment-tree-view.c:528
+#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
 #: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Description"
 msgstr "說明"
@@ -2057,21 +2023,26 @@ msgstr "是"
 msgid "is not"
 msgstr "不是"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:841 ../calendar/gui/e-cal-model.c:848
-#: ../calendar/gui/e-task-table.c:545 ../calendar/gui/memotypes.xml.h:10
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
+#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "公開"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:850 ../calendar/gui/e-task-table.c:546
-#: ../calendar/gui/memotypes.xml.h:11
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
+#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "私人"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:236
-#: ../calendar/gui/e-cal-model.c:852 ../calendar/gui/e-task-table.c:547
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-send-options.ui.h:7
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
+#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "機密"
 
@@ -2088,7 +2059,7 @@ msgstr "到會者"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:883
+#: ../plugins/publish-calendar/publish-calendar.c:882
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:390
 msgid "Location"
@@ -2100,8 +2071,8 @@ msgid "Category"
 msgstr "分類"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:56
-#: ../em-format/e-mail-formatter-print-headers.c:187
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:54
+#: ../em-format/e-mail-formatter-print-headers.c:204
 #: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "附件"
@@ -2117,8 +2088,8 @@ msgid "Do Not Exist"
 msgstr "不存在"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:316
-#: ../calendar/gui/dialogs/event-editor.c:337
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-editor.c:331
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "週期性"
@@ -2149,30 +2120,46 @@ msgstr "摘要包含"
 msgid "Description Contains"
 msgstr "描述包含"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:631
+#: ../calendar/gui/dialogs/alarm-dialog.c:669
 msgid "Edit Reminder"
 msgstr "編輯提醒"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:822
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
 #: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "顯示提示"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
 #: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "播放音效"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
 #: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "執行外部程式"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:900
 #: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "傳送電子郵件"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
+msgid "before"
+msgstr "æ—©æ–¼"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:910
+msgid "after"
+msgstr "晚於"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
+msgid "start of appointment"
+msgstr "約會開始"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:920
+msgid "end of appointment"
+msgstr "約會結束"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "minute(s)"
 msgstr "分鐘"
@@ -2185,81 +2172,65 @@ msgstr "小時"
 msgid "day(s)"
 msgstr "天"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "before"
-msgstr "æ—©æ–¼"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-msgid "after"
-msgstr "晚於"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-msgid "start of appointment"
-msgstr "約會開始"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "end of appointment"
-msgstr "約會結束"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "Add Reminder"
 msgstr "åŠ å…¥æé†’"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-#: ../calendar/gui/dialogs/event-editor.c:359
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-editor.c:353
 msgid "Reminder"
 msgstr "提醒"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Repeat"
 msgstr "重複"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Repeat the reminder"
 msgstr "重複這個提醒(_R)"
 
 #. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "extra times every"
 msgstr "提醒間隔每"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
 msgid "Options"
 msgstr "é¸é …"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "Custom _message"
 msgstr "自選訊息(_M)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 msgid "Mes_sage:"
 msgstr "訊息(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom reminder sound"
 msgstr "自選提醒聲音"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
 msgid "_Sound:"
 msgstr "聲音(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Select A File"
 msgstr "請選取檔案"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Program:"
 msgstr "執行程式(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "_Arguments:"
 msgstr "引數(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "Send To:"
 msgstr "收件者："
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "動作/觸發"
 
@@ -2317,241 +2288,246 @@ msgstr "%s  ä½ å·²ç¶“åšäº†äº›æ›´æ”¹ã€‚æ”¾æ£„é€™äº›æ›´æ”¹ä¸¦ä¸”æ›´æ–°é€™å€‹ç·¨
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ä½ æ²’æœ‰åšä»»ä½•æ›´æ”¹ï¼Œæ›´æ–°é€™å€‹ç·¨è¼¯å™¨ï¼Ÿ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:266
 msgid "Could not save attachments"
 msgstr "無法儲存附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:618
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:755
+#: ../calendar/gui/dialogs/comp-editor.c:752
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:759
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:764
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:767
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:769
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Memo - %s"
 msgstr "備忘錄 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:793
+#: ../calendar/gui/dialogs/comp-editor.c:790
 msgid "No Summary"
 msgstr "沒有摘要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:914
+#: ../calendar/gui/dialogs/comp-editor.c:911
 msgid "Keep original item?"
 msgstr "æ˜¯å¦ä¿æŒåŽŸå§‹é …ç›®ï¼Ÿ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1151
+#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1118
+msgid "Unable to synchronize with the server"
+msgstr "無法與伺服器同步"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1232
 msgid "Close the current window"
 msgstr "關閉目前的視窗"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158 ../e-util/e-focus-tracker.c:121
+#: ../calendar/gui/dialogs/comp-editor.c:1239 ../e-util/e-focus-tracker.c:121
 #: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
-#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:322
-#: ../e-util/e-web-view.c:1407 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:876
+#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1249 ../mail/e-mail-browser.c:136
+#: ../shell/e-shell-window-actions.c:888
 msgid "Copy the selection"
 msgstr "複製選取的內容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165 ../e-util/e-focus-tracker.c:114
+#: ../calendar/gui/dialogs/comp-editor.c:1246 ../e-util/e-focus-tracker.c:114
 #: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
-#: ../e-util/e-web-view.c:1401 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:883
+#: ../e-util/e-web-view.c:1243 ../mail/e-mail-browser.c:143
+#: ../shell/e-shell-window-actions.c:895
 msgid "Cut the selection"
 msgstr "剪下選取範圍"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172 ../e-util/e-focus-tracker.c:135
-#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:890
+#: ../calendar/gui/dialogs/comp-editor.c:1253 ../e-util/e-focus-tracker.c:135
+#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
 msgid "Delete the selection"
 msgstr "刪除選取範圍"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1179
+#: ../calendar/gui/dialogs/comp-editor.c:1260
 msgid "View help"
 msgstr "檢視求助"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186 ../e-util/e-focus-tracker.c:128
+#: ../calendar/gui/dialogs/comp-editor.c:1267 ../e-util/e-focus-tracker.c:128
 #: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
-#: ../e-util/e-web-view.c:1413 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:911
+#: ../e-util/e-web-view.c:1255 ../mail/e-mail-browser.c:150
+#: ../shell/e-shell-window-actions.c:923
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿的內容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1207
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 msgid "Save current changes"
 msgstr "儲存目前的更改"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1212
+#: ../calendar/gui/dialogs/comp-editor.c:1293
 #: ../e-util/e-mail-signature-editor.c:312
 msgid "Save and Close"
 msgstr "儲存並關閉"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1214
+#: ../calendar/gui/dialogs/comp-editor.c:1295
 msgid "Save current changes and close editor"
 msgstr "儲存目前的更改並且關閉編輯器"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1221 ../e-util/e-focus-tracker.c:142
-#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:151
-#: ../shell/e-shell-window-actions.c:988
+#: ../calendar/gui/dialogs/comp-editor.c:1302 ../e-util/e-focus-tracker.c:142
+#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
+#: ../shell/e-shell-window-actions.c:1000
 msgid "Select all text"
 msgstr "選取所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1228
+#: ../calendar/gui/dialogs/comp-editor.c:1309
 msgid "_Classification"
 msgstr "歸類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1316
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
-#: ../e-util/gal-define-views.ui.h:5 ../mail/e-mail-browser.c:165
+#: ../mail/e-mail-browser.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:1028
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1242
-#: ../e-util/e-mail-signature-editor.c:317 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1023
+#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../e-util/e-mail-signature-editor.c:317 ../mail/e-mail-browser.c:164
+#: ../shell/e-shell-window-actions.c:1035
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../shell/e-shell-window-actions.c:1030
+#: ../calendar/gui/dialogs/comp-editor.c:1330
+#: ../shell/e-shell-window-actions.c:1042
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1337
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1263
-#: ../composer/e-composer-actions.c:338
+#: ../calendar/gui/dialogs/comp-editor.c:1344
+#: ../composer/e-composer-actions.c:320
 msgid "_Options"
 msgstr "é¸é …(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-browser.c:172
-#: ../shell/e-shell-window-actions.c:1065 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1351 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
-#: ../composer/e-composer-actions.c:287
+#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../composer/e-composer-actions.c:269
 msgid "_Attachment..."
 msgstr "附件(_A)…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
-#: ../composer/e-composer-actions.c:289 ../e-util/e-attachment-view.c:413
+#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
 msgid "Attach a file"
 msgstr "é™„åŠ æª”æ¡ˆ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1371
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1373
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1309
+#: ../calendar/gui/dialogs/comp-editor.c:1390
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1392
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1316
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1399
 msgid "Classify as private"
 msgstr "歸類為私人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Classify as confidential"
 msgstr "歸類為機密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../calendar/gui/dialogs/comp-editor.c:1416
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1424
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2120
-#: ../composer/e-composer-actions.c:506
+#: ../calendar/gui/dialogs/comp-editor.c:2221
+#: ../composer/e-composer-actions.c:488
 msgid "Attach"
 msgstr "é™„åŠ "
 
-#: ../calendar/gui/dialogs/comp-editor.c:2470
-#: ../calendar/gui/dialogs/comp-editor.c:2657
-#: ../calendar/gui/dialogs/comp-editor.c:3663
+#: ../calendar/gui/dialogs/comp-editor.c:2551
+#: ../calendar/gui/dialogs/comp-editor.c:2761
+#: ../calendar/gui/dialogs/comp-editor.c:3772
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦‚æžœæœ‰æ–°çš„æ›´æ–°ï¼Œå‰‡æœƒæ”¾æ£„å°æ­¤é …ç›®æ‰€åšçš„æ›´æ”¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3627
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
+#: ../calendar/gui/dialogs/comp-editor.c:3734
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3695
+#: ../calendar/gui/dialogs/comp-editor.c:3804
 msgid "Unable to use current version!"
 msgstr "無法使用目前的版本！"
 
@@ -2660,66 +2636,66 @@ msgstr "委託給："
 msgid "Contacts..."
 msgstr "聯絡人…"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Reminders"
 msgstr "提醒(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:213
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Set or unset reminders for this event"
 msgstr "設定或取消這個事件的提醒"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:215
 msgid "Show Time as _Busy"
 msgstr "顯示時間為忙碌(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:223
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "Toggles whether to show time as busy"
 msgstr "切換是否將時間顯示為忙碌"
 
-#: ../calendar/gui/dialogs/event-editor.c:232
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "_Recurrence"
 msgstr "週期性(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Make this a recurring event"
 msgstr "å°‡æ­¤é …è¨­ç‚ºé€±æœŸæ€§äº‹ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:239 ../e-util/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "å‚³é€é¸é …"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/task-editor.c:96
 msgid "Insert advanced send options"
 msgstr "æ’å…¥é€²éšŽå‚³é€é¸é …"
 
-#: ../calendar/gui/dialogs/event-editor.c:249
+#: ../calendar/gui/dialogs/event-editor.c:243
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "Toggles whether to have All Day Event"
 msgstr "切換是否要有全天事件"
 
-#: ../calendar/gui/dialogs/event-editor.c:260
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "_Free/Busy"
 msgstr "空閒/忙碌(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:262
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Query free / busy information for the attendees"
 msgstr "查詢此到會者的空閒/忙碌資訊"
 
-#: ../calendar/gui/dialogs/event-editor.c:313 ../calendar/gui/print.c:3468
+#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3505
 msgid "Appointment"
 msgstr "約會"
 
-#: ../calendar/gui/dialogs/event-editor.c:383
+#: ../calendar/gui/dialogs/event-editor.c:377
 #: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "到會者"
 
-#: ../calendar/gui/dialogs/event-editor.c:580
+#: ../calendar/gui/dialogs/event-editor.c:574
 msgid "Print this event"
 msgstr "列印這個事件"
 
@@ -2736,7 +2712,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ä¸èƒ½å®Œæ•´çš„ç·¨è¼¯äº‹ä»¶ï¼Œå› ç‚ºä½ ä¸æ˜¯å¬é›†äºº"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3181
+#: ../calendar/gui/dialogs/event-page.c:3165
 msgid "This event has reminders"
 msgstr "這個事件具有提醒"
 
@@ -2755,7 +2731,7 @@ msgstr "無結束日期的事件"
 
 #: ../calendar/gui/dialogs/event-page.c:1475
 #: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:853
+#: ../calendar/gui/dialogs/task-page.c:1024
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
@@ -2773,12 +2749,12 @@ msgstr "結束時間錯誤"
 
 #: ../calendar/gui/dialogs/event-page.c:1682
 #: ../calendar/gui/dialogs/memo-page.c:765
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/task-page.c:1078
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
 #: ../calendar/gui/dialogs/event-page.c:1717
-#: ../calendar/gui/dialogs/task-page.c:942
+#: ../calendar/gui/dialogs/task-page.c:1113
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
@@ -2790,30 +2766,30 @@ msgstr "代理者(_D)"
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:3461
+#: ../calendar/gui/dialogs/event-page.c:3445
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "在每個約會前 %d 天"
 
-#: ../calendar/gui/dialogs/event-page.c:3467
+#: ../calendar/gui/dialogs/event-page.c:3451
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "約會前 %d 小時"
 
-#: ../calendar/gui/dialogs/event-page.c:3473
+#: ../calendar/gui/dialogs/event-page.c:3457
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "約會前 %d 分鐘"
 
-#: ../calendar/gui/dialogs/event-page.c:3494
+#: ../calendar/gui/dialogs/event-page.c:3478
 msgid "Customize"
 msgstr "自選"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3501
+#: ../calendar/gui/dialogs/event-page.c:3485
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "沒有"
@@ -2854,8 +2830,8 @@ msgstr "位置(_L):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:7
-#: ../e-util/e-attachment-dialog.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:29
+#: ../e-util/e-attachment-dialog.c:357
 msgid "_Description:"
 msgstr "描述(_D):"
 
@@ -2864,7 +2840,7 @@ msgid "_Time:"
 msgstr "時刻(_T):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
@@ -2877,8 +2853,8 @@ msgid "Event Description"
 msgstr "事件描述"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "到會者(_N)…"
 
@@ -2943,11 +2919,11 @@ msgid "Select Date"
 msgstr "選擇日期"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "Select _Today"
 msgstr "選擇今天(_T)"
 
-#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3472
+#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3509
 msgid "Memo"
 msgstr "備忘錄"
 
@@ -2967,23 +2943,23 @@ msgstr "ä¸èƒ½ç·¨è¼¯å‚™å¿˜éŒ„ï¼Œå› ç‚ºé¸å–çš„å‚™å¿˜éŒ„æ¸…å–®æ˜¯å”¯è®€çš„"
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ä¸èƒ½å®Œæ•´çš„ç·¨è¼¯å‚™å¿˜éŒ„ï¼Œå› ç‚ºä½ ä¸æ˜¯å¬é›†äºº"
 
-#: ../calendar/gui/dialogs/memo-page.c:1183
-#: ../em-format/e-mail-formatter.c:1391
-#: ../em-format/e-mail-formatter-utils.c:194
-#: ../em-format/e-mail-formatter-utils.c:218 ../mail/em-filter-i18n.h:78
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:63
+#: ../calendar/gui/dialogs/memo-page.c:1161
+#: ../em-format/e-mail-formatter-utils.c:205
+#: ../em-format/e-mail-formatter-utils.c:229
+#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
 msgid "To"
 msgstr "收件者"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:336
-#: ../calendar/gui/dialogs/task-page.ui.h:9
+#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.ui.h:31
 msgid "_List:"
 msgstr "清單(_L):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:344
-#: ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.ui.h:24
 msgid "Organi_zer:"
 msgstr "會議召集人(_Z):"
 
@@ -2992,12 +2968,12 @@ msgid "T_o:"
 msgstr "收件者(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:26
 msgid "Sta_rt date:"
 msgstr "開始日(_R):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:23
 msgid "Su_mmary:"
 msgstr "摘要(_M):"
 
@@ -3041,17 +3017,17 @@ msgstr "æ‰€æœ‰ä¾‹é …"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:973
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "Recurrence date is invalid"
 msgstr "週期性日期無效"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "End time of the recurrence was before event's start"
 msgstr "週期性事件的結束時刻早於開始時刻"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "on"
 msgstr "çš„"
 
@@ -3059,7 +3035,7 @@ msgstr "çš„"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/dialogs/recurrence-page.c:1154
 msgid "first"
 msgstr "一"
 
@@ -3068,7 +3044,7 @@ msgstr "一"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "second"
 msgstr "二"
 
@@ -3076,7 +3052,7 @@ msgstr "二"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "third"
 msgstr "三"
 
@@ -3084,7 +3060,7 @@ msgstr "三"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "fourth"
 msgstr "å››"
 
@@ -3092,7 +3068,7 @@ msgstr "å››"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fifth"
 msgstr "第五"
 
@@ -3100,13 +3076,13 @@ msgstr "第五"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1136
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "last"
 msgstr "最後"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 msgid "Other Date"
 msgstr "其他日期"
 
@@ -3114,7 +3090,7 @@ msgstr "其他日期"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "1st to 10th"
 msgstr "1日至10日"
 
@@ -3122,7 +3098,7 @@ msgstr "1日至10日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1172
+#: ../calendar/gui/dialogs/recurrence-page.c:1216
 msgid "11th to 20th"
 msgstr "11日至20日"
 
@@ -3130,73 +3106,73 @@ msgstr "11日至20日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1178
+#: ../calendar/gui/dialogs/recurrence-page.c:1222
 msgid "21st to 31st"
 msgstr "21日至31日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1206
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1207
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1209
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "星期日"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1342
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "on the"
 msgstr "在第"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1527
+#: ../calendar/gui/dialogs/recurrence-page.c:1571
 msgid "occurrences"
 msgstr "次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2253
+#: ../calendar/gui/dialogs/recurrence-page.c:2341
 msgid "Add exception"
 msgstr "åŠ å…¥ä¾‹å¤–"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2295
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
 msgid "Could not get a selection to modify."
 msgstr "無法取得要編輯的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2301
+#: ../calendar/gui/dialogs/recurrence-page.c:2389
 msgid "Modify exception"
 msgstr "編輯例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Could not get a selection to delete."
 msgstr "無法取得要刪除的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2488
+#: ../calendar/gui/dialogs/recurrence-page.c:2576
 msgid "Date/Time"
 msgstr "日期/時間"
 
@@ -3259,189 +3235,166 @@ msgid "Preview"
 msgstr "é è¦½"
 
 #: ../calendar/gui/dialogs/send-comp.c:223
+#: ../calendar/gui/dialogs/send-comp.c:301
 msgid "Send my reminders with this event"
 msgstr "將我的提醒與這個事件一起送出"
 
 #: ../calendar/gui/dialogs/send-comp.c:225
+#: ../calendar/gui/dialogs/send-comp.c:303
 msgid "Notify new attendees _only"
 msgstr "只通知新的到會者(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-editor.c:94
+msgid "_Send Options"
+msgstr "å‚³é€é¸é …(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3507
+#: ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "工作"
+
+#: ../calendar/gui/dialogs/task-editor.c:286
+msgid "Print this task"
+msgstr "åˆ—å°é€™é …å·¥ä½œ"
+
+#: ../calendar/gui/dialogs/task-page.c:330
+msgid "Task's start date is in the past"
+msgstr "工作的開始時刻在過去"
+
+#: ../calendar/gui/dialogs/task-page.c:331
+msgid "Task's due date is in the past"
+msgstr "工作的結束時刻在過去"
+
+#: ../calendar/gui/dialogs/task-page.c:364
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "ä¸èƒ½ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºé¸å–çš„å·¥ä½œæ¸…å–®æ˜¯å”¯è®€çš„"
+
+#: ../calendar/gui/dialogs/task-page.c:368
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "ä¸èƒ½å®Œæ•´çš„ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºä½ ä¸æ˜¯å¬é›†äºº"
+
+#: ../calendar/gui/dialogs/task-page.c:372
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr "ä¸èƒ½ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºé¸å–çš„å·¥ä½œæ¸…å–®ä¸æ”¯æ´æŒ‡æ´¾å·¥ä½œ"
+
+#: ../calendar/gui/dialogs/task-page.c:1005
+msgid "Due date is wrong"
+msgstr "到期日錯誤"
+
+#: ../calendar/gui/dialogs/task-page.c:1173
+#: ../calendar/gui/dialogs/task-page.c:1198
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
-#: ../calendar/gui/dialogs/task-details-page.c:490
-msgid "Web Page"
-msgstr "ç¶²é "
-
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:348
-#: ../calendar/gui/e-task-table.c:571 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:1257
+#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:320
 msgid "High"
 msgstr "高"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:350
-#: ../calendar/gui/e-cal-model.c:1681 ../calendar/gui/e-task-table.c:572
+#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:1256
+#: ../mail/message-list.c:319
 msgid "Normal"
 msgstr "一般"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:12
 #: ../calendar/gui/e-cal-component-preview.c:352
-#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:1255
+#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:318
 msgid "Low"
 msgstr "低"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/dialogs/task-page.ui.h:14
+#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "未指定"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/dialogs/task-page.ui.h:16
 #: ../calendar/gui/e-cal-component-preview.c:333
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:777 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:654
-#: ../calendar/gui/print.c:3554 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-model-tasks.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:551 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3591 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "未開始"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:12
+#: ../calendar/gui/dialogs/task-page.ui.h:18
 #: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:779
-#: ../calendar/gui/e-cal-model-tasks.c:857 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3557
+#: ../calendar/gui/e-cal-model-tasks.c:313
+#: ../calendar/gui/e-cal-model-tasks.c:553
+#: ../calendar/gui/e-cal-model-tasks.c:631 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3594
 msgid "In Progress"
 msgstr "進行中"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:14
+#: ../calendar/gui/dialogs/task-page.ui.h:20
 #: ../calendar/gui/e-cal-component-preview.c:326
-#: ../calendar/gui/e-cal-model-tasks.c:495
-#: ../calendar/gui/e-cal-model-tasks.c:781
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:315
+#: ../calendar/gui/e-cal-model-tasks.c:555
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
 #: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:656 ../calendar/gui/print.c:3560
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3597
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:380
 msgid "Completed"
 msgstr "已完成"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
+#: ../calendar/gui/dialogs/task-page.ui.h:22
 #: ../calendar/gui/e-cal-component-preview.c:329
-#: ../calendar/gui/e-cal-model-tasks.c:497
-#: ../calendar/gui/e-cal-model-tasks.c:783 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3563 ../mail/mail-send-recv.c:878
+#: ../calendar/gui/e-cal-model-tasks.c:317
+#: ../calendar/gui/e-cal-model-tasks.c:557 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3600 ../mail/mail-send-recv.c:878
 msgid "Canceled"
 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/dialogs/task-details-page.ui.h:17
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3520
-#: ../calendar/gui/e-meeting-list-view.c:692
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
-#: ../mail/message-list.etspec.h:1
-msgid "Status"
-msgstr "狀態"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:18
-msgid "Stat_us:"
-msgstr "狀態(_U):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:19
-msgid "P_ercent complete:"
-msgstr "完成百分比(_E):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "å„ªå…ˆé †åº(_P):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:21
-msgid "_Date completed:"
-msgstr "完成日期(_D):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:23
-msgid "_Web Page:"
-msgstr "ç¶²é (_W):"
-
-#: ../calendar/gui/dialogs/task-editor.c:113
-msgid "_Status Details"
-msgstr "狀態詳細資料(_S)"
-
-#: ../calendar/gui/dialogs/task-editor.c:115
-msgid "Click to change or view the status details of the task"
-msgstr "按這裏改變/檢視該工作的狀態詳細資料"
-
-#: ../calendar/gui/dialogs/task-editor.c:123
-msgid "_Send Options"
-msgstr "å‚³é€é¸é …(_S)"
-
-#: ../calendar/gui/dialogs/task-editor.c:183 ../calendar/gui/print.c:3470
-#: ../e-util/e-send-options.c:553
-msgid "Task"
-msgstr "工作"
-
-#: ../calendar/gui/dialogs/task-editor.c:304
-msgid "Task Details"
-msgstr "工作詳細資料"
-
-#: ../calendar/gui/dialogs/task-editor.c:348
-msgid "Print this task"
-msgstr "åˆ—å°é€™é …å·¥ä½œ"
+#: ../calendar/gui/dialogs/task-page.ui.h:25
+msgid "D_ue date:"
+msgstr "到期日(_U):"
 
-#: ../calendar/gui/dialogs/task-page.c:249
-msgid "Task's start date is in the past"
-msgstr "工作的開始時刻在過去"
+#: ../calendar/gui/dialogs/task-page.ui.h:28
+msgid "Time zone:"
+msgstr "時區："
 
-#: ../calendar/gui/dialogs/task-page.c:250
-msgid "Task's due date is in the past"
-msgstr "工作的結束時刻在過去"
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+msgid "_Status:"
+msgstr "狀態(_S):"
 
-#: ../calendar/gui/dialogs/task-page.c:283
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "ä¸èƒ½ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºé¸å–çš„å·¥ä½œæ¸…å–®æ˜¯å”¯è®€çš„"
+#: ../calendar/gui/dialogs/task-page.ui.h:33
+msgid "Date _completed:"
+msgstr "完成日期(_C):"
 
-#: ../calendar/gui/dialogs/task-page.c:287
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "ä¸èƒ½å®Œæ•´çš„ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºä½ ä¸æ˜¯å¬é›†äºº"
+#: ../calendar/gui/dialogs/task-page.ui.h:34
+msgid "_Percent complete:"
+msgstr "完成百分比(_P):"
 
-#: ../calendar/gui/dialogs/task-page.c:291
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr "ä¸èƒ½ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºé¸å–çš„å·¥ä½œæ¸…å–®ä¸æ”¯æ´æŒ‡æ´¾å·¥ä½œ"
+#: ../calendar/gui/dialogs/task-page.ui.h:35
+msgid "Priorit_y:"
+msgstr "優先等級(_Y):"
 
-#: ../calendar/gui/dialogs/task-page.c:834
-msgid "Due date is wrong"
-msgstr "到期日錯誤"
+#: ../calendar/gui/dialogs/task-page.ui.h:36
+msgid "C_lassification:"
+msgstr "歸類(_L):"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:3
-msgid "D_ue date:"
-msgstr "到期日(_U):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Time zone:"
-msgstr "時區："
+#: ../calendar/gui/dialogs/task-page.ui.h:37
+msgid "_Web Page:"
+msgstr "ç¶²é (_W):"
 
 #: ../calendar/gui/ea-cal-view.c:324
 msgid "New Appointment"
@@ -3488,7 +3441,7 @@ msgstr "行事曆事件：沒有摘要。"
 msgid "calendar view event"
 msgstr "行事曆檢視事件"
 
-#: ../calendar/gui/ea-cal-view-event.c:566
+#: ../calendar/gui/ea-cal-view-event.c:569
 msgid "Grab Focus"
 msgstr "得到焦點"
 
@@ -3534,7 +3487,7 @@ msgid "Gnome Calendar"
 msgstr "Gnome 行事曆"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1143
+#: ../modules/calendar/e-cal-shell-view-private.c:1222
 msgid "%A %d %b %Y"
 msgstr "%Y年%m月%d日 (%A)"
 
@@ -3544,19 +3497,19 @@ 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/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:1888
-#: ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1147
+#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2793
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:1226
 msgid "%a %d %b"
 msgstr "%m月%d日 (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:217
 #: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../modules/calendar/e-cal-shell-view-private.c:1150
-#: ../modules/calendar/e-cal-shell-view-private.c:1156
-#: ../modules/calendar/e-cal-shell-view-private.c:1159
+#: ../modules/calendar/e-cal-shell-view-private.c:1229
+#: ../modules/calendar/e-cal-shell-view-private.c:1235
+#: ../modules/calendar/e-cal-shell-view-private.c:1238
 msgid "%a %d %b %Y"
 msgstr "%Y年%m月%d日 (%a)"
 
@@ -3564,10 +3517,10 @@ msgstr "%Y年%m月%d日 (%a)"
 #: ../calendar/gui/ea-gnome-calendar.c:247
 #: ../calendar/gui/ea-gnome-calendar.c:254
 #: ../calendar/gui/ea-gnome-calendar.c:257
-#: ../modules/calendar/e-cal-shell-view-private.c:1176
-#: ../modules/calendar/e-cal-shell-view-private.c:1187
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
+#: ../modules/calendar/e-cal-shell-view-private.c:1255
+#: ../modules/calendar/e-cal-shell-view-private.c:1266
+#: ../modules/calendar/e-cal-shell-view-private.c:1273
+#: ../modules/calendar/e-cal-shell-view-private.c:1276
 msgid "%d %b %Y"
 msgstr "%Y年%m月%d日"
 
@@ -3576,10 +3529,10 @@ 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/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:1904
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:247
-#: ../modules/calendar/e-cal-shell-view-private.c:1183
+#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2809
+#: ../calendar/gui/e-day-view-top-item.c:863
+#: ../calendar/gui/e-week-view-main-item.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1262
 msgid "%d %b"
 msgstr "%m月%d日"
 
@@ -3701,8 +3654,8 @@ msgid "Due Date:"
 msgstr "截止日期："
 
 #: ../calendar/gui/e-cal-component-preview.c:319
-#: ../modules/itip-formatter/itip-view.c:1467
-#: ../modules/itip-formatter/itip-view.c:1584
+#: ../modules/itip-formatter/itip-view.c:1492
+#: ../modules/itip-formatter/itip-view.c:1609
 msgid "Status:"
 msgstr "狀態："
 
@@ -3728,7 +3681,7 @@ msgid "Start date"
 msgstr "開始日期"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:649
+#: ../calendar/gui/e-meeting-list-view.c:652
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:586
@@ -3759,6 +3712,17 @@ msgstr "% 完成"
 msgid "Priority"
 msgstr "優先等級"
 
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. * Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-cal-model.c:4017
+#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
+#: ../mail/message-list.etspec.h:1
+msgid "Status"
+msgstr "狀態"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
@@ -3772,37 +3736,37 @@ msgstr "已建立"
 msgid "Last modified"
 msgstr "修改日期"
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:445
 msgid "Cut selected events to the clipboard"
 msgstr "剪下選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:444
+#: ../calendar/gui/e-calendar-view.c:451
 msgid "Copy selected events to the clipboard"
 msgstr "複製選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:450
+#: ../calendar/gui/e-calendar-view.c:457
 msgid "Paste events from the clipboard"
 msgstr "從剪貼簿貼上事件"
 
-#: ../calendar/gui/e-calendar-view.c:456
+#: ../calendar/gui/e-calendar-view.c:463
 msgid "Delete selected events"
 msgstr "刪除選取的事件"
 
-#: ../calendar/gui/e-calendar-view.c:476 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-calendar-view.c:483 ../calendar/gui/e-memo-table.c:183
 #: ../calendar/gui/e-task-table.c:270
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: ../calendar/gui/e-calendar-view.c:635 ../calendar/gui/e-memo-table.c:863
-#: ../calendar/gui/e-task-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:642 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-task-table.c:1176
 msgid "Updating objects"
 msgstr "更新物件"
 
 #. 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:1999 ../calendar/gui/e-memo-table.c:540
-#: ../calendar/gui/e-task-table.c:827
+#: ../calendar/gui/e-calendar-view.c:2047 ../calendar/gui/e-memo-table.c:553
+#: ../calendar/gui/e-task-table.c:840
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "召集人: %s <%s>"
@@ -3810,21 +3774,21 @@ 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:2003 ../calendar/gui/e-memo-table.c:545
-#: ../calendar/gui/e-task-table.c:831
+#: ../calendar/gui/e-calendar-view.c:2051 ../calendar/gui/e-memo-table.c:558
+#: ../calendar/gui/e-task-table.c:844
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2019
-#: ../calendar/gui/e-meeting-time-sel.c:2790 ../calendar/gui/print.c:3508
+#: ../calendar/gui/e-calendar-view.c:2067
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3545
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2050
+#: ../calendar/gui/e-calendar-view.c:2098
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
@@ -3838,81 +3802,81 @@ msgstr "開始日期"
 msgid "End Date"
 msgstr "結束日期"
 
-#: ../calendar/gui/e-cal-model.c:854 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:236 ../calendar/gui/print.c:1235
-#: ../calendar/gui/print.c:1252 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3474
-#: ../modules/itip-formatter/itip-view.c:5969
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
+#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3496
+#: ../modules/itip-formatter/itip-view.c:6003
 #: ../modules/plugin-manager/evolution-plugin-manager.c:100
 msgid "Unknown"
 msgstr "不明"
 
-#: ../calendar/gui/e-cal-model.c:1683
+#: ../calendar/gui/e-cal-model.c:1668
 msgid "Recurring"
 msgstr "週期性模式"
 
-#: ../calendar/gui/e-cal-model.c:1685
+#: ../calendar/gui/e-cal-model.c:1670
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1161
 #: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:1074
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1024
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1161
 #: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "否"
 
-#: ../calendar/gui/e-cal-model.c:3461
+#: ../calendar/gui/e-cal-model.c:3958
 #: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../modules/itip-formatter/itip-view.c:5957
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../modules/itip-formatter/itip-view.c:5991
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-cal-model.c:3462
+#: ../calendar/gui/e-cal-model.c:3959
 #: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:5963
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../modules/itip-formatter/itip-view.c:5997
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-cal-model.c:3463
+#: ../calendar/gui/e-cal-model.c:3960
 #: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "Tentative"
 msgstr "暫訂"
 
-#: ../calendar/gui/e-cal-model.c:3464
+#: ../calendar/gui/e-cal-model.c:3961
 #: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../modules/itip-formatter/itip-view.c:5966
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:6000
 msgid "Delegated"
 msgstr "已委派"
 
-#: ../calendar/gui/e-cal-model.c:3465
+#: ../calendar/gui/e-cal-model.c:3962
 msgid "Needs action"
 msgstr "需要動作"
 
-#: ../calendar/gui/e-cal-model-calendar.c:158
-#: ../calendar/gui/e-task-table.c:629
+#: ../calendar/gui/e-cal-model-calendar.c:125
+#: ../calendar/gui/e-task-table.c:631
 msgid "Free"
 msgstr "空閒"
 
-#: ../calendar/gui/e-cal-model-calendar.c:161
-#: ../calendar/gui/e-meeting-time-sel.c:579 ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-cal-model-calendar.c:128
+#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../calendar/gui/e-cal-model-tasks.c:723
+#: ../calendar/gui/e-cal-model-tasks.c:497
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3923,7 +3887,7 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:775
+#: ../calendar/gui/e-cal-model-tasks.c:549
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "沒有"
@@ -3948,16 +3912,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:772
-#: ../calendar/gui/print.c:1058 ../calendar/gui/print.c:1077
-#: ../calendar/gui/print.c:2608 ../calendar/gui/print.c:2628
+#: ../calendar/gui/e-day-view.c:1983 ../calendar/gui/e-week-view.c:1554
+#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2637 ../calendar/gui/print.c:2657
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:775
-#: ../calendar/gui/print.c:1063 ../calendar/gui/print.c:1079
-#: ../calendar/gui/print.c:2613 ../calendar/gui/print.c:2630
+#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1557
+#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
+#: ../calendar/gui/print.c:2642 ../calendar/gui/print.c:2659
 msgid "pm"
 msgstr "下午"
 
@@ -3967,13 +3931,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:1871 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2071
+#: ../calendar/gui/e-day-view.c:2776 ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2093
 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:2709
+#: ../calendar/gui/e-day-view.c:3433
 #, c-format
 msgid "Week %d"
 msgstr "第 %d 週"
@@ -3984,27 +3948,27 @@ msgstr "第 %d 週"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:794
+#: ../calendar/gui/e-day-view-time-item.c:801
 #, c-format
 msgid "%02i minute divisions"
 msgstr "間隔 %02i 分鐘"
 
-#: ../calendar/gui/e-day-view-time-item.c:819
+#: ../calendar/gui/e-day-view-time-item.c:826
 msgid "Show the second time zone"
 msgstr "顯示第二時區"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:836
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/e-day-view-time-item.c:843
+#: ../modules/calendar/e-calendar-preferences.c:306
+#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "沒有"
 
-#: ../calendar/gui/e-day-view-time-item.c:870
+#: ../calendar/gui/e-day-view-time-item.c:877
 #: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:262
+#: ../modules/calendar/e-calendar-preferences.c:389
 msgid "Select..."
 msgstr "選擇…"
 
@@ -4025,149 +3989,149 @@ msgid "Resources"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/e-meeting-store.c:1068 ../calendar/gui/print.c:1231
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
 msgid "Individual"
 msgstr "個別"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1232 ../e-util/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
 msgid "Group"
 msgstr "羣組"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1233
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/print.c:1249
 msgid "Resource"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/print.c:1234
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1250
 msgid "Room"
 msgstr "會議室"
 
 #: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/print.c:1264
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/e-meeting-store.c:1071 ../calendar/gui/print.c:1249
+#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
 msgid "Required Participant"
 msgstr "出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1250
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1266
 msgid "Optional Participant"
 msgstr "列席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/print.c:1251
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/print.c:1267
 msgid "Non-Participant"
 msgstr "缺席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../calendar/gui/e-meeting-store.c:1081
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1031
 msgid "Needs Action"
 msgstr "需要動作"
 
-#: ../calendar/gui/e-meeting-list-view.c:623
+#: ../calendar/gui/e-meeting-list-view.c:626
 msgid "Attendee                          "
 msgstr "到會者"
 
-#: ../calendar/gui/e-meeting-list-view.c:678
+#: ../calendar/gui/e-meeting-list-view.c:681
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "進行中"
 
-#: ../calendar/gui/e-meeting-store.c:1955
+#: ../calendar/gui/e-meeting-store.c:1910
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "輸入使用者 %2$s 在伺服器 %1$s 上存取空閒/忙碌資訊的密碼 "
 
-#: ../calendar/gui/e-meeting-store.c:1965
+#: ../calendar/gui/e-meeting-store.c:1920
 #, c-format
 msgid "Failure reason: %s"
 msgstr "å¤±æ•—åŽŸå› ï¼š%s"
 
-#: ../calendar/gui/e-meeting-store.c:1970
-#: ../plugins/publish-calendar/publish-calendar.c:341
-#: ../smime/gui/component.c:55
+#: ../calendar/gui/e-meeting-store.c:1925
+#: ../plugins/publish-calendar/publish-calendar.c:340
+#: ../smime/gui/component.c:64
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: ../calendar/gui/e-meeting-time-sel.c:580
+#: ../calendar/gui/e-meeting-time-sel.c:528
 msgid "Out of Office"
 msgstr "不在辦公室"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:530
 msgid "No Information"
 msgstr "沒有資訊"
 
-#: ../calendar/gui/e-meeting-time-sel.c:622
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "O_ptions"
 msgstr "é¸é …(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:590
 msgid "Show _only working hours"
 msgstr "只顯示工作時間(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:655
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _zoomed out"
 msgstr "顯示縮小(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:673
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Update free/busy"
 msgstr "更新空閒/忙碌(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:690
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:658
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:727
+#: ../calendar/gui/e-meeting-time-sel.c:675
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:748
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:759
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:770
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:780
+#: ../calendar/gui/e-meeting-time-sel.c:728
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:834
+#: ../calendar/gui/e-meeting-time-sel.c:767
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:878
+#: ../calendar/gui/e-meeting-time-sel.c:796
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2786
+#: ../calendar/gui/e-meeting-time-sel.c:2660
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4176,7 +4140,7 @@ msgstr ""
 "摘要：%s\n"
 "位置：%s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2788 ../calendar/gui/print.c:3497
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3534
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要：%s"
@@ -4205,46 +4169,46 @@ msgstr "普通名稱"
 msgid "Language"
 msgstr "語言"
 
-#: ../calendar/gui/e-memo-table.c:421
-#: ../modules/calendar/e-cal-shell-content.c:472
-#: ../modules/calendar/e-memo-shell-view-actions.c:232
-#: ../modules/calendar/e-memo-shell-view-actions.c:247
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:434
+#: ../modules/calendar/e-cal-shell-content.c:482
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view.c:307
 msgid "Memos"
 msgstr "備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:502 ../calendar/gui/e-task-table.c:790
+#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
 msgid "* No Summary *"
 msgstr "* 沒有摘要 *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:589 ../calendar/gui/e-task-table.c:874
+#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
 msgid "Start: "
 msgstr "開始:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:608 ../calendar/gui/e-task-table.c:892
+#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
 msgid "Due: "
 msgstr "到期:"
 
-#: ../calendar/gui/e-memo-table.c:727
+#: ../calendar/gui/e-memo-table.c:742
 msgid "Cut selected memos to the clipboard"
 msgstr "剪下選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:733
+#: ../calendar/gui/e-memo-table.c:748
 msgid "Copy selected memos to the clipboard"
 msgstr "複製選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:739
+#: ../calendar/gui/e-memo-table.c:754
 msgid "Paste memos from the clipboard"
 msgstr "從剪貼簿貼上備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:745
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../calendar/gui/e-memo-table.c:760
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "Delete selected memos"
 msgstr "刪除選定的備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:751
+#: ../calendar/gui/e-memo-table.c:766
 msgid "Select all visible memos"
 msgstr "選擇全部可見的備忘錄"
 
@@ -4256,40 +4220,40 @@ msgstr "è«‹æŒ‰é€™è£å¢žåŠ æ–°çš„å‚™å¿˜éŒ„"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:602
+#: ../calendar/gui/e-task-table.c:604
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2389
+#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2418
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:1078
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:433
-#: ../modules/calendar/e-task-shell-view-actions.c:255
-#: ../modules/calendar/e-task-shell-view-actions.c:270
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../modules/calendar/e-cal-shell-content.c:439
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view.c:462
 msgid "Tasks"
 msgstr "工作"
 
-#: ../calendar/gui/e-task-table.c:1025
+#: ../calendar/gui/e-task-table.c:1040
 msgid "Cut selected tasks to the clipboard"
 msgstr "剪下選取的工作至剪貼簿"
 
-#: ../calendar/gui/e-task-table.c:1031
+#: ../calendar/gui/e-task-table.c:1046
 msgid "Copy selected tasks to the clipboard"
 msgstr "複製選取的工作至剪貼簿"
 
-#: ../calendar/gui/e-task-table.c:1037
+#: ../calendar/gui/e-task-table.c:1052
 msgid "Paste tasks from the clipboard"
 msgstr "從剪貼簿貼上工作"
 
-#: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../calendar/gui/e-task-table.c:1058
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
 
-#: ../calendar/gui/e-task-table.c:1049
+#: ../calendar/gui/e-task-table.c:1064
 msgid "Select all visible tasks"
 msgstr "選擇全部可見的工作"
 
@@ -4300,40 +4264,40 @@ 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:241 ../calendar/gui/print.c:2050
+#: ../calendar/gui/e-week-view-main-item.c:227 ../calendar/gui/print.c:2072
 msgid "%d %B"
 msgstr "%m月%d日"
 
-#: ../calendar/gui/gnome-cal.c:2319
+#: ../calendar/gui/gnome-cal.c:2369
 msgid "Purging"
 msgstr "清除"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:818
+#: ../calendar/gui/itip-utils.c:646 ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:838
 msgid "An organizer must be set."
 msgstr "å¿…é ˆæŒ‡å®šä¸€å€‹å¬é›†äººã€‚"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:695
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
-#: ../calendar/gui/itip-utils.c:905 ../calendar/gui/itip-utils.c:1066
+#: ../calendar/gui/itip-utils.c:926 ../calendar/gui/itip-utils.c:1087
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../calendar/gui/itip-utils.c:908 ../calendar/gui/itip-utils.c:1069
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/itip-utils.c:911 ../calendar/gui/itip-utils.c:1072
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Memo information"
 msgstr "備忘錄資訊"
 
-#: ../calendar/gui/itip-utils.c:914 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1111
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/itip-utils.c:917
+#: ../calendar/gui/itip-utils.c:938
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
@@ -4341,7 +4305,7 @@ msgstr "行事曆資訊"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:954
+#: ../calendar/gui/itip-utils.c:975
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "已接受"
@@ -4350,7 +4314,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:961
+#: ../calendar/gui/itip-utils.c:982
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
@@ -4362,7 +4326,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:968 ../calendar/gui/itip-utils.c:1016
+#: ../calendar/gui/itip-utils.c:989 ../calendar/gui/itip-utils.c:1037
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "已拒絕"
@@ -4371,7 +4335,7 @@ msgstr "已拒絕"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:975
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已委派"
@@ -4379,7 +4343,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:988
+#: ../calendar/gui/itip-utils.c:1009
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已更新"
@@ -4387,7 +4351,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:995
+#: ../calendar/gui/itip-utils.c:1016
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -4395,7 +4359,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:1002
+#: ../calendar/gui/itip-utils.c:1023
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "重新整理"
@@ -4403,248 +4367,257 @@ 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:1009
+#: ../calendar/gui/itip-utils.c:1030
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:1087
+#: ../calendar/gui/itip-utils.c:1108
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:1095
+#: ../calendar/gui/itip-utils.c:1116
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: ../calendar/gui/itip-utils.c:1122
+#: ../calendar/gui/itip-utils.c:1143
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "無法取得資源，新的事件與其他事件有所重疊。"
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../calendar/gui/itip-utils.c:1148
 #, c-format
 msgid "Unable to book a resource, error: %s"
 msgstr "無法取得資源，錯誤為：%s"
 
-#: ../calendar/gui/itip-utils.c:1304
+#: ../calendar/gui/itip-utils.c:1325
 msgid "You must be an attendee of the event."
 msgstr "ä½ å¿…é ˆæ˜¯æ­¤äº‹ä»¶çš„åˆ°æœƒè€…ã€‚"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "1st"
 msgstr "1æ—¥"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "2nd"
 msgstr "2æ—¥"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "3rd"
 msgstr "3æ—¥"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "4th"
 msgstr "4æ—¥"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "5th"
 msgstr "5æ—¥"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "6th"
 msgstr "6æ—¥"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "7th"
 msgstr "7æ—¥"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "8th"
 msgstr "8æ—¥"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "9th"
 msgstr "9æ—¥"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "10th"
 msgstr "10æ—¥"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "11th"
 msgstr "11æ—¥"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "12th"
 msgstr "12æ—¥"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "13th"
 msgstr "13æ—¥"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "14th"
 msgstr "14æ—¥"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "15th"
 msgstr "15æ—¥"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "16th"
 msgstr "16æ—¥"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "17th"
 msgstr "17æ—¥"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "18th"
 msgstr "18æ—¥"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "19th"
 msgstr "19æ—¥"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "20th"
 msgstr "20æ—¥"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "21st"
 msgstr "21æ—¥"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "22nd"
 msgstr "22æ—¥"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "23rd"
 msgstr "23æ—¥"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "24th"
 msgstr "24æ—¥"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "25th"
 msgstr "25æ—¥"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "26th"
 msgstr "26æ—¥"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "27th"
 msgstr "27æ—¥"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "28th"
 msgstr "28æ—¥"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "29th"
 msgstr "29æ—¥"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "30th"
 msgstr "30æ—¥"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "31st"
 msgstr "31æ—¥"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:721
-msgid "Su"
-msgstr "æ—¥"
-
-#: ../calendar/gui/print.c:721
+#. Translators: These are workday abbreviations,
+#. * e.g. Su=Sunday and Th=thursday
+#. G_DATE_BAD_WEEKDAY
+#. G_DATE_MONDAY
+#: ../calendar/gui/print.c:727
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:721
+#. G_DATE_TUESDAY
+#: ../calendar/gui/print.c:728
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:721
+#. G_DATE_WEDNESDAY
+#: ../calendar/gui/print.c:729
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_THURSDAY
+#: ../calendar/gui/print.c:730
 msgid "Th"
 msgstr "å››"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_FRIDAY
+#: ../calendar/gui/print.c:731
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_SATURDAY
+#: ../calendar/gui/print.c:732
 msgid "Sa"
 msgstr "å…­"
 
+#. G_DATE_SUNDAY
+#: ../calendar/gui/print.c:733
+msgid "Su"
+msgstr "æ—¥"
+
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3296
+#: ../calendar/gui/print.c:3328
 msgid " to "
 msgstr " 到 "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3306
+#: ../calendar/gui/print.c:3338
 msgid " (Completed "
 msgstr " (已完成 "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3312
+#: ../calendar/gui/print.c:3344
 msgid "Completed "
 msgstr "已完成 "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3322
+#: ../calendar/gui/print.c:3354
 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:3329
+#: ../calendar/gui/print.c:3361
 msgid "Due "
 msgstr "期限 "
 
-#: ../calendar/gui/print.c:3527
+#: ../calendar/gui/print.c:3564
 msgid "Attendees: "
 msgstr "到會者:"
 
-#: ../calendar/gui/print.c:3571
+#: ../calendar/gui/print.c:3608
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
-#: ../calendar/gui/print.c:3587
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Priority: %s"
 msgstr "å„ªå…ˆé †åº(_P): %s"
 
-#: ../calendar/gui/print.c:3605
+#: ../calendar/gui/print.c:3642
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
-#: ../calendar/gui/print.c:3619
+#: ../calendar/gui/print.c:3656
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3670
 #, c-format
 msgid "Categories: %s"
 msgstr "分類: %s"
 
-#: ../calendar/gui/print.c:3644
+#: ../calendar/gui/print.c:3681
 msgid "Contacts: "
 msgstr "聯絡人: "
 
@@ -4707,25 +4680,25 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
 
 #: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "會議"
 
 #: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
 #: ../calendar/importers/icalendar-importer.c:1189
-#: ../calendar/importers/icalendar-importer.c:1506
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "工作"
 
 #: ../calendar/importers/icalendar-importer.c:1192
-#: ../calendar/importers/icalendar-importer.c:1507
+#: ../calendar/importers/icalendar-importer.c:1502
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "備忘錄"
@@ -4776,7 +4749,7 @@ msgstr "歸類"
 
 #. Translators: Appointment's summary
 #: ../calendar/importers/icalendar-importer.c:1244
-#: ../calendar/importers/icalendar-importer.c:1549
+#: ../calendar/importers/icalendar-importer.c:1544
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "摘要"
@@ -4789,7 +4762,7 @@ msgstr "位置"
 
 #. Translators: Appointment's start time
 #: ../calendar/importers/icalendar-importer.c:1258
-#: ../calendar/importers/icalendar-importer.c:1544
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "開始"
@@ -4843,7 +4816,7 @@ msgctxt "iCalImp"
 msgid "Description"
 msgstr "描述"
 
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1534
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "é¡žåž‹"
@@ -6396,198 +6369,198 @@ msgstr "太平洋/瓦利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦島"
 
-#: ../composer/e-composer-actions.c:207
+#: ../composer/e-composer-actions.c:203
 msgid "Save as..."
 msgstr "另存新檔…"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:276
 #: ../e-util/e-mail-signature-editor.c:303
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:278
 msgid "Close the current file"
 msgstr "關閉目前的檔案"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:283
 msgid "New _Message"
 msgstr "撰寫新郵件(_M)"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:285
 msgid "Open New Message window"
 msgstr "開啟新的郵件視窗"
 
-#: ../composer/e-composer-actions.c:310 ../shell/e-shell-window-actions.c:925
+#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
 msgid "Configure Evolution"
 msgstr "設定 Evolution"
 
-#: ../composer/e-composer-actions.c:317
+#: ../composer/e-composer-actions.c:299
 msgid "Save the current file"
 msgstr "儲存目前的檔案"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:304
 msgid "Save _As..."
 msgstr "另存新檔(_A)…"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:306
 msgid "Save the current file with a different name"
 msgstr "以另一個名稱儲存目前的檔案"
 
-#: ../composer/e-composer-actions.c:331
+#: ../composer/e-composer-actions.c:313
 msgid "Character _Encoding"
 msgstr "字符編碼(_E)"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:330
 msgid "_Print..."
 msgstr "打印(_P)…"
 
-#: ../composer/e-composer-actions.c:355
+#: ../composer/e-composer-actions.c:337
 msgid "Print Pre_view"
 msgstr "é è¦½æ‰“å°(_V)"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:344
 msgid "Save as _Draft"
 msgstr "儲存為草稿(_D)"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:346
 msgid "Save as draft"
 msgstr "儲存為草稿"
 
-#: ../composer/e-composer-actions.c:369 ../composer/e-composer-private.c:327
+#: ../composer/e-composer-actions.c:351
 msgid "S_end"
 msgstr "傳送(_E)"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:353
 msgid "Send this message"
 msgstr "傳送這個郵件"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PG_P åŠ å¯†"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "使用 PGP å°‡é€™å°éƒµä»¶åŠ å¯†"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "P_GP åŠ ç°½"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "ç”¨ä½ çš„ PGP å¯†ç¢¼åŒ™ç‚ºéƒµä»¶åŠ ä¸Šæ•¸ç¢¼ç°½ç½²"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:377
 msgid "_Picture Gallery"
 msgstr "圖片集(_P)"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:379
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "ç¤ºä½ å¯ä»¥æ‹–æ›³åˆ°éƒµä»¶ä¸­çš„åœ–ç‰‡é›†"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:385
 msgid "_Prioritize Message"
 msgstr "郵件優先權(_P)"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:387
 msgid "Set the message priority to high"
 msgstr "將郵件優先權設為「高」"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:393
 msgid "Re_quest Read Receipt"
 msgstr "要求讀信回條(_Q)"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:395
 msgid "Get delivery notification when your message is read"
 msgstr "åœ¨ä½ çš„éƒµä»¶è¢«é–±è®€æ™‚å–å¾—é€ä¿¡é€šçŸ¥"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME åŠ å¯†"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:403
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ä½¿ç”¨ä½ çš„ S/MIME åŠ å¯†è­‰æ›¸å°‡é€™å°éƒµä»¶åŠ å¯†"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:409
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME åŠ ç°½"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:411
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç”¨ä½ çš„ S/MIME ç°½ç½²è­‰æ›¸ç‚ºéƒµä»¶åŠ ä¸Šæ•¸ç¢¼ç°½ç½²"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:417
 msgid "_Bcc Field"
 msgstr "密件副本欄位(_B)"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the BCC field is displayed"
 msgstr "切換密件副本欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:425
 msgid "_Cc Field"
 msgstr "副本欄位(_C)"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the CC field is displayed"
 msgstr "切換副本欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "回覆欄位(_R)"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:512
+#: ../composer/e-composer-actions.c:494
 msgid "Save Draft"
 msgstr "儲存草稿"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "輸入郵件的收件者"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:44
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr "輸入郵件密件副本的收件者，他們會收到這封郵件但不會出現在郵件的收件者清單"
 
-#: ../composer/e-composer-header-table.c:835
+#: ../composer/e-composer-header-table.c:772
 msgid "Fr_om:"
 msgstr "寄件者(_O):"
 
-#: ../composer/e-composer-header-table.c:842
+#: ../composer/e-composer-header-table.c:779
 msgid "_Reply-To:"
 msgstr "回覆(_R):"
 
-#: ../composer/e-composer-header-table.c:847
+#: ../composer/e-composer-header-table.c:784
 msgid "_To:"
 msgstr "收件者(_T):"
 
-#: ../composer/e-composer-header-table.c:853
+#: ../composer/e-composer-header-table.c:790
 msgid "_Cc:"
 msgstr "副本(_C):"
 
-#: ../composer/e-composer-header-table.c:859
+#: ../composer/e-composer-header-table.c:796
 msgid "_Bcc:"
 msgstr "密件副本(_B):"
 
-#: ../composer/e-composer-header-table.c:864
+#: ../composer/e-composer-header-table.c:801
 msgid "_Post To:"
 msgstr "張貼到(_P):"
 
-#: ../composer/e-composer-header-table.c:868
+#: ../composer/e-composer-header-table.c:805
 msgid "S_ubject:"
 msgstr "主旨(_U):"
 
-#: ../composer/e-composer-header-table.c:876
+#: ../composer/e-composer-header-table.c:813
 #: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
@@ -6600,32 +6573,28 @@ msgstr "按這裏新增目錄服務"
 msgid "Click here to select folders to post to"
 msgstr "按一下這裏，選取要張貼的資料夾"
 
-#: ../composer/e-composer-private.c:347
-msgid "Save draft"
-msgstr "儲存草稿"
-
-#: ../composer/e-msg-composer.c:862
+#: ../composer/e-msg-composer.c:869
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署送出的郵件：此帳號沒有設定簽署證書"
 
-#: ../composer/e-msg-composer.c:871
+#: ../composer/e-msg-composer.c:878
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ç„¡æ³•åŠ å¯†é€å‡ºçš„éƒµä»¶ï¼šæ²’æœ‰è¨­å®šåŠ å¯†è­‰æ›¸(此帳號)"
 
-#: ../composer/e-msg-composer.c:1552 ../composer/e-msg-composer.c:1961
+#: ../composer/e-msg-composer.c:1557 ../composer/e-msg-composer.c:1958
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4215
+#: ../composer/e-msg-composer.c:4213
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "郵件編輯器包含不能編輯的非文字的郵件內文。"
 
-#: ../composer/e-msg-composer.c:4890
+#: ../composer/e-msg-composer.c:4886
 msgid "Untitled Message"
 msgstr "未命名的郵件"
 
@@ -6745,7 +6714,7 @@ msgstr "å›žå ±çš„éŒ¯èª¤ç‚º &quot;{0}&quot;。郵件很可能沒有儲存。"
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "åœ¨å¯„ä¿¡æ™‚ç™¼ç”ŸéŒ¯èª¤ã€‚ä½ è¦å¦‚ä½•ç¹¼çºŒï¼Ÿ"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:152
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "å›žå ±çš„éŒ¯èª¤ç‚º &quot;{0}&quot;。"
 
@@ -6767,10 +6736,10 @@ msgstr "儲存郵件到寄件匣。"
 
 #: ../composer/mail-composer.error.xml.h:35
 msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
-msgstr "å› ç‚ºä½ åœ¨é›¢ç·šå·¥ä½œï¼Œé€™å€‹éƒµä»¶æœƒå„²å­˜åœ¨ä½ æœ¬åœ°ç«¯çš„å¯„ä»¶è³‡æ–™å¤¾è£ã€‚ç•¶ä½ å›žåˆ°ç¶²ä¸Šå·¥ä½œï¼Œä½ å¯ä»¥é»žé¸ Evolution 工具列的傳送/接收按鈕來寄出郵件。"
+"The message will be saved to your local Outbox folder, because the "
+"destination service is currently unavailable. You can send the message by "
+"clicking the Send/Receive button in Evolution's toolbar."
+msgstr "å› ç‚ºç›®çš„ç«¯æœå‹™ç›®å‰ç„¡æ³•ä½¿ç”¨ï¼Œé€™å€‹éƒµä»¶æœƒå„²å­˜åœ¨ä½ æœ¬åœ°ç«¯çš„å¯„ä»¶è³‡æ–™å¤¾è£ã€‚ç•¶ä½ å›žåˆ°ç¶²ä¸Šå·¥ä½œï¼Œä½ å¯ä»¥é»žé¸ Evolution 工具列的傳送/接收按鈕來寄出郵件。"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
@@ -6780,8 +6749,8 @@ msgstr "Evolution 鬧鈴通知"
 msgid "Calendar event notifications"
 msgstr "行事曆事件通知"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:932
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
+#: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "Evolution"
@@ -6802,14 +6771,6 @@ msgstr "ç®¡ç†ä½ çš„éƒµä»¶ã€è¯çµ¡äººå’Œè¡Œç¨‹"
 msgid "mail;calendar;contact;addressbook;task;"
 msgstr "mail;calendar;contact;addressbook;task;郵件;行事曆;聯絡人;通訊錄;工作;"
 
-#: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Email Settings"
-msgstr "電子郵件設定值"
-
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Configure email accounts"
-msgstr "設定郵件帳號"
-
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "å•Ÿç”¨åœ°å€æ ¼å¼åŒ–"
@@ -7443,20 +7404,57 @@ msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "使用系統時區取代在 Evolution 中選取的時區"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "Week start"
-msgstr "一週開始於"
+msgid "First day of the week"
+msgstr "一週的第一天"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
-msgstr "每週的開始，從星期日 (0) 到星期六 (6)"
+msgid "Monday is a work day"
+msgstr "星期一是工作日"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-msgid "Work days"
-msgstr "工作日"
+msgid "Tuesday is a work day"
+msgstr "星期二是工作日"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-msgid "Days on which the start and end of work hours should be indicated"
-msgstr "å¿…é ˆæŒ‡æ˜Žå·¥ä½œæ—¥é–‹å§‹èˆ‡çµæŸæ–¼å¹¾æ™‚"
+msgid "Wednesday is a work day"
+msgstr "星期三是工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid "Thursday is a work day"
+msgstr "星期四是工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Friday is a work day"
+msgstr "星期五是工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+msgid "Saturday is a work day"
+msgstr "星期六是工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Sunday is a work day"
+msgstr "星期日是工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
+msgstr "(已廢棄) 每週的開始，從星期日 (0) 到星期六 (6)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"week-start-day-name\" instead."
+msgstr "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「week-start-day-name」代替。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid "(Deprecated) Work days"
+msgstr "(已廢棄) 工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+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-"
+"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
+msgstr "å·¥ä½œæ—¥é–‹å§‹èˆ‡çµæŸçš„æ—¥å­å¿…é ˆæŒ‡å‡ºä¾†ã€‚(這個設定鍵在 3.10 版中已廢棄不再使用。請使用「work-day-monday」、「work-day-tuesday」等等設定鍵代替。)"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
 msgid "Previous Evolution version"
@@ -7778,245 +7776,209 @@ msgid "Can be either 'mbox' or 'pdf'."
 msgstr "可以是「mbox」或「pdf」。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-msgid "Save name format for drag-and-drop operation"
-msgstr "æ‹–æ”¾æ“ä½œæ™‚å„²å­˜çš„åç¨±æ ¼å¼"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-msgid ""
-"Can be either 2 to use current date and time or any other value for sent "
-"date of the message. This has a meaning only when dropping just one message."
-msgstr "可以是 2 以使用目前的日期和時刻或任何數值代表郵件的傳送日期。這只有在拖放單一郵件時才有意義。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Show image animations"
 msgstr "顯示動畫圖片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr "啟用 HTML éƒµä»¶ä¸­çš„å‹•ç•«åœ–ç‰‡ã€‚è¨±å¤šä½¿ç”¨è€…èªç‚ºå‹•ç•«åœ–ç‰‡å¾ˆç…©äººï¼Œå› è€Œåå¥½ä»¥éœæ…‹åœ–ç‰‡ä»£æ›¿ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+msgid "Ellipsize mode for folder names in side bar"
+msgstr "側邊列的資料夾名稱省略模式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Enable or disable type ahead search feature"
 msgstr "啟用或停用隨打即查功能"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "啟用側邊列搜尋功能允許互動式搜尋資料夾名稱。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "停用或啟用側邊列的資料夾名稱省略功能"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr "是否停用側邊列的資料夾名稱省略。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Enable or disable magic space bar"
 msgstr "啟用或停用魔術空白鍵"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "å•Ÿç”¨æ­¤é¸é …å¯åœ¨éƒµä»¶é è¦½ã€éƒµä»¶æ¸…å–®å’Œè³‡æ–™å¤¾ä¸­ä½¿ç”¨ç©ºç™½éµæ²å‹•ç•«é¢ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "啟用以在所有資料夾使用類似的郵件清單檢視設定值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "å•Ÿç”¨æ­¤é¸é …æœƒè®“æ‰€æœ‰çš„è³‡æ–™å¤¾ä½¿ç”¨é¡žä¼¼çš„éƒµä»¶æ¸…å–®æª¢è¦–è¨­å®šå€¼ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Mark citations in the message \"Preview\""
 msgstr "åœ¨éƒµä»¶ã€Œé è¦½ã€ä¸­æ¨™ç¤ºå¼•ç”¨"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Mark citations in the message \"Preview\"."
 msgstr "åœ¨éƒµä»¶ã€Œé è¦½ã€ä¸­æ¨™ç¤ºå¼•ç”¨ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Citation highlight color"
 msgstr "引用反白色彩"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Citation highlight color."
 msgstr "引用反白色彩。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Enable/disable caret mode"
 msgstr "啟用/停用插入號模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "å•Ÿç”¨æ’å…¥è™Ÿæ¨¡å¼ï¼Œå¦‚æ­¤ä½ å¯ä»¥åœ¨é–±è®€éƒµä»¶æ™‚çœ‹åˆ°æ¸¸æ¨™ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Default charset in which to display messages"
 msgstr "ç”¨æ–¼é¡¯ç¤ºéƒµä»¶çš„é è¨­å­—ç¬¦é›†"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Default charset in which to display messages."
 msgstr "ç”¨æ–¼é¡¯ç¤ºéƒµä»¶çš„é è¨­å­—ç¬¦é›†ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-msgid "Load images for HTML messages over HTTP"
-msgstr "透過 HTTP 載入 HTML 郵件的圖片"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-msgid ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
-msgstr "透過 HTTP(S) 載入 HTML 郵件的圖片。可能的值為：「0」– 不從網絡載入圖片。「1」– 如果是在聯絡人裏的寄件者時，載入圖片。「2」- 一定從網絡載入圖片。"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+msgid "Automatically load images for HTML messages over HTTP"
+msgstr "自動透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Show animated images as animations."
 msgstr "播放動畫圖片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show all message headers"
 msgstr "é¡¯ç¤ºæ‰€æœ‰éƒµä»¶æª”é ­"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Show all the headers when viewing a messages."
 msgstr "æª¢è¦–éƒµä»¶æ™‚é¡¯ç¤ºæª”é ­ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-msgid "List of custom headers and whether they are enabled."
-msgstr "è‡ªé¸æª”é ­ä»¥åŠå®ƒå€‘æ˜¯å¦å•Ÿç”¨çš„æ¸…å–®"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+msgid "List of headers to show when viewing a message."
+msgstr "æª¢è¦–éƒµä»¶æ™‚é¡¯ç¤ºçš„æª”é ­æ¸…å–®ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr "此密碼匙應該包含 XML æ¸…å–®ï¼Œå®ƒæœƒæŒ‡å®šè‡ªé¸æª”é ­ï¼Œä»¥åŠæ˜¯å¦é¡¯ç¤ºå®ƒå€‘ã€‚XML çµæ§‹çš„æ ¼å¼æ˜¯ &lt;header enabled&gt; - å¦‚æžœæª”é ­æœƒé¡¯ç¤ºåœ¨éƒµä»¶æª¢è¦–ï¼Œå‰‡è¨­å®šæˆ enabled。"
+"Each header is represented as a pair: the header name, and a boolean "
+"indicating whether the header is enabled. Disabled headers are not shown "
+"when viewing a message, but are still listed in Preferences."
+msgstr "æ¯å€‹æª”é ­éƒ½ä»¥é…å°æ–¹å¼å‘ˆç¾ï¼šæª”é ­çš„åç¨±ï¼ŒåŠä¸€å€‹é‚è¼¯å€¼è¡¨ç¤ºæ­¤æª”é ­æ˜¯å¦å•Ÿç”¨ã€‚åœç”¨çš„æª”é ­åœ¨æª¢è¦–éƒµä»¶æ™‚ä¸æœƒé¡¯ç¤ºï¼Œä½†ä»æœƒåˆ—åœ¨åå¥½è¨­å®šä¸­ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show photo of the sender"
 msgstr "顯示寄件者的相片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "åœ¨éƒµä»¶é–±è®€çª—æ ¼ä¸­é¡¯ç¤ºå¯„ä»¶è€…çš„ç›¸ç‰‡ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-msgid "Search for the sender photo in local address books"
-msgstr "在本地端通訊錄搜尋寄件者相片"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-msgid "This option would help in improving the speed of fetching."
-msgstr "é€™å€‹é¸é …èƒ½å”åŠ©å¢žé€²æŽ¥æ”¶çš„é€Ÿåº¦ã€‚"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定的時限過後，標示成已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定的時限過後，標示成已閱讀。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Timeout for marking messages as seen"
 msgstr "將郵件標示成已閱讀的時限"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "將郵件標示成已閱讀的時限，以毫秒計。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Sender email-address column in the message list"
 msgstr "在郵件清單的寄件者電子郵件欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "在郵件清單的中以分離的欄位顯示寄件者的電子郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
 msgstr "決定是否在垂直檢視的「郵件」裏的「寄件人」及「主旨」中使用同樣的字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr "決定是否在垂直檢視的「郵件」裏的「寄件人」及「主旨」中使用同樣的字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show deleted messages in the message-list"
 msgstr "在郵件清單中顯示刪除的郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在郵件清單中顯示刪除的郵件 (åŠ ä¸Šåˆªé™¤è™Ÿ)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Enable Unmatched search folder"
 msgstr "啟用未符合搜尋資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 msgstr "啟用搜尋資料夾中的未符合搜尋資料夾。如果搜尋資料夾停用則不會有任何動作。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "éš±è—å„è³‡æ–™å¤¾é è¦½ä¸¦ç§»é™¤é¸å–å€"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr "這個鍵值只能讀取一次，並會在讀取後設為「falseã€ã€‚é€™æ¨£æœƒå–æ¶ˆåœ¨æ¸…å–®ä¸­å°è©²éƒµä»¶çš„é¸å–ä¸¦ç§»é™¤å°è©²è³‡æ–™å¤¾çš„é è¦½ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Height of the message-list pane"
 msgstr "éƒµä»¶æ¸…å–®çª—æ ¼é«˜åº¦"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Height of the message-list pane."
 msgstr "éƒµä»¶æ¸…å–®çª—æ ¼çš„é«˜åº¦ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-msgid "State of message headers in paned view"
-msgstr "çª—æ ¼æª¢è¦–ä¸­éƒµä»¶æª”é ­çš„ç‹€æ…‹"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded and \"1\" = collapsed"
-msgstr "æè¿°åœ¨çª—æ ¼æª¢è¦–ä¸­çš„éƒµä»¶æª”é ­é è¨­æ‡‰è©²æ”¶æ‘ºæˆ–å±•é–‹ã€‚ã€Œ0」= 展開 「1」 = 收摺"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid "Whether message headers are collapsed in the user interface"
+msgstr "郵件標題在使用者介面中是否摺疊"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Width of the message-list pane"
 msgstr "éƒµä»¶æ¸…å–®çª—æ ¼é—Šåº¦"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Width of the message-list pane."
 msgstr "éƒµä»¶æ¸…å–®çª—æ ¼çš„é—Šåº¦ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Layout style"
 msgstr "配置樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -8024,86 +7986,86 @@ msgid ""
 "message list."
 msgstr "é…ç½®æ–¹å¼æ±ºå®šäº†åœ¨éƒµä»¶æ¸…å–®ä¸­é è¦½çª—æ ¼çš„ä½ç½®ã€‚ã€Œ0ã€ï¼ˆæ¨™æº–æª¢è¦–ï¼‰å°‡é è¦½çª—æ ¼æ”¾åœ¨éƒµä»¶æ¸…å–®ä¸‹æ–¹ã€‚ã€Œ1ã€ï¼ˆåž‚ç›´æª¢è¦–ï¼‰å°‡é è¦½çª—æ ¼æ”¾åœ¨éƒµä»¶æ¸…å–®æ—é‚Šã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Variable width font"
 msgstr "變動闊度字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "The variable width font for mail display."
 msgstr "用於顯示郵件的變動闊度字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Terminal font"
 msgstr "終端機字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "The terminal font for mail display."
 msgstr "用於顯示郵件的終端機字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Use custom fonts"
 msgstr "使用自選字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自選字型來顯示郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "壓縮在 TO/CC/BCC 中位址的顯示方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "將 TO/CC/BCC 中位址的顯示方式壓縮為 address_count 中指定的長度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示於 TO/CC/BCC 中位址的長度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "é€™æœƒè¨­å®šåœ¨é è¨­éƒµä»¶æ¸…å–®æª¢è¦–ä¸­é¡¯ç¤ºä½å€çš„é•·åº¦ï¼Œè¶…éŽçš„éƒ¨åˆ†æœƒé¡¯ç¤ºã€Œâ€¦ã€ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Thread the message-list based on Subject"
 msgstr "以主旨為基礎串接郵件清單"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr "當郵件不包含 In-Reply-To 或 References æª”é ­æ™‚ï¼Œæ˜¯å¦æŒ‰ç…§ä¸»æ—¨æ”¾å›žéƒµä»¶ç¾£çµ„ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Default value for thread expand state"
 msgstr "ç›¸é—œéƒµä»¶å±•é–‹ç‹€æ…‹çš„é è¨­æ•¸å€¼"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr "é€™å€‹è¨­å®šå€¼æŒ‡å®šç›¸é—œéƒµä»¶é è¨­ç‚ºå±•é–‹æˆ–æ”¶æ‘ºçš„ç‹€æ…‹ã€‚éœ€è¦é‡æ–°å•Ÿå‹• Evolution。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ˜¯å¦æ ¹æ“šéƒµä»¶ç¾£çµ„ä¸­æœ€æ–°çš„éƒµä»¶ä¾†æŽ’åºç›¸é—œéƒµä»¶"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr "é€™å€‹è¨­å®šå€¼æŒ‡å®šç›¸é—œéƒµä»¶è¦æ ¹æ“šæ¯å€‹éƒµä»¶ç¾£çµ„æœ€æ–°çš„éƒµä»¶æŽ’åºï¼Œè€Œéžæ ¹æ“šéƒµä»¶çš„æ—¥æœŸã€‚Evolution 將需要重新啟動。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "在資料夾樹狀圖中以字母排序帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -8111,124 +8073,128 @@ msgid ""
 "given by a user"
 msgstr "告知在郵件檢視中如何排序資料夾樹狀圖中的帳號。當設定為 true æ™‚å¸³è™Ÿæœƒä»¥å­—æ¯æŽ’åºï¼Œä½†é€™è‡ºé›»è…¦èˆ‡æœå°‹è³‡æ–™å¤¾ä¾‹å¤–ï¼Œå¦å‰‡å¸³è™Ÿæœƒä»¥ä½¿ç”¨è€…çµ¦äºˆçš„é †åºæŽ’åˆ—"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Log filter actions"
 msgstr "記錄過濾器動作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Log filter actions to the specified log file."
 msgstr "將過濾器動作記錄到指定的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Logfile to log filter actions"
 msgstr "用於記錄過濾器動作的記錄檔案"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Logfile to log filter actions."
 msgstr "用於記錄過濾器動作的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Flush Outbox after filtering"
 msgstr "過濾後清空寄件匣"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
 "one minute after the last action invocation."
 msgstr "是否在過濾完後清空寄件匣。寄件匣的清空只用在當使用了任何「轉寄至」過濾器動作，並且在這個動作後大約一分鐘開始進行。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Default forward style"
 msgstr "é è¨­è½‰éžæ¨£å¼"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+msgid "Default reply style"
+msgstr "é è¨­å›žè¦†æ¨£å¼"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Prompt on empty subject"
 msgstr "沒有主旨時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "當使用者傳送沒有主旨的郵件時，提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Prompt when emptying the trash"
 msgstr "使用者清空回收筒時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "當使用者嘗試清空回收筒時，提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Prompt when user expunges"
 msgstr "使用者清空時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時，提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "寄信給沒有輸入有效電子郵件地址的收件者前先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
 msgstr "它會停用/å•Ÿç”¨é‡è¦†æç¤ºè­¦å‘Šä½ æ­£å˜—è©¦å‚³é€éƒµä»¶çµ¦æ²’æœ‰è¼¸å…¥é›»å­éƒµä»¶åœ°å€çš„æ”¶ä»¶è€…"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "當使用者傳送不含收件者或副本收件者的郵件時，提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "當使用者嘗試傳送不想要的 HTML 時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "當使用者嘗試傳送 HTML 郵件到不想接受 HTML 郵件的收件者時，顯示提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "如果使用者嘗試一次開啟 10 或更多的郵件，詢問使用者是否確定要這麼做。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt while marking multiple messages"
 msgstr "當標記多個郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "啟用或停用標記多個郵件時的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when deleting messages in search folder"
 msgstr "當刪除搜尋資料夾中的郵件時顯示提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr "它啟用/停用在從搜尋資料夾中刪除郵件時是否重複提示以警告那將會永久刪除郵件，而非僅是將郵件自搜尋結果中移除。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "詢問是否在資料夾樹狀圖中以拖放複製資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -8236,11 +8202,11 @@ msgid ""
 "ask user."
 msgstr "可能的數值有：「never」- 不允許在資料夾樹狀圖中拖放複製、「 always」- 不詢問就允許在資料夾樹狀圖中拖放複製或「ask」- (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "詢問是否在資料夾樹狀圖中拖放以移動資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -8248,158 +8214,152 @@ msgid ""
 "ask user."
 msgstr "可能的數值有：「never」- 不允許在資料夾樹狀圖中拖放移動、「 always」- 不詢問就允許在資料夾樹狀圖中拖放移動或「ask」- (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt when replying privately to list messages"
 msgstr "當私人回覆通信論壇郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 msgstr "它會停用/å•Ÿç”¨é‡è¦†æç¤ºè­¦å‘Šä½ æ­£å˜—è©¦å›žè¦†ç§äººä¿¡ä»¶çµ¦é€éŽé€šä¿¡è«–å£‡å¯„å‡ºçš„ä¿¡ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "當通信論壇劫持私人回覆時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr "它會停用/å•Ÿç”¨é‡è¦†æç¤ºè­¦å‘Šä½ æ­£å˜—è©¦å›žè¦†ç§äººä¿¡ä»¶çµ¦é€éŽé€šä¿¡è«–å£‡å¯„å‡ºçš„ä¿¡ã€‚è€Œé€šä¿¡è«–å£‡è¨­å®šçš„ Reply-To: æ¨™é ­æœƒå°‡ä½ çš„å›žä¿¡é‡æ–°å°Žå‘è‡³é€šä¿¡è«–å£‡ä¸Šçš„æ‰€æœ‰æˆå“¡"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Prompt when replying to many recipients"
 msgstr "當回覆給許多收件者時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "它會停用/å•Ÿç”¨è­¦å‘Šä½ ã€Œä½ æ­£å›žè¦†çµ¦å¾ˆå¤šäººã€çš„é‡è¦†æç¤ºã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
-msgstr "當使用者轉寄或回覆視窗中顯示的郵件時詢問是否要關閉郵件視窗"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
-"Possible values are: 'never' - to never close browser window, 'always' - to "
-"always close browser window or 'ask' - (or any other value) will ask user."
-msgstr "可能的數值有：「never」- 永不關閉瀏覽器視窗、「 always」- 總是關閉瀏覽器視窗或「ask」- (或任何其他數值) 會詢問使用者。"
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
+msgstr "當轉寄或回覆顯示的郵件後自動關閉郵件瀏覽器視窗的原則。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Empty Trash folders on exit"
 msgstr "結束時清空垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "結束 Evolution 時清空所有垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Minimum days between emptying the trash on exit"
 msgstr "結束時清空回收筒最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "結束時清空回收筒最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Last time Empty Trash was run"
 msgstr "上次清空回收筒的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "上次執行清單回收筒的時間，從 1970 年一月一日(電腦紀元)後算起的日數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "錯誤訊息在狀態列中顯示的時間(秒)。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Level beyond which the message should be logged."
 msgstr "應記錄的郵件等級。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "這裏可使用三種數值。「0」為錯誤，「1」為警告，「2」為除錯訊息。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Show original \"Date\" header value."
 msgstr "é¡¯ç¤ºåŽŸå§‹çš„ã€Œæ—¥æœŸã€æ¨™é ­æ•¸å€¼ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr "é¡¯ç¤ºåŽŸå§‹çš„ã€Œæ—¥æœŸã€æª”é ­ï¼ˆè‹¥æ™‚å€ä¸åŒæ™‚æœƒä½¿ç”¨ç•¶åœ°æ™‚é–“ï¼‰ã€‚å¦å‰‡æ°¸é ä»¥ä½¿ç”¨è€…åå¥½çš„æ ¼å¼å’Œæœ¬åœ°æ™‚å€é¡¯ç¤ºã€Œæ—¥æœŸã€æª”é ­ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "List of Labels and their associated colors"
 msgstr "標籤和相關色彩的清單"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr "Evolution 的郵件元件已知的標籤清單。清單包含字串，其中包含 name:color，color 使用 HTML 十六進位編碼。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Check incoming mail being junk"
 msgstr "檢查內送的垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Run junk test on incoming mail."
 msgstr "在內送的郵件執行垃圾郵件檢查。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty Junk folders on exit"
 msgstr "離開時清空垃圾郵件資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "離開 Evolution 時清空所有垃圾郵件資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Minimum days between emptying the junk on exit"
 msgstr "結束時清空垃圾郵件最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "結束時清空垃圾郵件最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Last time Empty Junk was run"
 msgstr "上次清空垃圾郵件的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "上次執行清空垃圾郵件的時間，從 1970 年一月一日(電腦紀元)後算起的日數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "The default plugin for Junk hook"
 msgstr "åžƒåœ¾é‡£é‰¤çš„é è¨­å¤–æŽ›ç¨‹å¼"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr "é€™æ˜¯é è¨­çš„åžƒåœ¾éƒµä»¶å¤–æŽ›ç¨‹å¼ï¼Œå³ä½¿å·²å•Ÿç”¨äº†å…¶ä»–çš„å¤–æŽ›ç¨‹å¼ã€‚å¦‚æžœåœç”¨é€™è£åˆ—å‡ºçš„é è¨­å¤–æŽ›ç¨‹å¼ï¼Œä¸¦ä¸æœƒå½±éŸ¿å…¶ä»–å¯ç”¨çš„å¤–æŽ›ç¨‹å¼ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "決定是否在通訊錄中尋找寄件者電子郵件帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -8407,91 +8367,143 @@ msgid ""
 "autocompletion."
 msgstr "æ±ºå®šæ˜¯å¦åœ¨é€šè¨ŠéŒ„ä¸­å°‹æ‰¾å¯„ä»¶è€…é›»å­éƒµä»¶å¸³è™Ÿã€‚å¦‚æžœæ‰¾å¾—åˆ°ï¼Œå°±ä¸åˆ¤æ–·ç‚ºåžƒåœ¾éƒµä»¶ã€‚å®ƒæœƒæœå°‹æ¨™è¨˜ç‚ºè‡ªå‹•è£œé½Šçš„é€šè¨ŠéŒ„ã€‚ä½†è‹¥æ¨™è¨˜ç‚ºè‡ªå‹•è£œé½Šçš„æ˜¯é ç«¯é€šè¨ŠéŒ„ï¼ˆåƒ LDAP），則速度可能會很慢。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "決定是否只在本地端通訊錄中尋找檢查垃圾郵件用的電子郵件位址"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr "é€™å€‹é¸é …ç›¸é—œæ–¼éµå€¼ã€Œlookup_addressbook」，是用來決定是否只在本地端通訊錄中查詢電子郵件位址以用於垃圾郵件過濾時「排除已知聯絡人寄出的郵件」功能。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "æ±ºå®šæ˜¯å¦ä½¿ç”¨è‡ªé¸æ¨™é ­ä¾†æª¢æŸ¥åžƒåœ¾éƒµä»¶"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 msgstr "æ±ºå®šæ˜¯å¦ä½¿ç”¨è‡ªé¸æ¨™é ­ä¾†æª¢æŸ¥åžƒåœ¾éƒµä»¶ã€‚å¦‚æžœå•Ÿç”¨é€™å€‹é¸é …ä¸¦ä¸”æä¾›æ¨™é ­ï¼Œå°‡æœƒæå‡åžƒåœ¾éƒµä»¶æª¢æŸ¥çš„é€Ÿåº¦ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Custom headers to use while checking for junk."
 msgstr "æª¢æŸ¥åžƒåœ¾éƒµä»¶ç”¨çš„è‡ªé¸æ¨™é ­ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr "æª¢æŸ¥åžƒåœ¾éƒµä»¶ç”¨çš„è‡ªé¸æ¨™é ­ã€‚æ­¤æ¸…å–®ä¸­çš„å…ƒç´ æ ¼å¼ç‚ºã€Œheadername=value」字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "UID string of the default account."
 msgstr "é è¨­å¸³è™Ÿçš„ UID 字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Save directory"
 msgstr "儲存目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Directory for saving mail component files."
 msgstr "用來儲存郵件元件檔的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Composer load/attach directory"
 msgstr "編輯器讀取/é™„åŠ ç›®éŒ„"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Directory for loading/attaching files to composer."
 msgstr "用來郵件編輯器載入/附件的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Check for new messages on start"
 msgstr "啟動時檢查新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 msgstr "當 Evolution 啟動時是否檢查新郵件。這也包含寄出寄件匣中的郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Check for new messages in all active accounts"
 msgstr "檢查所有使用中帳號的新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr "當 Evolution 啟動時是否檢查所有使用中帳號的新郵件而不管「檢查新郵件於每 X åˆ†é˜ã€é¸é …ã€‚é€™å€‹é¸é …åªèƒ½å’Œã€Œsend_recv_on_startã€é¸é …ä¸€èµ·ä½¿ç”¨ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Server synchronization interval"
 msgstr "伺服器同步間隔"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr "æŽ§åˆ¶æœ¬åœ°ç«¯æ›´æ”¹èˆ‡é ç«¯éƒµä»¶ä¼ºæœå™¨åŒæ­¥çš„é »çŽ‡ã€‚é–“éš”å¿…é ˆè‡³å°‘æœ‰ 30 秒。"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+msgid "(Deprecated) Default forward style"
+msgstr "(已廢棄) é è¨­è½‰å¯„æ¨£å¼"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"forward-style-name\" instead."
+msgstr "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「forward-style-name」代替。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+msgid "(Deprecated) Default reply style"
+msgstr "(已廢棄) é è¨­çš„å›žè¦†æ¨£å¼"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"reply-style-name\" instead."
+msgstr "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「reply-style-name」代替。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+msgid "(Deprecated) List of custom headers and whether they are enabled."
+msgstr "(已廢棄) è‡ªé¸æª”é ­ä»¥åŠå®ƒå€‘æ˜¯å¦å•Ÿç”¨çš„æ¸…å–®"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"show-headers\" instead."
+msgstr "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「show-headers」代替。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+msgid "(Deprecated) Load images for HTML messages over HTTP"
+msgstr "(已廢棄) 透過 HTTP 載入 HTML 郵件的影像"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"image-loading-policy\" instead."
+msgstr "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「image-loading-policy」代替。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+msgid ""
+"(Deprecated) Asks whether to close the message window when the user forwards "
+"or replies to the message shown in the window"
+msgstr "(已廢棄) 當使用者轉寄或回覆視窗中顯示的郵件時詢問是否要關閉郵件視窗"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"browser-close-on-reply-policy\" instead."
+msgstr "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「browser-close-on-reply-policy」代替。"
+
 #. Translators: This is the a list of words for the attach reminder plugin to look
 #. for in a message body. Please use any number of words here in your language that might
 #. indicate that an attachment should have been attached to the message.
@@ -8752,7 +8764,7 @@ msgstr "檔案選擇對話盒的初始資料夾"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser 對話盒的初始資料夾。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:309
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
@@ -8840,19 +8852,7 @@ msgstr "只使用本地垃圾郵件測試。"
 msgid "Use only the local spam tests (no DNS)."
 msgstr "只使用本地垃圾郵件測試 (沒有 DNS)。"
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-msgid "Socket path for SpamAssassin"
-msgstr "SpamAssassin Socket 路徑"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-msgid "Use SpamAssassin daemon and client"
-msgstr "使用 SpamAsssassin 伺服程式和客戶端"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Use spamc and spamd programs, if available."
-msgstr "如果可以，使用 spamc 與 spamd 程式。"
-
-#: ../em-format/e-mail-formatter-attachment.c:370
+#: ../em-format/e-mail-formatter-attachment.c:397
 #: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
 #: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
 #: ../mail/message-list.etspec.h:4
@@ -8860,143 +8860,99 @@ msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 
-#: ../em-format/e-mail-formatter-attachment.c:371
+#: ../em-format/e-mail-formatter-attachment.c:398
 msgid "Display as attachment"
 msgstr "顯示為附件"
 
-#: ../em-format/e-mail-formatter.c:1389 ../mail/e-mail-tag-editor.c:326
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:61
+#: ../em-format/e-mail-formatter-headers.c:107
+#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
 msgid "From"
 msgstr "寄件者"
 
-#: ../em-format/e-mail-formatter.c:1390 ../modules/mail/em-mailer-prefs.c:62
-msgid "Reply-To"
-msgstr "回覆"
-
-#: ../em-format/e-mail-formatter.c:1392
-#: ../em-format/e-mail-formatter-utils.c:196
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../modules/mail/em-mailer-prefs.c:64
-msgid "Cc"
-msgstr "副本"
-
-#: ../em-format/e-mail-formatter.c:1393
-#: ../em-format/e-mail-formatter-utils.c:198
-#: ../em-format/e-mail-formatter-utils.c:222
-#: ../modules/mail/em-mailer-prefs.c:65
-msgid "Bcc"
-msgstr "密件副本"
-
-#: ../em-format/e-mail-formatter.c:1394
-#: ../em-format/e-mail-formatter-quote-headers.c:150
-#: ../mail/e-mail-tag-editor.c:331 ../mail/em-filter-i18n.h:77
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:66
-#: ../smime/lib/e-asn1-object.c:712
-msgid "Subject"
-msgstr "主旨"
-
-#: ../em-format/e-mail-formatter.c:1395 ../e-util/e-dateedit.c:549
-#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:67
-msgid "Date"
-msgstr "日期"
-
-#: ../em-format/e-mail-formatter.c:1396 ../modules/mail/em-mailer-prefs.c:68
-msgid "Newsgroups"
-msgstr "新聞羣組"
-
-#: ../em-format/e-mail-formatter.c:1397 ../modules/mail/em-mailer-prefs.c:69
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid "Face"
-msgstr "面貌"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../em-format/e-mail-formatter-headers.c:100
-#: ../plugins/mail-notification/mail-notification.c:395
-#, c-format
-msgid "From: %s"
-msgstr "寄件者：%s"
-
-#: ../em-format/e-mail-formatter-headers.c:121
-#: ../em-format/e-mail-formatter-headers.c:126
+#: ../em-format/e-mail-formatter-headers.c:133
 msgid "(no subject)"
 msgstr "(沒有主旨)"
 
-#: ../em-format/e-mail-formatter-headers.c:328
+#: ../em-format/e-mail-formatter-headers.c:333
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "這封郵件是由 %s 代表 %s 寄出"
 
-#: ../em-format/e-mail-formatter-image.c:143
+#: ../em-format/e-mail-formatter-image.c:152
 msgid "Regular Image"
 msgstr "一般影像"
 
-#: ../em-format/e-mail-formatter-image.c:144
+#: ../em-format/e-mail-formatter-image.c:153
 msgid "Display part as an image"
 msgstr "將部分顯示為影像"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:242
+#: ../em-format/e-mail-formatter-message-rfc822.c:252
 msgid "RFC822 message"
 msgstr "RFC822 郵件"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:243
+#: ../em-format/e-mail-formatter-message-rfc822.c:253
 msgid "Format part as an RFC822 message"
 msgstr "å°‡éƒ¨åˆ†æ ¼å¼åŒ– RFC822 郵件"
 
-#: ../em-format/e-mail-formatter-print.c:56
-#: ../e-util/gal-define-views-dialog.c:361
+#: ../em-format/e-mail-formatter-print.c:54
 #: ../e-util/gal-view-instance-save-as-dialog.c:95
 #: ../mail/e-mail-label-tree-view.c:99
 #: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
-#: ../modules/cal-config-google/e-google-chooser.c:209
+#: ../modules/cal-config-google/e-google-chooser.c:237
 #: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Name"
 msgstr "名稱"
 
-#: ../em-format/e-mail-formatter-print.c:56
+#: ../em-format/e-mail-formatter-print.c:54
 #: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "大小"
 
-#. Add encryption/signature header
-#: ../em-format/e-mail-formatter-print-headers.c:120
-#: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
-msgid "Security"
-msgstr "安全性"
-
-#: ../em-format/e-mail-formatter-print-headers.c:138
+#: ../em-format/e-mail-formatter-print-headers.c:144
 msgid "GPG signed"
 msgstr "GPG 簽署"
 
-#: ../em-format/e-mail-formatter-print-headers.c:144
+#: ../em-format/e-mail-formatter-print-headers.c:150
 msgid "GPG encrpyted"
 msgstr "GPG åŠ å¯†"
 
-#: ../em-format/e-mail-formatter-print-headers.c:150
+#: ../em-format/e-mail-formatter-print-headers.c:156
 msgid "S/MIME signed"
 msgstr "S/MIME 簽署"
 
-#: ../em-format/e-mail-formatter-print-headers.c:156
+#: ../em-format/e-mail-formatter-print-headers.c:162
 msgid "S/MIME encrpyted"
 msgstr "S/MIME åŠ å¯†"
 
+#: ../em-format/e-mail-formatter-print-headers.c:171
+#: ../mail/e-mail-config-security-page.c:642
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+msgid "Security"
+msgstr "安全性"
+
+#: ../em-format/e-mail-formatter-quote-headers.c:168
+#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
+msgid "Subject"
+msgstr "主旨"
+
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:161
-#: ../em-format/e-mail-formatter-utils.c:346
-#: ../modules/mail/em-mailer-prefs.c:1117
+#: ../em-format/e-mail-formatter-quote-headers.c:187
+#: ../em-format/e-mail-formatter-utils.c:359
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "Mailer"
 msgstr "寄件者"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:88
-#: ../em-format/e-mail-formatter-text-enriched.c:102
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
+#: ../em-format/e-mail-formatter-text-enriched.c:104
 msgid "Richtext"
 msgstr "豐富文字"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:89
-#: ../em-format/e-mail-formatter-text-enriched.c:103
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../em-format/e-mail-formatter-text-enriched.c:105
 msgid "Display part as enriched text"
 msgstr "將部分顯示為豐富文字"
 
@@ -9010,13 +8966,13 @@ msgstr "HTML"
 msgid "Format part as HTML"
 msgstr "å°‡éƒ¨åˆ†æ ¼å¼åŒ–ç‚º HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:111
-#: ../em-format/e-mail-formatter-text-plain.c:186
+#: ../em-format/e-mail-formatter-quote-text-plain.c:115
+#: ../em-format/e-mail-formatter-text-plain.c:194
 msgid "Plain Text"
 msgstr "純文字"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:112
-#: ../em-format/e-mail-formatter-text-plain.c:187
+#: ../em-format/e-mail-formatter-quote-text-plain.c:116
+#: ../em-format/e-mail-formatter-text-plain.c:195
 msgid "Format part as plain text"
 msgstr "å°‡éƒ¨åˆ†æ ¼å¼åŒ–ç‚ºç´”æ–‡å­—"
 
@@ -9112,23 +9068,35 @@ msgid ""
 "practical amount of time."
 msgstr "æ­¤éƒµä»¶å·²åŠ å¯†ï¼Œä½¿ç”¨åš´å¯†çš„åŠ å¯†æ¼”ç®—æ³•ã€‚ç¸±ä½¿ç¶“éŽä¸€æ®µæ™‚é–“ï¼Œå¤–é¢çš„äººå¾ˆé›£æª¢é–±æ­¤éƒµä»¶çš„å…§å®¹ã€‚"
 
-#: ../em-format/e-mail-formatter-secure-button.c:180
+#: ../em-format/e-mail-formatter-secure-button.c:182
 #: ../smime/gui/smime-ui.ui.h:20
 msgid "_View Certificate"
 msgstr "檢視證書(_V)"
 
-#: ../em-format/e-mail-formatter-secure-button.c:195
+#: ../em-format/e-mail-formatter-secure-button.c:197
 msgid "This certificate is not viewable"
 msgstr "此證書無法檢視"
 
-#: ../em-format/e-mail-formatter-source.c:126
+#: ../em-format/e-mail-formatter-source.c:130
 msgid "Source"
 msgstr "來源"
 
-#: ../em-format/e-mail-formatter-source.c:127
+#: ../em-format/e-mail-formatter-source.c:131
 msgid "Display source of a MIME part"
 msgstr "顯示 MIME 部分的來源"
 
+#: ../em-format/e-mail-formatter-utils.c:207
+#: ../em-format/e-mail-formatter-utils.c:231
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+msgid "Cc"
+msgstr "副本"
+
+#: ../em-format/e-mail-formatter-utils.c:209
+#: ../em-format/e-mail-formatter-utils.c:233
+#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
+msgid "Bcc"
+msgstr "密件副本"
+
 #: ../em-format/e-mail-parser-application-mbox.c:88
 #, c-format
 msgid "Error parsing MBOX part: %s"
@@ -9154,27 +9122,27 @@ msgstr "檢驗簽署時發生錯誤：%s"
 msgid "Malformed external-body part"
 msgstr "æ ¼å¼ä¸è‰¯çš„å¤–åŠ æœ¬æ–‡éƒ¨åˆ†"
 
-#: ../em-format/e-mail-parser-message-external.c:101
+#: ../em-format/e-mail-parser-message-external.c:102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:112
+#: ../em-format/e-mail-parser-message-external.c:113
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 「%s」有效的指示"
 
-#: ../em-format/e-mail-parser-message-external.c:114
+#: ../em-format/e-mail-parser-message-external.c:115
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:133
+#: ../em-format/e-mail-parser-message-external.c:134
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é ç«¯è³‡æ–™æŒ‡ç¤º (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:150
+#: ../em-format/e-mail-parser-message-external.c:152
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (「%s」類型)"
@@ -9197,6 +9165,25 @@ msgstr "無法解析 PGP/MIME 郵件：%s"
 msgid "Unsupported signature format"
 msgstr "ä¸æ”¯æ´çš„ç°½ç½²æ ¼å¼"
 
+#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
+msgid "Reply-To"
+msgstr "回覆"
+
+#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
+#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:70
+msgid "Date"
+msgstr "日期"
+
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+msgid "Newsgroups"
+msgstr "新聞羣組"
+
+#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "面貌"
+
 #: ../em-format/e-mail-part-utils.c:500
 #, c-format
 msgid "%s attachment"
@@ -9281,6 +9268,10 @@ msgstr "直到(_U)"
 msgid "Delivery Options"
 msgstr "éžé€é¸é …"
 
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "å„ªå…ˆé †åº(_P):"
+
 #: ../e-util/e-send-options.ui.h:27
 msgid "_Classification:"
 msgstr "歸類(_C):"
@@ -9337,89 +9328,65 @@ msgstr "返回通知"
 msgid "Sta_tus Tracking"
 msgstr "狀態追蹤(_T)"
 
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-table-config.c:670
-msgid "Show Fields"
-msgstr "顯示欄位"
+#: ../e-util/e-table-config.ui.h:1
+msgid "_Sort..."
+msgstr "排序(_S)…"
 
 #: ../e-util/e-table-config.ui.h:2
-msgid "A_vailable Fields:"
-msgstr "可用的欄位(_V):"
+msgid "_Group By..."
+msgstr "ç¾£çµ„æ ¹æ“š(_G)…"
 
 #: ../e-util/e-table-config.ui.h:3
-msgid "_Show these fields in order:"
-msgstr "æ ¹æ“šåºé¡¯ç¤ºé€™äº›æ¬„ä½(_S):"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "Move _Up"
-msgstr "上移(_U)"
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "Move _Down"
-msgstr "下移(_D)"
+msgid "_Fields Shown..."
+msgstr "欄位顯示(_F)…"
 
-#: ../e-util/e-table-config.ui.h:7 ../e-util/e-name-selector-dialog.c:969
-msgid "_Remove"
-msgstr "移除(_R)"
+#: ../e-util/e-table-config.ui.h:6
+msgid "Clear _All"
+msgstr "全部清除(_A)"
 
-#: ../e-util/e-table-config.ui.h:9
+#: ../e-util/e-table-config.ui.h:7
 msgid "_Show field in View"
 msgstr "顯示檢視中的欄位(_S)"
 
-#: ../e-util/e-table-config.ui.h:10 ../e-util/e-table-header-item.c:1751
+#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1750
 msgid "Ascending"
 msgstr "遞增"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1751
+#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1750
 msgid "Descending"
 msgstr "遞減"
 
-#: ../e-util/e-table-config.ui.h:12
+#: ../e-util/e-table-config.ui.h:10
 msgid "Group Items By"
 msgstr "å°‡é …ç›®çµ„æˆç¾£çµ„ï¼Œæ ¹æ“š"
 
-#: ../e-util/e-table-config.ui.h:13
+#: ../e-util/e-table-config.ui.h:11
 msgid "Show _field in View"
 msgstr "顯示檢視中的欄位(_F)"
 
-#: ../e-util/e-table-config.ui.h:14
+#: ../e-util/e-table-config.ui.h:12
 msgid "Then By"
 msgstr "æŽ¥ç€æ ¹æ“š"
 
-#: ../e-util/e-table-config.ui.h:15
+#: ../e-util/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "顯示檢視中的欄位(_N)"
 
-#: ../e-util/e-table-config.ui.h:16
+#: ../e-util/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "顯示檢視中的欄位(_V)"
 
-#: ../e-util/e-table-config.ui.h:17
-msgid "Clear _All"
-msgstr "全部清除(_A)"
-
-#: ../e-util/e-table-config.ui.h:18
+#: ../e-util/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "排序"
 
-#: ../e-util/e-table-config.ui.h:19
-msgid "Sort Items By"
-msgstr "æŽ’åºé …ç›®æ ¹æ“š"
-
-#: ../e-util/e-table-config.ui.h:20
+#: ../e-util/e-table-config.ui.h:16
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../e-util/e-table-config.ui.h:21
-msgid "_Sort..."
-msgstr "排序(_S)…"
-
-#: ../e-util/e-table-config.ui.h:22
-msgid "_Group By..."
-msgstr "ç¾£çµ„æ ¹æ“š(_G)…"
-
-#: ../e-util/e-table-config.ui.h:23
-msgid "_Fields Shown..."
-msgstr "欄位顯示(_F)…"
+#: ../e-util/e-table-config.ui.h:17
+msgid "Sort Items By"
+msgstr "æŽ’åºé …ç›®æ ¹æ“š"
 
 #: ../e-util/e-timezone-dialog.ui.h:1
 msgid "Select a Time Zone"
@@ -9447,7 +9414,7 @@ msgid "Timezone drop-down combination box"
 msgstr "時區下拉式組合方塊"
 
 #: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
-#: ../mail/em-utils.c:293
+#: ../mail/em-utils.c:240
 msgid "Incoming"
 msgstr "內送"
 
@@ -9524,16 +9491,6 @@ msgstr ""
 "郵件日期將會與相對於過濾器執行\n"
 "的時間作比較。"
 
-#: ../e-util/gal-define-views.ui.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr "定義「%s」的檢視"
-
-#: ../e-util/gal-define-views.ui.h:4 ../e-util/gal-define-views-dialog.c:375
-#, no-c-format
-msgid "Define Views for %s"
-msgstr "定義 %s 的檢視"
-
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "建立新的檢視(_C)"
@@ -9549,54 +9506,42 @@ msgstr "名稱(_N):"
 msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
-#: ../e-util/gal-view-new-dialog.ui.h:1
-msgid "Name of new view:"
-msgstr "新檢視的名稱:"
-
-#: ../e-util/gal-view-new-dialog.ui.h:2
-msgid "Type of view:"
-msgstr "檢視的類型:"
-
-#: ../e-util/gal-view-new-dialog.ui.h:3
-msgid "Type of View"
-msgstr "檢視的類型"
-
-#: ../e-util/e-activity-proxy.c:313
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../e-util/e-activity-proxy.c:311
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Cancel"
 msgstr "取消"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:247
+#: ../e-util/e-activity.c:259
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s （已取消）"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:250
+#: ../e-util/e-activity.c:262
 #, c-format
 msgid "%s (completed)"
 msgstr "%s （已完成） "
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:253
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (正在等待)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:257
+#: ../e-util/e-activity.c:269
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (正在取消)"
 
-#: ../e-util/e-activity.c:259
+#: ../e-util/e-activity.c:271
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:264
+#: ../e-util/e-activity.c:276
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
@@ -9613,19 +9558,19 @@ msgstr "圖示檢視"
 msgid "List View"
 msgstr "清單檢視"
 
-#: ../e-util/e-attachment-dialog.c:311
+#: ../e-util/e-attachment-dialog.c:318
 msgid "Attachment Properties"
 msgstr "附件內容"
 
-#: ../e-util/e-attachment-dialog.c:333 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
 msgid "F_ilename:"
 msgstr "檔案名稱(_I):"
 
-#: ../e-util/e-attachment-dialog.c:368
+#: ../e-util/e-attachment-dialog.c:375
 msgid "MIME Type:"
 msgstr "MIME 類型："
 
-#: ../e-util/e-attachment-dialog.c:376 ../e-util/e-attachment-store.c:441
+#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
 
@@ -9637,19 +9582,6 @@ msgstr "無法設為背景"
 msgid "Set as _Background"
 msgstr "設為背景(_B)"
 
-#: ../e-util/e-attachment-handler-sendto.c:93
-msgid "Could not send attachment"
-msgid_plural "Could not send attachments"
-msgstr[0] "無法送出附件。"
-
-#: ../e-util/e-attachment-handler-sendto.c:135
-msgid "_Send To..."
-msgstr "傳送至(_S)…"
-
-#: ../e-util/e-attachment-handler-sendto.c:137
-msgid "Send the selected attachments somewhere"
-msgstr "傳送選取的附件到別處"
-
 #: ../e-util/e-attachment-icon-view.c:166
 #: ../e-util/e-attachment-tree-view.c:549
 msgid "Loading"
@@ -9668,22 +9600,22 @@ msgstr "隱藏附件列(_B)"
 msgid "Show Attachment _Bar"
 msgstr "顯示附件列(_B)"
 
-#: ../e-util/e-attachment-store.c:429
+#: ../e-util/e-attachment-store.c:463
 msgid "Add Attachment"
 msgstr "åŠ å…¥é™„ä»¶"
 
-#: ../e-util/e-attachment-store.c:432
+#: ../e-util/e-attachment-store.c:466
 msgid "A_ttach"
 msgstr "é™„åŠ (_T)"
 
-#: ../e-util/e-attachment-store.c:495
+#: ../e-util/e-attachment-store.c:537
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "儲存附件"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:524 ../e-util/e-attachment.c:1841
-#: ../e-util/e-attachment.c:2477
+#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2055
+#: ../e-util/e-attachment.c:2711
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -9729,48 +9661,48 @@ msgstr "在 %s 中開啟這個附件"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:978
+#: ../e-util/e-attachment.c:1110
 msgid "Attached message"
 msgstr "é™„åŠ çš„éƒµä»¶"
 
-#: ../e-util/e-attachment.c:1917 ../e-util/e-attachment.c:2779
+#: ../e-util/e-attachment.c:2135 ../e-util/e-attachment.c:3017
 msgid "A load operation is already in progress"
 msgstr "載入操作已在進行中"
 
-#: ../e-util/e-attachment.c:1925 ../e-util/e-attachment.c:2787
+#: ../e-util/e-attachment.c:2143 ../e-util/e-attachment.c:3025
 msgid "A save operation is already in progress"
 msgstr "儲存操作已在進行中"
 
-#: ../e-util/e-attachment.c:2033
+#: ../e-util/e-attachment.c:2260
 #, c-format
 msgid "Could not load '%s'"
 msgstr "無法載入「%s」"
 
-#: ../e-util/e-attachment.c:2036
+#: ../e-util/e-attachment.c:2263
 #, c-format
 msgid "Could not load the attachment"
 msgstr "無法載入附件"
 
-#: ../e-util/e-attachment.c:2334
+#: ../e-util/e-attachment.c:2566
 #, c-format
 msgid "Could not open '%s'"
 msgstr "無法開啟「%s」"
 
-#: ../e-util/e-attachment.c:2337
+#: ../e-util/e-attachment.c:2569
 #, c-format
 msgid "Could not open the attachment"
 msgstr "無法開啟附件"
 
-#: ../e-util/e-attachment.c:2795
+#: ../e-util/e-attachment.c:3034
 msgid "Attachment contents not loaded"
 msgstr "無法載入附件內容"
 
-#: ../e-util/e-attachment.c:2871
+#: ../e-util/e-attachment.c:3110
 #, c-format
 msgid "Could not save '%s'"
 msgstr "無法儲存「%s」"
 
-#: ../e-util/e-attachment.c:2874
+#: ../e-util/e-attachment.c:3113
 #, c-format
 msgid "Could not save the attachment"
 msgstr "無法儲存附件"
@@ -9821,19 +9753,19 @@ msgid "Copy memo list contents locally for offline operation"
 msgstr "複製備忘錄清單內容至本地以便離線作業"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1324 ../e-util/e-calendar-item.c:2186
+#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1326
+#: ../e-util/e-calendar-item.c:1329
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1363
+#: ../e-util/e-calendar-item.c:1366
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y年%m月"
@@ -9912,8 +9844,8 @@ msgstr "現在"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
-#: ../modules/calendar/e-cal-shell-view-actions.c:1924
-#: ../modules/itip-formatter/itip-view.c:228
+#: ../modules/calendar/e-cal-shell-view-actions.c:1901
+#: ../modules/itip-formatter/itip-view.c:230
 msgid "Today"
 msgstr "今天"
 
@@ -9933,7 +9865,7 @@ msgstr "確定"
 msgid "The time must be in the format: %s"
 msgstr "æ™‚é–“å¿…é ˆç‚ºæ­¤æ ¼å¼ï¼š%s"
 
-#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1882
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1851
 msgid "?"
 msgstr "?"
 
@@ -10030,63 +9962,63 @@ msgstr "烏克蘭語"
 msgid "Visual"
 msgstr "視覺"
 
-#: ../e-util/e-client-cache.c:1061
+#: ../e-util/e-client-cache.c:1162
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "不能從延伸名稱「%s」建立客戶端物件"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "日期與時刻"
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:549
 msgid "Text entry to input date"
 msgstr "ç”¨ä¾†è¼¸å…¥æ—¥æœŸçš„æ–‡å­—é …ç›®"
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:572
 msgid "Click this button to show a calendar"
 msgstr "按此按鈕以顯示行事曆"
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:626
 msgid "Drop-down combination box to select time"
 msgstr "用以選擇時刻的下拉式組合方塊"
 
-#: ../e-util/e-dateedit.c:626
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../e-util/e-dateedit.c:627
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "時間"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:701
 msgid "No_w"
 msgstr "現在(_W)"
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:708
 msgid "_Today"
 msgstr "今天(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:716
+#: ../e-util/e-dateedit.c:717
 msgid "_None"
 msgstr "沒有(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1811 ../e-util/e-dateedit.c:2059
+#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
 msgctxt "date"
 msgid "None"
 msgstr "沒有"
 
-#: ../e-util/e-dateedit.c:1951
+#: ../e-util/e-dateedit.c:1953
 msgid "Invalid Date Value"
 msgstr "無效的日期數值"
 
-#: ../e-util/e-dateedit.c:1996
+#: ../e-util/e-dateedit.c:1998
 msgid "Invalid Time Value"
 msgstr "無效的時刻數值"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:256
+#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
 msgid "Tomorrow"
 msgstr "明天"
 
@@ -10159,19 +10091,19 @@ msgstr "ä½¿ç”¨åœ°å€è¨­å®šé è¨­å€¼"
 msgid "Format:"
 msgstr "æ ¼å¼ï¼š"
 
-#: ../e-util/e-file-utils.c:150
+#: ../e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "（不明的檔案名稱）"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:154
+#: ../e-util/e-file-utils.c:125
 #, c-format
 msgid "Writing \"%s\""
 msgstr "正在寫入「%s」"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:159
+#: ../e-util/e-file-utils.c:130
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "正在寫入「%s」至 %s"
@@ -10335,7 +10267,7 @@ msgstr "包括郵件羣組(_N):"
 msgid "A_dd Condition"
 msgstr "åŠ å…¥æ¢ä»¶(_D)"
 
-#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:294
+#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:241
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -10503,82 +10435,86 @@ msgid ""
 "should instead select the timezone from the drop-down combination box below."
 msgstr "ç”¨ä¾†é¸æ“‡æ™‚å€çš„æ»‘é¼ äº’å‹•å¼åœ°åœ–å…ƒä»¶ã€‚ä½¿ç”¨éµç›¤çš„ä½¿ç”¨è€…æ‡‰è©²ä½¿ç”¨ä¸‹æ–¹çš„ä¸‹æ‹‰å¼çµ„åˆæ–¹å¡Šä¾†é¸æ“‡æ™‚å€ã€‚"
 
-#: ../e-util/e-misc-utils.c:244
+#: ../e-util/e-misc-utils.c:242
 msgid "Could not open the link."
 msgstr "無法開啟該連結。"
 
-#: ../e-util/e-misc-utils.c:291
+#: ../e-util/e-misc-utils.c:289
 msgid "Could not display help for Evolution."
 msgstr "無法顯示 Evolution 的求助文件。"
 
-#: ../e-util/e-name-selector-dialog.c:279
+#: ../e-util/e-name-selector-dialog.c:278
 msgid "Show Contacts"
 msgstr "顯示聯絡人"
 
-#: ../e-util/e-name-selector-dialog.c:311
+#: ../e-util/e-name-selector-dialog.c:310
 msgid "Address B_ook:"
 msgstr "通訊錄(_O):"
 
-#: ../e-util/e-name-selector-dialog.c:318
+#: ../e-util/e-name-selector-dialog.c:317
 msgid "Cat_egory:"
 msgstr "分類(_E):"
 
-#: ../e-util/e-name-selector-dialog.c:342
+#: ../e-util/e-name-selector-dialog.c:341
 msgid "_Search:"
 msgstr "搜尋(_S):"
 
-#: ../e-util/e-name-selector-dialog.c:368
-#: ../e-util/e-name-selector-dialog.c:1243
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
-#: ../modules/calendar/e-cal-shell-view-actions.c:1757
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../e-util/e-name-selector-dialog.c:367
+#: ../e-util/e-name-selector-dialog.c:1256
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:938
 msgid "Any Category"
 msgstr "任何分類"
 
-#: ../e-util/e-name-selector-dialog.c:370
+#: ../e-util/e-name-selector-dialog.c:369
 msgid "Co_ntacts"
 msgstr "聯絡人(_N)"
 
-#: ../e-util/e-name-selector-dialog.c:447
+#: ../e-util/e-name-selector-dialog.c:446
 msgid "Search"
 msgstr "搜尋"
 
-#: ../e-util/e-name-selector-dialog.c:450
+#: ../e-util/e-name-selector-dialog.c:449
 #: ../mail/importers/pine-importer.c:426
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: ../e-util/e-name-selector-dialog.c:453
-#: ../modules/addressbook/e-book-shell-backend.c:305
-#: ../modules/addressbook/e-book-shell-view.c:356
+#: ../e-util/e-name-selector-dialog.c:452
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view.c:372
 msgid "Contacts"
 msgstr "聯絡人"
 
-#: ../e-util/e-name-selector-dialog.c:575
+#: ../e-util/e-name-selector-dialog.c:580
 msgid "Select Contacts from Address Book"
 msgstr "從通訊錄選取聯絡人"
 
+#: ../e-util/e-name-selector-dialog.c:981
+msgid "_Remove"
+msgstr "移除(_R)"
+
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3023
+#: ../e-util/e-name-selector-entry.c:3028
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "在行內展開 %s (_X)"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3039
+#: ../e-util/e-name-selector-entry.c:3044
 #, c-format
 msgid "Cop_y %s"
 msgstr "複製(_Y) %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3050
+#: ../e-util/e-name-selector-entry.c:3055
 #, c-format
 msgid "C_ut %s"
 msgstr "剪下(_U) %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3068
+#: ../e-util/e-name-selector-entry.c:3073
 #, c-format
 msgid "_Edit %s"
 msgstr "編輯 %s(_E)"
@@ -10641,62 +10577,62 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "åˆ—å°ç³»çµ±æ²’æœ‰å›žå ±ä»»ä½•é—œæ–¼æ­¤éŒ¯èª¤çš„é¡å¤–è³‡è¨Šã€‚"
 
-#: ../e-util/e-rule-editor.c:288
+#: ../e-util/e-rule-editor.c:185
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: ../e-util/e-rule-editor.c:395
+#: ../e-util/e-rule-editor.c:287
 msgid "Edit Rule"
 msgstr "編輯規則"
 
-#: ../e-util/e-search-bar.c:79
+#: ../e-util/e-search-bar.c:81
 #, c-format
 msgid "Matches: %u"
 msgstr "ç¬¦åˆé …ï¼š%u"
 
-#: ../e-util/e-search-bar.c:527
+#: ../e-util/e-search-bar.c:565
 msgid "Close the find bar"
 msgstr "關閉搜尋工具列"
 
-#: ../e-util/e-search-bar.c:535
+#: ../e-util/e-search-bar.c:573
 msgid "Fin_d:"
 msgstr "尋找(_D):"
 
-#: ../e-util/e-search-bar.c:547
+#: ../e-util/e-search-bar.c:585
 msgid "Clear the search"
 msgstr "清除此搜尋"
 
-#: ../e-util/e-search-bar.c:571
+#: ../e-util/e-search-bar.c:609
 msgid "_Previous"
 msgstr "上一個(_P)"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:615
 msgid "Find the previous occurrence of the phrase"
 msgstr "尋找上一個出現的字詞"
 
-#: ../e-util/e-search-bar.c:590
+#: ../e-util/e-search-bar.c:624
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: ../e-util/e-search-bar.c:596
+#: ../e-util/e-search-bar.c:630
 msgid "Find the next occurrence of the phrase"
 msgstr "尋找下一個出現的字詞"
 
-#: ../e-util/e-search-bar.c:609
+#: ../e-util/e-search-bar.c:639
 msgid "Mat_ch case"
 msgstr "區分大小寫(_C)"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:667
 msgid "Reached bottom of page, continued from top"
 msgstr "åˆ°é”é é¢åº•éƒ¨ï¼Œå¾žé ‚ç«¯ç¹¼çºŒ"
 
-#: ../e-util/e-search-bar.c:659
+#: ../e-util/e-search-bar.c:689
 msgid "Reached top of page, continued from bottom"
 msgstr "åˆ°é”é é¢é ‚ç«¯ï¼Œå¾žåº•éƒ¨ç¹¼çºŒ"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
 #: ../mail/importers/pine-importer.c:419
-#: ../modules/mail/e-mail-shell-view.c:1045
+#: ../modules/mail/e-mail-shell-view.c:1075
 msgid "Mail"
 msgstr "郵件"
 
@@ -10714,19 +10650,19 @@ msgstr "名稱："
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1293
+#: ../e-util/e-source-config.c:1300
 msgid "Refresh every"
 msgstr "重新整理於每"
 
-#: ../e-util/e-source-config.c:1323 ../e-util/e-source-config.c:1392
+#: ../e-util/e-source-config.c:1330 ../e-util/e-source-config.c:1401
 msgid "Use a secure connection"
 msgstr "使用安全連線"
 
-#: ../e-util/e-source-config.c:1416
+#: ../e-util/e-source-config.c:1425
 msgid "Unset _trust for SSL certificate"
 msgstr "取消設定 SSL 證書的信任(_T)"
 
-#: ../e-util/e-source-config.c:1450
+#: ../e-util/e-source-config.c:1459
 msgid "User"
 msgstr "使用者"
 
@@ -10739,26 +10675,26 @@ msgid "Select destination"
 msgstr "選擇目的地"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:352
+#: ../e-util/e-spell-entry.c:384
 msgid "(no suggestions)"
 msgstr "(沒有建議)"
 
-#: ../e-util/e-spell-entry.c:376
+#: ../e-util/e-spell-entry.c:408
 msgid "More..."
 msgstr "更多…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:445
+#: ../e-util/e-spell-entry.c:479
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "åŠ å…¥ã€Œ%s」至字典"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:488
+#: ../e-util/e-spell-entry.c:530
 msgid "Ignore All"
 msgstr "全部忽略"
 
-#: ../e-util/e-spell-entry.c:514
+#: ../e-util/e-spell-entry.c:558
 msgid "Spelling Suggestions"
 msgstr "拼字建議"
 
@@ -10855,37 +10791,61 @@ msgstr "備忘錄清單後端服務 &quot;{0}&quot; 遇到錯誤。"
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "工作清單後端服務 &quot;{0}&quot; 遇到錯誤。"
 
-#: ../e-util/e-table-click-to-add.c:643
+#: ../e-util/e-table-click-to-add.c:680
 #: ../e-util/gal-a11y-e-table-click-to-add.c:62
 #: ../e-util/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
 msgstr "è«‹æŒ‰é€™è£åŠ å…¥"
 
-#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+#: ../e-util/e-table-column-selector.c:266
+msgid "Move selected column names to top"
+msgstr "å°‡é¸å®šçš„æ¬„åç¨±ç§»è‡³é ‚ç«¯"
+
+#: ../e-util/e-table-column-selector.c:271
+msgid "Move selected column names up one row"
+msgstr "將選定的欄名稱上移一列"
+
+#: ../e-util/e-table-column-selector.c:276
+msgid "Move selected column names down one row"
+msgstr "將選定的欄名稱下移一列"
+
+#: ../e-util/e-table-column-selector.c:281
+msgid "Move selected column names to bottom"
+msgstr "將選定的欄名稱移至底端"
+
+#: ../e-util/e-table-column-selector.c:286
+msgid "Select all column names"
+msgstr "選擇所有的欄名稱"
+
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(遞增)"
 
-#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(遞減)"
 
-#: ../e-util/e-table-config.c:404
+#: ../e-util/e-table-config.c:396
 msgid "Not sorted"
 msgstr "未排序"
 
-#: ../e-util/e-table-config.c:445
+#: ../e-util/e-table-config.c:441
 msgid "No grouping"
 msgstr "未組成羣組"
 
-#: ../e-util/e-table-config.c:690
-msgid "Available Fields"
-msgstr "可用的欄位"
+#: ../e-util/e-table-config.c:546
+msgid "Show Fields"
+msgstr "顯示欄位"
+
+#: ../e-util/e-table-config.c:562
+msgid "Choose the order of information to appear in the message list."
+msgstr "請選擇在清單顯示模式時，顯示資訊的次序。"
 
 #: ../e-util/e-table-field-chooser-dialog.c:227
 msgid "Add a Column"
 msgstr "åŠ å…¥ä¸€æ¬„"
 
-#: ../e-util/e-table-field-chooser.c:164
+#: ../e-util/e-table-field-chooser.c:167
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -10893,72 +10853,72 @@ msgstr ""
 "æƒ³åœ¨ä½ çš„è¡¨æ ¼ä¸­åŠ å…¥æ¬„ä½ï¼Œåªè¦å°‡å®ƒ\n"
 "æ‹–æ›³è‡³ä½ å¸Œæœ›å®ƒå‡ºç¾çš„ä½ç½®å³å¯ã€‚"
 
-#: ../e-util/e-table-group-container.c:363
+#: ../e-util/e-table-group-container.c:369
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s：%s (%d å€‹é …ç›®)"
 
-#: ../e-util/e-table-group-container.c:377
+#: ../e-util/e-table-group-container.c:383
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d å€‹é …ç›®)"
 
-#: ../e-util/e-table-header-item.c:1579
+#: ../e-util/e-table-header-item.c:1573
 msgid "Customize Current View"
 msgstr "自選目前的檢視"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1596
 msgid "Sort _Ascending"
 msgstr "遞增排序(_A)"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1599
 msgid "Sort _Descending"
 msgstr "遞減排序(_D)"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1602
 msgid "_Unsort"
 msgstr "不排序(_U)"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1605
 msgid "Group By This _Field"
 msgstr "æ ¹æ“šæ­¤æ¬„ä½åšç¾£çµ„(_F)"
 
-#: ../e-util/e-table-header-item.c:1614
+#: ../e-util/e-table-header-item.c:1608
 msgid "Group By _Box"
 msgstr "æ ¹æ“šæ–¹å¡Šç‚ºç¾£çµ„(_B)"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1612
 msgid "Remove This _Column"
 msgstr "移除此欄(_C)"
 
-#: ../e-util/e-table-header-item.c:1621
+#: ../e-util/e-table-header-item.c:1615
 msgid "Add a C_olumn..."
 msgstr "åŠ å…¥ä¸€æ¬„(_O)…"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1619
 msgid "A_lignment"
 msgstr "排列(_L)"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1622
 msgid "B_est Fit"
 msgstr "最適填滿(_E)"
 
-#: ../e-util/e-table-header-item.c:1631
+#: ../e-util/e-table-header-item.c:1625
 msgid "Format Column_s..."
 msgstr "æ ¼å¼åŒ–æ¬„(_S)…"
 
-#: ../e-util/e-table-header-item.c:1635
+#: ../e-util/e-table-header-item.c:1629
 msgid "Custo_mize Current View..."
 msgstr "自選目前的檢視(_M)…"
 
-#: ../e-util/e-table-header-item.c:1706
+#: ../e-util/e-table-header-item.c:1700
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1724
+#: ../e-util/e-table-header-item.c:1723
 msgid "_Custom"
 msgstr "自選(_C)"
 
@@ -10977,59 +10937,87 @@ msgstr "輸入法"
 msgid "UTC"
 msgstr "UTC"
 
-#: ../e-util/e-url-entry.c:80
-msgid "Click here to go to URL"
-msgstr "按這裏以移至 URL"
+#: ../e-util/e-url-entry.c:109
+msgid "Click here to open the URL"
+msgstr "按這裏以開啟 URL"
+
+#: ../e-util/e-url-entry.c:111
+msgid "Enter a URL here"
+msgstr "請在這裏輸入 URL"
 
-#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:273
+#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:275
+#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:287
 msgid "Copy the link to the clipboard"
 msgstr "複製連結到剪貼薄"
 
-#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:283
+#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:295
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結(_O)"
 
-#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:297
 msgid "Open the link in a web browser"
 msgstr "åœ¨ç¶²é ç€è¦½å™¨ä¸­é–‹å•Ÿæ­¤é€£çµ"
 
-#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:293
+#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:305
 msgid "_Copy Email Address"
 msgstr "複製電子郵件位址(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:310
+#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:322
 msgid "_Copy Image"
 msgstr "複製圖片(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:312
+#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:324
 msgid "Copy the image to the clipboard"
 msgstr "複製圖片到剪貼薄"
 
 #: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
-#: ../e-util/e-web-view.c:332 ../e-util/e-web-view.c:1419
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1261
 msgid "Select all text and images"
 msgstr "選擇所有文字和圖片"
 
 #: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
-#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:1086
-#: ../e-util/e-web-view.c:1088 ../e-util/e-web-view.c:1090
+#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:936
+#: ../e-util/e-web-view.c:938 ../e-util/e-web-view.c:940
 #, c-format
 msgid "Click to call %s"
 msgstr "按一下播號給 %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:1092
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:942
 msgid "Click to hide/unhide addresses"
 msgstr "按這裏隱藏/解除隱藏位址"
 
-#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1094
+#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:944
 #, c-format
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
 
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "儲存圖片(_I)…"
+
+#: ../e-util/e-web-view.c:331
+msgid "Save the image to a file"
+msgstr "將圖片儲存為檔案"
+
+#: ../e-util/e-web-view.c:2832
+#, fuzzy
+#| msgid "Copy the image to the clipboard"
+msgid "Copying image to clipboard"
+msgstr "複製圖片到剪貼薄"
+
+#: ../e-util/e-web-view.c:3020
+msgid "Save Image"
+msgstr "儲存圖片"
+
+#: ../e-util/e-web-view.c:3056
+#, fuzzy, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Saving image to '%s'"
+msgstr "將郵件移到「%s」"
+
 #: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
 msgid "%d %B %Y"
 msgstr "%Y年%m月%d日"
@@ -11137,23 +11125,10 @@ msgstr "點選"
 msgid "sort"
 msgstr "排序"
 
-#: ../e-util/gal-define-views-dialog.c:385
-#: ../e-util/gal-define-views-dialog.c:388
-msgid "Define Views"
-msgstr "定義檢視"
-
-#: ../e-util/gal-view-factory-etable.c:114
-msgid "Table"
-msgstr "è¡¨æ ¼"
-
 #: ../e-util/gal-view-instance-save-as-dialog.c:296
 msgid "Save Current View"
 msgstr "儲存目前檢視"
 
-#: ../e-util/gal-view-new-dialog.c:173
-msgid "Define New View"
-msgstr "定義新的檢視"
-
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的更改？"
@@ -11175,10 +11150,22 @@ msgid "Please provide an unique name to identify this signature."
 msgstr "請輸入可供辨識這個簽名檔的獨特名稱。"
 
 #: ../e-util/widgets.error.xml.h:6
+#, fuzzy
+#| msgid "Copy the image to the clipboard"
+msgid "Unable to copy image to clipboard."
+msgstr "複製圖片到剪貼薄"
+
+#: ../e-util/widgets.error.xml.h:7
+#, fuzzy
+#| msgid "Unable to save {0}."
+msgid "Unable to save image."
+msgstr "無法儲存 {0}。"
+
+#: ../e-util/widgets.error.xml.h:8
 msgid "Could not load signature."
 msgstr "無法載入簽署。"
 
-#: ../e-util/widgets.error.xml.h:7
+#: ../e-util/widgets.error.xml.h:9
 msgid "Could not save signature."
 msgstr "無法儲存簽署。"
 
@@ -11200,69 +11187,62 @@ msgstr "無效的驗證結果代碼 (%d)"
 msgid "Saving message to folder '%s'"
 msgstr "儲存郵件到資料夾「%s」"
 
-#: ../libemail-engine/e-mail-folder-utils.c:573
+#: ../libemail-engine/e-mail-folder-utils.c:572
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:683
-#: ../libemail-engine/e-mail-folder-utils.c:934
+#: ../libemail-engine/e-mail-folder-utils.c:682
+#: ../libemail-engine/e-mail-folder-utils.c:933
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "取回 %d 封郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:777
+#: ../libemail-engine/e-mail-folder-utils.c:776
 msgid "Scanning messages for duplicates"
 msgstr "掃描郵件是否有重複"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1185
+#: ../libemail-engine/e-mail-folder-utils.c:1184
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移除資料夾「%s」"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1322
+#: ../libemail-engine/e-mail-folder-utils.c:1321
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "檔案「%s」已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1326
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 msgid "File has been removed."
 msgstr "檔案已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1385
+#: ../libemail-engine/e-mail-folder-utils.c:1384
 msgid "Removing attachments"
 msgstr "正在移除附件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1549
+#: ../libemail-engine/e-mail-folder-utils.c:1548
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "儲存 %d 封郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1905 ../mail/em-folder-utils.c:610
+#: ../libemail-engine/e-mail-folder-utils.c:1926 ../mail/em-folder-utils.c:610
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "無效的資料夾 URI「%s」"
 
 #: ../libemail-engine/e-mail-session-utils.c:540
-#, c-format
-msgid "No mail service found with UID '%s'"
-msgstr "沒有 UID「%s」的郵件服務"
-
-#: ../libemail-engine/e-mail-session-utils.c:549
-#, c-format
-msgid "UID '%s' is not a mail transport"
-msgstr "UID「%s」不是郵件傳輸"
+msgid "No mail transport service available"
+msgstr "沒有可用的郵件傳輸服務"
 
-#: ../libemail-engine/e-mail-session-utils.c:647
-#: ../libemail-engine/mail-ops.c:765
+#: ../libemail-engine/e-mail-session-utils.c:638
+#: ../libemail-engine/mail-ops.c:706
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器：%s"
 
-#: ../libemail-engine/e-mail-session-utils.c:676
-#: ../libemail-engine/e-mail-session-utils.c:710
-#: ../libemail-engine/mail-ops.c:784 ../libemail-engine/mail-ops.c:817
+#: ../libemail-engine/e-mail-session-utils.c:685
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11271,94 +11251,94 @@ msgstr ""
 "ç„¡æ³•é™„åŠ è‡³ %s：%s\n"
 "æ”¹é™„åŠ è‡³æœ¬åœ°ã€Œå¯„ä»¶åŒ£ã€è³‡æ–™å¤¾ã€‚"
 
-#: ../libemail-engine/e-mail-session-utils.c:730
-#: ../libemail-engine/mail-ops.c:839
+#: ../libemail-engine/e-mail-session-utils.c:711
+#: ../libemail-engine/mail-ops.c:774
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ç„¡æ³•é™„åŠ è‡³æœ¬åœ°ã€Œå¯„ä»¶åŒ£ã€è³‡æ–™å¤¾ï¼š%s"
 
-#: ../libemail-engine/e-mail-session-utils.c:974
-#: ../libemail-engine/mail-ops.c:971 ../libemail-engine/mail-ops.c:1073
+#: ../libemail-engine/e-mail-session-utils.c:912
+#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
 msgid "Sending message"
 msgstr "正在傳送郵件"
 
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:336
-#: ../mail/em-folder-tree-model.c:764
-#: ../modules/mail/e-mail-shell-view-private.c:1094
-#: ../modules/mail/e-mail-shell-view-private.c:1105
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:342
+#: ../mail/em-folder-tree-model.c:786
+#: ../modules/mail/e-mail-shell-view-private.c:1068
+#: ../modules/mail/e-mail-shell-view-private.c:1079
 msgid "Inbox"
 msgstr "收件匣"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:757
-#: ../modules/mail/e-mail-shell-view-private.c:1092
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:779
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:768
-#: ../modules/mail/e-mail-shell-view-private.c:1096
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:790
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Outbox"
 msgstr "寄件匣"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:772
-#: ../modules/mail/e-mail-shell-view-private.c:1098
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:794
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Sent"
 msgstr "已傳送"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:760
-#: ../modules/mail/e-mail-shell-view-private.c:1100
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:782
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1071 ../plugins/templates/templates.c:1368
-#: ../plugins/templates/templates.c:1378
+#: ../plugins/templates/templates.c:1082 ../plugins/templates/templates.c:1381
+#: ../plugins/templates/templates.c:1391
 msgid "Templates"
 msgstr "範本"
 
-#: ../libemail-engine/e-mail-session.c:1394
+#: ../libemail-engine/e-mail-session.c:1344
 #, c-format
 msgid "User cancelled operation"
 msgstr "使用者取消的操作"
 
-#: ../libemail-engine/e-mail-session.c:1615
+#: ../libemail-engine/e-mail-session.c:1534
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 驗證失敗"
 
-#: ../libemail-engine/e-mail-session.c:1660
+#: ../libemail-engine/e-mail-session.c:1584
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../libemail-engine/e-mail-session.c:1711
+#: ../libemail-engine/e-mail-session.c:1647
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "沒有提供目的地位址，郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-session.c:1724
+#: ../libemail-engine/e-mail-session.c:1660
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "找不到可使用的識別符，郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-store-utils.c:171
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "中斷與「%s」的連線"
 
-#: ../libemail-engine/e-mail-store-utils.c:263
+#: ../libemail-engine/e-mail-store-utils.c:279
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "重新連線到「%s」"
 
-#: ../libemail-engine/e-mail-store-utils.c:340
+#: ../libemail-engine/e-mail-store-utils.c:370
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "準備帳號「%s」離線工作"
 
-#: ../libemail-engine/mail-folder-cache.c:884
+#: ../libemail-engine/mail-folder-cache.c:1240
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -11383,7 +11363,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "從「%s」匯入郵件"
 
-#: ../libemail-engine/mail-ops.c:759
+#: ../libemail-engine/mail-ops.c:700
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -11394,51 +11374,51 @@ msgstr ""
 "ç„¡æ³•å¥—ç”¨å¤–å¯„éŽæ¿¾å™¨ã€‚å…¶ä¸­ä¸€å€‹åŽŸå› å¯èƒ½æ˜¯è³‡æ–™å¤¾ä½ç½®è¨­å®šçš„ä¸€æˆ–å¤šå€‹éŽæ¿¾å™¨æ˜¯ç„¡æ•ˆçš„ã€‚è«‹åœ¨ç·¨è¼¯->éƒµä»¶è¦å‰‡ä¸­æª¢æŸ¥ä½ çš„éŽæ¿¾å™¨ã€‚\n"
 "原始錯誤訊息是：%s"
 
-#: ../libemail-engine/mail-ops.c:982
+#: ../libemail-engine/mail-ops.c:916
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
 
-#: ../libemail-engine/mail-ops.c:1034
+#: ../libemail-engine/mail-ops.c:968
 #, 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:1040
+#: ../libemail-engine/mail-ops.c:974
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../libemail-engine/mail-ops.c:1042
+#: ../libemail-engine/mail-ops.c:976
 msgid "Complete."
 msgstr "完成。"
 
-#: ../libemail-engine/mail-ops.c:1154
+#: ../libemail-engine/mail-ops.c:1088
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "將郵件移到「%s」"
 
-#: ../libemail-engine/mail-ops.c:1155
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "將郵件複製到「%s」"
 
-#: ../libemail-engine/mail-ops.c:1274
+#: ../libemail-engine/mail-ops.c:1208
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在貯藏資料夾「%s」"
 
-#: ../libemail-engine/mail-ops.c:1402
+#: ../libemail-engine/mail-ops.c:1336
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "清空和儲存帳號 '%s'"
 
-#: ../libemail-engine/mail-ops.c:1403
+#: ../libemail-engine/mail-ops.c:1337
 #, c-format
 msgid "Storing account '%s'"
 msgstr "儲存帳號 '%s'"
 
-#: ../libemail-engine/mail-ops.c:1477
+#: ../libemail-engine/mail-ops.c:1411
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空「%s」的回收筒"
@@ -11462,12 +11442,12 @@ msgstr "轉寄的郵件 - %s"
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
-#: ../libemail-engine/mail-vfolder.c:127
+#: ../libemail-engine/mail-vfolder.c:153
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設定搜尋資料夾： %s"
 
-#: ../libemail-engine/mail-vfolder.c:280
+#: ../libemail-engine/mail-vfolder.c:306
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "更新「%s」的搜尋資料夾- %s"
@@ -11477,7 +11457,7 @@ msgstr "更新「%s」的搜尋資料夾- %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:646
+#: ../libemail-engine/mail-vfolder.c:670
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -11491,22 +11471,30 @@ msgstr[0] ""
 "搜尋資料夾「%sã€å·²ç¶“ä¿®æ”¹ï¼Œå› ç‚ºå®ƒåªç”¨åœ¨å‰›å‰›åˆªé™¤çš„è³‡æ–™å¤¾\n"
 "「%s」。"
 
-#: ../mail/e-mail-account-manager.c:460
+#: ../mail/e-mail-account-manager.c:116 ../mail/e-mail-account-manager.c:203
+msgid "Open _Online Accounts"
+msgstr "開啟網上帳號(_O)"
+
+#: ../mail/e-mail-account-manager.c:142 ../mail/e-mail-account-manager.c:229
+msgid "This account was created through the Online Accounts service."
+msgstr "這個帳號是透過 Online Accounts 服務建立的。"
+
+#: ../mail/e-mail-account-manager.c:690
 msgid "_Restore Default"
 msgstr "é‚„åŽŸç‚ºé è¨­å€¼(_R)"
 
-#: ../mail/e-mail-account-manager.c:473
+#: ../mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
 msgstr "ä½ å¯ä»¥æ‹–æ”¾å¸³è™Ÿåç¨±ä¾†èª¿æ•´å®ƒå€‘çš„é †åºã€‚"
 
-#: ../mail/e-mail-account-manager.c:518
+#: ../mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "é è¨­å€¼(_F)"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:488
+#: ../modules/mail/em-composer-prefs.c:443
 #: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:876
+#: ../plugins/publish-calendar/publish-calendar.c:875
 msgid "Enabled"
 msgstr "已啟用"
 
@@ -11516,29 +11504,29 @@ msgstr "帳號名稱"
 
 #: ../mail/e-mail-account-tree-view.c:136
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3684
-#: ../mail/mail-config.ui.h:44
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3530
+#: ../mail/mail-config.ui.h:49
 msgid "Default"
 msgstr "é è¨­å€¼"
 
-#: ../mail/e-mail-autoconfig.c:525
+#: ../mail/e-mail-autoconfig.c:578
 msgid "No email address provided"
 msgstr "沒有提供電子郵件位址"
 
-#: ../mail/e-mail-autoconfig.c:534
+#: ../mail/e-mail-autoconfig.c:587
 msgid "Missing domain in email address"
 msgstr "電子郵件位址缺乏網域"
 
-#: ../mail/e-mail-backend.c:766
+#: ../mail/e-mail-backend.c:737
 msgid "Unknown background operation"
 msgstr "不明的背景操作"
 
-#: ../mail/e-mail-browser.c:123 ../shell/e-shell-window-actions.c:848
-#: ../shell/e-shell-window-actions.c:855 ../shell/e-shell-window-actions.c:862
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
 msgid "Close this window"
 msgstr "關閉本視窗"
 
-#: ../mail/e-mail-browser.c:280
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(沒有主旨)"
 
@@ -11724,7 +11712,8 @@ msgid "Receiving Email"
 msgstr "接收電子郵件"
 
 #: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:260 ../mail/mail-config.ui.h:19
+#: ../mail/em-folder-properties.c:266 ../mail/mail-config.ui.h:24
+#: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:91
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
@@ -11749,22 +11738,22 @@ msgid "Si_gning algorithm:"
 msgstr "簽署演算法(_G):"
 
 #: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:50
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:51
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:52
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:53
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -11895,38 +11884,30 @@ msgstr "歡迎使用"
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
-#: ../mail/e-mail-display.c:113
+#: ../mail/e-mail-display.c:96
 msgid "_Add to Address Book..."
 msgstr "åŠ å…¥åˆ°é€šè¨ŠéŒ„(_A)…"
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:103
 msgid "_To This Address"
 msgstr "到這個位址(_T)"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:110
 msgid "_From This Address"
 msgstr "從這個位址(_F)"
 
-#: ../mail/e-mail-display.c:134
+#: ../mail/e-mail-display.c:117
 msgid "Send _Reply To..."
 msgstr "傳送回覆到(_R)…"
 
-#: ../mail/e-mail-display.c:136
+#: ../mail/e-mail-display.c:119
 msgid "Send a reply message to this address"
 msgstr "傳送回覆郵件到這個位址"
 
-#: ../mail/e-mail-display.c:143
+#: ../mail/e-mail-display.c:126
 msgid "Create Search _Folder"
 msgstr "建立搜尋資料夾(_F)"
 
-#: ../mail/e-mail-display.c:153
-msgid "Save _Image..."
-msgstr "儲存圖片(_I)…"
-
-#: ../mail/e-mail-display.c:155
-msgid "Save the image to a file"
-msgstr "將圖片儲存為檔案"
-
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
 #: ../mail/e-mail-junk-options.c:252
@@ -11962,7 +11943,7 @@ msgid "_Later"
 msgstr "稍後(_L)"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:771
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "Add Label"
 msgstr "åŠ å…¥æ¨™ç±¤"
 
@@ -11982,665 +11963,634 @@ msgstr ""
 msgid "Color"
 msgstr "顏色"
 
-#: ../mail/e-mail-notebook-view.c:269
-msgid "Please select a folder"
-msgstr "請選擇資料夾"
+#: ../mail/e-mail-print-config-headers.c:167
+msgid "Move selected headers to top"
+msgstr "å°‡é¸å–çš„æª”é ­ç§»è‡³é ‚ç«¯"
 
-#: ../mail/e-mail-printer.c:123
-#, c-format
-msgid "Page %d of %d"
-msgstr "第 %d / %d é "
+#: ../mail/e-mail-print-config-headers.c:172
+msgid "Move selected headers up one row"
+msgstr "å°‡é¸å–çš„æª”é ­ä¸Šç§»ä¸€åˆ—"
 
-#: ../mail/e-mail-printer.c:573
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-msgid "Print"
-msgstr "列印"
+#: ../mail/e-mail-print-config-headers.c:177
+msgid "Move selected headers down one row"
+msgstr "å°‡é¸å–çš„æª”é ­ä¸‹ç§»ä¸€åˆ—"
+
+#: ../mail/e-mail-print-config-headers.c:182
+msgid "Move selected headers to bottom"
+msgstr "å°‡é¸å–çš„æª”é ­ç§»è‡³åº•éƒ¨"
+
+#: ../mail/e-mail-print-config-headers.c:187
+msgid "Select all headers"
+msgstr "é¸å–æ‰€æœ‰çš„æª”é ­"
 
-#: ../mail/e-mail-printer.c:579
+#: ../mail/e-mail-print-config-headers.c:206
 msgid "Header Name"
 msgstr "æ¨™é ­åç¨±ï¼š"
 
-#: ../mail/e-mail-printer.c:585
+#: ../mail/e-mail-print-config-headers.c:215
 msgid "Header Value"
 msgstr "æ¨™é ­æ•¸å€¼"
 
-#: ../mail/e-mail-printer.c:639 ../mail/mail-config.ui.h:102
+#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:101
 msgid "Headers"
 msgstr "æª”é ­"
 
-#: ../mail/e-mail-reader.c:347
-msgid "Save Image"
-msgstr "儲存圖片"
+#: ../mail/e-mail-printer.c:167
+#, c-format
+msgid "Page %d of %d"
+msgstr "第 %d / %d é "
 
-#: ../mail/e-mail-reader.c:429 ../mail/em-filter-i18n.h:12
+#: ../mail/e-mail-reader.c:346 ../mail/em-filter-i18n.h:12
 msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
-#: ../mail/e-mail-reader.c:429 ../mail/em-folder-utils.c:489
+#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:489
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../mail/e-mail-reader.c:963 ../mail/em-filter-i18n.h:54
+#: ../mail/e-mail-reader.c:846 ../mail/em-filter-i18n.h:54
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: ../mail/e-mail-reader.c:963 ../mail/em-folder-utils.c:489
+#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:489
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../mail/e-mail-reader.c:1311 ../mail/e-mail-reader.c:1511
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1172 ../mail/e-mail-reader.c:1382
+#: ../mail/e-mail-reader.c:1422
 msgid "_Do not ask me again."
 msgstr "不要再詢問我(_D)。"
 
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1428
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æ°¸é å¿½ç•¥é€šä¿¡è«–å£‡çš„å›žè¦†æ¬„ä½(_A)"
 
-#: ../mail/e-mail-reader.c:1752
+#: ../mail/e-mail-reader.c:1630
 msgid "Failed to retrieve message:"
 msgstr "取回郵件失敗："
 
-#: ../mail/e-mail-reader.c:1798 ../mail/e-mail-reader.c:2891
+#: ../mail/e-mail-reader.c:1670 ../mail/e-mail-reader.c:2772
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "正在取回郵件「%s」"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1858
 msgid "A_dd Sender to Address Book"
 msgstr "åŠ å…¥å¯„ä»¶è€…åˆ°ç›®éŒ„æœå‹™(_D)"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1860
 msgid "Add sender to address book"
 msgstr "新增寄件者至通訊錄"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1865
 msgid "Check for _Junk"
 msgstr "檢查垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1867
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾郵件狀態"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1872
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)…"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1874
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1879
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1881
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:1886
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "從通信論壇建立過濾器規則(_L)…"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1888
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個通信論壇建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1893
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "從收件者建立過濾器規則(_R)…"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:1895
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:1900
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "從寄件者建立過濾器規則(_N)…"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:1902
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1907
 msgid "Create a Filter Rule for _Subject..."
 msgstr "從主旨建立過濾器規則(_S)…"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:1909
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1914
 msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:1916
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的郵件"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1921
 msgid "_Find in Message..."
 msgstr "在郵件內尋找(_F)…"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:1923
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1928
 msgid "_Clear Flag"
 msgstr "清除標幟(_C)"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:1930
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "移除選取郵件的跟隨旗標"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1935
 msgid "_Flag Completed"
 msgstr "標記為已完成(_F)"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:1937
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "將已選取郵件的跟隨旗標設為已完成"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1942
 msgid "Follow _Up..."
 msgstr "跟隨(_U)…"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:1944
 msgid "Flag the selected messages for follow-up"
 msgstr "å°‡é¸å®šçš„éƒµä»¶åŠ ä¸Šè·Ÿéš¨æ——æ¨™"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:1949
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../mail/e-mail-reader.c:2068 ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:1951 ../mail/e-mail-reader.c:1958
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附件形式轉寄給某人"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:1956
 msgid "Forward As _Attached"
 msgstr "以附件轉寄(_A)"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:1963
 msgid "_Inline"
 msgstr "行內(_I)"
 
-#: ../mail/e-mail-reader.c:2082 ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:1965 ../mail/e-mail-reader.c:1972
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:1970
 msgid "Forward As _Inline"
 msgstr "以行內轉寄(_I)"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:1977
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
-#: ../mail/e-mail-reader.c:2096 ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:1979 ../mail/e-mail-reader.c:1986
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:1984
 msgid "Forward As _Quoted"
 msgstr "以引文轉寄(_Q)"
 
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:1991
 msgid "_Load Images"
 msgstr "載入圖片(_L)"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:1993
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML æ ¼å¼çš„éƒµä»¶æ™‚å¼·è¿«è¼‰å…¥åœ–ç‰‡"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:1998
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2000
 msgid "Mark the selected messages as important"
 msgstr "將選定的郵件標示成重要"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2005
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2007
 msgid "Mark the selected messages as junk"
 msgstr "將選定的郵件標示成垃圾郵件"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2012
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2014
 msgid "Mark the selected messages as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2019
 msgid "_Read"
 msgstr "已閱讀(_R)"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2021
 msgid "Mark the selected messages as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2026
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2028
 msgid "Mark the selected messages as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
-#: ../mail/e-mail-reader.c:2150
+#: ../mail/e-mail-reader.c:2033
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2035
 msgid "Mark the selected messages as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2040
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)…"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2042
 msgid "Open the selected messages in the composer for editing"
 msgstr "在撰寫視窗開啟選取的郵件以便編輯"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2047
 msgid "Compose _New Message"
 msgstr "撰寫新郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2049
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2054
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2056
 msgid "Open the selected messages in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2061
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)…"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2063
 msgid "Move selected messages to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
-#: ../mail/e-mail-reader.c:2185
-msgid "_Switch to Folder"
-msgstr "切換至資料夾(_S)"
-
-#: ../mail/e-mail-reader.c:2187
-msgid "Display the parent folder"
-msgstr "顯示上層資料夾"
-
-#: ../mail/e-mail-reader.c:2192
-msgid "Switch to _next tab"
-msgstr "åˆ‡æ›è‡³ä¸‹ä¸€å€‹åˆ†é (_N)"
-
-#: ../mail/e-mail-reader.c:2194
-msgid "Switch to the next tab"
-msgstr "åˆ‡æ›è‡³ä¸‹ä¸€å€‹åˆ†é "
-
-#: ../mail/e-mail-reader.c:2199
-msgid "Switch to _previous tab"
-msgstr "åˆ‡æ›è‡³ä¸Šä¸€å€‹åˆ†é (_P)"
-
-#: ../mail/e-mail-reader.c:2201
-msgid "Switch to the previous tab"
-msgstr "åˆ‡æ›è‡³ä¸Šä¸€å€‹åˆ†é "
-
-#: ../mail/e-mail-reader.c:2206
-msgid "Cl_ose current tab"
-msgstr "é—œé–‰ç›®å‰çš„åˆ†é (_O)"
-
-#: ../mail/e-mail-reader.c:2208
-msgid "Close current tab"
-msgstr "é—œé–‰ç›®å‰çš„åˆ†é "
-
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2068
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2070
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2075
 msgid "Next _Important Message"
 msgstr "下一封重要郵件(_I)"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2077
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2082
 msgid "Next _Thread"
 msgstr "下一封相關郵件(_T)"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2084
 msgid "Display the next thread"
 msgstr "顯示下一封相關郵件"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2089
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2091
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2096
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2098
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2103
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2105
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2110
 msgid "Previous T_hread"
 msgstr "上一封相關郵件(_H)"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2112
 msgid "Display the previous thread"
 msgstr "顯示上一封相關郵件"
 
-#: ../mail/e-mail-reader.c:2262
+#: ../mail/e-mail-reader.c:2117
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2119
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2126
 msgid "Print this message"
 msgstr "列印郵件"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2133
 msgid "Preview the message to be printed"
 msgstr "é è¦½éœ€è¦åˆ—å°çš„éƒµä»¶"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2138
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2140
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2145
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2147
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2152
 msgid "Remove Du_plicate Messages"
 msgstr "移除重複的郵件(_P)"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2154
 msgid "Checks selected messages for duplicates"
 msgstr "檢查選取的郵件是否有重複"
 
-#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
-#: ../modules/mail/e-mail-attachment-handler.c:196
+#: ../mail/e-mail-reader.c:2159 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1548
+#: ../modules/mail/e-mail-attachment-handler.c:214
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2161
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "撰寫回郵給已選取郵件的全部收件者"
 
-#: ../mail/e-mail-reader.c:2311 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2166 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2168
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "撰寫回郵給所選定郵件的通信論壇"
 
-#: ../mail/e-mail-reader.c:2318
-#: ../modules/mail/e-mail-attachment-handler.c:203
+#: ../mail/e-mail-reader.c:2173
+#: ../modules/mail/e-mail-attachment-handler.c:221
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2175
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2180
 msgid "_Save as mbox..."
 msgstr "儲存成 mbox(_S)…"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2182
 msgid "Save selected messages as an mbox file"
 msgstr "將選定的郵件另存成 mbox 檔案"
 
-#: ../mail/e-mail-reader.c:2332
+#: ../mail/e-mail-reader.c:2187
 msgid "_Message Source"
 msgstr "郵件來源(_M)"
 
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2189
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2201
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2203
 msgid "Undelete the selected messages"
 msgstr "取消刪除選定的郵件"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2208
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2210
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2215
 msgid "_Zoom In"
 msgstr "拉近(_Z)"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2217
 msgid "Increase the text size"
 msgstr "將文字放大"
 
-#: ../mail/e-mail-reader.c:2367
+#: ../mail/e-mail-reader.c:2222
 msgid "Zoom _Out"
 msgstr "æ‹‰é (_O)"
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2224
 msgid "Decrease the text size"
 msgstr "將文字縮小"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2231
 msgid "Cre_ate"
 msgstr "建立(_A)"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2238
 msgid "Ch_aracter Encoding"
 msgstr "字符編碼(_A)"
 
-#: ../mail/e-mail-reader.c:2390
+#: ../mail/e-mail-reader.c:2245
 msgid "F_orward As"
 msgstr "轉寄為(_O)"
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2252
 msgid "_Group Reply"
 msgstr "羣組回覆(_G)"
 
-#: ../mail/e-mail-reader.c:2404
+#: ../mail/e-mail-reader.c:2259
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2266
 msgid "Mar_k As"
 msgstr "標示成(_K)"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2273
 msgid "_Message"
 msgstr "郵件(_M)"
 
-#: ../mail/e-mail-reader.c:2425
+#: ../mail/e-mail-reader.c:2280
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2290
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "從通信論壇建立搜尋資料夾(_L)…"
 
-#: ../mail/e-mail-reader.c:2437
+#: ../mail/e-mail-reader.c:2292
 msgid "Create a search folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2442
+#: ../mail/e-mail-reader.c:2297
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "從收件者建立搜尋資料夾(_T)…"
 
-#: ../mail/e-mail-reader.c:2444
+#: ../mail/e-mail-reader.c:2299
 msgid "Create a search folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2449
+#: ../mail/e-mail-reader.c:2304
 msgid "Create a Search Folder from Sen_der..."
 msgstr "從寄件者建立搜尋資料夾(_D)…"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2306
 msgid "Create a search folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2456
+#: ../mail/e-mail-reader.c:2311
 msgid "Create a Search Folder from S_ubject..."
 msgstr "從主旨建立搜尋資料夾(_U)…"
 
-#: ../mail/e-mail-reader.c:2458
+#: ../mail/e-mail-reader.c:2313
 msgid "Create a search folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2481
+#: ../mail/e-mail-reader.c:2336
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)…"
 
-#: ../mail/e-mail-reader.c:2489
+#: ../mail/e-mail-reader.c:2344
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
-#: ../mail/e-mail-reader.c:2493
+#: ../mail/e-mail-reader.c:2348
 msgid "Mark as _Junk"
 msgstr "標示成垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:2497
+#: ../mail/e-mail-reader.c:2352
 msgid "Mark as _Not Junk"
 msgstr "標示成非垃圾郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2501
+#: ../mail/e-mail-reader.c:2356
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
-#: ../mail/e-mail-reader.c:2505
+#: ../mail/e-mail-reader.c:2360
 msgid "Mark as Uni_mportant"
 msgstr "標示成不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2509
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
-#: ../mail/e-mail-reader.c:2553
+#: ../mail/e-mail-reader.c:2408
 msgid "_Caret Mode"
 msgstr "漏字模式(_C)"
 
-#: ../mail/e-mail-reader.c:2555
+#: ../mail/e-mail-reader.c:2410
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在顯示的郵件內文中顯示閃爍游標"
 
-#: ../mail/e-mail-reader.c:2561
+#: ../mail/e-mail-reader.c:2416
 msgid "All Message _Headers"
 msgstr "æ‰€æœ‰éƒµä»¶æª”é ­(_H)"
 
-#: ../mail/e-mail-reader.c:2563
+#: ../mail/e-mail-reader.c:2418
 msgid "Show messages with all email headers"
 msgstr "é¡¯ç¤ºéƒµä»¶åŠè©³ç´°æª”é ­"
 
-#: ../mail/e-mail-reader.c:2897
+#: ../mail/e-mail-reader.c:2778
 msgid "Retrieving message"
 msgstr "取回郵件"
 
-#: ../mail/e-mail-reader.c:3877
-#: ../modules/mail/e-mail-attachment-handler.c:189
+#: ../mail/e-mail-reader.c:3700
+#: ../modules/mail/e-mail-attachment-handler.c:207
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/e-mail-reader.c:3878
+#: ../mail/e-mail-reader.c:3701
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
-#: ../mail/e-mail-reader.c:3897
+#: ../mail/e-mail-reader.c:3720
 msgid "Group Reply"
 msgstr "羣組回覆"
 
-#: ../mail/e-mail-reader.c:3898
+#: ../mail/e-mail-reader.c:3721
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "回覆給通信論壇，或是給所有的收件者"
 
-#: ../mail/e-mail-reader.c:3964 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:3787 ../mail/em-filter-i18n.h:15
 msgid "Delete"
 msgstr "刪除"
 
-#: ../mail/e-mail-reader.c:3997
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../mail/e-mail-reader.c:3799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "Next"
 msgstr "下一個"
 
-#: ../mail/e-mail-reader.c:4001
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../mail/e-mail-reader.c:3803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Previous"
 msgstr "上一個"
 
-#: ../mail/e-mail-reader.c:4010 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3812 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/e-mail-reader.c:4728
-#, c-format
-msgid "Folder '%s'"
-msgstr "資料夾「%s」"
-
-#: ../mail/e-mail-reader-utils.c:161
+#: ../mail/e-mail-reader-utils.c:151
 msgid "Do not warn me again"
 msgstr "不要再警告我"
 
-#: ../mail/e-mail-reader-utils.c:962
+#: ../mail/e-mail-reader-utils.c:976
 msgid "Printing"
 msgstr "列印"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1149
+#: ../mail/e-mail-reader-utils.c:1211
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -12650,7 +12600,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "資料夾「%s」包含 %u å°é‡è¤‡çš„éƒµä»¶ã€‚ä½ ç¢ºå®šè¦åˆªé™¤å®ƒï¼Ÿ"
 
-#: ../mail/e-mail-reader-utils.c:1614
+#: ../mail/e-mail-reader-utils.c:2035
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "儲存郵件"
@@ -12660,21 +12610,20 @@ 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:1635
+#: ../mail/e-mail-reader-utils.c:2056
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "郵件"
 
-#: ../mail/e-mail-reader-utils.c:2085
+#: ../mail/e-mail-reader-utils.c:2425
 msgid "Parsing message"
 msgstr "解析郵件"
 
-#: ../mail/e-mail-request.c:177
-#, c-format
-msgid "Failed to load part '%s'"
-msgstr "無法載入部分「%s」"
+#: ../mail/e-mail-request.c:182
+msgid "The message has no text content."
+msgstr "這個郵件沒有文字內容。"
 
-#: ../mail/e-mail-tag-editor.c:292
+#: ../mail/e-mail-tag-editor.c:238
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
@@ -12682,29 +12631,29 @@ 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:1278
+#: ../mail/em-composer-utils.c:1368
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} ${TimeZone}，${Sender} 提到："
 
-#: ../mail/em-composer-utils.c:1284
+#: ../mail/em-composer-utils.c:1374
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-#: ../mail/em-composer-utils.c:1289
+#: ../mail/em-composer-utils.c:1379
 msgid "-----Original Message-----"
 msgstr "-----原始郵件-----"
 
-#: ../mail/em-composer-utils.c:2611
+#: ../mail/em-composer-utils.c:2524
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
-#: ../mail/em-composer-utils.c:3030
+#: ../mail/em-composer-utils.c:2945
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-#: ../mail/em-composer-utils.c:3031
+#: ../mail/em-composer-utils.c:2946
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
@@ -12837,7 +12786,7 @@ msgstr "未設定"
 msgid "is set"
 msgstr "設定"
 
-#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:109
+#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:108
 msgid "Junk"
 msgstr "垃圾郵件"
 
@@ -12999,7 +12948,7 @@ msgstr "配額使用量 (%s):"
 msgid "Quota usage"
 msgstr "限制用量"
 
-#: ../mail/em-folder-properties.c:341
+#: ../mail/em-folder-properties.c:347
 msgid "Folder Properties"
 msgstr "資料夾內容"
 
@@ -13039,12 +12988,12 @@ msgstr "正在移動資料夾 %s"
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2283
+#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2280
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2285
+#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2282
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
@@ -13055,11 +13004,11 @@ msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../mail/em-folder-tree-model.c:848 ../mail/em-folder-tree-model.c:1133
+#: ../mail/em-folder-tree-model.c:870 ../mail/em-folder-tree-model.c:1160
 msgid "Loading..."
 msgstr "載入中…"
 
@@ -13091,8 +13040,8 @@ msgstr "要顯示的訂閱(_B)"
 msgid "Subscribe To _All"
 msgstr "全部訂閱(_A)"
 
-#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1842
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
@@ -13108,52 +13057,52 @@ msgstr "全部取消訂閱(_A)"
 msgid "Folder Subscriptions"
 msgstr "資料夾訂閱"
 
-#: ../mail/em-subscription-editor.c:1717
+#: ../mail/em-subscription-editor.c:1716
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../mail/em-subscription-editor.c:1732
+#: ../mail/em-subscription-editor.c:1729
 msgid "Clear Search"
 msgstr "清除搜尋"
 
-#: ../mail/em-subscription-editor.c:1750
+#: ../mail/em-subscription-editor.c:1746
 msgid "Sho_w items that contain:"
 msgstr "é¡¯ç¤ºé …ç›®åŒ…å«(_W):"
 
-#: ../mail/em-subscription-editor.c:1795
+#: ../mail/em-subscription-editor.c:1789
 msgid "Subscribe to the selected folder"
 msgstr "訂閱選取的資料夾"
 
-#: ../mail/em-subscription-editor.c:1796
+#: ../mail/em-subscription-editor.c:1790
 msgid "Su_bscribe"
 msgstr "訂閱(_B)"
 
-#: ../mail/em-subscription-editor.c:1841
-#: ../modules/mail/e-mail-shell-view-actions.c:1400
+#: ../mail/em-subscription-editor.c:1835
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "Unsubscribe from the selected folder"
 msgstr "取消訂閱選取的資料夾"
 
-#: ../mail/em-subscription-editor.c:1881
+#: ../mail/em-subscription-editor.c:1875
 msgid "Collapse all folders"
 msgstr "收摺所有的資料夾"
 
-#: ../mail/em-subscription-editor.c:1882
+#: ../mail/em-subscription-editor.c:1876
 msgid "C_ollapse All"
 msgstr "全部收摺(_O)"
 
-#: ../mail/em-subscription-editor.c:1892
+#: ../mail/em-subscription-editor.c:1886
 msgid "Expand all folders"
 msgstr "展開所有的資料夾"
 
-#: ../mail/em-subscription-editor.c:1893
+#: ../mail/em-subscription-editor.c:1887
 msgid "E_xpand All"
 msgstr "全部展開(_X)"
 
-#: ../mail/em-subscription-editor.c:1903
+#: ../mail/em-subscription-editor.c:1897
 msgid "Refresh the folder list"
 msgstr "重新整理資料夾清單"
 
-#: ../mail/em-subscription-editor.c:1915
+#: ../mail/em-subscription-editor.c:1909
 msgid "Stop the current operation"
 msgstr "停止目前的操作"
 
@@ -13161,22 +13110,22 @@ msgstr "停止目前的操作"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:97
+#: ../mail/em-utils.c:86
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "ä½ ç¢ºå®šè¦ä¸€æ¬¡é–‹å•Ÿ %d 封郵件？"
 
-#: ../mail/em-utils.c:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+#: ../mail/em-utils.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:150
 msgid "_Do not show this message again"
 msgstr "不要再顯示這個訊息(_D)"
 
-#: ../mail/em-utils.c:305
+#: ../mail/em-utils.c:252
 msgid "Message Filters"
 msgstr "郵件規則"
 
-#: ../mail/em-utils.c:1060
+#: ../mail/em-utils.c:976
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
@@ -13236,13 +13185,13 @@ msgstr "目的端資料夾(_D):"
 
 #: ../mail/importers/evolution-mbox-importer.c:146
 #: ../plugins/dbx-import/dbx-importer.c:256
-#: ../plugins/pst-import/pst-importer.c:542
+#: ../plugins/pst-import/pst-importer.c:545
 msgid "Select folder"
 msgstr "選擇資料夾"
 
 #: ../mail/importers/evolution-mbox-importer.c:147
 #: ../plugins/dbx-import/dbx-importer.c:257
-#: ../plugins/pst-import/pst-importer.c:543
+#: ../plugins/pst-import/pst-importer.c:546
 msgid "Select folder to import into"
 msgstr "選取資料夾來輸入"
 
@@ -13257,7 +13206,7 @@ msgid "From"
 msgstr "寄件者"
 
 #: ../mail/importers/evolution-mbox-importer.c:486
-#: ../shell/e-shell-utils.c:193
+#: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 郵件信箱 (mbox)"
 
@@ -13272,7 +13221,7 @@ msgstr "正在匯入信箱"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:612
-#: ../plugins/pst-import/pst-importer.c:760
+#: ../plugins/pst-import/pst-importer.c:767
 #, c-format
 msgid "Importing '%s'"
 msgstr "正在匯入「%s」"
@@ -13410,118 +13359,118 @@ msgstr "如果可能，羣組回覆只用於通信論壇(_U)"
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "當原始郵件已簽署 (PGP 或 S/MIME) 時也對郵件數碼簽署(_S)"
 
+#: ../mail/mail-config.ui.h:19
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "附件"
+
 #: ../mail/mail-config.ui.h:20
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "行內 (Outlook é¢¨æ ¼)"
+
+#: ../mail/mail-config.ui.h:21
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "引文"
+
+#: ../mail/mail-config.ui.h:22
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "不使用引文"
+
+#: ../mail/mail-config.ui.h:23
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "行內"
+
+#: ../mail/mail-config.ui.h:25
 msgid "Sig_natures"
 msgstr "簽名檔(_N)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:26
 msgid "Signatures"
 msgstr "簽名檔"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:27
 msgid "_Languages"
 msgstr "語言(_L)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:28
 msgid "Languages Table"
 msgstr "語言表"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:29
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é€™è£çš„èªžè¨€æ¸…å–®åªåæ˜ å‡ºå·²ç¶“å®‰è£å­—å…¸çš„èªžè¨€ã€‚"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:31
 msgid "Check spelling while I _type"
 msgstr "當我輸入時檢查拼字(_T)"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:32
 msgid "Color for _misspelled words:"
 msgstr "拼錯字的顏色(_M):"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:33
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "挑選顏色"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:34
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:35
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr "è¦é¿å…é›»å­éƒµä»¶å‡ºç¾æ„å¤–æˆ–ä»¤äººé›£å ªçš„æƒ…æ³ï¼Œåœ¨é€²è¡Œä¸‹åˆ—å·²æ ¸å–å‹•ä½œæ™‚è©¢å•ä½¿ç”¨è€…ä»¥å–å¾—ç¢ºèªï¼š"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:37
 msgid "Sending a message with an _empty subject line"
 msgstr "傳送沒有主旨的郵件(_E)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:39
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "傳送只有指定密件副本收件者的郵件(_B)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a _private reply to a mailing list message"
 msgstr "傳送私人回覆到通信論壇(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a reply to a large _number of recipients"
 msgstr "傳送有大量收件者的郵件(_N)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:45
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "允許當通信論壇將私人回覆導回論壇(_M)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:47
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "傳送給沒有輸入有效電子郵件地址的收件者(_R)"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:48
 msgid "Confirmations"
 msgstr "確認"
 
-#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:54 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:55 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:51
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "附件"
-
-#: ../mail/mail-config.ui.h:52
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "行內 (Outlook é¢¨æ ¼)"
-
-#: ../mail/mail-config.ui.h:53
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "引文"
-
-#: ../mail/mail-config.ui.h:54
-msgctxt "ReplyForward"
-msgid "Do not quote"
-msgstr "不使用引文"
-
-#: ../mail/mail-config.ui.h:55
-msgctxt "ReplyForward"
-msgid "Inline"
-msgstr "行內"
-
 #: ../mail/mail-config.ui.h:56
 msgid "Proxy Settings"
 msgstr "代理伺服器設定值"
@@ -13685,58 +13634,54 @@ msgid "_Show the photograph of sender in the message preview"
 msgstr "åœ¨éƒµä»¶é è¦½é¡¯ç¤ºå¯„ä»¶è€…ç›¸ç‰‡(_S)"
 
 #: ../mail/mail-config.ui.h:98
-msgid "S_earch for sender photograph only in local address books"
-msgstr "只搜尋本地端通訊錄中的寄件者相片(_E)"
-
-#: ../mail/mail-config.ui.h:99
 msgid "Displayed Message Headers"
 msgstr "é¡¯ç¤ºçš„éƒµä»¶æª”é ­"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:99
 msgid "Mail Headers Table"
 msgstr "éƒµä»¶æª”é ­è¡¨"
 
-#: ../mail/mail-config.ui.h:101
-#: ../modules/addressbook/autocompletion-config.c:86
+#: ../mail/mail-config.ui.h:100
+#: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "日期/æ™‚åˆ»æ ¼å¼"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:102
 msgid "Check incoming _messages for junk"
 msgstr "檢查內送郵件是否為垃圾郵件(_M)"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:103
 msgid "_Delete junk messages"
 msgstr "刪除垃圾郵件(_D)"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:104
 msgid "Check cu_stom headers for junk"
 msgstr "ä»¥è‡ªé¸æ¨™é ­æª¢æŸ¥åžƒåœ¾éƒµä»¶(_S)"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:105
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "若寄件者在我的通訊錄中就不要將郵件標記為垃圾郵件(_K)"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:106
 msgid "_Lookup in local address book only"
 msgstr "只在本地通訊錄查詢(_L)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:107
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦‚æžœæ‰¾åˆ°ç¬¦åˆçš„è‡ªé¸åžƒåœ¾éƒµä»¶æ¨™é ­é€™å€‹é¸é …å°±æœƒè¢«å¿½ç•¥ã€‚"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:109
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:225
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:159
 msgid "No encryption"
 msgstr "æ²’æœ‰åŠ å¯†"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:110
 msgid "TLS encryption"
 msgstr "TLS åŠ å¯†"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:111
 msgid "SSL encryption"
 msgstr "SSL åŠ å¯†"
 
@@ -13987,7 +13932,7 @@ msgid ""
 msgstr "要永久移除所有資料夾中所有刪除的郵件？"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
@@ -14186,7 +14131,7 @@ msgid "Do _Not Disable"
 msgstr "不要停用(_N)"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:635
+#: ../plugins/publish-calendar/publish-calendar.c:634
 msgid "_Disable"
 msgstr "停用(_D)"
 
@@ -14346,34 +14291,34 @@ msgid "This will mark all messages as read in the selected folder."
 msgstr "這會將標示選取的資料夾中所有郵件為已閱讀。"
 
 #: ../mail/mail.error.xml.h:129
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr "這會將標示選定的資料夾及其子資料夾中所有郵件為已閱讀。"
+msgid "Also mark messages in subfolders?"
+msgstr "是否也標記子資料夾中的郵件？"
 
 #: ../mail/mail.error.xml.h:130
-msgid "Close message window."
-msgstr "關閉郵件視窗。"
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr "ä½ è¦å°‡ç›®å‰çš„è³‡æ–™å¤¾ä¸­çš„éƒµä»¶å·²é–±è®€ï¼Œæˆ–æ˜¯åŒ…å«ç›®å‰çš„è³‡æ–™å¤¾åŠå…¶å­è³‡æ–™å¤¾ä¸­æ‰€æœ‰éƒµä»¶ã€‚"
 
 #: ../mail/mail.error.xml.h:131
-msgid "Would you like to close the message window?"
-msgstr "ä½ æƒ³è¦é—œé–‰éƒµä»¶è¦–çª—å—Žï¼Ÿ"
+msgid "In Current Folder and _Subfolders"
+msgstr "於目前的資料夾及其子資料夾(_S)"
 
 #: ../mail/mail.error.xml.h:132
-msgid "_Yes"
-msgstr "是(_Y)"
+msgid "In Current _Folder Only"
+msgstr "於目前的資料夾(_F)"
 
 #: ../mail/mail.error.xml.h:133
-msgid "_No"
-msgstr "否(_N)"
+msgid "Should Evolution close this window when replying or forwarding?"
+msgstr "當回覆或轉寄時 Evolution 是否應關閉這個視窗？"
 
 #: ../mail/mail.error.xml.h:134
-msgid "_Always"
-msgstr "總是(_A)"
+msgid "_Yes, Always"
+msgstr "是，總是使用(_Y)"
 
 #: ../mail/mail.error.xml.h:135
-msgid "N_ever"
-msgstr "永不(_E)"
+msgid "_No, Never"
+msgstr "否，永不使用(_N)"
 
 #: ../mail/mail.error.xml.h:136
 msgid "Copy folder in folder tree."
@@ -14384,119 +14329,139 @@ msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "是否確定要將資料夾「{0}」複製到資料夾「{1}」？"
 
 #: ../mail/mail.error.xml.h:138
+msgid "_Yes"
+msgstr "是(_Y)"
+
+#: ../mail/mail.error.xml.h:139
+msgid "_No"
+msgstr "否(_N)"
+
+#: ../mail/mail.error.xml.h:140
+msgid "_Always"
+msgstr "總是(_A)"
+
+#: ../mail/mail.error.xml.h:141
+msgid "N_ever"
+msgstr "永不(_E)"
+
+#: ../mail/mail.error.xml.h:142
 msgid "Move folder in folder tree."
 msgstr "於資料夾樹狀圖移動。"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:143
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "是否確定要將資料夾「{0}」移動到資料夾「{1}」？"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "å› ç‚ºä½ æ²’æœ‰å•Ÿç”¨é¸æ“‡ç”¨ä¾†å¯„é€çš„å¸³è™Ÿï¼Œæ‰€ä»¥ç„¡æ³•å‚³é€æ­¤éƒµä»¶ã€‚"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:145
 msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳送。"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:146
 msgid "Mail Deletion Failed"
 msgstr "刪除郵件失敗"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:147
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ä½ æ²’æœ‰è¶³å¤ çš„æ¬Šé™åˆªé™¤æ­¤å°éƒµä»¶ã€‚"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
 msgid "\"Check Junk\" Failed"
 msgstr "「檢查垃圾郵件」失敗"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:149
 msgid "\"Report Junk\" Failed"
 msgstr "ã€Œå›žå ±åžƒåœ¾éƒµä»¶ã€å¤±æ•—"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:150
 msgid "\"Report Not Junk\" Failed"
 msgstr "ã€Œå›žå ±ç‚ºéžåžƒåœ¾éƒµä»¶ã€å¤±æ•—"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:151
 msgid "Remove duplicate messages?"
 msgstr "是否移除重複的郵件？"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:152
 msgid "No duplicate messages found."
 msgstr "找不到重複的郵件。"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:154
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "資料夾「{0}」並未包含任何重複的郵件。"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:155
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "無法中斷與帳號 &quot;{0}&quot; 的連線。"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:157
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "無法取消訂閱資料夾 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:158
 msgid "Unable to retrieve message."
 msgstr "無法接收郵件。"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:159
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to open folder."
 msgstr "無法開啟資料夾。"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to find duplicate messages."
 msgstr "找不到重複的郵件。"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to retrieve messages."
 msgstr "無法取回郵件。"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:163
+msgid "Failed to mark messages as read."
+msgstr "無法將郵件標示成已經閱讀。"
+
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to remove attachments from messages."
 msgstr "無法移除郵件中的附件。"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to download messages for offline viewing."
 msgstr "下載離線使用的郵件失敗。"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to save messages to disk."
 msgstr "無法將選取的郵件儲存至磁碟。"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:167
 msgid "Hidden file is attached."
 msgstr "é™„åŠ äº†éš±è—çš„æª”æ¡ˆã€‚"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:168
 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:164
+#: ../mail/mail.error.xml.h:169
 msgid "Printing failed."
 msgstr "列印失敗。"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:170
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "打印機回覆 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:171
 msgid "Could not perform this operation on {0}."
 msgstr "無法進行 {0} 上的操作。"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:172
 msgid "You must be working online to complete this operation."
 msgstr "ä½ å¿…é ˆæ–¼ç¶²ä¸Šå·¥ä½œæ‰èƒ½å®Œæˆæ­¤æ“ä½œã€‚"
 
@@ -14512,7 +14477,7 @@ msgstr "傳送與接收郵件"
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1041
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1047
 msgid "Updating..."
 msgstr "更新中…"
 
@@ -14537,87 +14502,86 @@ msgstr "編輯搜尋資料夾"
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
-#: ../mail/message-list.c:1244
+#: ../mail/message-list.c:298
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../mail/message-list.c:1245
+#: ../mail/message-list.c:299
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../mail/message-list.c:1246
+#: ../mail/message-list.c:300
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../mail/message-list.c:1247
+#: ../mail/message-list.c:301
 msgid "Forwarded"
 msgstr "轉寄"
 
-#: ../mail/message-list.c:1248
+#: ../mail/message-list.c:302
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../mail/message-list.c:1249
+#: ../mail/message-list.c:303
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../mail/message-list.c:1253
+#: ../mail/message-list.c:316
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1254
+#: ../mail/message-list.c:317
 msgid "Lower"
 msgstr "低"
 
-#: ../mail/message-list.c:1258
+#: ../mail/message-list.c:321
 msgid "Higher"
 msgstr "高"
 
-#: ../mail/message-list.c:1259
+#: ../mail/message-list.c:322
 msgid "Highest"
 msgstr "最高"
 
+#: ../mail/message-list.c:466 ../mail/message-list.c:5725
+msgid "Generating message list"
+msgstr "產生郵件清單"
+
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1889 ../modules/itip-formatter/itip-view.c:242
+#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
 msgid "Today %l:%M %p"
 msgstr "今天 %p %l:%M"
 
-#: ../mail/message-list.c:1898
+#: ../mail/message-list.c:1867
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %p %l:%M"
 
-#: ../mail/message-list.c:1910
+#: ../mail/message-list.c:1879
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../mail/message-list.c:1918
+#: ../mail/message-list.c:1887
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日 %p %l:%M"
 
-#: ../mail/message-list.c:1920
+#: ../mail/message-list.c:1889
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2751
+#: ../mail/message-list.c:2767
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../mail/message-list.c:2889 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3395 ../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:4114
+#: ../mail/message-list.c:4758
 msgid "Follow-up"
 msgstr "跟隨"
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4616 ../mail/message-list.c:5020
-msgid "Generating message list"
-msgstr "產生郵件清單"
-
-#: ../mail/message-list.c:4850
+#: ../mail/message-list.c:5663
 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 "
@@ -14625,7 +14589,7 @@ msgid ""
 "by changing the query above."
 msgstr "æ²’æœ‰éƒµä»¶æ»¿è¶³ä½ çš„æœå°‹æ¢ä»¶ã€‚è«‹å¾žä¸Šåˆ—ä¸‹æ‹‰å¼é¸å–®é¸æ“‡é¡¯ç¤ºéƒµä»¶éŽæ¿¾å™¨æˆ–åŸ·è¡Œæ–°çš„æœå°‹ï¼Œå¯å¾ž 搜尋->清除 é¸å–®é …ç›®æ¸…é™¤å®ƒæˆ–æ”¹è®Šä¸Šé¢çš„æŸ¥è©¢ã€‚"
 
-#: ../mail/message-list.c:4855
+#: ../mail/message-list.c:5671
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -14662,49 +14626,49 @@ msgid "Subject or Addresses contains"
 msgstr "主旨或電子郵件位址包含"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1762
+#: ../modules/mail/e-mail-shell-view-actions.c:1997
 msgid "Recipients contain"
 msgstr "收件者包含"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1755
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Message contains"
 msgstr "郵件包含"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1776
+#: ../modules/mail/e-mail-shell-view-actions.c:2011
 msgid "Subject contains"
 msgstr "主旨包含"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1769
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "Sender contains"
 msgstr "寄件者包含"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1748
+#: ../modules/mail/e-mail-shell-view-actions.c:1983
 msgid "Body contains"
 msgstr "內文包含"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:92
-#: ../modules/mail/em-mailer-prefs.c:1139
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1213
 msgid "_Table column:"
 msgstr "è¡¨æ ¼æ¬„(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:95
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "åœ°å€æ ¼å¼åŒ–"
 
-#: ../modules/addressbook/autocompletion-config.c:98
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr "åœ°å€æ˜¯å¦è¦æ ¹æ“šç›®çš„åœ°åœ‹å®¶çš„æ¨™æº–é€²è¡Œæ ¼å¼åŒ–(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:107
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "自動完成"
 
-#: ../modules/addressbook/autocompletion-config.c:110
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "æ°¸é é¡¯ç¤ºè‡ªå‹•è£œé½Šçš„è¯çµ¡äººä½å€(_S)"
 
@@ -14728,42 +14692,42 @@ msgstr "聯絡人資訊"
 msgid "Contact information for %s"
 msgstr "%s 的聯絡人資訊"
 
-#: ../modules/addressbook/e-book-shell-backend.c:260
+#: ../modules/addressbook/e-book-shell-backend.c:259
 #: ../modules/addressbook/e-book-shell-view-actions.c:125
 msgid "New Address Book"
 msgstr "新通訊錄"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-backend.c:268
 msgctxt "New"
 msgid "_Contact"
 msgstr "聯絡人(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:271
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-backend.c:270
+#: ../modules/addressbook/e-book-shell-view-actions.c:977
 msgid "Create a new contact"
 msgstr "建立新的聯絡人"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:275
 msgctxt "New"
 msgid "Contact _List"
 msgstr "聯絡人清單(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-backend.c:277
+#: ../modules/addressbook/e-book-shell-view-actions.c:984
 msgid "Create a new contact list"
 msgstr "建立新的聯絡人清單"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgctxt "New"
 msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:288
-#: ../modules/addressbook/e-book-shell-view-actions.c:866
+#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-view-actions.c:900
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:315
 msgid "Certificates"
 msgstr "證書"
 
@@ -14772,269 +14736,280 @@ msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:418
-#: ../modules/addressbook/e-book-shell-view-actions.c:714
+#: ../modules/addressbook/e-book-shell-view-actions.c:474
+#: ../modules/addressbook/e-book-shell-view-actions.c:770
 msgid "Save as vCard"
 msgstr "儲存為 vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:843
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Co_py All Contacts To..."
 msgstr "複製所有的聯絡人到(_P)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:845
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
 msgid "Copy the contacts of the selected address book to another"
 msgstr "將已選取通訊錄中的聯絡人複製到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:850
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "D_elete Address Book"
 msgstr "刪除通訊錄(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:852
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
 msgid "Delete the selected address book"
 msgstr "刪除選取的通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:857
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Mo_ve All Contacts To..."
 msgstr "將所有的聯絡人移到(_V)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:859
+#: ../modules/addressbook/e-book-shell-view-actions.c:893
 msgid "Move the contacts of the selected address book to another"
 msgstr "將已選取通訊錄中的聯絡人移動到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:864
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:871
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Address _Book Properties"
 msgstr "通訊錄屬性(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:873
+#: ../modules/addressbook/e-book-shell-view-actions.c:907
 msgid "Show properties of the selected address book"
 msgstr "顯示選取通訊錄的屬性"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-task-shell-view-actions.c:760
+msgid "Re_fresh"
+msgstr "重新整理(_F)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:914
+msgid "Refresh the selected address book"
+msgstr "重新整理選取的通訊錄"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "Address Book _Map"
 msgstr "通訊錄地圖(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:921
 msgid "Show map with all contacts from selected address book"
 msgstr "顯示已選取通訊錄中所有聯絡人的地圖"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/mail/e-mail-shell-view-actions.c:1605
 msgid "_Rename..."
 msgstr "重新命名(_R)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:928
 msgid "Rename the selected address book"
 msgstr "重新命名選取的通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:935
 msgid "Stop loading"
 msgstr "停止載入"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 msgid "_Copy Contact To..."
 msgstr "複製聯絡人到(_C)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
 msgid "Copy selected contacts to another address book"
 msgstr "將選取的聯絡人複製到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "_Delete Contact"
 msgstr "刪除聯絡人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
 msgid "_Find in Contact..."
 msgstr "在聯絡人內尋找(_F)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "Search for text in the displayed contact"
 msgstr "搜尋顯示的聯絡人中的文字"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "_Forward Contact..."
 msgstr "轉寄聯絡人(_F)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:963
 msgid "Send selected contacts to another person"
 msgstr "傳送選取聯絡人給其他使用者。"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "_Move Contact To..."
 msgstr "將聯絡人移到(_M)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:970
 msgid "Move selected contacts to another address book"
 msgstr "將選取的聯絡人移至另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "_New Contact..."
 msgstr "新增聯絡人(_N)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "New Contact _List..."
 msgstr "新增聯絡人清單(_L)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "_Open Contact"
 msgstr "開啟聯絡人(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "View the current contact"
 msgstr "檢視目前的聯絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "_Send Message to Contact..."
 msgstr "傳送郵件給聯絡人(_S)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:998
 msgid "Send a message to the selected contacts"
 msgstr "傳送郵件至選取的聯絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
-#: ../modules/calendar/e-cal-shell-view-actions.c:1601
-#: ../modules/calendar/e-task-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:1005
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "_Actions"
 msgstr "動作(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
-#: ../modules/calendar/e-memo-shell-view-actions.c:701
-#: ../modules/calendar/e-task-shell-view-actions.c:853
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/addressbook/e-book-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-task-shell-view-actions.c:832
+#: ../modules/mail/e-mail-shell-view-actions.c:1770
 msgid "_Preview"
 msgstr "é è¦½(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:980
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
-#: ../modules/calendar/e-task-shell-view-actions.c:866
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-memo-shell-view-actions.c:693
+#: ../modules/calendar/e-task-shell-view-actions.c:845
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:984
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1033
 msgid "Address Book Map"
 msgstr "通訊錄地圖"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+#: ../modules/addressbook/e-book-shell-view-actions.c:1065
 msgid "Contact _Preview"
 msgstr "è¯çµ¡äººé è¦½(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
 msgid "Show contact preview window"
 msgstr "é¡¯ç¤ºè¯çµ¡äººé è¦½è¦–çª—"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Show _Maps"
 msgstr "顯示地圖(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/addressbook/e-book-shell-view-actions.c:1075
 msgid "Show maps in contact preview window"
 msgstr "åœ¨è¯çµ¡äººé è¦½è¦–çª—é¡¯ç¤ºåœ°åœ–"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1049
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:935
-#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#: ../modules/addressbook/e-book-shell-view-actions.c:1094
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/mail/e-mail-shell-view-actions.c:1900
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/addressbook/e-book-shell-view-actions.c:1096
 msgid "Show contact preview below the contact list"
 msgstr "åœ¨è¯çµ¡äººæ¸…å–®ä¸‹æ–¹é¡¯ç¤ºè¯çµ¡äººé è¦½"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:942
-#: ../modules/mail/e-mail-shell-view-actions.c:1672
+#: ../modules/addressbook/e-book-shell-view-actions.c:1101
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/mail/e-mail-shell-view-actions.c:1907
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/addressbook/e-book-shell-view-actions.c:1103
 msgid "Show contact preview alongside the contact list"
 msgstr "åœ¨è¯çµ¡äººæ¸…å–®æ—é‚Šé¡¯ç¤ºè¯çµ¡äººé è¦½"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1073
-#: ../modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../modules/addressbook/e-book-shell-view-actions.c:1118
+#: ../modules/calendar/e-cal-shell-view-actions.c:1755
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1083
-#: ../modules/calendar/e-cal-shell-view-actions.c:1788
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
-#: ../modules/mail/e-mail-shell-view-actions.c:1741
-#: ../shell/e-shell-content.c:657
+#: ../modules/addressbook/e-book-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-actions.c:1765
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1976
+#: ../shell/e-shell-content.c:656
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/addressbook/e-book-shell-view-actions.c:1161
 msgid "Print all shown contacts"
 msgstr "列印所有顯示的聯絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+#: ../modules/addressbook/e-book-shell-view-actions.c:1168
 msgid "Preview the contacts to be printed"
 msgstr "é è¦½å°‡è¦åˆ—å°çš„è¯çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1130
+#: ../modules/addressbook/e-book-shell-view-actions.c:1175
 msgid "Print selected contacts"
 msgstr "列印已選取的聯絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1145
+#: ../modules/addressbook/e-book-shell-view-actions.c:1190
 msgid "S_ave Address Book as vCard"
 msgstr "將通訊錄另存為 vC_ard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/addressbook/e-book-shell-view-actions.c:1192
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "將已選取通訊錄中的聯絡人儲存為 vCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1153
-#: ../modules/addressbook/e-book-shell-view-actions.c:1163
+#: ../modules/addressbook/e-book-shell-view-actions.c:1198
+#: ../modules/addressbook/e-book-shell-view-actions.c:1208
 msgid "_Save as vCard..."
 msgstr "儲存成 _vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1155
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
 msgid "Save selected contacts as a vCard"
 msgstr "將選取的聯絡人儲存為 vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:300
+#: ../modules/addressbook/e-book-shell-view.c:312
 msgid "_Forward Contacts"
 msgstr "轉寄聯絡人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:302
+#: ../modules/addressbook/e-book-shell-view.c:314
 msgid "_Forward Contact"
 msgstr "轉寄聯絡人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:333
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Send Message to Contacts"
 msgstr "傳送郵件給聯絡人(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:335
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Send Message to List"
 msgstr "傳送郵件給清單(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:337
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Send Message to Contact"
 msgstr "傳送郵件給聯絡人(_S)"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:309
+#: ../modules/audio-inline/e-mail-formatter-audio.c:314
 msgid "Audio Player"
 msgstr "音樂播放器"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+#: ../modules/audio-inline/e-mail-formatter-audio.c:315
 msgid "Play the attachment in embedded audio player"
 msgstr "在內嵌音樂播放器中播放附件"
 
@@ -15116,83 +15091,83 @@ msgid "With Graphical User Interface"
 msgstr "使用圖形使用者介面"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:317
-#: ../modules/backup-restore/evolution-backup-tool.c:511
+#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:515
 msgid "Shutting down Evolution"
 msgstr "正在關閉 Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:326
+#: ../modules/backup-restore/evolution-backup-tool.c:330
 msgid "Backing Evolution accounts and settings"
 msgstr "備份 Evolution 的帳號與設定值"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:343
+#: ../modules/backup-restore/evolution-backup-tool.c:347
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "正在備份 Evolution 資料 (郵件、聯絡人、行事曆、工作、備忘錄)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:359
+#: ../modules/backup-restore/evolution-backup-tool.c:363
 msgid "Back up complete"
 msgstr "備份完成"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:366
-#: ../modules/backup-restore/evolution-backup-tool.c:698
+#: ../modules/backup-restore/evolution-backup-tool.c:370
+#: ../modules/backup-restore/evolution-backup-tool.c:702
 msgid "Restarting Evolution"
 msgstr "重新啟動 Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:517
+#: ../modules/backup-restore/evolution-backup-tool.c:521
 msgid "Back up current Evolution data"
 msgstr "備份目前的 Evolution 資料"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:524
+#: ../modules/backup-restore/evolution-backup-tool.c:528
 msgid "Extracting files from back up"
 msgstr "從備份解開檔案"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:606
+#: ../modules/backup-restore/evolution-backup-tool.c:610
 msgid "Loading Evolution settings"
 msgstr "正在讀取 Evolution 的設定值"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:672
+#: ../modules/backup-restore/evolution-backup-tool.c:676
 msgid "Removing temporary back up files"
 msgstr "移除暫存的備份檔案"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:683
+#: ../modules/backup-restore/evolution-backup-tool.c:687
 msgid "Reloading registry service"
 msgstr "重新載入註冊表服務"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:910
+#: ../modules/backup-restore/evolution-backup-tool.c:914
 msgid "Evolution Back Up"
 msgstr "Evolution 備份"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:911
+#: ../modules/backup-restore/evolution-backup-tool.c:915
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "正備份至資料夾 %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:915
+#: ../modules/backup-restore/evolution-backup-tool.c:919
 msgid "Evolution Restore"
 msgstr "Evolution 還原"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:920
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "從資料夾還原 %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:986
+#: ../modules/backup-restore/evolution-backup-tool.c:990
 msgid "Backing up Evolution Data"
 msgstr "備份 Evolution 資料"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:987
+#: ../modules/backup-restore/evolution-backup-tool.c:991
 msgid "Please wait while Evolution is backing up your data."
 msgstr "在 Evolution å‚™ä»½ä½ çš„è³‡æ–™æ™‚è«‹ç¨å€™ã€‚"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:989
+#: ../modules/backup-restore/evolution-backup-tool.c:993
 msgid "Restoring Evolution Data"
 msgstr "還原 Evolution 資料"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:990
+#: ../modules/backup-restore/evolution-backup-tool.c:994
 msgid "Please wait while Evolution is restoring your data."
 msgstr "在 Evolution é‚„åŽŸä½ çš„è³‡æ–™æ™‚è«‹ç¨å€™ã€‚"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1012
+#: ../modules/backup-restore/evolution-backup-tool.c:1016
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "é€™å€‹å‹•ä½œæ‰€èŠ±çš„æ™‚é–“å–æ±ºæ–¼ä½ çš„å¸³è™Ÿä¸­è³‡æ–™çš„å¤šå¯¡ã€‚"
 
@@ -15337,7 +15312,7 @@ msgid "Using LDAP"
 msgstr "使用 LDAP"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/mail/e-mail-shell-view.c:117
 msgid "Searching"
 msgstr "正在搜尋"
 
@@ -15469,12 +15444,12 @@ msgstr "用於生日和週年紀念日行事曆"
 msgid "Default User Calendar"
 msgstr "é è¨­ä½¿ç”¨è€…è¡Œäº‹æ›†"
 
-#: ../modules/cal-config-google/e-google-chooser.c:508
+#: ../modules/cal-config-google/e-google-chooser.c:515
 #, c-format
 msgid "Enter Google password for user '%s'."
 msgstr "輸入使用者「%s」的 Google 密碼。"
 
-#: ../modules/cal-config-google/e-google-chooser.c:525
+#: ../modules/cal-config-google/e-google-chooser.c:532
 msgid "User declined to provide a password"
 msgstr "使用者需要輸入密碼"
 
@@ -15498,145 +15473,145 @@ msgstr "檔案："
 msgid "Allow Evolution to update the file"
 msgstr "允許 Evolution 更新檔案"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:318
+#: ../modules/calendar/e-cal-attachment-handler.c:320
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "匯入(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:404
+#: ../modules/calendar/e-cal-attachment-handler.c:406
 msgid "Select a Calendar"
 msgstr "選擇行事曆"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:431
+#: ../modules/calendar/e-cal-attachment-handler.c:433
 msgid "Select a Task List"
 msgstr "選擇工作清單"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:441
+#: ../modules/calendar/e-cal-attachment-handler.c:443
 msgid "I_mport to Calendar"
 msgstr "匯入至行事曆(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:448
+#: ../modules/calendar/e-cal-attachment-handler.c:450
 msgid "I_mport to Tasks"
 msgstr "匯入至工作(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.c:401
+#: ../modules/calendar/e-calendar-preferences.c:517
 msgid "Selected Calendars for Alarms"
 msgstr "選取的鬧鈴行事曆"
 
-#: ../modules/calendar/e-calendar-preferences.c:822
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "Ti_me and date:"
 msgstr "時刻和日期(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:823
+#: ../modules/calendar/e-calendar-preferences.c:926
 msgid "_Date only:"
 msgstr "只有日期(_D):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "小時"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "天"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60 分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30 分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15 分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10 分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
 msgstr "05 分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "第二時區(_C):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "(Shown in a Day View)"
 msgstr "(顯示於日檢視)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "使用系統時區(_Y)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "æ™‚åˆ»æ ¼å¼:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小時 (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24 小時"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Work Week"
 msgstr "工作週"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Wee_k starts on:"
 msgstr "一週開始於(_K):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "工作日:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "一日開始於(_D):"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "週一(_M)"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "週二(_T)"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "週三(_W)"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "週四(_H)"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "週五(_F)"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "週六(_S)"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "週日(_U)"
 
@@ -15741,62 +15716,67 @@ msgstr "%u 與 %d 會被替換為電子郵件位址中的使用者與網域名
 msgid "Publishing Information"
 msgstr "發布資訊"
 
-#: ../modules/calendar/e-cal-shell-backend.c:310
+#: ../modules/calendar/e-cal-shell-backend.c:313
 #: ../modules/calendar/e-cal-shell-view-actions.c:191
 msgid "New Calendar"
 msgstr "新行事曆"
 
-#: ../modules/calendar/e-cal-shell-backend.c:319
+#: ../modules/calendar/e-cal-shell-backend.c:322
 msgctxt "New"
 msgid "_Appointment"
 msgstr "約會(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:321
-#: ../modules/calendar/e-cal-shell-view-actions.c:1545
+#: ../modules/calendar/e-cal-shell-backend.c:324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1522
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
-#: ../modules/calendar/e-cal-shell-backend.c:326
+#: ../modules/calendar/e-cal-shell-backend.c:329
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "全日約會(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:331
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
 
-#: ../modules/calendar/e-cal-shell-backend.c:333
+#: ../modules/calendar/e-cal-shell-backend.c:336
 msgctxt "New"
 msgid "M_eeting"
 msgstr "會議(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:338
 msgid "Create a new meeting request"
 msgstr "建立新會議要求"
 
-#: ../modules/calendar/e-cal-shell-backend.c:343
+#: ../modules/calendar/e-cal-shell-backend.c:346
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-backend.c:348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
-#: ../modules/calendar/e-cal-shell-backend.c:668
+#: ../modules/calendar/e-cal-shell-backend.c:703
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:565
-msgid "Calendar Selector"
-msgstr "行事曆選擇器"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:868
+#: ../modules/calendar/e-cal-shell-sidebar.c:119
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "開啟行事曆「%s」"
 
+#: ../modules/calendar/e-cal-shell-sidebar.c:597
+msgid "Calendar Selector"
+msgstr "行事曆選擇器"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+msgid "Print"
+msgstr "列印"
+
 #: ../modules/calendar/e-cal-shell-view-actions.c:291
 msgid "Calendar Properties"
 msgstr "iCalendar 錯誤"
@@ -15814,357 +15794,351 @@ msgstr "此作業會永久性刪除比選取時間還舊的所有事件。如果
 msgid "Purge events older than"
 msgstr "清除早於這段時間的事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:588
+#: ../modules/calendar/e-cal-shell-view-actions.c:585
 msgid "Copying Items"
 msgstr "è¤‡è£½é …ç›®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:881
+#: ../modules/calendar/e-cal-shell-view-actions.c:878
 msgid "Moving Items"
 msgstr "ç§»å‹•é …ç›®"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1215
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "event"
 msgstr "事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1217
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 #: ../modules/calendar/e-cal-shell-view-memopad.c:231
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:548
-#: ../modules/calendar/e-task-shell-view-actions.c:665
+#: ../modules/calendar/e-memo-shell-view-actions.c:527
+#: ../modules/calendar/e-task-shell-view-actions.c:644
 msgid "Save as iCalendar"
 msgstr "儲存為 iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Copy..."
 msgstr "複製(_C)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "D_elete Calendar"
 msgstr "刪除行事曆(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Delete the selected calendar"
 msgstr "刪除選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Go Back"
 msgstr "向後"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "Go Forward"
 msgstr "向前"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Select today"
 msgstr "選取今日"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Select _Date"
 msgstr "選擇日期(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Select a specific date"
 msgstr "選取特定日期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
-#: ../modules/calendar/e-task-shell-view-actions.c:837
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Purg_e"
 msgstr "清除(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
 msgid "Purge old appointments and meetings"
 msgstr "刪除舊約會和會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:781
-msgid "Re_fresh"
-msgstr "重新整理(_F)"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "Refresh the selected calendar"
 msgstr "重新整理選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Rename the selected calendar"
 msgstr "重新命名選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
 msgid "Find _next"
 msgstr "尋找下一個(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Find next occurrence of the current search string"
 msgstr "尋找目前搜尋字詞下一個出現處"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Find _previous"
 msgstr "尋找上一個(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Find previous occurrence of the current search string"
 msgstr "尋找目前搜尋字詞上一個出現處"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Stop _running search"
 msgstr "停止執行搜尋(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "Stop currently running search"
 msgstr "停止目前執行的搜尋"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 msgid "Show _Only This Calendar"
 msgstr "只顯示這個行事曆(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1464
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1494
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
 msgid "_Delete Appointment"
 msgstr "刪除約會(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "Delete selected appointments"
 msgstr "刪除選取的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1501
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "Delete This _Occurrence"
 msgstr "刪除這次發生的事件(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Delete this occurrence"
 msgstr "刪除此週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1508
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
 msgid "Delete All Occ_urrences"
 msgstr "刪除所有發生的事件(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
 msgid "Delete all occurrences"
 msgstr "刪除全部週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1515
+#: ../modules/calendar/e-cal-shell-view-actions.c:1492
 msgid "New All Day _Event..."
 msgstr "新增全天事件(_E)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1494
 msgid "Create a new all day event"
 msgstr "建立新的全天事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1499
 #: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1529
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
 msgid "New _Meeting..."
 msgstr "新增會議(_M)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1508
 msgid "Create a new meeting"
 msgstr "建立新的會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1536
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1543
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
 msgid "New _Appointment..."
 msgstr "新增約會(_A)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1527
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
 msgid "_Open Appointment"
 msgstr "開啟約會(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1536
 msgid "View the current appointment"
 msgstr "檢視目前的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1541
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1555
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
 msgid "Converts an appointment to a meeting"
 msgstr "將約會轉換為會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
 msgid "Conv_ert to Appointment..."
 msgstr "轉換為約會(_E)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
 msgid "Converts a meeting to an appointment"
 msgstr "將會議轉換為約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1569
 msgid "Quit"
 msgstr "結束"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1712
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1714
+#: ../modules/calendar/e-cal-shell-view-actions.c:1691
 msgid "Show one day"
 msgstr "顯示一天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
 msgid "List"
 msgstr "清單"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1721
+#: ../modules/calendar/e-cal-shell-view-actions.c:1698
 msgid "Show as list"
 msgstr "顯示成清單"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../modules/calendar/e-cal-shell-view-actions.c:1705
 msgid "Show one month"
 msgstr "顯示一個月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
 msgid "Week"
 msgstr "週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1735
+#: ../modules/calendar/e-cal-shell-view-actions.c:1712
 msgid "Show one week"
 msgstr "顯示一週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1742
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
 msgid "Show one work week"
 msgstr "顯示一個工作週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1750
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 msgid "Active Appointments"
 msgstr "進行中的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1764
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
 msgid "Next 7 Days' Appointments"
 msgstr "未來 7 天的約會(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1771
+#: ../modules/calendar/e-cal-shell-view-actions.c:1748
 msgid "Occurs Less Than 5 Times"
 msgstr "發生少於五次"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1802
-#: ../modules/calendar/e-memo-shell-view-actions.c:819
-#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#: ../modules/calendar/e-cal-shell-view-actions.c:1779
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:997
 msgid "Description contains"
 msgstr "描述包含"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1809
-#: ../modules/calendar/e-memo-shell-view-actions.c:826
-#: ../modules/calendar/e-task-shell-view-actions.c:1025
+#: ../modules/calendar/e-cal-shell-view-actions.c:1786
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
 msgid "Summary contains"
 msgstr "主旨包含"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1821
+#: ../modules/calendar/e-cal-shell-view-actions.c:1798
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1828
+#: ../modules/calendar/e-cal-shell-view-actions.c:1805
 msgid "Preview the calendar to be printed"
 msgstr "é è¦½å°‡è¦åˆ—å°çš„è¡Œäº‹æ›†"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1850
+#: ../modules/calendar/e-cal-shell-view-actions.c:1827
 #: ../modules/calendar/e-cal-shell-view-memopad.c:306
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:867
-#: ../modules/calendar/e-task-shell-view-actions.c:1066
+#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-task-shell-view-actions.c:1045
 msgid "_Save as iCalendar..."
 msgstr "儲存為 iCalendar[_S]…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1927
+#: ../modules/calendar/e-cal-shell-view-actions.c:1904
 msgid "Go To"
 msgstr "移至"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:546
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
 msgid "memo"
 msgstr "備忘錄"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "New _Memo"
 msgstr "新增備忘錄(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:274
 #: ../modules/calendar/e-memo-shell-backend.c:219
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:685
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "_Open Memo"
 msgstr "開啟備忘錄(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:687
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "View the selected memo"
 msgstr "檢視選取的備忘錄"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:286
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Open _Web Page"
 msgstr "é–‹å•Ÿç¶²é (_W)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:852
+#: ../modules/calendar/e-memo-shell-view-actions.c:831
 msgid "Print the selected memo"
 msgstr "列印選取的備忘錄"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1509
+#: ../modules/calendar/e-cal-shell-view-private.c:1591
 msgid "Searching next matching event"
 msgstr "搜尋下一個符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1510
+#: ../modules/calendar/e-cal-shell-view-private.c:1592
 msgid "Searching previous matching event"
 msgstr "搜尋前一個符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1531
+#: ../modules/calendar/e-cal-shell-view-private.c:1613
 #, 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:1535
+#: ../modules/calendar/e-cal-shell-view-private.c:1617
 #, 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:1560
+#: ../modules/calendar/e-cal-shell-view-private.c:1642
 msgid "Cannot search with no active calendar"
 msgstr "不能搜尋未使用的行事曆"
 
@@ -16173,22 +16147,22 @@ msgstr "不能搜尋未使用的行事曆"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "task"
 msgstr "工作"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:704
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Mark selected tasks as complete"
 msgstr "將選取的工作標示成完成"
 
@@ -16197,38 +16171,38 @@ msgid "_Mark as Incomplete"
 msgstr "標示為未完成(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:811
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Mark selected tasks as incomplete"
 msgstr "將選取的工作標示成未完成"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "New _Task"
 msgstr "新增工作(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:361
 #: ../modules/calendar/e-task-shell-backend.c:216
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../modules/calendar/e-task-shell-view-actions.c:797
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Open Task"
 msgstr "開啟工作(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "View the selected task"
 msgstr "檢視選取的工作"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1051
+#: ../modules/calendar/e-task-shell-view-actions.c:1030
 msgid "Print the selected task"
 msgstr "列印選取的工作"
 
 #: ../modules/calendar/e-memo-shell-backend.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:216
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
 msgid "New Memo List"
 msgstr "新增備忘錄清單"
 
@@ -16252,110 +16226,110 @@ msgid "Memo Li_st"
 msgstr "備忘錄清單(_S)"
 
 #: ../modules/calendar/e-memo-shell-backend.c:236
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:499
-msgid "Memo List Selector"
-msgstr "備忘錄清單選擇器"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:755
+#: ../modules/calendar/e-memo-shell-sidebar.c:117
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "開啟備忘錄清單「%s」"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:232
-#: ../modules/calendar/e-memo-shell-view-actions.c:247
+#: ../modules/calendar/e-memo-shell-sidebar.c:553
+msgid "Memo List Selector"
+msgstr "備忘錄清單選擇器"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
 msgid "Print Memos"
 msgstr "列印備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:288
+#: ../modules/calendar/e-memo-shell-view-actions.c:268
 msgid "Memo List Properties"
 msgstr "備忘錄清單屬性"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "_Delete Memo"
 msgstr "刪除備忘錄(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "_Find in Memo..."
 msgstr "在備忘錄內尋找(_F)…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
 msgid "Search for text in the displayed memo"
 msgstr "搜尋顯示的備忘錄中的文字"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "D_elete Memo List"
 msgstr "刪除備忘錄清單(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Delete the selected memo list"
 msgstr "刪除選取的備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "_New Memo List"
 msgstr "新增備忘錄清單(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 msgid "Refresh the selected memo list"
 msgstr "重新整理選取的備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Rename the selected memo list"
 msgstr "重新命名選取的備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 msgid "Show _Only This Memo List"
 msgstr "只顯示此備忘錄清單(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Memo _Preview"
 msgstr "å‚™å¿˜éŒ„é è¦½(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:731
 msgid "Show memo preview pane"
 msgstr "é¡¯ç¤ºå‚™å¿˜éŒ„é è¦½çª—æ ¼"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview below the memo list"
 msgstr "åœ¨å‚™å¿˜éŒ„æ¸…å–®ä¸‹æ–¹é¡¯ç¤ºå‚™å¿˜éŒ„é è¦½"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:780
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Show memo preview alongside the memo list"
 msgstr "åœ¨å‚™å¿˜éŒ„æ¸…å–®æ—é‚Šé¡¯ç¤ºå‚™å¿˜éŒ„é è¦½"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:838
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Print the list of memos"
 msgstr "列印備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Preview the list of memos to be printed"
 msgstr "é è¦½å°‡è¦åˆ—å°çš„å‚™å¿˜éŒ„æ¸…å–®"
 
-#: ../modules/calendar/e-memo-shell-view.c:236
+#: ../modules/calendar/e-memo-shell-view.c:239
 msgid "Delete Memos"
 msgstr "刪除備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:241
 msgid "Delete Memo"
 msgstr "刪除備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:465
+#: ../modules/calendar/e-memo-shell-view-private.c:538
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d é …å‚™å¿˜éŒ„"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:469
-#: ../modules/calendar/e-task-shell-view-private.c:639
+#: ../modules/calendar/e-memo-shell-view-private.c:542
+#: ../modules/calendar/e-task-shell-view-private.c:746
 #, c-format
 msgid "%d selected"
 msgstr "已選擇 %d 個"
 
 #: ../modules/calendar/e-task-shell-backend.c:205
-#: ../modules/calendar/e-task-shell-view-actions.c:239
+#: ../modules/calendar/e-task-shell-view-actions.c:219
 msgid "New Task List"
 msgstr "新增工作清單"
 
@@ -16379,29 +16353,29 @@ msgid "Tas_k List"
 msgstr "工作清單(_K)"
 
 #: ../modules/calendar/e-task-shell-backend.c:233
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:748
 msgid "Create a new task list"
 msgstr "建立新工作清單"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:499
-msgid "Task List Selector"
-msgstr "工作清單選擇器"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:755
+#: ../modules/calendar/e-task-shell-sidebar.c:117
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "開啟工作清單「%s」"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:255
-#: ../modules/calendar/e-task-shell-view-actions.c:270
+#: ../modules/calendar/e-task-shell-sidebar.c:553
+msgid "Task List Selector"
+msgstr "工作清單選擇器"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
 msgid "Print Tasks"
 msgstr "打印工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:311
+#: ../modules/calendar/e-task-shell-view-actions.c:291
 msgid "Task List Properties"
 msgstr "工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:586
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -16412,785 +16386,785 @@ msgstr ""
 "\n"
 "確定清除這些工作？"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:593
 msgid "Do not ask me again"
 msgstr "不要再詢問我"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "_Delete Task"
 msgstr "刪除工作(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "_Find in Task..."
 msgstr "在工作內尋找(_F)…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:720
 msgid "Search for text in the displayed task"
 msgstr "搜尋顯示的工作中的文字"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "Copy..."
 msgstr "複製…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "D_elete Task List"
 msgstr "刪除工作清單(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Delete the selected task list"
 msgstr "刪除選取的工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Refresh the selected task list"
 msgstr "重新整理選取的工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "Rename the selected task list"
 msgstr "重新命名選取的工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Show _Only This Task List"
 msgstr "只顯示此工作清單(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mar_k as Incomplete"
 msgstr "標示為未完成(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "Delete completed tasks"
 msgstr "刪除已完成的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Task _Preview"
 msgstr "å·¥ä½œé è¦½(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Show task preview pane"
 msgstr "é¡¯ç¤ºå·¥ä½œé è¦½çª—æ ¼"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview below the task list"
 msgstr "åœ¨å·¥ä½œæ¸…å–®ä¸‹æ–¹é¡¯ç¤ºå·¥ä½œé è¦½"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:923
 msgid "Show task preview alongside the task list"
 msgstr "åœ¨å·¥ä½œæ¸…å–®æ—é‚Šé¡¯ç¤ºå·¥ä½œé è¦½"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/calendar/e-task-shell-view-actions.c:931
 msgid "Active Tasks"
 msgstr "進行中的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:945
 msgid "Completed Tasks"
 msgstr "已完成的工作 "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Next 7 Days' Tasks"
 msgstr "未來 7 天的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Overdue Tasks"
 msgstr "過期的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Tasks with Attachments"
 msgstr "有附件的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1037
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Print the list of tasks"
 msgstr "打印工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Preview the list of tasks to be printed"
 msgstr "é è¦½å°‡è¦åˆ—å°çš„å·¥ä½œæ¸…å–®"
 
-#: ../modules/calendar/e-task-shell-view.c:371
+#: ../modules/calendar/e-task-shell-view.c:374
 msgid "Delete Tasks"
 msgstr "刪除工作"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:376
 msgid "Delete Task"
 msgstr "刪除工作"
 
-#: ../modules/calendar/e-task-shell-view-private.c:524
+#: ../modules/calendar/e-task-shell-view-private.c:631
 msgid "Expunging"
 msgstr "除去中"
 
-#: ../modules/calendar/e-task-shell-view-private.c:635
+#: ../modules/calendar/e-task-shell-view-private.c:742
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d é …å·¥ä½œ"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:145
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:146
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
 msgid "Display part as an invitation"
 msgstr "將部分顯示為邀請"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:233
+#: ../modules/itip-formatter/itip-view.c:235
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:237
+#: ../modules/itip-formatter/itip-view.c:239
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:246
+#: ../modules/itip-formatter/itip-view.c:248
 msgid "Today %l:%M:%S %p"
 msgstr "今天 %p %l:%M:%S"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:261
+#: ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:265
+#: ../modules/itip-formatter/itip-view.c:267
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:270
+#: ../modules/itip-formatter/itip-view.c:272
 msgid "Tomorrow %l:%M %p"
 msgstr "明天 %p %l:%M"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:274
+#: ../modules/itip-formatter/itip-view.c:276
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天 %p %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:293
+#: ../modules/itip-formatter/itip-view.c:295
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:298
+#: ../modules/itip-formatter/itip-view.c:300
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:302
+#: ../modules/itip-formatter/itip-view.c:304
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:307
+#: ../modules/itip-formatter/itip-view.c:309
 msgid "%A %l:%M %p"
 msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:311
+#: ../modules/itip-formatter/itip-view.c:313
 msgid "%A %l:%M:%S %p"
 msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:320
+#: ../modules/itip-formatter/itip-view.c:322
 msgid "%A, %B %e"
 msgstr "%m月%e日(%A)"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:326
+#: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %H:%M"
 msgstr "%m月%e日(%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:330
+#: ../modules/itip-formatter/itip-view.c:332
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%m月%e日(%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:335
+#: ../modules/itip-formatter/itip-view.c:337
 msgid "%A, %B %e %l:%M %p"
 msgstr "%m月%e日(%A) %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:339
+#: ../modules/itip-formatter/itip-view.c:341
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%m月%e日(%A) %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:345
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y"
 msgstr "%Y年%m月%e日(%A)"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:350
+#: ../modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y年%m月%e日(%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:354
+#: ../modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y年%m月%e日(%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:359
+#: ../modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y年%m月%e日(%A) %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:363
+#: ../modules/itip-formatter/itip-view.c:365
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%m月%e日(%A) %p %l:%M:%S"
 
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:402
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:492
-#: ../modules/itip-formatter/itip-view.c:581
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:404
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:494
+#: ../modules/itip-formatter/itip-view.c:583
 msgid "An unknown person"
 msgstr "不明人士"
 
-#: ../modules/itip-formatter/itip-view.c:406
-#: ../modules/itip-formatter/itip-view.c:496
-#: ../modules/itip-formatter/itip-view.c:585
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "請代表 %s 回覆"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:589
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "代表 %s 接收"
 
-#: ../modules/itip-formatter/itip-view.c:413
+#: ../modules/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s 透過 %s 已經發布下列會議資訊："
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:417
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s 已經發布下列會議資訊："
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:422
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s å·²ç¶“å§”æ´¾ä¸‹åˆ—æœƒè­°çµ¦ä½ ï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:423
+#: ../modules/itip-formatter/itip-view.c:425
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s 透過 %s é‚€è«‹ä½ å‡ºå¸­ä¸‹åˆ—æœƒè­°ï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:425
+#: ../modules/itip-formatter/itip-view.c:427
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s é‚€è«‹ä½ å‡ºå¸­ä¸‹åˆ—æœƒè­°ï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:431
+#: ../modules/itip-formatter/itip-view.c:433
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s 透過 %s å¸Œæœ›åŠ å…¥ä¸€å€‹æ—¢å­˜çš„æœƒè­°ï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:433
+#: ../modules/itip-formatter/itip-view.c:435
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s å¸Œæœ›åŠ å…¥ä¸€å€‹æ—¢å­˜çš„æœƒè­°ï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:437
+#: ../modules/itip-formatter/itip-view.c:439
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s 透過 %s 希望收到下列會議的最新資訊："
 
-#: ../modules/itip-formatter/itip-view.c:439
+#: ../modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s 希望收到下列會議的最新資訊："
 
-#: ../modules/itip-formatter/itip-view.c:443
+#: ../modules/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s 透過 %s 傳送了下列會議的回覆："
 
-#: ../modules/itip-formatter/itip-view.c:445
+#: ../modules/itip-formatter/itip-view.c:447
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s 傳送了下列會議的回覆："
 
-#: ../modules/itip-formatter/itip-view.c:449
+#: ../modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s 透過 %s 已經消取下列會議："
 
-#: ../modules/itip-formatter/itip-view.c:451
+#: ../modules/itip-formatter/itip-view.c:453
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s 已經消取下列會議："
 
-#: ../modules/itip-formatter/itip-view.c:455
+#: ../modules/itip-formatter/itip-view.c:457
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s 透過 %s 已經答覆了下列會議更改。"
 
-#: ../modules/itip-formatter/itip-view.c:457
+#: ../modules/itip-formatter/itip-view.c:459
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s 已經答覆了下列會議更改："
 
-#: ../modules/itip-formatter/itip-view.c:461
+#: ../modules/itip-formatter/itip-view.c:463
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s 透過 %s 已經婉拒了下列會議更改："
 
-#: ../modules/itip-formatter/itip-view.c:463
+#: ../modules/itip-formatter/itip-view.c:465
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s 已經婉拒了下列會議更改："
 
-#: ../modules/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s 透過 %s 已經發布了下列工作資訊："
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:507
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s 已經發布了下列工作："
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s 指派 %s åŠ å…¥ä¸‹åˆ—å·¥ä½œï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:513
+#: ../modules/itip-formatter/itip-view.c:515
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s 透過 %s å·²ç¶“æŒ‡æ´¾ä½ ä¸€é …å·¥ä½œï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:515
+#: ../modules/itip-formatter/itip-view.c:517
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s å·²ç¶“æŒ‡æ´¾ä½ ä¸€é …å·¥ä½œï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:521
+#: ../modules/itip-formatter/itip-view.c:523
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s 透過 %s å¸Œæœ›åŠ å…¥ä¸€é …æ—¢å­˜çš„å·¥ä½œï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:525
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s å¸Œæœ›åŠ å…¥ä¸€é …æ—¢å­˜çš„å·¥ä½œï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:527
+#: ../modules/itip-formatter/itip-view.c:529
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "%s 透過 %s 希望收到下列指派工作的最新資訊："
 
-#: ../modules/itip-formatter/itip-view.c:529
+#: ../modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s 希望收到下列指派工作的最新資訊："
 
-#: ../modules/itip-formatter/itip-view.c:533
+#: ../modules/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s 透過 %s 傳送了下列指派工作的回覆："
 
-#: ../modules/itip-formatter/itip-view.c:535
+#: ../modules/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s 傳送了下列指派工作的回覆："
 
-#: ../modules/itip-formatter/itip-view.c:539
+#: ../modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s 透過 %s 已經取消下列指派的工作："
 
-#: ../modules/itip-formatter/itip-view.c:541
+#: ../modules/itip-formatter/itip-view.c:543
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s 已經取消下列指派的工作："
 
-#: ../modules/itip-formatter/itip-view.c:545
+#: ../modules/itip-formatter/itip-view.c:547
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s 透過 %s 已經回覆下列指派工作的更改："
 
-#: ../modules/itip-formatter/itip-view.c:547
+#: ../modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s 已經回覆下列指派工作的更改："
 
-#: ../modules/itip-formatter/itip-view.c:551
+#: ../modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s 透過 %s 已婉拒了下列指派的工作："
 
-#: ../modules/itip-formatter/itip-view.c:553
+#: ../modules/itip-formatter/itip-view.c:555
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s 已經婉拒下列指派的工作："
 
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s 透過 %s 已經發布了下列備忘錄："
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:596
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s 已經發布了備忘錄："
 
-#: ../modules/itip-formatter/itip-view.c:599
+#: ../modules/itip-formatter/itip-view.c:601
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s 透過 %s å¸Œæœ›åŠ å…¥ä¸€å€‹æ—¢å­˜çš„å‚™å¿˜éŒ„ï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:603
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s å¸Œæœ›åŠ å…¥ä¸€å€‹æ—¢å­˜çš„å‚™å¿˜éŒ„ï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:605
+#: ../modules/itip-formatter/itip-view.c:607
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s 透過 %s 已經消取下列共用備忘錄："
 
-#: ../modules/itip-formatter/itip-view.c:607
+#: ../modules/itip-formatter/itip-view.c:609
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s 已經取消下列共用備忘錄："
 
-#: ../modules/itip-formatter/itip-view.c:680
+#: ../modules/itip-formatter/itip-view.c:682
 msgid "All day:"
 msgstr "整天："
 
-#: ../modules/itip-formatter/itip-view.c:686
+#: ../modules/itip-formatter/itip-view.c:688
 msgid "Start day:"
 msgstr "開始日："
 
-#: ../modules/itip-formatter/itip-view.c:686
-#: ../modules/itip-formatter/itip-view.c:1465
+#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:1490
 msgid "Start time:"
 msgstr "開始時間:"
 
-#: ../modules/itip-formatter/itip-view.c:695
+#: ../modules/itip-formatter/itip-view.c:697
 msgid "End day:"
 msgstr "結束日："
 
-#: ../modules/itip-formatter/itip-view.c:695
-#: ../modules/itip-formatter/itip-view.c:1466
+#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:1491
 msgid "End time:"
 msgstr "結束時間:"
 
-#: ../modules/itip-formatter/itip-view.c:1014
+#: ../modules/itip-formatter/itip-view.c:1016
 msgid "Ope_n Calendar"
 msgstr "開啟行事曆(_N)"
 
-#: ../modules/itip-formatter/itip-view.c:1017
+#: ../modules/itip-formatter/itip-view.c:1019
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1020
+#: ../modules/itip-formatter/itip-view.c:1022
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1023
+#: ../modules/itip-formatter/itip-view.c:1025
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1026
+#: ../modules/itip-formatter/itip-view.c:1028
 msgid "_Tentative"
 msgstr "暫訂(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1029
+#: ../modules/itip-formatter/itip-view.c:1031
 msgid "Acce_pt all"
 msgstr "全部接受(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1032
+#: ../modules/itip-formatter/itip-view.c:1034
 msgid "Acce_pt"
 msgstr "接受(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1035
+#: ../modules/itip-formatter/itip-view.c:1037
 msgid "Send _Information"
 msgstr "傳送資訊(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1038
+#: ../modules/itip-formatter/itip-view.c:1040
 msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../modules/itip-formatter/itip-view.c:1043
 msgid "_Update"
 msgstr "æ›´æ–°(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1468
-#: ../modules/itip-formatter/itip-view.c:1516
-#: ../modules/itip-formatter/itip-view.c:1587
+#: ../modules/itip-formatter/itip-view.c:1493
+#: ../modules/itip-formatter/itip-view.c:1541
+#: ../modules/itip-formatter/itip-view.c:1612
 msgid "Comment:"
 msgstr "註解:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1504
+#: ../modules/itip-formatter/itip-view.c:1529
 msgid "Send reply to sender"
 msgstr "回覆寄件者"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1544
 msgid "Send _updates to attendees"
 msgstr "傳送更新給到會者(_U)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1522
+#: ../modules/itip-formatter/itip-view.c:1547
 msgid "_Apply to all instances"
 msgstr "套用至所有實體(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1523
+#: ../modules/itip-formatter/itip-view.c:1548
 msgid "Show time as _free"
 msgstr "顯示時間為空閒(_F)"
 
-#: ../modules/itip-formatter/itip-view.c:1524
+#: ../modules/itip-formatter/itip-view.c:1549
 msgid "_Preserve my reminder"
 msgstr "保留我的提醒(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1525
+#: ../modules/itip-formatter/itip-view.c:1550
 msgid "_Inherit reminder"
 msgstr "繼承提醒(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1853
+#: ../modules/itip-formatter/itip-view.c:1880
 msgid "_Tasks:"
 msgstr "工作(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1856
+#: ../modules/itip-formatter/itip-view.c:1883
 msgid "_Memos:"
 msgstr "備忘錄(_M):"
 
-#: ../modules/itip-formatter/itip-view.c:3086
+#: ../modules/itip-formatter/itip-view.c:3111
 msgid "Sa_ve"
 msgstr "儲存(_V)"
 
-#: ../modules/itip-formatter/itip-view.c:3651
+#: ../modules/itip-formatter/itip-view.c:3681
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "行事曆 '%s' 中的約會和這個會議相衝突"
 
-#: ../modules/itip-formatter/itip-view.c:3680
+#: ../modules/itip-formatter/itip-view.c:3710
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s」中的約會"
 
-#: ../modules/itip-formatter/itip-view.c:3793
+#: ../modules/itip-formatter/itip-view.c:3823
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:3801
+#: ../modules/itip-formatter/itip-view.c:3831
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個約會"
 
-#: ../modules/itip-formatter/itip-view.c:3806
+#: ../modules/itip-formatter/itip-view.c:3836
 msgid "Unable to find this task in any task list"
 msgstr "ç„¡æ³•åœ¨ä»»ä½•å·¥ä½œæ¸…å–®ä¸­æ‰¾åˆ°é€™é …å·¥ä½œ"
 
-#: ../modules/itip-formatter/itip-view.c:3811
+#: ../modules/itip-formatter/itip-view.c:3841
 msgid "Unable to find this memo in any memo list"
 msgstr "ç„¡æ³•åœ¨ä»»ä½•å‚™å¿˜éŒ„æ¸…å–®ä¸­æ‰¾åˆ°é€™é …å‚™å¿˜éŒ„"
 
-#: ../modules/itip-formatter/itip-view.c:4162
+#: ../modules/itip-formatter/itip-view.c:4187
 msgid "Opening the calendar. Please wait..."
 msgstr "正在開啟行事曆。請稍候…"
 
-#: ../modules/itip-formatter/itip-view.c:4167
+#: ../modules/itip-formatter/itip-view.c:4192
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個約會既存的版本"
 
-#: ../modules/itip-formatter/itip-view.c:4557
+#: ../modules/itip-formatter/itip-view.c:4583
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ç„¡æ³•å‚³é€é …ç›®è‡³è¡Œäº‹æ›†ã€Œ%s」。%s"
 
-#: ../modules/itip-formatter/itip-view.c:4573
+#: ../modules/itip-formatter/itip-view.c:4599
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "傳送至行事曆 '%s' 並設為已接受"
 
-#: ../modules/itip-formatter/itip-view.c:4578
+#: ../modules/itip-formatter/itip-view.c:4604
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "傳送至行事曆 '%s' 並設為不確定的"
 
-#: ../modules/itip-formatter/itip-view.c:4584
+#: ../modules/itip-formatter/itip-view.c:4610
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "傳送至行事曆 '%s' 並設為已婉拒"
 
-#: ../modules/itip-formatter/itip-view.c:4590
+#: ../modules/itip-formatter/itip-view.c:4616
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "傳送至行事曆「%s」並設為已取消"
 
-#: ../modules/itip-formatter/itip-view.c:4611
-#: ../modules/itip-formatter/itip-view.c:5052
-#: ../modules/itip-formatter/itip-view.c:5159
+#: ../modules/itip-formatter/itip-view.c:4637
+#: ../modules/itip-formatter/itip-view.c:5084
+#: ../modules/itip-formatter/itip-view.c:5191
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "正在將更改儲存到行事曆。請稍候…"
 
-#: ../modules/itip-formatter/itip-view.c:4652
+#: ../modules/itip-formatter/itip-view.c:4678
 msgid "Unable to parse item"
 msgstr "ç„¡æ³•åˆ†æžé …ç›®"
 
-#: ../modules/itip-formatter/itip-view.c:4842
+#: ../modules/itip-formatter/itip-view.c:4871
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-#: ../modules/itip-formatter/itip-view.c:4857
+#: ../modules/itip-formatter/itip-view.c:4888
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-#: ../modules/itip-formatter/itip-view.c:4861
+#: ../modules/itip-formatter/itip-view.c:4892
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
 
-#: ../modules/itip-formatter/itip-view.c:4911
+#: ../modules/itip-formatter/itip-view.c:4943
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新到會者。%s"
 
-#: ../modules/itip-formatter/itip-view.c:4918
+#: ../modules/itip-formatter/itip-view.c:4950
 msgid "Attendee status updated"
 msgstr "到會者狀態已更新"
 
-#: ../modules/itip-formatter/itip-view.c:4941
+#: ../modules/itip-formatter/itip-view.c:4973
 msgid "The meeting is invalid and cannot be updated"
 msgstr "這個會議無效並且不能更新"
 
-#: ../modules/itip-formatter/itip-view.c:5017
+#: ../modules/itip-formatter/itip-view.c:5049
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！"
 
-#: ../modules/itip-formatter/itip-view.c:5089
-#: ../modules/itip-formatter/itip-view.c:5129
+#: ../modules/itip-formatter/itip-view.c:5121
+#: ../modules/itip-formatter/itip-view.c:5161
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "åˆ°æœƒè€…ç‹€æ…‹ä¸èƒ½æ›´æ–°ï¼Œå› ç‚ºé …ç›®å·²ç¶“ä¸å­˜åœ¨"
 
-#: ../modules/itip-formatter/itip-view.c:5192
+#: ../modules/itip-formatter/itip-view.c:5224
 msgid "Meeting information sent"
 msgstr "會議資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5197
+#: ../modules/itip-formatter/itip-view.c:5229
 msgid "Task information sent"
 msgstr "工作資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5202
+#: ../modules/itip-formatter/itip-view.c:5234
 msgid "Memo information sent"
 msgstr "備忘錄資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5213
+#: ../modules/itip-formatter/itip-view.c:5245
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "無法寄出會議資訊，該會議並不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5218
+#: ../modules/itip-formatter/itip-view.c:5250
 msgid "Unable to send task information, the task does not exist"
 msgstr "ç„¡æ³•å¯„å‡ºå·¥ä½œè³‡è¨Šï¼Œè©²é …å·¥ä½œä¸å­˜åœ¨"
 
-#: ../modules/itip-formatter/itip-view.c:5223
+#: ../modules/itip-formatter/itip-view.c:5255
 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:5288
+#: ../modules/itip-formatter/itip-view.c:5320
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5293
+#: ../modules/itip-formatter/itip-view.c:5325
 msgid "Save Calendar"
 msgstr "儲存行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:5346
-#: ../modules/itip-formatter/itip-view.c:5359
+#: ../modules/itip-formatter/itip-view.c:5374
+#: ../modules/itip-formatter/itip-view.c:5387
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../modules/itip-formatter/itip-view.c:5347
-#: ../modules/itip-formatter/itip-view.c:5360
+#: ../modules/itip-formatter/itip-view.c:5375
+#: ../modules/itip-formatter/itip-view.c:5388
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "此郵件宣告其含有行事曆內容，但其行事曆並非有效的 iCalendar。"
 
-#: ../modules/itip-formatter/itip-view.c:5402
-#: ../modules/itip-formatter/itip-view.c:5432
-#: ../modules/itip-formatter/itip-view.c:5532
+#: ../modules/itip-formatter/itip-view.c:5430
+#: ../modules/itip-formatter/itip-view.c:5460
+#: ../modules/itip-formatter/itip-view.c:5561
 msgid "The item in the calendar is not valid"
 msgstr "è¡Œäº‹æ›†ä¸­çš„é …ç›®æ˜¯ç„¡æ•ˆçš„"
 
-#: ../modules/itip-formatter/itip-view.c:5403
-#: ../modules/itip-formatter/itip-view.c:5433
-#: ../modules/itip-formatter/itip-view.c:5533
+#: ../modules/itip-formatter/itip-view.c:5431
+#: ../modules/itip-formatter/itip-view.c:5461
+#: ../modules/itip-formatter/itip-view.c:5562
 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:5448
+#: ../modules/itip-formatter/itip-view.c:5476
 msgid "The calendar attached contains multiple items"
 msgstr "é™„åŠ çš„è¡Œäº‹æ›†å…§å®¹å«æœ‰å¤šå€‹é …ç›®"
 
-#: ../modules/itip-formatter/itip-view.c:5449
+#: ../modules/itip-formatter/itip-view.c:5477
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "è¦è™•ç†é€™äº›å…¨éƒ¨çš„é …ç›®ï¼Œæ‡‰è©²å°‡æ­¤æª”æ¡ˆå„²å­˜å¾ŒåŒ¯å…¥å…¶ä¸­çš„è¡Œäº‹æ›†"
 
-#: ../modules/itip-formatter/itip-view.c:5944
+#: ../modules/itip-formatter/itip-view.c:5978
 msgctxt "cal-itip"
 msgid "None"
 msgstr "沒有"
 
-#: ../modules/itip-formatter/itip-view.c:5960
+#: ../modules/itip-formatter/itip-view.c:5994
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: ../modules/itip-formatter/itip-view.c:6103
+#: ../modules/itip-formatter/itip-view.c:6154
 msgid "This meeting recurs"
 msgstr "這個會議的週期規則為"
 
-#: ../modules/itip-formatter/itip-view.c:6106
+#: ../modules/itip-formatter/itip-view.c:6157
 msgid "This task recurs"
 msgstr "é€™é …å·¥ä½œçš„é€±æœŸè¦å‰‡ç‚º"
 
-#: ../modules/itip-formatter/itip-view.c:6109
+#: ../modules/itip-formatter/itip-view.c:6160
 msgid "This memo recurs"
 msgstr "這個備忘錄的週期規則為"
 
@@ -17287,7 +17261,7 @@ msgid "Choose a mbox spool directory"
 msgstr "選擇 mbox 排程器目錄"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:137
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:80
 #: ../modules/plugin-manager/evolution-plugin-manager.c:159
 msgid "Configuration"
@@ -17324,23 +17298,23 @@ msgstr "連線後使用 STARTTLS"
 msgid "SSL on a dedicated port"
 msgstr "SSL æ–¼å°ˆç”¨çš„é€£æŽ¥åŸ "
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "使用自選的二元檔，取代「sendmail」(_U)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
 msgid "_Custom binary:"
 msgstr "自選二元檔(_C):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
 msgid "U_se custom arguments"
 msgstr "使用自選引數(_S)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
 msgid "Cus_tom arguments:"
 msgstr "自選引數(_T):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -17350,6 +17324,10 @@ msgstr ""
 "   %F - 代表寄件者電子郵件地址\n"
 "   %R - 代表收件者電子郵件地址"
 
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+msgid "Send mail also when in offline _mode"
+msgstr "離線模式下仍傳送郵件(_M)"
+
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求驗證(_V)"
@@ -17366,470 +17344,476 @@ msgstr "Yahoo! 功能"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "å°‡ Yahoo! è¡Œäº‹æ›†èˆ‡å·¥ä½œåŠ å…¥é€™å€‹å¸³è™Ÿ(_L)"
 
-#: ../modules/mail/e-mail-attachment-handler.c:404
+#: ../modules/mail/e-mail-attachment-handler.c:425
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d å°é™„åŠ çš„éƒµä»¶"
 
-#: ../modules/mail/e-mail-shell-backend.c:238
+#: ../modules/mail/e-mail-shell-backend.c:237
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:240
+#: ../modules/mail/e-mail-shell-backend.c:239
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
-#: ../modules/mail/e-mail-shell-backend.c:248
+#: ../modules/mail/e-mail-shell-backend.c:247
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "郵件帳號(_U)"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
+#: ../modules/mail/e-mail-shell-backend.c:249
 msgid "Create a new mail account"
 msgstr "建立新郵件帳號"
 
-#: ../modules/mail/e-mail-shell-backend.c:255
+#: ../modules/mail/e-mail-shell-backend.c:254
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "郵件資料夾(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:257
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
-#: ../modules/mail/e-mail-shell-backend.c:555
+#: ../modules/mail/e-mail-shell-backend.c:551
 msgid "Mail Accounts"
 msgstr "郵件帳號"
 
-#: ../modules/mail/e-mail-shell-backend.c:564
+#: ../modules/mail/e-mail-shell-backend.c:560
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:573
+#: ../modules/mail/e-mail-shell-backend.c:569
 msgid "Composer Preferences"
 msgstr "郵件編輯器偏好設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:582
+#: ../modules/mail/e-mail-shell-backend.c:578
 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:883
+#: ../modules/mail/e-mail-shell-backend.c:867
 msgctxt "label"
 msgid "None"
 msgstr "沒有"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:655
+msgid "Marking messages as read..."
+msgstr "將郵件標示成已經閱讀…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1507
 msgid "_Disable Account"
 msgstr "停用帳號(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1281
+#: ../modules/mail/e-mail-shell-view-actions.c:1509
 msgid "Disable this account"
 msgstr "停用這個帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1516
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1523
 msgid "Edit properties of this account"
 msgstr "編輯這個帳號的屬性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1530
 msgid "Refresh list of folders of this account"
 msgstr "重新整理這個帳號的資料夾清單"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "_Download Messages for Offline Usage"
 msgstr "下載離線使用的郵件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1537
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "下載標記為離線使用的帳號與資料夾之郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1542
 msgid "Fl_ush Outbox"
 msgstr "清理寄件匣(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1549
 msgid "_Copy Folder To..."
 msgstr "複製資料夾到(_C)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1551
 msgid "Copy the selected folder into another folder"
 msgstr "複製已選定的資料夾到另一個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1558
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1335
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "E_xpunge"
 msgstr "刪除(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1670
 msgid "Mar_k All Messages as Read"
 msgstr "標示所有郵件為已閱讀(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1672
 msgid "Mark all messages in the folder as read"
 msgstr "將資料夾中全部的郵件標示成已閱讀"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
 msgid "_Move Folder To..."
 msgstr "移動資料夾到(_M)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1351
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
 msgid "Move the selected folder into another folder"
 msgstr "將選定的資料夾移至另一個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1584
 msgid "_New..."
 msgstr "新增(_N)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1358
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Create a new folder for storing mail"
 msgstr "建立一個新資料夾以儲存郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1365
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "Change the properties of this folder"
 msgstr "更改這個資料夾的屬性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "Refresh the folder"
 msgstr "重新載入資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1379
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Change the name of this folder"
 msgstr "更改這個資料夾的名稱"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "Select Message _Thread"
 msgstr "é¸æ“‡éƒµä»¶æª”é ­(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1386
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選擇所有相關的郵件為選定的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "Select Message S_ubthread"
 msgstr "選擇郵件子羣組(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1393
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Select all replies to the currently selected message"
 msgstr "選擇所有回覆選定郵件的信"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1405
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Empty _Trash"
 msgstr "清理回收筒(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "永久移除在所有帳號內全部已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "_New Label"
 msgstr "新增標籤(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1421
+#: ../modules/mail/e-mail-shell-view-actions.c:1649
 msgid "N_one"
 msgstr "沒有(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1663
 msgid "_Manage Subscriptions"
 msgstr "管理訂閱(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#: ../modules/mail/e-mail-shell-view-actions.c:1749
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "è¨‚é–±æˆ–å–æ¶ˆè¨‚é–±åœ¨é ç«¯ä¼ºæœå™¨çš„è³‡æ–™å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Send / _Receive"
 msgstr "傳送/接收(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1444
+#: ../modules/mail/e-mail-shell-view-actions.c:1679
 msgid "Send queued items and retrieve new items"
 msgstr "å‚³é€å¾…é€çš„é …ç›®ä¸¦æŽ¥æ”¶æ–°çš„é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "R_eceive All"
 msgstr "全部接收(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1686
 msgid "Receive new items from all accounts"
 msgstr "æŽ¥æ”¶åœ¨æ‰€æœ‰å¸³è™Ÿå…§çš„æ–°é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "_Send All"
 msgstr "全部傳送(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1458
+#: ../modules/mail/e-mail-shell-view-actions.c:1693
 msgid "Send queued items in all accounts"
 msgstr "å‚³é€åœ¨æ‰€æœ‰å¸³è™Ÿå…§å¾…é€çš„é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1721
 msgid "Cancel the current mail operation"
 msgstr "取消目前郵件所作的行動"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Collapse All _Threads"
 msgstr "收摺所有相關郵件(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1728
 msgid "Collapse all message threads"
 msgstr "收摺所有的相關郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "E_xpand All Threads"
 msgstr "展開所有相關郵件(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1735
 msgid "Expand all message threads"
 msgstr "展開所有的相關郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1740
 msgid "_Message Filters"
 msgstr "郵件規則(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1507
+#: ../modules/mail/e-mail-shell-view-actions.c:1742
 msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "_Subscriptions..."
 msgstr "訂閱(_S)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1756
 msgid "F_older"
 msgstr "資料夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1763
 msgid "_Label"
 msgstr "標籤(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1780
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-shell-view-actions.c:1787
 msgid "Search F_olders"
 msgstr "搜尋資料夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1789
 msgid "Create or edit search folder definitions"
 msgstr "建立或編輯搜尋資料夾的定義"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1828
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1856
 msgid "Show Message _Preview"
 msgstr "é¡¯ç¤ºéƒµä»¶é è¦½(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Show message preview pane"
 msgstr "é¡¯ç¤ºéƒµä»¶é è¦½çª—æ ¼"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:1864
 msgid "Show _Deleted Messages"
 msgstr "顯示已刪除郵件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1866
 msgid "Show deleted messages with a line through them"
 msgstr "顯示已刪除的郵件 (åŠ ä¸Šåˆªé™¤ç·š)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Group By Threads"
 msgstr "æ ¹æ“šç›¸é—œéƒµä»¶ç‚ºç¾£çµ„(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Threaded message list"
 msgstr "相關郵件清單"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1880
 msgid "_Unmatched Folder Enabled"
 msgstr "未符合資料夾已啟用(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1882
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "切換是否啟用未符合搜尋資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "Show message preview below the message list"
 msgstr "åœ¨éƒµä»¶æ¸…å–®ä¸‹æ–¹é¡¯ç¤ºéƒµä»¶é è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1674
+#: ../modules/mail/e-mail-shell-view-actions.c:1909
 msgid "Show message preview alongside the message list"
 msgstr "åœ¨éƒµä»¶æ¸…å–®æ—é‚Šé¡¯ç¤ºéƒµä»¶é è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1917
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Important Messages"
 msgstr "重要郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1931
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1938
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:1945
 msgid "Messages with Attachments"
 msgstr "有附件的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1952
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1959
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1966
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1783
+#: ../modules/mail/e-mail-shell-view-actions.c:2018
 msgid "Subject or Addresses contain"
 msgstr "主旨或電子郵件位址包含"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:2028
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1800
+#: ../modules/mail/e-mail-shell-view-actions.c:2035
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1807
+#: ../modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-#: ../modules/mail/e-mail-shell-view.c:616
+#: ../modules/mail/e-mail-shell-view.c:630
 msgid "All Account Search"
 msgstr "所有的帳號搜尋"
 
-#: ../modules/mail/e-mail-shell-view.c:717
+#: ../modules/mail/e-mail-shell-view.c:734
 msgid "Account Search"
 msgstr "帳號搜尋"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1022
+#: ../modules/mail/e-mail-shell-view-private.c:996
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已選擇 %d 個，"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1007
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已刪除"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1039
-#: ../modules/mail/e-mail-shell-view-private.c:1046
+#: ../modules/mail/e-mail-shell-view-private.c:1013
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 個草稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未傳送"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../modules/mail/e-mail-shell-view-private.c:1038
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1050
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d 封未讀，"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1053
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "共 %d 封"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1102
+#: ../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Trash"
 msgstr "回收筒"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1518
+#: ../modules/mail/e-mail-shell-view-private.c:1514
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
-#: ../modules/mail/em-composer-prefs.c:492
+#: ../modules/mail/em-composer-prefs.c:447
 msgid "Language(s)"
 msgstr "語言"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:81
 msgid "On exit, every time"
 msgstr "結束時，每次"
 
-#: ../modules/mail/em-mailer-prefs.c:81
+#: ../modules/mail/em-mailer-prefs.c:82
 msgid "On exit, once per day"
 msgstr "結束時，每天一次"
 
-#: ../modules/mail/em-mailer-prefs.c:82
+#: ../modules/mail/em-mailer-prefs.c:83
 msgid "On exit, once per week"
 msgstr "結束時，每週一次"
 
-#: ../modules/mail/em-mailer-prefs.c:83
+#: ../modules/mail/em-mailer-prefs.c:84
 msgid "On exit, once per month"
 msgstr "結束時，每月一次"
 
-#: ../modules/mail/em-mailer-prefs.c:84
+#: ../modules/mail/em-mailer-prefs.c:85
 msgid "Immediately, on folder leave"
 msgstr "立即，在離開資料夾時"
 
-#: ../modules/mail/em-mailer-prefs.c:313
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "é é¦–"
 
-#: ../modules/mail/em-mailer-prefs.c:317
+#: ../modules/mail/em-mailer-prefs.c:360
 msgid "Contains Value"
 msgstr "包含數值"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "_Date header:"
 msgstr "æ—¥æœŸæ¨™é ­(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1216
 msgid "Show _original header value"
 msgstr "é¡¯ç¤ºåŽŸå§‹æ¨™é ­æ•¸å€¼(_O)"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../modules/mailto-handler/evolution-mailto-handler.c:142
 msgid "Do you want to make Evolution your default email client?"
 msgstr "是否要將 Evolution è¨­ç‚ºä½ çš„é è¨­é›»å­éƒµä»¶å®¢æˆ¶ç«¯ï¼Ÿ"
 
@@ -17846,13 +17830,13 @@ msgstr "ä½ å¯„çµ¦ %s 主旨「%s」 (%s) 的郵件已被閱讀。"
 msgid "Delivery Notification for \"%s\""
 msgstr "「%s」的遞送通知"
 
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../modules/mdn/evolution-mdn.c:543
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "傳送郵件回條給「%s」"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:541
+#: ../modules/mdn/evolution-mdn.c:548
 msgid "_Notify Sender"
 msgstr "通知寄件者(_N)"
 
@@ -17882,22 +17866,6 @@ msgid ""
 "established."
 msgstr "一旦網絡連線建立，Evolution 就會回到網上模式。"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:298
-msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
-msgstr "在 org.gnome 找不到對應的帳號。這是 OnlineAccounts 服務獲取驗證記號的地方。"
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:380
-msgid "OAuth"
-msgstr "OAuth"
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:382
-msgid ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
-msgstr "é€™å€‹é¸é …æœƒé€éŽ GNOME Online Accounts 服務連接到伺服器"
-
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Author(s)"
 msgstr "作者"
@@ -17998,41 +17966,41 @@ msgstr "純文字模型"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "以純文字方式檢視郵件，即使它們含有 HTML 內容。"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:184
+#: ../modules/spamassassin/evolution-spamassassin.c:151
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "無法產生 SpamAssassin (%s)："
 
-#: ../modules/spamassassin/evolution-spamassassin.c:207
+#: ../modules/spamassassin/evolution-spamassassin.c:174
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "無法將郵件訊息的內容串流導至 SpamAssassin："
 
-#: ../modules/spamassassin/evolution-spamassassin.c:226
+#: ../modules/spamassassin/evolution-spamassassin.c:193
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "無法寫入「%s」至 SpamAssassin："
 
-#: ../modules/spamassassin/evolution-spamassassin.c:254
+#: ../modules/spamassassin/evolution-spamassassin.c:221
 msgid "Failed to read output from SpamAssassin: "
 msgstr "無法從 SpamAssassin 讀取輸出："
 
-#: ../modules/spamassassin/evolution-spamassassin.c:309
+#: ../modules/spamassassin/evolution-spamassassin.c:276
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin 可能當掉或無法處理郵件訊息"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:747
+#: ../modules/spamassassin/evolution-spamassassin.c:356
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin é¸é …"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:762
+#: ../modules/spamassassin/evolution-spamassassin.c:371
 msgid "I_nclude remote tests"
 msgstr "åŒ…å«é ç«¯æ¸¬è©¦(_N)"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:776
+#: ../modules/spamassassin/evolution-spamassassin.c:385
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "這會讓 SpamAssasin æ›´å¯é ï¼Œä½†é€Ÿåº¦è®Šæ…¢ã€‚"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1033
+#: ../modules/spamassassin/evolution-spamassassin.c:559
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -18062,7 +18030,7 @@ msgstr ""
 "\n"
 "以下畫面會讓 Evolution é€£ç·šè‡³ä½ çš„é›»å­éƒµä»¶å¸³è™Ÿï¼Œä»¥åŠå¾žå…¶ä»–æ‡‰ç”¨ç¨‹å¼åŒ¯å…¥æª”æ¡ˆã€‚"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:239
+#: ../modules/startup-wizard/evolution-startup-wizard.c:229
 msgid "Loading accounts..."
 msgstr "正在載入帳號…"
 
@@ -18074,11 +18042,11 @@ msgstr "æ ¼å¼åŒ–ç‚º(_F)…"
 msgid "_Other languages"
 msgstr "其他的語言(_O)"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:371
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:367
 msgid "Text Highlight"
 msgstr "文字突顯"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:372
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:368
 msgid "Syntax highlighting of mail parts"
 msgstr "郵件部分的語法突顯"
 
@@ -18298,35 +18266,35 @@ msgstr "_TCSH"
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:126
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:194
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
+#: ../modules/vcard-inline/e-mail-part-vcard.c:152
 msgid "Show F_ull vCard"
 msgstr "顯示完整的 vCard (_U)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:129
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:212
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
+#: ../modules/vcard-inline/e-mail-part-vcard.c:170
 msgid "Show Com_pact vCard"
 msgstr "顯示精簡的 vCard (_P)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:153
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
 msgid "Save _To Addressbook"
 msgstr "儲存到通訊錄(_T)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:173
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
 msgid "There is one other contact."
 msgstr "還有聯絡人。"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:179
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "還有 %d 個其他聯絡人。"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:204
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
 msgid "Addressbook Contact"
 msgstr "通訊錄聯絡人"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:205
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
 msgid "Display the part as an addressbook contact"
 msgstr "將部分顯示為通訊錄聯絡人"
 
@@ -18339,7 +18307,7 @@ msgid "_Do not show this message again."
 msgstr "不要再顯示這個訊息(_D)"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:583
-#: ../plugins/templates/templates.c:473
+#: ../plugins/templates/templates.c:480
 msgid "Keywords"
 msgstr "關鍵字"
 
@@ -18369,35 +18337,35 @@ msgstr "附件提醒程式"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "ç•¶ä½ å¿˜è¨˜å°‡é™„ä»¶åŠ å…¥éƒµä»¶æ™‚æé†’ä½ ã€‚"
 
-#: ../plugins/bbdb/bbdb.c:633 ../plugins/bbdb/bbdb.c:642
+#: ../plugins/bbdb/bbdb.c:627 ../plugins/bbdb/bbdb.c:636
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "è‡ªå‹•åŠ å…¥çš„è¯çµ¡äºº"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:657
+#: ../plugins/bbdb/bbdb.c:651
 msgid "Create _address book entries when sending mails"
 msgstr "åœ¨å‚³é€éƒµä»¶æ™‚è‡ªå‹•å»ºç«‹é€šè¨ŠéŒ„é …ç›®(_A)"
 
-#: ../plugins/bbdb/bbdb.c:665
+#: ../plugins/bbdb/bbdb.c:658
 msgid "Select Address book for Automatic Contacts"
 msgstr "é¸æ“‡çµ¦è‡ªå‹•åŠ å…¥è¯çµ¡äººç”¨çš„é€šè¨ŠéŒ„"
 
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Instant Messaging Contacts"
 msgstr "即時訊息聯絡人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:697
+#: ../plugins/bbdb/bbdb.c:690
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "從 Pidgin 的好友清單同步聯絡人資訊和圖片(_S)"
 
-#: ../plugins/bbdb/bbdb.c:705
+#: ../plugins/bbdb/bbdb.c:697
 msgid "Select Address book for Pidgin buddy list"
 msgstr "選擇給 Pidgin 好友名單用的通訊錄"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:718
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Synchronize with _buddy list now"
 msgstr "立即與好友清單同步(_B)"
 
@@ -18491,7 +18459,7 @@ msgid "Key"
 msgstr "設定鍵"
 
 #: ../plugins/email-custom-header/email-custom-header.c:876
-#: ../plugins/templates/templates.c:482
+#: ../plugins/templates/templates.c:489
 msgid "Values"
 msgstr "數值"
 
@@ -18623,55 +18591,55 @@ msgstr "行內圖片"
 msgid "View image attachments directly in mail messages."
 msgstr "直接在郵件中顯示圖片。"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Get List _Archive"
 msgstr "取得清單檔案庫(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:370
 msgid "Get an archive of the list this message belongs to"
 msgstr "取得此郵件所屬論壇的檔案庫"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Get List _Usage Information"
 msgstr "取得清單使用資訊(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:377
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "取得此郵件所屬論壇的使用方法相關資訊"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Contact List _Owner"
 msgstr "聯絡人清單擁有者(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:384
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "聯絡此郵件所屬通信論壇的管理者"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "_Post Message to List"
 msgstr "傳送郵件給論壇(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:391
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "撰寫郵件給此郵件所屬的通信論壇"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 msgid "_Subscribe to List"
 msgstr "訂閱論壇(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:397
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:398
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "訂閱此郵件所屬的通信論壇"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 msgid "_Unsubscribe from List"
 msgstr "取消訂閱論壇(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:404
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:405
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "取消訂閱此郵件所屬的通信論壇"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:411
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:412
 msgid "Mailing _List"
 msgstr "通信論壇(_L)"
 
@@ -18763,6 +18731,13 @@ msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ä½ å·²ç¶“æŽ¥æ”¶ %d 封郵件 。 "
 
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:395
+#, c-format
+msgid "From: %s"
+msgstr "寄件者：%s"
+
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
 #: ../plugins/mail-notification/mail-notification.c:409
@@ -18914,39 +18889,39 @@ msgid ""
 "memo list, please."
 msgstr "é¸å–çš„å‚™å¿˜éŒ„æ¸…å–®æ˜¯å”¯è®€çš„ï¼Œå› æ­¤ä¸èƒ½åœ¨é€™è£å»ºç«‹å‚™å¿˜éŒ„ã€‚è«‹é¸æ“‡å…¶ä»–çš„å‚™å¿˜éŒ„æ¸…å–®ã€‚"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1199
+#: ../plugins/mail-to-task/mail-to-task.c:1196
 msgid "No writable calendar is available."
 msgstr "沒有可寫入的行事曆。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1273
 msgid "Create an _Appointment"
 msgstr "建立一個約會(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1279
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a new event from the selected message"
 msgstr "以選取的郵件建立新的事件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a Mem_o"
 msgstr "建立備忘錄(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1286
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new memo from the selected message"
 msgstr "以選取的郵件建立新的備忘錄"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1291
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a _Task"
 msgstr "建立工作(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1293
+#: ../plugins/mail-to-task/mail-to-task.c:1289
 msgid "Create a new task from the selected message"
 msgstr "以選取的郵件建立新的工作"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1301
+#: ../plugins/mail-to-task/mail-to-task.c:1297
 msgid "Create a _Meeting"
 msgstr "建立會議(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1303
+#: ../plugins/mail-to-task/mail-to-task.c:1299
 msgid "Create a new meeting from the selected message"
 msgstr "以選取的郵件建立新的會議"
 
@@ -18954,36 +18929,6 @@ msgstr "以選取的郵件建立新的會議"
 msgid "Convert a mail message to a task."
 msgstr "將郵件轉換為工作。"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
-msgid "Also mark messages in subfolders?"
-msgstr "是否也標記子資料夾中的郵件？"
-
-#: ../plugins/mark-all-read/mark-all-read.c:44
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr "ä½ è¦å°‡ç›®å‰çš„è³‡æ–™å¤¾ä¸­çš„éƒµä»¶å·²é–±è®€ï¼Œæˆ–æ˜¯åŒ…å«ç›®å‰çš„è³‡æ–™å¤¾åŠå…¶å­è³‡æ–™å¤¾ä¸­æ‰€æœ‰éƒµä»¶ã€‚"
-
-#: ../plugins/mark-all-read/mark-all-read.c:184
-msgid "In Current Folder and _Subfolders"
-msgstr "於目前的資料夾及其子資料夾(_S)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:198
-msgid "In Current _Folder Only"
-msgstr "於目前的資料夾(_F)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:544
-msgid "Mark Me_ssages as Read"
-msgstr "標示郵件為已讀(_S)"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-msgid "Mark All Read"
-msgstr "全部標示成已讀"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark all messages in a folder as read."
-msgstr "將資料夾中全部的郵件標示成已閱讀。"
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST 匯入"
@@ -18996,37 +18941,37 @@ msgstr "Outlook 個人資料夾 (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "從 PST 檔案匯入 Outlook 郵件"
 
-#: ../plugins/pst-import/pst-importer.c:527
+#: ../plugins/pst-import/pst-importer.c:530
 msgid "_Mail"
 msgstr "郵件(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:556
+#: ../plugins/pst-import/pst-importer.c:559
 msgid "Destination folder:"
 msgstr "目的地資料夾:"
 
-#: ../plugins/pst-import/pst-importer.c:566
+#: ../plugins/pst-import/pst-importer.c:569
 msgid "_Address Book"
 msgstr "通訊錄(_A)"
 
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../plugins/pst-import/pst-importer.c:574
 msgid "A_ppointments"
 msgstr "約會(_P)"
 
-#: ../plugins/pst-import/pst-importer.c:576 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "工作(_T)"
 
-#: ../plugins/pst-import/pst-importer.c:581
+#: ../plugins/pst-import/pst-importer.c:584
 msgid "_Journal entries"
 msgstr "æ—¥èªŒé …ç›®(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:697
+#: ../plugins/pst-import/pst-importer.c:704
 msgid "Importing Outlook data"
 msgstr "匯入 Outlook 資料"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:142
-#: ../plugins/publish-calendar/publish-calendar.c:149
+#: ../plugins/publish-calendar/publish-calendar.c:141
+#: ../plugins/publish-calendar/publish-calendar.c:148
 msgid "Calendar Publishing"
 msgstr "行事曆發布"
 
@@ -19038,49 +18983,49 @@ msgstr "位置"
 msgid "Publish calendars to the web."
 msgstr "å°‡è¡Œäº‹æ›†ç™¼å¸ƒç‚ºç¶²é ã€‚"
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
-#: ../plugins/publish-calendar/publish-calendar.c:472
+#: ../plugins/publish-calendar/publish-calendar.c:213
+#: ../plugins/publish-calendar/publish-calendar.c:471
 #, c-format
 msgid "Could not open %s:"
 msgstr "無法開啟 %s："
 
-#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:215
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "無法開啟 %s：未知的錯誤"
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../plugins/publish-calendar/publish-calendar.c:235
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "發布到 %s 時發生錯誤："
 
-#: ../plugins/publish-calendar/publish-calendar.c:238
+#: ../plugins/publish-calendar/publish-calendar.c:237
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "發布到 %s 已成功結束"
 
-#: ../plugins/publish-calendar/publish-calendar.c:282
+#: ../plugins/publish-calendar/publish-calendar.c:281
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "掛載 %s 失敗："
 
-#: ../plugins/publish-calendar/publish-calendar.c:635
+#: ../plugins/publish-calendar/publish-calendar.c:634
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "啟用(_E)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:785
+#: ../plugins/publish-calendar/publish-calendar.c:784
 msgid "Are you sure you want to remove this location?"
 msgstr "確定要移除這個位置？"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1124
+#: ../plugins/publish-calendar/publish-calendar.c:1123
 msgid "Could not create publish thread."
 msgstr "無法建立發布執行緒。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1134
+#: ../plugins/publish-calendar/publish-calendar.c:1133
 msgid "_Publish Calendar Information"
 msgstr "發布行事曆資訊(_P)"
 
@@ -19265,7 +19210,7 @@ msgstr "以此封裝數值(_E):"
 msgid "Comma separated values (.csv)"
 msgstr "é€—è™Ÿéš”é–‹çš„æ•¸å€¼æ ¼å¼ (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:171 ../shell/e-shell-utils.c:197
+#: ../plugins/save-calendar/ical-format.c:171 ../shell/e-shell-utils.c:175
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -19317,39 +19262,39 @@ msgid ""
 "an email you are replying to."
 msgstr "åŸºæ–¼è‰ç¨¿çš„ç¯„æœ¬å¤–æŽ›ç¨‹å¼ã€‚ä½ å¯ä»¥ä½¿ç”¨çš„è®Šæ•¸æœ‰ $ORIG[subject], $ORIG[from], $ORIG[to] 或 $ORIG[body]ï¼Œå®ƒå€‘æœƒä»¥ä½ æ‰€å›žè¦†çš„éƒµä»¶ä¸­çš„æ•¸å€¼å–ä»£ã€‚"
 
-#: ../plugins/templates/templates.c:1135
+#: ../plugins/templates/templates.c:1148
 msgid "No Title"
 msgstr "沒有標題"
 
-#: ../plugins/templates/templates.c:1244
+#: ../plugins/templates/templates.c:1257
 msgid "Save as _Template"
 msgstr "儲存為範本(_T)"
 
-#: ../plugins/templates/templates.c:1246
+#: ../plugins/templates/templates.c:1259
 msgid "Save as Template"
 msgstr "儲存為範本"
 
-#: ../shell/e-shell.c:307
+#: ../shell/e-shell.c:278
 msgid "Preparing to go offline..."
 msgstr "準備進入離線…"
 
-#: ../shell/e-shell.c:360
+#: ../shell/e-shell.c:331
 msgid "Preparing to go online..."
 msgstr "準備進入上線…"
 
-#: ../shell/e-shell.c:434
+#: ../shell/e-shell.c:412
 msgid "Preparing to quit"
 msgstr "準備結束"
 
-#: ../shell/e-shell.c:440
+#: ../shell/e-shell.c:418
 msgid "Preparing to quit..."
 msgstr "準備結束…"
 
-#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
+#: ../shell/e-shell-content.c:719 ../shell/e-shell-content.c:720
 msgid "Searches"
 msgstr "搜尋"
 
-#: ../shell/e-shell-content.c:764
+#: ../shell/e-shell-content.c:763
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
@@ -19357,31 +19302,31 @@ msgstr "儲存搜尋結果"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:1143
+#: ../shell/e-shell-searchbar.c:1086
 msgid "Sho_w:"
 msgstr "顯示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1186
+#: ../shell/e-shell-searchbar.c:1120
 msgid "Sear_ch:"
 msgstr "搜尋(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1272
+#: ../shell/e-shell-searchbar.c:1201
 msgid "i_n"
 msgstr "æ–¼(_N)"
 
-#: ../shell/e-shell-utils.c:195
+#: ../shell/e-shell-utils.c:173
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:218
+#: ../shell/e-shell-utils.c:196
 msgid "All Files (*)"
 msgstr "所有檔案 (*)"
 
-#: ../shell/e-shell-view.c:295
+#: ../shell/e-shell-view.c:290
 msgid "Saving user interface state"
 msgstr "儲存使用者介面狀態"
 
@@ -19403,277 +19348,278 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution 網站"
 
-#: ../shell/e-shell-window-actions.c:323
+#: ../shell/e-shell-window-actions.c:341
 msgid "Categories Editor"
 msgstr "分類編輯器"
 
-#: ../shell/e-shell-window-actions.c:660
+#: ../shell/e-shell-window-actions.c:672
 msgid "Bug Buddy is not installed."
 msgstr "尚未安裝 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:661
+#: ../shell/e-shell-window-actions.c:673
 msgid "Bug Buddy could not be run."
 msgstr "無法執行 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:841
+#: ../shell/e-shell-window-actions.c:853
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
-#: ../shell/e-shell-window-actions.c:846 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
 
-#: ../shell/e-shell-window-actions.c:867
+#: ../shell/e-shell-window-actions.c:879
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../shell/e-shell-window-actions.c:869
+#: ../shell/e-shell-window-actions.c:881
 msgid "Open the Evolution User Guide"
 msgstr "開啟 Evolution 使用者指南"
 
-#: ../shell/e-shell-window-actions.c:895
+#: ../shell/e-shell-window-actions.c:907
 msgid "I_mport..."
 msgstr "匯入(_M)…"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:909
 msgid "Import data from other programs"
 msgstr "匯入其他程式的資料"
 
-#: ../shell/e-shell-window-actions.c:902
+#: ../shell/e-shell-window-actions.c:914
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-#: ../shell/e-shell-window-actions.c:904
+#: ../shell/e-shell-window-actions.c:916
 msgid "Create a new window displaying this view"
 msgstr "建立一個新的視窗來顯示這個檢視"
 
-#: ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:928
 msgid "Available Cate_gories"
 msgstr "可用的分類(_G)"
 
-#: ../shell/e-shell-window-actions.c:918
+#: ../shell/e-shell-window-actions.c:930
 msgid "Manage available categories"
 msgstr "管理可用的分類"
 
-#: ../shell/e-shell-window-actions.c:930
+#: ../shell/e-shell-window-actions.c:942
 msgid "_Quick Reference"
 msgstr "快捷鍵參照表(_Q)"
 
-#: ../shell/e-shell-window-actions.c:932
+#: ../shell/e-shell-window-actions.c:944
 msgid "Show Evolution's shortcut keys"
 msgstr "顯示 Evolution 的捷徑鍵"
 
-#: ../shell/e-shell-window-actions.c:939
+#: ../shell/e-shell-window-actions.c:951
 msgid "Exit the program"
 msgstr "離開這個程式"
 
-#: ../shell/e-shell-window-actions.c:944
+#: ../shell/e-shell-window-actions.c:956
 msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)…"
 
-#: ../shell/e-shell-window-actions.c:946
+#: ../shell/e-shell-window-actions.c:958
 msgid "Construct a more advanced search"
 msgstr "建立更進階的搜尋"
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:965
 msgid "Clear the current search parameters"
 msgstr "清除目前的搜尋參數"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:970
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的搜尋結果(_E)…"
 
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:972
 msgid "Manage your saved searches"
 msgstr "ç®¡ç†ä½ å·²å„²å­˜çš„æœå°‹"
 
-#: ../shell/e-shell-window-actions.c:967
+#: ../shell/e-shell-window-actions.c:979
 msgid "Click here to change the search type"
 msgstr "按這裏以改變搜尋類型"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:984
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:986
 msgid "Execute the current search parameters"
 msgstr "執行目前的搜尋參數"
 
-#: ../shell/e-shell-window-actions.c:979
+#: ../shell/e-shell-window-actions.c:991
 msgid "_Save Search..."
 msgstr "儲存搜尋結果(_S)…"
 
-#: ../shell/e-shell-window-actions.c:981
+#: ../shell/e-shell-window-actions.c:993
 msgid "Save the current search parameters"
 msgstr "儲存目前的搜尋參數"
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:1005
 msgid "Submit _Bug Report..."
 msgstr "å‚³é€éŒ¯èª¤å ±å‘Š(_B)…"
 
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:1007
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy é€å‡ºéŒ¯èª¤å ±å‘Šã€‚"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:1012
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:1014
 msgid "Put Evolution into offline mode"
 msgstr "讓 Evolution 進入離線模式"
 
-#: ../shell/e-shell-window-actions.c:1007
+#: ../shell/e-shell-window-actions.c:1019
 msgid "_Work Online"
 msgstr "網上工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:1021
 msgid "Put Evolution into online mode"
 msgstr "讓 Evolution 進入上線模式"
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:1049
 msgid "Lay_out"
 msgstr "佈局(_O)"
 
-#: ../shell/e-shell-window-actions.c:1044
+#: ../shell/e-shell-window-actions.c:1056
 msgid "_New"
 msgstr "新增(_N)"
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:1063
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:1070
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
 
-#: ../shell/e-shell-window-actions.c:1072
+#: ../shell/e-shell-window-actions.c:1084
 msgid "_Window"
 msgstr "視窗(_O)"
 
-#: ../shell/e-shell-window-actions.c:1101
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Show Side _Bar"
 msgstr "顯示側邊欄(_B)"
 
-#: ../shell/e-shell-window-actions.c:1103
+#: ../shell/e-shell-window-actions.c:1115
 msgid "Show the side bar"
 msgstr "顯示側邊列"
 
-#: ../shell/e-shell-window-actions.c:1109
+#: ../shell/e-shell-window-actions.c:1121
 msgid "Show _Buttons"
 msgstr "顯示按鈕(_B)"
 
-#: ../shell/e-shell-window-actions.c:1111
+#: ../shell/e-shell-window-actions.c:1123
 msgid "Show the switcher buttons"
 msgstr "顯示切換程式按鈕"
 
-#: ../shell/e-shell-window-actions.c:1117
+#: ../shell/e-shell-window-actions.c:1129
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: ../shell/e-shell-window-actions.c:1119
+#: ../shell/e-shell-window-actions.c:1131
 msgid "Show the status bar"
 msgstr "顯示狀態列"
 
-#: ../shell/e-shell-window-actions.c:1125
+#: ../shell/e-shell-window-actions.c:1137
 msgid "Show _Tool Bar"
 msgstr "顯示工具列(_T)"
 
-#: ../shell/e-shell-window-actions.c:1127
+#: ../shell/e-shell-window-actions.c:1139
 msgid "Show the tool bar"
 msgstr "顯示工具列"
 
-#: ../shell/e-shell-window-actions.c:1149
+#: ../shell/e-shell-window-actions.c:1161
 msgid "_Icons Only"
 msgstr "只有圖示(_I)"
 
-#: ../shell/e-shell-window-actions.c:1151
+#: ../shell/e-shell-window-actions.c:1163
 msgid "Display window buttons with icons only"
 msgstr "只顯示視窗按鈕的圖示"
 
-#: ../shell/e-shell-window-actions.c:1156
+#: ../shell/e-shell-window-actions.c:1168
 msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../shell/e-shell-window-actions.c:1158
+#: ../shell/e-shell-window-actions.c:1170
 msgid "Display window buttons with text only"
 msgstr "只顯示視窗按鈕的文字"
 
-#: ../shell/e-shell-window-actions.c:1163
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Icons _and Text"
 msgstr "圖示及文字(_A)"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1177
 msgid "Display window buttons with icons and text"
 msgstr "顯示視窗按鈕的圖示及文字"
 
-#: ../shell/e-shell-window-actions.c:1170
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Tool_bar Style"
 msgstr "å·¥å…·åˆ—é¢¨æ ¼(_B)"
 
-#: ../shell/e-shell-window-actions.c:1172
+#: ../shell/e-shell-window-actions.c:1184
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使用桌面工具列設定值顯示視窗按鈕"
 
-#: ../shell/e-shell-window-actions.c:1180
-msgid "Define Views..."
-msgstr "定義檢視…"
+#: ../shell/e-shell-window-actions.c:1192
+msgid "Delete Current View"
+msgstr "刪除目前的檢視"
 
-#: ../shell/e-shell-window-actions.c:1182
-msgid "Create or edit views"
-msgstr "建立或編輯檢視(_C)"
-
-#: ../shell/e-shell-window-actions.c:1187
+#: ../shell/e-shell-window-actions.c:1199
 msgid "Save Custom View..."
 msgstr "儲存自選檢視…"
 
-#: ../shell/e-shell-window-actions.c:1189
+#: ../shell/e-shell-window-actions.c:1201
 msgid "Save current custom view"
 msgstr "儲存目前的自選檢視"
 
-#: ../shell/e-shell-window-actions.c:1196
+#: ../shell/e-shell-window-actions.c:1208
 msgid "C_urrent View"
 msgstr "目前檢視(_U)"
 
-#: ../shell/e-shell-window-actions.c:1206
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Custom View"
 msgstr "自選檢視"
 
-#: ../shell/e-shell-window-actions.c:1208
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Current view is a customized view"
 msgstr "目前的檢視方式是自選的檢視"
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Change the page settings for your current printer"
 msgstr "ä¿®æ”¹ç›®å‰æ‰“å°æ©Ÿçš„é é¢æ‰“å°è¨­å®š"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1591
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1714
 #, c-format
 msgid "Select view: %s"
 msgstr "選擇檢視：%s"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1731
+#, c-format
+msgid "Delete view: %s"
+msgstr "刪除檢視：%s"
+
+#: ../shell/e-shell-window-actions.c:1825
 msgid "Execute these search parameters"
 msgstr "執行這些搜尋參數"
 
-#: ../shell/e-shell-window.c:497
+#: ../shell/e-shell-window.c:439
 msgid "New"
 msgstr "新增"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:585
+#: ../shell/e-shell-window-private.c:580
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19708,7 +19654,7 @@ msgstr ""
 "æˆ‘å€‘å¸Œæœ›ä½ äº«å—å·¥ä½œæˆæžœï¼Œè€Œä¸”æˆ‘å€‘\n"
 "ç†±åˆ‡å¸Œæœ›ä½ æä¾›æ„è¦‹ï¼\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19716,66 +19662,62 @@ msgstr ""
 "謝謝\n"
 "Evolution 小組敬上\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:213
 msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:303
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr "å•Ÿå‹• Evolution æ™‚ä»¥æŒ‡å®šçš„å…ƒä»¶é¡¯ç¤ºã€‚å¯ç”¨çš„é¸é …æœ‰ã€Œmail」、「calendar」、「contacts」、「tasks」和「memos」"
 
-#: ../shell/main.c:307
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "將指定的尺寸套用到主視窗"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "以網上模式啟動"
 
-#: ../shell/main.c:313
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "忽略互聯網是否可用"
 
 #: ../shell/main.c:315
-msgid "Start in \"express\" mode"
-msgstr "以「快速」模式啟動"
-
-#: ../shell/main.c:318
 msgid "Forcibly shut down Evolution"
 msgstr "強制關閉 Evoultion"
 
-#: ../shell/main.c:321
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "åœç”¨éƒµä»¶ã€è¯çµ¡äººå’Œå·¥ä½œçš„é è¦½çª—æ ¼ã€‚"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:324
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "將指定的 URI 或檔案名稱匯入為接下來的引數。"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "要求執行中的 Evolution 程序結束"
 
-#: ../shell/main.c:419
+#: ../shell/main.c:403
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 msgstr "不能啟動 Evolution。可能有另一個 Evolution 實體沒有回應。系統錯誤：%s"
 
-#: ../shell/main.c:515 ../shell/main.c:520
+#: ../shell/main.c:499 ../shell/main.c:504
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
-#: ../shell/main.c:587
+#: ../shell/main.c:571
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19784,7 +19726,7 @@ msgstr ""
 "%s： --online 和 --offline 不能一起使用。\n"
 "  使用 '%s --help' 取得進一步資訊。\n"
 
-#: ../shell/main.c:593
+#: ../shell/main.c:577
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20020,17 +19962,22 @@ msgid ""
 "unless otherwise indicated here"
 msgstr "å› ç‚ºä½ ä¸ä¿¡ä»»ç™¼å‡ºæ­¤è­‰æ›¸çš„è­‰æ›¸å–®ä½ï¼Œæ‰€ä»¥é™¤éžåœ¨æ­¤æŒ‡ç¤ºï¼Œå¦å‰‡ä½ å°‡ä¸ä¿¡ä»»æ­¤è­‰æ›¸çš„æœ‰æ•ˆæ€§ã€‚"
 
-#: ../smime/gui/component.c:51
+#: ../smime/gui/component.c:56
+#, c-format
+msgid "Enter the password for '%s', token '%s'"
+msgstr "輸入「%s」的密碼，記號「%s」 "
+
+#: ../smime/gui/component.c:58
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "輸入「%s」的密碼 "
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:77
+#: ../smime/gui/component.c:86
 msgid "Enter new password for certificate database"
 msgstr "輸入證書資料庫的新密碼"
 
-#: ../smime/gui/component.c:80
+#: ../smime/gui/component.c:89
 msgid "Enter new password"
 msgstr "輸入新密碼"
 
@@ -20412,6 +20359,255 @@ msgstr "到期日(_D):"
 msgid "With _Status"
 msgstr "設定狀態(_S)"
 
+#~ msgid "Card View"
+#~ msgstr "名片檢視模式"
+
+#~ msgid ""
+#~ "Evolution does not support calendar reminders with\n"
+#~ "email notifications yet, but this reminder was\n"
+#~ "configured to send an email.  Evolution will display\n"
+#~ "a normal reminder dialog box instead."
+#~ msgstr ""
+#~ "Evolution 尚未支援使用電子郵件通知的\n"
+#~ "行事曆提醒，但是這個提醒被設定為\n"
+#~ "送出電子郵件。  Evolution 會顯示\n"
+#~ "普通的提醒對話盒來代替。"
+
+#~ msgid "Day View"
+#~ msgstr "日檢視"
+
+#~ msgid "Work Week View"
+#~ msgstr "工作週檢視"
+
+#~ msgid "Week View"
+#~ msgstr "週檢視"
+
+#~ msgid "Month View"
+#~ msgstr "月檢視"
+
+#~ msgid "Web Page"
+#~ msgstr "ç¶²é "
+
+#~ msgid "Stat_us:"
+#~ msgstr "狀態(_U):"
+
+#~ msgid "_Status Details"
+#~ msgstr "狀態詳細資料(_S)"
+
+#~ msgid "Click to change or view the status details of the task"
+#~ msgstr "按這裡改變/檢視該工作的狀態詳細資料"
+
+#~ msgid "Task Details"
+#~ msgstr "工作詳細資料"
+
+#~ msgid "Save draft"
+#~ msgstr "儲存草稿"
+
+#~ msgid "Email Settings"
+#~ msgstr "電子郵件設定值"
+
+#~ msgid "Configure email accounts"
+#~ msgstr "設定郵件帳號"
+
+#~ msgid "Week start"
+#~ msgstr "一週開始於"
+
+#~ msgid "Work days"
+#~ msgstr "工作日"
+
+#~ msgid "Days on which the start and end of work hours should be indicated"
+#~ msgstr "å¿…é ˆæŒ‡æ˜Žå·¥ä½œæ—¥é–‹å§‹èˆ‡çµæŸæ–¼å¹¾æ™‚"
+
+#~ msgid "Save name format for drag-and-drop operation"
+#~ msgstr "æ‹–æ”¾æ“ä½œæ™‚å„²å­˜çš„åç¨±æ ¼å¼"
+
+#~ msgid ""
+#~ "Can be either 2 to use current date and time or any other value for sent "
+#~ "date of the message. This has a meaning only when dropping just one "
+#~ "message."
+#~ msgstr ""
+#~ "可以是 2 以使用目前的日期和時刻或任何數值代表郵件的傳送日期。這只有在拖放"
+#~ "單一郵件時才有意義。"
+
+#~ msgid "Whether disable ellipsizing feature of folder names in side bar."
+#~ msgstr "是否停用側邊列的資料夾名稱省略。"
+
+#~ msgid ""
+#~ "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+#~ "Never load images off the net. \"1\" - Load images in messages from "
+#~ "contacts. \"2\" - Always load images off the net."
+#~ msgstr ""
+#~ "透過 HTTP(S) 載入 HTML 郵件的圖片。可能的值為：「0」– 不從網路載入圖片。"
+#~ "「1」– 如果是在連絡人裡的寄件者時，載入圖片。「2」- 一定從網路載入圖片。"
+
+#~ msgid ""
+#~ "This key should contain a list of XML structures specifying custom "
+#~ "headers, and whether they are to be displayed. The format of the XML "
+#~ "structure is &lt;header enabled&gt; - set enabled if the header is to be "
+#~ "displayed in the mail view."
+#~ msgstr ""
+#~ "此金鑰應該包含 XML æ¸…å–®ï¼Œå®ƒæœƒæŒ‡å®šè‡ªè¨‚æª”é ­ï¼Œä»¥åŠæ˜¯å¦é¡¯ç¤ºå®ƒå€‘ã€‚XML çµæ§‹çš„æ ¼"
+#~ "式是 &lt;header enabled&gt; - å¦‚æžœæª”é ­æœƒé¡¯ç¤ºåœ¨éƒµä»¶æª¢è¦–ï¼Œå‰‡è¨­å®šæˆ enabled。"
+
+#~ msgid "Search for the sender photo in local address books"
+#~ msgstr "在本地端通訊錄搜尋寄件者相片"
+
+#~ msgid "This option would help in improving the speed of fetching."
+#~ msgstr "é€™å€‹é¸é …èƒ½å”åŠ©å¢žé€²æŽ¥æ”¶çš„é€Ÿåº¦ã€‚"
+
+#~ msgid "State of message headers in paned view"
+#~ msgstr "çª—æ ¼æª¢è¦–ä¸­éƒµä»¶æª”é ­çš„ç‹€æ…‹"
+
+#~ msgid ""
+#~ "Describes whether message headers in paned view should be collapsed or "
+#~ "expanded by default. \"0\" = expanded and \"1\" = collapsed"
+#~ msgstr ""
+#~ "æè¿°åœ¨çª—æ ¼æª¢è¦–ä¸­çš„éƒµä»¶æª”é ­é è¨­æ‡‰è©²æ”¶æ‘ºæˆ–å±•é–‹ã€‚ã€Œ0」= 展開 「1」 = 收摺"
+
+#~ msgid ""
+#~ "Possible values are: 'never' - to never close browser window, 'always' - "
+#~ "to always close browser window or 'ask' - (or any other value) will ask "
+#~ "user."
+#~ msgstr ""
+#~ "可能的數值有：「never」- 永不關閉瀏覽器視窗、「 always」- 總是關閉瀏覽器視"
+#~ "窗或「ask」- (或任何其他數值) 會詢問使用者。"
+
+#~ msgid "Socket path for SpamAssassin"
+#~ msgstr "SpamAssassin Socket 路徑"
+
+#~ msgid "Use SpamAssassin daemon and client"
+#~ msgstr "使用 SpamAsssassin 伺服程式和客戶端"
+
+#~ msgid "Use spamc and spamd programs, if available."
+#~ msgstr "如果可以，使用 spamc 與 spamd 程式。"
+
+#~ msgid "A_vailable Fields:"
+#~ msgstr "可用的欄位(_V):"
+
+#~ msgid "_Show these fields in order:"
+#~ msgstr "依序顯示這些欄位(_S):"
+
+#~ msgid "Move _Up"
+#~ msgstr "上移(_U)"
+
+#~ msgid "Move _Down"
+#~ msgstr "下移(_D)"
+
+#~ msgid "Define Views for \"%s\""
+#~ msgstr "定義「%s」的檢視"
+
+#~ msgid "Define Views for %s"
+#~ msgstr "定義 %s 的檢視"
+
+#~ msgid "Name of new view:"
+#~ msgstr "新檢視的名稱:"
+
+#~ msgid "Type of view:"
+#~ msgstr "檢視的類型:"
+
+#~ msgid "Type of View"
+#~ msgstr "檢視的類型"
+
+#~ msgid "Could not send attachment"
+#~ msgid_plural "Could not send attachments"
+#~ msgstr[0] "無法送出附件。"
+
+#~ msgid "_Send To..."
+#~ msgstr "傳送至(_S)…"
+
+#~ msgid "Send the selected attachments somewhere"
+#~ msgstr "傳送選取的附件到別處"
+
+#~ msgid "Available Fields"
+#~ msgstr "可用的欄位"
+
+#~ msgid "Define Views"
+#~ msgstr "定義檢視"
+
+#~ msgid "Table"
+#~ msgstr "è¡¨æ ¼"
+
+#~ msgid "Define New View"
+#~ msgstr "定義新的檢視"
+
+#~ msgid "No mail service found with UID '%s'"
+#~ msgstr "沒有 UID「%s」的郵件服務"
+
+#~ msgid "UID '%s' is not a mail transport"
+#~ msgstr "UID「%s」不是郵件傳輸"
+
+#~ msgid "Please select a folder"
+#~ msgstr "請選擇資料夾"
+
+#~ msgid "_Switch to Folder"
+#~ msgstr "切換至資料夾(_S)"
+
+#~ msgid "Display the parent folder"
+#~ msgstr "顯示上層資料夾"
+
+#~ msgid "Switch to _next tab"
+#~ msgstr "åˆ‡æ›è‡³ä¸‹ä¸€å€‹åˆ†é (_N)"
+
+#~ msgid "Switch to the next tab"
+#~ msgstr "åˆ‡æ›è‡³ä¸‹ä¸€å€‹åˆ†é "
+
+#~ msgid "Switch to _previous tab"
+#~ msgstr "åˆ‡æ›è‡³ä¸Šä¸€å€‹åˆ†é (_P)"
+
+#~ msgid "Switch to the previous tab"
+#~ msgstr "åˆ‡æ›è‡³ä¸Šä¸€å€‹åˆ†é "
+
+#~ msgid "Cl_ose current tab"
+#~ msgstr "é—œé–‰ç›®å‰çš„åˆ†é (_O)"
+
+#~ msgid "Close current tab"
+#~ msgstr "é—œé–‰ç›®å‰çš„åˆ†é "
+
+#~ msgid "Folder '%s'"
+#~ msgstr "資料夾「%s」"
+
+#~ msgid "Failed to load part '%s'"
+#~ msgstr "無法載入部分「%s」"
+
+#~ msgid "S_earch for sender photograph only in local address books"
+#~ msgstr "只搜尋本地端通訊錄中的寄件者相片(_E)"
+
+#~ msgid ""
+#~ "This will mark all messages as read in the selected folder and its "
+#~ "subfolders."
+#~ msgstr "這會將標示選定的資料夾及其子資料夾中所有郵件為已閱讀。"
+
+#~ msgid "Close message window."
+#~ msgstr "關閉郵件視窗。"
+
+#~ msgid "Would you like to close the message window?"
+#~ msgstr "您想要關閉郵件視窗嗎？"
+
+#~ msgid ""
+#~ "Cannot find a corresponding account in the org.gnome.OnlineAccounts "
+#~ "service from which to obtain an authentication token."
+#~ msgstr ""
+#~ "在 org.gnome 找不到對應的帳號。這是 OnlineAccounts 服務獲取驗證記號的地"
+#~ "方。"
+
+#~ msgid "OAuth"
+#~ msgstr "OAuth"
+
+#~ msgid "Mark All Read"
+#~ msgstr "全部標示成已讀"
+
+#~ msgid "Mark all messages in a folder as read."
+#~ msgstr "將資料夾中全部的郵件標示成已閱讀。"
+
+#~ msgid "Define Views..."
+#~ msgstr "定義檢視…"
+
+#~ msgid "Create or edit views"
+#~ msgstr "建立或編輯檢視(_C)"
+
+#~ msgid "Start in \"express\" mode"
+#~ msgstr "以「快速」模式啟動"
+
 #~ msgid "Export in asynchronous mode"
 #~ msgstr "在非同步模式匯出"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index dd80586..7ba3ca1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,13 +6,13 @@
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010, 2012.
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
-#: ../shell/main.c:573
+#: ../shell/main.c:557
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.3.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 22:29+0800\n"
-"PO-Revision-Date: 2013-02-27 19:59+0800\n"
+"POT-Creation-Date: 2013-08-02 10:46+0800\n"
+"PO-Revision-Date: 2013-07-26 20:45+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "Language: zh_TW\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: Poedit 1.5.3\n"
 "X-Project-Style: gnome\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
@@ -176,8 +176,8 @@ msgid ""
 "with the same address anyway?"
 msgstr "æ­¤é€£çµ¡äººçš„é›»å­éƒµä»¶åœ°å€å·²ç¶“å­˜åœ¨ã€‚æ‚¨ç„¡è«–å¦‚ä½•éƒ½è¦åŠ å…¥åŒæ¨£ä½å€çš„æ–°åç‰‡å—Žï¼Ÿ"
 
-#: ../addressbook/addressbook.error.xml.h:33 ../e-util/e-table-config.ui.h:6
-#: ../e-util/e-name-selector-dialog.c:965 ../mail/em-vfolder-editor-rule.c:397
+#: ../addressbook/addressbook.error.xml.h:33
+#: ../e-util/e-name-selector-dialog.c:977 ../mail/em-vfolder-editor-rule.c:397
 msgid "_Add"
 msgstr "åŠ å…¥(_A)"
 
@@ -210,7 +210,7 @@ msgid ""
 msgstr "以「{0}ã€ç‚ºåçš„é€£çµ¡äººæ¸…å–®å·²ç¶“å­˜åœ¨é€™å€‹é€£çµ¡äººæ¸…å–®ä¸­ã€‚è¦å¼·åˆ¶åŠ å…¥å®ƒå—Žï¼Ÿ"
 
 #: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1252
 msgid "Failed to delete contact"
 msgstr "刪除連絡人失敗"
 
@@ -234,7 +234,7 @@ msgstr ""
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:635
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:657
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2949
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -258,7 +258,7 @@ msgstr "通訊錄(_W):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 #: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:5
+#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "分類(_T)…"
 
@@ -271,10 +271,10 @@ msgid "_Wants to receive HTML mail"
 msgstr "可接受 H_TML 郵件"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:396
+#: ../addressbook/gui/merging/eab-contact-merging.c:407
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:971
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:942
 #: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "電子郵件"
@@ -299,7 +299,7 @@ msgstr "é¦–é (_H):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1850
+#: ../modules/itip-formatter/itip-view.c:1877
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
@@ -391,8 +391,8 @@ msgid "_Anniversary:"
 msgstr "週年紀念日(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-#: ../calendar/gui/e-calendar-view.c:2193
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
+#: ../calendar/gui/e-calendar-view.c:2241
 msgid "Anniversary"
 msgstr "週年紀念日"
 
@@ -402,13 +402,12 @@ msgstr "週年紀念日"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
-#: ../calendar/gui/e-calendar-view.c:2192 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../calendar/gui/e-calendar-view.c:2240 ../shell/main.c:128
 msgid "Birthday"
 msgstr "生日"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
 msgid "Miscellaneous"
 msgstr "é›œé …"
 
@@ -443,25 +442,25 @@ msgstr "地址(_A):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/e-contact-map.c:308
-#: ../addressbook/gui/widgets/eab-contact-display.c:389
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:357
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
 msgid "Home"
 msgstr "住家"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/e-contact-map.c:316
-#: ../addressbook/gui/widgets/eab-contact-display.c:386
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:68
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../addressbook/gui/widgets/eab-contact-display.c:354
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
 msgid "Work"
 msgstr "工作"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:70
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:379
-#: ../calendar/gui/e-cal-model.c:3466
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
+#: ../calendar/gui/e-cal-model.c:3963
 msgid "Other"
 msgstr "其他"
 
@@ -474,47 +473,47 @@ msgid "Notes"
 msgstr "備註"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:609
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:612
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:610
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
 msgid "Twitter"
 msgstr "Twitter"
 
@@ -532,20 +531,20 @@ msgid "Error removing contact"
 msgstr "移除連絡人時發生錯誤"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:651
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "連絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3474
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3471
 msgid "Please select an image for this contact"
 msgstr "請選取代表此連絡人的圖片"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3475
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3472
 msgid "_No image"
 msgstr "沒有圖片(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3813
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -553,48 +552,48 @@ msgstr ""
 "連絡人資料無效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3819
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "「%sã€å«æœ‰ç„¡æ•ˆçš„æ ¼å¼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3822
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3827
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "「%s」不能是未來日期"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3830
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3835
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s「%sã€å«æœ‰ç„¡æ•ˆçš„æ ¼å¼"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3843
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3857
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3848
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3862
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s「%s」是空的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3872
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3877
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:434
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "Contact Quick-Add"
 msgstr "快速新增連絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:457
 msgid "_Edit Full"
 msgstr "編輯全部(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:487
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:500
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:523
 msgid "E_mail"
 msgstr "電子郵件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:536
 msgid "_Select Address Book"
 msgstr "選擇通訊錄(_S)"
 
@@ -669,7 +668,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:814
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
 msgid "Contact List Editor"
 msgstr "連絡人清單編輯器"
 
@@ -705,23 +704,23 @@ msgstr "從通訊錄插入電子郵件位址"
 msgid "_Select..."
 msgstr "選取(_S)…"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:937
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
 msgid "Contact List Members"
 msgstr "連絡人清單成員"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1463
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
 msgid "_Members"
 msgstr "成員(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1582
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1594
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1597
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1609
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1612
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1624
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
@@ -746,7 +745,7 @@ msgid "Changed Contact:"
 msgstr "變更後的連絡人:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:342
+#: ../addressbook/gui/merging/eab-contact-merging.c:362
 msgid "_Merge"
 msgstr "合併(_M)"
 
@@ -766,27 +765,27 @@ msgstr "原本的連絡人:"
 msgid "New Contact:"
 msgstr "新的連絡人:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:324
+#: ../addressbook/gui/merging/eab-contact-merging.c:344
 msgid "Merge Contact"
 msgstr "合併連絡人"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Name contains"
 msgstr "名稱包含"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Email begins with"
 msgstr "電子郵件開始於"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1090
-#: ../modules/calendar/e-cal-shell-view-actions.c:1795
-#: ../modules/calendar/e-memo-shell-view-actions.c:812
-#: ../modules/calendar/e-task-shell-view-actions.c:1011
+#: ../modules/addressbook/e-book-shell-view-actions.c:1135
+#: ../modules/calendar/e-cal-shell-view-actions.c:1772
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:990
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
@@ -808,59 +807,59 @@ msgstr "取得書本檢視時發生錯誤"
 msgid "Search Interrupted"
 msgstr "搜尋被中斷"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:161
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr "剪下選取的連絡人至剪貼簿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr "複製選取的連絡人至剪貼簿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr "從剪貼簿貼上連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
 msgid "Delete selected contacts"
 msgstr "刪除選定的連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:658
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr "選擇全部可見的連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "您確定要刪除這些連絡人清單？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact list?"
 msgstr "您確定要刪除這個連絡人清單？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "您確定要刪除這個連絡人清單 (%s)？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 msgid "Are you sure you want to delete these contacts?"
 msgstr "您確定要刪除這些連絡人？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 msgid "Are you sure you want to delete this contact?"
 msgstr "您確定要刪除這個連絡人？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "您確定要刪除這個連絡人 (%s)？"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1463
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -872,11 +871,11 @@ msgstr[0] ""
 "開啟 %d 個連絡人會同時開啟 %d 個新視窗。\n"
 "確定要顯示這裡所有的連絡人？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1471
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
 msgid "_Don't Display"
 msgstr "不要顯示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1487
 msgid "Display _All Contacts"
 msgstr "顯示所有的連絡人(_A)"
 
@@ -893,7 +892,7 @@ msgid "Family Name"
 msgstr "姓"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:608
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -950,7 +949,7 @@ msgid "ISDN Phone"
 msgstr "ISDN 電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
 msgid "Mobile Phone"
 msgstr "行動電話"
 
@@ -989,7 +988,7 @@ msgid "TTYTDD"
 msgstr "TTYTDD"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
 msgid "Company"
 msgstr "公司"
 
@@ -1006,18 +1005,18 @@ msgid "Title"
 msgstr "é ­éŠœ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:663
+#: ../calendar/gui/e-meeting-list-view.c:666
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "角色"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
 msgid "Manager"
 msgstr "主管"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
 msgid "Assistant"
 msgstr "助理"
 
@@ -1038,12 +1037,12 @@ msgid "Categories"
 msgstr "分類"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
 msgid "Spouse"
 msgstr "配偶"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:738
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
 msgid "Note"
 msgstr "備註"
 
@@ -1158,110 +1157,110 @@ msgstr "連絡人: "
 msgid "evolution minicard"
 msgstr "Evolution è¿·ä½ åç‰‡"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../addressbook/gui/widgets/eab-contact-display.c:150
 msgid "Copy _Email Address"
 msgstr "複製電子郵件位址(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:154
-#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:295
+#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:307
 msgid "Copy the email address to the clipboard"
 msgstr "複製電子郵件位址到剪貼簿"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:159
-#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:300
+#: ../addressbook/gui/widgets/eab-contact-display.c:157
+#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:312
 msgid "_Send New Message To..."
 msgstr "傳送新郵件至(_S)…"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:161
-#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:302
+#: ../addressbook/gui/widgets/eab-contact-display.c:159
+#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:314
 msgid "Send a mail message to this address"
 msgstr "傳送郵件到這個位址"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:323
-#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:1084
+#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:934
 #, c-format
 msgid "Click to mail %s"
 msgstr "按一下來傳送郵件 %s"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:148
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
 msgid "Open map"
 msgstr "開啟地圖"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:544
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
 msgid "List Members:"
 msgstr "清單成員："
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:664
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
 msgid "Department"
 msgstr "部門"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:665
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
 msgid "Profession"
 msgstr "職業"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
 msgid "Position"
 msgstr "位置"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
 msgid "Video Chat"
 msgstr "視訊交談"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
 #: ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:216
 #: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:548
+#: ../modules/calendar/e-cal-shell-view.c:591
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "行事曆"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
-#: ../calendar/gui/dialogs/event-editor.c:122
-#: ../calendar/gui/dialogs/event-editor.c:349
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:699
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
 msgid "Phone"
 msgstr "電話"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
 msgid "Fax"
 msgstr "傳真"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
 msgid "Address"
 msgstr "地址"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:697
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
 msgid "Home Page"
 msgstr "é¦–é "
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:698
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
 msgid "Web Log"
 msgstr "網誌"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:714
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
 msgid "Personal"
 msgstr "個人"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:935
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:906
 msgid "List Members"
 msgstr "清單成員"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:956
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:927
 msgid "Job Title"
 msgstr "職稱"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:997
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:968
 msgid "Home page"
 msgstr "é¦–é "
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1007
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:978
 msgid "Blog"
 msgstr "éƒ¨è½æ ¼"
 
@@ -1372,10 +1371,6 @@ msgstr "將連絡人移到"
 msgid "Copy contacts to"
 msgstr "複製連絡人到"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
-msgid "Card View"
-msgstr "名片檢視模式"
-
 #: ../addressbook/importers/evolution-csv-importer.c:744
 #: ../addressbook/importers/evolution-ldif-importer.c:543
 #: ../addressbook/importers/evolution-vcard-importer.c:279
@@ -1489,7 +1484,7 @@ msgstr[0] "小時"
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:132
-#: ../calendar/gui/dialogs/recurrence-page.c:1204
+#: ../calendar/gui/dialogs/recurrence-page.c:1248
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
@@ -1510,16 +1505,16 @@ msgstr "全部解除(_A)"
 msgid "_Snooze"
 msgstr "延期(_S)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:162
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:165
 msgid "_Dismiss"
 msgstr "解除(_D)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1766
-#: ../calendar/alarm-notify/alarm-queue.c:1776
+#: ../calendar/alarm-notify/alarm-queue.c:1819
+#: ../calendar/alarm-notify/alarm-queue.c:1829
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
-#: ../modules/itip-formatter/itip-view.c:1464
-#: ../modules/itip-formatter/itip-view.c:1575
+#: ../modules/itip-formatter/itip-view.c:1489
+#: ../modules/itip-formatter/itip-view.c:1600
 msgid "Location:"
 msgstr "位置:"
 
@@ -1534,7 +1529,7 @@ msgstr "忽略時間(_T):"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/filter.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
 #: ../e-util/e-interval-chooser.c:143
 #: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
@@ -1542,64 +1537,51 @@ msgid "days"
 msgstr "天"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
 #: ../e-util/e-interval-chooser.c:141
 msgid "hours"
 msgstr "小時"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
 #: ../e-util/e-interval-chooser.c:139
 #: ../mail/e-mail-config-provider-page.c:527
 msgid "minutes"
 msgstr "分鐘"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1612
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1661
+#: ../calendar/alarm-notify/alarm-queue.c:1799
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1621
-#: ../calendar/alarm-notify/alarm-queue.c:1623
+#: ../calendar/alarm-notify/alarm-queue.c:1670
+#: ../calendar/alarm-notify/alarm-queue.c:1672
 msgid "No description available."
 msgstr "沒有任何描述。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1631
+#: ../calendar/alarm-notify/alarm-queue.c:1680
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1636
-#: ../calendar/alarm-notify/alarm-queue.c:1737
-#: ../calendar/alarm-notify/alarm-queue.c:2099
+#: ../calendar/alarm-notify/alarm-queue.c:1685
+#: ../calendar/alarm-notify/alarm-queue.c:1790
+#: ../calendar/alarm-notify/alarm-queue.c:2131
 msgid "Evolution Reminders"
 msgstr "Evolution 提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1679
+#: ../calendar/alarm-notify/alarm-queue.c:1729
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "您有 %d 個提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1884
-#: ../calendar/alarm-notify/alarm-queue.c:1919
+#: ../calendar/alarm-notify/alarm-queue.c:1951
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1888
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
-"Evolution 尚未支援使用電子郵件通知的\n"
-"行事曆提醒，但是這個提醒被設定為\n"
-"送出電子郵件。  Evolution 會顯示\n"
-"普通的提醒對話盒來代替。"
-
-#: ../calendar/alarm-notify/alarm-queue.c:1925
+#: ../calendar/alarm-notify/alarm-queue.c:1957
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1616,7 +1598,7 @@ msgstr ""
 "\n"
 "您確定要執行這個程式？"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1940
+#: ../calendar/alarm-notify/alarm-queue.c:1972
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -1779,14 +1761,14 @@ msgid "You have changed this meeting, but not yet saved it."
 msgstr "您已經變更此會議，但尚未儲存它。"
 
 #: ../calendar/calendar.error.xml.h:30
+msgid "_Save Changes"
+msgstr "儲存變更(_S)"
+
+#: ../calendar/calendar.error.xml.h:31
 #: ../composer/mail-composer.error.xml.h:16
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
-#: ../calendar/calendar.error.xml.h:31
-msgid "_Save Changes"
-msgstr "儲存變更(_S)"
-
 #: ../calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
 msgstr "要儲存對此約會所做的變更？"
@@ -1856,7 +1838,7 @@ msgid ""
 "loss of these attachments."
 msgstr "這裡有一些需要下載的附件。儲存此工作將會失去這些附件。"
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:315
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:297
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -2010,22 +1992,6 @@ msgstr "載入備忘錄清單「{0}」時發生錯誤"
 msgid "The memo list is not marked for offline usage."
 msgstr "此備忘錄清單尚未標記為離線使用。"
 
-#: ../calendar/gui/calendar-view-factory.c:88
-msgid "Day View"
-msgstr "日檢視"
-
-#: ../calendar/gui/calendar-view-factory.c:91
-msgid "Work Week View"
-msgstr "工作週檢視"
-
-#: ../calendar/gui/calendar-view-factory.c:94
-msgid "Week View"
-msgstr "週檢視"
-
-#: ../calendar/gui/calendar-view-factory.c:97
-msgid "Month View"
-msgstr "月檢視"
-
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
@@ -2046,7 +2012,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-table-config.ui.h:24 ../e-util/e-attachment-tree-view.c:528
+#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
 #: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Description"
 msgstr "說明"
@@ -2070,21 +2036,26 @@ msgstr "是"
 msgid "is not"
 msgstr "不是"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:841 ../calendar/gui/e-cal-model.c:848
-#: ../calendar/gui/e-task-table.c:545 ../calendar/gui/memotypes.xml.h:10
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
+#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "公開"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:850 ../calendar/gui/e-task-table.c:546
-#: ../calendar/gui/memotypes.xml.h:11
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
+#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "私人"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:236
-#: ../calendar/gui/e-cal-model.c:852 ../calendar/gui/e-task-table.c:547
-#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-send-options.ui.h:7
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
+#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "機密"
 
@@ -2101,7 +2072,7 @@ msgstr "到會者"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:883
+#: ../plugins/publish-calendar/publish-calendar.c:882
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:390
 msgid "Location"
@@ -2113,8 +2084,8 @@ msgid "Category"
 msgstr "分類"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:56
-#: ../em-format/e-mail-formatter-print-headers.c:187
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:54
+#: ../em-format/e-mail-formatter-print-headers.c:204
 #: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "附件"
@@ -2130,8 +2101,8 @@ msgid "Do Not Exist"
 msgstr "不存在"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:316
-#: ../calendar/gui/dialogs/event-editor.c:337
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-editor.c:331
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "週期性"
@@ -2162,30 +2133,46 @@ msgstr "摘要包含"
 msgid "Description Contains"
 msgstr "描述包含"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:631
+#: ../calendar/gui/dialogs/alarm-dialog.c:669
 msgid "Edit Reminder"
 msgstr "編輯提醒"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:822
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
 #: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "顯示提示"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
 #: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "播放音效"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
 #: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "執行外部程式"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:900
 #: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "傳送電子郵件"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
+msgid "before"
+msgstr "æ—©æ–¼"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:910
+msgid "after"
+msgstr "晚於"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
+msgid "start of appointment"
+msgstr "約會開始"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:920
+msgid "end of appointment"
+msgstr "約會結束"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "minute(s)"
 msgstr "分鐘"
@@ -2198,81 +2185,65 @@ msgstr "小時"
 msgid "day(s)"
 msgstr "天"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "before"
-msgstr "æ—©æ–¼"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-msgid "after"
-msgstr "晚於"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-msgid "start of appointment"
-msgstr "約會開始"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "end of appointment"
-msgstr "約會結束"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "Add Reminder"
 msgstr "åŠ å…¥æé†’"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-#: ../calendar/gui/dialogs/event-editor.c:359
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-editor.c:353
 msgid "Reminder"
 msgstr "提醒"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Repeat"
 msgstr "重複"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Repeat the reminder"
 msgstr "重複這個提醒(_R)"
 
 #. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "extra times every"
 msgstr "提醒間隔每"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
 msgid "Options"
 msgstr "é¸é …"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "Custom _message"
 msgstr "自訂訊息(_M)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 msgid "Mes_sage:"
 msgstr "訊息(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom reminder sound"
 msgstr "自訂提醒聲音"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
 msgid "_Sound:"
 msgstr "聲音(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Select A File"
 msgstr "請選取檔案"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Program:"
 msgstr "執行程式(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "_Arguments:"
 msgstr "引數(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "Send To:"
 msgstr "收件者："
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "動作/觸發"
 
@@ -2330,241 +2301,246 @@ msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您沒有做任何變更，更新這個編輯器？"
 
-#: ../calendar/gui/dialogs/comp-editor.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:266
 msgid "Could not save attachments"
 msgstr "無法儲存附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:618
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:755
+#: ../calendar/gui/dialogs/comp-editor.c:752
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:759
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:764
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:767
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:769
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Memo - %s"
 msgstr "備忘錄 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:793
+#: ../calendar/gui/dialogs/comp-editor.c:790
 msgid "No Summary"
 msgstr "沒有摘要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:914
+#: ../calendar/gui/dialogs/comp-editor.c:911
 msgid "Keep original item?"
 msgstr "æ˜¯å¦ä¿æŒåŽŸå§‹é …ç›®ï¼Ÿ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1151
+#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1118
+msgid "Unable to synchronize with the server"
+msgstr "無法與伺服器同步"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1232
 msgid "Close the current window"
 msgstr "關閉目前的視窗"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158 ../e-util/e-focus-tracker.c:121
+#: ../calendar/gui/dialogs/comp-editor.c:1239 ../e-util/e-focus-tracker.c:121
 #: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
-#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:322
-#: ../e-util/e-web-view.c:1407 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:876
+#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1249 ../mail/e-mail-browser.c:136
+#: ../shell/e-shell-window-actions.c:888
 msgid "Copy the selection"
 msgstr "複製選取的內容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165 ../e-util/e-focus-tracker.c:114
+#: ../calendar/gui/dialogs/comp-editor.c:1246 ../e-util/e-focus-tracker.c:114
 #: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
-#: ../e-util/e-web-view.c:1401 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:883
+#: ../e-util/e-web-view.c:1243 ../mail/e-mail-browser.c:143
+#: ../shell/e-shell-window-actions.c:895
 msgid "Cut the selection"
 msgstr "剪下選取範圍"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172 ../e-util/e-focus-tracker.c:135
-#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:890
+#: ../calendar/gui/dialogs/comp-editor.c:1253 ../e-util/e-focus-tracker.c:135
+#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
 msgid "Delete the selection"
 msgstr "刪除選取範圍"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1179
+#: ../calendar/gui/dialogs/comp-editor.c:1260
 msgid "View help"
 msgstr "檢視求助"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186 ../e-util/e-focus-tracker.c:128
+#: ../calendar/gui/dialogs/comp-editor.c:1267 ../e-util/e-focus-tracker.c:128
 #: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
-#: ../e-util/e-web-view.c:1413 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:911
+#: ../e-util/e-web-view.c:1255 ../mail/e-mail-browser.c:150
+#: ../shell/e-shell-window-actions.c:923
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿的內容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1207
+#: ../calendar/gui/dialogs/comp-editor.c:1288
 msgid "Save current changes"
 msgstr "儲存目前的變更"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1212
+#: ../calendar/gui/dialogs/comp-editor.c:1293
 #: ../e-util/e-mail-signature-editor.c:312
 msgid "Save and Close"
 msgstr "儲存並關閉"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1214
+#: ../calendar/gui/dialogs/comp-editor.c:1295
 msgid "Save current changes and close editor"
 msgstr "儲存目前的變更並且關閉編輯器"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1221 ../e-util/e-focus-tracker.c:142
-#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:151
-#: ../shell/e-shell-window-actions.c:988
+#: ../calendar/gui/dialogs/comp-editor.c:1302 ../e-util/e-focus-tracker.c:142
+#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
+#: ../shell/e-shell-window-actions.c:1000
 msgid "Select all text"
 msgstr "選取所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1228
+#: ../calendar/gui/dialogs/comp-editor.c:1309
 msgid "_Classification"
 msgstr "歸類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1316
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
-#: ../e-util/gal-define-views.ui.h:5 ../mail/e-mail-browser.c:165
+#: ../mail/e-mail-browser.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:1028
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1242
-#: ../e-util/e-mail-signature-editor.c:317 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1023
+#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../e-util/e-mail-signature-editor.c:317 ../mail/e-mail-browser.c:164
+#: ../shell/e-shell-window-actions.c:1035
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../shell/e-shell-window-actions.c:1030
+#: ../calendar/gui/dialogs/comp-editor.c:1330
+#: ../shell/e-shell-window-actions.c:1042
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1256
+#: ../calendar/gui/dialogs/comp-editor.c:1337
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1263
-#: ../composer/e-composer-actions.c:338
+#: ../calendar/gui/dialogs/comp-editor.c:1344
+#: ../composer/e-composer-actions.c:320
 msgid "_Options"
 msgstr "é¸é …(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-browser.c:172
-#: ../shell/e-shell-window-actions.c:1065 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1351 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
-#: ../composer/e-composer-actions.c:287
+#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../composer/e-composer-actions.c:269
 msgid "_Attachment..."
 msgstr "附件(_A)…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
-#: ../composer/e-composer-actions.c:289 ../e-util/e-attachment-view.c:413
+#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
 msgid "Attach a file"
 msgstr "é™„åŠ æª”æ¡ˆ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1371
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1373
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1381
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1309
+#: ../calendar/gui/dialogs/comp-editor.c:1390
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1311
+#: ../calendar/gui/dialogs/comp-editor.c:1392
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1316
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1318
+#: ../calendar/gui/dialogs/comp-editor.c:1399
 msgid "Classify as private"
 msgstr "歸類為私人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1325
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Classify as confidential"
 msgstr "歸類為機密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../calendar/gui/dialogs/comp-editor.c:1416
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1424
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1359
+#: ../calendar/gui/dialogs/comp-editor.c:1440
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2120
-#: ../composer/e-composer-actions.c:506
+#: ../calendar/gui/dialogs/comp-editor.c:2221
+#: ../composer/e-composer-actions.c:488
 msgid "Attach"
 msgstr "é™„åŠ "
 
-#: ../calendar/gui/dialogs/comp-editor.c:2470
-#: ../calendar/gui/dialogs/comp-editor.c:2657
-#: ../calendar/gui/dialogs/comp-editor.c:3663
+#: ../calendar/gui/dialogs/comp-editor.c:2551
+#: ../calendar/gui/dialogs/comp-editor.c:2761
+#: ../calendar/gui/dialogs/comp-editor.c:3772
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦‚æžœæœ‰æ–°çš„æ›´æ–°ï¼Œå‰‡æœƒæ”¾æ£„å°æ­¤é …ç›®æ‰€åšçš„è®Šæ›´"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3627
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
+#: ../calendar/gui/dialogs/comp-editor.c:3734
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3695
+#: ../calendar/gui/dialogs/comp-editor.c:3804
 msgid "Unable to use current version!"
 msgstr "無法使用目前的版本！"
 
@@ -2673,66 +2649,66 @@ msgstr "委託給："
 msgid "Contacts..."
 msgstr "連絡人…"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Reminders"
 msgstr "提醒(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:213
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Set or unset reminders for this event"
 msgstr "設定或取消這個事件的提醒"
 
-#: ../calendar/gui/dialogs/event-editor.c:221
+#: ../calendar/gui/dialogs/event-editor.c:215
 msgid "Show Time as _Busy"
 msgstr "顯示時間為忙碌(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:223
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "Toggles whether to show time as busy"
 msgstr "切換是否將時間顯示為忙碌"
 
-#: ../calendar/gui/dialogs/event-editor.c:232
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "_Recurrence"
 msgstr "週期性(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Make this a recurring event"
 msgstr "å°‡æ­¤é …è¨­ç‚ºé€±æœŸæ€§äº‹ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:239 ../e-util/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "å‚³é€é¸é …"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/task-editor.c:96
 msgid "Insert advanced send options"
 msgstr "æ’å…¥é€²éšŽå‚³é€é¸é …"
 
-#: ../calendar/gui/dialogs/event-editor.c:249
+#: ../calendar/gui/dialogs/event-editor.c:243
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "Toggles whether to have All Day Event"
 msgstr "切換是否要有全天事件"
 
-#: ../calendar/gui/dialogs/event-editor.c:260
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "_Free/Busy"
 msgstr "空閒/忙碌(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:262
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Query free / busy information for the attendees"
 msgstr "查詢此到會者的空閒/忙碌資訊"
 
-#: ../calendar/gui/dialogs/event-editor.c:313 ../calendar/gui/print.c:3468
+#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3505
 msgid "Appointment"
 msgstr "約會"
 
-#: ../calendar/gui/dialogs/event-editor.c:383
+#: ../calendar/gui/dialogs/event-editor.c:377
 #: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "到會者"
 
-#: ../calendar/gui/dialogs/event-editor.c:580
+#: ../calendar/gui/dialogs/event-editor.c:574
 msgid "Print this event"
 msgstr "列印這個事件"
 
@@ -2749,7 +2725,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ä¸èƒ½å®Œæ•´çš„ç·¨è¼¯äº‹ä»¶ï¼Œå› ç‚ºæ‚¨ä¸æ˜¯å¬é›†äºº"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3181
+#: ../calendar/gui/dialogs/event-page.c:3165
 msgid "This event has reminders"
 msgstr "這個事件具有提醒"
 
@@ -2768,7 +2744,7 @@ msgstr "無結束日期的事件"
 
 #: ../calendar/gui/dialogs/event-page.c:1475
 #: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:853
+#: ../calendar/gui/dialogs/task-page.c:1024
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
@@ -2786,12 +2762,12 @@ msgstr "結束時間錯誤"
 
 #: ../calendar/gui/dialogs/event-page.c:1682
 #: ../calendar/gui/dialogs/memo-page.c:765
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/task-page.c:1078
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
 #: ../calendar/gui/dialogs/event-page.c:1717
-#: ../calendar/gui/dialogs/task-page.c:942
+#: ../calendar/gui/dialogs/task-page.c:1113
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
@@ -2803,30 +2779,30 @@ msgstr "代理者(_D)"
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:3461
+#: ../calendar/gui/dialogs/event-page.c:3445
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "在每個約會前 %d 天"
 
-#: ../calendar/gui/dialogs/event-page.c:3467
+#: ../calendar/gui/dialogs/event-page.c:3451
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "約會前 %d 小時"
 
-#: ../calendar/gui/dialogs/event-page.c:3473
+#: ../calendar/gui/dialogs/event-page.c:3457
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "約會前 %d 分鐘"
 
-#: ../calendar/gui/dialogs/event-page.c:3494
+#: ../calendar/gui/dialogs/event-page.c:3478
 msgid "Customize"
 msgstr "自訂"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3501
+#: ../calendar/gui/dialogs/event-page.c:3485
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "沒有"
@@ -2867,8 +2843,8 @@ msgstr "位置(_L):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:7
-#: ../e-util/e-attachment-dialog.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:29
+#: ../e-util/e-attachment-dialog.c:357
 msgid "_Description:"
 msgstr "描述(_D):"
 
@@ -2877,7 +2853,7 @@ msgid "_Time:"
 msgstr "時刻(_T):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
@@ -2890,8 +2866,8 @@ msgid "Event Description"
 msgstr "事件描述"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "到會者(_N)…"
 
@@ -2956,11 +2932,11 @@ msgid "Select Date"
 msgstr "選擇日期"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "Select _Today"
 msgstr "選擇今天(_T)"
 
-#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3472
+#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3509
 msgid "Memo"
 msgstr "備忘錄"
 
@@ -2980,23 +2956,23 @@ msgstr "ä¸èƒ½ç·¨è¼¯å‚™å¿˜éŒ„ï¼Œå› ç‚ºé¸å–çš„å‚™å¿˜éŒ„æ¸…å–®æ˜¯å”¯è®€çš„"
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ä¸èƒ½å®Œæ•´çš„ç·¨è¼¯å‚™å¿˜éŒ„ï¼Œå› ç‚ºæ‚¨ä¸æ˜¯å¬é›†äºº"
 
-#: ../calendar/gui/dialogs/memo-page.c:1183
-#: ../em-format/e-mail-formatter.c:1391
-#: ../em-format/e-mail-formatter-utils.c:194
-#: ../em-format/e-mail-formatter-utils.c:218 ../mail/em-filter-i18n.h:78
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:63
+#: ../calendar/gui/dialogs/memo-page.c:1161
+#: ../em-format/e-mail-formatter-utils.c:205
+#: ../em-format/e-mail-formatter-utils.c:229
+#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
 msgid "To"
 msgstr "收件者"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:336
-#: ../calendar/gui/dialogs/task-page.ui.h:9
+#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.ui.h:31
 msgid "_List:"
 msgstr "清單(_L):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:344
-#: ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.ui.h:24
 msgid "Organi_zer:"
 msgstr "會議召集人(_Z):"
 
@@ -3005,12 +2981,12 @@ msgid "T_o:"
 msgstr "收件者(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:26
 msgid "Sta_rt date:"
 msgstr "開始日(_R):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:23
 msgid "Su_mmary:"
 msgstr "摘要(_M):"
 
@@ -3054,17 +3030,17 @@ msgstr "æ‰€æœ‰ä¾‹é …"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:973
+#: ../calendar/gui/dialogs/recurrence-page.c:1000
 msgid "Recurrence date is invalid"
 msgstr "週期性日期無效"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "End time of the recurrence was before event's start"
 msgstr "週期性事件的結束時刻早於開始時刻"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "on"
 msgstr "çš„"
 
@@ -3072,7 +3048,7 @@ msgstr "çš„"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/dialogs/recurrence-page.c:1154
 msgid "first"
 msgstr "一"
 
@@ -3081,7 +3057,7 @@ msgstr "一"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "second"
 msgstr "二"
 
@@ -3089,7 +3065,7 @@ msgstr "二"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "third"
 msgstr "三"
 
@@ -3097,7 +3073,7 @@ msgstr "三"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "fourth"
 msgstr "å››"
 
@@ -3105,7 +3081,7 @@ msgstr "å››"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fifth"
 msgstr "第五"
 
@@ -3113,13 +3089,13 @@ msgstr "第五"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1136
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "last"
 msgstr "最後"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 msgid "Other Date"
 msgstr "其他日期"
 
@@ -3127,7 +3103,7 @@ msgstr "其他日期"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 msgid "1st to 10th"
 msgstr "1日至10日"
 
@@ -3135,7 +3111,7 @@ msgstr "1日至10日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1172
+#: ../calendar/gui/dialogs/recurrence-page.c:1216
 msgid "11th to 20th"
 msgstr "11日至20日"
 
@@ -3143,73 +3119,73 @@ msgstr "11日至20日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1178
+#: ../calendar/gui/dialogs/recurrence-page.c:1222
 msgid "21st to 31st"
 msgstr "21日至31日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1206
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1207
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1208
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1209
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1210
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "星期日"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1342
+#: ../calendar/gui/dialogs/recurrence-page.c:1386
 msgid "on the"
 msgstr "在第"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1527
+#: ../calendar/gui/dialogs/recurrence-page.c:1571
 msgid "occurrences"
 msgstr "次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2253
+#: ../calendar/gui/dialogs/recurrence-page.c:2341
 msgid "Add exception"
 msgstr "åŠ å…¥ä¾‹å¤–"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2295
+#: ../calendar/gui/dialogs/recurrence-page.c:2383
 msgid "Could not get a selection to modify."
 msgstr "無法取得要編輯的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2301
+#: ../calendar/gui/dialogs/recurrence-page.c:2389
 msgid "Modify exception"
 msgstr "編輯例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2347
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Could not get a selection to delete."
 msgstr "無法取得要刪除的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2488
+#: ../calendar/gui/dialogs/recurrence-page.c:2576
 msgid "Date/Time"
 msgstr "日期/時間"
 
@@ -3272,189 +3248,166 @@ msgid "Preview"
 msgstr "é è¦½"
 
 #: ../calendar/gui/dialogs/send-comp.c:223
+#: ../calendar/gui/dialogs/send-comp.c:301
 msgid "Send my reminders with this event"
 msgstr "將我的提醒與這個事件一起送出"
 
 #: ../calendar/gui/dialogs/send-comp.c:225
+#: ../calendar/gui/dialogs/send-comp.c:303
 msgid "Notify new attendees _only"
 msgstr "只通知新的到會者(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-editor.c:94
+msgid "_Send Options"
+msgstr "å‚³é€é¸é …(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3507
+#: ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "工作"
+
+#: ../calendar/gui/dialogs/task-editor.c:286
+msgid "Print this task"
+msgstr "åˆ—å°é€™é …å·¥ä½œ"
+
+#: ../calendar/gui/dialogs/task-page.c:330
+msgid "Task's start date is in the past"
+msgstr "工作的開始時刻在過去"
+
+#: ../calendar/gui/dialogs/task-page.c:331
+msgid "Task's due date is in the past"
+msgstr "工作的結束時刻在過去"
+
+#: ../calendar/gui/dialogs/task-page.c:364
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "ä¸èƒ½ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºé¸å–çš„å·¥ä½œæ¸…å–®æ˜¯å”¯è®€çš„"
+
+#: ../calendar/gui/dialogs/task-page.c:368
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "ä¸èƒ½å®Œæ•´çš„ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºæ‚¨ä¸æ˜¯å¬é›†äºº"
+
+#: ../calendar/gui/dialogs/task-page.c:372
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr "ä¸èƒ½ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºé¸å–çš„å·¥ä½œæ¸…å–®ä¸æ”¯æ´æŒ‡æ´¾å·¥ä½œ"
+
+#: ../calendar/gui/dialogs/task-page.c:1005
+msgid "Due date is wrong"
+msgstr "到期日錯誤"
+
+#: ../calendar/gui/dialogs/task-page.c:1173
+#: ../calendar/gui/dialogs/task-page.c:1198
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
-#: ../calendar/gui/dialogs/task-details-page.c:490
-msgid "Web Page"
-msgstr "ç¶²é "
-
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:348
-#: ../calendar/gui/e-task-table.c:571 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:1257
+#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:320
 msgid "High"
 msgstr "高"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:350
-#: ../calendar/gui/e-cal-model.c:1681 ../calendar/gui/e-task-table.c:572
+#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:1256
+#: ../mail/message-list.c:319
 msgid "Normal"
 msgstr "一般"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:12
 #: ../calendar/gui/e-cal-component-preview.c:352
-#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:1255
+#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:318
 msgid "Low"
 msgstr "低"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/dialogs/task-page.ui.h:14
+#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "未指定"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/dialogs/task-page.ui.h:16
 #: ../calendar/gui/e-cal-component-preview.c:333
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:777 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:654
-#: ../calendar/gui/print.c:3554 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-model-tasks.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:551 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3591 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "未開始"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:12
+#: ../calendar/gui/dialogs/task-page.ui.h:18
 #: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:779
-#: ../calendar/gui/e-cal-model-tasks.c:857 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3557
+#: ../calendar/gui/e-cal-model-tasks.c:313
+#: ../calendar/gui/e-cal-model-tasks.c:553
+#: ../calendar/gui/e-cal-model-tasks.c:631 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3594
 msgid "In Progress"
 msgstr "進行中"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:14
+#: ../calendar/gui/dialogs/task-page.ui.h:20
 #: ../calendar/gui/e-cal-component-preview.c:326
-#: ../calendar/gui/e-cal-model-tasks.c:495
-#: ../calendar/gui/e-cal-model-tasks.c:781
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:315
+#: ../calendar/gui/e-cal-model-tasks.c:555
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
 #: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:656 ../calendar/gui/print.c:3560
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3597
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:380
 msgid "Completed"
 msgstr "已完成"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
+#: ../calendar/gui/dialogs/task-page.ui.h:22
 #: ../calendar/gui/e-cal-component-preview.c:329
-#: ../calendar/gui/e-cal-model-tasks.c:497
-#: ../calendar/gui/e-cal-model-tasks.c:783 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3563 ../mail/mail-send-recv.c:878
+#: ../calendar/gui/e-cal-model-tasks.c:317
+#: ../calendar/gui/e-cal-model-tasks.c:557 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3600 ../mail/mail-send-recv.c:878
 msgid "Canceled"
 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/dialogs/task-details-page.ui.h:17
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3520
-#: ../calendar/gui/e-meeting-list-view.c:692
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
-#: ../mail/message-list.etspec.h:1
-msgid "Status"
-msgstr "狀態"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:18
-msgid "Stat_us:"
-msgstr "狀態(_U):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:19
-msgid "P_ercent complete:"
-msgstr "完成百分比(_E):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "å„ªå…ˆé †åº(_P):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:21
-msgid "_Date completed:"
-msgstr "完成日期(_D):"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:23
-msgid "_Web Page:"
-msgstr "ç¶²é (_W):"
-
-#: ../calendar/gui/dialogs/task-editor.c:113
-msgid "_Status Details"
-msgstr "狀態詳細資料(_S)"
-
-#: ../calendar/gui/dialogs/task-editor.c:115
-msgid "Click to change or view the status details of the task"
-msgstr "按這裡改變/檢視該工作的狀態詳細資料"
-
-#: ../calendar/gui/dialogs/task-editor.c:123
-msgid "_Send Options"
-msgstr "å‚³é€é¸é …(_S)"
-
-#: ../calendar/gui/dialogs/task-editor.c:183 ../calendar/gui/print.c:3470
-#: ../e-util/e-send-options.c:553
-msgid "Task"
-msgstr "工作"
-
-#: ../calendar/gui/dialogs/task-editor.c:304
-msgid "Task Details"
-msgstr "工作詳細資料"
-
-#: ../calendar/gui/dialogs/task-editor.c:348
-msgid "Print this task"
-msgstr "åˆ—å°é€™é …å·¥ä½œ"
-
-#: ../calendar/gui/dialogs/task-page.c:249
-msgid "Task's start date is in the past"
-msgstr "工作的開始時刻在過去"
+#: ../calendar/gui/dialogs/task-page.ui.h:25
+msgid "D_ue date:"
+msgstr "到期日(_U):"
 
-#: ../calendar/gui/dialogs/task-page.c:250
-msgid "Task's due date is in the past"
-msgstr "工作的結束時刻在過去"
+#: ../calendar/gui/dialogs/task-page.ui.h:28
+msgid "Time zone:"
+msgstr "時區："
 
-#: ../calendar/gui/dialogs/task-page.c:283
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "ä¸èƒ½ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºé¸å–çš„å·¥ä½œæ¸…å–®æ˜¯å”¯è®€çš„"
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+msgid "_Status:"
+msgstr "狀態(_S):"
 
-#: ../calendar/gui/dialogs/task-page.c:287
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "ä¸èƒ½å®Œæ•´çš„ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºæ‚¨ä¸æ˜¯å¬é›†äºº"
+#: ../calendar/gui/dialogs/task-page.ui.h:33
+msgid "Date _completed:"
+msgstr "完成日期(_C):"
 
-#: ../calendar/gui/dialogs/task-page.c:291
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr "ä¸èƒ½ç·¨è¼¯å·¥ä½œï¼Œå› ç‚ºé¸å–çš„å·¥ä½œæ¸…å–®ä¸æ”¯æ´æŒ‡æ´¾å·¥ä½œ"
+#: ../calendar/gui/dialogs/task-page.ui.h:34
+msgid "_Percent complete:"
+msgstr "完成百分比(_P):"
 
-#: ../calendar/gui/dialogs/task-page.c:834
-msgid "Due date is wrong"
-msgstr "到期日錯誤"
+#: ../calendar/gui/dialogs/task-page.ui.h:35
+msgid "Priorit_y:"
+msgstr "優先等級(_Y):"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:3
-msgid "D_ue date:"
-msgstr "到期日(_U):"
+#: ../calendar/gui/dialogs/task-page.ui.h:36
+msgid "C_lassification:"
+msgstr "歸類(_L):"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Time zone:"
-msgstr "時區："
+#: ../calendar/gui/dialogs/task-page.ui.h:37
+msgid "_Web Page:"
+msgstr "ç¶²é (_W):"
 
 #: ../calendar/gui/ea-cal-view.c:324
 msgid "New Appointment"
@@ -3501,7 +3454,7 @@ msgstr "行事曆事件：沒有摘要。"
 msgid "calendar view event"
 msgstr "行事曆檢視事件"
 
-#: ../calendar/gui/ea-cal-view-event.c:566
+#: ../calendar/gui/ea-cal-view-event.c:569
 msgid "Grab Focus"
 msgstr "得到焦點"
 
@@ -3547,7 +3500,7 @@ msgid "Gnome Calendar"
 msgstr "Gnome 行事曆"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1143
+#: ../modules/calendar/e-cal-shell-view-private.c:1222
 msgid "%A %d %b %Y"
 msgstr "%Y年%m月%d日 (%A)"
 
@@ -3557,19 +3510,19 @@ 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/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:1888
-#: ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1147
+#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:2793
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:1226
 msgid "%a %d %b"
 msgstr "%m月%d日 (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:217
 #: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../modules/calendar/e-cal-shell-view-private.c:1150
-#: ../modules/calendar/e-cal-shell-view-private.c:1156
-#: ../modules/calendar/e-cal-shell-view-private.c:1159
+#: ../modules/calendar/e-cal-shell-view-private.c:1229
+#: ../modules/calendar/e-cal-shell-view-private.c:1235
+#: ../modules/calendar/e-cal-shell-view-private.c:1238
 msgid "%a %d %b %Y"
 msgstr "%Y年%m月%d日 (%a)"
 
@@ -3577,10 +3530,10 @@ msgstr "%Y年%m月%d日 (%a)"
 #: ../calendar/gui/ea-gnome-calendar.c:247
 #: ../calendar/gui/ea-gnome-calendar.c:254
 #: ../calendar/gui/ea-gnome-calendar.c:257
-#: ../modules/calendar/e-cal-shell-view-private.c:1176
-#: ../modules/calendar/e-cal-shell-view-private.c:1187
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
+#: ../modules/calendar/e-cal-shell-view-private.c:1255
+#: ../modules/calendar/e-cal-shell-view-private.c:1266
+#: ../modules/calendar/e-cal-shell-view-private.c:1273
+#: ../modules/calendar/e-cal-shell-view-private.c:1276
 msgid "%d %b %Y"
 msgstr "%Y年%m月%d日"
 
@@ -3589,10 +3542,10 @@ 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/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:1904
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:247
-#: ../modules/calendar/e-cal-shell-view-private.c:1183
+#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:2809
+#: ../calendar/gui/e-day-view-top-item.c:863
+#: ../calendar/gui/e-week-view-main-item.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1262
 msgid "%d %b"
 msgstr "%m月%d日"
 
@@ -3714,8 +3667,8 @@ msgid "Due Date:"
 msgstr "截止日期："
 
 #: ../calendar/gui/e-cal-component-preview.c:319
-#: ../modules/itip-formatter/itip-view.c:1467
-#: ../modules/itip-formatter/itip-view.c:1584
+#: ../modules/itip-formatter/itip-view.c:1492
+#: ../modules/itip-formatter/itip-view.c:1609
 msgid "Status:"
 msgstr "狀態："
 
@@ -3741,7 +3694,7 @@ msgid "Start date"
 msgstr "開始日期"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:649
+#: ../calendar/gui/e-meeting-list-view.c:652
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:586
@@ -3772,6 +3725,17 @@ msgstr "% 完成"
 msgid "Priority"
 msgstr "優先等級"
 
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. * Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-cal-model.c:4017
+#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
+#: ../mail/message-list.etspec.h:1
+msgid "Status"
+msgstr "狀態"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
@@ -3785,37 +3749,37 @@ msgstr "已建立"
 msgid "Last modified"
 msgstr "修改日期"
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:445
 msgid "Cut selected events to the clipboard"
 msgstr "剪下選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:444
+#: ../calendar/gui/e-calendar-view.c:451
 msgid "Copy selected events to the clipboard"
 msgstr "複製選取的事件至剪貼簿"
 
-#: ../calendar/gui/e-calendar-view.c:450
+#: ../calendar/gui/e-calendar-view.c:457
 msgid "Paste events from the clipboard"
 msgstr "從剪貼簿貼上事件"
 
-#: ../calendar/gui/e-calendar-view.c:456
+#: ../calendar/gui/e-calendar-view.c:463
 msgid "Delete selected events"
 msgstr "刪除選取的事件"
 
-#: ../calendar/gui/e-calendar-view.c:476 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-calendar-view.c:483 ../calendar/gui/e-memo-table.c:183
 #: ../calendar/gui/e-task-table.c:270
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: ../calendar/gui/e-calendar-view.c:635 ../calendar/gui/e-memo-table.c:863
-#: ../calendar/gui/e-task-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:642 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-task-table.c:1176
 msgid "Updating objects"
 msgstr "更新物件"
 
 #. 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:1999 ../calendar/gui/e-memo-table.c:540
-#: ../calendar/gui/e-task-table.c:827
+#: ../calendar/gui/e-calendar-view.c:2047 ../calendar/gui/e-memo-table.c:553
+#: ../calendar/gui/e-task-table.c:840
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "召集人: %s <%s>"
@@ -3823,21 +3787,21 @@ 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:2003 ../calendar/gui/e-memo-table.c:545
-#: ../calendar/gui/e-task-table.c:831
+#: ../calendar/gui/e-calendar-view.c:2051 ../calendar/gui/e-memo-table.c:558
+#: ../calendar/gui/e-task-table.c:844
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2019
-#: ../calendar/gui/e-meeting-time-sel.c:2790 ../calendar/gui/print.c:3508
+#: ../calendar/gui/e-calendar-view.c:2067
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3545
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2050
+#: ../calendar/gui/e-calendar-view.c:2098
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
@@ -3851,81 +3815,81 @@ msgstr "開始日期"
 msgid "End Date"
 msgstr "結束日期"
 
-#: ../calendar/gui/e-cal-model.c:854 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:236 ../calendar/gui/print.c:1235
-#: ../calendar/gui/print.c:1252 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3474
-#: ../modules/itip-formatter/itip-view.c:5969
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
+#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3496
+#: ../modules/itip-formatter/itip-view.c:6003
 #: ../modules/plugin-manager/evolution-plugin-manager.c:100
 msgid "Unknown"
 msgstr "不明"
 
-#: ../calendar/gui/e-cal-model.c:1683
+#: ../calendar/gui/e-cal-model.c:1668
 msgid "Recurring"
 msgstr "週期性模式"
 
-#: ../calendar/gui/e-cal-model.c:1685
+#: ../calendar/gui/e-cal-model.c:1670
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1161
 #: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:1074
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1024
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model.c:1687 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1161
 #: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "否"
 
-#: ../calendar/gui/e-cal-model.c:3461
+#: ../calendar/gui/e-cal-model.c:3958
 #: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../modules/itip-formatter/itip-view.c:5957
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../modules/itip-formatter/itip-view.c:5991
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-cal-model.c:3462
+#: ../calendar/gui/e-cal-model.c:3959
 #: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:5963
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../modules/itip-formatter/itip-view.c:5997
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-cal-model.c:3463
+#: ../calendar/gui/e-cal-model.c:3960
 #: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "Tentative"
 msgstr "暫訂"
 
-#: ../calendar/gui/e-cal-model.c:3464
+#: ../calendar/gui/e-cal-model.c:3961
 #: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../modules/itip-formatter/itip-view.c:5966
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:6000
 msgid "Delegated"
 msgstr "已委派"
 
-#: ../calendar/gui/e-cal-model.c:3465
+#: ../calendar/gui/e-cal-model.c:3962
 msgid "Needs action"
 msgstr "需要動作"
 
-#: ../calendar/gui/e-cal-model-calendar.c:158
-#: ../calendar/gui/e-task-table.c:629
+#: ../calendar/gui/e-cal-model-calendar.c:125
+#: ../calendar/gui/e-task-table.c:631
 msgid "Free"
 msgstr "空閒"
 
-#: ../calendar/gui/e-cal-model-calendar.c:161
-#: ../calendar/gui/e-meeting-time-sel.c:579 ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-cal-model-calendar.c:128
+#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../calendar/gui/e-cal-model-tasks.c:723
+#: ../calendar/gui/e-cal-model-tasks.c:497
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3936,7 +3900,7 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:775
+#: ../calendar/gui/e-cal-model-tasks.c:549
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "沒有"
@@ -3961,16 +3925,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:772
-#: ../calendar/gui/print.c:1058 ../calendar/gui/print.c:1077
-#: ../calendar/gui/print.c:2608 ../calendar/gui/print.c:2628
+#: ../calendar/gui/e-day-view.c:1983 ../calendar/gui/e-week-view.c:1554
+#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2637 ../calendar/gui/print.c:2657
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:775
-#: ../calendar/gui/print.c:1063 ../calendar/gui/print.c:1079
-#: ../calendar/gui/print.c:2613 ../calendar/gui/print.c:2630
+#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1557
+#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
+#: ../calendar/gui/print.c:2642 ../calendar/gui/print.c:2659
 msgid "pm"
 msgstr "下午"
 
@@ -3980,13 +3944,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:1871 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2071
+#: ../calendar/gui/e-day-view.c:2776 ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2093
 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:2709
+#: ../calendar/gui/e-day-view.c:3433
 #, c-format
 msgid "Week %d"
 msgstr "第 %d 週"
@@ -3997,27 +3961,27 @@ msgstr "第 %d 週"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:794
+#: ../calendar/gui/e-day-view-time-item.c:801
 #, c-format
 msgid "%02i minute divisions"
 msgstr "間隔 %02i 分鐘"
 
-#: ../calendar/gui/e-day-view-time-item.c:819
+#: ../calendar/gui/e-day-view-time-item.c:826
 msgid "Show the second time zone"
 msgstr "顯示第二時區"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:836
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/e-day-view-time-item.c:843
+#: ../modules/calendar/e-calendar-preferences.c:306
+#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "沒有"
 
-#: ../calendar/gui/e-day-view-time-item.c:870
+#: ../calendar/gui/e-day-view-time-item.c:877
 #: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:262
+#: ../modules/calendar/e-calendar-preferences.c:389
 msgid "Select..."
 msgstr "選擇…"
 
@@ -4038,149 +4002,149 @@ msgid "Resources"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/e-meeting-store.c:1068 ../calendar/gui/print.c:1231
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
 msgid "Individual"
 msgstr "個別"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1232 ../e-util/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
 msgid "Group"
 msgstr "群組"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1233
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/print.c:1249
 msgid "Resource"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/print.c:1234
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1250
 msgid "Room"
 msgstr "會議室"
 
 #: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/print.c:1264
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/e-meeting-store.c:1071 ../calendar/gui/print.c:1249
+#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
 msgid "Required Participant"
 msgstr "出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1250
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1266
 msgid "Optional Participant"
 msgstr "列席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/print.c:1251
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/print.c:1267
 msgid "Non-Participant"
 msgstr "缺席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../calendar/gui/e-meeting-store.c:1081
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1031
 msgid "Needs Action"
 msgstr "需要動作"
 
-#: ../calendar/gui/e-meeting-list-view.c:623
+#: ../calendar/gui/e-meeting-list-view.c:626
 msgid "Attendee                          "
 msgstr "到會者"
 
-#: ../calendar/gui/e-meeting-list-view.c:678
+#: ../calendar/gui/e-meeting-list-view.c:681
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "進行中"
 
-#: ../calendar/gui/e-meeting-store.c:1955
+#: ../calendar/gui/e-meeting-store.c:1910
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "輸入使用者 %2$s 在伺服器 %1$s 上存取空閒/忙碌資訊的密碼 "
 
-#: ../calendar/gui/e-meeting-store.c:1965
+#: ../calendar/gui/e-meeting-store.c:1920
 #, c-format
 msgid "Failure reason: %s"
 msgstr "å¤±æ•—åŽŸå› ï¼š%s"
 
-#: ../calendar/gui/e-meeting-store.c:1970
-#: ../plugins/publish-calendar/publish-calendar.c:341
-#: ../smime/gui/component.c:55
+#: ../calendar/gui/e-meeting-store.c:1925
+#: ../plugins/publish-calendar/publish-calendar.c:340
+#: ../smime/gui/component.c:64
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: ../calendar/gui/e-meeting-time-sel.c:580
+#: ../calendar/gui/e-meeting-time-sel.c:528
 msgid "Out of Office"
 msgstr "不在辦公室"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:530
 msgid "No Information"
 msgstr "沒有資訊"
 
-#: ../calendar/gui/e-meeting-time-sel.c:622
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "O_ptions"
 msgstr "é¸é …(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:590
 msgid "Show _only working hours"
 msgstr "只顯示工作時間(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:655
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _zoomed out"
 msgstr "顯示縮小(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:673
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Update free/busy"
 msgstr "更新空閒/忙碌(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:690
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:658
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:727
+#: ../calendar/gui/e-meeting-time-sel.c:675
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:748
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:759
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:770
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:780
+#: ../calendar/gui/e-meeting-time-sel.c:728
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:834
+#: ../calendar/gui/e-meeting-time-sel.c:767
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:878
+#: ../calendar/gui/e-meeting-time-sel.c:796
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2786
+#: ../calendar/gui/e-meeting-time-sel.c:2660
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4189,7 +4153,7 @@ msgstr ""
 "摘要：%s\n"
 "位置：%s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2788 ../calendar/gui/print.c:3497
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3534
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要：%s"
@@ -4218,46 +4182,46 @@ msgstr "普通名稱"
 msgid "Language"
 msgstr "語言"
 
-#: ../calendar/gui/e-memo-table.c:421
-#: ../modules/calendar/e-cal-shell-content.c:472
-#: ../modules/calendar/e-memo-shell-view-actions.c:232
-#: ../modules/calendar/e-memo-shell-view-actions.c:247
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:434
+#: ../modules/calendar/e-cal-shell-content.c:482
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view.c:307
 msgid "Memos"
 msgstr "備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:502 ../calendar/gui/e-task-table.c:790
+#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
 msgid "* No Summary *"
 msgstr "* 沒有摘要 *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:589 ../calendar/gui/e-task-table.c:874
+#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
 msgid "Start: "
 msgstr "開始:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:608 ../calendar/gui/e-task-table.c:892
+#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
 msgid "Due: "
 msgstr "到期:"
 
-#: ../calendar/gui/e-memo-table.c:727
+#: ../calendar/gui/e-memo-table.c:742
 msgid "Cut selected memos to the clipboard"
 msgstr "剪下選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:733
+#: ../calendar/gui/e-memo-table.c:748
 msgid "Copy selected memos to the clipboard"
 msgstr "複製選取的備忘錄至剪貼簿"
 
-#: ../calendar/gui/e-memo-table.c:739
+#: ../calendar/gui/e-memo-table.c:754
 msgid "Paste memos from the clipboard"
 msgstr "從剪貼簿貼上備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:745
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
+#: ../calendar/gui/e-memo-table.c:760
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "Delete selected memos"
 msgstr "刪除選定的備忘錄"
 
-#: ../calendar/gui/e-memo-table.c:751
+#: ../calendar/gui/e-memo-table.c:766
 msgid "Select all visible memos"
 msgstr "選擇全部可見的備忘錄"
 
@@ -4269,40 +4233,40 @@ msgstr "è«‹æŒ‰é€™è£¡å¢žåŠ æ–°çš„å‚™å¿˜éŒ„"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:602
+#: ../calendar/gui/e-task-table.c:604
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2389
+#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2418
 #: ../calendar/importers/icalendar-importer.c:79
 #: ../calendar/importers/icalendar-importer.c:1078
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:433
-#: ../modules/calendar/e-task-shell-view-actions.c:255
-#: ../modules/calendar/e-task-shell-view-actions.c:270
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../modules/calendar/e-cal-shell-content.c:439
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view.c:462
 msgid "Tasks"
 msgstr "工作"
 
-#: ../calendar/gui/e-task-table.c:1025
+#: ../calendar/gui/e-task-table.c:1040
 msgid "Cut selected tasks to the clipboard"
 msgstr "剪下選取的工作至剪貼簿"
 
-#: ../calendar/gui/e-task-table.c:1031
+#: ../calendar/gui/e-task-table.c:1046
 msgid "Copy selected tasks to the clipboard"
 msgstr "複製選取的工作至剪貼簿"
 
-#: ../calendar/gui/e-task-table.c:1037
+#: ../calendar/gui/e-task-table.c:1052
 msgid "Paste tasks from the clipboard"
 msgstr "從剪貼簿貼上工作"
 
-#: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:734
+#: ../calendar/gui/e-task-table.c:1058
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
 
-#: ../calendar/gui/e-task-table.c:1049
+#: ../calendar/gui/e-task-table.c:1064
 msgid "Select all visible tasks"
 msgstr "選擇全部可見的工作"
 
@@ -4313,40 +4277,40 @@ 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:241 ../calendar/gui/print.c:2050
+#: ../calendar/gui/e-week-view-main-item.c:227 ../calendar/gui/print.c:2072
 msgid "%d %B"
 msgstr "%m月%d日"
 
-#: ../calendar/gui/gnome-cal.c:2319
+#: ../calendar/gui/gnome-cal.c:2369
 msgid "Purging"
 msgstr "清除"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:818
+#: ../calendar/gui/itip-utils.c:646 ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:838
 msgid "An organizer must be set."
 msgstr "å¿…é ˆæŒ‡å®šä¸€å€‹å¬é›†äººã€‚"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:695
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
-#: ../calendar/gui/itip-utils.c:905 ../calendar/gui/itip-utils.c:1066
+#: ../calendar/gui/itip-utils.c:926 ../calendar/gui/itip-utils.c:1087
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../calendar/gui/itip-utils.c:908 ../calendar/gui/itip-utils.c:1069
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/itip-utils.c:911 ../calendar/gui/itip-utils.c:1072
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Memo information"
 msgstr "備忘錄資訊"
 
-#: ../calendar/gui/itip-utils.c:914 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1111
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/itip-utils.c:917
+#: ../calendar/gui/itip-utils.c:938
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
@@ -4354,7 +4318,7 @@ msgstr "行事曆資訊"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:954
+#: ../calendar/gui/itip-utils.c:975
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "已接受"
@@ -4363,7 +4327,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:961
+#: ../calendar/gui/itip-utils.c:982
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
@@ -4375,7 +4339,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:968 ../calendar/gui/itip-utils.c:1016
+#: ../calendar/gui/itip-utils.c:989 ../calendar/gui/itip-utils.c:1037
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "已拒絕"
@@ -4384,7 +4348,7 @@ msgstr "已拒絕"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:975
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已委派"
@@ -4392,7 +4356,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:988
+#: ../calendar/gui/itip-utils.c:1009
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已更新"
@@ -4400,7 +4364,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:995
+#: ../calendar/gui/itip-utils.c:1016
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -4408,7 +4372,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:1002
+#: ../calendar/gui/itip-utils.c:1023
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "重新整理"
@@ -4416,248 +4380,257 @@ 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:1009
+#: ../calendar/gui/itip-utils.c:1030
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:1087
+#: ../calendar/gui/itip-utils.c:1108
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:1095
+#: ../calendar/gui/itip-utils.c:1116
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: ../calendar/gui/itip-utils.c:1122
+#: ../calendar/gui/itip-utils.c:1143
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "無法取得資源，新的事件與其他事件有所重疊。"
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../calendar/gui/itip-utils.c:1148
 #, c-format
 msgid "Unable to book a resource, error: %s"
 msgstr "無法取得資源，錯誤為：%s"
 
-#: ../calendar/gui/itip-utils.c:1304
+#: ../calendar/gui/itip-utils.c:1325
 msgid "You must be an attendee of the event."
 msgstr "æ‚¨å¿…é ˆæ˜¯æ­¤äº‹ä»¶çš„åˆ°æœƒè€…ã€‚"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "1st"
 msgstr "1æ—¥"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "2nd"
 msgstr "2æ—¥"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "3rd"
 msgstr "3æ—¥"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "4th"
 msgstr "4æ—¥"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:661
 msgid "5th"
 msgstr "5æ—¥"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "6th"
 msgstr "6æ—¥"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "7th"
 msgstr "7æ—¥"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "8th"
 msgstr "8æ—¥"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "9th"
 msgstr "9æ—¥"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:662
 msgid "10th"
 msgstr "10æ—¥"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "11th"
 msgstr "11æ—¥"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "12th"
 msgstr "12æ—¥"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "13th"
 msgstr "13æ—¥"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "14th"
 msgstr "14æ—¥"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:663
 msgid "15th"
 msgstr "15æ—¥"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "16th"
 msgstr "16æ—¥"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "17th"
 msgstr "17æ—¥"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "18th"
 msgstr "18æ—¥"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "19th"
 msgstr "19æ—¥"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "20th"
 msgstr "20æ—¥"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "21st"
 msgstr "21æ—¥"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "22nd"
 msgstr "22æ—¥"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "23rd"
 msgstr "23æ—¥"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "24th"
 msgstr "24æ—¥"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "25th"
 msgstr "25æ—¥"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "26th"
 msgstr "26æ—¥"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "27th"
 msgstr "27æ—¥"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "28th"
 msgstr "28æ—¥"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "29th"
 msgstr "29æ—¥"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "30th"
 msgstr "30æ—¥"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "31st"
 msgstr "31æ—¥"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:721
-msgid "Su"
-msgstr "æ—¥"
-
-#: ../calendar/gui/print.c:721
+#. Translators: These are workday abbreviations,
+#. * e.g. Su=Sunday and Th=thursday
+#. G_DATE_BAD_WEEKDAY
+#. G_DATE_MONDAY
+#: ../calendar/gui/print.c:727
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:721
+#. G_DATE_TUESDAY
+#: ../calendar/gui/print.c:728
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:721
+#. G_DATE_WEDNESDAY
+#: ../calendar/gui/print.c:729
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_THURSDAY
+#: ../calendar/gui/print.c:730
 msgid "Th"
 msgstr "å››"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_FRIDAY
+#: ../calendar/gui/print.c:731
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:722
+#. G_DATE_SATURDAY
+#: ../calendar/gui/print.c:732
 msgid "Sa"
 msgstr "å…­"
 
+#. G_DATE_SUNDAY
+#: ../calendar/gui/print.c:733
+msgid "Su"
+msgstr "æ—¥"
+
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3296
+#: ../calendar/gui/print.c:3328
 msgid " to "
 msgstr " 到 "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3306
+#: ../calendar/gui/print.c:3338
 msgid " (Completed "
 msgstr " (已完成 "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3312
+#: ../calendar/gui/print.c:3344
 msgid "Completed "
 msgstr "已完成 "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3322
+#: ../calendar/gui/print.c:3354
 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:3329
+#: ../calendar/gui/print.c:3361
 msgid "Due "
 msgstr "期限 "
 
-#: ../calendar/gui/print.c:3527
+#: ../calendar/gui/print.c:3564
 msgid "Attendees: "
 msgstr "到會者:"
 
-#: ../calendar/gui/print.c:3571
+#: ../calendar/gui/print.c:3608
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
-#: ../calendar/gui/print.c:3587
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Priority: %s"
 msgstr "å„ªå…ˆé †åº(_P): %s"
 
-#: ../calendar/gui/print.c:3605
+#: ../calendar/gui/print.c:3642
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
-#: ../calendar/gui/print.c:3619
+#: ../calendar/gui/print.c:3656
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3670
 #, c-format
 msgid "Categories: %s"
 msgstr "分類: %s"
 
-#: ../calendar/gui/print.c:3644
+#: ../calendar/gui/print.c:3681
 msgid "Contacts: "
 msgstr "連絡人: "
 
@@ -4720,25 +4693,25 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
 
 #: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "會議"
 
 #: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1500
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
 #: ../calendar/importers/icalendar-importer.c:1189
-#: ../calendar/importers/icalendar-importer.c:1506
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "工作"
 
 #: ../calendar/importers/icalendar-importer.c:1192
-#: ../calendar/importers/icalendar-importer.c:1507
+#: ../calendar/importers/icalendar-importer.c:1502
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "備忘錄"
@@ -4789,7 +4762,7 @@ msgstr "歸類"
 
 #. Translators: Appointment's summary
 #: ../calendar/importers/icalendar-importer.c:1244
-#: ../calendar/importers/icalendar-importer.c:1549
+#: ../calendar/importers/icalendar-importer.c:1544
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "摘要"
@@ -4802,7 +4775,7 @@ msgstr "位置"
 
 #. Translators: Appointment's start time
 #: ../calendar/importers/icalendar-importer.c:1258
-#: ../calendar/importers/icalendar-importer.c:1544
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "開始"
@@ -4856,7 +4829,7 @@ msgctxt "iCalImp"
 msgid "Description"
 msgstr "描述"
 
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1534
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "é¡žåž‹"
@@ -6409,199 +6382,199 @@ msgstr "太平洋/瓦利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦島"
 
-#: ../composer/e-composer-actions.c:207
+#: ../composer/e-composer-actions.c:203
 msgid "Save as..."
 msgstr "另存新檔…"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:276
 #: ../e-util/e-mail-signature-editor.c:303
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:278
 msgid "Close the current file"
 msgstr "關閉目前的檔案"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:283
 msgid "New _Message"
 msgstr "撰寫新郵件(_M)"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:285
 msgid "Open New Message window"
 msgstr "開啟新的郵件視窗"
 
-#: ../composer/e-composer-actions.c:310 ../shell/e-shell-window-actions.c:925
+#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
 msgid "Configure Evolution"
 msgstr "設定 Evolution"
 
-#: ../composer/e-composer-actions.c:317
+#: ../composer/e-composer-actions.c:299
 msgid "Save the current file"
 msgstr "儲存目前的檔案"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:304
 msgid "Save _As..."
 msgstr "另存新檔(_A)…"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:306
 msgid "Save the current file with a different name"
 msgstr "以另一個名稱儲存目前的檔案"
 
-#: ../composer/e-composer-actions.c:331
+#: ../composer/e-composer-actions.c:313
 msgid "Character _Encoding"
 msgstr "字元編碼(_E)"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:330
 msgid "_Print..."
 msgstr "列印(_P)…"
 
-#: ../composer/e-composer-actions.c:355
+#: ../composer/e-composer-actions.c:337
 msgid "Print Pre_view"
 msgstr "é è¦½åˆ—å°(_V)"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:344
 msgid "Save as _Draft"
 msgstr "儲存為草稿(_D)"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:346
 msgid "Save as draft"
 msgstr "儲存為草稿"
 
-#: ../composer/e-composer-actions.c:369 ../composer/e-composer-private.c:327
+#: ../composer/e-composer-actions.c:351
 msgid "S_end"
 msgstr "傳送(_E)"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:353
 msgid "Send this message"
 msgstr "傳送這個郵件"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PG_P åŠ å¯†"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "使用 PGP å°‡é€™å°éƒµä»¶åŠ å¯†"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "P_GP åŠ ç°½"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP é‡‘é‘°ç‚ºéƒµä»¶åŠ ä¸Šæ•¸ä½ç°½ç« "
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:377
 msgid "_Picture Gallery"
 msgstr "圖片集(_P)"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:379
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "示您可以拖曳到郵件中的圖片集"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:385
 msgid "_Prioritize Message"
 msgstr "郵件優先權(_P)"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:387
 msgid "Set the message priority to high"
 msgstr "將郵件優先權設為「高」"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:393
 msgid "Re_quest Read Receipt"
 msgstr "要求讀信回條(_Q)"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:395
 msgid "Get delivery notification when your message is read"
 msgstr "在您的郵件被閱讀時取得送信通知"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME åŠ å¯†"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:403
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使用您的 S/MIME åŠ å¯†æ†‘è­‰å°‡é€™å°éƒµä»¶åŠ å¯†"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:409
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME åŠ ç°½"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:411
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME ç°½åæ†‘è­‰ç‚ºéƒµä»¶åŠ ä¸Šæ•¸ä½ç°½ç« "
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:417
 msgid "_Bcc Field"
 msgstr "密件副本欄位(_B)"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the BCC field is displayed"
 msgstr "切換密件副本欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:425
 msgid "_Cc Field"
 msgstr "副本欄位(_C)"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the CC field is displayed"
 msgstr "切換副本欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "回覆欄位(_R)"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
-#: ../composer/e-composer-actions.c:512
+#: ../composer/e-composer-actions.c:494
 msgid "Save Draft"
 msgstr "儲存草稿"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "輸入郵件的收件者"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:44
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
 "輸入郵件密件副本的收件者，他們會收到這封郵件但不會出現在郵件的收件者清單"
 
-#: ../composer/e-composer-header-table.c:835
+#: ../composer/e-composer-header-table.c:772
 msgid "Fr_om:"
 msgstr "寄件者(_O):"
 
-#: ../composer/e-composer-header-table.c:842
+#: ../composer/e-composer-header-table.c:779
 msgid "_Reply-To:"
 msgstr "回覆(_R):"
 
-#: ../composer/e-composer-header-table.c:847
+#: ../composer/e-composer-header-table.c:784
 msgid "_To:"
 msgstr "收件者(_T):"
 
-#: ../composer/e-composer-header-table.c:853
+#: ../composer/e-composer-header-table.c:790
 msgid "_Cc:"
 msgstr "副本(_C):"
 
-#: ../composer/e-composer-header-table.c:859
+#: ../composer/e-composer-header-table.c:796
 msgid "_Bcc:"
 msgstr "密件副本(_B):"
 
-#: ../composer/e-composer-header-table.c:864
+#: ../composer/e-composer-header-table.c:801
 msgid "_Post To:"
 msgstr "張貼到(_P):"
 
-#: ../composer/e-composer-header-table.c:868
+#: ../composer/e-composer-header-table.c:805
 msgid "S_ubject:"
 msgstr "主旨(_U):"
 
-#: ../composer/e-composer-header-table.c:876
+#: ../composer/e-composer-header-table.c:813
 #: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
@@ -6614,32 +6587,28 @@ msgstr "按這裡新增目錄服務"
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡，選取要張貼的資料夾"
 
-#: ../composer/e-composer-private.c:347
-msgid "Save draft"
-msgstr "儲存草稿"
-
-#: ../composer/e-msg-composer.c:862
+#: ../composer/e-msg-composer.c:869
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç„¡æ³•ç°½ç½²é€å‡ºçš„éƒµä»¶ï¼šæ­¤å¸³è™Ÿæ²’æœ‰è¨­å®šç°½ç« æ†‘è­‰"
 
-#: ../composer/e-msg-composer.c:871
+#: ../composer/e-msg-composer.c:878
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ç„¡æ³•åŠ å¯†é€å‡ºçš„éƒµä»¶ï¼šæ²’æœ‰è¨­å®šåŠ å¯†æ†‘è­‰(此帳號)"
 
-#: ../composer/e-msg-composer.c:1552 ../composer/e-msg-composer.c:1961
+#: ../composer/e-msg-composer.c:1557 ../composer/e-msg-composer.c:1958
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4215
+#: ../composer/e-msg-composer.c:4213
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "郵件編輯器包含不能編輯的非文字的郵件內文。"
 
-#: ../composer/e-msg-composer.c:4890
+#: ../composer/e-msg-composer.c:4886
 msgid "Untitled Message"
 msgstr "未命名的郵件"
 
@@ -6762,7 +6731,7 @@ msgstr "å›žå ±çš„éŒ¯èª¤ç‚º &quot;{0}&quot;。郵件很可能沒有儲存。"
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "在寄信時發生錯誤。您要如何繼續？"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:152
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "å›žå ±çš„éŒ¯èª¤ç‚º &quot;{0}&quot;。"
 
@@ -6784,12 +6753,12 @@ msgstr "儲存郵件到寄件匣。"
 
 #: ../composer/mail-composer.error.xml.h:35
 msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
+"The message will be saved to your local Outbox folder, because the "
+"destination service is currently unavailable. You can send the message by "
+"clicking the Send/Receive button in Evolution's toolbar."
 msgstr ""
-"å› ç‚ºæ‚¨åœ¨é›¢ç·šå·¥ä½œï¼Œé€™å€‹éƒµä»¶æœƒå„²å­˜åœ¨æ‚¨æœ¬åœ°ç«¯çš„å¯„ä»¶è³‡æ–™å¤¾è£¡ã€‚ç•¶æ‚¨å›žåˆ°ç·šä¸Šå·¥ä½œï¼Œ"
-"您可以點選 Evolution 工具列的傳送/接收按鈕來寄出郵件。"
+"å› ç‚ºç›®çš„ç«¯æœå‹™ç›®å‰ç„¡æ³•ä½¿ç”¨ï¼Œé€™å€‹éƒµä»¶æœƒå„²å­˜åœ¨æ‚¨æœ¬åœ°ç«¯çš„å¯„ä»¶è³‡æ–™å¤¾è£¡ã€‚ç•¶æ‚¨å›žåˆ°"
+"線上工作，您可以點選 Evolution 工具列的傳送/接收按鈕來寄出郵件。"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
@@ -6799,8 +6768,8 @@ msgstr "Evolution 鬧鈴通知"
 msgid "Calendar event notifications"
 msgstr "行事曆事件通知"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:932
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
+#: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "Evolution"
@@ -6821,14 +6790,6 @@ msgstr "管理您的郵件、連絡人和行程"
 msgid "mail;calendar;contact;addressbook;task;"
 msgstr "mail;calendar;contact;addressbook;task;郵件;行事曆;連絡人;通訊錄;工作;"
 
-#: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Email Settings"
-msgstr "電子郵件設定值"
-
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Configure email accounts"
-msgstr "設定郵件帳號"
-
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "å•Ÿç”¨åœ°å€æ ¼å¼åŒ–"
@@ -7480,20 +7441,60 @@ msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "使用系統時區取代在 Evolution 中選取的時區"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "Week start"
-msgstr "一週開始於"
+msgid "First day of the week"
+msgstr "一週的第一天"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
-msgstr "每週的開始，從星期日 (0) 到星期六 (6)"
+msgid "Monday is a work day"
+msgstr "星期一是工作日"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-msgid "Work days"
-msgstr "工作日"
+msgid "Tuesday is a work day"
+msgstr "星期二是工作日"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-msgid "Days on which the start and end of work hours should be indicated"
-msgstr "å¿…é ˆæŒ‡æ˜Žå·¥ä½œæ—¥é–‹å§‹èˆ‡çµæŸæ–¼å¹¾æ™‚"
+msgid "Wednesday is a work day"
+msgstr "星期三是工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid "Thursday is a work day"
+msgstr "星期四是工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Friday is a work day"
+msgstr "星期五是工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+msgid "Saturday is a work day"
+msgstr "星期六是工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Sunday is a work day"
+msgstr "星期日是工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
+msgstr "(已廢棄) 每週的開始，從星期日 (0) 到星期六 (6)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"week-start-day-name\" instead."
+msgstr ""
+"這個設定鍵在 3.10 版中已廢棄不再使用。請使用「week-start-day-name」代替。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid "(Deprecated) Work days"
+msgstr "(已廢棄) 工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+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-"
+"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
+msgstr ""
+"å·¥ä½œæ—¥é–‹å§‹èˆ‡çµæŸçš„æ—¥å­å¿…é ˆæŒ‡å‡ºä¾†ã€‚(這個設定鍵在 3.10 版中已廢棄不再使用。請使"
+"用「work-day-monday」、「work-day-tuesday」等等設定鍵代替。)"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
 msgid "Previous Evolution version"
@@ -7837,22 +7838,10 @@ msgid "Can be either 'mbox' or 'pdf'."
 msgstr "可以是「mbox」或「pdf」。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-msgid "Save name format for drag-and-drop operation"
-msgstr "æ‹–æ”¾æ“ä½œæ™‚å„²å­˜çš„åç¨±æ ¼å¼"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-msgid ""
-"Can be either 2 to use current date and time or any other value for sent "
-"date of the message. This has a meaning only when dropping just one message."
-msgstr ""
-"可以是 2 以使用目前的日期和時刻或任何數值代表郵件的傳送日期。這只有在拖放單一"
-"郵件時才有意義。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Show image animations"
 msgstr "顯示動畫圖片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -7860,195 +7849,173 @@ msgstr ""
 "啟用 HTML éƒµä»¶ä¸­çš„å‹•ç•«åœ–ç‰‡ã€‚è¨±å¤šä½¿ç”¨è€…èªç‚ºå‹•ç•«åœ–ç‰‡å¾ˆç…©äººï¼Œå› è€Œåå¥½ä»¥éœæ…‹åœ–ç‰‡"
 "代替。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+msgid "Ellipsize mode for folder names in side bar"
+msgstr "側邊列的資料夾名稱省略模式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Enable or disable type ahead search feature"
 msgstr "啟用或停用隨打即查功能"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "啟用側邊列搜尋功能允許互動式搜尋資料夾名稱。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "停用或啟用側邊列的資料夾名稱省略功能"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr "是否停用側邊列的資料夾名稱省略。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Enable or disable magic space bar"
 msgstr "啟用或停用魔術空白鍵"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "å•Ÿç”¨æ­¤é¸é …å¯åœ¨éƒµä»¶é è¦½ã€éƒµä»¶æ¸…å–®å’Œè³‡æ–™å¤¾ä¸­ä½¿ç”¨ç©ºç™½éµæ²å‹•ç•«é¢ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "啟用以在所有資料夾使用類似的郵件清單檢視設定值"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "å•Ÿç”¨æ­¤é¸é …æœƒè®“æ‰€æœ‰çš„è³‡æ–™å¤¾ä½¿ç”¨é¡žä¼¼çš„éƒµä»¶æ¸…å–®æª¢è¦–è¨­å®šå€¼ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Mark citations in the message \"Preview\""
 msgstr "åœ¨éƒµä»¶ã€Œé è¦½ã€ä¸­æ¨™ç¤ºå¼•ç”¨"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Mark citations in the message \"Preview\"."
 msgstr "åœ¨éƒµä»¶ã€Œé è¦½ã€ä¸­æ¨™ç¤ºå¼•ç”¨ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Citation highlight color"
 msgstr "引用反白色彩"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Citation highlight color."
 msgstr "引用反白色彩。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Enable/disable caret mode"
 msgstr "啟用/停用插入號模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "啟用插入號模式，如此您可以在閱讀郵件時看到游標。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Default charset in which to display messages"
 msgstr "ç”¨æ–¼é¡¯ç¤ºéƒµä»¶çš„é è¨­å­—å…ƒé›†"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Default charset in which to display messages."
 msgstr "ç”¨æ–¼é¡¯ç¤ºéƒµä»¶çš„é è¨­å­—å…ƒé›†ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-msgid "Load images for HTML messages over HTTP"
-msgstr "透過 HTTP 載入 HTML 郵件的圖片"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-msgid ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"透過 HTTP(S) 載入 HTML 郵件的圖片。可能的值為：「0」– 不從網路載入圖片。"
-"「1」– 如果是在連絡人裡的寄件者時，載入圖片。「2」- 一定從網路載入圖片。"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+msgid "Automatically load images for HTML messages over HTTP"
+msgstr "自動透過 HTTP 載入 HTML 郵件的影像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Show animated images as animations."
 msgstr "播放動畫圖片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show all message headers"
 msgstr "é¡¯ç¤ºæ‰€æœ‰éƒµä»¶æª”é ­"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Show all the headers when viewing a messages."
 msgstr "æª¢è¦–éƒµä»¶æ™‚é¡¯ç¤ºæª”é ­ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-msgid "List of custom headers and whether they are enabled."
-msgstr "è‡ªè¨‚æª”é ­ä»¥åŠå®ƒå€‘æ˜¯å¦å•Ÿç”¨çš„æ¸…å–®"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+msgid "List of headers to show when viewing a message."
+msgstr "æª¢è¦–éƒµä»¶æ™‚é¡¯ç¤ºçš„æª”é ­æ¸…å–®ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+"Each header is represented as a pair: the header name, and a boolean "
+"indicating whether the header is enabled. Disabled headers are not shown "
+"when viewing a message, but are still listed in Preferences."
 msgstr ""
-"此金鑰應該包含 XML æ¸…å–®ï¼Œå®ƒæœƒæŒ‡å®šè‡ªè¨‚æª”é ­ï¼Œä»¥åŠæ˜¯å¦é¡¯ç¤ºå®ƒå€‘ã€‚XML çµæ§‹çš„æ ¼å¼"
-"是 &lt;header enabled&gt; - å¦‚æžœæª”é ­æœƒé¡¯ç¤ºåœ¨éƒµä»¶æª¢è¦–ï¼Œå‰‡è¨­å®šæˆ enabled。"
+"æ¯å€‹æª”é ­éƒ½ä»¥é…å°æ–¹å¼å‘ˆç¾ï¼šæª”é ­çš„åç¨±ï¼ŒåŠä¸€å€‹å¸ƒæž—å€¼è¡¨ç¤ºæ­¤æª”é ­æ˜¯å¦å•Ÿç”¨ã€‚åœç”¨çš„"
+"æª”é ­åœ¨æª¢è¦–éƒµä»¶æ™‚ä¸æœƒé¡¯ç¤ºï¼Œä½†ä»æœƒåˆ—åœ¨åå¥½è¨­å®šä¸­ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show photo of the sender"
 msgstr "顯示寄件者的相片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "åœ¨éƒµä»¶é–±è®€çª—æ ¼ä¸­é¡¯ç¤ºå¯„ä»¶è€…çš„ç›¸ç‰‡ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-msgid "Search for the sender photo in local address books"
-msgstr "在本地端通訊錄搜尋寄件者相片"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-msgid "This option would help in improving the speed of fetching."
-msgstr "é€™å€‹é¸é …èƒ½å”åŠ©å¢žé€²æŽ¥æ”¶çš„é€Ÿåº¦ã€‚"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定的時限過後，標示成已閱讀"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定的時限過後，標示成已閱讀。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Timeout for marking messages as seen"
 msgstr "將郵件標示成已閱讀的時限"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "將郵件標示成已閱讀的時限，以毫秒計。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Sender email-address column in the message list"
 msgstr "在郵件清單的寄件者電子郵件欄位"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "在郵件清單的中以分離的欄位顯示寄件者的電子郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
 msgstr "決定是否在垂直檢視的「郵件」裡的「寄件人」及「主旨」中使用同樣的字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr "決定是否在垂直檢視的「郵件」裡的「寄件人」及「主旨」中使用同樣的字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show deleted messages in the message-list"
 msgstr "在郵件清單中顯示刪除的郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在郵件清單中顯示刪除的郵件 (åŠ ä¸Šåˆªé™¤è™Ÿ)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Enable Unmatched search folder"
 msgstr "啟用未符合搜尋資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 msgstr ""
 "啟用搜尋資料夾中的未符合搜尋資料夾。如果搜尋資料夾停用則不會有任何動作。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "éš±è—å„è³‡æ–™å¤¾é è¦½ä¸¦ç§»é™¤é¸å–å€"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -8056,37 +8023,31 @@ msgstr ""
 "這個鍵值只能讀取一次，並會在讀取後設為「false」。這樣會取消在清單中對該郵件的"
 "é¸å–ä¸¦ç§»é™¤å°è©²è³‡æ–™å¤¾çš„é è¦½ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Height of the message-list pane"
 msgstr "éƒµä»¶æ¸…å–®çª—æ ¼é«˜åº¦"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Height of the message-list pane."
 msgstr "éƒµä»¶æ¸…å–®çª—æ ¼çš„é«˜åº¦ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-msgid "State of message headers in paned view"
-msgstr "çª—æ ¼æª¢è¦–ä¸­éƒµä»¶æª”é ­çš„ç‹€æ…‹"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded and \"1\" = collapsed"
-msgstr "æè¿°åœ¨çª—æ ¼æª¢è¦–ä¸­çš„éƒµä»¶æª”é ­é è¨­æ‡‰è©²æ”¶æ‘ºæˆ–å±•é–‹ã€‚ã€Œ0」= 展開 「1」 = 收摺"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid "Whether message headers are collapsed in the user interface"
+msgstr "郵件標題在使用者介面中是否摺疊"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Width of the message-list pane"
 msgstr "éƒµä»¶æ¸…å–®çª—æ ¼å¯¬åº¦"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Width of the message-list pane."
 msgstr "éƒµä»¶æ¸…å–®çª—æ ¼çš„å¯¬åº¦ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Layout style"
 msgstr "配置樣式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -8096,76 +8057,76 @@ msgstr ""
 "é…ç½®æ–¹å¼æ±ºå®šäº†åœ¨éƒµä»¶æ¸…å–®ä¸­é è¦½çª—æ ¼çš„ä½ç½®ã€‚ã€Œ0ã€ï¼ˆæ¨™æº–æª¢è¦–ï¼‰å°‡é è¦½çª—æ ¼æ”¾åœ¨éƒµä»¶"
 "清單下方。「1ã€ï¼ˆåž‚ç›´æª¢è¦–ï¼‰å°‡é è¦½çª—æ ¼æ”¾åœ¨éƒµä»¶æ¸…å–®æ—é‚Šã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Variable width font"
 msgstr "變動寬度字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "The variable width font for mail display."
 msgstr "用於顯示郵件的變動寬度字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Terminal font"
 msgstr "終端機字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "The terminal font for mail display."
 msgstr "用於顯示郵件的終端機字型。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Use custom fonts"
 msgstr "使用自訂字型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自訂字型來顯示郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "壓縮在 TO/CC/BCC 中位址的顯示方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "將 TO/CC/BCC 中位址的顯示方式壓縮為 address_count 中指定的長度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示於 TO/CC/BCC 中位址的長度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "é€™æœƒè¨­å®šåœ¨é è¨­éƒµä»¶æ¸…å–®æª¢è¦–ä¸­é¡¯ç¤ºä½å€çš„é•·åº¦ï¼Œè¶…éŽçš„éƒ¨åˆ†æœƒé¡¯ç¤ºã€Œâ€¦ã€ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Thread the message-list based on Subject"
 msgstr "以主旨為基礎串接郵件清單"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 "當郵件不包含 In-Reply-To 或 References æª”é ­æ™‚ï¼Œæ˜¯å¦æŒ‰ç…§ä¸»æ—¨æ”¾å›žéƒµä»¶ç¾¤çµ„ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Default value for thread expand state"
 msgstr "ç›¸é—œéƒµä»¶å±•é–‹ç‹€æ…‹çš„é è¨­æ•¸å€¼"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr "é€™å€‹è¨­å®šå€¼æŒ‡å®šç›¸é—œéƒµä»¶é è¨­ç‚ºå±•é–‹æˆ–æ”¶æ‘ºçš„ç‹€æ…‹ã€‚éœ€è¦é‡æ–°å•Ÿå‹• Evolution。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否依郵件群組中最新的郵件來排序相關郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -8174,11 +8135,11 @@ msgstr ""
 "這個設定值指定相關郵件要依每個郵件群組最新的郵件排序，而非依照郵件的日期。"
 "Evolution 將需要重新啟動。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "在資料夾樹狀圖中以字母排序帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -8188,27 +8149,27 @@ msgstr ""
 "告知在郵件檢視中如何排序資料夾樹狀圖中的帳號。當設定為 true 時帳號會以字母排"
 "åºï¼Œä½†é€™è‡ºé›»è…¦èˆ‡æœå°‹è³‡æ–™å¤¾ä¾‹å¤–ï¼Œå¦å‰‡å¸³è™Ÿæœƒä»¥ä½¿ç”¨è€…çµ¦äºˆçš„é †åºæŽ’åˆ—"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Log filter actions"
 msgstr "記錄過濾器動作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Log filter actions to the specified log file."
 msgstr "將過濾器動作記錄到指定的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Logfile to log filter actions"
 msgstr "用於記錄過濾器動作的記錄檔案"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Logfile to log filter actions."
 msgstr "用於記錄過濾器動作的記錄檔案。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Flush Outbox after filtering"
 msgstr "過濾後清空寄件匣"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -8217,86 +8178,90 @@ msgstr ""
 "是否在過濾完後清空寄件匣。寄件匣的清空只用在當使用了任何「轉寄至」過濾器動"
 "作，並且在這個動作後大約一分鐘開始進行。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Default forward style"
 msgstr "é è¨­è½‰éžæ¨£å¼"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+msgid "Default reply style"
+msgstr "é è¨­å›žè¦†æ¨£å¼"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Prompt on empty subject"
 msgstr "沒有主旨時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "當使用者傳送沒有主旨的郵件時，提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Prompt when emptying the trash"
 msgstr "使用者清空回收筒時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "當使用者嘗試清空回收筒時，提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Prompt when user expunges"
 msgstr "使用者清空時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時，提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "寄信給沒有輸入有效郵件位址的收件者前先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
 msgstr "它會停用/啟用重覆提示警告您正試著傳送郵件給沒有輸入郵件位址的收件者"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "當使用者傳送不含收件者或副本收件者的郵件時，提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "當使用者嘗試傳送不想要的 HTML 時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "當使用者嘗試傳送 HTML 郵件到不想接受 HTML 郵件的收件者時，顯示提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "如果使用者嘗試一次開啟 10 或更多的郵件，詢問使用者是否確定要這麼做。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt while marking multiple messages"
 msgstr "當標記多個郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "啟用或停用標記多個郵件時的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt when deleting messages in search folder"
 msgstr "當刪除搜尋資料夾中的郵件時顯示提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -8305,11 +8270,11 @@ msgstr ""
 "它啟用/停用在從搜尋資料夾中刪除郵件時是否重複提示以警告那將會永久刪除郵件，而"
 "非僅是將郵件自搜尋結果中移除。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "詢問是否在資料夾樹狀圖中以拖放複製資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -8319,11 +8284,11 @@ msgstr ""
 "可能的數值有：「never」- 不允許在資料夾樹狀圖中拖放複製、「 always」- 不詢問"
 "就允許在資料夾樹狀圖中拖放複製或「ask」- (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "詢問是否在資料夾樹狀圖中拖放以移動資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -8333,21 +8298,21 @@ msgstr ""
 "可能的數值有：「never」- 不允許在資料夾樹狀圖中拖放移動、「 always」- 不詢問"
 "就允許在資料夾樹狀圖中拖放移動或「ask」- (或任何其他數值) 會詢問使用者。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt when replying privately to list messages"
 msgstr "當私人回覆通信論壇郵件時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 msgstr "它會停用/啟用重覆提示警告您正試著回覆私人信件給透過通信論壇寄出的信。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "當通信論壇劫持私人回覆時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -8356,74 +8321,66 @@ msgstr ""
 "它會停用/啟用重覆提示警告您正試著回覆私人信件給透過通信論壇寄出的信。而通信論"
 "壇設定的 Reply-To: æ¨™é ­æœƒå°‡æ‚¨çš„å›žä¿¡é‡æ–°å°Žå‘è‡³é€šä¿¡è«–å£‡ä¸Šçš„æ‰€æœ‰æˆå“¡"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Prompt when replying to many recipients"
 msgstr "當回覆給許多收件者時提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "它會停用/啟用警告您「您正回覆給很多人」的重覆提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
-msgstr "當使用者轉寄或回覆視窗中顯示的郵件時詢問是否要關閉郵件視窗"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
-"Possible values are: 'never' - to never close browser window, 'always' - to "
-"always close browser window or 'ask' - (or any other value) will ask user."
-msgstr ""
-"可能的數值有：「never」- 永不關閉瀏覽器視窗、「 always」- 總是關閉瀏覽器視窗"
-"或「ask」- (或任何其他數值) 會詢問使用者。"
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
+msgstr "當轉寄或回覆顯示的郵件後自動關閉郵件瀏覽器視窗的原則。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Empty Trash folders on exit"
 msgstr "結束時清空垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "結束 Evolution 時清空所有垃圾資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Minimum days between emptying the trash on exit"
 msgstr "結束時清空回收筒最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "結束時清空回收筒最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Last time Empty Trash was run"
 msgstr "上次清空回收筒的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "上次執行清單回收筒的時間，從 1970 年一月一日(電腦紀元)後算起的日數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "錯誤訊息在狀態列中顯示的時間(秒)。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Level beyond which the message should be logged."
 msgstr "應記錄的郵件等級。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "這裡可使用三種數值。「0」為錯誤，「1」為警告，「2」為除錯訊息。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Show original \"Date\" header value."
 msgstr "é¡¯ç¤ºåŽŸå§‹çš„ã€Œæ—¥æœŸã€æ¨™é ­æ•¸å€¼ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -8432,11 +8389,11 @@ msgstr ""
 "é¡¯ç¤ºåŽŸå§‹çš„ã€Œæ—¥æœŸã€æª”é ­ï¼ˆè‹¥æ™‚å€ä¸åŒæ™‚æœƒä½¿ç”¨ç•¶åœ°æ™‚é–“ï¼‰ã€‚å¦å‰‡æ°¸é ä»¥ä½¿ç”¨è€…åå¥½çš„"
 "æ ¼å¼å’Œæœ¬åœ°æ™‚å€é¡¯ç¤ºã€Œæ—¥æœŸã€æª”é ­ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "List of Labels and their associated colors"
 msgstr "標籤和相關色彩的清單"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -8444,44 +8401,44 @@ msgstr ""
 "Evolution 的郵件元件已知的標籤清單。清單包含字串，其中包含 name:color，color "
 "使用 HTML 十六進位編碼。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Check incoming mail being junk"
 msgstr "檢查內送的垃圾郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Run junk test on incoming mail."
 msgstr "在內送的郵件執行垃圾郵件檢查。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty Junk folders on exit"
 msgstr "離開時清空垃圾郵件資料夾"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "離開 Evolution 時清空所有垃圾郵件資料夾。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Minimum days between emptying the junk on exit"
 msgstr "結束時清空垃圾郵件最少間隔天數"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "結束時清空垃圾郵件最少間隔天數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Last time Empty Junk was run"
 msgstr "上次清空垃圾郵件的時間"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "上次執行清空垃圾郵件的時間，從 1970 年一月一日(電腦紀元)後算起的日數。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "The default plugin for Junk hook"
 msgstr "åžƒåœ¾é‡£é‰¤çš„é è¨­å¤–æŽ›ç¨‹å¼"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -8490,11 +8447,11 @@ msgstr ""
 "é€™æ˜¯é è¨­çš„åžƒåœ¾éƒµä»¶å¤–æŽ›ç¨‹å¼ï¼Œå³ä½¿å·²å•Ÿç”¨äº†å…¶ä»–çš„å¤–æŽ›ç¨‹å¼ã€‚å¦‚æžœåœç”¨é€™è£¡åˆ—å‡ºçš„é "
 "設外掛程式，並不會影響其他可用的外掛程式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "決定是否在通訊錄中尋找寄件者電子郵件帳號"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -8505,13 +8462,13 @@ msgstr ""
 "æœƒæœå°‹æ¨™è¨˜ç‚ºè‡ªå‹•è£œé½Šçš„é€šè¨ŠéŒ„ã€‚ä½†è‹¥æ¨™è¨˜ç‚ºè‡ªå‹•è£œé½Šçš„æ˜¯é ç«¯é€šè¨ŠéŒ„ï¼ˆåƒ LDAP），則"
 "速度可能會很慢。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "決定是否只在本地端通訊錄中尋找檢查垃圾郵件用的電子郵件位址"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -8520,11 +8477,11 @@ msgstr ""
 "é€™å€‹é¸é …ç›¸é—œæ–¼éµå€¼ã€Œlookup_addressbook」，是用來決定是否只在本地端通訊錄中查"
 "詢電子郵件位址以用於垃圾郵件過濾時「排除已知連絡人寄出的郵件」功能。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "æ±ºå®šæ˜¯å¦ä½¿ç”¨è‡ªè¨‚æ¨™é ­ä¾†æª¢æŸ¥åžƒåœ¾éƒµä»¶"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -8533,52 +8490,52 @@ msgstr ""
 "æ±ºå®šæ˜¯å¦ä½¿ç”¨è‡ªè¨‚æ¨™é ­ä¾†æª¢æŸ¥åžƒåœ¾éƒµä»¶ã€‚å¦‚æžœå•Ÿç”¨é€™å€‹é¸é …ä¸¦ä¸”æä¾›æ¨™é ­ï¼Œå°‡æœƒæå‡åžƒ"
 "圾郵件檢查的速度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Custom headers to use while checking for junk."
 msgstr "æª¢æŸ¥åžƒåœ¾éƒµä»¶ç”¨çš„è‡ªè¨‚æ¨™é ­ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
 "æª¢æŸ¥åžƒåœ¾éƒµä»¶ç”¨çš„è‡ªè¨‚æ¨™é ­ã€‚æ­¤æ¸…å–®ä¸­çš„å…ƒç´ æ ¼å¼ç‚ºã€Œheadername=value」字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "UID string of the default account."
 msgstr "é è¨­å¸³è™Ÿçš„ UID 字串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Save directory"
 msgstr "儲存目錄"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Directory for saving mail component files."
 msgstr "用來儲存郵件元件檔的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Composer load/attach directory"
 msgstr "編輯器讀取/é™„åŠ ç›®éŒ„"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Directory for loading/attaching files to composer."
 msgstr "用來郵件編輯器載入/附件的目錄。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Check for new messages on start"
 msgstr "啟動時檢查新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 msgstr "當 Evolution 啟動時是否檢查新郵件。這也包含寄出寄件匣中的郵件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Check for new messages in all active accounts"
 msgstr "檢查所有使用中帳號的新郵件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -8587,16 +8544,72 @@ msgstr ""
 "當 Evolution 啟動時是否檢查所有使用中帳號的新郵件而不管「檢查新郵件於每 X 分"
 "é˜ã€é¸é …ã€‚é€™å€‹é¸é …åªèƒ½å’Œã€Œsend_recv_on_startã€é¸é …ä¸€èµ·ä½¿ç”¨ã€‚"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Server synchronization interval"
 msgstr "伺服器同步間隔"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr "æŽ§åˆ¶æœ¬åœ°ç«¯è®Šæ›´èˆ‡é ç«¯éƒµä»¶ä¼ºæœå™¨åŒæ­¥çš„é »çŽ‡ã€‚é–“éš”å¿…é ˆè‡³å°‘æœ‰ 30 秒。"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+msgid "(Deprecated) Default forward style"
+msgstr "(已廢棄) é è¨­è½‰å¯„æ¨£å¼"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"forward-style-name\" instead."
+msgstr ""
+"這個設定鍵在 3.10 版中已廢棄不再使用。請使用「forward-style-name」代替。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+msgid "(Deprecated) Default reply style"
+msgstr "(已廢棄) é è¨­çš„å›žè¦†æ¨£å¼"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"reply-style-name\" instead."
+msgstr "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「reply-style-name」代替。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+msgid "(Deprecated) List of custom headers and whether they are enabled."
+msgstr "(已廢棄) è‡ªè¨‚æª”é ­ä»¥åŠå®ƒå€‘æ˜¯å¦å•Ÿç”¨çš„æ¸…å–®"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"show-headers\" instead."
+msgstr "這個設定鍵在 3.10 版中已廢棄不再使用。請使用「show-headers」代替。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+msgid "(Deprecated) Load images for HTML messages over HTTP"
+msgstr "(已廢棄) 透過 HTTP 載入 HTML 郵件的影像"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"image-loading-policy\" instead."
+msgstr ""
+"這個設定鍵在 3.10 版中已廢棄不再使用。請使用「image-loading-policy」代替。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+msgid ""
+"(Deprecated) Asks whether to close the message window when the user forwards "
+"or replies to the message shown in the window"
+msgstr "(已廢棄) 當使用者轉寄或回覆視窗中顯示的郵件時詢問是否要關閉郵件視窗"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"browser-close-on-reply-policy\" instead."
+msgstr ""
+"這個設定鍵在 3.10 版中已廢棄不再使用。請使用「browser-close-on-reply-policy」"
+"代替。"
+
 #. Translators: This is the a list of words for the attach reminder plugin to look
 #. for in a message body. Please use any number of words here in your language that might
 #. indicate that an attachment should have been attached to the message.
@@ -8871,7 +8884,7 @@ msgstr "檔案選擇對話盒的初始資料夾"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser 對話盒的初始資料夾。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:309
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
@@ -8962,19 +8975,7 @@ msgstr "只使用本地垃圾郵件測試。"
 msgid "Use only the local spam tests (no DNS)."
 msgstr "只使用本地垃圾郵件測試 (沒有 DNS)。"
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-msgid "Socket path for SpamAssassin"
-msgstr "SpamAssassin Socket 路徑"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-msgid "Use SpamAssassin daemon and client"
-msgstr "使用 SpamAsssassin 伺服程式和客戶端"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Use spamc and spamd programs, if available."
-msgstr "如果可以，使用 spamc 與 spamd 程式。"
-
-#: ../em-format/e-mail-formatter-attachment.c:370
+#: ../em-format/e-mail-formatter-attachment.c:397
 #: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
 #: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
 #: ../mail/message-list.etspec.h:4
@@ -8982,143 +8983,99 @@ msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 
-#: ../em-format/e-mail-formatter-attachment.c:371
+#: ../em-format/e-mail-formatter-attachment.c:398
 msgid "Display as attachment"
 msgstr "顯示為附件"
 
-#: ../em-format/e-mail-formatter.c:1389 ../mail/e-mail-tag-editor.c:326
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:61
+#: ../em-format/e-mail-formatter-headers.c:107
+#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
 msgid "From"
 msgstr "寄件者"
 
-#: ../em-format/e-mail-formatter.c:1390 ../modules/mail/em-mailer-prefs.c:62
-msgid "Reply-To"
-msgstr "回覆"
-
-#: ../em-format/e-mail-formatter.c:1392
-#: ../em-format/e-mail-formatter-utils.c:196
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../modules/mail/em-mailer-prefs.c:64
-msgid "Cc"
-msgstr "副本"
-
-#: ../em-format/e-mail-formatter.c:1393
-#: ../em-format/e-mail-formatter-utils.c:198
-#: ../em-format/e-mail-formatter-utils.c:222
-#: ../modules/mail/em-mailer-prefs.c:65
-msgid "Bcc"
-msgstr "密件副本"
-
-#: ../em-format/e-mail-formatter.c:1394
-#: ../em-format/e-mail-formatter-quote-headers.c:150
-#: ../mail/e-mail-tag-editor.c:331 ../mail/em-filter-i18n.h:77
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:66
-#: ../smime/lib/e-asn1-object.c:712
-msgid "Subject"
-msgstr "主旨"
-
-#: ../em-format/e-mail-formatter.c:1395 ../e-util/e-dateedit.c:549
-#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:67
-msgid "Date"
-msgstr "日期"
-
-#: ../em-format/e-mail-formatter.c:1396 ../modules/mail/em-mailer-prefs.c:68
-msgid "Newsgroups"
-msgstr "新聞群組"
-
-#: ../em-format/e-mail-formatter.c:1397 ../modules/mail/em-mailer-prefs.c:69
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid "Face"
-msgstr "面貌"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../em-format/e-mail-formatter-headers.c:100
-#: ../plugins/mail-notification/mail-notification.c:395
-#, c-format
-msgid "From: %s"
-msgstr "寄件者：%s"
-
-#: ../em-format/e-mail-formatter-headers.c:121
-#: ../em-format/e-mail-formatter-headers.c:126
+#: ../em-format/e-mail-formatter-headers.c:133
 msgid "(no subject)"
 msgstr "(沒有主旨)"
 
-#: ../em-format/e-mail-formatter-headers.c:328
+#: ../em-format/e-mail-formatter-headers.c:333
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "這封郵件是由 %s 代表 %s 寄出"
 
-#: ../em-format/e-mail-formatter-image.c:143
+#: ../em-format/e-mail-formatter-image.c:152
 msgid "Regular Image"
 msgstr "一般影像"
 
-#: ../em-format/e-mail-formatter-image.c:144
+#: ../em-format/e-mail-formatter-image.c:153
 msgid "Display part as an image"
 msgstr "將部分顯示為影像"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:242
+#: ../em-format/e-mail-formatter-message-rfc822.c:252
 msgid "RFC822 message"
 msgstr "RFC822 郵件"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:243
+#: ../em-format/e-mail-formatter-message-rfc822.c:253
 msgid "Format part as an RFC822 message"
 msgstr "å°‡éƒ¨åˆ†æ ¼å¼åŒ– RFC822 郵件"
 
-#: ../em-format/e-mail-formatter-print.c:56
-#: ../e-util/gal-define-views-dialog.c:361
+#: ../em-format/e-mail-formatter-print.c:54
 #: ../e-util/gal-view-instance-save-as-dialog.c:95
 #: ../mail/e-mail-label-tree-view.c:99
 #: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
-#: ../modules/cal-config-google/e-google-chooser.c:209
+#: ../modules/cal-config-google/e-google-chooser.c:237
 #: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Name"
 msgstr "名稱"
 
-#: ../em-format/e-mail-formatter-print.c:56
+#: ../em-format/e-mail-formatter-print.c:54
 #: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "大小"
 
-#. Add encryption/signature header
-#: ../em-format/e-mail-formatter-print-headers.c:120
-#: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
-msgid "Security"
-msgstr "安全性"
-
-#: ../em-format/e-mail-formatter-print-headers.c:138
+#: ../em-format/e-mail-formatter-print-headers.c:144
 msgid "GPG signed"
 msgstr "GPG 簽署"
 
-#: ../em-format/e-mail-formatter-print-headers.c:144
+#: ../em-format/e-mail-formatter-print-headers.c:150
 msgid "GPG encrpyted"
 msgstr "GPG åŠ å¯†"
 
-#: ../em-format/e-mail-formatter-print-headers.c:150
+#: ../em-format/e-mail-formatter-print-headers.c:156
 msgid "S/MIME signed"
 msgstr "S/MIME 簽署"
 
-#: ../em-format/e-mail-formatter-print-headers.c:156
+#: ../em-format/e-mail-formatter-print-headers.c:162
 msgid "S/MIME encrpyted"
 msgstr "S/MIME åŠ å¯†"
 
+#: ../em-format/e-mail-formatter-print-headers.c:171
+#: ../mail/e-mail-config-security-page.c:642
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+msgid "Security"
+msgstr "安全性"
+
+#: ../em-format/e-mail-formatter-quote-headers.c:168
+#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
+msgid "Subject"
+msgstr "主旨"
+
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:161
-#: ../em-format/e-mail-formatter-utils.c:346
-#: ../modules/mail/em-mailer-prefs.c:1117
+#: ../em-format/e-mail-formatter-quote-headers.c:187
+#: ../em-format/e-mail-formatter-utils.c:359
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "Mailer"
 msgstr "寄件者"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:88
-#: ../em-format/e-mail-formatter-text-enriched.c:102
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
+#: ../em-format/e-mail-formatter-text-enriched.c:104
 msgid "Richtext"
 msgstr "豐富文字"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:89
-#: ../em-format/e-mail-formatter-text-enriched.c:103
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../em-format/e-mail-formatter-text-enriched.c:105
 msgid "Display part as enriched text"
 msgstr "將部分顯示為豐富文字"
 
@@ -9132,13 +9089,13 @@ msgstr "HTML"
 msgid "Format part as HTML"
 msgstr "å°‡éƒ¨åˆ†æ ¼å¼åŒ–ç‚º HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:111
-#: ../em-format/e-mail-formatter-text-plain.c:186
+#: ../em-format/e-mail-formatter-quote-text-plain.c:115
+#: ../em-format/e-mail-formatter-text-plain.c:194
 msgid "Plain Text"
 msgstr "純文字"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:112
-#: ../em-format/e-mail-formatter-text-plain.c:187
+#: ../em-format/e-mail-formatter-quote-text-plain.c:116
+#: ../em-format/e-mail-formatter-text-plain.c:195
 msgid "Format part as plain text"
 msgstr "å°‡éƒ¨åˆ†æ ¼å¼åŒ–ç‚ºç´”æ–‡å­—"
 
@@ -9238,23 +9195,35 @@ msgstr ""
 "æ­¤éƒµä»¶å·²åŠ å¯†ï¼Œä½¿ç”¨åš´å¯†çš„åŠ å¯†æ¼”ç®—æ³•ã€‚ç¸±ä½¿ç¶“éŽä¸€æ®µæ™‚é–“ï¼Œå¤–é¢çš„äººå¾ˆé›£æª¢é–±æ­¤éƒµä»¶"
 "的內容。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:180
+#: ../em-format/e-mail-formatter-secure-button.c:182
 #: ../smime/gui/smime-ui.ui.h:20
 msgid "_View Certificate"
 msgstr "檢視憑證(_V)"
 
-#: ../em-format/e-mail-formatter-secure-button.c:195
+#: ../em-format/e-mail-formatter-secure-button.c:197
 msgid "This certificate is not viewable"
 msgstr "此憑證無法檢視"
 
-#: ../em-format/e-mail-formatter-source.c:126
+#: ../em-format/e-mail-formatter-source.c:130
 msgid "Source"
 msgstr "來源"
 
-#: ../em-format/e-mail-formatter-source.c:127
+#: ../em-format/e-mail-formatter-source.c:131
 msgid "Display source of a MIME part"
 msgstr "顯示 MIME 部分的來源"
 
+#: ../em-format/e-mail-formatter-utils.c:207
+#: ../em-format/e-mail-formatter-utils.c:231
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+msgid "Cc"
+msgstr "副本"
+
+#: ../em-format/e-mail-formatter-utils.c:209
+#: ../em-format/e-mail-formatter-utils.c:233
+#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
+msgid "Bcc"
+msgstr "密件副本"
+
 #: ../em-format/e-mail-parser-application-mbox.c:88
 #, c-format
 msgid "Error parsing MBOX part: %s"
@@ -9280,27 +9249,27 @@ msgstr "檢驗簽名時發生錯誤：%s"
 msgid "Malformed external-body part"
 msgstr "æ ¼å¼ä¸è‰¯çš„å¤–åŠ æœ¬æ–‡éƒ¨åˆ†"
 
-#: ../em-format/e-mail-parser-message-external.c:101
+#: ../em-format/e-mail-parser-message-external.c:102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:112
+#: ../em-format/e-mail-parser-message-external.c:113
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 「%s」有效的指示"
 
-#: ../em-format/e-mail-parser-message-external.c:114
+#: ../em-format/e-mail-parser-message-external.c:115
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:133
+#: ../em-format/e-mail-parser-message-external.c:134
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é ç«¯è³‡æ–™æŒ‡ç¤º (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:150
+#: ../em-format/e-mail-parser-message-external.c:152
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (「%s」類型)"
@@ -9323,6 +9292,25 @@ msgstr "無法解析 PGP/MIME 郵件：%s"
 msgid "Unsupported signature format"
 msgstr "ä¸æ”¯æ´çš„ç°½åæ ¼å¼"
 
+#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
+msgid "Reply-To"
+msgstr "回覆"
+
+#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
+#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:70
+msgid "Date"
+msgstr "日期"
+
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+msgid "Newsgroups"
+msgstr "新聞群組"
+
+#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "面貌"
+
 #: ../em-format/e-mail-part-utils.c:500
 #, c-format
 msgid "%s attachment"
@@ -9407,6 +9395,10 @@ msgstr "直到(_U)"
 msgid "Delivery Options"
 msgstr "éžé€é¸é …"
 
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "å„ªå…ˆé †åº(_P):"
+
 #: ../e-util/e-send-options.ui.h:27
 msgid "_Classification:"
 msgstr "歸類(_C):"
@@ -9463,89 +9455,65 @@ msgstr "返回通知"
 msgid "Sta_tus Tracking"
 msgstr "狀態追蹤(_T)"
 
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-table-config.c:670
-msgid "Show Fields"
-msgstr "顯示欄位"
+#: ../e-util/e-table-config.ui.h:1
+msgid "_Sort..."
+msgstr "排序(_S)…"
 
 #: ../e-util/e-table-config.ui.h:2
-msgid "A_vailable Fields:"
-msgstr "可用的欄位(_V):"
+msgid "_Group By..."
+msgstr "群組依(_G)…"
 
 #: ../e-util/e-table-config.ui.h:3
-msgid "_Show these fields in order:"
-msgstr "依序顯示這些欄位(_S):"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "Move _Up"
-msgstr "上移(_U)"
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "Move _Down"
-msgstr "下移(_D)"
+msgid "_Fields Shown..."
+msgstr "欄位顯示(_F)…"
 
-#: ../e-util/e-table-config.ui.h:7 ../e-util/e-name-selector-dialog.c:969
-msgid "_Remove"
-msgstr "移除(_R)"
+#: ../e-util/e-table-config.ui.h:6
+msgid "Clear _All"
+msgstr "全部清除(_A)"
 
-#: ../e-util/e-table-config.ui.h:9
+#: ../e-util/e-table-config.ui.h:7
 msgid "_Show field in View"
 msgstr "顯示檢視中的欄位(_S)"
 
-#: ../e-util/e-table-config.ui.h:10 ../e-util/e-table-header-item.c:1751
+#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1750
 msgid "Ascending"
 msgstr "遞增"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1751
+#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1750
 msgid "Descending"
 msgstr "遞減"
 
-#: ../e-util/e-table-config.ui.h:12
+#: ../e-util/e-table-config.ui.h:10
 msgid "Group Items By"
 msgstr "å°‡é …ç›®çµ„æˆç¾¤çµ„ï¼Œä¾"
 
-#: ../e-util/e-table-config.ui.h:13
+#: ../e-util/e-table-config.ui.h:11
 msgid "Show _field in View"
 msgstr "顯示檢視中的欄位(_F)"
 
-#: ../e-util/e-table-config.ui.h:14
+#: ../e-util/e-table-config.ui.h:12
 msgid "Then By"
 msgstr "接著依"
 
-#: ../e-util/e-table-config.ui.h:15
+#: ../e-util/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "顯示檢視中的欄位(_N)"
 
-#: ../e-util/e-table-config.ui.h:16
+#: ../e-util/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "顯示檢視中的欄位(_V)"
 
-#: ../e-util/e-table-config.ui.h:17
-msgid "Clear _All"
-msgstr "全部清除(_A)"
-
-#: ../e-util/e-table-config.ui.h:18
+#: ../e-util/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "排序"
 
-#: ../e-util/e-table-config.ui.h:19
-msgid "Sort Items By"
-msgstr "æŽ’åºé …ç›®ä¾"
-
-#: ../e-util/e-table-config.ui.h:20
+#: ../e-util/e-table-config.ui.h:16
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../e-util/e-table-config.ui.h:21
-msgid "_Sort..."
-msgstr "排序(_S)…"
-
-#: ../e-util/e-table-config.ui.h:22
-msgid "_Group By..."
-msgstr "群組依(_G)…"
-
-#: ../e-util/e-table-config.ui.h:23
-msgid "_Fields Shown..."
-msgstr "欄位顯示(_F)…"
+#: ../e-util/e-table-config.ui.h:17
+msgid "Sort Items By"
+msgstr "æŽ’åºé …ç›®ä¾"
 
 #: ../e-util/e-timezone-dialog.ui.h:1
 msgid "Select a Time Zone"
@@ -9573,7 +9541,7 @@ msgid "Timezone drop-down combination box"
 msgstr "時區下拉式組合方塊"
 
 #: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
-#: ../mail/em-utils.c:293
+#: ../mail/em-utils.c:240
 msgid "Incoming"
 msgstr "內送"
 
@@ -9650,16 +9618,6 @@ msgstr ""
 "郵件日期將會與相對於過濾器執行\n"
 "的時間作比較。"
 
-#: ../e-util/gal-define-views.ui.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr "定義「%s」的檢視"
-
-#: ../e-util/gal-define-views.ui.h:4 ../e-util/gal-define-views-dialog.c:375
-#, no-c-format
-msgid "Define Views for %s"
-msgstr "定義 %s 的檢視"
-
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "建立新的檢視(_C)"
@@ -9675,54 +9633,42 @@ msgstr "名稱(_N):"
 msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
-#: ../e-util/gal-view-new-dialog.ui.h:1
-msgid "Name of new view:"
-msgstr "新檢視的名稱:"
-
-#: ../e-util/gal-view-new-dialog.ui.h:2
-msgid "Type of view:"
-msgstr "檢視的類型:"
-
-#: ../e-util/gal-view-new-dialog.ui.h:3
-msgid "Type of View"
-msgstr "檢視的類型"
-
-#: ../e-util/e-activity-proxy.c:313
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../e-util/e-activity-proxy.c:311
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Cancel"
 msgstr "取消"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:247
+#: ../e-util/e-activity.c:259
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s （已取消）"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:250
+#: ../e-util/e-activity.c:262
 #, c-format
 msgid "%s (completed)"
 msgstr "%s （已完成） "
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:253
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (正在等待)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:257
+#: ../e-util/e-activity.c:269
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (正在取消)"
 
-#: ../e-util/e-activity.c:259
+#: ../e-util/e-activity.c:271
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:264
+#: ../e-util/e-activity.c:276
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
@@ -9739,19 +9685,19 @@ msgstr "圖示檢視"
 msgid "List View"
 msgstr "清單檢視"
 
-#: ../e-util/e-attachment-dialog.c:311
+#: ../e-util/e-attachment-dialog.c:318
 msgid "Attachment Properties"
 msgstr "附件內容"
 
-#: ../e-util/e-attachment-dialog.c:333 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
 msgid "F_ilename:"
 msgstr "檔案名稱(_I):"
 
-#: ../e-util/e-attachment-dialog.c:368
+#: ../e-util/e-attachment-dialog.c:375
 msgid "MIME Type:"
 msgstr "MIME 類型："
 
-#: ../e-util/e-attachment-dialog.c:376 ../e-util/e-attachment-store.c:441
+#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
 
@@ -9763,19 +9709,6 @@ msgstr "無法設為背景"
 msgid "Set as _Background"
 msgstr "設為背景(_B)"
 
-#: ../e-util/e-attachment-handler-sendto.c:93
-msgid "Could not send attachment"
-msgid_plural "Could not send attachments"
-msgstr[0] "無法送出附件。"
-
-#: ../e-util/e-attachment-handler-sendto.c:135
-msgid "_Send To..."
-msgstr "傳送至(_S)…"
-
-#: ../e-util/e-attachment-handler-sendto.c:137
-msgid "Send the selected attachments somewhere"
-msgstr "傳送選取的附件到別處"
-
 #: ../e-util/e-attachment-icon-view.c:166
 #: ../e-util/e-attachment-tree-view.c:549
 msgid "Loading"
@@ -9794,22 +9727,22 @@ msgstr "隱藏附件列(_B)"
 msgid "Show Attachment _Bar"
 msgstr "顯示附件列(_B)"
 
-#: ../e-util/e-attachment-store.c:429
+#: ../e-util/e-attachment-store.c:463
 msgid "Add Attachment"
 msgstr "åŠ å…¥é™„ä»¶"
 
-#: ../e-util/e-attachment-store.c:432
+#: ../e-util/e-attachment-store.c:466
 msgid "A_ttach"
 msgstr "é™„åŠ (_T)"
 
-#: ../e-util/e-attachment-store.c:495
+#: ../e-util/e-attachment-store.c:537
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "儲存附件"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:524 ../e-util/e-attachment.c:1841
-#: ../e-util/e-attachment.c:2477
+#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2055
+#: ../e-util/e-attachment.c:2711
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -9855,48 +9788,48 @@ msgstr "在 %s 中開啟這個附件"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:978
+#: ../e-util/e-attachment.c:1110
 msgid "Attached message"
 msgstr "é™„åŠ çš„éƒµä»¶"
 
-#: ../e-util/e-attachment.c:1917 ../e-util/e-attachment.c:2779
+#: ../e-util/e-attachment.c:2135 ../e-util/e-attachment.c:3017
 msgid "A load operation is already in progress"
 msgstr "載入操作已在進行中"
 
-#: ../e-util/e-attachment.c:1925 ../e-util/e-attachment.c:2787
+#: ../e-util/e-attachment.c:2143 ../e-util/e-attachment.c:3025
 msgid "A save operation is already in progress"
 msgstr "儲存操作已在進行中"
 
-#: ../e-util/e-attachment.c:2033
+#: ../e-util/e-attachment.c:2260
 #, c-format
 msgid "Could not load '%s'"
 msgstr "無法載入「%s」"
 
-#: ../e-util/e-attachment.c:2036
+#: ../e-util/e-attachment.c:2263
 #, c-format
 msgid "Could not load the attachment"
 msgstr "無法載入附件"
 
-#: ../e-util/e-attachment.c:2334
+#: ../e-util/e-attachment.c:2566
 #, c-format
 msgid "Could not open '%s'"
 msgstr "無法開啟「%s」"
 
-#: ../e-util/e-attachment.c:2337
+#: ../e-util/e-attachment.c:2569
 #, c-format
 msgid "Could not open the attachment"
 msgstr "無法開啟附件"
 
-#: ../e-util/e-attachment.c:2795
+#: ../e-util/e-attachment.c:3034
 msgid "Attachment contents not loaded"
 msgstr "無法載入附件內容"
 
-#: ../e-util/e-attachment.c:2871
+#: ../e-util/e-attachment.c:3110
 #, c-format
 msgid "Could not save '%s'"
 msgstr "無法儲存「%s」"
 
-#: ../e-util/e-attachment.c:2874
+#: ../e-util/e-attachment.c:3113
 #, c-format
 msgid "Could not save the attachment"
 msgstr "無法儲存附件"
@@ -9947,19 +9880,19 @@ msgid "Copy memo list contents locally for offline operation"
 msgstr "複製備忘錄清單內容至本地以便離線作業"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1324 ../e-util/e-calendar-item.c:2186
+#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1326
+#: ../e-util/e-calendar-item.c:1329
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1363
+#: ../e-util/e-calendar-item.c:1366
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y年%m月"
@@ -10038,8 +9971,8 @@ msgstr "現在"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
-#: ../modules/calendar/e-cal-shell-view-actions.c:1924
-#: ../modules/itip-formatter/itip-view.c:228
+#: ../modules/calendar/e-cal-shell-view-actions.c:1901
+#: ../modules/itip-formatter/itip-view.c:230
 msgid "Today"
 msgstr "今天"
 
@@ -10059,7 +9992,7 @@ msgstr "確定"
 msgid "The time must be in the format: %s"
 msgstr "æ™‚é–“å¿…é ˆç‚ºæ­¤æ ¼å¼ï¼š%s"
 
-#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1882
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1851
 msgid "?"
 msgstr "?"
 
@@ -10156,63 +10089,63 @@ msgstr "烏克蘭語"
 msgid "Visual"
 msgstr "視覺"
 
-#: ../e-util/e-client-cache.c:1061
+#: ../e-util/e-client-cache.c:1162
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "不能從延伸名稱「%s」建立客戶端物件"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "日期與時刻"
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:549
 msgid "Text entry to input date"
 msgstr "ç”¨ä¾†è¼¸å…¥æ—¥æœŸçš„æ–‡å­—é …ç›®"
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:572
 msgid "Click this button to show a calendar"
 msgstr "按此按鈕以顯示行事曆"
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:626
 msgid "Drop-down combination box to select time"
 msgstr "用以選擇時刻的下拉式組合方塊"
 
-#: ../e-util/e-dateedit.c:626
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../e-util/e-dateedit.c:627
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "時間"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:701
 msgid "No_w"
 msgstr "現在(_W)"
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:708
 msgid "_Today"
 msgstr "今天(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:716
+#: ../e-util/e-dateedit.c:717
 msgid "_None"
 msgstr "沒有(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1811 ../e-util/e-dateedit.c:2059
+#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
 msgctxt "date"
 msgid "None"
 msgstr "沒有"
 
-#: ../e-util/e-dateedit.c:1951
+#: ../e-util/e-dateedit.c:1953
 msgid "Invalid Date Value"
 msgstr "無效的日期數值"
 
-#: ../e-util/e-dateedit.c:1996
+#: ../e-util/e-dateedit.c:1998
 msgid "Invalid Time Value"
 msgstr "無效的時刻數值"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:256
+#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
 msgid "Tomorrow"
 msgstr "明天"
 
@@ -10285,19 +10218,19 @@ msgstr "ä½¿ç”¨åœ°å€è¨­å®šé è¨­å€¼"
 msgid "Format:"
 msgstr "æ ¼å¼ï¼š"
 
-#: ../e-util/e-file-utils.c:150
+#: ../e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "（不明的檔案名稱）"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:154
+#: ../e-util/e-file-utils.c:125
 #, c-format
 msgid "Writing \"%s\""
 msgstr "正在寫入「%s」"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:159
+#: ../e-util/e-file-utils.c:130
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "正在寫入「%s」至 %s"
@@ -10461,7 +10394,7 @@ msgstr "包括郵件群組(_N):"
 msgid "A_dd Condition"
 msgstr "åŠ å…¥æ¢ä»¶(_D)"
 
-#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:294
+#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:241
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -10633,82 +10566,86 @@ msgstr ""
 "ç”¨ä¾†é¸æ“‡æ™‚å€çš„æ»‘é¼ äº’å‹•å¼åœ°åœ–å…ƒä»¶ã€‚ä½¿ç”¨éµç›¤çš„ä½¿ç”¨è€…æ‡‰è©²ä½¿ç”¨ä¸‹æ–¹çš„ä¸‹æ‹‰å¼çµ„åˆæ–¹"
 "塊來選擇時區。"
 
-#: ../e-util/e-misc-utils.c:244
+#: ../e-util/e-misc-utils.c:242
 msgid "Could not open the link."
 msgstr "無法開啟該連結。"
 
-#: ../e-util/e-misc-utils.c:291
+#: ../e-util/e-misc-utils.c:289
 msgid "Could not display help for Evolution."
 msgstr "無法顯示 Evolution 的求助文件。"
 
-#: ../e-util/e-name-selector-dialog.c:279
+#: ../e-util/e-name-selector-dialog.c:278
 msgid "Show Contacts"
 msgstr "顯示連絡人"
 
-#: ../e-util/e-name-selector-dialog.c:311
+#: ../e-util/e-name-selector-dialog.c:310
 msgid "Address B_ook:"
 msgstr "通訊錄(_O):"
 
-#: ../e-util/e-name-selector-dialog.c:318
+#: ../e-util/e-name-selector-dialog.c:317
 msgid "Cat_egory:"
 msgstr "分類(_E):"
 
-#: ../e-util/e-name-selector-dialog.c:342
+#: ../e-util/e-name-selector-dialog.c:341
 msgid "_Search:"
 msgstr "搜尋(_S):"
 
-#: ../e-util/e-name-selector-dialog.c:368
-#: ../e-util/e-name-selector-dialog.c:1243
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
-#: ../modules/calendar/e-cal-shell-view-actions.c:1757
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../e-util/e-name-selector-dialog.c:367
+#: ../e-util/e-name-selector-dialog.c:1256
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:938
 msgid "Any Category"
 msgstr "任何分類"
 
-#: ../e-util/e-name-selector-dialog.c:370
+#: ../e-util/e-name-selector-dialog.c:369
 msgid "Co_ntacts"
 msgstr "連絡人(_N)"
 
-#: ../e-util/e-name-selector-dialog.c:447
+#: ../e-util/e-name-selector-dialog.c:446
 msgid "Search"
 msgstr "搜尋"
 
-#: ../e-util/e-name-selector-dialog.c:450
+#: ../e-util/e-name-selector-dialog.c:449
 #: ../mail/importers/pine-importer.c:426
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: ../e-util/e-name-selector-dialog.c:453
-#: ../modules/addressbook/e-book-shell-backend.c:305
-#: ../modules/addressbook/e-book-shell-view.c:356
+#: ../e-util/e-name-selector-dialog.c:452
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view.c:372
 msgid "Contacts"
 msgstr "連絡人"
 
-#: ../e-util/e-name-selector-dialog.c:575
+#: ../e-util/e-name-selector-dialog.c:580
 msgid "Select Contacts from Address Book"
 msgstr "從通訊錄選取連絡人"
 
+#: ../e-util/e-name-selector-dialog.c:981
+msgid "_Remove"
+msgstr "移除(_R)"
+
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3023
+#: ../e-util/e-name-selector-entry.c:3028
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "在行內展開 %s (_X)"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3039
+#: ../e-util/e-name-selector-entry.c:3044
 #, c-format
 msgid "Cop_y %s"
 msgstr "複製(_Y) %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3050
+#: ../e-util/e-name-selector-entry.c:3055
 #, c-format
 msgid "C_ut %s"
 msgstr "剪下(_U) %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3068
+#: ../e-util/e-name-selector-entry.c:3073
 #, c-format
 msgid "_Edit %s"
 msgstr "編輯 %s(_E)"
@@ -10771,62 +10708,62 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "åˆ—å°ç³»çµ±æ²’æœ‰å›žå ±ä»»ä½•é—œæ–¼æ­¤éŒ¯èª¤çš„é¡å¤–è³‡è¨Šã€‚"
 
-#: ../e-util/e-rule-editor.c:288
+#: ../e-util/e-rule-editor.c:185
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: ../e-util/e-rule-editor.c:395
+#: ../e-util/e-rule-editor.c:287
 msgid "Edit Rule"
 msgstr "編輯規則"
 
-#: ../e-util/e-search-bar.c:79
+#: ../e-util/e-search-bar.c:81
 #, c-format
 msgid "Matches: %u"
 msgstr "ç¬¦åˆé …ï¼š%u"
 
-#: ../e-util/e-search-bar.c:527
+#: ../e-util/e-search-bar.c:565
 msgid "Close the find bar"
 msgstr "關閉搜尋工具列"
 
-#: ../e-util/e-search-bar.c:535
+#: ../e-util/e-search-bar.c:573
 msgid "Fin_d:"
 msgstr "尋找(_D):"
 
-#: ../e-util/e-search-bar.c:547
+#: ../e-util/e-search-bar.c:585
 msgid "Clear the search"
 msgstr "清除此搜尋"
 
-#: ../e-util/e-search-bar.c:571
+#: ../e-util/e-search-bar.c:609
 msgid "_Previous"
 msgstr "上一個(_P)"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:615
 msgid "Find the previous occurrence of the phrase"
 msgstr "尋找上一個出現的字詞"
 
-#: ../e-util/e-search-bar.c:590
+#: ../e-util/e-search-bar.c:624
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: ../e-util/e-search-bar.c:596
+#: ../e-util/e-search-bar.c:630
 msgid "Find the next occurrence of the phrase"
 msgstr "尋找下一個出現的字詞"
 
-#: ../e-util/e-search-bar.c:609
+#: ../e-util/e-search-bar.c:639
 msgid "Mat_ch case"
 msgstr "區分大小寫(_C)"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:667
 msgid "Reached bottom of page, continued from top"
 msgstr "åˆ°é”é é¢åº•éƒ¨ï¼Œå¾žé ‚ç«¯ç¹¼çºŒ"
 
-#: ../e-util/e-search-bar.c:659
+#: ../e-util/e-search-bar.c:689
 msgid "Reached top of page, continued from bottom"
 msgstr "åˆ°é”é é¢é ‚ç«¯ï¼Œå¾žåº•éƒ¨ç¹¼çºŒ"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
 #: ../mail/importers/pine-importer.c:419
-#: ../modules/mail/e-mail-shell-view.c:1045
+#: ../modules/mail/e-mail-shell-view.c:1075
 msgid "Mail"
 msgstr "郵件"
 
@@ -10844,19 +10781,19 @@ msgstr "名稱："
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1293
+#: ../e-util/e-source-config.c:1300
 msgid "Refresh every"
 msgstr "重新整理於每"
 
-#: ../e-util/e-source-config.c:1323 ../e-util/e-source-config.c:1392
+#: ../e-util/e-source-config.c:1330 ../e-util/e-source-config.c:1401
 msgid "Use a secure connection"
 msgstr "使用安全連線"
 
-#: ../e-util/e-source-config.c:1416
+#: ../e-util/e-source-config.c:1425
 msgid "Unset _trust for SSL certificate"
 msgstr "取消設定 SSL 憑證的信任(_T)"
 
-#: ../e-util/e-source-config.c:1450
+#: ../e-util/e-source-config.c:1459
 msgid "User"
 msgstr "使用者"
 
@@ -10869,26 +10806,26 @@ msgid "Select destination"
 msgstr "選擇目的地"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:352
+#: ../e-util/e-spell-entry.c:384
 msgid "(no suggestions)"
 msgstr "(沒有建議)"
 
-#: ../e-util/e-spell-entry.c:376
+#: ../e-util/e-spell-entry.c:408
 msgid "More..."
 msgstr "更多…"
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:445
+#: ../e-util/e-spell-entry.c:479
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "åŠ å…¥ã€Œ%s」至字典"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:488
+#: ../e-util/e-spell-entry.c:530
 msgid "Ignore All"
 msgstr "全部忽略"
 
-#: ../e-util/e-spell-entry.c:514
+#: ../e-util/e-spell-entry.c:558
 msgid "Spelling Suggestions"
 msgstr "拼字建議"
 
@@ -10985,37 +10922,61 @@ msgstr "備忘錄清單後端服務 &quot;{0}&quot; 遇到錯誤。"
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "工作清單後端服務 &quot;{0}&quot; 遇到錯誤。"
 
-#: ../e-util/e-table-click-to-add.c:643
+#: ../e-util/e-table-click-to-add.c:680
 #: ../e-util/gal-a11y-e-table-click-to-add.c:62
 #: ../e-util/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
 msgstr "è«‹æŒ‰é€™è£¡åŠ å…¥"
 
-#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+#: ../e-util/e-table-column-selector.c:266
+msgid "Move selected column names to top"
+msgstr "å°‡é¸å®šçš„æ¬„åç¨±ç§»è‡³é ‚ç«¯"
+
+#: ../e-util/e-table-column-selector.c:271
+msgid "Move selected column names up one row"
+msgstr "將選定的欄名稱上移一列"
+
+#: ../e-util/e-table-column-selector.c:276
+msgid "Move selected column names down one row"
+msgstr "將選定的欄名稱下移一列"
+
+#: ../e-util/e-table-column-selector.c:281
+msgid "Move selected column names to bottom"
+msgstr "將選定的欄名稱移至底端"
+
+#: ../e-util/e-table-column-selector.c:286
+msgid "Select all column names"
+msgstr "選擇所有的欄名稱"
+
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(遞增)"
 
-#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(遞減)"
 
-#: ../e-util/e-table-config.c:404
+#: ../e-util/e-table-config.c:396
 msgid "Not sorted"
 msgstr "未排序"
 
-#: ../e-util/e-table-config.c:445
+#: ../e-util/e-table-config.c:441
 msgid "No grouping"
 msgstr "未組成群組"
 
-#: ../e-util/e-table-config.c:690
-msgid "Available Fields"
-msgstr "可用的欄位"
+#: ../e-util/e-table-config.c:546
+msgid "Show Fields"
+msgstr "顯示欄位"
+
+#: ../e-util/e-table-config.c:562
+msgid "Choose the order of information to appear in the message list."
+msgstr "請選擇在清單顯示模式時，顯示資訊的次序。"
 
 #: ../e-util/e-table-field-chooser-dialog.c:227
 msgid "Add a Column"
 msgstr "åŠ å…¥ä¸€æ¬„"
 
-#: ../e-util/e-table-field-chooser.c:164
+#: ../e-util/e-table-field-chooser.c:167
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -11023,72 +10984,72 @@ msgstr ""
 "æƒ³åœ¨æ‚¨çš„è¡¨æ ¼ä¸­åŠ å…¥æ¬„ä½ï¼Œåªè¦å°‡å®ƒ\n"
 "拖曳至您希望它出現的位置即可。"
 
-#: ../e-util/e-table-group-container.c:363
+#: ../e-util/e-table-group-container.c:369
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s：%s (%d å€‹é …ç›®)"
 
-#: ../e-util/e-table-group-container.c:377
+#: ../e-util/e-table-group-container.c:383
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d å€‹é …ç›®)"
 
-#: ../e-util/e-table-header-item.c:1579
+#: ../e-util/e-table-header-item.c:1573
 msgid "Customize Current View"
 msgstr "自訂目前的檢視"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1596
 msgid "Sort _Ascending"
 msgstr "遞增排序(_A)"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1599
 msgid "Sort _Descending"
 msgstr "遞減排序(_D)"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1602
 msgid "_Unsort"
 msgstr "不排序(_U)"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1605
 msgid "Group By This _Field"
 msgstr "依此欄位做群組(_F)"
 
-#: ../e-util/e-table-header-item.c:1614
+#: ../e-util/e-table-header-item.c:1608
 msgid "Group By _Box"
 msgstr "依方塊為群組(_B)"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1612
 msgid "Remove This _Column"
 msgstr "移除此欄(_C)"
 
-#: ../e-util/e-table-header-item.c:1621
+#: ../e-util/e-table-header-item.c:1615
 msgid "Add a C_olumn..."
 msgstr "åŠ å…¥ä¸€æ¬„(_O)…"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1619
 msgid "A_lignment"
 msgstr "排列(_L)"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1622
 msgid "B_est Fit"
 msgstr "最適填滿(_E)"
 
-#: ../e-util/e-table-header-item.c:1631
+#: ../e-util/e-table-header-item.c:1625
 msgid "Format Column_s..."
 msgstr "æ ¼å¼åŒ–æ¬„(_S)…"
 
-#: ../e-util/e-table-header-item.c:1635
+#: ../e-util/e-table-header-item.c:1629
 msgid "Custo_mize Current View..."
 msgstr "自訂目前的檢視(_M)…"
 
-#: ../e-util/e-table-header-item.c:1706
+#: ../e-util/e-table-header-item.c:1700
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1724
+#: ../e-util/e-table-header-item.c:1723
 msgid "_Custom"
 msgstr "自訂(_C)"
 
@@ -11107,59 +11068,87 @@ msgstr "輸入法"
 msgid "UTC"
 msgstr "UTC"
 
-#: ../e-util/e-url-entry.c:80
-msgid "Click here to go to URL"
-msgstr "按這裡以移至 URL"
+#: ../e-util/e-url-entry.c:109
+msgid "Click here to open the URL"
+msgstr "按這裡以開啟 URL"
 
-#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:273
+#: ../e-util/e-url-entry.c:111
+msgid "Enter a URL here"
+msgstr "請在這裡輸入 URL"
+
+#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:275
+#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:287
 msgid "Copy the link to the clipboard"
 msgstr "複製連結到剪貼薄"
 
-#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:283
+#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:295
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結(_O)"
 
-#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:297
 msgid "Open the link in a web browser"
 msgstr "åœ¨ç¶²é ç€è¦½å™¨ä¸­é–‹å•Ÿæ­¤é€£çµ"
 
-#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:293
+#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:305
 msgid "_Copy Email Address"
 msgstr "複製電子郵件位址(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:310
+#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:322
 msgid "_Copy Image"
 msgstr "複製圖片(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:312
+#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:324
 msgid "Copy the image to the clipboard"
 msgstr "複製圖片到剪貼薄"
 
 #: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
-#: ../e-util/e-web-view.c:332 ../e-util/e-web-view.c:1419
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1261
 msgid "Select all text and images"
 msgstr "選擇所有文字和圖片"
 
 #: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
-#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:1086
-#: ../e-util/e-web-view.c:1088 ../e-util/e-web-view.c:1090
+#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:936
+#: ../e-util/e-web-view.c:938 ../e-util/e-web-view.c:940
 #, c-format
 msgid "Click to call %s"
 msgstr "按一下播號給 %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:1092
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:942
 msgid "Click to hide/unhide addresses"
 msgstr "按這裡隱藏/解除隱藏位址"
 
-#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1094
+#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:944
 #, c-format
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
 
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "儲存圖片(_I)…"
+
+#: ../e-util/e-web-view.c:331
+msgid "Save the image to a file"
+msgstr "將圖片儲存為檔案"
+
+#: ../e-util/e-web-view.c:2832
+#, fuzzy
+#| msgid "Copy the image to the clipboard"
+msgid "Copying image to clipboard"
+msgstr "複製圖片到剪貼薄"
+
+#: ../e-util/e-web-view.c:3020
+msgid "Save Image"
+msgstr "儲存圖片"
+
+#: ../e-util/e-web-view.c:3056
+#, fuzzy, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Saving image to '%s'"
+msgstr "將郵件移到「%s」"
+
 #: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
 msgid "%d %B %Y"
 msgstr "%Y年%m月%d日"
@@ -11267,23 +11256,10 @@ msgstr "單擊"
 msgid "sort"
 msgstr "排序"
 
-#: ../e-util/gal-define-views-dialog.c:385
-#: ../e-util/gal-define-views-dialog.c:388
-msgid "Define Views"
-msgstr "定義檢視"
-
-#: ../e-util/gal-view-factory-etable.c:114
-msgid "Table"
-msgstr "è¡¨æ ¼"
-
 #: ../e-util/gal-view-instance-save-as-dialog.c:296
 msgid "Save Current View"
 msgstr "儲存目前檢視"
 
-#: ../e-util/gal-view-new-dialog.c:173
-msgid "Define New View"
-msgstr "定義新的檢視"
-
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的變更？"
@@ -11305,10 +11281,22 @@ msgid "Please provide an unique name to identify this signature."
 msgstr "請輸入可供辨識這個簽名檔的獨特名稱。"
 
 #: ../e-util/widgets.error.xml.h:6
+#, fuzzy
+#| msgid "Copy the image to the clipboard"
+msgid "Unable to copy image to clipboard."
+msgstr "複製圖片到剪貼薄"
+
+#: ../e-util/widgets.error.xml.h:7
+#, fuzzy
+#| msgid "Unable to save {0}."
+msgid "Unable to save image."
+msgstr "無法儲存 {0}。"
+
+#: ../e-util/widgets.error.xml.h:8
 msgid "Could not load signature."
 msgstr "ç„¡æ³•è¼‰å…¥ç°½ç« ã€‚"
 
-#: ../e-util/widgets.error.xml.h:7
+#: ../e-util/widgets.error.xml.h:9
 msgid "Could not save signature."
 msgstr "ç„¡æ³•å„²å­˜ç°½ç« ã€‚"
 
@@ -11330,69 +11318,62 @@ msgstr "無效的驗證結果代碼 (%d)"
 msgid "Saving message to folder '%s'"
 msgstr "儲存郵件到資料夾「%s」"
 
-#: ../libemail-engine/e-mail-folder-utils.c:573
+#: ../libemail-engine/e-mail-folder-utils.c:572
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:683
-#: ../libemail-engine/e-mail-folder-utils.c:934
+#: ../libemail-engine/e-mail-folder-utils.c:682
+#: ../libemail-engine/e-mail-folder-utils.c:933
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "取回 %d 封郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:777
+#: ../libemail-engine/e-mail-folder-utils.c:776
 msgid "Scanning messages for duplicates"
 msgstr "掃描郵件是否有重複"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1185
+#: ../libemail-engine/e-mail-folder-utils.c:1184
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移除資料夾「%s」"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1322
+#: ../libemail-engine/e-mail-folder-utils.c:1321
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "檔案「%s」已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1326
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 msgid "File has been removed."
 msgstr "檔案已經被移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1385
+#: ../libemail-engine/e-mail-folder-utils.c:1384
 msgid "Removing attachments"
 msgstr "正在移除附件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1549
+#: ../libemail-engine/e-mail-folder-utils.c:1548
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "儲存 %d 封郵件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1905 ../mail/em-folder-utils.c:610
+#: ../libemail-engine/e-mail-folder-utils.c:1926 ../mail/em-folder-utils.c:610
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "無效的資料夾 URI「%s」"
 
 #: ../libemail-engine/e-mail-session-utils.c:540
-#, c-format
-msgid "No mail service found with UID '%s'"
-msgstr "沒有 UID「%s」的郵件服務"
+msgid "No mail transport service available"
+msgstr "沒有可用的郵件傳輸服務"
 
-#: ../libemail-engine/e-mail-session-utils.c:549
-#, c-format
-msgid "UID '%s' is not a mail transport"
-msgstr "UID「%s」不是郵件傳輸"
-
-#: ../libemail-engine/e-mail-session-utils.c:647
-#: ../libemail-engine/mail-ops.c:765
+#: ../libemail-engine/e-mail-session-utils.c:638
+#: ../libemail-engine/mail-ops.c:706
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器：%s"
 
-#: ../libemail-engine/e-mail-session-utils.c:676
-#: ../libemail-engine/e-mail-session-utils.c:710
-#: ../libemail-engine/mail-ops.c:784 ../libemail-engine/mail-ops.c:817
+#: ../libemail-engine/e-mail-session-utils.c:685
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11401,94 +11382,94 @@ msgstr ""
 "ç„¡æ³•é™„åŠ è‡³ %s：%s\n"
 "æ”¹é™„åŠ è‡³æœ¬åœ°ã€Œå¯„ä»¶åŒ£ã€è³‡æ–™å¤¾ã€‚"
 
-#: ../libemail-engine/e-mail-session-utils.c:730
-#: ../libemail-engine/mail-ops.c:839
+#: ../libemail-engine/e-mail-session-utils.c:711
+#: ../libemail-engine/mail-ops.c:774
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ç„¡æ³•é™„åŠ è‡³æœ¬åœ°ã€Œå¯„ä»¶åŒ£ã€è³‡æ–™å¤¾ï¼š%s"
 
-#: ../libemail-engine/e-mail-session-utils.c:974
-#: ../libemail-engine/mail-ops.c:971 ../libemail-engine/mail-ops.c:1073
+#: ../libemail-engine/e-mail-session-utils.c:912
+#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
 msgid "Sending message"
 msgstr "正在傳送郵件"
 
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:336
-#: ../mail/em-folder-tree-model.c:764
-#: ../modules/mail/e-mail-shell-view-private.c:1094
-#: ../modules/mail/e-mail-shell-view-private.c:1105
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:342
+#: ../mail/em-folder-tree-model.c:786
+#: ../modules/mail/e-mail-shell-view-private.c:1068
+#: ../modules/mail/e-mail-shell-view-private.c:1079
 msgid "Inbox"
 msgstr "收件匣"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:757
-#: ../modules/mail/e-mail-shell-view-private.c:1092
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:779
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:768
-#: ../modules/mail/e-mail-shell-view-private.c:1096
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:790
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Outbox"
 msgstr "寄件匣"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:772
-#: ../modules/mail/e-mail-shell-view-private.c:1098
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:794
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Sent"
 msgstr "已傳送"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:760
-#: ../modules/mail/e-mail-shell-view-private.c:1100
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:782
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1071 ../plugins/templates/templates.c:1368
-#: ../plugins/templates/templates.c:1378
+#: ../plugins/templates/templates.c:1082 ../plugins/templates/templates.c:1381
+#: ../plugins/templates/templates.c:1391
 msgid "Templates"
 msgstr "範本"
 
-#: ../libemail-engine/e-mail-session.c:1394
+#: ../libemail-engine/e-mail-session.c:1344
 #, c-format
 msgid "User cancelled operation"
 msgstr "使用者取消的操作"
 
-#: ../libemail-engine/e-mail-session.c:1615
+#: ../libemail-engine/e-mail-session.c:1534
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 驗證失敗"
 
-#: ../libemail-engine/e-mail-session.c:1660
+#: ../libemail-engine/e-mail-session.c:1584
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "沒有 UID「%s」的資料來源"
 
-#: ../libemail-engine/e-mail-session.c:1711
+#: ../libemail-engine/e-mail-session.c:1647
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "沒有提供目的地位址，郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-session.c:1724
+#: ../libemail-engine/e-mail-session.c:1660
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "找不到可使用的識別符，郵件的轉寄已經取消。"
 
-#: ../libemail-engine/e-mail-store-utils.c:171
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "中斷與「%s」的連線"
 
-#: ../libemail-engine/e-mail-store-utils.c:263
+#: ../libemail-engine/e-mail-store-utils.c:279
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "重新連線到「%s」"
 
-#: ../libemail-engine/e-mail-store-utils.c:340
+#: ../libemail-engine/e-mail-store-utils.c:370
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "準備帳號「%s」離線工作"
 
-#: ../libemail-engine/mail-folder-cache.c:884
+#: ../libemail-engine/mail-folder-cache.c:1240
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -11514,7 +11495,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "從「%s」匯入郵件"
 
-#: ../libemail-engine/mail-ops.c:759
+#: ../libemail-engine/mail-ops.c:700
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -11526,51 +11507,51 @@ msgstr ""
 "的。請在編輯->郵件規則中檢查您的過濾器。\n"
 "原始錯誤訊息是：%s"
 
-#: ../libemail-engine/mail-ops.c:982
+#: ../libemail-engine/mail-ops.c:916
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
 
-#: ../libemail-engine/mail-ops.c:1034
+#: ../libemail-engine/mail-ops.c:968
 #, 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:1040
+#: ../libemail-engine/mail-ops.c:974
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../libemail-engine/mail-ops.c:1042
+#: ../libemail-engine/mail-ops.c:976
 msgid "Complete."
 msgstr "完成。"
 
-#: ../libemail-engine/mail-ops.c:1154
+#: ../libemail-engine/mail-ops.c:1088
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "將郵件移到「%s」"
 
-#: ../libemail-engine/mail-ops.c:1155
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "將郵件複製到「%s」"
 
-#: ../libemail-engine/mail-ops.c:1274
+#: ../libemail-engine/mail-ops.c:1208
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在貯藏資料夾「%s」"
 
-#: ../libemail-engine/mail-ops.c:1402
+#: ../libemail-engine/mail-ops.c:1336
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "清空和儲存帳號 '%s'"
 
-#: ../libemail-engine/mail-ops.c:1403
+#: ../libemail-engine/mail-ops.c:1337
 #, c-format
 msgid "Storing account '%s'"
 msgstr "儲存帳號 '%s'"
 
-#: ../libemail-engine/mail-ops.c:1477
+#: ../libemail-engine/mail-ops.c:1411
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空「%s」的回收筒"
@@ -11594,12 +11575,12 @@ msgstr "轉寄的郵件 - %s"
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
-#: ../libemail-engine/mail-vfolder.c:127
+#: ../libemail-engine/mail-vfolder.c:153
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設定搜尋資料夾： %s"
 
-#: ../libemail-engine/mail-vfolder.c:280
+#: ../libemail-engine/mail-vfolder.c:306
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "更新「%s」的搜尋資料夾- %s"
@@ -11609,7 +11590,7 @@ msgstr "更新「%s」的搜尋資料夾- %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:646
+#: ../libemail-engine/mail-vfolder.c:670
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -11623,22 +11604,30 @@ msgstr[0] ""
 "搜尋資料夾「%sã€å·²ç¶“ä¿®æ”¹ï¼Œå› ç‚ºå®ƒåªç”¨åœ¨å‰›å‰›åˆªé™¤çš„è³‡æ–™å¤¾\n"
 "「%s」。"
 
-#: ../mail/e-mail-account-manager.c:460
+#: ../mail/e-mail-account-manager.c:116 ../mail/e-mail-account-manager.c:203
+msgid "Open _Online Accounts"
+msgstr "開啟線上帳號(_O)"
+
+#: ../mail/e-mail-account-manager.c:142 ../mail/e-mail-account-manager.c:229
+msgid "This account was created through the Online Accounts service."
+msgstr "這個帳號是透過 Online Accounts 服務建立的。"
+
+#: ../mail/e-mail-account-manager.c:690
 msgid "_Restore Default"
 msgstr "é‚„åŽŸç‚ºé è¨­å€¼(_R)"
 
-#: ../mail/e-mail-account-manager.c:473
+#: ../mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
 msgstr "æ‚¨å¯ä»¥æ‹–æ”¾å¸³è™Ÿåç¨±ä¾†èª¿æ•´å®ƒå€‘çš„é †åºã€‚"
 
-#: ../mail/e-mail-account-manager.c:518
+#: ../mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "é è¨­å€¼(_F)"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:488
+#: ../modules/mail/em-composer-prefs.c:443
 #: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:876
+#: ../plugins/publish-calendar/publish-calendar.c:875
 msgid "Enabled"
 msgstr "已啟用"
 
@@ -11648,29 +11637,29 @@ msgstr "帳號名稱"
 
 #: ../mail/e-mail-account-tree-view.c:136
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3684
-#: ../mail/mail-config.ui.h:44
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3530
+#: ../mail/mail-config.ui.h:49
 msgid "Default"
 msgstr "é è¨­å€¼"
 
-#: ../mail/e-mail-autoconfig.c:525
+#: ../mail/e-mail-autoconfig.c:578
 msgid "No email address provided"
 msgstr "沒有提供電子郵件位址"
 
-#: ../mail/e-mail-autoconfig.c:534
+#: ../mail/e-mail-autoconfig.c:587
 msgid "Missing domain in email address"
 msgstr "電子郵件位址缺乏網域"
 
-#: ../mail/e-mail-backend.c:766
+#: ../mail/e-mail-backend.c:737
 msgid "Unknown background operation"
 msgstr "不明的背景操作"
 
-#: ../mail/e-mail-browser.c:123 ../shell/e-shell-window-actions.c:848
-#: ../shell/e-shell-window-actions.c:855 ../shell/e-shell-window-actions.c:862
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
 msgid "Close this window"
 msgstr "關閉本視窗"
 
-#: ../mail/e-mail-browser.c:280
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(沒有主旨)"
 
@@ -11858,7 +11847,8 @@ msgid "Receiving Email"
 msgstr "接收電子郵件"
 
 #: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:260 ../mail/mail-config.ui.h:19
+#: ../mail/em-folder-properties.c:266 ../mail/mail-config.ui.h:24
+#: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:91
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
@@ -11883,22 +11873,22 @@ msgid "Si_gning algorithm:"
 msgstr "ç°½ç« æ¼”ç®—æ³•(_G):"
 
 #: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:50
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:51
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:52
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:53
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -12029,38 +12019,30 @@ msgstr "歡迎使用"
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
-#: ../mail/e-mail-display.c:113
+#: ../mail/e-mail-display.c:96
 msgid "_Add to Address Book..."
 msgstr "åŠ å…¥åˆ°é€šè¨ŠéŒ„(_A)…"
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:103
 msgid "_To This Address"
 msgstr "到這個位址(_T)"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:110
 msgid "_From This Address"
 msgstr "從這個位址(_F)"
 
-#: ../mail/e-mail-display.c:134
+#: ../mail/e-mail-display.c:117
 msgid "Send _Reply To..."
 msgstr "傳送回覆到(_R)…"
 
-#: ../mail/e-mail-display.c:136
+#: ../mail/e-mail-display.c:119
 msgid "Send a reply message to this address"
 msgstr "傳送回覆郵件到這個位址"
 
-#: ../mail/e-mail-display.c:143
+#: ../mail/e-mail-display.c:126
 msgid "Create Search _Folder"
 msgstr "建立搜尋資料夾(_F)"
 
-#: ../mail/e-mail-display.c:153
-msgid "Save _Image..."
-msgstr "儲存圖片(_I)…"
-
-#: ../mail/e-mail-display.c:155
-msgid "Save the image to a file"
-msgstr "將圖片儲存為檔案"
-
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
 #: ../mail/e-mail-junk-options.c:252
@@ -12096,7 +12078,7 @@ msgid "_Later"
 msgstr "稍後(_L)"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:771
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "Add Label"
 msgstr "åŠ å…¥æ¨™ç±¤"
 
@@ -12116,665 +12098,634 @@ msgstr ""
 msgid "Color"
 msgstr "顏色"
 
-#: ../mail/e-mail-notebook-view.c:269
-msgid "Please select a folder"
-msgstr "請選擇資料夾"
+#: ../mail/e-mail-print-config-headers.c:167
+msgid "Move selected headers to top"
+msgstr "å°‡é¸å–çš„æª”é ­ç§»è‡³é ‚ç«¯"
 
-#: ../mail/e-mail-printer.c:123
-#, c-format
-msgid "Page %d of %d"
-msgstr "第 %d / %d é "
+#: ../mail/e-mail-print-config-headers.c:172
+msgid "Move selected headers up one row"
+msgstr "å°‡é¸å–çš„æª”é ­ä¸Šç§»ä¸€åˆ—"
 
-#: ../mail/e-mail-printer.c:573
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-msgid "Print"
-msgstr "列印"
+#: ../mail/e-mail-print-config-headers.c:177
+msgid "Move selected headers down one row"
+msgstr "å°‡é¸å–çš„æª”é ­ä¸‹ç§»ä¸€åˆ—"
+
+#: ../mail/e-mail-print-config-headers.c:182
+msgid "Move selected headers to bottom"
+msgstr "å°‡é¸å–çš„æª”é ­ç§»è‡³åº•éƒ¨"
 
-#: ../mail/e-mail-printer.c:579
+#: ../mail/e-mail-print-config-headers.c:187
+msgid "Select all headers"
+msgstr "é¸å–æ‰€æœ‰çš„æª”é ­"
+
+#: ../mail/e-mail-print-config-headers.c:206
 msgid "Header Name"
 msgstr "æ¨™é ­åç¨±ï¼š"
 
-#: ../mail/e-mail-printer.c:585
+#: ../mail/e-mail-print-config-headers.c:215
 msgid "Header Value"
 msgstr "æ¨™é ­æ•¸å€¼"
 
-#: ../mail/e-mail-printer.c:639 ../mail/mail-config.ui.h:102
+#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:101
 msgid "Headers"
 msgstr "æª”é ­"
 
-#: ../mail/e-mail-reader.c:347
-msgid "Save Image"
-msgstr "儲存圖片"
+#: ../mail/e-mail-printer.c:167
+#, c-format
+msgid "Page %d of %d"
+msgstr "第 %d / %d é "
 
-#: ../mail/e-mail-reader.c:429 ../mail/em-filter-i18n.h:12
+#: ../mail/e-mail-reader.c:346 ../mail/em-filter-i18n.h:12
 msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
-#: ../mail/e-mail-reader.c:429 ../mail/em-folder-utils.c:489
+#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:489
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../mail/e-mail-reader.c:963 ../mail/em-filter-i18n.h:54
+#: ../mail/e-mail-reader.c:846 ../mail/em-filter-i18n.h:54
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: ../mail/e-mail-reader.c:963 ../mail/em-folder-utils.c:489
+#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:489
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../mail/e-mail-reader.c:1311 ../mail/e-mail-reader.c:1511
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1172 ../mail/e-mail-reader.c:1382
+#: ../mail/e-mail-reader.c:1422
 msgid "_Do not ask me again."
 msgstr "不要再詢問我(_D)。"
 
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1428
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æ°¸é å¿½ç•¥é€šä¿¡è«–å£‡çš„å›žè¦†æ¬„ä½(_A)"
 
-#: ../mail/e-mail-reader.c:1752
+#: ../mail/e-mail-reader.c:1630
 msgid "Failed to retrieve message:"
 msgstr "取回郵件失敗："
 
-#: ../mail/e-mail-reader.c:1798 ../mail/e-mail-reader.c:2891
+#: ../mail/e-mail-reader.c:1670 ../mail/e-mail-reader.c:2772
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "正在取回郵件「%s」"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1858
 msgid "A_dd Sender to Address Book"
 msgstr "åŠ å…¥å¯„ä»¶è€…åˆ°ç›®éŒ„æœå‹™(_D)"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1860
 msgid "Add sender to address book"
 msgstr "新增寄件者至通訊錄"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1865
 msgid "Check for _Junk"
 msgstr "檢查垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1867
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾郵件狀態"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1872
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)…"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1874
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1879
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1881
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:1886
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "從通信論壇建立過濾器規則(_L)…"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1888
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個通信論壇建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1893
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "從收件者建立過濾器規則(_R)…"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:1895
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:1900
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "從寄件者建立過濾器規則(_N)…"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:1902
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1907
 msgid "Create a Filter Rule for _Subject..."
 msgstr "從主旨建立過濾器規則(_S)…"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:1909
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1914
 msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:1916
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的郵件"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1921
 msgid "_Find in Message..."
 msgstr "在郵件內尋找(_F)…"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:1923
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1928
 msgid "_Clear Flag"
 msgstr "清除標幟(_C)"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:1930
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "移除選取郵件的跟隨旗標"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1935
 msgid "_Flag Completed"
 msgstr "標記為已完成(_F)"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:1937
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "將已選取郵件的跟隨旗標設為已完成"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1942
 msgid "Follow _Up..."
 msgstr "跟隨(_U)…"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:1944
 msgid "Flag the selected messages for follow-up"
 msgstr "å°‡é¸å®šçš„éƒµä»¶åŠ ä¸Šè·Ÿéš¨æ——æ¨™"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:1949
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../mail/e-mail-reader.c:2068 ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:1951 ../mail/e-mail-reader.c:1958
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附件形式轉寄給某人"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:1956
 msgid "Forward As _Attached"
 msgstr "以附件轉寄(_A)"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:1963
 msgid "_Inline"
 msgstr "行內(_I)"
 
-#: ../mail/e-mail-reader.c:2082 ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:1965 ../mail/e-mail-reader.c:1972
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:1970
 msgid "Forward As _Inline"
 msgstr "以行內轉寄(_I)"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:1977
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
-#: ../mail/e-mail-reader.c:2096 ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:1979 ../mail/e-mail-reader.c:1986
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:1984
 msgid "Forward As _Quoted"
 msgstr "以引文轉寄(_Q)"
 
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:1991
 msgid "_Load Images"
 msgstr "載入圖片(_L)"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:1993
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML æ ¼å¼çš„éƒµä»¶æ™‚å¼·è¿«è¼‰å…¥åœ–ç‰‡"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:1998
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2000
 msgid "Mark the selected messages as important"
 msgstr "將選定的郵件標示成重要"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2005
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2007
 msgid "Mark the selected messages as junk"
 msgstr "將選定的郵件標示成垃圾郵件"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2012
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2014
 msgid "Mark the selected messages as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2019
 msgid "_Read"
 msgstr "已閱讀(_R)"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2021
 msgid "Mark the selected messages as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2026
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2028
 msgid "Mark the selected messages as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
-#: ../mail/e-mail-reader.c:2150
+#: ../mail/e-mail-reader.c:2033
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2035
 msgid "Mark the selected messages as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2040
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)…"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2042
 msgid "Open the selected messages in the composer for editing"
 msgstr "在撰寫視窗開啟選取的郵件以便編輯"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2047
 msgid "Compose _New Message"
 msgstr "撰寫新郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2049
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2054
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2056
 msgid "Open the selected messages in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2061
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)…"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2063
 msgid "Move selected messages to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
-#: ../mail/e-mail-reader.c:2185
-msgid "_Switch to Folder"
-msgstr "切換至資料夾(_S)"
-
-#: ../mail/e-mail-reader.c:2187
-msgid "Display the parent folder"
-msgstr "顯示上層資料夾"
-
-#: ../mail/e-mail-reader.c:2192
-msgid "Switch to _next tab"
-msgstr "åˆ‡æ›è‡³ä¸‹ä¸€å€‹åˆ†é (_N)"
-
-#: ../mail/e-mail-reader.c:2194
-msgid "Switch to the next tab"
-msgstr "åˆ‡æ›è‡³ä¸‹ä¸€å€‹åˆ†é "
-
-#: ../mail/e-mail-reader.c:2199
-msgid "Switch to _previous tab"
-msgstr "åˆ‡æ›è‡³ä¸Šä¸€å€‹åˆ†é (_P)"
-
-#: ../mail/e-mail-reader.c:2201
-msgid "Switch to the previous tab"
-msgstr "åˆ‡æ›è‡³ä¸Šä¸€å€‹åˆ†é "
-
-#: ../mail/e-mail-reader.c:2206
-msgid "Cl_ose current tab"
-msgstr "é—œé–‰ç›®å‰çš„åˆ†é (_O)"
-
-#: ../mail/e-mail-reader.c:2208
-msgid "Close current tab"
-msgstr "é—œé–‰ç›®å‰çš„åˆ†é "
-
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2068
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2070
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2075
 msgid "Next _Important Message"
 msgstr "下一封重要郵件(_I)"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2077
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2082
 msgid "Next _Thread"
 msgstr "下一封相關郵件(_T)"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2084
 msgid "Display the next thread"
 msgstr "顯示下一封相關郵件"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2089
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2091
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2096
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2098
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2103
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2105
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2110
 msgid "Previous T_hread"
 msgstr "上一封相關郵件(_H)"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2112
 msgid "Display the previous thread"
 msgstr "顯示上一封相關郵件"
 
-#: ../mail/e-mail-reader.c:2262
+#: ../mail/e-mail-reader.c:2117
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2119
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2126
 msgid "Print this message"
 msgstr "列印郵件"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2133
 msgid "Preview the message to be printed"
 msgstr "é è¦½éœ€è¦åˆ—å°çš„éƒµä»¶"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2138
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2140
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2145
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2147
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2152
 msgid "Remove Du_plicate Messages"
 msgstr "移除重複的郵件(_P)"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2154
 msgid "Checks selected messages for duplicates"
 msgstr "檢查選取的郵件是否有重複"
 
-#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
-#: ../modules/mail/e-mail-attachment-handler.c:196
+#: ../mail/e-mail-reader.c:2159 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1548
+#: ../modules/mail/e-mail-attachment-handler.c:214
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2161
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "撰寫回郵給已選取郵件的全部收件者"
 
-#: ../mail/e-mail-reader.c:2311 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2166 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2168
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "撰寫回郵給所選定郵件的通信論壇"
 
-#: ../mail/e-mail-reader.c:2318
-#: ../modules/mail/e-mail-attachment-handler.c:203
+#: ../mail/e-mail-reader.c:2173
+#: ../modules/mail/e-mail-attachment-handler.c:221
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2175
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2180
 msgid "_Save as mbox..."
 msgstr "儲存成 mbox(_S)…"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2182
 msgid "Save selected messages as an mbox file"
 msgstr "將選定的郵件另存成 mbox 檔案"
 
-#: ../mail/e-mail-reader.c:2332
+#: ../mail/e-mail-reader.c:2187
 msgid "_Message Source"
 msgstr "郵件來源(_M)"
 
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2189
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2201
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2203
 msgid "Undelete the selected messages"
 msgstr "取消刪除選定的郵件"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2208
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2210
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2215
 msgid "_Zoom In"
 msgstr "拉近(_Z)"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2217
 msgid "Increase the text size"
 msgstr "將文字放大"
 
-#: ../mail/e-mail-reader.c:2367
+#: ../mail/e-mail-reader.c:2222
 msgid "Zoom _Out"
 msgstr "æ‹‰é (_O)"
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2224
 msgid "Decrease the text size"
 msgstr "將文字縮小"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2231
 msgid "Cre_ate"
 msgstr "建立(_A)"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2238
 msgid "Ch_aracter Encoding"
 msgstr "字元編碼(_A)"
 
-#: ../mail/e-mail-reader.c:2390
+#: ../mail/e-mail-reader.c:2245
 msgid "F_orward As"
 msgstr "轉寄為(_O)"
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2252
 msgid "_Group Reply"
 msgstr "群組回覆(_G)"
 
-#: ../mail/e-mail-reader.c:2404
+#: ../mail/e-mail-reader.c:2259
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2266
 msgid "Mar_k As"
 msgstr "標示成(_K)"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2273
 msgid "_Message"
 msgstr "郵件(_M)"
 
-#: ../mail/e-mail-reader.c:2425
+#: ../mail/e-mail-reader.c:2280
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2290
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "從通信論壇建立搜尋資料夾(_L)…"
 
-#: ../mail/e-mail-reader.c:2437
+#: ../mail/e-mail-reader.c:2292
 msgid "Create a search folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2442
+#: ../mail/e-mail-reader.c:2297
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "從收件者建立搜尋資料夾(_T)…"
 
-#: ../mail/e-mail-reader.c:2444
+#: ../mail/e-mail-reader.c:2299
 msgid "Create a search folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2449
+#: ../mail/e-mail-reader.c:2304
 msgid "Create a Search Folder from Sen_der..."
 msgstr "從寄件者建立搜尋資料夾(_D)…"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2306
 msgid "Create a search folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2456
+#: ../mail/e-mail-reader.c:2311
 msgid "Create a Search Folder from S_ubject..."
 msgstr "從主旨建立搜尋資料夾(_U)…"
 
-#: ../mail/e-mail-reader.c:2458
+#: ../mail/e-mail-reader.c:2313
 msgid "Create a search folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
-#: ../mail/e-mail-reader.c:2481
+#: ../mail/e-mail-reader.c:2336
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)…"
 
-#: ../mail/e-mail-reader.c:2489
+#: ../mail/e-mail-reader.c:2344
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
-#: ../mail/e-mail-reader.c:2493
+#: ../mail/e-mail-reader.c:2348
 msgid "Mark as _Junk"
 msgstr "標示成垃圾郵件(_J)"
 
-#: ../mail/e-mail-reader.c:2497
+#: ../mail/e-mail-reader.c:2352
 msgid "Mark as _Not Junk"
 msgstr "標示成非垃圾郵件(_N)"
 
-#: ../mail/e-mail-reader.c:2501
+#: ../mail/e-mail-reader.c:2356
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
-#: ../mail/e-mail-reader.c:2505
+#: ../mail/e-mail-reader.c:2360
 msgid "Mark as Uni_mportant"
 msgstr "標示成不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2509
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
-#: ../mail/e-mail-reader.c:2553
+#: ../mail/e-mail-reader.c:2408
 msgid "_Caret Mode"
 msgstr "漏字模式(_C)"
 
-#: ../mail/e-mail-reader.c:2555
+#: ../mail/e-mail-reader.c:2410
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在顯示的郵件內文中顯示閃爍游標"
 
-#: ../mail/e-mail-reader.c:2561
+#: ../mail/e-mail-reader.c:2416
 msgid "All Message _Headers"
 msgstr "æ‰€æœ‰éƒµä»¶æª”é ­(_H)"
 
-#: ../mail/e-mail-reader.c:2563
+#: ../mail/e-mail-reader.c:2418
 msgid "Show messages with all email headers"
 msgstr "é¡¯ç¤ºéƒµä»¶åŠè©³ç´°æª”é ­"
 
-#: ../mail/e-mail-reader.c:2897
+#: ../mail/e-mail-reader.c:2778
 msgid "Retrieving message"
 msgstr "取回郵件"
 
-#: ../mail/e-mail-reader.c:3877
-#: ../modules/mail/e-mail-attachment-handler.c:189
+#: ../mail/e-mail-reader.c:3700
+#: ../modules/mail/e-mail-attachment-handler.c:207
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/e-mail-reader.c:3878
+#: ../mail/e-mail-reader.c:3701
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
-#: ../mail/e-mail-reader.c:3897
+#: ../mail/e-mail-reader.c:3720
 msgid "Group Reply"
 msgstr "群組回覆"
 
-#: ../mail/e-mail-reader.c:3898
+#: ../mail/e-mail-reader.c:3721
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "回覆給通信論壇，或是給所有的收件者"
 
-#: ../mail/e-mail-reader.c:3964 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:3787 ../mail/em-filter-i18n.h:15
 msgid "Delete"
 msgstr "刪除"
 
-#: ../mail/e-mail-reader.c:3997
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../mail/e-mail-reader.c:3799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "Next"
 msgstr "下一個"
 
-#: ../mail/e-mail-reader.c:4001
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../mail/e-mail-reader.c:3803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Previous"
 msgstr "上一個"
 
-#: ../mail/e-mail-reader.c:4010 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3812 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/e-mail-reader.c:4728
-#, c-format
-msgid "Folder '%s'"
-msgstr "資料夾「%s」"
-
-#: ../mail/e-mail-reader-utils.c:161
+#: ../mail/e-mail-reader-utils.c:151
 msgid "Do not warn me again"
 msgstr "不要再警告我"
 
-#: ../mail/e-mail-reader-utils.c:962
+#: ../mail/e-mail-reader-utils.c:976
 msgid "Printing"
 msgstr "列印"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1149
+#: ../mail/e-mail-reader-utils.c:1211
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -12784,7 +12735,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "資料夾「%s」包含 %u 封重複的郵件。您確定要刪除它？"
 
-#: ../mail/e-mail-reader-utils.c:1614
+#: ../mail/e-mail-reader-utils.c:2035
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "儲存郵件"
@@ -12794,21 +12745,20 @@ 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:1635
+#: ../mail/e-mail-reader-utils.c:2056
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "郵件"
 
-#: ../mail/e-mail-reader-utils.c:2085
+#: ../mail/e-mail-reader-utils.c:2425
 msgid "Parsing message"
 msgstr "解析郵件"
 
-#: ../mail/e-mail-request.c:177
-#, c-format
-msgid "Failed to load part '%s'"
-msgstr "無法載入部分「%s」"
+#: ../mail/e-mail-request.c:182
+msgid "The message has no text content."
+msgstr "這個郵件沒有文字內容。"
 
-#: ../mail/e-mail-tag-editor.c:292
+#: ../mail/e-mail-tag-editor.c:238
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
@@ -12816,7 +12766,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:1278
+#: ../mail/em-composer-utils.c:1368
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12824,23 +12774,23 @@ msgstr ""
 "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
 "${TimeZone}，${Sender} 提到："
 
-#: ../mail/em-composer-utils.c:1284
+#: ../mail/em-composer-utils.c:1374
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-#: ../mail/em-composer-utils.c:1289
+#: ../mail/em-composer-utils.c:1379
 msgid "-----Original Message-----"
 msgstr "-----原始郵件-----"
 
-#: ../mail/em-composer-utils.c:2611
+#: ../mail/em-composer-utils.c:2524
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
-#: ../mail/em-composer-utils.c:3030
+#: ../mail/em-composer-utils.c:2945
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-#: ../mail/em-composer-utils.c:3031
+#: ../mail/em-composer-utils.c:2946
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
@@ -12973,7 +12923,7 @@ msgstr "未設定"
 msgid "is set"
 msgstr "設定"
 
-#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:109
+#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:108
 msgid "Junk"
 msgstr "垃圾郵件"
 
@@ -13135,7 +13085,7 @@ msgstr "配額使用量 (%s):"
 msgid "Quota usage"
 msgstr "限制用量"
 
-#: ../mail/em-folder-properties.c:341
+#: ../mail/em-folder-properties.c:347
 msgid "Folder Properties"
 msgstr "資料夾內容"
 
@@ -13175,12 +13125,12 @@ msgstr "正在移動資料夾 %s"
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2283
+#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2280
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2285
+#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2282
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
@@ -13191,11 +13141,11 @@ msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../mail/em-folder-tree-model.c:848 ../mail/em-folder-tree-model.c:1133
+#: ../mail/em-folder-tree-model.c:870 ../mail/em-folder-tree-model.c:1160
 msgid "Loading..."
 msgstr "載入中…"
 
@@ -13227,8 +13177,8 @@ msgstr "要顯示的訂閱(_B)"
 msgid "Subscribe To _All"
 msgstr "全部訂閱(_A)"
 
-#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1842
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1836
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
@@ -13244,52 +13194,52 @@ msgstr "全部取消訂閱(_A)"
 msgid "Folder Subscriptions"
 msgstr "資料夾訂閱"
 
-#: ../mail/em-subscription-editor.c:1717
+#: ../mail/em-subscription-editor.c:1716
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../mail/em-subscription-editor.c:1732
+#: ../mail/em-subscription-editor.c:1729
 msgid "Clear Search"
 msgstr "清除搜尋"
 
-#: ../mail/em-subscription-editor.c:1750
+#: ../mail/em-subscription-editor.c:1746
 msgid "Sho_w items that contain:"
 msgstr "é¡¯ç¤ºé …ç›®åŒ…å«(_W):"
 
-#: ../mail/em-subscription-editor.c:1795
+#: ../mail/em-subscription-editor.c:1789
 msgid "Subscribe to the selected folder"
 msgstr "訂閱選取的資料夾"
 
-#: ../mail/em-subscription-editor.c:1796
+#: ../mail/em-subscription-editor.c:1790
 msgid "Su_bscribe"
 msgstr "訂閱(_B)"
 
-#: ../mail/em-subscription-editor.c:1841
-#: ../modules/mail/e-mail-shell-view-actions.c:1400
+#: ../mail/em-subscription-editor.c:1835
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "Unsubscribe from the selected folder"
 msgstr "取消訂閱選取的資料夾"
 
-#: ../mail/em-subscription-editor.c:1881
+#: ../mail/em-subscription-editor.c:1875
 msgid "Collapse all folders"
 msgstr "收摺所有的資料夾"
 
-#: ../mail/em-subscription-editor.c:1882
+#: ../mail/em-subscription-editor.c:1876
 msgid "C_ollapse All"
 msgstr "全部收摺(_O)"
 
-#: ../mail/em-subscription-editor.c:1892
+#: ../mail/em-subscription-editor.c:1886
 msgid "Expand all folders"
 msgstr "展開所有的資料夾"
 
-#: ../mail/em-subscription-editor.c:1893
+#: ../mail/em-subscription-editor.c:1887
 msgid "E_xpand All"
 msgstr "全部展開(_X)"
 
-#: ../mail/em-subscription-editor.c:1903
+#: ../mail/em-subscription-editor.c:1897
 msgid "Refresh the folder list"
 msgstr "重新整理資料夾清單"
 
-#: ../mail/em-subscription-editor.c:1915
+#: ../mail/em-subscription-editor.c:1909
 msgid "Stop the current operation"
 msgstr "停止目前的操作"
 
@@ -13297,22 +13247,22 @@ msgstr "停止目前的操作"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:97
+#: ../mail/em-utils.c:86
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "您確定要一次開啟 %d 封郵件？"
 
-#: ../mail/em-utils.c:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+#: ../mail/em-utils.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:150
 msgid "_Do not show this message again"
 msgstr "不要再顯示這個訊息(_D)"
 
-#: ../mail/em-utils.c:305
+#: ../mail/em-utils.c:252
 msgid "Message Filters"
 msgstr "郵件規則"
 
-#: ../mail/em-utils.c:1060
+#: ../mail/em-utils.c:976
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
@@ -13372,13 +13322,13 @@ msgstr "目的端資料夾(_D):"
 
 #: ../mail/importers/evolution-mbox-importer.c:146
 #: ../plugins/dbx-import/dbx-importer.c:256
-#: ../plugins/pst-import/pst-importer.c:542
+#: ../plugins/pst-import/pst-importer.c:545
 msgid "Select folder"
 msgstr "選擇資料夾"
 
 #: ../mail/importers/evolution-mbox-importer.c:147
 #: ../plugins/dbx-import/dbx-importer.c:257
-#: ../plugins/pst-import/pst-importer.c:543
+#: ../plugins/pst-import/pst-importer.c:546
 msgid "Select folder to import into"
 msgstr "選取資料夾來輸入"
 
@@ -13393,7 +13343,7 @@ msgid "From"
 msgstr "寄件者"
 
 #: ../mail/importers/evolution-mbox-importer.c:486
-#: ../shell/e-shell-utils.c:193
+#: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 郵件信箱 (mbox)"
 
@@ -13408,7 +13358,7 @@ msgstr "正在匯入信箱"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:612
-#: ../plugins/pst-import/pst-importer.c:760
+#: ../plugins/pst-import/pst-importer.c:767
 #, c-format
 msgid "Importing '%s'"
 msgstr "正在匯入「%s」"
@@ -13546,46 +13496,71 @@ msgstr "如果可能，群組回覆只用於通信論壇(_U)"
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "當原始郵件已簽名 (PGP 或 S/MIME) 時也對郵件數位簽名(_S)"
 
+#: ../mail/mail-config.ui.h:19
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "附件"
+
 #: ../mail/mail-config.ui.h:20
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "行內 (Outlook é¢¨æ ¼)"
+
+#: ../mail/mail-config.ui.h:21
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "引文"
+
+#: ../mail/mail-config.ui.h:22
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "不使用引文"
+
+#: ../mail/mail-config.ui.h:23
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "行內"
+
+#: ../mail/mail-config.ui.h:25
 msgid "Sig_natures"
 msgstr "簽名檔(_N)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:26
 msgid "Signatures"
 msgstr "簽名檔"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:27
 msgid "_Languages"
 msgstr "語言(_L)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:28
 msgid "Languages Table"
 msgstr "語言表"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:29
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é€™è£¡çš„èªžè¨€æ¸…å–®åªåæ˜ å‡ºå·²ç¶“å®‰è£å­—å…¸çš„èªžè¨€ã€‚"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:31
 msgid "Check spelling while I _type"
 msgstr "當我輸入時檢查拼字(_T)"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:32
 msgid "Color for _misspelled words:"
 msgstr "拼錯字的顏色(_M):"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:33
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "挑選顏色"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:34
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:35
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -13594,72 +13569,47 @@ msgstr ""
 "得確認："
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:37
 msgid "Sending a message with an _empty subject line"
 msgstr "傳送沒有主旨的郵件(_E)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:39
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "傳送只有指定密件副本收件者的郵件(_B)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a _private reply to a mailing list message"
 msgstr "傳送私人回覆到通信論壇(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a reply to a large _number of recipients"
 msgstr "傳送有大量收件者的郵件(_N)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:45
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "允許當通信論壇將私人回覆導回論壇(_M)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:47
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "傳送給沒有輸入有效郵件位址的收件者(_R)"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:48
 msgid "Confirmations"
 msgstr "確認"
 
-#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:54 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:55 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:51
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "附件"
-
-#: ../mail/mail-config.ui.h:52
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "行內 (Outlook é¢¨æ ¼)"
-
-#: ../mail/mail-config.ui.h:53
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "引文"
-
-#: ../mail/mail-config.ui.h:54
-msgctxt "ReplyForward"
-msgid "Do not quote"
-msgstr "不使用引文"
-
-#: ../mail/mail-config.ui.h:55
-msgctxt "ReplyForward"
-msgid "Inline"
-msgstr "行內"
-
 #: ../mail/mail-config.ui.h:56
 msgid "Proxy Settings"
 msgstr "代理伺服器設定值"
@@ -13823,58 +13773,54 @@ msgid "_Show the photograph of sender in the message preview"
 msgstr "åœ¨éƒµä»¶é è¦½é¡¯ç¤ºå¯„ä»¶è€…ç›¸ç‰‡(_S)"
 
 #: ../mail/mail-config.ui.h:98
-msgid "S_earch for sender photograph only in local address books"
-msgstr "只搜尋本地端通訊錄中的寄件者相片(_E)"
-
-#: ../mail/mail-config.ui.h:99
 msgid "Displayed Message Headers"
 msgstr "é¡¯ç¤ºçš„éƒµä»¶æª”é ­"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:99
 msgid "Mail Headers Table"
 msgstr "éƒµä»¶æª”é ­è¡¨"
 
-#: ../mail/mail-config.ui.h:101
-#: ../modules/addressbook/autocompletion-config.c:86
+#: ../mail/mail-config.ui.h:100
+#: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "日期/æ™‚åˆ»æ ¼å¼"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:102
 msgid "Check incoming _messages for junk"
 msgstr "檢查內送郵件是否為垃圾郵件(_M)"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:103
 msgid "_Delete junk messages"
 msgstr "刪除垃圾郵件(_D)"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:104
 msgid "Check cu_stom headers for junk"
 msgstr "ä»¥è‡ªè¨‚æ¨™é ­æª¢æŸ¥åžƒåœ¾éƒµä»¶(_S)"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:105
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "若寄件者在我的通訊錄中就不要將郵件標記為垃圾郵件(_K)"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:106
 msgid "_Lookup in local address book only"
 msgstr "只在本地通訊錄查詢(_L)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:107
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦‚æžœæ‰¾åˆ°ç¬¦åˆçš„è‡ªè¨‚åžƒåœ¾éƒµä»¶æ¨™é ­é€™å€‹é¸é …å°±æœƒè¢«å¿½ç•¥ã€‚"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:109
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:225
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:159
 msgid "No encryption"
 msgstr "æ²’æœ‰åŠ å¯†"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:110
 msgid "TLS encryption"
 msgstr "TLS åŠ å¯†"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:111
 msgid "SSL encryption"
 msgstr "SSL åŠ å¯†"
 
@@ -14137,7 +14083,7 @@ msgid ""
 msgstr "要永久移除所有資料夾中所有刪除的郵件？"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "_Empty Trash"
 msgstr "清理回收筒(_E)"
 
@@ -14340,7 +14286,7 @@ msgid "Do _Not Disable"
 msgstr "不要停用(_N)"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:635
+#: ../plugins/publish-calendar/publish-calendar.c:634
 msgid "_Disable"
 msgstr "停用(_D)"
 
@@ -14504,34 +14450,36 @@ msgid "This will mark all messages as read in the selected folder."
 msgstr "這會將標示選取的資料夾中所有郵件為已閱讀。"
 
 #: ../mail/mail.error.xml.h:129
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr "這會將標示選定的資料夾及其子資料夾中所有郵件為已閱讀。"
+msgid "Also mark messages in subfolders?"
+msgstr "是否也標記子資料夾中的郵件？"
 
 #: ../mail/mail.error.xml.h:130
-msgid "Close message window."
-msgstr "關閉郵件視窗。"
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"您要將目前的資料夾中的郵件已閱讀，或是包含目前的資料夾及其子資料夾中所有郵"
+"件。"
 
 #: ../mail/mail.error.xml.h:131
-msgid "Would you like to close the message window?"
-msgstr "您想要關閉郵件視窗嗎？"
+msgid "In Current Folder and _Subfolders"
+msgstr "於目前的資料夾及其子資料夾(_S)"
 
 #: ../mail/mail.error.xml.h:132
-msgid "_Yes"
-msgstr "是(_Y)"
+msgid "In Current _Folder Only"
+msgstr "於目前的資料夾(_F)"
 
 #: ../mail/mail.error.xml.h:133
-msgid "_No"
-msgstr "否(_N)"
+msgid "Should Evolution close this window when replying or forwarding?"
+msgstr "當回覆或轉寄時 Evolution 是否應關閉這個視窗？"
 
 #: ../mail/mail.error.xml.h:134
-msgid "_Always"
-msgstr "總是(_A)"
+msgid "_Yes, Always"
+msgstr "是，總是使用(_Y)"
 
 #: ../mail/mail.error.xml.h:135
-msgid "N_ever"
-msgstr "永不(_E)"
+msgid "_No, Never"
+msgstr "否，永不使用(_N)"
 
 #: ../mail/mail.error.xml.h:136
 msgid "Copy folder in folder tree."
@@ -14542,119 +14490,139 @@ msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "是否確定要將資料夾「{0}」複製到資料夾「{1}」？"
 
 #: ../mail/mail.error.xml.h:138
+msgid "_Yes"
+msgstr "是(_Y)"
+
+#: ../mail/mail.error.xml.h:139
+msgid "_No"
+msgstr "否(_N)"
+
+#: ../mail/mail.error.xml.h:140
+msgid "_Always"
+msgstr "總是(_A)"
+
+#: ../mail/mail.error.xml.h:141
+msgid "N_ever"
+msgstr "永不(_E)"
+
+#: ../mail/mail.error.xml.h:142
 msgid "Move folder in folder tree."
 msgstr "於資料夾樹狀圖移動。"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:143
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "是否確定要將資料夾「{0}」移動到資料夾「{1}」？"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "å› ç‚ºæ‚¨æ²’æœ‰å•Ÿç”¨é¸æ“‡ç”¨ä¾†å¯„é€çš„å¸³è™Ÿï¼Œæ‰€ä»¥ç„¡æ³•å‚³é€æ­¤éƒµä»¶ã€‚"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:145
 msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳送。"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:146
 msgid "Mail Deletion Failed"
 msgstr "刪除郵件失敗"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:147
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "æ‚¨æ²’æœ‰è¶³å¤ çš„æ¬Šé™åˆªé™¤æ­¤å°éƒµä»¶ã€‚"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
 msgid "\"Check Junk\" Failed"
 msgstr "「檢查垃圾郵件」失敗"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:149
 msgid "\"Report Junk\" Failed"
 msgstr "ã€Œå›žå ±åžƒåœ¾éƒµä»¶ã€å¤±æ•—"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:150
 msgid "\"Report Not Junk\" Failed"
 msgstr "ã€Œå›žå ±ç‚ºéžåžƒåœ¾éƒµä»¶ã€å¤±æ•—"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:151
 msgid "Remove duplicate messages?"
 msgstr "是否移除重複的郵件？"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:152
 msgid "No duplicate messages found."
 msgstr "找不到重複的郵件。"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:154
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "資料夾「{0}」並未包含任何重複的郵件。"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:155
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "無法中斷與帳號 &quot;{0}&quot; 的連線。"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:157
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "無法取消訂閱資料夾 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:158
 msgid "Unable to retrieve message."
 msgstr "無法接收郵件。"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:159
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to open folder."
 msgstr "無法開啟資料夾。"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to find duplicate messages."
 msgstr "找不到重複的郵件。"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to retrieve messages."
 msgstr "無法取回郵件。"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:163
+msgid "Failed to mark messages as read."
+msgstr "無法將郵件標示成已經閱讀。"
+
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to remove attachments from messages."
 msgstr "無法移除郵件中的附件。"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to download messages for offline viewing."
 msgstr "下載離線使用的郵件失敗。"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to save messages to disk."
 msgstr "無法將選取的郵件儲存至磁碟。"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:167
 msgid "Hidden file is attached."
 msgstr "é™„åŠ äº†éš±è—çš„æª”æ¡ˆã€‚"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:168
 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:164
+#: ../mail/mail.error.xml.h:169
 msgid "Printing failed."
 msgstr "列印失敗。"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:170
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "印表機回覆 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:171
 msgid "Could not perform this operation on {0}."
 msgstr "無法進行 {0} 上的操作。"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:172
 msgid "You must be working online to complete this operation."
 msgstr "æ‚¨å¿…é ˆæ–¼ç·šä¸Šå·¥ä½œæ‰èƒ½å®Œæˆæ­¤æ“ä½œã€‚"
 
@@ -14670,7 +14638,7 @@ msgstr "傳送與接收郵件"
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1041
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1047
 msgid "Updating..."
 msgstr "更新中…"
 
@@ -14695,87 +14663,86 @@ msgstr "編輯搜尋資料夾"
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
-#: ../mail/message-list.c:1244
+#: ../mail/message-list.c:298
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../mail/message-list.c:1245
+#: ../mail/message-list.c:299
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../mail/message-list.c:1246
+#: ../mail/message-list.c:300
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../mail/message-list.c:1247
+#: ../mail/message-list.c:301
 msgid "Forwarded"
 msgstr "轉寄"
 
-#: ../mail/message-list.c:1248
+#: ../mail/message-list.c:302
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../mail/message-list.c:1249
+#: ../mail/message-list.c:303
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../mail/message-list.c:1253
+#: ../mail/message-list.c:316
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1254
+#: ../mail/message-list.c:317
 msgid "Lower"
 msgstr "低"
 
-#: ../mail/message-list.c:1258
+#: ../mail/message-list.c:321
 msgid "Higher"
 msgstr "高"
 
-#: ../mail/message-list.c:1259
+#: ../mail/message-list.c:322
 msgid "Highest"
 msgstr "最高"
 
+#: ../mail/message-list.c:466 ../mail/message-list.c:5725
+msgid "Generating message list"
+msgstr "產生郵件清單"
+
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1889 ../modules/itip-formatter/itip-view.c:242
+#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
 msgid "Today %l:%M %p"
 msgstr "今天 %p %l:%M"
 
-#: ../mail/message-list.c:1898
+#: ../mail/message-list.c:1867
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %p %l:%M"
 
-#: ../mail/message-list.c:1910
+#: ../mail/message-list.c:1879
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../mail/message-list.c:1918
+#: ../mail/message-list.c:1887
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日 %p %l:%M"
 
-#: ../mail/message-list.c:1920
+#: ../mail/message-list.c:1889
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2751
+#: ../mail/message-list.c:2767
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../mail/message-list.c:2889 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3395 ../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:4114
+#: ../mail/message-list.c:4758
 msgid "Follow-up"
 msgstr "跟隨"
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4616 ../mail/message-list.c:5020
-msgid "Generating message list"
-msgstr "產生郵件清單"
-
-#: ../mail/message-list.c:4850
+#: ../mail/message-list.c:5663
 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 "
@@ -14785,7 +14752,7 @@ msgstr ""
 "沒有郵件滿足您的搜尋條件。請從上列下拉式選單選擇顯示郵件過濾器或執行新的搜"
 "尋，可從 搜尋->清除 é¸å–®é …ç›®æ¸…é™¤å®ƒæˆ–æ”¹è®Šä¸Šé¢çš„æŸ¥è©¢ã€‚"
 
-#: ../mail/message-list.c:4855
+#: ../mail/message-list.c:5671
 msgid "There are no messages in this folder."
 msgstr "這個資料夾中沒有郵件。"
 
@@ -14822,49 +14789,49 @@ msgid "Subject or Addresses contains"
 msgstr "主旨或電子郵件位址包含"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1762
+#: ../modules/mail/e-mail-shell-view-actions.c:1997
 msgid "Recipients contain"
 msgstr "收件者包含"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1755
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Message contains"
 msgstr "郵件包含"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1776
+#: ../modules/mail/e-mail-shell-view-actions.c:2011
 msgid "Subject contains"
 msgstr "主旨包含"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1769
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "Sender contains"
 msgstr "寄件者包含"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1748
+#: ../modules/mail/e-mail-shell-view-actions.c:1983
 msgid "Body contains"
 msgstr "內文包含"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:92
-#: ../modules/mail/em-mailer-prefs.c:1139
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1213
 msgid "_Table column:"
 msgstr "è¡¨æ ¼æ¬„(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:95
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "åœ°å€æ ¼å¼åŒ–"
 
-#: ../modules/addressbook/autocompletion-config.c:98
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr "åœ°å€æ˜¯å¦è¦æ ¹æ“šç›®çš„åœ°åœ‹å®¶çš„æ¨™æº–é€²è¡Œæ ¼å¼åŒ–(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:107
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "自動完成"
 
-#: ../modules/addressbook/autocompletion-config.c:110
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "æ°¸é é¡¯ç¤ºè‡ªå‹•è£œé½Šçš„é€£çµ¡äººä½å€(_S)"
 
@@ -14888,42 +14855,42 @@ msgstr "連絡人資訊"
 msgid "Contact information for %s"
 msgstr "%s 的連絡人資訊"
 
-#: ../modules/addressbook/e-book-shell-backend.c:260
+#: ../modules/addressbook/e-book-shell-backend.c:259
 #: ../modules/addressbook/e-book-shell-view-actions.c:125
 msgid "New Address Book"
 msgstr "新通訊錄"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-backend.c:268
 msgctxt "New"
 msgid "_Contact"
 msgstr "連絡人(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:271
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-backend.c:270
+#: ../modules/addressbook/e-book-shell-view-actions.c:977
 msgid "Create a new contact"
 msgstr "建立新的連絡人"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:275
 msgctxt "New"
 msgid "Contact _List"
 msgstr "連絡人清單(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-backend.c:277
+#: ../modules/addressbook/e-book-shell-view-actions.c:984
 msgid "Create a new contact list"
 msgstr "建立新的連絡人清單"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgctxt "New"
 msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:288
-#: ../modules/addressbook/e-book-shell-view-actions.c:866
+#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-view-actions.c:900
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:315
 msgid "Certificates"
 msgstr "憑證"
 
@@ -14932,269 +14899,280 @@ msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:418
-#: ../modules/addressbook/e-book-shell-view-actions.c:714
+#: ../modules/addressbook/e-book-shell-view-actions.c:474
+#: ../modules/addressbook/e-book-shell-view-actions.c:770
 msgid "Save as vCard"
 msgstr "儲存為 vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:843
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Co_py All Contacts To..."
 msgstr "複製所有的連絡人到(_P)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:845
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
 msgid "Copy the contacts of the selected address book to another"
 msgstr "將已選取通訊錄中的連絡人複製到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:850
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "D_elete Address Book"
 msgstr "刪除通訊錄(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:852
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
 msgid "Delete the selected address book"
 msgstr "刪除選取的通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:857
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Mo_ve All Contacts To..."
 msgstr "將所有的連絡人移到(_V)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:859
+#: ../modules/addressbook/e-book-shell-view-actions.c:893
 msgid "Move the contacts of the selected address book to another"
 msgstr "將已選取通訊錄中的連絡人移動到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:864
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:871
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Address _Book Properties"
 msgstr "通訊錄屬性(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:873
+#: ../modules/addressbook/e-book-shell-view-actions.c:907
 msgid "Show properties of the selected address book"
 msgstr "顯示選取通訊錄的屬性"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-task-shell-view-actions.c:760
+msgid "Re_fresh"
+msgstr "重新整理(_F)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:914
+msgid "Refresh the selected address book"
+msgstr "重新整理選取的通訊錄"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "Address Book _Map"
 msgstr "通訊錄地圖(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:921
 msgid "Show map with all contacts from selected address book"
 msgstr "顯示已選取通訊錄中所有連絡人的地圖"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/mail/e-mail-shell-view-actions.c:1605
 msgid "_Rename..."
 msgstr "重新命名(_R)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:928
 msgid "Rename the selected address book"
 msgstr "重新命名選取的通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:935
 msgid "Stop loading"
 msgstr "停止載入"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 msgid "_Copy Contact To..."
 msgstr "複製連絡人到(_C)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
 msgid "Copy selected contacts to another address book"
 msgstr "將選取的連絡人複製到另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "_Delete Contact"
 msgstr "刪除連絡人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
 msgid "_Find in Contact..."
 msgstr "在連絡人內尋找(_F)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "Search for text in the displayed contact"
 msgstr "搜尋顯示的連絡人中的文字"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "_Forward Contact..."
 msgstr "轉寄連絡人(_F)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:963
 msgid "Send selected contacts to another person"
 msgstr "傳送選取連絡人給其他使用者。"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "_Move Contact To..."
 msgstr "將連絡人移到(_M)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:970
 msgid "Move selected contacts to another address book"
 msgstr "將選取的連絡人移至另一個通訊錄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "_New Contact..."
 msgstr "新增連絡人(_N)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "New Contact _List..."
 msgstr "新增連絡人清單(_L)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "_Open Contact"
 msgstr "開啟連絡人(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "View the current contact"
 msgstr "檢視目前的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "_Send Message to Contact..."
 msgstr "傳送郵件給連絡人(_S)…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:998
 msgid "Send a message to the selected contacts"
 msgstr "傳送郵件至選取的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
-#: ../modules/calendar/e-cal-shell-view-actions.c:1601
-#: ../modules/calendar/e-task-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:1005
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "_Actions"
 msgstr "動作(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
-#: ../modules/calendar/e-memo-shell-view-actions.c:701
-#: ../modules/calendar/e-task-shell-view-actions.c:853
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/addressbook/e-book-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-task-shell-view-actions.c:832
+#: ../modules/mail/e-mail-shell-view-actions.c:1770
 msgid "_Preview"
 msgstr "é è¦½(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:980
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
-#: ../modules/calendar/e-task-shell-view-actions.c:866
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-memo-shell-view-actions.c:693
+#: ../modules/calendar/e-task-shell-view-actions.c:845
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:984
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1033
 msgid "Address Book Map"
 msgstr "通訊錄地圖"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+#: ../modules/addressbook/e-book-shell-view-actions.c:1065
 msgid "Contact _Preview"
 msgstr "é€£çµ¡äººé è¦½(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
 msgid "Show contact preview window"
 msgstr "é¡¯ç¤ºé€£çµ¡äººé è¦½è¦–çª—"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Show _Maps"
 msgstr "顯示地圖(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/addressbook/e-book-shell-view-actions.c:1075
 msgid "Show maps in contact preview window"
 msgstr "åœ¨é€£çµ¡äººé è¦½è¦–çª—é¡¯ç¤ºåœ°åœ–"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1049
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:935
-#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#: ../modules/addressbook/e-book-shell-view-actions.c:1094
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/mail/e-mail-shell-view-actions.c:1900
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/addressbook/e-book-shell-view-actions.c:1096
 msgid "Show contact preview below the contact list"
 msgstr "åœ¨é€£çµ¡äººæ¸…å–®ä¸‹æ–¹é¡¯ç¤ºé€£çµ¡äººé è¦½"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:942
-#: ../modules/mail/e-mail-shell-view-actions.c:1672
+#: ../modules/addressbook/e-book-shell-view-actions.c:1101
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/mail/e-mail-shell-view-actions.c:1907
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/addressbook/e-book-shell-view-actions.c:1103
 msgid "Show contact preview alongside the contact list"
 msgstr "åœ¨é€£çµ¡äººæ¸…å–®æ—é‚Šé¡¯ç¤ºé€£çµ¡äººé è¦½"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1073
-#: ../modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:994
+#: ../modules/addressbook/e-book-shell-view-actions.c:1118
+#: ../modules/calendar/e-cal-shell-view-actions.c:1755
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1083
-#: ../modules/calendar/e-cal-shell-view-actions.c:1788
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
-#: ../modules/mail/e-mail-shell-view-actions.c:1741
-#: ../shell/e-shell-content.c:657
+#: ../modules/addressbook/e-book-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-actions.c:1765
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1976
+#: ../shell/e-shell-content.c:656
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/addressbook/e-book-shell-view-actions.c:1161
 msgid "Print all shown contacts"
 msgstr "列印所有顯示的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+#: ../modules/addressbook/e-book-shell-view-actions.c:1168
 msgid "Preview the contacts to be printed"
 msgstr "é è¦½å°‡è¦åˆ—å°çš„é€£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1130
+#: ../modules/addressbook/e-book-shell-view-actions.c:1175
 msgid "Print selected contacts"
 msgstr "列印已選取的連絡人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1145
+#: ../modules/addressbook/e-book-shell-view-actions.c:1190
 msgid "S_ave Address Book as vCard"
 msgstr "將通訊錄另存為 vC_ard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/addressbook/e-book-shell-view-actions.c:1192
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "將已選取通訊錄中的連絡人儲存為 vCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1153
-#: ../modules/addressbook/e-book-shell-view-actions.c:1163
+#: ../modules/addressbook/e-book-shell-view-actions.c:1198
+#: ../modules/addressbook/e-book-shell-view-actions.c:1208
 msgid "_Save as vCard..."
 msgstr "儲存成 _vCard…"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1155
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
 msgid "Save selected contacts as a vCard"
 msgstr "將選取的連絡人儲存為 vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:300
+#: ../modules/addressbook/e-book-shell-view.c:312
 msgid "_Forward Contacts"
 msgstr "轉寄連絡人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:302
+#: ../modules/addressbook/e-book-shell-view.c:314
 msgid "_Forward Contact"
 msgstr "轉寄連絡人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:333
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Send Message to Contacts"
 msgstr "傳送郵件給連絡人(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:335
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Send Message to List"
 msgstr "傳送郵件給清單(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:337
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Send Message to Contact"
 msgstr "傳送郵件給連絡人(_S)"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:309
+#: ../modules/audio-inline/e-mail-formatter-audio.c:314
 msgid "Audio Player"
 msgstr "音樂播放器"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+#: ../modules/audio-inline/e-mail-formatter-audio.c:315
 msgid "Play the attachment in embedded audio player"
 msgstr "在內嵌音樂播放器中播放附件"
 
@@ -15276,83 +15254,83 @@ msgid "With Graphical User Interface"
 msgstr "使用圖形使用者介面"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:317
-#: ../modules/backup-restore/evolution-backup-tool.c:511
+#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:515
 msgid "Shutting down Evolution"
 msgstr "正在關閉 Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:326
+#: ../modules/backup-restore/evolution-backup-tool.c:330
 msgid "Backing Evolution accounts and settings"
 msgstr "備份 Evolution 的帳號與設定值"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:343
+#: ../modules/backup-restore/evolution-backup-tool.c:347
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "正在備份 Evolution 資料 (郵件、連絡人、行事曆、工作、備忘錄)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:359
+#: ../modules/backup-restore/evolution-backup-tool.c:363
 msgid "Back up complete"
 msgstr "備份完成"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:366
-#: ../modules/backup-restore/evolution-backup-tool.c:698
+#: ../modules/backup-restore/evolution-backup-tool.c:370
+#: ../modules/backup-restore/evolution-backup-tool.c:702
 msgid "Restarting Evolution"
 msgstr "重新啟動 Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:517
+#: ../modules/backup-restore/evolution-backup-tool.c:521
 msgid "Back up current Evolution data"
 msgstr "備份目前的 Evolution 資料"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:524
+#: ../modules/backup-restore/evolution-backup-tool.c:528
 msgid "Extracting files from back up"
 msgstr "從備份解開檔案"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:606
+#: ../modules/backup-restore/evolution-backup-tool.c:610
 msgid "Loading Evolution settings"
 msgstr "正在讀取 Evolution 的設定值"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:672
+#: ../modules/backup-restore/evolution-backup-tool.c:676
 msgid "Removing temporary back up files"
 msgstr "移除暫存的備份檔案"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:683
+#: ../modules/backup-restore/evolution-backup-tool.c:687
 msgid "Reloading registry service"
 msgstr "重新載入註冊表服務"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:910
+#: ../modules/backup-restore/evolution-backup-tool.c:914
 msgid "Evolution Back Up"
 msgstr "Evolution 備份"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:911
+#: ../modules/backup-restore/evolution-backup-tool.c:915
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "正備份至資料夾 %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:915
+#: ../modules/backup-restore/evolution-backup-tool.c:919
 msgid "Evolution Restore"
 msgstr "Evolution 還原"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:920
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "從資料夾還原 %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:986
+#: ../modules/backup-restore/evolution-backup-tool.c:990
 msgid "Backing up Evolution Data"
 msgstr "備份 Evolution 資料"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:987
+#: ../modules/backup-restore/evolution-backup-tool.c:991
 msgid "Please wait while Evolution is backing up your data."
 msgstr "在 Evolution 備份您的資料時請稍候。"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:989
+#: ../modules/backup-restore/evolution-backup-tool.c:993
 msgid "Restoring Evolution Data"
 msgstr "還原 Evolution 資料"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:990
+#: ../modules/backup-restore/evolution-backup-tool.c:994
 msgid "Please wait while Evolution is restoring your data."
 msgstr "在 Evolution 還原您的資料時請稍候。"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1012
+#: ../modules/backup-restore/evolution-backup-tool.c:1016
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "這個動作所花的時間取決於您的帳號中資料的多寡。"
 
@@ -15504,7 +15482,7 @@ msgid "Using LDAP"
 msgstr "使用 LDAP"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/mail/e-mail-shell-view.c:117
 msgid "Searching"
 msgstr "正在搜尋"
 
@@ -15639,12 +15617,12 @@ msgstr "用於生日和週年紀念日行事曆"
 msgid "Default User Calendar"
 msgstr "é è¨­ä½¿ç”¨è€…è¡Œäº‹æ›†"
 
-#: ../modules/cal-config-google/e-google-chooser.c:508
+#: ../modules/cal-config-google/e-google-chooser.c:515
 #, c-format
 msgid "Enter Google password for user '%s'."
 msgstr "輸入使用者「%s」的 Google 密碼。"
 
-#: ../modules/cal-config-google/e-google-chooser.c:525
+#: ../modules/cal-config-google/e-google-chooser.c:532
 msgid "User declined to provide a password"
 msgstr "使用者需要輸入密碼"
 
@@ -15668,145 +15646,145 @@ msgstr "檔案："
 msgid "Allow Evolution to update the file"
 msgstr "允許 Evolution 更新檔案"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:318
+#: ../modules/calendar/e-cal-attachment-handler.c:320
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "匯入(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:404
+#: ../modules/calendar/e-cal-attachment-handler.c:406
 msgid "Select a Calendar"
 msgstr "選擇行事曆"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:431
+#: ../modules/calendar/e-cal-attachment-handler.c:433
 msgid "Select a Task List"
 msgstr "選擇工作清單"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:441
+#: ../modules/calendar/e-cal-attachment-handler.c:443
 msgid "I_mport to Calendar"
 msgstr "匯入至行事曆(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:448
+#: ../modules/calendar/e-cal-attachment-handler.c:450
 msgid "I_mport to Tasks"
 msgstr "匯入至工作(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.c:401
+#: ../modules/calendar/e-calendar-preferences.c:517
 msgid "Selected Calendars for Alarms"
 msgstr "選取的鬧鈴行事曆"
 
-#: ../modules/calendar/e-calendar-preferences.c:822
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "Ti_me and date:"
 msgstr "時刻和日期(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:823
+#: ../modules/calendar/e-calendar-preferences.c:926
 msgid "_Date only:"
 msgstr "只有日期(_D):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "小時"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "天"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60 分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30 分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15 分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10 分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
 msgstr "05 分鐘"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "第二時區(_C):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "(Shown in a Day View)"
 msgstr "(顯示於日檢視)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "使用系統時區(_Y)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "æ™‚åˆ»æ ¼å¼:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小時 (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24 小時"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Work Week"
 msgstr "工作週"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Wee_k starts on:"
 msgstr "一週開始於(_K):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "工作日:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "一日開始於(_D):"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "週一(_M)"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "週二(_T)"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "週三(_W)"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "週四(_H)"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "週五(_F)"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "週六(_S)"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "週日(_U)"
 
@@ -15911,62 +15889,67 @@ msgstr "%u 與 %d 會被替換為電子郵件位址中的使用者與網域名
 msgid "Publishing Information"
 msgstr "發布資訊"
 
-#: ../modules/calendar/e-cal-shell-backend.c:310
+#: ../modules/calendar/e-cal-shell-backend.c:313
 #: ../modules/calendar/e-cal-shell-view-actions.c:191
 msgid "New Calendar"
 msgstr "新行事曆"
 
-#: ../modules/calendar/e-cal-shell-backend.c:319
+#: ../modules/calendar/e-cal-shell-backend.c:322
 msgctxt "New"
 msgid "_Appointment"
 msgstr "約會(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:321
-#: ../modules/calendar/e-cal-shell-view-actions.c:1545
+#: ../modules/calendar/e-cal-shell-backend.c:324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1522
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
-#: ../modules/calendar/e-cal-shell-backend.c:326
+#: ../modules/calendar/e-cal-shell-backend.c:329
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "全日約會(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:331
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
 
-#: ../modules/calendar/e-cal-shell-backend.c:333
+#: ../modules/calendar/e-cal-shell-backend.c:336
 msgctxt "New"
 msgid "M_eeting"
 msgstr "會議(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:338
 msgid "Create a new meeting request"
 msgstr "建立新會議要求"
 
-#: ../modules/calendar/e-cal-shell-backend.c:343
+#: ../modules/calendar/e-cal-shell-backend.c:346
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-backend.c:348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
-#: ../modules/calendar/e-cal-shell-backend.c:668
+#: ../modules/calendar/e-cal-shell-backend.c:703
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:565
-msgid "Calendar Selector"
-msgstr "行事曆選擇器"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:868
+#: ../modules/calendar/e-cal-shell-sidebar.c:119
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "開啟行事曆「%s」"
 
+#: ../modules/calendar/e-cal-shell-sidebar.c:597
+msgid "Calendar Selector"
+msgstr "行事曆選擇器"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+msgid "Print"
+msgstr "列印"
+
 #: ../modules/calendar/e-cal-shell-view-actions.c:291
 msgid "Calendar Properties"
 msgstr "iCalendar 錯誤"
@@ -15985,357 +15968,351 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "清除早於這段時間的事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:588
+#: ../modules/calendar/e-cal-shell-view-actions.c:585
 msgid "Copying Items"
 msgstr "è¤‡è£½é …ç›®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:881
+#: ../modules/calendar/e-cal-shell-view-actions.c:878
 msgid "Moving Items"
 msgstr "ç§»å‹•é …ç›®"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1215
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "event"
 msgstr "事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1217
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 #: ../modules/calendar/e-cal-shell-view-memopad.c:231
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:548
-#: ../modules/calendar/e-task-shell-view-actions.c:665
+#: ../modules/calendar/e-memo-shell-view-actions.c:527
+#: ../modules/calendar/e-task-shell-view-actions.c:644
 msgid "Save as iCalendar"
 msgstr "儲存為 iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Copy..."
 msgstr "複製(_C)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "D_elete Calendar"
 msgstr "刪除行事曆(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Delete the selected calendar"
 msgstr "刪除選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Go Back"
 msgstr "向後"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "Go Forward"
 msgstr "向前"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Select today"
 msgstr "選取今日"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Select _Date"
 msgstr "選擇日期(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Select a specific date"
 msgstr "選取特定日期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
-#: ../modules/calendar/e-task-shell-view-actions.c:837
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Purg_e"
 msgstr "清除(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
 msgid "Purge old appointments and meetings"
 msgstr "刪除舊約會和會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:781
-msgid "Re_fresh"
-msgstr "重新整理(_F)"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "Refresh the selected calendar"
 msgstr "重新整理選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Rename the selected calendar"
 msgstr "重新命名選取的行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
 msgid "Find _next"
 msgstr "尋找下一個(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Find next occurrence of the current search string"
 msgstr "尋找目前搜尋字詞下一個出現處"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Find _previous"
 msgstr "尋找上一個(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Find previous occurrence of the current search string"
 msgstr "尋找目前搜尋字詞上一個出現處"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Stop _running search"
 msgstr "停止執行搜尋(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "Stop currently running search"
 msgstr "停止目前執行的搜尋"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 msgid "Show _Only This Calendar"
 msgstr "只顯示這個行事曆(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1464
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1494
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
 msgid "_Delete Appointment"
 msgstr "刪除約會(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "Delete selected appointments"
 msgstr "刪除選取的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1501
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "Delete This _Occurrence"
 msgstr "刪除這次發生的事件(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Delete this occurrence"
 msgstr "刪除此週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1508
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
 msgid "Delete All Occ_urrences"
 msgstr "刪除所有發生的事件(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
 msgid "Delete all occurrences"
 msgstr "刪除全部週期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1515
+#: ../modules/calendar/e-cal-shell-view-actions.c:1492
 msgid "New All Day _Event..."
 msgstr "新增全天事件(_E)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1494
 msgid "Create a new all day event"
 msgstr "建立新的全天事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1499
 #: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1529
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
 msgid "New _Meeting..."
 msgstr "新增會議(_M)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1508
 msgid "Create a new meeting"
 msgstr "建立新的會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1536
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1543
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
 msgid "New _Appointment..."
 msgstr "新增約會(_A)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1527
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
 msgid "_Open Appointment"
 msgstr "開啟約會(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1536
 msgid "View the current appointment"
 msgstr "檢視目前的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1541
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1555
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
 msgid "Converts an appointment to a meeting"
 msgstr "將約會轉換為會議"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
 msgid "Conv_ert to Appointment..."
 msgstr "轉換為約會(_E)…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
 msgid "Converts a meeting to an appointment"
 msgstr "將會議轉換為約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1569
 msgid "Quit"
 msgstr "結束"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1712
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1714
+#: ../modules/calendar/e-cal-shell-view-actions.c:1691
 msgid "Show one day"
 msgstr "顯示一天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
 msgid "List"
 msgstr "清單"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1721
+#: ../modules/calendar/e-cal-shell-view-actions.c:1698
 msgid "Show as list"
 msgstr "顯示成清單"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
+#: ../modules/calendar/e-cal-shell-view-actions.c:1705
 msgid "Show one month"
 msgstr "顯示一個月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
 msgid "Week"
 msgstr "週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1735
+#: ../modules/calendar/e-cal-shell-view-actions.c:1712
 msgid "Show one week"
 msgstr "顯示一週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1742
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
 msgid "Show one work week"
 msgstr "顯示一個工作週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1750
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 msgid "Active Appointments"
 msgstr "進行中的約會"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1764
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
 msgid "Next 7 Days' Appointments"
 msgstr "未來 7 天的約會(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1771
+#: ../modules/calendar/e-cal-shell-view-actions.c:1748
 msgid "Occurs Less Than 5 Times"
 msgstr "發生少於五次"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1802
-#: ../modules/calendar/e-memo-shell-view-actions.c:819
-#: ../modules/calendar/e-task-shell-view-actions.c:1018
+#: ../modules/calendar/e-cal-shell-view-actions.c:1779
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:997
 msgid "Description contains"
 msgstr "描述包含"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1809
-#: ../modules/calendar/e-memo-shell-view-actions.c:826
-#: ../modules/calendar/e-task-shell-view-actions.c:1025
+#: ../modules/calendar/e-cal-shell-view-actions.c:1786
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
 msgid "Summary contains"
 msgstr "主旨包含"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1821
+#: ../modules/calendar/e-cal-shell-view-actions.c:1798
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1828
+#: ../modules/calendar/e-cal-shell-view-actions.c:1805
 msgid "Preview the calendar to be printed"
 msgstr "é è¦½å°‡è¦åˆ—å°çš„è¡Œäº‹æ›†"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1850
+#: ../modules/calendar/e-cal-shell-view-actions.c:1827
 #: ../modules/calendar/e-cal-shell-view-memopad.c:306
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:867
-#: ../modules/calendar/e-task-shell-view-actions.c:1066
+#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-task-shell-view-actions.c:1045
 msgid "_Save as iCalendar..."
 msgstr "儲存為 iCalendar[_S]…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1927
+#: ../modules/calendar/e-cal-shell-view-actions.c:1904
 msgid "Go To"
 msgstr "移至"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:546
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
 msgid "memo"
 msgstr "備忘錄"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "New _Memo"
 msgstr "新增備忘錄(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:274
 #: ../modules/calendar/e-memo-shell-backend.c:219
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:685
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "_Open Memo"
 msgstr "開啟備忘錄(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:687
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "View the selected memo"
 msgstr "檢視選取的備忘錄"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:286
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Open _Web Page"
 msgstr "é–‹å•Ÿç¶²é (_W)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:852
+#: ../modules/calendar/e-memo-shell-view-actions.c:831
 msgid "Print the selected memo"
 msgstr "列印選取的備忘錄"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1509
+#: ../modules/calendar/e-cal-shell-view-private.c:1591
 msgid "Searching next matching event"
 msgstr "搜尋下一個符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1510
+#: ../modules/calendar/e-cal-shell-view-private.c:1592
 msgid "Searching previous matching event"
 msgstr "搜尋前一個符合的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1531
+#: ../modules/calendar/e-cal-shell-view-private.c:1613
 #, 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:1535
+#: ../modules/calendar/e-cal-shell-view-private.c:1617
 #, 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:1560
+#: ../modules/calendar/e-cal-shell-view-private.c:1642
 msgid "Cannot search with no active calendar"
 msgstr "不能搜尋未使用的行事曆"
 
@@ -16344,22 +16321,22 @@ msgstr "不能搜尋未使用的行事曆"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "task"
 msgstr "工作"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:704
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Mark selected tasks as complete"
 msgstr "將選取的工作標示成完成"
 
@@ -16368,38 +16345,38 @@ msgid "_Mark as Incomplete"
 msgstr "標示為未完成(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:811
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Mark selected tasks as incomplete"
 msgstr "將選取的工作標示成未完成"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "New _Task"
 msgstr "新增工作(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:361
 #: ../modules/calendar/e-task-shell-backend.c:216
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../modules/calendar/e-task-shell-view-actions.c:797
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Open Task"
 msgstr "開啟工作(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "View the selected task"
 msgstr "檢視選取的工作"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1051
+#: ../modules/calendar/e-task-shell-view-actions.c:1030
 msgid "Print the selected task"
 msgstr "列印選取的工作"
 
 #: ../modules/calendar/e-memo-shell-backend.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:216
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
 msgid "New Memo List"
 msgstr "新增備忘錄清單"
 
@@ -16423,110 +16400,110 @@ msgid "Memo Li_st"
 msgstr "備忘錄清單(_S)"
 
 #: ../modules/calendar/e-memo-shell-backend.c:236
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:499
-msgid "Memo List Selector"
-msgstr "備忘錄清單選擇器"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:755
+#: ../modules/calendar/e-memo-shell-sidebar.c:117
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "開啟備忘錄清單「%s」"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:232
-#: ../modules/calendar/e-memo-shell-view-actions.c:247
+#: ../modules/calendar/e-memo-shell-sidebar.c:553
+msgid "Memo List Selector"
+msgstr "備忘錄清單選擇器"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
 msgid "Print Memos"
 msgstr "列印備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:288
+#: ../modules/calendar/e-memo-shell-view-actions.c:268
 msgid "Memo List Properties"
 msgstr "備忘錄清單屬性"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "_Delete Memo"
 msgstr "刪除備忘錄(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "_Find in Memo..."
 msgstr "在備忘錄內尋找(_F)…"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
 msgid "Search for text in the displayed memo"
 msgstr "搜尋顯示的備忘錄中的文字"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "D_elete Memo List"
 msgstr "刪除備忘錄清單(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Delete the selected memo list"
 msgstr "刪除選取的備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "_New Memo List"
 msgstr "新增備忘錄清單(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 msgid "Refresh the selected memo list"
 msgstr "重新整理選取的備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Rename the selected memo list"
 msgstr "重新命名選取的備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 msgid "Show _Only This Memo List"
 msgstr "只顯示此備忘錄清單(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Memo _Preview"
 msgstr "å‚™å¿˜éŒ„é è¦½(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:731
 msgid "Show memo preview pane"
 msgstr "é¡¯ç¤ºå‚™å¿˜éŒ„é è¦½çª—æ ¼"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview below the memo list"
 msgstr "åœ¨å‚™å¿˜éŒ„æ¸…å–®ä¸‹æ–¹é¡¯ç¤ºå‚™å¿˜éŒ„é è¦½"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:780
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Show memo preview alongside the memo list"
 msgstr "åœ¨å‚™å¿˜éŒ„æ¸…å–®æ—é‚Šé¡¯ç¤ºå‚™å¿˜éŒ„é è¦½"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:838
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Print the list of memos"
 msgstr "列印備忘錄清單"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Preview the list of memos to be printed"
 msgstr "é è¦½å°‡è¦åˆ—å°çš„å‚™å¿˜éŒ„æ¸…å–®"
 
-#: ../modules/calendar/e-memo-shell-view.c:236
+#: ../modules/calendar/e-memo-shell-view.c:239
 msgid "Delete Memos"
 msgstr "刪除備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:241
 msgid "Delete Memo"
 msgstr "刪除備忘錄"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:465
+#: ../modules/calendar/e-memo-shell-view-private.c:538
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d é …å‚™å¿˜éŒ„"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:469
-#: ../modules/calendar/e-task-shell-view-private.c:639
+#: ../modules/calendar/e-memo-shell-view-private.c:542
+#: ../modules/calendar/e-task-shell-view-private.c:746
 #, c-format
 msgid "%d selected"
 msgstr "已選擇 %d 個"
 
 #: ../modules/calendar/e-task-shell-backend.c:205
-#: ../modules/calendar/e-task-shell-view-actions.c:239
+#: ../modules/calendar/e-task-shell-view-actions.c:219
 msgid "New Task List"
 msgstr "新增工作清單"
 
@@ -16550,29 +16527,29 @@ msgid "Tas_k List"
 msgstr "工作清單(_K)"
 
 #: ../modules/calendar/e-task-shell-backend.c:233
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:748
 msgid "Create a new task list"
 msgstr "建立新工作清單"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:499
-msgid "Task List Selector"
-msgstr "工作清單選擇器"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:755
+#: ../modules/calendar/e-task-shell-sidebar.c:117
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "開啟工作清單「%s」"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:255
-#: ../modules/calendar/e-task-shell-view-actions.c:270
+#: ../modules/calendar/e-task-shell-sidebar.c:553
+msgid "Task List Selector"
+msgstr "工作清單選擇器"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
 msgid "Print Tasks"
 msgstr "列印工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:311
+#: ../modules/calendar/e-task-shell-view-actions.c:291
 msgid "Task List Properties"
 msgstr "工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:586
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -16584,786 +16561,786 @@ msgstr ""
 "\n"
 "確定清除這些工作？"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:593
 msgid "Do not ask me again"
 msgstr "不要再詢問我"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "_Delete Task"
 msgstr "刪除工作(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "_Find in Task..."
 msgstr "在工作內尋找(_F)…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:720
 msgid "Search for text in the displayed task"
 msgstr "搜尋顯示的工作中的文字"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "Copy..."
 msgstr "複製…"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "D_elete Task List"
 msgstr "刪除工作清單(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Delete the selected task list"
 msgstr "刪除選取的工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Refresh the selected task list"
 msgstr "重新整理選取的工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "Rename the selected task list"
 msgstr "重新命名選取的工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Show _Only This Task List"
 msgstr "只顯示此工作清單(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mar_k as Incomplete"
 msgstr "標示為未完成(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "Delete completed tasks"
 msgstr "刪除已完成的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Task _Preview"
 msgstr "å·¥ä½œé è¦½(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Show task preview pane"
 msgstr "é¡¯ç¤ºå·¥ä½œé è¦½çª—æ ¼"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview below the task list"
 msgstr "åœ¨å·¥ä½œæ¸…å–®ä¸‹æ–¹é¡¯ç¤ºå·¥ä½œé è¦½"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:923
 msgid "Show task preview alongside the task list"
 msgstr "åœ¨å·¥ä½œæ¸…å–®æ—é‚Šé¡¯ç¤ºå·¥ä½œé è¦½"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/calendar/e-task-shell-view-actions.c:931
 msgid "Active Tasks"
 msgstr "進行中的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:945
 msgid "Completed Tasks"
 msgstr "已完成的工作 "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Next 7 Days' Tasks"
 msgstr "未來 7 天的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Overdue Tasks"
 msgstr "過期的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Tasks with Attachments"
 msgstr "有附件的工作"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1037
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Print the list of tasks"
 msgstr "列印工作清單"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Preview the list of tasks to be printed"
 msgstr "é è¦½å°‡è¦åˆ—å°çš„å·¥ä½œæ¸…å–®"
 
-#: ../modules/calendar/e-task-shell-view.c:371
+#: ../modules/calendar/e-task-shell-view.c:374
 msgid "Delete Tasks"
 msgstr "刪除工作"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:376
 msgid "Delete Task"
 msgstr "刪除工作"
 
-#: ../modules/calendar/e-task-shell-view-private.c:524
+#: ../modules/calendar/e-task-shell-view-private.c:631
 msgid "Expunging"
 msgstr "除去中"
 
-#: ../modules/calendar/e-task-shell-view-private.c:635
+#: ../modules/calendar/e-task-shell-view-private.c:742
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d é …å·¥ä½œ"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:145
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:146
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
 msgid "Display part as an invitation"
 msgstr "將部分顯示為邀請"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:233
+#: ../modules/itip-formatter/itip-view.c:235
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:237
+#: ../modules/itip-formatter/itip-view.c:239
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:246
+#: ../modules/itip-formatter/itip-view.c:248
 msgid "Today %l:%M:%S %p"
 msgstr "今天 %p %l:%M:%S"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:261
+#: ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:265
+#: ../modules/itip-formatter/itip-view.c:267
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:270
+#: ../modules/itip-formatter/itip-view.c:272
 msgid "Tomorrow %l:%M %p"
 msgstr "明天 %p %l:%M"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:274
+#: ../modules/itip-formatter/itip-view.c:276
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天 %p %l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:293
+#: ../modules/itip-formatter/itip-view.c:295
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:298
+#: ../modules/itip-formatter/itip-view.c:300
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:302
+#: ../modules/itip-formatter/itip-view.c:304
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:307
+#: ../modules/itip-formatter/itip-view.c:309
 msgid "%A %l:%M %p"
 msgstr "%A %p %l:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:311
+#: ../modules/itip-formatter/itip-view.c:313
 msgid "%A %l:%M:%S %p"
 msgstr "%A %p %l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:320
+#: ../modules/itip-formatter/itip-view.c:322
 msgid "%A, %B %e"
 msgstr "%m月%e日(%A)"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:326
+#: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %H:%M"
 msgstr "%m月%e日(%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:330
+#: ../modules/itip-formatter/itip-view.c:332
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%m月%e日(%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:335
+#: ../modules/itip-formatter/itip-view.c:337
 msgid "%A, %B %e %l:%M %p"
 msgstr "%m月%e日(%A) %p %l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:339
+#: ../modules/itip-formatter/itip-view.c:341
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%m月%e日(%A) %p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:345
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y"
 msgstr "%Y年%m月%e日(%A)"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:350
+#: ../modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y年%m月%e日(%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:354
+#: ../modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y年%m月%e日(%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:359
+#: ../modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y年%m月%e日(%A) %p %l:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:363
+#: ../modules/itip-formatter/itip-view.c:365
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%m月%e日(%A) %p %l:%M:%S"
 
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:402
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:492
-#: ../modules/itip-formatter/itip-view.c:581
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:404
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:494
+#: ../modules/itip-formatter/itip-view.c:583
 msgid "An unknown person"
 msgstr "不明人士"
 
-#: ../modules/itip-formatter/itip-view.c:406
-#: ../modules/itip-formatter/itip-view.c:496
-#: ../modules/itip-formatter/itip-view.c:585
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "請代表 %s 回覆"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:589
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "代表 %s 接收"
 
-#: ../modules/itip-formatter/itip-view.c:413
+#: ../modules/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s 透過 %s 已經發布下列會議資訊："
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:417
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s 已經發布下列會議資訊："
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:422
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s 已經委派下列會議給您："
 
-#: ../modules/itip-formatter/itip-view.c:423
+#: ../modules/itip-formatter/itip-view.c:425
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s 透過 %s 邀請您出席下列會議："
 
-#: ../modules/itip-formatter/itip-view.c:425
+#: ../modules/itip-formatter/itip-view.c:427
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s 邀請您出席下列會議："
 
-#: ../modules/itip-formatter/itip-view.c:431
+#: ../modules/itip-formatter/itip-view.c:433
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s 透過 %s å¸Œæœ›åŠ å…¥ä¸€å€‹æ—¢å­˜çš„æœƒè­°ï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:433
+#: ../modules/itip-formatter/itip-view.c:435
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s å¸Œæœ›åŠ å…¥ä¸€å€‹æ—¢å­˜çš„æœƒè­°ï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:437
+#: ../modules/itip-formatter/itip-view.c:439
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s 透過 %s 希望收到下列會議的最新資訊："
 
-#: ../modules/itip-formatter/itip-view.c:439
+#: ../modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s 希望收到下列會議的最新資訊："
 
-#: ../modules/itip-formatter/itip-view.c:443
+#: ../modules/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s 透過 %s 傳送了下列會議的回覆："
 
-#: ../modules/itip-formatter/itip-view.c:445
+#: ../modules/itip-formatter/itip-view.c:447
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s 傳送了下列會議的回覆："
 
-#: ../modules/itip-formatter/itip-view.c:449
+#: ../modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s 透過 %s 已經消取下列會議："
 
-#: ../modules/itip-formatter/itip-view.c:451
+#: ../modules/itip-formatter/itip-view.c:453
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s 已經消取下列會議："
 
-#: ../modules/itip-formatter/itip-view.c:455
+#: ../modules/itip-formatter/itip-view.c:457
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s 透過 %s 已經答覆了下列會議變更。"
 
-#: ../modules/itip-formatter/itip-view.c:457
+#: ../modules/itip-formatter/itip-view.c:459
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s 已經答覆了下列會議變更："
 
-#: ../modules/itip-formatter/itip-view.c:461
+#: ../modules/itip-formatter/itip-view.c:463
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s 透過 %s 已經婉拒了下列會議變更："
 
-#: ../modules/itip-formatter/itip-view.c:463
+#: ../modules/itip-formatter/itip-view.c:465
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s 已經婉拒了下列會議變更："
 
-#: ../modules/itip-formatter/itip-view.c:503
+#: ../modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s 透過 %s 已經發布了下列工作資訊："
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:507
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s 已經發布了下列工作："
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s 指派 %s åŠ å…¥ä¸‹åˆ—å·¥ä½œï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:513
+#: ../modules/itip-formatter/itip-view.c:515
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s 透過 %s å·²ç¶“æŒ‡æ´¾æ‚¨ä¸€é …å·¥ä½œï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:515
+#: ../modules/itip-formatter/itip-view.c:517
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s å·²ç¶“æŒ‡æ´¾æ‚¨ä¸€é …å·¥ä½œï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:521
+#: ../modules/itip-formatter/itip-view.c:523
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s 透過 %s å¸Œæœ›åŠ å…¥ä¸€é …æ—¢å­˜çš„å·¥ä½œï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:525
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s å¸Œæœ›åŠ å…¥ä¸€é …æ—¢å­˜çš„å·¥ä½œï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:527
+#: ../modules/itip-formatter/itip-view.c:529
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "%s 透過 %s 希望收到下列指派工作的最新資訊："
 
-#: ../modules/itip-formatter/itip-view.c:529
+#: ../modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s 希望收到下列指派工作的最新資訊："
 
-#: ../modules/itip-formatter/itip-view.c:533
+#: ../modules/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s 透過 %s 傳送了下列指派工作的回覆："
 
-#: ../modules/itip-formatter/itip-view.c:535
+#: ../modules/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s 傳送了下列指派工作的回覆："
 
-#: ../modules/itip-formatter/itip-view.c:539
+#: ../modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s 透過 %s 已經取消下列指派的工作："
 
-#: ../modules/itip-formatter/itip-view.c:541
+#: ../modules/itip-formatter/itip-view.c:543
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s 已經取消下列指派的工作："
 
-#: ../modules/itip-formatter/itip-view.c:545
+#: ../modules/itip-formatter/itip-view.c:547
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s 透過 %s 已經回覆下列指派工作的變更："
 
-#: ../modules/itip-formatter/itip-view.c:547
+#: ../modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s 已經回覆下列指派工作的變更："
 
-#: ../modules/itip-formatter/itip-view.c:551
+#: ../modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s 透過 %s 已婉拒了下列指派的工作："
 
-#: ../modules/itip-formatter/itip-view.c:553
+#: ../modules/itip-formatter/itip-view.c:555
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s 已經婉拒下列指派的工作："
 
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s 透過 %s 已經發布了下列備忘錄："
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:596
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s 已經發布了備忘錄："
 
-#: ../modules/itip-formatter/itip-view.c:599
+#: ../modules/itip-formatter/itip-view.c:601
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s 透過 %s å¸Œæœ›åŠ å…¥ä¸€å€‹æ—¢å­˜çš„å‚™å¿˜éŒ„ï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:603
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s å¸Œæœ›åŠ å…¥ä¸€å€‹æ—¢å­˜çš„å‚™å¿˜éŒ„ï¼š"
 
-#: ../modules/itip-formatter/itip-view.c:605
+#: ../modules/itip-formatter/itip-view.c:607
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s 透過 %s 已經消取下列共用備忘錄："
 
-#: ../modules/itip-formatter/itip-view.c:607
+#: ../modules/itip-formatter/itip-view.c:609
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s 已經取消下列共用備忘錄："
 
-#: ../modules/itip-formatter/itip-view.c:680
+#: ../modules/itip-formatter/itip-view.c:682
 msgid "All day:"
 msgstr "整天："
 
-#: ../modules/itip-formatter/itip-view.c:686
+#: ../modules/itip-formatter/itip-view.c:688
 msgid "Start day:"
 msgstr "開始日："
 
-#: ../modules/itip-formatter/itip-view.c:686
-#: ../modules/itip-formatter/itip-view.c:1465
+#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:1490
 msgid "Start time:"
 msgstr "開始時間:"
 
-#: ../modules/itip-formatter/itip-view.c:695
+#: ../modules/itip-formatter/itip-view.c:697
 msgid "End day:"
 msgstr "結束日："
 
-#: ../modules/itip-formatter/itip-view.c:695
-#: ../modules/itip-formatter/itip-view.c:1466
+#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:1491
 msgid "End time:"
 msgstr "結束時間:"
 
-#: ../modules/itip-formatter/itip-view.c:1014
+#: ../modules/itip-formatter/itip-view.c:1016
 msgid "Ope_n Calendar"
 msgstr "開啟行事曆(_N)"
 
-#: ../modules/itip-formatter/itip-view.c:1017
+#: ../modules/itip-formatter/itip-view.c:1019
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1020
+#: ../modules/itip-formatter/itip-view.c:1022
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1023
+#: ../modules/itip-formatter/itip-view.c:1025
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1026
+#: ../modules/itip-formatter/itip-view.c:1028
 msgid "_Tentative"
 msgstr "暫訂(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1029
+#: ../modules/itip-formatter/itip-view.c:1031
 msgid "Acce_pt all"
 msgstr "全部接受(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1032
+#: ../modules/itip-formatter/itip-view.c:1034
 msgid "Acce_pt"
 msgstr "接受(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1035
+#: ../modules/itip-formatter/itip-view.c:1037
 msgid "Send _Information"
 msgstr "傳送資訊(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1038
+#: ../modules/itip-formatter/itip-view.c:1040
 msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../modules/itip-formatter/itip-view.c:1043
 msgid "_Update"
 msgstr "æ›´æ–°(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1468
-#: ../modules/itip-formatter/itip-view.c:1516
-#: ../modules/itip-formatter/itip-view.c:1587
+#: ../modules/itip-formatter/itip-view.c:1493
+#: ../modules/itip-formatter/itip-view.c:1541
+#: ../modules/itip-formatter/itip-view.c:1612
 msgid "Comment:"
 msgstr "註解:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1504
+#: ../modules/itip-formatter/itip-view.c:1529
 msgid "Send reply to sender"
 msgstr "回覆寄件者"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1544
 msgid "Send _updates to attendees"
 msgstr "傳送更新給到會者(_U)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1522
+#: ../modules/itip-formatter/itip-view.c:1547
 msgid "_Apply to all instances"
 msgstr "套用至所有實體(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1523
+#: ../modules/itip-formatter/itip-view.c:1548
 msgid "Show time as _free"
 msgstr "顯示時間為空閒(_F)"
 
-#: ../modules/itip-formatter/itip-view.c:1524
+#: ../modules/itip-formatter/itip-view.c:1549
 msgid "_Preserve my reminder"
 msgstr "保留我的提醒(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1525
+#: ../modules/itip-formatter/itip-view.c:1550
 msgid "_Inherit reminder"
 msgstr "繼承提醒(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1853
+#: ../modules/itip-formatter/itip-view.c:1880
 msgid "_Tasks:"
 msgstr "工作(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1856
+#: ../modules/itip-formatter/itip-view.c:1883
 msgid "_Memos:"
 msgstr "備忘錄(_M):"
 
-#: ../modules/itip-formatter/itip-view.c:3086
+#: ../modules/itip-formatter/itip-view.c:3111
 msgid "Sa_ve"
 msgstr "儲存(_V)"
 
-#: ../modules/itip-formatter/itip-view.c:3651
+#: ../modules/itip-formatter/itip-view.c:3681
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "行事曆 '%s' 中的約會和這個會議相衝突"
 
-#: ../modules/itip-formatter/itip-view.c:3680
+#: ../modules/itip-formatter/itip-view.c:3710
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s」中的約會"
 
-#: ../modules/itip-formatter/itip-view.c:3793
+#: ../modules/itip-formatter/itip-view.c:3823
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:3801
+#: ../modules/itip-formatter/itip-view.c:3831
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個約會"
 
-#: ../modules/itip-formatter/itip-view.c:3806
+#: ../modules/itip-formatter/itip-view.c:3836
 msgid "Unable to find this task in any task list"
 msgstr "ç„¡æ³•åœ¨ä»»ä½•å·¥ä½œæ¸…å–®ä¸­æ‰¾åˆ°é€™é …å·¥ä½œ"
 
-#: ../modules/itip-formatter/itip-view.c:3811
+#: ../modules/itip-formatter/itip-view.c:3841
 msgid "Unable to find this memo in any memo list"
 msgstr "ç„¡æ³•åœ¨ä»»ä½•å‚™å¿˜éŒ„æ¸…å–®ä¸­æ‰¾åˆ°é€™é …å‚™å¿˜éŒ„"
 
-#: ../modules/itip-formatter/itip-view.c:4162
+#: ../modules/itip-formatter/itip-view.c:4187
 msgid "Opening the calendar. Please wait..."
 msgstr "正在開啟行事曆。請稍候…"
 
-#: ../modules/itip-formatter/itip-view.c:4167
+#: ../modules/itip-formatter/itip-view.c:4192
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個約會既存的版本"
 
-#: ../modules/itip-formatter/itip-view.c:4557
+#: ../modules/itip-formatter/itip-view.c:4583
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ç„¡æ³•å‚³é€é …ç›®è‡³è¡Œäº‹æ›†ã€Œ%s」。%s"
 
-#: ../modules/itip-formatter/itip-view.c:4573
+#: ../modules/itip-formatter/itip-view.c:4599
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "傳送至行事曆 '%s' 並設為已接受"
 
-#: ../modules/itip-formatter/itip-view.c:4578
+#: ../modules/itip-formatter/itip-view.c:4604
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "傳送至行事曆 '%s' 並設為不確定的"
 
-#: ../modules/itip-formatter/itip-view.c:4584
+#: ../modules/itip-formatter/itip-view.c:4610
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "傳送至行事曆 '%s' 並設為已婉拒"
 
-#: ../modules/itip-formatter/itip-view.c:4590
+#: ../modules/itip-formatter/itip-view.c:4616
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "傳送至行事曆「%s」並設為已取消"
 
-#: ../modules/itip-formatter/itip-view.c:4611
-#: ../modules/itip-formatter/itip-view.c:5052
-#: ../modules/itip-formatter/itip-view.c:5159
+#: ../modules/itip-formatter/itip-view.c:4637
+#: ../modules/itip-formatter/itip-view.c:5084
+#: ../modules/itip-formatter/itip-view.c:5191
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "正在將變更儲存到行事曆。請稍候…"
 
-#: ../modules/itip-formatter/itip-view.c:4652
+#: ../modules/itip-formatter/itip-view.c:4678
 msgid "Unable to parse item"
 msgstr "ç„¡æ³•åˆ†æžé …ç›®"
 
-#: ../modules/itip-formatter/itip-view.c:4842
+#: ../modules/itip-formatter/itip-view.c:4871
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-#: ../modules/itip-formatter/itip-view.c:4857
+#: ../modules/itip-formatter/itip-view.c:4888
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-#: ../modules/itip-formatter/itip-view.c:4861
+#: ../modules/itip-formatter/itip-view.c:4892
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
 
-#: ../modules/itip-formatter/itip-view.c:4911
+#: ../modules/itip-formatter/itip-view.c:4943
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新到會者。%s"
 
-#: ../modules/itip-formatter/itip-view.c:4918
+#: ../modules/itip-formatter/itip-view.c:4950
 msgid "Attendee status updated"
 msgstr "到會者狀態已更新"
 
-#: ../modules/itip-formatter/itip-view.c:4941
+#: ../modules/itip-formatter/itip-view.c:4973
 msgid "The meeting is invalid and cannot be updated"
 msgstr "這個會議無效並且不能更新"
 
-#: ../modules/itip-formatter/itip-view.c:5017
+#: ../modules/itip-formatter/itip-view.c:5049
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！"
 
-#: ../modules/itip-formatter/itip-view.c:5089
-#: ../modules/itip-formatter/itip-view.c:5129
+#: ../modules/itip-formatter/itip-view.c:5121
+#: ../modules/itip-formatter/itip-view.c:5161
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "åˆ°æœƒè€…ç‹€æ…‹ä¸èƒ½æ›´æ–°ï¼Œå› ç‚ºé …ç›®å·²ç¶“ä¸å­˜åœ¨"
 
-#: ../modules/itip-formatter/itip-view.c:5192
+#: ../modules/itip-formatter/itip-view.c:5224
 msgid "Meeting information sent"
 msgstr "會議資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5197
+#: ../modules/itip-formatter/itip-view.c:5229
 msgid "Task information sent"
 msgstr "工作資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5202
+#: ../modules/itip-formatter/itip-view.c:5234
 msgid "Memo information sent"
 msgstr "備忘錄資訊寄出"
 
-#: ../modules/itip-formatter/itip-view.c:5213
+#: ../modules/itip-formatter/itip-view.c:5245
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "無法寄出會議資訊，該會議並不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5218
+#: ../modules/itip-formatter/itip-view.c:5250
 msgid "Unable to send task information, the task does not exist"
 msgstr "ç„¡æ³•å¯„å‡ºå·¥ä½œè³‡è¨Šï¼Œè©²é …å·¥ä½œä¸å­˜åœ¨"
 
-#: ../modules/itip-formatter/itip-view.c:5223
+#: ../modules/itip-formatter/itip-view.c:5255
 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:5288
+#: ../modules/itip-formatter/itip-view.c:5320
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5293
+#: ../modules/itip-formatter/itip-view.c:5325
 msgid "Save Calendar"
 msgstr "儲存行事曆"
 
-#: ../modules/itip-formatter/itip-view.c:5346
-#: ../modules/itip-formatter/itip-view.c:5359
+#: ../modules/itip-formatter/itip-view.c:5374
+#: ../modules/itip-formatter/itip-view.c:5387
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../modules/itip-formatter/itip-view.c:5347
-#: ../modules/itip-formatter/itip-view.c:5360
+#: ../modules/itip-formatter/itip-view.c:5375
+#: ../modules/itip-formatter/itip-view.c:5388
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "此郵件宣告其含有行事曆內容，但其行事曆並非有效的 iCalendar。"
 
-#: ../modules/itip-formatter/itip-view.c:5402
-#: ../modules/itip-formatter/itip-view.c:5432
-#: ../modules/itip-formatter/itip-view.c:5532
+#: ../modules/itip-formatter/itip-view.c:5430
+#: ../modules/itip-formatter/itip-view.c:5460
+#: ../modules/itip-formatter/itip-view.c:5561
 msgid "The item in the calendar is not valid"
 msgstr "è¡Œäº‹æ›†ä¸­çš„é …ç›®æ˜¯ç„¡æ•ˆçš„"
 
-#: ../modules/itip-formatter/itip-view.c:5403
-#: ../modules/itip-formatter/itip-view.c:5433
-#: ../modules/itip-formatter/itip-view.c:5533
+#: ../modules/itip-formatter/itip-view.c:5431
+#: ../modules/itip-formatter/itip-view.c:5461
+#: ../modules/itip-formatter/itip-view.c:5562
 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:5448
+#: ../modules/itip-formatter/itip-view.c:5476
 msgid "The calendar attached contains multiple items"
 msgstr "é™„åŠ çš„è¡Œäº‹æ›†å…§å®¹å«æœ‰å¤šå€‹é …ç›®"
 
-#: ../modules/itip-formatter/itip-view.c:5449
+#: ../modules/itip-formatter/itip-view.c:5477
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "è¦è™•ç†é€™äº›å…¨éƒ¨çš„é …ç›®ï¼Œæ‡‰è©²å°‡æ­¤æª”æ¡ˆå„²å­˜å¾ŒåŒ¯å…¥å…¶ä¸­çš„è¡Œäº‹æ›†"
 
-#: ../modules/itip-formatter/itip-view.c:5944
+#: ../modules/itip-formatter/itip-view.c:5978
 msgctxt "cal-itip"
 msgid "None"
 msgstr "沒有"
 
-#: ../modules/itip-formatter/itip-view.c:5960
+#: ../modules/itip-formatter/itip-view.c:5994
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: ../modules/itip-formatter/itip-view.c:6103
+#: ../modules/itip-formatter/itip-view.c:6154
 msgid "This meeting recurs"
 msgstr "這個會議的週期規則為"
 
-#: ../modules/itip-formatter/itip-view.c:6106
+#: ../modules/itip-formatter/itip-view.c:6157
 msgid "This task recurs"
 msgstr "é€™é …å·¥ä½œçš„é€±æœŸè¦å‰‡ç‚º"
 
-#: ../modules/itip-formatter/itip-view.c:6109
+#: ../modules/itip-formatter/itip-view.c:6160
 msgid "This memo recurs"
 msgstr "這個備忘錄的週期規則為"
 
@@ -17460,7 +17437,7 @@ msgid "Choose a mbox spool directory"
 msgstr "選擇 mbox 排程器目錄"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:137
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:80
 #: ../modules/plugin-manager/evolution-plugin-manager.c:159
 msgid "Configuration"
@@ -17497,23 +17474,23 @@ msgstr "連線後使用 STARTTLS"
 msgid "SSL on a dedicated port"
 msgstr "SSL æ–¼å°ˆç”¨çš„é€£æŽ¥åŸ "
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "使用自訂的二元檔，取代「sendmail」(_U)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
 msgid "_Custom binary:"
 msgstr "自訂二元檔(_C):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
 msgid "U_se custom arguments"
 msgstr "使用自訂引數(_S)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
 msgid "Cus_tom arguments:"
 msgstr "自訂引數(_T):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -17523,6 +17500,10 @@ msgstr ""
 "   %F - 代表寄件者郵件位址\n"
 "   %R - 代表收件者郵件位址"
 
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+msgid "Send mail also when in offline _mode"
+msgstr "離線模式下仍傳送郵件(_M)"
+
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求驗證(_V)"
@@ -17539,470 +17520,476 @@ msgstr "Yahoo! 功能"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "å°‡ Yahoo! è¡Œäº‹æ›†èˆ‡å·¥ä½œåŠ å…¥é€™å€‹å¸³è™Ÿ(_L)"
 
-#: ../modules/mail/e-mail-attachment-handler.c:404
+#: ../modules/mail/e-mail-attachment-handler.c:425
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d å°é™„åŠ çš„éƒµä»¶"
 
-#: ../modules/mail/e-mail-shell-backend.c:238
+#: ../modules/mail/e-mail-shell-backend.c:237
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:240
+#: ../modules/mail/e-mail-shell-backend.c:239
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
-#: ../modules/mail/e-mail-shell-backend.c:248
+#: ../modules/mail/e-mail-shell-backend.c:247
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "郵件帳號(_U)"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
+#: ../modules/mail/e-mail-shell-backend.c:249
 msgid "Create a new mail account"
 msgstr "建立新郵件帳號"
 
-#: ../modules/mail/e-mail-shell-backend.c:255
+#: ../modules/mail/e-mail-shell-backend.c:254
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "郵件資料夾(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:257
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
-#: ../modules/mail/e-mail-shell-backend.c:555
+#: ../modules/mail/e-mail-shell-backend.c:551
 msgid "Mail Accounts"
 msgstr "郵件帳號"
 
-#: ../modules/mail/e-mail-shell-backend.c:564
+#: ../modules/mail/e-mail-shell-backend.c:560
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:573
+#: ../modules/mail/e-mail-shell-backend.c:569
 msgid "Composer Preferences"
 msgstr "郵件編輯器偏好設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:582
+#: ../modules/mail/e-mail-shell-backend.c:578
 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:883
+#: ../modules/mail/e-mail-shell-backend.c:867
 msgctxt "label"
 msgid "None"
 msgstr "沒有"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:655
+msgid "Marking messages as read..."
+msgstr "將郵件標示成已經閱讀…"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1507
 msgid "_Disable Account"
 msgstr "停用帳號(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1281
+#: ../modules/mail/e-mail-shell-view-actions.c:1509
 msgid "Disable this account"
 msgstr "停用這個帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1516
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1523
 msgid "Edit properties of this account"
 msgstr "編輯這個帳號的屬性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1530
 msgid "Refresh list of folders of this account"
 msgstr "重新整理這個帳號的資料夾清單"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "_Download Messages for Offline Usage"
 msgstr "下載離線使用的郵件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1537
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "下載標記為離線使用的帳號與資料夾之郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1542
 msgid "Fl_ush Outbox"
 msgstr "清理寄件匣(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1549
 msgid "_Copy Folder To..."
 msgstr "複製資料夾到(_C)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1551
 msgid "Copy the selected folder into another folder"
 msgstr "複製已選定的資料夾到另一個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1558
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1335
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "E_xpunge"
 msgstr "刪除(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1670
 msgid "Mar_k All Messages as Read"
 msgstr "標示所有郵件為已閱讀(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1672
 msgid "Mark all messages in the folder as read"
 msgstr "將資料夾中全部的郵件標示成已閱讀"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1349
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
 msgid "_Move Folder To..."
 msgstr "移動資料夾到(_M)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1351
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
 msgid "Move the selected folder into another folder"
 msgstr "將選定的資料夾移至另一個資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1356
+#: ../modules/mail/e-mail-shell-view-actions.c:1584
 msgid "_New..."
 msgstr "新增(_N)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1358
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Create a new folder for storing mail"
 msgstr "建立一個新資料夾以儲存郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1365
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "Change the properties of this folder"
 msgstr "變更這個資料夾的屬性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "Refresh the folder"
 msgstr "重新載入資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1379
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Change the name of this folder"
 msgstr "變更這個資料夾的名稱"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "Select Message _Thread"
 msgstr "é¸æ“‡éƒµä»¶æª”é ­(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1386
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選擇所有相關的郵件為選定的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "Select Message S_ubthread"
 msgstr "選擇郵件子群組(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1393
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Select all replies to the currently selected message"
 msgstr "選擇所有回覆選定郵件的信"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1405
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Empty _Trash"
 msgstr "清理回收筒(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "永久移除在所有帳號內全部已刪除的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1412
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "_New Label"
 msgstr "新增標籤(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1421
+#: ../modules/mail/e-mail-shell-view-actions.c:1649
 msgid "N_one"
 msgstr "沒有(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1663
 msgid "_Manage Subscriptions"
 msgstr "管理訂閱(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#: ../modules/mail/e-mail-shell-view-actions.c:1749
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "è¨‚é–±æˆ–å–æ¶ˆè¨‚é–±åœ¨é ç«¯ä¼ºæœå™¨çš„è³‡æ–™å¤¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Send / _Receive"
 msgstr "傳送/接收(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1444
+#: ../modules/mail/e-mail-shell-view-actions.c:1679
 msgid "Send queued items and retrieve new items"
 msgstr "å‚³é€å¾…é€çš„é …ç›®ä¸¦æŽ¥æ”¶æ–°çš„é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "R_eceive All"
 msgstr "全部接收(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1686
 msgid "Receive new items from all accounts"
 msgstr "æŽ¥æ”¶åœ¨æ‰€æœ‰å¸³è™Ÿå…§çš„æ–°é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "_Send All"
 msgstr "全部傳送(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1458
+#: ../modules/mail/e-mail-shell-view-actions.c:1693
 msgid "Send queued items in all accounts"
 msgstr "å‚³é€åœ¨æ‰€æœ‰å¸³è™Ÿå…§å¾…é€çš„é …ç›®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1486
+#: ../modules/mail/e-mail-shell-view-actions.c:1721
 msgid "Cancel the current mail operation"
 msgstr "取消目前郵件所作的行動"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Collapse All _Threads"
 msgstr "收摺所有相關郵件(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1493
+#: ../modules/mail/e-mail-shell-view-actions.c:1728
 msgid "Collapse all message threads"
 msgstr "收摺所有的相關郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "E_xpand All Threads"
 msgstr "展開所有相關郵件(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1500
+#: ../modules/mail/e-mail-shell-view-actions.c:1735
 msgid "Expand all message threads"
 msgstr "展開所有的相關郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1740
 msgid "_Message Filters"
 msgstr "郵件規則(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1507
+#: ../modules/mail/e-mail-shell-view-actions.c:1742
 msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "_Subscriptions..."
 msgstr "訂閱(_S)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1756
 msgid "F_older"
 msgstr "資料夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1763
 msgid "_Label"
 msgstr "標籤(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1780
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-shell-view-actions.c:1787
 msgid "Search F_olders"
 msgstr "搜尋資料夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1789
 msgid "Create or edit search folder definitions"
 msgstr "建立或編輯搜尋資料夾的定義"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1828
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1856
 msgid "Show Message _Preview"
 msgstr "é¡¯ç¤ºéƒµä»¶é è¦½(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Show message preview pane"
 msgstr "é¡¯ç¤ºéƒµä»¶é è¦½çª—æ ¼"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:1864
 msgid "Show _Deleted Messages"
 msgstr "顯示已刪除郵件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1866
 msgid "Show deleted messages with a line through them"
 msgstr "顯示已刪除的郵件 (åŠ ä¸Šåˆªé™¤ç·š)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Group By Threads"
 msgstr "依相關郵件為群組(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Threaded message list"
 msgstr "相關郵件清單"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1880
 msgid "_Unmatched Folder Enabled"
 msgstr "未符合資料夾已啟用(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1882
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "切換是否啟用未符合搜尋資料夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "Show message preview below the message list"
 msgstr "åœ¨éƒµä»¶æ¸…å–®ä¸‹æ–¹é¡¯ç¤ºéƒµä»¶é è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1674
+#: ../modules/mail/e-mail-shell-view-actions.c:1909
 msgid "Show message preview alongside the message list"
 msgstr "åœ¨éƒµä»¶æ¸…å–®æ—é‚Šé¡¯ç¤ºéƒµä»¶é è¦½"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1917
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Important Messages"
 msgstr "重要郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1931
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1938
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:1945
 msgid "Messages with Attachments"
 msgstr "有附件的郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1952
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1959
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1966
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1783
+#: ../modules/mail/e-mail-shell-view-actions.c:2018
 msgid "Subject or Addresses contain"
 msgstr "主旨或電子郵件位址包含"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1793
+#: ../modules/mail/e-mail-shell-view-actions.c:2028
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1800
+#: ../modules/mail/e-mail-shell-view-actions.c:2035
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1807
+#: ../modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-#: ../modules/mail/e-mail-shell-view.c:616
+#: ../modules/mail/e-mail-shell-view.c:630
 msgid "All Account Search"
 msgstr "所有的帳號搜尋"
 
-#: ../modules/mail/e-mail-shell-view.c:717
+#: ../modules/mail/e-mail-shell-view.c:734
 msgid "Account Search"
 msgstr "帳號搜尋"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1022
+#: ../modules/mail/e-mail-shell-view-private.c:996
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已選擇 %d 個，"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1007
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已刪除"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1039
-#: ../modules/mail/e-mail-shell-view-private.c:1046
+#: ../modules/mail/e-mail-shell-view-private.c:1013
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 個草稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未傳送"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../modules/mail/e-mail-shell-view-private.c:1038
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1050
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d 封未讀，"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1053
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "共 %d 封"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1102
+#: ../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Trash"
 msgstr "回收筒"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1518
+#: ../modules/mail/e-mail-shell-view-private.c:1514
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
-#: ../modules/mail/em-composer-prefs.c:492
+#: ../modules/mail/em-composer-prefs.c:447
 msgid "Language(s)"
 msgstr "語言"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:81
 msgid "On exit, every time"
 msgstr "結束時，每次"
 
-#: ../modules/mail/em-mailer-prefs.c:81
+#: ../modules/mail/em-mailer-prefs.c:82
 msgid "On exit, once per day"
 msgstr "結束時，每天一次"
 
-#: ../modules/mail/em-mailer-prefs.c:82
+#: ../modules/mail/em-mailer-prefs.c:83
 msgid "On exit, once per week"
 msgstr "結束時，每週一次"
 
-#: ../modules/mail/em-mailer-prefs.c:83
+#: ../modules/mail/em-mailer-prefs.c:84
 msgid "On exit, once per month"
 msgstr "結束時，每月一次"
 
-#: ../modules/mail/em-mailer-prefs.c:84
+#: ../modules/mail/em-mailer-prefs.c:85
 msgid "Immediately, on folder leave"
 msgstr "立即，在離開資料夾時"
 
-#: ../modules/mail/em-mailer-prefs.c:313
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "é é¦–"
 
-#: ../modules/mail/em-mailer-prefs.c:317
+#: ../modules/mail/em-mailer-prefs.c:360
 msgid "Contains Value"
 msgstr "包含數值"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "_Date header:"
 msgstr "æ—¥æœŸæ¨™é ­(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1216
 msgid "Show _original header value"
 msgstr "é¡¯ç¤ºåŽŸå§‹æ¨™é ­æ•¸å€¼(_O)"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../modules/mailto-handler/evolution-mailto-handler.c:142
 msgid "Do you want to make Evolution your default email client?"
 msgstr "是否要將 Evolution è¨­ç‚ºæ‚¨çš„é è¨­é›»å­éƒµä»¶å®¢æˆ¶ç«¯ï¼Ÿ"
 
@@ -18019,13 +18006,13 @@ msgstr "您寄給 %s 主旨「%s」 (%s) 的郵件已被閱讀。"
 msgid "Delivery Notification for \"%s\""
 msgstr "「%s」的遞送通知"
 
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../modules/mdn/evolution-mdn.c:543
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "傳送郵件回條給「%s」"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:541
+#: ../modules/mdn/evolution-mdn.c:548
 msgid "_Notify Sender"
 msgstr "通知寄件者(_N)"
 
@@ -18055,23 +18042,6 @@ msgid ""
 "established."
 msgstr "一旦網路連線建立，Evolution 就會回到線上模式。"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:298
-msgid ""
-"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
-"from which to obtain an authentication token."
-msgstr ""
-"在 org.gnome 找不到對應的帳號。這是 OnlineAccounts 服務獲取驗證記號的地方。"
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:380
-msgid "OAuth"
-msgstr "OAuth"
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:382
-msgid ""
-"This option will connect to the server by way of the GNOME Online Accounts "
-"service"
-msgstr "é€™å€‹é¸é …æœƒé€éŽ GNOME Online Accounts 服務連接到伺服器"
-
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Author(s)"
 msgstr "作者"
@@ -18172,41 +18142,41 @@ msgstr "純文字模型"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "以純文字方式檢視郵件，即使它們含有 HTML 內容。"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:184
+#: ../modules/spamassassin/evolution-spamassassin.c:151
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "無法產生 SpamAssassin (%s)："
 
-#: ../modules/spamassassin/evolution-spamassassin.c:207
+#: ../modules/spamassassin/evolution-spamassassin.c:174
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "無法將郵件訊息的內容串流導至 SpamAssassin："
 
-#: ../modules/spamassassin/evolution-spamassassin.c:226
+#: ../modules/spamassassin/evolution-spamassassin.c:193
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "無法寫入「%s」至 SpamAssassin："
 
-#: ../modules/spamassassin/evolution-spamassassin.c:254
+#: ../modules/spamassassin/evolution-spamassassin.c:221
 msgid "Failed to read output from SpamAssassin: "
 msgstr "無法從 SpamAssassin 讀取輸出："
 
-#: ../modules/spamassassin/evolution-spamassassin.c:309
+#: ../modules/spamassassin/evolution-spamassassin.c:276
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin 可能當掉或無法處理郵件訊息"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:747
+#: ../modules/spamassassin/evolution-spamassassin.c:356
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin é¸é …"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:762
+#: ../modules/spamassassin/evolution-spamassassin.c:371
 msgid "I_nclude remote tests"
 msgstr "åŒ…å«é ç«¯æ¸¬è©¦(_N)"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:776
+#: ../modules/spamassassin/evolution-spamassassin.c:385
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "這會讓 SpamAssasin æ›´å¯é ï¼Œä½†é€Ÿåº¦è®Šæ…¢ã€‚"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1033
+#: ../modules/spamassassin/evolution-spamassassin.c:559
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -18236,7 +18206,7 @@ msgstr ""
 "\n"
 "以下畫面會讓 Evolution 連線至您的電子郵件帳號，以及從其他應用程式匯入檔案。"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:239
+#: ../modules/startup-wizard/evolution-startup-wizard.c:229
 msgid "Loading accounts..."
 msgstr "正在載入帳號…"
 
@@ -18248,11 +18218,11 @@ msgstr "æ ¼å¼åŒ–ç‚º(_F)…"
 msgid "_Other languages"
 msgstr "其他的語言(_O)"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:371
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:367
 msgid "Text Highlight"
 msgstr "文字突顯"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:372
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:368
 msgid "Syntax highlighting of mail parts"
 msgstr "郵件部分的語法突顯"
 
@@ -18472,35 +18442,35 @@ msgstr "_TCSH"
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:126
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:194
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
+#: ../modules/vcard-inline/e-mail-part-vcard.c:152
 msgid "Show F_ull vCard"
 msgstr "顯示完整的 vCard (_U)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:129
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:212
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
+#: ../modules/vcard-inline/e-mail-part-vcard.c:170
 msgid "Show Com_pact vCard"
 msgstr "顯示精簡的 vCard (_P)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:153
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
 msgid "Save _To Addressbook"
 msgstr "儲存到通訊錄(_T)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:173
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
 msgid "There is one other contact."
 msgstr "還有連絡人。"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:179
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "還有 %d 個其他連絡人。"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:204
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
 msgid "Addressbook Contact"
 msgstr "通訊錄連絡人"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:205
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
 msgid "Display the part as an addressbook contact"
 msgstr "將部分顯示為通訊錄連絡人"
 
@@ -18513,7 +18483,7 @@ msgid "_Do not show this message again."
 msgstr "不要再顯示這個訊息(_D)"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:583
-#: ../plugins/templates/templates.c:473
+#: ../plugins/templates/templates.c:480
 msgid "Keywords"
 msgstr "關鍵字"
 
@@ -18543,35 +18513,35 @@ msgstr "附件提醒程式"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "ç•¶æ‚¨å¿˜è¨˜å°‡é™„ä»¶åŠ å…¥éƒµä»¶æ™‚æé†’æ‚¨ã€‚"
 
-#: ../plugins/bbdb/bbdb.c:633 ../plugins/bbdb/bbdb.c:642
+#: ../plugins/bbdb/bbdb.c:627 ../plugins/bbdb/bbdb.c:636
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "è‡ªå‹•åŠ å…¥çš„é€£çµ¡äºº"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:657
+#: ../plugins/bbdb/bbdb.c:651
 msgid "Create _address book entries when sending mails"
 msgstr "åœ¨å‚³é€éƒµä»¶æ™‚è‡ªå‹•å»ºç«‹é€šè¨ŠéŒ„é …ç›®(_A)"
 
-#: ../plugins/bbdb/bbdb.c:665
+#: ../plugins/bbdb/bbdb.c:658
 msgid "Select Address book for Automatic Contacts"
 msgstr "é¸æ“‡çµ¦è‡ªå‹•åŠ å…¥é€£çµ¡äººç”¨çš„é€šè¨ŠéŒ„"
 
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:675
 msgid "Instant Messaging Contacts"
 msgstr "即時訊息連絡人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:697
+#: ../plugins/bbdb/bbdb.c:690
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "從 Pidgin 的好友清單同步連絡人資訊和圖片(_S)"
 
-#: ../plugins/bbdb/bbdb.c:705
+#: ../plugins/bbdb/bbdb.c:697
 msgid "Select Address book for Pidgin buddy list"
 msgstr "選擇給 Pidgin 好友名單用的通訊錄"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:718
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Synchronize with _buddy list now"
 msgstr "立即與好友清單同步(_B)"
 
@@ -18666,7 +18636,7 @@ msgid "Key"
 msgstr "設定鍵"
 
 #: ../plugins/email-custom-header/email-custom-header.c:876
-#: ../plugins/templates/templates.c:482
+#: ../plugins/templates/templates.c:489
 msgid "Values"
 msgstr "數值"
 
@@ -18799,55 +18769,55 @@ msgstr "行內圖片"
 msgid "View image attachments directly in mail messages."
 msgstr "直接在郵件中顯示圖片。"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Get List _Archive"
 msgstr "取得清單檔案庫(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:370
 msgid "Get an archive of the list this message belongs to"
 msgstr "取得此郵件所屬論壇的檔案庫"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Get List _Usage Information"
 msgstr "取得清單使用資訊(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:377
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "取得此郵件所屬論壇的使用方法相關資訊"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Contact List _Owner"
 msgstr "連絡人清單擁有者(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:384
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "連絡此郵件所屬通信論壇的管理者"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "_Post Message to List"
 msgstr "傳送郵件給論壇(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:391
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "撰寫郵件給此郵件所屬的通信論壇"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 msgid "_Subscribe to List"
 msgstr "訂閱論壇(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:397
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:398
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "訂閱此郵件所屬的通信論壇"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 msgid "_Unsubscribe from List"
 msgstr "取消訂閱論壇(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:404
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:405
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "取消訂閱此郵件所屬的通信論壇"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:411
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:412
 msgid "Mailing _List"
 msgstr "通信論壇(_L)"
 
@@ -18942,6 +18912,13 @@ msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "您已經接收 %d 封郵件 。 "
 
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:395
+#, c-format
+msgid "From: %s"
+msgstr "寄件者：%s"
+
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
 #: ../plugins/mail-notification/mail-notification.c:409
@@ -19094,39 +19071,39 @@ msgid ""
 msgstr ""
 "é¸å–çš„å‚™å¿˜éŒ„æ¸…å–®æ˜¯å”¯è®€çš„ï¼Œå› æ­¤ä¸èƒ½åœ¨é€™è£¡å»ºç«‹å‚™å¿˜éŒ„ã€‚è«‹é¸æ“‡å…¶ä»–çš„å‚™å¿˜éŒ„æ¸…å–®ã€‚"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1199
+#: ../plugins/mail-to-task/mail-to-task.c:1196
 msgid "No writable calendar is available."
 msgstr "沒有可寫入的行事曆。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1273
 msgid "Create an _Appointment"
 msgstr "建立一個約會(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1279
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a new event from the selected message"
 msgstr "以選取的郵件建立新的事件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a Mem_o"
 msgstr "建立備忘錄(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1286
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new memo from the selected message"
 msgstr "以選取的郵件建立新的備忘錄"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1291
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a _Task"
 msgstr "建立工作(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1293
+#: ../plugins/mail-to-task/mail-to-task.c:1289
 msgid "Create a new task from the selected message"
 msgstr "以選取的郵件建立新的工作"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1301
+#: ../plugins/mail-to-task/mail-to-task.c:1297
 msgid "Create a _Meeting"
 msgstr "建立會議(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1303
+#: ../plugins/mail-to-task/mail-to-task.c:1299
 msgid "Create a new meeting from the selected message"
 msgstr "以選取的郵件建立新的會議"
 
@@ -19134,38 +19111,6 @@ msgstr "以選取的郵件建立新的會議"
 msgid "Convert a mail message to a task."
 msgstr "將郵件轉換為工作。"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
-msgid "Also mark messages in subfolders?"
-msgstr "是否也標記子資料夾中的郵件？"
-
-#: ../plugins/mark-all-read/mark-all-read.c:44
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-"您要將目前的資料夾中的郵件已閱讀，或是包含目前的資料夾及其子資料夾中所有郵"
-"件。"
-
-#: ../plugins/mark-all-read/mark-all-read.c:184
-msgid "In Current Folder and _Subfolders"
-msgstr "於目前的資料夾及其子資料夾(_S)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:198
-msgid "In Current _Folder Only"
-msgstr "於目前的資料夾(_F)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:544
-msgid "Mark Me_ssages as Read"
-msgstr "標示郵件為已讀(_S)"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-msgid "Mark All Read"
-msgstr "全部標示成已讀"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark all messages in a folder as read."
-msgstr "將資料夾中全部的郵件標示成已閱讀。"
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST 匯入"
@@ -19178,37 +19123,37 @@ msgstr "Outlook 個人資料夾 (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "從 PST 檔案匯入 Outlook 郵件"
 
-#: ../plugins/pst-import/pst-importer.c:527
+#: ../plugins/pst-import/pst-importer.c:530
 msgid "_Mail"
 msgstr "郵件(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:556
+#: ../plugins/pst-import/pst-importer.c:559
 msgid "Destination folder:"
 msgstr "目的地資料夾:"
 
-#: ../plugins/pst-import/pst-importer.c:566
+#: ../plugins/pst-import/pst-importer.c:569
 msgid "_Address Book"
 msgstr "通訊錄(_A)"
 
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../plugins/pst-import/pst-importer.c:574
 msgid "A_ppointments"
 msgstr "約會(_P)"
 
-#: ../plugins/pst-import/pst-importer.c:576 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "工作(_T)"
 
-#: ../plugins/pst-import/pst-importer.c:581
+#: ../plugins/pst-import/pst-importer.c:584
 msgid "_Journal entries"
 msgstr "æ—¥èªŒé …ç›®(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:697
+#: ../plugins/pst-import/pst-importer.c:704
 msgid "Importing Outlook data"
 msgstr "匯入 Outlook 資料"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:142
-#: ../plugins/publish-calendar/publish-calendar.c:149
+#: ../plugins/publish-calendar/publish-calendar.c:141
+#: ../plugins/publish-calendar/publish-calendar.c:148
 msgid "Calendar Publishing"
 msgstr "行事曆發布"
 
@@ -19220,49 +19165,49 @@ msgstr "位置"
 msgid "Publish calendars to the web."
 msgstr "å°‡è¡Œäº‹æ›†ç™¼å¸ƒç‚ºç¶²é ã€‚"
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
-#: ../plugins/publish-calendar/publish-calendar.c:472
+#: ../plugins/publish-calendar/publish-calendar.c:213
+#: ../plugins/publish-calendar/publish-calendar.c:471
 #, c-format
 msgid "Could not open %s:"
 msgstr "無法開啟 %s："
 
-#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:215
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "無法開啟 %s：未知的錯誤"
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../plugins/publish-calendar/publish-calendar.c:235
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "發布到 %s 時發生錯誤："
 
-#: ../plugins/publish-calendar/publish-calendar.c:238
+#: ../plugins/publish-calendar/publish-calendar.c:237
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "發布到 %s 已成功結束"
 
-#: ../plugins/publish-calendar/publish-calendar.c:282
+#: ../plugins/publish-calendar/publish-calendar.c:281
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "掛載 %s 失敗："
 
-#: ../plugins/publish-calendar/publish-calendar.c:635
+#: ../plugins/publish-calendar/publish-calendar.c:634
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "啟用(_E)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:785
+#: ../plugins/publish-calendar/publish-calendar.c:784
 msgid "Are you sure you want to remove this location?"
 msgstr "確定要移除這個位置？"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1124
+#: ../plugins/publish-calendar/publish-calendar.c:1123
 msgid "Could not create publish thread."
 msgstr "無法建立發布執行緒。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1134
+#: ../plugins/publish-calendar/publish-calendar.c:1133
 msgid "_Publish Calendar Information"
 msgstr "發布行事曆資訊(_P)"
 
@@ -19447,7 +19392,7 @@ msgstr "以此封裝數值(_E):"
 msgid "Comma separated values (.csv)"
 msgstr "é€—è™Ÿéš”é–‹çš„æ•¸å€¼æ ¼å¼ (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:171 ../shell/e-shell-utils.c:197
+#: ../plugins/save-calendar/ical-format.c:171 ../shell/e-shell-utils.c:175
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -19498,42 +19443,42 @@ msgid ""
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an email you are replying to."
 msgstr ""
-"基於草稿的範本外掛程式。您可以使用的變數有 $ORIG[subject], $ORIG[from], $ORIG"
-"[to] 或 $ORIG[body]，它們會以您所回覆的郵件中的數值取代。"
+"基於草稿的範本外掛程式。您可以使用的變數有 $ORIG[subject], $ORIG[from], "
+"$ORIG[to] 或 $ORIG[body]，它們會以您所回覆的郵件中的數值取代。"
 
-#: ../plugins/templates/templates.c:1135
+#: ../plugins/templates/templates.c:1148
 msgid "No Title"
 msgstr "沒有標題"
 
-#: ../plugins/templates/templates.c:1244
+#: ../plugins/templates/templates.c:1257
 msgid "Save as _Template"
 msgstr "儲存為範本(_T)"
 
-#: ../plugins/templates/templates.c:1246
+#: ../plugins/templates/templates.c:1259
 msgid "Save as Template"
 msgstr "儲存為範本"
 
-#: ../shell/e-shell.c:307
+#: ../shell/e-shell.c:278
 msgid "Preparing to go offline..."
 msgstr "準備進入離線…"
 
-#: ../shell/e-shell.c:360
+#: ../shell/e-shell.c:331
 msgid "Preparing to go online..."
 msgstr "準備進入上線…"
 
-#: ../shell/e-shell.c:434
+#: ../shell/e-shell.c:412
 msgid "Preparing to quit"
 msgstr "準備結束"
 
-#: ../shell/e-shell.c:440
+#: ../shell/e-shell.c:418
 msgid "Preparing to quit..."
 msgstr "準備結束…"
 
-#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
+#: ../shell/e-shell-content.c:719 ../shell/e-shell-content.c:720
 msgid "Searches"
 msgstr "搜尋"
 
-#: ../shell/e-shell-content.c:764
+#: ../shell/e-shell-content.c:763
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
@@ -19541,31 +19486,31 @@ msgstr "儲存搜尋結果"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:1143
+#: ../shell/e-shell-searchbar.c:1086
 msgid "Sho_w:"
 msgstr "顯示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1186
+#: ../shell/e-shell-searchbar.c:1120
 msgid "Sear_ch:"
 msgstr "搜尋(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1272
+#: ../shell/e-shell-searchbar.c:1201
 msgid "i_n"
 msgstr "æ–¼(_N)"
 
-#: ../shell/e-shell-utils.c:195
+#: ../shell/e-shell-utils.c:173
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:218
+#: ../shell/e-shell-utils.c:196
 msgid "All Files (*)"
 msgstr "所有檔案 (*)"
 
-#: ../shell/e-shell-view.c:295
+#: ../shell/e-shell-view.c:290
 msgid "Saving user interface state"
 msgstr "儲存使用者介面狀態"
 
@@ -19587,277 +19532,278 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution 網站"
 
-#: ../shell/e-shell-window-actions.c:323
+#: ../shell/e-shell-window-actions.c:341
 msgid "Categories Editor"
 msgstr "分類編輯器"
 
-#: ../shell/e-shell-window-actions.c:660
+#: ../shell/e-shell-window-actions.c:672
 msgid "Bug Buddy is not installed."
 msgstr "尚未安裝 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:661
+#: ../shell/e-shell-window-actions.c:673
 msgid "Bug Buddy could not be run."
 msgstr "無法執行 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:841
+#: ../shell/e-shell-window-actions.c:853
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
-#: ../shell/e-shell-window-actions.c:846 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
 
-#: ../shell/e-shell-window-actions.c:867
+#: ../shell/e-shell-window-actions.c:879
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../shell/e-shell-window-actions.c:869
+#: ../shell/e-shell-window-actions.c:881
 msgid "Open the Evolution User Guide"
 msgstr "開啟 Evolution 使用者指南"
 
-#: ../shell/e-shell-window-actions.c:895
+#: ../shell/e-shell-window-actions.c:907
 msgid "I_mport..."
 msgstr "匯入(_M)…"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:909
 msgid "Import data from other programs"
 msgstr "匯入其他程式的資料"
 
-#: ../shell/e-shell-window-actions.c:902
+#: ../shell/e-shell-window-actions.c:914
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-#: ../shell/e-shell-window-actions.c:904
+#: ../shell/e-shell-window-actions.c:916
 msgid "Create a new window displaying this view"
 msgstr "建立一個新的視窗來顯示這個檢視"
 
-#: ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:928
 msgid "Available Cate_gories"
 msgstr "可用的分類(_G)"
 
-#: ../shell/e-shell-window-actions.c:918
+#: ../shell/e-shell-window-actions.c:930
 msgid "Manage available categories"
 msgstr "管理可用的分類"
 
-#: ../shell/e-shell-window-actions.c:930
+#: ../shell/e-shell-window-actions.c:942
 msgid "_Quick Reference"
 msgstr "快捷鍵參照表(_Q)"
 
-#: ../shell/e-shell-window-actions.c:932
+#: ../shell/e-shell-window-actions.c:944
 msgid "Show Evolution's shortcut keys"
 msgstr "顯示 Evolution 的捷徑鍵"
 
-#: ../shell/e-shell-window-actions.c:939
+#: ../shell/e-shell-window-actions.c:951
 msgid "Exit the program"
 msgstr "離開這個程式"
 
-#: ../shell/e-shell-window-actions.c:944
+#: ../shell/e-shell-window-actions.c:956
 msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)…"
 
-#: ../shell/e-shell-window-actions.c:946
+#: ../shell/e-shell-window-actions.c:958
 msgid "Construct a more advanced search"
 msgstr "建構更進階的搜尋"
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:965
 msgid "Clear the current search parameters"
 msgstr "清除目前的搜尋參數"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:970
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的搜尋結果(_E)…"
 
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:972
 msgid "Manage your saved searches"
 msgstr "管理您已儲存的搜尋"
 
-#: ../shell/e-shell-window-actions.c:967
+#: ../shell/e-shell-window-actions.c:979
 msgid "Click here to change the search type"
 msgstr "按這裡以改變搜尋類型"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:984
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:986
 msgid "Execute the current search parameters"
 msgstr "執行目前的搜尋參數"
 
-#: ../shell/e-shell-window-actions.c:979
+#: ../shell/e-shell-window-actions.c:991
 msgid "_Save Search..."
 msgstr "儲存搜尋結果(_S)…"
 
-#: ../shell/e-shell-window-actions.c:981
+#: ../shell/e-shell-window-actions.c:993
 msgid "Save the current search parameters"
 msgstr "儲存目前的搜尋參數"
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:1005
 msgid "Submit _Bug Report..."
 msgstr "å‚³é€éŒ¯èª¤å ±å‘Š(_B)…"
 
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:1007
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy é€å‡ºéŒ¯èª¤å ±å‘Šã€‚"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:1012
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:1014
 msgid "Put Evolution into offline mode"
 msgstr "讓 Evolution 進入離線模式"
 
-#: ../shell/e-shell-window-actions.c:1007
+#: ../shell/e-shell-window-actions.c:1019
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:1021
 msgid "Put Evolution into online mode"
 msgstr "讓 Evolution 進入上線模式"
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:1049
 msgid "Lay_out"
 msgstr "佈局(_O)"
 
-#: ../shell/e-shell-window-actions.c:1044
+#: ../shell/e-shell-window-actions.c:1056
 msgid "_New"
 msgstr "新增(_N)"
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:1063
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:1070
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
 
-#: ../shell/e-shell-window-actions.c:1072
+#: ../shell/e-shell-window-actions.c:1084
 msgid "_Window"
 msgstr "視窗(_O)"
 
-#: ../shell/e-shell-window-actions.c:1101
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Show Side _Bar"
 msgstr "顯示側邊欄(_B)"
 
-#: ../shell/e-shell-window-actions.c:1103
+#: ../shell/e-shell-window-actions.c:1115
 msgid "Show the side bar"
 msgstr "顯示側邊列"
 
-#: ../shell/e-shell-window-actions.c:1109
+#: ../shell/e-shell-window-actions.c:1121
 msgid "Show _Buttons"
 msgstr "顯示按鈕(_B)"
 
-#: ../shell/e-shell-window-actions.c:1111
+#: ../shell/e-shell-window-actions.c:1123
 msgid "Show the switcher buttons"
 msgstr "顯示切換程式按鈕"
 
-#: ../shell/e-shell-window-actions.c:1117
+#: ../shell/e-shell-window-actions.c:1129
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: ../shell/e-shell-window-actions.c:1119
+#: ../shell/e-shell-window-actions.c:1131
 msgid "Show the status bar"
 msgstr "顯示狀態列"
 
-#: ../shell/e-shell-window-actions.c:1125
+#: ../shell/e-shell-window-actions.c:1137
 msgid "Show _Tool Bar"
 msgstr "顯示工具列(_T)"
 
-#: ../shell/e-shell-window-actions.c:1127
+#: ../shell/e-shell-window-actions.c:1139
 msgid "Show the tool bar"
 msgstr "顯示工具列"
 
-#: ../shell/e-shell-window-actions.c:1149
+#: ../shell/e-shell-window-actions.c:1161
 msgid "_Icons Only"
 msgstr "只有圖示(_I)"
 
-#: ../shell/e-shell-window-actions.c:1151
+#: ../shell/e-shell-window-actions.c:1163
 msgid "Display window buttons with icons only"
 msgstr "只顯示視窗按鈕的圖示"
 
-#: ../shell/e-shell-window-actions.c:1156
+#: ../shell/e-shell-window-actions.c:1168
 msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../shell/e-shell-window-actions.c:1158
+#: ../shell/e-shell-window-actions.c:1170
 msgid "Display window buttons with text only"
 msgstr "只顯示視窗按鈕的文字"
 
-#: ../shell/e-shell-window-actions.c:1163
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Icons _and Text"
 msgstr "圖示及文字(_A)"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1177
 msgid "Display window buttons with icons and text"
 msgstr "顯示視窗按鈕的圖示及文字"
 
-#: ../shell/e-shell-window-actions.c:1170
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Tool_bar Style"
 msgstr "å·¥å…·åˆ—é¢¨æ ¼(_B)"
 
-#: ../shell/e-shell-window-actions.c:1172
+#: ../shell/e-shell-window-actions.c:1184
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使用桌面工具列設定值顯示視窗按鈕"
 
-#: ../shell/e-shell-window-actions.c:1180
-msgid "Define Views..."
-msgstr "定義檢視…"
-
-#: ../shell/e-shell-window-actions.c:1182
-msgid "Create or edit views"
-msgstr "建立或編輯檢視(_C)"
+#: ../shell/e-shell-window-actions.c:1192
+msgid "Delete Current View"
+msgstr "刪除目前的檢視"
 
-#: ../shell/e-shell-window-actions.c:1187
+#: ../shell/e-shell-window-actions.c:1199
 msgid "Save Custom View..."
 msgstr "儲存自訂檢視…"
 
-#: ../shell/e-shell-window-actions.c:1189
+#: ../shell/e-shell-window-actions.c:1201
 msgid "Save current custom view"
 msgstr "儲存目前的自訂檢視"
 
-#: ../shell/e-shell-window-actions.c:1196
+#: ../shell/e-shell-window-actions.c:1208
 msgid "C_urrent View"
 msgstr "目前檢視(_U)"
 
-#: ../shell/e-shell-window-actions.c:1206
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Custom View"
 msgstr "自訂檢視"
 
-#: ../shell/e-shell-window-actions.c:1208
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Current view is a customized view"
 msgstr "目前的檢視方式是自訂的檢視"
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Change the page settings for your current printer"
 msgstr "ä¿®æ”¹ç›®å‰å°è¡¨æ©Ÿçš„é é¢åˆ—å°è¨­å®š"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1591
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1714
 #, c-format
 msgid "Select view: %s"
 msgstr "選擇檢視：%s"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1731
+#, c-format
+msgid "Delete view: %s"
+msgstr "刪除檢視：%s"
+
+#: ../shell/e-shell-window-actions.c:1825
 msgid "Execute these search parameters"
 msgstr "執行這些搜尋參數"
 
-#: ../shell/e-shell-window.c:497
+#: ../shell/e-shell-window.c:439
 msgid "New"
 msgstr "新增"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:585
+#: ../shell/e-shell-window-private.c:580
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19892,7 +19838,7 @@ msgstr ""
 "我們希望您享受工作成果，而且我們\n"
 "熱切希望您提供意見！\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19900,13 +19846,13 @@ msgstr ""
 "謝謝\n"
 "Evolution 小組敬上\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:213
 msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:303
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19914,54 +19860,50 @@ msgstr ""
 "å•Ÿå‹• Evolution æ™‚ä»¥æŒ‡å®šçš„å…ƒä»¶é¡¯ç¤ºã€‚å¯ç”¨çš„é¸é …æœ‰ã€Œmail」、「calendar」、"
 "「contacts」、「tasks」和「memos」"
 
-#: ../shell/main.c:307
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "將指定的尺寸套用到主視窗"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: ../shell/main.c:313
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "忽略網際網路是否可用"
 
 #: ../shell/main.c:315
-msgid "Start in \"express\" mode"
-msgstr "以「快速」模式啟動"
-
-#: ../shell/main.c:318
 msgid "Forcibly shut down Evolution"
 msgstr "強制關閉 Evoultion"
 
-#: ../shell/main.c:321
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "åœç”¨éƒµä»¶ã€é€£çµ¡äººå’Œå·¥ä½œçš„é è¦½çª—æ ¼ã€‚"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:324
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "將指定的 URI 或檔案名稱匯入為接下來的引數。"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "要求執行中的 Evolution 程序結束"
 
-#: ../shell/main.c:419
+#: ../shell/main.c:403
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 msgstr "不能啟動 Evolution。可能有另一個 Evolution 實體沒有回應。系統錯誤：%s"
 
-#: ../shell/main.c:515 ../shell/main.c:520
+#: ../shell/main.c:499 ../shell/main.c:504
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
-#: ../shell/main.c:587
+#: ../shell/main.c:571
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19970,7 +19912,7 @@ msgstr ""
 "%s： --online 和 --offline 不能一起使用。\n"
 "  使用 '%s --help' 取得進一步資訊。\n"
 
-#: ../shell/main.c:593
+#: ../shell/main.c:577
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20212,17 +20154,22 @@ msgstr ""
 "å› ç‚ºæ‚¨ä¸ä¿¡ä»»ç™¼å‡ºæ­¤æ†‘è­‰çš„æ†‘è­‰å–®ä½ï¼Œæ‰€ä»¥é™¤éžåœ¨æ­¤æŒ‡ç¤ºï¼Œå¦å‰‡æ‚¨å°‡ä¸ä¿¡ä»»æ­¤æ†‘è­‰çš„æœ‰"
 "效性。"
 
-#: ../smime/gui/component.c:51
+#: ../smime/gui/component.c:56
+#, c-format
+msgid "Enter the password for '%s', token '%s'"
+msgstr "輸入「%s」的密碼，記號「%s」 "
+
+#: ../smime/gui/component.c:58
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "輸入「%s」的密碼 "
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:77
+#: ../smime/gui/component.c:86
 msgid "Enter new password for certificate database"
 msgstr "輸入憑證資料庫的新密碼"
 
-#: ../smime/gui/component.c:80
+#: ../smime/gui/component.c:89
 msgid "Enter new password"
 msgstr "輸入新密碼"
 
@@ -20606,6 +20553,255 @@ msgstr "到期日(_D):"
 msgid "With _Status"
 msgstr "設定狀態(_S)"
 
+#~ msgid "Card View"
+#~ msgstr "名片檢視模式"
+
+#~ msgid ""
+#~ "Evolution does not support calendar reminders with\n"
+#~ "email notifications yet, but this reminder was\n"
+#~ "configured to send an email.  Evolution will display\n"
+#~ "a normal reminder dialog box instead."
+#~ msgstr ""
+#~ "Evolution 尚未支援使用電子郵件通知的\n"
+#~ "行事曆提醒，但是這個提醒被設定為\n"
+#~ "送出電子郵件。  Evolution 會顯示\n"
+#~ "普通的提醒對話盒來代替。"
+
+#~ msgid "Day View"
+#~ msgstr "日檢視"
+
+#~ msgid "Work Week View"
+#~ msgstr "工作週檢視"
+
+#~ msgid "Week View"
+#~ msgstr "週檢視"
+
+#~ msgid "Month View"
+#~ msgstr "月檢視"
+
+#~ msgid "Web Page"
+#~ msgstr "ç¶²é "
+
+#~ msgid "Stat_us:"
+#~ msgstr "狀態(_U):"
+
+#~ msgid "_Status Details"
+#~ msgstr "狀態詳細資料(_S)"
+
+#~ msgid "Click to change or view the status details of the task"
+#~ msgstr "按這裡改變/檢視該工作的狀態詳細資料"
+
+#~ msgid "Task Details"
+#~ msgstr "工作詳細資料"
+
+#~ msgid "Save draft"
+#~ msgstr "儲存草稿"
+
+#~ msgid "Email Settings"
+#~ msgstr "電子郵件設定值"
+
+#~ msgid "Configure email accounts"
+#~ msgstr "設定郵件帳號"
+
+#~ msgid "Week start"
+#~ msgstr "一週開始於"
+
+#~ msgid "Work days"
+#~ msgstr "工作日"
+
+#~ msgid "Days on which the start and end of work hours should be indicated"
+#~ msgstr "å¿…é ˆæŒ‡æ˜Žå·¥ä½œæ—¥é–‹å§‹èˆ‡çµæŸæ–¼å¹¾æ™‚"
+
+#~ msgid "Save name format for drag-and-drop operation"
+#~ msgstr "æ‹–æ”¾æ“ä½œæ™‚å„²å­˜çš„åç¨±æ ¼å¼"
+
+#~ msgid ""
+#~ "Can be either 2 to use current date and time or any other value for sent "
+#~ "date of the message. This has a meaning only when dropping just one "
+#~ "message."
+#~ msgstr ""
+#~ "可以是 2 以使用目前的日期和時刻或任何數值代表郵件的傳送日期。這只有在拖放"
+#~ "單一郵件時才有意義。"
+
+#~ msgid "Whether disable ellipsizing feature of folder names in side bar."
+#~ msgstr "是否停用側邊列的資料夾名稱省略。"
+
+#~ msgid ""
+#~ "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+#~ "Never load images off the net. \"1\" - Load images in messages from "
+#~ "contacts. \"2\" - Always load images off the net."
+#~ msgstr ""
+#~ "透過 HTTP(S) 載入 HTML 郵件的圖片。可能的值為：「0」– 不從網路載入圖片。"
+#~ "「1」– 如果是在連絡人裡的寄件者時，載入圖片。「2」- 一定從網路載入圖片。"
+
+#~ msgid ""
+#~ "This key should contain a list of XML structures specifying custom "
+#~ "headers, and whether they are to be displayed. The format of the XML "
+#~ "structure is &lt;header enabled&gt; - set enabled if the header is to be "
+#~ "displayed in the mail view."
+#~ msgstr ""
+#~ "此金鑰應該包含 XML æ¸…å–®ï¼Œå®ƒæœƒæŒ‡å®šè‡ªè¨‚æª”é ­ï¼Œä»¥åŠæ˜¯å¦é¡¯ç¤ºå®ƒå€‘ã€‚XML çµæ§‹çš„æ ¼"
+#~ "式是 &lt;header enabled&gt; - å¦‚æžœæª”é ­æœƒé¡¯ç¤ºåœ¨éƒµä»¶æª¢è¦–ï¼Œå‰‡è¨­å®šæˆ enabled。"
+
+#~ msgid "Search for the sender photo in local address books"
+#~ msgstr "在本地端通訊錄搜尋寄件者相片"
+
+#~ msgid "This option would help in improving the speed of fetching."
+#~ msgstr "é€™å€‹é¸é …èƒ½å”åŠ©å¢žé€²æŽ¥æ”¶çš„é€Ÿåº¦ã€‚"
+
+#~ msgid "State of message headers in paned view"
+#~ msgstr "çª—æ ¼æª¢è¦–ä¸­éƒµä»¶æª”é ­çš„ç‹€æ…‹"
+
+#~ msgid ""
+#~ "Describes whether message headers in paned view should be collapsed or "
+#~ "expanded by default. \"0\" = expanded and \"1\" = collapsed"
+#~ msgstr ""
+#~ "æè¿°åœ¨çª—æ ¼æª¢è¦–ä¸­çš„éƒµä»¶æª”é ­é è¨­æ‡‰è©²æ”¶æ‘ºæˆ–å±•é–‹ã€‚ã€Œ0」= 展開 「1」 = 收摺"
+
+#~ msgid ""
+#~ "Possible values are: 'never' - to never close browser window, 'always' - "
+#~ "to always close browser window or 'ask' - (or any other value) will ask "
+#~ "user."
+#~ msgstr ""
+#~ "可能的數值有：「never」- 永不關閉瀏覽器視窗、「 always」- 總是關閉瀏覽器視"
+#~ "窗或「ask」- (或任何其他數值) 會詢問使用者。"
+
+#~ msgid "Socket path for SpamAssassin"
+#~ msgstr "SpamAssassin Socket 路徑"
+
+#~ msgid "Use SpamAssassin daemon and client"
+#~ msgstr "使用 SpamAsssassin 伺服程式和客戶端"
+
+#~ msgid "Use spamc and spamd programs, if available."
+#~ msgstr "如果可以，使用 spamc 與 spamd 程式。"
+
+#~ msgid "A_vailable Fields:"
+#~ msgstr "可用的欄位(_V):"
+
+#~ msgid "_Show these fields in order:"
+#~ msgstr "依序顯示這些欄位(_S):"
+
+#~ msgid "Move _Up"
+#~ msgstr "上移(_U)"
+
+#~ msgid "Move _Down"
+#~ msgstr "下移(_D)"
+
+#~ msgid "Define Views for \"%s\""
+#~ msgstr "定義「%s」的檢視"
+
+#~ msgid "Define Views for %s"
+#~ msgstr "定義 %s 的檢視"
+
+#~ msgid "Name of new view:"
+#~ msgstr "新檢視的名稱:"
+
+#~ msgid "Type of view:"
+#~ msgstr "檢視的類型:"
+
+#~ msgid "Type of View"
+#~ msgstr "檢視的類型"
+
+#~ msgid "Could not send attachment"
+#~ msgid_plural "Could not send attachments"
+#~ msgstr[0] "無法送出附件。"
+
+#~ msgid "_Send To..."
+#~ msgstr "傳送至(_S)…"
+
+#~ msgid "Send the selected attachments somewhere"
+#~ msgstr "傳送選取的附件到別處"
+
+#~ msgid "Available Fields"
+#~ msgstr "可用的欄位"
+
+#~ msgid "Define Views"
+#~ msgstr "定義檢視"
+
+#~ msgid "Table"
+#~ msgstr "è¡¨æ ¼"
+
+#~ msgid "Define New View"
+#~ msgstr "定義新的檢視"
+
+#~ msgid "No mail service found with UID '%s'"
+#~ msgstr "沒有 UID「%s」的郵件服務"
+
+#~ msgid "UID '%s' is not a mail transport"
+#~ msgstr "UID「%s」不是郵件傳輸"
+
+#~ msgid "Please select a folder"
+#~ msgstr "請選擇資料夾"
+
+#~ msgid "_Switch to Folder"
+#~ msgstr "切換至資料夾(_S)"
+
+#~ msgid "Display the parent folder"
+#~ msgstr "顯示上層資料夾"
+
+#~ msgid "Switch to _next tab"
+#~ msgstr "åˆ‡æ›è‡³ä¸‹ä¸€å€‹åˆ†é (_N)"
+
+#~ msgid "Switch to the next tab"
+#~ msgstr "åˆ‡æ›è‡³ä¸‹ä¸€å€‹åˆ†é "
+
+#~ msgid "Switch to _previous tab"
+#~ msgstr "åˆ‡æ›è‡³ä¸Šä¸€å€‹åˆ†é (_P)"
+
+#~ msgid "Switch to the previous tab"
+#~ msgstr "åˆ‡æ›è‡³ä¸Šä¸€å€‹åˆ†é "
+
+#~ msgid "Cl_ose current tab"
+#~ msgstr "é—œé–‰ç›®å‰çš„åˆ†é (_O)"
+
+#~ msgid "Close current tab"
+#~ msgstr "é—œé–‰ç›®å‰çš„åˆ†é "
+
+#~ msgid "Folder '%s'"
+#~ msgstr "資料夾「%s」"
+
+#~ msgid "Failed to load part '%s'"
+#~ msgstr "無法載入部分「%s」"
+
+#~ msgid "S_earch for sender photograph only in local address books"
+#~ msgstr "只搜尋本地端通訊錄中的寄件者相片(_E)"
+
+#~ msgid ""
+#~ "This will mark all messages as read in the selected folder and its "
+#~ "subfolders."
+#~ msgstr "這會將標示選定的資料夾及其子資料夾中所有郵件為已閱讀。"
+
+#~ msgid "Close message window."
+#~ msgstr "關閉郵件視窗。"
+
+#~ msgid "Would you like to close the message window?"
+#~ msgstr "您想要關閉郵件視窗嗎？"
+
+#~ msgid ""
+#~ "Cannot find a corresponding account in the org.gnome.OnlineAccounts "
+#~ "service from which to obtain an authentication token."
+#~ msgstr ""
+#~ "在 org.gnome 找不到對應的帳號。這是 OnlineAccounts 服務獲取驗證記號的地"
+#~ "方。"
+
+#~ msgid "OAuth"
+#~ msgstr "OAuth"
+
+#~ msgid "Mark All Read"
+#~ msgstr "全部標示成已讀"
+
+#~ msgid "Mark all messages in a folder as read."
+#~ msgstr "將資料夾中全部的郵件標示成已閱讀。"
+
+#~ msgid "Define Views..."
+#~ msgstr "定義檢視…"
+
+#~ msgid "Create or edit views"
+#~ msgstr "建立或編輯檢視(_C)"
+
+#~ msgid "Start in \"express\" mode"
+#~ msgstr "以「快速」模式啟動"
+
 #~ msgid "Export in asynchronous mode"
 #~ msgstr "在非同步模式匯出"