unified some frames and checkboxes in common prefs.

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

1 files changed, 249 insertions, 250 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9e1bab2f..7a6f95c4 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-09 17:21+0900\n"
+"POT-Creation-Date: 2005-06-10 17:08+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"
@@ -384,7 +384,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:495 src/compose.c:4396 src/prefs_common.c:2370
+#: src/addressbook.c:495 src/compose.c:4396 src/prefs_common.c:2360
 msgid "Address book"
 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:3978
+#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:4004
 msgid "None"
 msgstr "没有"
 
@@ -1068,7 +1068,7 @@ 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:4122
+#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4148
 msgid "Size"
 msgstr "大小"
 
@@ -1109,7 +1109,7 @@ msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4365 src/prefs_account.c:1339 src/prefs_common.c:1321
+#: src/compose.c:4365 src/prefs_account.c:1339 src/prefs_common.c:1315
 msgid "Signature"
 msgstr "签名"
 
@@ -1117,7 +1117,7 @@ msgstr "签名"
 msgid "Insert signature"
 msgstr "插入签名"
 
-#: src/compose.c:4375 src/prefs_common.c:1343 src/prefs_common.c:2349
+#: src/compose.c:4375 src/prefs_common.c:1337 src/prefs_common.c:2339
 msgid "Editor"
 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:2004
+#: src/importldif.c:534 src/prefs_account.c:1852 src/prefs_common.c:1994
 msgid " ... "
 msgstr " ... "
 
@@ -1850,7 +1850,7 @@ msgstr "未知"
 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 
-#: src/grouplistdialog.c:449 src/summaryview.c:727
+#: src/grouplistdialog.c:449 src/summaryview.c:729
 msgid "Done."
 msgstr "完成。"
 
@@ -1871,11 +1871,11 @@ msgstr "标题："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:180 src/summaryview.c:1881
+#: src/headerview.c:180 src/summaryview.c:1885
 msgid "(No From)"
 msgstr "(没有发件人)"
 
-#: src/headerview.c:195 src/summaryview.c:1878
+#: src/headerview.c:195 src/summaryview.c:1882
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
@@ -3022,8 +3022,8 @@ msgstr "正在创建主窗口...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1059 src/summaryview.c:1990 src/summaryview.c:2075
-#: src/summaryview.c:3312 src/summaryview.c:3385 src/summaryview.c:3655
+#: src/mainwindow.c:1059 src/summaryview.c:2013 src/summaryview.c:2098
+#: src/summaryview.c:3335 src/summaryview.c:3408 src/summaryview.c:3681
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3152,7 +3152,7 @@ msgstr "撰写"
 msgid "Compose new message"
 msgstr "撰写新邮件"
 
-#: src/mainwindow.c:2226 src/prefs_common.c:1413
+#: src/mainwindow.c:2226 src/prefs_common.c:1407
 msgid "Reply"
 msgstr "回复"
 
@@ -3180,7 +3180,7 @@ msgstr "转发该邮件"
 msgid "Delete the message"
 msgstr "删除该邮件"
 
-#: src/mainwindow.c:2285 src/prefs_common.c:1955
+#: src/mainwindow.c:2285 src/prefs_common.c:1945
 msgid "Junk"
 msgstr ""
 
@@ -3352,7 +3352,7 @@ msgstr "搜索结束"
 msgid "Creating message view...\n"
 msgstr "正在创建邮件视图...\n"
 
-#: src/messageview.c:313 src/prefs_common.c:1610
+#: src/messageview.c:313 src/prefs_common.c:1604
 msgid "Text"
 msgstr "文本"
 
@@ -3360,16 +3360,16 @@ msgstr "文本"
 msgid "Attachments"
 msgstr "附件"
 
-#: src/messageview.c:658 src/summaryview.c:2913
+#: src/messageview.c:658 src/summaryview.c:2936
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
 
-#: src/messageview.c:713 src/prefs_common.c:2338 src/summaryview.c:2932
+#: src/messageview.c:713 src/prefs_common.c:2328 src/summaryview.c:2955
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:714 src/summaryview.c:2933
+#: src/messageview.c:714 src/summaryview.c:2956
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3378,7 +3378,7 @@ msgstr ""
 "输入打印命令行：\n"
 "(“%s”将被替换为文件名)"
 
-#: src/messageview.c:720 src/summaryview.c:2939
+#: src/messageview.c:720 src/summaryview.c:2962
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3837,7 +3837,7 @@ msgstr "(没有过滤的邮件会保存在该文件夹中)"
 msgid "Authentication method"
 msgstr "验证方法"
 
