integrated junk filter setting into common prefs.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@336 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 422 insertions, 407 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7a6f95c4..af829d92 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-10 17:08+0900\n"
+"POT-Creation-Date: 2005-06-13 19:29+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -95,7 +95,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account.c:691 src/addressadd.c:191 src/addressbook.c:490
-#: src/compose.c:3965 src/editaddress.c:199 src/editaddress.c:940
+#: src/compose.c:3964 src/editaddress.c:199 src/editaddress.c:940
 #: src/editaddress.c:988 src/editbook.c:195 src/editgroup.c:264
 #: src/editjpilot.c:303 src/editldap.c:305 src/editvcard.c:216
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -133,15 +133,15 @@ msgstr "无标题"
 msgid "Delete account"
 msgstr "删除帐号"
 
-#: src/account.c:815 src/compose.c:2653 src/compose.c:5077
+#: src/account.c:815 src/compose.c:2653 src/compose.c:5076
 #: src/folderview.c:2035 src/folderview.c:2131 src/folderview.c:2177
-#: src/folderview.c:2318 src/folderview.c:2364
+#: src/folderview.c:2319 src/folderview.c:2365
 msgid "Yes"
 msgstr "是"
 
-#: src/account.c:815 src/compose.c:2653 src/compose.c:5077
+#: src/account.c:815 src/compose.c:2653 src/compose.c:5076
 #: src/folderview.c:2035 src/folderview.c:2131 src/folderview.c:2177
-#: src/folderview.c:2318 src/folderview.c:2364
+#: src/folderview.c:2319 src/folderview.c:2365
 msgid "+No"
 msgstr "+否"
 
@@ -244,7 +244,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:201 src/compose.c:4395 src/editaddress.c:200
+#: src/addressadd.c:201 src/compose.c:4394 src/editaddress.c:200
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
@@ -365,9 +365,9 @@ msgstr "/新建文件夹(_F)"
 #: src/folderview.c:229 src/folderview.c:231 src/folderview.c:235
 #: src/folderview.c:245 src/folderview.c:247 src/folderview.c:249
 #: src/folderview.c:253 src/folderview.c:263 src/folderview.c:265
-#: src/folderview.c:268 src/summaryview.c:372 src/summaryview.c:376
-#: src/summaryview.c:380 src/summaryview.c:390 src/summaryview.c:392
-#: src/summaryview.c:395 src/summaryview.c:401
+#: src/folderview.c:268 src/summaryview.c:374 src/summaryview.c:378
+#: src/summaryview.c:382 src/summaryview.c:392 src/summaryview.c:394
+#: src/summaryview.c:397 src/summaryview.c:403
 msgid "/---"
 msgstr "/---"
 
@@ -376,7 +376,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:379
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:381
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
@@ -384,7 +384,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:495 src/compose.c:4396 src/prefs_common.c:2360
+#: src/addressbook.c:495 src/compose.c:4395 src/prefs_common.c:2421
 msgid "Address book"
 msgstr "地址簿"
 
@@ -540,7 +540,7 @@ msgstr "地址簿转换错误"
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3055 src/prefs_common.c:904
+#: src/addressbook.c:3055 src/prefs_common.c:946
 msgid "Interface"
 msgstr "界面"
 
@@ -585,7 +585,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:123 src/compose.c:5077 src/main.c:460
+#: src/alertpanel.c:123 src/compose.c:5076 src/main.c:460
 msgid "Notice"
 msgstr "注意"
 
@@ -636,7 +636,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4004
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4018
 msgid "None"
 msgstr "没有"
 
@@ -727,7 +727,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
 #: src/compose.c:520 src/mainwindow.c:504 src/messageview.c:150
-#: src/summaryview.c:396
+#: src/summaryview.c:398
 msgid "/_View"
 msgstr "/查看(_V)"
 
@@ -970,8 +970,8 @@ msgstr "撰写邮件%s"
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2394 src/compose.c:4316 src/mainwindow.c:2206
-#: src/prefs_account.c:703 src/prefs_common.c:888
+#: src/compose.c:2394 src/compose.c:4315 src/mainwindow.c:2206
+#: src/prefs_account.c:703 src/prefs_common.c:930
 msgid "Send"
 msgstr "发送"
 
@@ -1006,7 +1006,7 @@ msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
 #: src/compose.c:2616 src/compose.c:2845 src/compose.c:2908 src/compose.c:3028
-#: src/utils.c:2229
+#: src/utils.c:2230
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
@@ -1039,130 +1039,130 @@ msgstr "无法找到队列文件夹：%s\n"
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:3676
+#: src/compose.c:3675
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:3785
+#: src/compose.c:3784
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:3833 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3832 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:3905
+#: src/compose.c:3904
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:3908
+#: src/compose.c:3907
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:3946 src/compose.c:4868
+#: src/compose.c:3945 src/compose.c:4867
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:3955 src/mimeview.c:192 src/prefs_filter_edit.c:585
-#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4148
+#: src/compose.c:3954 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4162
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4317
+#: src/compose.c:4316
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4325
+#: src/compose.c:4324
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4326
+#: src/compose.c:4325
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4334
+#: src/compose.c:4333
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4335
+#: src/compose.c:4334
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4345 src/compose.c:5665
+#: src/compose.c:4344 src/compose.c:5664
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4346
+#: src/compose.c:4345
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4354
+#: src/compose.c:4353
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4355
+#: src/compose.c:4354
 msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4365 src/prefs_account.c:1339 src/prefs_common.c:1315
+#: src/compose.c:4364 src/prefs_account.c:1339 src/prefs_common.c:1357
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4366
+#: src/compose.c:4365
 msgid "Insert signature"
 msgstr "插入签名"
 
-#: src/compose.c:4375 src/prefs_common.c:1337 src/prefs_common.c:2339
+#: src/compose.c:4374 src/prefs_common.c:1379 src/prefs_common.c:2400
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4376
+#: src/compose.c:4375
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4384
+#: src/compose.c:4383
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4385
+#: src/compose.c:4384
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:4764
+#: src/compose.c:4763
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:4782
+#: src/compose.c:4781
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:4850
+#: src/compose.c:4849
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:4870
+#: src/compose.c:4869
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:4893 src/prefs_folder_item.c:183
+#: src/compose.c:4892 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:4894
+#: src/compose.c:4893
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5048
+#: src/compose.c:5047
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5074
+#: src/compose.c:5073
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1173,71 +1173,71 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:5087
+#: src/compose.c:5086
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "已结束程序组标识号：%d"
 
-#: src/compose.c:5088
+#: src/compose.c:5087
 #, c-format
 msgid "Temporary file: %s"
 msgstr "临时文件：%s"
 
-#: src/compose.c:5112
+#: src/compose.c:5111
 msgid "Compose: input from monitoring process\n"
 msgstr "撰写：从监听进程中输入\n"
 
 #. failed
-#: src/compose.c:5145
+#: src/compose.c:5144
 msgid "Couldn't exec external editor\n"
 msgstr "无法执行外部编辑器\n"
 
-#: src/compose.c:5149
+#: src/compose.c:5148
 msgid "Couldn't write to file\n"
 msgstr "无法写入文件\n"
 
