updated po files.

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

1 files changed, 241 insertions, 236 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a264df1e..0767c4a9 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: 2006-07-24 17:36+0900\n"
+"POT-Creation-Date: 2006-07-25 11:02+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"
@@ -497,7 +497,7 @@ msgstr "发现 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "配置已经保存。\n"
 
-#: libsylph/prefs_common.c:498
+#: libsylph/prefs_common.c:500
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "文件夹："
@@ -958,7 +958,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:496 src/compose.c:4837 src/prefs_common_dialog.c:2213
+#: src/addressbook.c:496 src/compose.c:4837 src/prefs_common_dialog.c:2222
 msgid "Address book"
 msgstr "地址簿"
 
@@ -1121,7 +1121,7 @@ msgstr "地址簿转换错误"
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3080 src/prefs_common_dialog.c:2063
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2072
 msgid "Interface"
 msgstr "界面"
 
@@ -1684,7 +1684,7 @@ msgid "Size"
 msgstr "大小"
 
 #: src/compose.c:4757 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
-#: src/prefs_common_dialog.c:659
+#: src/prefs_common_dialog.c:662
 msgid "Send"
 msgstr "发送"
 
@@ -1726,7 +1726,7 @@ msgstr "加入附件"
 
 #. signature
 #: src/compose.c:4806 src/prefs_account_dialog.c:1208
-#: src/prefs_common_dialog.c:983
+#: src/prefs_common_dialog.c:986
 msgid "Signature"
 msgstr "签名"
 
@@ -1736,8 +1736,8 @@ msgid "Append signature"
 msgstr "签名错误"
 
 #. editor
-#: src/compose.c:4816 src/prefs_common_dialog.c:1021
-#: src/prefs_common_dialog.c:2345
+#: src/compose.c:4816 src/prefs_common_dialog.c:1024
+#: src/prefs_common_dialog.c:2354
 msgid "Editor"
 msgstr "编辑器"
 
@@ -1765,7 +1765,7 @@ msgstr "文件不存在或为空。"
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5393 src/prefs_common_dialog.c:1474
+#: src/compose.c:5393 src/prefs_common_dialog.c:1477
 msgid "Encoding"
 msgstr "编码方式"
 
@@ -2017,7 +2017,7 @@ msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
 #: src/importldif.c:534 src/prefs_account_dialog.c:1722
-#: src/prefs_common_dialog.c:1875
+#: src/prefs_common_dialog.c:1879
 msgid " ... "
 msgstr " ... "
 
@@ -2322,7 +2322,7 @@ msgstr "重建文件夹树失败。"
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1823
 msgid "Junk"
 msgstr ""
 
@@ -2709,15 +2709,15 @@ msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "正在获取 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:1106
+#: src/inc.c:1113
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1112
+#: src/inc.c:1119
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1117
+#: src/inc.c:1124
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2726,28 +2726,28 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1123
+#: src/inc.c:1130
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1128
+#: src/inc.c:1135
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1133
+#: src/inc.c:1140
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1139 src/send_message.c:586 src/send_message.c:774
+#: src/inc.c:1146 src/send_message.c:586 src/send_message.c:774
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1145
+#: src/inc.c:1152
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1149
+#: src/inc.c:1156
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2756,11 +2756,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1155 src/send_message.c:759
+#: src/inc.c:1162 src/send_message.c:759
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1160 src/send_message.c:762
+#: src/inc.c:1167 src/send_message.c:762
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2769,15 +2769,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1165 src/send_message.c:778
+#: src/inc.c:1172 src/send_message.c:778
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1201
+#: src/inc.c:1208
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1284
+#: src/inc.c:1291
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -3656,7 +3656,7 @@ msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
 #: src/mainwindow.c:2370 src/prefs_account_dialog.c:530
-#: src/prefs_common_dialog.c:661 src/prefs_folder_item.c:140
+#: src/prefs_common_dialog.c:664 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰写"
 
@@ -3664,7 +3664,7 @@ msgstr "撰写"
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2379 src/prefs_common_dialog.c:1005
+#: src/mainwindow.c:2379 src/prefs_common_dialog.c:1008
 msgid "Reply"
 msgstr "回复"
 
@@ -3851,7 +3851,7 @@ msgstr ""
 msgid "(Default print command)"
 msgstr "执行命令"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3525
+#: src/messageview.c:761 src/prefs_common_dialog.c:2343 src/summaryview.c:3525
 msgid "Print"
 msgstr "打印"
 
@@ -4014,11 +4014,11 @@ msgstr "帐号首选项"
 msgid "Creating account preferences window...\n"
 msgstr "正在创建帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:657