-#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1248
+#: src/prefs_account.c:1123 src/prefs_account.c:1239 src/prefs_common.c:1242
 msgid "Automatic"
 msgstr "自动"
 
@@ -3861,7 +3861,7 @@ msgstr "生成邮件标识"
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account.c:1196 src/prefs_common.c:1776 src/prefs_common.c:1801
+#: src/prefs_account.c:1196 src/prefs_common.c:1770 src/prefs_common.c:1795
 msgid " Edit... "
 msgstr " 编辑... "
 
@@ -4198,59 +4198,52 @@ msgstr ""
 msgid "Other"
 msgstr "其它"
 
-#: src/prefs_common.c:947 src/prefs_common.c:1114
-msgid "External program"
-msgstr "外部程序"
-
-#: src/prefs_common.c:956
+#: src/prefs_common.c:948
 msgid "Use external program for incorporation"
 msgstr "使用外部程序合并邮件"
 
-#: src/prefs_common.c:963 src/prefs_common.c:1129
+#: src/prefs_common.c:960 src/prefs_common.c:1123
 msgid "Command"
 msgstr "命令"
 
-#: src/prefs_common.c:977
-msgid "Local spool"
-msgstr "本地邮件池"
-
-#: src/prefs_common.c:988
-msgid "Incorporate from spool"
+#: src/prefs_common.c:975
+#, fuzzy
+msgid "Incorporate from local spool"
 msgstr "从邮件池合并邮件"
 
-#: src/prefs_common.c:990
+#: src/prefs_common.c:988
 msgid "Filter on incorporation"
 msgstr "合并邮件时进行过滤"
 
-#: src/prefs_common.c:998
+#: src/prefs_common.c:994
 msgid "Spool path"
 msgstr "邮件池路径"
 
-#: src/prefs_common.c:1016
+#: src/prefs_common.c:1012
 msgid "Auto-check new mail"
 msgstr "自动检查新邮件"
 
-#: src/prefs_common.c:1018
+#: src/prefs_common.c:1014
 msgid "every"
 msgstr "每"
 
-#: src/prefs_common.c:1030
+#: src/prefs_common.c:1026
 msgid "minute(s)"
 msgstr "分钟"
 
-#: src/prefs_common.c:1039
+#: src/prefs_common.c:1035
 msgid "Check new mail on startup"
 msgstr "启动时检查新邮件"
 
-#: src/prefs_common.c:1041
+#: src/prefs_common.c:1037
 msgid "Update all local folders after incorporation"
 msgstr "合并邮件后更新所有的本地文件夹"
 
-#: src/prefs_common.c:1043
+#: src/prefs_common.c:1039
 msgid "News"
 msgstr "新闻"
 
-#: src/prefs_common.c:1051
+#: src/prefs_common.c:1047
 msgid ""
 "Maximum number of articles to download\n"
 "(unlimited if 0 is specified)"
@@ -4258,261 +4251,261 @@ msgstr ""
 "下载文章的最大数量\n"
 "(指定 0 表示无限制)"
 
-#: src/prefs_common.c:1122
+#: src/prefs_common.c:1111
 msgid "Use external program for sending"
 msgstr "使用外部程序发送"
 
-#: src/prefs_common.c:1148
+#: src/prefs_common.c:1142
 msgid "Save sent messages to outbox"
 msgstr "将已发出的邮件保存在发件箱"
 
-#: src/prefs_common.c:1150
+#: src/prefs_common.c:1144
 msgid "Apply filter rules to sent messages"
 msgstr ""
 
-#: src/prefs_common.c:1156
+#: src/prefs_common.c:1150
 msgid "Outgoing encoding"
 msgstr "发送时使用的字符编码"
 
-#: src/prefs_common.c:1171
+#: src/prefs_common.c:1165
 msgid "Automatic (Recommended)"
 msgstr "自动 (建议使用)"
 
-#: src/prefs_common.c:1173
+#: src/prefs_common.c:1167
 msgid "7bit ascii (US-ASCII)"
 msgstr "7位 ASCII (US-ASCII) "
 
-#: src/prefs_common.c:1175
+#: src/prefs_common.c:1169
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common.c:1177
+#: src/prefs_common.c:1171
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: src/prefs_common.c:1178
+#: src/prefs_common.c:1172
 msgid "Western European (ISO-8859-15)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common.c:1180
+#: src/prefs_common.c:1174
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common.c:1182
+#: src/prefs_common.c:1176
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的语 (ISO-8859-13)"
 
-#: src/prefs_common.c:1183
+#: src/prefs_common.c:1177
 msgid "Baltic (ISO-8859-4)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common.c:1185