-#: src/compose.c:5151
+#: src/compose.c:5150
 msgid "Pipe read failed\n"
 msgstr "管道读取失败\n"
 
-#: src/compose.c:5456 src/compose.c:5464 src/compose.c:5470
+#: src/compose.c:5455 src/compose.c:5463 src/compose.c:5469
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:5561
+#: src/compose.c:5560
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:5583
+#: src/compose.c:5582
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:5618
+#: src/compose.c:5617
 msgid "Discard message"
 msgstr "丢弃邮件"
 
-#: src/compose.c:5619
+#: src/compose.c:5618
 msgid "This message has been modified. discard it?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:5620
+#: src/compose.c:5619
 msgid "Discard"
 msgstr "丢弃"
 
-#: src/compose.c:5620
+#: src/compose.c:5619
 msgid "to Draft"
 msgstr "放入草稿箱"
 
-#: src/compose.c:5662
+#: src/compose.c:5661
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:5664
+#: src/compose.c:5663
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:5665
+#: src/compose.c:5664
 msgid "Replace"
 msgstr "替换"
 
@@ -1420,7 +1420,7 @@ msgid "Edit JPilot Entry"
 msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:322 src/editldap.c:347 src/editvcard.c:235
-#: src/importldif.c:534 src/prefs_account.c:1852 src/prefs_common.c:1994
+#: src/importldif.c:534 src/prefs_account.c:1852 src/prefs_common.c:2038
 msgid " ... "
 msgstr " ... "
 
@@ -1561,7 +1561,7 @@ msgstr "覆盖"
 msgid "Overwrite existing file?"
 msgstr "覆盖已存在的文件？"
 
-#: src/filter.c:827 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
+#: src/filter.c:828 src/prefs.c:158 src/prefs.c:186 src/prefs.c:231
 #: src/prefs_account.c:563 src/prefs_account.c:577
 #: src/prefs_customheader.c:382 src/prefs_customheader.c:428
 #: src/prefs_display_header.c:407 src/prefs_display_header.c:432
@@ -1788,21 +1788,21 @@ msgstr "真的要删除 IMAP4 帐号“%s”？"
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2316
+#: src/folderview.c:2317
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2317
+#: src/folderview.c:2318
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2363
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2363
+#: src/folderview.c:2364
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -1850,11 +1850,11 @@ msgstr "未知"
 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 
-#: src/grouplistdialog.c:449 src/summaryview.c:729
+#: src/grouplistdialog.c:450 src/summaryview.c:731
 msgid "Done."
 msgstr "完成。"
 
-#: src/grouplistdialog.c:483
+#: src/grouplistdialog.c:484
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收 %d 个新闻组(已读取 %s)"
@@ -1871,11 +1871,11 @@ msgstr "标题："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:180 src/summaryview.c:1885
+#: src/headerview.c:180 src/summaryview.c:1899
 msgid "(No From)"
 msgstr "(没有发件人)"
 
-#: src/headerview.c:195 src/summaryview.c:1882
+#: src/headerview.c:195 src/summaryview.c:1896
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
@@ -1897,146 +1897,146 @@ msgstr "到 %s 的 IMAP4 连接已断开。正在重新连接...\n"
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 服务器目录"
 
-#: src/imap.c:587
+#: src/imap.c:589
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "正在创建到 %s:%d 的 IMAP4 连接...\n"
 
-#: src/imap.c:628
+#: src/imap.c:630
 msgid "Can't start TLS session.\n"
 msgstr "无法启动 TLS 会话。\n"
 
-#: src/imap.c:1411
+#: src/imap.c:1417
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "无法设置删除标志：%s\n"
 
-#: src/imap.c:1419 src/imap.c:1511
+#: src/imap.c:1425 src/imap.c:1517
 msgid "can't expunge\n"
 msgstr "无法清除\n"
 
-#: src/imap.c:1505
+#: src/imap.c:1511
 msgid "can't set deleted flags: 1:*\n"
 msgstr "无法设置删除标志：1:*\n"
 
-#: src/imap.c:1550
+#: src/imap.c:1556
 msgid "can't close folder\n"
 msgstr "无法关闭文件夹\n"
 
-#: src/imap.c:1628
+#: src/imap.c:1634
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根文件夹 %s 不存在\n"
 
-#: src/imap.c:1808 src/imap.c:1816
+#: src/imap.c:1818 src/imap.c:1826
 msgid "error occurred while getting LIST.\n"
 msgstr "获取列表时发生错误。\n"
 
-#: src/imap.c:1930
+#: src/imap.c:1940
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "无法创建“%s”\n"
 
-#: src/imap.c:1935
+#: src/imap.c:1945
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "无法在收件箱中创建“%s”\n"
 
-#: src/imap.c:1996
+#: src/imap.c:2006
 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建邮箱：LIST 失败\n"
 
-#: src/imap.c:2016
+#: src/imap.c:2026
 msgid "can't create mailbox\n"
 msgstr "无法创建邮箱\n"
 
-#: src/imap.c:2085
+#: src/imap.c:2095
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱 %s 重命名为 %s\n"
 
-#: src/imap.c:2147
+#: src/imap.c:2157
 msgid "can't delete mailbox\n"
 msgstr "无法删除邮箱\n"
 
-#: src/imap.c:2186
+#: src/imap.c:2196
 msgid "can't get envelope\n"
 msgstr "无法获取信封\n"
 
-#: src/imap.c:2194
+#: src/imap.c:2204
 msgid "error occurred while getting envelope.\n"
 msgstr "获取信封时发生错误。\n"
 
-#: src/imap.c:2215
+#: src/imap.c:2225
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "无法解析信封：%s\n"
 
-#: src/imap.c:2338
+#: src/imap.c:2348
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: src/imap.c:2345
+#: src/imap.c:2355
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: src/imap.c:2420
+#: src/imap.c:2430
 msgid "can't get namespace\n"
 msgstr "无法获得名字空间\n"
 
-#: src/imap.c:2938
+#: src/imap.c:2949
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择文件夹：%s\n"
 
-#: src/imap.c:3110
+#: src/imap.c:3124
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 验证失败。\n"
 
-#: src/imap.c:3127
+#: src/imap.c:3141
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登录失败。\n"
 
-#: src/imap.c:3451
+#: src/imap.c:3465
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "无法把 %s 添加到 %s\n"
 
-#: src/imap.c:3458
+#: src/imap.c:3472
 msgid "(sending file...)"
 msgstr "(正在发送文件...)"
 
-#: src/imap.c:3486
+#: src/imap.c:3500
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "无法追加邮件到 %s\n"
 
-#: src/imap.c:3518
+#: src/imap.c:3532
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "无法将 %s 复制到 %s\n"
 
-#: src/imap.c:3542
+#: src/imap.c:3556
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "执行IMAP命令时发生错误：STORE %s %s\n"
 
-#: src/imap.c:3556
+#: src/imap.c:3570
 msgid "error while imap command: EXPUNGE\n"
 msgstr "执行IMAP命令时发生错误：EXPUNGE\n"
 
-#: src/imap.c:3569
+#: src/imap.c:3583
 msgid "error while imap command: CLOSE\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: src/imap.c:3796