+#: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:660
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:668
+#: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:671
 msgid "Privacy"
 msgstr "隐私"
 
@@ -4026,7 +4026,7 @@ msgstr "隐私"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2135
+#: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2144
 msgid "Advanced"
 msgstr "高级"
 
@@ -4152,7 +4152,7 @@ msgid "Authentication method"
 msgstr "验证方法"
 
 #: src/prefs_account_dialog.c:953 src/prefs_account_dialog.c:1108
-#: src/prefs_common_dialog.c:875 src/prefs_common_dialog.c:2504
+#: src/prefs_common_dialog.c:878 src/prefs_common_dialog.c:2513
 msgid "Automatic"
 msgstr "自动"
 
@@ -4197,8 +4197,8 @@ msgstr "生成邮件标识"
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account_dialog.c:1065 src/prefs_common_dialog.c:1579
-#: src/prefs_common_dialog.c:1606
+#: src/prefs_account_dialog.c:1065 src/prefs_common_dialog.c:1582
+#: src/prefs_common_dialog.c:1609
 msgid " Edit... "
 msgstr " 编辑... "
 
@@ -4531,279 +4531,279 @@ msgstr "删除动作"
 msgid "Do you really want to delete this action?"
 msgstr "您真的要删除该动作吗？"
 
-#: src/prefs_common_dialog.c:637
+#: src/prefs_common_dialog.c:640
 msgid "Creating common preferences window...\n"
 msgstr "正在创建通用首选项窗口...\n"
 
-#: src/prefs_common_dialog.c:641
+#: src/prefs_common_dialog.c:644
 msgid "Common Preferences"
 msgstr "通用首选项"
 
-#: src/prefs_common_dialog.c:663
+#: src/prefs_common_dialog.c:666
 msgid "Display"
 msgstr "显示"
 
-#: src/prefs_common_dialog.c:665
+#: src/prefs_common_dialog.c:668
 #, fuzzy
 msgid "Junk mail"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:671
+#: src/prefs_common_dialog.c:674
 msgid "Details"
 msgstr ""
 
-#: src/prefs_common_dialog.c:725
+#: src/prefs_common_dialog.c:728
 msgid "Auto-check new mail"
 msgstr "自动检查新邮件"
 
-#: src/prefs_common_dialog.c:727 src/prefs_common_dialog.c:1097
+#: src/prefs_common_dialog.c:730 src/prefs_common_dialog.c:1100
 msgid "every"
 msgstr "每"
 
-#: src/prefs_common_dialog.c:739 src/prefs_common_dialog.c:1111
+#: src/prefs_common_dialog.c:742 src/prefs_common_dialog.c:1114
 msgid "minute(s)"
 msgstr "分钟"
 
-#: src/prefs_common_dialog.c:748
+#: src/prefs_common_dialog.c:751
 msgid "Check new mail on startup"
 msgstr "启动时检查新邮件"
 
-#: src/prefs_common_dialog.c:750
+#: src/prefs_common_dialog.c:753
 msgid "Update all local folders after incorporation"
 msgstr "合并邮件后更新所有的本地文件夹"
 
-#: src/prefs_common_dialog.c:755
+#: src/prefs_common_dialog.c:758
 #, fuzzy
 msgid "Execute command when new messages arrived"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:2383
-#: src/prefs_common_dialog.c:2405
+#: src/prefs_common_dialog.c:770 src/prefs_common_dialog.c:2392
+#: src/prefs_common_dialog.c:2414
 msgid "Command"
 msgstr "命令"
 
-#: src/prefs_common_dialog.c:778
+#: src/prefs_common_dialog.c:781
 #, fuzzy, c-format
 msgid "`%d' will be replaced with the number of new messages."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/prefs_common_dialog.c:782
+#: src/prefs_common_dialog.c:785
 #, fuzzy
 msgid "Incorporate from local spool"
 msgstr "从邮件池合并邮件"
 
-#: src/prefs_common_dialog.c:795
+#: src/prefs_common_dialog.c:798
 msgid "Filter on incorporation"
 msgstr "合并邮件时进行过滤"
 
-#: src/prefs_common_dialog.c:801
+#: src/prefs_common_dialog.c:804
 msgid "Spool path"
 msgstr "邮件池路径"
 
-#: src/prefs_common_dialog.c:852
+#: src/prefs_common_dialog.c:855
 msgid "Save sent messages to outbox"
 msgstr "将已发出的邮件保存在发件箱"
 
-#: src/prefs_common_dialog.c:854
+#: src/prefs_common_dialog.c:857
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common_dialog.c:861
+#: src/prefs_common_dialog.c:864
 msgid "Transfer encoding"
 msgstr "传输编码"
 