+#: src/prefs_common.c:1179
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common.c:1187
+#: src/prefs_common.c:1181
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common.c:1188
+#: src/prefs_common.c:1182
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common.c:1190
+#: src/prefs_common.c:1184
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: src/prefs_common.c:1192
+#: src/prefs_common.c:1186
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫语 (ISO-8859-5)"
 
-#: src/prefs_common.c:1193
+#: src/prefs_common.c:1187
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫语 (KOI8-R)"
 
-#: src/prefs_common.c:1194
+#: src/prefs_common.c:1188
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫语 (KOI8-U)"
 
-#: src/prefs_common.c:1195
+#: src/prefs_common.c:1189
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common.c:1197
+#: src/prefs_common.c:1191
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日语 (ISO-2022-JP)"
 
-#: src/prefs_common.c:1199
+#: src/prefs_common.c:1193
 msgid "Japanese (EUC-JP)"
 msgstr "日语 (EUC-JP)"
 
-#: src/prefs_common.c:1200
+#: src/prefs_common.c:1194
 msgid "Japanese (Shift_JIS)"
 msgstr "日语 (Shift_JIS)"
 
-#: src/prefs_common.c:1203
+#: src/prefs_common.c:1197
 msgid "Simplified Chinese (GB2312)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common.c:1204
+#: src/prefs_common.c:1198
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common.c:1205
+#: src/prefs_common.c:1199
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体中文 (Big5)"
 
-#: src/prefs_common.c:1207
+#: src/prefs_common.c:1201
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体中文 (EUC-TW)"
 
-#: src/prefs_common.c:1208
+#: src/prefs_common.c:1202
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common.c:1211
+#: src/prefs_common.c:1205
 msgid "Korean (EUC-KR)"
 msgstr "朝鲜文 (EUC-KR)"
 
-#: src/prefs_common.c:1213
+#: src/prefs_common.c:1207
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common.c:1214
+#: src/prefs_common.c:1208
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common.c:1224
+#: src/prefs_common.c:1218
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr "如果选择“自动”，将使用最适合当前区域设置的编码方式。"
 
-#: src/prefs_common.c:1238
+#: src/prefs_common.c:1232
 msgid "Transfer encoding"
 msgstr "传输编码"
 
-#: src/prefs_common.c:1261
+#: src/prefs_common.c:1255
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr "指定当邮件内容包含非 ASCII 字符时使用的 Content-Transfer-Encoding。"
 
-#: src/prefs_common.c:1332
+#: src/prefs_common.c:1326
 msgid "Signature separator"
 msgstr "签名分隔符"
 
-#: src/prefs_common.c:1341
+#: src/prefs_common.c:1335
 msgid "Insert automatically"
 msgstr "自动插入"
 
-#: src/prefs_common.c:1351
+#: src/prefs_common.c:1345
 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 
-#: src/prefs_common.c:1361
+#: src/prefs_common.c:1355
 msgid "Undo level"
 msgstr "撤销次数"
 
-#: src/prefs_common.c:1381
+#: src/prefs_common.c:1375
 msgid "Wrap messages at"
 msgstr "邮件折行于第"
 
-#: src/prefs_common.c:1393
+#: src/prefs_common.c:1387
 msgid "characters"
 msgstr "个字符"
 
-#: src/prefs_common.c:1403
+#: src/prefs_common.c:1397
 msgid "Wrap quotation"
 msgstr "引文折行"
 
-#: src/prefs_common.c:1409
+#: src/prefs_common.c:1403
 msgid "Wrap on input"
 msgstr "输入时折行"
 
-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1405
 msgid "Wrap before sending"
 msgstr "发送前折行"
 
-#: src/prefs_common.c:1421
+#: src/prefs_common.c:1415
 msgid "Automatically select account for replies"
 msgstr "自动选择回复用的帐号"
 
-#: src/prefs_common.c:1423
+#: src/prefs_common.c:1417
 msgid "Quote message when replying"
 msgstr "回复时引用原文"
 
-#: src/prefs_common.c:1425
+#: src/prefs_common.c:1419
 msgid "Reply button invokes mailing list reply"
 msgstr "回复按钮会回复到邮件列表"
 
 #. reply
-#: src/prefs_common.c:1471
+#: src/prefs_common.c:1465
 msgid "Reply format"
 msgstr "回复格式"
 
-#: src/prefs_common.c:1486 src/prefs_common.c:1528
+#: src/prefs_common.c:1480 src/prefs_common.c:1522
 msgid "Quotation mark"
 msgstr "引文符号"
 
 #. forward
-#: src/prefs_common.c:1513
+#: src/prefs_common.c:1507
 msgid "Forward format"
 msgstr "转发格式"
 