+#: src/imap.c:3811
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 无法转换 UTF-7 到 %s\n"
 
-#: src/imap.c:3826
+#: src/imap.c:3841
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
@@ -2272,15 +2272,15 @@ msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "正在获取 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:1070
+#: src/inc.c:1075
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1076
+#: src/inc.c:1081
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1081
+#: src/inc.c:1086
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2289,28 +2289,28 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1087
+#: src/inc.c:1092
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1092
+#: src/inc.c:1097
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1097
+#: src/inc.c:1102
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1103 src/send_message.c:476 src/send_message.c:664
+#: src/inc.c:1108 src/send_message.c:476 src/send_message.c:664
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1109
+#: src/inc.c:1114
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1113
+#: src/inc.c:1118
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2319,11 +2319,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1119 src/send_message.c:649
+#: src/inc.c:1124 src/send_message.c:649
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1124 src/send_message.c:652
+#: src/inc.c:1129 src/send_message.c:652
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2332,15 +2332,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1129 src/send_message.c:668
+#: src/inc.c:1134 src/send_message.c:668
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1165
+#: src/inc.c:1170
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1248
+#: src/inc.c:1253
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -2748,7 +2748,7 @@ msgstr "/查看(_V)/字符编码(_E)/中文 (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 
-#: src/mainwindow.c:669 src/summaryview.c:397
+#: src/mainwindow.c:669 src/summaryview.c:399
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
@@ -3022,8 +3022,8 @@ msgstr "正在创建主窗口...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1059 src/summaryview.c:2013 src/summaryview.c:2098
-#: src/summaryview.c:3335 src/summaryview.c:3408 src/summaryview.c:3681
+#: src/mainwindow.c:1059 src/summaryview.c:2027 src/summaryview.c:2112
+#: src/summaryview.c:3349 src/summaryview.c:3422 src/summaryview.c:3695
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3095,7 +3095,7 @@ msgstr "Sylpheed－文件夹视图"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2138 src/summaryview.c:366
+#: src/mainwindow.c:2138 src/summaryview.c:368
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
@@ -3111,15 +3111,15 @@ msgstr "/回复到发件人(_S)"
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2146 src/summaryview.c:373
+#: src/mainwindow.c:2146 src/summaryview.c:375
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2147 src/summaryview.c:374
+#: src/mainwindow.c:2147 src/summaryview.c:376
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2148 src/summaryview.c:375
+#: src/mainwindow.c:2148 src/summaryview.c:377
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
@@ -3143,7 +3143,7 @@ msgstr "合并所有帐号的新邮件"
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2217 src/prefs_account.c:705 src/prefs_common.c:890
+#: src/mainwindow.c:2217 src/prefs_account.c:705 src/prefs_common.c:932
 #: src/prefs_folder_item.c:137
 msgid "Compose"
 msgstr "撰写"
@@ -3152,7 +3152,7 @@ msgstr "撰写"
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2226 src/prefs_common.c:1407
+#: src/mainwindow.c:2226 src/prefs_common.c:1449
 msgid "Reply"
 msgstr "回复"
 
@@ -3180,7 +3180,7 @@ msgstr "转发该邮件"
 msgid "Delete the message"
 msgstr "删除该邮件"
 
-#: src/mainwindow.c:2285 src/prefs_common.c:1945
+#: src/mainwindow.c:2285 src/prefs_common.c:1989
 msgid "Junk"
 msgstr ""
 
@@ -3352,7 +3352,7 @@ msgstr "搜索结束"
 msgid "Creating message view...\n"
 msgstr "正在创建邮件视图...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1604
+#: src/messageview.c:313 src/prefs_common.c:1646
 msgid "Text"
 msgstr "文本"
 
@@ -3360,16 +3360,16 @@ msgstr "文本"
 msgid "Attachments"
 msgstr "附件"
 
-#: src/messageview.c:658 src/summaryview.c:2936
+#: src/messageview.c:658 src/summaryview.c:2950
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
 
-#: src/messageview.c:713 src/prefs_common.c:2328 src/summaryview.c:2955
+#: src/messageview.c:713 src/prefs_common.c:2389 src/summaryview.c:2969
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:714 src/summaryview.c:2956
+#: src/messageview.c:714 src/summaryview.c:2970
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3378,7 +3378,7 @@ msgstr ""
 "输入打印命令行：\n"
 "(“%s”将被替换为文件名)"
 
-#: src/messageview.c:720 src/summaryview.c:2962
+#: src/messageview.c:720 src/summaryview.c:2976
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3531,43 +3531,43 @@ msgstr "无法发表文章。\n"
 msgid "can't retrieve article %d\n"
 msgstr "无法获取文章 %d\n"
 
-#: src/news.c:742
+#: src/news.c:743
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "无法选择组：%s\n"
 
-#: src/news.c:777
+#: src/news.c:778
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "无效的文章范围：%d - %d\n"
 
-#: src/news.c:790
+#: src/news.c:791
 msgid "no new articles.\n"
 msgstr "没有新文章。\n"
 
-#: src/news.c:800
+#: src/news.c:801
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "正在获取 %3$s 里的 xover %1$d - %2$d...\n"
 
-#: src/news.c:804
+#: src/news.c:805
 msgid "can't get xover\n"
 msgstr "无法获取 xover\n"
 
-#: src/news.c:814
+#: src/news.c:815
 msgid "error occurred while getting xover.\n"
 msgstr "获取 xover 时发生错误。\n"
 
-#: src/news.c:824
+#: src/news.c:825
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "无效的 xover 行：%s\n"
 
-#: src/news.c:843 src/news.c:875
+#: src/news.c:844 src/news.c:876
 msgid "can't get xhdr\n"
 msgstr "无法获取 xhdr\n"
 
-#: src/news.c:855 src/news.c:887
+#: src/news.c:856 src/news.c:888
 msgid "error occurred while getting xhdr.\n"
 msgstr "获取 xhdr 时发生错误。\n"
 
@@ -3703,11 +3703,11 @@ msgstr "帐号首选项"
 msgid "Creating account preferences window...\n"
 msgstr "正在创建帐号首选项窗口...\n"
 
-#: src/prefs_account.c:701 src/prefs_common.c:886
+#: src/prefs_account.c:701 src/prefs_common.c:928
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account.c:708 src/prefs_common.c:901
+#: src/prefs_account.c:708 src/prefs_common.c:943
 msgid "Privacy"
 msgstr "隐私"
 
@@ -3837,7 +3837,7 @@ msgstr "(没有过滤的邮件会保存在该文件夹中)"
 msgid "Authentication method"
 msgstr "验证方法"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1242
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1284
 msgid "Automatic"
 msgstr "自动"
 
@@ -3861,7 +3861,7 @@ msgstr "生成邮件标识"
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1770 src/prefs_common.c:1795
+#: src/prefs_account.c:1196 src/prefs_common.c:1812 src/prefs_common.c:1837
 msgid " Edit... "
 msgstr " 编辑... "
 
@@ -4170,80 +4170,85 @@ msgstr "删除动作"
 msgid "Do you really want to delete this action?"
 msgstr "您真的要删除该动作吗？"
 
