[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-934-g8333dd717

paul at claws-mail.org paul at claws-mail.org
Fri Feb 21 12:22:05 CET 2020


The branch, gtk3 has been updated
       via  8333dd717068496015993c44621d8f187f5b6505 (commit)
      from  182db61383062b5e95bd06dde1fb3bb42ed2616e (commit)

Summary of changes:
 po/zh_TW.po | 7612 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 3970 insertions(+), 3642 deletions(-)


- Log -----------------------------------------------------------------
commit 8333dd717068496015993c44621d8f187f5b6505
Author: Paul <paul at claws-mail.org>
Date:   Fri Feb 21 11:20:40 2020 +0000

    updated Traditional Chinese translation by Mark Chang

diff --git a/po/zh_TW.po b/po/zh_TW.po
index f952fb8a7..a8a94adec 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,4 +1,3 @@
-# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The Claws Mail Team
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
@@ -7,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: claws-mail 3.14.0git127\n"
 "Report-Msgid-Bugs-To: paul at claws-mail.org\n"
-"POT-Creation-Date: 2017-12-17 11:51+0000\n"
-"PO-Revision-Date: 2016-11-02 01:34+8\n"
+"POT-Creation-Date: 2020-02-21 10:44+0800\n"
+"PO-Revision-Date: 2019-07-23 10:02+8\n"
 "Last-Translator: Mark Chang <mark.cyj at gmail.com>\n"
 "Language-Team: Mark Chang <mark.cyj at gmail.com>\n"
 "Language: zh_TW\n"
@@ -17,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/account.c:395 src/account.c:462
+#: src/account.c:402 src/account.c:469
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing accounts."
@@ -25,15 +24,15 @@ msgstr ""
 "發現已開啟的新郵件視窗\n"
 "編輯帳號前請先關閉所有的新郵件視窗"
 
-#: src/account.c:440
+#: src/account.c:447
 msgid "Can't create folder."
 msgstr "無法新增資料夾"
 
-#: src/account.c:727
+#: src/account.c:735
 msgid "Edit accounts"
 msgstr "編輯帳號"
 
-#: src/account.c:744
+#: src/account.c:752
 msgid ""
 "Using 'Get Mail' will retrieve messages from your Accounts in the order "
 "given, the checkbox indicates which accounts will be included. Bold text "
@@ -42,60 +41,61 @@ msgstr ""
 "「收信」功能可從你已設定的帳號中標示為「已勾選」的項目,依序收取信件,其中預"
 "設的帳號將以粗體顯示。"
 
-#: src/account.c:815
+#: src/account.c:823
 msgid " _Set as default account "
 msgstr " 設定為預設帳號 (_S)"
 
-#: src/account.c:907
+#: src/account.c:915
 msgid "Accounts with remote folders cannot be copied."
 msgstr "包含遠端資料夾的帳號無法被複製"
 
-#: src/account.c:914
+#: src/account.c:922
 #, c-format
 msgid "Copy of %s"
 msgstr "複製 %s"
 
-#: src/account.c:1097
+#: src/account.c:1119
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "你確認要刪除帳號 '%s' 嗎?"
 
-#: src/account.c:1099
+#: src/account.c:1121
 msgid "(Untitled)"
 msgstr "(無標題)"
 
-#: src/account.c:1100
+#: src/account.c:1122
 msgid "Delete account"
 msgstr "刪除帳號"
 
-#: src/account.c:1590
+#: src/account.c:1596
 msgctxt "Accounts List Get Column Name"
 msgid "G"
 msgstr "G"
 
-#: src/account.c:1596
+#: src/account.c:1602
 msgid "'Get Mail' retrieves mail from the checked accounts"
 msgstr "「收信」將從選取的帳號下取回郵件"
 
-#: src/account.c:1603 src/addrduplicates.c:471 src/addressadd.c:215
-#: src/addressbook.c:126 src/compose.c:7456 src/editaddress.c:1264
-#: src/editaddress.c:1321 src/editaddress.c:1341
-#: src/editaddress_other_attributes_ldap.c:302
-#: src/editaddress_other_attributes_ldap.c:350 src/editbook.c:170
-#: src/editgroup.c:288 src/editjpilot.c:257 src/editldap.c:427
-#: src/editvcard.c:173 src/importmutt.c:222 src/importpine.c:221
-#: src/mimeview.c:274 src/plugins/managesieve/sieve_manager.c:465
-#: src/plugins/pdf_viewer/poppler_viewer.c:1803
-#: src/plugins/pgpcore/select-keys.c:409 src/prefs_filtering.c:384
-#: src/prefs_filtering.c:1870 src/prefs_template.c:79
+#: src/account.c:1609 src/addrduplicates.c:472 src/addressadd.c:223
+#: src/addressbook.c:128 src/compose.c:7473 src/editaddress.c:1474
+#: src/editaddress.c:1503 src/editaddress.c:1519
+#: src/editaddress_other_attributes_ldap.c:371
+#: src/editaddress_other_attributes_ldap.c:392 src/editbook.c:171
+#: src/editgroup.c:290 src/editjpilot.c:257 src/editldap.c:428
+#: src/editvcard.c:174 src/importmutt.c:223 src/importpine.c:222
+#: src/mimeview.c:304 src/plugins/managesieve/sieve_manager.c:470
+#: src/plugins/pdf_viewer/poppler_viewer.c:1846
+#: src/plugins/pgpcore/select-keys.c:464 src/prefs_filtering.c:385
+#: src/prefs_filtering.c:1875 src/prefs_summaries.c:477 src/prefs_template.c:79
+#: src/prefs_themes.c:990
 msgid "Name"
 msgstr "名稱"
 
-#: src/account.c:1611 src/prefs_account.c:1108 src/prefs_account.c:4241
+#: src/account.c:1617 src/prefs_account.c:1199 src/prefs_account.c:4624
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/account.c:1619 src/ssl_manager.c:100
+#: src/account.c:1625 src/ssl_manager.c:109
 msgid "Server"
 msgstr "伺服器"
 
@@ -121,11 +121,11 @@ msgid ""
 msgstr ""
 "無法在新信件視窗中執行您所選擇的操作,因為它包含了%%f, %%F, %%as or %%p。"
 
-#: src/action.c:719
+#: src/action.c:728
 msgid "There is no filtering action set"
 msgstr "沒有設定任何的過濾行為"
 
-#: src/action.c:721
+#: src/action.c:730
 #, c-format
 msgid ""
 "Invalid filtering action(s):\n"
@@ -134,7 +134,7 @@ msgstr ""
 "無效的過濾動作設定:\n"
 "%s"
 
-#: src/action.c:986
+#: src/action.c:997
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
@@ -145,34 +145,35 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:988 src/ldaputil.c:323 src/plugins/bogofilter/bogofilter.c:857
-#: src/plugins/tnef_parse/tnef_parse.c:75
-#: src/plugins/vcalendar/vcal_folder.c:1823
+#: src/action.c:999 src/compose.c:5262 src/compose.c:5267 src/ldaputil.c:333
+#: src/plugins/bogofilter/bogofilter.c:858
+#: src/plugins/tnef_parse/tnef_parse.c:76
 #: src/plugins/vcalendar/vcal_folder.c:1827
-#: src/plugins/vcalendar/vcal_folder.c:1840
-#: src/plugins/vcalendar/vcal_folder.c:1843 src/privacy.c:62
+#: src/plugins/vcalendar/vcal_folder.c:1831
+#: src/plugins/vcalendar/vcal_folder.c:1849
+#: src/plugins/vcalendar/vcal_folder.c:1852 src/privacy.c:62
 msgid "Unknown error"
 msgstr "未知的錯誤"
 
-#: src/action.c:1206 src/action.c:1371
+#: src/action.c:1218 src/action.c:1390
 msgid "Completed"
 msgstr "完成"
 
-#: src/action.c:1242
+#: src/action.c:1254
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 執行: %s\n"
 
-#: src/action.c:1246
+#: src/action.c:1258
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 已結束: %s\n"
 
-#: src/action.c:1279
+#: src/action.c:1304
 msgid "Action's input/output"
 msgstr "輸出/入的動作"
 
-#: src/action.c:1607
+#: src/action.c:1636
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -183,11 +184,11 @@ msgstr ""
 "('%%h' 將以此命令覆蓋)\n"
 "  %s"
 
-#: src/action.c:1612
+#: src/action.c:1641
 msgid "Action's hidden user argument"
 msgstr "隱藏使用者命令的動作"
 
-#: src/action.c:1616
+#: src/action.c:1645
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -198,24 +199,24 @@ msgstr ""
 "('%%u' 將以此命令覆蓋)\n"
 "  %s"
 
-#: src/action.c:1621
+#: src/action.c:1650
 msgid "Action's user argument"
 msgstr "使用者命令的動作"
 
-#: src/addrclip.c:480
+#: src/addrclip.c:481
 msgid "Cannot copy a folder to itself or to its sub-structure."
 msgstr "無法複製資料夾到當前位置"
 
-#: src/addrclip.c:503
+#: src/addrclip.c:504
 msgid "Cannot copy an address book to itself."
 msgstr "無法複製通訊錄到當前位置"
 
-#: src/addrclip.c:594
+#: src/addrclip.c:595
 msgid "Cannot move a folder to itself or to its sub-structure."
 msgstr "無法移動資料夾到當前位置"
 
-#: src/addr_compl.c:689 src/addressbook.c:4967
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
+#: src/addr_compl.c:689 src/addressbook.c:5018
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
 msgid "Group"
 msgstr "群組"
 
@@ -255,66 +256,66 @@ msgstr "傳真"
 msgid "website"
 msgstr "網址"
 
-#: src/addrcustomattr.c:141
+#: src/addrcustomattr.c:146
 msgid "Attribute name"
 msgstr "屬性名稱"
 
-#: src/addrcustomattr.c:156
+#: src/addrcustomattr.c:161
 msgid "Delete all attribute names"
 msgstr "刪除所有屬性名稱"
 
-#: src/addrcustomattr.c:157
+#: src/addrcustomattr.c:162
 msgid "Do you really want to delete all attribute names?"
 msgstr "確認刪除所有屬性嗎?"
 
-#: src/addrcustomattr.c:181
+#: src/addrcustomattr.c:186
 msgid "Delete attribute name"
 msgstr "刪除屬性"
 
-#: src/addrcustomattr.c:182
+#: src/addrcustomattr.c:187
 msgid "Do you really want to delete this attribute name?"
 msgstr "確認刪除此一屬性名稱嗎?"
 
-#: src/addrcustomattr.c:191
+#: src/addrcustomattr.c:196
 msgid "Reset to default"
 msgstr "恢復至預設值"
 
-#: src/addrcustomattr.c:192
+#: src/addrcustomattr.c:197
 msgid ""
 "Do you really want to replace all attribute names\n"
 "with the default set?"
 msgstr "確認要以預設值覆蓋所有的屬性名稱嗎?"
 
-#: src/addrcustomattr.c:212 src/addressbook.c:439 src/addressbook.c:467
-#: src/addressbook.c:484 src/edittags.c:279
-#: src/plugins/archive/archiver_gtk.c:1307 src/prefs_actions.c:1084
-#: src/prefs_filtering.c:1697 src/prefs_template.c:1110
+#: src/addrcustomattr.c:217 src/addressbook.c:438 src/addressbook.c:467
+#: src/addressbook.c:484 src/edittags.c:286
+#: src/plugins/archive/archiver_gtk.c:1313 src/prefs_actions.c:1086
+#: src/prefs_filtering.c:1700 src/prefs_template.c:1112
 msgid "_Delete"
 msgstr "刪除"
 
-#: src/addrcustomattr.c:213 src/edittags.c:280 src/prefs_actions.c:1085
-#: src/prefs_filtering.c:1698 src/prefs_template.c:1111
+#: src/addrcustomattr.c:218 src/edittags.c:287 src/prefs_actions.c:1087
+#: src/prefs_filtering.c:1701 src/prefs_template.c:1113
 msgid "Delete _all"
 msgstr "刪除所有"
 
-#: src/addrcustomattr.c:214
+#: src/addrcustomattr.c:219
 msgid "_Reset to default"
 msgstr "恢復至預設值"
 
-#: src/addrcustomattr.c:403
+#: src/addrcustomattr.c:410
 msgid "Attribute name is not set."
 msgstr "屬性名稱尚未設定"
 
-#: src/addrcustomattr.c:462
+#: src/addrcustomattr.c:469
 msgctxt "Dialog title"
 msgid "Edit attribute names"
 msgstr "編輯屬性名稱"
 
-#: src/addrcustomattr.c:476
+#: src/addrcustomattr.c:483
 msgid "New attribute name:"
 msgstr "新屬性名稱"
 
-#: src/addrcustomattr.c:513
+#: src/addrcustomattr.c:520
 msgid ""
 "Adding or removing attribute names won't affect attributes already set for "
 "contacts."
@@ -341,158 +342,163 @@ msgstr "Claws Mail將在通訊錄中搜尋重複的email"
 msgid "No duplicate email addresses found in the address book"
 msgstr "通訊錄中沒有重複的email"
 
-#: src/addrduplicates.c:346
+#: src/addrduplicates.c:347
 msgid "Duplicate email addresses"
 msgstr "重複的email"
 
-#: src/addrduplicates.c:442 src/addressadd.c:227
-#: src/plugins/pgpcore/select-keys.c:410 src/toolbar.c:529
+#: src/addrduplicates.c:443 src/addressadd.c:235
+#: src/plugins/pgpcore/select-keys.c:470 src/prefs_summaries.c:478
+#: src/toolbar.c:529
 msgid "Address"
 msgstr "地址"
 
-#: src/addrduplicates.c:464
+#: src/addrduplicates.c:465
 msgid "Address book path"
 msgstr "通訊錄路徑"
 
-#: src/addrduplicates.c:793 src/addressbook.c:1440 src/addressbook.c:1493
+#: src/addrduplicates.c:791 src/addressbook.c:1445 src/addressbook.c:1498
 msgid "Delete address(es)"
 msgstr "刪除地址"
 
-#: src/addrduplicates.c:794 src/addressbook.c:1494
+#: src/addrduplicates.c:792 src/addressbook.c:1499
 msgid "Really delete the address(es)?"
 msgstr "確定要刪除地址嗎?"
 
-#: src/addrduplicates.c:842
+#: src/addrduplicates.c:841
 msgid "Delete address"
 msgstr "刪除地址"
 
-#: src/addrduplicates.c:843 src/addressbook.c:1441
+#: src/addrduplicates.c:842 src/addressbook.c:1446
 msgid "This address data is readonly and cannot be deleted."
 msgstr "這個地址資訊是唯讀的,而且不能被刪除"
 
-#: src/addressadd.c:185 src/prefs_filtering_action.c:201
+#: src/addressadd.c:192 src/prefs_filtering_action.c:195
 msgid "Add to address book"
 msgstr "加入通訊錄"
 
-#: src/addressadd.c:207
+#: src/addressadd.c:215
 msgid "Contact"
 msgstr "連絡人"
 
-#: src/addressadd.c:238 src/addressbook.c:128 src/editaddress.c:1056
-#: src/editaddress.c:1131 src/editgroup.c:290
+#: src/addressadd.c:246 src/addressbook.c:130 src/editaddress.c:1258
+#: src/editaddress.c:1302 src/editgroup.c:292
 msgid "Remarks"
 msgstr "備註"
 
-#: src/addressadd.c:257 src/addressbook_foldersel.c:158
+#: src/addressadd.c:289 src/addressbook_foldersel.c:158
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressadd.c:534 src/addressbook.c:3215 src/addressbook.c:3266
+#: src/addressadd.c:599 src/addressbook.c:3268 src/addressbook.c:3319
 msgid "Add address(es)"
 msgstr "新增連絡人地址"
 
-#: src/addressadd.c:535
+#: src/addressadd.c:600
 msgid "Can't add the specified address"
 msgstr "無法新增指定的連絡人地址"
 
-#: src/addressbook.c:127 src/addressbook.c:4955 src/editaddress.c:1053
-#: src/editaddress.c:1114 src/editgroup.c:289 src/expldifdlg.c:517
-#: src/exporthtml.c:600 src/exporthtml.c:764 src/ldif.c:762
+#: src/addressbook.c:129 src/addressbook.c:5006 src/editaddress.c:1247
+#: src/editaddress.c:1285 src/editgroup.c:291 src/expldifdlg.c:517
+#: src/exporthtml.c:601 src/exporthtml.c:765 src/ldif.c:763
 msgid "Email Address"
 msgstr "Email 地址"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:405
 msgid "_Book"
 msgstr "通訊錄(_B)"
 
-#: src/addressbook.c:407 src/addressbook.c:438 src/addressbook.c:466
-#: src/addressbook.c:483 src/compose.c:604 src/mainwindow.c:514
-#: src/messageview.c:209 src/plugins/managesieve/sieve_editor.c:82
+#: src/addressbook.c:406 src/addressbook.c:437 src/addressbook.c:466
+#: src/addressbook.c:483 src/compose.c:607 src/mainwindow.c:523
+#: src/messageview.c:212 src/plugins/managesieve/sieve_editor.c:82
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/addressbook.c:408 src/compose.c:609 src/mainwindow.c:517
-#: src/messageview.c:212
+#: src/addressbook.c:407 src/compose.c:612 src/mainwindow.c:526
+#: src/messageview.c:215
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: src/addressbook.c:409 src/compose.c:610 src/mainwindow.c:519
-#: src/messageview.c:213
+#: src/addressbook.c:408 src/compose.c:613 src/mainwindow.c:528
+#: src/messageview.c:216
 msgid "_Help"
 msgstr "協助(_H)"
 
-#: src/addressbook.c:412 src/addressbook.c:469
+#: src/addressbook.c:411 src/addressbook.c:469
 msgid "New _Book"
 msgstr "新增通訊錄(_B)"
 
-#: src/addressbook.c:413 src/addressbook.c:470
+#: src/addressbook.c:412 src/addressbook.c:470
 msgid "New _Folder"
 msgstr "新增資料夾(_F)"
 
-#: src/addressbook.c:414
+#: src/addressbook.c:413
 msgid "New _vCard"
 msgstr "新增vCard(_v)"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:417
 msgid "New _JPilot"
 msgstr "新增JPilot(_J)"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:420
 msgid "New LDAP _Server"
 msgstr "新增 LDAP Server"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:424
 msgid "_Edit book"
 msgstr "編輯通訊錄"
 
-#: src/addressbook.c:426
+#: src/addressbook.c:425
 msgid "_Delete book"
 msgstr "刪除通訊錄"
 
-#: src/addressbook.c:428 src/compose.c:621
+#: src/addressbook.c:427 src/compose.c:624
 #: src/plugins/managesieve/sieve_editor.c:85
-#: src/plugins/managesieve/sieve_editor.c:433
-#: src/plugins/managesieve/sieve_editor.c:631
+#: src/plugins/managesieve/sieve_editor.c:434
+#: src/plugins/managesieve/sieve_editor.c:633
 msgid "_Save"
 msgstr "儲存"
 
-#: src/addressbook.c:429 src/compose.c:625 src/messageview.c:222
+#: src/addressbook.c:428 src/compose.c:628 src/messageview.c:225
 #: src/plugins/managesieve/sieve_editor.c:88
-#: src/plugins/managesieve/sieve_editor.c:629
+#: src/plugins/managesieve/sieve_editor.c:631
 msgid "_Close"
 msgstr "關閉"
 
-#: src/addressbook.c:432 src/addressbook.c:481 src/messageview.c:226
+#: src/addressbook.c:431 src/addressbook.c:481 src/messageview.c:229
 msgid "_Select all"
 msgstr "全選"
 
-#: src/addressbook.c:434 src/addressbook.c:473 src/addressbook.c:489
+#: src/addressbook.c:433 src/addressbook.c:473 src/addressbook.c:489
 msgid "C_ut"
 msgstr "剪下"
 
-#: src/addressbook.c:435 src/addressbook.c:474 src/addressbook.c:490
-#: src/compose.c:633 src/mainwindow.c:548 src/messageview.c:225
+#: src/addressbook.c:434 src/addressbook.c:474 src/addressbook.c:490
+#: src/compose.c:636 src/mainwindow.c:557 src/messageview.c:228
 #: src/plugins/managesieve/sieve_editor.c:96
 msgid "_Copy"
 msgstr "複製"
 
-#: src/addressbook.c:436 src/addressbook.c:475 src/addressbook.c:491
-#: src/compose.c:634 src/plugins/managesieve/sieve_editor.c:97
+#: src/addressbook.c:435 src/addressbook.c:475 src/addressbook.c:491
+#: src/compose.c:637 src/plugins/managesieve/sieve_editor.c:97
 msgid "_Paste"
 msgstr "貼上"
 
-#: src/addressbook.c:441 src/addressbook.c:486
+#: src/addressbook.c:440 src/addressbook.c:486
 msgid "New _Address"
 msgstr "新連絡人"
 
-#: src/addressbook.c:442 src/addressbook.c:471 src/addressbook.c:487
+#: src/addressbook.c:441 src/addressbook.c:471 src/addressbook.c:487
 msgid "New _Group"
 msgstr "新群組"
 
-#: src/addressbook.c:444 src/addressbook.c:493
+#: src/addressbook.c:443 src/addressbook.c:493
 msgid "_Mail To"
 msgstr "寄給"
 
+#: src/addressbook.c:444 src/addressbook.c:497
+msgid "_Merge"
+msgstr "合併(_M)"
+
 #: src/addressbook.c:448
 msgid "Import _LDIF file..."
 msgstr "匯入 _LDIF 檔案..."
@@ -521,8 +527,8 @@ msgstr "尋找重複連絡人..."
 msgid "Edit custom attributes..."
 msgstr "編輯使用者屬性"
 
-#: src/addressbook.c:459 src/compose.c:711 src/mainwindow.c:813
-#: src/messageview.c:337
+#: src/addressbook.c:459 src/compose.c:714 src/mainwindow.c:825
+#: src/messageview.c:340
 msgid "_About"
 msgstr "關於"
 
@@ -530,128 +536,128 @@ msgstr "關於"
 msgid "_Browse Entry"
 msgstr "瀏覽(_B)"
 
-#: src/addressbook.c:508 src/crash.c:456 src/crash.c:475 src/importldif.c:114
-#: src/plugins/pgpcore/select-keys.c:253 src/plugins/pgpcore/sgpgme.c:143
-#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/vcalendar/day-view.c:402
+#: src/addressbook.c:509 src/crash.c:457 src/crash.c:476 src/importldif.c:114
+#: src/plugins/pgpcore/select-keys.c:247 src/plugins/pgpcore/sgpgme.c:144
+#: src/plugins/pgpcore/sgpgme.c:172 src/plugins/vcalendar/day-view.c:403
 #: src/plugins/vcalendar/month-view.c:428 src/prefs_themes.c:819
 #: src/prefs_themes.c:851 src/prefs_themes.c:852
 msgid "Unknown"
 msgstr "未知"
 
-#: src/addressbook.c:515 src/addressbook.c:534 src/importldif.c:121
+#: src/addressbook.c:516 src/addressbook.c:535 src/importldif.c:121
 msgid "Success"
 msgstr "成功"
 
-#: src/addressbook.c:516 src/importldif.c:122
+#: src/addressbook.c:517 src/importldif.c:122
 msgid "Bad arguments"
 msgstr "錯誤的命令"
 
-#: src/addressbook.c:517 src/importldif.c:123
+#: src/addressbook.c:518 src/importldif.c:123
 msgid "File not specified"
 msgstr "未指定檔案"
 
-#: src/addressbook.c:518 src/importldif.c:124
+#: src/addressbook.c:519 src/importldif.c:124
 msgid "Error opening file"
 msgstr "檔案開啟失敗"
 
-#: src/addressbook.c:519 src/importldif.c:125
+#: src/addressbook.c:520 src/importldif.c:125
 msgid "Error reading file"
 msgstr "讀取檔案錯誤"
 
-#: src/addressbook.c:520 src/importldif.c:126
+#: src/addressbook.c:521 src/importldif.c:126
 msgid "End of file encountered"
 msgstr "已達檔案結尾"
 
-#: src/addressbook.c:521 src/importldif.c:127
+#: src/addressbook.c:522 src/importldif.c:127
 msgid "Error allocating memory"
 msgstr "記憶體配置錯誤"
 
-#: src/addressbook.c:522 src/importldif.c:128
+#: src/addressbook.c:523 src/importldif.c:128
 msgid "Bad file format"
 msgstr "檔案格式錯誤"
 
-#: src/addressbook.c:523 src/importldif.c:129
+#: src/addressbook.c:524 src/importldif.c:129
 msgid "Error writing to file"
 msgstr "檔案寫入錯誤"
 
-#: src/addressbook.c:524 src/importldif.c:130
+#: src/addressbook.c:525 src/importldif.c:130
 msgid "Error opening directory"
 msgstr "目錄開啟錯誤"
 
-#: src/addressbook.c:525 src/importldif.c:131
+#: src/addressbook.c:526 src/importldif.c:131
 msgid "No path specified"
 msgstr "指定的路徑不存在"
 
-#: src/addressbook.c:535
+#: src/addressbook.c:536
 msgid "Error connecting to LDAP server"
 msgstr "連線至LDAP伺服器錯誤"
 
-#: src/addressbook.c:536
+#: src/addressbook.c:537
 msgid "Error initializing LDAP"
 msgstr "LDAP初始化錯誤"
 
-#: src/addressbook.c:537
+#: src/addressbook.c:538
 msgid "Error binding to LDAP server"
 msgstr "LDAP伺服器綁定錯誤"
 
-#: src/addressbook.c:538
+#: src/addressbook.c:539
 msgid "Error searching LDAP database"
 msgstr "搜尋LDAP資料庫錯誤"
 
-#: src/addressbook.c:539
+#: src/addressbook.c:540
 msgid "Timeout performing LDAP operation"
 msgstr "進行LDAP操作超時"
 
-#: src/addressbook.c:540
+#: src/addressbook.c:541
 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜尋標準錯誤"
 
-#: src/addressbook.c:541
+#: src/addressbook.c:542
 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP的搜尋標準進入點不存在"
 
-#: src/addressbook.c:542
+#: src/addressbook.c:543
 msgid "LDAP search terminated on request"
 msgstr "LDAP搜尋被要求終止"
 
-#: src/addressbook.c:543
+#: src/addressbook.c:544
 msgid "Error starting STARTTLS connection"
 msgstr "TLS連線起始失敗"
 
-#: src/addressbook.c:544
+#: src/addressbook.c:545
 msgid "Distinguished Name (dn) is missing"
 msgstr "缺少識別名稱?"
 
-#: src/addressbook.c:545
+#: src/addressbook.c:546
 msgid "Missing required information"
 msgstr "缺少要求的資訊"
 
-#: src/addressbook.c:546
+#: src/addressbook.c:547
 msgid "Another contact exists with that key"
 msgstr "發現另一個連絡人存在相同的金鑰"
 
-#: src/addressbook.c:547
+#: src/addressbook.c:548
 msgid "Strong(er) authentication required"
 msgstr "需要更強而有力的認證碼"
 
-#: src/addressbook.c:915
+#: src/addressbook.c:916
 msgid "Sources"
 msgstr "來源"
 
-#: src/addressbook.c:919 src/prefs_matcher.c:632 src/prefs_other.c:492
-#: src/toolbar.c:268 src/toolbar.c:2519
+#: src/addressbook.c:920 src/prefs_matcher.c:643 src/prefs_other.c:493
+#: src/toolbar.c:268 src/toolbar.c:2522
 msgid "Address book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:1114 src/editldap.c:793
+#: src/addressbook.c:1118 src/editldap.c:794
 msgid "Search"
 msgstr "搜尋"
 
-#: src/addressbook.c:1485
+#: src/addressbook.c:1490
 msgid "Delete group"
 msgstr "刪除群組"
 
-#: src/addressbook.c:1486
+#: src/addressbook.c:1491
 msgid ""
 "Really delete the group(s)?\n"
 "The addresses it contains will not be lost."
@@ -659,26 +665,26 @@ msgstr ""
 "確認要刪除群組嗎?\n"
 "所有的地址將遺失"
 
-#: src/addressbook.c:2194
+#: src/addressbook.c:2218
 msgid "Cannot paste. Target address book is readonly."
 msgstr "無法貼上,此地址是唯讀的"
 
-#: src/addressbook.c:2204
+#: src/addressbook.c:2228
 msgid "Cannot paste into an address group."
 msgstr "無法貼在地址群組上"
 
-#: src/addressbook.c:2912
+#: src/addressbook.c:2965
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s'?"
 msgstr "確認要刪除%s內所有搜尋的結果和地址嗎?"
 
-#: src/addressbook.c:2915 src/addressbook.c:2941 src/addressbook.c:2948
-#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:177
+#: src/addressbook.c:2968 src/addressbook.c:2994 src/addressbook.c:3001
+#: src/plugins/archive/archiver_prefs.c:431 src/prefs_filtering_action.c:173
 #: src/toolbar.c:497
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:2977
 #, c-format
 msgid ""
 "Do you want to delete '%s'? If you delete the folder only, the addresses it "
@@ -686,20 +692,20 @@ msgid ""
 msgstr ""
 "確認刪除%s嗎?如果只刪除資料夾,則裡面原有的地址都將被自動移至上層資料夾內"
 
-#: src/addressbook.c:2927 src/imap_gtk.c:368 src/mh_gtk.c:206
-#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:155
+#: src/addressbook.c:2980 src/imap_gtk.c:368 src/mh_gtk.c:206
+#: src/plugins/mailmbox/plugin_gtk.c:332 src/plugins/rssyl/rssyl_cb_menu.c:156
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:2928
+#: src/addressbook.c:2981
 msgid "Delete _folder only"
 msgstr "只刪除資料夾(_f)"
 
-#: src/addressbook.c:2928
+#: src/addressbook.c:2981
 msgid "Delete folder and _addresses"
 msgstr "刪除資料夾和地址(_a)"
 
-#: src/addressbook.c:2939
+#: src/addressbook.c:2992
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -708,7 +714,7 @@ msgstr ""
 "確認刪除%s嗎?\n"
 "所有的地址將不會遺失"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2999
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -717,28 +723,28 @@ msgstr ""
 "確認刪除%s嗎?\n"
 "所有的地址都將遺失"
 
-#: src/addressbook.c:3060
+#: src/addressbook.c:3113
 #, c-format
 msgid "Search '%s'"
 msgstr "尋找 %s"
 
-#: src/addressbook.c:3198 src/addressbook.c:3247
+#: src/addressbook.c:3251 src/addressbook.c:3300
 msgid "New Contacts"
 msgstr "新增連絡人"
 
-#: src/addressbook.c:4086
+#: src/addressbook.c:4137
 msgid "New user, could not save index file."
 msgstr "新連絡人無法儲存至索引檔中"
 
-#: src/addressbook.c:4090
+#: src/addressbook.c:4141
 msgid "New user, could not save address book files."
 msgstr "新連絡人無法儲存至通訊錄檔案"
 
-#: src/addressbook.c:4100
+#: src/addressbook.c:4151
 msgid "Old address book converted successfully."
 msgstr "舊通訊錄轉換成功"
 
-#: src/addressbook.c:4105
+#: src/addressbook.c:4156
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -746,7 +752,7 @@ msgstr ""
 "舊通訊錄已轉換,\n"
 "無法儲存新地址索引檔"
 
-#: src/addressbook.c:4118
+#: src/addressbook.c:4169
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -754,7 +760,7 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "但已建立新的空通訊錄檔案"
 
-#: src/addressbook.c:4124
+#: src/addressbook.c:4175
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -762,7 +768,7 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "無法儲存新的地址索引檔"
 
-#: src/addressbook.c:4129
+#: src/addressbook.c:4180
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -770,300 +776,283 @@ msgstr ""
 "無法轉換通訊錄,\n"
 "且無法建立新的通訊錄檔案"
 
-#: src/addressbook.c:4136 src/addressbook.c:4142
+#: src/addressbook.c:4187 src/addressbook.c:4193
 msgid "Addressbook conversion error"
 msgstr "通訊錄轉換失敗"
 
-#: src/addressbook.c:4257
+#: src/addressbook.c:4308
 msgid "Addressbook Error"
 msgstr "通訊錄錯誤"
 
-#: src/addressbook.c:4258
+#: src/addressbook.c:4309
 msgid "Could not read address index"
 msgstr "無法讀取地址索引"
 
-#: src/addressbook.c:4589
+#: src/addressbook.c:4640
 msgid "Busy searching..."
 msgstr "正在搜尋..."
 
-#: src/addressbook.c:4919 src/prefs_send.c:216
+#: src/addressbook.c:4970 src/prefs_send.c:220
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:4931
+#: src/addressbook.c:4982
 msgid "Address Books"
 msgstr "通訊錄"
 
-#: src/addressbook.c:4943
+#: src/addressbook.c:4994
 msgid "Person"
 msgstr "人員"
 
-#: src/addressbook.c:4979 src/exporthtml.c:884 src/folderview.c:355
-#: src/folderview.c:443 src/prefs_account.c:2860 src/prefs_folder_column.c:77
+#: src/addressbook.c:5030 src/exporthtml.c:885 src/folderview.c:361
+#: src/folderview.c:449 src/prefs_account.c:3149 src/prefs_folder_column.c:77
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:4991
+#: src/addressbook.c:5042
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:5003 src/addressbook.c:5015
+#: src/addressbook.c:5054 src/addressbook.c:5066
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:5027
+#: src/addressbook.c:5078
 msgid "LDAP servers"
 msgstr "LDAP伺服器"
 
-#: src/addressbook.c:5039
+#: src/addressbook.c:5090
 msgid "LDAP Query"
 msgstr "LDAP查詢"
 
-#: src/addressbook_foldersel.c:182 src/exphtmldlg.c:371 src/expldifdlg.c:388
-#: src/exporthtml.c:984 src/importldif.c:657
+#: src/addressbook_foldersel.c:203 src/exphtmldlg.c:371 src/expldifdlg.c:388
+#: src/exporthtml.c:985 src/importldif.c:541
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook_foldersel.c:387 src/plugins/bogofilter/bogofilter.c:107
-#: src/plugins/bogofilter/bogofilter_gtk.c:274
-#: src/plugins/bogofilter/bogofilter_gtk.c:347
-#: src/plugins/bogofilter/bogofilter_gtk.c:424
-#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
-#: src/plugins/bsfilter/bsfilter_gtk.c:266
-#: src/plugins/bsfilter/bsfilter_gtk.c:326
-#: src/plugins/spamassassin/spamassassin.c:117
-#: src/plugins/spamassassin/spamassassin_gtk.c:443
-#: src/plugins/spamassassin/spamassassin_gtk.c:490
-#: src/plugins/spamassassin/spamassassin_gtk.c:613 src/prefs_matcher.c:675
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1621 src/prefs_matcher.c:1628
-#: src/prefs_matcher.c:1636 src/prefs_matcher.c:1638 src/prefs_matcher.c:2522
-#: src/prefs_matcher.c:2526
-msgid "Any"
-msgstr "任何"
-
-#: src/addrgather.c:173
+#: src/addrgather.c:179
 msgid "Please specify name for address book."
 msgstr "請指定通訊錄名稱"
 
-#: src/addrgather.c:180
+#: src/addrgather.c:186
 msgid "No available address book."
 msgstr "找不到有效的通訊錄"
 
-#: src/addrgather.c:201
+#: src/addrgather.c:207
 msgid "Please select the mail headers to search."
 msgstr "請選擇信件標頭進行搜尋"
 
-#: src/addrgather.c:208
+#: src/addrgather.c:214
 msgid "Collecting addresses..."
 msgstr "搜索地址"
 
-#: src/addrgather.c:248
-msgid "address added by claws-mail"
-msgstr "地址已加入 claws-mail"
+#: src/addrgather.c:254
+msgid "address added by Claws Mail"
+msgstr "地址已加入 Claws-mail"
 
-#: src/addrgather.c:276
+#: src/addrgather.c:285
 msgid "Addresses collected successfully."
 msgstr "地址收集成功"
 
-#: src/addrgather.c:351
+#: src/addrgather.c:360
 msgid "Current folder:"
 msgstr "目前的資料夾"
 
-#: src/addrgather.c:362
+#: src/addrgather.c:371
 msgid "Address book name:"
 msgstr "通訊錄名稱"
 
-#: src/addrgather.c:389
+#: src/addrgather.c:398
 msgid "Address book folder size:"
 msgstr "通訊錄資料夾大小"
 
-#: src/addrgather.c:393 src/addrgather.c:403
+#: src/addrgather.c:402 src/addrgather.c:411
 msgid ""
 "Maximum amount of entries per folder within the newly created address book"
 msgstr "新通訊錄中每一個資料夾內最大的資料筆數"
 
-#: src/addrgather.c:407
+#: src/addrgather.c:415
 msgid "Process these mail header fields"
 msgstr "郵件標頭區處理中"
 
-#: src/addrgather.c:426
+#: src/addrgather.c:434
 msgid "Include subfolders"
 msgstr "包含子資料夾"
 
-#: src/addrgather.c:450 src/prefs_filtering_action.c:1429
+#: src/addrgather.c:492 src/prefs_filtering_action.c:1384
 msgid "Header Name"
 msgstr "標頭名稱"
 
-#: src/addrgather.c:451
+#: src/addrgather.c:498
 msgid "Address Count"
 msgstr "地址數量"
 
-#: src/addrgather.c:561
+#: src/addrgather.c:586
 msgid "Header Fields"
 msgstr "標頭區"
 
-#: src/addrgather.c:562 src/exphtmldlg.c:658 src/expldifdlg.c:722
-#: src/importldif.c:1022
+#: src/addrgather.c:587 src/exphtmldlg.c:659 src/expldifdlg.c:723
+#: src/importldif.c:982
 msgid "Finish"
 msgstr "完成"
 
-#: src/addrgather.c:620
+#: src/addrgather.c:645
 msgid "Collect email addresses from selected messages"
 msgstr "從選擇的郵件內收集郵件地址"
 
-#: src/addrgather.c:624
+#: src/addrgather.c:649
 msgid "Collect email addresses from folder"
 msgstr "從資料夾內收集郵件地址"
 
-#: src/addrindex.c:124
+#: src/addrindex.c:125
 msgid "Common addresses"
 msgstr "共用地址"
 
-#: src/addrindex.c:125
+#: src/addrindex.c:126
 msgid "Personal addresses"
 msgstr "個人地址"
 
-#: src/addrindex.c:131
+#: src/addrindex.c:132
 msgid "Common address"
 msgstr "共用地址"
 
-#: src/addrindex.c:132
+#: src/addrindex.c:133
 msgid "Personal address"
 msgstr "個人地址"
 
-#: src/addrindex.c:1829
+#: src/addrindex.c:1834
 msgid "Address(es) update"
 msgstr "地址更新"
 
-#: src/addrindex.c:1830
+#: src/addrindex.c:1835
 msgid "Update failed. Changes not written to Directory."
 msgstr "更新錯誤!所有的改變將不會被儲存"
 
-#: src/alertpanel.c:146 src/compose.c:9800
+#: src/alertpanel.c:144 src/compose.c:9795
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:159 src/compose.c:5852 src/compose.c:6380
-#: src/compose.c:12257 src/file_checker.c:78 src/file_checker.c:100
-#: src/messageview.c:855 src/messageview.c:882 src/plugins/pgpcore/sgpgme.c:806
-#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:4937
+#: src/alertpanel.c:157 src/compose.c:5856 src/compose.c:6401
+#: src/compose.c:12258 src/file_checker.c:84 src/file_checker.c:108
+#: src/messageview.c:858 src/plugins/pgpcore/sgpgme.c:811
+#: src/plugins/vcalendar/vcalendar.c:125 src/summaryview.c:5091
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:172 src/alertpanel.c:195 src/compose.c:5789 src/inc.c:663
-#: src/plugins/pgpcore/sgpgme.c:155 src/plugins/pgpcore/sgpgme.c:310
+#: src/alertpanel.c:170 src/alertpanel.c:193 src/compose.c:5793 src/inc.c:726
+#: src/plugins/pgpcore/sgpgme.c:156 src/plugins/pgpcore/sgpgme.c:311
 msgid "Error"
 msgstr "錯誤"
 
-#: src/alertpanel.c:196 src/gtk/progressdialog.c:94
+#: src/alertpanel.c:194 src/gtk/progressdialog.c:94
 msgid "_View log"
 msgstr "顯示日誌(_V)"
 
-#: src/alertpanel.c:347
+#: src/alertpanel.c:346
 msgid "Show this message next time"
 msgstr "下一次顯示這個訊息"
 
-#: src/browseldap.c:218
+#: src/browseldap.c:223
 msgid "Browse Directory Entry"
 msgstr "瀏覽目錄"
 
-#: src/browseldap.c:237
+#: src/browseldap.c:243
 msgid "Server Name:"
 msgstr "伺服器名稱:"
 
-#: src/browseldap.c:247
+#: src/browseldap.c:253
 msgid "Distinguished Name (dn):"
 msgstr "識別名稱 (dn)"
 
-#: src/browseldap.c:270
+#: src/browseldap.c:284
 msgid "LDAP Name"
 msgstr "LDAP名稱"
 
-#: src/browseldap.c:272
+#: src/browseldap.c:290
 msgid "Attribute Value"
 msgstr "屬性值"
 
-#: src/common/plugin.c:69
+#: src/common/plugin.c:70
 msgid "Nothing"
 msgstr "什麼都沒有"
 
-#: src/common/plugin.c:70
+#: src/common/plugin.c:71
 msgid "a viewer"
 msgstr "觀察器"
 
-#: src/common/plugin.c:71
+#: src/common/plugin.c:72
 msgid "a MIME parser"
 msgstr "MIME轉譯器"
 
-#: src/common/plugin.c:72
+#: src/common/plugin.c:73
 msgid "folders"
 msgstr "資料夾"
 
-#: src/common/plugin.c:73
+#: src/common/plugin.c:74
 msgid "filtering"
 msgstr "過濾中"
 
-#: src/common/plugin.c:74
+#: src/common/plugin.c:75
 msgid "a privacy interface"
 msgstr "私有界面"
 
-#: src/common/plugin.c:75
+#: src/common/plugin.c:76
 msgid "a notifier"
 msgstr "通知器"
 
-#: src/common/plugin.c:76
+#: src/common/plugin.c:77
 msgid "an utility"
 msgstr "實用的"
 
-#: src/common/plugin.c:77
+#: src/common/plugin.c:78
 msgid "things"
 msgstr "東西"
 
-#: src/common/plugin.c:334
+#: src/common/plugin.c:335
 #, c-format
 msgid ""
 "This plugin provides %s (%s), which is already provided by the %s plugin."
 msgstr "這個外掛提供了 %s (%s), 而這個功能已經在 %s 外掛中被提供了"
 
-#: src/common/plugin.c:437
+#: src/common/plugin.c:438
 msgid "Plugin already loaded"
 msgstr "此外掛功能已經載入"
 
-#: src/common/plugin.c:448
+#: src/common/plugin.c:449
 msgid "Failed to allocate memory for Plugin"
 msgstr "此外掛功能發生記憶體配置錯誤"
 
-#: src/common/plugin.c:482
+#: src/common/plugin.c:483
 msgid "This module is not licensed under a GPL v3 or later compatible license."
 msgstr "此模組並未取得GPL v3或更新版本的相容許可"
 
-#: src/common/plugin.c:491
+#: src/common/plugin.c:492
 msgid "This module is for Claws Mail GTK1."
 msgstr "此模組適用於 Claws Mail GTK1"
 
-#: src/common/plugin.c:769
+#: src/common/plugin.c:770
 #, c-format
 msgid ""
 "Your version of Claws Mail is newer than the version the '%s' plugin was "
 "built with."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要新"
 
-#: src/common/plugin.c:772
+#: src/common/plugin.c:773
 msgid ""
 "Your version of Claws Mail is newer than the version the plugin was built "
 "with."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要新"
 
-#: src/common/plugin.c:781
+#: src/common/plugin.c:782
 #, c-format
 msgid "Your version of Claws Mail is too old for the '%s' plugin."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要舊"
 
-#: src/common/plugin.c:783
+#: src/common/plugin.c:784
 msgid "Your version of Claws Mail is too old for the plugin."
 msgstr "此Claws Mail版本比外掛程式 %s 建置的版本還要舊"
 
-#: src/common/session.c:183 src/imap.c:1207
+#: src/common/session.c:201 src/imap.c:1233
 msgid "SSL/TLS handshake failed\n"
 msgstr "SSL/TLS 交握失敗\n"
 
@@ -1083,7 +1072,7 @@ msgstr "錯誤的SMTP回應\n"
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP執行時期發生錯誤\n"
 
-#: src/common/smtp.c:535 src/pop.c:905
+#: src/common/smtp.c:535 src/pop.c:907
 msgid "error occurred on authentication\n"
 msgstr "認證發生錯誤\n"
 
@@ -1092,7 +1081,7 @@ msgstr "認證發生錯誤\n"
 msgid "Message is too big (Maximum size is %s)\n"
 msgstr "訊息太多(最大的容許量是 %s)\n"
 
-#: src/common/smtp.c:617 src/pop.c:898
+#: src/common/smtp.c:617 src/pop.c:900
 msgid "couldn't start STARTTLS session\n"
 msgstr "無法執行STARTTLS\n"
 
@@ -1104,104 +1093,104 @@ msgstr "Socket 輸出/入超時\n"
 msgid "Connection timed out.\n"
 msgstr "連線超時\n"
 
-#: src/common/socket.c:734
+#: src/common/socket.c:740
 #, c-format
 msgid "%s:%d: connection failed (%s).\n"
 msgstr "%s:%d: 連線失敗 (%s)\n"
 
-#: src/common/socket.c:974
+#: src/common/socket.c:980
 #, c-format
 msgid "%s:%d: unknown host.\n"
 msgstr "%s:%d: 不知名的主機\n"
 
-#: src/common/socket.c:1066
+#: src/common/socket.c:1072
 #, c-format
 msgid "%s:%s: host lookup failed (%s).\n"
 msgstr "%s:%s: 尋找主機失敗 (%s)\n"
 
-#: src/common/socket.c:1370
+#: src/common/socket.c:1385
 #, c-format
 msgid "write on fd%d: %s\n"
 msgstr "寫入 fd%d: %s\n"
 
-#: src/common/ssl_certificate.c:326
+#: src/common/ssl_certificate.c:338
 #, c-format
 msgid "Cannot stat P12 certificate file (%s)\n"
 msgstr "無法指定P12認證檔 (%s)\n"
 
-#: src/common/ssl_certificate.c:334
+#: src/common/ssl_certificate.c:346
 #, c-format
 msgid "Cannot read P12 certificate file (%s)\n"
 msgstr "無法讀取P12認證檔 (%s)\n"
 
-#: src/common/ssl_certificate.c:343
+#: src/common/ssl_certificate.c:355
 #, c-format
 msgid "Cannot import P12 certificate file (%s)\n"
 msgstr "無法匯入P12認證檔 (%s)\n"
 
-#: src/common/ssl_certificate.c:628
+#: src/common/ssl_certificate.c:640
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: src/common/ssl_certificate.c:633
+#: src/common/ssl_certificate.c:645
 msgid "Uncheckable"
 msgstr "無法被選取"
 
-#: src/common/ssl_certificate.c:637
+#: src/common/ssl_certificate.c:649
 msgid "Self-signed certificate"
 msgstr "自我簽署簽證"
 
-#: src/common/ssl_certificate.c:640
+#: src/common/ssl_certificate.c:652
 msgid "Revoked certificate"
 msgstr "簽證徹回"
 
-#: src/common/ssl_certificate.c:642
+#: src/common/ssl_certificate.c:654
 msgid "No certificate issuer found"
 msgstr "找不到簽證發行者"
 
-#: src/common/ssl_certificate.c:644
+#: src/common/ssl_certificate.c:656
 msgid "Certificate issuer is not a CA"
 msgstr "簽證發行者不是CA"
 
-#: src/common/ssl_certificate.c:869
+#: src/common/ssl_certificate.c:881
 #, c-format
 msgid "Cannot open certificate file %s: %s\n"
 msgstr "無法開啟簽證檔案 %s: %s\n"
 
-#: src/common/ssl_certificate.c:873
+#: src/common/ssl_certificate.c:885
 #, c-format
 msgid "Certificate file %s missing (%s)\n"
 msgstr "簽證檔案%s遺失(%s)\n"
 
-#: src/common/ssl_certificate.c:892
+#: src/common/ssl_certificate.c:904
 #, c-format
 msgid "Cannot open key file %s (%s)\n"
 msgstr "無法開啟金鑰檔案 %s (%s)\n"
 
-#: src/common/ssl_certificate.c:896
+#: src/common/ssl_certificate.c:908
 #, c-format
 msgid "Key file %s missing (%s)\n"
 msgstr "金鑰檔案%s遺失(%s)\n"
 
-#: src/common/ssl_certificate.c:1044
+#: src/common/ssl_certificate.c:1056
 #, c-format
 msgid "Failed to read P12 certificate file %s\n"
 msgstr "讀取P12簽證檔案%s失敗\n"
 
-#: src/common/ssl_certificate.c:1047
+#: src/common/ssl_certificate.c:1059
 #, c-format
 msgid "Cannot open P12 certificate file %s (%s)\n"
 msgstr "開啟P12簽證檔案 %s (%s)失敗\n"
 
-#: src/common/ssl_certificate.c:1051
+#: src/common/ssl_certificate.c:1063
 #, c-format
 msgid "P12 Certificate file %s missing (%s)\n"
 msgstr "P12簽證檔案%s遺失 (%s)\n"
 
-#: src/common/ssl_certificate.c:1076 src/gtk/sslcertwindow.c:85
-#: src/gtk/sslcertwindow.c:92 src/gtk/sslcertwindow.c:107
-#: src/gtk/sslcertwindow.c:112 src/gtk/sslcertwindow.c:119
-#: src/gtk/sslcertwindow.c:134
+#: src/common/ssl_certificate.c:1088 src/gtk/sslcertwindow.c:87
+#: src/gtk/sslcertwindow.c:94 src/gtk/sslcertwindow.c:109
+#: src/gtk/sslcertwindow.c:114 src/gtk/sslcertwindow.c:121
+#: src/gtk/sslcertwindow.c:136
 msgid "<not in certificate>"
 msgstr "<尚未簽證>"
 
@@ -1209,646 +1198,659 @@ msgstr "<尚未簽證>"
 msgid "(Subject cleared by RegExp)"
 msgstr "標題已被RegExp清除"
 
-#: src/common/utils.c:256
+#: src/common/utils.c:200
 #, c-format
 msgid "%dB"
 msgstr "%dB"
 
-#: src/common/utils.c:257
+#: src/common/utils.c:201
 #, c-format
 msgid "%d.%02dKB"
 msgstr "%d.%02dKB"
 
-#: src/common/utils.c:258
+#: src/common/utils.c:202
 #, c-format
 msgid "%d.%02dMB"
 msgstr "%d.%02dMB"
 
-#: src/common/utils.c:259
+#: src/common/utils.c:203
 #, c-format
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/common/utils.c:4781
+#: src/common/utils.c:4028
 msgctxt "Complete day name for use by strftime"
 msgid "Sunday"
 msgstr "星期日"
 
-#: src/common/utils.c:4782
+#: src/common/utils.c:4029
 msgctxt "Complete day name for use by strftime"
 msgid "Monday"
 msgstr "星期一"
 
-#: src/common/utils.c:4783
+#: src/common/utils.c:4030
 msgctxt "Complete day name for use by strftime"
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/common/utils.c:4784
+#: src/common/utils.c:4031
 msgctxt "Complete day name for use by strftime"
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/common/utils.c:4785
+#: src/common/utils.c:4032
 msgctxt "Complete day name for use by strftime"
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/common/utils.c:4786
+#: src/common/utils.c:4033
 msgctxt "Complete day name for use by strftime"
 msgid "Friday"
 msgstr "星期五"
 
-#: src/common/utils.c:4787
+#: src/common/utils.c:4034
 msgctxt "Complete day name for use by strftime"
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/common/utils.c:4789
+#: src/common/utils.c:4036
 msgctxt "Complete month name for use by strftime"
 msgid "January"
 msgstr "一月"
 
-#: src/common/utils.c:4790
+#: src/common/utils.c:4037
 msgctxt "Complete month name for use by strftime"
 msgid "February"
 msgstr "二月"
 
-#: src/common/utils.c:4791
+#: src/common/utils.c:4038
 msgctxt "Complete month name for use by strftime"
 msgid "March"
 msgstr "三月"
 
-#: src/common/utils.c:4792
+#: src/common/utils.c:4039
 msgctxt "Complete month name for use by strftime"
 msgid "April"
 msgstr "四月"
 
-#: src/common/utils.c:4793
+#: src/common/utils.c:4040
 msgctxt "Complete month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4794
+#: src/common/utils.c:4041
 msgctxt "Complete month name for use by strftime"
 msgid "June"
 msgstr "六月"
 
-#: src/common/utils.c:4795
+#: src/common/utils.c:4042
 msgctxt "Complete month name for use by strftime"
 msgid "July"
 msgstr "七月"
 
-#: src/common/utils.c:4796
+#: src/common/utils.c:4043
 msgctxt "Complete month name for use by strftime"
 msgid "August"
 msgstr "八月"
 
-#: src/common/utils.c:4797
+#: src/common/utils.c:4044
 msgctxt "Complete month name for use by strftime"
 msgid "September"
 msgstr "九月"
 
-#: src/common/utils.c:4798
+#: src/common/utils.c:4045
 msgctxt "Complete month name for use by strftime"
 msgid "October"
 msgstr "十月"
 
-#: src/common/utils.c:4799
+#: src/common/utils.c:4046
 msgctxt "Complete month name for use by strftime"
 msgid "November"
 msgstr "十一月"
 
-#: src/common/utils.c:4800
+#: src/common/utils.c:4047
 msgctxt "Complete month name for use by strftime"
 msgid "December"
 msgstr "十二月"
 
-#: src/common/utils.c:4802
+#: src/common/utils.c:4049
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sun"
 msgstr "星期日"
 
-#: src/common/utils.c:4803
+#: src/common/utils.c:4050
 msgctxt "Abbr. day name for use by strftime"
 msgid "Mon"
 msgstr "星期一"
 
-#: src/common/utils.c:4804
+#: src/common/utils.c:4051
 msgctxt "Abbr. day name for use by strftime"
 msgid "Tue"
 msgstr "星期二"
 
-#: src/common/utils.c:4805
+#: src/common/utils.c:4052
 msgctxt "Abbr. day name for use by strftime"
 msgid "Wed"
 msgstr "星期三"
 
-#: src/common/utils.c:4806
+#: src/common/utils.c:4053
 msgctxt "Abbr. day name for use by strftime"
 msgid "Thu"
 msgstr "星期四"
 
-#: src/common/utils.c:4807
+#: src/common/utils.c:4054
 msgctxt "Abbr. day name for use by strftime"
 msgid "Fri"
 msgstr "星期五"
 
-#: src/common/utils.c:4808
+#: src/common/utils.c:4055
 msgctxt "Abbr. day name for use by strftime"
 msgid "Sat"
 msgstr "星期六"
 
-#: src/common/utils.c:4810
+#: src/common/utils.c:4057
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jan"
 msgstr "一月"
 
-#: src/common/utils.c:4811
+#: src/common/utils.c:4058
 msgctxt "Abbr. month name for use by strftime"
 msgid "Feb"
 msgstr "二月"
 
-#: src/common/utils.c:4812
+#: src/common/utils.c:4059
 msgctxt "Abbr. month name for use by strftime"
 msgid "Mar"
 msgstr "三月"
 
-#: src/common/utils.c:4813
+#: src/common/utils.c:4060
 msgctxt "Abbr. month name for use by strftime"
 msgid "Apr"
 msgstr "四月"
 
-#: src/common/utils.c:4814
+#: src/common/utils.c:4061
 msgctxt "Abbr. month name for use by strftime"
 msgid "May"
 msgstr "五月"
 
-#: src/common/utils.c:4815
+#: src/common/utils.c:4062
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jun"
 msgstr "六月"
 
-#: src/common/utils.c:4816
+#: src/common/utils.c:4063
 msgctxt "Abbr. month name for use by strftime"
 msgid "Jul"
 msgstr "七月"
 
-#: src/common/utils.c:4817
+#: src/common/utils.c:4064
 msgctxt "Abbr. month name for use by strftime"
 msgid "Aug"
 msgstr "八月"
 
-#: src/common/utils.c:4818
+#: src/common/utils.c:4065
 msgctxt "Abbr. month name for use by strftime"
 msgid "Sep"
 msgstr "九月"
 
-#: src/common/utils.c:4819
+#: src/common/utils.c:4066
 msgctxt "Abbr. month name for use by strftime"
 msgid "Oct"
 msgstr "十月"
 
-#: src/common/utils.c:4820
+#: src/common/utils.c:4067
 msgctxt "Abbr. month name for use by strftime"
 msgid "Nov"
 msgstr "十一月"
 
-#: src/common/utils.c:4821
+#: src/common/utils.c:4068
 msgctxt "Abbr. month name for use by strftime"
 msgid "Dec"
 msgstr "十二月"
 
-#: src/common/utils.c:4832
+#: src/common/utils.c:4079
 msgctxt "For use by strftime (morning)"
 msgid "AM"
 msgstr "上午"
 
-#: src/common/utils.c:4833
+#: src/common/utils.c:4080
 msgctxt "For use by strftime (afternoon)"
 msgid "PM"
 msgstr "下午"
 
-#: src/common/utils.c:4834
+#: src/common/utils.c:4081
 msgctxt "For use by strftime (morning, lowercase)"
 msgid "am"
 msgstr "上午"
 
-#: src/common/utils.c:4835
+#: src/common/utils.c:4082
 msgctxt "For use by strftime (afternoon, lowercase)"
 msgid "pm"
 msgstr "下午"
 
-#: src/compose.c:593
+#: src/compose.c:596
 msgid "_Add..."
 msgstr "新增(_A)..."
 
-#: src/compose.c:594 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
-#: src/plugins/rssyl/rssyl_cb_menu.c:316
+#: src/compose.c:597 src/mh_gtk.c:375 src/plugins/mailmbox/plugin_gtk.c:301
+#: src/plugins/rssyl/rssyl_cb_menu.c:323
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/compose.c:596 src/folderview.c:254
+#: src/compose.c:599 src/folderview.c:254
 msgid "_Properties..."
 msgstr "屬性(_P)"
 
-#: src/compose.c:603 src/mainwindow.c:516 src/messageview.c:211
+#: src/compose.c:606 src/mainwindow.c:525 src/messageview.c:214
 msgid "_Message"
 msgstr "郵件(_M)"
 
-#: src/compose.c:606
+#: src/compose.c:609
 msgid "_Spelling"
 msgstr "拼字(_S)"
 
-#: src/compose.c:608 src/compose.c:675
+#: src/compose.c:611 src/compose.c:678
 msgid "_Options"
 msgstr "選用(_O)"
 
-#: src/compose.c:612
+#: src/compose.c:615
 msgid "S_end"
 msgstr "傳送(_e)"
 
-#: src/compose.c:613
+#: src/compose.c:616
 msgid "Send _later"
 msgstr "稍後傳送(_l)"
 
-#: src/compose.c:616
+#: src/compose.c:619
 msgid "_Attach file"
 msgstr "附加檔案(_A)"
 
-#: src/compose.c:617
+#: src/compose.c:620
 msgid "_Insert file"
 msgstr "插入檔案(_I)"
 
-#: src/compose.c:618
+#: src/compose.c:621
 msgid "Insert si_gnature"
 msgstr "插入簽名(_g)"
 
-#: src/compose.c:619
+#: src/compose.c:622
 msgid "_Replace signature"
 msgstr "覆蓋簽名(_R)"
 
-#: src/compose.c:623
+#: src/compose.c:626
 msgid "_Print"
 msgstr "列印(_P)"
 
-#: src/compose.c:628 src/plugins/managesieve/sieve_editor.c:91
+#: src/compose.c:631 src/plugins/managesieve/sieve_editor.c:91
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: src/compose.c:629 src/plugins/managesieve/sieve_editor.c:92
+#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:92
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
-#: src/compose.c:632 src/plugins/managesieve/sieve_editor.c:95
+#: src/compose.c:635 src/plugins/managesieve/sieve_editor.c:95
 msgid "Cu_t"
 msgstr "剪下(_t)"
 
-#: src/compose.c:636
+#: src/compose.c:639
 msgid "_Special paste"
 msgstr "特殊貼上(_S)"
 
-#: src/compose.c:637
+#: src/compose.c:640
 msgid "As _quotation"
 msgstr "如引言(_q)"
 
-#: src/compose.c:638
+#: src/compose.c:641
 msgid "_Wrapped"
 msgstr "已換行(_W)"
 
-#: src/compose.c:639
+#: src/compose.c:642
 msgid "_Unwrapped"
 msgstr "不換行(_U)"
 
-#: src/compose.c:641 src/mainwindow.c:549
+#: src/compose.c:644 src/mainwindow.c:558
 #: src/plugins/managesieve/sieve_editor.c:99
 msgid "Select _all"
 msgstr "全選(_a)"
 
-#: src/compose.c:643
+#: src/compose.c:646
 msgid "A_dvanced"
 msgstr "進階(_d)"
 
-#: src/compose.c:644
+#: src/compose.c:647
 msgid "Move a character backward"
 msgstr "向後移動一個位元"
 
-#: src/compose.c:645
+#: src/compose.c:648
 msgid "Move a character forward"
 msgstr "向前移動一個位元"
 
-#: src/compose.c:646
+#: src/compose.c:649
 msgid "Move a word backward"
 msgstr "向後移動一個字"
 
-#: src/compose.c:647
+#: src/compose.c:650
 msgid "Move a word forward"
 msgstr "向前移動一個字"
 
-#: src/compose.c:648
+#: src/compose.c:651
 msgid "Move to beginning of line"
 msgstr "移至列首"
 
-#: src/compose.c:649
+#: src/compose.c:652
 msgid "Move to end of line"
 msgstr "移至列尾"
 
-#: src/compose.c:650
+#: src/compose.c:653
 msgid "Move to previous line"
 msgstr "移至上一列"
 
-#: src/compose.c:651
+#: src/compose.c:654
 msgid "Move to next line"
 msgstr "移至下一列"
 
-#: src/compose.c:652
+#: src/compose.c:655
 msgid "Delete a character backward"
 msgstr "向後刪除一個字元"
 
-#: src/compose.c:653
+#: src/compose.c:656
 msgid "Delete a character forward"
 msgstr "向前刪除一個字元"
 
-#: src/compose.c:654
+#: src/compose.c:657
 msgid "Delete a word backward"
 msgstr "向後刪除一個字"
 
-#: src/compose.c:655
+#: src/compose.c:658
 msgid "Delete a word forward"
 msgstr "向前刪除一個字"
 
-#: src/compose.c:656
+#: src/compose.c:659
 msgid "Delete line"
 msgstr "刪除列"
 
-#: src/compose.c:657
+#: src/compose.c:660
 msgid "Delete to end of line"
 msgstr "刪除至列尾"
 
-#: src/compose.c:660 src/messageview.c:228
+#: src/compose.c:663 src/messageview.c:231
 #: src/plugins/managesieve/sieve_editor.c:102
 msgid "_Find"
 msgstr "尋找(_F)"
 
-#: src/compose.c:663
+#: src/compose.c:666
 msgid "_Wrap current paragraph"
 msgstr "目前的段落換行(_W)"
 
-#: src/compose.c:664
+#: src/compose.c:667
 msgid "Wrap all long _lines"
 msgstr "所有的長列換行(_l)"
 
-#: src/compose.c:666
+#: src/compose.c:669
 msgid "Edit with e_xternal editor"
 msgstr "用外部編輯器進行編輯(_x)"
 
-#: src/compose.c:669
+#: src/compose.c:672
 msgid "_Check all or check selection"
 msgstr "檢查所有或勾選的項目(_C)"
 
-#: src/compose.c:670
+#: src/compose.c:673
 msgid "_Highlight all misspelled words"
 msgstr "標示所有拼錯的單字(_H)"
 
-#: src/compose.c:671
+#: src/compose.c:674
 msgid "Check _backwards misspelled word"
 msgstr "向後檢查拼錯的單字(_b)"
 
-#: src/compose.c:672
+#: src/compose.c:675
 msgid "_Forward to next misspelled word"
 msgstr "向前檢查拼錯的單字(_F)"
 
-#: src/compose.c:679
+#: src/compose.c:682
 msgid "Reply _mode"
 msgstr "回復模式(_m)"
 
-#: src/compose.c:681
+#: src/compose.c:684
 msgid "Privacy _System"
 msgstr "隱私系統(_S)"
 
-#: src/compose.c:685
+#: src/compose.c:688
 msgid "_Priority"
 msgstr "優先權(_P)"
 
-#: src/compose.c:687 src/mainwindow.c:611 src/messageview.c:264
+#: src/compose.c:690 src/mainwindow.c:620 src/messageview.c:267
 msgid "Character _encoding"
 msgstr "字元編碼(_e)"
 
-#: src/compose.c:692 src/mainwindow.c:616 src/messageview.c:269
+#: src/compose.c:695 src/mainwindow.c:625 src/messageview.c:272
 msgid "Western European"
 msgstr "西歐"
 
-#: src/compose.c:693 src/mainwindow.c:617 src/messageview.c:270
+#: src/compose.c:696 src/mainwindow.c:626 src/messageview.c:273
 msgid "Baltic"
 msgstr "波羅的海"
 
-#: src/compose.c:694 src/mainwindow.c:618 src/messageview.c:271
+#: src/compose.c:697 src/mainwindow.c:627 src/messageview.c:274
 msgid "Hebrew"
 msgstr "希伯來"
 
-#: src/compose.c:695 src/mainwindow.c:619 src/messageview.c:272
+#: src/compose.c:698 src/mainwindow.c:628 src/messageview.c:275
 msgid "Arabic"
 msgstr "阿拉伯"
 
-#: src/compose.c:696 src/mainwindow.c:620 src/messageview.c:273
+#: src/compose.c:699 src/mainwindow.c:629 src/messageview.c:276
 msgid "Cyrillic"
 msgstr "西里爾"
 
-#: src/compose.c:697 src/mainwindow.c:621 src/messageview.c:274
+#: src/compose.c:700 src/mainwindow.c:630 src/messageview.c:277
 msgid "Japanese"
 msgstr "日文"
 
-#: src/compose.c:698 src/mainwindow.c:622 src/messageview.c:275
+#: src/compose.c:701 src/mainwindow.c:631 src/messageview.c:278
 msgid "Chinese"
 msgstr "中文"
 
-#: src/compose.c:699 src/mainwindow.c:623 src/messageview.c:276
+#: src/compose.c:702 src/mainwindow.c:632 src/messageview.c:279
 msgid "Korean"
 msgstr "韓文"
 
-#: src/compose.c:700 src/mainwindow.c:624 src/messageview.c:277
+#: src/compose.c:703 src/mainwindow.c:633 src/messageview.c:280
 msgid "Thai"
 msgstr "泰文"
 
-#: src/compose.c:703 src/mainwindow.c:734 src/messageview.c:313
+#: src/compose.c:706 src/mainwindow.c:743 src/messageview.c:316
 msgid "_Address book"
 msgstr "通訊錄"
 
-#: src/compose.c:705
+#: src/compose.c:708
 msgid "_Template"
 msgstr "樣板"
 
-#: src/compose.c:707 src/mainwindow.c:762 src/messageview.c:333
+#: src/compose.c:710 src/mainwindow.c:771 src/messageview.c:336
 msgid "Actio_ns"
 msgstr "動作"
 
-#: src/compose.c:716
+#: src/compose.c:719
 msgid "Aut_o wrapping"
 msgstr "自動換行"
 
-#: src/compose.c:717
+#: src/compose.c:720
 msgid "Auto _indent"
 msgstr "自動縮排(_i)"
 
-#: src/compose.c:718
+#: src/compose.c:721
 msgid "Si_gn"
 msgstr "簽名"
 
-#: src/compose.c:719
+#: src/compose.c:722
 msgid "_Encrypt"
 msgstr "加密"
 
-#: src/compose.c:720
+#: src/compose.c:723
 msgid "_Request Return Receipt"
 msgstr "要求回條"
 
-#: src/compose.c:721
+#: src/compose.c:724
 msgid "Remo_ve references"
 msgstr "移除參考"
 
-#: src/compose.c:722
+#: src/compose.c:725
 msgid "Show _ruler"
 msgstr "顯示尺標"
 
-#: src/compose.c:727 src/compose.c:737
+#: src/compose.c:730 src/compose.c:740
 msgid "_Normal"
 msgstr "一般"
 
-#: src/compose.c:728 src/mainwindow.c:665 src/messageview.c:302
+#: src/compose.c:731 src/mainwindow.c:674 src/messageview.c:305
+#: src/summaryview.c:433
 msgid "_All"
 msgstr "所有"
 
-#: src/compose.c:729 src/mainwindow.c:666 src/messageview.c:303
+#: src/compose.c:732 src/mainwindow.c:675 src/messageview.c:306
+#: src/summaryview.c:434
 msgid "_Sender"
 msgstr "傳送者"
 
-#: src/compose.c:730
+#: src/compose.c:733
 msgid "_Mailing-list"
 msgstr "寄送清單"
 
-#: src/compose.c:735
+#: src/compose.c:738
 msgid "_Highest"
 msgstr "最高"
 
-#: src/compose.c:736
+#: src/compose.c:739
 msgid "Hi_gh"
 msgstr "高"
 
-#: src/compose.c:738
+#: src/compose.c:741
 msgid "Lo_w"
 msgstr "低"
 
-#: src/compose.c:739
+#: src/compose.c:742
 msgid "_Lowest"
 msgstr "最低"
 
-#: src/compose.c:744 src/mainwindow.c:878 src/messageview.c:350
+#: src/compose.c:747 src/mainwindow.c:890 src/messageview.c:353
 msgid "_Automatic"
 msgstr "自動"
 
-#: src/compose.c:745 src/mainwindow.c:879 src/messageview.c:351
+#: src/compose.c:748 src/mainwindow.c:891 src/messageview.c:354
 msgid "7bit ASCII (US-ASC_II)"
 msgstr "7位元 ASCII (US-ASC_II)"
 
-#: src/compose.c:746 src/mainwindow.c:880 src/messageview.c:352
+#: src/compose.c:749 src/mainwindow.c:892 src/messageview.c:355
 msgid "Unicode (_UTF-8)"
 msgstr "萬國碼 (_UTF-8)"
 
-#: src/compose.c:750 src/mainwindow.c:884 src/messageview.c:356
+#: src/compose.c:753 src/mainwindow.c:896 src/messageview.c:359
 msgid "Central European (ISO-8859-_2)"
 msgstr "中歐 (ISO-8859-_2)"
 
-#: src/compose.c:753 src/mainwindow.c:887 src/messageview.c:359
+#: src/compose.c:756 src/mainwindow.c:899 src/messageview.c:362
 msgid "Greek (ISO-8859-_7)"
 msgstr "希臘 (ISO-8859-_7)"
 
-#: src/compose.c:758 src/mainwindow.c:892 src/messageview.c:364
+#: src/compose.c:761 src/mainwindow.c:904 src/messageview.c:367
 msgid "Turkish (ISO-8859-_9)"
 msgstr "士耳其語 (ISO-8859-_9)"
 
-#: src/compose.c:1087
+#: src/compose.c:1015 src/compose.c:1697
+msgid ""
+"You have opted to sign and/or encrypt this message but have not selected a "
+"privacy system.\n"
+"\n"
+"Signing and encrypting have been disabled for this message."
+msgstr ""
+"您已選擇簽章及(或)加密此信件,但是尚未選擇一個獨立的系統\n"
+"\n"
+"已取消簽證章及加密此信件"
+
+#: src/compose.c:1051
 msgid "New message From format error."
 msgstr "新訊息寄件者格式錯誤"
 
-#: src/compose.c:1180
+#: src/compose.c:1144
 msgid "New message subject format error."
 msgstr "新訊息標題格式錯誤"
 
-#: src/compose.c:1212 src/quote_fmt.c:563
+#: src/compose.c:1176 src/quote_fmt.c:563
 #, c-format
 msgid "The body of the \"New message\" template has an error at line %d."
 msgstr "新訊息內容樣板在第%d行出現錯誤"
 
-#: src/compose.c:1477
+#: src/compose.c:1445
 msgid "Unable to reply. The original email probably doesn't exist."
 msgstr "無法回覆,原始信件可能不存在"
 
-#: src/compose.c:1660 src/quote_fmt.c:580
+#: src/compose.c:1630 src/quote_fmt.c:580
 msgid ""
 "The \"From\" field of the \"Reply\" template contains an invalid email "
 "address."
 msgstr "回寄信件內的寄件者樣板包含一個無效的郵件地址"
 
-#: src/compose.c:1709 src/quote_fmt.c:583
+#: src/compose.c:1679 src/quote_fmt.c:583
 #, c-format
 msgid "The body of the \"Reply\" template has an error at line %d."
 msgstr "回寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:1843 src/compose.c:2035 src/quote_fmt.c:600
+#: src/compose.c:1822 src/compose.c:2016 src/quote_fmt.c:600
 msgid ""
 "The \"From\" field of the \"Forward\" template contains an invalid email "
 "address."
 msgstr "轉寄信件內的寄件者樣板包含一個無效的郵件地址"
 
-#: src/compose.c:1904 src/quote_fmt.c:603
+#: src/compose.c:1883 src/quote_fmt.c:603
 #, c-format
 msgid "The body of the \"Forward\" template has an error at line %d."
 msgstr "轉寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:2078
+#: src/compose.c:2059
 msgid "Fw: multiple emails"
 msgstr "回覆:多重郵件"
 
-#: src/compose.c:2580
+#: src/compose.c:2566
 #, c-format
 msgid "The body of the \"Redirect\" template has an error at line %d."
 msgstr "改寄信件內的內容樣板在第%d行出現一個錯誤"
 
-#: src/compose.c:2647 src/gtk/headers.h:14
+#: src/compose.c:2633 src/gtk/headers.h:14
 msgid "Cc:"
 msgstr "副本:"
 
-#: src/compose.c:2650 src/gtk/headers.h:15
+#: src/compose.c:2636 src/gtk/headers.h:15
 msgid "Bcc:"
 msgstr "密件副本:"
 
-#: src/compose.c:2653 src/gtk/headers.h:12
+#: src/compose.c:2639 src/gtk/headers.h:12
 msgid "Reply-To:"
 msgstr "回信給:"
 
-#: src/compose.c:2656 src/compose.c:5023 src/compose.c:5025
+#: src/compose.c:2642 src/compose.c:5011 src/compose.c:5013
 #: src/gtk/headers.h:33
 msgid "Newsgroups:"
 msgstr "新聞群組:"
 
-#: src/compose.c:2659 src/gtk/headers.h:34
+#: src/compose.c:2645 src/gtk/headers.h:34
 msgid "Followup-To:"
 msgstr "跟隨至:"
 
-#: src/compose.c:2662 src/gtk/headers.h:17
+#: src/compose.c:2648 src/gtk/headers.h:17
 msgid "In-Reply-To:"
 msgstr "回覆至:"
 
-#: src/compose.c:2666 src/compose.c:5020 src/compose.c:5028
-#: src/gtk/headers.h:13 src/summary_search.c:481
+#: src/compose.c:2652 src/compose.c:5008 src/compose.c:5016
+#: src/gtk/headers.h:13 src/summary_search.c:422
 msgid "To:"
 msgstr "收件者:"
 
-#: src/compose.c:2856
+#: src/compose.c:2842
 msgid "Couldn't attach a file (charset conversion failed)."
 msgstr "無法夾帶檔案(字元轉換失敗)"
 
-#: src/compose.c:2862
+#: src/compose.c:2848
 #, c-format
 msgid ""
 "The following file has been attached: \n"
@@ -1863,73 +1865,73 @@ msgstr[1] ""
 "下列檔案已經夾帶:\n"
 "%s"
 
-#: src/compose.c:3142
+#: src/compose.c:3128
 msgid "The \"Quotation mark\" of the template is invalid."
 msgstr "樣板內\"引用標示\"有誤"
 
-#: src/compose.c:3671
+#: src/compose.c:3657
 #, c-format
 msgid "Could not get size of file '%s'."
 msgstr "無法取得檔案'%s'大小"
 
-#: src/compose.c:3689
+#: src/compose.c:3675
 #, c-format
 msgid ""
 "You are about to insert a file of %s in the message body. Are you sure you "
 "want to do that?"
 msgstr "你可以在訊息內容中插入一個檔案 %s,確認要這樣幹嗎?"
 
-#: src/compose.c:3692
+#: src/compose.c:3678
 msgid "Are you sure?"
 msgstr "你確定嗎?"
 
-#: src/compose.c:3693 src/compose.c:10856 src/compose.c:11734
+#: src/compose.c:3679 src/compose.c:10844 src/compose.c:11738
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/compose.c:3817
+#: src/compose.c:3804
 #, c-format
 msgid "File %s is empty."
 msgstr "檔案 %s 是空白的"
 
-#: src/compose.c:3818
+#: src/compose.c:3805
 msgid "Empty file"
 msgstr "清空檔案"
 
-#: src/compose.c:3819
+#: src/compose.c:3806
 msgid "_Attach anyway"
 msgstr "直接夾檔(_A)"
 
-#: src/compose.c:3828
+#: src/compose.c:3815
 #, c-format
 msgid "Can't read %s."
 msgstr "無法讀取 %s"
 
-#: src/compose.c:3855
+#: src/compose.c:3842
 #, c-format
 msgid "Message: %s"
 msgstr "訊息: %s"
 
-#: src/compose.c:4860 src/plugins/managesieve/sieve_editor.c:694
+#: src/compose.c:4852 src/plugins/managesieve/sieve_editor.c:696
 #: src/plugins/python/composewindowtype.c:498
 msgid " [Edited]"
 msgstr " 已編輯"
 
-#: src/compose.c:4867 src/plugins/python/composewindowtype.c:501
+#: src/compose.c:4859 src/plugins/python/composewindowtype.c:501
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新信件 %s"
 
-#: src/compose.c:4870 src/plugins/python/composewindowtype.c:504
+#: src/compose.c:4862 src/plugins/python/composewindowtype.c:504
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[無主題] - 新信件 %s"
 
-#: src/compose.c:4872 src/plugins/python/composewindowtype.c:492
+#: src/compose.c:4864 src/plugins/python/composewindowtype.c:492
 msgid "Compose message"
 msgstr "新信件"
 
-#: src/compose.c:4899 src/messageview.c:903
+#: src/compose.c:4891 src/messageview.c:887
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1937,103 +1939,112 @@ msgstr ""
 "尚未指定郵件的傳送地址\n"
 "傳送前請選擇一個郵件地址"
 
-#: src/compose.c:5120 src/compose.c:5157
+#: src/compose.c:5108 src/compose.c:5145
 #, c-format
 msgid "The only recipient is the default '%s' address. Send anyway?"
 msgstr "只存在一個預設的收件者 '%s',確認寄出?"
 
-#: src/compose.c:5122 src/compose.c:5159 src/compose.c:5202 src/compose.c:5251
-#: src/prefs_account.c:3405 src/toolbar.c:487 src/toolbar.c:519
+#: src/compose.c:5110 src/compose.c:5147 src/compose.c:5185 src/compose.c:5228
+#: src/prefs_account.c:3758 src/toolbar.c:487 src/toolbar.c:519
 msgid "Send"
 msgstr "傳送"
 
-#: src/compose.c:5124 src/compose.c:5161 src/compose.c:5195 src/compose.c:5244
-#: src/compose.c:5790 src/folderview.c:2543 src/messageview.c:856
-#: src/messageview.c:884 src/plugins/attachwarner/attachwarner.c:210
-#: src/toolbar.c:3030
+#: src/compose.c:5112 src/compose.c:5149 src/compose.c:5186 src/compose.c:5229
+#: src/compose.c:5794 src/folderview.c:2546 src/messageview.c:859
+#: src/plugins/attachwarner/attachwarner.c:218 src/toolbar.c:3054
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: src/compose.c:5178
+#: src/compose.c:5166
 msgid "Recipient is not specified."
 msgstr "尚未指定收件者"
 
-#: src/compose.c:5197 src/compose.c:5246
-#: src/plugins/attachwarner/attachwarner.c:212
-msgid "_Queue"
-msgstr "草稿(_Q)"
-
-#: src/compose.c:5198
+#: src/compose.c:5181
 #, c-format
 msgid "Subject is empty. %s"
 msgstr "主題空白 %s"
 
-#: src/compose.c:5199 src/compose.c:5248
-#: src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5182 src/compose.c:5225
+#: src/plugins/attachwarner/attachwarner.c:215
 msgid "Send it anyway?"
 msgstr "確認寄出?"
 
-#: src/compose.c:5200 src/compose.c:5249
-#: src/plugins/attachwarner/attachwarner.c:222
+#: src/compose.c:5183 src/compose.c:5226
+#: src/plugins/attachwarner/attachwarner.c:215
 msgid "Queue it anyway?"
 msgstr "儲存至草稿?"
 
-#: src/compose.c:5202 src/compose.c:5251 src/toolbar.c:520
+#: src/compose.c:5185 src/compose.c:5228 src/toolbar.c:520
 msgid "Send later"
 msgstr "稍後寄送"
 
-#: src/compose.c:5247
+#: src/compose.c:5186 src/compose.c:5229
+msgid "_Queue"
+msgstr "草稿(_Q)"
+
+#: src/compose.c:5224
 #, c-format
 msgid "Sending to %d recipients. %s"
 msgstr "傳送給 %d 接收者. %s"
 
-#: src/compose.c:5304 src/compose.c:10298
+#: src/compose.c:5253
+msgid "Could not queue message."
+msgstr "此訊息無法稍後再送出"
+
+#: src/compose.c:5256
+#, c-format
 msgid ""
-"Could not queue message for sending:\n"
+"Could not queue message:\n"
 "\n"
-"Charset conversion failed."
+"%s."
 msgstr ""
-"無法將寄送信件儲存在草稿:\n"
+"此訊息無法稍後再送出\n"
 "\n"
-"字元轉換失敗"
+"%s."
 
-#: src/compose.c:5307 src/compose.c:10301
+#: src/compose.c:5260
+#, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Couldn't get recipient encryption key."
+"Signature failed: %s"
 msgstr ""
 "無法將寄送信件儲存在草稿:\n"
 "\n"
-"無法取得收件者的加密金鑰"
+"簽名天敗:  %s"
 
-#: src/compose.c:5313 src/compose.c:10295
+#: src/compose.c:5265
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Signature failed: %s"
+"Encryption failed: %s"
 msgstr ""
 "無法將寄送信件儲存在草稿:\n"
 "\n"
-"簽名天敗:  %s"
+"加密失敗:  %s"
 
-#: src/compose.c:5316
-#, c-format
+#: src/compose.c:5270
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"%s."
+"Charset conversion failed."
 msgstr ""
 "無法將寄送信件儲存在草稿:\n"
 "\n"
-"%s"
+"字元轉換失敗"
 
-#: src/compose.c:5318
-msgid "Could not queue message for sending."
-msgstr "無法將寄送信件儲存在草稿"
+#: src/compose.c:5274
+msgid ""
+"Could not queue message for sending:\n"
+"\n"
+"Couldn't get recipient encryption key."
+msgstr ""
+"無法將寄送信件儲存在草稿:\n"
+"\n"
+"無法取得收件者的加密金鑰"
 
-#: src/compose.c:5333 src/compose.c:5393
+#: src/compose.c:5337 src/compose.c:5397
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -2041,7 +2052,7 @@ msgstr ""
 "草稿信件無法被傳送\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5389
+#: src/compose.c:5393
 #, c-format
 msgid ""
 "%s\n"
@@ -2050,7 +2061,7 @@ msgstr ""
 "%s\n"
 "從主視窗用\"傳送草稿訊息\"重試"
 
-#: src/compose.c:5786
+#: src/compose.c:5790
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -2060,7 +2071,7 @@ msgstr ""
 "無法轉換訊息的字元編碼至指定的 %s 編碼\n"
 "確認以 %s 傳送?"
 
-#: src/compose.c:5848
+#: src/compose.c:5852
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -2072,103 +2083,98 @@ msgstr ""
 "訊息內容將被打斷以利傳輸\n"
 "確定要傳送嗎?"
 
-#: src/compose.c:5959
-#, c-format
-msgid "Couldn't encrypt the email: %s"
-msgstr "郵件 %s 無法被加密"
-
-#: src/compose.c:6080
+#: src/compose.c:6087
 msgid "Encryption warning"
 msgstr "加密警告"
 
-#: src/compose.c:6081
+#: src/compose.c:6088
 msgid "C_ontinue"
 msgstr "繼續(_o)"
 
-#: src/compose.c:6130
+#: src/compose.c:6137
 msgid "No account for sending mails available!"
 msgstr "傳送郵件時找不到有效的帳號"
 
-#: src/compose.c:6139
+#: src/compose.c:6146
 msgid "Selected account isn't NNTP: Posting is impossible."
 msgstr "選擇的帳號並非NNTP:無法傳輸"
 
-#: src/compose.c:6379
+#: src/compose.c:6400
 #, c-format
 msgid "Attachment %s doesn't exist anymore. Ignore?"
 msgstr "附加檔案%s不存在,忽略嗎?"
 
-#: src/compose.c:6380 src/mainwindow.c:656 src/toolbar.c:276 src/toolbar.c:2560
+#: src/compose.c:6402 src/mainwindow.c:665 src/toolbar.c:276 src/toolbar.c:2563
 msgid "Cancel sending"
 msgstr "終止傳送"
 
-#: src/compose.c:6380
+#: src/compose.c:6402
 msgid "Ignore attachment"
 msgstr "忽略附加檔案"
 
-#: src/compose.c:6436
+#: src/compose.c:6458
 #, c-format
 msgid "Original %s part"
 msgstr "原始的第%s部份"
 
-#: src/compose.c:7036
+#: src/compose.c:7058
 msgid "Add to address _book"
 msgstr "新增至通訊錄"
 
-#: src/compose.c:7208
+#: src/compose.c:7225
 msgid "Delete entry contents"
 msgstr "刪除目錄"
 
-#: src/compose.c:7212 src/plugins/vcalendar/vcal_meeting_gtk.c:289
+#: src/compose.c:7229 src/plugins/vcalendar/vcal_meeting_gtk.c:290
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "按下 <tab> 可自動完成郵件地址"
 
-#: src/compose.c:7444
+#: src/compose.c:7461
 msgid "Mime type"
 msgstr "Mime格式"
 
-#: src/compose.c:7450 src/mimeview.c:273 src/plugins/pgpcore/select-keys.c:407
-#: src/prefs_matcher.c:630 src/prefs_summaries.c:441
-#: src/prefs_summary_column.c:84 src/summaryview.c:447
+#: src/compose.c:7467 src/mimeview.c:303 src/plugins/pgpcore/select-keys.c:452
+#: src/prefs_matcher.c:641 src/prefs_summaries.c:633
+#: src/prefs_summary_column.c:84 src/summaryview.c:472
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:7513
+#: src/compose.c:7529
 msgid "Save Message to "
 msgstr "儲存訊息到"
 
-#: src/compose.c:7550 src/editjpilot.c:276 src/editldap.c:517
-#: src/editvcard.c:192 src/export.c:164 src/import.c:163 src/importmutt.c:238
-#: src/importpine.c:237 src/plugins/archive/archiver_gtk.c:1075
-#: src/plugins/bogofilter/bogofilter_gtk.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:252
+#: src/compose.c:7560 src/editjpilot.c:276 src/editldap.c:518
+#: src/editvcard.c:193 src/export.c:166 src/import.c:164 src/importmutt.c:239
+#: src/importpine.c:238 src/plugins/archive/archiver_gtk.c:1081
+#: src/plugins/bogofilter/bogofilter_gtk.c:213
+#: src/plugins/bogofilter/bogofilter_gtk.c:236
 #: src/plugins/bsfilter/bsfilter_gtk.c:181
-#: src/plugins/clamd/clamav_plugin_gtk.c:300
-#: src/plugins/spamassassin/spamassassin_gtk.c:418
+#: src/plugins/clamd/clamav_plugin_gtk.c:295
+#: src/plugins/spamassassin/spamassassin_gtk.c:434
 msgid "_Browse"
 msgstr "瀏覽"
 
-#: src/compose.c:7572
+#: src/compose.c:7576
 msgid "Select folder to save message to"
 msgstr "選擇要儲存郵件的目錄"
 
-#: src/compose.c:8029
+#: src/compose.c:8033
 msgid "Hea_der"
 msgstr "標頭"
 
-#: src/compose.c:8034
+#: src/compose.c:8038
 msgid "_Attachments"
 msgstr "附件檔"
 
-#: src/compose.c:8048
+#: src/compose.c:8052
 msgid "Othe_rs"
 msgstr "其它"
 
-#: src/compose.c:8063
+#: src/compose.c:8067
 msgid "S_ubject:"
 msgstr "主旨"
 
-#: src/compose.c:8287
+#: src/compose.c:8291
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -2177,69 +2183,69 @@ msgstr ""
 "拼字檢查無法正確啟用\n"
 "%s"
 
-#: src/compose.c:8434
+#: src/compose.c:8438
 msgid "_From:"
 msgstr "寄件者:"
 
-#: src/compose.c:8451
+#: src/compose.c:8455
 msgid "Account to use for this email"
 msgstr "此郵件使用的帳號"
 
-#: src/compose.c:8453
+#: src/compose.c:8457
 msgid "Sender address to be used"
 msgstr "使用的寄件者地址"
 
-#: src/compose.c:8635
+#: src/compose.c:8639
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr "無法載入隱私系統'%s',此訊息將無法被簽證或加密"
 
-#: src/compose.c:8746 src/plugins/archive/archiver_gtk.c:1174
+#: src/compose.c:8750 src/plugins/archive/archiver_gtk.c:1180
 msgid "_None"
 msgstr "空白(_N)"
 
-#: src/compose.c:8847 src/prefs_template.c:751
+#: src/compose.c:8851 src/prefs_template.c:752
 #, c-format
 msgid "The body of the template has an error at line %d."
 msgstr "此樣板內容的第%d行發現錯誤"
 
-#: src/compose.c:8944
+#: src/compose.c:8948
 #, c-format
 msgctxt "'%s' stands for a header name"
 msgid "Template '%s' format error."
 msgstr "樣板中 '%s' 欄位格式錯誤"
 
-#: src/compose.c:9370
+#: src/compose.c:9372
 msgid "Invalid MIME type."
 msgstr "無效的MINE型式"
 
-#: src/compose.c:9385
+#: src/compose.c:9387
 msgid "File doesn't exist or is empty."
 msgstr "檔案不存在或空白"
 
-#: src/compose.c:9459
+#: src/compose.c:9461
 msgid "Properties"
 msgstr "屬性"
 
-#: src/compose.c:9476
+#: src/compose.c:9479
 msgid "MIME type"
 msgstr "MIME型式"
 
-#: src/compose.c:9517
+#: src/compose.c:9512
 msgid "Encoding"
 msgstr "編碼中"
 
-#: src/compose.c:9537
+#: src/compose.c:9532
 msgid "Path"
 msgstr "路徑"
 
-#: src/compose.c:9538
+#: src/compose.c:9533
 msgid "File name"
 msgstr "檔案名稱"
 
-#: src/compose.c:9797
+#: src/compose.c:9792
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -2250,34 +2256,19 @@ msgstr ""
 "強制終止此行程嗎?\n"
 "行程id: %d"
 
-#: src/compose.c:10264 src/messageview.c:1105
+#: src/compose.c:10265 src/messageview.c:1088
 msgid "Claws Mail needs network access in order to send this email."
 msgstr "Claws Mail 需要網路的存取權才能傳送此郵件"
 
-#: src/compose.c:10290
-msgid "Could not queue message."
-msgstr "此訊息無法稍後再送出"
-
-#: src/compose.c:10292
-#, c-format
-msgid ""
-"Could not queue message:\n"
-"\n"
-"%s."
-msgstr ""
-"此訊息無法稍後再送出\n"
-"\n"
-"%s."
-
-#: src/compose.c:10470
+#: src/compose.c:10458
 msgid "Could not save draft."
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10474
+#: src/compose.c:10462
 msgid "Could not save draft"
 msgstr "無法儲存為草稿"
 
-#: src/compose.c:10475
+#: src/compose.c:10463
 msgid ""
 "Could not save draft.\n"
 "Do you want to cancel exit or discard this email?"
@@ -2285,24 +2276,24 @@ msgstr ""
 "無法儲存為草稿\n"
 "確定要終止離開或放棄此郵件?"
 
-#: src/compose.c:10477
+#: src/compose.c:10465
 msgid "_Cancel exit"
 msgstr "終止離開"
 
-#: src/compose.c:10477
+#: src/compose.c:10465
 msgid "_Discard email"
 msgstr "放棄郵件"
 
-#: src/compose.c:10667 src/compose.c:10681
+#: src/compose.c:10654 src/compose.c:10668
 msgid "Select file"
 msgstr "選擇檔案"
 
-#: src/compose.c:10695
+#: src/compose.c:10682
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "無法讀取檔案'%s'"
 
-#: src/compose.c:10697
+#: src/compose.c:10684
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -2311,50 +2302,50 @@ msgstr ""
 "目前的編碼檔案'%s'包含無效的字元\n"
 "插入可能是無效的"
 
-#: src/compose.c:10776
+#: src/compose.c:10763
 msgid "Discard message"
 msgstr "放棄訊息"
 
-#: src/compose.c:10777
+#: src/compose.c:10764
 msgid "This message has been modified. Discard it?"
 msgstr "此訊息已經被修改過了,要放棄嗎?"
 
-#: src/compose.c:10778 src/plugins/managesieve/sieve_editor.c:433
+#: src/compose.c:10765 src/plugins/managesieve/sieve_editor.c:434
 msgid "_Discard"
 msgstr "放棄"
 
-#: src/compose.c:10778 src/compose.c:10782
+#: src/compose.c:10765 src/compose.c:10770
 msgid "_Save to Drafts"
 msgstr "儲存至草稿(_S)"
 
-#: src/compose.c:10780 src/plugins/managesieve/sieve_editor.c:431
+#: src/compose.c:10768 src/plugins/managesieve/sieve_editor.c:432
 msgid "Save changes"
 msgstr "儲存異動"
 
-#: src/compose.c:10781
+#: src/compose.c:10769
 msgid "This message has been modified. Save the latest changes?"
 msgstr "此訊息已經被修改過了,要儲存最後的修改嗎?"
 
-#: src/compose.c:10782
+#: src/compose.c:10770
 msgid "_Don't save"
 msgstr "不要儲存"
 
-#: src/compose.c:10853
+#: src/compose.c:10841
 #, c-format
 msgid "Do you want to apply the template '%s'?"
 msgstr "確定要使用樣板 '%s'嗎?"
 
-#: src/compose.c:10855
+#: src/compose.c:10843
 msgid "Apply template"
 msgstr "使用樣板"
 
-#: src/compose.c:10856 src/prefs_actions.c:329 src/prefs_filtering_action.c:610
-#: src/prefs_filtering.c:477 src/prefs_matcher.c:774 src/prefs_template.c:310
-#: src/prefs_toolbar.c:1063
+#: src/compose.c:10844 src/prefs_actions.c:331 src/prefs_filtering_action.c:583
+#: src/prefs_filtering.c:478 src/prefs_matcher.c:798 src/prefs_template.c:311
+#: src/prefs_toolbar.c:1018
 msgid "_Replace"
 msgstr "覆蓋(_R)"
 
-#: src/compose.c:11727
+#: src/compose.c:11731
 #, c-format
 msgid ""
 "Do you want to insert the contents of the file into the message body, or "
@@ -2365,20 +2356,20 @@ msgid_plural ""
 msgstr[0] "確定要將此一檔案內容插入至郵件訊息中?還是要將它附加至郵件?"
 msgstr[1] "確定要將%d個檔案的內容插入至郵件訊息中?還是要將它們附加至郵件?"
 
-#: src/compose.c:11733
+#: src/compose.c:11737
 msgid "Insert or attach?"
 msgstr "確定插入或附加檔案?"
 
-#: src/compose.c:11734
+#: src/compose.c:11738
 msgid "_Attach"
 msgstr "附加檔案(_A)"
 
-#: src/compose.c:11954
+#: src/compose.c:11956
 #, c-format
 msgid "Quote format error at line %d."
 msgstr "第%d格式有誤"
 
-#: src/compose.c:12251
+#: src/compose.c:12252
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
@@ -2394,7 +2385,7 @@ msgstr "Claws Mail 進行 (%ld) 收到信號 %ld"
 msgid "Claws Mail has crashed"
 msgstr "Claws Mail 不正常結束"
 
-#: src/crash.c:202
+#: src/crash.c:203
 #, c-format
 msgid ""
 "%s.\n"
@@ -2403,31 +2394,31 @@ msgstr ""
 "%s\n"
 "請提供一個bug通報,包含下列的資訊"
 
-#: src/crash.c:207
+#: src/crash.c:208
 msgid "Debug log"
 msgstr "偵錯log"
 
-#: src/crash.c:251 src/toolbar.c:539
+#: src/crash.c:252 src/toolbar.c:539
 msgid "Close"
 msgstr "關閉"
 
-#: src/crash.c:256
+#: src/crash.c:257
 msgid "Save..."
 msgstr "儲存..."
 
-#: src/crash.c:261
+#: src/crash.c:262
 msgid "Create bug report"
 msgstr "產生錯誤報告"
 
-#: src/crash.c:311
+#: src/crash.c:312
 msgid "Save crash information"
 msgstr "儲存崩潰資訊"
 
-#: src/editaddress.c:155 src/editaddress.c:231
+#: src/editaddress.c:150 src/editaddress.c:288
 msgid "Add New Person"
 msgstr "新增連絡人"
 
-#: src/editaddress.c:157
+#: src/editaddress.c:152
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2452,7 +2443,7 @@ msgstr ""
 "按下OK繼續編輯此連絡人\n"
 "按下Cancel離開且不儲存"
 
-#: src/editaddress.c:168
+#: src/editaddress.c:163
 msgid ""
 "Adding a new person requires at least one of the\n"
 "following values to be set:\n"
@@ -2475,35 +2466,35 @@ msgstr ""
 "按下OK繼續編輯此連絡人\n"
 "按下Cancel離開且不儲存"
 
-#: src/editaddress.c:232
+#: src/editaddress.c:289
 msgid "Edit Person Details"
 msgstr "編輯連絡人詳細資料"
 
-#: src/editaddress.c:410
+#: src/editaddress.c:507
 msgid "An Email address must be supplied."
 msgstr "必需提供一個電子郵件地址"
 
-#: src/editaddress.c:586 src/editaddress_other_attributes_ldap.c:198
+#: src/editaddress.c:710 src/editaddress_other_attributes_ldap.c:205
 msgid "A Name and Value must be supplied."
 msgstr "必需提供一個名"
 
-#: src/editaddress.c:675 src/prefs_folder_item.c:1694
+#: src/editaddress.c:820 src/prefs_folder_item.c:1784
 msgid "Discard"
 msgstr "放棄"
 
-#: src/editaddress.c:676
+#: src/editaddress.c:821
 msgid "Apply"
 msgstr "指定"
 
-#: src/editaddress.c:706 src/editaddress.c:755
+#: src/editaddress.c:851 src/editaddress.c:901
 msgid "Edit Person Data"
 msgstr "編輯連絡人資料"
 
-#: src/editaddress.c:784
+#: src/editaddress.c:930
 msgid "Choose a picture"
 msgstr "選擇一張照片"
 
-#: src/editaddress.c:803
+#: src/editaddress.c:949
 #, c-format
 msgid ""
 "Failed to import image: \n"
@@ -2512,58 +2503,58 @@ msgstr ""
 "匯入圖片失敗:\n"
 "%s"
 
-#: src/editaddress.c:845
+#: src/editaddress.c:991
 msgid "_Set picture"
 msgstr "設定圖片"
 
-#: src/editaddress.c:846
+#: src/editaddress.c:992
 msgid "_Unset picture"
 msgstr "恢復圖片設定"
 
-#: src/editaddress.c:904
+#: src/editaddress.c:1050
 msgid "Photo"
 msgstr "照片"
 
-#: src/editaddress.c:951 src/editaddress.c:953 src/expldifdlg.c:516
-#: src/exporthtml.c:761 src/ldif.c:746
+#: src/editaddress.c:1097 src/editaddress.c:1099 src/expldifdlg.c:516
+#: src/exporthtml.c:762 src/ldif.c:747
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#: src/editaddress.c:962 src/editaddress.c:966 src/ldif.c:754
+#: src/editaddress.c:1108 src/editaddress.c:1112 src/ldif.c:755
 msgid "Last Name"
 msgstr "姓"
 
-#: src/editaddress.c:963 src/editaddress.c:965 src/ldif.c:750
+#: src/editaddress.c:1109 src/editaddress.c:1111 src/ldif.c:751
 msgid "First Name"
 msgstr "名"
 
-#: src/editaddress.c:969 src/editaddress.c:971
+#: src/editaddress.c:1115 src/editaddress.c:1117
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/editaddress.c:1055 src/editaddress.c:1123
+#: src/editaddress.c:1253 src/editaddress.c:1294
 msgid "Alias"
 msgstr "別名"
 
-#: src/editaddress.c:1265 src/editaddress.c:1334 src/editaddress.c:1354
-#: src/editaddress_other_attributes_ldap.c:303
-#: src/editaddress_other_attributes_ldap.c:371 src/prefs_customheader.c:221
+#: src/editaddress.c:1479 src/editaddress.c:1512 src/editaddress.c:1528
+#: src/editaddress_other_attributes_ldap.c:376
+#: src/editaddress_other_attributes_ldap.c:413 src/prefs_customheader.c:223
 msgid "Value"
 msgstr "數值"
 
-#: src/editaddress.c:1425
+#: src/editaddress.c:1594
 msgid "_User Data"
 msgstr "連絡人資料"
 
-#: src/editaddress.c:1426
+#: src/editaddress.c:1595
 msgid "_Email Addresses"
 msgstr "電子郵件地址"
 
-#: src/editaddress.c:1429 src/editaddress.c:1432
+#: src/editaddress.c:1598 src/editaddress.c:1601
 msgid "O_ther Attributes"
 msgstr "其它屬性"
 
-#: src/editaddress.c:1583
+#: src/editaddress.c:1769
 #, c-format
 msgid ""
 "Failed to save image: \n"
@@ -2584,21 +2575,21 @@ msgstr "檔案看似出現無效的通訊錄格式"
 msgid "Could not read file."
 msgstr "無法讀取檔案"
 
-#: src/editbook.c:149 src/editbook.c:262
+#: src/editbook.c:149 src/editbook.c:263
 msgid "Edit Addressbook"
 msgstr "編輯通訊錄"
 
-#: src/editbook.c:177 src/editjpilot.c:264 src/editvcard.c:180
+#: src/editbook.c:178 src/editjpilot.c:264 src/editvcard.c:181
 msgid " Check File "
 msgstr "檢查檔案"
 
-#: src/editbook.c:182 src/editjpilot.c:269 src/editvcard.c:185
-#: src/importmutt.c:231 src/importpine.c:230 src/prefs_account.c:2023
-#: src/wizard.c:1196 src/wizard.c:1616
+#: src/editbook.c:183 src/editjpilot.c:269 src/editvcard.c:186
+#: src/importmutt.c:232 src/importpine.c:231 src/prefs_account.c:2158
+#: src/wizard.c:1198 src/wizard.c:1618
 msgid "File"
 msgstr "檔案"
 
-#: src/editbook.c:281
+#: src/editbook.c:282
 msgid "Add New Addressbook"
 msgstr "新增通訊錄"
 
@@ -2606,31 +2597,31 @@ msgstr "新增通訊錄"
 msgid "A Group Name must be supplied."
 msgstr "需要新增群組名稱"
 
-#: src/editgroup.c:294
+#: src/editgroup.c:296
 msgid "Edit Group Data"
 msgstr "編輯群組資料"
 
-#: src/editgroup.c:323 src/exporthtml.c:597
+#: src/editgroup.c:326 src/exporthtml.c:598
 msgid "Group Name"
 msgstr "群組名稱"
 
-#: src/editgroup.c:342
+#: src/editgroup.c:345
 msgid "Addresses in Group"
 msgstr "群組內地址"
 
-#: src/editgroup.c:377
+#: src/editgroup.c:379
 msgid "Available Addresses"
 msgstr "有效的地址"
 
-#: src/editgroup.c:452
+#: src/editgroup.c:453
 msgid "Move Email Addresses to or from Group with arrow buttons"
 msgstr "用箭號鈕將郵件地址移往或移出群組"
 
-#: src/editgroup.c:500
+#: src/editgroup.c:501
 msgid "Edit Group Details"
 msgstr "編輯群組詳細資料"
 
-#: src/editgroup.c:503
+#: src/editgroup.c:504
 msgid "Add New Group"
 msgstr "新增群組"
 
@@ -2642,13 +2633,13 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "輸入新名稱給資料夾"
 
-#: src/editgroup.c:556 src/foldersel.c:571 src/imap_gtk.c:193 src/mh_gtk.c:144
-#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:91
+#: src/editgroup.c:556 src/foldersel.c:572 src/imap_gtk.c:193 src/mh_gtk.c:144
+#: src/plugins/mailmbox/plugin_gtk.c:244 src/plugins/rssyl/rssyl_cb_menu.c:92
 msgid "New folder"
 msgstr "新增資料夾"
 
-#: src/editgroup.c:557 src/foldersel.c:572 src/mh_gtk.c:145
-#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:92
+#: src/editgroup.c:557 src/foldersel.c:573 src/mh_gtk.c:145
+#: src/plugins/mailmbox/plugin_gtk.c:245 src/plugins/rssyl/rssyl_cb_menu.c:93
 msgid "Input the name of new folder:"
 msgstr "輸入名稱給新資料夾"
 
@@ -2672,32 +2663,34 @@ msgstr "附加的電子郵件地址項目"
 msgid "Add New JPilot Entry"
 msgstr "新增JPilot進入點"
 
-#: src/editldap_basedn.c:136
+#: src/editldap_basedn.c:153
 msgid "Edit LDAP - Select Search Base"
 msgstr "編輯LDAP - 選擇搜尋基準"
 
-#: src/editldap_basedn.c:155 src/editldap.c:440
+#: src/editldap_basedn.c:173 src/editldap.c:441 src/prefs_account.c:2910
+#: src/prefs_proxy.c:98
 msgid "Hostname"
 msgstr "主機名稱"
 
-#: src/editldap_basedn.c:165 src/editldap.c:457
-#: src/plugins/clamd/clamav_plugin_gtk.c:390 src/ssl_manager.c:108
+#: src/editldap_basedn.c:183 src/editldap.c:458
+#: src/plugins/clamd/clamav_plugin_gtk.c:379 src/prefs_account.c:2917
+#: src/prefs_proxy.c:105 src/ssl_manager.c:117
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/editldap_basedn.c:175 src/editldap.c:501
+#: src/editldap_basedn.c:193 src/editldap.c:502
 msgid "Search Base"
 msgstr "搜尋基準"
 
-#: src/editldap_basedn.c:196
+#: src/editldap_basedn.c:221
 msgid "Available Search Base(s)"
 msgstr "有效的搜尋基準"
 
-#: src/editldap_basedn.c:286
+#: src/editldap_basedn.c:327
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "無法從伺服器中讀取搜尋基準 - 請手動設定"
 
-#: src/editldap_basedn.c:290 src/editldap.c:281
+#: src/editldap_basedn.c:331 src/editldap.c:281
 msgid "Could not connect to server"
 msgstr "無法連線至伺服器"
 
@@ -2717,15 +2710,15 @@ msgstr "至少要提供一個LDAP搜尋基準屬性"
 msgid "Connected successfully to server"
 msgstr "伺服器連線成功"
 
-#: src/editldap.c:335 src/editldap.c:990
+#: src/editldap.c:335 src/editldap.c:991
 msgid "Edit LDAP Server"
 msgstr "編輯LDAP伺器"
 
-#: src/editldap.c:436
+#: src/editldap.c:437
 msgid "A name that you wish to call the server."
 msgstr "要呼叫的伺服器名稱"
 
-#: src/editldap.c:449
+#: src/editldap.c:450
 msgid ""
 "This is the hostname of the server. For example, \"ldap.example.org\" may be "
 "appropriate for the \"example.org\" organization. An IP address may also be "
@@ -2736,15 +2729,15 @@ msgstr ""
 "以使用IP位址。如果和Claws Mail在同一台電腦上執行LDAP伺服器,可以指定為"
 "\"localhost\"。"
 
-#: src/editldap.c:468
+#: src/editldap.c:469
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: src/editldap.c:469 src/prefs_account.c:3478
+#: src/editldap.c:470 src/prefs_account.c:3831
 msgid "SSL/TLS"
 msgstr "SSL/TLS"
 
-#: src/editldap.c:473
+#: src/editldap.c:474
 msgid ""
 "Enable secure connection to the LDAP server via STARTTLS. Connection starts "
 "unencrypted and is secured by STARTTLS command. If connection fails, be sure "
@@ -2754,7 +2747,7 @@ msgstr ""
 "透過STARTTLS可以啟用LDAP伺服器的安全連線機制。若連線失敗,務必檢查ldap.conf檔"
 "案的設定(TLS_CACERTDIR 和 TLS_REQCERT項目)"
 
-#: src/editldap.c:478
+#: src/editldap.c:479
 msgid ""
 "Enable secure connection to the LDAP server via SSL/TLS. If connection "
 "fails, be sure to check the correct configuration in ldap.conf "
@@ -2763,19 +2756,19 @@ msgstr ""
 "透過SSL/TLS可以啟用LDAP伺服器的安全連線機制。若連線失敗,務必檢查ldap.conf檔"
 "案的設定(TLS_CACERTDIR 和 TLS_REQCERT項目)"
 
-#: src/editldap.c:490
+#: src/editldap.c:491
 msgid "The port number that the server listens on. Port 389 is the default."
 msgstr "這是伺服器的監聽埠,預設通訊埠是389"
 
-#: src/editldap.c:493
+#: src/editldap.c:494
 msgid " Check Server "
 msgstr "檢查伺服器"
 
-#: src/editldap.c:497
+#: src/editldap.c:498
 msgid "Press this button to test the connection to the server."
 msgstr "按下此鍵進行伺服器連線測試"
 
-#: src/editldap.c:510
+#: src/editldap.c:511
 msgid ""
 "This specifies the name of the directory to be searched on the server. "
 "Examples include:\n"
@@ -2788,38 +2781,38 @@ msgstr ""
 "  ou=people,dc=domainname,dc=com\n"
 "  o=Organization Name,c=Country\n"
 
-#: src/editldap.c:521
+#: src/editldap.c:522
 msgid ""
 "Press this button to lookup the name of available directory names on the "
 "server."
 msgstr "按下此鍵在伺服器上搜尋有效的目錄名稱"
 
-#: src/editldap.c:577
+#: src/editldap.c:578
 msgid "Search Attributes"
 msgstr "搜尋屬性"
 
-#: src/editldap.c:586
+#: src/editldap.c:587
 msgid ""
 "A list of LDAP attribute names that should be searched when attempting to "
 "find a name or address."
 msgstr "用於搜尋名稱或地址時的LDAP屬性列表"
 
-#: src/editldap.c:589
+#: src/editldap.c:590
 msgid " Defaults "
 msgstr "預設"
 
-#: src/editldap.c:593
+#: src/editldap.c:594
 msgid ""
 "This resets the attribute names to a default value that should find most "
 "names and addresses during a name or address search process."
 msgstr ""
 "將重置屬性名稱為預設值,如此可以在搜尋姓名或地址過程中,找到更多的姓名和地址"
 
-#: src/editldap.c:599
+#: src/editldap.c:600
 msgid "Max Query Age (secs)"
 msgstr "最大的搜尋年齡 (secs)"
 
-#: src/editldap.c:613
+#: src/editldap.c:614
 msgid ""
 "This defines the maximum period of time (in seconds) that an address search "
 "result is valid for address completion purposes. Search results are stored "
@@ -2838,21 +2831,21 @@ msgstr ""
 "少下一次的搜尋時間。此功能對於較慢的伺服器可以提供更多的記憶體來暫存搜搜結"
 "果,進而提高搜尋效能。"
 
-#: src/editldap.c:630
+#: src/editldap.c:631
 msgid "Include server in dynamic search"
 msgstr "動態搜尋包含伺服器"
 
-#: src/editldap.c:635
+#: src/editldap.c:636
 msgid ""
 "Check this option to include this server for dynamic searches when using "
 "address completion."
 msgstr "當使用地址完成功能時,檢查這個選項以包含動態搜尋"
 
-#: src/editldap.c:641
+#: src/editldap.c:642
 msgid "Match names 'containing' search term"
 msgstr "姓名符合'包含'搜尋項目"
 
-#: src/editldap.c:646
+#: src/editldap.c:647
 msgid ""
 "Searches for names and addresses can be performed either using \"begins-with"
 "\" or \"contains\" search term. Check this option to perform a \"contains\" "
@@ -2864,11 +2857,11 @@ msgstr ""
 "行\"包含\"的搜尋,此法通常會花費較長的時間。特別注意,為了提昇效能,地址自動"
 "完成功能使用\"以...開始\"進行所有搜尋,以取代其它的地址界面"
 
-#: src/editldap.c:709
+#: src/editldap.c:710
 msgid "Bind DN"
 msgstr "綁定 DN"
 
-#: src/editldap.c:718
+#: src/editldap.c:719
 msgid ""
 "The LDAP user account name to be used to connect to the server. This is "
 "usually only used for protected servers. This name is typically formatted "
@@ -2879,87 +2872,88 @@ msgstr ""
 "的格式一般為 \"cn=user,dc=claws-mail,dc=org\",這個欄位一般建議空白以進行搜"
 "尋。"
 
-#: src/editldap.c:725
+#: src/editldap.c:726
 msgid "Bind Password"
 msgstr "綁定密碼"
 
-#: src/editldap.c:735
+#: src/editldap.c:736
 msgid "The password to be used when connecting as the \"Bind DN\" user."
 msgstr "以\"Bind DN\"進行連線時,此密碼將被使用"
 
-#: src/editldap.c:738 src/prefs_account.c:1314 src/prefs_account.c:1868
-#: src/prefs_account.c:2587 src/prefs_account.c:2615
+#: src/editldap.c:739 src/prefs_account.c:1405 src/prefs_account.c:2003
+#: src/prefs_account.c:2722 src/prefs_account.c:2750 src/prefs_account.c:2955
+#: src/prefs_proxy.c:146
 msgid "Show password"
 msgstr "顯示密碼"
 
-#: src/editldap.c:747
+#: src/editldap.c:748
 msgid "Timeout (secs)"
 msgstr "超時 (secs)"
 
-#: src/editldap.c:760
+#: src/editldap.c:761
 msgid "The timeout period in seconds."
 msgstr "超時的週期 (單位秒)"
 
-#: src/editldap.c:764
+#: src/editldap.c:765
 msgid "Maximum Entries"
 msgstr "最大的登入數量"
 
-#: src/editldap.c:777
+#: src/editldap.c:778
 msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "搜尋結果中可以接收的最大登入數量"
 
-#: src/editldap.c:792 src/prefs_account.c:3369
+#: src/editldap.c:793 src/prefs_account.c:3722
 msgid "Basic"
 msgstr "基本"
 
-#: src/editldap.c:794 src/gtk/quicksearch.c:708
+#: src/editldap.c:795 src/gtk/quicksearch.c:706
 msgid "Extended"
 msgstr "延伸"
 
-#: src/editldap.c:995
+#: src/editldap.c:996
 msgid "Add New LDAP Server"
 msgstr "新增LDAP伺服器?"
 
-#: src/edittags.c:187 src/prefs_filtering_action.c:1450
-#: src/prefs_summaries.c:448
+#: src/edittags.c:192 src/prefs_filtering_action.c:1403
+#: src/prefs_summaries.c:640
 msgid "Tag"
 msgstr "標籤"
 
-#: src/edittags.c:216
+#: src/edittags.c:221
 msgid "Delete tag"
 msgstr "刪除標籤"
 
-#: src/edittags.c:217
+#: src/edittags.c:222
 msgid "Do you really want to delete this tag?"
 msgstr "確認要刪除標籤?"
 
-#: src/edittags.c:251
+#: src/edittags.c:257
 msgid "Delete all tags"
 msgstr "刪除所有的標籤"
 
-#: src/edittags.c:252
+#: src/edittags.c:258
 msgid "Do you really want to delete all tags?"
 msgstr "確認刪除所有的標籤?"
 
-#: src/edittags.c:423
+#: src/edittags.c:430
 msgid "You entered a reserved tag name, please choose another instead."
 msgstr "此標籤名稱是保留的,請選擇另一個"
 
-#: src/edittags.c:465
+#: src/edittags.c:472
 msgid "Tag is not set."
 msgstr "沒有設定標籤"
 
-#: src/edittags.c:530
+#: src/edittags.c:550
 msgctxt "Dialog title"
 msgid "Apply tags"
 msgstr "指定標籤"
 
-#: src/edittags.c:544
+#: src/edittags.c:567
 msgid "New tag:"
 msgstr "新標籤"
 
-#: src/edittags.c:577
+#: src/edittags.c:600
 msgid "Please select tags to apply/remove. Changes are immediate."
 msgstr "請選擇標籤以指定或移除,修改將立即生效。"
 
@@ -2971,11 +2965,11 @@ msgstr "檔案不是vCard格式"
 msgid "Select vCard File"
 msgstr "選擇vCard檔案"
 
-#: src/editvcard.c:152 src/editvcard.c:256
+#: src/editvcard.c:152 src/editvcard.c:257
 msgid "Edit vCard Entry"
 msgstr "編輯vCard進入點"
 
-#: src/editvcard.c:261
+#: src/editvcard.c:262
 msgid "Add New vCard Entry"
 msgstr "新增vCard進入點"
 
@@ -2983,11 +2977,11 @@ msgstr "新增vCard進入點"
 msgid "Impossible to set the client certificate.\n"
 msgstr "無法設定客戶端認證\n"
 
-#: src/etpan/nntp-thread.c:865
+#: src/etpan/nntp-thread.c:949
 msgid "couldn't get xover range\n"
 msgstr "無法取得 xover 的範圍\n"
 
-#: src/etpan/nntp-thread.c:963
+#: src/etpan/nntp-thread.c:1048
 msgid "couldn't get xhdr range\n"
 msgstr "無法取得 xhdr 的範圍\n"
 
@@ -3039,30 +3033,31 @@ msgstr "選擇HTML輸出檔案"
 msgid "HTML Output File"
 msgstr "HTML輸出檔案"
 
-#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:171 src/import.c:170
-#: src/importldif.c:684
+#: src/exphtmldlg.c:392 src/expldifdlg.c:409 src/export.c:173 src/import.c:171
+#: src/importldif.c:568
 msgid "B_rowse"
 msgstr "瀏覽"
 
-#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:300
+#: src/exphtmldlg.c:445 src/plugins/fancy/fancy_prefs.c:301
 msgid "Stylesheet"
 msgstr "樣式"
 
-#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:387 src/gtk/gtkaspell.c:1571
-#: src/gtk/gtkaspell.c:2225 src/gtk/menu.c:125 src/mainwindow.c:1188
+#: src/exphtmldlg.c:453 src/gtk/colorlabel.c:369 src/gtk/gtkaspell.c:1577
+#: src/gtk/gtkaspell.c:2232 src/gtk/menu.c:127 src/mainwindow.c:1181
 #: src/plugins/archive/archiver_prefs.c:313
-#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:949
-#: src/prefs_toolbar.c:790 src/prefs_toolbar.c:1479 src/summaryview.c:6061
+#: src/plugins/libravatar/libravatar_prefs.c:304 src/prefs_account.c:1040
+#: src/prefs_toolbar.c:769 src/prefs_toolbar.c:1435 src/summaryview.c:6269
 msgid "None"
 msgstr "無"
 
-#: src/exphtmldlg.c:454 src/prefs_folder_item.c:520 src/prefs_other.c:126
-#: src/prefs_other.c:418
+#: src/exphtmldlg.c:454 src/prefs_folder_item.c:523
+#: src/prefs_folder_item.c:1198 src/prefs_folder_item.c:1230
+#: src/prefs_other.c:129 src/prefs_other.c:417
 msgid "Default"
 msgstr "預設"
 
-#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:246
-#: src/plugins/pgpcore/sgpgme.c:151 src/plugins/pgpcore/sgpgme.c:167
+#: src/exphtmldlg.c:455 src/plugins/pgpcore/select-keys.c:240
+#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:168
 msgid "Full"
 msgstr "完整"
 
@@ -3106,11 +3101,11 @@ msgstr "格式化電子郵件超連結"
 msgid "Format User Attributes"
 msgstr "格式化使用者屬性"
 
-#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:891
+#: src/exphtmldlg.c:539 src/expldifdlg.c:612 src/importldif.c:850
 msgid "Address Book:"
 msgstr "通訊錄"
 
-#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:901
+#: src/exphtmldlg.c:549 src/expldifdlg.c:622 src/importldif.c:860
 msgid "File Name:"
 msgstr "檔案名稱"
 
@@ -3122,11 +3117,11 @@ msgstr "以瀏覽器開啟"
 msgid "Export Address Book to HTML File"
 msgstr "將通訊錄匯出為HTML格式檔案"
 
-#: src/exphtmldlg.c:656 src/expldifdlg.c:720 src/importldif.c:1020
+#: src/exphtmldlg.c:657 src/expldifdlg.c:721 src/importldif.c:980
 msgid "File Info"
 msgstr "檔案資訊"
 
-#: src/exphtmldlg.c:657
+#: src/exphtmldlg.c:658
 msgid "Format"
 msgstr "格式"
 
@@ -3276,86 +3271,86 @@ msgstr "通訊錄沒有包含郵件地址,請檢查這個選項以忽略這些
 msgid "Export Address Book to LDIF File"
 msgstr "匯出通訊錄至 LDIF 檔"
 
-#: src/expldifdlg.c:721
+#: src/expldifdlg.c:722
 msgid "Distinguished Name"
 msgstr "Distinguished Name"
 
-#: src/export.c:113 src/summaryview.c:8233
+#: src/export.c:113 src/summaryview.c:8482
 msgid "Export to mbox file"
 msgstr "匯出至 mbox 檔案"
 
-#: src/export.c:131
+#: src/export.c:132
 msgid "Locate the folder to export and specify the mbox file."
 msgstr "指定匯出資料夾和 mbox 檔案名稱"
 
-#: src/export.c:142
+#: src/export.c:143
 msgid "Source folder:"
 msgstr "來源資料夾"
 
-#: src/export.c:148 src/import.c:142
+#: src/export.c:149 src/import.c:143
 msgid "Mbox file:"
 msgstr "Mbox 檔案:"
 
-#: src/export.c:203
+#: src/export.c:205
 msgid "Target mbox filename can't be left empty."
 msgstr "未指定目的 mbox 名稱"
 
-#: src/export.c:208
+#: src/export.c:210
 msgid "Source folder can't be left empty."
 msgstr "未指定來源資料夾"
 
-#: src/export.c:221
+#: src/export.c:223
 msgid "Couldn't find the source folder."
 msgstr "找不到來源資料夾"
 
-#: src/export.c:245
+#: src/export.c:247
 msgid "Select exporting file"
 msgstr "選擇匯出檔案"
 
-#: src/export.c:268
+#: src/export.c:270
 msgid "Select folder to export"
 msgstr "選擇匯出資料夾"
 
-#: src/exporthtml.c:767
+#: src/exporthtml.c:768
 msgid "Full Name"
 msgstr "全名"
 
-#: src/exporthtml.c:771 src/importldif.c:1021
-#: src/plugins/archive/archiver_gtk.c:769
+#: src/exporthtml.c:772 src/importldif.c:981
+#: src/plugins/archive/archiver_gtk.c:772
 msgid "Attributes"
 msgstr "屬性"
 
-#: src/exporthtml.c:974
+#: src/exporthtml.c:975
 msgid "Claws Mail Address Book"
 msgstr "Claws Mail 通訊錄"
 
-#: src/exporthtml.c:1069 src/exportldif.c:606
+#: src/exporthtml.c:1070 src/exportldif.c:607
 msgid "Name already exists but is not a directory."
 msgstr "名稱已存在,但是它不是一個目錄"
 
-#: src/exporthtml.c:1072 src/exportldif.c:609
+#: src/exporthtml.c:1073 src/exportldif.c:610
 msgid "No permissions to create directory."
 msgstr "沒有建立目錄的權限"
 
-#: src/exporthtml.c:1075 src/exportldif.c:612
+#: src/exporthtml.c:1076 src/exportldif.c:613
 msgid "Name is too long."
 msgstr "名稱太長"
 
-#: src/exporthtml.c:1078 src/exportldif.c:615
+#: src/exporthtml.c:1079 src/exportldif.c:616
 msgid "Not specified."
 msgstr "未指定"
 
-#: src/file_checker.c:76
+#: src/file_checker.c:82
 #, c-format
 msgid "The file %s is missing! Do you want to use the backup file from %s?"
 msgstr "缺少檔案 %s,確認要用使用來自於 %s 的備份檔案嗎?"
 
-#: src/file_checker.c:84 src/file_checker.c:106
+#: src/file_checker.c:91 src/file_checker.c:115
 #, c-format
 msgid "Could not copy %s to %s"
 msgstr "無法從 %s 複制到 %s"
 
-#: src/file_checker.c:98
+#: src/file_checker.c:106
 #, c-format
 msgid ""
 "The file %s is empty or corrupted! Do you want to use the backup file from "
@@ -3455,51 +3450,51 @@ msgstr "無法套用此動作\n"
 msgid "no further processing after action [ %s ]\n"
 msgstr "此動作 [ %s ] 套用後沒有其它的處理程序\n"
 
-#: src/filtering.c:810
+#: src/filtering.c:809
 #, c-format
 msgid "processing rule '%s' [ %s ]\n"
 msgstr "套用規則 '%s' [ %s ]\n"
 
-#: src/filtering.c:814
+#: src/filtering.c:813
 #, c-format
 msgid "processing rule <unnamed> [ %s ]\n"
 msgstr "套用規則 <unnamed> [ %s ]\n"
 
-#: src/filtering.c:832
+#: src/filtering.c:831
 #, c-format
 msgid "disabled rule '%s' [ %s ]\n"
 msgstr "關閉規則 '%s' [ %s ]\n"
 
-#: src/filtering.c:836
+#: src/filtering.c:835
 #, c-format
 msgid "disabled rule <unnamed> [ %s ]\n"
 msgstr "關閉規則 <unnamed> [ %s ]\n"
 
-#: src/filtering.c:874
+#: src/filtering.c:873
 msgid "undetermined"
 msgstr "未確定的"
 
-#: src/filtering.c:878
+#: src/filtering.c:877
 msgid "incorporation"
 msgstr "結合"
 
-#: src/filtering.c:882
+#: src/filtering.c:881
 msgid "manually"
 msgstr "手動地"
 
-#: src/filtering.c:886
+#: src/filtering.c:885
 msgid "folder processing"
 msgstr "資料夾處理中"
 
-#: src/filtering.c:890
+#: src/filtering.c:889
 msgid "pre-processing"
 msgstr "前處理"
 
-#: src/filtering.c:894
+#: src/filtering.c:893
 msgid "post-processing"
 msgstr "後處理"
 
-#: src/filtering.c:909
+#: src/filtering.c:908
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3516,11 +3511,11 @@ msgstr ""
 "%s%s %s\n"
 "%s%s %s\n"
 
-#: src/filtering.c:911 src/filtering.c:920
+#: src/filtering.c:910 src/filtering.c:919
 msgid ": "
 msgstr ": "
 
-#: src/filtering.c:918
+#: src/filtering.c:917
 #, c-format
 msgid ""
 "filtering message (%s%s%s)\n"
@@ -3529,60 +3524,61 @@ msgstr ""
 "郵件過濾中 (%s%s%s)\n"
 "%s郵件檔案: %s\n"
 
-#: src/folder.c:1570 src/prefs_folder_item.c:315
+#: src/folder.c:1595 src/prefs_folder_item.c:319
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/folder.c:1574
+#: src/folder.c:1599
 msgid "Sent"
 msgstr "已傳送"
 
-#: src/folder.c:1578 src/prefs_folder_item.c:318
+#: src/folder.c:1603 src/plugins/attachwarner/attachwarner.c:218
+#: src/prefs_folder_item.c:322
 msgid "Queue"
 msgstr "暫存"
 
-#: src/folder.c:1582 src/prefs_folder_item.c:319
+#: src/folder.c:1607 src/prefs_folder_item.c:323
 msgid "Trash"
 msgstr "回收桶"
 
-#: src/folder.c:1586 src/prefs_folder_item.c:317
+#: src/folder.c:1611 src/prefs_folder_item.c:321
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/folder.c:2017
+#: src/folder.c:2042
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "處理 (%s)...\n"
 
-#: src/folder.c:3262
+#: src/folder.c:3289
 #, c-format
 msgid "Copying %s to %s...\n"
 msgstr "正在複製 %s 到 %s...\n"
 
-#: src/folder.c:3262
+#: src/folder.c:3289
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "正在移動 %s 到 %s...\n"
 
-#: src/folder.c:3572
+#: src/folder.c:3599
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "正在為 %s 更新緩衝..."
 
-#: src/folder.c:4434
+#: src/folder.c:4461
 msgid "Processing messages..."
 msgstr "郵件處理..."
 
-#: src/folder.c:4569
+#: src/folder.c:4596
 #, c-format
 msgid "Synchronising %s for offline use...\n"
 msgstr "離線同步化 %s ...\n"
 
-#: src/folder.c:4828
+#: src/folder.c:4855
 msgid "A folder name cannot begin or end with a dot."
 msgstr "資料夾名稱開頭或結尾不能為'.'"
 
-#: src/folder.c:4832
+#: src/folder.c:4859
 msgid "A folder name can not end with a space."
 msgstr "資料夾名稱開頭或結尾不能為'.'"
 
@@ -3590,31 +3586,31 @@ msgstr "資料夾名稱開頭或結尾不能為'.'"
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:573 src/imap_gtk.c:197 src/mh_gtk.c:146
-#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:93
+#: src/foldersel.c:574 src/imap_gtk.c:197 src/mh_gtk.c:146
+#: src/plugins/mailmbox/plugin_gtk.c:246 src/plugins/rssyl/rssyl_cb_menu.c:94
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:581 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
+#: src/foldersel.c:582 src/imap_gtk.c:208 src/imap_gtk.c:214 src/imap_gtk.c:270
 #: src/imap_gtk.c:275 src/mh_gtk.c:154 src/mh_gtk.c:262 src/news_gtk.c:299
 #: src/plugins/mailmbox/plugin_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:430
-#: src/plugins/rssyl/rssyl_cb_menu.c:204
-#: src/plugins/vcalendar/vcal_folder.c:2059
+#: src/plugins/rssyl/rssyl_cb_menu.c:202
+#: src/plugins/vcalendar/vcal_folder.c:2068
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "'%c' 不能被包含在資料夾名稱內"
 
-#: src/foldersel.c:596 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
+#: src/foldersel.c:597 src/imap_gtk.c:224 src/imap_gtk.c:282 src/mh_gtk.c:167
 #: src/mh_gtk.c:272 src/news_gtk.c:306 src/plugins/mailmbox/plugin_gtk.c:269
-#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:217
-#: src/plugins/vcalendar/vcal_folder.c:2066
+#: src/plugins/mailmbox/plugin_gtk.c:442 src/plugins/rssyl/rssyl_cb_menu.c:214
+#: src/plugins/vcalendar/vcal_folder.c:2075
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "資料夾 '%s' 已經存在"
 
-#: src/foldersel.c:603 src/imap_gtk.c:230 src/mh_gtk.c:173
+#: src/foldersel.c:604 src/imap_gtk.c:230 src/mh_gtk.c:173
 #: src/plugins/mailmbox/plugin_gtk.c:276 src/plugins/rssyl/opml_import.c:91
-#: src/plugins/rssyl/rssyl_cb_menu.c:124
+#: src/plugins/rssyl/rssyl_cb_menu.c:125
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "無法建立資料夾 '%s'"
@@ -3639,7 +3635,7 @@ msgstr "遞迴地標示所有為未讀(_v)"
 msgid "R_un processing rules"
 msgstr "立即執行規則(u)"
 
-#: src/folderview.c:253 src/mainwindow.c:553
+#: src/folderview.c:253 src/mainwindow.c:562
 msgid "_Search folder..."
 msgstr "搜尋資料夾(_S)..."
 
@@ -3655,144 +3651,148 @@ msgstr "清空回收桶(_t)..."
 msgid "Send _queue..."
 msgstr "傳送暫存郵件(_q)..."
 
-#: src/folderview.c:397 src/folderview.c:444
+#: src/folderview.c:264
+msgid "Set Displayed columns"
+msgstr "設定已顯示行數"
+
+#: src/folderview.c:403 src/folderview.c:450
 #: src/plugins/notification/notification_lcdproc.c:141
-#: src/prefs_folder_column.c:78 src/prefs_matcher.c:393 src/summaryview.c:6335
+#: src/prefs_folder_column.c:78 src/prefs_matcher.c:402 src/summaryview.c:6543
 msgid "New"
 msgstr "新郵件"
 
-#: src/folderview.c:398 src/folderview.c:445
+#: src/folderview.c:404 src/folderview.c:451
 #: src/plugins/notification/notification_lcdproc.c:145
-#: src/prefs_folder_column.c:79 src/prefs_matcher.c:392 src/summaryview.c:6337
+#: src/prefs_folder_column.c:79 src/prefs_matcher.c:401 src/summaryview.c:6545
 #: src/toolbar.c:512
 msgid "Unread"
 msgstr "未讀郵件"
 
-#: src/folderview.c:399 src/plugins/notification/notification_lcdproc.c:149
+#: src/folderview.c:405 src/plugins/notification/notification_lcdproc.c:149
 #: src/prefs_folder_column.c:80
 msgid "Total"
 msgstr "全部郵件"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:447 src/summaryview.c:448
+#: src/folderview.c:453 src/summaryview.c:473
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:782
+#: src/folderview.c:783
 msgid "Setting folder info..."
 msgstr "設定資料夾訊息..."
 
-#: src/folderview.c:867 src/summaryview.c:4182
+#: src/folderview.c:868 src/summaryview.c:4288
 msgid "Mark all as read"
 msgstr "將所有的郵件標示為已讀"
 
-#: src/folderview.c:868
+#: src/folderview.c:869
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "read?"
 msgstr "確定要將此資料夾及其下的子目錄內所有的郵件標示為已讀嗎?"
 
-#: src/folderview.c:870 src/summaryview.c:4183
+#: src/folderview.c:871 src/summaryview.c:4289
 msgid "Do you really want to mark all mails in this folder as read?"
 msgstr "確定要將此資料內所有的郵件標示為已讀嗎?"
 
-#: src/folderview.c:873 src/summaryview.c:4221
+#: src/folderview.c:874 src/summaryview.c:4334
 msgid "Mark all as unread"
 msgstr "將所有的郵件標示為未讀"
 
-#: src/folderview.c:874
+#: src/folderview.c:875
 msgid ""
 "Do you really want to mark all mails in this folder and its sub-folders as "
 "unread?"
 msgstr "確定要將此資料夾及其下的子目錄內所有的郵件標示為未讀嗎?"
 
-#: src/folderview.c:876 src/summaryview.c:4222
+#: src/folderview.c:877 src/summaryview.c:4335
 msgid "Do you really want to mark all mails in this folder as unread?"
 msgstr "確定要將此資料內所有的郵件標示為未讀嗎?"
 
-#: src/folderview.c:1066 src/imap.c:4606
+#: src/folderview.c:1067 src/imap.c:4643
 #, c-format
 msgid "Scanning folder %s/%s..."
 msgstr "掃描資料夾 %s/%s..."
 
-#: src/folderview.c:1069 src/imap.c:4610 src/mainwindow.c:5245 src/setup.c:96
+#: src/folderview.c:1070 src/imap.c:4647 src/mainwindow.c:5280 src/setup.c:96
 #, c-format
 msgid "Scanning folder %s..."
 msgstr "掃描資料夾 %s..."
 
-#: src/folderview.c:1100
+#: src/folderview.c:1101
 msgid "Rebuild folder tree"
 msgstr "重建資料夾串列"
 
-#: src/folderview.c:1101
+#: src/folderview.c:1102
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "重建資料夾串列將移除本地的暫存資料,確定要繼續嗎?"
 
-#: src/folderview.c:1111
+#: src/folderview.c:1112
 msgid "Rebuilding folder tree..."
 msgstr "資料夾串列重建..."
 
-#: src/folderview.c:1113
+#: src/folderview.c:1114
 msgid "Scanning folder tree..."
 msgstr "資料夾串列掃描..."
 
-#: src/folderview.c:1204
+#: src/folderview.c:1205
 #, c-format
 msgid "Couldn't scan folder %s\n"
 msgstr "無法掃描資料夾 %s\n"
 
-#: src/folderview.c:1258
+#: src/folderview.c:1259
 msgid "Checking for new messages in all folders..."
 msgstr "在所有資料夾內檢查新郵件..."
 
-#: src/folderview.c:2229
+#: src/folderview.c:2233
 #, c-format
 msgid "Closing folder %s..."
 msgstr "關閉資料夾 %s..."
 
-#: src/folderview.c:2324
+#: src/folderview.c:2328
 #, c-format
 msgid "Opening folder %s..."
 msgstr "開啟 %s..."
 
-#: src/folderview.c:2342
+#: src/folderview.c:2346
 msgid "Folder could not be opened."
 msgstr "資料夾無法開啟"
 
-#: src/folderview.c:2484 src/mainwindow.c:2902 src/mainwindow.c:2906
+#: src/folderview.c:2486 src/mainwindow.c:2896 src/mainwindow.c:2901
 msgid "Empty trash"
 msgstr "清空回收桶"
 
-#: src/folderview.c:2485
+#: src/folderview.c:2487
 msgid "Delete all messages in trash?"
 msgstr "刪除所以回收桶內的郵件"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2488
 msgid "_Empty trash"
 msgstr "清空回收桶(_E)"
 
-#: src/folderview.c:2529 src/inc.c:1533 src/toolbar.c:3008
+#: src/folderview.c:2532 src/inc.c:1661 src/toolbar.c:3032
 msgid "Offline warning"
 msgstr "離線警告"
 
-#: src/folderview.c:2530 src/toolbar.c:3009
+#: src/folderview.c:2533 src/toolbar.c:3033
 msgid "You're working offline. Override?"
 msgstr "目前為離線模式,要覆寫嗎?"
 
-#: src/folderview.c:2541 src/toolbar.c:3028
+#: src/folderview.c:2544 src/toolbar.c:3052
 msgid "Send queued messages"
 msgstr "傳送暫存郵件"
 
-#: src/folderview.c:2542 src/toolbar.c:3029
+#: src/folderview.c:2545 src/toolbar.c:3053
 msgid "Send all queued messages?"
 msgstr "傳送所有暫存郵件?"
 
-#: src/folderview.c:2551 src/toolbar.c:3048
+#: src/folderview.c:2554 src/toolbar.c:3072
 msgid "Some errors occurred while sending queued messages."
 msgstr "傳送暫存郵件時發生一些錯誤"
 
-#: src/folderview.c:2554 src/main.c:2780 src/toolbar.c:3051
+#: src/folderview.c:2557 src/main.c:2812 src/toolbar.c:3075
 #, c-format
 msgid ""
 "Some errors occurred while sending queued messages:\n"
@@ -3801,64 +3801,64 @@ msgstr ""
 "傳送暫存郵件時發生一些錯誤:\n"
 "%s"
 
-#: src/folderview.c:2629
+#: src/folderview.c:2632
 #, c-format
 msgid "Do you really want to copy folder '%s' in '%s'?"
 msgstr "確認要複製資料夾 '%s' 嗎?(從'%s'內)"
 
-#: src/folderview.c:2630
+#: src/folderview.c:2633
 #, c-format
 msgid "Do you really want to make folder '%s' a subfolder of '%s'?"
 msgstr "確認要將資料夾 '%s' 變為 '%s' 的子資料夾嗎?"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2635
 msgid "Copy folder"
 msgstr "複製資料夾"
 
-#: src/folderview.c:2632
+#: src/folderview.c:2635
 msgid "Move folder"
 msgstr "移動資料夾"
 
-#: src/folderview.c:2643
+#: src/folderview.c:2646
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "從 %s 複製到 %s ..."
 
-#: src/folderview.c:2643
+#: src/folderview.c:2646
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "從 %s 移動到 %s ..."
 
-#: src/folderview.c:2677
+#: src/folderview.c:2680
 msgid "Source and destination are the same."
 msgstr "來源和目的相同"
 
-#: src/folderview.c:2680
+#: src/folderview.c:2683
 msgid "Can't copy a folder to one of its children."
 msgstr "不能將資料夾複製到它的子目錄內"
 
-#: src/folderview.c:2681
+#: src/folderview.c:2684
 msgid "Can't move a folder to one of its children."
 msgstr "不能將資料夾移動到它的子目錄內"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2687
 msgid "A folder cannot be moved between different mailboxes."
 msgstr "資料夾無法在兩個不同的郵件資料夾間移動"
 
-#: src/folderview.c:2687
+#: src/folderview.c:2690
 msgid "Copy failed!"
 msgstr "複製失敗"
 
-#: src/folderview.c:2687
+#: src/folderview.c:2690
 msgid "Move failed!"
 msgstr "移動失敗"
 
-#: src/folderview.c:2737
+#: src/folderview.c:2740
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "進行資料夾 %s 配置"
 
-#: src/folderview.c:3177 src/summaryview.c:4618 src/summaryview.c:4724
+#: src/folderview.c:3175 src/summaryview.c:4743 src/summaryview.c:4849
 msgid "The destination folder can only be used to store subfolders."
 msgstr "目的資料夾只能被用來儲存子資料夾"
 
@@ -3882,7 +3882,7 @@ msgstr " 搜尋 "
 msgid "Newsgroup name"
 msgstr "新聞群組名稱"
 
-#: src/grouplistdialog.c:205 src/prefs_send.c:184
+#: src/grouplistdialog.c:205 src/prefs_send.c:188
 msgid "Messages"
 msgstr "郵件"
 
@@ -3890,47 +3890,47 @@ msgstr "郵件"
 msgid "Type"
 msgstr "型式"
 
-#: src/grouplistdialog.c:347
+#: src/grouplistdialog.c:346
 msgid "moderated"
 msgstr "合適的"
 
-#: src/grouplistdialog.c:349
+#: src/grouplistdialog.c:348
 msgid "readonly"
 msgstr "唯讀的"
 
-#: src/grouplistdialog.c:351 src/plugins/att_remover/att_remover.c:302
-#: src/plugins/vcalendar/vcal_manager.c:114
-#: src/plugins/vcalendar/vcal_manager.c:148
+#: src/grouplistdialog.c:350 src/plugins/att_remover/att_remover.c:302
+#: src/plugins/vcalendar/vcal_manager.c:115
+#: src/plugins/vcalendar/vcal_manager.c:149
 msgid "unknown"
 msgstr "未知的"
 
-#: src/grouplistdialog.c:422
+#: src/grouplistdialog.c:424
 msgid "Can't retrieve newsgroup list."
 msgstr "無法取得新聞群組清單"
 
-#: src/grouplistdialog.c:459 src/gtk/gtkutils.c:1934 src/summaryview.c:1600
+#: src/grouplistdialog.c:461 src/gtk/gtkutils.c:1857 src/summaryview.c:1683
 msgid "Done."
 msgstr "完成"
 
-#: src/grouplistdialog.c:492
+#: src/grouplistdialog.c:494
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "新聞群組 %d 接收完成 (%s 讀取)"
 
-#: src/gtk/about.c:132
+#: src/gtk/about.c:133
 msgid "Claws Mail is a lightweight, fast and highly-configurable email client."
 msgstr "Claws Mail 是輕量化、快速且高度自由配置的電子郵件客戶端軟體"
 
-#: src/gtk/about.c:135
+#: src/gtk/about.c:136
 msgid "For further information visit the Claws Mail website:"
 msgstr "參閱 Claws Mail 官網以取得更詳細的資訊"
 
-#: src/gtk/about.c:140
+#: src/gtk/about.c:141
 msgid ""
 "For support and discussion subscribe to the Claws Mail users' mailing list:"
 msgstr "更多的支援和討論,請訂閱 Claws Mail 使用者 mail list:"
 
-#: src/gtk/about.c:146
+#: src/gtk/about.c:147
 msgid ""
 "Claws Mail is free software released under the GPL. If you wish to donate to "
 "the Claws Mail project you can do so at:"
@@ -3938,21 +3938,21 @@ msgstr ""
 "Claws Mail 是自由軟體並遵循GPL規範釋出。若希望贊助 Claws Mail 專案,可以如"
 "下:"
 
-#: src/gtk/about.c:162 src/gtk/about.c:850
+#: src/gtk/about.c:163 src/gtk/about.c:852
 msgid ""
-"Copyright (C) 1999-2017\n"
+"Copyright (C) 1999-2020\n"
 "The Claws Mail Team\n"
 "and Hiroyuki Yamamoto"
 msgstr ""
-"版權所有 (C) 1999-2017\n"
+"版權所有 (C) 1999-2019\n"
 "Claws Mail 團隊及\n"
 "Hiroyuki Yamamoto"
 
-#: src/gtk/about.c:167
+#: src/gtk/about.c:168
 msgid "System Information\n"
 msgstr "系統資訊\n"
 
-#: src/gtk/about.c:173
+#: src/gtk/about.c:174
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -3961,7 +3961,7 @@ msgstr ""
 "地區: %s (charset: %s)\n"
 "作業系統: %s %s (%s)"
 
-#: src/gtk/about.c:182
+#: src/gtk/about.c:183
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -3970,7 +3970,7 @@ msgstr ""
 "地區: %s (charset: %s)\n"
 "作業系統: %s"
 
-#: src/gtk/about.c:191
+#: src/gtk/about.c:192
 #, c-format
 msgid ""
 "Locale: %s (charset: %s)\n"
@@ -3979,94 +3979,94 @@ msgstr ""
 "地區: %s (charset: %s)\n"
 "作業系統: 不明"
 
-#: src/gtk/about.c:247 src/prefs_themes.c:842 src/wizard.c:527
+#: src/gtk/about.c:248 src/prefs_themes.c:842 src/wizard.c:529
 msgid "The Claws Mail Team"
 msgstr "Claws Mail 團隊"
 
-#: src/gtk/about.c:266
+#: src/gtk/about.c:267
 msgid "Previous team members"
 msgstr "早期團隊成員"
 
-#: src/gtk/about.c:285
+#: src/gtk/about.c:286
 msgid "The translation team"
 msgstr "翻譯團隊"
 
-#: src/gtk/about.c:304
+#: src/gtk/about.c:305
 msgid "Documentation team"
 msgstr "文件團隊"
 
-#: src/gtk/about.c:322
+#: src/gtk/about.c:323
 msgid "Logo"
 msgstr "Logo"
 
-#: src/gtk/about.c:341
+#: src/gtk/about.c:342
 msgid "Icons"
 msgstr "Icons"
 
-#: src/gtk/about.c:360
+#: src/gtk/about.c:361
 msgid "Contributors"
 msgstr "捐助者"
 
-#: src/gtk/about.c:408
+#: src/gtk/about.c:409
 msgid "Compiled-in Features"
 msgstr "內鍵功能"
 
-#: src/gtk/about.c:425
+#: src/gtk/about.c:426
 msgctxt "compface"
 msgid "adds support for the X-Face header\n"
 msgstr "為 X-Face header 加入支援\n"
 
-#: src/gtk/about.c:435
+#: src/gtk/about.c:436
 msgctxt "Enchant"
 msgid "adds support for spell checking\n"
 msgstr "為拼字檢查加入支援\n"
 
-#: src/gtk/about.c:445
+#: src/gtk/about.c:446
 msgctxt "GnuTLS"
 msgid "adds support for encrypted connections to servers\n"
 msgstr "新增加密連線至伺服器的支援\n"
 
-#: src/gtk/about.c:455
+#: src/gtk/about.c:456
 msgctxt "IPv6"
 msgid "adds support for IPv6 addresses, the new Internet addressing protocol\n"
 msgstr "新增支援 IPv6 位址,這是新的網際網路位址協定\n"
 
-#: src/gtk/about.c:466
+#: src/gtk/about.c:467
 msgctxt "iconv"
 msgid "allows converting to and from different character sets\n"
 msgstr "允許在不同的字元編碼間相互轉換\n"
 
-#: src/gtk/about.c:476
+#: src/gtk/about.c:477
 msgctxt "JPilot"
 msgid "adds support for PalmOS addressbooks\n"
 msgstr "新增對 PalmOS 通訊錄的支援\n"
 
-#: src/gtk/about.c:486
+#: src/gtk/about.c:487
 msgctxt "LDAP"
 msgid "adds support for LDAP shared addressbooks\n"
 msgstr "新增對 LDAP 分享式通訊錄的支援\n"
 
-#: src/gtk/about.c:496
+#: src/gtk/about.c:497
 msgctxt "libetpan"
 msgid "adds support for IMAP and NNTP servers\n"
 msgstr "新增對 IMAP 及 NNTP 伺服器的支援\n"
 
-#: src/gtk/about.c:506
+#: src/gtk/about.c:507
 msgctxt "libSM"
 msgid "adds support for session handling\n"
 msgstr "新增對通訊處理(session handling)的支援\n"
 
-#: src/gtk/about.c:516
+#: src/gtk/about.c:517
 msgctxt "NetworkManager"
 msgid "adds support for detection of network connection changes\n"
 msgstr "新增對網路連線改變的偵測支援\n"
 
-#: src/gtk/about.c:526
+#: src/gtk/about.c:527
 msgctxt "librSVG"
 msgid "adds support for SVG themes\n"
 msgstr "新增支援 SVG 主題功能\n"
 
-#: src/gtk/about.c:558
+#: src/gtk/about.c:559
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -4075,7 +4075,7 @@ msgstr ""
 "此程式是自由軟體,你可以在遵循 GNU General Public License 的規範下重製、修改"
 "並自由的發佈,包括第3版或任何更新的版本。"
 
-#: src/gtk/about.c:565
+#: src/gtk/about.c:566
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -4085,7 +4085,7 @@ msgstr ""
 "此程式的發佈希望是有用的,但是沒有任何的保固,對於銷售或特定的目的也一樣沒有"
 "任何的保固詳細參閱 GNU General Public License"
 
-#: src/gtk/about.c:584
+#: src/gtk/about.c:585
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see "
@@ -4093,145 +4093,145 @@ msgstr ""
 "你將會伴隨此程式收到一份 GNU General Public License 的複本,如果沒有收到,請"
 "參閱"
 
-#: src/gtk/about.c:717 src/main.c:2604
+#: src/gtk/about.c:718 src/main.c:2636
 msgid "Session statistics\n"
 msgstr "通信統計\n"
 
-#: src/gtk/about.c:727 src/gtk/about.c:730 src/main.c:2614 src/main.c:2617
+#: src/gtk/about.c:728 src/gtk/about.c:731 src/main.c:2646 src/main.c:2649
 #, c-format
 msgid "Started: %s\n"
 msgstr "開始於: %s\n"
 
-#: src/gtk/about.c:737 src/main.c:2623
+#: src/gtk/about.c:738 src/main.c:2655
 msgid "Incoming traffic\n"
 msgstr "收件傳輸量\n"
 
-#: src/gtk/about.c:740 src/main.c:2626
+#: src/gtk/about.c:741 src/main.c:2658
 #, c-format
 msgid "Received messages: %d\n"
 msgstr "已接收郵件: %d\n"
 
-#: src/gtk/about.c:747 src/main.c:2632
+#: src/gtk/about.c:748 src/main.c:2664
 msgid "Outgoing traffic\n"
 msgstr "外寄傳輸量\n"
 
-#: src/gtk/about.c:750 src/main.c:2635
+#: src/gtk/about.c:751 src/main.c:2667
 #, c-format
 msgid "New/redirected messages: %d\n"
 msgstr "新/改寄的郵件: %d\n"
 
-#: src/gtk/about.c:755 src/main.c:2639
+#: src/gtk/about.c:756 src/main.c:2671
 #, c-format
 msgid "Replied messages: %d\n"
 msgstr "回覆的郵件: %d\n"
 
-#: src/gtk/about.c:760 src/main.c:2643
+#: src/gtk/about.c:761 src/main.c:2675
 #, c-format
 msgid "Forwarded messages: %d\n"
 msgstr "轉寄的郵件: %d\n"
 
-#: src/gtk/about.c:765 src/main.c:2647
+#: src/gtk/about.c:766 src/main.c:2679
 #, c-format
 msgid "Total outgoing messages: %d\n"
 msgstr "所有寄出的郵件: %d\n"
 
-#: src/gtk/about.c:792
+#: src/gtk/about.c:793
 msgid "About Claws Mail"
 msgstr "關於 Claws Mail"
 
-#: src/gtk/about.c:864
+#: src/gtk/about.c:866
 msgid "_Info"
 msgstr "資訊(_I)"
 
-#: src/gtk/about.c:870
+#: src/gtk/about.c:872
 msgid "_Authors"
 msgstr "作者群(_A)"
 
-#: src/gtk/about.c:876
+#: src/gtk/about.c:878
 msgid "_Features"
 msgstr "功能(_F)"
 
-#: src/gtk/about.c:882
+#: src/gtk/about.c:884
 msgid "_License"
 msgstr "許可(_L)"
 
-#: src/gtk/about.c:890
+#: src/gtk/about.c:892
 msgid "_Release Notes"
 msgstr "釋出記錄(_R)"
 
-#: src/gtk/about.c:896
+#: src/gtk/about.c:898
 msgid "_Statistics"
 msgstr "統計(_S)"
 
-#: src/gtk/colorlabel.c:38 src/prefs_common.c:362
+#: src/gtk/colorlabel.c:38 src/prefs_common.c:365
 msgid "Orange"
 msgstr "橙"
 
-#: src/gtk/colorlabel.c:39 src/prefs_common.c:366
+#: src/gtk/colorlabel.c:39 src/prefs_common.c:369
 msgid "Red"
 msgstr "紅"
 
-#: src/gtk/colorlabel.c:40 src/prefs_common.c:370
+#: src/gtk/colorlabel.c:40 src/prefs_common.c:373
 msgid "Pink"
 msgstr "粉紅"
 
-#: src/gtk/colorlabel.c:41 src/prefs_common.c:374
+#: src/gtk/colorlabel.c:41 src/prefs_common.c:377
 msgid "Sky blue"
 msgstr "天空藍"
 
-#: src/gtk/colorlabel.c:42 src/prefs_common.c:378
+#: src/gtk/colorlabel.c:42 src/prefs_common.c:381
 msgid "Blue"
 msgstr "藍"
 
-#: src/gtk/colorlabel.c:43 src/prefs_common.c:382
+#: src/gtk/colorlabel.c:43 src/prefs_common.c:385
 msgid "Green"
 msgstr "綠"
 
-#: src/gtk/colorlabel.c:44 src/prefs_common.c:386
+#: src/gtk/colorlabel.c:44 src/prefs_common.c:389
 msgid "Brown"
 msgstr "棕"
 
-#: src/gtk/colorlabel.c:45 src/prefs_common.c:390
+#: src/gtk/colorlabel.c:45 src/prefs_common.c:393
 msgid "Grey"
 msgstr "灰"
 
-#: src/gtk/colorlabel.c:46 src/prefs_common.c:394
+#: src/gtk/colorlabel.c:46 src/prefs_common.c:397
 msgid "Light brown"
 msgstr "淡藍"
 
-#: src/gtk/colorlabel.c:47 src/prefs_common.c:398
+#: src/gtk/colorlabel.c:47 src/prefs_common.c:401
 msgid "Dark red"
 msgstr "深紅"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:402
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:405
 msgid "Dark pink"
 msgstr "深粉紅"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:406
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:409
 msgid "Steel blue"
 msgstr "金屬藍"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:410
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:413
 msgid "Gold"
 msgstr "金"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:414
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:417
 msgid "Bright green"
 msgstr "亮綠"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:418
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:421
 msgid "Magenta"
 msgstr "洋紅"
 
-#: src/gtk/foldersort.c:156
+#: src/gtk/foldersort.c:241
 msgid "Set mailbox order"
 msgstr "設定郵件箱順序"
 
-#: src/gtk/foldersort.c:190
+#: src/gtk/foldersort.c:277
 msgid "Move mailboxes up or down to change the sort order in the Folder list."
 msgstr "往上或往下改變郵件箱在資料夾清單內的順序"
 
-#: src/gtk/foldersort.c:216
+#: src/gtk/foldersort.c:311
 msgid "Mailboxes"
 msgstr "郵件箱"
 
@@ -4257,70 +4257,70 @@ msgstr "無法初始化 %s 字典:"
 msgid "No misspelled word found."
 msgstr "沒有拼錯的字"
 
-#: src/gtk/gtkaspell.c:1443
+#: src/gtk/gtkaspell.c:1451
 msgid "Replace unknown word"
 msgstr "取代未知的單字"
 
-#: src/gtk/gtkaspell.c:1460
+#: src/gtk/gtkaspell.c:1467
 #, c-format
 msgid "Replace \"%s\" with: "
 msgstr "以...取代\"%s\""
 
-#: src/gtk/gtkaspell.c:1503
+#: src/gtk/gtkaspell.c:1510
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
 msgstr "按下 Enter 鍵時保持控制鍵將會從錯誤的地方進行學習\n"
 
-#: src/gtk/gtkaspell.c:1805 src/gtk/gtkaspell.c:1943
+#: src/gtk/gtkaspell.c:1811 src/gtk/gtkaspell.c:1949
 msgid "More..."
 msgstr "更多..."
 
-#: src/gtk/gtkaspell.c:1861
+#: src/gtk/gtkaspell.c:1867
 #, c-format
 msgid "\"%s\" unknown in dictionary '%s'"
 msgstr "\"%s\" 在字典中找不到 '%s'"
 
-#: src/gtk/gtkaspell.c:1877
+#: src/gtk/gtkaspell.c:1883
 msgid "Accept in this session"
 msgstr "此次接受"
 
-#: src/gtk/gtkaspell.c:1887
+#: src/gtk/gtkaspell.c:1893
 msgid "Add to personal dictionary"
 msgstr "新增至個人字典"
 
-#: src/gtk/gtkaspell.c:1897
+#: src/gtk/gtkaspell.c:1903
 msgid "Replace with..."
 msgstr "以...取代"
 
-#: src/gtk/gtkaspell.c:1910
+#: src/gtk/gtkaspell.c:1916
 #, c-format
 msgid "Check with %s"
 msgstr "用 %s 檢查"
 
-#: src/gtk/gtkaspell.c:1932
+#: src/gtk/gtkaspell.c:1938
 msgid "(no suggestions)"
 msgstr "(沒有建議)"
 
-#: src/gtk/gtkaspell.c:2006
+#: src/gtk/gtkaspell.c:2012
 #, c-format
 msgid "Dictionary: %s"
 msgstr "字典: %s"
 
-#: src/gtk/gtkaspell.c:2021
+#: src/gtk/gtkaspell.c:2027
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "使用替換 (%s)"
 
-#: src/gtk/gtkaspell.c:2032
+#: src/gtk/gtkaspell.c:2038
 msgid "Use both dictionaries"
 msgstr "使用兩個字典"
 
-#: src/gtk/gtkaspell.c:2048 src/prefs_spelling.c:143
+#: src/gtk/gtkaspell.c:2054 src/prefs_spelling.c:143
 msgid "Check while typing"
 msgstr "輸⼊時檢查"
 
-#: src/gtk/gtkaspell.c:2147
+#: src/gtk/gtkaspell.c:2154
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -4329,7 +4329,7 @@ msgstr ""
 "這個拼字檢查器無法改變字典\n"
 "%s"
 
-#: src/gtk/gtkaspell.c:2203
+#: src/gtk/gtkaspell.c:2210
 #, c-format
 msgid ""
 "The spell checker could not change the alternate dictionary.\n"
@@ -4338,26 +4338,26 @@ msgstr ""
 "這個拼字檢查器無法改變替換的字典\n"
 "%s"
 
-#: src/gtk/gtkutils.c:1939
+#: src/gtk/gtkutils.c:1862
 msgid "Failed: no service record found."
 msgstr "失敗: 找不到服務記錄"
 
-#: src/gtk/gtkutils.c:1942
+#: src/gtk/gtkutils.c:1865
 msgid "Failed: network error."
 msgstr "失敗: 網路錯誤"
 
-#: src/gtk/gtkutils.c:1945
+#: src/gtk/gtkutils.c:1868
 #, c-format
 msgid "Failed: unknown error (%d)."
 msgstr "未知的錯誤(%d)"
 
-#: src/gtk/gtkutils.c:2015
+#: src/gtk/gtkutils.c:1938
 msgid "Configuring..."
 msgstr "配置..."
 
-#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1262
-#: src/prefs_matcher.c:2168 src/prefs_summaries.c:442
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:446
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1225
+#: src/prefs_matcher.c:646 src/prefs_matcher.c:2217 src/prefs_summaries.c:634
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:49 src/summaryview.c:471
 msgid "Date"
 msgstr "日期"
 
@@ -4365,13 +4365,13 @@ msgstr "日期"
 msgid "Date:"
 msgstr "日期:"
 
-#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1259
-#: src/prefs_matcher.c:2165 src/prefs_summaries.c:444
-#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:444
+#: src/gtk/headers.h:10 src/prefs_filtering_action.c:1222
+#: src/prefs_matcher.c:2214 src/prefs_summaries.c:636
+#: src/prefs_summary_column.c:81 src/quote_fmt.c:50 src/summaryview.c:469
 msgid "From"
 msgstr "寄件者"
 
-#: src/gtk/headers.h:10 src/summary_search.c:474
+#: src/gtk/headers.h:10 src/summary_search.c:415
 msgid "From:"
 msgstr "寄件者:"
 
@@ -4387,14 +4387,14 @@ msgstr "寄件者:"
 msgid "Reply-To"
 msgstr "回覆給"
 
-#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1260
-#: src/prefs_matcher.c:2166 src/prefs_summaries.c:445
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:445
+#: src/gtk/headers.h:13 src/prefs_filtering_action.c:1223
+#: src/prefs_matcher.c:2215 src/prefs_summaries.c:637
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:57 src/summaryview.c:470
 msgid "To"
 msgstr "收件者"
 
-#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1261
-#: src/prefs_matcher.c:2167 src/quote_fmt.c:58
+#: src/gtk/headers.h:14 src/prefs_filtering_action.c:1224
+#: src/prefs_matcher.c:2216 src/quote_fmt.c:58
 msgid "Cc"
 msgstr "副本"
 
@@ -4402,8 +4402,8 @@ msgstr "副本"
 msgid "Bcc"
 msgstr "密件副本"
 
-#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1263
-#: src/prefs_matcher.c:2169 src/quote_fmt.c:61
+#: src/gtk/headers.h:16 src/prefs_filtering_action.c:1226
+#: src/prefs_matcher.c:2218 src/quote_fmt.c:61
 msgid "Message-ID"
 msgstr "Message-ID"
 
@@ -4415,8 +4415,8 @@ msgstr "Message-ID:"
 msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
-#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1265
-#: src/prefs_matcher.c:2171 src/quote_fmt.c:60
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1228
+#: src/prefs_matcher.c:2220 src/quote_fmt.c:60
 msgid "References"
 msgstr "索引"
 
@@ -4424,18 +4424,18 @@ msgstr "索引"
 msgid "References:"
 msgstr "索引:"
 
-#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1258
-#: src/prefs_matcher.c:2164 src/prefs_summaries.c:446
-#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:443
+#: src/gtk/headers.h:19 src/prefs_filtering_action.c:1221
+#: src/prefs_matcher.c:2213 src/prefs_summaries.c:638
+#: src/prefs_summary_column.c:80 src/quote_fmt.c:56 src/summaryview.c:468
 msgid "Subject"
 msgstr "主旨"
 
-#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:702
-#: src/summary_search.c:488
+#: src/gtk/headers.h:19 src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/summary_search.c:429
 msgid "Subject:"
 msgstr "主旨:"
 
-#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:431
+#: src/gtk/headers.h:20 src/plugins/rssyl/rssyl_feed_props.c:421
 msgid "Comments"
 msgstr "註解"
 
@@ -4447,7 +4447,7 @@ msgstr "註解:"
 msgid "Keywords"
 msgstr "關鍵字"
 
-#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:704
+#: src/gtk/headers.h:21 src/plugins/pdf_viewer/poppler_viewer.c:707
 msgid "Keywords:"
 msgstr "關鍵字:"
 
@@ -4523,8 +4523,8 @@ msgstr "已接收"
 msgid "Received:"
 msgstr "已接收:"
 
-#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1264
-#: src/prefs_matcher.c:2170 src/quote_fmt.c:59
+#: src/gtk/headers.h:33 src/prefs_filtering_action.c:1227
+#: src/prefs_matcher.c:2219 src/quote_fmt.c:59
 msgid "Newsgroups"
 msgstr "新聞群組"
 
@@ -4549,12 +4549,13 @@ msgid "Seen:"
 msgstr "已見:"
 
 #: src/gtk/headers.h:37 src/gtk/progressdialog.c:149
-#: src/gtk/sslcertwindow.c:164 src/prefs_summaries.c:450
-#: src/prefs_summary_column.c:78 src/summaryview.c:2823
+#: src/gtk/sslcertwindow.c:190 src/prefs_summaries.c:642
+#: src/prefs_summary_column.c:78 src/prefs_themes.c:1034 src/ssl_manager.c:124
+#: src/summaryview.c:2898
 msgid "Status"
 msgstr "狀態"
 
-#: src/gtk/headers.h:37 src/prefs_themes.c:1033
+#: src/gtk/headers.h:37
 msgid "Status:"
 msgstr "狀態:"
 
@@ -4594,7 +4595,7 @@ msgstr "代理人:"
 msgid "Content-Type"
 msgstr "內容種類"
 
-#: src/gtk/headers.h:42 src/image_viewer.c:327
+#: src/gtk/headers.h:42 src/image_viewer.c:340
 msgid "Content-Type:"
 msgstr "內容種類:"
 
@@ -4622,7 +4623,7 @@ msgstr "優先權"
 msgid "Precedence:"
 msgstr "優先權:"
 
-#: src/gtk/headers.h:46 src/prefs_account.c:1078
+#: src/gtk/headers.h:46 src/prefs_account.c:1169
 msgid "Organization"
 msgstr "組織"
 
@@ -4846,48 +4847,52 @@ msgstr "IMAP 郵箱只顯示已訂閱資料夾"
 msgid "Icon Legend"
 msgstr "圖例"
 
-#: src/gtk/icon_legend.c:145
+#: src/gtk/icon_legend.c:146
 msgid ""
 "The following icons are used to show the status of messages and folders:"
 msgstr "以下圖示用來顯示郵件和資料夾狀態:"
 
-#: src/gtk/inputdialog.c:233 src/gtk/inputdialog.c:255
+#: src/gtk/inputdialog.c:228 src/gtk/inputdialog.c:250
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr "為 %s 輸入密碼於 %s:"
 
-#: src/gtk/inputdialog.c:236 src/gtk/inputdialog.c:239
-#: src/gtk/inputdialog.c:258 src/gtk/inputdialog.c:261
+#: src/gtk/inputdialog.c:231 src/gtk/inputdialog.c:234
+#: src/gtk/inputdialog.c:253 src/gtk/inputdialog.c:256
 #, c-format
 msgid "Input password for %s:"
 msgstr "為 %s 輸入密碼:"
 
-#: src/gtk/inputdialog.c:242 src/gtk/inputdialog.c:264
+#: src/gtk/inputdialog.c:237 src/gtk/inputdialog.c:259
 msgid "Input password:"
 msgstr "輸入密碼:"
 
-#: src/gtk/inputdialog.c:243 src/gtk/inputdialog.c:271
-#: src/gtk/inputdialog.c:283
+#: src/gtk/inputdialog.c:238 src/gtk/inputdialog.c:266
+#: src/gtk/inputdialog.c:278
 msgid "Input password"
 msgstr "輸入密碼"
 
-#: src/gtk/inputdialog.c:273
+#: src/gtk/inputdialog.c:268
 msgid "Remember password for this session"
 msgstr "為此記住密碼"
 
-#: src/gtk/inputdialog.c:372 src/gtk/inputdialog.c:419
+#: src/gtk/inputdialog.c:363 src/gtk/inputdialog.c:410
 msgid "Remember this"
 msgstr "記住這個"
 
-#: src/gtk/logwindow.c:447
+#: src/gtk/logwindow.c:450
+msgid "_Go to last error"
+msgstr "前往最後一個錯誤(_G)"
+
+#: src/gtk/logwindow.c:457
 msgid "Clear _Log"
 msgstr "清除歷程(_L)"
 
-#: src/gtk/menu.c:137
+#: src/gtk/menu.c:139
 msgid "Warning:"
 msgstr "警告:"
 
-#: src/gtk/menu.c:138
+#: src/gtk/menu.c:140
 msgid ""
 "This URL was too long for displaying and\n"
 "has been truncated for safety. This message could be\n"
@@ -4930,18 +4935,18 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:790
+#: src/gtk/pluginwindow.c:303 src/plugins/acpi_notifier/acpi_notifier.c:792
 #: src/plugins/address_keeper/address_keeper_prefs.c:273
 #: src/plugins/archive/archiver_prefs.c:106
 #: src/plugins/attachwarner/attachwarner_prefs.c:229
-#: src/plugins/bogofilter/bogofilter_gtk.c:498
+#: src/plugins/bogofilter/bogofilter_gtk.c:482
 #: src/plugins/bsfilter/bsfilter_gtk.c:400
-#: src/plugins/clamd/clamav_plugin_gtk.c:549
-#: src/plugins/fancy/fancy_prefs.c:114
+#: src/plugins/clamd/clamav_plugin_gtk.c:537
+#: src/plugins/fancy/fancy_prefs.c:115
 #: src/plugins/fetchinfo/fetchinfo_plugin_gtk.c:181
 #: src/plugins/gdata/cm_gdata_prefs.c:137
 #: src/plugins/libravatar/libravatar_prefs.c:545
-#: src/plugins/managesieve/sieve_prefs.c:427
+#: src/plugins/managesieve/sieve_prefs.c:423
 #: src/plugins/notification/notification_prefs.c:398
 #: src/plugins/notification/notification_prefs.c:413
 #: src/plugins/notification/notification_prefs.c:432
@@ -4950,260 +4955,268 @@ msgstr ""
 #: src/plugins/notification/notification_prefs.c:486
 #: src/plugins/notification/notification_prefs.c:504
 #: src/plugins/notification/notification_prefs.c:522
-#: src/plugins/pgpcore/prefs_gpg.c:686 src/plugins/pgpcore/prefs_gpg.c:706
+#: src/plugins/pgpcore/prefs_gpg.c:687 src/plugins/pgpcore/prefs_gpg.c:707
 #: src/plugins/rssyl/rssyl_prefs.c:70
 #: src/plugins/spam_report/spam_report_prefs.c:82
-#: src/plugins/spamassassin/spamassassin_gtk.c:648
-#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:957
+#: src/plugins/spamassassin/spamassassin_gtk.c:670
+#: src/plugins/vcalendar/vcal_prefs.c:774 src/prefs_toolbar.c:924
 msgid "Plugins"
 msgstr "外掛程式"
 
-#: src/gtk/pluginwindow.c:336
+#: src/gtk/pluginwindow.c:337
 msgid "_Load..."
 msgstr "載入(_L)..."
 
-#: src/gtk/pluginwindow.c:337
+#: src/gtk/pluginwindow.c:338
 msgid "_Unload"
 msgstr "卸載(_U)"
 
-#: src/gtk/pluginwindow.c:351 src/prefs_summaries.c:229
+#: src/gtk/pluginwindow.c:352 src/prefs_summaries.c:237
 msgid "Description"
 msgstr "說明"
 
-#: src/gtk/pluginwindow.c:375
+#: src/gtk/pluginwindow.c:376
 #, c-format
 msgid "For more information about plugins see the %sClaws Mail website%s."
 msgstr "參閱 %sClaws Mail website%s 以取得更詳細的資訊"
 
-#: src/gtk/pluginwindow.c:416
+#: src/gtk/pluginwindow.c:417
 msgid "Click here to load one or more plugins"
 msgstr "點選此處以載入一個或多個外掛程式"
 
-#: src/gtk/pluginwindow.c:419
+#: src/gtk/pluginwindow.c:420
 msgid "Unload the selected plugin"
 msgstr "移除選擇的外掛程式"
 
-#: src/gtk/pluginwindow.c:484
+#: src/gtk/pluginwindow.c:485
 msgid "Loaded plugins"
 msgstr "已載入的外掛程式"
 
-#: src/gtk/prefswindow.c:639
+#: src/gtk/prefswindow.c:640
 msgid "Page Index"
 msgstr "頁索引"
 
-#: src/gtk/progressdialog.c:91 src/mainwindow.c:841
+#: src/gtk/progressdialog.c:91 src/mainwindow.c:853
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
-#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:688
-#: src/prefs_account.c:3368 src/prefs_account.c:3386 src/prefs_account.c:3404
-#: src/prefs_account.c:3422 src/prefs_account.c:3440 src/prefs_account.c:3458
-#: src/prefs_account.c:3477 src/prefs_account.c:3570
-#: src/prefs_filtering_action.c:1425 src/prefs_filtering.c:397
-#: src/prefs_filtering.c:1879
+#: src/gtk/progressdialog.c:141 src/plugins/managesieve/sieve_manager.c:694
+#: src/prefs_account.c:3721 src/prefs_account.c:3739 src/prefs_account.c:3757
+#: src/prefs_account.c:3775 src/prefs_account.c:3793 src/prefs_account.c:3811
+#: src/prefs_account.c:3830 src/prefs_account.c:3923 src/prefs_account.c:3941
+#: src/prefs_filtering_action.c:1380 src/prefs_filtering.c:398
+#: src/prefs_filtering.c:1884
 msgid "Account"
 msgstr "帳號"
 
-#: src/gtk/quicksearch.c:478
+#: src/gtk/quicksearch.c:472
 msgid "all messages"
 msgstr "所有郵件"
 
-#: src/gtk/quicksearch.c:479
+#: src/gtk/quicksearch.c:473
 msgid "messages whose age is greater than # days"
 msgstr "郵件已接收超過 # 天"
 
-#: src/gtk/quicksearch.c:480
+#: src/gtk/quicksearch.c:474
 msgid "messages whose age is less than # days"
 msgstr "郵件接收過後未超過 # 天"
 
-#: src/gtk/quicksearch.c:481
+#: src/gtk/quicksearch.c:475
 msgid "messages whose age is greater than # hours"
 msgstr "郵件已接收超過 # 小時"
 
-#: src/gtk/quicksearch.c:482
+#: src/gtk/quicksearch.c:476
 msgid "messages whose age is less than # hours"
 msgstr "郵件接收過後未超過 # 小時"
 
-#: src/gtk/quicksearch.c:483
+#: src/gtk/quicksearch.c:477
 msgid "messages which contain S in the message body"
 msgstr "郵件內容包含了 S"
 
-#: src/gtk/quicksearch.c:484
+#: src/gtk/quicksearch.c:478
 msgid "messages which contain S in the whole message"
 msgstr "郵件內包含了 S"
 
-#: src/gtk/quicksearch.c:485
+#: src/gtk/quicksearch.c:479
 msgid "messages carbon-copied to S"
 msgstr "郵件已回覆至 S"
 
-#: src/gtk/quicksearch.c:486
+#: src/gtk/quicksearch.c:480
 msgid "message is either To: or Cc: to S"
 msgstr "郵件已回覆寄件者或密件副本至S"
 
-#: src/gtk/quicksearch.c:487
+#: src/gtk/quicksearch.c:481
 msgid "deleted messages"
 msgstr "刪除郵件"
 
-#: src/gtk/quicksearch.c:488
+#: src/gtk/quicksearch.c:482
+msgid "messages whose date is after requested date (time is optional)"
+msgstr "郵件的日期在求要的日期之後(時間是選項)"
+
+#: src/gtk/quicksearch.c:484
+msgid "messages whose date is before requested date (time is optional)"
+msgstr "郵件的日期在求要的日期之前(時間是選項)"
+
+#: src/gtk/quicksearch.c:486
 msgid "messages which contain S in the Sender field"
 msgstr "郵件在寄件者區塊中包含了 S"
 
-#: src/gtk/quicksearch.c:489
+#: src/gtk/quicksearch.c:487
 msgid "true if execute \"S\" succeeds"
 msgstr "若執行 \"S\" 成功則為真"
 
-#: src/gtk/quicksearch.c:490
+#: src/gtk/quicksearch.c:488
 msgid "messages originating from user S"
 msgstr "郵件起源於使用者 S"
 
-#: src/gtk/quicksearch.c:491
+#: src/gtk/quicksearch.c:489
 msgid "forwarded messages"
 msgstr "郵件已轉寄"
 
-#: src/gtk/quicksearch.c:492
+#: src/gtk/quicksearch.c:490
 msgid "messages which have attachments"
 msgstr "郵件包含附件"
 
-#: src/gtk/quicksearch.c:493
+#: src/gtk/quicksearch.c:491
 msgid "messages which contain S in any header name or value"
 msgstr "任何標頭名稱或數據包含 S 的郵件"
 
-#: src/gtk/quicksearch.c:494
+#: src/gtk/quicksearch.c:492
 msgid "messages which contain S in the value of any header"
 msgstr "任何標頭內數據內包含 S 的郵件"
 
-#: src/gtk/quicksearch.c:495
+#: src/gtk/quicksearch.c:493
 msgid "messages which contain S in Message-ID header"
 msgstr "任何 Message-ID 標頭包含 S 的郵件"
 
-#: src/gtk/quicksearch.c:496
+#: src/gtk/quicksearch.c:494
 msgid "messages which contain S in In-Reply-To header"
 msgstr "任何 In-Reply-To 標頭包含 S 的郵件"
 
-#: src/gtk/quicksearch.c:497
+#: src/gtk/quicksearch.c:495
 msgid "messages which are marked with color #"
 msgstr "標示為 # 顏色的郵件"
 
-#: src/gtk/quicksearch.c:498
+#: src/gtk/quicksearch.c:496
 msgid "locked messages"
 msgstr "鎖定郵件"
 
-#: src/gtk/quicksearch.c:499
+#: src/gtk/quicksearch.c:497
 msgid "messages which are in newsgroup S"
 msgstr "在新聞群組S內的郵件"
 
-#: src/gtk/quicksearch.c:500
+#: src/gtk/quicksearch.c:498
 msgid "new messages"
 msgstr "新郵件"
 
-#: src/gtk/quicksearch.c:501
+#: src/gtk/quicksearch.c:499
 msgid "old messages"
 msgstr "舊郵件"
 
-#: src/gtk/quicksearch.c:502
+#: src/gtk/quicksearch.c:500
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "不完整的郵件 (沒有完整的下載)"
 
-#: src/gtk/quicksearch.c:503
+#: src/gtk/quicksearch.c:501
 msgid "messages which you have replied to"
 msgstr "回覆的郵件"
 
-#: src/gtk/quicksearch.c:504
+#: src/gtk/quicksearch.c:502
 msgid "read messages"
 msgstr "讀取郵件"
 
-#: src/gtk/quicksearch.c:505
+#: src/gtk/quicksearch.c:503
 msgid "messages which contain S in subject"
 msgstr "主旨內包含 S 的郵件"
 
-#: src/gtk/quicksearch.c:506
+#: src/gtk/quicksearch.c:504
 msgid "messages whose score is equal to # points"
 msgstr "評分等於 # 點的郵件"
 
-#: src/gtk/quicksearch.c:507
+#: src/gtk/quicksearch.c:505
 msgid "messages whose score is greater than # points"
 msgstr "評分高於 # 點的郵件"
 
-#: src/gtk/quicksearch.c:508
+#: src/gtk/quicksearch.c:506
 msgid "messages whose score is lower than # points"
 msgstr "評分低於 # 點的郵件"
 
-#: src/gtk/quicksearch.c:509
+#: src/gtk/quicksearch.c:507
 msgid "messages whose size is equal to # bytes"
 msgstr "等於 # 位元的郵件"
 
-#: src/gtk/quicksearch.c:510
+#: src/gtk/quicksearch.c:508
 msgid "messages whose size is greater than # bytes"
 msgstr "大於 # 位元的郵件"
 
-#: src/gtk/quicksearch.c:511
+#: src/gtk/quicksearch.c:509
 msgid "messages whose size is smaller than # bytes"
 msgstr "小於 # 位元的郵件"
 
-#: src/gtk/quicksearch.c:512
+#: src/gtk/quicksearch.c:510
 msgid "messages which have been sent to S"
 msgstr "寄給S的郵件"
 
-#: src/gtk/quicksearch.c:513
+#: src/gtk/quicksearch.c:511
 msgid "messages which tags contain S"
 msgstr "標籤包含S的郵件"
 
-#: src/gtk/quicksearch.c:514
+#: src/gtk/quicksearch.c:512
 msgid "messages which have tag(s)"
 msgstr "有標籤的郵件"
 
-#: src/gtk/quicksearch.c:515
+#: src/gtk/quicksearch.c:513
 msgid "marked messages"
 msgstr "已標示的郵件"
 
-#: src/gtk/quicksearch.c:516
+#: src/gtk/quicksearch.c:514
 msgid "unread messages"
 msgstr "未讀的郵件"
 
-#: src/gtk/quicksearch.c:517
+#: src/gtk/quicksearch.c:515
 msgid "messages which contain S in References header"
 msgstr "參考標頭內包含S的郵件"
 
-#: src/gtk/quicksearch.c:518
+#: src/gtk/quicksearch.c:516
 #, c-format
 msgid "messages returning 0 when passed to command - %F is message file"
 msgstr "傳入命令的返回值為0 - %F 為郵件檔案"
 
-#: src/gtk/quicksearch.c:519
+#: src/gtk/quicksearch.c:517
 msgid "messages which contain S in X-Label header"
 msgstr "X-Label 標頭內包含S的郵件"
 
-#: src/gtk/quicksearch.c:521
+#: src/gtk/quicksearch.c:519
 msgid "logical AND operator"
 msgstr "'而且'的操作邏輯"
 
-#: src/gtk/quicksearch.c:522
+#: src/gtk/quicksearch.c:520
 msgid "logical OR operator"
 msgstr "'或'的操作邏輯"
 
-#: src/gtk/quicksearch.c:523
+#: src/gtk/quicksearch.c:521
 msgid "logical NOT operator"
 msgstr "'非'的操作邏輯"
 
-#: src/gtk/quicksearch.c:524
+#: src/gtk/quicksearch.c:522
 msgid "case sensitive search"
 msgstr "大小寫視為不同的搜尋"
 
-#: src/gtk/quicksearch.c:525
+#: src/gtk/quicksearch.c:523
 msgid "match using regular expressions instead of substring search"
 msgstr "用常態表示式取代子字串搜尋進行比對"
 
-#: src/gtk/quicksearch.c:527
+#: src/gtk/quicksearch.c:525
 msgid ""
 "all filtering expressions are allowed, but cannot be mixed through logical "
 "operators with the expressions above"
 msgstr "所有的過濾表達式都是被允許的,但是不能夠將上述的語法混用"
 
-#: src/gtk/quicksearch.c:537 src/summary_search.c:521
+#: src/gtk/quicksearch.c:535 src/summary_search.c:462
 msgid "Extended Search"
 msgstr "擴展性的搜尋"
 
-#: src/gtk/quicksearch.c:538
+#: src/gtk/quicksearch.c:536
 msgid ""
 "Extended Search allows the user to define criteria that messages must have "
 "in order to match and be displayed in the message list.\n"
@@ -5212,99 +5225,107 @@ msgstr ""
 "擴展性的搜尋允許使用者自定標準法則,郵件必需排序而且顯示在郵件清單內\n"
 "下列符號是允許被使用的:"
 
-#: src/gtk/quicksearch.c:638
+#: src/gtk/quicksearch.c:640
 msgid "Something went wrong during search. Please check your logs."
 msgstr "搜尋過程出現一些錯誤,請檢視你的歷程"
 
-#: src/gtk/quicksearch.c:704
+#: src/gtk/quicksearch.c:702
 msgid "From/To/Cc/Subject/Tag"
 msgstr "寄件者/收件者/密件/主旨/標籤"
 
-#: src/gtk/quicksearch.c:715 src/plugins/archive/archiver_prefs.c:416
+#: src/gtk/quicksearch.c:713 src/plugins/archive/archiver_prefs.c:416
 msgid "Recursive"
 msgstr "循環"
 
-#: src/gtk/quicksearch.c:724
+#: src/gtk/quicksearch.c:722
 msgid "Sticky"
 msgstr "黏貼"
 
-#: src/gtk/quicksearch.c:734
+#: src/gtk/quicksearch.c:732
 msgid "Type-ahead"
 msgstr "預先輸入"
 
-#: src/gtk/quicksearch.c:746
+#: src/gtk/quicksearch.c:744
 msgid "Run on select"
 msgstr "執行所選擇的"
 
-#: src/gtk/quicksearch.c:788
+#: src/gtk/quicksearch.c:780
 msgid "Clear the current search"
 msgstr "清除目前的搜尋"
 
-#: src/gtk/quicksearch.c:798 src/summary_search.c:472
+#: src/gtk/quicksearch.c:790 src/summary_search.c:413
 msgid "Edit search criteria"
 msgstr "編輯搜尋規則"
 
-#: src/gtk/quicksearch.c:807
+#: src/gtk/quicksearch.c:799
 msgid "Information about extended symbols"
 msgstr "關於擴展符號的資訊"
 
-#: src/gtk/quicksearch.c:845 src/gtk/quicksearch.c:869
+#: src/gtk/quicksearch.c:837 src/gtk/quicksearch.c:861
 msgid "_Information"
 msgstr "資訊(_I)"
 
-#: src/gtk/quicksearch.c:846 src/gtk/quicksearch.c:870
+#: src/gtk/quicksearch.c:838 src/gtk/quicksearch.c:862
 msgid "E_dit"
 msgstr "編輯(_d)"
 
-#: src/gtk/quicksearch.c:847 src/gtk/quicksearch.c:871 src/prefs_actions.c:347
-#: src/prefs_filtering.c:495 src/prefs_template.c:329
+#: src/gtk/quicksearch.c:839 src/gtk/quicksearch.c:863 src/prefs_actions.c:349
+#: src/prefs_filtering.c:496 src/prefs_template.c:330
 msgid "C_lear"
 msgstr "清除(_l)"
 
-#: src/gtk/sslcertwindow.c:157 src/gtk/sslcertwindow.c:348
-#: src/gtk/sslcertwindow.c:398 src/gtk/sslcertwindow.c:462
-msgid "Correct"
-msgstr "正確"
+#: src/gtk/sslcertwindow.c:181 src/ssl_manager.c:301
+#, c-format
+msgid "Correct%s"
+msgstr "正確%s"
 
-#: src/gtk/sslcertwindow.c:162
+#: src/gtk/sslcertwindow.c:181 src/gtk/sslcertwindow.c:183
+#: src/ssl_manager.c:301 src/ssl_manager.c:305
+msgid " (expired)"
+msgstr "(已逾時)"
+
+#: src/gtk/sslcertwindow.c:188
 msgid "Owner"
 msgstr "擁有者"
 
-#: src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:189
 msgid "Signer"
 msgstr "簽核者"
 
-#: src/gtk/sslcertwindow.c:170 src/gtk/sslcertwindow.c:194
-#: src/prefs_themes.c:989
+#: src/gtk/sslcertwindow.c:196 src/gtk/sslcertwindow.c:220
 msgid "Name: "
 msgstr "名稱: "
 
-#: src/gtk/sslcertwindow.c:178 src/gtk/sslcertwindow.c:202
+#: src/gtk/sslcertwindow.c:204 src/gtk/sslcertwindow.c:228
 msgid "Organization: "
 msgstr "組識: "
 
-#: src/gtk/sslcertwindow.c:186 src/gtk/sslcertwindow.c:210
+#: src/gtk/sslcertwindow.c:212 src/gtk/sslcertwindow.c:236
 msgid "Location: "
 msgstr "地區: "
 
-#: src/gtk/sslcertwindow.c:218
+#: src/gtk/sslcertwindow.c:244
 msgid "Fingerprint: \n"
 msgstr "指紋: \n"
 
-#: src/gtk/sslcertwindow.c:228
+#: src/gtk/sslcertwindow.c:254
 msgid "Signature status: "
 msgstr "簽名狀態: "
 
-#: src/gtk/sslcertwindow.c:235
+#: src/gtk/sslcertwindow.c:261
+msgid "Expired on: "
+msgstr "已過期日: "
+
+#: src/gtk/sslcertwindow.c:261
 msgid "Expires on: "
 msgstr "過期日: "
 
-#: src/gtk/sslcertwindow.c:302
+#: src/gtk/sslcertwindow.c:328
 #, c-format
 msgid "SSL/TLS certificate for %s"
 msgstr "%s 的 SSL/TLS 簽證"
 
-#: src/gtk/sslcertwindow.c:318
+#: src/gtk/sslcertwindow.c:344
 #, c-format
 msgid ""
 "Certificate is for %s, but connection is to %s.\n"
@@ -5315,7 +5336,7 @@ msgstr ""
 "可能是連接到一個惡意的伺服器\n"
 "\n"
 
-#: src/gtk/sslcertwindow.c:338
+#: src/gtk/sslcertwindow.c:364
 #, c-format
 msgid ""
 "Certificate for %s is unknown.\n"
@@ -5324,34 +5345,39 @@ msgstr ""
 "%s 的簽證是無效的\n"
 "%s 確認要接受嗎?"
 
-#: src/gtk/sslcertwindow.c:350 src/gtk/sslcertwindow.c:400
-#: src/gtk/sslcertwindow.c:464
+#: src/gtk/sslcertwindow.c:374 src/gtk/sslcertwindow.c:424
+#: src/gtk/sslcertwindow.c:488
+msgid "Correct"
+msgstr "正確"
+
+#: src/gtk/sslcertwindow.c:376 src/gtk/sslcertwindow.c:426
+#: src/gtk/sslcertwindow.c:490
 #, c-format
 msgid "Signature status: %s"
 msgstr "簽名狀態: %s"
 
-#: src/gtk/sslcertwindow.c:358 src/gtk/sslcertwindow.c:408
+#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:434
 msgid "_View certificate"
 msgstr "查看簽證(_V)"
 
-#: src/gtk/sslcertwindow.c:364
+#: src/gtk/sslcertwindow.c:390
 msgid "SSL/TLS certificate is invalid"
 msgstr "SSL/TLS認證是無效的"
 
-#: src/gtk/sslcertwindow.c:366
+#: src/gtk/sslcertwindow.c:392
 msgid "SSL/TLS certificate is unknown"
 msgstr "SSL/TLS認證是未知的"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:419
-#: src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:445
+#: src/gtk/sslcertwindow.c:507
 msgid "_Cancel connection"
 msgstr "取消連線(_C)"
 
-#: src/gtk/sslcertwindow.c:369 src/gtk/sslcertwindow.c:481
+#: src/gtk/sslcertwindow.c:395 src/gtk/sslcertwindow.c:507
 msgid "_Accept and save"
 msgstr "接受並儲存(_A)"
 
-#: src/gtk/sslcertwindow.c:387
+#: src/gtk/sslcertwindow.c:413
 #, c-format
 msgid ""
 "Certificate for %s is expired.\n"
@@ -5360,27 +5386,27 @@ msgstr ""
 "%s 的簽證已過期\n"
 "%s 確認要繼續嗎?"
 
-#: src/gtk/sslcertwindow.c:414
+#: src/gtk/sslcertwindow.c:440
 msgid "SSL/TLS certificate is invalid and expired"
 msgstr "SSL/TLS 簽證是無效且過期的"
 
-#: src/gtk/sslcertwindow.c:416
+#: src/gtk/sslcertwindow.c:442
 msgid "SSL/TLS certificate is expired"
 msgstr "SSL/TLS 簽證是過期的"
 
-#: src/gtk/sslcertwindow.c:419
+#: src/gtk/sslcertwindow.c:445
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: src/gtk/sslcertwindow.c:439
+#: src/gtk/sslcertwindow.c:465
 msgid "New certificate:"
 msgstr "新的簽證"
 
-#: src/gtk/sslcertwindow.c:444
+#: src/gtk/sslcertwindow.c:470
 msgid "Known certificate:"
 msgstr "已知的簽證"
 
-#: src/gtk/sslcertwindow.c:451
+#: src/gtk/sslcertwindow.c:477
 #, c-format
 msgid ""
 "Certificate for %s has changed.\n"
@@ -5389,15 +5415,15 @@ msgstr ""
 "%s 的簽證已經改變\n"
 "%s 確認要接受嗎?"
 
-#: src/gtk/sslcertwindow.c:472
+#: src/gtk/sslcertwindow.c:498
 msgid "_View certificates"
 msgstr "查看簽證(_V)"
 
-#: src/gtk/sslcertwindow.c:477
+#: src/gtk/sslcertwindow.c:503
 msgid "SSL/TLS certificate changed and is invalid"
 msgstr "SSL/TLS 簽證變更而且是無效的"
 
-#: src/gtk/sslcertwindow.c:479
+#: src/gtk/sslcertwindow.c:505
 msgid "SSL/TLS certificate changed"
 msgstr "SSL/TLS 簽證變更"
 
@@ -5407,223 +5433,223 @@ msgstr "標簽:"
 
 #: src/headerview.c:192 src/plugins/notification/notification_popup.c:313
 #: src/plugins/notification/notification_popup.c:620
-#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3423
-#: src/summaryview.c:3441 src/summaryview.c:3462
+#: src/plugins/notification/notification_trayicon.c:886 src/summaryview.c:3499
+#: src/summaryview.c:3517 src/summaryview.c:3556
 msgid "(No From)"
 msgstr "(無寄件者)"
 
 #: src/headerview.c:207 src/plugins/notification/notification_popup.c:315
 #: src/plugins/notification/notification_popup.c:624
-#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3474
-#: src/summaryview.c:3477
+#: src/plugins/notification/notification_trayicon.c:889 src/summaryview.c:3568
+#: src/summaryview.c:3571
 msgid "(No Subject)"
 msgstr "(無主旨)"
 
-#: src/image_viewer.c:100
+#: src/image_viewer.c:127
 msgid "Error:"
 msgstr "錯誤:"
 
-#: src/image_viewer.c:299 src/mimeview.c:2611
+#: src/image_viewer.c:312 src/mimeview.c:2666
 #: src/plugins/att_remover/att_remover.c:306
-#: src/plugins/pdf_viewer/poppler_viewer.c:698
+#: src/plugins/pdf_viewer/poppler_viewer.c:701
 msgid "Filename:"
 msgstr "檔案名稱"
 
-#: src/image_viewer.c:306
+#: src/image_viewer.c:319
 msgid "Filesize:"
 msgstr "檔案大小:"
 
-#: src/image_viewer.c:355
+#: src/image_viewer.c:368
 msgid "Load Image"
 msgstr "載入圖片"
 
-#: src/imap.c:576
+#: src/imap.c:577
 msgid "IMAP connection broken\n"
 msgstr "IMAP4 連線中斷\n"
 
-#: src/imap.c:615 src/imap.c:618 src/imap.c:621 src/imap.c:624 src/imap.c:627
-#: src/imap.c:631 src/imap.c:634 src/imap.c:637 src/imap.c:640 src/imap.c:644
-#: src/imap.c:647 src/imap.c:650 src/imap.c:653 src/imap.c:656 src/imap.c:659
-#: src/imap.c:662 src/imap.c:665 src/imap.c:668 src/imap.c:671 src/imap.c:674
-#: src/imap.c:677 src/imap.c:680 src/imap.c:683 src/imap.c:686 src/imap.c:689
-#: src/imap.c:692 src/imap.c:695 src/imap.c:698 src/imap.c:701 src/imap.c:704
-#: src/imap.c:707 src/imap.c:710 src/imap.c:713 src/imap.c:716 src/imap.c:719
-#: src/imap.c:722 src/imap.c:725 src/imap.c:728 src/imap.c:731 src/imap.c:734
-#: src/imap.c:738 src/imap.c:742
+#: src/imap.c:622 src/imap.c:625 src/imap.c:628 src/imap.c:631 src/imap.c:634
+#: src/imap.c:638 src/imap.c:641 src/imap.c:644 src/imap.c:647 src/imap.c:651
+#: src/imap.c:654 src/imap.c:657 src/imap.c:660 src/imap.c:663 src/imap.c:666
+#: src/imap.c:669 src/imap.c:672 src/imap.c:675 src/imap.c:678 src/imap.c:681
+#: src/imap.c:684 src/imap.c:687 src/imap.c:690 src/imap.c:693 src/imap.c:696
+#: src/imap.c:699 src/imap.c:702 src/imap.c:705 src/imap.c:708 src/imap.c:711
+#: src/imap.c:714 src/imap.c:717 src/imap.c:720 src/imap.c:723 src/imap.c:726
+#: src/imap.c:729 src/imap.c:732 src/imap.c:735 src/imap.c:738 src/imap.c:741
+#: src/imap.c:745 src/imap.c:749
 #, c-format
 msgid "IMAP error on %s:"
 msgstr "IMAP 發生%s錯誤:"
 
-#: src/imap.c:615
+#: src/imap.c:622
 msgid "authenticated"
 msgstr " 已認證"
 
-#: src/imap.c:618
+#: src/imap.c:625
 msgid "not authenticated"
 msgstr "沒有認證"
 
-#: src/imap.c:621
+#: src/imap.c:628
 msgid "bad state"
 msgstr " 錯誤狀態"
 
-#: src/imap.c:624
+#: src/imap.c:631
 msgid "stream error"
 msgstr " stream 錯誤"
 
-#: src/imap.c:627
+#: src/imap.c:634
 msgid "parse error (very probably non-RFC compliance from the server)"
 msgstr " 解析錯誤(很可能是因為不符合伺服器的RFC規範)"
 
-#: src/imap.c:631
+#: src/imap.c:638
 msgid "connection refused"
 msgstr "連線被拒絕"
 
-#: src/imap.c:634
+#: src/imap.c:641
 msgid "memory error"
 msgstr "記憶體錯誤"
 
-#: src/imap.c:637
+#: src/imap.c:644
 msgid "fatal error"
 msgstr " 內部錯誤"
 
-#: src/imap.c:640
+#: src/imap.c:647
 msgid "protocol error (very probably non-RFC compliance from the server)"
 msgstr " 協定錯誤(很可能是因為不符合伺服器的RFC規範)"
 
-#: src/imap.c:644
+#: src/imap.c:651
 msgid "connection not accepted"
 msgstr " 連線沒有被接受"
 
-#: src/imap.c:647
+#: src/imap.c:654
 msgid "APPEND error"
 msgstr " APPEND 錯誤"
 
-#: src/imap.c:650
+#: src/imap.c:657
 msgid "NOOP error"
 msgstr " NOOP 錯誤"
 
-#: src/imap.c:653
+#: src/imap.c:660
 msgid "LOGOUT error"
 msgstr " 登出錯誤"
 
-#: src/imap.c:656
+#: src/imap.c:663
 msgid "CAPABILITY error"
 msgstr " 容量錯誤"
 
-#: src/imap.c:659
+#: src/imap.c:666
 msgid "CHECK error"
 msgstr " 檢查錯誤"
 
-#: src/imap.c:662
+#: src/imap.c:669
 msgid "CLOSE error"
 msgstr " 關閉錯誤"
 
-#: src/imap.c:665
+#: src/imap.c:672
 msgid "EXPUNGE error"
 msgstr " 刪除錯誤"
 
-#: src/imap.c:668
+#: src/imap.c:675
 msgid "COPY error"
 msgstr " 複製錯誤"
 
-#: src/imap.c:671
+#: src/imap.c:678
 msgid "UID COPY error"
 msgstr " UID 複制錯誤"
 
-#: src/imap.c:674
+#: src/imap.c:681
 msgid "CREATE error"
 msgstr " 建立錯誤"
 
-#: src/imap.c:677
+#: src/imap.c:684
 msgid "DELETE error"
 msgstr " 刪除錯誤"
 
-#: src/imap.c:680
+#: src/imap.c:687
 msgid "EXAMINE error"
 msgstr " 檢驗錯誤"
 
-#: src/imap.c:683
+#: src/imap.c:690
 msgid "FETCH error"
 msgstr " 擷取錯誤"
 
-#: src/imap.c:686
+#: src/imap.c:693
 msgid "UID FETCH error"
 msgstr " UID取得錯誤"
 
-#: src/imap.c:689
+#: src/imap.c:696
 msgid "LIST error"
 msgstr " LIST 錯誤"
 
-#: src/imap.c:692
+#: src/imap.c:699
 msgid "LOGIN error"
 msgstr " 登入錯誤"
 
-#: src/imap.c:695
+#: src/imap.c:702
 msgid "LSUB error"
 msgstr " LSUB 錯誤"
 
-#: src/imap.c:698
+#: src/imap.c:705
 msgid "RENAME error"
 msgstr " 重新命名錯誤"
 
-#: src/imap.c:701
+#: src/imap.c:708
 msgid "SEARCH error"
 msgstr " 搜尋錯誤"
 
-#: src/imap.c:704
+#: src/imap.c:711
 msgid "UID SEARCH error"
 msgstr " UID搜尋錯誤"
 
-#: src/imap.c:707
+#: src/imap.c:714
 msgid "SELECT error"
 msgstr " 選擇錯誤"
 
-#: src/imap.c:710
+#: src/imap.c:717
 msgid "STATUS error"
 msgstr " 狀態錯誤"
 
-#: src/imap.c:713
+#: src/imap.c:720
 msgid "STORE error"
 msgstr " 儲存錯誤"
 
-#: src/imap.c:716
+#: src/imap.c:723
 msgid "UID STORE error"
 msgstr " UID儲存錯誤"
 
-#: src/imap.c:719
+#: src/imap.c:726
 msgid "SUBSCRIBE error"
 msgstr " 訂閱錯誤"
 
-#: src/imap.c:722
+#: src/imap.c:729
 msgid "UNSUBSCRIBE error"
 msgstr " 取消定閱錯誤"
 
-#: src/imap.c:725
+#: src/imap.c:732
 msgid "STARTTLS error"
 msgstr " STARTLS錯誤"
 
-#: src/imap.c:728
+#: src/imap.c:735
 msgid "INVAL error"
 msgstr " INVAL錯誤"
 
-#: src/imap.c:731
+#: src/imap.c:738
 msgid "EXTENSION error"
 msgstr " 擴展錯誤"
 
-#: src/imap.c:734
+#: src/imap.c:741
 msgid "SASL error"
 msgstr " SASL 錯誤"
 
-#: src/imap.c:738
+#: src/imap.c:745
 msgid "SSL/TLS error"
 msgstr " SSL 錯誤"
 
-#: src/imap.c:742
+#: src/imap.c:749
 #, c-format
 msgid "Unknown error [%d]"
 msgstr "未知的錯誤 [%d]"
 
-#: src/imap.c:946
+#: src/imap.c:955
 msgid ""
 "\n"
 "\n"
@@ -5635,7 +5661,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了CRAM-MD5 SASL外掛程式,CRAM-MD5登入才能"
 "正常運作"
 
-#: src/imap.c:952
+#: src/imap.c:961
 msgid ""
 "\n"
 "\n"
@@ -5647,7 +5673,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了DIGEST-MD5 SASL外掛程式,DIGEST-MD5登入"
 "才能正常運作"
 
-#: src/imap.c:958
+#: src/imap.c:967
 msgid ""
 "\n"
 "\n"
@@ -5659,7 +5685,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了SCRAM SASL外掛程式,SCRAM-SHA-1登入才能"
 "正常運作"
 
-#: src/imap.c:964
+#: src/imap.c:973
 msgid ""
 "\n"
 "\n"
@@ -5671,7 +5697,7 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了CRAM-MD5 SASL外掛程式,CRAM-MD5登入才能"
 "正常運作"
 
-#: src/imap.c:970
+#: src/imap.c:979
 msgid ""
 "\n"
 "\n"
@@ -5683,36 +5709,36 @@ msgstr ""
 "只有在libetpan被編譯成支援SASL且安裝了DIGEST-MD5 SASL外掛程式,DIGEST-MD5登入"
 "才能正常運作"
 
-#: src/imap.c:977
+#: src/imap.c:986
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "連線到 %s 失敗:登入被拒絕 %s"
 
-#: src/imap.c:981
+#: src/imap.c:990
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "連線到 %s 失敗:登入被拒絕 %s\n"
 
-#: src/imap.c:999
+#: src/imap.c:1008
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "連線到 %s 失敗"
 
-#: src/imap.c:1006 src/imap.c:1009
+#: src/imap.c:1015 src/imap.c:1018
 #, c-format
 msgid "IMAP connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 連線到 %s 已經被中斷,正在重新連線...\n"
 
-#: src/imap.c:1039 src/imap.c:3656 src/imap.c:4315 src/imap.c:4409
-#: src/imap.c:4587 src/imap.c:5398
+#: src/imap.c:1048 src/imap.c:3693 src/imap.c:4352 src/imap.c:4446
+#: src/imap.c:4624 src/imap.c:5435
 msgid "Claws Mail needs network access in order to access the IMAP server."
 msgstr "Claws Mail 需要有網路的存取能力,才能夠存取 IMAP 伺服器"
 
-#: src/imap.c:1148 src/inc.c:811 src/news.c:388 src/send_message.c:282
+#: src/imap.c:1158 src/inc.c:876 src/news.c:402 src/send_message.c:286
 msgid "Insecure connection"
 msgstr "不安全的連線"
 
-#: src/imap.c:1149 src/inc.c:812 src/news.c:389 src/send_message.c:283
+#: src/imap.c:1159 src/inc.c:877 src/news.c:403 src/send_message.c:287
 msgid ""
 "This connection is configured to be secured using SSL/TLS, but SSL/TLS is "
 "not available in this build of Claws Mail. \n"
@@ -5725,104 +5751,108 @@ msgstr ""
 "\n"
 "確認要繼續連線到這個伺服器嗎?此通訊將不安全"
 
-#: src/imap.c:1155 src/inc.c:818 src/news.c:395 src/send_message.c:289
+#: src/imap.c:1165 src/inc.c:883 src/news.c:409 src/send_message.c:293
 msgid "Con_tinue connecting"
 msgstr "繼續保持連線"
 
-#: src/imap.c:1165
+#: src/imap.c:1174
 #, c-format
 msgid "Account '%s': Connecting to IMAP server: %s:%d..."
 msgstr "帳號 '%s':連線到 IMAP4 伺服器:  %s:%d..."
 
-#: src/imap.c:1213
+#: src/imap.c:1239
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d"
 
-#: src/imap.c:1216
+#: src/imap.c:1242
 #, c-format
 msgid "Can't connect to IMAP server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器: %s:%d\n"
 
-#: src/imap.c:1249 src/imap.c:4077
+#: src/imap.c:1274 src/imap.c:4114
 msgid "Can't start STARTTLS session.\n"
 msgstr "無法啟始 STARTTLS 通信\n"
 
-#: src/imap.c:1316
+#: src/imap.c:1343
 #, c-format
 msgid "Couldn't login to IMAP server %s.\n"
 msgstr "無法登入到 IMAP 伺服器 %s \n"
 
-#: src/imap.c:1319
+#: src/imap.c:1346
 #, c-format
 msgid "Couldn't login to IMAP server %s."
 msgstr "無法登入到 IMAP 伺服器 %s"
 
-#: src/imap.c:1747
+#: src/imap.c:1774
 msgid "Adding messages..."
 msgstr "加入郵件..."
 
-#: src/imap.c:1952 src/mh.c:529
+#: src/imap.c:1979 src/mh.c:530
 msgid "Copying messages..."
 msgstr "複製郵件..."
 
-#: src/imap.c:2545
+#: src/imap.c:2504
+msgid "Search failed due to server error."
+msgstr "因伺服器錯誤造成搜尋失敗"
+
+#: src/imap.c:2586
 msgid "can't set deleted flags\n"
 msgstr "無法設定已刪除旗標\n"
 
-#: src/imap.c:2552 src/imap.c:5028
+#: src/imap.c:2593 src/imap.c:5065
 msgid "can't expunge\n"
 msgstr "無法刪掉\n"
 
-#: src/imap.c:2903
+#: src/imap.c:2944
 #, c-format
 msgid "Looking for unsubscribed folders in %s..."
 msgstr "在沒有訂閱的資料夾 %s 內尋找..."
 
-#: src/imap.c:2906
+#: src/imap.c:2947
 #, c-format
 msgid "Looking for subfolders of %s..."
 msgstr "在%s尋找子資料夾..."
 
-#: src/imap.c:3196
+#: src/imap.c:3235
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法建立郵件箱:LIST錯誤\n"
 
-#: src/imap.c:3211
+#: src/imap.c:3248
 msgid "can't create mailbox\n"
 msgstr "無法建立郵件箱\n"
 
-#: src/imap.c:3342
+#: src/imap.c:3379
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "無法將郵件箱口稱從 %s 變更為 %s\n"
 
-#: src/imap.c:3455
+#: src/imap.c:3492
 msgid "can't delete mailbox\n"
 msgstr "無法刪除郵件箱\n"
 
-#: src/imap.c:3734
+#: src/imap.c:3771
 msgid "LIST failed\n"
 msgstr "LIST 失敗\n"
 
-#: src/imap.c:3819
+#: src/imap.c:3856
 msgid "Flagging messages..."
 msgstr "標示郵件..."
 
-#: src/imap.c:3922
+#: src/imap.c:3959
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾: %s\n"
 
-#: src/imap.c:4074
+#: src/imap.c:4111
 msgid "Server requires STARTTLS to log in.\n"
 msgstr "伺服器需要以 STARTTLS 進行登入\n"
 
-#: src/imap.c:4084
+#: src/imap.c:4121
 msgid "Can't refresh capabilities.\n"
 msgstr "不能刷新功能\n"
 
-#: src/imap.c:4089
+#: src/imap.c:4126
 #, c-format
 msgid ""
 "Connection to %s failed: server requires STARTTLS, but Claws Mail has been "
@@ -5831,20 +5861,20 @@ msgstr ""
 "連線到 %s 失敗:伺服器需要 STARTTLS,但是目前的 Claws Mail 被編譯成不支援 "
 "STARTTLS 的版本\n"
 
-#: src/imap.c:4097
+#: src/imap.c:4134
 msgid "Server logins are disabled.\n"
 msgstr "伺服器登入被關閉\n"
 
-#: src/imap.c:4320
+#: src/imap.c:4357
 msgid "Fetching message..."
 msgstr "取得郵件..."
 
-#: src/imap.c:5021
+#: src/imap.c:5058
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "無法設定被刪除的旗標: %d\n"
 
-#: src/imap.c:6056
+#: src/imap.c:6093
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Claws "
 "Mail has been built without IMAP support; your IMAP accounts are disabled.\n"
@@ -5894,7 +5924,7 @@ msgstr "訂閱內容"
 msgid "_Subscribe..."
 msgstr "訂閱(_S)..."
 
-#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:169
+#: src/imap_gtk.c:78 src/plugins/vcalendar/vcal_folder.c:171
 msgid "_Unsubscribe..."
 msgstr "取消訂閱(_U)..."
 
@@ -5926,25 +5956,25 @@ msgstr ""
 "請在資料夾後加上 '/'"
 
 #: src/imap_gtk.c:198 src/mh_gtk.c:147
-msgid "Inherit properties from parent folder"
-msgstr "從上層資料夾繼承屬性"
+msgid "Inherit properties and processing rules from parent folder"
+msgstr "從上層資料夾繼承屬性並處理"
 
 #: src/imap_gtk.c:259 src/mh_gtk.c:252 src/news_gtk.c:290
-#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:197
-#: src/plugins/vcalendar/vcal_folder.c:2051
+#: src/plugins/mailmbox/plugin_gtk.c:419 src/plugins/rssyl/rssyl_cb_menu.c:196
+#: src/plugins/vcalendar/vcal_folder.c:2060
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "為 %s 輸入新名稱"
 
 #: src/imap_gtk.c:261 src/mh_gtk.c:254 src/plugins/mailmbox/plugin_gtk.c:420
-#: src/plugins/rssyl/rssyl_cb_menu.c:198
-#: src/plugins/vcalendar/vcal_folder.c:2052
+#: src/plugins/rssyl/rssyl_cb_menu.c:197
+#: src/plugins/vcalendar/vcal_folder.c:2061
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
 #: src/imap_gtk.c:290 src/mh_gtk.c:280 src/news_gtk.c:312
-#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:224
-#: src/plugins/vcalendar/vcal_folder.c:2072
+#: src/plugins/mailmbox/plugin_gtk.c:450 src/plugins/rssyl/rssyl_cb_menu.c:220
+#: src/plugins/vcalendar/vcal_folder.c:2081
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
@@ -5962,7 +5992,7 @@ msgstr "將資料夾 %s 移至選擇的路徑"
 msgid "Select folder to copy folder '%s' to"
 msgstr "將資料夾 %s 複製到選擇的資料夾"
 
-#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:152
+#: src/imap_gtk.c:365 src/mh_gtk.c:203 src/plugins/rssyl/rssyl_cb_menu.c:153
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
@@ -5975,8 +6005,8 @@ msgstr ""
 "確認要刪除嗎?"
 
 #: src/imap_gtk.c:384 src/news_gtk.c:265 src/plugins/mailmbox/plugin_gtk.c:347
-#: src/plugins/rssyl/rssyl_cb_menu.c:171
-#: src/plugins/vcalendar/vcal_folder.c:2005
+#: src/plugins/rssyl/rssyl_cb_menu.c:172
+#: src/plugins/vcalendar/vcal_folder.c:2014
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "不能移除資料夾 '%s'"
@@ -6003,7 +6033,7 @@ msgstr "搜尋(_S)"
 msgid "Choose a subfolder of %s to subscribe to: "
 msgstr "選擇 %s 的一個子資料夾以訂閱:"
 
-#: src/imap_gtk.c:536 src/mainwindow.c:680
+#: src/imap_gtk.c:536 src/mainwindow.c:689
 msgid "Subscribe"
 msgstr "訂閱"
 
@@ -6036,8 +6066,8 @@ msgstr "訂閱"
 msgid "unsubscribe"
 msgstr "取消訂閱"
 
-#: src/imap_gtk.c:568 src/prefs_folder_item.c:1447 src/prefs_folder_item.c:1475
-#: src/prefs_folder_item.c:1503
+#: src/imap_gtk.c:568 src/prefs_folder_item.c:1537 src/prefs_folder_item.c:1565
+#: src/prefs_folder_item.c:1593
 msgid "Apply to subfolders"
 msgstr "套用至子資料夾"
 
@@ -6045,27 +6075,27 @@ msgstr "套用至子資料夾"
 msgid "_Subscribe"
 msgstr "訂閱(_S)"
 
-#: src/imap_gtk.c:575 src/news_gtk.c:252
+#: src/imap_gtk.c:574 src/news_gtk.c:252
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-#: src/import.c:113 src/import.c:207
+#: src/import.c:113 src/import.c:208
 msgid "Import mbox file"
 msgstr "匯入 mbox 檔案"
 
-#: src/import.c:131
+#: src/import.c:132
 msgid "Locate the mbox file and specify the destination folder."
 msgstr "指定 mbox 檔案和目的資料夾"
 
-#: src/import.c:148
+#: src/import.c:149
 msgid "Destination folder:"
 msgstr "目的資料夾"
 
-#: src/import.c:202
+#: src/import.c:203
 msgid "Source mbox filename can't be left empty."
 msgstr "未指定有效的 mbox 檔案"
 
-#: src/import.c:207
+#: src/import.c:208
 msgid ""
 "Destination folder is not set.\n"
 "Import mbox file to the Inbox folder?"
@@ -6073,15 +6103,15 @@ msgstr ""
 "目的資料夾尚未設定\n"
 "確定要匯入 mbox 到收件夾嗎?"
 
-#: src/import.c:229
+#: src/import.c:230
 msgid "Can't find the destination folder."
 msgstr "找不到目的資料夾"
 
-#: src/import.c:254
+#: src/import.c:263
 msgid "Select importing file"
 msgstr "選擇匯戶檔案"
 
-#: src/import.c:272
+#: src/import.c:281
 msgid "Select folder to import to"
 msgstr "選擇要匯入的路徑"
 
@@ -6097,65 +6127,65 @@ msgstr "請選擇並修改 LDIF 欄位名稱以利匯入"
 msgid "File imported."
 msgstr "檔案已匯入"
 
-#: src/importldif.c:450 src/importmutt.c:122 src/importpine.c:121
+#: src/importldif.c:334 src/importmutt.c:122 src/importpine.c:121
 msgid "Please select a file."
 msgstr "請選擇一個檔案"
 
-#: src/importldif.c:456 src/importmutt.c:127 src/importpine.c:126
+#: src/importldif.c:340 src/importmutt.c:127 src/importpine.c:126
 msgid "Address book name must be supplied."
 msgstr "請提供通訊錄名稱"
 
-#: src/importldif.c:496
+#: src/importldif.c:380
 msgid "LDIF file imported successfully."
 msgstr "LDIF 檔案匯入成功"
 
-#: src/importldif.c:581
+#: src/importldif.c:465
 msgid "Select LDIF File"
 msgstr "選擇 LDIF 檔案"
 
-#: src/importldif.c:667
+#: src/importldif.c:551
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgstr "指定通訊錄的名稱,以利在 LDIF 上建立檔案資料"
 
-#: src/importldif.c:672
+#: src/importldif.c:556
 msgid "File Name"
 msgstr "檔案名稱"
 
-#: src/importldif.c:682
+#: src/importldif.c:566
 msgid "The full file specification of the LDIF file to import."
 msgstr "用來匯入的 LDIF 檔案之完整規格"
 
-#: src/importldif.c:689
+#: src/importldif.c:573
 msgid "Select the LDIF file to import."
 msgstr "選擇要匯入的 LDIF 檔案"
 
-#: src/importldif.c:725
+#: src/importldif.c:705
 msgid "R"
 msgstr "R"
 
-#: src/importldif.c:726 src/summaryview.c:441
+#: src/importldif.c:710 src/summaryview.c:466
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:727
+#: src/importldif.c:716
 msgid "LDIF Field Name"
 msgstr "LDIF 檔案名稱"
 
-#: src/importldif.c:728
+#: src/importldif.c:721
 msgid "Attribute Name"
 msgstr "屬性名稱"
 
-#: src/importldif.c:783
+#: src/importldif.c:740
 msgid "LDIF Field"
 msgstr "LDIF 範籌"
 
-#: src/importldif.c:795
+#: src/importldif.c:752
 msgid "Attribute"
 msgstr "屬性"
 
-#: src/importldif.c:807
+#: src/importldif.c:764
 msgid ""
 "Choose the LDIF field that will be renamed or selected for import in the "
 "list above. Reserved fields (marked with a tick in the \"R\" column), are "
@@ -6170,35 +6200,35 @@ msgstr ""
 "選擇想要匯入的欄位。而點選其它列的任何地方將可以在下方的清單輸入區域選擇想要"
 "修改名稱的欄位。若在其它列的任何地方雙擊,也可以選擇要匯入的欄位"
 
-#: src/importldif.c:822
+#: src/importldif.c:779
 msgid "The LDIF field can be renamed to the User Attribute name."
 msgstr "LDIF區塊可以將名稱變更為使用者自定的屬性名稱"
 
-#: src/importldif.c:827
+#: src/importldif.c:784
 msgid "Select for Import"
 msgstr "匯入選擇"
 
-#: src/importldif.c:832
+#: src/importldif.c:789
 msgid "Select the LDIF field for import into the address book."
 msgstr "選擇 LDIF 區塊,用以匯入至通訊錄"
 
-#: src/importldif.c:834
+#: src/importldif.c:791
 msgid " Modify "
 msgstr "修改"
 
-#: src/importldif.c:839
+#: src/importldif.c:796
 msgid "This button will update the list above with the data supplied."
 msgstr "這個按鍵將會用支援的資料更新上方的清單"
 
-#: src/importldif.c:911
+#: src/importldif.c:870
 msgid "Records Imported:"
 msgstr "記錄已匯入的"
 
-#: src/importldif.c:943
+#: src/importldif.c:902
 msgid "Import LDIF file into Address Book"
 msgstr "匯入 LDIF 檔案至通訊錄"
 
-#: src/importldif.c:980
+#: src/importldif.c:940
 msgid "Proceed"
 msgstr "已進行"
 
@@ -6214,7 +6244,7 @@ msgstr "選擇 MUTT 檔案"
 msgid "Import MUTT file into Address Book"
 msgstr "匯入 MUTT 檔案至通訊錄"
 
-#: src/importmutt.c:288 src/importpine.c:288
+#: src/importmutt.c:289 src/importpine.c:289
 msgid "Please select a file to import."
 msgstr "請選擇要匯入的檔案"
 
@@ -6230,142 +6260,142 @@ msgstr "選擇 Pine 檔案"
 msgid "Import Pine file into Address Book"
 msgstr "匯入 Pine 檔至通訊錄"
 
-#: src/inc.c:186 src/inc.c:294 src/inc.c:321
+#: src/inc.c:191 src/inc.c:299 src/inc.c:325
 msgid "Claws Mail needs network access in order to get mails."
 msgstr "Claws Mail 需要網路才能取得郵件"
 
-#: src/inc.c:343
+#: src/inc.c:344
 #, c-format
 msgid "%s failed\n"
 msgstr "%s 失敗\n"
 
-#: src/inc.c:416
+#: src/inc.c:476
 msgid "Retrieving new messages"
 msgstr "取回新郵件"
 
-#: src/inc.c:474
+#: src/inc.c:534
 msgid "Standby"
 msgstr "待命"
 
-#: src/inc.c:615 src/inc.c:669
+#: src/inc.c:678 src/inc.c:732
 msgid "Cancelled"
 msgstr "已取消"
 
-#: src/inc.c:626
+#: src/inc.c:689
 msgid "Retrieving"
 msgstr "正在取回"
 
-#: src/inc.c:635
+#: src/inc.c:698
 #, c-format
 msgid "Done (%d message (%s) received)"
 msgid_plural "Done (%d messages (%s) received)"
 msgstr[0] "完成 (%d 郵件 (%s) 已取回)"
 msgstr[1] "完成 (%d 郵件 (%s) 已取回"
 
-#: src/inc.c:641
+#: src/inc.c:704
 msgid "Done (no new messages)"
 msgstr "已完成 (沒有新郵件)"
 
-#: src/inc.c:646
+#: src/inc.c:709
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: src/inc.c:649 src/plugins/managesieve/managesieve.c:887
+#: src/inc.c:712 src/plugins/managesieve/managesieve.c:888
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:656 src/prefs_matcher.c:398 src/prefs_summaries.c:453
-#: src/prefs_summary_column.c:87 src/summaryview.c:2819 src/summaryview.c:6361
+#: src/inc.c:719 src/prefs_matcher.c:407 src/prefs_summaries.c:645
+#: src/prefs_summary_column.c:87 src/summaryview.c:2894 src/summaryview.c:6569
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:666 src/plugins/spamassassin/spamassassin_gtk.c:378
+#: src/inc.c:729 src/plugins/spamassassin/spamassassin_gtk.c:394
 msgid "Timeout"
 msgstr "超時"
 
-#: src/inc.c:752
+#: src/inc.c:815
 #, c-format
 msgid "Finished (%d new message)"
 msgid_plural "Finished (%d new messages)"
 msgstr[0] "已完成 (%d 新郵件)"
 msgstr[1] "已完成 (%d 新郵件)"
 
-#: src/inc.c:756
+#: src/inc.c:819
 msgid "Finished (no new messages)"
 msgstr "已完成 (沒有新郵件)"
 
-#: src/inc.c:795
+#: src/inc.c:860
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 正在取回新郵件"
 
-#: src/inc.c:825
+#: src/inc.c:889
 #, c-format
 msgid "Account '%s': Connecting to POP3 server: %s:%d..."
 msgstr "帳號 '%s': POP3 伺服器連線中: %s:%d..."
 
-#: src/inc.c:843
+#: src/inc.c:923
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "無法連線至 POP3 伺服器: %s:%d"
 
-#: src/inc.c:847
+#: src/inc.c:927
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線至 POP3 伺服器: %s:%d\n"
 
-#: src/inc.c:927 src/plugins/managesieve/managesieve.c:423
-#: src/send_message.c:496
+#: src/inc.c:1007 src/plugins/managesieve/managesieve.c:424
+#: src/send_message.c:515
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: src/inc.c:929
+#: src/inc.c:1009
 #, c-format
 msgid "Retrieving messages from %s (%s)..."
 msgstr "正在從 %s (%s) 取回郵件..."
 
-#: src/inc.c:935
+#: src/inc.c:1015
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在取得新郵件 (STAT)..."
 
-#: src/inc.c:939
+#: src/inc.c:1019
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在取得新郵件 (LAST)..."
 
-#: src/inc.c:943
+#: src/inc.c:1023
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在取得新郵件 (UIDL)..."
 
-#: src/inc.c:947
+#: src/inc.c:1027
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在取得郵件大小 (LIST)..."
 
-#: src/inc.c:954 src/send_message.c:514
+#: src/inc.c:1034 src/send_message.c:533
 msgid "Quitting"
 msgstr "離開中"
 
-#: src/inc.c:979
+#: src/inc.c:1059
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在取得郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:992
+#: src/inc.c:1072
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "正在取回 (%d 郵件 (%s) 已接收)"
 msgstr[1] "正在取回 (%d 郵件 (%s) 已接收)"
 
-#: src/inc.c:1151
+#: src/inc.c:1227
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "連線至 %s:%d 失敗"
 
-#: src/inc.c:1156
+#: src/inc.c:1232
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤"
 
-#: src/inc.c:1162
+#: src/inc.c:1238
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -6374,37 +6404,37 @@ msgstr ""
 "處理郵件時發生錯誤\n"
 "%s"
 
-#: src/inc.c:1168
+#: src/inc.c:1244
 msgid "No disk space left."
 msgstr "沒有足夠的磁碟空間"
 
-#: src/inc.c:1173
+#: src/inc.c:1249
 msgid "Can't write file."
 msgstr "無法寫入檔案"
 
-#: src/inc.c:1178
+#: src/inc.c:1254
 msgid "Socket error."
 msgstr "通訊錯誤"
 
-#: src/inc.c:1181
+#: src/inc.c:1257
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "連線至 %s:%d 時通訊錯誤"
 
-#: src/inc.c:1186 src/send_message.c:425 src/send_message.c:688
+#: src/inc.c:1262 src/send_message.c:444 src/send_message.c:707
 msgid "Connection closed by the remote host."
 msgstr "遠端伺服器關閉連線"
 
-#: src/inc.c:1189
+#: src/inc.c:1265
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "連線至 %s:%d 時被遠端伺服器關閉連線"
 
-#: src/inc.c:1194
+#: src/inc.c:1270
 msgid "Mailbox is locked."
 msgstr "郵件箱已鎖定"
 
-#: src/inc.c:1198
+#: src/inc.c:1274
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -6413,11 +6443,11 @@ msgstr ""
 "郵件箱已鎖定:\n"
 "%s"
 
-#: src/inc.c:1204 src/send_message.c:673
+#: src/inc.c:1280 src/send_message.c:692
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1210 src/send_message.c:676
+#: src/inc.c:1286 src/send_message.c:695
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -6426,44 +6456,89 @@ msgstr ""
 "認證失敗:\n"
 "%s"
 
-#: src/inc.c:1215 src/send_message.c:692
+#: src/inc.c:1291 src/send_message.c:711
 msgid ""
 "Session timed out. You may be able to recover by increasing the timeout "
 "value in Preferences/Other/Miscellaneous."
 msgstr "連線已超時。可以在選項/其它/雜項中增加超時設定值,或許可以回復"
 
-#: src/inc.c:1220
+#: src/inc.c:1296
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "連線至 %s:%d 超時"
 
-#: src/inc.c:1258
+#: src/inc.c:1334
 msgid "Incorporation cancelled\n"
 msgstr "已取消合併\n"
 
-#: src/inc.c:1523
+#: src/inc.c:1626 src/plugins/notification/notification_prefs.c:1072
+#: src/plugins/notification/notification_prefs.c:1367
+#: src/plugins/notification/notification_prefs.c:1673
+#: src/plugins/spamassassin/spamassassin_gtk.c:407 src/prefs_account.c:1766
+#: src/prefs_other.c:578 src/prefs_receive.c:203 src/prefs_summaries.c:551
+msgid "seconds"
+msgstr "秒"
+
+#: src/inc.c:1636 src/inc.c:1646
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "分"
+msgstr[1] "分"
+
+#: src/inc.c:1639
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "小時"
+msgstr[1] "小時"
+
+#: src/inc.c:1651
 #, c-format
-msgid "%s%sYou're working offline. Override for %d minutes?"
-msgstr "%s%s 目前處於離線模式,要回復 %d 分鐘嗎?"
+msgid "%s%sYou're working offline. Override for %d %s?"
+msgstr "%s%s 目前處於離線模式,要回復 %d %s 嗎?"
 
-#: src/inc.c:1529
+#: src/inc.c:1657
 #, c-format
 msgid "%s%sYou're working offline. Override?"
 msgstr "%s%s 目前處於離線模式,要回復嗎?"
 
-#: src/inc.c:1536
+#: src/inc.c:1664
 msgid "On_ly once"
 msgstr "僅一次有效(_l)"
 
-#: src/ldapupdate.c:1044
+#: src/ldapupdate.c:680
+#, c-format
+msgid "LDAP error (search): for attribute '%s': %d (%s)\n"
+msgstr "LDAP 錯誤(搜尋):屬性'%s': %d (%s)\n"
+
+#: src/ldapupdate.c:918 src/ldapupdate.c:1061 src/ldapupdate.c:1289
+#: src/ldapupdate.c:1330
+#, c-format
+msgid "LDAP error (modify): for DN '%s': %d (%s)\n"
+msgstr "LDAP 錯誤 (異動): for DN '%s': %d (%s)\n"
+
+#: src/ldapupdate.c:1046
 msgid "Some SN"
 msgstr "一些 SN"
 
-#: src/ldif.c:758
+#: src/ldapupdate.c:1133
+#, c-format
+msgid "LDAP error (rename): from '%s' to '%s': %d (%s)\n"
+msgstr "LDAP 錯誤 (修改名稱): from '%s' to '%s': %d (%s)\n"
+
+#: src/ldaputil.c:81 src/ldaputil.c:156
+msgid "LDAP (search): successful\n"
+msgstr "LDAP (搜尋): 成功\n"
+
+#: src/ldaputil.c:112 src/ldaputil.c:200
+#, c-format
+msgid "LDAP error (search): %d (%s)\n"
+msgstr "LDAP 錯誤 (搜尋): %d (%s)\n"
+
+#: src/ldif.c:759
 msgid "Nick Name"
 msgstr "暱稱"
 
-#: src/main.c:249
+#: src/main.c:250
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -6472,7 +6547,7 @@ msgstr ""
 "檔案 '%s' 已經存在\n"
 "無法建立資料夾"
 
-#: src/main.c:370
+#: src/main.c:375
 #, c-format
 msgid ""
 "Configuration for %s found.\n"
@@ -6481,7 +6556,7 @@ msgstr ""
 "發現 %s 的配置設定\n"
 "確認要合併配置設定內容嗎?"
 
-#: src/main.c:372
+#: src/main.c:377
 #, c-format
 msgid ""
 "\n"
@@ -6494,11 +6569,11 @@ msgstr ""
 "你的 Sylpheed 過濾條件可以使用一個在 %s 的有效 script 進行轉換\n"
 " "
 
-#: src/main.c:384
+#: src/main.c:389
 msgid "Keep old configuration"
 msgstr "保留舊有的配置設定內容"
 
-#: src/main.c:387
+#: src/main.c:392
 msgid ""
 "Keeping a backup will allow you to go back to an older version, but may take "
 "a while if you have cached IMAP or News data, and will take some extra room "
@@ -6507,31 +6582,31 @@ msgstr ""
 "保留備份可以允許你未來回復至舊的版本,但是,如果你有 IMAP 或是新聞資料時,將"
 "會花費一些時間,同時,也會占去磁碟上的部份空間"
 
-#: src/main.c:395
+#: src/main.c:400
 msgid "Migration of configuration"
 msgstr "配置設定的合併內容"
 
-#: src/main.c:406
+#: src/main.c:411
 msgid "Copying configuration... This may take a while..."
 msgstr "正在複製配置內容... 這將會花費一些時間..."
 
-#: src/main.c:415
+#: src/main.c:420
 msgid "Migration failed!"
 msgstr "合併失敗"
 
-#: src/main.c:424
+#: src/main.c:429
 msgid "Migrating configuration..."
 msgstr "正在合併配置內容..."
 
-#: src/main.c:1138
+#: src/main.c:1141
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib 沒有支援 gthread(_t)\n"
 
-#: src/main.c:1158 src/main.c:1162 src/main.c:1166
+#: src/main.c:1161 src/main.c:1165 src/main.c:1169
 msgid "(or older)"
 msgstr "(或較舊的)"
 
-#: src/main.c:1483
+#: src/main.c:1510
 #, c-format
 msgid ""
 "The following plugin failed to load. Check the Plugins configuration for "
@@ -6542,13 +6617,13 @@ msgid_plural ""
 "more information:\n"
 "%s"
 msgstr[0] ""
-"以下這些外掛程式載入失敗,請檢查外掛程式配置以獲取更多的資訊:\n"
+"以下外掛程式載入失敗,請檢查外掛程式配置以獲取更多的資訊:\n"
 "%s"
 msgstr[1] ""
 "以下這些外掛程式載入失敗,請檢查外掛程式配置以獲取更多的資訊:\n"
 "%s"
 
-#: src/main.c:1525
+#: src/main.c:1552
 msgid ""
 "Claws Mail has detected a configured mailbox, but it is incomplete. It is "
 "possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
@@ -6557,7 +6632,7 @@ msgstr ""
 "Claws Mail已偵測到郵件配置,但是它並不完整。這可能是源自於一個無效的 IMAP 帳"
 "號。請嘗試使用郵件箱的最上層資料夾內的\"重建資料夾\"功能進行修復"
 
-#: src/main.c:1531
+#: src/main.c:1558
 msgid ""
 "Claws Mail has detected a configured mailbox, but could not load it. It is "
 "probably provided by an out-of-date external plugin. Please reinstall the "
@@ -6566,36 +6641,36 @@ msgstr ""
 "Claws Mail已偵測到郵件配置,但是它無法載入。這可能是源自於一個過時的延伸外掛"
 "程式,請重新安裝外掛程式後,再試一次。"
 
-#: src/main.c:1776
+#: src/main.c:1799
 msgid "Missing filename\n"
 msgstr "找不到案名稱\n"
 
-#: src/main.c:1783
+#: src/main.c:1806
 msgid "Cannot open filename for reading\n"
 msgstr "無法開啟要讀取的檔案名稱\n"
 
-#: src/main.c:1794
+#: src/main.c:1817
 msgid "Malformed header\n"
 msgstr "變形的標頭\n"
 
-#: src/main.c:1801
+#: src/main.c:1824
 msgid "Duplicated 'To:' header\n"
 msgstr "重複的'收件者:'標頭\n"
 
-#: src/main.c:1812
+#: src/main.c:1835
 msgid "Missing required 'To:' header\n"
 msgstr "遺失必要的'收件者:'標頭\n"
 
-#: src/main.c:1958
+#: src/main.c:1980
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "使用方式: %s [選項]...\n"
 
-#: src/main.c:1960
+#: src/main.c:1982
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [郵件地址]    開啟新郵件視窗"
 
-#: src/main.c:1961
+#: src/main.c:1983
 msgid ""
 "  --compose-from-file file\n"
 "                         open composition window with data from given file;\n"
@@ -6612,11 +6687,11 @@ msgstr ""
 "行,接著是\n"
 "                         郵件的內容,直到檔案結束"
 
-#: src/main.c:1966
-msgid "  --subscribe [uri]      subscribe to the given URI if possible"
+#: src/main.c:1988
+msgid "  --subscribe uri        subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      如果可能的話加入訂閱的 URI"
 
-#: src/main.c:1967
+#: src/main.c:1989
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6626,7 +6701,7 @@ msgstr ""
 "                         以指定的附加檔案開啟新郵件視窗\n"
 "                         "
 
-#: src/main.c:1970
+#: src/main.c:1992
 msgid ""
 "  --insert file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -6636,23 +6711,23 @@ msgstr ""
 "                         以指定的附加檔案夾在新開啟的郵件視窗\n"
 "                         "
 
-#: src/main.c:1973
+#: src/main.c:1995
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新郵件"
 
-#: src/main.c:1974
+#: src/main.c:1996
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帳號的新郵件"
 
-#: src/main.c:1975
+#: src/main.c:1997
 msgid "  --cancel-receiving     cancel receiving of messages"
 msgstr "  --cancel-receiving     取消接收郵件"
 
-#: src/main.c:1976
+#: src/main.c:1998
 msgid "  --cancel-sending       cancel sending of messages"
 msgstr "  --cancel-sending       取消傳送郵件"
 
-#: src/main.c:1977
+#: src/main.c:1999
 msgid ""
 "  --search folder type request [recursive]\n"
 "                         searches mail\n"
@@ -6670,15 +6745,15 @@ msgstr ""
 "                         需求: 尋找字串\n"
 "                         遞迴: 若字串的開頭為 0, n, N, f or F,將會失敗"
 
-#: src/main.c:1984
+#: src/main.c:2006
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 傳送所有暫存的郵件"
 
-#: src/main.c:1985
+#: src/main.c:2007
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [資料夾]...   顯示所有郵件的數量"
 
-#: src/main.c:1986
+#: src/main.c:2008
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -6686,15 +6761,15 @@ msgstr ""
 "  --status-full [資料夾]...\n"
 "                         顯示每一個資料夾的狀態"
 
-#: src/main.c:1988
+#: src/main.c:2010
 msgid "  --statistics           show session statistics"
 msgstr "  --statistics           顯示統計資訊"
 
-#: src/main.c:1989
+#: src/main.c:2011
 msgid "  --reset-statistics     reset session statistics"
 msgstr "  --reset-statistics     重置統計資訊"
 
-#: src/main.c:1990
+#: src/main.c:2012
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like 'folder/sub_folder'"
@@ -6702,53 +6777,53 @@ msgstr ""
 "  --select 資料夾[/郵件]  跳至指定的資料夾/郵件\n"
 "                         資料夾是一個資料夾 id 像是'資料夾/子資料夾(_f)'"
 
-#: src/main.c:1992
+#: src/main.c:2014
 msgid "  --online               switch to online mode"
 msgstr "  --online               切換至上線模式"
 
-#: src/main.c:1993
+#: src/main.c:2015
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切換至離線模式"
 
-#: src/main.c:1994
+#: src/main.c:2016
 msgid "  --exit --quit -q       exit Claws Mail"
 msgstr "  --exit --quit -q       離開 Claws Mail"
 
-#: src/main.c:1995
+#: src/main.c:2017
 msgid "  --debug                debug mode"
 msgstr "  --debug                除錯模式"
 
-#: src/main.c:1996
+#: src/main.c:2018
 msgid "  --toggle-debug         toggle debug mode"
 msgstr "  --toggle-debug         釘住除錯模式"
 
-#: src/main.c:1997
+#: src/main.c:2019
 msgid "  --help -h              display this help and exit"
 msgstr "  --help -h              顯示這個說明並離開"
 
-#: src/main.c:1998
+#: src/main.c:2020
 msgid "  --version -v           output version information and exit"
 msgstr "  --version -v           顯示版本資訊並離開"
 
-#: src/main.c:1999
+#: src/main.c:2021
 msgid ""
 "  --version-full -V      output version and built-in features information "
 "and exit"
 msgstr "  --version-full -V      顯示版本資訊及內鍵的功能資訊並離開 "
 
-#: src/main.c:2000
+#: src/main.c:2022
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           顯示配置路徑"
 
-#: src/main.c:2001
+#: src/main.c:2023
 msgid ""
-"  --alternate-config-dir [dir]\n"
+"  --alternate-config-dir directory\n"
 "                         use specified configuration directory"
 msgstr ""
 "  --alternate-config-dir [路徑]\n"
 "                         使用指定的配置路徑"
 
-#: src/main.c:2003
+#: src/main.c:2025
 msgid ""
 "  --geometry -geometry WxH+X+Y\n"
 "                         set geometry for main window"
@@ -6756,866 +6831,876 @@ msgstr ""
 "  --geometry -geometry WxH+X+Y\n"
 "\t\t\t\t\t\t\t設定主視窗的大小"
 
-#: src/main.c:2056
-msgid "Unknown option\n"
-msgstr "未知的選項\n"
+#: src/main.c:2078
+msgid "Unknown option. Try -h or --help for usage.\n"
+msgstr "未知的選項。試著用 -h 或 -help 取得用法\n"
 
-#: src/main.c:2074
+#: src/main.c:2096
 #, c-format
 msgid "Processing (%s)..."
 msgstr "處理 (%s)..."
 
-#: src/main.c:2077
+#: src/main.c:2099
 msgid "top level folder"
 msgstr "最上層資料夾"
 
-#: src/main.c:2160
+#: src/main.c:2181
 msgid "Queued messages"
 msgstr "已暫存郵件"
 
-#: src/main.c:2161
+#: src/main.c:2182
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "尚有未傳送郵件在暫存區,確定要離開嗎?"
 
-#: src/main.c:2908
+#: src/main.c:2940
 msgid "NetworkManager: network is online.\n"
 msgstr "NetworkManager(網路管理員):網路是上線的\n"
 
-#: src/main.c:2914
+#: src/main.c:2946
 msgid "NetworkManager: network is offline.\n"
 msgstr "NetworkManager(網路管理員):網路是離線的\n"
 
-#: src/mainwindow.c:513 src/messageview.c:208
+#: src/mainwindow.c:522 src/messageview.c:211
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: src/mainwindow.c:515 src/messageview.c:210 src/summaryview.c:436
+#: src/mainwindow.c:524 src/messageview.c:213 src/summaryview.c:447
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: src/mainwindow.c:518
+#: src/mainwindow.c:527
 msgid "_Configuration"
 msgstr "設定(_C)"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:531
 msgid "_Add mailbox"
 msgstr "新增郵件夾(_A)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:532
 msgid "MH..."
 msgstr "MH..."
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:535
 msgid "Change mailbox order..."
 msgstr "改變郵件夾順序"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:538
 msgid "_Import mbox file..."
 msgstr "匯入mbox檔案"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:539
 msgid "_Export to mbox file..."
 msgstr "匯出mbox檔案"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:540
 msgid "_Export selected to mbox file..."
 msgstr "匯出選擇的項目至mbox檔案"
 
-#: src/mainwindow.c:533
+#: src/mainwindow.c:542
 msgid "Empty all _Trash folders"
 msgstr "清空所有的垃圾桶"
 
-#: src/mainwindow.c:536 src/messageview.c:217
+#: src/mainwindow.c:545 src/messageview.c:220
 msgid "_Save email as..."
 msgstr "另存電子郵件..."
 
-#: src/mainwindow.c:537 src/messageview.c:218
+#: src/mainwindow.c:546 src/messageview.c:221
 msgid "_Save part as..."
 msgstr "另存部份郵件"
 
-#: src/mainwindow.c:540 src/messageview.c:219
+#: src/mainwindow.c:549 src/messageview.c:222
 msgid "Page setup..."
 msgstr "頁面設定..."
 
-#: src/mainwindow.c:541 src/messageview.c:220
+#: src/mainwindow.c:550 src/messageview.c:223
 msgid "_Print..."
 msgstr "列印..."
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:552
 msgid "Synchronise folders"
 msgstr "同步資料夾"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:554
 msgid "E_xit"
 msgstr "離開"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:559
 msgid "Select _thread"
 msgstr "選擇串列"
 
-#: src/mainwindow.c:552
+#: src/mainwindow.c:561
 msgid "_Find in current message..."
 msgstr "在目前訊息中尋找(_F)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:563
 msgid "_Quick search"
 msgstr "快速搜尋(_Q)"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:566
 msgid "Show or hi_de"
 msgstr "顯示或隱藏(_d)"
 
-#: src/mainwindow.c:558
+#: src/mainwindow.c:567
 msgid "_Toolbar"
 msgstr "工具列(_T)"
 
-#: src/mainwindow.c:560
+#: src/mainwindow.c:569
 msgid "Set displayed _columns"
 msgstr "設定顯示行數(_c)"
 
-#: src/mainwindow.c:561
+#: src/mainwindow.c:570
 msgid "In _folder list..."
 msgstr "在資料夾清單內(_f)"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:571
 msgid "In _message list..."
 msgstr "在郵件清單內(_m)"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:576
 msgid "La_yout"
 msgstr "佈局(_y)"
 
-#: src/mainwindow.c:569
+#: src/mainwindow.c:578
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/mainwindow.c:571
+#: src/mainwindow.c:580
 msgid "_Attract by subject"
 msgstr "藉由主旨(_A)"
 
-#: src/mainwindow.c:573
+#: src/mainwindow.c:582
 msgid "E_xpand all threads"
 msgstr "展開所有串列(_x)"
 
-#: src/mainwindow.c:574
+#: src/mainwindow.c:583
 msgid "Co_llapse all threads"
 msgstr "關閉所有串列(_l)"
 
-#: src/mainwindow.c:576 src/messageview.c:231
+#: src/mainwindow.c:585 src/messageview.c:234
 msgid "_Go to"
 msgstr "前往(_G)"
 
-#: src/mainwindow.c:577 src/messageview.c:232
+#: src/mainwindow.c:586 src/messageview.c:235
 msgid "_Previous message"
 msgstr "上一封郵件(_P)"
 
-#: src/mainwindow.c:578 src/messageview.c:233
+#: src/mainwindow.c:587 src/messageview.c:236
 msgid "_Next message"
 msgstr "下一封郵件(_N)"
 
-#: src/mainwindow.c:580 src/messageview.c:235
+#: src/mainwindow.c:589 src/messageview.c:238
 msgid "P_revious unread message"
 msgstr "上一封未讀郵件(_r)"
 
-#: src/mainwindow.c:581 src/messageview.c:236
+#: src/mainwindow.c:590 src/messageview.c:239
 msgid "N_ext unread message"
 msgstr "下一封未讀郵件(_e)"
 
-#: src/mainwindow.c:583 src/messageview.c:238
+#: src/mainwindow.c:592 src/messageview.c:241
 msgid "Previous ne_w message"
 msgstr "上一封新郵件(_w)"
 
-#: src/mainwindow.c:584 src/messageview.c:239
+#: src/mainwindow.c:593 src/messageview.c:242
 msgid "Ne_xt new message"
 msgstr "下一封新郵件(_x)"
 
-#: src/mainwindow.c:586 src/messageview.c:241
+#: src/mainwindow.c:595 src/messageview.c:244
 msgid "Previous _marked message"
 msgstr "上一封已標記郵件(_m)"
 
-#: src/mainwindow.c:587 src/messageview.c:242
+#: src/mainwindow.c:596 src/messageview.c:245
 msgid "Next m_arked message"
 msgstr "下一封已標記郵件(_a)"
 
-#: src/mainwindow.c:589 src/messageview.c:244
+#: src/mainwindow.c:598 src/messageview.c:247
 msgid "Previous _labeled message"
 msgstr "上一封已標記郵件(_l)"
 
-#: src/mainwindow.c:590 src/messageview.c:245
+#: src/mainwindow.c:599 src/messageview.c:248
 msgid "Next la_beled message"
 msgstr "下一封已標記郵件(_b)"
 
-#: src/mainwindow.c:592 src/messageview.c:247
+#: src/mainwindow.c:601 src/messageview.c:250
 msgid "Previous opened message"
 msgstr "上一封已開啟郵件"
 
-#: src/mainwindow.c:593 src/messageview.c:248
+#: src/mainwindow.c:602 src/messageview.c:251
 msgid "Next opened message"
 msgstr "下一封已開啟郵件"
 
-#: src/mainwindow.c:595 src/messageview.c:250
+#: src/mainwindow.c:604 src/messageview.c:253
 msgid "Parent message"
 msgstr "父郵件"
 
-#: src/mainwindow.c:597 src/messageview.c:252
+#: src/mainwindow.c:606 src/messageview.c:255
 msgid "Next unread _folder"
 msgstr "下一個未讀資料夾(_f)"
 
-#: src/mainwindow.c:598 src/messageview.c:253
+#: src/mainwindow.c:607 src/messageview.c:256
 msgid "F_older..."
 msgstr "資料夾"
 
-#: src/mainwindow.c:600 src/messageview.c:255 src/mimeview.c:200
+#: src/mainwindow.c:609 src/messageview.c:258 src/mimeview.c:230
 msgid "Next part"
 msgstr "下一個部份"
 
-#: src/mainwindow.c:601 src/messageview.c:256 src/mimeview.c:201
+#: src/mainwindow.c:610 src/messageview.c:259 src/mimeview.c:231
 msgid "Previous part"
 msgstr "上一個部份"
 
-#: src/mainwindow.c:604 src/messageview.c:257
+#: src/mainwindow.c:613 src/messageview.c:260
 msgid "Message scroll"
 msgstr "郵件捲動"
 
-#: src/mainwindow.c:605 src/messageview.c:258
+#: src/mainwindow.c:614 src/messageview.c:261
 msgid "Previous line"
 msgstr "上一行"
 
-#: src/mainwindow.c:606 src/messageview.c:259
+#: src/mainwindow.c:615 src/messageview.c:262
 msgid "Next line"
 msgstr "下一行"
 
-#: src/mainwindow.c:607 src/messageview.c:260 src/printing.c:481
+#: src/mainwindow.c:616 src/messageview.c:263 src/printing.c:476
 msgid "Previous page"
 msgstr "上一頁"
 
-#: src/mainwindow.c:608 src/messageview.c:261 src/printing.c:487
+#: src/mainwindow.c:617 src/messageview.c:264 src/printing.c:482
 msgid "Next page"
 msgstr "下一頁"
 
-#: src/mainwindow.c:626 src/messageview.c:279
+#: src/mainwindow.c:635 src/messageview.c:282
 msgid "Decode"
 msgstr "解碼"
 
-#: src/mainwindow.c:633
+#: src/mainwindow.c:642
 msgid "Open in new _window"
 msgstr "在新視窗開啟(_w)"
 
-#: src/mainwindow.c:634 src/messageview.c:286
+#: src/mainwindow.c:643 src/messageview.c:289
 msgid "Mess_age source"
 msgstr "信件來源(_a)"
 
-#: src/mainwindow.c:636 src/messageview.c:287
+#: src/mainwindow.c:645 src/messageview.c:290
 msgid "Message part"
 msgstr "部份信件"
 
-#: src/mainwindow.c:637 src/messageview.c:288
+#: src/mainwindow.c:646 src/messageview.c:291
 msgid "View as text"
 msgstr "以文字模式檢視"
 
-#: src/mainwindow.c:638 src/messageview.c:289 src/toolbar.c:494
+#: src/mainwindow.c:647 src/messageview.c:292 src/toolbar.c:494
 msgid "Open"
 msgstr "開啟"
 
-#: src/mainwindow.c:640 src/messageview.c:291
+#: src/mainwindow.c:649 src/messageview.c:294
 msgid "Open with..."
 msgstr "以...開啟"
 
-#: src/mainwindow.c:644 src/messageview.c:294
+#: src/mainwindow.c:653 src/messageview.c:297
 msgid "Quotes"
 msgstr "引言"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:655
 msgid "_Update summary"
 msgstr "更新結果(_U)"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:658
 msgid "Recei_ve"
 msgstr "接收(_V)"
 
-#: src/mainwindow.c:650
+#: src/mainwindow.c:659
 msgid "Get from _current account"
 msgstr "從目前的帳號取得(_c)"
 
-#: src/mainwindow.c:651
+#: src/mainwindow.c:660
 msgid "Get from _all accounts"
 msgstr "從所有的帳號取得(_a)"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:661
 msgid "Cancel receivin_g"
 msgstr "終止接收(_g)"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:664
 msgid "_Send queued messages"
 msgstr "傳送暫存郵件(_S)"
 
-#: src/mainwindow.c:660
+#: src/mainwindow.c:669
 msgid "Compose a_n email message"
 msgstr "新增郵件(_n)"
 
-#: src/mainwindow.c:661
+#: src/mainwindow.c:670
 msgid "Compose a news message"
 msgstr "新增郵件"
 
-#: src/mainwindow.c:663 src/messageview.c:300
-#: src/plugins/notification/notification_banner.c:95
+#: src/mainwindow.c:672 src/messageview.c:303
+#: src/plugins/notification/notification_banner.c:95 src/summaryview.c:431
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: src/mainwindow.c:664 src/messageview.c:301 src/summaryview.c:428
+#: src/mainwindow.c:673 src/messageview.c:304 src/summaryview.c:432
 msgid "Repl_y to"
 msgstr "回覆給(_y)"
 
-#: src/mainwindow.c:667 src/messageview.c:304
+#: src/mainwindow.c:676 src/messageview.c:307 src/summaryview.c:435
 msgid "Mailing _list"
 msgstr "郵件清單(_l)"
 
-#: src/mainwindow.c:668
+#: src/mainwindow.c:677
 msgid "Follow-up and reply to"
 msgstr "轉送及回覆"
 
-#: src/mainwindow.c:671 src/messageview.c:307 src/toolbar.c:2446
+#: src/mainwindow.c:680 src/messageview.c:310 src/summaryview.c:437
+#: src/toolbar.c:2449
 msgid "_Forward"
 msgstr "轉送(_F)"
 
-#: src/mainwindow.c:672 src/messageview.c:308 src/toolbar.c:2447
+#: src/mainwindow.c:681 src/messageview.c:311 src/summaryview.c:438
+#: src/toolbar.c:2450
 msgid "For_ward as attachment"
 msgstr "以夾檔方式轉送(_w)"
 
-#: src/mainwindow.c:673 src/messageview.c:309 src/toolbar.c:2448
+#: src/mainwindow.c:682 src/messageview.c:312 src/summaryview.c:439
+#: src/toolbar.c:2451
 msgid "Redirec_t"
 msgstr "重新導向(_t)"
 
-#: src/mainwindow.c:675
+#: src/mainwindow.c:684
 msgid "Mailing-_List"
 msgstr "郵件清單(_L)"
 
-#: src/mainwindow.c:676
+#: src/mainwindow.c:685
 msgid "Post"
 msgstr "傳送"
 
-#: src/mainwindow.c:678
+#: src/mainwindow.c:687
 msgid "Help"
 msgstr "協助"
 
-#: src/mainwindow.c:682
+#: src/mainwindow.c:691
 msgid "Unsubscribe"
 msgstr "退訂"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:693
 msgid "View archive"
 msgstr "檢視封存"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:695
 msgid "Contact owner"
 msgstr "連絡人擁有者"
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:699
 msgid "M_ove..."
 msgstr "移動(_o)..."
 
-#: src/mainwindow.c:691
+#: src/mainwindow.c:700
 msgid "_Copy..."
 msgstr "複製(_C)..."
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:701
 msgid "Move to _trash"
 msgstr "移至垃圾桶(_t)"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:702
 msgid "_Delete..."
 msgstr "刪除(_D)"
 
-#: src/mainwindow.c:694
+#: src/mainwindow.c:703
 msgid "Move thread to tr_ash"
 msgstr "移至垃圾桶(_a)"
 
-#: src/mainwindow.c:695
+#: src/mainwindow.c:704
 msgid "Delete t_hread"
 msgstr "刪除串列(_h)"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:705
 msgid "Cancel a news message"
 msgstr "取消新郵件"
 
-#: src/mainwindow.c:699 src/mainwindow.c:700 src/summaryview.c:429
+#: src/mainwindow.c:708 src/mainwindow.c:709 src/summaryview.c:440
 msgid "_Mark"
 msgstr "標記(_M)"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:710
 msgid "_Unmark"
 msgstr "移除標記(_U)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:713
 msgid "Mark as rea_d"
 msgstr "標記為已讀(_d)"
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:714
 msgid "Mark as unr_ead"
 msgstr "標記為未讀(_e)"
 
-#: src/mainwindow.c:707
-msgid "Mark all read"
+#: src/mainwindow.c:716
+msgid "Mark all read in folder"
 msgstr "標記所有為已讀"
 
-#: src/mainwindow.c:708
-msgid "Mark all unread"
+#: src/mainwindow.c:717
+msgid "Mark all unread in folder"
 msgstr "標記所有為未讀"
 
-#: src/mainwindow.c:710 src/prefs_filtering_action.c:199 src/toolbar.c:242
+#: src/mainwindow.c:719 src/prefs_filtering_action.c:193 src/toolbar.c:242
 #: src/toolbar.c:503
 msgid "Ignore thread"
 msgstr "忽略串列"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:720
 msgid "Unignore thread"
 msgstr "不忽略串列"
 
-#: src/mainwindow.c:712 src/prefs_filtering_action.c:200 src/toolbar.c:243
+#: src/mainwindow.c:721 src/prefs_filtering_action.c:194 src/toolbar.c:243
 #: src/toolbar.c:504
 msgid "Watch thread"
 msgstr "以串列檢視"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:722
 msgid "Unwatch thread"
 msgstr "不以串列檢視"
 
-#: src/mainwindow.c:716
+#: src/mainwindow.c:725
 msgid "Mark as _spam"
 msgstr "標記為垃圾郵件(_s)"
 
-#: src/mainwindow.c:717
+#: src/mainwindow.c:726
 msgid "Mark as _ham"
 msgstr "標記為非垃圾郵件(_h)"
 
-#: src/mainwindow.c:720 src/prefs_filtering_action.c:181 src/toolbar.c:507
+#: src/mainwindow.c:729 src/prefs_filtering_action.c:177 src/toolbar.c:507
 msgid "Lock"
 msgstr "上鎖"
 
-#: src/mainwindow.c:721 src/prefs_filtering_action.c:182 src/toolbar.c:508
+#: src/mainwindow.c:730 src/prefs_filtering_action.c:178 src/toolbar.c:508
 msgid "Unlock"
 msgstr "解鎖"
 
-#: src/mainwindow.c:723 src/summaryview.c:430
+#: src/mainwindow.c:732 src/summaryview.c:441
 msgid "Color la_bel"
 msgstr "顏色標記(_b)"
 
-#: src/mainwindow.c:724 src/summaryview.c:431
+#: src/mainwindow.c:733 src/summaryview.c:442
 msgid "Ta_gs"
 msgstr "標籤(_g)"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:736
 msgid "Re-_edit"
 msgstr "重新編輯(_e)"
 
-#: src/mainwindow.c:730 src/messageview.c:310 src/mimeview.c:1021
+#: src/mainwindow.c:739 src/messageview.c:313 src/mimeview.c:1048
 msgid "Check signature"
 msgstr "檢查簽名"
 
-#: src/mainwindow.c:735 src/messageview.c:314
+#: src/mainwindow.c:744 src/messageview.c:317
 msgid "Add sender to address boo_k"
 msgstr "新增寄件者至通訊錄(_k)"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:746
 msgid "C_ollect addresses"
 msgstr "郵件地址分類(_o)"
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:747
 msgid "From current _folder..."
 msgstr "從目前的資料夾(_f)..."
 
-#: src/mainwindow.c:739
+#: src/mainwindow.c:748
 msgid "From selected _messages..."
 msgstr "從選擇的郵件(_m)..."
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:751
 msgid "_Filter all messages in folder"
 msgstr "過濾資料夾中所有的郵件(_F)"
 
-#: src/mainwindow.c:743
+#: src/mainwindow.c:752
 msgid "Filter _selected messages"
 msgstr "過濾所有選擇的郵件(_s)"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:753
 msgid "Run folder pr_ocessing rules"
 msgstr "執行資料夾規則(_o)"
 
-#: src/mainwindow.c:746 src/messageview.c:317
+#: src/mainwindow.c:755 src/messageview.c:320
 msgid "_Create filter rule"
 msgstr "建立過濾器規則(_C)"
 
-#: src/mainwindow.c:747 src/mainwindow.c:753 src/messageview.c:318
-#: src/messageview.c:324
+#: src/mainwindow.c:756 src/mainwindow.c:762 src/messageview.c:321
+#: src/messageview.c:327
 msgid "_Automatically"
 msgstr "自動地(_A)"
 
-#: src/mainwindow.c:748 src/mainwindow.c:754 src/mainwindow.c:858
-#: src/messageview.c:319 src/messageview.c:325
+#: src/mainwindow.c:757 src/mainwindow.c:763 src/mainwindow.c:870
+#: src/messageview.c:322 src/messageview.c:328
 msgid "By _From"
 msgstr "根據寄件者(_F)"
 
-#: src/mainwindow.c:749 src/mainwindow.c:755 src/mainwindow.c:859
-#: src/messageview.c:320 src/messageview.c:326
+#: src/mainwindow.c:758 src/mainwindow.c:764 src/mainwindow.c:871
+#: src/messageview.c:323 src/messageview.c:329
 msgid "By _To"
 msgstr "根據收件者(_T)"
 
-#: src/mainwindow.c:750 src/mainwindow.c:756 src/messageview.c:321
-#: src/messageview.c:327
+#: src/mainwindow.c:759 src/mainwindow.c:765 src/messageview.c:324
+#: src/messageview.c:330
 msgid "By _Subject"
 msgstr "根據主旨(_S)"
 
-#: src/mainwindow.c:752 src/messageview.c:323 src/summaryview.c:434
+#: src/mainwindow.c:761 src/messageview.c:326 src/summaryview.c:445
 msgid "Create processing rule"
 msgstr "建立執行規則"
 
-#: src/mainwindow.c:759 src/messageview.c:330
+#: src/mainwindow.c:768 src/messageview.c:333
 msgid "List _URLs..."
 msgstr "列出URLs(_U)..."
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:775
 msgid "Ch_eck for new messages in all folders"
 msgstr "檢查所有資料夾內的新郵件(_e)"
 
-#: src/mainwindow.c:767
+#: src/mainwindow.c:776
 msgid "Delete du_plicated messages"
 msgstr "刪除重覆的郵件(_p)"
 
-#: src/mainwindow.c:768
+#: src/mainwindow.c:777
 msgid "In selected folder"
 msgstr "在選擇的資料夾內"
 
-#: src/mainwindow.c:769
+#: src/mainwindow.c:778
 msgid "In all folders"
 msgstr "在所有的資料夾內"
 
-#: src/mainwindow.c:772
+#: src/mainwindow.c:781
 msgid "E_xecute"
 msgstr "執行(_x)"
 
-#: src/mainwindow.c:773
+#: src/mainwindow.c:782
 msgid "Exp_unge"
 msgstr "刪除(_u)"
 
-#: src/mainwindow.c:776
+#: src/mainwindow.c:785
 msgid "SSL/TLS cer_tificates"
 msgstr "SSL/TLS 認證(_t)"
 
-#: src/mainwindow.c:779
+#: src/mainwindow.c:788
 msgid "Filtering Lo_g"
 msgstr "過濾日誌(_g)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:789
 msgid "Network _Log"
 msgstr "網路日誌(_L)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:791
+msgid "Debug _Log"
+msgstr "偵錯 log(_L)"
+
+#: src/mainwindow.c:794
 msgid "_Forget all session passwords"
 msgstr "消除所有(_F)"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:796
 msgid "Forget _master passphrase"
 msgstr "消除所有(_F)"
 
-#: src/mainwindow.c:788
+#: src/mainwindow.c:800
 msgid "C_hange current account"
 msgstr "更改目前帳號(_h)"
 
-#: src/mainwindow.c:790
+#: src/mainwindow.c:802
 msgid "_Preferences for current account..."
 msgstr "目前帳號設定(_P)..."
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:803
 msgid "Create _new account..."
 msgstr "新增帳號(_n)"
 
-#: src/mainwindow.c:792
+#: src/mainwindow.c:804
 msgid "_Edit accounts..."
 msgstr "編輯帳號(_E)"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:807
 msgid "P_references..."
 msgstr "選項(_r)..."
 
-#: src/mainwindow.c:796
+#: src/mainwindow.c:808
 msgid "Pre-pr_ocessing..."
 msgstr "前處理(_o)..."
 
-#: src/mainwindow.c:797
+#: src/mainwindow.c:809
 msgid "Post-pro_cessing..."
 msgstr "後處理(_c)..."
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:810
 msgid "_Filtering..."
 msgstr "過濾器(_F)..."
 
-#: src/mainwindow.c:799
+#: src/mainwindow.c:811
 msgid "_Templates..."
 msgstr "樣板(_T)..."
 
-#: src/mainwindow.c:800
+#: src/mainwindow.c:812
 msgid "_Actions..."
 msgstr "動作(_A)..."
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:813
 msgid "Tag_s..."
 msgstr "標籤(_s)..."
 
-#: src/mainwindow.c:803
+#: src/mainwindow.c:815
 msgid "Plu_gins..."
 msgstr "外掛(_g)..."
 
-#: src/mainwindow.c:806
+#: src/mainwindow.c:818
 msgid "_Manual"
 msgstr "手冊(_M)"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:819
 msgid "_Online User-contributed FAQ"
 msgstr "線上協助 FAQ(_O)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:820
 msgid "Icon _Legend"
 msgstr "圖示說明(_L)"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:822
 msgid "Set as default client"
 msgstr "設置為預設客戶端"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:829
 msgid "Offline _mode"
 msgstr "離線模式(_m)"
 
-#: src/mainwindow.c:818
+#: src/mainwindow.c:830
 msgid "Men_ubar"
 msgstr "選單列(_u)"
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:831
 msgid "_Message view"
 msgstr "郵件檢視(_M)"
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:833
 msgid "Status _bar"
 msgstr "狀態列(_b)"
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:835
 msgid "Column headers"
 msgstr "標頭列"
 
-#: src/mainwindow.c:824
+#: src/mainwindow.c:836
 msgid "Th_read view"
 msgstr "串列檢視(_r)"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:837 src/prefs_summaries.c:667
 msgid "Hide read threads"
 msgstr "隱藏讀取串列"
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:838
 msgid "_Hide read messages"
 msgstr "隱藏讀取郵件(_H)"
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:839 src/prefs_summaries.c:673
 msgid "Hide deleted messages"
 msgstr "隱藏刪除郵件"
 
-#: src/mainwindow.c:828
+#: src/mainwindow.c:840
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: src/mainwindow.c:829 src/messageview.c:342
+#: src/mainwindow.c:841 src/messageview.c:345
 msgid "Show all _headers"
 msgstr "顯示所有標頭(_h)"
 
-#: src/mainwindow.c:830 src/messageview.c:343
+#: src/mainwindow.c:842 src/messageview.c:346
 msgid "_Collapse all"
 msgstr "全部折疊(_C)"
 
-#: src/mainwindow.c:831 src/messageview.c:344
+#: src/mainwindow.c:843 src/messageview.c:347
 msgid "Collapse from level _2"
 msgstr "從第二層開始折疊(_2)"
 
-#: src/mainwindow.c:832 src/messageview.c:345
+#: src/mainwindow.c:844 src/messageview.c:348
 msgid "Collapse from level _3"
 msgstr "從第三層開始折疊(_3)"
 
-#: src/mainwindow.c:836
+#: src/mainwindow.c:848
 msgid "Text _below icons"
 msgstr "圖示下方顯示字串(_b)"
 
-#: src/mainwindow.c:837
+#: src/mainwindow.c:849
 msgid "Text be_side icons"
 msgstr "圖示旁顯示字串(_s)"
 
-#: src/mainwindow.c:838
+#: src/mainwindow.c:850
 msgid "_Icons only"
 msgstr "只顯示圖示(_I)"
 
-#: src/mainwindow.c:839
+#: src/mainwindow.c:851
 msgid "_Text only"
 msgstr "只顯示字串(_T)"
 
-#: src/mainwindow.c:846
+#: src/mainwindow.c:858
 msgid "_Standard"
 msgstr "標準(_S)"
 
-#: src/mainwindow.c:847
+#: src/mainwindow.c:859
 msgid "_Three columns"
 msgstr "三欄(_T)"
 
-#: src/mainwindow.c:848
+#: src/mainwindow.c:860
 msgid "_Wide message"
 msgstr "寬郵件(_W)"
 
-#: src/mainwindow.c:849
+#: src/mainwindow.c:861
 msgid "W_ide message list"
 msgstr "寬郵件清單(_i)"
 
-#: src/mainwindow.c:850
+#: src/mainwindow.c:862
 msgid "S_mall screen"
 msgstr "小螢幕(_m)"
 
-#: src/mainwindow.c:854
+#: src/mainwindow.c:866
 msgid "By _number"
 msgstr "根據數值(_n)"
 
-#: src/mainwindow.c:855
+#: src/mainwindow.c:867
 msgid "By s_ize"
 msgstr "根據大小(_i)"
 
-#: src/mainwindow.c:856
+#: src/mainwindow.c:868
 msgid "By _date"
 msgstr "根據日期(_d)"
 
-#: src/mainwindow.c:857
+#: src/mainwindow.c:869
 msgid "By thread date"
 msgstr "根據串列日期"
 
-#: src/mainwindow.c:860
+#: src/mainwindow.c:872
 msgid "By s_ubject"
 msgstr "根據主旨(_u)"
 
-#: src/mainwindow.c:861
+#: src/mainwindow.c:873
 msgid "By _color label"
 msgstr "根據標籤顏色(_c)"
 
-#: src/mainwindow.c:862
+#: src/mainwindow.c:874
 msgid "By tag"
 msgstr "根據標籤"
 
-#: src/mainwindow.c:863
+#: src/mainwindow.c:875
 msgid "By _mark"
 msgstr "根據標記(_m)"
 
-#: src/mainwindow.c:864
+#: src/mainwindow.c:876
 msgid "By _status"
 msgstr "根據狀態(_s)"
 
-#: src/mainwindow.c:865
+#: src/mainwindow.c:877
 msgid "By a_ttachment"
 msgstr "根據附加檔案(_t)"
 
-#: src/mainwindow.c:866
+#: src/mainwindow.c:878
 msgid "By score"
 msgstr "根據分數"
 
-#: src/mainwindow.c:867
+#: src/mainwindow.c:879
 msgid "By locked"
 msgstr "根據鎖定"
 
-#: src/mainwindow.c:868
+#: src/mainwindow.c:880
 msgid "D_on't sort"
 msgstr "不排序(_o)"
 
-#: src/mainwindow.c:872 src/prefs_summaries.c:462
+#: src/mainwindow.c:884 src/prefs_summaries.c:654
 msgid "Ascending"
 msgstr "升冪"
 
-#: src/mainwindow.c:873 src/prefs_summaries.c:463
+#: src/mainwindow.c:885 src/prefs_summaries.c:655
 msgid "Descending"
 msgstr "降冪"
 
-#: src/mainwindow.c:915 src/messageview.c:387
+#: src/mainwindow.c:927 src/messageview.c:390
 msgid "_Auto detect"
 msgstr "自動偵測(_A)"
 
-#: src/mainwindow.c:1312 src/summaryview.c:6287
+#: src/mainwindow.c:1305 src/summaryview.c:6495
 msgid "Apply tags..."
 msgstr "指定標籤"
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1961
 msgid "Some error(s) happened. Click here to view log."
 msgstr "發生一些錯誤,點選這裡以檢視日誌"
 
-#: src/mainwindow.c:1973
+#: src/mainwindow.c:1976
 msgid "You are online. Click the icon to go offline"
 msgstr "目前是上線狀態,按下圖示進入離線狀態"
 
-#: src/mainwindow.c:1976
+#: src/mainwindow.c:1979
 msgid "You are offline. Click the icon to go online"
 msgstr "目前是離線狀態,按下圖示進入上線狀態"
 
-#: src/mainwindow.c:1990
+#: src/mainwindow.c:1993
 msgid "Select account"
 msgstr "選擇帳號"
 
-#: src/mainwindow.c:2017 src/prefs_logging.c:136
+#: src/mainwindow.c:2020 src/prefs_logging.c:136
 msgid "Network log"
 msgstr "網路日誌"
 
-#: src/mainwindow.c:2021
+#: src/mainwindow.c:2024
 msgid "Filtering/Processing debug log"
 msgstr "過濾器/執行除錯日誌"
 
-#: src/mainwindow.c:2040 src/prefs_logging.c:378
+#: src/mainwindow.c:2043 src/prefs_logging.c:378
 msgid "filtering log enabled\n"
 msgstr "開啟過濾器日誌\n"
 
-#: src/mainwindow.c:2042 src/prefs_logging.c:380
+#: src/mainwindow.c:2045 src/prefs_logging.c:380
 msgid "filtering log disabled\n"
 msgstr "關閉過濾器日誌\n"
 
-#: src/mainwindow.c:2485 src/mainwindow.c:2492 src/mainwindow.c:2535
-#: src/mainwindow.c:2568 src/mainwindow.c:2600 src/mainwindow.c:2645
+#: src/mainwindow.c:2479 src/mainwindow.c:2486 src/mainwindow.c:2529
+#: src/mainwindow.c:2562 src/mainwindow.c:2594 src/mainwindow.c:2639
 #: src/plugins/notification/notification_trayicon.c:372
-#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1077
+#: src/plugins/rssyl/opml_import.c:73 src/prefs_folder_item.c:1087
 msgid "Untitled"
 msgstr "無標題的"
 
-#: src/mainwindow.c:2646 src/prefs_summary_open.c:114
+#: src/mainwindow.c:2640 src/prefs_summary_open.c:114
 msgid "none"
 msgstr "無"
 
-#: src/mainwindow.c:2903 src/mainwindow.c:2907
+#: src/mainwindow.c:2897 src/mainwindow.c:2902
 msgid "Delete all messages in trash folders?"
 msgstr "刪除回收桶中所有的郵件"
 
-#: src/mainwindow.c:2904
+#: src/mainwindow.c:2898
 msgid "Don't quit"
 msgstr "不要離開"
 
-#: src/mainwindow.c:2933 src/plugins/mailmbox/plugin_gtk.c:189
+#: src/mainwindow.c:2929 src/plugins/mailmbox/plugin_gtk.c:189
 msgid "Add mailbox"
 msgstr "新增郵件夾"
 
-#: src/mainwindow.c:2934
+#: src/mainwindow.c:2930
 msgid ""
-"Input the location of mailbox.\n"
-"If an existing mailbox is specified, it will be\n"
+"Input the location of the mailbox.\n"
+"The location can be either the full path or relative to the \n"
+"home directory.\n"
+"If the location of an existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
-"輸入郵件夾的路徑\n"
-"如果指定的郵件夾已經存在,它將被自動的找到"
+"輸入郵件箱的位置\n"
+"如果指定的郵件箱已經存在,它將會被自動地發現\n"
+" "
 
-#: src/mainwindow.c:2940 src/plugins/mailmbox/plugin_gtk.c:196
+#: src/mainwindow.c:2938 src/plugins/mailmbox/plugin_gtk.c:196
 #: src/plugins/rssyl/rssyl_gtk.c:132
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "郵件夾 '%s' 已經存在"
 
-#: src/mainwindow.c:2945 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
-#: src/wizard.c:740
+#: src/mainwindow.c:2943 src/plugins/mailmbox/plugin_gtk.c:209 src/setup.c:52
+#: src/wizard.c:742
 msgid "Mailbox"
 msgstr "郵件夾"
 
-#: src/mainwindow.c:2950 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
+#: src/mainwindow.c:2948 src/plugins/mailmbox/plugin_gtk.c:215 src/setup.c:55
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -7624,167 +7709,176 @@ msgstr ""
 "郵件箱建立失敗\n"
 "可能有部份檔案已經存在,或是沒有足夠的存取權限"
 
-#: src/mainwindow.c:3419
+#: src/mainwindow.c:3415
 msgid "No posting allowed"
 msgstr "不允許發郵件"
 
-#: src/mainwindow.c:4002
+#: src/mainwindow.c:3997
 msgid "Mbox import has failed."
 msgstr "Mbox 匯入失敗"
 
-#: src/mainwindow.c:4011 src/mainwindow.c:4020
+#: src/mainwindow.c:4006 src/mainwindow.c:4015
 msgid "Export to mbox has failed."
 msgstr "匯出至 mbox 失敗"
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit"
 msgstr "離開"
 
-#: src/mainwindow.c:4061 src/plugins/notification/notification_trayicon.c:550
+#: src/mainwindow.c:4056 src/plugins/notification/notification_trayicon.c:550
 msgid "Exit Claws Mail?"
 msgstr "離開 Clasw Mail?"
 
-#: src/mainwindow.c:4252
+#: src/mainwindow.c:4257
 msgid "Folder synchronisation"
 msgstr "資料夾同步"
 
-#: src/mainwindow.c:4253
+#: src/mainwindow.c:4258
 msgid "Do you want to synchronise your folders now?"
 msgstr "同步資料夾?"
 
-#: src/mainwindow.c:4254
+#: src/mainwindow.c:4259
 msgid "_Synchronise"
 msgstr "同步(_S)"
 
-#: src/mainwindow.c:4702
+#: src/mainwindow.c:4737
 msgid "Deleting duplicated messages..."
 msgstr "正在刪除重複的郵件..."
 
-#: src/mainwindow.c:4712
+#: src/mainwindow.c:4747
 msgid "No duplicate message found in selected folder.\n"
 msgstr "選擇的路徑中沒有重複的郵件\n"
 
-#: src/mainwindow.c:4718
+#: src/mainwindow.c:4753
 #, c-format
 msgid "Deleted %d duplicate message in selected folder.\n"
 msgid_plural "Deleted %d duplicate messages in selected folder.\n"
 msgstr[0] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 msgstr[1] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 
-#: src/mainwindow.c:4722
+#: src/mainwindow.c:4757
 #, c-format
 msgid "Marked %d duplicate message for deletion in selected folder.\n"
 msgid_plural "Marked %d duplicate messages for deletion in selected folder.\n"
 msgstr[0] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 msgstr[1] "已刪除 %d 重複郵件於選擇的資料夾內\n"
 
-#: src/mainwindow.c:4760
+#: src/mainwindow.c:4795
 msgid "Deleting duplicated messages in all folders..."
 msgstr "正在所有的路徑中刪除重複的郵件..."
 
-#: src/mainwindow.c:4766
+#: src/mainwindow.c:4801
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "已刪除 %d 重複郵件於 %d 資料夾內\n"
 msgstr[1] "已刪除 %d 重複郵件於 %d 資料夾內\n"
 
-#: src/mainwindow.c:4771
+#: src/mainwindow.c:4806
 #, c-format
 msgid "No duplicate message found in %d folders.\n"
 msgstr "資料夾 %d 內沒有重複的郵件\n"
 
-#: src/mainwindow.c:4933 src/messageview.c:2657
+#: src/mainwindow.c:4968 src/messageview.c:2634
 msgid "Select folder to go to"
 msgstr "選擇要前往的資料夾"
 
-#: src/mainwindow.c:5034 src/summaryview.c:5778
+#: src/mainwindow.c:5069 src/summaryview.c:5938
 msgid "Processing rules to apply before folder rules"
 msgstr "在資料夾的規則進行前套用"
 
-#: src/mainwindow.c:5042
+#: src/mainwindow.c:5077
 msgid "Processing rules to apply after folder rules"
 msgstr "在資料夾的規則進行後套用"
 
-#: src/mainwindow.c:5050 src/summaryview.c:5789
+#: src/mainwindow.c:5085 src/summaryview.c:5949
 msgid "Filtering configuration"
 msgstr "過濾配置"
 
-#: src/mainwindow.c:5165
+#: src/mainwindow.c:5200
 msgid "Can not register as default client: impossible to get executable path."
 msgstr "無法註冊為預設的客戶端郵件程式:無法寫入取得可執行的路徑"
 
-#: src/mainwindow.c:5224
+#: src/mainwindow.c:5259
 msgid "Claws Mail has been registered as default client."
 msgstr "Claws Mail 已註冊為預設客戶端郵件程式"
 
-#: src/mainwindow.c:5226
+#: src/mainwindow.c:5261
 msgid ""
 "Can not register as default client: impossible to write to the registry."
 msgstr "無法註冊為預設的客戶端郵件程式:無法寫入 registry"
 
-#: src/mainwindow.c:5240 src/setup.c:91
+#: src/mainwindow.c:5275 src/setup.c:91
 #, c-format
 msgid "Scanning folder %s%c%s..."
 msgstr "掃描資料夾 %s%c%s..."
 
-#: src/mainwindow.c:5384
+#: src/mainwindow.c:5419
 #, c-format
 msgid "Forgotten %d password in %d accounts.\n"
 msgid_plural "Forgotten %d passwords in %d accounts.\n"
 msgstr[0] "忘記了 %d 密碼於 %d 帳號內\n"
 msgstr[1] "忘記了 %d 密碼於 %d 帳號內\n"
 
-#: src/matcher.c:214 src/matcher.c:215 src/matcher.c:216 src/matcher.c:217
-#: src/matcher.c:218 src/matcher.c:219 src/matcher.c:220 src/matcher.c:221
+#: src/matcher.c:217 src/matcher.c:218 src/matcher.c:219 src/matcher.c:220
+#: src/matcher.c:221 src/matcher.c:222 src/matcher.c:223 src/matcher.c:224
 #, c-format
 msgid "%s header"
 msgstr "%s 標頭"
 
-#: src/matcher.c:222
+#: src/matcher.c:225
 msgid "header"
 msgstr "標頭"
 
-#: src/matcher.c:223
+#: src/matcher.c:226
 msgid "header line"
 msgstr "標頭線"
 
-#: src/matcher.c:224
+#: src/matcher.c:227
 msgid "body line"
 msgstr "內容線"
 
-#: src/matcher.c:225
+#: src/matcher.c:228
 msgid "tag"
 msgstr "標籤"
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
-#: src/message_search.c:212 src/prefs_matcher.c:743 src/summary_search.c:514
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
+#: src/message_search.c:215 src/prefs_matcher.c:752 src/summary_search.c:455
 msgid "Case sensitive"
 msgstr "區分大小寫"
 
-#: src/matcher.c:528 src/matcher.c:533 src/matcher.c:552 src/matcher.c:557
+#: src/matcher.c:538 src/matcher.c:543 src/matcher.c:562 src/matcher.c:567
 msgid "Case insensitive"
 msgstr "不區分大小寫"
 
-#: src/matcher.c:1859
+#: src/matcher.c:1903
 #, c-format
 msgid "checking if message matches [ %s ]\n"
 msgstr "檢查郵件是否相符 [ %s ]\n"
 
-#: src/matcher.c:1930 src/matcher.c:1949 src/matcher.c:1962
+#: src/matcher.c:1976 src/matcher.c:1995 src/matcher.c:2008
 msgid "message matches\n"
 msgstr "郵件相符\n"
 
-#: src/matcher.c:1937 src/matcher.c:1955 src/matcher.c:1964
+#: src/matcher.c:1983 src/matcher.c:2001 src/matcher.c:2010
 msgid "message does not match\n"
 msgstr "郵件不相符\n"
 
-#: src/matcher.c:2227 src/matcher.c:2228 src/matcher.c:2229 src/matcher.c:2230
-#: src/matcher.c:2231 src/matcher.c:2232 src/matcher.c:2233 src/matcher.c:2234
+#: src/matcher.c:2275 src/matcher.c:2276 src/matcher.c:2277 src/matcher.c:2278
+#: src/matcher.c:2279 src/matcher.c:2280 src/matcher.c:2281 src/matcher.c:2282
 msgid "(none)"
 msgstr "(空)"
 
-#: src/mbox.c:107
+#: src/mbox.c:98
+#, c-format
+msgid ""
+"Could not stat mbox file:\n"
+"%s\n"
+msgstr ""
+"無法建立 mbox 檔案\n"
+"%s\n"
+
+#: src/mbox.c:104
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
@@ -7793,27 +7887,26 @@ msgstr ""
 "無法開啟 mbox 檔案:\n"
 "%s\n"
 
-#: src/mbox.c:144
+#: src/mbox.c:142
 #, c-format
-msgid "Importing from mbox... (%d mail imported)"
-msgid_plural "Importing from mbox... (%d mails imported)"
-msgstr[0] "從 mbox 匯入... (%d 郵件已匯入)"
-msgstr[1] "從 mbox 匯入... (%d 郵件已匯入)"
+msgid "Importing from mbox... (%ld MB imported)"
+msgid_plural "Importing from mbox... (%ld MB imported)"
+msgstr[0] "從 mbox 匯入... (%ld 郵件已匯入)"
+msgstr[1] "從 mbox 匯入... (%ld 郵件已匯入)"
 
-#: src/mbox.c:549
+#: src/mbox.c:550
 msgid "Overwrite mbox file"
 msgstr "覆寫 mbox 檔案"
 
-#: src/mbox.c:550
+#: src/mbox.c:551
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "此檔案已經鄉在,要覆寫嗎?"
 
-#: src/mbox.c:551 src/messageview.c:1864 src/mimeview.c:1843
-#: src/prefs_themes.c:598 src/textview.c:3095
+#: src/mbox.c:552 src/mimeview.c:1897 src/prefs_themes.c:596
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: src/mbox.c:560
+#: src/mbox.c:561
 #, c-format
 msgid ""
 "Could not create mbox file:\n"
@@ -7822,51 +7915,51 @@ msgstr ""
 "無法建立 mbox 檔案\n"
 "%s\n"
 
-#: src/mbox.c:568
+#: src/mbox.c:565
 msgid "Exporting to mbox..."
 msgstr "匯出 mobx..."
 
-#: src/message_search.c:162
+#: src/message_search.c:173
 msgid "Find in current message"
 msgstr "在目前郵件中搜尋"
 
-#: src/message_search.c:180
+#: src/message_search.c:192
 msgid "Find text:"
 msgstr "尋找字串:"
 
-#: src/message_search.c:328 src/summary_search.c:838
+#: src/message_search.c:318 src/summary_search.c:779
 msgid "Search failed"
 msgstr "搜尋失敗"
 
-#: src/message_search.c:329 src/summary_search.c:839
+#: src/message_search.c:319 src/summary_search.c:780
 msgid "Search string not found."
 msgstr "找不到字串"
 
-#: src/message_search.c:338
+#: src/message_search.c:328
 msgid "Beginning of message reached; continue from end?"
 msgstr "已到達郵件的開始處,從最後面開始搜尋嗎?"
 
-#: src/message_search.c:341
+#: src/message_search.c:331
 msgid "End of message reached; continue from beginning?"
 msgstr "已到達郵件的尾端,從最前面開始搜尋嗎?"
 
-#: src/message_search.c:344 src/summary_search.c:850
+#: src/message_search.c:334 src/summary_search.c:791
 msgid "Search finished"
 msgstr "搜尋完畢"
 
-#: src/messageview.c:297 src/textview.c:252
+#: src/messageview.c:300 src/textview.c:249
 msgid "Compose _new message"
 msgstr "寫新郵件(_n)"
 
-#: src/messageview.c:712 src/messageview.c:1455 src/messageview.c:1606
+#: src/messageview.c:715 src/messageview.c:1436 src/messageview.c:1587
 msgid "Claws Mail - Message View"
 msgstr "Claws Mail - 郵件視窗"
 
-#: src/messageview.c:842
+#: src/messageview.c:845
 msgid "<No Return-Path found>"
 msgstr "<找不到回覆路徑>"
 
-#: src/messageview.c:849
+#: src/messageview.c:852
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -7881,82 +7974,52 @@ msgstr ""
 "回覆路徑: %s\n"
 "建議你不要傳送回條"
 
-#: src/messageview.c:856 src/messageview.c:884
+#: src/messageview.c:859
 msgid "_Don't Send"
 msgstr "不傳送(_D)"
 
-#: src/messageview.c:875
-#, c-format
-msgctxt "'%s' stands for 'To' then 'Cc'"
-msgid ""
-"This message is asking for a return receipt notification\n"
-"but according to its '%s' and '%s' headers it was not\n"
-"officially addressed to you.\n"
-"It is advised to not send the return receipt."
-msgstr ""
-"此郵件被要求回覆回條通知\n"
-"但是根據它的 '%s' 和 '%s'標頭,\n"
-"並沒有給你官方郵件地址\n"
-"建議你不要傳送回條"
-
-#: src/messageview.c:1385
+#: src/messageview.c:1366
 #, c-format
 msgid "Fetching message (%s)..."
 msgstr "取得郵件 (%s)..."
 
-#: src/messageview.c:1421 src/procmime.c:1009
+#: src/messageview.c:1402 src/procmime.c:957
 #, c-format
 msgid "Couldn't decrypt: %s"
 msgstr "無法解碼: %s"
 
-#: src/messageview.c:1502 src/messageview.c:1510
+#: src/messageview.c:1483 src/messageview.c:1491
 msgid "Message doesn't conform to MIME standard. It may render wrongly."
 msgstr "郵件不符合 MIME 標準,可能解讀錯誤"
 
-#: src/messageview.c:1856 src/messageview.c:1859 src/mimeview.c:2048
-#: src/plugins/fancy/fancy_viewer.c:709 src/summaryview.c:4882
-#: src/summaryview.c:4885 src/textview.c:3083
-msgid "Save as"
-msgstr "另存新檔"
-
-#: src/messageview.c:1865
-msgid "Overwrite existing file?"
-msgstr "覆寫已存在的檔案嗎?"
-
-#: src/messageview.c:1873 src/summaryview.c:4902 src/summaryview.c:4905
-#: src/summaryview.c:4920
-#, c-format
-msgid "Couldn't save the file '%s'."
-msgstr "無法儲存檔案 '%s'"
-
-#: src/messageview.c:1926
+#: src/messageview.c:1868
 #, c-format
 msgid "Show all %s."
 msgstr "顯示全部 %s"
 
-#: src/messageview.c:1928
+#: src/messageview.c:1870
 msgid "Only the first megabyte of text is shown."
 msgstr "只有文字中第一個 megabyte 會顯示"
 
-#: src/messageview.c:1959
+#: src/messageview.c:1901
 msgid ""
 "You got a return receipt for this message: it has been displayed by the "
 "recipient."
 msgstr "你已收到此郵件的回條:接收者將會看到"
 
-#: src/messageview.c:1962
+#: src/messageview.c:1904
 msgid "You asked for a return receipt in this message."
 msgstr "你在此郵件中要求回覆回條"
 
-#: src/messageview.c:1968
+#: src/messageview.c:1910
 msgid "This message asks for a return receipt."
 msgstr "此郵件要求回覆回條"
 
-#: src/messageview.c:1969
+#: src/messageview.c:1911
 msgid "Send receipt"
 msgstr "傳送回條"
 
-#: src/messageview.c:2012
+#: src/messageview.c:1954
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
@@ -7964,7 +8027,7 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "而且已經待伺服器被刪除"
 
-#: src/messageview.c:2018
+#: src/messageview.c:1960
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7973,15 +8036,15 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s"
 
-#: src/messageview.c:2022 src/messageview.c:2044
+#: src/messageview.c:1964 src/messageview.c:1986
 msgid "Mark for download"
 msgstr "標示欲下載項目"
 
-#: src/messageview.c:2023 src/messageview.c:2035
+#: src/messageview.c:1965 src/messageview.c:1977
 msgid "Mark for deletion"
 msgstr "標示欲刪除項目"
 
-#: src/messageview.c:2028
+#: src/messageview.c:1970
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -7990,12 +8053,12 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s 將被下載"
 
-#: src/messageview.c:2033 src/messageview.c:2046
-#: src/prefs_filtering_action.c:180 src/toolbar.c:506
+#: src/messageview.c:1975 src/messageview.c:1988
+#: src/prefs_filtering_action.c:176 src/toolbar.c:506
 msgid "Unmark"
 msgstr "未標示"
 
-#: src/messageview.c:2039
+#: src/messageview.c:1981
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
@@ -8004,11 +8067,34 @@ msgstr ""
 "此郵件的多個部份均已接收完成\n"
 "%s 將被刪除"
 
-#: src/messageview.c:2112
+#: src/messageview.c:2058
+#, c-format
+msgctxt "'%s' stands for 'To' then 'Cc'"
+msgid ""
+"This message is asking for a return receipt notification\n"
+"but according to its '%s' and '%s' headers it was not\n"
+"officially addressed to you.\n"
+"It is advised to not send the return receipt."
+msgstr ""
+"此郵件被要求回覆回條通知\n"
+"但是根據它的 '%s' 和 '%s'標頭,\n"
+"並沒有給你官方郵件地址\n"
+"建議你不要傳送回條"
+
+#: src/messageview.c:2066 src/messageview.c:2074
 msgid "Return Receipt Notification"
 msgstr "回覆回條通知"
 
-#: src/messageview.c:2113
+#: src/messageview.c:2068 src/messageview.c:2079
+#: src/plugins/rssyl/rssyl_feed_props.c:496
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: src/messageview.c:2068 src/messageview.c:2079
+msgid "_Send Notification"
+msgstr "傳送通知(_S)"
+
+#: src/messageview.c:2075
 msgid ""
 "More than one of your accounts uses the address that this message was sent "
 "to.\n"
@@ -8018,19 +8104,11 @@ msgstr ""
 "超過一個帳號使用了此郵件的收件者地址\n"
 "請選擇一個帳號用來傳送回條通知"
 
-#: src/messageview.c:2117 src/plugins/rssyl/rssyl_feed_props.c:506
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: src/messageview.c:2117
-msgid "_Send Notification"
-msgstr "傳送通知(_S)"
-
-#: src/messageview.c:2206
+#: src/messageview.c:2171 src/messageview.c:2190
 msgid "Cannot print: the message doesn't contain text."
 msgstr "無法列印:此郵件不包含文字"
 
-#: src/messageview.c:2967
+#: src/messageview.c:2944
 msgid ""
 "\n"
 "  There are no messages in this folder"
@@ -8038,7 +8116,7 @@ msgstr ""
 "\n"
 "  此資料夾內沒有郵件"
 
-#: src/messageview.c:2975
+#: src/messageview.c:2952
 msgid ""
 "\n"
 "  Message has been deleted"
@@ -8046,7 +8124,7 @@ msgstr ""
 "\n"
 "  郵件已被刪除"
 
-#: src/messageview.c:2976
+#: src/messageview.c:2953
 msgid ""
 "\n"
 "  Message has been deleted or moved to another folder"
@@ -8054,16 +8132,16 @@ msgstr ""
 "\n"
 "  郵件已被刪除或移至其它資料夾"
 
-#: src/messageview.c:3009 src/messageview.c:3015 src/summaryview.c:4295
-#: src/summaryview.c:7054
+#: src/messageview.c:2986 src/messageview.c:2992 src/summaryview.c:4420
+#: src/summaryview.c:7298
 msgid "An error happened while learning.\n"
 msgstr "學習過程中發生錯誤\n"
 
-#: src/mh.c:527
+#: src/mh.c:528
 msgid "Moving messages..."
 msgstr "移動郵件..."
 
-#: src/mh.c:671 src/plugins/mailmbox/mailmbox_folder.c:838
+#: src/mh.c:672 src/plugins/mailmbox/mailmbox_folder.c:839
 msgid "Deleting messages..."
 msgstr "刪除郵件..."
 
@@ -8095,137 +8173,146 @@ msgstr ""
 msgid "Remove mailbox"
 msgstr "移除郵件箱"
 
-#: src/mimeview.c:192
+#: src/mimeview.c:221
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: src/mimeview.c:194
+#: src/mimeview.c:223
 msgid "Open _with..."
 msgstr "以...開啟(_w)"
 
-#: src/mimeview.c:196
+#: src/mimeview.c:225 src/prefs_filtering_action.c:172
+msgid "Copy"
+msgstr "複制"
+
+#: src/mimeview.c:226
 msgid "Send to..."
 msgstr "傳送到..."
 
-#: src/mimeview.c:197
+#: src/mimeview.c:227
 msgid "_Display as text"
 msgstr "以文字顯示(_D)"
 
-#: src/mimeview.c:198
+#: src/mimeview.c:228
 msgid "_Save as..."
 msgstr "另存新檔(_S)..."
 
-#: src/mimeview.c:199
+#: src/mimeview.c:229
 msgid "Save _all..."
 msgstr "全部儲存(_a)"
 
-#: src/mimeview.c:272
+#: src/mimeview.c:302
 msgid "MIME Type"
 msgstr "MINI格式"
 
-#: src/mimeview.c:1026 src/mimeview.c:1031 src/mimeview.c:1036
-#: src/mimeview.c:1041
+#: src/mimeview.c:1053 src/mimeview.c:1058 src/mimeview.c:1063
+#: src/mimeview.c:1068
 msgid "View full information"
 msgstr "顯示完整資訊"
 
-#: src/mimeview.c:1047
+#: src/mimeview.c:1074
 msgid "Check again"
 msgstr "再檢查一次"
 
-#: src/mimeview.c:1059
+#: src/mimeview.c:1086
 #, c-format
 msgid "%s Click the icon to check it."
 msgstr "%s 點選圖示去檢查它"
 
-#: src/mimeview.c:1061
+#: src/mimeview.c:1088
 #, c-format
 msgid "%s Click the icon or hit '%s' to check it."
 msgstr "%s 點選圖示或點擊'%s'去檢查它 "
 
-#: src/mimeview.c:1071
+#: src/mimeview.c:1098
 msgid "Timeout checking the signature. Click the icon to try again."
 msgstr "檢查簽章超時,點選圖示再試一次"
 
-#: src/mimeview.c:1073
+#: src/mimeview.c:1100
 #, c-format
 msgid ""
 "Timeout checking the signature. Click the icon or hit '%s' to try again."
 msgstr "檢查簽章超時,點選圖示或點擊'%s'再試一次"
 
-#: src/mimeview.c:1313
+#: src/mimeview.c:1345
 msgid "Checking signature..."
 msgstr "檢查簽章..."
 
-#: src/mimeview.c:1354
+#: src/mimeview.c:1386
 msgid "Go back to email"
 msgstr "回到電子郵件"
 
-#: src/mimeview.c:1761 src/mimeview.c:1853 src/mimeview.c:2095
-#: src/mimeview.c:2131 src/mimeview.c:2243 src/plugins/fancy/fancy_viewer.c:449
+#: src/mimeview.c:1815 src/mimeview.c:1907 src/mimeview.c:2149
+#: src/mimeview.c:2185 src/mimeview.c:2297 src/plugins/fancy/fancy_viewer.c:440
 #, c-format
 msgid "Couldn't save the part of multipart message: %s"
 msgstr "無法儲存多重郵件的一個部份:%s"
 
-#: src/mimeview.c:1840 src/textview.c:3093
+#: src/mimeview.c:1894
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆寫已存在的檔案 '%s' 嗎?"
 
-#: src/mimeview.c:1864
+#: src/mimeview.c:1918
 #, c-format
 msgid ""
 "An error has occurred while saving message part #%d. Do you want to cancel "
 "operation or skip error and continue?"
 msgstr "當儲存郵件的第#%d個部份時發生錯誤!確定要取消或跳過錯誤並繼續嗎?"
 
-#: src/mimeview.c:1867
+#: src/mimeview.c:1921
 msgid "Error saving all message parts"
 msgstr "儲存所有郵件發生錯誤"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1922
 msgid "Skip"
 msgstr "跳過"
 
-#: src/mimeview.c:1868
+#: src/mimeview.c:1922
 msgid "Skip all"
 msgstr "跳過全部"
 
-#: src/mimeview.c:1878
+#: src/mimeview.c:1932
 #, c-format
 msgid "%d file saved successfully."
 msgid_plural "%d files saved successfully."
 msgstr[0] "檔案 %d 已經成功的儲存"
 msgstr[1] "檔案 %d 已經成功的儲存"
 
-#: src/mimeview.c:1886
+#: src/mimeview.c:1940
 #, c-format
 msgid "%d file saved successfully"
 msgid_plural "%d files saved successfully"
 msgstr[0] "檔案 %d 已經成功的儲存"
 msgstr[1] "檔案 %d 已經成功的儲存"
 
-#: src/mimeview.c:1891
+#: src/mimeview.c:1945
 #, c-format
 msgid "%s, %d file failed."
 msgid_plural "%s, %d files failed."
 msgstr[0] "%s,%d 檔案失敗"
 msgstr[1] "%s,%d 檔案失敗"
 
-#: src/mimeview.c:1924 src/plugins/archive/archiver_prefs.c:142
-#: src/prefs_filtering_action.c:1300
+#: src/mimeview.c:1978 src/plugins/archive/archiver_prefs.c:142
+#: src/prefs_filtering_action.c:1263
 msgid "Select destination folder"
 msgstr "選擇目的資料夾"
 
-#: src/mimeview.c:1931 src/plugins/archive/archiver_prefs.c:148
+#: src/mimeview.c:1985 src/plugins/archive/archiver_prefs.c:148
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s'並不是一個路徑"
 
-#: src/mimeview.c:2178 src/mimeview.c:2185 src/textview.c:3010
+#: src/mimeview.c:2102 src/plugins/fancy/fancy_viewer.c:693
+#: src/summaryview.c:5032
+msgid "Save as"
+msgstr "另存新檔"
+
+#: src/mimeview.c:2232 src/mimeview.c:2239
 msgid "Open with"
 msgstr "以...開啟"
 
-#: src/mimeview.c:2179 src/mimeview.c:2186 src/textview.c:3011
+#: src/mimeview.c:2233 src/mimeview.c:2240
 #, c-format
 msgid ""
 "Enter the command-line to open file:\n"
@@ -8234,7 +8321,7 @@ msgstr ""
 "輸入命令列以開啟檔案:\n"
 "('%s' 將被用檔名覆蓋)"
 
-#: src/mimeview.c:2281
+#: src/mimeview.c:2335
 #, c-format
 msgid ""
 "Could not convert attachment name to UTF-16:\n"
@@ -8245,14 +8332,14 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/mimeview.c:2289
+#: src/mimeview.c:2343
 msgid "Execute untrusted binary?"
 msgstr "要執行不信任的二進制檔案嗎?"
 
-#: src/mimeview.c:2290
+#: src/mimeview.c:2344
 msgid ""
 "This attachment is an executable file. Executing untrusted binaries is "
-"dangerous and could probably lead to compromission of your computer.\n"
+"dangerous and could compromise your computer.\n"
 "\n"
 "Do you want to run this file?"
 msgstr ""
@@ -8261,96 +8348,96 @@ msgstr ""
 "\n"
 "你仍希望執行這個檔案嗎?"
 
-#: src/mimeview.c:2294
+#: src/mimeview.c:2348
 msgid "Run binary"
 msgstr "執行二進制檔"
 
-#: src/mimeview.c:2596 src/plugins/att_remover/att_remover.c:304
+#: src/mimeview.c:2651 src/plugins/att_remover/att_remover.c:304
 msgid "Type:"
 msgstr "型式:"
 
-#: src/mimeview.c:2597 src/plugins/att_remover/att_remover.c:305
-#: src/plugins/pdf_viewer/poppler_viewer.c:699 src/summaryview.c:2713
+#: src/mimeview.c:2652 src/plugins/att_remover/att_remover.c:305
+#: src/plugins/pdf_viewer/poppler_viewer.c:702 src/summaryview.c:2788
 msgid "Size:"
 msgstr "大小:"
 
-#: src/mimeview.c:2611 src/plugins/vcalendar/vcalendar.c:1265
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1709
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1719
+#: src/mimeview.c:2666 src/plugins/vcalendar/vcalendar.c:1240
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1595
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1605
 msgid "Description:"
 msgstr "描述:"
 
-#: src/news.c:303
+#: src/news.c:300
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected.\n"
 msgstr "連線至 %s:%d 的 NNTP 已經斷線\n"
 
-#: src/news.c:336
+#: src/news.c:335
 #, c-format
 msgid "Account '%s': Connecting to NNTP server: %s:%d...\n"
 msgstr "帳號 '%s': 連線至 NNTP 伺服器:%s:%d...\n"
 
-#: src/news.c:357
+#: src/news.c:372
 #, c-format
 msgid "Error logging in to %s:%d...\n"
 msgstr "登入%s:%d時發生錯誤...\n"
 
-#: src/news.c:438
+#: src/news.c:451
 msgid ""
 "Libetpan does not support return code 480 so for now we choose to continue\n"
 msgstr "Libetpan 不支援回傳值480,因此將繼續執行\n"
 
-#: src/news.c:447
+#: src/news.c:460
 msgid "Mode reader failed, continuing nevertheless\n"
 msgstr "雖然模式讀取器失效,但仍將繼續\n"
 
-#: src/news.c:451
+#: src/news.c:464
 #, c-format
 msgid "Error creating session with %s:%d\n"
 msgstr "用 %s:%d 建立資料發生錯誤\n"
 
-#: src/news.c:466
+#: src/news.c:479
 #, c-format
 msgid "Error authenticating to %s:%d...\n"
 msgstr "向 %s:%d 認證時發生錯誤\n"
 
-#: src/news.c:491
+#: src/news.c:504
 msgid "Claws Mail needs network access in order to access the News server."
 msgstr "Claws Mail 需要網路才能存取新聞伺服器"
 
-#: src/news.c:862
+#: src/news.c:875
 #, c-format
 msgid "couldn't select group: %s\n"
 msgstr "無法選擇群組: %s\n"
 
-#: src/news.c:1054 src/news.c:1232
+#: src/news.c:1067 src/news.c:1253
 #, c-format
 msgid "couldn't set group: %s\n"
 msgstr "無法設定群組: %s\n"
 
-#: src/news.c:1063
+#: src/news.c:1076
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "無效的文章範圍 %d - %d\n"
 
-#: src/news.c:1133 src/news.c:1160 src/news.c:1187
+#: src/news.c:1154 src/news.c:1181 src/news.c:1208
 msgid "couldn't get xhdr\n"
 msgstr "無法取得 xhdr\n"
 
-#: src/news.c:1225
+#: src/news.c:1246
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "取得 xover %d - %d 於 %s 內...\n"
 
-#: src/news.c:1240
+#: src/news.c:1261
 msgid "couldn't get xover\n"
 msgstr "無法取得 xover\n"
 
-#: src/news.c:1257
+#: src/news.c:1278
 msgid "invalid xover line\n"
 msgstr "無效的 xover 線\n"
 
-#: src/news.c:1459
+#: src/news.c:1480
 msgid ""
 "You have one or more News accounts defined. However this version of Claws "
 "Mail has been built without News support; your News accounts are disabled.\n"
@@ -8423,11 +8510,11 @@ msgstr "密碼"
 msgid "Confirm passphrase:"
 msgstr "錯誤的密碼"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:51
+#: src/plugins/acpi_notifier/acpi_notifier.c:53
 msgid "Acpi Notifier"
 msgstr "Acpi 提示器"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:67
+#: src/plugins/acpi_notifier/acpi_notifier.c:69
 msgid ""
 "Make sure that the kernel module 'acerhk' is loaded.\n"
 "You can get it from http://www.cakey.de/acerhk/"
@@ -8435,7 +8522,7 @@ msgstr ""
 "請確認核心模組 'acerhk' 是否已載入\n"
 "可以從 http://www.cakey.de/acerhk/ 取得"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:69
+#: src/plugins/acpi_notifier/acpi_notifier.c:71
 msgid ""
 "Make sure that the kernel module 'acer_acpi' is loaded.\n"
 "You can get it from http://code.google.com/p/aceracpi/"
@@ -8443,19 +8530,19 @@ msgstr ""
 "請確認核心模組 'acer_acpi' 是否已載入\n"
 "可以從 http://code.google.com/p/aceracpi/ 取得"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:71
+#: src/plugins/acpi_notifier/acpi_notifier.c:73
 msgid "Make sure that the kernel module 'asus_laptop' is loaded."
 msgstr "請確認核心模組 'asus_laptop' 是否已載入"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:72
+#: src/plugins/acpi_notifier/acpi_notifier.c:74
 msgid "Make sure that the kernel module 'asus_acpi' is loaded."
 msgstr "請確認核心模組 'asus_acpi' 是否已載入"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:73
+#: src/plugins/acpi_notifier/acpi_notifier.c:75
 msgid "Make sure that the kernel module 'ibm_acpi' is loaded."
 msgstr "ibm_acpi' 是否已載入"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:74
+#: src/plugins/acpi_notifier/acpi_notifier.c:76
 msgid ""
 "Make sure that you have apanelc installed.\n"
 "You can get it from http://apanel.sourceforge.net/"
@@ -8463,78 +8550,78 @@ msgstr ""
 "請確認是否已安裝apanelc\n"
 "可以從 http://apanel.sourceforge.net/ 取得"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:207
-#: src/plugins/acpi_notifier/acpi_notifier.c:213
-#: src/plugins/acpi_notifier/acpi_notifier.c:425
+#: src/plugins/acpi_notifier/acpi_notifier.c:209
+#: src/plugins/acpi_notifier/acpi_notifier.c:215
+#: src/plugins/acpi_notifier/acpi_notifier.c:427
 msgid "Control file doesn't exist."
 msgstr "控制檔案不存在"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:305
+#: src/plugins/acpi_notifier/acpi_notifier.c:307
 msgid " : no new or unread mail"
 msgstr " : 沒有新聞或未讀郵件"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:306
+#: src/plugins/acpi_notifier/acpi_notifier.c:308
 msgid " : unread mail"
 msgstr " : 沒有未讀郵件"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:307
+#: src/plugins/acpi_notifier/acpi_notifier.c:309
 msgid " : new mail"
 msgstr " : 新郵件"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:309
-#: src/plugins/acpi_notifier/acpi_notifier.c:315
-#: src/plugins/acpi_notifier/acpi_notifier.c:321
-msgid "off"
-msgstr "關閉"
-
 #: src/plugins/acpi_notifier/acpi_notifier.c:311
 #: src/plugins/acpi_notifier/acpi_notifier.c:317
 #: src/plugins/acpi_notifier/acpi_notifier.c:323
-msgid "blinking"
-msgstr "閃爍"
-
+msgid "off"
+msgstr "關閉"
+
 #: src/plugins/acpi_notifier/acpi_notifier.c:313
 #: src/plugins/acpi_notifier/acpi_notifier.c:319
 #: src/plugins/acpi_notifier/acpi_notifier.c:325
+msgid "blinking"
+msgstr "閃爍"
+
+#: src/plugins/acpi_notifier/acpi_notifier.c:315
+#: src/plugins/acpi_notifier/acpi_notifier.c:321
+#: src/plugins/acpi_notifier/acpi_notifier.c:327
 msgid "on"
 msgstr "開啟"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:347
-#: src/plugins/acpi_notifier/acpi_notifier.c:356
-#: src/plugins/acpi_notifier/acpi_notifier.c:371
+#: src/plugins/acpi_notifier/acpi_notifier.c:349
+#: src/plugins/acpi_notifier/acpi_notifier.c:358
+#: src/plugins/acpi_notifier/acpi_notifier.c:373
 msgid "LED "
 msgstr "LED "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:386
+#: src/plugins/acpi_notifier/acpi_notifier.c:388
 msgid "ACPI type: "
 msgstr "ACPI 型式: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:395
+#: src/plugins/acpi_notifier/acpi_notifier.c:397
 msgid "ACPI file: "
 msgstr "ACPI 檔案:"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:406
+#: src/plugins/acpi_notifier/acpi_notifier.c:408
 msgid "values - On: "
 msgstr "數值 - 開啟: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:411
+#: src/plugins/acpi_notifier/acpi_notifier.c:413
 msgid " - Off: "
 msgstr " - 關閉: "
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:433
+#: src/plugins/acpi_notifier/acpi_notifier.c:435
 msgid "Blink when user interaction is required"
 msgstr "當使用者內部需求時閃爍"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:867
+#: src/plugins/acpi_notifier/acpi_notifier.c:869
 msgid "This plugin handles various ACPI mail LEDs."
 msgstr "此外掛程式控制 ACPI 郵件 LEDs 的改變"
 
-#: src/plugins/acpi_notifier/acpi_notifier.c:888
+#: src/plugins/acpi_notifier/acpi_notifier.c:890
 msgid "Laptop LED"
 msgstr "桌上型由腦 LED"
 
 #: src/plugins/address_keeper/address_keeper.c:252
-#: src/plugins/attachwarner/attachwarner.c:257
+#: src/plugins/attachwarner/attachwarner.c:252
 msgid "Failed to register check before send hook"
 msgstr "在傳送的 hook 前註冊檢查失敗"
 
@@ -8561,11 +8648,11 @@ msgid "Address book path where addresses are kept"
 msgstr "已保留地址的通訊錄路徑"
 
 #: src/plugins/address_keeper/address_keeper_prefs.c:123
-#: src/plugins/bogofilter/bogofilter_gtk.c:278
+#: src/plugins/bogofilter/bogofilter_gtk.c:262
 #: src/plugins/bsfilter/bsfilter_gtk.c:201
-#: src/plugins/spamassassin/spamassassin_gtk.c:447
-#: src/prefs_filtering_action.c:573 src/prefs_filtering_action.c:580
-#: src/prefs_matcher.c:679
+#: src/plugins/spamassassin/spamassassin_gtk.c:463
+#: src/prefs_filtering_action.c:546 src/prefs_filtering_action.c:553
+#: src/prefs_matcher.c:690
 msgid "Select..."
 msgstr "選擇..."
 
@@ -8639,19 +8726,19 @@ msgstr ""
 msgid "Archiver"
 msgstr "封存器"
 
-#: src/plugins/archive/archiver_gtk.c:107
+#: src/plugins/archive/archiver_gtk.c:108
 msgid "Archiving"
 msgstr "封存"
 
-#: src/plugins/archive/archiver_gtk.c:125
+#: src/plugins/archive/archiver_gtk.c:127
 msgid "Press Cancel button to stop archiving"
 msgstr "按下取消鍵以停止封存"
 
-#: src/plugins/archive/archiver_gtk.c:141
+#: src/plugins/archive/archiver_gtk.c:143
 msgid "Archiving:"
 msgstr "封存:"
 
-#: src/plugins/archive/archiver_gtk.c:525
+#: src/plugins/archive/archiver_gtk.c:527
 #, c-format
 msgid ""
 "Some uninitialized data prevents from starting\n"
@@ -8662,7 +8749,7 @@ msgstr ""
 "部份未初始化的資料:\n"
 "%s%s"
 
-#: src/plugins/archive/archiver_gtk.c:528
+#: src/plugins/archive/archiver_gtk.c:530
 msgid ""
 "\n"
 "- the folder to archive is not set"
@@ -8670,7 +8757,7 @@ msgstr ""
 "\n"
 "尚未設定封存路徑"
 
-#: src/plugins/archive/archiver_gtk.c:529
+#: src/plugins/archive/archiver_gtk.c:531
 msgid ""
 "\n"
 "- the name for archive is not set"
@@ -8678,37 +8765,37 @@ msgstr ""
 "\n"
 "尚未設定封存名稱"
 
-#: src/plugins/archive/archiver_gtk.c:552
+#: src/plugins/archive/archiver_gtk.c:554
 #, c-format
 msgid "%s: Exists. Continue anyway?"
 msgstr "%s: 已存在!繼續嗎?"
 
-#: src/plugins/archive/archiver_gtk.c:555
+#: src/plugins/archive/archiver_gtk.c:557
 #, c-format
 msgid "%s: Is a link. Cannot continue"
 msgstr "%s: 是一個超連結!無法繼續"
 
-#: src/plugins/archive/archiver_gtk.c:558
+#: src/plugins/archive/archiver_gtk.c:560
 #, c-format
 msgid "%s: Is a directory. Cannot continue"
 msgstr "%s: 是一個路徑!無法繼續"
 
-#: src/plugins/archive/archiver_gtk.c:561
+#: src/plugins/archive/archiver_gtk.c:563
 #, c-format
 msgid "%s: Missing permissions. Cannot continue"
 msgstr "%s: 沒有權限!無法繼續"
 
-#: src/plugins/archive/archiver_gtk.c:564
+#: src/plugins/archive/archiver_gtk.c:566
 #, c-format
 msgid "%s: Unknown error. Cannot continue"
 msgstr "%s: 未知的錯誤!無法繼續"
 
-#: src/plugins/archive/archiver_gtk.c:572
-#: src/plugins/archive/archiver_gtk.c:619
+#: src/plugins/archive/archiver_gtk.c:574
+#: src/plugins/archive/archiver_gtk.c:621
 msgid "Creating archive"
 msgstr "建立新的封存"
 
-#: src/plugins/archive/archiver_gtk.c:585
+#: src/plugins/archive/archiver_gtk.c:587
 #, c-format
 msgid ""
 "Not a valid file name:\n"
@@ -8717,7 +8804,7 @@ msgstr ""
 "不是一個有效的 Claws Mail 檔案名稱:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:590
+#: src/plugins/archive/archiver_gtk.c:592
 #, c-format
 msgid ""
 "Not a valid Claws Mail folder:\n"
@@ -8726,7 +8813,7 @@ msgstr ""
 "不是一個有效的 Claws Mail 資料夾:\n"
 "%s."
 
-#: src/plugins/archive/archiver_gtk.c:614
+#: src/plugins/archive/archiver_gtk.c:616
 #, c-format
 msgid ""
 "Adding files in folder failed\n"
@@ -8741,7 +8828,7 @@ msgstr ""
 "\n"
 "繼續嗎?"
 
-#: src/plugins/archive/archiver_gtk.c:631
+#: src/plugins/archive/archiver_gtk.c:633
 #, c-format
 msgid ""
 "Archive creation error:\n"
@@ -8750,173 +8837,175 @@ msgstr ""
 "建立封存發生錯誤:\n"
 "%s"
 
-#: src/plugins/archive/archiver_gtk.c:743
+#: src/plugins/archive/archiver_gtk.c:746
 msgid "Archive result"
 msgstr "封存結果"
 
-#: src/plugins/archive/archiver_gtk.c:773
+#: src/plugins/archive/archiver_gtk.c:776
 msgid "Values"
 msgstr "數值"
 
-#: src/plugins/archive/archiver_gtk.c:782
+#: src/plugins/archive/archiver_gtk.c:786
 msgid "Archive"
 msgstr "封存"
 
-#: src/plugins/archive/archiver_gtk.c:788
+#: src/plugins/archive/archiver_gtk.c:792
 msgid "Archive format"
 msgstr "封存格式"
 
-#: src/plugins/archive/archiver_gtk.c:795
+#: src/plugins/archive/archiver_gtk.c:799
 msgid "Compression method"
 msgstr "壓縮演算法"
 
-#: src/plugins/archive/archiver_gtk.c:803
+#: src/plugins/archive/archiver_gtk.c:807
 msgid "Number of files"
 msgstr "檔案數量"
 
-#: src/plugins/archive/archiver_gtk.c:811
+#: src/plugins/archive/archiver_gtk.c:815
 msgid "Archive Size"
 msgstr "封存大小"
 
-#: src/plugins/archive/archiver_gtk.c:819
+#: src/plugins/archive/archiver_gtk.c:823
 msgid "Folder Size"
 msgstr "資料夾大小"
 
-#: src/plugins/archive/archiver_gtk.c:828
+#: src/plugins/archive/archiver_gtk.c:832
 msgid "Compression level"
 msgstr "壓縮等級"
 
-#: src/plugins/archive/archiver_gtk.c:833
-#: src/plugins/archive/archiver_gtk.c:841
-#: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:718 src/prefs_folder_item.c:522
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:525
+#: src/prefs_folder_item.c:1200 src/prefs_folder_item.c:1232
 msgid "Yes"
 msgstr "是"
 
-#: src/plugins/archive/archiver_gtk.c:833
-#: src/plugins/archive/archiver_gtk.c:841
-#: src/plugins/archive/archiver_gtk.c:849
-#: src/plugins/pdf_viewer/poppler_viewer.c:721 src/prefs_folder_item.c:521
-#: src/prefs_summaries.c:380
+#: src/plugins/archive/archiver_gtk.c:837
+#: src/plugins/archive/archiver_gtk.c:845
+#: src/plugins/archive/archiver_gtk.c:853
+#: src/plugins/pdf_viewer/poppler_viewer.c:724 src/prefs_folder_item.c:524
+#: src/prefs_folder_item.c:1199 src/prefs_folder_item.c:1231
+#: src/prefs_summaries.c:409
 msgid "No"
 msgstr "否"
 
-#: src/plugins/archive/archiver_gtk.c:836
+#: src/plugins/archive/archiver_gtk.c:840
 msgid "MD5 checksum"
 msgstr "MD5 檢查碼"
 
-#: src/plugins/archive/archiver_gtk.c:844
+#: src/plugins/archive/archiver_gtk.c:848
 msgid "Descriptive names"
 msgstr "描述名稱"
 
-#: src/plugins/archive/archiver_gtk.c:852
+#: src/plugins/archive/archiver_gtk.c:856
 msgid "Delete selected files"
 msgstr "刪除選擇的檔案"
 
-#: src/plugins/archive/archiver_gtk.c:861
-#: src/plugins/archive/archiver_gtk.c:1324
+#: src/plugins/archive/archiver_gtk.c:865
+#: src/plugins/archive/archiver_gtk.c:1330
 msgid "Select mails before"
 msgstr "先選擇郵件"
 
-#: src/plugins/archive/archiver_gtk.c:917
+#: src/plugins/archive/archiver_gtk.c:921
 msgid "Select folder to archive"
 msgstr "選擇封存資料夾"
 
-#: src/plugins/archive/archiver_gtk.c:938
+#: src/plugins/archive/archiver_gtk.c:942
 msgid "Select file name for archive [suffix should reflect archive like .tgz]"
 msgstr "選擇封存檔案名稱 [後綴將類似 .tgz]"
 
-#: src/plugins/archive/archiver_gtk.c:986
+#: src/plugins/archive/archiver_gtk.c:990
 #, c-format
 msgid "%ld of %ld"
 msgstr "%ld of %ld"
 
-#: src/plugins/archive/archiver_gtk.c:1038
+#: src/plugins/archive/archiver_gtk.c:1043
 msgid "Create Archive"
 msgstr "建立新的封存"
 
-#: src/plugins/archive/archiver_gtk.c:1053
+#: src/plugins/archive/archiver_gtk.c:1058
 msgid "Enter Archiver arguments"
 msgstr "輸入封存命令"
 
-#: src/plugins/archive/archiver_gtk.c:1066
+#: src/plugins/archive/archiver_gtk.c:1072
 msgid "Folder to archive"
 msgstr "封存資料夾"
 
-#: src/plugins/archive/archiver_gtk.c:1073
+#: src/plugins/archive/archiver_gtk.c:1079
 msgid "Folder which is the root of the archive"
 msgstr "封存資料夾的根目錄"
 
-#: src/plugins/archive/archiver_gtk.c:1078
+#: src/plugins/archive/archiver_gtk.c:1084
 msgid "Click this button to select a folder which is to be root of the archive"
 msgstr "按下此鍵為封存資料夾選擇根目錄"
 
-#: src/plugins/archive/archiver_gtk.c:1084
+#: src/plugins/archive/archiver_gtk.c:1090
 msgid "Name for archive"
 msgstr "封存名稱"
 
-#: src/plugins/archive/archiver_gtk.c:1090
+#: src/plugins/archive/archiver_gtk.c:1096
 msgid "Archive location and name"
 msgstr "封存路徑和名稱"
 
-#: src/plugins/archive/archiver_gtk.c:1092
+#: src/plugins/archive/archiver_gtk.c:1098
 #: src/plugins/archive/archiver_prefs.c:225
-#: src/plugins/pgpcore/select-keys.c:435
+#: src/plugins/pgpcore/select-keys.c:494
 msgid "_Select"
 msgstr "選擇(_S)"
 
-#: src/plugins/archive/archiver_gtk.c:1095
+#: src/plugins/archive/archiver_gtk.c:1101
 msgid "Click this button to select a name and location for the archive"
 msgstr "按下此鍵為封存選擇名稱和路徑"
 
-#: src/plugins/archive/archiver_gtk.c:1097
+#: src/plugins/archive/archiver_gtk.c:1103
 msgid "Choose compression"
 msgstr "選擇壓縮方式"
 
-#: src/plugins/archive/archiver_gtk.c:1109
 #: src/plugins/archive/archiver_gtk.c:1115
 #: src/plugins/archive/archiver_gtk.c:1121
-#: src/plugins/archive/archiver_gtk.c:1128
+#: src/plugins/archive/archiver_gtk.c:1127
 #: src/plugins/archive/archiver_gtk.c:1134
-#: src/plugins/archive/archiver_gtk.c:1142
-#: src/plugins/archive/archiver_gtk.c:1150
+#: src/plugins/archive/archiver_gtk.c:1140
+#: src/plugins/archive/archiver_gtk.c:1148
 #: src/plugins/archive/archiver_gtk.c:1156
 #: src/plugins/archive/archiver_gtk.c:1162
-#: src/plugins/archive/archiver_gtk.c:1170
-#: src/plugins/archive/archiver_gtk.c:1177
+#: src/plugins/archive/archiver_gtk.c:1168
+#: src/plugins/archive/archiver_gtk.c:1176
+#: src/plugins/archive/archiver_gtk.c:1183
 #, c-format
 msgid "Choose this option to use %s compression for the archive"
 msgstr "選擇這個選項,將可在封存時使用 %s 壓縮功能"
 
-#: src/plugins/archive/archiver_gtk.c:1226
+#: src/plugins/archive/archiver_gtk.c:1232
 msgid "Choose format"
 msgstr "選擇格式"
 
-#: src/plugins/archive/archiver_gtk.c:1238
 #: src/plugins/archive/archiver_gtk.c:1244
 #: src/plugins/archive/archiver_gtk.c:1250
 #: src/plugins/archive/archiver_gtk.c:1256
+#: src/plugins/archive/archiver_gtk.c:1262
 #, c-format
 msgid "Choose this to use %s as format for the archive"
 msgstr "選擇這個選項,將可在封存時使用 %s 格式"
 
-#: src/plugins/archive/archiver_gtk.c:1276
+#: src/plugins/archive/archiver_gtk.c:1282
 msgid "Miscellaneous options"
 msgstr "雜項選項"
 
-#: src/plugins/archive/archiver_gtk.c:1285
+#: src/plugins/archive/archiver_gtk.c:1291
 msgid "_Recursive"
 msgstr "遞迴(_R)"
 
-#: src/plugins/archive/archiver_gtk.c:1289
+#: src/plugins/archive/archiver_gtk.c:1295
 msgid "Choose this option to include subfolders in the archive"
 msgstr "選擇這個選項,將在封存中包含子資料夾"
 
-#: src/plugins/archive/archiver_gtk.c:1291
+#: src/plugins/archive/archiver_gtk.c:1297
 msgid "_MD5sum"
 msgstr "MD5檢查碼(_M)"
 
-#: src/plugins/archive/archiver_gtk.c:1295
+#: src/plugins/archive/archiver_gtk.c:1301
 msgid ""
 "Choose this option to add MD5 checksums for each file in the archive.\n"
 "Be aware though, that this dramatically increases the time it\n"
@@ -8926,11 +9015,11 @@ msgstr ""
 "必需要了解的是,這個功能將會在新建封存時,增加不少的時間\n"
 " "
 
-#: src/plugins/archive/archiver_gtk.c:1299
+#: src/plugins/archive/archiver_gtk.c:1305
 msgid "R_ename"
 msgstr "修改名稱(_e)"
 
-#: src/plugins/archive/archiver_gtk.c:1303
+#: src/plugins/archive/archiver_gtk.c:1309
 #: src/plugins/archive/archiver_prefs.c:427
 msgid ""
 "Choose this option to use descriptive names for each file in the archive.\n"
@@ -8941,7 +9030,7 @@ msgstr ""
 "名稱的設計為: 日期起源@至@主旨\n"
 "名稱長度將被限制為最長96個字元"
 
-#: src/plugins/archive/archiver_gtk.c:1311
+#: src/plugins/archive/archiver_gtk.c:1317
 msgid ""
 "Choose this option to delete mails after archiving\n"
 "At this point only handles IMAP4, Local mbox and POP3"
@@ -8949,11 +9038,11 @@ msgstr ""
 "選擇這個選項,將在封存後刪除郵件\n"
 "此功能只能套用在 IMAP4,本地郵件箱和 POP3"
 
-#: src/plugins/archive/archiver_gtk.c:1315
+#: src/plugins/archive/archiver_gtk.c:1321
 msgid "Selection options"
 msgstr "選擇選項"
 
-#: src/plugins/archive/archiver_gtk.c:1331
+#: src/plugins/archive/archiver_gtk.c:1337
 msgid ""
 "Select emails before a certain date\n"
 "Date must comply to ISO-8601 [YYYY-MM-DD]"
@@ -9024,7 +9113,7 @@ msgstr ""
 " "
 
 #: src/plugins/archive/archiver_prefs.c:425
-#: src/plugins/managesieve/sieve_manager.c:765
+#: src/plugins/managesieve/sieve_manager.c:771
 msgid "Rename"
 msgstr "重新命名"
 
@@ -9036,21 +9125,21 @@ msgstr "選擇這個選項,在封存後刪除郵件"
 msgid "Remove attachments"
 msgstr "移除附加檔"
 
-#: src/plugins/att_remover/att_remover.c:362
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:324 src/prefs_themes.c:1097
+#: src/plugins/att_remover/att_remover.c:363
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:325 src/prefs_themes.c:1099
 msgid "Remove"
 msgstr "移除"
 
-#: src/plugins/att_remover/att_remover.c:370 src/prefs_summaries.c:451
-#: src/prefs_summary_column.c:79 src/summaryview.c:2807
+#: src/plugins/att_remover/att_remover.c:371 src/prefs_summaries.c:643
+#: src/prefs_summary_column.c:79 src/summaryview.c:2882
 msgid "Attachment"
 msgstr "附加檔"
 
-#: src/plugins/att_remover/att_remover.c:422
+#: src/plugins/att_remover/att_remover.c:425
 msgid "Destroy attachments"
 msgstr "刪除附加檔"
 
-#: src/plugins/att_remover/att_remover.c:423
+#: src/plugins/att_remover/att_remover.c:426
 msgid ""
 "Do you really want to remove all attachments from the selected messages?\n"
 "\n"
@@ -9060,20 +9149,34 @@ msgstr ""
 "\n"
 "被刪除的資料將無法回復"
 
-#: src/plugins/att_remover/att_remover.c:484
+#: src/plugins/att_remover/att_remover.c:469
+msgid "The selected messages don't have any attachments."
+msgstr "選擇的郵件沒有夾帶任何檔案"
+
+#: src/plugins/att_remover/att_remover.c:472
+#, c-format
+msgid "Attachments removed from %d of the %d selected messages."
+msgstr "從%d封已選擇的郵件中的%d封內移除了附件"
+
+#: src/plugins/att_remover/att_remover.c:475
+#, c-format
+msgid "Attachments removed from all %d selected messages."
+msgstr "從%d個選擇的郵件內移除附加檔案"
+
+#: src/plugins/att_remover/att_remover.c:504
 msgid "This message doesn't have any attachments."
 msgstr "此郵件沒有任何的附合檔案"
 
-#: src/plugins/att_remover/att_remover.c:499
+#: src/plugins/att_remover/att_remover.c:517
 msgid "Remove attachments..."
 msgstr "移除附加檔案..."
 
-#: src/plugins/att_remover/att_remover.c:511
-#: src/plugins/att_remover/att_remover.c:571
+#: src/plugins/att_remover/att_remover.c:529
+#: src/plugins/att_remover/att_remover.c:589
 msgid "AttRemover"
 msgstr "AttRemover"
 
-#: src/plugins/att_remover/att_remover.c:576
+#: src/plugins/att_remover/att_remover.c:594
 msgid ""
 "This plugin removes attachments from mails.\n"
 "\n"
@@ -9084,11 +9187,11 @@ msgstr ""
 "\n"
 "警告:這個操作將會完整地刪除且附加檔案且無法取消,附加檔案將永遠永遠的消失。 "
 
-#: src/plugins/att_remover/att_remover.c:600
+#: src/plugins/att_remover/att_remover.c:618
 msgid "Attachment handling"
 msgstr "已掌握附加檔案"
 
-#: src/plugins/attachwarner/attachwarner.c:217
+#: src/plugins/attachwarner/attachwarner.c:210
 #, c-format
 msgid ""
 "An attachment is mentioned in the mail you're sending, but no file was "
@@ -9101,17 +9204,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/attachwarner/attachwarner.c:223
+#: src/plugins/attachwarner/attachwarner.c:216
 msgid "Attachment warning"
 msgstr "附加檔案警告"
 
-#: src/plugins/attachwarner/attachwarner.c:250
-#: src/plugins/attachwarner/attachwarner.c:287
-#: src/plugins/attachwarner/attachwarner.c:339
+#: src/plugins/attachwarner/attachwarner.c:245
+#: src/plugins/attachwarner/attachwarner.c:282
+#: src/plugins/attachwarner/attachwarner.c:334
 msgid "Attach warner"
 msgstr "附加檔案警告器"
 
-#: src/plugins/attachwarner/attachwarner.c:297
+#: src/plugins/attachwarner/attachwarner.c:292
 msgid ""
 "Warns user if some reference to attachments is found in the message text and "
 "no file is attached."
@@ -9157,7 +9260,7 @@ msgid ""
 "Don't check for missing attachments when forwarding or redirecting messages"
 msgstr "轉發或改寄郵件時,不要檢查是否缺少附件"
 
-#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:353
+#: src/plugins/attachwarner/attachwarner_prefs.c:135 src/prefs_msg_colors.c:310
 msgid "Signatures"
 msgstr "簽名"
 
@@ -9181,20 +9284,37 @@ msgstr "不包含"
 msgid "Attach Warner"
 msgstr "附件警告器"
 
-#: src/plugins/bogofilter/bogofilter.c:81
-#: src/plugins/bogofilter/bogofilter_gtk.c:499
+#: src/plugins/bogofilter/bogofilter.c:82
+#: src/plugins/bogofilter/bogofilter_gtk.c:483
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: src/plugins/bogofilter/bogofilter.c:456
+#: src/plugins/bogofilter/bogofilter.c:108
+#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:331
+#: src/plugins/bogofilter/bogofilter_gtk.c:408
+#: src/plugins/bsfilter/bsfilter.c:107 src/plugins/bsfilter/bsfilter_gtk.c:197
+#: src/plugins/bsfilter/bsfilter_gtk.c:266
+#: src/plugins/bsfilter/bsfilter_gtk.c:326
+#: src/plugins/spamassassin/spamassassin.c:118
+#: src/plugins/spamassassin/spamassassin_gtk.c:459
+#: src/plugins/spamassassin/spamassassin_gtk.c:508
+#: src/plugins/spamassassin/spamassassin_gtk.c:635 src/prefs_matcher.c:686
+#: src/prefs_matcher.c:719 src/prefs_matcher.c:1661 src/prefs_matcher.c:1668
+#: src/prefs_matcher.c:1676 src/prefs_matcher.c:1678 src/prefs_matcher.c:2586
+#: src/prefs_matcher.c:2590
+msgid "Any"
+msgstr "任何"
+
+#: src/plugins/bogofilter/bogofilter.c:457
 msgid "Bogofilter: fetching bodies..."
 msgstr "Bogofilter: 正在取得內容..."
 
-#: src/plugins/bogofilter/bogofilter.c:469
+#: src/plugins/bogofilter/bogofilter.c:470
 msgid "Bogofilter: filtering messages..."
 msgstr "Bogofilter: 正在取得郵件..."
 
-#: src/plugins/bogofilter/bogofilter.c:585
+#: src/plugins/bogofilter/bogofilter.c:586
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The probable cause of the "
 "error is that it didn't learn from any mail.\n"
@@ -9206,28 +9326,28 @@ msgstr ""
 "使用 \"/Mark/Mark as spam\" 和 \"/Mark/Mark as ham\" 來對 Bogofilter 進行訓"
 "練,建議使用數百個垃圾郵件及一般郵件來進行。"
 
-#: src/plugins/bogofilter/bogofilter.c:592
+#: src/plugins/bogofilter/bogofilter.c:593
 #, c-format
 msgid ""
 "The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
 "couldn't be run."
 msgstr "此Bogofilter外掛程式無法過濾一個郵件。這個命令 `%s %s %s` 無法被執行"
 
-#: src/plugins/bogofilter/bogofilter.c:739
+#: src/plugins/bogofilter/bogofilter.c:740
 msgid "Bogofilter: learning from message..."
 msgstr "Bogofilter: 從郵件中學習..."
 
-#: src/plugins/bogofilter/bogofilter.c:752
-#: src/plugins/bogofilter/bogofilter.c:799 src/plugins/bsfilter/bsfilter.c:486
+#: src/plugins/bogofilter/bogofilter.c:753
+#: src/plugins/bogofilter/bogofilter.c:800 src/plugins/bsfilter/bsfilter.c:486
 #, c-format
 msgid "Learning failed; `%s` returned with status %d."
 msgstr "學習失敗; `%s` 返回狀態為 %d."
 
-#: src/plugins/bogofilter/bogofilter.c:767
+#: src/plugins/bogofilter/bogofilter.c:768
 msgid "Bogofilter: learning from messages..."
 msgstr "Bogofilter: 從郵件中學習..."
 
-#: src/plugins/bogofilter/bogofilter.c:855
+#: src/plugins/bogofilter/bogofilter.c:856
 #, c-format
 msgid ""
 "Learning failed; `%s %s %s` returned with error:\n"
@@ -9236,7 +9356,7 @@ msgstr ""
 "學習失敗; `%s %s %s` 返回錯誤:\n"
 "%s"
 
-#: src/plugins/bogofilter/bogofilter.c:983
+#: src/plugins/bogofilter/bogofilter.c:984
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using Bogofilter. You will need Bogofilter installed "
@@ -9261,96 +9381,96 @@ msgstr ""
 "\n"
 "可以在/Configuration/Preferences/Plugins/Bogofilter中找到所有的選項"
 
-#: src/plugins/bogofilter/bogofilter.c:1016 src/plugins/bsfilter/bsfilter.c:649
-#: src/plugins/spamassassin/spamassassin.c:624
+#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:649
+#: src/plugins/spamassassin/spamassassin.c:643
 msgid "Spam detection"
 msgstr "垃圾郵件偵測"
 
-#: src/plugins/bogofilter/bogofilter.c:1017 src/plugins/bsfilter/bsfilter.c:650
-#: src/plugins/spamassassin/spamassassin.c:625
+#: src/plugins/bogofilter/bogofilter.c:1018 src/plugins/bsfilter/bsfilter.c:650
+#: src/plugins/spamassassin/spamassassin.c:644
 msgid "Spam learning"
 msgstr "垃圾郵件學習中"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:161
 #: src/plugins/bsfilter/bsfilter_gtk.c:143
-#: src/plugins/spamassassin/spamassassin_gtk.c:400
+#: src/plugins/spamassassin/spamassassin_gtk.c:416
 msgid "Process messages on receiving"
 msgstr "收信時處理郵件"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:169
 #: src/plugins/bsfilter/bsfilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:358
+#: src/plugins/spamassassin/spamassassin_gtk.c:374
 msgid "Maximum size"
 msgstr "最大容量"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:178
 #: src/plugins/bsfilter/bsfilter_gtk.c:160
-#: src/plugins/spamassassin/spamassassin_gtk.c:367
+#: src/plugins/spamassassin/spamassassin_gtk.c:383
 msgid "Messages larger than this will not be checked"
 msgstr "郵件大小超過此將不被檢查"
 
 #: src/plugins/bogofilter/bogofilter_gtk.c:181
 #: src/plugins/bsfilter/bsfilter_gtk.c:163
-#: src/plugins/spamassassin/spamassassin_gtk.c:370 src/prefs_account.c:1544
+#: src/plugins/spamassassin/spamassassin_gtk.c:386 src/prefs_account.c:1616
 msgid "KB"
 msgstr "KB"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:200
+#: src/plugins/bogofilter/bogofilter_gtk.c:192
 msgid "Delete spam"
 msgstr "刪除垃圾件"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:207
+#: src/plugins/bogofilter/bogofilter_gtk.c:195
 msgid "Save spam in..."
 msgstr "儲存垃圾郵件在..."
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:214
+#: src/plugins/bogofilter/bogofilter_gtk.c:198
 msgid "Only mark as spam"
 msgstr "只標示為垃圾郵件"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:227
+#: src/plugins/bogofilter/bogofilter_gtk.c:211
 #: src/plugins/bsfilter/bsfilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:416
+#: src/plugins/spamassassin/spamassassin_gtk.c:432
 msgid ""
 "Folder for storing identified spam. Leave empty to use the trash folder."
 msgstr "這是用來儲存已被判定為垃圾郵件的資料夾。清空它用來作為回收桶。"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:233
+#: src/plugins/bogofilter/bogofilter_gtk.c:217
 #: src/plugins/bsfilter/bsfilter_gtk.c:185
-#: src/plugins/spamassassin/spamassassin_gtk.c:422
+#: src/plugins/spamassassin/spamassassin_gtk.c:438
 msgid "Click this button to select a folder for storing spam"
 msgstr "按下此鍵選擇一個資料夾作為儲存垃圾郵件使用"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:242
+#: src/plugins/bogofilter/bogofilter_gtk.c:226
 msgid "When unsure, move to"
 msgstr "當不確定時,移至"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:250
+#: src/plugins/bogofilter/bogofilter_gtk.c:234
 msgid ""
 "Folder for storing mail for which spam status is Unsure. Leave empty to use "
 "the Inbox folder."
 msgstr "用來儲存尚未確認是否為垃圾郵件的資料夾。保持它為空用來作為收件資料夾"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:256
+#: src/plugins/bogofilter/bogofilter_gtk.c:240
 msgid "Click this button to select a folder for storing Unsure mails."
 msgstr "按下盤鍵選擇一個資料夾作以儲存不確定的郵件"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:258
+#: src/plugins/bogofilter/bogofilter_gtk.c:242
 msgid "Insert X-Bogosity header"
 msgstr "插入 X-Bogosity 標頭"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:262
+#: src/plugins/bogofilter/bogofilter_gtk.c:246
 msgid "Only done for messages in MH folders"
 msgstr "只執行在MH資料夾內的郵件"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:268
+#: src/plugins/bogofilter/bogofilter_gtk.c:252
 #: src/plugins/bsfilter/bsfilter_gtk.c:191
-#: src/plugins/spamassassin/spamassassin_gtk.c:437
+#: src/plugins/spamassassin/spamassassin_gtk.c:453
 msgid "Whitelist senders found in address book/folder"
 msgstr "在通訊錄或資料夾中發現白名單的寄件者"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:272
+#: src/plugins/bogofilter/bogofilter_gtk.c:256
 #: src/plugins/bsfilter/bsfilter_gtk.c:195
-#: src/plugins/spamassassin/spamassassin_gtk.c:441
+#: src/plugins/spamassassin/spamassassin_gtk.c:457
 msgid ""
 "Messages coming from your address book contacts will be received in the "
 "normal folder even if detected as spam"
@@ -9358,18 +9478,18 @@ msgstr ""
 "縱使被判定為垃圾郵件,只要郵件是來自於通訊錄中的聯絡人,將一律接收且置於一般"
 "資料夾內"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:282
+#: src/plugins/bogofilter/bogofilter_gtk.c:266
 #: src/plugins/bsfilter/bsfilter_gtk.c:205
-#: src/plugins/spamassassin/spamassassin_gtk.c:451
+#: src/plugins/spamassassin/spamassassin_gtk.c:467
 msgid "Click this button to select a book or folder in the address book"
 msgstr "按下此鍵在通訊錄中選擇一本書或資料夾"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:284
+#: src/plugins/bogofilter/bogofilter_gtk.c:268
 #: src/plugins/bsfilter/bsfilter_gtk.c:207
 msgid "Learn whitelisted emails as ham"
 msgstr "學習白名單中的郵件為正常郵件"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:286
+#: src/plugins/bogofilter/bogofilter_gtk.c:270
 msgid ""
 "If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
 "learn it as ham."
@@ -9377,17 +9497,17 @@ msgstr ""
 "如果bogofilter認為電子郵件是垃圾郵件或不確定,但是它在白名單中,則學習並視為"
 "非垃圾郵件"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:295
+#: src/plugins/bogofilter/bogofilter_gtk.c:279
 msgid "Bogofilter call"
 msgstr "bogofilter 呼叫"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:303
+#: src/plugins/bogofilter/bogofilter_gtk.c:287
 msgid "Path to bogofilter executable"
 msgstr "bogofilter執行檔案的路徑"
 
-#: src/plugins/bogofilter/bogofilter_gtk.c:309
+#: src/plugins/bogofilter/bogofilter_gtk.c:293
 #: src/plugins/bsfilter/bsfilter_gtk.c:232
-#: src/plugins/spamassassin/spamassassin_gtk.c:429
+#: src/plugins/spamassassin/spamassassin_gtk.c:445
 msgid "Mark spam as read"
 msgstr "將垃圾郵件標記為已讀"
 
@@ -9452,7 +9572,7 @@ msgstr ""
 "可以在/Configuration/Preferences/Plugins/Bsfilter中找到所有的選項"
 
 #: src/plugins/bsfilter/bsfilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:408
+#: src/plugins/spamassassin/spamassassin_gtk.c:424
 msgid "Save spam in"
 msgstr "儲存垃圾郵件在"
 
@@ -9473,7 +9593,7 @@ msgid "Path to bsfilter executable"
 msgstr "Bsfilter的執行路徑"
 
 #: src/plugins/clamd/clamav_plugin.c:47
-#: src/plugins/clamd/clamav_plugin_gtk.c:550
+#: src/plugins/clamd/clamav_plugin_gtk.c:538
 msgid "Clam AntiVirus"
 msgstr "Clam 防毒"
 
@@ -9589,52 +9709,52 @@ msgstr "病毒偵測"
 msgid "Select folder to store infected messages in"
 msgstr "選擇資料夾用來儲存所有已過濾的郵件"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:250
+#: src/plugins/clamd/clamav_plugin_gtk.c:248
 msgid "Enable virus scanning"
 msgstr "開啟病毒掃描"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:260
+#: src/plugins/clamd/clamav_plugin_gtk.c:258
 msgid "Maximum attachment size"
 msgstr "最大的附加檔大小"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:271
+#: src/plugins/clamd/clamav_plugin_gtk.c:269
 msgid "Message attachments larger than this will not be scanned"
 msgstr "郵件附加檔過大,將無法被掃描"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:275
+#: src/plugins/clamd/clamav_plugin_gtk.c:272
 msgid "MB"
 msgstr "MB"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:284
+#: src/plugins/clamd/clamav_plugin_gtk.c:281
 msgid "Save infected mail in"
 msgstr "儲存被感染的郵件至"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:288
+#: src/plugins/clamd/clamav_plugin_gtk.c:285
 msgid "Save mail that contains viruses"
 msgstr "儲存包含病毒的郵件"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:296
+#: src/plugins/clamd/clamav_plugin_gtk.c:292
 msgid ""
 "Folder for storing infected mail. Leave empty to use the default trash folder"
 msgstr "儲存被感染郵件的資料夾。留下空白以使用預設的回收桶"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:304
+#: src/plugins/clamd/clamav_plugin_gtk.c:299
 msgid "Click this button to select a folder for storing infected mail"
 msgstr "按下此鍵選擇一個資料夾以儲存感染郵件"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:312
+#: src/plugins/clamd/clamav_plugin_gtk.c:306
 msgid "Automatic configuration"
 msgstr "自動配置"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:317
+#: src/plugins/clamd/clamav_plugin_gtk.c:311
 msgid "Should configuration be done automatic or manual"
 msgstr "採用自動配置或是手動配置?"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:325
+#: src/plugins/clamd/clamav_plugin_gtk.c:318
 msgid "Where is clamd.conf"
 msgstr "clamd.conf 位於什麼地方?"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:333
+#: src/plugins/clamd/clamav_plugin_gtk.c:326
 msgid ""
 "Full path to clamd.conf. If this field is not empty then the plugin has been "
 "able to locate the file automatically"
@@ -9642,35 +9762,35 @@ msgstr ""
 "clamd.conf的完整路徑。如果這個欄位不是空白的,則這個外掛程式會自動地把這個檔"
 "案放置在指定的位置"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:337
+#: src/plugins/clamd/clamav_plugin_gtk.c:329
 msgid "Br_owse"
 msgstr "瀏覽(_o)"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:341
+#: src/plugins/clamd/clamav_plugin_gtk.c:333
 msgid "Click this button to select full path to clamd.conf"
 msgstr "按下此鍵選擇clamd.conf的完成路徑"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:349
+#: src/plugins/clamd/clamav_plugin_gtk.c:340
 msgid "Check permission for folders and adjust if necessary"
 msgstr "如果需要的話,檢查並調整資料夾的權限"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:362
+#: src/plugins/clamd/clamav_plugin_gtk.c:353
 msgid "Click this button to check and adjust folder permissions"
 msgstr "按下此鍵檢查並調整資料夾的權限"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:370
+#: src/plugins/clamd/clamav_plugin_gtk.c:360
 msgid "Remote Host"
 msgstr "遠端主機"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:378
+#: src/plugins/clamd/clamav_plugin_gtk.c:368
 msgid "Hostname or IP for remote host running clamav daemon"
 msgstr "遠端主機名稱或IP正在執行clamav討護神"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:398
+#: src/plugins/clamd/clamav_plugin_gtk.c:387
 msgid "Port number where clamav daemon is listening"
 msgstr "clamav 守護者的通訊埠號碼監聽中"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:525
+#: src/plugins/clamd/clamav_plugin_gtk.c:513
 msgid ""
 "New config\n"
 "No socket information.\n"
@@ -9680,7 +9800,7 @@ msgstr ""
 "沒有 socket 資訊\n"
 "防毒功能關閉"
 
-#: src/plugins/clamd/clamav_plugin_gtk.c:529
+#: src/plugins/clamd/clamav_plugin_gtk.c:517
 msgid ""
 "New config\n"
 "Clamd does not respond to ping.\n"
@@ -9690,7 +9810,7 @@ msgstr ""
 "Clamd 沒有回應給 ping.\n"
 "clamd 仍在執行嗎?"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:121
+#: src/plugins/clamd/libclamd/clamd-plugin.c:122
 #, c-format
 msgid ""
 "%s: Unable to open\n"
@@ -9699,7 +9819,7 @@ msgstr ""
 "%s:無法開啟\n"
 "clamd 將被關閉"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:216
+#: src/plugins/clamd/libclamd/clamd-plugin.c:217
 #, c-format
 msgid ""
 "%s: Not able to find required information\n"
@@ -9708,30 +9828,30 @@ msgstr ""
 "%s: 找不到需要的資訊\n"
 "clamd 將被關閉"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:250
+#: src/plugins/clamd/libclamd/clamd-plugin.c:251
 msgid "Could not create socket"
 msgstr "無誤建立socket"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:437
+#: src/plugins/clamd/libclamd/clamd-plugin.c:442
 msgid ": File does not exist"
 msgstr ": 檔案不存在"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:450
+#: src/plugins/clamd/libclamd/clamd-plugin.c:455
 msgid ": Unable to open"
 msgstr ": 無法開啟"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:470
-#: src/plugins/clamd/libclamd/clamd-plugin.c:475
-#: src/plugins/clamd/libclamd/clamd-plugin.c:489
+#: src/plugins/clamd/libclamd/clamd-plugin.c:474
+#: src/plugins/clamd/libclamd/clamd-plugin.c:479
+#: src/plugins/clamd/libclamd/clamd-plugin.c:493
 msgid "Socket write error"
 msgstr "Socket寫入錯誤"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:482
+#: src/plugins/clamd/libclamd/clamd-plugin.c:486
 #, c-format
 msgid "%s: Error reading"
 msgstr "%s: 讀取錯誤"
 
-#: src/plugins/clamd/libclamd/clamd-plugin.c:496
+#: src/plugins/clamd/libclamd/clamd-plugin.c:500
 msgid "Socket read error"
 msgstr "Socket讀取錯誤"
 
@@ -9755,63 +9875,64 @@ msgstr ""
 "\n"
 "它並不是真的那麼有用"
 
-#: src/plugins/fancy/fancy_prefs.c:146
+#: src/plugins/fancy/fancy_prefs.c:147
 msgid "Display images"
 msgstr "顯示圖片"
 
-#: src/plugins/fancy/fancy_prefs.c:147
+#: src/plugins/fancy/fancy_prefs.c:148
 msgid "Display embedded images"
 msgstr "顯示內嵌的圖片"
 
-#: src/plugins/fancy/fancy_prefs.c:151
+#: src/plugins/fancy/fancy_prefs.c:152
 msgid "Execute javascript"
 msgstr "執行 javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:152
+#: src/plugins/fancy/fancy_prefs.c:153
 msgid "Execute embedded javascript"
 msgstr "執行內嵌的 javascript"
 
-#: src/plugins/fancy/fancy_prefs.c:156
+#: src/plugins/fancy/fancy_prefs.c:157
 msgid "Execute Java applets"
 msgstr "執行 Java applets"
 
-#: src/plugins/fancy/fancy_prefs.c:157
+#: src/plugins/fancy/fancy_prefs.c:158
 msgid "Execute embedded Java applets"
 msgstr "執行內嵌的 Java applets"
 
-#: src/plugins/fancy/fancy_prefs.c:161
+#: src/plugins/fancy/fancy_prefs.c:162
 msgid "Render objects using plugins"
 msgstr "使用外掛程式處理物件"
 
-#: src/plugins/fancy/fancy_prefs.c:162
+#: src/plugins/fancy/fancy_prefs.c:163
 msgid "Render embedded objects using plugins"
 msgstr "使用外掛程式處理內嵌的物件"
 
-#: src/plugins/fancy/fancy_prefs.c:169
-msgid "Open in viewer (remote content is enabled)"
+#: src/plugins/fancy/fancy_prefs.c:170
+msgid "Open in Viewer (remote content is enabled)"
 msgstr "在顯示視窗中開啟 (使用遠端資源)"
 
-#: src/plugins/fancy/fancy_prefs.c:172
+#: src/plugins/fancy/fancy_prefs.c:173
 msgid "Do nothing (remote content is disabled)"
 msgstr "無效 (使用遠端資源)"
 
-#: src/plugins/fancy/fancy_prefs.c:209
+#: src/plugins/fancy/fancy_prefs.c:210 src/prefs_account.c:3924
+#: src/prefs_proxy.c:241
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: src/plugins/fancy/fancy_prefs.c:211
+#: src/plugins/fancy/fancy_prefs.c:212
 msgid "Use GNOME's proxy settings"
 msgstr "使用 GNOME 的代表伺服器設定"
 
-#: src/plugins/fancy/fancy_prefs.c:219
+#: src/plugins/fancy/fancy_prefs.c:220
 msgid "Use proxy"
 msgstr "使用代理伺服器"
 
-#: src/plugins/fancy/fancy_prefs.c:237
+#: src/plugins/fancy/fancy_prefs.c:238
 msgid "Remote resources"
 msgstr "遠端資源"
 
-#: src/plugins/fancy/fancy_prefs.c:238
+#: src/plugins/fancy/fancy_prefs.c:239
 msgid ""
 "Loading remote resources can lead to some privacy issues.\n"
 "When remote content loading is disabled, nothing will be requested\n"
@@ -9823,121 +9944,117 @@ msgstr ""
 "要求。\n"
 "對於郵件中有夾帶的圖片、scripts、外掛物件或Java applets,則依然可以進行處理"
 
-#: src/plugins/fancy/fancy_prefs.c:244
+#: src/plugins/fancy/fancy_prefs.c:245
 msgid "Enable loading of remote content"
 msgstr "載入遠端資源"
 
-#: src/plugins/fancy/fancy_prefs.c:276
+#: src/plugins/fancy/fancy_prefs.c:277
 msgid "When clicking on a link, by default"
 msgstr "當按下超連結,預設將執行"
 
-#: src/plugins/fancy/fancy_prefs.c:284
-msgid "Open in external browser"
-msgstr "在外部瀏覽器開開啟"
+#: src/plugins/fancy/fancy_prefs.c:285
+msgid "Open in External Browser"
+msgstr "在外部瀏覽器開啟"
 
-#: src/plugins/fancy/fancy_prefs.c:298
+#: src/plugins/fancy/fancy_prefs.c:299
 msgid "The CSS in this file will be applied to all HTML parts"
 msgstr "此檔案內的CSS將套用在所有的HTML上"
 
-#: src/plugins/fancy/fancy_prefs.c:308
+#: src/plugins/fancy/fancy_prefs.c:309
 #: src/plugins/notification/notification_prefs.c:1346
-#: src/plugins/pgpcore/prefs_gpg.c:209 src/plugins/rssyl/rssyl_prefs.c:186
-#: src/prefs_account.c:1478 src/prefs_account.c:1567 src/prefs_account.c:2055
-#: src/prefs_customheader.c:234
+#: src/plugins/pgpcore/prefs_gpg.c:208 src/plugins/rssyl/rssyl_prefs.c:186
+#: src/prefs_account.c:1550 src/prefs_account.c:1639 src/prefs_account.c:2190
+#: src/prefs_customheader.c:236
 msgid "Bro_wse"
 msgstr "瀏覽(W)"
 
-#: src/plugins/fancy/fancy_prefs.c:350
+#: src/plugins/fancy/fancy_prefs.c:351
 msgid "Select stylesheet"
 msgstr "選擇風格"
 
-#: src/plugins/fancy/fancy_viewer.c:418
+#: src/plugins/fancy/fancy_viewer.c:409
 msgid "Remote content loading is disabled."
 msgstr "不載入遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:497
+#: src/plugins/fancy/fancy_viewer.c:488
 msgid "Load images"
 msgstr "載入圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:499
+#: src/plugins/fancy/fancy_viewer.c:490
 msgid "Enable remote content"
 msgstr "使用遠端資源"
 
-#: src/plugins/fancy/fancy_viewer.c:501
+#: src/plugins/fancy/fancy_viewer.c:492
 msgid "Enable Javascript"
 msgstr "啟用 Javascript"
 
-#: src/plugins/fancy/fancy_viewer.c:503
+#: src/plugins/fancy/fancy_viewer.c:494
 msgid "Enable Plugins"
 msgstr "啟用外掛程式"
 
-#: src/plugins/fancy/fancy_viewer.c:505
+#: src/plugins/fancy/fancy_viewer.c:496
 msgid "Enable Java"
 msgstr "啟用 Java"
 
-#: src/plugins/fancy/fancy_viewer.c:507
+#: src/plugins/fancy/fancy_viewer.c:498
 msgid "Open links with external browser"
 msgstr "以外部瀏覽器開啟連結"
 
-#: src/plugins/fancy/fancy_viewer.c:689
+#: src/plugins/fancy/fancy_viewer.c:673
 #, c-format
 msgid "An error occurred: %d\n"
 msgstr "發生錯誤: %d\n"
 
-#: src/plugins/fancy/fancy_viewer.c:745
+#: src/plugins/fancy/fancy_viewer.c:733
 #, c-format
 msgid "%s is a malformed or not supported feed"
 msgstr "%s 是一個畸形或不支援的輸入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:756
+#: src/plugins/fancy/fancy_viewer.c:744
 msgid "Search the Web"
 msgstr "搜尋瀏覽器"
 
-#: src/plugins/fancy/fancy_viewer.c:768
+#: src/plugins/fancy/fancy_viewer.c:755
 msgid "Open in Viewer"
 msgstr "在檢視器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:770
-msgid "Open in Viewer (enable remote content)"
-msgstr "在檢視器中開啟 (啟用遠端的內容)"
-
-#: src/plugins/fancy/fancy_viewer.c:779
+#: src/plugins/fancy/fancy_viewer.c:764
 msgid "Open in Browser"
 msgstr "在瀏覽器中開啟"
 
-#: src/plugins/fancy/fancy_viewer.c:789
+#: src/plugins/fancy/fancy_viewer.c:774
 msgid "Open Image"
 msgstr "開啟圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:798
+#: src/plugins/fancy/fancy_viewer.c:783
 msgid "Copy Link"
 msgstr "複製連結"
 
-#: src/plugins/fancy/fancy_viewer.c:802
+#: src/plugins/fancy/fancy_viewer.c:787
 msgid "Download Link"
 msgstr "下載連結"
 
-#: src/plugins/fancy/fancy_viewer.c:813
+#: src/plugins/fancy/fancy_viewer.c:798
 msgid "Save Image As"
 msgstr "另存圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:823
+#: src/plugins/fancy/fancy_viewer.c:808
 msgid "Copy Image"
 msgstr "複製圖片"
 
-#: src/plugins/fancy/fancy_viewer.c:841
+#: src/plugins/fancy/fancy_viewer.c:848
 msgid "Import feed"
 msgstr "匯入資料"
 
-#: src/plugins/fancy/fancy_viewer.c:1120
+#: src/plugins/fancy/fancy_viewer.c:1130
 msgid "Fancy"
 msgstr "Fancy"
 
-#: src/plugins/fancy/fancy_viewer.c:1148
+#: src/plugins/fancy/fancy_viewer.c:1158
 msgid "Fancy HTML Viewer"
 msgstr "Fancy HTML 檢視器"
 
-#: src/plugins/fancy/fancy_viewer.c:1153
+#: src/plugins/fancy/fancy_viewer.c:1163
 #, c-format
 msgid ""
 "This plugin renders HTML mail using the WebKit %d.%d.%d library.\n"
@@ -10108,47 +10225,53 @@ msgstr "GData外掛程式:認證錯誤: %s\n"
 msgid "GData plugin: Authorization successful\n"
 msgstr "GData外掛程式: 認證成功\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:464
+#: src/plugins/gdata/cm_gdata_contacts.c:474
 msgid "GData plugin: Starting interactive authorization\n"
 msgstr "GData外掛程式: 開始進行內部認證\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:474
+#: src/plugins/gdata/cm_gdata_contacts.c:481
 msgid "GData plugin: Got authorization code, requesting authorization\n"
 msgstr "GData外掛程式: 已取得認證碼,要求認證\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:481
+#: src/plugins/gdata/cm_gdata_contacts.c:488
 msgid ""
 "GData plugin: No authorization code received, authorization request "
 "cancelled\n"
 msgstr "GData外掛程式:沒有收到認證碼,認證要求取消\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:497
+#: src/plugins/gdata/cm_gdata_contacts.c:494
+msgid ""
+"GData plugin: Interactive authorization still running, no additional session "
+"started\n"
+msgstr "GData外掛程式: 認證執行中,沒有已執行的額外項目\n"
+
+#: src/plugins/gdata/cm_gdata_contacts.c:511
 #, c-format
 msgid "GData plugin: Authorization refresh error: %s\n"
 msgstr "GData外掛程式: 認證刷新失敗: %s\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:506
+#: src/plugins/gdata/cm_gdata_contacts.c:535
 msgid "GData plugin: Authorization refresh successful\n"
 msgstr "GData外掛程式: 認證刷新成功\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:566
+#: src/plugins/gdata/cm_gdata_contacts.c:595
 #, c-format
 msgid ""
 "GData plugin: Elapsed time since last refresh: %d minutes, refreshing now\n"
 msgstr ""
 "GData 外掛: 從上次刷新開始到現在所經過的時間: %d 分鐘,目前正在刷新中\n"
 
-#: src/plugins/gdata/cm_gdata_contacts.c:574
+#: src/plugins/gdata/cm_gdata_contacts.c:603
 msgid "GData plugin: Trying to refresh authorization\n"
 msgstr "GData外掛程式: 正在嘗試刷新認證\n"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:78
-#: src/plugins/managesieve/sieve_prefs.c:203 src/prefs_account.c:1786
+#: src/plugins/managesieve/sieve_prefs.c:199 src/prefs_account.c:1921
 msgid "Authentication"
 msgstr "認證"
 
 #: src/plugins/gdata/cm_gdata_prefs.c:84
-#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1560
+#: src/plugins/spam_report/spam_report_prefs.c:172 src/wizard.c:1562
 msgid "Username:"
 msgstr "使用者名稱"
 
@@ -10193,30 +10316,30 @@ msgstr ""
 msgid "GData integration"
 msgstr "GData整合"
 
-#: src/plugins/libravatar/libravatar.c:338
-#: src/plugins/libravatar/libravatar.c:403
-#: src/plugins/libravatar/libravatar.c:463
+#: src/plugins/libravatar/libravatar.c:332
+#: src/plugins/libravatar/libravatar.c:397
+#: src/plugins/libravatar/libravatar.c:457
 #: src/plugins/libravatar/libravatar_prefs.c:546
 msgid "Libravatar"
 msgstr "Libravatar"
 
-#: src/plugins/libravatar/libravatar.c:345
+#: src/plugins/libravatar/libravatar.c:339
 msgid "Failed to register avatar header update hook"
 msgstr "註冊 avatar 標頭的更新 hook 失敗"
 
-#: src/plugins/libravatar/libravatar.c:354
+#: src/plugins/libravatar/libravatar.c:348
 msgid "Failed to register avatar image render hook"
 msgstr "註冊 avatar 圖示的渲染 hook 失敗"
 
-#: src/plugins/libravatar/libravatar.c:360
+#: src/plugins/libravatar/libravatar.c:354
 msgid "Failed to create avatar image cache directory"
 msgstr "建立 avatar 圖示的快取目錄失敗"
 
-#: src/plugins/libravatar/libravatar.c:370
+#: src/plugins/libravatar/libravatar.c:364
 msgid "Failed to load missing items cache"
 msgstr "載入遺失的項目快取失敗"
 
-#: src/plugins/libravatar/libravatar.c:413
+#: src/plugins/libravatar/libravatar.c:407
 msgid ""
 "Display libravatar profiles' images for mail messages. More\n"
 "info about libravatar at http://www.libravatar.org/. If you have\n"
@@ -10318,8 +10441,8 @@ msgid "Cache refresh interval"
 msgstr "快取刷新的間隔時間"
 
 #: src/plugins/libravatar/libravatar_prefs.c:229
-#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1523
-#: src/prefs_matcher.c:336 src/prefs_receive.c:177
+#: src/plugins/vcalendar/vcal_prefs.c:323 src/prefs_account.c:1595
+#: src/prefs_account.c:1752 src/prefs_matcher.c:340 src/prefs_receive.c:180
 msgid "hours"
 msgstr "小時"
 
@@ -10462,70 +10585,70 @@ msgstr ""
 "在 '%s' 下的所有資料夾和郵件將會被刪除\n"
 "你確定要刪除嗎?"
 
-#: src/plugins/managesieve/managesieve.c:435
+#: src/plugins/managesieve/managesieve.c:436
 msgid "No Sieve auth method available\n"
 msgstr "找不到有效的Sieve認證方法\n"
 
-#: src/plugins/managesieve/managesieve.c:439
+#: src/plugins/managesieve/managesieve.c:440
 msgid "Selected Sieve auth method not available\n"
 msgstr "已經選擇的Sieve認證方法是無效的\n"
 
-#: src/plugins/managesieve/managesieve.c:672
+#: src/plugins/managesieve/managesieve.c:673
 msgid "Disconnected"
 msgstr "連線已終止"
 
-#: src/plugins/managesieve/managesieve.c:676
+#: src/plugins/managesieve/managesieve.c:677
 #, c-format
 msgid "Disconnected: %s"
 msgstr "連線已終止:  %s"
 
-#: src/plugins/managesieve/managesieve.c:725
-#: src/plugins/managesieve/managesieve.c:870
+#: src/plugins/managesieve/managesieve.c:726
+#: src/plugins/managesieve/managesieve.c:871
 #, c-format
 msgid "unhandled message on Sieve session: %s\n"
 msgstr "無法掌控在Sieve程序中的郵件: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:732
+#: src/plugins/managesieve/managesieve.c:733
 msgid "STARTTLS failed"
 msgstr "STARTTLS失效"
 
-#: src/plugins/managesieve/managesieve.c:797
-#: src/plugins/managesieve/managesieve.c:813
-#: src/plugins/managesieve/managesieve.c:840
-#: src/plugins/managesieve/managesieve.c:922
-#: src/plugins/managesieve/managesieve.c:940
+#: src/plugins/managesieve/managesieve.c:798
+#: src/plugins/managesieve/managesieve.c:814
+#: src/plugins/managesieve/managesieve.c:841
+#: src/plugins/managesieve/managesieve.c:923
+#: src/plugins/managesieve/managesieve.c:941
 msgid "error occurred on SIEVE session\n"
 msgstr "Sieve程序中發生錯誤\n"
 
-#: src/plugins/managesieve/managesieve.c:866
+#: src/plugins/managesieve/managesieve.c:867
 #, c-format
 msgid "error occurred on Sieve session. data: %s\n"
 msgstr "Sieve程序中發生錯誤: %s\n"
 
-#: src/plugins/managesieve/managesieve.c:875
+#: src/plugins/managesieve/managesieve.c:876
 #, c-format
 msgid "unhandled message on Sieve session: %d\n"
 msgstr "無法掌控在Sieve程序中的郵件: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1132
+#: src/plugins/managesieve/managesieve.c:1153
 msgid "Sieve: retrying auth\n"
 msgstr "Sieve: 重試認證: %d\n"
 
-#: src/plugins/managesieve/managesieve.c:1134
+#: src/plugins/managesieve/managesieve.c:1155
 msgid "Auth method not available"
 msgstr "認證方法無效"
 
-#: src/plugins/managesieve/managesieve.c:1151
+#: src/plugins/managesieve/managesieve.c:1172
 #, c-format
 msgid "sending error on Sieve session: %s\n"
 msgstr "在Sieve程序中發生傳送錯誤: %s\n"
 
-#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5676
+#: src/plugins/managesieve/sieve_editor.c:81 src/summaryview.c:5830
 msgid "_Filter"
 msgstr "過濾器(_F)"
 
 #: src/plugins/managesieve/sieve_editor.c:86
-#: src/plugins/managesieve/sieve_editor.c:630
+#: src/plugins/managesieve/sieve_editor.c:632
 msgid "Chec_k Syntax"
 msgstr "檢查語法(_k)"
 
@@ -10534,8 +10657,8 @@ msgid "Re_vert"
 msgstr "回復(_v)"
 
 #: src/plugins/managesieve/sieve_editor.c:296
-#: src/plugins/managesieve/sieve_editor.c:722
-#: src/plugins/managesieve/sieve_manager.c:182
+#: src/plugins/managesieve/sieve_editor.c:724
+#: src/plugins/managesieve/sieve_manager.c:183
 msgid "Unable to get script contents"
 msgstr "無法取得script內容"
 
@@ -10567,67 +10690,67 @@ msgstr "儲存..."
 msgid "Checking syntax..."
 msgstr "語法檢查..."
 
-#: src/plugins/managesieve/sieve_editor.c:432
+#: src/plugins/managesieve/sieve_editor.c:433
 msgid "This script has been modified. Save the latest changes?"
 msgstr "這個腳本已經被修改過。儲存最新的異動嗎?"
 
-#: src/plugins/managesieve/sieve_editor.c:693
+#: src/plugins/managesieve/sieve_editor.c:695
 #, c-format
 msgid "%s - Sieve Filter%s"
 msgstr "%s - 過濾器%s"
 
-#: src/plugins/managesieve/sieve_editor.c:742
-#: src/plugins/pdf_viewer/poppler_viewer.c:1282
+#: src/plugins/managesieve/sieve_editor.c:744
+#: src/plugins/pdf_viewer/poppler_viewer.c:1315
 msgid "Loading..."
 msgstr "載入..."
 
-#: src/plugins/managesieve/sieve_manager.c:159
-#: src/plugins/managesieve/sieve_manager.c:241
+#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:246
 msgid "Add Sieve script"
 msgstr "新增Sieve腳本"
 
-#: src/plugins/managesieve/sieve_manager.c:160
+#: src/plugins/managesieve/sieve_manager.c:161
 msgid "Enter name for a new Sieve filter script."
 msgstr "為新的Sieve腳本輸入名稱"
 
-#: src/plugins/managesieve/sieve_manager.c:242
+#: src/plugins/managesieve/sieve_manager.c:247
 msgid "Enter new name for the script."
 msgstr "為腳本輸入新的名稱"
 
-#: src/plugins/managesieve/sieve_manager.c:323
+#: src/plugins/managesieve/sieve_manager.c:328
 #, c-format
 msgid "Do you really want to delete the filter '%s'?"
 msgstr "你確定要刪除過濾器 '%s' 嗎?"
 
-#: src/plugins/managesieve/sieve_manager.c:324
+#: src/plugins/managesieve/sieve_manager.c:329
 msgid "Delete filter"
 msgstr "刪除過濾器"
 
-#: src/plugins/managesieve/sieve_manager.c:478
+#: src/plugins/managesieve/sieve_manager.c:483
 msgid "Active"
 msgstr "啟用"
 
-#: src/plugins/managesieve/sieve_manager.c:489
+#: src/plugins/managesieve/sieve_manager.c:494
 msgid "An account can only have one active script at a time."
 msgstr "一個帳號一次只能有一個啟動腳本"
 
-#: src/plugins/managesieve/sieve_manager.c:576
+#: src/plugins/managesieve/sieve_manager.c:581
 msgid "Unable to connect"
 msgstr "無法進行連線"
 
-#: src/plugins/managesieve/sieve_manager.c:623
+#: src/plugins/managesieve/sieve_manager.c:628
 msgid "Listing scripts..."
 msgstr "列出腳本..."
 
-#: src/plugins/managesieve/sieve_manager.c:626
+#: src/plugins/managesieve/sieve_manager.c:631
 msgid "Connecting..."
 msgstr "連線..."
 
-#: src/plugins/managesieve/sieve_manager.c:658
+#: src/plugins/managesieve/sieve_manager.c:663
 msgid "Manage Sieve Filters"
 msgstr "管理Sieve過濾器"
 
-#: src/plugins/managesieve/sieve_manager.c:800
+#: src/plugins/managesieve/sieve_manager.c:806
 msgid "To use Sieve, enable it in an account's preferences."
 msgstr "若要使用Sieve,要在帳號的選項中啟用它"
 
@@ -10648,108 +10771,109 @@ msgstr "在伺服器上使用ManageSieve協定管理Sieve過濾器"
 msgid "Enable Sieve"
 msgstr "啟用Sieve"
 
-#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1102
+#: src/plugins/managesieve/sieve_prefs.c:156 src/prefs_account.c:1193
 msgid "Server information"
 msgstr "伺服器資訊"
 
-#: src/plugins/managesieve/sieve_prefs.c:165
+#: src/plugins/managesieve/sieve_prefs.c:163
 msgid "Server name"
 msgstr "伺服器名稱"
 
-#: src/plugins/managesieve/sieve_prefs.c:174
+#: src/plugins/managesieve/sieve_prefs.c:172
 msgid "Connect to this host instead of the host used for receiving mail"
 msgstr "連線到用來接收郵件的主機以取代這個主機"
 
-#: src/plugins/managesieve/sieve_prefs.c:178
+#: src/plugins/managesieve/sieve_prefs.c:176
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
-#: src/plugins/managesieve/sieve_prefs.c:185
+#: src/plugins/managesieve/sieve_prefs.c:183
 msgid "Connect to this port instead of the default"
 msgstr "連線到預設的通訊埠以及代目前的這個"
 
-#: src/plugins/managesieve/sieve_prefs.c:189
+#: src/plugins/managesieve/sieve_prefs.c:187
 msgid "Encryption"
 msgstr "加密"
 
-#: src/plugins/managesieve/sieve_prefs.c:194
+#: src/plugins/managesieve/sieve_prefs.c:190
 msgid "No encryption"
 msgstr "沒有加密"
 
-#: src/plugins/managesieve/sieve_prefs.c:196
+#: src/plugins/managesieve/sieve_prefs.c:192
 msgid "Use STARTTLS when available"
 msgstr "當STARTTLS有效機使用它"
 
-#: src/plugins/managesieve/sieve_prefs.c:198
+#: src/plugins/managesieve/sieve_prefs.c:194
 msgid "Require STARTTLS"
 msgstr "需要STARTTLS"
 
-#: src/plugins/managesieve/sieve_prefs.c:206
-#: src/plugins/rssyl/rssyl_feed_props.c:262
+#: src/plugins/managesieve/sieve_prefs.c:202
+#: src/plugins/rssyl/rssyl_feed_props.c:268
 msgid "No authentication"
 msgstr "沒有認證"
 
-#: src/plugins/managesieve/sieve_prefs.c:208
+#: src/plugins/managesieve/sieve_prefs.c:204
 msgid "Use same authentication as for receiving mail"
 msgstr "對接收中的郵件採行一樣的認證"
 
-#: src/plugins/managesieve/sieve_prefs.c:210
+#: src/plugins/managesieve/sieve_prefs.c:206
 msgid "Specify authentication"
 msgstr "指定認證"
 
-#: src/plugins/managesieve/sieve_prefs.c:240
+#: src/plugins/managesieve/sieve_prefs.c:236
 #: src/plugins/vcalendar/vcal_prefs.c:391
-#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1297
-#: src/prefs_account.c:1832
+#: src/plugins/vcalendar/vcal_prefs.c:510 src/prefs_account.c:1388
+#: src/prefs_account.c:1967
 msgid "User ID"
 msgstr "使用者名稱"
 
-#: src/plugins/managesieve/sieve_prefs.c:250
-#: src/plugins/rssyl/rssyl_feed_props.c:393
+#: src/plugins/managesieve/sieve_prefs.c:246
+#: src/plugins/rssyl/rssyl_feed_props.c:383
 #: src/plugins/vcalendar/vcal_prefs.c:399
-#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1303
-#: src/prefs_account.c:1855 src/prefs_account.c:2583 src/prefs_account.c:2611
-#: src/wizard.c:1214 src/wizard.c:1634
+#: src/plugins/vcalendar/vcal_prefs.c:518 src/prefs_account.c:1394
+#: src/prefs_account.c:1990 src/prefs_account.c:2718 src/prefs_account.c:2746
+#: src/prefs_account.c:2943 src/prefs_proxy.c:134 src/wizard.c:1216
+#: src/wizard.c:1636
 msgid "Password"
 msgstr "密碼"
 
-#: src/plugins/managesieve/sieve_prefs.c:266 src/prefs_account.c:1606
-#: src/prefs_account.c:1804
+#: src/plugins/managesieve/sieve_prefs.c:262 src/prefs_account.c:1678
+#: src/prefs_account.c:1939
 msgid "Authentication method"
 msgstr "認證方式"
 
-#: src/plugins/managesieve/sieve_prefs.c:275 src/prefs_account.c:1616
-#: src/prefs_account.c:1813 src/prefs_send.c:261 src/prefs_send.c:332
-#: src/prefs_themes.c:1112
+#: src/plugins/managesieve/sieve_prefs.c:271 src/prefs_account.c:1688
+#: src/prefs_account.c:1948 src/prefs_send.c:265 src/prefs_send.c:336
+#: src/prefs_themes.c:1114
 msgid "Automatic"
 msgstr "自動"
 
-#: src/plugins/managesieve/sieve_prefs.c:394
+#: src/plugins/managesieve/sieve_prefs.c:390
 msgid "Sieve server must not contain a space."
 msgstr "Sieve伺服器必不能包含空白"
 
-#: src/plugins/managesieve/sieve_prefs.c:400
+#: src/plugins/managesieve/sieve_prefs.c:396
 msgid "Sieve server is not entered."
 msgstr "Sieve伺服器不能被登入"
 
-#: src/plugins/managesieve/sieve_prefs.c:428
+#: src/plugins/managesieve/sieve_prefs.c:424
 msgid "Sieve"
 msgstr "Sieve"
 
-#: src/plugins/newmail/newmail.c:106 src/plugins/newmail/newmail.c:149
+#: src/plugins/newmail/newmail.c:107 src/plugins/newmail/newmail.c:150
 msgid "NewMail"
 msgstr "新郵件"
 
-#: src/plugins/newmail/newmail.c:111
+#: src/plugins/newmail/newmail.c:112
 msgid "Failed to register newmail hook"
 msgstr "註冊新郵件hook失敗"
 
-#: src/plugins/newmail/newmail.c:128
+#: src/plugins/newmail/newmail.c:129
 #, c-format
 msgid "Could not open log file %s: %s\n"
 msgstr "無法開啟日誌檔 %s: %s\n"
 
-#: src/plugins/newmail/newmail.c:141
+#: src/plugins/newmail/newmail.c:142
 #, c-format
 msgid ""
 "This plugin writes a header summary to a log file for each mail received "
@@ -10765,11 +10889,11 @@ msgstr ""
 "\n"
 "目前的日誌是 %s"
 
-#: src/plugins/newmail/newmail.c:175
+#: src/plugins/newmail/newmail.c:176
 msgid "Log file"
 msgstr "日誌檔案"
 
-#: src/plugins/notification/notification_banner.c:356
+#: src/plugins/notification/notification_banner.c:357
 msgid "Folder:"
 msgstr "資料夾:"
 
@@ -10953,8 +11077,8 @@ msgstr "通知欄"
 msgid "Popup"
 msgstr "彈跳視窗"
 
-#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:263
-#: src/prefs_receive.c:152
+#: src/plugins/notification/notification_prefs.c:470 src/prefs_actions.c:265
+#: src/prefs_receive.c:155
 msgid "Command"
 msgstr "命令"
 
@@ -11015,13 +11139,13 @@ msgid "Show banner"
 msgstr "顯示通知欄"
 
 #: src/plugins/notification/notification_prefs.c:766
-#: src/plugins/pgpcore/select-keys.c:240 src/plugins/pgpcore/sgpgme.c:147
-#: src/prefs_receive.c:228
+#: src/plugins/pgpcore/select-keys.c:234 src/plugins/pgpcore/sgpgme.c:148
+#: src/prefs_receive.c:231
 msgid "Never"
 msgstr "從不"
 
-#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:226
-#: src/prefs_summaries.c:493 src/prefs_summaries.c:503
+#: src/plugins/notification/notification_prefs.c:768 src/prefs_receive.c:229
+#: src/prefs_summaries.c:523 src/prefs_summaries.c:576
 msgid "Always"
 msgstr "總是"
 
@@ -11096,8 +11220,8 @@ msgstr "前景顏色"
 
 #: src/plugins/notification/notification_prefs.c:927
 #: src/plugins/notification/notification_prefs.c:1146
-#: src/prefs_msg_colors.c:276 src/prefs_msg_colors.c:296
-#: src/prefs_msg_colors.c:316
+#: src/prefs_msg_colors.c:260 src/prefs_msg_colors.c:273
+#: src/prefs_msg_colors.c:286
 msgid "Background"
 msgstr "背景"
 
@@ -11116,14 +11240,6 @@ msgstr "彈跳視窗有效"
 msgid "Popup timeout"
 msgstr "彈跳視窗超時"
 
-#: src/plugins/notification/notification_prefs.c:1072
-#: src/plugins/notification/notification_prefs.c:1367
-#: src/plugins/notification/notification_prefs.c:1673
-#: src/plugins/spamassassin/spamassassin_gtk.c:391 src/prefs_other.c:574
-#: src/prefs_receive.c:200 src/prefs_summaries.c:542
-msgid "seconds"
-msgstr "秒"
-
 #: src/plugins/notification/notification_prefs.c:1101
 msgid "Make popup sticky"
 msgstr "將彈跳視窗黏貼"
@@ -11157,7 +11273,7 @@ msgstr "選擇命令"
 msgid "Enable command"
 msgstr "啟動命令"
 
-#: src/plugins/notification/notification_prefs.c:1339
+#: src/plugins/notification/notification_prefs.c:1339 src/prefs_receive.c:268
 msgid "Command to execute"
 msgstr "執行的命令"
 
@@ -11306,128 +11422,128 @@ msgid_plural "%d new articles in RSS feeds arrived"
 msgstr[0] "%d 新的RSS文章已到達"
 msgstr[1] "%d 新的RSS文章已到達"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:701
+#: src/plugins/pdf_viewer/poppler_viewer.c:704
 msgid "Title:"
 msgstr "標題:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:703
+#: src/plugins/pdf_viewer/poppler_viewer.c:706
 msgid "Author:"
 msgstr "作者:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:705
+#: src/plugins/pdf_viewer/poppler_viewer.c:708
 msgid "Creator:"
 msgstr "建立者:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:706
+#: src/plugins/pdf_viewer/poppler_viewer.c:709
 msgid "Producer:"
 msgstr "製造者:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:709
+#: src/plugins/pdf_viewer/poppler_viewer.c:712
 msgid "Created:"
 msgstr "已建立:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:713
+#: src/plugins/pdf_viewer/poppler_viewer.c:716
 msgid "Modified:"
 msgstr "已修改:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:716
+#: src/plugins/pdf_viewer/poppler_viewer.c:719
 msgid "Format:"
 msgstr "格式:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:718
 #: src/plugins/pdf_viewer/poppler_viewer.c:721
+#: src/plugins/pdf_viewer/poppler_viewer.c:724
 msgid "Optimized:"
 msgstr "已最佳化:"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1185
+#: src/plugins/pdf_viewer/poppler_viewer.c:1217
 msgid "PDF properties"
 msgstr "PDF屬性"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1333
+#: src/plugins/pdf_viewer/poppler_viewer.c:1366
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1334
+#: src/plugins/pdf_viewer/poppler_viewer.c:1367
 msgid ""
 "This document is locked and requires a password before it can be opened."
 msgstr "此文件已被鎖定,需要輸入正確的密碼才能開啟"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1349
+#: src/plugins/pdf_viewer/poppler_viewer.c:1382
 #, c-format
 msgid "%s Document"
 msgstr "%s 文件"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1355
+#: src/plugins/pdf_viewer/poppler_viewer.c:1388
 #, c-format
 msgid "of %d"
 msgstr "%d 個當中"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1371
+#: src/plugins/pdf_viewer/poppler_viewer.c:1404
 msgid "PDF rendering failed for an unknown reason."
 msgstr "PDF因為未知原因開啟(渲染)失敗"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1735
-#: src/plugins/pdf_viewer/poppler_viewer.c:1950
+#: src/plugins/pdf_viewer/poppler_viewer.c:1776
+#: src/plugins/pdf_viewer/poppler_viewer.c:1993
 msgid "Document Index"
 msgstr "文件索引"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1915
+#: src/plugins/pdf_viewer/poppler_viewer.c:1958
 msgid "First Page"
 msgstr "第一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1918
+#: src/plugins/pdf_viewer/poppler_viewer.c:1961
 msgid "Previous Page"
 msgstr "上一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1921
+#: src/plugins/pdf_viewer/poppler_viewer.c:1964
 msgid "Next Page"
 msgstr "下一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1924
+#: src/plugins/pdf_viewer/poppler_viewer.c:1967
 msgid "Last Page"
 msgstr "最後一頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1927
+#: src/plugins/pdf_viewer/poppler_viewer.c:1970
 msgid "Zoom In"
 msgstr "放大"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1929
+#: src/plugins/pdf_viewer/poppler_viewer.c:1972
 msgid "Zoom Out"
 msgstr "縮小"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1932
+#: src/plugins/pdf_viewer/poppler_viewer.c:1975
 msgid "Fit Page"
 msgstr "滿版"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1935
+#: src/plugins/pdf_viewer/poppler_viewer.c:1978
 msgid "Fit Page Width"
 msgstr "寬度放滿頁"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1938
+#: src/plugins/pdf_viewer/poppler_viewer.c:1981
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1941
+#: src/plugins/pdf_viewer/poppler_viewer.c:1984
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1944
+#: src/plugins/pdf_viewer/poppler_viewer.c:1987
 msgid "Print Document"
 msgstr "列印文件"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1947
+#: src/plugins/pdf_viewer/poppler_viewer.c:1990
 msgid "Document Info"
 msgstr "文件資訊"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1952
+#: src/plugins/pdf_viewer/poppler_viewer.c:1995
 msgid "Page Number"
 msgstr "頁碼"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:1954
+#: src/plugins/pdf_viewer/poppler_viewer.c:1997
 msgid "Zoom Factor"
 msgstr "縮放倍率因子"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2064
+#: src/plugins/pdf_viewer/poppler_viewer.c:2108
 #, c-format
 msgid ""
 "This plugin enables the viewing of PDF and PostScript attachments using the "
@@ -11440,13 +11556,13 @@ msgstr ""
 "\n"
 "歡迎任何的回覆至: iwkse at claws-mail.org"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2070
-#: src/plugins/pdf_viewer/poppler_viewer.c:2078
-#: src/plugins/pdf_viewer/poppler_viewer.c:2098
+#: src/plugins/pdf_viewer/poppler_viewer.c:2114
+#: src/plugins/pdf_viewer/poppler_viewer.c:2122
+#: src/plugins/pdf_viewer/poppler_viewer.c:2142
 msgid "PDF Viewer"
 msgstr "PDF檢視器"
 
-#: src/plugins/pdf_viewer/poppler_viewer.c:2074
+#: src/plugins/pdf_viewer/poppler_viewer.c:2118
 #, c-format
 msgid ""
 "Warning: could not find ghostscript binary (gs) required for %s plugin to "
@@ -11472,27 +11588,27 @@ msgstr "註冊PGP地址自動完成hook失敗"
 msgid "Passphrase"
 msgstr "密碼"
 
-#: src/plugins/pgpcore/passphrase.c:248
+#: src/plugins/pgpcore/passphrase.c:249
 msgid "[no user id]"
 msgstr "[沒有使用者名稱(ID)]"
 
-#: src/plugins/pgpcore/passphrase.c:260
+#: src/plugins/pgpcore/passphrase.c:261
 msgid "Please enter the passphrase for the new key:"
 msgstr "請為新金鑰輸入密碼:"
 
-#: src/plugins/pgpcore/passphrase.c:263
+#: src/plugins/pgpcore/passphrase.c:264
 msgid "Passphrases did not match.\n"
 msgstr "密碼不同\n"
 
-#: src/plugins/pgpcore/passphrase.c:267
+#: src/plugins/pgpcore/passphrase.c:268
 msgid "Please re-enter the passphrase for the new key:"
 msgstr "<請再一次為新金鑰輸入密碼:"
 
-#: src/plugins/pgpcore/passphrase.c:272
+#: src/plugins/pgpcore/passphrase.c:273
 msgid "Please enter the passphrase for:"
 msgstr "請輸入密碼:"
 
-#: src/plugins/pgpcore/passphrase.c:275
+#: src/plugins/pgpcore/passphrase.c:276
 msgid "Bad passphrase.\n"
 msgstr "錯誤的密碼\n"
 
@@ -11625,140 +11741,140 @@ msgstr "儲存密碼在記憶體中"
 msgid "Expire after"
 msgstr "過期了"
 
-#: src/plugins/pgpcore/prefs_gpg.c:179
+#: src/plugins/pgpcore/prefs_gpg.c:178
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "設定為 '0' 將會為整個程序儲存密碼"
 
-#: src/plugins/pgpcore/prefs_gpg.c:183 src/plugins/rssyl/rssyl_feed_props.c:474
-#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1921
-#: src/prefs_receive.c:187
+#: src/plugins/pgpcore/prefs_gpg.c:182 src/plugins/rssyl/rssyl_feed_props.c:464
+#: src/plugins/rssyl/rssyl_prefs.c:154 src/prefs_account.c:1759
+#: src/prefs_account.c:2056 src/prefs_receive.c:190
 msgid "minutes"
 msgstr "分"
 
-#: src/plugins/pgpcore/prefs_gpg.c:193
+#: src/plugins/pgpcore/prefs_gpg.c:192
 msgid "Grab input while entering a passphrase"
 msgstr "在鍵入密碼時擷取輸入內容"
 
-#: src/plugins/pgpcore/prefs_gpg.c:200
+#: src/plugins/pgpcore/prefs_gpg.c:199
 msgid "Display warning on start-up if GnuPG doesn't work"
 msgstr "如果 GnuPG 無法正常工作,在一開始就顯示警告"
 
-#: src/plugins/pgpcore/prefs_gpg.c:203
+#: src/plugins/pgpcore/prefs_gpg.c:202
 msgid "Path to GnuPG executable"
 msgstr "Bsfilter的執行路徑"
 
-#: src/plugins/pgpcore/prefs_gpg.c:208
+#: src/plugins/pgpcore/prefs_gpg.c:207
 msgid ""
 "If left blank the location of the GnuPG executable will be automatically "
 "determined."
 msgstr "如果留下空白,那麼將會自動偵測 GnuPG 的執行檔所在路徑 "
 
-#: src/plugins/pgpcore/prefs_gpg.c:249
+#: src/plugins/pgpcore/prefs_gpg.c:248
 msgid "Select GnuPG executable"
 msgstr "選擇 GnuPG 執行檔"
 
-#: src/plugins/pgpcore/prefs_gpg.c:361
+#: src/plugins/pgpcore/prefs_gpg.c:358
 msgid "Sign key"
 msgstr "簽署金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:369
+#: src/plugins/pgpcore/prefs_gpg.c:366
 msgid "Use default GnuPG key"
 msgstr "使用預設的 GnuPG 金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:380
+#: src/plugins/pgpcore/prefs_gpg.c:377
 msgid "Select key by your email address"
 msgstr "為你的郵件地址選擇金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:391
+#: src/plugins/pgpcore/prefs_gpg.c:388
 msgid "Specify key manually"
 msgstr "手動指定金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:401
+#: src/plugins/pgpcore/prefs_gpg.c:398
 msgid "User or key ID:"
 msgstr "使用者或是金鑰ID:"
 
-#: src/plugins/pgpcore/prefs_gpg.c:445
+#: src/plugins/pgpcore/prefs_gpg.c:442
 msgid "No secret key found."
 msgstr "找不到密祕金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:448
+#: src/plugins/pgpcore/prefs_gpg.c:445
 msgid "Generate a new key pair"
 msgstr "產生一對新的金鑰"
 
-#: src/plugins/pgpcore/prefs_gpg.c:687
+#: src/plugins/pgpcore/prefs_gpg.c:688
 msgid "GPG"
 msgstr "GPG"
 
-#: src/plugins/pgpcore/prefs_gpg.c:707 src/plugins/smime/plugin.c:38
-#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:913
+#: src/plugins/pgpcore/prefs_gpg.c:708 src/plugins/smime/plugin.c:38
+#: src/plugins/smime/plugin.c:54 src/plugins/smime/smime.c:920
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: src/plugins/pgpcore/select-keys.c:94
+#: src/plugins/pgpcore/select-keys.c:98
 #, c-format
 msgid "No exact match for '%s'; please select the key."
 msgstr "沒有完全符合'%s'的;請選擇金鑰"
 
-#: src/plugins/pgpcore/select-keys.c:97
+#: src/plugins/pgpcore/select-keys.c:101
 #, c-format
 msgid "Collecting info for '%s' ... %c"
 msgstr "為 '%s' ... %c 搜集資訊"
 
-#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:145
+#: src/plugins/pgpcore/select-keys.c:231 src/plugins/pgpcore/sgpgme.c:146
 msgid "Undefined"
 msgstr "未定義"
 
-#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:149
-#: src/plugins/pgpcore/sgpgme.c:165
+#: src/plugins/pgpcore/select-keys.c:237 src/plugins/pgpcore/sgpgme.c:150
+#: src/plugins/pgpcore/sgpgme.c:166
 msgid "Marginal"
 msgstr "臨界值"
 
-#: src/plugins/pgpcore/select-keys.c:249 src/plugins/pgpcore/sgpgme.c:153
-#: src/plugins/pgpcore/sgpgme.c:169
+#: src/plugins/pgpcore/select-keys.c:243 src/plugins/pgpcore/sgpgme.c:154
+#: src/plugins/pgpcore/sgpgme.c:170
 msgid "Ultimate"
 msgstr "極限值"
 
-#: src/plugins/pgpcore/select-keys.c:381
+#: src/plugins/pgpcore/select-keys.c:408
 msgid "Select Keys"
 msgstr "選擇金鑰"
 
-#: src/plugins/pgpcore/select-keys.c:408
+#: src/plugins/pgpcore/select-keys.c:458
 msgid "Key ID"
 msgstr "金鑰 ID"
 
-#: src/plugins/pgpcore/select-keys.c:411
+#: src/plugins/pgpcore/select-keys.c:476
 msgid "Trust"
 msgstr "信任"
 
-#: src/plugins/pgpcore/select-keys.c:436
+#: src/plugins/pgpcore/select-keys.c:495
 msgid "_Other"
 msgstr "其它(_O)"
 
-#: src/plugins/pgpcore/select-keys.c:437
+#: src/plugins/pgpcore/select-keys.c:496
 msgid "Do_n't encrypt"
 msgstr "不要加密(_n)"
 
-#: src/plugins/pgpcore/select-keys.c:596
+#: src/plugins/pgpcore/select-keys.c:677
 msgid "Add key"
 msgstr "新加入金鑰"
 
-#: src/plugins/pgpcore/select-keys.c:597
+#: src/plugins/pgpcore/select-keys.c:678
 msgid "Enter another user or key ID:"
 msgstr "輸入其它的使用者ID或金鑰ID:"
 
-#: src/plugins/pgpcore/select-keys.c:619
+#: src/plugins/pgpcore/select-keys.c:700
 #, c-format
 msgid "Encrypt to %s <%s>"
 msgstr "加密至 %s <%s>"
 
-#: src/plugins/pgpcore/select-keys.c:620
+#: src/plugins/pgpcore/select-keys.c:701
 #, c-format
 msgid ""
 "This encryption key is not fully trusted.\n"
 "If you choose to encrypt the message with this key, you don't\n"
 "know for sure that it will go to the person you mean it to.\n"
 "\n"
-"Key details: ID %s, primary identity %s <%s>\n"
+"Key details: ID %s, primary identity %s <%s>\n"
 "\n"
 "Do you trust this key enough to use it anyway?"
 msgstr ""
@@ -11766,182 +11882,182 @@ msgstr ""
 "如果你選擇以這個金鑰去加密郵件,你無法確認它是否將\n"
 "被傳送到你希望它去的地方\n"
 "\n"
-"金鑰詳細資訊 ID %s, 主要的身份  %s <%s>\n"
+"金鑰詳細資訊 ID %s, 主要的身份  %s <%s>\n"
 "\n"
 "你是如足夠信任此金鑰並使用它?"
 
-#: src/plugins/pgpcore/sgpgme.c:83 src/privacy.c:249 src/privacy.c:253
+#: src/plugins/pgpcore/sgpgme.c:84 src/privacy.c:249 src/privacy.c:253
 #: src/privacy.c:270 src/privacy.c:274
 msgid "No signature found"
 msgstr "找不到簽名"
 
-#: src/plugins/pgpcore/sgpgme.c:163
+#: src/plugins/pgpcore/sgpgme.c:164
 msgid "Untrusted"
 msgstr "不被信任的"
 
-#: src/plugins/pgpcore/sgpgme.c:237 src/plugins/pgpcore/sgpgme.c:256
+#: src/plugins/pgpcore/sgpgme.c:238 src/plugins/pgpcore/sgpgme.c:257
 #, c-format
 msgid "The signature can't be checked - %s"
 msgstr "這個簽名無法被檢查 - %s"
 
-#: src/plugins/pgpcore/sgpgme.c:241 src/plugins/pgpcore/sgpgme.c:245
+#: src/plugins/pgpcore/sgpgme.c:242 src/plugins/pgpcore/sgpgme.c:246
 msgid "The signature has not been checked."
 msgstr "這個簽名尚未被檢查"
 
-#: src/plugins/pgpcore/sgpgme.c:251
+#: src/plugins/pgpcore/sgpgme.c:252
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr "PGP Core: 無法取得金鑰 - 沒有執行gpg-agent"
 
-#: src/plugins/pgpcore/sgpgme.c:269
+#: src/plugins/pgpcore/sgpgme.c:270
 #, c-format
 msgid "Good signature from \"%s\" [ultimate]"
 msgstr "來自於 \"%s\" 的良好簽名 [最根本的]"
 
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:273
 #, c-format
 msgid "Good signature from \"%s\" [full]"
 msgstr "來自於 \"%s\" 的良好簽名 [完整的]"
 
-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:276
 #, c-format
 msgid "Good signature from \"%s\" [marginal]"
 msgstr "來自於 \"%s\" 的良好簽名 [最低限度的]"
 
-#: src/plugins/pgpcore/sgpgme.c:282
+#: src/plugins/pgpcore/sgpgme.c:283
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "來自於 \"%s\" 的良好簽名"
 
-#: src/plugins/pgpcore/sgpgme.c:284 src/plugins/pgpcore/sgpgme.c:302
+#: src/plugins/pgpcore/sgpgme.c:285 src/plugins/pgpcore/sgpgme.c:303
 #, c-format
 msgid "Key 0x%s not available to verify this signature"
 msgstr "金鑰 0x%s 用來驗證這一個簽名是無效的"
 
-#: src/plugins/pgpcore/sgpgme.c:290
+#: src/plugins/pgpcore/sgpgme.c:291
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "來自於 \"%s\" 的過期簽名"
 
-#: src/plugins/pgpcore/sgpgme.c:293
+#: src/plugins/pgpcore/sgpgme.c:294
 #, c-format
 msgid "Good signature from \"%s\", but the key has expired"
 msgstr "來自於 \"%s\" 的良好簽名,但是金鑰已經過期了"
 
-#: src/plugins/pgpcore/sgpgme.c:296
+#: src/plugins/pgpcore/sgpgme.c:297
 #, c-format
 msgid "Good signature from \"%s\", but the key has been revoked"
 msgstr "來自於 \"%s\" 的良好簽名,但是金鑰已經被撤回"
 
-#: src/plugins/pgpcore/sgpgme.c:299
+#: src/plugins/pgpcore/sgpgme.c:300
 #, c-format
 msgid "Bad signature from \"%s\""
 msgstr "來自於 \"%s\" 的不良簽名,"
 
-#: src/plugins/pgpcore/sgpgme.c:306
+#: src/plugins/pgpcore/sgpgme.c:307
 msgid "The signature has not been checked"
 msgstr "這個簽名尚未被檢查過"
 
-#: src/plugins/pgpcore/sgpgme.c:325
+#: src/plugins/pgpcore/sgpgme.c:330
 msgid "Error checking signature: no status\n"
 msgstr "檢查簽名發生錯誤:沒有狀態\n"
 
-#: src/plugins/pgpcore/sgpgme.c:343
+#: src/plugins/pgpcore/sgpgme.c:348
 #, c-format
 msgid "Error checking signature: %s\n"
 msgstr "檢查簽名發生錯誤: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:361
+#: src/plugins/pgpcore/sgpgme.c:366
 #, c-format
 msgid "Signature made on %s using %s key ID %s\n"
 msgstr "此簽名是以 %s 製作,使用 %s 金鑰 ID %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:367
+#: src/plugins/pgpcore/sgpgme.c:372
 #, c-format
 msgid "Good signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的良好簽名 (有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:372
+#: src/plugins/pgpcore/sgpgme.c:377
 #, c-format
 msgid "Expired key uid \"%s\"\n"
 msgstr "逾期的金鑰 uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:377
+#: src/plugins/pgpcore/sgpgme.c:382
 #, c-format
 msgid "Expired signature from uid \"%s\" (Validity: %s)\n"
 msgstr "來自 uid\"%s\"的逾期簽名 (有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:382
+#: src/plugins/pgpcore/sgpgme.c:387
 #, c-format
 msgid "Revoked key uid \"%s\"\n"
 msgstr "已撤銷的金鑰 uid \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:387
+#: src/plugins/pgpcore/sgpgme.c:392
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "來自 \"%s\" 的不良簽名\n"
 
-#: src/plugins/pgpcore/sgpgme.c:400
+#: src/plugins/pgpcore/sgpgme.c:405
 #, c-format
 msgid "uid \"%s\" (Validity: %s)\n"
 msgstr "uid\"%s\"(有效期限: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:402
+#: src/plugins/pgpcore/sgpgme.c:407
 msgid "Revoked"
 msgstr "已撤銷"
 
-#: src/plugins/pgpcore/sgpgme.c:407
+#: src/plugins/pgpcore/sgpgme.c:412
 #, c-format
 msgid "Owner Trust: %s\n"
 msgstr "擁有者信任: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:408
+#: src/plugins/pgpcore/sgpgme.c:413
 msgid "No key!"
 msgstr "沒有金鑰!"
 
-#: src/plugins/pgpcore/sgpgme.c:410
+#: src/plugins/pgpcore/sgpgme.c:415
 msgid "Primary key fingerprint:"
 msgstr "主要的金鑰指紋:"
 
-#: src/plugins/pgpcore/sgpgme.c:428
+#: src/plugins/pgpcore/sgpgme.c:433
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "警告:簽名者的地址 \"%s\" 和DNS項目不符合\n"
 
-#: src/plugins/pgpcore/sgpgme.c:434
+#: src/plugins/pgpcore/sgpgme.c:439
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "已驗證的簽名者地址是 \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:468
+#: src/plugins/pgpcore/sgpgme.c:473
 #, c-format
 msgid "Couldn't get data from message, %s"
 msgstr "無法取得來自郵件 %s 的資料"
 
-#: src/plugins/pgpcore/sgpgme.c:484
+#: src/plugins/pgpcore/sgpgme.c:489
 #, c-format
 msgid "Couldn't initialize data, %s"
 msgstr "無法初始化資料, %s"
 
-#: src/plugins/pgpcore/sgpgme.c:661
+#: src/plugins/pgpcore/sgpgme.c:666
 msgid "Secret key specification is ambiguous"
 msgstr "密鑰規格模稜兩可"
 
-#: src/plugins/pgpcore/sgpgme.c:671
+#: src/plugins/pgpcore/sgpgme.c:676
 #, c-format
 msgid "Secret key not found (%s)"
 msgstr "無不到密鑰 (%s)"
 
-#: src/plugins/pgpcore/sgpgme.c:684
+#: src/plugins/pgpcore/sgpgme.c:689
 #, c-format
 msgid "Error setting secret key: %s"
 msgstr "設定密鑰錯誤: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:777
+#: src/plugins/pgpcore/sgpgme.c:782
 #, c-format
 msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
 msgstr "Gpgme 協定 '%s' 無法使用:引擎 '%s' 尚未被正確的安裝"
 
-#: src/plugins/pgpcore/sgpgme.c:783
+#: src/plugins/pgpcore/sgpgme.c:788
 #, c-format
 msgid ""
 "Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
@@ -11950,12 +12066,12 @@ msgstr ""
 "Gpgme 協定 '%s' 無法使用:已安裝引擎 '%s' ,版本為 %s,但是 需要的版本應為 "
 "%s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:791
+#: src/plugins/pgpcore/sgpgme.c:796
 #, c-format
 msgid "Gpgme protocol '%s' is unusable (unknown problem)"
 msgstr "Gpgme 協定 '%s' 無法使用 (未知的問題)"
 
-#: src/plugins/pgpcore/sgpgme.c:807
+#: src/plugins/pgpcore/sgpgme.c:812
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -11963,17 +12079,17 @@ msgstr ""
 "GnuPG 尚未正確的安裝,或是需要升級\n"
 "OpenPGP支援已關閉"
 
-#: src/plugins/pgpcore/sgpgme.c:884
+#: src/plugins/pgpcore/sgpgme.c:889
 msgid ""
 "You have to save the account's information with \"OK\" before being able to "
 "generate a key pair.\n"
 msgstr "你必需要先按下\"OK\"鍵,以儲存帳號的資訊,才能產生一對金鑰\n"
 
-#: src/plugins/pgpcore/sgpgme.c:889
+#: src/plugins/pgpcore/sgpgme.c:894
 msgid "No PGP key found"
 msgstr "找不到PGP金鑰"
 
-#: src/plugins/pgpcore/sgpgme.c:890
+#: src/plugins/pgpcore/sgpgme.c:895
 msgid ""
 "Claws Mail did not find a secret PGP key, which means that you won't be able "
 "to sign emails or receive encrypted emails.\n"
@@ -11983,22 +12099,22 @@ msgstr ""
 "件\n"
 "你確定現在要產生一對新的金鑰嗎?"
 
-#: src/plugins/pgpcore/sgpgme.c:979 src/plugins/pgpcore/sgpgme.c:1001
+#: src/plugins/pgpcore/sgpgme.c:984 src/plugins/pgpcore/sgpgme.c:1006
 #, c-format
 msgid "Couldn't generate a new key pair: %s"
 msgstr "無法產生一對新的金鑰: %s"
 
-#: src/plugins/pgpcore/sgpgme.c:989
+#: src/plugins/pgpcore/sgpgme.c:994
 msgid ""
 "Generating your new key pair... Please move the mouse around to help "
 "generate entropy..."
 msgstr "你的新金鑰對正在建立中... 請將移動滑鼠以利產生... generate entropy..."
 
-#: src/plugins/pgpcore/sgpgme.c:1007
+#: src/plugins/pgpcore/sgpgme.c:1012
 msgid "Couldn't generate a new key pair: unknown error"
 msgstr "無法產生新的金鑰對: 未知的錯誤"
 
-#: src/plugins/pgpcore/sgpgme.c:1011
+#: src/plugins/pgpcore/sgpgme.c:1016
 #, c-format
 msgid ""
 "Your new key pair has been generated. Its fingerprint is:\n"
@@ -12011,62 +12127,62 @@ msgstr ""
 "\n"
 "你要將它匯出至金鑰伺服器嗎?"
 
-#: src/plugins/pgpcore/sgpgme.c:1015
+#: src/plugins/pgpcore/sgpgme.c:1020
 msgid "Key generated"
 msgstr "金鑰已產生"
 
-#: src/plugins/pgpcore/sgpgme.c:1091
+#: src/plugins/pgpcore/sgpgme.c:1096
 msgid "Key exported."
 msgstr "金鑰已匯出"
 
-#: src/plugins/pgpcore/sgpgme.c:1093
+#: src/plugins/pgpcore/sgpgme.c:1098
 msgid "Couldn't export key."
 msgstr "無法匯出金鑰"
 
-#: src/plugins/pgpinline/pgpinline.c:155
+#: src/plugins/pgpinline/pgpinline.c:156
 msgid "Incorrect part"
 msgstr "不正確的區塊"
 
-#: src/plugins/pgpinline/pgpinline.c:159
+#: src/plugins/pgpinline/pgpinline.c:160
 msgid "Not a text part"
 msgstr "不是一個文件區塊"
 
-#: src/plugins/pgpinline/pgpinline.c:170 src/plugins/pgpinline/pgpinline.c:322
+#: src/plugins/pgpinline/pgpinline.c:171 src/plugins/pgpinline/pgpinline.c:323
 msgid "Couldn't get text data."
 msgstr "無法取得文件資料"
 
-#: src/plugins/pgpinline/pgpinline.c:188
+#: src/plugins/pgpinline/pgpinline.c:189
 msgid "Couldn't convert text data to any sane charset."
 msgstr "無法將文字資料轉換至其它合理的字元"
 
-#: src/plugins/pgpinline/pgpinline.c:196 src/plugins/pgpinline/pgpinline.c:518
-#: src/plugins/pgpinline/pgpinline.c:657 src/plugins/pgpinline/pgpinline.c:713
-#: src/plugins/pgpmime/pgpmime.c:183 src/plugins/pgpmime/pgpmime.c:329
-#: src/plugins/pgpmime/pgpmime.c:511 src/plugins/pgpmime/pgpmime.c:654
-#: src/plugins/smime/smime.c:413
+#: src/plugins/pgpinline/pgpinline.c:197 src/plugins/pgpinline/pgpinline.c:519
+#: src/plugins/pgpinline/pgpinline.c:658 src/plugins/pgpinline/pgpinline.c:714
+#: src/plugins/pgpmime/pgpmime.c:184 src/plugins/pgpmime/pgpmime.c:330
+#: src/plugins/pgpmime/pgpmime.c:512 src/plugins/pgpmime/pgpmime.c:656
+#: src/plugins/smime/smime.c:418
 #, c-format
 msgid "Couldn't initialize GPG context, %s"
 msgstr "無法初始化PGP內容, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:315
+#: src/plugins/pgpinline/pgpinline.c:316
 msgid "Couldn't parse mime part."
 msgstr "無法解析mime的區塊"
 
-#: src/plugins/pgpinline/pgpinline.c:345 src/plugins/pgpmime/pgpmime.c:352
+#: src/plugins/pgpinline/pgpinline.c:346 src/plugins/pgpmime/pgpmime.c:353
 #, c-format
 msgid "Couldn't open decrypted file %s"
 msgstr "無法開啟已加密的檔案 %s"
 
-#: src/plugins/pgpinline/pgpinline.c:362 src/plugins/pgpinline/pgpinline.c:371
-#: src/plugins/pgpinline/pgpinline.c:380 src/plugins/pgpinline/pgpinline.c:388
-#: src/plugins/pgpinline/pgpinline.c:398 src/plugins/pgpinline/pgpinline.c:407
-#: src/plugins/pgpmime/pgpmime.c:363 src/plugins/pgpmime/pgpmime.c:377
+#: src/plugins/pgpinline/pgpinline.c:363 src/plugins/pgpinline/pgpinline.c:372
+#: src/plugins/pgpinline/pgpinline.c:381 src/plugins/pgpinline/pgpinline.c:389
+#: src/plugins/pgpinline/pgpinline.c:399 src/plugins/pgpinline/pgpinline.c:408
+#: src/plugins/pgpmime/pgpmime.c:364 src/plugins/pgpmime/pgpmime.c:378
 #, c-format
 msgid "Couldn't write to decrypted file %s"
 msgstr "無法寫入已解密的檔案 %s"
 
-#: src/plugins/pgpinline/pgpinline.c:376 src/plugins/pgpinline/pgpinline.c:377
-#: src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:377 src/plugins/pgpinline/pgpinline.c:378
+#: src/plugins/pgpinline/pgpinline.c:379
 msgid ""
 "\n"
 "--- Start of PGP/Inline encrypted data ---\n"
@@ -12074,69 +12190,69 @@ msgstr ""
 "\n"
 "--- 此為 PGP/Inline 加密資料的開始 ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:394 src/plugins/pgpinline/pgpinline.c:395
-#: src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:395 src/plugins/pgpinline/pgpinline.c:396
+#: src/plugins/pgpinline/pgpinline.c:397
 msgid "--- End of PGP/Inline encrypted data ---\n"
 msgstr "--- 此為 PGP/Inline 加密資料的結束 ---\n"
 
-#: src/plugins/pgpinline/pgpinline.c:415 src/plugins/pgpmime/pgpmime.c:389
+#: src/plugins/pgpinline/pgpinline.c:416 src/plugins/pgpmime/pgpmime.c:390
 #, c-format
 msgid "Couldn't close decrypted file %s"
 msgstr "無法關閉已解密的檔案 %s"
 
-#: src/plugins/pgpinline/pgpinline.c:427
+#: src/plugins/pgpinline/pgpinline.c:428
 msgid "Couldn't scan decrypted file."
 msgstr "無法掃描已解密的檔案"
 
-#: src/plugins/pgpinline/pgpinline.c:435
+#: src/plugins/pgpinline/pgpinline.c:436
 msgid "Couldn't scan decrypted file parts."
 msgstr "無法掃描已解密的部份檔案"
 
-#: src/plugins/pgpinline/pgpinline.c:492 src/plugins/pgpinline/pgpinline.c:684
+#: src/plugins/pgpinline/pgpinline.c:493 src/plugins/pgpinline/pgpinline.c:685
 msgid "Malformed message"
 msgstr "Malformed 郵件"
 
-#: src/plugins/pgpinline/pgpinline.c:503 src/plugins/pgpinline/pgpinline.c:695
-#: src/plugins/pgpmime/pgpmime.c:694
+#: src/plugins/pgpinline/pgpinline.c:504 src/plugins/pgpinline/pgpinline.c:696
+#: src/plugins/pgpmime/pgpmime.c:696
 #, c-format
 msgid "Couldn't create temporary file, %s"
 msgstr "無法建立暫存檔,%s"
 
-#: src/plugins/pgpinline/pgpinline.c:542 src/plugins/pgpmime/pgpmime.c:538
+#: src/plugins/pgpinline/pgpinline.c:543 src/plugins/pgpmime/pgpmime.c:539
 #, c-format
 msgid "Data signing failed, %s"
 msgstr "資料簽名失敗, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:565
+#: src/plugins/pgpinline/pgpinline.c:561 src/plugins/pgpmime/pgpmime.c:566
 #, c-format
 msgid "Data signing failed due to invalid signer: %s"
 msgstr "資料簽名失敗起因於無效的簽名者: %s"
 
-#: src/plugins/pgpinline/pgpinline.c:569 src/plugins/pgpmime/pgpmime.c:574
+#: src/plugins/pgpinline/pgpinline.c:570 src/plugins/pgpmime/pgpmime.c:575
 msgid "Data signing failed, no results."
 msgstr "資料簽名失敗, 沒有結果"
 
-#: src/plugins/pgpinline/pgpinline.c:579 src/plugins/pgpmime/pgpmime.c:585
+#: src/plugins/pgpinline/pgpinline.c:580 src/plugins/pgpmime/pgpmime.c:586
 msgid "Data signing failed, no contents."
 msgstr "資料簽名失敗,沒有內容"
 
-#: src/plugins/pgpinline/pgpinline.c:623
+#: src/plugins/pgpinline/pgpinline.c:624
 msgid ""
 "Please note that attachments are not encrypted by the PGP/Inline system, nor "
 "are email headers, like Subject."
 msgstr "請注意!附件沒有用 PGP/Inline 系統進行加密,不包括 郵件標頭,像是主旨"
 
-#: src/plugins/pgpinline/pgpinline.c:667 src/plugins/pgpmime/pgpmime.c:664
+#: src/plugins/pgpinline/pgpinline.c:668 src/plugins/pgpmime/pgpmime.c:666
 #, c-format
 msgid "Couldn't add GPG key %s, %s"
 msgstr "無法加入 GPG 金鑰 %s, %s"
 
-#: src/plugins/pgpinline/pgpinline.c:726 src/plugins/pgpmime/pgpmime.c:722
+#: src/plugins/pgpinline/pgpinline.c:727 src/plugins/pgpmime/pgpmime.c:724
 #, c-format
 msgid "Encryption failed, %s"
 msgstr "加密失敗,%s"
 
-#: src/plugins/pgpinline/pgpinline.c:795
+#: src/plugins/pgpinline/pgpinline.c:796
 msgid "PGP/Inline"
 msgstr "PGP/Inline"
 
@@ -12168,34 +12284,34 @@ msgstr ""
 "\n"
 "GPGME 版權宣告於 2001 屬於 Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/pgpmime/pgpmime.c:203
+#: src/plugins/pgpmime/pgpmime.c:204
 msgid "Signature boundary not found."
 msgstr "找不到簽名的邊界"
 
-#: src/plugins/pgpmime/pgpmime.c:401 src/plugins/smime/smime.c:494
+#: src/plugins/pgpmime/pgpmime.c:402 src/plugins/smime/smime.c:499
 msgid "Couldn't parse decrypted file."
 msgstr "無法解析已解密的檔案"
 
-#: src/plugins/pgpmime/pgpmime.c:407 src/plugins/smime/smime.c:501
+#: src/plugins/pgpmime/pgpmime.c:408 src/plugins/smime/smime.c:506
 msgid "Couldn't parse decrypted file parts."
 msgstr "無法解析已解密的部份檔案"
 
-#: src/plugins/pgpmime/pgpmime.c:456 src/plugins/pgpmime/pgpmime.c:495
+#: src/plugins/pgpmime/pgpmime.c:457 src/plugins/pgpmime/pgpmime.c:496
 #, c-format
 msgid "Couldn't create temporary file: %s"
 msgstr "無法建立暫存檔案: %s"
 
-#: src/plugins/pgpmime/pgpmime.c:598
+#: src/plugins/pgpmime/pgpmime.c:599
 msgid "OpenPGP digital signature"
 msgstr "OpenPGP 數位簽名"
 
-#: src/plugins/pgpmime/pgpmime.c:620
+#: src/plugins/pgpmime/pgpmime.c:622
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the PGP/"
 "Mime system."
 msgstr "請注郵件標頭,像是主旨,無法使用PGP/Mime系統進行加密"
 
-#: src/plugins/pgpmime/pgpmime.c:794
+#: src/plugins/pgpmime/pgpmime.c:798
 msgid "PGP/Mime"
 msgstr "PGP/Mime"
 
@@ -12226,36 +12342,36 @@ msgstr ""
 "\n"
 "GPGME 版權宣告於 2001 屬於 Werner Koch <dd9jn at gnu.org>"
 
-#: src/plugins/python/python_plugin.c:358
-#: src/plugins/python/python_plugin.c:502
+#: src/plugins/python/python_plugin.c:379
+#: src/plugins/python/python_plugin.c:523
 msgid "Python scripts"
 msgstr "Python 腳本"
 
-#: src/plugins/python/python_plugin.c:497
+#: src/plugins/python/python_plugin.c:518
 msgid "Show Python console..."
 msgstr "顯示 Python 控制台..."
 
-#: src/plugins/python/python_plugin.c:503
-#: src/plugins/rssyl/rssyl_feed_props.c:481
+#: src/plugins/python/python_plugin.c:524
+#: src/plugins/rssyl/rssyl_feed_props.c:471
 msgid "Refresh"
 msgstr "更新"
 
-#: src/plugins/python/python_plugin.c:505 src/prefs_account.c:2572
-#: src/prefs_account.c:2600 src/prefs_account.c:2883 src/wizard.c:1204
-#: src/wizard.c:1624
+#: src/plugins/python/python_plugin.c:526 src/prefs_account.c:2707
+#: src/prefs_account.c:2735 src/prefs_account.c:3172 src/wizard.c:1206
+#: src/wizard.c:1626
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/plugins/python/python_plugin.c:651
-#: src/plugins/python/python_plugin.c:735
+#: src/plugins/python/python_plugin.c:672
+#: src/plugins/python/python_plugin.c:762
 msgid "Python"
 msgstr "Python"
 
-#: src/plugins/python/python_plugin.c:657
+#: src/plugins/python/python_plugin.c:681
 msgid "Failed to register \"compose create hook\" in the Python plugin"
 msgstr "在 Python 外掛程式中註冊 \"建立新郵件 hook\" 失敗"
 
-#: src/plugins/python/python_plugin.c:740
+#: src/plugins/python/python_plugin.c:767
 msgid ""
 "This plugin provides Python integration features.\n"
 "Python code can be entered interactively into an embedded Python console, "
@@ -12335,7 +12451,7 @@ msgstr ""
 " \n"
 "歡迎回覆至 <berndth at gmx.de> "
 
-#: src/plugins/python/python_plugin.c:791
+#: src/plugins/python/python_plugin.c:818
 msgid "Python integration"
 msgstr "Python 整合"
 
@@ -12348,22 +12464,22 @@ msgstr ""
 "無法讀取舊版的 feeds.xml 標案內容:\n"
 "%s"
 
-#: src/plugins/rssyl/opml_export.c:110
+#: src/plugins/rssyl/opml_export.c:111
 #, c-format
 msgid "RSSyl: Error while writing '%s' to feed export list.\n"
 msgstr "RSSyl:  當寫入'%s'以匯出feed清單時發生錯誤\n"
 
-#: src/plugins/rssyl/opml_export.c:131
+#: src/plugins/rssyl/opml_export.c:132
 #, c-format
 msgid "RSSyl: Couldn't delete old OPML file '%s': %s\n"
 msgstr "RSSyl: 無法刪除舊版本的 OPML 檔案 '%s': %s\n"
 
-#: src/plugins/rssyl/opml_export.c:141
+#: src/plugins/rssyl/opml_export.c:142
 #, c-format
 msgid "RSSyl: Couldn't open file '%s' for feed list exporting: %s\n"
 msgstr "RSSyl: 無法開啟檔案 '%s' 以匯出feed清單: %s\n"
 
-#: src/plugins/rssyl/opml_export.c:182
+#: src/plugins/rssyl/opml_export.c:183
 msgid "RSSyl: Error during writing feed export file.\n"
 msgstr "RSSyl: 寫入feed匯出檔案時發生錯誤\n"
 
@@ -12398,44 +12514,45 @@ msgstr ""
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: src/plugins/rssyl/rssyl_add_item.c:296
+#: src/plugins/rssyl/rssyl_add_item.c:304
 msgctxt "Empty RSS feed title placeholder"
 msgid "(empty)"
 msgstr "(空白)"
 
-#: src/plugins/rssyl/rssyl.c:156 src/plugins/rssyl/rssyl.c:167
+#: src/plugins/rssyl/rssyl.c:157 src/plugins/rssyl/rssyl.c:169
 msgid "Refresh all feeds"
 msgstr "更新所有的feeds"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:65
+#: src/plugins/rssyl/rssyl_cb_menu.c:66
 msgid "Subscribe feed"
 msgstr "訂閱feed"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:66
+#: src/plugins/rssyl/rssyl_cb_menu.c:67
 msgid "Input the URL of the news feed you wish to subscribe:"
 msgstr "輸入你希望訂閱的新聞feed的URL:"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:98
+#: src/plugins/rssyl/rssyl_cb_menu.c:99
 #, c-format
 msgid "'%c' can't be used in folder name."
 msgstr "'%c' 不能用於資料夾名稱"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:251
+#: src/plugins/rssyl/rssyl_cb_menu.c:248 src/plugins/rssyl/rssyl_cb_menu.c:295
+#: src/plugins/rssyl/rssyl_feed_props.c:201
 msgid "Claws Mail needs network access in order to update the feed."
 msgid_plural "Claws Mail needs network access in order to update feeds."
 msgstr[0] "Claws Mail需要網路的存取能力才能進行feed的更新"
 msgstr[1] "Claws Mail需要網路的存取能力才能進行feed的更新"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:314
+#: src/plugins/rssyl/rssyl_cb_menu.c:321
 #, c-format
 msgid "Really remove the feed tree `%s' ?\n"
 msgstr "你確定要移除feed `%s' 的樹狀結構嗎?\n"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:315
+#: src/plugins/rssyl/rssyl_cb_menu.c:322
 msgid "Remove feed tree"
 msgstr "移除feed的樹狀結構"
 
-#: src/plugins/rssyl/rssyl_cb_menu.c:349
+#: src/plugins/rssyl/rssyl_cb_menu.c:356
 msgid "Select an OPML file"
 msgstr "選擇一個 OPML 檔案"
 
@@ -12479,51 +12596,51 @@ msgstr "RSSyl: 無法在 '%s' 進行 feed \n"
 msgid "RSSyl: Application is exiting, couldn't finish updating feed at '%s'\n"
 msgstr "RSSyl: 應用程式已經存在,無法在 '%s' 結束feed的更新動作\n"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:268
+#: src/plugins/rssyl/rssyl_feed_props.c:270
 msgid "HTTP Basic authentication"
 msgstr "HTTP 基礎認證"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:289
+#: src/plugins/rssyl/rssyl_feed_props.c:292
 msgid "Use default refresh interval"
 msgstr "使用預設更新時間"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:301
+#: src/plugins/rssyl/rssyl_feed_props.c:304
 msgid "Keep old items"
 msgstr "保持舊有的項目"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:307
+#: src/plugins/rssyl/rssyl_feed_props.c:310
 msgid "_Trim"
 msgstr "對齊(_T)"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:309
+#: src/plugins/rssyl/rssyl_feed_props.c:312
 msgid "Update feed, deleting items which are no longer in the source feed"
 msgstr "更新 feed,刪除那些已經不在來源feed內的項目"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:312
+#: src/plugins/rssyl/rssyl_feed_props.c:315
 msgid "Fetch comments if possible"
 msgstr "如果可以的話擷取註解"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:335
 msgid "Always mark it as new"
 msgstr "永遠標示為新feed"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:343
+#: src/plugins/rssyl/rssyl_feed_props.c:337
 msgid "Only mark it as new if its text has changed"
 msgstr "只有當此文件內容異動時,才會把它標示為新文件"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:349
+#: src/plugins/rssyl/rssyl_feed_props.c:339
 msgid "Never mark it as new"
 msgstr "永遠不要標示為新feed"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:354
+#: src/plugins/rssyl/rssyl_feed_props.c:344
 msgid "Add item title to the top of message"
 msgstr "增加項目的標題至郵件的頂端"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:361
+#: src/plugins/rssyl/rssyl_feed_props.c:351
 msgid "Ignore title rename"
 msgstr "忽略標題的變更"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:366
+#: src/plugins/rssyl/rssyl_feed_props.c:356
 msgid ""
 "Enable this to keep current folder name, even if feed author changes title "
 "of the feed."
@@ -12531,54 +12648,54 @@ msgstr ""
 "啟用這個功能可以保持目前的資料夾名稱,甚至當feed作者改變feed的標題時也一樣有"
 "效"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:370
+#: src/plugins/rssyl/rssyl_feed_props.c:360
 #: src/plugins/vcalendar/vcal_prefs.c:593
 msgid "Verify SSL/TLS certificate validity"
 msgstr "驗證 SSL/TLS 認證的有效期限"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:390
+#: src/plugins/rssyl/rssyl_feed_props.c:380
 msgid "User name"
 msgstr "使用者名稱"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:403
+#: src/plugins/rssyl/rssyl_feed_props.c:393
 msgid "Source URL"
 msgstr "來源 URL"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:416
+#: src/plugins/rssyl/rssyl_feed_props.c:406
 msgid "Fetch comments on posts aged less than"
 msgstr "如果可以的話擷取註解,貼文出現至今少於"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:424
-#: src/plugins/vcalendar/day-view.c:614 src/plugins/vcalendar/month-view.c:711
-#: src/prefs_account.c:1513 src/prefs_folder_item.c:568 src/prefs_matcher.c:337
+#: src/plugins/rssyl/rssyl_feed_props.c:414
+#: src/plugins/vcalendar/day-view.c:615 src/plugins/vcalendar/month-view.c:711
+#: src/prefs_account.c:1585 src/prefs_folder_item.c:571 src/prefs_matcher.c:341
 msgid "days"
 msgstr "天"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:425
+#: src/plugins/rssyl/rssyl_feed_props.c:415
 msgid "Set to -1 to fetch all comments"
 msgstr "設定為 -1 時將會擷取所有的註解"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:449
+#: src/plugins/rssyl/rssyl_feed_props.c:439
 msgid "If an item changes"
 msgstr "如果項目改變了"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:454
+#: src/plugins/rssyl/rssyl_feed_props.c:444
 msgid "Items"
 msgstr "項目"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:467
+#: src/plugins/rssyl/rssyl_feed_props.c:457
 msgid "Refresh interval"
 msgstr "刷新的間隔時間"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:475
+#: src/plugins/rssyl/rssyl_feed_props.c:465
 msgid "Set to 0 to disable automatic refreshing for this feed"
 msgstr "若要關閉此feed的自動更新功能,將它設定為0"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:527
+#: src/plugins/rssyl/rssyl_feed_props.c:517
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: src/plugins/rssyl/rssyl_feed_props.c:535
+#: src/plugins/rssyl/rssyl_feed_props.c:525
 msgid "Set feed properties"
 msgstr "設定 feed 屬性"
 
@@ -12695,27 +12812,26 @@ msgstr "加入後編輯 feed 屬性(_E)"
 msgid "Updating comments for '%s'..."
 msgstr "為 '%s' 更新註解..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:105
-#: src/plugins/vcalendar/vcal_folder.c:1620
+#: src/plugins/rssyl/rssyl_update_feed.c:107
+#: src/plugins/vcalendar/vcal_folder.c:1624
 msgid "401 (Authorisation required)"
 msgstr "401 (要求認證)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:108
-#: src/plugins/vcalendar/vcal_folder.c:1623
-msgid "403 (Unauthorised)"
+#: src/plugins/rssyl/rssyl_update_feed.c:110
+msgid "403 (Forbidden)"
 msgstr "403 (無法認證)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:111
-#: src/plugins/vcalendar/vcal_folder.c:1626
+#: src/plugins/rssyl/rssyl_update_feed.c:113
+#: src/plugins/vcalendar/vcal_folder.c:1630
 msgid "404 (Not found)"
 msgstr "404 (找不到)"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:114
+#: src/plugins/rssyl/rssyl_update_feed.c:116
 #, c-format
 msgid "Error %d"
 msgstr "錯誤 %d"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:127
+#: src/plugins/rssyl/rssyl_update_feed.c:129
 #, c-format
 msgctxt "First parameter is URL, second is error text"
 msgid ""
@@ -12728,7 +12844,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:140
+#: src/plugins/rssyl/rssyl_update_feed.c:142
 #, c-format
 msgid ""
 "No valid feed found at\n"
@@ -12737,21 +12853,21 @@ msgstr ""
 "在<b>%s</b>\n"
 "沒有有效的 feed"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:152
+#: src/plugins/rssyl/rssyl_update_feed.c:154
 msgid "Untitled feed"
 msgstr "無標題的 Feed"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:154
+#: src/plugins/rssyl/rssyl_update_feed.c:156
 #, c-format
 msgid "RSSyl: Possibly invalid feed without title at %s.\n"
 msgstr "RSSyl: 可能在 '%s' 中存在不合法的 feed 沒有主旨\n"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:231
+#: src/plugins/rssyl/rssyl_update_feed.c:233
 #, c-format
 msgid "Updating feed '%s'..."
 msgstr "正在更新 feed '%s'..."
 
-#: src/plugins/rssyl/rssyl_update_feed.c:258
+#: src/plugins/rssyl/rssyl_update_feed.c:270
 #, c-format
 msgid ""
 "Couldn't process feed at\n"
@@ -12763,11 +12879,11 @@ msgstr ""
 "進行 feed\n"
 "請連絡開發人員,這是不應該發生的。"
 
-#: src/plugins/rssyl/rssyl_update_feed.c:342
+#: src/plugins/rssyl/rssyl_update_feed.c:356
 msgid "Claws Mail needs network access in order to update your feeds."
 msgstr "Claws Mail 需要網路存取,以更新你的 feeds."
 
-#: src/plugins/rssyl/rssyl_update_format.c:127
+#: src/plugins/rssyl/rssyl_update_format.c:128
 msgid ""
 "Internal problem while upgrading storage format. This should not happen. "
 "Please report this, with debug output attached.\n"
@@ -12808,44 +12924,44 @@ msgstr ""
 "找得到\n"
 "GPGME 版本來自於 Werner Koch <dd9jn at gnu.org>,於 2001"
 
-#: src/plugins/smime/smime.c:421
+#: src/plugins/smime/smime.c:426
 #, c-format
 msgid "Couldn't set GPG protocol, %s"
 msgstr "無法設定 GPG 協定,%s"
 
-#: src/plugins/smime/smime.c:449
+#: src/plugins/smime/smime.c:454
 msgid "Couldn't open temporary file"
 msgstr "無法開啟暫存檔"
 
-#: src/plugins/smime/smime.c:460 src/plugins/smime/smime.c:475
+#: src/plugins/smime/smime.c:465 src/plugins/smime/smime.c:480
 msgid "Couldn't write to temporary file"
 msgstr "無法寫入暫存檔"
 
-#: src/plugins/smime/smime.c:486
+#: src/plugins/smime/smime.c:491
 msgid "Couldn't close temporary file"
 msgstr "無法關閉暫存檔"
 
-#: src/plugins/smime/smime.c:708
+#: src/plugins/smime/smime.c:714
 msgid ""
 "Please note that email headers, like Subject, are not encrypted by the S/"
 "MIME system."
 msgstr "請注意,郵件的標頭,像是主旨,無法使用 S/MIME 系統進行加密"
 
-#: src/plugins/spam_report/spam_report.c:301
+#: src/plugins/spam_report/spam_report.c:307
 msgid "Reporting spam..."
 msgstr "正在提報垃圾郵件..."
 
-#: src/plugins/spam_report/spam_report.c:336
+#: src/plugins/spam_report/spam_report.c:342
 msgid "Report spam online..."
 msgstr "線上提報垃圾郵件..."
 
-#: src/plugins/spam_report/spam_report.c:347
-#: src/plugins/spam_report/spam_report.c:385
+#: src/plugins/spam_report/spam_report.c:353
+#: src/plugins/spam_report/spam_report.c:391
 #: src/plugins/spam_report/spam_report_prefs.c:83
 msgid "SpamReport"
 msgstr "垃圾郵件提報"
 
-#: src/plugins/spam_report/spam_report.c:390
+#: src/plugins/spam_report/spam_report.c:396
 msgid ""
 "This plugin reports spam to various places.\n"
 "Currently the following sites or methods are supported:\n"
@@ -12861,7 +12977,7 @@ msgstr ""
 " * spamcop.net\n"
 " * lists.debian.org nomination system"
 
-#: src/plugins/spam_report/spam_report.c:415
+#: src/plugins/spam_report/spam_report.c:421
 msgid "Spam reporting"
 msgstr "垃圾郵件提報"
 
@@ -12873,32 +12989,32 @@ msgstr "啟用"
 msgid "Forward to:"
 msgstr "轉寄至:"
 
-#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1572
+#: src/plugins/spam_report/spam_report_prefs.c:185 src/wizard.c:1574
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/plugins/spamassassin/spamassassin.c:77
-#: src/plugins/spamassassin/spamassassin_gtk.c:649
+#: src/plugins/spamassassin/spamassassin.c:78
+#: src/plugins/spamassassin/spamassassin_gtk.c:671
 msgid "SpamAssassin"
 msgstr "垃圾暗殺者(SpamAssassin)"
 
-#: src/plugins/spamassassin/spamassassin.c:169
+#: src/plugins/spamassassin/spamassassin.c:182
 msgid "SpamAssassin plugin couldn't connect to spamd.\n"
 msgstr "垃圾暗殺者(SpamAssassin)外掛程式無法連接到 spamd\n"
 
-#: src/plugins/spamassassin/spamassassin.c:185
+#: src/plugins/spamassassin/spamassassin.c:198
 msgid "SpamAssassin plugin filtering failed.\n"
 msgstr "SpamAssassin外掛程式過濾失敗\n"
 
-#: src/plugins/spamassassin/spamassassin.c:211
+#: src/plugins/spamassassin/spamassassin.c:224
 msgid "SpamAssassin plugin is disabled by its preferences.\n"
 msgstr "SpamAssassin外掛程式藉由它的選項被關閉了\n"
 
-#: src/plugins/spamassassin/spamassassin.c:216
+#: src/plugins/spamassassin/spamassassin.c:229
 msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: 過濾郵件..."
 
-#: src/plugins/spamassassin/spamassassin.c:345
+#: src/plugins/spamassassin/spamassassin.c:358
 msgid ""
 "The SpamAssassin plugin couldn't filter a message. The probable cause of the "
 "error is an unreachable spamd daemon. Please make sure spamd is running and "
@@ -12907,21 +13023,21 @@ msgstr ""
 "SpamAssassin外掛程式無法過濾一個郵件。這可能是因為無法連繫到spamd。請確認 "
 "spamd 已經執行而且是可以被存取的。 "
 
-#: src/plugins/spamassassin/spamassassin.c:402
+#: src/plugins/spamassassin/spamassassin.c:416
 msgid ""
 "Claws Mail needs network access in order to feed the mail to the remote "
 "learner."
 msgstr "Claws Mail 需要網路的存取能力才能將郵件送至遠端的學習器  "
 
-#: src/plugins/spamassassin/spamassassin.c:547
+#: src/plugins/spamassassin/spamassassin.c:561
 msgid "Failed to get username"
 msgstr "取得使用者名稱失敗"
 
-#: src/plugins/spamassassin/spamassassin.c:559
+#: src/plugins/spamassassin/spamassassin.c:578
 msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
 msgstr "SpamAssassin外掛程式已載入,但是已在它的選項目被關閉了。\n"
 
-#: src/plugins/spamassassin/spamassassin.c:593
+#: src/plugins/spamassassin/spamassassin.c:612
 msgid ""
 "This plugin can check all messages that are received from an IMAP, LOCAL or "
 "POP account for spam using a SpamAssassin server. You will need a "
@@ -12943,65 +13059,73 @@ msgstr ""
 "\n"
 "可以在/Configuration/Preferences/Plugins/SpamAssassin中找到所有的選項"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:90
+#: src/plugins/spamassassin/spamassassin_gtk.c:91
 msgid "Localhost"
 msgstr "本地主機"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:91
+#: src/plugins/spamassassin/spamassassin_gtk.c:92
 msgid "TCP"
 msgstr "TCP"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:92
+#: src/plugins/spamassassin/spamassassin_gtk.c:94
 msgid "Unix Socket"
 msgstr "Unix Socket"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:119
+#: src/plugins/spamassassin/spamassassin_gtk.c:122
 msgid "Select folder to save spam to"
 msgstr "選擇儲存垃圾郵件的資料夾"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:269
+#: src/plugins/spamassassin/spamassassin_gtk.c:274
 msgid "Enable SpamAssassin plugin"
 msgstr "啟用 SpamAssassin 外掛程式"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:273
+#: src/plugins/spamassassin/spamassassin_gtk.c:278
 msgid "Transport"
 msgstr "傳送"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:281
+#: src/plugins/spamassassin/spamassassin_gtk.c:286
 msgid "Type of transport"
 msgstr "傳送的型別"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:302
+#: src/plugins/spamassassin/spamassassin_gtk.c:307
 msgid "User"
 msgstr "使用者"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:315
+#: src/plugins/spamassassin/spamassassin_gtk.c:320
 msgid "User to use with spamd server"
 msgstr "使用spamd伺服器的使用者"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:317
+#: src/plugins/spamassassin/spamassassin_gtk.c:322
 msgid "spamd"
 msgstr "spamd"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:335
+#: src/plugins/spamassassin/spamassassin_gtk.c:340
 msgid "Hostname or IP address of spamd server"
 msgstr "spamd伺服器的主機名稱或IP位址"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:346
+#: src/plugins/spamassassin/spamassassin_gtk.c:351
 msgid "Port of spamd server"
 msgstr "spamd伺服器的通訊埠"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:352
+#: src/plugins/spamassassin/spamassassin_gtk.c:357
 msgid "Path of Unix socket"
 msgstr "Unix socket的路徑"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/spamassassin/spamassassin_gtk.c:364
+msgid "Use compression"
+msgstr "使用壓縮模式"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:368
+msgid "Enable compression if spamd uses it, otherwise disable it."
+msgstr "若spamd使用了壓縮,就啟用壓縮功能,否則,停止此功能"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:403
 msgid ""
 "Maximum time allowed for checking. If the check takes longer it will be "
 "aborted."
 msgstr "允許檢查的最高次數。如果檢查花費了太長的時間,它將會終止。"
 
-#: src/plugins/tnef_parse/tnef_parse.c:73
+#: src/plugins/tnef_parse/tnef_parse.c:74
 #, c-format
 msgid ""
 "\n"
@@ -13014,29 +13138,29 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: src/plugins/tnef_parse/tnef_parse.c:130
-#: src/plugins/tnef_parse/tnef_parse.c:137
+#: src/plugins/tnef_parse/tnef_parse.c:131
+#: src/plugins/tnef_parse/tnef_parse.c:138
 msgid "Failed to write the part data."
 msgstr "部份寫入資料失敗"
 
-#: src/plugins/tnef_parse/tnef_parse.c:182
+#: src/plugins/tnef_parse/tnef_parse.c:183
 msgid "Failed to parse VCalendar data."
 msgstr "解析 VCalendar 資料失敗"
 
-#: src/plugins/tnef_parse/tnef_parse.c:221
+#: src/plugins/tnef_parse/tnef_parse.c:222
 msgid "Failed to parse VTask data."
 msgstr "解析 VTask 資料失敗"
 
-#: src/plugins/tnef_parse/tnef_parse.c:273
+#: src/plugins/tnef_parse/tnef_parse.c:274
 msgid "Failed to parse VCard data."
 msgstr "解析 VCard 資料失敗"
 
-#: src/plugins/tnef_parse/tnef_parse.c:413
-#: src/plugins/tnef_parse/tnef_parse.c:437
+#: src/plugins/tnef_parse/tnef_parse.c:414
+#: src/plugins/tnef_parse/tnef_parse.c:438
 msgid "TNEF Parser"
 msgstr "TNEF解析器"
 
-#: src/plugins/tnef_parse/tnef_parse.c:442
+#: src/plugins/tnef_parse/tnef_parse.c:443
 msgid ""
 "This Claws Mail plugin allows you to read application/ms-tnef attachments.\n"
 "\n"
@@ -13064,11 +13188,11 @@ msgstr "建立新會議(_C)"
 msgid "_Go to today"
 msgstr "前往今天(_G)"
 
-#: src/plugins/vcalendar/day-view.c:593 src/plugins/vcalendar/month-view.c:690
+#: src/plugins/vcalendar/day-view.c:594 src/plugins/vcalendar/month-view.c:690
 msgid "Start"
 msgstr "開始"
 
-#: src/plugins/vcalendar/day-view.c:606 src/plugins/vcalendar/month-view.c:703
+#: src/plugins/vcalendar/day-view.c:607 src/plugins/vcalendar/month-view.c:703
 msgid "Show"
 msgstr "顯示"
 
@@ -13148,15 +13272,15 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
-#: src/plugins/vcalendar/month-view.c:796
+#: src/plugins/vcalendar/month-view.c:798
 msgid "Week number"
 msgstr "星期幾"
 
-#: src/plugins/vcalendar/month-view.c:886
+#: src/plugins/vcalendar/month-view.c:889
 msgid "Previous month"
 msgstr "上個月"
 
-#: src/plugins/vcalendar/month-view.c:906
+#: src/plugins/vcalendar/month-view.c:909
 msgid "Next month"
 msgstr "下個月"
 
@@ -13201,65 +13325,65 @@ msgid ""
 "You are about to create %d meetings, one by one. Do you want to continue?"
 msgstr "你可以一個一個建立 %d 會議,你要續嗎?"
 
-#: src/plugins/vcalendar/vcalendar.c:139
+#: src/plugins/vcalendar/vcalendar.c:140
 msgid "Creating meeting..."
 msgstr "建立會議..."
 
-#: src/plugins/vcalendar/vcalendar.c:158
+#: src/plugins/vcalendar/vcalendar.c:159
 msgid "no subject"
 msgstr "沒有主旨"
 
-#: src/plugins/vcalendar/vcalendar.c:384
+#: src/plugins/vcalendar/vcalendar.c:385
 msgid "Accept"
 msgstr "接受"
 
-#: src/plugins/vcalendar/vcalendar.c:385
+#: src/plugins/vcalendar/vcalendar.c:386
 msgid "Tentatively accept"
 msgstr "暫時接受"
 
-#: src/plugins/vcalendar/vcalendar.c:386
+#: src/plugins/vcalendar/vcalendar.c:387
 msgid "Decline"
 msgstr "拒絕"
 
-#: src/plugins/vcalendar/vcalendar.c:473
+#: src/plugins/vcalendar/vcalendar.c:474
 msgid "You have a Todo item."
 msgstr "你有一個待執行項目"
 
-#: src/plugins/vcalendar/vcalendar.c:474 src/plugins/vcalendar/vcalendar.c:481
-#: src/plugins/vcalendar/vcalendar.c:486 src/plugins/vcalendar/vcalendar.c:494
-#: src/plugins/vcalendar/vcalendar.c:503 src/plugins/vcalendar/vcalendar.c:744
+#: src/plugins/vcalendar/vcalendar.c:475 src/plugins/vcalendar/vcalendar.c:482
+#: src/plugins/vcalendar/vcalendar.c:487 src/plugins/vcalendar/vcalendar.c:495
+#: src/plugins/vcalendar/vcalendar.c:504 src/plugins/vcalendar/vcalendar.c:716
 msgid "Details follow:"
 msgstr "細節如下:"
 
-#: src/plugins/vcalendar/vcalendar.c:480
+#: src/plugins/vcalendar/vcalendar.c:481
 msgid "You have created a meeting."
 msgstr "你已經建立了一個會議"
 
-#: src/plugins/vcalendar/vcalendar.c:485
+#: src/plugins/vcalendar/vcalendar.c:486
 msgid "You have been invited to a meeting."
 msgstr "你已收到一個會議的邀請"
 
-#: src/plugins/vcalendar/vcalendar.c:493
+#: src/plugins/vcalendar/vcalendar.c:494
 msgid "A meeting to which you had been invited has been cancelled."
 msgstr "一個你已收到的會議邀請已取消"
 
-#: src/plugins/vcalendar/vcalendar.c:502
+#: src/plugins/vcalendar/vcalendar.c:503
 msgid "You have been forwarded an appointment."
 msgstr "你已轉發一個約會"
 
-#: src/plugins/vcalendar/vcalendar.c:556
+#: src/plugins/vcalendar/vcalendar.c:557
 msgid "(this event recurs)"
 msgstr "(此事件重現)"
 
-#: src/plugins/vcalendar/vcalendar.c:563
+#: src/plugins/vcalendar/vcalendar.c:564
 msgid "(this event is part of a recurring event)"
 msgstr "(這個事件是一個重現性事件的一部份)"
 
-#: src/plugins/vcalendar/vcalendar.c:743
+#: src/plugins/vcalendar/vcalendar.c:715
 msgid "You have received an answer to an unknown meeting proposal."
 msgstr "你收到了一個未知的計畫會議回覆"
 
-#: src/plugins/vcalendar/vcalendar.c:747
+#: src/plugins/vcalendar/vcalendar.c:719
 #, c-format
 msgid ""
 "You have received an answer to a meeting proposal.\n"
@@ -13268,35 +13392,35 @@ msgstr ""
 "你收到了一個計畫的會議回覆\n"
 "%s 有 %s 個邀請,細節如下:"
 
-#: src/plugins/vcalendar/vcalendar.c:826
+#: src/plugins/vcalendar/vcalendar.c:798
 msgid "Error - could not get the calendar MIME part."
 msgstr "錯誤 - 無法取得行事曆的 MIME 部份"
 
-#: src/plugins/vcalendar/vcalendar.c:833
+#: src/plugins/vcalendar/vcalendar.c:805
 msgid "Error - no calendar part found."
 msgstr "錯誤 - 找不到行事曆"
 
-#: src/plugins/vcalendar/vcalendar.c:847
+#: src/plugins/vcalendar/vcalendar.c:819
 msgid "Error - Unknown calendar component type."
 msgstr "錯誤 - 未知的行事曆型式"
 
-#: src/plugins/vcalendar/vcalendar.c:976
+#: src/plugins/vcalendar/vcalendar.c:951
 msgid "Send a notification to the attendees"
 msgstr "傳送通知給出席人員"
 
-#: src/plugins/vcalendar/vcalendar.c:985
+#: src/plugins/vcalendar/vcalendar.c:960
 msgid "Cancel meeting"
 msgstr "取消會議"
 
-#: src/plugins/vcalendar/vcalendar.c:986
+#: src/plugins/vcalendar/vcalendar.c:961
 msgid "Are you sure you want to cancel this meeting?"
 msgstr "你確定要取消這個會議嗎?"
 
-#: src/plugins/vcalendar/vcalendar.c:1081
+#: src/plugins/vcalendar/vcalendar.c:1056
 msgid "No account found"
 msgstr "找不到帳號"
 
-#: src/plugins/vcalendar/vcalendar.c:1082
+#: src/plugins/vcalendar/vcalendar.c:1057
 msgid ""
 "You have no account matching any attendee.\n"
 "Do you want to reply anyway?"
@@ -13304,128 +13428,128 @@ msgstr ""
 "你沒有任何符合出席人員的帳號\n"
 "確定要回覆嗎?"
 
-#: src/plugins/vcalendar/vcalendar.c:1084
+#: src/plugins/vcalendar/vcalendar.c:1059
 msgid "Reply anyway"
 msgstr "直接回覆"
 
-#: src/plugins/vcalendar/vcalendar.c:1213
+#: src/plugins/vcalendar/vcalendar.c:1188
 msgid "Answer"
 msgstr "回答"
 
-#: src/plugins/vcalendar/vcalendar.c:1214
+#: src/plugins/vcalendar/vcalendar.c:1189
 msgid "Edit meeting..."
 msgstr "編輯會議..."
 
-#: src/plugins/vcalendar/vcalendar.c:1215
+#: src/plugins/vcalendar/vcalendar.c:1190
 msgid "Cancel meeting..."
 msgstr "取消會議..."
 
-#: src/plugins/vcalendar/vcalendar.c:1216
+#: src/plugins/vcalendar/vcalendar.c:1191
 msgid "Launch website"
 msgstr "執行網站"
 
-#: src/plugins/vcalendar/vcalendar.c:1220
+#: src/plugins/vcalendar/vcalendar.c:1195
 msgid "You are already busy at this time."
 msgstr "你這個時間是忙碌的"
 
-#: src/plugins/vcalendar/vcalendar.c:1259
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1727
+#: src/plugins/vcalendar/vcalendar.c:1234
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1613
 msgid "Event:"
 msgstr "事件:"
 
-#: src/plugins/vcalendar/vcalendar.c:1260
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1705
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1716
+#: src/plugins/vcalendar/vcalendar.c:1235
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1602
 msgid "Organizer:"
 msgstr "發起人:"
 
-#: src/plugins/vcalendar/vcalendar.c:1261
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1708
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1718
+#: src/plugins/vcalendar/vcalendar.c:1236
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1594
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1604
 msgid "Location:"
 msgstr "地點:"
 
-#: src/plugins/vcalendar/vcalendar.c:1262
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1706
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1717
+#: src/plugins/vcalendar/vcalendar.c:1237
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1592
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1603
 msgid "Summary:"
 msgstr "摘要:"
 
-#: src/plugins/vcalendar/vcalendar.c:1263
+#: src/plugins/vcalendar/vcalendar.c:1238
 msgid "Starting:"
 msgstr "開始:"
 
-#: src/plugins/vcalendar/vcalendar.c:1264
+#: src/plugins/vcalendar/vcalendar.c:1239
 msgid "Ending:"
 msgstr "結束:"
 
-#: src/plugins/vcalendar/vcalendar.c:1266
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1710
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1720
+#: src/plugins/vcalendar/vcalendar.c:1241
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1596
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1606
 msgid "Attendees:"
 msgstr "出席人員:"
 
-#: src/plugins/vcalendar/vcalendar.c:1268
+#: src/plugins/vcalendar/vcalendar.c:1243
 msgid "Action:"
 msgstr "動作:"
 
-#: src/plugins/vcalendar/vcal_folder.c:166
+#: src/plugins/vcalendar/vcal_folder.c:168
 msgid "_New meeting..."
 msgstr "新會議(_N)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:167
+#: src/plugins/vcalendar/vcal_folder.c:169
 msgid "_Export calendar..."
 msgstr "匯出行事曆(_E)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:168
+#: src/plugins/vcalendar/vcal_folder.c:170
 msgid "_Subscribe to Webcal..."
 msgstr "向webCal訂閱(_S)..."
 
-#: src/plugins/vcalendar/vcal_folder.c:170
+#: src/plugins/vcalendar/vcal_folder.c:172
 msgid "_Rename..."
 msgstr "修改名稱(_R)"
 
-#: src/plugins/vcalendar/vcal_folder.c:171
+#: src/plugins/vcalendar/vcal_folder.c:173
 msgid "U_pdate subscriptions"
 msgstr "更新訂閱(_p)"
 
-#: src/plugins/vcalendar/vcal_folder.c:172
+#: src/plugins/vcalendar/vcal_folder.c:174
 msgid "_List view"
 msgstr "檢視清單(_L)"
 
-#: src/plugins/vcalendar/vcal_folder.c:173
+#: src/plugins/vcalendar/vcal_folder.c:175
 msgid "_Week view"
 msgstr "以週檢視(_W)"
 
-#: src/plugins/vcalendar/vcal_folder.c:174
+#: src/plugins/vcalendar/vcal_folder.c:176
 msgid "_Month view"
 msgstr "以月份檢視(_M)"
 
-#: src/plugins/vcalendar/vcal_folder.c:1101
+#: src/plugins/vcalendar/vcal_folder.c:1103
 msgid "Meetings"
 msgstr "會議"
 
-#: src/plugins/vcalendar/vcal_folder.c:1500
+#: src/plugins/vcalendar/vcal_folder.c:1502
 msgid "in the past"
 msgstr "在過去"
 
-#: src/plugins/vcalendar/vcal_folder.c:1503
+#: src/plugins/vcalendar/vcal_folder.c:1505
 msgid "today"
 msgstr "今天"
 
-#: src/plugins/vcalendar/vcal_folder.c:1506
+#: src/plugins/vcalendar/vcal_folder.c:1508
 msgid "tomorrow"
 msgstr "明天"
 
-#: src/plugins/vcalendar/vcal_folder.c:1509
+#: src/plugins/vcalendar/vcal_folder.c:1511
 msgid "this week"
 msgstr "本週"
 
-#: src/plugins/vcalendar/vcal_folder.c:1512
+#: src/plugins/vcalendar/vcal_folder.c:1514
 msgid "later"
 msgstr "稍後"
 
-#: src/plugins/vcalendar/vcal_folder.c:1516
+#: src/plugins/vcalendar/vcal_folder.c:1518
 #, c-format
 msgid ""
 "\n"
@@ -13434,17 +13558,21 @@ msgstr ""
 "\n"
 "這些是已計劃的事件 %s:\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1611
+#: src/plugins/vcalendar/vcal_folder.c:1615
 #, c-format
 msgid "Timeout (%d seconds) connecting to %s\n"
 msgstr "已超時 (%d 秒),發生在連線至 %s 時\n"
 
-#: src/plugins/vcalendar/vcal_folder.c:1629
+#: src/plugins/vcalendar/vcal_folder.c:1627
+msgid "403 (Unauthorised)"
+msgstr "403 (無法認證)"
+
+#: src/plugins/vcalendar/vcal_folder.c:1633
 #, c-format
 msgid "Error %ld"
 msgstr "錯誤 %ld"
 
-#: src/plugins/vcalendar/vcal_folder.c:1811
+#: src/plugins/vcalendar/vcal_folder.c:1815
 #, c-format
 msgid ""
 "Could not retrieve the Webcal URL:\n"
@@ -13457,7 +13585,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1837
+#: src/plugins/vcalendar/vcal_folder.c:1846
 #, c-format
 msgid ""
 "This URL does not look like a Webcal URL:\n"
@@ -13468,130 +13596,130 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1868
-#: src/plugins/vcalendar/vcal_folder.c:1871
+#: src/plugins/vcalendar/vcal_folder.c:1877
+#: src/plugins/vcalendar/vcal_folder.c:1880
 #, c-format
 msgid "Could not create directory %s"
 msgstr "無法建立目錄 %s"
 
-#: src/plugins/vcalendar/vcal_folder.c:1911
+#: src/plugins/vcalendar/vcal_folder.c:1920
 msgid "Claws Mail needs network access in order to update the Webcal feed."
 msgstr "Claws Mail 需要網路的存取能力以更新Webcal feed"
 
-#: src/plugins/vcalendar/vcal_folder.c:1922
+#: src/plugins/vcalendar/vcal_folder.c:1931
 #, c-format
 msgid "Fetching calendar for %s..."
 msgstr "為 %s 取得行事曆..."
 
-#: src/plugins/vcalendar/vcal_folder.c:1923
+#: src/plugins/vcalendar/vcal_folder.c:1932
 msgid "new subscription"
 msgstr "新的訂閱"
 
-#: src/plugins/vcalendar/vcal_folder.c:1934
+#: src/plugins/vcalendar/vcal_folder.c:1943
 msgid "Claws Mail needs network access in order to update the subscription."
 msgstr "Claws Mail 需要網路的存取能力以進行訂閱更新"
 
-#: src/plugins/vcalendar/vcal_folder.c:1946
+#: src/plugins/vcalendar/vcal_folder.c:1955
 msgid "Subscribe to Webcal"
 msgstr "向WebCal訂閱"
 
-#: src/plugins/vcalendar/vcal_folder.c:1946
-msgid "Enter the WebCal URL:"
+#: src/plugins/vcalendar/vcal_folder.c:1955
+msgid "Enter the Webcal URL:"
 msgstr "輸入WebCal的URL:"
 
-#: src/plugins/vcalendar/vcal_folder.c:1958
+#: src/plugins/vcalendar/vcal_folder.c:1967
 msgid "Could not parse the URL."
 msgstr "無法解析此URL"
 
-#: src/plugins/vcalendar/vcal_folder.c:1986
+#: src/plugins/vcalendar/vcal_folder.c:1995
 msgid "Do you really want to unsubscribe?"
 msgstr "你確定要取消訂閱?"
 
-#: src/plugins/vcalendar/vcal_folder.c:1987
+#: src/plugins/vcalendar/vcal_folder.c:1996
 msgid "Delete subscription"
 msgstr "取消訂閱"
 
-#: src/plugins/vcalendar/vcal_manager.c:110
+#: src/plugins/vcalendar/vcal_manager.c:111
 msgid "accepted"
 msgstr "已接受"
 
-#: src/plugins/vcalendar/vcal_manager.c:111
+#: src/plugins/vcalendar/vcal_manager.c:112
 msgid "tentatively accepted"
 msgstr "已暫時接受"
 
-#: src/plugins/vcalendar/vcal_manager.c:112
+#: src/plugins/vcalendar/vcal_manager.c:113
 msgid "declined"
 msgstr "拒絕"
 
-#: src/plugins/vcalendar/vcal_manager.c:113
+#: src/plugins/vcalendar/vcal_manager.c:114
 msgid "did not answer"
 msgstr "尚未回覆"
 
-#: src/plugins/vcalendar/vcal_manager.c:144
+#: src/plugins/vcalendar/vcal_manager.c:145
 msgid "individual"
 msgstr "個人"
 
-#: src/plugins/vcalendar/vcal_manager.c:145
+#: src/plugins/vcalendar/vcal_manager.c:146
 msgid "group"
 msgstr "群組"
 
-#: src/plugins/vcalendar/vcal_manager.c:146
+#: src/plugins/vcalendar/vcal_manager.c:147
 msgid "resource"
 msgstr "資源"
 
-#: src/plugins/vcalendar/vcal_manager.c:147
+#: src/plugins/vcalendar/vcal_manager.c:148
 msgid "room"
 msgstr "處室"
 
-#: src/plugins/vcalendar/vcal_manager.c:558
+#: src/plugins/vcalendar/vcal_manager.c:560
 msgid "Past"
 msgstr "過去"
 
-#: src/plugins/vcalendar/vcal_manager.c:561
+#: src/plugins/vcalendar/vcal_manager.c:563
 msgid "Today"
 msgstr "今天"
 
-#: src/plugins/vcalendar/vcal_manager.c:564
+#: src/plugins/vcalendar/vcal_manager.c:566
 msgid "Tomorrow"
 msgstr "明天"
 
-#: src/plugins/vcalendar/vcal_manager.c:567
+#: src/plugins/vcalendar/vcal_manager.c:569
 msgid "This week"
 msgstr "本週"
 
-#: src/plugins/vcalendar/vcal_manager.c:570
+#: src/plugins/vcalendar/vcal_manager.c:572
 msgid "Later"
 msgstr "稍後"
 
-#: src/plugins/vcalendar/vcal_manager.c:1246
+#: src/plugins/vcalendar/vcal_manager.c:1248
 msgid "Accepted: "
 msgstr "接受:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1248
+#: src/plugins/vcalendar/vcal_manager.c:1250
 msgid "Declined: "
 msgstr "拒絕:"
 
-#: src/plugins/vcalendar/vcal_manager.c:1250
+#: src/plugins/vcalendar/vcal_manager.c:1252
 msgid "Tentatively Accepted: "
 msgstr "暫時接受:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:307
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:308
 msgid "Individual"
 msgstr "個人"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:309
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
 msgid "Resource"
 msgstr "資源"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:310
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:311
 msgid "Room"
 msgstr "室"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:323
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:324
 msgid "Add..."
 msgstr "新增..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:779
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:728
 msgid ""
 "The following people are busy at the time of your planned meeting:\n"
 "- "
@@ -13599,62 +13727,62 @@ msgstr ""
 "以下這些人員在你計畫的這個會議時間是忙碌的\n"
 "- "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:780
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:869
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:955
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:729
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:818
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:904
 msgid "You"
 msgstr "你"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:781
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:730
 msgid "You are busy at the time of your planned meeting"
 msgstr "你自己在你計畫的這個會議時間是忙碌的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:783
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:732
 #, c-format
 msgid "%s is busy at the time of your planned meeting"
 msgstr "%s 在你計畫的這個會議時間是忙碌的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:785
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:734
 #, c-format
 msgid "%d hour sooner"
 msgstr "%d 小時之前"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:787
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:736
 #, c-format
 msgid "%d hours sooner"
 msgstr "%d 小時之前"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:789
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:738
 #, c-format
 msgid "%d hours and %d minutes sooner"
 msgstr "%d 小時和 %d 分鐘之前"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:791
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:740
 #, c-format
 msgid "%d minutes sooner"
 msgstr "%d 分鐘之前"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:796
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:745
 #, c-format
 msgid "%d hour later"
 msgstr "%d 小時之後"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:798
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:747
 #, c-format
 msgid "%d hours later"
 msgstr "%d 小時之後"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:800
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:749
 #, c-format
 msgid "%d hours and %d minutes later"
 msgstr "%d 小時和 %d 分鐘之後"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:802
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:751
 #, c-format
 msgid "%d minutes later"
 msgstr "%d 分鐘之前"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:808
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:757
 #, c-format
 msgid ""
 "\n"
@@ -13665,7 +13793,7 @@ msgstr ""
 "\n"
 "每一個人都可以 %s 或 %s."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:810
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:759
 #, c-format
 msgid ""
 "\n"
@@ -13676,7 +13804,7 @@ msgstr ""
 "\n"
 "每一個人都可以 %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:812
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:761
 msgid ""
 "\n"
 "\n"
@@ -13687,79 +13815,79 @@ msgstr ""
 "\n"
 "在這之前的6個小時或是之前的6個小時內,要每一個人參與這個會議是不可 能的事情"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:817
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:766
 #, c-format
 msgid "would be available %s or %s"
 msgstr "%s 或 %s 將是可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:819
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:768
 #, c-format
 msgid "would be available %s"
 msgstr "%s 是可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:821
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:882
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:952
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:770
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:831
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:901
 msgid "not available"
 msgstr "不可能"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:824
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:773
 #, c-format
 msgid ", but would be available %s or %s."
 msgstr ", 但是 %s 或 %s 是可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:826
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:775
 #, c-format
 msgid ", but would be available %s."
 msgstr ", 但是 %s 是可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:828
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:777
 msgid ", and isn't available in the previous or next 6 hours."
 msgstr ", 而且在此之前或是之後的6個小時是不可能的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:885
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:834
 msgid "available"
 msgstr "可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:887
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1136
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:836
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1087
 msgid "Free/busy retrieval failed"
 msgstr "空閒/忙錄 取回失敗"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:969
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:918
 msgid "Not everyone is available"
 msgstr "不是每一個人都可以"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:970
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:919
 msgid "Send anyway"
 msgstr "傳送出去"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:981
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:930
 msgid "Not everyone is available. See tooltips for more info..."
 msgstr "並不是每個人都可以!參考提示以獲得更多的資訊..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1118
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1069
 #, c-format
 msgid "Fetching planning for %s..."
 msgstr "為 %s 取得計畫..."
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1145
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1096
 msgid "Available"
 msgstr "可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1158
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1165
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1173
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1109
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1116
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1124
 msgid "Everyone is available."
 msgstr "每一個人都是可以的"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1174
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1125
 msgid ""
 "Everyone seems available, but some free/busy information failed to be "
 "retrieved."
 msgstr "似乎每一個人都可以,但是有些 空閒/忙碌 的資訊取得失敗  "
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1340
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1295
 msgid ""
 "Could not send the meeting invitation.\n"
 "Check the recipients."
@@ -13767,61 +13895,61 @@ msgstr ""
 "不能傳送會議的邀請\n"
 "檢查回條"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1461
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1376
 msgid "Save & Send"
 msgstr "儲存並傳送"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1462
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1377
 msgid "Check availability"
 msgstr "檢查可行性"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1585
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1471
 msgid "Starts at:"
 msgstr "開始於:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1591
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1615
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1477
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1501 src/prefs_matcher.c:771
 msgid "on:"
 msgstr "在:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1609
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1495
 msgid "Ends at:"
 msgstr "結束於:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1650
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1536
 msgid "New meeting"
 msgstr "新的會議"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1652
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1538
 #, c-format
 msgid "%s - Edit meeting"
 msgstr "%s - 編輯會議"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1707
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1731
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1593
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1617
 msgid "Time:"
 msgstr "時間:"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1864
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1739
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1867
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1742
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分鐘"
 msgstr[1] "%d 分鐘"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1878
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1753
 #, c-format
 msgid "Upcoming event: %s"
 msgstr "即將到來的事件: %s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1879
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1754
 #, c-format
 msgid ""
 "You have a meeting or event soon.\n"
@@ -13838,39 +13966,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:1896
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1771
 #, c-format
 msgid "Remind me in %d minute"
 msgid_plural "Remind me in %d minutes"
 msgstr[0] "在 %d 分鐘後提醒我"
 msgstr[1] "在 %d 分鐘後提醒我"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2022
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1897
 msgid "Empty calendar"
 msgstr "清空行事曆"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2023
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1898
 msgid "There is nothing to export."
 msgstr "沒有什麼可以匯出"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2063
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1938
 msgid "Could not export the calendar."
 msgstr "無法匯出行事曆"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2080
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1955
 msgid "Export calendar to ICS"
 msgstr "把行事曆匯出至 ICS"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2103
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:1978
 #, c-format
 msgid "Couldn't export calendar to '%s'\n"
 msgstr "無法匯出行事曆至 '%s'\n"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2219
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2094
 msgid "Could not export the freebusy info."
 msgstr "無法匯出 空閒/忙碌 的資訊"
 
-#: src/plugins/vcalendar/vcal_meeting_gtk.c:2251
+#: src/plugins/vcalendar/vcal_meeting_gtk.c:2126
 #, c-format
 msgid "Couldn't export free/busy to '%s'\n"
 msgstr "無法匯出 空閒/忙碌 至'%s'\n"
@@ -13962,107 +14090,107 @@ msgstr ""
 msgid "SSL/TLS options"
 msgstr "SSL/TLS 選項"
 
-#: src/pop.c:152
+#: src/pop.c:153
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "在問候語中找不到需要的 APOP 時間戳記\n"
 
-#: src/pop.c:159
+#: src/pop.c:160
 msgid "Timestamp syntax error in greeting\n"
 msgstr "在問候語中的時間戳記語法錯誤\n"
 
-#: src/pop.c:166
+#: src/pop.c:167
 msgid "Timestamp syntax error in greeting (not ASCII)\n"
 msgstr "在問候語中的時間戳記語法錯誤 (非ASCII)\n"
 
-#: src/pop.c:190 src/pop.c:217
+#: src/pop.c:191 src/pop.c:218
 msgid "POP protocol error\n"
 msgstr "POP3 協定錯誤\n"
 
-#: src/pop.c:263
+#: src/pop.c:264
 #, c-format
 msgid "invalid UIDL response: %s\n"
 msgstr "無效的 UIDL 回應: %s\n"
 
-#: src/pop.c:841
+#: src/pop.c:843
 #, c-format
 msgid "POP: Deleting expired message %d [%s]\n"
 msgstr "POP3: 刪除已過期的郵件 %d [%s]\n"
 
-#: src/pop.c:857
+#: src/pop.c:859
 #, c-format
 msgid "POP: Skipping message %d [%s] (%d bytes)\n"
 msgstr "POP3: 略過郵件 %d [%s] (%d 位元)\n"
 
-#: src/pop.c:889
+#: src/pop.c:891
 msgid "mailbox is locked\n"
 msgstr "郵件箱已鎖定\n"
 
-#: src/pop.c:892
+#: src/pop.c:894
 msgid "Session timeout\n"
 msgstr "通信超時\n"
 
-#: src/pop.c:911
+#: src/pop.c:913
 msgid "command not supported\n"
 msgstr "未支援的命令\n"
 
-#: src/pop.c:916
+#: src/pop.c:918
 msgid "error occurred on POP session\n"
 msgstr "POP3通信發生錯誤\n"
 
-#: src/pop.c:1111
+#: src/pop.c:1113
 msgid "TOP command unsupported\n"
 msgstr "未支援的頂端命令\n"
 
-#: src/prefs_account.c:335 src/prefs_account.c:1487 src/prefs_account.c:2500
+#: src/prefs_account.c:364 src/prefs_account.c:1559 src/prefs_account.c:2635
 msgid "POP"
 msgstr "POP"
 
-#: src/prefs_account.c:336 src/prefs_account.c:1600 src/prefs_account.c:2515
-#: src/wizard.c:1499
+#: src/prefs_account.c:365 src/prefs_account.c:1672 src/prefs_account.c:2650
+#: src/wizard.c:1501
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/prefs_account.c:337
+#: src/prefs_account.c:366
 msgid "News (NNTP)"
 msgstr "新聞 (NNTP)"
 
-#: src/prefs_account.c:338 src/wizard.c:1500
+#: src/prefs_account.c:367 src/wizard.c:1502
 msgid "Local mbox file"
 msgstr "本地 mbox 檔案"
 
-#: src/prefs_account.c:339
+#: src/prefs_account.c:368
 msgid "None (SMTP only)"
 msgstr "空  (只針對SMTP)"
 
-#: src/prefs_account.c:1040
+#: src/prefs_account.c:1131
 msgid "Name of account"
 msgstr "帳號名稱"
 
-#: src/prefs_account.c:1049
+#: src/prefs_account.c:1140
 msgid "Set as default"
 msgstr "設定為預設值"
 
-#: src/prefs_account.c:1057
+#: src/prefs_account.c:1148
 msgid "Personal information"
 msgstr "個人資訊"
 
-#: src/prefs_account.c:1066
+#: src/prefs_account.c:1157
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account.c:1072
+#: src/prefs_account.c:1163
 msgid "Mail address"
 msgstr "郵件地址"
 
-#: src/prefs_account.c:1135 src/wizard.c:1523
+#: src/prefs_account.c:1226 src/wizard.c:1525
 msgid "Auto-configure"
 msgstr "自動配置"
 
-#: src/prefs_account.c:1137 src/wizard.c:1524
+#: src/prefs_account.c:1228 src/wizard.c:1526
 msgid "Cancel"
 msgstr "取消"
 
-#: src/prefs_account.c:1154
+#: src/prefs_account.c:1245
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP and News support."
@@ -14070,537 +14198,604 @@ msgstr ""
 "警告:此 Claws Mail 編譯版本未支援\n"
 "IMPA 和 新聞功能"
 
-#: src/prefs_account.c:1185
+#: src/prefs_account.c:1276
 msgid "This server requires authentication"
 msgstr "此伺服器要求認證"
 
-#: src/prefs_account.c:1192
+#: src/prefs_account.c:1283
 msgid "Authenticate on connect"
 msgstr "連線時進行認證"
 
-#: src/prefs_account.c:1254
+#: src/prefs_account.c:1345
 msgid "News server"
 msgstr "新聞伺服器"
 
-#: src/prefs_account.c:1260
+#: src/prefs_account.c:1351
 msgid "Server for receiving"
 msgstr "POP3 伺服器 (接收)"
 
-#: src/prefs_account.c:1266
+#: src/prefs_account.c:1357
 msgid "Local mailbox"
 msgstr "本地郵件夾"
 
-#: src/prefs_account.c:1273
+#: src/prefs_account.c:1364
 msgid "SMTP server (send)"
 msgstr "SMTP 伺服器 (傳送)"
 
-#: src/prefs_account.c:1281
+#: src/prefs_account.c:1372
 msgid "Use mail command rather than SMTP server"
 msgstr "與其使用郵件命令,不如使用 SMTP 伺服器"
 
-#: src/prefs_account.c:1290
+#: src/prefs_account.c:1381
 msgid "command to send mails"
 msgstr "傳送郵件命令"
 
-#: src/prefs_account.c:1365
+#: src/prefs_account.c:1454
 #, c-format
 msgid "Account%d"
 msgstr "帳號 %d"
 
-#: src/prefs_account.c:1461
+#: src/prefs_account.c:1533
 msgid "Local"
 msgstr "本地"
 
-#: src/prefs_account.c:1467 src/prefs_account.c:1556
+#: src/prefs_account.c:1539 src/prefs_account.c:1628
 msgid "Default Inbox"
 msgstr "預設收件夾"
 
-#: src/prefs_account.c:1474 src/prefs_account.c:1481 src/prefs_account.c:1563
-#: src/prefs_account.c:1570
+#: src/prefs_account.c:1546 src/prefs_account.c:1553 src/prefs_account.c:1635
+#: src/prefs_account.c:1642
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "未過濾郵件將被儲存在這個資料夾"
 
-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1561
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全認證 (APOP)"
 
-#: src/prefs_account.c:1492
+#: src/prefs_account.c:1564
 msgid "Remove messages on server when received"
 msgstr "郵件接收後從伺服器上移除"
 
-#: src/prefs_account.c:1503
+#: src/prefs_account.c:1575
 msgid "Remove after"
 msgstr "超過"
 
-#: src/prefs_account.c:1510 src/prefs_account.c:1520
+#: src/prefs_account.c:1582 src/prefs_account.c:1592
 msgid "0 days and 0 hours : remove immediately"
 msgstr "0 天 0 小時後: 立刻移除"
 
-#: src/prefs_account.c:1533
+#: src/prefs_account.c:1605
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1608
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
 msgstr ""
 "郵件超過此限制將被部份接收,當選擇它們後,你將可以把它們全部下找或刪除。"
 
-#: src/prefs_account.c:1576 src/prefs_account.c:2530
+#: src/prefs_account.c:1648 src/prefs_account.c:2665
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1583
+#: src/prefs_account.c:1655
 msgid "Maximum number of articles to download"
 msgstr "可允許最大的郵件下載數量"
 
-#: src/prefs_account.c:1593
+#: src/prefs_account.c:1665
 msgid "unlimited if 0 is specified"
 msgstr "若設為0代表沒有限制"
 
-#: src/prefs_account.c:1618
+#: src/prefs_account.c:1690
 msgid "Plain text"
 msgstr "尋找字串:"
 
-#: src/prefs_account.c:1631
+#: src/prefs_account.c:1703
 msgid "IMAP server directory"
 msgstr "IMAP 伺服器目錄"
 
-#: src/prefs_account.c:1635
+#: src/prefs_account.c:1707
 msgid "(usually empty)"
 msgstr "(通常是空白的)"
 
-#: src/prefs_account.c:1649
+#: src/prefs_account.c:1721
 msgid "Show subscribed folders only"
 msgstr "只顯示訂閱資料夾"
 
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1728
 msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
 msgstr "寬頻效果模式 (防止接到遠端的標籤)"
 
-#: src/prefs_account.c:1658
+#: src/prefs_account.c:1730
 msgid "This mode uses less bandwidth, but can be slower with some servers."
 msgstr "此模式使用較少的頻寬,對於某此伺服器可能會有速度較慢的情況發生"
 
-#: src/prefs_account.c:1665
+#: src/prefs_account.c:1737 src/prefs_receive.c:164
+msgid "Automatic checking"
+msgstr "自動檢查"
+
+#: src/prefs_account.c:1740
+msgid "Use global settings"
+msgstr "使用全域設定"
+
+#: src/prefs_account.c:1746 src/prefs_receive.c:171
+msgid "Check for new mail every"
+msgstr "檢查新郵件頻率"
+
+#: src/prefs_account.c:1785
 msgid "Filter messages on receiving"
 msgstr "接收郵件時進行過濾"
 
-#: src/prefs_account.c:1672
+#: src/prefs_account.c:1801
 msgid "Allow filtering using plugins on receiving"
 msgstr "接收郵件時允許使用外掛程式進行過濾"
 
-#: src/prefs_account.c:1676
+#: src/prefs_account.c:1805
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "'接收郵件' 檢查此帳號的新郵件"
 
-#: src/prefs_account.c:1759 src/prefs_customheader.c:208
-#: src/prefs_matcher.c:623 src/prefs_matcher.c:1970 src/prefs_matcher.c:1992
+#: src/prefs_account.c:1894 src/prefs_customheader.c:210
+#: src/prefs_matcher.c:634 src/prefs_matcher.c:2014 src/prefs_matcher.c:2042
 msgid "Header"
 msgstr "郵件標頭"
 
-#: src/prefs_account.c:1761
+#: src/prefs_account.c:1896
 msgid "Generate Message-ID"
 msgstr "產生  Message-ID"
 
-#: src/prefs_account.c:1764
+#: src/prefs_account.c:1899
 msgid "Send account mail address in Message-ID"
 msgstr "將傳送帳號的郵件地址放入  Message-ID"
 
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1902
 msgid "Add user agent header"
 msgstr "加入使用者代理郵件標頭"
 
-#: src/prefs_account.c:1774
+#: src/prefs_account.c:1909
 msgid "Add user-defined header"
 msgstr "加入使用者自訂郵件標頭"
 
-#: src/prefs_account.c:1789
+#: src/prefs_account.c:1924
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP 認證 (SMTP AUTH)"
 
-#: src/prefs_account.c:1887
+#: src/prefs_account.c:2022
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "若以下欄位空白,將以使用者名稱和密碼進行接收"
 
-#: src/prefs_account.c:1898
+#: src/prefs_account.c:2033
 msgid "Authenticate with POP before sending"
 msgstr "傳送前用 POP3 認證"
 
-#: src/prefs_account.c:1913
-msgid "POP authentication timeout: "
+#: src/prefs_account.c:2048
+msgid "POP authentication timeout"
 msgstr "POP 認證超時:"
 
-#: src/prefs_account.c:2001 src/prefs_account.c:2047
+#: src/prefs_account.c:2136 src/prefs_account.c:2182
 msgid "Signature"
 msgstr "簽名"
 
-#: src/prefs_account.c:2004
+#: src/prefs_account.c:2139
 msgid "Automatically insert signature"
 msgstr "自動插入簽名"
 
-#: src/prefs_account.c:2009
+#: src/prefs_account.c:2144
 msgid "Signature separator"
 msgstr "簽名分隔線"
 
-#: src/prefs_account.c:2034
+#: src/prefs_account.c:2169
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account.c:2067
+#: src/prefs_account.c:2202
 msgid "Automatically set the following addresses"
 msgstr "自動設置轉寄地址"
 
-#: src/prefs_account.c:2119
+#: src/prefs_account.c:2254
 msgid "Spell check dictionaries"
 msgstr "併字檢查字典"
 
-#: src/prefs_account.c:2129 src/prefs_folder_item.c:1104
+#: src/prefs_account.c:2264 src/prefs_folder_item.c:1114
 #: src/prefs_spelling.c:162
 msgid "Default dictionary"
 msgstr "預設定典"
 
-#: src/prefs_account.c:2142 src/prefs_folder_item.c:1138
+#: src/prefs_account.c:2277 src/prefs_folder_item.c:1148
 #: src/prefs_spelling.c:174
 msgid "Default alternate dictionary"
 msgstr "預設替代定典"
 
-#: src/prefs_account.c:2228 src/prefs_account.c:3423
-#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1449
-#: src/prefs_folder_item.c:1842 src/prefs_quote.c:119 src/prefs_quote.c:237
+#: src/prefs_account.c:2363 src/prefs_account.c:3776
+#: src/prefs_compose_writing.c:370 src/prefs_folder_item.c:1539
+#: src/prefs_folder_item.c:1924 src/prefs_quote.c:119 src/prefs_quote.c:237
 #: src/prefs_spelling.c:332 src/prefs_wrapping.c:152
 msgid "Compose"
 msgstr "新郵件"
 
-#: src/prefs_account.c:2243 src/prefs_folder_item.c:1477 src/prefs_quote.c:134
+#: src/prefs_account.c:2378 src/prefs_folder_item.c:1567 src/prefs_quote.c:134
 #: src/toolbar.c:490
 msgid "Reply"
 msgstr "回覆"
 
-#: src/prefs_account.c:2258 src/prefs_filtering_action.c:191
-#: src/prefs_folder_item.c:1505 src/prefs_quote.c:149 src/toolbar.c:495
+#: src/prefs_account.c:2393 src/prefs_filtering_action.c:185
+#: src/prefs_folder_item.c:1595 src/prefs_quote.c:149 src/toolbar.c:495
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/prefs_account.c:2305
+#: src/prefs_account.c:2440
 msgid "Default privacy system"
 msgstr "預設的隱私系統"
 
-#: src/prefs_account.c:2334
+#: src/prefs_account.c:2469 src/prefs_folder_item.c:1188
 msgid "Always sign messages"
 msgstr "總是進行郵件簽章"
 
-#: src/prefs_account.c:2336
+#: src/prefs_account.c:2471 src/prefs_folder_item.c:1220
 msgid "Always encrypt messages"
 msgstr "總是將郵件加密"
 
-#: src/prefs_account.c:2338
+#: src/prefs_account.c:2473
 msgid "Always sign messages when replying to a signed message"
 msgstr "當回覆簽章郵件時,總是將郵件進行簽章"
 
-#: src/prefs_account.c:2341
+#: src/prefs_account.c:2476
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "當回覆已加密郵件時,總是將郵件進行加密"
 
-#: src/prefs_account.c:2344
+#: src/prefs_account.c:2479
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "除了收件者外,將已傳送的郵件用私有金鑰進行加密"
 
-#: src/prefs_account.c:2346
+#: src/prefs_account.c:2481
 msgid "Save sent encrypted messages as clear text"
 msgstr "將已傳送的加密郵件儲存為明碼文件"
 
-#: src/prefs_account.c:2504 src/prefs_account.c:2519 src/prefs_account.c:2533
+#: src/prefs_account.c:2639 src/prefs_account.c:2654 src/prefs_account.c:2668
 msgid "Don't use SSL/TLS"
 msgstr "不使用 SSL/TLS"
 
-#: src/prefs_account.c:2507 src/prefs_account.c:2522 src/prefs_account.c:2542
-#: src/prefs_account.c:2553
+#: src/prefs_account.c:2642 src/prefs_account.c:2657 src/prefs_account.c:2677
+#: src/prefs_account.c:2688
 msgid "Use SSL/TLS"
 msgstr "使用 SSL/TLS"
 
-#: src/prefs_account.c:2510 src/prefs_account.c:2525 src/prefs_account.c:2556
+#: src/prefs_account.c:2645 src/prefs_account.c:2660 src/prefs_account.c:2691
 msgid "Use STARTTLS command to start encrypted session"
 msgstr "使用 STARTTLS 命令啟用加密通訊"
 
-#: src/prefs_account.c:2546
+#: src/prefs_account.c:2681
 msgid "Send (SMTP)"
 msgstr "傳送 (SMTP)"
 
-#: src/prefs_account.c:2550
+#: src/prefs_account.c:2685
 msgid "Don't use SSL/TLS (but, if necessary, use STARTTLS)"
 msgstr "不使用 SSL/TLS (若需要,使用 STARTTLS)"
 
-#: src/prefs_account.c:2561
+#: src/prefs_account.c:2696
 msgid "Client certificates"
 msgstr "客戶端認證"
 
-#: src/prefs_account.c:2569
+#: src/prefs_account.c:2704
 msgid "Certificate for receiving"
 msgstr "進行接收認證"
 
-#: src/prefs_account.c:2574 src/prefs_account.c:2576 src/prefs_account.c:2602
-#: src/prefs_account.c:2604
+#: src/prefs_account.c:2709 src/prefs_account.c:2711 src/prefs_account.c:2737
+#: src/prefs_account.c:2739
 msgid "Client certificate file as a PKCS12 or PEM file"
 msgstr "客戶端認證檔案為 PKCS12 或 PEM 檔"
 
-#: src/prefs_account.c:2597
+#: src/prefs_account.c:2732
 msgid "Certificate for sending"
 msgstr "進行傳送認證"
 
-#: src/prefs_account.c:2637
+#: src/prefs_account.c:2772
 msgid "Automatically accept valid SSL/TLS certificates"
 msgstr "自動接放不明的合法 SSL/TLS 認證"
 
-#: src/prefs_account.c:2640
+#: src/prefs_account.c:2775
 msgid "Use non-blocking SSL/TLS"
 msgstr "使用非阻斷式 SSL/TLS"
 
-#: src/prefs_account.c:2652
+#: src/prefs_account.c:2787
 msgid "Turn this off if you have SSL/TLS connection problems"
 msgstr "如果發生 SSL/TLS 連線問題,請把此功能關閉"
 
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:2879 src/prefs_proxy.c:73
+msgid "Use proxy server"
+msgstr "使用代理伺服器"
+
+#: src/prefs_account.c:2888
+msgctxt ""
+"In account preferences, referring to whether or not use proxy settings from "
+"common preferences"
+msgid "Use default settings"
+msgstr "使用預設值"
+
+#: src/prefs_account.c:2890
+msgid "Use global proxy server settings"
+msgstr "使用全域的代理伺服器設定"
+
+#: src/prefs_account.c:2927 src/prefs_proxy.c:115 src/wizard.c:1120
+msgid "Use authentication"
+msgstr "使用認證"
+
+#: src/prefs_account.c:2932 src/prefs_proxy.c:123
+msgid "Username"
+msgstr "使用者名稱"
+
+#: src/prefs_account.c:2966
+msgid "Use proxy server for sending"
+msgstr "使用代理伺服器寄送郵件"
+
+#: src/prefs_account.c:2968
+msgid ""
+"If disabled, messages will be sent using direct connection to configured "
+"outgoing server, bypassing any configured proxy server."
+msgstr ""
+"若關閉此功能,郵件將忽略任何設置的代理伺服器,轉而使用已設置的外部伺服器直接"
+"連線並寄送郵件"
+
+#: src/prefs_account.c:3079
 msgid "SMTP port"
 msgstr "SMTP 通訊埠"
 
-#: src/prefs_account.c:2794
+#: src/prefs_account.c:3086
 msgid "POP port"
 msgstr "POP3 通訊埠"
 
-#: src/prefs_account.c:2801
+#: src/prefs_account.c:3093
 msgid "IMAP port"
 msgstr "IMAP4 通訊埠"
 
-#: src/prefs_account.c:2808
+#: src/prefs_account.c:3100
 msgid "NNTP port"
 msgstr "NNTP 通訊埠"
 
-#: src/prefs_account.c:2814
+#: src/prefs_account.c:3106
 msgid "Domain name"
 msgstr "網域名稱"
 
-#: src/prefs_account.c:2817
+#: src/prefs_account.c:3109
 msgid ""
 "The domain name will be used in the generated Message-ID, and when "
 "connecting to SMTP servers."
 msgstr "網域名稱將被用來產生 Message-ID 以及當要連接到 SMTP 伺服器時"
 
-#: src/prefs_account.c:2831
+#: src/prefs_account.c:3123
 msgid "Use command to communicate with server"
 msgstr "以命令和伺服器進行通訊"
 
-#: src/prefs_account.c:2840
+#: src/prefs_account.c:3132
 msgid "Mark cross-posted messages as read and color:"
 msgstr "標示已傳送郵件為已讀並更改顏色"
 
-#: src/prefs_account.c:2896
+#: src/prefs_account.c:3185
 msgid "Put sent messages in"
 msgstr "郵已傳送郵件放在"
 
-#: src/prefs_account.c:2898
+#: src/prefs_account.c:3187
 msgid "Put queued messages in"
 msgstr "將暫存郵件放在"
 
-#: src/prefs_account.c:2900
+#: src/prefs_account.c:3189
 msgid "Put draft messages in"
 msgstr "將草稿郵件放在"
 
-#: src/prefs_account.c:2902
+#: src/prefs_account.c:3191
 msgid "Put deleted messages in"
 msgstr "將刪除的郵件放在"
 
-#: src/prefs_account.c:2961
+#: src/prefs_account.c:3248
 msgid "Account name is not entered."
 msgstr "未指定帳號名稱"
 
-#: src/prefs_account.c:2965
+#: src/prefs_account.c:3252
 msgid "Mail address is not entered."
 msgstr "未指定郵件地方"
 
-#: src/prefs_account.c:2973
+#: src/prefs_account.c:3260
 msgid "SMTP server is not entered."
 msgstr "未指定 SMTP 伺服器"
 
-#: src/prefs_account.c:2978
+#: src/prefs_account.c:3265
 msgid "User ID is not entered."
 msgstr "使用者 ID 未指定"
 
-#: src/prefs_account.c:2983
+#: src/prefs_account.c:3270
 msgid "POP server is not entered."
 msgstr "未指定 POP3 伺服器"
 
-#: src/prefs_account.c:3003
+#: src/prefs_account.c:3290
 msgid "The default Inbox folder doesn't exist."
 msgstr "預設收件夾不存在"
 
-#: src/prefs_account.c:3009
+#: src/prefs_account.c:3296
 msgid "IMAP server is not entered."
 msgstr "IMAP4 伺服器未指定"
 
-#: src/prefs_account.c:3014
+#: src/prefs_account.c:3301
 msgid "NNTP server is not entered."
 msgstr "NNTP 伺服器未指定"
 
-#: src/prefs_account.c:3020
+#: src/prefs_account.c:3307
 msgid "local mailbox filename is not entered."
 msgstr "本地郵件夾名稱未指定"
 
-#: src/prefs_account.c:3026
+#: src/prefs_account.c:3313
 msgid "mail command is not entered."
 msgstr "郵件命令未指定"
 
-#: src/prefs_account.c:3036
+#: src/prefs_account.c:3323
 msgid "User ID cannot contain a newline character."
-msgstr ""
+msgstr "使用者名稱不能包含新行的字元"
 
-#: src/prefs_account.c:3041
+#: src/prefs_account.c:3328
 msgid "Password cannot contain a newline character."
-msgstr ""
+msgstr "密碼不能包含新行的字元"
 
-#: src/prefs_account.c:3069
+#: src/prefs_account.c:3356
 msgid "SMTP user ID cannot contain a newline character."
-msgstr ""
+msgstr "SMTP的使用者名稱不能包含新行的字元"
 
-#: src/prefs_account.c:3074
+#: src/prefs_account.c:3361
 msgid "SMTP password cannot contain a newline character."
-msgstr ""
+msgstr "SMTP的密碼不能包含新行的字元"
+
+#: src/prefs_account.c:3437
+msgid "domain is not specified."
+msgstr "尚未指定收件者"
+
+#: src/prefs_account.c:3442
+msgid "sent folder is not selected."
+msgstr "尚未選擇已傳送資料夾"
+
+#: src/prefs_account.c:3447
+msgid "queue folder is not selected."
+msgstr "尚未選擇暫存資料夾"
+
+#: src/prefs_account.c:3452
+msgid "draft folder is not selected."
+msgstr "尚未選擇草稿資料夾"
 
-#: src/prefs_account.c:3387
+#: src/prefs_account.c:3457
+msgid "trash folder is not selected."
+msgstr "尚未選擇回收資料夾"
+
+#: src/prefs_account.c:3740
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account.c:3441 src/prefs_folder_item.c:1858 src/prefs_quote.c:238
+#: src/prefs_account.c:3794 src/prefs_folder_item.c:1940 src/prefs_quote.c:238
 msgid "Templates"
 msgstr "樣版"
 
-#: src/prefs_account.c:3459
+#: src/prefs_account.c:3812
 msgid "Privacy"
 msgstr "隱私"
 
-#: src/prefs_account.c:3571
+#: src/prefs_account.c:3942
 msgid "Advanced"
 msgstr "進階"
 
-#: src/prefs_account.c:3906
+#: src/prefs_account.c:4291
 msgid "Preferences for new account"
 msgstr "新帳號選項"
 
-#: src/prefs_account.c:3908
+#: src/prefs_account.c:4293
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帳號選項"
 
-#: src/prefs_account.c:4029 src/wizard.c:1388
+#: src/prefs_account.c:4412 src/wizard.c:1390
 msgid "Failed (wrong address)"
 msgstr "失敗 (錯誤的地址)"
 
-#: src/prefs_account.c:4114
+#: src/prefs_account.c:4497
 msgid "Select signature file"
 msgstr "繼擇簽名檔案"
 
-#: src/prefs_account.c:4132 src/prefs_account.c:4149 src/wizard.c:1065
+#: src/prefs_account.c:4515 src/prefs_account.c:4532 src/wizard.c:1067
 msgid "Select certificate file"
 msgstr "選擇認證檔案"
 
-#: src/prefs_account.c:4245
+#: src/prefs_account.c:4628
 msgid "Protocol:"
 msgstr "通訊協定"
 
-#: src/prefs_account.c:4385
+#: src/prefs_account.c:4799
 #, c-format
 msgid "%s (plugin not loaded)"
 msgstr "%s (未載入外掛程式)"
 
-#: src/prefs_actions.c:223
+#: src/prefs_actions.c:225
 msgid "Actions configuration"
 msgstr "動作配置"
 
-#: src/prefs_actions.c:250
+#: src/prefs_actions.c:252
 msgid "Menu name"
 msgstr "功能清單名稱"
 
-#: src/prefs_actions.c:283
+#: src/prefs_actions.c:285
 msgid "Shell command"
 msgstr "Shell命令"
 
-#: src/prefs_actions.c:293
+#: src/prefs_actions.c:295
 msgid "Filter action"
 msgstr "過濾器動作"
 
-#: src/prefs_actions.c:299
+#: src/prefs_actions.c:301
 msgid "Edit filter action"
 msgstr "編輯過濾器動作"
 
-#: src/prefs_actions.c:327
+#: src/prefs_actions.c:329
 msgid "Append the new action above to the list"
 msgstr "在此清單上加入新的動作"
 
-#: src/prefs_actions.c:335
+#: src/prefs_actions.c:337
 msgid "Replace the selected action in list with the action above"
 msgstr "將清單內選擇的動作以上方的動作取代"
 
-#: src/prefs_actions.c:337 src/prefs_filtering_action.c:616
-#: src/prefs_filtering.c:486 src/prefs_matcher.c:780 src/prefs_template.c:319
-#: src/prefs_toolbar.c:1069
+#: src/prefs_actions.c:339 src/prefs_filtering_action.c:589
+#: src/prefs_filtering.c:487 src/prefs_matcher.c:804 src/prefs_template.c:320
+#: src/prefs_toolbar.c:1024
 msgid "D_elete"
 msgstr "刪除(_e)"
 
-#: src/prefs_actions.c:345
+#: src/prefs_actions.c:347
 msgid "Delete the selected action from the list"
 msgstr "從清單中刪除已選擇的動作"
 
-#: src/prefs_actions.c:355 src/prefs_filtering.c:503 src/prefs_template.c:337
+#: src/prefs_actions.c:357 src/prefs_filtering.c:504 src/prefs_template.c:338
 msgid "Clear all the input fields in the dialog"
 msgstr "在對話框中清除所有輸入的區塊"
 
-#: src/prefs_actions.c:363
+#: src/prefs_actions.c:365
 msgid "Show information on configuring actions"
 msgstr "顯示配置動作的資訊"
 
-#: src/prefs_actions.c:394
+#: src/prefs_actions.c:396
 msgid "Move the selected action up"
 msgstr "將選擇的動作上移"
 
-#: src/prefs_actions.c:402
+#: src/prefs_actions.c:404
 msgid "Move selected action down"
 msgstr "將選擇的動作下移"
 
-#: src/prefs_actions.c:535 src/prefs_filtering_action.c:707
-#: src/prefs_filtering.c:838 src/prefs_filtering.c:840
-#: src/prefs_filtering.c:841 src/prefs_filtering.c:951 src/prefs_matcher.c:897
-#: src/prefs_template.c:471
+#: src/prefs_actions.c:537 src/prefs_filtering_action.c:678
+#: src/prefs_filtering.c:839 src/prefs_filtering.c:841
+#: src/prefs_filtering.c:842 src/prefs_filtering.c:952 src/prefs_matcher.c:922
+#: src/prefs_template.c:472
 msgid "(New)"
 msgstr "(新的)"
 
-#: src/prefs_actions.c:600
+#: src/prefs_actions.c:602
 msgid "Menu name is not set."
 msgstr "尚未設定功能項目名稱"
 
-#: src/prefs_actions.c:605
+#: src/prefs_actions.c:607
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "功能項目名稱不能以 '/' 作為開頭"
 
-#: src/prefs_actions.c:610
+#: src/prefs_actions.c:612
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "功能項目名稱不能包含冒號 ':'"
 
-#: src/prefs_actions.c:629
+#: src/prefs_actions.c:631
 msgid "Menu name is too long."
 msgstr "功能項目名稱太長了"
 
-#: src/prefs_actions.c:638
+#: src/prefs_actions.c:640
 msgid "Command-line not set."
 msgstr "尚未設定命令列"
 
-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:645
 msgid "Menu name and command are too long."
 msgstr "功能項目和命令都太長了"
 
-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:651
 #, c-format
 msgid ""
 "The command\n"
@@ -14611,134 +14806,134 @@ msgstr ""
 "%s\n"
 "有一個語法上的錯誤"
 
-#: src/prefs_actions.c:707
+#: src/prefs_actions.c:709
 msgid "Delete action"
 msgstr "刪除動作"
 
-#: src/prefs_actions.c:708
+#: src/prefs_actions.c:710
 msgid "Do you really want to delete this action?"
 msgstr "你確定要刪除這個動作嗎?"
 
-#: src/prefs_actions.c:728
+#: src/prefs_actions.c:730
 msgid "Delete all actions"
 msgstr "刪除所有動作"
 
-#: src/prefs_actions.c:729
+#: src/prefs_actions.c:731
 msgid "Do you really want to delete all the actions?"
 msgstr "你真的要刪除所有的動作嗎?"
 
-#: src/prefs_actions.c:892 src/prefs_actions.c:923 src/prefs_filtering.c:1501
-#: src/prefs_filtering.c:1523 src/prefs_matcher.c:2117 src/prefs_template.c:571
-#: src/prefs_template.c:596
+#: src/prefs_actions.c:894 src/prefs_actions.c:925 src/prefs_filtering.c:1504
+#: src/prefs_filtering.c:1526 src/prefs_matcher.c:2165 src/prefs_template.c:572
+#: src/prefs_template.c:597
 msgid "Entry not saved"
 msgstr "項目尚未儲存"
 
-#: src/prefs_actions.c:893 src/prefs_actions.c:924 src/prefs_filtering.c:1502
-#: src/prefs_filtering.c:1524 src/prefs_template.c:572 src/prefs_template.c:597
+#: src/prefs_actions.c:895 src/prefs_actions.c:926 src/prefs_filtering.c:1505
+#: src/prefs_filtering.c:1527 src/prefs_template.c:573 src/prefs_template.c:598
 msgid "The entry was not saved. Close anyway?"
 msgstr "項目尚未儲存,仍然要關閉嗎?"
 
-#: src/prefs_actions.c:894 src/prefs_actions.c:899 src/prefs_actions.c:925
-#: src/prefs_filtering.c:1481 src/prefs_filtering.c:1503
-#: src/prefs_filtering.c:1525 src/prefs_matcher.c:2120 src/prefs_template.c:573
-#: src/prefs_template.c:598 src/prefs_template.c:603
+#: src/prefs_actions.c:896 src/prefs_actions.c:901 src/prefs_actions.c:927
+#: src/prefs_filtering.c:1484 src/prefs_filtering.c:1506
+#: src/prefs_filtering.c:1528 src/prefs_matcher.c:2168 src/prefs_template.c:574
+#: src/prefs_template.c:599 src/prefs_template.c:604
 msgid "_Continue editing"
 msgstr "繼續編輯(_C)"
 
-#: src/prefs_actions.c:897
+#: src/prefs_actions.c:899
 msgid "Actions list not saved"
 msgstr "動作清單尚未儲存"
 
-#: src/prefs_actions.c:898
+#: src/prefs_actions.c:900
 msgid "The actions list has been modified. Close anyway?"
 msgstr "動作清單已被修改,仍然要離開嗎?"
 
-#: src/prefs_actions.c:968
+#: src/prefs_actions.c:970
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">功能項目名稱:</span>"
 
-#: src/prefs_actions.c:969
+#: src/prefs_actions.c:971
 msgid "Use / in menu name to make submenus."
 msgstr "在功能項目名稱中使用 / 可以製作子功能項目"
 
-#: src/prefs_actions.c:971
+#: src/prefs_actions.c:973
 msgid "<span weight=\"bold\" underline=\"single\">Command-line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">命令列:</span>"
 
-#: src/prefs_actions.c:972
+#: src/prefs_actions.c:974
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">開始於:</span>"
 
-#: src/prefs_actions.c:973
+#: src/prefs_actions.c:975
 msgid "to send message body or selection to command's standard input"
 msgstr "傳送郵件內容或選項到命令的標準輸入"
 
-#: src/prefs_actions.c:974
+#: src/prefs_actions.c:976
 msgid "to send user provided text to command's standard input"
 msgstr "傳送使用者提供的文字到命令的標準輸入"
 
-#: src/prefs_actions.c:975
+#: src/prefs_actions.c:977
 msgid "to send user provided hidden text to command's standard input"
 msgstr "傳送使用者提供的隱藏文字到命令的標準輸入"
 
-#: src/prefs_actions.c:976
+#: src/prefs_actions.c:978
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">結束於:</span>"
 
-#: src/prefs_actions.c:977
+#: src/prefs_actions.c:979
 msgid "to replace message body or selection with command's standard output"
 msgstr "取代郵件內容或選項到命令的標準輸出"
 
-#: src/prefs_actions.c:978
+#: src/prefs_actions.c:980
 msgid "to insert command's standard output without replacing old text"
 msgstr "插入命令的標準輸出而不取代舊的文字"
 
-#: src/prefs_actions.c:979
+#: src/prefs_actions.c:981
 msgid "to run command asynchronously"
 msgstr "非同步執行命令"
 
-#: src/prefs_actions.c:980
+#: src/prefs_actions.c:982
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">使用:</span>"
 
-#: src/prefs_actions.c:981
+#: src/prefs_actions.c:983
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "所選擇之郵件的檔案格式為 RFC822/2822"
 
-#: src/prefs_actions.c:982
+#: src/prefs_actions.c:984
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "所選擇之郵件的檔案的清單格式為 RFC822/2822"
 
-#: src/prefs_actions.c:983
+#: src/prefs_actions.c:985
 msgid "for the file of the selected decoded message MIME part"
 msgstr "所選擇之已解密MIME郵件的檔案"
 
-#: src/prefs_actions.c:984
+#: src/prefs_actions.c:986
 msgid "for a user provided argument"
 msgstr "使用者已提供的參數"
 
-#: src/prefs_actions.c:985
+#: src/prefs_actions.c:987
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "使用者已提供的隱藏參數 (例如:密碼)"
 
-#: src/prefs_actions.c:986
+#: src/prefs_actions.c:988
 msgid "for the text selection"
 msgstr "文字選擇"
 
-#: src/prefs_actions.c:987
+#: src/prefs_actions.c:989
 msgid "apply filtering actions between {} to selected messages"
 msgstr "套用在 {} 間的過濾動作到選擇的郵件上"
 
-#: src/prefs_actions.c:988
+#: src/prefs_actions.c:990
 msgid "for a literal %"
 msgstr "文字 %"
 
-#: src/prefs_actions.c:998 src/prefs_themes.c:1088
+#: src/prefs_actions.c:1000 src/prefs_themes.c:1090
 msgid "Actions"
 msgstr "動作"
 
-#: src/prefs_actions.c:999
+#: src/prefs_actions.c:1001
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -14746,29 +14941,29 @@ msgstr ""
 "此動作功能提供了使用者一個可以執行外部命令的方法,用來套用至完整郵件檔案或是"
 "郵件的其中的一個部份"
 
-#: src/prefs_actions.c:1086 src/prefs_filtering.c:1699
-#: src/prefs_template.c:1112
+#: src/prefs_actions.c:1088 src/prefs_filtering.c:1702
+#: src/prefs_template.c:1114
 msgid "D_uplicate"
 msgstr "重複的(_u)"
 
-#: src/prefs_actions.c:1206
+#: src/prefs_actions.c:1208
 msgid "Current actions"
 msgstr "目前的動作"
 
-#: src/prefs_actions.c:1305 src/prefs_filtering.c:1078
-#: src/prefs_filtering.c:1136
+#: src/prefs_actions.c:1307 src/prefs_filtering.c:1079
+#: src/prefs_filtering.c:1137
 msgid "Action string is not valid."
 msgstr "動作字串是無效的"
 
-#: src/prefs_common.c:236 src/prefs_quote.c:69
+#: src/prefs_common.c:239 src/prefs_quote.c:69
 msgid "Hello,\\n"
 msgstr "嗨, \\n"
 
-#: src/prefs_common.c:314
+#: src/prefs_common.c:317
 msgid "On %d\\n%f wrote:\\n\\n%q\\n%X"
 msgstr "在 %d\\n%f 已寫入:\\n\\n%q\\n%X"
 
-#: src/prefs_common.c:320 src/prefs_quote.c:85
+#: src/prefs_common.c:323 src/prefs_quote.c:85
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -14776,7 +14971,7 @@ msgstr ""
 "\\n\\n開始轉寄郵件:\\n\\n?d{日期: %d\\n}?f{寄件者: %f\\n}?t{收件者: %t"
 "\\n}?c{副本: %c\\n}?n{新聞群組: %n\\n}?s{主旨: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:448
+#: src/prefs_common.c:451
 msgid "%x(%a) %H:%M"
 msgstr "%x(%a) %H:%M"
 
@@ -14844,7 +15039,7 @@ msgstr "回信按鍵執行寄件清單的回覆"
 msgid "Forwarding"
 msgstr "轉送"
 
-#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:192
+#: src/prefs_compose_writing.c:225 src/prefs_filtering_action.c:186
 msgid "Forward as attachment"
 msgstr "以附加檔轉送"
 
@@ -14873,97 +15068,97 @@ msgstr "附件"
 msgid "Writing"
 msgstr "寫信"
 
-#: src/prefs_customheader.c:183
+#: src/prefs_customheader.c:185
 msgid "Custom header configuration"
 msgstr "自訂的標頭配置"
 
-#: src/prefs_customheader.c:502 src/prefs_display_header.c:601
-#: src/prefs_matcher.c:1597 src/prefs_matcher.c:1612
+#: src/prefs_customheader.c:504 src/prefs_display_header.c:589
+#: src/prefs_matcher.c:1637 src/prefs_matcher.c:1652
 msgid "Header name is not set."
 msgstr "尚未設定標頭名稱"
 
-#: src/prefs_customheader.c:512
+#: src/prefs_customheader.c:514
 msgid "This Header name is not allowed as a custom header."
 msgstr "此標頭名稱不允許作為自訂標頭"
 
-#: src/prefs_customheader.c:559
+#: src/prefs_customheader.c:561
 msgid "Choose a PNG file"
 msgstr "選擇一個 PNG 檔"
 
-#: src/prefs_customheader.c:561
+#: src/prefs_customheader.c:563
 msgid "Choose an XBM file"
 msgstr "選擇一個 XBM 檔"
 
-#: src/prefs_customheader.c:563
+#: src/prefs_customheader.c:565
 msgid "Choose a text file"
 msgstr "選擇一個文字檔"
 
-#: src/prefs_customheader.c:576
+#: src/prefs_customheader.c:578
 msgid "This file isn't an image."
 msgstr "這不是一個影像檔"
 
-#: src/prefs_customheader.c:581
+#: src/prefs_customheader.c:583
 msgid "The chosen image isn't the correct size (48x48)."
 msgstr "所選的影像檔大小不正確 (48x48)"
 
-#: src/prefs_customheader.c:587
+#: src/prefs_customheader.c:589
 msgid "The image is too big; it must be maximum 725 bytes."
 msgstr "此影像檔太大;最大不可超過 725 位元"
 
-#: src/prefs_customheader.c:592
+#: src/prefs_customheader.c:594
 msgid "The image isn't in the correct format (PNG)."
 msgstr "此影像檔格式不正確 (PNG)"
 
-#: src/prefs_customheader.c:601
+#: src/prefs_customheader.c:603
 msgid "The image isn't in the correct format (XBM)."
 msgstr "此影像檔格式不正確 (XBM)"
 
-#: src/prefs_customheader.c:610
+#: src/prefs_customheader.c:612
 msgid "Couldn't call `compface`. Make sure it's in your $PATH."
 msgstr "無法呼叫 `compface`。請確認它在你的 $PATH 內"
 
-#: src/prefs_customheader.c:616
+#: src/prefs_customheader.c:618
 #, c-format
 msgid "Compface error: %s"
 msgstr "Compface 錯誤: %s"
 
-#: src/prefs_customheader.c:669
+#: src/prefs_customheader.c:671
 msgid "This file contains newlines."
 msgstr "此檔包含了新列"
 
-#: src/prefs_customheader.c:699
+#: src/prefs_customheader.c:701
 msgid "Delete header"
 msgstr "刪除標頭"
 
-#: src/prefs_customheader.c:700
+#: src/prefs_customheader.c:702
 msgid "Do you really want to delete this header?"
 msgstr "你確定要刪除這個標頭嗎?"
 
-#: src/prefs_customheader.c:873
+#: src/prefs_customheader.c:875
 msgid "Current custom headers"
 msgstr "目前的自訂標頭"
 
-#: src/prefs_display_header.c:252
+#: src/prefs_display_header.c:254
 msgid "Displayed header configuration"
 msgstr "顯示標頭配置"
 
-#: src/prefs_display_header.c:276
+#: src/prefs_display_header.c:278
 msgid "Header name"
 msgstr "標頭名稱"
 
-#: src/prefs_display_header.c:319
-msgid "Displayed Headers"
-msgstr "顯示標頭"
-
-#: src/prefs_display_header.c:381
+#: src/prefs_display_header.c:313
 msgid "Hidden headers"
 msgstr "隱藏標頭"
 
-#: src/prefs_display_header.c:407
+#: src/prefs_display_header.c:354
+msgid "Displayed Headers"
+msgstr "顯示標頭"
+
+#: src/prefs_display_header.c:399
 msgid "Show all unspecified headers"
 msgstr "顯示所有未指定的標頭"
 
-#: src/prefs_display_header.c:611
+#: src/prefs_display_header.c:599
 msgid "This header is already in the list."
 msgstr "此標頭已經存在清單中了"
 
@@ -15001,7 +15196,7 @@ msgstr ""
 "時,它可以透過一個腳本達成"
 
 #: src/prefs_ext_prog.c:282 src/prefs_image_viewer.c:138
-#: src/prefs_message.c:352
+#: src/prefs_message.c:351
 msgid "Message View"
 msgstr "郵件檢視"
 
@@ -15009,177 +15204,173 @@ msgstr "郵件檢視"
 msgid "External Programs"
 msgstr "外部程式"
 
-#: src/prefs_filtering_action.c:175
+#: src/prefs_filtering_action.c:171
 msgid "Move"
 msgstr "移動"
 
-#: src/prefs_filtering_action.c:176
-msgid "Copy"
-msgstr "複制"
-
-#: src/prefs_filtering_action.c:178
+#: src/prefs_filtering_action.c:174
 msgid "Hide"
 msgstr "隱藏"
 
+#: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
+#: src/prefs_filtering_action.c:177 src/prefs_filtering_action.c:178
 #: src/prefs_filtering_action.c:179 src/prefs_filtering_action.c:180
 #: src/prefs_filtering_action.c:181 src/prefs_filtering_action.c:182
-#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
-#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
 msgid "Message flags"
 msgstr "郵件旗標"
 
-#: src/prefs_filtering_action.c:179 src/prefs_summaries.c:449
-#: src/prefs_summary_column.c:77 src/summaryview.c:2813 src/toolbar.c:505
+#: src/prefs_filtering_action.c:175 src/prefs_summaries.c:641
+#: src/prefs_summary_column.c:77 src/summaryview.c:2888 src/toolbar.c:505
 msgid "Mark"
 msgstr "標示"
 
-#: src/prefs_filtering_action.c:183
+#: src/prefs_filtering_action.c:179
 msgid "Mark as read"
 msgstr "標示為已讀"
 
-#: src/prefs_filtering_action.c:184
+#: src/prefs_filtering_action.c:180
 msgid "Mark as unread"
 msgstr "標示為未讀"
 
-#: src/prefs_filtering_action.c:185
+#: src/prefs_filtering_action.c:181
 msgid "Mark as spam"
 msgstr "標示為垃圾郵件"
 
-#: src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:182
 msgid "Mark as ham"
 msgstr "標示為一般郵件"
 
-#: src/prefs_filtering_action.c:187 src/prefs_filtering_action.c:1442
-#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2465
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:1395
+#: src/toolbar.c:238 src/toolbar.c:499 src/toolbar.c:2468
 msgid "Execute"
 msgstr "執行"
 
-#: src/prefs_filtering_action.c:189 src/prefs_summaries.c:447
+#: src/prefs_filtering_action.c:184 src/prefs_summaries.c:639
 msgid "Color label"
 msgstr "標籤顏色"
 
-#: src/prefs_filtering_action.c:191 src/prefs_filtering_action.c:192
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:185 src/prefs_filtering_action.c:186
+#: src/prefs_filtering_action.c:187
 msgid "Resend"
 msgstr "重傳"
 
-#: src/prefs_filtering_action.c:193
+#: src/prefs_filtering_action.c:187
 msgid "Redirect"
 msgstr "改寄"
 
-#: src/prefs_filtering_action.c:194 src/prefs_filtering_action.c:195
-#: src/prefs_filtering_action.c:1446 src/prefs_matcher.c:629
-#: src/prefs_summaries.c:452 src/prefs_summary_column.c:86
-#: src/summaryview.c:449
+#: src/prefs_filtering_action.c:188 src/prefs_filtering_action.c:189
+#: src/prefs_filtering_action.c:1399 src/prefs_matcher.c:640
+#: src/prefs_summaries.c:644 src/prefs_summary_column.c:86
+#: src/summaryview.c:474
 msgid "Score"
 msgstr "分數"
 
-#: src/prefs_filtering_action.c:194
+#: src/prefs_filtering_action.c:188
 msgid "Change score"
 msgstr "改變分數"
 
-#: src/prefs_filtering_action.c:195
+#: src/prefs_filtering_action.c:189
 msgid "Set score"
 msgstr "設定分數"
 
-#: src/prefs_filtering_action.c:196 src/prefs_filtering_action.c:197
-#: src/prefs_filtering_action.c:198 src/prefs_matcher.c:633
-#: src/prefs_summary_column.c:88 src/summaryview.c:451
+#: src/prefs_filtering_action.c:190 src/prefs_filtering_action.c:191
+#: src/prefs_filtering_action.c:192 src/prefs_matcher.c:644
+#: src/prefs_summary_column.c:88 src/summaryview.c:476
 msgid "Tags"
 msgstr "標籤"
 
-#: src/prefs_filtering_action.c:196
+#: src/prefs_filtering_action.c:190
 msgid "Apply tag"
 msgstr "套用標籤"
 
-#: src/prefs_filtering_action.c:197
+#: src/prefs_filtering_action.c:191
 msgid "Unset tag"
 msgstr "取消標籤設定"
 
-#: src/prefs_filtering_action.c:198
+#: src/prefs_filtering_action.c:192
 msgid "Clear tags"
 msgstr "清除標籤"
 
-#: src/prefs_filtering_action.c:199 src/prefs_filtering_action.c:200
+#: src/prefs_filtering_action.c:193 src/prefs_filtering_action.c:194
 msgid "Threads"
 msgstr "串列"
 
-#: src/prefs_filtering_action.c:202
+#: src/prefs_filtering_action.c:196
 msgid "Stop filter"
 msgstr "保止過濾"
 
-#: src/prefs_filtering_action.c:410
+#: src/prefs_filtering_action.c:401
 msgid "Action configuration"
 msgstr "動作設定"
 
-#: src/prefs_filtering_action.c:427 src/prefs_filtering.c:1890
-#: src/prefs_matcher.c:586
+#: src/prefs_filtering_action.c:418 src/prefs_filtering.c:1895
+#: src/prefs_matcher.c:597
 msgid "Rule"
 msgstr "規則"
 
-#: src/prefs_filtering_action.c:440 src/prefs_filtering.c:433
+#: src/prefs_filtering_action.c:431 src/prefs_filtering.c:434
 msgid "Action"
 msgstr "動作"
 
-#: src/prefs_filtering_action.c:938
+#: src/prefs_filtering_action.c:907
 msgid "Command-line not set"
 msgstr "命令列未設定"
 
-#: src/prefs_filtering_action.c:939
+#: src/prefs_filtering_action.c:908
 msgid "Destination is not set."
 msgstr "目的地未設定"
 
-#: src/prefs_filtering_action.c:950
+#: src/prefs_filtering_action.c:919
 msgid "Recipient is not set."
 msgstr "回條未設定"
 
-#: src/prefs_filtering_action.c:968
+#: src/prefs_filtering_action.c:935
 msgid "Score is not set"
 msgstr "分數未設定"
 
-#: src/prefs_filtering_action.c:976
+#: src/prefs_filtering_action.c:943
 msgid "Header is not set."
 msgstr "標頭未設定"
 
-#: src/prefs_filtering_action.c:983
+#: src/prefs_filtering_action.c:950
 msgid "Target addressbook/folder is not set."
 msgstr "目的通訊錄/資料夾未設定"
 
-#: src/prefs_filtering_action.c:997
+#: src/prefs_filtering_action.c:960
 msgid "Tag name is empty."
 msgstr "標籤名稱是空白的"
 
-#: src/prefs_filtering_action.c:1219
+#: src/prefs_filtering_action.c:1182
 msgid "No action was defined."
 msgstr "沒有定義動作"
 
-#: src/prefs_filtering_action.c:1257 src/prefs_matcher.c:2163
+#: src/prefs_filtering_action.c:1220 src/prefs_matcher.c:2212
 #: src/quote_fmt.c:79
 msgid "literal %"
 msgstr "字 %"
 
-#: src/prefs_filtering_action.c:1266 src/prefs_matcher.c:2172
+#: src/prefs_filtering_action.c:1229 src/prefs_matcher.c:2221
 msgid "filename (should not be modified)"
 msgstr "檔案名稱 (不能被修改)"
 
-#: src/prefs_filtering_action.c:1267 src/prefs_matcher.c:2173
+#: src/prefs_filtering_action.c:1230 src/prefs_matcher.c:2222
 #: src/quote_fmt.c:87
 msgid "new line"
 msgstr "新的行"
 
-#: src/prefs_filtering_action.c:1268 src/prefs_matcher.c:2174
+#: src/prefs_filtering_action.c:1231 src/prefs_matcher.c:2223
 msgid "escape character for quotes"
 msgstr "引言的跳脫字元"
 
-#: src/prefs_filtering_action.c:1269 src/prefs_matcher.c:2175
+#: src/prefs_filtering_action.c:1232 src/prefs_matcher.c:2224
 msgid "quote character"
 msgstr "引言字元"
 
-#: src/prefs_filtering_action.c:1278
+#: src/prefs_filtering_action.c:1241
 msgid "Filtering Action: 'Execute'"
 msgstr "過濾動作: '執行'"
 
-#: src/prefs_filtering_action.c:1279
+#: src/prefs_filtering_action.c:1242
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -15188,145 +15379,145 @@ msgstr ""
 "'執行' 允許你傳送一個郵件或訊息到一個外部的程式或腳本\n"
 "可以使用以下的符號:"
 
-#: src/prefs_filtering_action.c:1426
+#: src/prefs_filtering_action.c:1381
 msgid "Recipient"
 msgstr "回條"
 
-#: src/prefs_filtering_action.c:1430
+#: src/prefs_filtering_action.c:1385
 msgid "Book/Folder"
 msgstr "通訊錄/資料夾"
 
-#: src/prefs_filtering_action.c:1434
+#: src/prefs_filtering_action.c:1389
 msgid "Destination"
 msgstr "目的"
 
-#: src/prefs_filtering_action.c:1438
+#: src/prefs_filtering_action.c:1392
 msgid "Color"
 msgstr "顏色"
 
-#: src/prefs_filtering_action.c:1524
+#: src/prefs_filtering_action.c:1477
 msgid "Current action list"
 msgstr "目前的動作清單"
 
-#: src/prefs_filtering.c:197 src/prefs_filtering.c:359
+#: src/prefs_filtering.c:197 src/prefs_filtering.c:360
 msgid "Filtering/Processing configuration"
 msgstr "過濾/處理 配置"
 
-#: src/prefs_filtering.c:266 src/prefs_filtering.c:869
-#: src/prefs_filtering.c:985
+#: src/prefs_filtering.c:266 src/prefs_filtering.c:870
+#: src/prefs_filtering.c:986
 msgctxt "Filtering Account Menu"
 msgid "All"
 msgstr "全部"
 
-#: src/prefs_filtering.c:411
+#: src/prefs_filtering.c:412
 msgid "Condition"
 msgstr "條件"
 
-#: src/prefs_filtering.c:424
+#: src/prefs_filtering.c:425
 msgid " Def_ine... "
 msgstr " 定義(_i)..."
 
-#: src/prefs_filtering.c:446
+#: src/prefs_filtering.c:447
 msgid " De_fine... "
 msgstr " 定義(_f)..."
 
-#: src/prefs_filtering.c:475
+#: src/prefs_filtering.c:476
 msgid "Append the new rule above to the list"
 msgstr "加入一個新規則到清單的上方"
 
-#: src/prefs_filtering.c:484
+#: src/prefs_filtering.c:485
 msgid "Replace the selected rule in list with the rule above"
 msgstr "以上方的規則取代清單內選擇的規則"
 
-#: src/prefs_filtering.c:493
+#: src/prefs_filtering.c:494
 msgid "Delete the selected rule from the list"
 msgstr "從清單中刪除選擇的規則"
 
-#: src/prefs_filtering.c:534
+#: src/prefs_filtering.c:535
 msgid "Move the selected rule to the top"
 msgstr "將選擇的規則移至最頂端"
 
-#: src/prefs_filtering.c:537
+#: src/prefs_filtering.c:538
 msgid "Page u_p"
 msgstr "上一頁(_p)"
 
-#: src/prefs_filtering.c:545
+#: src/prefs_filtering.c:546
 msgid "Move the selected rule one page up"
 msgstr "移動選擇的規則至上一頁"
 
-#: src/prefs_filtering.c:554
+#: src/prefs_filtering.c:555
 msgid "Move the selected rule up"
 msgstr "向上移動選擇的規則"
 
-#: src/prefs_filtering.c:562
+#: src/prefs_filtering.c:563
 msgid "Move the selected rule down"
 msgstr "向下移動選擇的規則"
 
-#: src/prefs_filtering.c:565
+#: src/prefs_filtering.c:566
 msgid "Page dow_n"
 msgstr "下一頁(_n)"
 
-#: src/prefs_filtering.c:573
+#: src/prefs_filtering.c:574
 msgid "Move the selected rule one page down"
 msgstr "移動選擇的規則至下一頁"
 
-#: src/prefs_filtering.c:582
+#: src/prefs_filtering.c:583
 msgid "Move the selected rule to the bottom"
 msgstr "移動選擇的規則至底部"
 
-#: src/prefs_filtering.c:1042 src/prefs_filtering.c:1128
+#: src/prefs_filtering.c:1043 src/prefs_filtering.c:1129
 msgid "Condition string is not valid."
 msgstr "條件字串是無效的"
 
-#: src/prefs_filtering.c:1115
+#: src/prefs_filtering.c:1116
 msgid "Condition string is empty."
 msgstr "條件字串是空白的"
 
-#: src/prefs_filtering.c:1121
+#: src/prefs_filtering.c:1122
 msgid "Action string is empty."
 msgstr "動作字串是空白的"
 
-#: src/prefs_filtering.c:1209
+#: src/prefs_filtering.c:1211
 msgid "Delete rule"
 msgstr "刪除規則"
 
-#: src/prefs_filtering.c:1210
+#: src/prefs_filtering.c:1212
 msgid "Do you really want to delete this rule?"
 msgstr "你確定要刪除這個規則嗎?"
 
-#: src/prefs_filtering.c:1228
+#: src/prefs_filtering.c:1230
 msgid "Delete all rules"
 msgstr "刪除所有的規則"
 
-#: src/prefs_filtering.c:1229
+#: src/prefs_filtering.c:1231
 msgid "Do you really want to delete all the rules?"
 msgstr "你確定要刪除所有的規則"
 
-#: src/prefs_filtering.c:1479
+#: src/prefs_filtering.c:1482
 msgid "Filtering rules not saved"
 msgstr "過濾規格尚未儲存"
 
-#: src/prefs_filtering.c:1480
+#: src/prefs_filtering.c:1483
 msgid "The list of filtering rules have been modified. Close anyway?"
 msgstr "此過濾規則清單已被修改,仍然要關閉嗎?"
 
-#: src/prefs_filtering.c:1702
+#: src/prefs_filtering.c:1705
 msgid "Move one page up"
 msgstr "移往上一頁"
 
-#: src/prefs_filtering.c:1703
+#: src/prefs_filtering.c:1706
 msgid "Move one page down"
 msgstr "移至下一頁"
 
-#: src/prefs_filtering.c:1858
+#: src/prefs_filtering.c:1863
 msgid "Enable"
 msgstr "啟用"
 
-#: src/prefs_folder_column.c:211
+#: src/prefs_folder_column.c:212
 msgid "Folder list columns configuration"
 msgstr "配置資料夾清單列"
 
-#: src/prefs_folder_column.c:228
+#: src/prefs_folder_column.c:229
 msgid ""
 "Select columns to be displayed in the folder list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
@@ -15334,21 +15525,21 @@ msgstr ""
 "選擇資料夾清單列內要顯示的列。你可以用向上/向下鍵或拖拉項目的方式來改變\n"
 "顯示的順序。"
 
-#: src/prefs_folder_column.c:258 src/prefs_summary_column.c:272
+#: src/prefs_folder_column.c:259 src/prefs_summary_column.c:273
 msgid "Hidden columns"
 msgstr "隱藏行數"
 
-#: src/prefs_folder_column.c:299 src/prefs_summaries.c:416
-#: src/prefs_summaries.c:590 src/prefs_summary_column.c:313
+#: src/prefs_folder_column.c:300 src/prefs_summaries.c:386
+#: src/prefs_summaries.c:451 src/prefs_summary_column.c:314
 msgid "Displayed columns"
 msgstr "顯示行數"
 
-#: src/prefs_folder_column.c:332 src/prefs_msg_colors.c:484
-#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:1077
+#: src/prefs_folder_column.c:333 src/prefs_msg_colors.c:464
+#: src/prefs_summary_column.c:347 src/prefs_toolbar.c:1032
 msgid " Use default "
 msgstr "使用預設值"
 
-#: src/prefs_folder_item.c:210
+#: src/prefs_folder_item.c:214
 msgid ""
 "These preferences will not be saved as this folder is a top-level folder.\n"
 "However, you can set them for the whole mailbox tree by using \"Apply to "
@@ -15357,7 +15548,7 @@ msgstr ""
 "當此資料夾不是最上層的資料夾時,這些選項將無法被儲存,然而,你可以用 \"套用至"
 "子資料夾\" 功能將它們套用到整個 郵件箱樹狀結構上"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:886
+#: src/prefs_folder_item.c:293 src/prefs_folder_item.c:896
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -15365,55 +15556,55 @@ msgstr ""
 "套用至\n"
 "子資料夾"
 
-#: src/prefs_folder_item.c:314
+#: src/prefs_folder_item.c:318
 msgid "Normal"
 msgstr "一般"
 
-#: src/prefs_folder_item.c:316
+#: src/prefs_folder_item.c:320
 msgid "Outbox"
 msgstr "外寄郵件箱"
 
-#: src/prefs_folder_item.c:332
+#: src/prefs_folder_item.c:336
 msgid "Folder type"
 msgstr "資料夾型式"
 
-#: src/prefs_folder_item.c:344
+#: src/prefs_folder_item.c:348
 msgid "Simplify Subject RegExp"
 msgstr "簡化主旨 RegExp"
 
-#: src/prefs_folder_item.c:370
-msgid "Test string:"
+#: src/prefs_folder_item.c:374
+msgid "Test string"
 msgstr "測試字串:"
 
-#: src/prefs_folder_item.c:387
-msgid "Result:"
+#: src/prefs_folder_item.c:391
+msgid "Result"
 msgstr "結果:"
 
-#: src/prefs_folder_item.c:402
+#: src/prefs_folder_item.c:406
 msgid "Folder chmod"
 msgstr "資料夾權限"
 
-#: src/prefs_folder_item.c:428
+#: src/prefs_folder_item.c:432
 msgid "Folder color"
 msgstr "資料夾顏色"
 
-#: src/prefs_folder_item.c:441 src/prefs_folder_item.c:1678
+#: src/prefs_folder_item.c:444 src/prefs_folder_item.c:1768
 msgid "Pick color for folder"
 msgstr "為資料夾選取顏色"
 
-#: src/prefs_folder_item.c:459
+#: src/prefs_folder_item.c:462
 msgid "Run Processing rules at start-up"
 msgstr "在開始時進行規則的套用"
 
-#: src/prefs_folder_item.c:474
+#: src/prefs_folder_item.c:477
 msgid "Run Processing rules when opening"
 msgstr "在開啟時進行規則的套用"
 
-#: src/prefs_folder_item.c:488
+#: src/prefs_folder_item.c:491
 msgid "Scan for new mail"
 msgstr "掃描新郵件"
 
-#: src/prefs_folder_item.c:490
+#: src/prefs_folder_item.c:493
 msgid ""
 "Turn this option on if mail is delivered directly to this folder by server "
 "side filtering on IMAP or by an external application"
@@ -15421,75 +15612,79 @@ msgstr ""
 "若此郵件被外部應用程式或是在 IMAP 伺服器上被過濾器直接傳送至這個資料夾, 此選"
 "項應該要開啟。"
 
-#: src/prefs_folder_item.c:510
+#: src/prefs_folder_item.c:513
 msgid "Select the HTML part of multipart messages"
 msgstr "選擇多重郵件的HTML部份"
 
-#: src/prefs_folder_item.c:527
+#: src/prefs_folder_item.c:530
 msgid ""
 "\"Default\" will follow global preference (found in /Preferences/Message "
 "View/Text Options)"
 msgstr ""
 "\"預設\" 將會套用全域的選項 (選項可以在 /Preferences/Message View/Text 找到)"
 
-#: src/prefs_folder_item.c:537
+#: src/prefs_folder_item.c:540
 msgid "Synchronise for offline use"
 msgstr "離線模式下同步"
 
-#: src/prefs_folder_item.c:558
+#: src/prefs_folder_item.c:561
 msgid "Fetch message bodies from the last"
 msgstr "從最後面擷取郵件內容"
 
-#: src/prefs_folder_item.c:565
+#: src/prefs_folder_item.c:568
 msgid "0: all bodies"
 msgstr "0: 所有的內容"
 
-#: src/prefs_folder_item.c:573
+#: src/prefs_folder_item.c:576
 msgid "Remove older messages bodies"
 msgstr "移除舊郵件內容"
 
-#: src/prefs_folder_item.c:590
+#: src/prefs_folder_item.c:593
 msgid "Discard folder cache"
 msgstr "放棄資料夾快取"
 
-#: src/prefs_folder_item.c:895
+#: src/prefs_folder_item.c:905
 msgid "Request Return Receipt"
 msgstr "要求回覆回條"
 
-#: src/prefs_folder_item.c:910
+#: src/prefs_folder_item.c:920
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "用傳送儲存外寄郵件複本至這個資料夾"
 
-#: src/prefs_folder_item.c:924 src/prefs_folder_item.c:976
-#: src/prefs_folder_item.c:1002 src/prefs_folder_item.c:1028
+#: src/prefs_folder_item.c:934 src/prefs_folder_item.c:986
+#: src/prefs_folder_item.c:1012 src/prefs_folder_item.c:1038
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s"
 msgstr "預設 %s"
 
-#: src/prefs_folder_item.c:950
+#: src/prefs_folder_item.c:960
 #, c-format
 msgctxt "folder properties: %s stands for a header name"
 msgid "Default %s for replies"
 msgstr "回信的預設 %s"
 
-#: src/prefs_folder_item.c:1053
+#: src/prefs_folder_item.c:1063
 msgid "Default account"
 msgstr "需設帳號"
 
-#: src/prefs_folder_item.c:1691
+#: src/prefs_folder_item.c:1205 src/prefs_folder_item.c:1237
+msgid "\"Default\" will follow the applicable account preference"
+msgstr "\"預設\"將依循合適的帳號設置"
+
+#: src/prefs_folder_item.c:1781
 msgid "Discard cache"
 msgstr "放棄快取"
 
-#: src/prefs_folder_item.c:1692
+#: src/prefs_folder_item.c:1782
 msgid "Do you really want to discard the local cached data for this folder?"
 msgstr "你確定要放棄本地資料夾的快取資料嗎?"
 
-#: src/prefs_folder_item.c:1825
+#: src/prefs_folder_item.c:1907
 msgid "General"
 msgstr "一般"
 
-#: src/prefs_folder_item.c:1904
+#: src/prefs_folder_item.c:1986
 #, c-format
 msgid "Properties for folder %s"
 msgstr "資料夾屬性 %s"
@@ -15498,7 +15693,7 @@ msgstr "資料夾屬性 %s"
 msgid "Folder and Message Lists"
 msgstr "資料夾與郵件清單"
 
-#: src/prefs_fonts.c:99 src/prefs_matcher.c:2038
+#: src/prefs_fonts.c:99 src/prefs_matcher.c:2086
 msgid "Message"
 msgstr "郵件"
 
@@ -15522,8 +15717,8 @@ msgstr "使用不同的字型進行列印"
 msgid "Message Printing"
 msgstr "列印郵件"
 
-#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:830 src/prefs_summaries.c:765
-#: src/prefs_themes.c:421
+#: src/prefs_fonts.c:268 src/prefs_msg_colors.c:776 src/prefs_summaries.c:869
+#: src/prefs_themes.c:422
 msgid "Display"
 msgstr "顯示"
 
@@ -15531,7 +15726,7 @@ msgstr "顯示"
 msgid "Fonts"
 msgstr "字型"
 
-#: src/prefs_gtk.c:910 src/toolbar.c:256 src/toolbar.c:517
+#: src/prefs_gtk.c:895 src/toolbar.c:256 src/toolbar.c:517
 msgid "Preferences"
 msgstr "選項"
 
@@ -15674,7 +15869,7 @@ msgstr "錯誤郵件"
 msgid "Status messages for filtering/processing log"
 msgstr "記錄過濾/執行日誌的狀態郵件"
 
-#: src/prefs_logging.c:410 src/prefs_msg_colors.c:144 src/prefs_other.c:776
+#: src/prefs_logging.c:410 src/prefs_msg_colors.c:153 src/prefs_other.c:815
 msgid "Other"
 msgstr "其它"
 
@@ -15682,247 +15877,265 @@ msgstr "其它"
 msgid "Logging"
 msgstr "日誌"
 
-#: src/prefs_matcher.c:331
+#: src/prefs_matcher.c:335
 msgid "more than"
 msgstr "多於"
 
-#: src/prefs_matcher.c:332
+#: src/prefs_matcher.c:336
 msgid "less than"
 msgstr "少於"
 
-#: src/prefs_matcher.c:338
+#: src/prefs_matcher.c:342
 msgid "weeks"
 msgstr "星期"
 
-#: src/prefs_matcher.c:342
-msgid "higher than"
+#: src/prefs_matcher.c:346
+msgid "after"
+msgstr "之後"
+
+#: src/prefs_matcher.c:347
+msgid "before"
+msgstr "之前"
+
+#: src/prefs_matcher.c:351
+msgid "higher than"
 msgstr "高於"
 
-#: src/prefs_matcher.c:343
+#: src/prefs_matcher.c:352
 msgid "lower than"
 msgstr "低於"
 
-#: src/prefs_matcher.c:344 src/prefs_matcher.c:350
+#: src/prefs_matcher.c:353 src/prefs_matcher.c:359
 msgid "exactly"
 msgstr "完全正確"
 
-#: src/prefs_matcher.c:348
+#: src/prefs_matcher.c:357
 msgid "greater than"
 msgstr "大於"
 
-#: src/prefs_matcher.c:349
+#: src/prefs_matcher.c:358
 msgid "smaller than"
 msgstr "小於"
 
-#: src/prefs_matcher.c:354
+#: src/prefs_matcher.c:363
 msgid "bytes"
 msgstr "位元"
 
-#: src/prefs_matcher.c:355
+#: src/prefs_matcher.c:364
 msgid "kilobytes"
 msgstr "千位元"
 
-#: src/prefs_matcher.c:356
+#: src/prefs_matcher.c:365
 msgid "megabytes"
 msgstr "megabytes"
 
-#: src/prefs_matcher.c:360
+#: src/prefs_matcher.c:369
 msgid "contains"
 msgstr "包含"
 
-#: src/prefs_matcher.c:361
+#: src/prefs_matcher.c:370
 msgid "doesn't contain"
 msgstr "未包含"
 
-#: src/prefs_matcher.c:385
+#: src/prefs_matcher.c:394
 msgid "headers part"
 msgstr "郵件標頭的部份"
 
-#: src/prefs_matcher.c:386
+#: src/prefs_matcher.c:395
 msgid "headers values"
 msgstr "郵件標頭的數值"
 
-#: src/prefs_matcher.c:387
+#: src/prefs_matcher.c:396
 msgid "body part"
 msgstr "內文部份"
 
-#: src/prefs_matcher.c:388
+#: src/prefs_matcher.c:397
 msgid "whole message"
 msgstr "全部郵件"
 
-#: src/prefs_matcher.c:394 src/summaryview.c:6351
+#: src/prefs_matcher.c:403 src/summaryview.c:6559
 msgid "Marked"
 msgstr "已標示"
 
-#: src/prefs_matcher.c:395 src/summaryview.c:6349
+#: src/prefs_matcher.c:404 src/summaryview.c:6557
 msgid "Deleted"
 msgstr "已刪除"
 
-#: src/prefs_matcher.c:396
+#: src/prefs_matcher.c:405
 msgid "Replied"
 msgstr "已回覆"
 
-#: src/prefs_matcher.c:397 src/summaryview.c:6343
+#: src/prefs_matcher.c:406 src/summaryview.c:6551
 msgid "Forwarded"
 msgstr "已轉寄"
 
-#: src/prefs_matcher.c:399 src/summaryview.c:6333 src/toolbar.c:515
-#: src/toolbar.c:988 src/toolbar.c:2339
+#: src/prefs_matcher.c:408 src/summaryview.c:6541 src/toolbar.c:515
+#: src/toolbar.c:988 src/toolbar.c:2342
 msgid "Spam"
 msgstr "垃圾郵件"
 
-#: src/prefs_matcher.c:400
+#: src/prefs_matcher.c:409
 msgid "Has attachment"
 msgstr "有附加檔額"
 
-#: src/prefs_matcher.c:401 src/summaryview.c:6369
+#: src/prefs_matcher.c:410 src/summaryview.c:6577
 msgid "Signed"
 msgstr "簽章"
 
-#: src/prefs_matcher.c:405
+#: src/prefs_matcher.c:414
 msgid "set"
 msgstr "設定"
 
-#: src/prefs_matcher.c:406
+#: src/prefs_matcher.c:415
 msgid "not set"
 msgstr "未設定"
 
-#: src/prefs_matcher.c:410
+#: src/prefs_matcher.c:419
 msgid "yes"
 msgstr "是"
 
-#: src/prefs_matcher.c:411
+#: src/prefs_matcher.c:420
 msgid "no"
 msgstr "否"
 
-#: src/prefs_matcher.c:415
+#: src/prefs_matcher.c:424
 msgid "Any tags"
 msgstr "任何標籤"
 
-#: src/prefs_matcher.c:416
+#: src/prefs_matcher.c:425
 msgid "Specific tag"
 msgstr "指定的標籤"
 
-#: src/prefs_matcher.c:420
+#: src/prefs_matcher.c:429
 msgid "ignored"
 msgstr "忽略"
 
-#: src/prefs_matcher.c:421
+#: src/prefs_matcher.c:430
 msgid "not ignored"
 msgstr "不忽略"
 
-#: src/prefs_matcher.c:422
+#: src/prefs_matcher.c:431
 msgid "watched"
 msgstr "已監看"
 
-#: src/prefs_matcher.c:423
+#: src/prefs_matcher.c:432
 msgid "not watched"
 msgstr "未被監看"
 
-#: src/prefs_matcher.c:427
+#: src/prefs_matcher.c:436
 msgid "found"
 msgstr "找"
 
-#: src/prefs_matcher.c:428
+#: src/prefs_matcher.c:437
 msgid "not found"
 msgstr "找不到"
 
-#: src/prefs_matcher.c:432
+#: src/prefs_matcher.c:441
 msgid "0 (Passed)"
 msgstr "0 (通過)"
 
-#: src/prefs_matcher.c:433
+#: src/prefs_matcher.c:442
 msgid "non-0 (Failed)"
 msgstr "無-0 (失敗)"
 
-#: src/prefs_matcher.c:569
+#: src/prefs_matcher.c:580
 msgid "Condition configuration"
 msgstr "條件設定"
 
-#: src/prefs_matcher.c:613
-msgid "Match criteria:"
+#: src/prefs_matcher.c:624
+msgid "Match criteria"
 msgstr "符合條件"
 
-#: src/prefs_matcher.c:622
+#: src/prefs_matcher.c:633
 msgid "All messages"
 msgstr "所有郵件"
 
-#: src/prefs_matcher.c:624
+#: src/prefs_matcher.c:635
 msgid "Age"
 msgstr "年齡"
 
-#: src/prefs_matcher.c:625
+#: src/prefs_matcher.c:636
 msgid "Phrase"
 msgstr "片語"
 
-#: src/prefs_matcher.c:626
+#: src/prefs_matcher.c:637
 msgid "Flags"
 msgstr "旗標"
 
-#: src/prefs_matcher.c:627 src/prefs_msg_colors.c:399
+#: src/prefs_matcher.c:638 src/prefs_msg_colors.c:380
 msgid "Color labels"
 msgstr "標籤顏色"
 
-#: src/prefs_matcher.c:628
+#: src/prefs_matcher.c:639
 msgid "Thread"
 msgstr "執行緒"
 
-#: src/prefs_matcher.c:631
+#: src/prefs_matcher.c:642
 msgid "Partially downloaded"
 msgstr "部份已下載"
 
-#: src/prefs_matcher.c:634
+#: src/prefs_matcher.c:645
 msgid "External program test"
 msgstr "外部程式測試"
 
-#: src/prefs_matcher.c:710 src/prefs_matcher.c:1618 src/prefs_matcher.c:1633
-#: src/prefs_matcher.c:2519
+#: src/prefs_matcher.c:674
+msgid ""
+"Use selector on the right to pick the header name. Type the name of the "
+"header if not available in the list."
+msgstr "使用右側的選擇器挑選標頭名稱,若標頭名稱不在清單中,請直接輸入名稱"
+
+#: src/prefs_matcher.c:719 src/prefs_matcher.c:1658 src/prefs_matcher.c:1673
+#: src/prefs_matcher.c:2583
 msgctxt "Filtering Matcher Menu"
 msgid "All"
 msgstr "所有"
 
-#: src/prefs_matcher.c:744
+#: src/prefs_matcher.c:753
 msgid "Use regexp"
 msgstr "使用 regexp"
 
-#: src/prefs_matcher.c:820
+#: src/prefs_matcher.c:844
 msgid "Message must match"
 msgstr "郵件必需滿足"
 
-#: src/prefs_matcher.c:824
+#: src/prefs_matcher.c:848
 msgid "at least one"
 msgstr "至少包含一個"
 
-#: src/prefs_matcher.c:825
+#: src/prefs_matcher.c:849
 msgid "all"
 msgstr "所有"
 
-#: src/prefs_matcher.c:828
+#: src/prefs_matcher.c:852
 msgid "of above rules"
 msgstr "在上述所的規則內"
 
-#: src/prefs_matcher.c:1536 src/prefs_matcher.c:1602
+#: src/prefs_matcher.c:1564 src/prefs_matcher.c:1642
 msgid "Search pattern is not set."
 msgstr "搜尋模型尚未設定"
 
-#: src/prefs_matcher.c:1545
+#: src/prefs_matcher.c:1578
+msgid "Invalid hour."
+msgstr "無效的小時"
+
+#: src/prefs_matcher.c:1587
 msgid "Test command is not set."
 msgstr "測試命令尚未設定"
 
-#: src/prefs_matcher.c:1619
+#: src/prefs_matcher.c:1659
 msgid "all addresses in all headers"
 msgstr "所有郵件標頭內的所有地址"
 
-#: src/prefs_matcher.c:1622
+#: src/prefs_matcher.c:1662
 msgid "any address in any header"
 msgstr "任何郵件標頭內的任何地址"
 
-#: src/prefs_matcher.c:1624
+#: src/prefs_matcher.c:1664
 #, c-format
 msgid "the address(es) in header '%s'"
 msgstr "郵件標頭'%s'內的地址"
 
-#: src/prefs_matcher.c:1625
+#: src/prefs_matcher.c:1665
 #, c-format
 msgid ""
 "Book/folder path is not set.\n"
@@ -15934,83 +16147,87 @@ msgstr ""
 "\n"
 "如果你想符合 %s 所有的通訊錄,必需從通訊錄/資料夾的下拉式選單中選取'%s'"
 
-#: src/prefs_matcher.c:1844
+#: src/prefs_matcher.c:1884
 msgid "Headers part"
 msgstr "郵件標頭的部份"
 
-#: src/prefs_matcher.c:1848
+#: src/prefs_matcher.c:1888
 msgid "Headers values"
 msgstr "郵件標頭的數值"
 
-#: src/prefs_matcher.c:1852
+#: src/prefs_matcher.c:1892
 msgid "Body part"
 msgstr "內文部份"
 
-#: src/prefs_matcher.c:1856
+#: src/prefs_matcher.c:1896
 msgid "Whole message"
 msgstr "全部郵件"
 
-#: src/prefs_matcher.c:1969 src/prefs_matcher.c:2011
+#: src/prefs_matcher.c:2013 src/prefs_matcher.c:2059
 msgid "in"
 msgstr "在"
 
-#: src/prefs_matcher.c:1971
+#: src/prefs_matcher.c:2015
 msgid "content is"
 msgstr "內容為"
 
-#: src/prefs_matcher.c:1980
+#: src/prefs_matcher.c:2019
+msgid "Date is"
+msgstr "日期為"
+
+#: src/prefs_matcher.c:2030
 msgid "Age is"
 msgstr "年齡為"
 
-#: src/prefs_matcher.c:1985
+#: src/prefs_matcher.c:2035
 msgid "Flag"
 msgstr "旗標"
 
-#: src/prefs_matcher.c:1986 src/prefs_matcher.c:2001
+#: src/prefs_matcher.c:2036 src/prefs_matcher.c:2050
 msgid "is"
 msgstr "是"
 
-#: src/prefs_matcher.c:1991
+#: src/prefs_matcher.c:2041
 msgid "Name:"
 msgstr "名稱:"
 
-#: src/prefs_matcher.c:2000
+#: src/prefs_matcher.c:2049
 msgid "Label"
 msgstr "標籤"
 
-#: src/prefs_matcher.c:2006
+#: src/prefs_matcher.c:2054
 msgid "Value:"
 msgstr "值:"
 
-#: src/prefs_matcher.c:2021
+#: src/prefs_matcher.c:2069
 msgid "Score is"
 msgstr "範圍為"
 
-#: src/prefs_matcher.c:2022
+#: src/prefs_matcher.c:2070
 msgid "points"
 msgstr "點"
 
-#: src/prefs_matcher.c:2032
+#: src/prefs_matcher.c:2080
 msgid "Size is"
 msgstr "大小為"
 
-#: src/prefs_matcher.c:2037
+#: src/prefs_matcher.c:2085
 msgid "Scope:"
 msgstr "範圍"
 
-#: src/prefs_matcher.c:2039
+#: src/prefs_matcher.c:2087
 msgid "tags"
 msgstr "標籤"
 
-#: src/prefs_matcher.c:2044
+#: src/prefs_matcher.c:2092
 msgid "type is"
 msgstr "型式為"
 
-#: src/prefs_matcher.c:2048
+#: src/prefs_matcher.c:2096
 msgid "Program returns"
 msgstr "程式結束"
 
-#: src/prefs_matcher.c:2118
+#: src/prefs_matcher.c:2166
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -16018,11 +16235,11 @@ msgstr ""
 "輸入內容尚未儲存\n"
 "確定要離開?"
 
-#: src/prefs_matcher.c:2184
+#: src/prefs_matcher.c:2233
 msgid "Match Type: 'Test'"
 msgstr "符合型式:'測試'"
 
-#: src/prefs_matcher.c:2185
+#: src/prefs_matcher.c:2234
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -16033,91 +16250,91 @@ msgstr ""
 "\n"
 "下列的符號是可以使用的:"
 
-#: src/prefs_matcher.c:2284
+#: src/prefs_matcher.c:2333
 msgid "Current condition rules"
 msgstr "目前條件規則"
 
-#: src/prefs_message.c:120
+#: src/prefs_message.c:119
 msgid "Headers"
 msgstr "標頭"
 
-#: src/prefs_message.c:123
+#: src/prefs_message.c:122
 msgid "Display header pane above message view"
 msgstr "在郵件區上方顯示標頭"
 
-#: src/prefs_message.c:127
+#: src/prefs_message.c:126
 msgid "Display (X-)Face in message view"
 msgstr "在郵件區顯示(X-)Face"
 
-#: src/prefs_message.c:130
+#: src/prefs_message.c:129
 msgid "Display Face in message view"
 msgstr "在郵件區顯示Face"
 
-#: src/prefs_message.c:144
+#: src/prefs_message.c:143
 msgid "Display headers in message view"
 msgstr "在郵件區顯示標頭"
 
-#: src/prefs_message.c:156
+#: src/prefs_message.c:155
 msgid "HTML messages"
 msgstr "HTML格式郵件"
 
-#: src/prefs_message.c:159
+#: src/prefs_message.c:158
 msgid "Render HTML messages as text"
 msgstr "以文字顯示HTML格式郵件"
 
-#: src/prefs_message.c:162
+#: src/prefs_message.c:161
 msgid "Render HTML-only messages with plugin if possible"
 msgstr "盡可能以外掛程式顯示純HTML郵件"
 
-#: src/prefs_message.c:165
+#: src/prefs_message.c:164
 msgid "Select the HTML part of multipart/alternative messages"
 msgstr "選擇多類型郵件的HTML部份"
 
-#: src/prefs_message.c:175
+#: src/prefs_message.c:174
 msgid "Line space"
 msgstr "行距"
 
-#: src/prefs_message.c:188 src/prefs_message.c:221
+#: src/prefs_message.c:187 src/prefs_message.c:220
 msgid "pixels"
 msgstr "畫素"
 
-#: src/prefs_message.c:194
+#: src/prefs_message.c:193
 msgid "Scroll"
 msgstr "捲動"
 
-#: src/prefs_message.c:196
+#: src/prefs_message.c:195
 msgid "Half page"
 msgstr "半頁"
 
-#: src/prefs_message.c:202
+#: src/prefs_message.c:201
 msgid "Smooth scroll"
 msgstr "平滑捲動"
 
-#: src/prefs_message.c:208
+#: src/prefs_message.c:207
 msgid "Step"
 msgstr "步驟"
 
-#: src/prefs_message.c:228
+#: src/prefs_message.c:227
 msgid "Show attachment descriptions (rather than names)"
 msgstr "顯示附件說明 (優先於附件名稱)"
 
-#: src/prefs_message.c:231
+#: src/prefs_message.c:230
 msgid "Quotation"
 msgstr "引言"
 
-#: src/prefs_message.c:240
+#: src/prefs_message.c:239
 msgid "Collapse quoted text on double click"
 msgstr "雙擊折疊引言"
 
-#: src/prefs_message.c:247
-msgid "Treat these characters as quotation marks: "
+#: src/prefs_message.c:246
+msgid "Treat these characters as quotation marks"
 msgstr "視此字元為引言標示:"
 
-#: src/prefs_message.c:353
+#: src/prefs_message.c:352
 msgid "Text Options"
 msgstr "字串選項"
 
-#: src/prefs_migration.c:50
+#: src/prefs_migration.c:51
 #, c-format
 msgid ""
 "Your Claws Mail configuration is from a newer version than the version which "
@@ -16137,36 +16354,36 @@ msgstr ""
 "\n"
 "你確認現在要離開嗎?"
 
-#: src/prefs_migration.c:59
+#: src/prefs_migration.c:60
 msgid "Configuration warning"
 msgstr "配置完成"
 
-#: src/prefs_msg_colors.c:146
+#: src/prefs_msg_colors.c:155
 msgid "Message view"
 msgstr "郵件檢視"
 
-#: src/prefs_msg_colors.c:153
+#: src/prefs_msg_colors.c:162
 msgid "Enable coloration of message text"
 msgstr "啟用郵件文字的著色功能"
 
-#: src/prefs_msg_colors.c:161
+#: src/prefs_msg_colors.c:170
 msgid "Quote"
 msgstr "引言"
 
-#: src/prefs_msg_colors.c:173
+#: src/prefs_msg_colors.c:182
 msgid "Cycle quote colors"
 msgstr "引言顏色循環"
 
-#: src/prefs_msg_colors.c:177
+#: src/prefs_msg_colors.c:186
 msgid "If there are more than 3 quote levels, the colors will be reused"
 msgstr "如果超過3層引言,則這些顏色將會被重複使用"
 
-#: src/prefs_msg_colors.c:183
+#: src/prefs_msg_colors.c:192
 msgid "1st Level"
 msgstr "第一層"
 
-#: src/prefs_msg_colors.c:189 src/prefs_msg_colors.c:214
-#: src/prefs_msg_colors.c:239
+#: src/prefs_msg_colors.c:198 src/prefs_msg_colors.c:216
+#: src/prefs_msg_colors.c:234
 msgid "Text"
 msgstr "文字"
 
@@ -16175,84 +16392,121 @@ msgctxt "Tooltip"
 msgid "Pick color for 1st level text"
 msgstr "為第一層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:208
+#: src/prefs_msg_colors.c:210
 msgid "2nd Level"
 msgstr "第二層"
 
-#: src/prefs_msg_colors.c:227
+#: src/prefs_msg_colors.c:220
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text"
 msgstr "為第二層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:233
+#: src/prefs_msg_colors.c:228
 msgid "3rd Level"
 msgstr "第三層"
 
-#: src/prefs_msg_colors.c:252
+#: src/prefs_msg_colors.c:238
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text"
 msgstr "為第三層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:259
+#: src/prefs_msg_colors.c:247
 msgid "Enable coloration of text background"
 msgstr "曲用文字背景著色功能"
 
-#: src/prefs_msg_colors.c:274
+#: src/prefs_msg_colors.c:256
 msgctxt "Tooltip"
 msgid "Pick color for 1st level text background"
 msgstr "為第一層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:294
+#: src/prefs_msg_colors.c:269
 msgctxt "Tooltip"
 msgid "Pick color for 2nd level text background"
 msgstr "為第二層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:314
+#: src/prefs_msg_colors.c:282
 msgctxt "Tooltip"
 msgid "Pick color for 3rd level text background"
 msgstr "為第三層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:333
+#: src/prefs_msg_colors.c:294
 msgctxt "Tooltip"
 msgid "Pick color for links"
 msgstr "挑選連結的顏色"
 
-#: src/prefs_msg_colors.c:335
+#: src/prefs_msg_colors.c:298
 msgid "URI link"
 msgstr "URI連結"
 
-#: src/prefs_msg_colors.c:351
+#: src/prefs_msg_colors.c:306
 msgctxt "Tooltip"
 msgid "Pick color for signatures"
 msgstr "挑選簽名的顏色"
 
-#: src/prefs_msg_colors.c:358 src/prefs_summaries.c:365
+#. TRANSLATORS: A patch is a text file listing the differences between 2 or more different
+#. versions of the same text file
+#: src/prefs_msg_colors.c:316
+msgid "Patch messages and attachments"
+msgstr "郵件已成為附加檔"
+
+#: src/prefs_msg_colors.c:324
+msgctxt "Tooltip"
+msgid "Pick color for inserted lines"
+msgstr "挑選連結的顏色"
+
+#: src/prefs_msg_colors.c:326
+msgid "Inserted lines"
+msgstr "插入檔案"
+
+#: src/prefs_msg_colors.c:333
+msgctxt "Tooltip"
+msgid "Pick color for removed lines"
+msgstr "挑選連結的顏色"
+
+#: src/prefs_msg_colors.c:336
+msgid "Removed lines"
+msgstr "移除 feed"
+
+#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
+#: src/prefs_msg_colors.c:344
+msgctxt "Tooltip."
+msgid "Pick color for hunk lines"
+msgstr "挑選連結的顏色"
+
+#. TRANSLATORS: A hunk is a section of the patch indicating how the files differ
+#: src/prefs_msg_colors.c:348
+msgid "Hunk lines"
+msgstr "新的行"
+
+#: src/prefs_msg_colors.c:350 src/prefs_summaries.c:380
 msgid "Folder list"
 msgstr "資料夾清單"
 
-#: src/prefs_msg_colors.c:370
+#: src/prefs_msg_colors.c:357
+msgctxt "Tooltip"
 msgid ""
 "Pick color for Target folder. Target folder is used when the option 'Execute "
 "immediately when moving or deleting messages' is turned off"
 msgstr ""
-"挑選目的資料夾的顏色。在選項 '當移動或刪除郵件時立即執行' 被關閉時,目的資料"
-"夾將會被使用"
+"挑選目的資料夾的顏色。在'當移動或刪除郵件時立即執行'選項被關閉時,目的資料夾"
+"將會被使用"
 
-#: src/prefs_msg_colors.c:374
+#: src/prefs_msg_colors.c:362
 msgid "Target folder"
 msgstr "目的資料夾"
 
-#: src/prefs_msg_colors.c:388
+#: src/prefs_msg_colors.c:369
+msgctxt "Tooltip"
 msgid "Pick color for folders containing new messages"
 msgstr "為包含新郵件的資料夾挑選顏色"
 
-#: src/prefs_msg_colors.c:390
+#: src/prefs_msg_colors.c:373
 msgid "Folder containing new messages"
 msgstr "包含新郵件的資料夾"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:417 src/prefs_msg_colors.c:449
+#: src/prefs_msg_colors.c:398 src/prefs_msg_colors.c:430
 #, c-format
 msgctxt "Tooltip"
 msgid "Pick color for 'color %d'"
@@ -16260,82 +16514,97 @@ msgstr "為 '顏色 %d' 挑選顏色"
 
 #. TRANSLATORS: 'color %d' refers to the filtering/processing
 #. rule name and should not be translated
-#: src/prefs_msg_colors.c:421 src/prefs_msg_colors.c:453
+#: src/prefs_msg_colors.c:402 src/prefs_msg_colors.c:434
 #, c-format
 msgid "Set label for 'color %d'"
 msgstr "為 '顏色 %d' 設定標籤"
 
-#. TRANSLATORS: 'color %d' refers to the filtering/processing
-#. rule name and should not be translated
-#: src/prefs_msg_colors.c:582
-#, c-format
-msgctxt "Dialog title"
-msgid "Pick color for 'color %d'"
-msgstr "為 '顏色 %d' 挑選顏色"
-
-#: src/prefs_msg_colors.c:590
+#: src/prefs_msg_colors.c:529
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text"
 msgstr "為第一層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:593
+#: src/prefs_msg_colors.c:531
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text"
 msgstr "為第二層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:596
+#: src/prefs_msg_colors.c:533
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text"
 msgstr "為第三層文字挑選顏色"
 
-#: src/prefs_msg_colors.c:599
+#: src/prefs_msg_colors.c:535
 msgctxt "Dialog title"
 msgid "Pick color for 1st level text background"
 msgstr "為第一層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:602
+#: src/prefs_msg_colors.c:537
 msgctxt "Dialog title"
 msgid "Pick color for 2nd level text background"
 msgstr "為第二層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:605
+#: src/prefs_msg_colors.c:539
 msgctxt "Dialog title"
 msgid "Pick color for 3rd level text background"
 msgstr "為第三層文字背景挑選顏色"
 
-#: src/prefs_msg_colors.c:608
+#: src/prefs_msg_colors.c:541
 msgctxt "Dialog title"
 msgid "Pick color for links"
 msgstr "挑選連結的顏色"
 
-#: src/prefs_msg_colors.c:611
+#: src/prefs_msg_colors.c:543
 msgctxt "Dialog title"
 msgid "Pick color for target folder"
 msgstr "挑選目的資料夾的顏色"
 
-#: src/prefs_msg_colors.c:614
+#: src/prefs_msg_colors.c:545
 msgctxt "Dialog title"
 msgid "Pick color for signatures"
 msgstr "挑選簽名的顏色"
 
-#: src/prefs_msg_colors.c:617
+#: src/prefs_msg_colors.c:547
 msgctxt "Dialog title"
 msgid "Pick color for folder"
 msgstr "挑選資料夾的顏色"
 
-#: src/prefs_msg_colors.c:831
+#: src/prefs_msg_colors.c:549
+msgctxt "Dialog title"
+msgid "Pick color for inserted lines"
+msgstr "挑選連結的顏色"
+
+#: src/prefs_msg_colors.c:551
+msgctxt "Dialog title"
+msgid "Pick color for removed lines"
+msgstr "挑選連結的顏色"
+
+#: src/prefs_msg_colors.c:553
+msgctxt "Dialog title"
+msgid "Pick color for hunk lines"
+msgstr "挑選連結的顏色"
+
+#. TRANSLATORS: 'color %d' refers to the filtering/processing
+#. rule name and should not be translated
+#: src/prefs_msg_colors.c:576
+#, c-format
+msgctxt "Dialog title"
+msgid "Pick color for 'color %d'"
+msgstr "為 '顏色 %d' 挑選顏色"
+
+#: src/prefs_msg_colors.c:777
 msgid "Colors"
 msgstr "顏色"
 
-#: src/prefs_other.c:107
+#: src/prefs_other.c:109
 msgid "Choose preset keyboard shortcuts"
 msgstr "選擇預設的快捷鍵"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:124
 msgid "Select preset:"
 msgstr "選擇預設:"
 
-#: src/prefs_other.c:136
+#: src/prefs_other.c:139
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when focusing the mouse pointer on the item."
@@ -16343,35 +16612,39 @@ msgstr ""
 "你可以透過把滑鼠焦點放在項目上時,按下任何按鍵,\n"
 "來修改每一個功能項目的快捷鍵"
 
-#: src/prefs_other.c:496
+#: src/prefs_other.c:497
 msgid "Add address to destination when double-clicked"
 msgstr "雙擊時將郵件地址加入通訊錄"
 
-#: src/prefs_other.c:499
+#: src/prefs_other.c:500
 msgid "On exit"
 msgstr "離開時"
 
-#: src/prefs_other.c:502
+#: src/prefs_other.c:503
 msgid "Confirm on exit"
 msgstr "離開時需確認"
 
-#: src/prefs_other.c:509
+#: src/prefs_other.c:510
 msgid "Empty trash on exit"
 msgstr "離開時清空回收桶"
 
-#: src/prefs_other.c:512
+#: src/prefs_other.c:513
 msgid "Warn if there are queued messages"
 msgstr "若有任何的暫存郵件時提出警示"
 
-#: src/prefs_other.c:514
+#: src/prefs_other.c:515
 msgid "Keyboard shortcuts"
 msgstr "快捷鍵"
 
-#: src/prefs_other.c:517
+#: src/prefs_other.c:518
+msgid "Enable keyboard shortcuts"
+msgstr "啟用快捷鍵"
+
+#: src/prefs_other.c:521
 msgid "Enable customisable keyboard shortcuts"
 msgstr "啟用使用者自訂的快捷鍵"
 
-#: src/prefs_other.c:520
+#: src/prefs_other.c:524
 msgid ""
 "If checked, you can change the keyboard shortcuts of most of the menu items "
 "by focusing on the menu item and pressing a key combination.\n"
@@ -16381,15 +16654,15 @@ msgstr ""
 "快捷鍵設定\n"
 "若你希望保持所有已存在的快捷鍵,請取消勾選。"
 
-#: src/prefs_other.c:527
+#: src/prefs_other.c:531
 msgid " Choose preset keyboard shortcuts... "
 msgstr "選擇已設定的快捷鍵..."
 
-#: src/prefs_other.c:537
+#: src/prefs_other.c:541
 msgid "Metadata handling"
 msgstr "原始數據控制"
 
-#: src/prefs_other.c:538
+#: src/prefs_other.c:542
 msgid ""
 "Safer mode asks the OS to write metadata to disk directly;\n"
 "it avoids data loss after crashes but can take some time."
@@ -16397,31 +16670,41 @@ msgstr ""
 "安全模式會要求系統將原始數據直接寫入磁碟,它將避免在任何的崩潰情況下\n"
 "遺失數據,但是這樣將會花費一些時間。"
 
-#: src/prefs_other.c:542
+#: src/prefs_other.c:546
 msgid "Safer"
 msgstr "更安全"
 
-#: src/prefs_other.c:544
+#: src/prefs_other.c:548
 msgid "Faster"
 msgstr "更快"
 
-#: src/prefs_other.c:562
+#: src/prefs_other.c:566
 msgid "Socket I/O timeout"
 msgstr "Socket I/O 超時"
 
-#: src/prefs_other.c:583
+#: src/prefs_other.c:587
+msgid "Translate header names"
+msgstr "轉換標頭名稱"
+
+#: src/prefs_other.c:589
+msgid ""
+"The display of standard headers (such as 'From:', 'Subject:') will be "
+"translated into your language."
+msgstr "標準標頭的顯示 (像是 'From:', 'Subject:') 將會 翻譯為你的語言"
+
+#: src/prefs_other.c:592
 msgid "Ask before emptying trash"
 msgstr "清空回收桶前詢問"
 
-#: src/prefs_other.c:585
+#: src/prefs_other.c:594
 msgid "Ask about account specific filtering rules when filtering manually"
 msgstr "手動進行過濾時,詢問要使用那一個帳號使用的過濾規則"
 
-#: src/prefs_other.c:590
+#: src/prefs_other.c:599
 msgid "Use secure file deletion if possible"
 msgstr "如果可以,使用安全的檔案刪除"
 
-#: src/prefs_other.c:594
+#: src/prefs_other.c:603
 msgid ""
 "Use secure file deletion if possible\n"
 "(the 'shred' program is not available)"
@@ -16429,7 +16712,7 @@ msgstr ""
 "如果可以,使用安全的檔案刪除\n"
 "('shred'程式是無效的)"
 
-#: src/prefs_other.c:599
+#: src/prefs_other.c:608
 msgid ""
 "Use the 'shred' program to overwrite files with random data before deleting "
 "them. This slows down deletion. Be sure to read shred's man page for caveats."
@@ -16437,19 +16720,19 @@ msgstr ""
 "使用'shred'程式,以隨機的方式在檔案刪除前覆寫檔案,這樣將使刪除變慢。請仔細閱"
 "讀'shred'的man page,以取得更詳細的警示說明"
 
-#: src/prefs_other.c:603
+#: src/prefs_other.c:612
 msgid "Synchronise offline folders as soon as possible"
 msgstr "儘快的同步離線資料夾"
 
-#: src/prefs_other.c:606
+#: src/prefs_other.c:615
 msgid "Master passphrase"
 msgstr "錯誤的密碼"
 
-#: src/prefs_other.c:609
+#: src/prefs_other.c:618
 msgid "Use a master passphrase"
 msgstr "請輸入密碼:"
 
-#: src/prefs_other.c:612
+#: src/prefs_other.c:621
 msgid ""
 "If checked, your saved account passwords will be protected by a master "
 "passphrase. If no master passphrase is set, you will be prompted to set one."
@@ -16457,265 +16740,253 @@ msgstr ""
 "如果勾選了此選項,你已儲存的帳密將會受到一個慣用詞的保護,如果沒有指定慣用"
 "詞,你將會被要求設定一個。"
 
-#: src/prefs_other.c:617
+#: src/prefs_other.c:626
 msgid "Change master passphrase"
 msgstr "請輸入密碼:"
 
-#: src/prefs_other.c:777
+#: src/prefs_other.c:816
 msgid "Miscellaneous"
 msgstr "雜項"
 
+#: src/prefs_proxy.c:240 src/prefs_receive.c:415 src/prefs_send.c:419
+msgid "Mail Handling"
+msgstr "郵件處理"
+
 #: src/prefs_quote.c:77
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "在 %d\\n%f 上, 已寫入\\n\\n%q"
 
-#: src/prefs_receive.c:142
+#: src/prefs_receive.c:145
 msgid "External incorporation program"
 msgstr "外部程式"
 
-#: src/prefs_receive.c:145
+#: src/prefs_receive.c:148
 msgid "Use external program for receiving mail"
 msgstr "使用外部程式接收郵件"
 
-#: src/prefs_receive.c:161
-msgid "Automatic checking"
-msgstr "自動檢查"
-
-#: src/prefs_receive.c:168
-msgid "Check for new mail every"
-msgstr "檢查新郵件頻率"
-
-#: src/prefs_receive.c:212
+#: src/prefs_receive.c:215
 msgid "Check for new mail on start-up"
 msgstr "啟動後檢查新郵件"
 
-#: src/prefs_receive.c:215
+#: src/prefs_receive.c:218
 msgid "Dialogs"
 msgstr "對話視窗"
 
-#: src/prefs_receive.c:217
+#: src/prefs_receive.c:220
 msgid "Show receive dialog"
 msgstr "顯示接收視窗"
 
-#: src/prefs_receive.c:227
+#: src/prefs_receive.c:230
 msgid "Only on manual receiving"
 msgstr "只在手動收信時"
 
-#: src/prefs_receive.c:238
+#: src/prefs_receive.c:241
 msgid "Close receive dialog when finished"
 msgstr "當結束時關閉接收視窗"
 
-#: src/prefs_receive.c:241
+#: src/prefs_receive.c:244
 msgid "Don't popup error dialog on receive error"
 msgstr "接收錯誤時不會彈出錯誤對話視窗"
 
-#: src/prefs_receive.c:244
+#: src/prefs_receive.c:247
 msgid "After receiving new mail"
 msgstr "在接收新郵件後"
 
-#: src/prefs_receive.c:246
+#: src/prefs_receive.c:249
 msgid "Go to Inbox"
 msgstr "前往收件夾"
 
-#: src/prefs_receive.c:248
+#: src/prefs_receive.c:251
 msgid "Update all local folders"
 msgstr "更新所有本地資料夾"
 
-#: src/prefs_receive.c:250
+#: src/prefs_receive.c:253
 msgid "Run command"
 msgstr "執行命令"
 
-#: src/prefs_receive.c:255
+#: src/prefs_receive.c:258
 msgid "after automatic check"
 msgstr "在自動檢查後"
 
-#: src/prefs_receive.c:257
+#: src/prefs_receive.c:260
 msgid "after manual check"
 msgstr "在手動檢查後"
 
-#: src/prefs_receive.c:265
+#: src/prefs_receive.c:280
 #, c-format
-msgid ""
-"Command to execute:\n"
-"(use %d as number of new mails)"
-msgstr ""
-"執行的命令:\n"
-"(使用 %d 封新郵件)"
+msgid "Use %d as number of new mails"
+msgstr "使用 %d 封新郵件"
 
-#: src/prefs_receive.c:408 src/prefs_send.c:415
-msgid "Mail Handling"
-msgstr "郵件處理"
-
-#: src/prefs_receive.c:409
+#: src/prefs_receive.c:416
 msgid "Receiving"
 msgstr "接收"
 
-#: src/prefs_send.c:172
+#: src/prefs_send.c:176
 msgid "Save sent messages"
 msgstr "儲存已傳送的郵件"
 
-#: src/prefs_send.c:175
+#: src/prefs_send.c:179
 msgid "Never send Return Receipts"
 msgstr "不傳送回條"
 
-#: src/prefs_send.c:193
+#: src/prefs_send.c:197
 msgid "Confirm before sending queued messages"
 msgstr "傳送暫存郵件前需確認"
 
-#: src/prefs_send.c:196
+#: src/prefs_send.c:200
 msgid "Show send dialog"
 msgstr "顯示傳送對話視窗"
 
-#: src/prefs_send.c:199
+#: src/prefs_send.c:203
 msgid "Warn when Subject is empty"
 msgstr "主旨空白時提示警告"
 
-#: src/prefs_send.c:205
-msgid "Warn when sending to more recipients than:"
-msgstr "發出警告!當附加檔案超過:"
+#: src/prefs_send.c:209
+msgid "Warn when sending to more recipients than"
+msgstr "發出警告!當接收者超過:"
 
-#: src/prefs_send.c:221
+#: src/prefs_send.c:225
 msgid "Outgoing encoding"
 msgstr "外寄郵件編碼"
 
-#: src/prefs_send.c:246
+#: src/prefs_send.c:250
 msgid ""
 "If 'Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr "如果選取'自動',則目前本地端的最佳化將被套用"
 
-#: src/prefs_send.c:263
+#: src/prefs_send.c:267
 msgid "7bit ASCII (US-ASCII)"
 msgstr "7位元  ASCII (US-ASCII)"
 
-#: src/prefs_send.c:264
+#: src/prefs_send.c:268
 msgid "Unicode (UTF-8)"
 msgstr "萬國碼 (UTF-8)"
 
-#: src/prefs_send.c:266
+#: src/prefs_send.c:270
 msgid "Western European (ISO-8859-1)"
 msgstr "西歐 (ISO-8859-1)"
 
-#: src/prefs_send.c:267
+#: src/prefs_send.c:271
 msgid "Western European (ISO-8859-15)"
 msgstr "西歐 (ISO-8859-15)"
 
-#: src/prefs_send.c:269
+#: src/prefs_send.c:273
 msgid "Central European (ISO-8859-2)"
 msgstr "中歐 (ISO-8859-2)"
 
-#: src/prefs_send.c:271
+#: src/prefs_send.c:275
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: src/prefs_send.c:272
+#: src/prefs_send.c:276
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海 (ISO-8859-4)"
 
-#: src/prefs_send.c:274
+#: src/prefs_send.c:278
 msgid "Greek (ISO-8859-7)"
 msgstr "希臘 (ISO-8859-7)"
 
-#: src/prefs_send.c:276
+#: src/prefs_send.c:280
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯萊 (ISO-8859-8)"
 
-#: src/prefs_send.c:277
+#: src/prefs_send.c:281
 msgid "Hebrew (Windows-1255)"
 msgstr "希伯萊 (Windows-1255)"
 
-#: src/prefs_send.c:279
+#: src/prefs_send.c:283
 msgid "Arabic (ISO-8859-6)"
 msgstr "阿拉伯 (ISO-8859-6)"
 
-#: src/prefs_send.c:280
+#: src/prefs_send.c:284
 msgid "Arabic (Windows-1256)"
 msgstr "阿拉伯 (Windows-1256)"
 
-#: src/prefs_send.c:282
+#: src/prefs_send.c:286
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其 (ISO-8859-9)"
 
-#: src/prefs_send.c:284
+#: src/prefs_send.c:288
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "西里爾 (ISO-8859-5)"
 
-#: src/prefs_send.c:285
+#: src/prefs_send.c:289
 msgid "Cyrillic (KOI8-R)"
 msgstr "西里爾 (KOI8-R)"
 
-#: src/prefs_send.c:286
+#: src/prefs_send.c:290
 msgid "Cyrillic (X-MAC-CYRILLIC)"
 msgstr "西里爾 (X-MAC-CYRILLIC)"
 
-#: src/prefs_send.c:287
+#: src/prefs_send.c:291
 msgid "Cyrillic (KOI8-U)"
 msgstr "西里爾 (KOI8-U)"
 
-#: src/prefs_send.c:288
+#: src/prefs_send.c:292
 msgid "Cyrillic (Windows-1251)"
 msgstr "西里爾 (Windows-1251)"
 
-#: src/prefs_send.c:290
+#: src/prefs_send.c:294
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日文(ISO-2022-JP)"
 
-#: src/prefs_send.c:292
+#: src/prefs_send.c:296
 msgid "Japanese (EUC-JP)"
 msgstr "日文 (EUC-JP)"
 
-#: src/prefs_send.c:293
+#: src/prefs_send.c:297
 msgid "Japanese (Shift_JIS)"
 msgstr "日文 (Shift_JIS)"
 
-#: src/prefs_send.c:296
+#: src/prefs_send.c:300
 msgid "Simplified Chinese (GB18030)"
 msgstr "簡體中文 (GB18030)"
 
-#: src/prefs_send.c:297
+#: src/prefs_send.c:301
 msgid "Simplified Chinese (GB2312)"
 msgstr "簡體中文 (GB2312)"
 
-#: src/prefs_send.c:298
+#: src/prefs_send.c:302
 msgid "Simplified Chinese (GBK)"
 msgstr "簡體中文 (GBK)"
 
-#: src/prefs_send.c:299
+#: src/prefs_send.c:303
 msgid "Traditional Chinese (Big5)"
 msgstr "繁體中文 (Big5)"
 
-#: src/prefs_send.c:301
+#: src/prefs_send.c:305
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁體中文 (EUC-TW)"
 
-#: src/prefs_send.c:302
+#: src/prefs_send.c:306
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_send.c:305
+#: src/prefs_send.c:309
 msgid "Korean (EUC-KR)"
 msgstr "韓文 (EUC-KR)"
 
-#: src/prefs_send.c:307
+#: src/prefs_send.c:311
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_send.c:308
+#: src/prefs_send.c:312
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_send.c:312
+#: src/prefs_send.c:316
 msgid "Transfer encoding"
 msgstr "傳送編號"
 
-#: src/prefs_send.c:323
+#: src/prefs_send.c:327
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr "當郵件內容包含非ASCII編碼字元時需指定傳送加碼方式"
 
-#: src/prefs_send.c:416 src/send_message.c:501 src/send_message.c:505
-#: src/send_message.c:510
+#: src/prefs_send.c:420 src/send_message.c:520 src/send_message.c:524
+#: src/send_message.c:529
 msgid "Sending"
 msgstr "傳送"
 
@@ -16767,240 +17038,266 @@ msgstr "為錯字挑選顏色,要使用黑色的底線嗎?"
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:167
 msgid "the abbreviated weekday name"
 msgstr "星期名稱縮寫"
 
-#: src/prefs_summaries.c:161
+#: src/prefs_summaries.c:168
 msgid "the full weekday name"
 msgstr "星期的完整名稱"
 
-#: src/prefs_summaries.c:162
+#: src/prefs_summaries.c:169
 msgid "the abbreviated month name"
 msgstr "月份名稱縮寫"
 
-#: src/prefs_summaries.c:163
+#: src/prefs_summaries.c:170
 msgid "the full month name"
 msgstr "月份的完整名稱"
 
-#: src/prefs_summaries.c:164
+#: src/prefs_summaries.c:171
 msgid "the preferred date and time for the current locale"
 msgstr "目前地區的最佳日期和時間"
 
-#: src/prefs_summaries.c:165
+#: src/prefs_summaries.c:172
 msgid "the century number (year/100)"
 msgstr "年代數字 (年/100)"
 
-#: src/prefs_summaries.c:166
+#: src/prefs_summaries.c:173
 msgid "the day of the month as a decimal number"
 msgstr "以十進制數字顯示該月的日期"
 
-#: src/prefs_summaries.c:167
+#: src/prefs_summaries.c:174
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "用十進制數字以24時制顯示小時"
 
-#: src/prefs_summaries.c:168
+#: src/prefs_summaries.c:175
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "用十進制數字以12時制顯示小時"
 
-#: src/prefs_summaries.c:169
+#: src/prefs_summaries.c:176
 msgid "the day of the year as a decimal number"
 msgstr "以十進制數字顯示該年的日期"
 
-#: src/prefs_summaries.c:170
+#: src/prefs_summaries.c:177
 msgid "the month as a decimal number"
 msgstr "以十進制數字顯示月份"
 
-#: src/prefs_summaries.c:171
+#: src/prefs_summaries.c:178
 msgid "the minute as a decimal number"
 msgstr "以十進制數字顯示分"
 
-#: src/prefs_summaries.c:172
+#: src/prefs_summaries.c:179
 msgid "either AM or PM"
 msgstr "AM 或 PM"
 
-#: src/prefs_summaries.c:173
+#: src/prefs_summaries.c:180
 msgid "the second as a decimal number"
 msgstr "以十進制數字顯示秒"
 
-#: src/prefs_summaries.c:174
+#: src/prefs_summaries.c:181
 msgid "the day of the week as a decimal number"
 msgstr "以十進制數字顯示該週的日期"
 
-#: src/prefs_summaries.c:175
+#: src/prefs_summaries.c:182
 msgid "the preferred date for the current locale"
 msgstr "目前地區的最佳日期"
 
-#: src/prefs_summaries.c:176
+#: src/prefs_summaries.c:183
 msgid "the last two digits of a year"
 msgstr "年份最後兩位數字"
 
-#: src/prefs_summaries.c:177
+#: src/prefs_summaries.c:184
 msgid "the year as a decimal number"
 msgstr "以十進制數字顯示年份"
 
-#: src/prefs_summaries.c:178
+#: src/prefs_summaries.c:185
 msgid "the time zone or name or abbreviation"
 msgstr "時區或名稱或縮寫"
 
-#: src/prefs_summaries.c:199 src/prefs_summaries.c:247
-#: src/prefs_summaries.c:565
+#: src/prefs_summaries.c:206 src/prefs_summaries.c:255
+#: src/prefs_summaries.c:486
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_summaries.c:223
+#: src/prefs_summaries.c:231
 msgid "Specifier"
 msgstr "區分符號"
 
-#: src/prefs_summaries.c:265
+#: src/prefs_summaries.c:273
 msgid "Example"
 msgstr "範例"
 
-#: src/prefs_summaries.c:371
+#: src/prefs_summaries.c:400
 msgid "Display message count next to folder name"
 msgstr "下一個資料夾名稱所顯示的郵件數量"
 
-#: src/prefs_summaries.c:381
+#: src/prefs_summaries.c:410
 msgid "Unread messages"
 msgstr "未讀郵件"
 
-#: src/prefs_summaries.c:382
+#: src/prefs_summaries.c:411
 msgid "Unread and Total messages"
 msgstr "未讀以及所有郵件"
 
-#: src/prefs_summaries.c:392
+#: src/prefs_summaries.c:417
 msgid "Open last opened folder at start-up"
 msgstr "啟動時開啟最後一次開啟的資料夾"
 
-#: src/prefs_summaries.c:395
+#: src/prefs_summaries.c:424
 msgid "Abbreviate newsgroup names longer than"
 msgstr "新聞群組名稱超過"
 
-#: src/prefs_summaries.c:408
+#: src/prefs_summaries.c:437
 msgid "letters"
 msgstr "字元時縮寫"
 
-#: src/prefs_summaries.c:426
+#: src/prefs_summaries.c:445
 msgid "Message list"
 msgstr "郵件清單"
 
-#: src/prefs_summaries.c:432
-msgid "Sort new folders by"
-msgstr "新資料夾排序以"
-
-#: src/prefs_summaries.c:440 src/prefs_summary_column.c:85
-msgid "Number"
-msgstr "數字"
+#: src/prefs_summaries.c:462
+msgid "Lock column headers"
+msgstr "鎖定標頭列"
 
-#: src/prefs_summaries.c:443
-msgid "Thread date"
-msgstr "根據串列日期"
-
-#: src/prefs_summaries.c:454
-msgid "Don't sort"
-msgstr "不排序"
-
-#: src/prefs_summaries.c:471
-msgid "Set default selection when entering a folder"
-msgstr "設定進入資料夾時的預設選項"
+#: src/prefs_summaries.c:468
+msgid "Displayed in From column"
+msgstr "顯示行數"
 
-#: src/prefs_summaries.c:484
-msgid "Show \"no unread (or new) message\" dialog"
-msgstr "顯示 \"無未讀或新郵件\" 對話框"
+#: src/prefs_summaries.c:479
+msgid "Name and Address"
+msgstr "新連絡人"
 
-#: src/prefs_summaries.c:494
-msgid "Assume 'Yes'"
-msgstr "假設 'Yes'"
+#: src/prefs_summaries.c:505
+msgid "Date format help"
+msgstr "日期格式"
 
-#: src/prefs_summaries.c:495
-msgid "Assume 'No'"
-msgstr "假設 'No'"
+#: src/prefs_summaries.c:511
+msgid "Set message selection when entering a folder"
+msgstr "設定進入資料夾信件為選擇狀態"
 
-#: src/prefs_summaries.c:500
+#: src/prefs_summaries.c:520
 msgid "Open message when selected"
 msgstr "開啟選擇的郵件"
 
-#: src/prefs_summaries.c:505
+#: src/prefs_summaries.c:525
 msgid "When opening a folder"
 msgstr "當開啟一個資料夾"
 
-#: src/prefs_summaries.c:507
+#: src/prefs_summaries.c:527
 msgid "When displaying search results"
 msgstr "當顯示搜尋結果時"
 
-#: src/prefs_summaries.c:509
+#: src/prefs_summaries.c:529
 msgid "When selecting next or previous message using shortcuts"
 msgstr "當選擇下一個或上一個郵件時使用捷徑"
 
-#: src/prefs_summaries.c:511
+#: src/prefs_summaries.c:531
 msgid "When deleting or moving messages"
 msgstr "當刪除或移動郵件"
 
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:533
 msgid "When using directional keys"
 msgstr "當使用方向鍵時"
 
-#: src/prefs_summaries.c:517
-msgid "Thread using subject in addition to standard headers"
-msgstr "除了標準標頭之外,執行緒將使用主旨"
-
-#: src/prefs_summaries.c:521
-msgid "Execute immediately when moving or deleting messages"
-msgstr "當移除或刪除郵件時,立即執行"
-
-#: src/prefs_summaries.c:523
-msgid ""
-"Defers moving, copying and deleting of messages until you choose 'Tools/"
-"Execute'"
-msgstr "延後移動、複製和刪除郵件,直到你選擇 '工具/執行'"
-
-#: src/prefs_summaries.c:526
+#: src/prefs_summaries.c:535
 msgid "Mark message as read"
 msgstr "標示為已讀"
 
-#: src/prefs_summaries.c:529
+#: src/prefs_summaries.c:538
 msgid "when selected, after"
 msgstr "在選擇後過了"
 
-#: src/prefs_summaries.c:548
+#: src/prefs_summaries.c:557
 msgid "only when opened in a new window, or replied to"
 msgstr "只有當開啟了新視窗或回覆"
 
-#: src/prefs_summaries.c:555
+#: src/prefs_summaries.c:567
+msgid "Show \"no unread (or new) message\" dialog"
+msgstr "顯示 \"無未讀或新郵件\" 對話框"
+
+#: src/prefs_summaries.c:577
+msgid "Assume 'Yes'"
+msgstr "假設 'Yes'"
+
+#: src/prefs_summaries.c:578
+msgid "Assume 'No'"
+msgstr "假設 'No'"
+
+#: src/prefs_summaries.c:584
 msgid "Display sender using address book"
 msgstr "以通訊錄顯示寄件者"
 
-#: src/prefs_summaries.c:559
+#: src/prefs_summaries.c:588
+msgid "Thread using subject in addition to standard headers"
+msgstr "除了標準標頭之外,執行緒將使用主旨"
+
+#: src/prefs_summaries.c:592
+msgid "Execute immediately when moving or deleting messages"
+msgstr "當移除或刪除郵件時,立即執行"
+
+#: src/prefs_summaries.c:594
+msgid ""
+"When unchecked moving, copying and deleting of messages is deferred until "
+"you use 'Tools/Execute'"
+msgstr "當取消了選項,則會延後移動、複製和刪除郵件,直到你選擇 '工具/執行'"
+
+#: src/prefs_summaries.c:599
+msgid "Confirm when marking all messages as read or unread"
+msgstr "將資料夾中所有的郵件標示為已讀或未讀時,需經過確認"
+
+#: src/prefs_summaries.c:602
+msgid "Confirm when changing color labels"
+msgstr "覆寫郵件顏色標籤前需再次確認"
+
+#: src/prefs_summaries.c:606
 msgid "Show tooltips"
 msgstr "顯示工具提示"
 
-#: src/prefs_summaries.c:584
-msgid "Date format help"
-msgstr "日期格式"
+#: src/prefs_summaries.c:616 src/quote_fmt.c:539
+msgid "Defaults"
+msgstr "預設值"
 
-#: src/prefs_summaries.c:602
-msgid "Confirm before marking all messages in a folder as read"
-msgstr "將資料夾中所有的郵件標示為已讀時,需經過確認"
+#: src/prefs_summaries.c:618
+msgid "New folders"
+msgstr "新增資料夾"
 
-#: src/prefs_summaries.c:605
-msgid "Translate header names"
-msgstr "轉換標頭名稱"
+#: src/prefs_summaries.c:624
+msgid "Sort by"
+msgstr "排序"
 
-#: src/prefs_summaries.c:607
-msgid ""
-"The display of standard headers (such as 'From:', 'Subject:') will be "
-"translated into your language."
-msgstr "標準標頭的顯示 (像是 'From:', 'Subject:') 將會 翻譯為你的語言"
+#: src/prefs_summaries.c:632 src/prefs_summary_column.c:85
+msgid "Number"
+msgstr "數字"
+
+#: src/prefs_summaries.c:635
+msgid "Thread date"
+msgstr "根據串列日期"
+
+#: src/prefs_summaries.c:646
+msgid "Don't sort"
+msgstr "不排序"
 
-#: src/prefs_summaries.c:766
+#: src/prefs_summaries.c:661
+msgid "Thread view"
+msgstr "串列檢視"
+
+#: src/prefs_summaries.c:664
+msgid "Collapse all threads"
+msgstr "關閉所有串列"
+
+#: src/prefs_summaries.c:670
+msgid "Hide read messages"
+msgstr "隱藏讀取郵件"
+
+#: src/prefs_summaries.c:870
 msgid "Summaries"
 msgstr "摘要"
 
-#: src/prefs_summary_column.c:225
+#: src/prefs_summary_column.c:226
 msgid "Message list columns configuration"
 msgstr "配置郵件清單列"
 
-#: src/prefs_summary_column.c:242
+#: src/prefs_summary_column.c:243
 msgid ""
 "Select columns to be displayed in the message list. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
@@ -17009,15 +17306,15 @@ msgstr ""
 "顯示的順序。"
 
 #: src/prefs_summary_open.c:109
-msgid "first marked email"
+msgid "oldest marked email"
 msgstr "第一封標示的郵件"
 
 #: src/prefs_summary_open.c:110
-msgid "first new email"
+msgid "oldest new email"
 msgstr "第一封新的郵件"
 
 #: src/prefs_summary_open.c:111
-msgid "first unread email"
+msgid "oldest unread email"
 msgstr "第一封未讀的郵件"
 
 #: src/prefs_summary_open.c:112
@@ -17025,24 +17322,36 @@ msgid "last opened email"
 msgstr "最後一封開啟的郵件"
 
 #: src/prefs_summary_open.c:113
-msgid "last email in the list"
+msgid "newest email in the list"
 msgstr "最後一封清單中的郵件"
 
 #: src/prefs_summary_open.c:115
-msgid "first email in the list"
+msgid "oldest email in the list"
 msgstr "第一封清單中的郵件"
 
-#: src/prefs_summary_open.c:185
-msgid " Selection when entering a folder"
-msgstr " 當進入資料夾後選取"
+#: src/prefs_summary_open.c:116
+msgid "newest marked email"
+msgstr "最後一封標示的郵件"
+
+#: src/prefs_summary_open.c:117
+msgid "newest new email"
+msgstr "最後一封新的郵件"
+
+#: src/prefs_summary_open.c:118
+msgid "newest unread email"
+msgstr "最後一封未讀的郵件"
 
-#: src/prefs_summary_open.c:230
-msgid "Possible selections"
-msgstr "可能的選擇"
+#: src/prefs_summary_open.c:189
+msgid "Message selection when entering a folder"
+msgstr " 當進入資料夾後選取信件"
 
-#: src/prefs_summary_open.c:265
-msgid "Selection on folder opening"
-msgstr "當開啟資料夾後選取"
+#: src/prefs_summary_open.c:234
+msgid "Available selections"
+msgstr "可用的選擇"
+
+#: src/prefs_summary_open.c:269
+msgid "Current selections"
+msgstr "目前的動作"
 
 #: src/prefs_template.c:80
 msgid "This name is used as the Menu item"
@@ -17054,130 +17363,126 @@ msgid ""
 "account."
 msgstr "從郵件標頭覆寫新郵件帳號,這樣不會改變新郵件的帳號"
 
-#: src/prefs_template.c:308
+#: src/prefs_template.c:309
 msgid "Append the new template above to the list"
 msgstr "將新樣版加在清單的上方"
 
-#: src/prefs_template.c:317
+#: src/prefs_template.c:318
 msgid "Replace the selected template in list with the template above"
 msgstr "用上方的樣版將清單內所選擇的樣版置換"
 
-#: src/prefs_template.c:327
+#: src/prefs_template.c:328
 msgid "Delete the selected template from the list"
 msgstr "從清單中把選擇的板版刪除"
 
-#: src/prefs_template.c:345
+#: src/prefs_template.c:346
 msgid "Show information on configuring templates"
 msgstr "顯示所有設定的樣版資訊"
 
-#: src/prefs_template.c:369
+#: src/prefs_template.c:370
 msgid "Move the selected template to the top"
 msgstr "將選擇的樣版移至最上方"
 
-#: src/prefs_template.c:379
+#: src/prefs_template.c:380
 msgid "Move the selected template up"
 msgstr "將選擇的樣版上移"
 
-#: src/prefs_template.c:387
+#: src/prefs_template.c:388
 msgid "Move the selected template down"
 msgstr "將選擇的樣版下移"
 
-#: src/prefs_template.c:397
+#: src/prefs_template.c:398
 msgid "Move the selected template to the bottom"
 msgstr "移動已選擇的樣版到底部"
 
-#: src/prefs_template.c:413
+#: src/prefs_template.c:414
 msgid "Template configuration"
 msgstr "樣版設定"
 
-#: src/prefs_template.c:601
+#: src/prefs_template.c:602
 msgid "Templates list not saved"
 msgstr "樣版尚未儲存"
 
-#: src/prefs_template.c:602
+#: src/prefs_template.c:603
 msgid "The templates list has been modified. Close anyway?"
 msgstr "樣版清單已變更,確認關閉嗎?"
 
-#: src/prefs_template.c:759
+#: src/prefs_template.c:760
 msgid "The template's name is not set."
 msgstr "樣版名稱尚未設定"
 
-#: src/prefs_template.c:802
+#: src/prefs_template.c:803
 msgid "The \"From\" field of the template contains an invalid email address."
 msgstr "樣版的\"寄件者\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:808
+#: src/prefs_template.c:809
 msgid "The \"To\" field of the template contains an invalid email address."
 msgstr "樣版的\"收件者\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:814
+#: src/prefs_template.c:815
 msgid "The \"Cc\" field of the template contains an invalid email address."
 msgstr "樣版的\"副本\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:820
+#: src/prefs_template.c:821
 msgid "The \"Bcc\" field of the template contains an invalid email address."
 msgstr "樣版的\"副本\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:826
+#: src/prefs_template.c:827
 msgid ""
 "The \"Reply-To\" field of the template contains an invalid email address."
 msgstr "樣版的\"回覆給\"欄位包含了無效的郵件地址"
 
-#: src/prefs_template.c:832
+#: src/prefs_template.c:833
 msgid "The \"Subject\" field of the template is invalid."
 msgstr "樣版的\"主旨\"欄位無效"
 
-#: src/prefs_template.c:903
+#: src/prefs_template.c:904
 msgid "Delete template"
 msgstr "刪除樣版"
 
-#: src/prefs_template.c:904
+#: src/prefs_template.c:905
 msgid "Do you really want to delete this template?"
 msgstr "確定要刪除這個樣版嗎?"
 
-#: src/prefs_template.c:916
+#: src/prefs_template.c:917
 msgid "Delete all templates"
 msgstr "刪除所有的樣版嗎?"
 
-#: src/prefs_template.c:917
+#: src/prefs_template.c:918
 msgid "Do you really want to delete all the templates?"
 msgstr "確定要刪除所有樣版嗎?"
 
-#: src/prefs_template.c:1232
+#: src/prefs_template.c:1234
 msgid "Current templates"
 msgstr "現有的樣版"
 
-#: src/prefs_template.c:1260
+#: src/prefs_template.c:1262
 msgid "Template"
 msgstr "樣版"
 
-#: src/prefs_themes.c:400 src/prefs_themes.c:841
+#: src/prefs_themes.c:401 src/prefs_themes.c:841
 msgid "Default internal theme"
 msgstr "預設內部主題"
 
-#: src/prefs_themes.c:422
+#: src/prefs_themes.c:423
 msgid "Themes"
 msgstr "佈景主題"
 
-#: src/prefs_themes.c:501
-msgid "Only root can remove system themes"
-msgstr "只有 root 權限才能移除系統佈景主題"
-
-#: src/prefs_themes.c:504
+#: src/prefs_themes.c:500
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "移除系統佈景主題 '%s'"
 
-#: src/prefs_themes.c:507
+#: src/prefs_themes.c:502
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "移除佈景主題 '%s'"
 
-#: src/prefs_themes.c:513
+#: src/prefs_themes.c:507
 msgid "Are you sure you want to remove this theme?"
 msgstr "你確認要移除這個佈景主題嗎?"
 
-#: src/prefs_themes.c:523
+#: src/prefs_themes.c:517
 #, c-format
 msgid ""
 "File %s failed\n"
@@ -17186,40 +17491,40 @@ msgstr ""
 " 檔案 %s 失敗\n"
 "當移除佈景主題時"
 
-#: src/prefs_themes.c:527
+#: src/prefs_themes.c:521
 msgid "Removing theme directory failed."
 msgstr "移除佈景主題路徑失敗"
 
-#: src/prefs_themes.c:530
+#: src/prefs_themes.c:524
 msgid "Theme removed successfully"
 msgstr "佈景主題移除成功"
 
-#: src/prefs_themes.c:550
+#: src/prefs_themes.c:544
 msgid "Select theme folder"
 msgstr "選擇佈景主題資料夾"
 
-#: src/prefs_themes.c:565
+#: src/prefs_themes.c:559
 #, c-format
 msgid "Install theme '%s'"
 msgstr "安裝佈景主題 '%s'"
 
-#: src/prefs_themes.c:568
+#: src/prefs_themes.c:562
 msgid ""
-"This folder doesn't seem to be a theme folder.\n"
+"This folder doesn't seem to be a themefolder.\n"
 "Install anyway?"
 msgstr ""
 "此資料夾似乎不是一個佈景主題資料夾\n"
 "仍然要安裝嗎?"
 
-#: src/prefs_themes.c:575
+#: src/prefs_themes.c:572
 msgid "Do you want to install theme for all users?"
 msgstr "你希望為所有的使用者安裝佈景主題嗎?"
 
-#: src/prefs_themes.c:595
+#: src/prefs_themes.c:592
 msgid "Theme exists"
 msgstr "佈景主題已經存在"
 
-#: src/prefs_themes.c:596
+#: src/prefs_themes.c:593
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location.\n"
@@ -17231,12 +17536,12 @@ msgstr ""
 "\n"
 "你希望覆蓋它嗎?"
 
-#: src/prefs_themes.c:602
+#: src/prefs_themes.c:600
 #, c-format
 msgid "Couldn't delete the old theme in %s."
 msgstr "無法在 %s 內刪除舊佈景主題"
 
-#: src/prefs_themes.c:610
+#: src/prefs_themes.c:609
 #, c-format
 msgid "Couldn't create destination directory %s."
 msgstr "無法建立目的路徑 %s"
@@ -17297,31 +17602,31 @@ msgstr "更多..."
 msgid "Information"
 msgstr "資訊"
 
-#: src/prefs_themes.c:997
-msgid "Author: "
+#: src/prefs_themes.c:998
+msgid "Author"
 msgstr "作者:"
 
-#: src/prefs_themes.c:1005
-msgid "URL:"
+#: src/prefs_themes.c:1006
+msgid "URL"
 msgstr "URL:"
 
-#: src/prefs_themes.c:1047
+#: src/prefs_themes.c:1048
 msgid "Preview"
 msgstr "預覽"
 
-#: src/prefs_themes.c:1103
+#: src/prefs_themes.c:1105
 msgid "SVG rendering"
 msgstr "SVG 渲染"
 
-#: src/prefs_themes.c:1110
+#: src/prefs_themes.c:1112
 msgid "Enable alpha channel"
 msgstr "啟用alpha頻道"
 
-#: src/prefs_themes.c:1111
+#: src/prefs_themes.c:1113
 msgid "Force scaling"
 msgstr "強制比例"
 
-#: src/prefs_themes.c:1117
+#: src/prefs_themes.c:1119
 msgid "Pixels per inch (PPI)"
 msgstr "每英吋的點數(PPI)"
 
@@ -17341,67 +17646,67 @@ msgstr "項目沒有定義圖示"
 msgid "Item has no text defined."
 msgstr "項目沒有定義文字"
 
-#: src/prefs_toolbar.c:929
+#: src/prefs_toolbar.c:896
 msgid "Toolbar item"
 msgstr "工具列項目"
 
-#: src/prefs_toolbar.c:945
+#: src/prefs_toolbar.c:912
 msgid "Item type"
 msgstr "項目型式"
 
-#: src/prefs_toolbar.c:955
+#: src/prefs_toolbar.c:922
 msgid "Internal Function"
 msgstr "內部功能"
 
-#: src/prefs_toolbar.c:956
+#: src/prefs_toolbar.c:923
 msgid "User Action"
 msgstr "自行動作"
 
-#: src/prefs_toolbar.c:958 src/toolbar.c:279
+#: src/prefs_toolbar.c:925 src/toolbar.c:279
 msgid "Separator"
 msgstr "間隔器"
 
-#: src/prefs_toolbar.c:965
+#: src/prefs_toolbar.c:932
 msgid "Event executed on click"
 msgstr "按下時執行事件"
 
-#: src/prefs_toolbar.c:1004
+#: src/prefs_toolbar.c:959
 msgid "Toolbar text"
 msgstr "工具列顯示字串"
 
-#: src/prefs_toolbar.c:1019 src/prefs_toolbar.c:1395
+#: src/prefs_toolbar.c:974 src/prefs_toolbar.c:1351
 msgid "Icon"
 msgstr "圖示"
 
-#: src/prefs_toolbar.c:1055
+#: src/prefs_toolbar.c:1010
 msgid "A_dd"
 msgstr "加入(_d)"
 
-#: src/prefs_toolbar.c:1275 src/prefs_toolbar.c:1289 src/prefs_toolbar.c:1303
+#: src/prefs_toolbar.c:1230 src/prefs_toolbar.c:1244 src/prefs_toolbar.c:1258
 msgid "Toolbars"
 msgstr "工具列"
 
-#: src/prefs_toolbar.c:1276
+#: src/prefs_toolbar.c:1231
 msgid "Main Window"
 msgstr "主視窗"
 
-#: src/prefs_toolbar.c:1290
+#: src/prefs_toolbar.c:1245
 msgid "Message Window"
 msgstr "郵件視窗"
 
-#: src/prefs_toolbar.c:1304
+#: src/prefs_toolbar.c:1259
 msgid "Compose Window"
 msgstr "新郵件視窗"
 
-#: src/prefs_toolbar.c:1418
+#: src/prefs_toolbar.c:1374
 msgid "Icon text"
 msgstr "圖示顯示字串"
 
-#: src/prefs_toolbar.c:1427
+#: src/prefs_toolbar.c:1383
 msgid "Mapped event"
 msgstr "對應事件"
 
-#: src/prefs_toolbar.c:1724
+#: src/prefs_toolbar.c:1690
 msgid "Toolbar item icon"
 msgstr "工具列項目圖示"
 
@@ -17429,35 +17734,35 @@ msgstr "換行字串於"
 msgid "Wrapping"
 msgstr "換行"
 
-#: src/printing.c:436
+#: src/printing.c:431
 msgid "Print preview"
 msgstr "預覽列印"
 
-#: src/printing.c:479
+#: src/printing.c:474
 msgid "First page"
 msgstr "第一頁"
 
-#: src/printing.c:489
+#: src/printing.c:484
 msgid "Last page"
 msgstr "最後一頁"
 
-#: src/printing.c:495
+#: src/printing.c:490
 msgid "Zoom 100%"
 msgstr "縮放 100%"
 
-#: src/printing.c:497
+#: src/printing.c:492
 msgid "Zoom fit"
 msgstr "縮放至滿版"
 
-#: src/printing.c:499
+#: src/printing.c:494
 msgid "Zoom in"
 msgstr "放大"
 
-#: src/printing.c:501
+#: src/printing.c:496
 msgid "Zoom out"
 msgstr "縮小"
 
-#: src/printing.c:700
+#: src/printing.c:676
 #, c-format
 msgid "Page %d"
 msgstr "第 %d 頁"
@@ -17470,53 +17775,57 @@ msgstr "無可用訊息"
 msgid "No recipient keys defined."
 msgstr "接收的金鑰尚未定義"
 
-#: src/procmime.c:433 src/procmime.c:435 src/procmime.c:436
+#: src/procmime.c:402 src/procmime.c:404 src/procmime.c:405
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64編碼錯誤]\n"
 
-#: src/procmsg.c:937 src/procmsg.c:940
+#: src/procmime.c:2755
+msgid "Could not decode part"
+msgstr "無法解析部份的訊息"
+
+#: src/procmsg.c:936 src/procmsg.c:939
 msgid "Already trying to send."
 msgstr "已嘗試傳送"
 
-#: src/procmsg.c:1558 src/procmsg.c:1619
+#: src/procmsg.c:1563 src/procmsg.c:1624
 #, c-format
 msgid "Couldn't open file %s."
 msgstr "無法開啟檔案 %s"
 
-#: src/procmsg.c:1629
+#: src/procmsg.c:1634
 msgid "Queued message header is broken."
 msgstr "暫存的郵件標頭已損毀"
 
-#: src/procmsg.c:1649
+#: src/procmsg.c:1654
 msgid "An error happened during SMTP session."
 msgstr "SMTP傳送過程中發生錯誤"
 
-#: src/procmsg.c:1663
+#: src/procmsg.c:1668
 msgid ""
 "No specific account has been found to send, and an error happened during "
 "SMTP session."
 msgstr "找不到已指定的帳號進行郵件傳送,而且在 SMTP 通信時 發生錯誤"
 
-#: src/procmsg.c:1671
+#: src/procmsg.c:1676
 msgid ""
 "Couldn't determine sending information. Maybe the email hasn't been "
 "generated by Claws Mail."
 msgstr "無法偵測傳送的資訊,可能是因為Claws Mail無法產生郵件 "
 
-#: src/procmsg.c:1694
+#: src/procmsg.c:1699
 msgid "Couldn't create temporary file for news sending."
 msgstr "無法為新傳送郵件建立暫存檔案"
 
-#: src/procmsg.c:1707
+#: src/procmsg.c:1712
 msgid "Error when writing temporary file for news sending."
 msgstr "為新傳送郵件建立暫存檔案時發生錯誤"
 
-#: src/procmsg.c:1721
+#: src/procmsg.c:1726
 #, c-format
 msgid "Error occurred while posting the message to %s."
 msgstr "當發出郵件至 %s 時,發生錯誤"
 
-#: src/procmsg.c:2273
+#: src/procmsg.c:2286
 msgid "Filtering messages...\n"
 msgstr "過濾郵件...\n"
 
@@ -17789,10 +18098,6 @@ msgstr "轉寄郵件時使用樣版"
 msgid "Override From header. This doesn't change the account used to forward."
 msgstr "覆寫寄件者標頭。這個動作不會改變使用的轉寄帳號"
 
-#: src/quote_fmt.c:539
-msgid "Defaults"
-msgstr "預設值"
-
 #: src/quote_fmt.c:557
 msgid ""
 "The \"From\" field of the \"New message\" template contains an invalid email "
@@ -17811,97 +18116,97 @@ msgstr "此 \"回覆\" 樣版的 \"引言標示\" 欄位是無效的"
 msgid "The \"Quotation mark\" field of the \"Forward\" template is invalid."
 msgstr "此 \"轉寄\" 樣版的 \"引言標示\" 欄位是無效的"
 
-#: src/quote_fmt_parse.y:541
+#: src/quote_fmt_parse.y:544
 #, c-format
 msgid "Enter text to replace '%s'"
 msgstr "輸入文字以覆蓋 '%s'"
 
-#: src/quote_fmt_parse.y:542
+#: src/quote_fmt_parse.y:545
 msgid "Enter variable"
 msgstr "輸入變數"
 
-#: src/send_message.c:152
+#: src/send_message.c:154
 #, c-format
 msgid "Sending message using command: %s\n"
 msgstr "使用此命令傳送郵件: %s\n"
 
-#: src/send_message.c:166
+#: src/send_message.c:168
 #, c-format
 msgid "Couldn't execute command: %s"
 msgstr "不能執行此命令: %s"
 
-#: src/send_message.c:202
+#: src/send_message.c:204
 #, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "當執行此命令時發生錯誤: %s"
 
-#: src/send_message.c:350
+#: src/send_message.c:353
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/send_message.c:355
+#: src/send_message.c:358
 msgid "Doing POP before SMTP..."
 msgstr "在SMTP之前執行POP..."
 
-#: src/send_message.c:358
+#: src/send_message.c:361
 msgid "POP before SMTP"
 msgstr "在SMTP之前POP"
 
-#: src/send_message.c:363
+#: src/send_message.c:366
 #, c-format
 msgid "Account '%s': Connecting to SMTP server: %s:%d..."
 msgstr "帳號'%s':連線到SMTP伺服器: %s:%d..."
 
-#: src/send_message.c:420
+#: src/send_message.c:439
 msgid "Mail sent successfully."
 msgstr "郵件傳送成功"
 
-#: src/send_message.c:486
+#: src/send_message.c:505
 msgid "Sending HELO..."
 msgstr "傳送 HELO..."
 
-#: src/send_message.c:487 src/send_message.c:492 src/send_message.c:497
+#: src/send_message.c:506 src/send_message.c:511 src/send_message.c:516
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/send_message.c:488 src/send_message.c:493
+#: src/send_message.c:507 src/send_message.c:512
 msgid "Sending message..."
 msgstr "傳送郵件..."
 
-#: src/send_message.c:491
+#: src/send_message.c:510
 msgid "Sending EHLO..."
 msgstr "傳送 HELO..."
 
-#: src/send_message.c:500
+#: src/send_message.c:519
 msgid "Sending MAIL FROM..."
 msgstr "傳送郵件來自..."
 
-#: src/send_message.c:504
+#: src/send_message.c:523
 msgid "Sending RCPT TO..."
 msgstr "傳送 RCPT 到..."
 
-#: src/send_message.c:509
+#: src/send_message.c:528
 msgid "Sending DATA..."
 msgstr "傳送 DATA..."
 
-#: src/send_message.c:513
+#: src/send_message.c:532
 msgid "Quitting..."
 msgstr "離開..."
 
-#: src/send_message.c:542
+#: src/send_message.c:561
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "傳送郵件 (%d / %d 位元)"
 
-#: src/send_message.c:595
+#: src/send_message.c:614
 msgid "Sending message"
 msgstr "傳送郵件"
 
-#: src/send_message.c:664 src/send_message.c:684
+#: src/send_message.c:683 src/send_message.c:703
 msgid "Error occurred while sending the message."
 msgstr "在傳送郵件時發生錯誤"
 
-#: src/send_message.c:667
+#: src/send_message.c:686
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -17926,344 +18231,365 @@ msgstr ""
 "你可以使用現有的\n"
 "如果你不確定,選擇確定鍵"
 
-#: src/sourcewindow.c:64
+#: src/sourcewindow.c:65
 msgid "Source of the message"
 msgstr "郵件的來源"
 
-#: src/sourcewindow.c:159
+#: src/sourcewindow.c:161
 #, c-format
 msgid "%s - Source"
 msgstr "%s - 來源"
 
-#: src/ssl_manager.c:156
+#: src/ssl_manager.c:131
+msgid "Expiry"
+msgstr "屆滿"
+
+#: src/ssl_manager.c:195
 msgid "Saved SSL/TLS certificates"
 msgstr "儲存 SSL/TLS 認證"
 
-#: src/ssl_manager.c:410
+#: src/ssl_manager.c:445
 msgid "Delete certificate"
 msgstr "刪除認證"
 
-#: src/ssl_manager.c:411
+#: src/ssl_manager.c:446
 msgid "Do you really want to delete this certificate?"
 msgstr "你確定要刪除這個認證嗎?"
 
-#: src/summary_search.c:305
+#: src/summary_search.c:290
 msgid "Search messages"
 msgstr "搜尋郵件"
 
-#: src/summary_search.c:327
+#: src/summary_search.c:313
 msgid "Match any of the following"
 msgstr "符合下列任何一個"
 
-#: src/summary_search.c:329
+#: src/summary_search.c:315
 msgid "Match all of the following"
 msgstr "符合下列所有的"
 
-#: src/summary_search.c:495
+#: src/summary_search.c:436
 msgid "Body:"
 msgstr "內容:"
 
-#: src/summary_search.c:502
+#: src/summary_search.c:443
 msgid "Condition:"
 msgstr "條件:"
 
-#: src/summary_search.c:536
+#: src/summary_search.c:477
 msgid "Find _all"
 msgstr "尋找全部(_a)"
 
-#: src/summary_search.c:751 src/summaryview.c:1090 src/summaryview.c:1352
+#: src/summary_search.c:692 src/summaryview.c:1148 src/summaryview.c:1411
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "在%s內搜尋...\n"
 
-#: src/summary_search.c:846
+#: src/summary_search.c:787
 msgid "Beginning of list reached; continue from end?"
 msgstr "已到達清單的開頭,從結尾繼續嗎?"
 
-#: src/summary_search.c:848
+#: src/summary_search.c:789
 msgid "End of list reached; continue from beginning?"
 msgstr "已到達清單的結尾,從開頭繼續嗎?"
 
-#: src/summaryview.c:432
+#: src/summaryview.c:430
+msgid "Re-edit"
+msgstr "重新編輯(_e)"
+
+#: src/summaryview.c:443
 msgid "Create _filter rule"
 msgstr "建立過濾規則(_f)"
 
-#: src/summaryview.c:560
+#: src/summaryview.c:456
+msgid "_Set displayed columns"
+msgstr "設定顯示行數(_S)"
+
+#: src/summaryview.c:461
+msgid "_Lock column headers"
+msgstr "鎖定標頭列(_L)"
+
+#: src/summaryview.c:598
 msgid "Toggle quick search bar"
 msgstr "釘住快速搜尋列"
 
-#: src/summaryview.c:597
+#: src/summaryview.c:635
 msgid "Toggle multiple selection"
 msgstr "釘住多重選擇"
 
-#: src/summaryview.c:1280
+#: src/summaryview.c:1339
 msgid "Process mark"
 msgstr "進行標示"
 
-#: src/summaryview.c:1281
+#: src/summaryview.c:1340
 msgid "Some marks are left. Process them?"
 msgstr "有一些標示已留下,要進行嗎?"
 
-#: src/summaryview.c:1331
+#: src/summaryview.c:1390
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾 (%s)..."
 
-#: src/summaryview.c:1883 src/summaryview.c:1931
+#: src/summaryview.c:1950 src/summaryview.c:1998
 msgid "No more unread messages"
 msgstr "沒有更多的未讀郵件"
 
-#: src/summaryview.c:1884
+#: src/summaryview.c:1951
 msgid "No unread message found. Search from the end?"
 msgstr "找不到未讀郵件,從結尾開始搜尋嗎?"
 
-#: src/summaryview.c:1896 src/summaryview.c:1944 src/summaryview.c:1981
-#: src/summaryview.c:2029 src/summaryview.c:2096
+#: src/summaryview.c:1963 src/summaryview.c:2011 src/summaryview.c:2048
+#: src/summaryview.c:2096 src/summaryview.c:2163
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "內部錯誤:無法預期的 prefs_common.next_unread_msg_dialog 數值\n"
 
-#: src/summaryview.c:1908
+#: src/summaryview.c:1975
 msgid "No unread messages."
 msgstr "沒有未讀郵件"
 
-#: src/summaryview.c:1932
+#: src/summaryview.c:1999
 msgid "No unread message found. Go to next folder?"
 msgstr "找不到未讀的郵件,到下一個資料夾嗎?"
 
-#: src/summaryview.c:1968 src/summaryview.c:2016
+#: src/summaryview.c:2035 src/summaryview.c:2083
 msgid "No more new messages"
 msgstr "沒有新郵件"
 
-#: src/summaryview.c:1969
+#: src/summaryview.c:2036
 msgid "No new message found. Search from the end?"
 msgstr "找不到新郵件,從結尾開始搜尋嗎?"
 
-#: src/summaryview.c:1993
+#: src/summaryview.c:2060
 msgid "No new messages."
 msgstr "沒有新郵件"
 
-#: src/summaryview.c:2017
+#: src/summaryview.c:2084
 msgid "No new message found. Go to next folder?"
 msgstr "找不到新郵件,到下一個資料夾嗎?"
 
-#: src/summaryview.c:2050 src/summaryview.c:2083
+#: src/summaryview.c:2117 src/summaryview.c:2150
 msgid "No more marked messages"
 msgstr "沒有更多已標示的郵件"
 
-#: src/summaryview.c:2051
+#: src/summaryview.c:2118
 msgid "No marked message found. Search from the end?"
 msgstr "找不到已標示郵件,從結尾再次搜尋?"
 
-#: src/summaryview.c:2060
+#: src/summaryview.c:2127
 msgid "No marked messages."
 msgstr "沒有已標示的郵件"
 
-#: src/summaryview.c:2084
+#: src/summaryview.c:2151
 msgid "No marked message found. Go to next folder?"
 msgstr "找不到已標示的郵件,到下一次資料夾嗎?"
 
-#: src/summaryview.c:2117 src/summaryview.c:2146
+#: src/summaryview.c:2184 src/summaryview.c:2213
 msgid "No more labeled messages"
 msgstr "沒有已貼標籤的郵件"
 
-#: src/summaryview.c:2118
+#: src/summaryview.c:2185
 msgid "No labeled message found. Search from the end?"
 msgstr "找不到已貼標籤的郵件,到下一次資料夾嗎?"
 
-#: src/summaryview.c:2127 src/summaryview.c:2160
+#: src/summaryview.c:2194 src/summaryview.c:2227
 msgid "No labeled messages."
 msgstr "沒有已貼標籤的郵件"
 
-#: src/summaryview.c:2147
+#: src/summaryview.c:2214
 msgid "No labeled message found. Search from the beginning?"
 msgstr "找不到已貼標籤的郵件,從開頭繼重新搜尋嗎?"
 
-#: src/summaryview.c:2464
+#: src/summaryview.c:2537
 msgid "Attracting messages by subject..."
 msgstr "從主旨取出郵件..."
 
-#: src/summaryview.c:2649
+#: src/summaryview.c:2722
 #, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:2653
+#: src/summaryview.c:2726
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:2654 src/summaryview.c:2661
+#: src/summaryview.c:2727 src/summaryview.c:2734
 msgid ", "
 msgstr ",  "
 
-#: src/summaryview.c:2659
+#: src/summaryview.c:2732
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:2673
+#: src/summaryview.c:2746
 msgid " item selected"
 msgid_plural " items selected"
 msgstr[0] "項目已選擇"
 msgstr[1] "項目已選擇"
 
-#: src/summaryview.c:2691 src/summaryview.c:2734
+#: src/summaryview.c:2764 src/summaryview.c:2809
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 新郵件, %d 未讀, %d 全部 (%s)"
 
-#: src/summaryview.c:2709
+#: src/summaryview.c:2784
 msgid "Message summary"
 msgstr "郵件摘要"
 
-#: src/summaryview.c:2710
+#: src/summaryview.c:2785
 msgid "New:"
 msgstr "新郵件:"
 
-#: src/summaryview.c:2711
+#: src/summaryview.c:2786
 msgid "Unread:"
 msgstr "未讀郵件:"
 
-#: src/summaryview.c:2712
+#: src/summaryview.c:2787
 msgid "Total:"
 msgstr "全部郵件:"
 
-#: src/summaryview.c:2714
+#: src/summaryview.c:2789
 msgid "Marked:"
 msgstr "已標示:"
 
-#: src/summaryview.c:2715
+#: src/summaryview.c:2790
 msgid "Replied:"
 msgstr "已回覆:"
 
-#: src/summaryview.c:2716
+#: src/summaryview.c:2791
 msgid "Forwarded:"
 msgstr "已轉寄:"
 
-#: src/summaryview.c:2717
+#: src/summaryview.c:2792
 msgid "Locked:"
 msgstr "已鎖定:"
 
-#: src/summaryview.c:2718
+#: src/summaryview.c:2793
 msgid "Ignored:"
 msgstr "忽略:"
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2794
 msgid "Watched:"
 msgstr "已監看:"
 
-#: src/summaryview.c:2729
+#: src/summaryview.c:2804
 #, c-format
 msgid "%d/%d selected (%s/%s), %d unread"
 msgstr "%d/%d 已選擇 (%s/%s), %d 未讀"
 
-#: src/summaryview.c:3022
+#: src/summaryview.c:3097
 msgid "Sorting summary..."
 msgstr "摘要排序..."
 
-#: src/summaryview.c:3190
+#: src/summaryview.c:3265
 msgid "Setting summary from message data..."
 msgstr "從郵件資料設定摘要..."
 
-#: src/summaryview.c:3395
+#: src/summaryview.c:3471
 msgid "(No Date)"
 msgstr "(無資料)"
 
-#: src/summaryview.c:3447
+#: src/summaryview.c:3528
 msgid "(No Recipient)"
 msgstr "(無收信者)"
 
-#: src/summaryview.c:3482
+#: src/summaryview.c:3576
 #, c-format
 msgid "From: %s, on %s"
 msgstr "寄件者: %s,  以 %s"
 
-#: src/summaryview.c:3491
+#: src/summaryview.c:3585
 #, c-format
 msgid "To: %s, on %s"
 msgstr "收件者: %s, 以 %s"
 
-#: src/summaryview.c:4356
-msgid "You're not the author of the article.\n"
-msgstr "你不是文章的作者\n"
+#: src/summaryview.c:4481
+msgid "You're not the author of the article."
+msgstr "你不是文章的作者"
 
-#: src/summaryview.c:4446
+#: src/summaryview.c:4571
 #, c-format
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the %d selected messages?"
 msgstr[0] "你確定要刪除 %d 封選擇的郵件嗎?"
 msgstr[1] "你確定要刪除 %d 封選擇的郵件嗎?"
 
-#: src/summaryview.c:4449
+#: src/summaryview.c:4574
 msgid "Delete message"
 msgid_plural "Delete messages"
 msgstr[0] "刪除郵件"
 msgstr[1] "刪除郵件"
 
-#: src/summaryview.c:4613
+#: src/summaryview.c:4738
 msgid "Destination is same as current folder."
 msgstr "目的資料夾和目前的相同"
 
-#: src/summaryview.c:4668
+#: src/summaryview.c:4793
 msgid "Select folder to move selected message to"
 msgid_plural "Select folder to move selected messages to"
 msgstr[0] "選擇路徑將選定的郵件移至該位置"
 msgstr[1] "選擇路徑將選定的郵件移至該位置"
 
-#: src/summaryview.c:4719
+#: src/summaryview.c:4844
 msgid "Destination to copy is same as current folder."
 msgstr "要複製的目的資料夾和目前的相同"
 
-#: src/summaryview.c:4753
+#: src/summaryview.c:4878
 msgid "Select folder to copy selected message to"
 msgid_plural "Select folder to copy selected messages to"
 msgstr[0] "選擇路徑,將所有選定複製到該位置"
 msgstr[1] "選擇路徑,將所有選定複製到該位置"
 
-#: src/summaryview.c:4889
+#: src/summaryview.c:5036
 msgid "Append or Overwrite"
 msgstr "擴展或覆寫"
 
-#: src/summaryview.c:4890
+#: src/summaryview.c:5037
 msgid "Append or overwrite existing file?"
 msgstr "擴展或覆寫已存在的檔案?"
 
-#: src/summaryview.c:4891
+#: src/summaryview.c:5038
 msgid "_Append"
 msgstr "擴展(_A)"
 
-#: src/summaryview.c:4891
+#: src/summaryview.c:5038
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-#: src/summaryview.c:4932
+#: src/summaryview.c:5049 src/summaryview.c:5052 src/summaryview.c:5067
+#, c-format
+msgid "Couldn't save the file '%s'."
+msgstr "無法儲存檔案 '%s'"
+
+#: src/summaryview.c:5086
 #, c-format
 msgid ""
 "You are about to print %d messages, one by one. Do you want to continue?"
 msgstr "你想要列印%d封件,一封一封的印,你確定要繼續嗎?"
 
-#: src/summaryview.c:5390
+#: src/summaryview.c:5544
 msgid "Building threads..."
 msgstr "建立串列..."
 
-#: src/summaryview.c:5638
+#: src/summaryview.c:5792
 msgid "Skip these rules"
 msgstr "略過這些規則"
 
-#: src/summaryview.c:5641
+#: src/summaryview.c:5795
 msgid "Apply these rules regardless of the account they belong to"
 msgstr "不管帳號是屬於誰的,全部套用這些規則"
 
-#: src/summaryview.c:5644
+#: src/summaryview.c:5798
 msgid "Apply these rules if they apply to the current account"
 msgstr "如果這些規則已經套用在目前的帳號,就套用吧!"
 
-#: src/summaryview.c:5673
+#: src/summaryview.c:5827
 msgid "Filtering"
 msgstr "過濾"
 
-#: src/summaryview.c:5674
+#: src/summaryview.c:5828
 msgid ""
 "There are some filtering rules that belong to an account.\n"
 "Please choose what to do with these rules:"
@@ -18271,55 +18597,71 @@ msgstr ""
 "有一些過濾規則屬於一個特定帳號\n"
 "請選擇要使用這些規則做什麼:"
 
-#: src/summaryview.c:5704
+#: src/summaryview.c:5860
 msgid "Filtering..."
 msgstr "過濾..."
 
-#: src/summaryview.c:5783
+#: src/summaryview.c:5943
 msgid "Processing configuration"
 msgstr "處理配置"
 
-#: src/summaryview.c:6329
+#: src/summaryview.c:6091
+msgid "Do you really want to reset the color label of all selected messages?"
+msgstr "你確定要重置所有已選擇郵件的顏色標籤嗎?"
+
+#: src/summaryview.c:6093
+msgid "Do you really want to apply this color label to all selected messages?"
+msgstr "你確定要將顏色標籤套用到所有已選擇的郵件上嗎?"
+
+#: src/summaryview.c:6094
+msgid "Reset color label"
+msgstr "重置顏色標籤"
+
+#: src/summaryview.c:6094
+msgid "Set color label"
+msgstr "設定顏色標籤"
+
+#: src/summaryview.c:6537
 msgid "Ignored thread"
 msgstr "忽略串列"
 
-#: src/summaryview.c:6331
+#: src/summaryview.c:6539
 msgid "Watched thread"
 msgstr "關注串列"
 
-#: src/summaryview.c:6339
+#: src/summaryview.c:6547
 msgid "Replied but also forwarded - click to see reply"
 msgstr "已回覆但是也轉發了 - 點選以檢視回覆"
 
-#: src/summaryview.c:6341
+#: src/summaryview.c:6549
 msgid "Replied - click to see reply"
 msgstr "已回覆 - 點選以檢視回覆"
 
-#: src/summaryview.c:6353
+#: src/summaryview.c:6561
 msgid "To be moved"
 msgstr "將被移動"
 
-#: src/summaryview.c:6355
+#: src/summaryview.c:6563
 msgid "To be copied"
 msgstr "將被複製"
 
-#: src/summaryview.c:6367
+#: src/summaryview.c:6575
 msgid "Signed, has attachment(s)"
 msgstr "已簽名,有附件"
 
-#: src/summaryview.c:6371
+#: src/summaryview.c:6579
 msgid "Encrypted, has attachment(s)"
 msgstr "已加密,有附件"
 
-#: src/summaryview.c:6373
+#: src/summaryview.c:6581
 msgid "Encrypted"
 msgstr "已加密"
 
-#: src/summaryview.c:6375
+#: src/summaryview.c:6583
 msgid "Has attachment(s)"
 msgstr "有附件"
 
-#: src/summaryview.c:8046
+#: src/summaryview.c:8295
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -18328,53 +18670,45 @@ msgstr ""
 "正規表示式 (regexp) 發生錯誤:\n"
 "%s"
 
-#: src/summaryview.c:8149
+#: src/summaryview.c:8398
 msgid "Go back to the folder list (You have unread messages)"
 msgstr "回到資料夾清單 (你有未讀郵件)"
 
-#: src/summaryview.c:8154
+#: src/summaryview.c:8403
 msgid "Go back to the folder list"
 msgstr "回到資料夾清單"
 
-#: src/textview.c:245
+#: src/textview.c:242
 msgid "_Open in web browser"
 msgstr "在瀏覽器中開啟(_O)"
 
-#: src/textview.c:246
+#: src/textview.c:243
 msgid "Copy this _link"
 msgstr "複製此連結(_l)"
 
-#: src/textview.c:253
+#: src/textview.c:250
 msgid "_Reply to this address"
 msgstr "回覆至此地址(_R)"
 
-#: src/textview.c:254
+#: src/textview.c:251
 msgid "Add to _Address book"
 msgstr "新增至通訊錄(_A)"
 
-#: src/textview.c:255
+#: src/textview.c:252
 msgid "Copy this add_ress"
 msgstr "複製這個地址(_r)"
 
-#: src/textview.c:261
-msgid "_Open image"
-msgstr "開啟影像檔(_O)"
-
-#: src/textview.c:262
-msgid "_Save image..."
-msgstr "儲存影像檔(_S)..."
-
-#: src/textview.c:724
+#: src/textview.c:702
 #, c-format
 msgid "[%s  %s (%d bytes)]"
 msgstr "[%s  %s (%d 位元)]"
 
-#: src/textview.c:727
+#: src/textview.c:705
 #, c-format
 msgid "[%s (%d bytes)]"
 msgstr "[%s (%d 位元)]"
 
-#: src/textview.c:917
+#: src/textview.c:875
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -18388,68 +18722,67 @@ msgstr ""
 "\n"
 "  使用 "
 
-#: src/textview.c:922
+#: src/textview.c:880
 msgid "'Network Log'"
 msgstr "'網路日誌'"
 
-#: src/textview.c:923
+#: src/textview.c:881
 msgid " in the Tools menu for more information."
 msgstr " 在工具箱中以取得更多資訊"
 
-#: src/textview.c:986
+#: src/textview.c:947
 msgid "  The following can be performed on this part\n"
 msgstr "  以下這些可以在這個部份被執行\n"
 
-#: src/textview.c:988
+#: src/textview.c:949
 msgid "  by right-clicking the icon or list item:"
 msgstr "  在圖示或清單項目上按下右鍵"
 
-#: src/textview.c:992
+#: src/textview.c:953
 msgid "     - To save, select "
 msgstr "     - 儲存,選擇"
 
-#: src/textview.c:993
+#: src/textview.c:954
 msgid "'Save as...'"
 msgstr "'另存新檔...'"
 
-#: src/textview.c:995 src/textview.c:1007 src/textview.c:1019
-#: src/textview.c:1029
+#: src/textview.c:956 src/textview.c:968 src/textview.c:980 src/textview.c:990
 msgid " (Shortcut key: '"
 msgstr " (快捷鍵: '"
 
-#: src/textview.c:1003
+#: src/textview.c:964
 msgid "     - To display as text, select "
 msgstr "     - 以文字模式檢視,選擇 "
 
-#: src/textview.c:1004
+#: src/textview.c:965
 msgid "'Display as text'"
 msgstr "'以文字模式檢視'"
 
-#: src/textview.c:1015
+#: src/textview.c:976
 msgid "     - To open with an external program, select "
 msgstr "     - 以外部程式開啟,選擇 "
 
-#: src/textview.c:1016
+#: src/textview.c:977
 msgid "'Open'"
 msgstr "'開啟'"
 
-#: src/textview.c:1024
+#: src/textview.c:985
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (間隔地雙擊或按下中鍵 "
 
-#: src/textview.c:1025
+#: src/textview.c:986
 msgid "mouse button)\n"
 msgstr "滑鼠鍵)\n"
 
-#: src/textview.c:1027
+#: src/textview.c:988
 msgid "     - Or use "
 msgstr "     - 或是使用 "
 
-#: src/textview.c:1028
+#: src/textview.c:989
 msgid "'Open with...'"
 msgstr "以...開啟"
 
-#: src/textview.c:1147
+#: src/textview.c:1111
 #, c-format
 msgid ""
 "The command to view attachment as text failed:\n"
@@ -18460,7 +18793,7 @@ msgstr ""
 "    %s\n"
 "離開碼 %d\n"
 
-#: src/textview.c:2206
+#: src/textview.c:2195
 msgid "Tags: "
 msgstr "標籤:"
 
@@ -18488,19 +18821,19 @@ msgstr "嘗試釣魚的警告"
 msgid "_Open URL"
 msgstr "開啟URL(_O)"
 
-#: src/toolbar.c:224 src/toolbar.c:2291
+#: src/toolbar.c:224 src/toolbar.c:2294
 msgid "Receive Mail from all Accounts"
 msgstr "從所有的帳號接收郵件"
 
-#: src/toolbar.c:225 src/toolbar.c:2296
+#: src/toolbar.c:225 src/toolbar.c:2299
 msgid "Receive Mail from current Account"
 msgstr "從目前的帳號接收郵件"
 
-#: src/toolbar.c:226 src/toolbar.c:2300
+#: src/toolbar.c:226 src/toolbar.c:2303
 msgid "Send Queued Messages"
 msgstr "傳送暫存郵件"
 
-#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2318 src/toolbar.c:2329
+#: src/toolbar.c:227 src/toolbar.c:959 src/toolbar.c:2321 src/toolbar.c:2332
 msgid "Compose Email"
 msgstr "新郵件"
 
@@ -18508,35 +18841,35 @@ msgstr "新郵件"
 msgid "Compose News"
 msgstr "新新聞"
 
-#: src/toolbar.c:229 src/toolbar.c:2373 src/toolbar.c:2383
+#: src/toolbar.c:229 src/toolbar.c:2376 src/toolbar.c:2386
 msgid "Reply to Message"
 msgstr "回覆郵件"
 
-#: src/toolbar.c:230 src/toolbar.c:2390 src/toolbar.c:2400
+#: src/toolbar.c:230 src/toolbar.c:2393 src/toolbar.c:2403
 msgid "Reply to Sender"
 msgstr "回覆寄件者"
 
-#: src/toolbar.c:231 src/toolbar.c:2407 src/toolbar.c:2417
+#: src/toolbar.c:231 src/toolbar.c:2410 src/toolbar.c:2420
 msgid "Reply to All"
 msgstr "回覆全部"
 
-#: src/toolbar.c:232 src/toolbar.c:2424 src/toolbar.c:2434
+#: src/toolbar.c:232 src/toolbar.c:2427 src/toolbar.c:2437
 msgid "Reply to Mailing-list"
 msgstr "回覆至郵件清單"
 
-#: src/toolbar.c:233 src/toolbar.c:2312
+#: src/toolbar.c:233 src/toolbar.c:2315
 msgid "Open email"
 msgstr "開啟郵件"
 
-#: src/toolbar.c:234 src/toolbar.c:2441 src/toolbar.c:2452
+#: src/toolbar.c:234 src/toolbar.c:2444 src/toolbar.c:2455
 msgid "Forward Message"
 msgstr "轉寄"
 
-#: src/toolbar.c:235 src/toolbar.c:2457
+#: src/toolbar.c:235 src/toolbar.c:2460
 msgid "Trash Message"
 msgstr "垃圾郵件"
 
-#: src/toolbar.c:236 src/toolbar.c:2461
+#: src/toolbar.c:236 src/toolbar.c:2464
 msgid "Delete Message"
 msgstr "刪除郵件"
 
@@ -18544,11 +18877,11 @@ msgstr "刪除郵件"
 msgid "Delete duplicate messages"
 msgstr "刪除重覆的郵件"
 
-#: src/toolbar.c:239 src/toolbar.c:2469
+#: src/toolbar.c:239 src/toolbar.c:2472
 msgid "Go to Previous Unread Message"
 msgstr "移動至上一個未讀郵件"
 
-#: src/toolbar.c:240 src/toolbar.c:2473
+#: src/toolbar.c:240 src/toolbar.c:2476
 msgid "Go to Next Unread Message"
 msgstr "移動至下一個未讀郵件"
 
@@ -18596,55 +18929,55 @@ msgstr "學習垃圾郵件或非垃圾郵件"
 msgid "Open folder/Go to folder list"
 msgstr "開啟資料夾/前往資料夾清單"
 
-#: src/toolbar.c:258 src/toolbar.c:2479
+#: src/toolbar.c:258 src/toolbar.c:2482
 msgid "Send Message"
 msgstr "傳送郵件"
 
-#: src/toolbar.c:259 src/toolbar.c:2483
+#: src/toolbar.c:259 src/toolbar.c:2486
 msgid "Put into queue folder and send later"
 msgstr "移至暫存郵件夾並稍後傳送"
 
-#: src/toolbar.c:260 src/toolbar.c:2487
+#: src/toolbar.c:260 src/toolbar.c:2490
 msgid "Save to draft folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/toolbar.c:261 src/toolbar.c:2491
+#: src/toolbar.c:261 src/toolbar.c:2494
 msgid "Insert file"
 msgstr "插入檔案"
 
-#: src/toolbar.c:262 src/toolbar.c:2495
+#: src/toolbar.c:262 src/toolbar.c:2498
 msgid "Attach file"
 msgstr "附加檔案"
 
-#: src/toolbar.c:263 src/toolbar.c:2499
+#: src/toolbar.c:263 src/toolbar.c:2502
 msgid "Insert signature"
 msgstr "插入簽名"
 
-#: src/toolbar.c:264 src/toolbar.c:2503
+#: src/toolbar.c:264 src/toolbar.c:2506
 msgid "Replace signature"
 msgstr "覆蓋簽名"
 
-#: src/toolbar.c:265 src/toolbar.c:2507
+#: src/toolbar.c:265 src/toolbar.c:2510
 msgid "Edit with external editor"
 msgstr "用外部編輯器進行編輯"
 
-#: src/toolbar.c:266 src/toolbar.c:2511
+#: src/toolbar.c:266 src/toolbar.c:2514
 msgid "Wrap long lines of current paragraph"
 msgstr "將目前段落內的過長內容換行"
 
-#: src/toolbar.c:267 src/toolbar.c:2515
+#: src/toolbar.c:267 src/toolbar.c:2518
 msgid "Wrap all long lines"
 msgstr "所有過長內容換行"
 
-#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2524
+#: src/toolbar.c:270 src/toolbar.c:531 src/toolbar.c:2527
 msgid "Check spelling"
 msgstr "檢查拼字"
 
-#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2529
+#: src/toolbar.c:272 src/toolbar.c:533 src/toolbar.c:2532
 msgid "Sign"
 msgstr "簽核者"
 
-#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2537
+#: src/toolbar.c:273 src/toolbar.c:534 src/toolbar.c:2540
 msgid "Encrypt"
 msgstr "加密"
 
@@ -18652,15 +18985,15 @@ msgstr "加密"
 msgid "Claws Mail Actions Feature"
 msgstr "Claws Mail Actions 功能"
 
-#: src/toolbar.c:275 src/toolbar.c:2556
+#: src/toolbar.c:275 src/toolbar.c:2559
 msgid "Cancel receiving"
 msgstr "終止收信"
 
-#: src/toolbar.c:277 src/toolbar.c:2564
+#: src/toolbar.c:277 src/toolbar.c:2567
 msgid "Cancel receiving/sending"
 msgstr "終止收信/寄信"
 
-#: src/toolbar.c:278 src/toolbar.c:2304
+#: src/toolbar.c:278 src/toolbar.c:2307
 msgid "Close window"
 msgstr "關閉視窗"
 
@@ -18699,7 +19032,7 @@ msgstr "回覆所有"
 msgid "List"
 msgstr "清單"
 
-#: src/toolbar.c:498 src/toolbar.c:2357 src/toolbar.c:2366
+#: src/toolbar.c:498 src/toolbar.c:2360 src/toolbar.c:2369
 msgid "Delete duplicates"
 msgstr "刪除重覆的郵件"
 
@@ -18791,101 +19124,101 @@ msgstr "郵件將加密"
 msgid "Message will not be encrypted"
 msgstr "郵件將不加密"
 
-#: src/toolbar.c:2286
+#: src/toolbar.c:2289
 msgid "Go to folder list"
 msgstr "前往資料夾清單"
 
-#: src/toolbar.c:2292
+#: src/toolbar.c:2295
 msgid "Receive Mail from selected Account"
 msgstr "從選擇的帳號收信"
 
-#: src/toolbar.c:2308
+#: src/toolbar.c:2311
 msgid "Open preferences"
 msgstr "開啟選項"
 
-#: src/toolbar.c:2319
+#: src/toolbar.c:2322
 msgid "Compose with selected Account"
 msgstr "從選擇的帳號開新郵件"
 
-#: src/toolbar.c:2340
+#: src/toolbar.c:2343
 msgid "Learn as..."
 msgstr "學習自..."
 
-#: src/toolbar.c:2350
+#: src/toolbar.c:2353
 msgid "Learn as _Spam"
 msgstr "從垃圾郵件學習"
 
-#: src/toolbar.c:2351
+#: src/toolbar.c:2354
 msgid "Learn as _Ham"
 msgstr "從非垃圾郵件學習"
 
-#: src/toolbar.c:2358
+#: src/toolbar.c:2361
 msgid "Delete duplicates options"
 msgstr "刪除重覆的選項"
 
-#: src/toolbar.c:2362
+#: src/toolbar.c:2365
 msgid "Delete duplicates in selected folder"
 msgstr "在選擇的資料夾內刪除重複的郵件"
 
-#: src/toolbar.c:2363
+#: src/toolbar.c:2366
 msgid "Delete duplicates in all folders"
 msgstr "在所有的資料夾內刪除重複的郵件"
 
-#: src/toolbar.c:2374
+#: src/toolbar.c:2377
 msgid "Reply to Message options"
 msgstr "「回覆的郵件的選項"
 
-#: src/toolbar.c:2378 src/toolbar.c:2395 src/toolbar.c:2412 src/toolbar.c:2429
+#: src/toolbar.c:2381 src/toolbar.c:2398 src/toolbar.c:2415 src/toolbar.c:2432
 msgid "_Reply with quote"
 msgstr "回覆包含引言"
 
-#: src/toolbar.c:2379 src/toolbar.c:2396 src/toolbar.c:2413 src/toolbar.c:2430
+#: src/toolbar.c:2382 src/toolbar.c:2399 src/toolbar.c:2416 src/toolbar.c:2433
 msgid "Reply without _quote"
 msgstr "回覆不包含引言"
 
-#: src/toolbar.c:2391
+#: src/toolbar.c:2394
 msgid "Reply to Sender options"
 msgstr "回覆至寄件者的選項"
 
-#: src/toolbar.c:2408
+#: src/toolbar.c:2411
 msgid "Reply to All options"
 msgstr "回覆至所有的選項"
 
-#: src/toolbar.c:2425
+#: src/toolbar.c:2428
 msgid "Reply to Mailing-list options"
 msgstr "回覆至郵件清單的選項"
 
-#: src/toolbar.c:2442
+#: src/toolbar.c:2445
 msgid "Forward Message options"
 msgstr "轉寄郵件的選項"
 
-#: src/uri_opener.c:88
+#: src/uri_opener.c:87
 msgid "There are no URLs in this email."
 msgstr "郵件中找不到 URLs"
 
-#: src/uri_opener.c:116
+#: src/uri_opener.c:115
 msgid "Available URLs:"
 msgstr "有效的 URLs:"
 
-#: src/uri_opener.c:181
+#: src/uri_opener.c:189
 msgctxt "Dialog title"
 msgid "Open URLs"
 msgstr "開啟 URLs:"
 
-#: src/uri_opener.c:206
+#: src/uri_opener.c:217
 msgid "Please select the URL to open."
 msgstr "請選擇一個要開啟的 URL"
 
-#: src/uri_opener.c:214
+#: src/uri_opener.c:225
 msgid "Select All"
 msgstr "全選"
 
-#: src/wizard.c:521
+#: src/wizard.c:523
 msgctxt "Welcome Mail Subject"
 msgid "Welcome to Claws Mail"
 msgstr "歡迎光臨 Claws Mail"
 
-#: src/wizard.c:544
+#: src/wizard.c:546
 #, c-format
 msgid ""
 "\n"
@@ -18973,125 +19306,121 @@ msgstr ""
 "<%s>.\n"
 "\n"
 
-#: src/wizard.c:619
+#: src/wizard.c:621
 msgid "Please enter the mailbox name."
 msgstr "請輸入郵件箱名稱"
 
-#: src/wizard.c:647
+#: src/wizard.c:649
 msgid "Please enter your name and email address."
 msgstr "請輸入你的名字和郵件地址"
 
-#: src/wizard.c:658
+#: src/wizard.c:660
 msgid "Please enter your receiving server and username."
 msgstr "請輸入你的接收伺服器和使用者名稱"
 
-#: src/wizard.c:668
+#: src/wizard.c:670
 msgid "Please enter your username."
 msgstr "請輸入你的使用者名稱"
 
-#: src/wizard.c:678
+#: src/wizard.c:680
 msgid "Please enter your SMTP server."
 msgstr "請輸入你的 SMTP 伺服器"
 
-#: src/wizard.c:689
+#: src/wizard.c:691
 msgid "Please enter your SMTP username."
 msgstr "請輸入你的 SMTP 使用者名稱"
 
-#: src/wizard.c:974
+#: src/wizard.c:976
 msgid "Your name:"
 msgstr "你的姓名:"
 
-#: src/wizard.c:985
+#: src/wizard.c:987
 msgid "Your email address:"
 msgstr "你的郵件地址:"
 
-#: src/wizard.c:996
+#: src/wizard.c:998
 msgid "Your organization:"
 msgstr "你的組識:"
 
-#: src/wizard.c:1030
+#: src/wizard.c:1032
 msgid "Mailbox name:"
 msgstr "郵件箱"
 
-#: src/wizard.c:1038
+#: src/wizard.c:1040
 msgid ""
 "You can also specify an absolute path, for example: \"/home/john/Documents/"
 "Mail\""
 msgstr "你也可以指定一個絕對路徑,例如: \"/home/john/Documents/Mail\""
 
-#: src/wizard.c:1109
+#: src/wizard.c:1111
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:25\""
 msgstr "你可以藉由在最後加上通訊埠來指定: \"mail.example.com:25\""
 
-#: src/wizard.c:1112
+#: src/wizard.c:1114
 msgid "SMTP server address:"
 msgstr "SMTP 伺服器地址:"
 
-#: src/wizard.c:1118
-msgid "Use authentication"
-msgstr "使用認證"
-
-#: src/wizard.c:1127
+#: src/wizard.c:1129
 msgid "(empty to use the same as receive)"
 msgstr "(留下空白代表使用和接收伺服器使用一樣的設定)"
 
-#: src/wizard.c:1141
+#: src/wizard.c:1143
 msgid "SMTP username:"
 msgstr "SMTP 使用者名稱:"
 
-#: src/wizard.c:1152
+#: src/wizard.c:1154
 msgid "SMTP password:"
 msgstr "SMTP 密碼:"
 
-#: src/wizard.c:1165
+#: src/wizard.c:1167
 msgid "Use SSL/TLS to connect to SMTP server"
 msgstr "使用 SSL/TLS 和 SMTP 伺服器建立連線"
 
-#: src/wizard.c:1176 src/wizard.c:1596
+#: src/wizard.c:1178 src/wizard.c:1598
 msgid "Use STARTTLS command to start encryption"
 msgstr "使用 STARTTLS 命令進行加密"
 
-#: src/wizard.c:1188 src/wizard.c:1608
+#: src/wizard.c:1190 src/wizard.c:1610
 msgid "Client SSL/TLS certificate (optional)"
 msgstr "客戶端的 SSL/TLS 認證 (選項)"
 
-#: src/wizard.c:1256 src/wizard.c:1288 src/wizard.c:1543
+#: src/wizard.c:1258 src/wizard.c:1290 src/wizard.c:1545
 msgid "Server address:"
 msgstr "伺服器地址:"
 
-#: src/wizard.c:1320
+#: src/wizard.c:1322
 msgid "Local mailbox:"
 msgstr "本地郵件夾:"
 
-#: src/wizard.c:1489
+#: src/wizard.c:1491
 msgid "Server type:"
 msgstr "伺服器型式:"
 
-#: src/wizard.c:1498
+#: src/wizard.c:1500
 msgid "POP3"
 msgstr "POP3"
 
-#: src/wizard.c:1554
+#: src/wizard.c:1556
 msgid ""
 "You can specify the port number by appending it at the end: \"mail.example."
 "com:110\""
 msgstr "你可以藉由在最後加上通訊埠來指定: \"mail.example.com:110\""
 
-#: src/wizard.c:1585
+#: src/wizard.c:1587
 msgid "Use SSL/TLS to connect to receiving server"
 msgstr "使用 SSL/TLS  和接收伺服器建立連線"
 
-#: src/wizard.c:1650
+#: src/wizard.c:1652
 msgid "IMAP server directory:"
 msgstr "IMAP 伺服器路徑"
 
-#: src/wizard.c:1661
+#: src/wizard.c:1663
 msgid "Show only subscribed folders"
 msgstr "只顯示已訂閱資料夾"
 
-#: src/wizard.c:1669
+#: src/wizard.c:1671
 msgid ""
 "Warning: this version of Claws Mail\n"
 "has been built without IMAP support."
@@ -19099,15 +19428,15 @@ msgstr ""
 "警告:這個版本的 Clasw Mail\n"
 "已被編譯為不支援 IMAP"
 
-#: src/wizard.c:1787
+#: src/wizard.c:1789
 msgid "Claws Mail Setup Wizard"
 msgstr "Claws Mail 設定精靈"
 
-#: src/wizard.c:1820
+#: src/wizard.c:1822
 msgid "Welcome to Claws Mail"
 msgstr "歡迎來到 Clasw Mail"
 
-#: src/wizard.c:1827
+#: src/wizard.c:1829
 msgid ""
 "Welcome to the Claws Mail setup wizard.\n"
 "\n"
@@ -19120,35 +19449,34 @@ msgstr ""
 "我們將會從定義一些基本的資訊開始,關於你和你常用的郵件選項。如此你就可以在少"
 "於5分鐘的時間內,開始使用 Claws Mail  "
 
-#: src/wizard.c:1840
+#: src/wizard.c:1842
 msgid "About You"
 msgstr "關於你"
 
-#: src/wizard.c:1848 src/wizard.c:1863 src/wizard.c:1878 src/wizard.c:1894
+#: src/wizard.c:1850 src/wizard.c:1865 src/wizard.c:1880 src/wizard.c:1896
 msgid "Bold fields must be completed"
 msgstr "粗體欄位需要被完成"
 
-#: src/wizard.c:1855
+#: src/wizard.c:1857
 msgid "Receiving mail"
 msgstr "接收郵件"
 
-#: src/wizard.c:1870
+#: src/wizard.c:1872
 msgid "Sending mail"
 msgstr "傳送郵件"
 
-#: src/wizard.c:1886
+#: src/wizard.c:1888
 msgid "Saving mail on disk"
 msgstr "儲存郵件在磁碟上"
 
-#: src/wizard.c:1902
+#: src/wizard.c:1904
 msgid "Configuration finished"
 msgstr "配置完成"
 
-#: src/wizard.c:1909
+#: src/wizard.c:1911
 msgid ""
 "Claws Mail is now ready.\n"
 "Click Save to start."
 msgstr ""
 "Claws Mail 已經準備好了\n"
 "點擊儲存後開始"
-

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list