-#: src/prefs_common_dialog.c:884
+#: src/prefs_common_dialog.c:887
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "指定当邮件内容包含非 ASCII 字符时使用的 Content-Transfer-Encoding。"
 
-#: src/prefs_common_dialog.c:891
+#: src/prefs_common_dialog.c:894
 #, fuzzy
 msgid "MIME filename encoding"
 msgstr "发送时使用的字符编码"
 
-#: src/prefs_common_dialog.c:902
+#: src/prefs_common_dialog.c:905
 #, fuzzy
 msgid "MIME header"
 msgstr "发送时使用的字符编码"
 
-#: src/prefs_common_dialog.c:912
+#: src/prefs_common_dialog.c:915
 msgid ""
 "Specify encoding method for MIME filename with non-ASCII characters.\n"
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
 
-#: src/prefs_common_dialog.c:979 src/prefs_common_dialog.c:1364
+#: src/prefs_common_dialog.c:982 src/prefs_common_dialog.c:1367
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "常规"
 
-#: src/prefs_common_dialog.c:994
+#: src/prefs_common_dialog.c:997
 msgid "Signature separator"
 msgstr "签名分隔符"
 
-#: src/prefs_common_dialog.c:1003
+#: src/prefs_common_dialog.c:1006
 msgid "Insert automatically"
 msgstr "自动插入"
 
-#: src/prefs_common_dialog.c:1013
+#: src/prefs_common_dialog.c:1016
 msgid "Automatically select account for replies"
 msgstr "自动选择回复用的帐号"
 
-#: src/prefs_common_dialog.c:1015
+#: src/prefs_common_dialog.c:1018
 msgid "Quote message when replying"
 msgstr "回复时引用原文"
 
-#: src/prefs_common_dialog.c:1017
+#: src/prefs_common_dialog.c:1020
 msgid "Reply button invokes mailing list reply"
 msgstr "回复按钮会回复到邮件列表"
 
-#: src/prefs_common_dialog.c:1028
+#: src/prefs_common_dialog.c:1031
 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 
-#: src/prefs_common_dialog.c:1038
+#: src/prefs_common_dialog.c:1041
 msgid "Undo level"
 msgstr "撤销次数"
 
-#: src/prefs_common_dialog.c:1058
+#: src/prefs_common_dialog.c:1061
 msgid "Wrap messages at"
 msgstr "邮件折行于第"
 
-#: src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:1073
 msgid "characters"
 msgstr "个字符"
 
-#: src/prefs_common_dialog.c:1080
+#: src/prefs_common_dialog.c:1083
 msgid "Wrap quotation"
 msgstr "引文折行"
 
-#: src/prefs_common_dialog.c:1086
+#: src/prefs_common_dialog.c:1089
 msgid "Wrap on input"
 msgstr "输入时折行"
 
-#: src/prefs_common_dialog.c:1095
+#: src/prefs_common_dialog.c:1098
 #, fuzzy
 msgid "Auto-save to draft"
 msgstr "保存到草稿文件夹"
 
-#: src/prefs_common_dialog.c:1120
+#: src/prefs_common_dialog.c:1123
 #, fuzzy
 msgid "Format"
 msgstr "普通"
 
-#: src/prefs_common_dialog.c:1125
+#: src/prefs_common_dialog.c:1128
 msgid "Spell checking"
 msgstr ""
 
 #. reply
-#: src/prefs_common_dialog.c:1175
+#: src/prefs_common_dialog.c:1178
 msgid "Reply format"
 msgstr "回复格式"
 
-#: src/prefs_common_dialog.c:1190 src/prefs_common_dialog.c:1232
+#: src/prefs_common_dialog.c:1193 src/prefs_common_dialog.c:1235
 msgid "Quotation mark"
 msgstr "引文符号"
 
 #. forward
-#: src/prefs_common_dialog.c:1217
+#: src/prefs_common_dialog.c:1220
 msgid "Forward format"
 msgstr "转发格式"
 
-#: src/prefs_common_dialog.c:1264
+#: src/prefs_common_dialog.c:1267
 msgid " Description of symbols "
 msgstr " 符号描述 "
 
-#: src/prefs_common_dialog.c:1293
+#: src/prefs_common_dialog.c:1296
 msgid "Enable Spell checking"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1305
+#: src/prefs_common_dialog.c:1308
 #, fuzzy
 msgid "Default language:"
 msgstr "默认收件箱"
 
-#: src/prefs_common_dialog.c:1372
+#: src/prefs_common_dialog.c:1375
 #, fuzzy
 msgid "Text font"
 msgstr "文本"
 
 #. ---- Folder View ----