-#: src/prefs_common.c:866
+#: src/prefs_common.c:898
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "文件夹："
+
+#: src/prefs_common.c:908
 msgid "Creating common preferences window...\n"
 msgstr "正在创建通用首选项窗口...\n"
 
-#: src/prefs_common.c:870
+#: src/prefs_common.c:912
 msgid "Common Preferences"
 msgstr "通用首选项"
 
-#: src/prefs_common.c:892
+#: src/prefs_common.c:934
 msgid "Quote"
 msgstr "引文"
 
-#: src/prefs_common.c:894
+#: src/prefs_common.c:936
 msgid "Display"
 msgstr "显示"
 
-#: src/prefs_common.c:896
+#: src/prefs_common.c:938
 msgid "Message"
 msgstr "邮件"
 
-#: src/prefs_common.c:898
+#: src/prefs_common.c:940
 msgid "Junk mail"
 msgstr ""
 
-#: src/prefs_common.c:906 src/select-keys.c:344
+#: src/prefs_common.c:948 src/select-keys.c:344
 msgid "Other"
 msgstr "其它"
 
-#: src/prefs_common.c:948
+#: src/prefs_common.c:990
 msgid "Use external program for incorporation"
 msgstr "使用外部程序合并邮件"
 
-#: src/prefs_common.c:960 src/prefs_common.c:1123
+#: src/prefs_common.c:1002 src/prefs_common.c:1165
 msgid "Command"
 msgstr "命令"
 
-#: src/prefs_common.c:975
+#: src/prefs_common.c:1017
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "从邮件池合并邮件"
 
-#: src/prefs_common.c:988
+#: src/prefs_common.c:1030
 msgid "Filter on incorporation"
 msgstr "合并邮件时进行过滤"
 
-#: src/prefs_common.c:994
+#: src/prefs_common.c:1036
 msgid "Spool path"
 msgstr "邮件池路径"
 
-#: src/prefs_common.c:1012
+#: src/prefs_common.c:1054
 msgid "Auto-check new mail"
 msgstr "自动检查新邮件"
 
-#: src/prefs_common.c:1014
+#: src/prefs_common.c:1056
 msgid "every"
 msgstr "每"
 
-#: src/prefs_common.c:1026
+#: src/prefs_common.c:1068
 msgid "minute(s)"
 msgstr "分钟"
 
-#: src/prefs_common.c:1035
+#: src/prefs_common.c:1077
 msgid "Check new mail on startup"
 msgstr "启动时检查新邮件"
 
-#: src/prefs_common.c:1037
+#: src/prefs_common.c:1079
 msgid "Update all local folders after incorporation"
 msgstr "合并邮件后更新所有的本地文件夹"
 
-#: src/prefs_common.c:1039
+#: src/prefs_common.c:1081
 msgid "News"
 msgstr "新闻"
 
-#: src/prefs_common.c:1047
+#: src/prefs_common.c:1089
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4251,261 +4256,261 @@ msgstr ""
 "下载文章的最大数量\n"
 "(指定 0 表示无限制)"
 
-#: src/prefs_common.c:1111
+#: src/prefs_common.c:1153
 msgid "Use external program for sending"
 msgstr "使用外部程序发送"
 
-#: src/prefs_common.c:1142
+#: src/prefs_common.c:1184
 msgid "Save sent messages to outbox"
 msgstr "将已发出的邮件保存在发件箱"
 
-#: src/prefs_common.c:1144
+#: src/prefs_common.c:1186
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1192
 msgid "Outgoing encoding"
 msgstr "发送时使用的字符编码"
 
-#: src/prefs_common.c:1165
+#: src/prefs_common.c:1207
 msgid "Automatic (Recommended)"
 msgstr "自动 (建议使用)"
 
-#: src/prefs_common.c:1167
+#: src/prefs_common.c:1209
 msgid "7bit ascii (US-ASCII)"
 msgstr "7位 ASCII (US-ASCII) "
 
-#: src/prefs_common.c:1169
+#: src/prefs_common.c:1211
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1213
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: src/prefs_common.c:1172
+#: src/prefs_common.c:1214
 msgid "Western European (ISO-8859-15)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common.c:1174
+#: src/prefs_common.c:1216
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common.c:1176
+#: src/prefs_common.c:1218
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的语 (ISO-8859-13)"
 
-#: src/prefs_common.c:1177
+#: src/prefs_common.c:1219
 msgid "Baltic (ISO-8859-4)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common.c:1179
+#: src/prefs_common.c:1221
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common.c:1181
+#: src/prefs_common.c:1223
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common.c:1182
+#: src/prefs_common.c:1224
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common.c:1184
+#: src/prefs_common.c:1226
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: src/prefs_common.c:1186
+#: src/prefs_common.c:1228
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫语 (ISO-8859-5)"
 
-#: src/prefs_common.c:1187
+#: src/prefs_common.c:1229
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫语 (KOI8-R)"
 
-#: src/prefs_common.c:1188
+#: src/prefs_common.c:1230
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫语 (KOI8-U)"
 
-#: src/prefs_common.c:1189
+#: src/prefs_common.c:1231
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common.c:1191
+#: src/prefs_common.c:1233
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日语 (ISO-2022-JP)"
 
-#: src/prefs_common.c:1193
+#: src/prefs_common.c:1235
 msgid "Japanese (EUC-JP)"
 msgstr "日语 (EUC-JP)"
 
-#: src/prefs_common.c:1194
+#: src/prefs_common.c:1236
 msgid "Japanese (Shift_JIS)"
 msgstr "日语 (Shift_JIS)"
 
-#: src/prefs_common.c:1197
+#: src/prefs_common.c:1239
 msgid "Simplified Chinese (GB2312)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common.c:1198
+#: src/prefs_common.c:1240
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common.c:1199
+#: src/prefs_common.c:1241
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体中文 (Big5)"
 
-#: src/prefs_common.c:1201
+#: src/prefs_common.c:1243
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体中文 (EUC-TW)"
 
-#: src/prefs_common.c:1202
+#: src/prefs_common.c:1244
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1205
+#: src/prefs_common.c:1247
 msgid "Korean (EUC-KR)"
 msgstr "朝鲜文 (EUC-KR)"
 
-#: src/prefs_common.c:1207
+#: src/prefs_common.c:1249
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common.c:1208
+#: src/prefs_common.c:1250
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common.c:1218
+#: src/prefs_common.c:1260
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr "如果选择“自动”，将使用最适合当前区域设置的编码方式。"
 
-#: src/prefs_common.c:1232
+#: src/prefs_common.c:1274
 msgid "Transfer encoding"
 msgstr "传输编码"
 
-#: src/prefs_common.c:1255
+#: src/prefs_common.c:1297
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "指定当邮件内容包含非 ASCII 字符时使用的 Content-Transfer-Encoding。"
 
-#: src/prefs_common.c:1326
+#: src/prefs_common.c:1368
 msgid "Signature separator"
 msgstr "签名分隔符"
 
-#: src/prefs_common.c:1335
+#: src/prefs_common.c:1377
 msgid "Insert automatically"
 msgstr "自动插入"
 
-#: src/prefs_common.c:1345
+#: src/prefs_common.c:1387
 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 
-#: src/prefs_common.c:1355
+#: src/prefs_common.c:1397
 msgid "Undo level"
 msgstr "撤销次数"
 