-#: src/prefs_common.c:1560
+#: src/prefs_common.c:1554
 msgid " Description of symbols "
 msgstr " 符号描述 "
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1595
 msgid "Font"
 msgstr "字体"
 
-#: src/prefs_common.c:1633
+#: src/prefs_common.c:1627
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "翻译邮件头名(如“发件人：”、“主题：”)"
 
-#: src/prefs_common.c:1636
+#: src/prefs_common.c:1630
 msgid "Display unread number next to folder name"
 msgstr "在文件夹名后显示未读邮件的数量"
 
-#: src/prefs_common.c:1645
+#: src/prefs_common.c:1639
 msgid "Abbreviate newsgroups longer than"
 msgstr "缩写新闻组长于"
 
-#: src/prefs_common.c:1660
+#: src/prefs_common.c:1654
 msgid "letters"
 msgstr "信件"
 
 #. ---- Summary ----
-#: src/prefs_common.c:1666
+#: src/prefs_common.c:1660
 msgid "Summary View"
 msgstr "摘要视图"
 
-#: src/prefs_common.c:1675
+#: src/prefs_common.c:1669
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "如果发件人是您自己，“发件人”栏中显示的是收件人"
 
-#: src/prefs_common.c:1677
+#: src/prefs_common.c:1671
 msgid "Expand threads"
 msgstr "展开线索"
 
-#: src/prefs_common.c:1685 src/prefs_common.c:2627 src/prefs_common.c:2665
+#: src/prefs_common.c:1679 src/prefs_common.c:2617 src/prefs_common.c:2655
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common.c:1706
+#: src/prefs_common.c:1700
 msgid " Set display item of summary... "
 msgstr " 设置摘要中显示的项... "
 
-#: src/prefs_common.c:1772
+#: src/prefs_common.c:1766
 msgid "Enable coloration of message"
 msgstr "启用邮件的颜色表示"
 
-#: src/prefs_common.c:1786
+#: src/prefs_common.c:1780
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -4520,354 +4513,354 @@ msgstr ""
 "用单字节字符显示多字节字母和数字\n"
 "(仅适用于日语)"
 
-#: src/prefs_common.c:1792
+#: src/prefs_common.c:1786
 msgid "Display header pane above message view"
 msgstr "在邮件视图之上显示邮件头面板"
 
-#: src/prefs_common.c:1799
+#: src/prefs_common.c:1793
 msgid "Display short headers on message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common.c:1811
+#: src/prefs_common.c:1805
 msgid "Render HTML messages as text"
 msgstr "将HTML内容显示为文本"
 
-#: src/prefs_common.c:1814
+#: src/prefs_common.c:1808
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common.c:1826
+#: src/prefs_common.c:1820
 msgid "Line space"
 msgstr "邮件内容行间距"
 
-#: src/prefs_common.c:1840 src/prefs_common.c:1878
+#: src/prefs_common.c:1834 src/prefs_common.c:1872
 msgid "pixel(s)"
 msgstr "个像素"
 
-#: src/prefs_common.c:1845
+#: src/prefs_common.c:1839
 msgid "Scroll"
 msgstr "滚动"
 
-#: src/prefs_common.c:1852
+#: src/prefs_common.c:1846
 msgid "Half page"
 msgstr "半页滚动"
 
-#: src/prefs_common.c:1858
+#: src/prefs_common.c:1852
 msgid "Smooth scroll"
 msgstr "平滑滚动"
 
-#: src/prefs_common.c:1864
+#: src/prefs_common.c:1858
 msgid "Step"
 msgstr "每次滚动"
 
-#: src/prefs_common.c:1884
+#: src/prefs_common.c:1878
 msgid "Images"
 msgstr "图像"
 
-#: src/prefs_common.c:1892
+#: src/prefs_common.c:1886
 msgid "Resize attached large images to fit in the window"
 msgstr "将附件中的图像缩放至适合窗口大小"
 
-#: src/prefs_common.c:1894
+#: src/prefs_common.c:1888
 msgid "Display images as inline"
 msgstr "嵌入显示图像"
 
-#: src/prefs_common.c:1934
+#: src/prefs_common.c:1928
 msgid "Enable Junk mail control"
 msgstr ""
 
-#: src/prefs_common.c:1946
+#: src/prefs_common.c:1936
 #, fuzzy
 msgid "Learning command:"
 msgstr "执行命令"
 
-#: src/prefs_common.c:1967
+#: src/prefs_common.c:1957
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common.c:1979
+#: 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:1996
+#: src/prefs_common.c:1986
 #, fuzzy
 msgid "Junk folder"
 msgstr "文件夹："
 