-#: src/prefs_common_dialog.c:1384
+#: src/prefs_common_dialog.c:1387
 #, fuzzy
 msgid "Folder View"
 msgstr "文件夹"
 
-#: src/prefs_common_dialog.c:1392
+#: src/prefs_common_dialog.c:1395
 msgid "Display unread number next to folder name"
 msgstr "在文件夹名后显示未读邮件的数量"
 
-#: src/prefs_common_dialog.c:1394
+#: src/prefs_common_dialog.c:1397
 #, fuzzy
 msgid "Display message number columns in the folder view"
 msgstr "在文件夹名后显示未读邮件的数量"
 
-#: src/prefs_common_dialog.c:1403
+#: src/prefs_common_dialog.c:1406
 msgid "Abbreviate newsgroups longer than"
 msgstr "缩写新闻组长于"
 
-#: src/prefs_common_dialog.c:1418
+#: src/prefs_common_dialog.c:1421
 msgid "letters"
 msgstr "信件"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1424
+#: src/prefs_common_dialog.c:1427
 msgid "Summary View"
 msgstr "摘要视图"
 
-#: src/prefs_common_dialog.c:1433
+#: src/prefs_common_dialog.c:1436
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "如果发件人是您自己，“发件人”栏中显示的是收件人"
 
-#: src/prefs_common_dialog.c:1435
+#: src/prefs_common_dialog.c:1438
 msgid "Expand threads"
 msgstr "展开线索"
 
-#: src/prefs_common_dialog.c:1443 src/prefs_common_dialog.c:2746
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:1446 src/prefs_common_dialog.c:2755
+#: src/prefs_common_dialog.c:2793
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common_dialog.c:1464
+#: src/prefs_common_dialog.c:1467
 msgid " Set display item of summary... "
 msgstr " 设置摘要中显示的项... "
 
-#: src/prefs_common_dialog.c:1470
+#: src/prefs_common_dialog.c:1473
 msgid "Message"
 msgstr "邮件"
 
-#: src/prefs_common_dialog.c:1480
+#: src/prefs_common_dialog.c:1483
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/prefs_common_dialog.c:1494
+#: src/prefs_common_dialog.c:1497
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1500
+#: src/prefs_common_dialog.c:1503
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/prefs_common_dialog.c:1514
+#: src/prefs_common_dialog.c:1517
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr "如果选择“自动”，将使用最适合当前区域设置的编码方式。"
 
-#: src/prefs_common_dialog.c:1575
+#: src/prefs_common_dialog.c:1578
 msgid "Enable coloration of message"
 msgstr "启用邮件的颜色表示"
 
-#: src/prefs_common_dialog.c:1590
+#: src/prefs_common_dialog.c:1593
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4811,549 +4811,554 @@ msgstr ""
 "用单字节字符显示多字节字母和数字\n"
 "(仅适用于日语)"
 
-#: src/prefs_common_dialog.c:1597
+#: src/prefs_common_dialog.c:1600
 msgid "Display header pane above message view"
 msgstr "在邮件视图之上显示邮件头面板"
 
-#: src/prefs_common_dialog.c:1604
+#: src/prefs_common_dialog.c:1607
 msgid "Display short headers on message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1619
 msgid "Render HTML messages as text"
 msgstr "将HTML内容显示为文本"
 
-#: src/prefs_common_dialog.c:1620
+#: src/prefs_common_dialog.c:1623
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common_dialog.c:1633
+#: src/prefs_common_dialog.c:1636
 msgid "Line space"
 msgstr "邮件内容行间距"
 
-#: src/prefs_common_dialog.c:1647 src/prefs_common_dialog.c:1685
+#: src/prefs_common_dialog.c:1650 src/prefs_common_dialog.c:1688
 msgid "pixel(s)"
 msgstr "个像素"
 
-#: src/prefs_common_dialog.c:1652
+#: src/prefs_common_dialog.c:1655
 msgid "Scroll"
 msgstr "滚动"
 
-#: src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1662
 msgid "Half page"
 msgstr "半页滚动"
 
-#: src/prefs_common_dialog.c:1665
+#: src/prefs_common_dialog.c:1668
 msgid "Smooth scroll"
 msgstr "平滑滚动"
 
-#: src/prefs_common_dialog.c:1671
+#: src/prefs_common_dialog.c:1674
 msgid "Step"
 msgstr "每次滚动"
 
-#: src/prefs_common_dialog.c:1691
+#: src/prefs_common_dialog.c:1694
 msgid "Images"
 msgstr "图像"
 