-#: src/prefs_common.c:1375
+#: src/prefs_common.c:1417
 msgid "Wrap messages at"
 msgstr "邮件折行于第"
 
-#: src/prefs_common.c:1387
+#: src/prefs_common.c:1429
 msgid "characters"
 msgstr "个字符"
 
-#: src/prefs_common.c:1397
+#: src/prefs_common.c:1439
 msgid "Wrap quotation"
 msgstr "引文折行"
 
-#: src/prefs_common.c:1403
+#: src/prefs_common.c:1445
 msgid "Wrap on input"
 msgstr "输入时折行"
 
-#: src/prefs_common.c:1405
+#: src/prefs_common.c:1447
 msgid "Wrap before sending"
 msgstr "发送前折行"
 
-#: src/prefs_common.c:1415
+#: src/prefs_common.c:1457
 msgid "Automatically select account for replies"
 msgstr "自动选择回复用的帐号"
 
-#: src/prefs_common.c:1417
+#: src/prefs_common.c:1459
 msgid "Quote message when replying"
 msgstr "回复时引用原文"
 
-#: src/prefs_common.c:1419
+#: src/prefs_common.c:1461
 msgid "Reply button invokes mailing list reply"
 msgstr "回复按钮会回复到邮件列表"
 
 #. reply
-#: src/prefs_common.c:1465
+#: src/prefs_common.c:1507
 msgid "Reply format"
 msgstr "回复格式"
 
-#: src/prefs_common.c:1480 src/prefs_common.c:1522
+#: src/prefs_common.c:1522 src/prefs_common.c:1564
 msgid "Quotation mark"
 msgstr "引文符号"
 
 #. forward
-#: src/prefs_common.c:1507
+#: src/prefs_common.c:1549
 msgid "Forward format"
 msgstr "转发格式"
 
-#: src/prefs_common.c:1554
+#: src/prefs_common.c:1596
 msgid " Description of symbols "
 msgstr " 符号描述 "
 
-#: src/prefs_common.c:1595
+#: src/prefs_common.c:1637
 msgid "Font"
 msgstr "字体"
 
-#: src/prefs_common.c:1627
+#: src/prefs_common.c:1669
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "翻译邮件头名(如“发件人：”、“主题：”)"
 
-#: src/prefs_common.c:1630
+#: src/prefs_common.c:1672
 msgid "Display unread number next to folder name"
 msgstr "在文件夹名后显示未读邮件的数量"
 
-#: src/prefs_common.c:1639
+#: src/prefs_common.c:1681
 msgid "Abbreviate newsgroups longer than"
 msgstr "缩写新闻组长于"
 
-#: src/prefs_common.c:1654
+#: src/prefs_common.c:1696
 msgid "letters"
 msgstr "信件"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1660
+#: src/prefs_common.c:1702
 msgid "Summary View"
 msgstr "摘要视图"
 
-#: src/prefs_common.c:1669
+#: src/prefs_common.c:1711
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "如果发件人是您自己，“发件人”栏中显示的是收件人"
 
-#: src/prefs_common.c:1671
+#: src/prefs_common.c:1713
 msgid "Expand threads"
 msgstr "展开线索"
 
-#: src/prefs_common.c:1679 src/prefs_common.c:2617 src/prefs_common.c:2655
+#: src/prefs_common.c:1721 src/prefs_common.c:2678 src/prefs_common.c:2716
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common.c:1700
+#: src/prefs_common.c:1742
 msgid " Set display item of summary... "
 msgstr " 设置摘要中显示的项... "
 
-#: src/prefs_common.c:1766
+#: src/prefs_common.c:1808
 msgid "Enable coloration of message"
 msgstr "启用邮件的颜色表示"
 
-#: src/prefs_common.c:1780
+#: src/prefs_common.c:1822
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4513,354 +4518,364 @@ msgstr ""
 "用单字节字符显示多字节字母和数字\n"
 "(仅适用于日语)"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1828
 msgid "Display header pane above message view"
 msgstr "在邮件视图之上显示邮件头面板"
 
-#: src/prefs_common.c:1793
+#: src/prefs_common.c:1835
 msgid "Display short headers on message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common.c:1805
+#: src/prefs_common.c:1847
 msgid "Render HTML messages as text"
 msgstr "将HTML内容显示为文本"
 
-#: src/prefs_common.c:1808
+#: src/prefs_common.c:1850
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common.c:1820
+#: src/prefs_common.c:1862
 msgid "Line space"
 msgstr "邮件内容行间距"
 
-#: src/prefs_common.c:1834 src/prefs_common.c:1872
+#: src/prefs_common.c:1876 src/prefs_common.c:1914
 msgid "pixel(s)"
 msgstr "个像素"
 
-#: src/prefs_common.c:1839
+#: src/prefs_common.c:1881
 msgid "Scroll"
 msgstr "滚动"
 
-#: src/prefs_common.c:1846
+#: src/prefs_common.c:1888
 msgid "Half page"
 msgstr "半页滚动"
 
-#: src/prefs_common.c:1852
+#: src/prefs_common.c:1894
 msgid "Smooth scroll"
 msgstr "平滑滚动"
 
-#: src/prefs_common.c:1858
+#: src/prefs_common.c:1900
 msgid "Step"
 msgstr "每次滚动"
 
-#: src/prefs_common.c:1878
+#: src/prefs_common.c:1920
 msgid "Images"
 msgstr "图像"
 
-#: src/prefs_common.c:1886
+#: src/prefs_common.c:1928
 msgid "Resize attached large images to fit in the window"
 msgstr "将附件中的图像缩放至适合窗口大小"
 
-#: src/prefs_common.c:1888
+#: src/prefs_common.c:1930
 msgid "Display images as inline"
 msgstr "嵌入显示图像"
 
-#: src/prefs_common.c:1928
+#: src/prefs_common.c:1972
 msgid "Enable Junk mail control"
 msgstr ""
 
-#: src/prefs_common.c:1936
+#: src/prefs_common.c:1980
 #, fuzzy
 msgid "Learning command:"
 msgstr "执行命令"
 
-#: src/prefs_common.c:1957
+#: src/prefs_common.c:2001
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common.c:1969
-msgid ""
-"Specify command line for learning junk mail. You must add a filter rule with "
-"'Result of command' as a condition to enable automatic filtering using the "
-"result of this learning."
-msgstr ""
+#: src/prefs_common.c:2016
+#, fuzzy
+msgid "Classifying command"
+msgstr "执行命令"
 
-#: src/prefs_common.c:1986
+#: src/prefs_common.c:2030
 #, fuzzy
 msgid "Junk folder"
 msgstr "文件夹："
 
-#: src/prefs_common.c:2003
+#: src/prefs_common.c:2047
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 
-#: src/prefs_common.c:2045
+#: src/prefs_common.c:2059
+#, fuzzy
+msgid "Filter messages classified as junk on receiving"
+msgstr "在接收邮件时进行过滤"
+
+#: src/prefs_common.c:2062
+#, fuzzy
+msgid ""
+"Filtered messages will be moved to the junk folder and deleted from the "
+"server."
+msgstr "(没有过滤的邮件会保存在该文件夹中)"
+
+#: src/prefs_common.c:2106
 msgid "Automatically check signatures"
 msgstr "自动检查签名"
 