-#: src/prefs_common.c:2013
+#: src/prefs_common.c:2003
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr ""
 
-#: src/prefs_common.c:2055
+#: src/prefs_common.c:2045
 msgid "Automatically check signatures"
 msgstr "自动检查签名"
 
-#: src/prefs_common.c:2058
+#: src/prefs_common.c:2048
 msgid "Show signature check result in a popup window"
 msgstr "在弹出窗口中显示签名检查结果"
 
-#: src/prefs_common.c:2061
+#: src/prefs_common.c:2051
 msgid "Store passphrase in memory temporarily"
 msgstr "将口令串临时存放在内存中"
 
-#: src/prefs_common.c:2076
+#: src/prefs_common.c:2066
 msgid "Expired after"
 msgstr "过期时间"
 
-#: src/prefs_common.c:2089
+#: src/prefs_common.c:2079
 msgid "minute(s) "
 msgstr "分钟后"
 
-#: src/prefs_common.c:2102
+#: src/prefs_common.c:2092
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "设置为“0”将在整个会话过程中储存口令串"
 
-#: src/prefs_common.c:2116
+#: src/prefs_common.c:2106
 msgid "Grab input while entering a passphrase"
 msgstr "输入口令串时捕获输入(更安全)"
 
-#: src/prefs_common.c:2121
+#: src/prefs_common.c:2111
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "如果 GnuPG 无法工作，在启动时显示警告"
 
-#: src/prefs_common.c:2173
+#: src/prefs_common.c:2163
 msgid "Always open messages in summary when selected"
 msgstr "在摘要窗口中选择邮件时打开邮件"
 
-#: src/prefs_common.c:2177
+#: src/prefs_common.c:2167
 msgid "Open first unread message when entering a folder"
 msgstr "进入文件夹时打开第一个未读的邮件"
 
-#: src/prefs_common.c:2181
+#: src/prefs_common.c:2171
 msgid "Only mark message as read when opened in new window"
 msgstr "仅在新窗口中打开邮件时标记邮件为已读"
 
-#: src/prefs_common.c:2185
+#: src/prefs_common.c:2175
 msgid "Go to inbox after receiving new mail"
 msgstr "收到新邮件时转到收件箱"
 
-#: src/prefs_common.c:2193
+#: src/prefs_common.c:2183
 msgid "Execute immediately when moving or deleting messages"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common.c:2205
+#: src/prefs_common.c:2195
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "如果该选项关闭，标记邮件直到完成执行。"
 
-#: src/prefs_common.c:2213
+#: src/prefs_common.c:2203
 msgid "Receive dialog"
 msgstr "收对话框"
 
-#: src/prefs_common.c:2223
+#: src/prefs_common.c:2213
 msgid "Show receive dialog"
 msgstr "显示接收对话框"
 
-#: src/prefs_common.c:2233
+#: src/prefs_common.c:2223
 msgid "Always"
 msgstr "总是"
 
-#: src/prefs_common.c:2234
+#: src/prefs_common.c:2224
 msgid "Only on manual receiving"
 msgstr "仅在手工接收时"
 
-#: src/prefs_common.c:2236
+#: src/prefs_common.c:2226
 msgid "Never"
 msgstr "从不"
 
-#: src/prefs_common.c:2241
+#: src/prefs_common.c:2231
 msgid "Don't popup error dialog on receive error"
 msgstr "在接收错误时不弹出错误对话框"
 
-#: src/prefs_common.c:2244
+#: src/prefs_common.c:2234
 msgid "Close receive dialog when finished"
 msgstr "完成后关闭接收对话框"
 
-#: src/prefs_common.c:2250
+#: src/prefs_common.c:2240
 msgid " Set key bindings... "
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common.c:2306
+#: src/prefs_common.c:2296
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部命令 (%s 将被替换为文件名或URI)"
 
-#: src/prefs_common.c:2315
+#: src/prefs_common.c:2305
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: src/prefs_common.c:2379
+#: src/prefs_common.c:2369
 msgid "Add address to destination when double-clicked"
 msgstr "双击时将地址添加为收件人"
 
-#: src/prefs_common.c:2381
+#: src/prefs_common.c:2371
 msgid "On exit"
 msgstr "退出程序时"
 
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2379
 msgid "Confirm on exit"
 msgstr "退出时进行确认"
 
-#: src/prefs_common.c:2396
+#: src/prefs_common.c:2386
 msgid "Empty trash on exit"
 msgstr "退出时清空废件箱"
 
-#: src/prefs_common.c:2398
+#: src/prefs_common.c:2388
 msgid "Ask before emptying"
 msgstr "在清空前询问"
 