-#: src/prefs_common_dialog.c:1699
+#: src/prefs_common_dialog.c:1702
 msgid "Resize attached large images to fit in the window"
 msgstr "将附件中的图像缩放至适合窗口大小"
 
-#: src/prefs_common_dialog.c:1701
+#: src/prefs_common_dialog.c:1704
 msgid "Display images as inline"
 msgstr "嵌入显示图像"
 
-#: src/prefs_common_dialog.c:1785
+#: src/prefs_common_dialog.c:1789
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:1797
+#: src/prefs_common_dialog.c:1801
 #, fuzzy
 msgid "Learning command:"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:1806
+#: src/prefs_common_dialog.c:1810
 #, fuzzy
 msgid "(Select preset)"
 msgstr "选择密钥"
 
-#: src/prefs_common_dialog.c:1831
+#: src/prefs_common_dialog.c:1835
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1846
+#: src/prefs_common_dialog.c:1850
 #, fuzzy
 msgid "Classifying command"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:1857
+#: src/prefs_common_dialog.c:1861
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1867
+#: src/prefs_common_dialog.c:1871
 #, fuzzy
 msgid "Junk folder"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:1885
+#: src/prefs_common_dialog.c:1889
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(没有过滤的邮件会保存在该文件夹中)"
 
-#: src/prefs_common_dialog.c:1896
+#: src/prefs_common_dialog.c:1900
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "在接收邮件时进行过滤"
 
-#: src/prefs_common_dialog.c:1899
+#: src/prefs_common_dialog.c:1903
+#, fuzzy
+msgid "Filter junk mails before normal filtering"
+msgstr "从服务器上删除"
+
+#: src/prefs_common_dialog.c:1906
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "从服务器上删除"
 
-#: src/prefs_common_dialog.c:1903
+#: src/prefs_common_dialog.c:1911
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1944
+#: src/prefs_common_dialog.c:1953
 msgid "Automatically check signatures"
 msgstr "自动检查签名"
 
-#: src/prefs_common_dialog.c:1947
+#: src/prefs_common_dialog.c:1956
 msgid "Show signature check result in a popup window"
 msgstr "在弹出窗口中显示签名检查结果"
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1959
 msgid "Store passphrase in memory temporarily"
 msgstr "将口令串临时存放在内存中"
 
-#: src/prefs_common_dialog.c:1965
+#: src/prefs_common_dialog.c:1974
 msgid "Expired after"
 msgstr "过期时间"
 
-#: src/prefs_common_dialog.c:1978
+#: src/prefs_common_dialog.c:1987
 msgid "minute(s) "
 msgstr "分钟后"
 
-#: src/prefs_common_dialog.c:1992
+#: src/prefs_common_dialog.c:2001
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "设置为“0”将在整个会话过程中储存口令串"
 
-#: src/prefs_common_dialog.c:2001
+#: src/prefs_common_dialog.c:2010
 msgid "Grab input while entering a passphrase"
 msgstr "输入口令串时捕获输入(更安全)"
 
-#: src/prefs_common_dialog.c:2006
+#: src/prefs_common_dialog.c:2015
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "如果 GnuPG 无法工作，在启动时显示警告"
 
-#: src/prefs_common_dialog.c:2071
+#: src/prefs_common_dialog.c:2080
 msgid "Always open messages in summary when selected"
 msgstr "在摘要窗口中选择邮件时打开邮件"
 
-#: src/prefs_common_dialog.c:2075
+#: src/prefs_common_dialog.c:2084
 msgid "Open first unread message when entering a folder"
 msgstr "进入文件夹时打开第一个未读的邮件"
 
-#: src/prefs_common_dialog.c:2079
+#: src/prefs_common_dialog.c:2088
 msgid "Only mark message as read when opened in new window"
 msgstr "仅在新窗口中打开邮件时标记邮件为已读"
 
-#: src/prefs_common_dialog.c:2083
+#: src/prefs_common_dialog.c:2092
 msgid "Go to inbox after receiving new mail"
 msgstr "收到新邮件时转到收件箱"
 
-#: src/prefs_common_dialog.c:2091
+#: src/prefs_common_dialog.c:2100
 msgid "Execute immediately when moving or deleting messages"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common_dialog.c:2103
+#: src/prefs_common_dialog.c:2112
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "如果该选项关闭，标记邮件直到完成执行。"
 
-#: src/prefs_common_dialog.c:2112
+#: src/prefs_common_dialog.c:2121
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2114
+#: src/prefs_common_dialog.c:2123
 #, fuzzy
 msgid "Display tray icon"
 msgstr "显示姓名"
 