-#: src/prefs_common.c:2048
+#: src/prefs_common.c:2109
 msgid "Show signature check result in a popup window"
 msgstr "在弹出窗口中显示签名检查结果"
 
-#: src/prefs_common.c:2051
+#: src/prefs_common.c:2112
 msgid "Store passphrase in memory temporarily"
 msgstr "将口令串临时存放在内存中"
 
-#: src/prefs_common.c:2066
+#: src/prefs_common.c:2127
 msgid "Expired after"
 msgstr "过期时间"
 
-#: src/prefs_common.c:2079
+#: src/prefs_common.c:2140
 msgid "minute(s) "
 msgstr "分钟后"
 
-#: src/prefs_common.c:2092
+#: src/prefs_common.c:2153
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "设置为“0”将在整个会话过程中储存口令串"
 
-#: src/prefs_common.c:2106
+#: src/prefs_common.c:2167
 msgid "Grab input while entering a passphrase"
 msgstr "输入口令串时捕获输入(更安全)"
 
-#: src/prefs_common.c:2111
+#: src/prefs_common.c:2172
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "如果 GnuPG 无法工作，在启动时显示警告"
 
-#: src/prefs_common.c:2163
+#: src/prefs_common.c:2224
 msgid "Always open messages in summary when selected"
 msgstr "在摘要窗口中选择邮件时打开邮件"
 
-#: src/prefs_common.c:2167
+#: src/prefs_common.c:2228
 msgid "Open first unread message when entering a folder"
 msgstr "进入文件夹时打开第一个未读的邮件"
 
-#: src/prefs_common.c:2171
+#: src/prefs_common.c:2232
 msgid "Only mark message as read when opened in new window"
 msgstr "仅在新窗口中打开邮件时标记邮件为已读"
 
-#: src/prefs_common.c:2175
+#: src/prefs_common.c:2236
 msgid "Go to inbox after receiving new mail"
 msgstr "收到新邮件时转到收件箱"
 
-#: src/prefs_common.c:2183
+#: src/prefs_common.c:2244
 msgid "Execute immediately when moving or deleting messages"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common.c:2195
+#: src/prefs_common.c:2256
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "如果该选项关闭，标记邮件直到完成执行。"
 
-#: src/prefs_common.c:2203
+#: src/prefs_common.c:2264
 msgid "Receive dialog"
 msgstr "收对话框"
 
-#: src/prefs_common.c:2213
+#: src/prefs_common.c:2274
 msgid "Show receive dialog"
 msgstr "显示接收对话框"
 
-#: src/prefs_common.c:2223
+#: src/prefs_common.c:2284
 msgid "Always"
 msgstr "总是"
 
-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2285
 msgid "Only on manual receiving"
 msgstr "仅在手工接收时"
 
-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2287
 msgid "Never"
 msgstr "从不"
 
-#: src/prefs_common.c:2231
+#: src/prefs_common.c:2292
 msgid "Don't popup error dialog on receive error"
 msgstr "在接收错误时不弹出错误对话框"
 
-#: src/prefs_common.c:2234
+#: src/prefs_common.c:2295
 msgid "Close receive dialog when finished"
 msgstr "完成后关闭接收对话框"
 
-#: src/prefs_common.c:2240
+#: src/prefs_common.c:2301
 msgid " Set key bindings... "
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common.c:2296
+#: src/prefs_common.c:2357
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部命令 (%s 将被替换为文件名或URI)"
 
-#: src/prefs_common.c:2305
+#: src/prefs_common.c:2366
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: src/prefs_common.c:2369
+#: src/prefs_common.c:2430
 msgid "Add address to destination when double-clicked"
 msgstr "双击时将地址添加为收件人"
 
-#: src/prefs_common.c:2371
+#: src/prefs_common.c:2432
 msgid "On exit"
 msgstr "退出程序时"
 
-#: src/prefs_common.c:2379
+#: src/prefs_common.c:2440
 msgid "Confirm on exit"
 msgstr "退出时进行确认"
 
-#: src/prefs_common.c:2386
+#: src/prefs_common.c:2447
 msgid "Empty trash on exit"
 msgstr "退出时清空废件箱"
 
-#: src/prefs_common.c:2388
+#: src/prefs_common.c:2449
 msgid "Ask before emptying"
 msgstr "在清空前询问"
 
-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2453
 msgid "Warn if there are queued messages"
 msgstr "如果队列中有邮件就发出警告"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2459
 msgid "Socket I/O timeout:"
 msgstr "套接字 I/O 超时："
 
-#: src/prefs_common.c:2411
+#: src/prefs_common.c:2472
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common.c:2593
+#: src/prefs_common.c:2654
 msgid "the full abbreviated weekday name"
 msgstr "缩写的星期名"
 
-#: src/prefs_common.c:2594
+#: src/prefs_common.c:2655
 msgid "the full weekday name"
 msgstr "完整的星期名"
 
-#: src/prefs_common.c:2595
+#: src/prefs_common.c:2656
 msgid "the abbreviated month name"
 msgstr "缩写的月份名"
 
-#: src/prefs_common.c:2596
+#: src/prefs_common.c:2657
 msgid "the full month name"
 msgstr "完整的月份名"
 
-#: src/prefs_common.c:2597
+#: src/prefs_common.c:2658
 msgid "the preferred date and time for the current locale"
 msgstr "当前区域设置首选的日期和时间格式"
 
-#: src/prefs_common.c:2598
+#: src/prefs_common.c:2659
 msgid "the century number (year/100)"
 msgstr "世纪(年份/100)"
 
-#: src/prefs_common.c:2599
+#: src/prefs_common.c:2660
 msgid "the day of the month as a decimal number"
 msgstr "十进制表示的月中的天数"
 
-#: src/prefs_common.c:2600
+#: src/prefs_common.c:2661
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24小时时钟的十进制小时"
 
-#: src/prefs_common.c:2601
+#: src/prefs_common.c:2662
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12小时时钟的十进制小时"
 
-#: src/prefs_common.c:2602
+#: src/prefs_common.c:2663
 msgid "the day of the year as a decimal number"
 msgstr "十进制表示的一年中的天数"
 
-#: src/prefs_common.c:2603
+#: src/prefs_common.c:2664
 msgid "the month as a decimal number"
 msgstr "十进制表示的月份"
 
-#: src/prefs_common.c:2604
+#: src/prefs_common.c:2665
 msgid "the minute as a decimal number"
 msgstr "十进制表示的天数"
 
-#: src/prefs_common.c:2605
+#: src/prefs_common.c:2666
 msgid "either AM or PM"
 msgstr "AM或PM"
 
-#: src/prefs_common.c:2606
+#: src/prefs_common.c:2667
 msgid "the second as a decimal number"
 msgstr "十进制表示的秒"
 
-#: src/prefs_common.c:2607
+#: src/prefs_common.c:2668
 msgid "the day of the week as a decimal number"
 msgstr "十进制表示的星期中的天数"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2669
 msgid "the preferred date for the current locale"
 msgstr "当前区域设置的首选日期格式"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2670
 msgid "the last two digits of a year"
 msgstr "年份的最后两个数字"
 