-#: src/prefs_common.c:2402
+#: src/prefs_common.c:2392
 msgid "Warn if there are queued messages"
 msgstr "如果队列中有邮件就发出警告"
 
-#: src/prefs_common.c:2408
+#: src/prefs_common.c:2398
 msgid "Socket I/O timeout:"
 msgstr "套接字 I/O 超时："
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2411
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common.c:2603
+#: src/prefs_common.c:2593
 msgid "the full abbreviated weekday name"
 msgstr "缩写的星期名"
 
-#: src/prefs_common.c:2604
+#: src/prefs_common.c:2594
 msgid "the full weekday name"
 msgstr "完整的星期名"
 
-#: src/prefs_common.c:2605
+#: src/prefs_common.c:2595
 msgid "the abbreviated month name"
 msgstr "缩写的月份名"
 
-#: src/prefs_common.c:2606
+#: src/prefs_common.c:2596
 msgid "the full month name"
 msgstr "完整的月份名"
 
-#: src/prefs_common.c:2607
+#: src/prefs_common.c:2597
 msgid "the preferred date and time for the current locale"
 msgstr "当前区域设置首选的日期和时间格式"
 
-#: src/prefs_common.c:2608
+#: src/prefs_common.c:2598
 msgid "the century number (year/100)"
 msgstr "世纪(年份/100)"
 
-#: src/prefs_common.c:2609
+#: src/prefs_common.c:2599
 msgid "the day of the month as a decimal number"
 msgstr "十进制表示的月中的天数"
 
-#: src/prefs_common.c:2610
+#: src/prefs_common.c:2600
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24小时时钟的十进制小时"
 
-#: src/prefs_common.c:2611
+#: src/prefs_common.c:2601
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12小时时钟的十进制小时"
 
-#: src/prefs_common.c:2612
+#: src/prefs_common.c:2602
 msgid "the day of the year as a decimal number"
 msgstr "十进制表示的一年中的天数"
 
-#: src/prefs_common.c:2613
+#: src/prefs_common.c:2603
 msgid "the month as a decimal number"
 msgstr "十进制表示的月份"
 
-#: src/prefs_common.c:2614
+#: src/prefs_common.c:2604
 msgid "the minute as a decimal number"
 msgstr "十进制表示的天数"
 
-#: src/prefs_common.c:2615
+#: src/prefs_common.c:2605
 msgid "either AM or PM"
 msgstr "AM或PM"
 
-#: src/prefs_common.c:2616
+#: src/prefs_common.c:2606
 msgid "the second as a decimal number"
 msgstr "十进制表示的秒"
 
-#: src/prefs_common.c:2617
+#: src/prefs_common.c:2607
 msgid "the day of the week as a decimal number"
 msgstr "十进制表示的星期中的天数"
 
-#: src/prefs_common.c:2618
+#: src/prefs_common.c:2608
 msgid "the preferred date for the current locale"
 msgstr "当前区域设置的首选日期格式"
 
-#: src/prefs_common.c:2619
+#: src/prefs_common.c:2609
 msgid "the last two digits of a year"
 msgstr "年份的最后两个数字"
 
-#: src/prefs_common.c:2620
+#: src/prefs_common.c:2610
 msgid "the year as a decimal number"
 msgstr "十进制的年份"
 
-#: src/prefs_common.c:2621
+#: src/prefs_common.c:2611
 msgid "the time zone or name or abbreviation"
 msgstr "时区、名字或缩写"
 
-#: src/prefs_common.c:2642
+#: src/prefs_common.c:2632
 msgid "Specifier"
 msgstr "说明符"
 
-#: src/prefs_common.c:2643
+#: src/prefs_common.c:2633
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common.c:2683
+#: src/prefs_common.c:2673
 msgid "Example"
 msgstr "示例"
 
-#: src/prefs_common.c:2764
+#: src/prefs_common.c:2754
 msgid "Set message colors"
 msgstr "设置邮件颜色"
 
-#: src/prefs_common.c:2772
+#: src/prefs_common.c:2762
 msgid "Colors"
 msgstr "颜色"
 
-#: src/prefs_common.c:2806
+#: src/prefs_common.c:2796
 msgid "Quoted Text - First Level"
 msgstr "引文－第一级"
 
-#: src/prefs_common.c:2812
+#: src/prefs_common.c:2802
 msgid "Quoted Text - Second Level"
 msgstr "引文－第二级"
 
-#: src/prefs_common.c:2818
+#: src/prefs_common.c:2808
 msgid "Quoted Text - Third Level"
 msgstr "引文－第三级"
 