-#: src/prefs_common_dialog.c:2121
+#: src/prefs_common_dialog.c:2130
 msgid " Set key bindings... "
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common_dialog.c:2127 src/select-keys.c:344
+#: src/prefs_common_dialog.c:2136 src/select-keys.c:344
 msgid "Other"
 msgstr "其它"
 
-#: src/prefs_common_dialog.c:2131
+#: src/prefs_common_dialog.c:2140
 #, fuzzy
 msgid "External commands"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:2180
+#: src/prefs_common_dialog.c:2189
 msgid "Receive dialog"
 msgstr "收对话框"
 
-#: src/prefs_common_dialog.c:2190
+#: src/prefs_common_dialog.c:2199
 msgid "Show receive dialog"
 msgstr "显示接收对话框"
 
-#: src/prefs_common_dialog.c:2200
+#: src/prefs_common_dialog.c:2209
 msgid "Always"
 msgstr "总是"
 
-#: src/prefs_common_dialog.c:2201
+#: src/prefs_common_dialog.c:2210
 msgid "Only on manual receiving"
 msgstr "仅在手工接收时"
 
-#: src/prefs_common_dialog.c:2203
+#: src/prefs_common_dialog.c:2212
 msgid "Never"
 msgstr "从不"
 
-#: src/prefs_common_dialog.c:2208
+#: src/prefs_common_dialog.c:2217
 msgid "Don't popup error dialog on receive error"
 msgstr "在接收错误时不弹出错误对话框"
 
-#: src/prefs_common_dialog.c:2211
+#: src/prefs_common_dialog.c:2220
 msgid "Close receive dialog when finished"
 msgstr "完成后关闭接收对话框"
 
-#: src/prefs_common_dialog.c:2222
+#: src/prefs_common_dialog.c:2231
 msgid "Add address to destination when double-clicked"
 msgstr "双击时将地址添加为收件人"
 
-#: src/prefs_common_dialog.c:2224
+#: src/prefs_common_dialog.c:2233
 msgid "On exit"
 msgstr "退出程序时"
 
-#: src/prefs_common_dialog.c:2232
+#: src/prefs_common_dialog.c:2241
 msgid "Confirm on exit"
 msgstr "退出时进行确认"
 
-#: src/prefs_common_dialog.c:2239
+#: src/prefs_common_dialog.c:2248
 msgid "Empty trash on exit"
 msgstr "退出时清空废件箱"
 
-#: src/prefs_common_dialog.c:2241
+#: src/prefs_common_dialog.c:2250
 msgid "Ask before emptying"
 msgstr "在清空前询问"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2254
 msgid "Warn if there are queued messages"
 msgstr "如果队列中有邮件就发出警告"
 
-#: src/prefs_common_dialog.c:2297
+#: src/prefs_common_dialog.c:2306
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部命令 (%s 将被替换为文件名或URI)"
 
-#: src/prefs_common_dialog.c:2306
+#: src/prefs_common_dialog.c:2315
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: src/prefs_common_dialog.c:2318 src/prefs_common_dialog.c:3751
-#: src/prefs_common_dialog.c:3772
+#: src/prefs_common_dialog.c:2327 src/prefs_common_dialog.c:3760
+#: src/prefs_common_dialog.c:3781
 #, fuzzy
 msgid "(Default browser)"
 msgstr "默认收件箱"
 
-#: src/prefs_common_dialog.c:2371
+#: src/prefs_common_dialog.c:2380
 msgid "Use external program for incorporation"
 msgstr "使用外部程序合并邮件"
 
-#: src/prefs_common_dialog.c:2393
+#: src/prefs_common_dialog.c:2402
 msgid "Use external program for sending"
 msgstr "使用外部程序发送"
 
-#: src/prefs_common_dialog.c:2451
+#: src/prefs_common_dialog.c:2460
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/prefs_common_dialog.c:2454
+#: src/prefs_common_dialog.c:2463
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2461
+#: src/prefs_common_dialog.c:2470
 msgid "Socket I/O timeout:"
 msgstr "套接字 I/O 超时："
 
-#: src/prefs_common_dialog.c:2474
+#: src/prefs_common_dialog.c:2483
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common_dialog.c:2502
+#: src/prefs_common_dialog.c:2511
 msgid "Automatic (Recommended)"
 msgstr "自动 (建议使用)"
 
-#: src/prefs_common_dialog.c:2507
+#: src/prefs_common_dialog.c:2516
 msgid "7bit ascii (US-ASCII)"
 msgstr "7位 ASCII (US-ASCII) "
 
-#: src/prefs_common_dialog.c:2509
+#: src/prefs_common_dialog.c:2518
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2511
+#: src/prefs_common_dialog.c:2520
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2512
+#: src/prefs_common_dialog.c:2521
 msgid "Western European (ISO-8859-15)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2514