-#: src/prefs_common.c:2610
+#: src/prefs_common.c:2671
 msgid "the year as a decimal number"
 msgstr "十进制的年份"
 
-#: src/prefs_common.c:2611
+#: src/prefs_common.c:2672
 msgid "the time zone or name or abbreviation"
 msgstr "时区、名字或缩写"
 
-#: src/prefs_common.c:2632
+#: src/prefs_common.c:2693
 msgid "Specifier"
 msgstr "说明符"
 
-#: src/prefs_common.c:2633
+#: src/prefs_common.c:2694
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common.c:2673
+#: src/prefs_common.c:2734
 msgid "Example"
 msgstr "示例"
 
-#: src/prefs_common.c:2754
+#: src/prefs_common.c:2815
 msgid "Set message colors"
 msgstr "设置邮件颜色"
 
-#: src/prefs_common.c:2762
+#: src/prefs_common.c:2823
 msgid "Colors"
 msgstr "颜色"
 
-#: src/prefs_common.c:2796
+#: src/prefs_common.c:2857
 msgid "Quoted Text - First Level"
 msgstr "引文－第一级"
 
-#: src/prefs_common.c:2802
+#: src/prefs_common.c:2863
 msgid "Quoted Text - Second Level"
 msgstr "引文－第二级"
 
-#: src/prefs_common.c:2808
+#: src/prefs_common.c:2869
 msgid "Quoted Text - Third Level"
 msgstr "引文－第三级"
 
-#: src/prefs_common.c:2814
+#: src/prefs_common.c:2875
 msgid "URI link"
 msgstr "URI 链接"
 
-#: src/prefs_common.c:2821
+#: src/prefs_common.c:2882
 msgid "Recycle quote colors"
 msgstr "循环使用引文颜色"
 
-#: src/prefs_common.c:2881
+#: src/prefs_common.c:2942
 msgid "Pick color for quotation level 1"
 msgstr "选择引文级别 1 的颜色"
 
-#: src/prefs_common.c:2884
+#: src/prefs_common.c:2945
 msgid "Pick color for quotation level 2"
 msgstr "选择引文级别 2 的颜色"
 
-#: src/prefs_common.c:2887
+#: src/prefs_common.c:2948
 msgid "Pick color for quotation level 3"
 msgstr "选择引文级别 3 的颜色"
 
-#: src/prefs_common.c:2890
+#: src/prefs_common.c:2951
 msgid "Pick color for URI"
 msgstr "选择URI的颜色"
 
-#: src/prefs_common.c:3027
+#: src/prefs_common.c:3088
 msgid "Description of symbols"
 msgstr "符号的描述"
 
-#: src/prefs_common.c:3083
+#: src/prefs_common.c:3144
 msgid ""
 "Date\n"
 "From\n"
@@ -4884,11 +4899,11 @@ msgstr ""
 "新闻组\n"
 "邮件标识号"
 
-#: src/prefs_common.c:3096
+#: src/prefs_common.c:3157
 msgid "If x is set, displays expr"
 msgstr "如果 x 设置了值则显示 expr"
 
-#: src/prefs_common.c:3100
+#: src/prefs_common.c:3161
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4902,7 +4917,7 @@ msgstr ""
 "没有签名的引文内容\n"
 "%"
 
-#: src/prefs_common.c:3108
+#: src/prefs_common.c:3169
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4914,15 +4929,15 @@ msgstr ""
 "左括号\n"
 "右括号"
 
-#: src/prefs_common.c:3145
+#: src/prefs_common.c:3206
 msgid "Font selection"
 msgstr "字体选择"
 
-#: src/prefs_common.c:3214
+#: src/prefs_common.c:3275
 msgid "Key bindings"
 msgstr "键盘关联"
 
-#: src/prefs_common.c:3228
+#: src/prefs_common.c:3289
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4932,11 +4947,11 @@ msgstr ""
 "您也可以将鼠标放在菜单项上并按下任何键\n"
 "(或组合键)来修改菜单快捷键。"
 
-#: src/prefs_common.c:3240 src/prefs_common.c:3564
+#: src/prefs_common.c:3301 src/prefs_common.c:3625
 msgid "Default"
 msgstr "默认"
 
-#: src/prefs_common.c:3243 src/prefs_common.c:3573
+#: src/prefs_common.c:3304 src/prefs_common.c:3634
 msgid "Old Sylpheed"
 msgstr "旧式的Sylpheed"
 
@@ -5237,17 +5252,17 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4141
+#: src/prefs_summary_column.c:71 src/summaryview.c:4155
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4144
+#: src/prefs_summary_column.c:72 src/summaryview.c:4158
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4146
+#: src/prefs_summary_column.c:73 src/summaryview.c:4160
 msgid "Date"
 msgstr "日期"
 
@@ -5332,7 +5347,7 @@ msgstr "删除模板"
 msgid "Do you really want to delete this template?"
 msgstr "您确实要删除该模板吗？"
 
-#: src/procmime.c:742
+#: src/procmime.c:743
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content()：代码转换失败。\n"
 
@@ -5717,306 +5732,306 @@ msgstr "已到达列表的开始；继续从最后开始吗？"
 msgid "End of list reached; continue from beginning?"
 msgstr "已到达列表的最后；继续从头开始吗？"
 
-#: src/summaryview.c:367
+#: src/summaryview.c:369
 msgid "/Repl_y to"
 msgstr "/回复到(_Y)"
 
-#: src/summaryview.c:368
+#: src/summaryview.c:370
 msgid "/Repl_y to/_all"
 msgstr "/回复到(_Y)/全部(_A)"
 
-#: src/summaryview.c:369
+#: src/summaryview.c:371
 msgid "/Repl_y to/_sender"
 msgstr "/回复到(_Y)/发件人(_S)"
 
-#: src/summaryview.c:370
+#: src/summaryview.c:372
 msgid "/Repl_y to/mailing _list"
 msgstr "/回复到(_Y)/邮件列表(_L)"
 
-#: src/summaryview.c:377
+#: src/summaryview.c:379
 msgid "/M_ove..."
 msgstr "/移动(_O)..."
 
-#: src/summaryview.c:378
+#: src/summaryview.c:380
 msgid "/_Copy..."
 msgstr "/复制(_C)..."
 
-#: src/summaryview.c:381
+#: src/summaryview.c:383
 msgid "/_Mark"
 msgstr "/标记(_M)"
 
-#: src/summaryview.c:382
+#: src/summaryview.c:384
 msgid "/_Mark/_Mark"
 msgstr "/标记(_M)/标记(_M)"
 
-#: src/summaryview.c:383
+#: src/summaryview.c:385
 msgid "/_Mark/_Unmark"
 msgstr "/标记(_M)/取消标记(_U)"
 
-#: src/summaryview.c:384
+#: src/summaryview.c:386
 msgid "/_Mark/---"
 msgstr "/标记(_M)/---"
 
-#: src/summaryview.c:385
+#: src/summaryview.c:387
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/标记(_M)/标记为未读(_E)"
 
-#: src/summaryview.c:386
+#: src/summaryview.c:388
 msgid "/_Mark/Mark as rea_d"
 msgstr "/标记(_M)/标记为已读(_D)"
 