-#: src/prefs_common.c:2824
+#: src/prefs_common.c:2814
 msgid "URI link"
 msgstr "URI 链接"
 
-#: src/prefs_common.c:2831
+#: src/prefs_common.c:2821
 msgid "Recycle quote colors"
 msgstr "循环使用引文颜色"
 
-#: src/prefs_common.c:2891
+#: src/prefs_common.c:2881
 msgid "Pick color for quotation level 1"
 msgstr "选择引文级别 1 的颜色"
 
-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2884
 msgid "Pick color for quotation level 2"
 msgstr "选择引文级别 2 的颜色"
 
-#: src/prefs_common.c:2897
+#: src/prefs_common.c:2887
 msgid "Pick color for quotation level 3"
 msgstr "选择引文级别 3 的颜色"
 
-#: src/prefs_common.c:2900
+#: src/prefs_common.c:2890
 msgid "Pick color for URI"
 msgstr "选择URI的颜色"
 
-#: src/prefs_common.c:3037
+#: src/prefs_common.c:3027
 msgid "Description of symbols"
 msgstr "符号的描述"
 
-#: src/prefs_common.c:3093
+#: src/prefs_common.c:3083
 msgid ""
 "Date\n"
 "From\n"
@@ -4891,11 +4884,11 @@ msgstr ""
 "新闻组\n"
 "邮件标识号"
 
-#: src/prefs_common.c:3106
+#: src/prefs_common.c:3096
 msgid "If x is set, displays expr"
 msgstr "如果 x 设置了值则显示 expr"
 
-#: src/prefs_common.c:3110
+#: src/prefs_common.c:3100
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -4909,7 +4902,7 @@ msgstr ""
 "没有签名的引文内容\n"
 "%"
 
-#: src/prefs_common.c:3118
+#: src/prefs_common.c:3108
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -4921,15 +4914,15 @@ msgstr ""
 "左括号\n"
 "右括号"
 
-#: src/prefs_common.c:3155
+#: src/prefs_common.c:3145
 msgid "Font selection"
 msgstr "字体选择"
 
-#: src/prefs_common.c:3224
+#: src/prefs_common.c:3214
 msgid "Key bindings"
 msgstr "键盘关联"
 
-#: src/prefs_common.c:3238
+#: src/prefs_common.c:3228
 msgid ""
 "Select the preset of key bindings.\n"
 "You can also modify each menu's shortcuts by pressing\n"
@@ -4939,11 +4932,11 @@ msgstr ""
 "您也可以将鼠标放在菜单项上并按下任何键\n"
 "(或组合键)来修改菜单快捷键。"
 
-#: src/prefs_common.c:3250 src/prefs_common.c:3574
+#: src/prefs_common.c:3240 src/prefs_common.c:3564
 msgid "Default"
 msgstr "默认"
 
-#: src/prefs_common.c:3253 src/prefs_common.c:3583
+#: src/prefs_common.c:3243 src/prefs_common.c:3573
 msgid "Old Sylpheed"
 msgstr "旧式的Sylpheed"
 
@@ -5244,17 +5237,17 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:71 src/summaryview.c:4115
+#: src/prefs_summary_column.c:71 src/summaryview.c:4141
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:72 src/summaryview.c:4118
+#: src/prefs_summary_column.c:72 src/summaryview.c:4144
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:73 src/summaryview.c:4120
+#: src/prefs_summary_column.c:73 src/summaryview.c:4146
 msgid "Date"
 msgstr "日期"
 
@@ -5817,213 +5810,213 @@ msgstr "有一些剩余标记。处理吗？"
 msgid "Scanning folder (%s)..."
 msgstr "正在扫描文件夹 (%s)..."
 
-#: src/summaryview.c:1131
+#: src/summaryview.c:1133
 msgid "Search again"
 msgstr "再次查找"
 
-#: src/summaryview.c:1153 src/summaryview.c:1162
+#: src/summaryview.c:1155 src/summaryview.c:1164
 msgid "No more unread messages"
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1154
+#: src/summaryview.c:1156
 msgid "No unread message found. Search from the end?"
 msgstr "没发现未读邮件。从后面开始查找？"
 
-#: src/summaryview.c:1156
+#: src/summaryview.c:1158
 msgid "No unread messages."
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1163
+#: src/summaryview.c:1165
 msgid "No unread message found. Go to next folder?"
 msgstr "没发现未读邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1171 src/summaryview.c:1180
+#: src/summaryview.c:1173 src/summaryview.c:1182
 msgid "No more new messages"
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1172
+#: src/summaryview.c:1174
 msgid "No new message found. Search from the end?"
 msgstr "没发现新邮件。从后面开始查找？"
 