+#: src/prefs_common_dialog.c:2523
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2518
+#: src/prefs_common_dialog.c:2527
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2520
+#: src/prefs_common_dialog.c:2529
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的语 (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2521
+#: src/prefs_common_dialog.c:2530
 msgid "Baltic (ISO-8859-4)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2523
+#: src/prefs_common_dialog.c:2532
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:2534
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2526
+#: src/prefs_common_dialog.c:2535
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2528
+#: src/prefs_common_dialog.c:2537
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2529
+#: src/prefs_common_dialog.c:2538
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2531
+#: src/prefs_common_dialog.c:2540
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2533
+#: src/prefs_common_dialog.c:2542
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫语 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2534
+#: src/prefs_common_dialog.c:2543
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫语 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2535
+#: src/prefs_common_dialog.c:2544
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫语 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2536
+#: src/prefs_common_dialog.c:2545
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2538
+#: src/prefs_common_dialog.c:2547
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日语 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2540
+#: src/prefs_common_dialog.c:2549
 msgid "Japanese (EUC-JP)"
 msgstr "日语 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2541
+#: src/prefs_common_dialog.c:2550
 msgid "Japanese (Shift_JIS)"
 msgstr "日语 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2544
+#: src/prefs_common_dialog.c:2553
 msgid "Simplified Chinese (GB2312)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2545
+#: src/prefs_common_dialog.c:2554
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2546
+#: src/prefs_common_dialog.c:2555
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体中文 (Big5)"
 
-#: src/prefs_common_dialog.c:2548
+#: src/prefs_common_dialog.c:2557
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体中文 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2549
+#: src/prefs_common_dialog.c:2558
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2552
+#: src/prefs_common_dialog.c:2561
 msgid "Korean (EUC-KR)"
 msgstr "朝鲜文 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2554
+#: src/prefs_common_dialog.c:2563
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2555
+#: src/prefs_common_dialog.c:2564
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2722
+#: src/prefs_common_dialog.c:2731
 msgid "the full abbreviated weekday name"
 msgstr "缩写的星期名"
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2732
 msgid "the full weekday name"
 msgstr "完整的星期名"
 
-#: src/prefs_common_dialog.c:2724
+#: src/prefs_common_dialog.c:2733
 msgid "the abbreviated month name"
 msgstr "缩写的月份名"
 
-#: src/prefs_common_dialog.c:2725
+#: src/prefs_common_dialog.c:2734
 msgid "the full month name"
 msgstr "完整的月份名"
 
-#: src/prefs_common_dialog.c:2726
+#: src/prefs_common_dialog.c:2735
 msgid "the preferred date and time for the current locale"
 msgstr "当前区域设置首选的日期和时间格式"
 
-#: src/prefs_common_dialog.c:2727
+#: src/prefs_common_dialog.c:2736
 msgid "the century number (year/100)"
 msgstr "世纪(年份/100)"
 
-#: src/prefs_common_dialog.c:2728
+#: src/prefs_common_dialog.c:2737
 msgid "the day of the month as a decimal number"
 msgstr "十进制表示的月中的天数"
 
-#: src/prefs_common_dialog.c:2729
+#: src/prefs_common_dialog.c:2738
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2730
+#: src/prefs_common_dialog.c:2739
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2731
+#: src/prefs_common_dialog.c:2740
 msgid "the day of the year as a decimal number"
 msgstr "十进制表示的一年中的天数"
 
-#: src/prefs_common_dialog.c:2732
+#: src/prefs_common_dialog.c:2741
 msgid "the month as a decimal number"
 msgstr "十进制表示的月份"
 
-#: src/prefs_common_dialog.c:2733
+#: src/prefs_common_dialog.c:2742
 msgid "the minute as a decimal number"
 msgstr "十进制表示的天数"
 
-#: src/prefs_common_dialog.c:2734
+#: src/prefs_common_dialog.c:2743
 msgid "either AM or PM"
 msgstr "AM或PM"
 
-#: src/prefs_common_dialog.c:2735
+#: src/prefs_common_dialog.c:2744
 msgid "the second as a decimal number"
 msgstr "十进制表示的秒"
 
-#: src/prefs_common_dialog.c:2736
+#: src/prefs_common_dialog.c:2745
 msgid "the day of the week as a decimal number"
 msgstr "十进制表示的星期中的天数"
 
-#: src/prefs_common_dialog.c:2737
+#: src/prefs_common_dialog.c:2746
 msgid "the preferred date for the current locale"
 msgstr "当前区域设置的首选日期格式"
 
-#: src/prefs_common_dialog.c:2738
+#: src/prefs_common_dialog.c:2747
 msgid "the last two digits of a year"
 msgstr "年份的最后两个数字"
 
-#: src/prefs_common_dialog.c:2739
+#: src/prefs_common_dialog.c:2748
 msgid "the year as a decimal number"
 msgstr "十进制的年份"
 
-#: src/prefs_common_dialog.c:2740
+#: src/prefs_common_dialog.c:2749
 msgid "the time zone or name or abbreviation"
 msgstr "时区、名字或缩写"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2770
 msgid "Specifier"
 msgstr "说明符"
 
-#: src/prefs_common_dialog.c:2762
+#: src/prefs_common_dialog.c:2771
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2811
 msgid "Example"
 msgstr "示例"
 
-#: src/prefs_common_dialog.c:2883
+#: src/prefs_common_dialog.c:2892
 msgid "Set message colors"
 msgstr "设置邮件颜色"
 
-#: src/prefs_common_dialog.c:2891
+#: src/prefs_common_dialog.c:2900
 msgid "Colors"
 msgstr "颜色"
 
-#: src/prefs_common_dialog.c:2925
+#: src/prefs_common_dialog.c:2934
 msgid "Quoted Text - First Level"
 msgstr "引文－第一级"
 
-#: src/prefs_common_dialog.c:2931
+#: src/prefs_common_dialog.c:2940
 msgid "Quoted Text - Second Level"
 msgstr "引文－第二级"
 
-#: src/prefs_common_dialog.c:2937
+#: src/prefs_common_dialog.c:2946
 msgid "Quoted Text - Third Level"
 msgstr "引文－第三级"
 
-#: src/prefs_common_dialog.c:2943
+#: src/prefs_common_dialog.c:2952
 msgid "URI link"
 msgstr "URI 链接"
 
-#: src/prefs_common_dialog.c:2950
+#: src/prefs_common_dialog.c:2959
 msgid "Recycle quote colors"
 msgstr "循环使用引文颜色"
 
-#: src/prefs_common_dialog.c:3017
+#: src/prefs_common_dialog.c:3026
 msgid "Pick color for quotation level 1"
 msgstr "选择引文级别 1 的颜色"
 
-#: src/prefs_common_dialog.c:3020
+#: src/prefs_common_dialog.c:3029
 msgid "Pick color for quotation level 2"
 msgstr "选择引文级别 2 的颜色"
 
-#: src/prefs_common_dialog.c:3023
+#: src/prefs_common_dialog.c:3032
 msgid "Pick color for quotation level 3"
 msgstr "选择引文级别 3 的颜色"
 
-#: src/prefs_common_dialog.c:3026
+#: src/prefs_common_dialog.c:3035
 msgid "Pick color for URI"
 msgstr "选择URI的颜色"
 
-#: src/prefs_common_dialog.c:3166
+#: src/prefs_common_dialog.c:3175
 msgid "Description of symbols"
 msgstr "符号的描述"
 
-#: src/prefs_common_dialog.c:3222
+#: src/prefs_common_dialog.c:3231
 msgid ""
 "Date\n"
 "From\n"
@@ -5377,11 +5382,11 @@ msgstr ""
 "新闻组\n"
 "邮件标识号"
 
-#: src/prefs_common_dialog.c:3235
+#: src/prefs_common_dialog.c:3244
 msgid "If x is set, displays expr"
 msgstr "如果 x 设置了值则显示 expr"
 
-#: src/prefs_common_dialog.c:3239
+#: src/prefs_common_dialog.c:3248
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5395,7 +5400,7 @@ msgstr ""
 "没有签名的引文内容\n"
 "%"
 
-#: src/prefs_common_dialog.c:3247
+#: src/prefs_common_dialog.c:3256
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5407,20 +5412,20 @@ msgstr ""
 "左括号\n"
 "右括号"
 
-#: src/prefs_common_dialog.c:3293
+#: src/prefs_common_dialog.c:3302
 msgid "Key bindings"
 msgstr "键盘关联"
 
-#: src/prefs_common_dialog.c:3306
+#: src/prefs_common_dialog.c:3315
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common_dialog.c:3316 src/prefs_common_dialog.c:3640
+#: src/prefs_common_dialog.c:3325 src/prefs_common_dialog.c:3649
 msgid "Default"
 msgstr "默认"
 
-#: src/prefs_common_dialog.c:3319 src/prefs_common_dialog.c:3649
+#: src/prefs_common_dialog.c:3328 src/prefs_common_dialog.c:3658
 msgid "Old Sylpheed"
 msgstr "旧式的Sylpheed"