-#: src/summaryview.c:388
+#: src/summaryview.c:390
 msgid "/_Mark/Mark all _read"
 msgstr "/标记(_M)/全部标记为已读(_R)"
 
-#: src/summaryview.c:389
+#: src/summaryview.c:391
 msgid "/Color la_bel"
 msgstr "/颜色标签(_B)"
 
-#: src/summaryview.c:391
+#: src/summaryview.c:393
 msgid "/Re-_edit"
 msgstr "/重新编辑(_E)"
 
-#: src/summaryview.c:393
+#: src/summaryview.c:395
 msgid "/Add sender to address boo_k"
 msgstr "/添加发件人到地址簿(_K)"
 
-#: src/summaryview.c:399
+#: src/summaryview.c:401
 msgid "/_View/_Source"
 msgstr "/查看(_V)/原文(_S)"
 
-#: src/summaryview.c:400
+#: src/summaryview.c:402
 msgid "/_View/All _header"
 msgstr "/查看(_V)/所有标题(_H)"
 
-#: src/summaryview.c:402
+#: src/summaryview.c:404
 msgid "/_Print..."
 msgstr "/打印(_P)..."
 
-#: src/summaryview.c:427
+#: src/summaryview.c:429
 msgid "Creating summary view...\n"
 msgstr "正在创建摘要视图...\n"
 
-#: src/summaryview.c:588
+#: src/summaryview.c:590
 msgid "Process mark"
 msgstr "处理标志"
 
-#: src/summaryview.c:589
+#: src/summaryview.c:591
 msgid "Some marks are left. Process it?"
 msgstr "有一些剩余标记。处理吗？"
 
-#: src/summaryview.c:636
+#: src/summaryview.c:638
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "正在扫描文件夹 (%s)..."
 
-#: src/summaryview.c:1133
+#: src/summaryview.c:1147
 msgid "Search again"
 msgstr "再次查找"
 
-#: src/summaryview.c:1155 src/summaryview.c:1164
+#: src/summaryview.c:1169 src/summaryview.c:1178
 msgid "No more unread messages"
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1156
+#: src/summaryview.c:1170
 msgid "No unread message found. Search from the end?"
 msgstr "没发现未读邮件。从后面开始查找？"
 
-#: src/summaryview.c:1158
+#: src/summaryview.c:1172
 msgid "No unread messages."
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1165
+#: src/summaryview.c:1179
 msgid "No unread message found. Go to next folder?"
 msgstr "没发现未读邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1173 src/summaryview.c:1182
+#: src/summaryview.c:1187 src/summaryview.c:1196
 msgid "No more new messages"
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1174
+#: src/summaryview.c:1188
 msgid "No new message found. Search from the end?"
 msgstr "没发现新邮件。从后面开始查找？"
 
-#: src/summaryview.c:1176
+#: src/summaryview.c:1190
 msgid "No new messages."
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1183
+#: src/summaryview.c:1197
 msgid "No new message found. Go to next folder?"
 msgstr "没发现新邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1191 src/summaryview.c:1200
+#: src/summaryview.c:1205 src/summaryview.c:1214
 msgid "No more marked messages"
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1192
+#: src/summaryview.c:1206
 msgid "No marked message found. Search from the end?"
 msgstr "没有标记过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1194 src/summaryview.c:1203
+#: src/summaryview.c:1208 src/summaryview.c:1217
 msgid "No marked messages."
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1201
+#: src/summaryview.c:1215
 msgid "No marked message found. Search from the beginning?"
 msgstr "没有标记过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1209 src/summaryview.c:1218
+#: src/summaryview.c:1223 src/summaryview.c:1232
 msgid "No more labeled messages"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/summaryview.c:1210
+#: src/summaryview.c:1224
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到用颜色标注过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1212 src/summaryview.c:1221
+#: src/summaryview.c:1226 src/summaryview.c:1235
 msgid "No labeled messages."
 msgstr "没有用颜色标注的邮件。"
 
-#: src/summaryview.c:1219
+#: src/summaryview.c:1233
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到用颜色标注过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1504
+#: src/summaryview.c:1518
 msgid "Attracting messages by subject..."
 msgstr "正在按标题归类邮件..."
 
-#: src/summaryview.c:1663
+#: src/summaryview.c:1677
 #, c-format
 msgid "%d deleted"
 msgstr "删除了 %d 个邮件"
 
-#: src/summaryview.c:1667
+#: src/summaryview.c:1681
 #, c-format
 msgid "%s%d moved"
 msgstr "移动了 %s%d"
 
-#: src/summaryview.c:1668 src/summaryview.c:1675
+#: src/summaryview.c:1682 src/summaryview.c:1689
 msgid ", "
 msgstr "，"
 
-#: src/summaryview.c:1673
+#: src/summaryview.c:1687
 #, c-format
 msgid "%s%d copied"
 msgstr "复制了 %s%d"
 
-#: src/summaryview.c:1690
+#: src/summaryview.c:1704
 msgid " item(s) selected"
 msgstr " 项被选中"
 
-#: src/summaryview.c:1700
+#: src/summaryview.c:1714
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 个新邮件，%d 个未读邮件，共 %d 个邮件(%s)"
 
-#: src/summaryview.c:1706
+#: src/summaryview.c:1720
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 个新邮件邮件，%d 个未读邮件，共 %d 个邮件"
 
-#: src/summaryview.c:1747
+#: src/summaryview.c:1761
 msgid "Sorting summary..."
 msgstr "正在排序摘要..."
 
-#: src/summaryview.c:1822
+#: src/summaryview.c:1836
 msgid "(No Date)"
 msgstr "(没有日期)"
 
-#: src/summaryview.c:1950
+#: src/summaryview.c:1964
 msgid "\tSetting summary from message data..."
 msgstr "\t正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:1952
+#: src/summaryview.c:1966
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2077
+#: src/summaryview.c:2091
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2381
+#: src/summaryview.c:2395
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:2423
+#: src/summaryview.c:2437
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:2495
+#: src/summaryview.c:2509
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:2548
+#: src/summaryview.c:2562
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:2566
+#: src/summaryview.c:2580
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:2567
+#: src/summaryview.c:2581
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:2632
+#: src/summaryview.c:2646
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:2669
+#: src/summaryview.c:2683
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:2719
+#: src/summaryview.c:2733
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:2736
+#: src/summaryview.c:2750
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:2790
+#: src/summaryview.c:2804
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:2807
+#: src/summaryview.c:2821
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:2999
+#: src/summaryview.c:3013
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3293 src/summaryview.c:3294
+#: src/summaryview.c:3307 src/summaryview.c:3308
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:3391 src/summaryview.c:3392
+#: src/summaryview.c:3405 src/summaryview.c:3406
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:3657
+#: src/summaryview.c:3671
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:3658
+#: src/summaryview.c:3672
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:3688
+#: src/summaryview.c:3702
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:4150
+#: src/summaryview.c:4164
 msgid "No."
 msgstr "No."
 
@@ -6072,7 +6087,7 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/utils.c:2236 src/utils.c:2363
+#: src/utils.c:2237 src/utils.c:2364
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "写入 %s 时失败。\n"