-#: src/summaryview.c:1174
+#: src/summaryview.c:1176
 msgid "No new messages."
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1181
+#: src/summaryview.c:1183
 msgid "No new message found. Go to next folder?"
 msgstr "没发现新邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1189 src/summaryview.c:1198
+#: src/summaryview.c:1191 src/summaryview.c:1200
 msgid "No more marked messages"
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1190
+#: src/summaryview.c:1192
 msgid "No marked message found. Search from the end?"
 msgstr "没有标记过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1192 src/summaryview.c:1201
+#: src/summaryview.c:1194 src/summaryview.c:1203
 msgid "No marked messages."
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1199
+#: src/summaryview.c:1201
 msgid "No marked message found. Search from the beginning?"
 msgstr "没有标记过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1207 src/summaryview.c:1216
+#: src/summaryview.c:1209 src/summaryview.c:1218
 msgid "No more labeled messages"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/summaryview.c:1208
+#: src/summaryview.c:1210
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到用颜色标注过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1210 src/summaryview.c:1219
+#: src/summaryview.c:1212 src/summaryview.c:1221
 msgid "No labeled messages."
 msgstr "没有用颜色标注的邮件。"
 
-#: src/summaryview.c:1217
+#: src/summaryview.c:1219
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到用颜色标注过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1500
+#: src/summaryview.c:1504
 msgid "Attracting messages by subject..."
 msgstr "正在按标题归类邮件..."
 
-#: src/summaryview.c:1659
+#: src/summaryview.c:1663
 #, c-format
 msgid "%d deleted"
 msgstr "删除了 %d 个邮件"
 
-#: src/summaryview.c:1663
+#: src/summaryview.c:1667
 #, c-format
 msgid "%s%d moved"
 msgstr "移动了 %s%d"
 
-#: src/summaryview.c:1664 src/summaryview.c:1671
+#: src/summaryview.c:1668 src/summaryview.c:1675
 msgid ", "
 msgstr "，"
 
-#: src/summaryview.c:1669
+#: src/summaryview.c:1673
 #, c-format
 msgid "%s%d copied"
 msgstr "复制了 %s%d"
 
-#: src/summaryview.c:1686
+#: src/summaryview.c:1690
 msgid " item(s) selected"
 msgstr " 项被选中"
 
-#: src/summaryview.c:1696
+#: src/summaryview.c:1700
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 个新邮件，%d 个未读邮件，共 %d 个邮件(%s)"
 
-#: src/summaryview.c:1702
+#: src/summaryview.c:1706
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 个新邮件邮件，%d 个未读邮件，共 %d 个邮件"
 
-#: src/summaryview.c:1743
+#: src/summaryview.c:1747
 msgid "Sorting summary..."
 msgstr "正在排序摘要..."
 
-#: src/summaryview.c:1818
+#: src/summaryview.c:1822
 msgid "(No Date)"
 msgstr "(没有日期)"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1950
 msgid "\tSetting summary from message data..."
 msgstr "\t正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1952
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2054
+#: src/summaryview.c:2077
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2358
+#: src/summaryview.c:2381
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:2400
+#: src/summaryview.c:2423
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:2472
+#: src/summaryview.c:2495
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:2525
+#: src/summaryview.c:2548
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:2543
+#: src/summaryview.c:2566
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:2544
+#: src/summaryview.c:2567
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:2609
+#: src/summaryview.c:2632
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:2646
+#: src/summaryview.c:2669
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:2696
+#: src/summaryview.c:2719
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:2713
+#: src/summaryview.c:2736
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:2767
+#: src/summaryview.c:2790
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:2784
+#: src/summaryview.c:2807
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:2976
+#: src/summaryview.c:2999
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3270 src/summaryview.c:3271
+#: src/summaryview.c:3293 src/summaryview.c:3294
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:3368 src/summaryview.c:3369
+#: src/summaryview.c:3391 src/summaryview.c:3392
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:3631
+#: src/summaryview.c:3657
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:3632
+#: src/summaryview.c:3658
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:3662
+#: src/summaryview.c:3688
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:4124
+#: src/summaryview.c:4150
 msgid "No."
 msgstr "No."
 
@@ -6084,6 +6077,12 @@ msgstr "%.2fGB"
 msgid "writing to %s failed.\n"
 msgstr "写入 %s 时失败。\n"
 
+#~ msgid "External program"
+#~ msgstr "外部程序"
+
+#~ msgid "Local spool"
+#~ msgstr "本地邮件池"
+
 #~ msgid "Sending queued message %d failed.\n"
 #~ msgstr "发送队列中的邮件 %d 失败。\n"