2006-07-31 [paul] 2.3.1cvs90

[claws.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 303ff36943aa8bccc402e4134b4ecb7754493317..1aa1fd171d5ba4127bb1ba4361e8921c00991dbb 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2003 Tsu-Fan Cheng
 # This file is distributed under the same license as the sylpheed-claws package.
 # Tsu-Fan Cheng <tscheng@ic.sunysb.edu> 2003
-# Ralgh Young <glyoung@users.sourceforge.net> 2004,2005
+# Ralgh Young <glyoung@users.sourceforge.net> 2004-2006
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claw\n"
 "Report-Msgid-Bugs-To: paul@sylpheed.org\n"
-"POT-Creation-Date: 2006-06-05 07:15+0100\n"
-"PO-Revision-Date: 2006-06-06 23:14中國標準時間\n"
+"POT-Creation-Date: 2006-07-24 05:45+0100\n"
+"PO-Revision-Date: 2006-07-30 00:25+0800\n"
 "Last-Translator: Ralgh Young <glyoung@users.sourceforge.net>\n"
 "Language-Team: Ralgh Young <glyoung@users.sourceforge.net> \n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/account.c:376
+#: src/account.c:377
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -25,15 +25,15 @@ msgstr ""
 "您正在撰写邮件，\n"
 "请关掉所有撰写中的邮件再进行帐号设置。"
 
-#: src/account.c:423
+#: src/account.c:424
 msgid "Can't create folder."
 msgstr "无法创建邮件夹。"
 
-#: src/account.c:679
+#: src/account.c:681
 msgid "Edit accounts"
 msgstr "编辑帐号设置"
 
-#: src/account.c:697
+#: src/account.c:699
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the 'G' column to enable message retrieval by 'Get Mail'."
@@ -41,46 +41,46 @@ msgstr ""
 "检查新邮件时将会依照下面的顺序。您可以勾选 G 栏位中的方块，\n"
 "来决定是否在「全部收取」时要检查该帐号的邮件。"
 
-#: src/account.c:772
+#: src/account.c:774
 msgid " _Set as default account "
 msgstr " 设为缺省帐号(_S) "
 
-#: src/account.c:862
+#: src/account.c:868
 msgid "Accounts with remote folders cannot be copied."
 msgstr "不能克隆有远程邮件夹的帐户。"
 
-#: src/account.c:868
+#: src/account.c:874
 #, c-format
 msgid "Copy of %s"
 msgstr "%s 副本"
 
-#: src/account.c:1007
+#: src/account.c:1012
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "您确定要删除帐号 '%s' 吗？"
 
-#: src/account.c:1009
+#: src/account.c:1014
 msgid "(Untitled)"
 msgstr "(未命名)"
 
-#: src/account.c:1010
+#: src/account.c:1015
 msgid "Delete account"
 msgstr "删除帐号"
 
-#: src/account.c:1451 src/addressadd.c:196 src/addressbook.c:117
-#: src/compose.c:5467 src/compose.c:5758 src/editaddress.c:953
+#: src/account.c:1456 src/addressadd.c:196 src/addressbook.c:118
+#: src/compose.c:5519 src/compose.c:5810 src/editaddress.c:953
 #: src/editaddress.c:1002 src/editbook.c:175 src/editgroup.c:279
 #: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
-#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:201
-#: src/plugins/pgpcore/select-keys.c:338 src/prefs_filtering.c:1317
+#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:203
+#: src/plugins/pgpcore/select-keys.c:338 src/prefs_filtering.c:1342
 msgid "Name"
 msgstr "名称"
 
-#: src/account.c:1458 src/prefs_account.c:1183
+#: src/account.c:1463 src/prefs_account.c:1165 src/prefs_account.c:2686
 msgid "Protocol"
 msgstr "通讯协议"
 
-#: src/account.c:1465 src/ssl_manager.c:99
+#: src/account.c:1470 src/ssl_manager.c:99
 msgid "Server"
 msgstr "服务器"
 
@@ -126,25 +126,25 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: src/action.c:1143 src/action.c:1293
+#: src/action.c:1144 src/action.c:1294
 msgid "Completed"
 msgstr "已完成"
 
-#: src/action.c:1179
+#: src/action.c:1180
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 正在运行: %s\n"
 
-#: src/action.c:1183
+#: src/action.c:1184
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 已经结束: %s\n"
 
-#: src/action.c:1216
+#: src/action.c:1217
 msgid "Action's input/output"
 msgstr "动作输入/输出"
 
-#: src/action.c:1526
+#: src/action.c:1527
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -155,11 +155,11 @@ msgstr ""
 "(`%%h' 将被所输入的参数替换)\n"
 "  %s"
 
-#: src/action.c:1531
+#: src/action.c:1532
 msgid "Action's hidden user argument"
 msgstr "用户提供的参数(输入时不回显)"
 
-#: src/action.c:1535
+#: src/action.c:1536
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
@@ -170,7 +170,7 @@ msgstr ""
 "(`%%u' 将被输入的参数替换)\n"
 "  %s"
 
-#: src/action.c:1540
+#: src/action.c:1541
 msgid "Action's user argument"
 msgstr "用户提供的参数"
 
@@ -183,7 +183,7 @@ msgstr "将地址加入地址簿"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:218 src/addressbook.c:119 src/editaddress.c:761
+#: src/addressadd.c:218 src/addressbook.c:120 src/editaddress.c:761
 #: src/editaddress.c:825 src/editgroup.c:281
 msgid "Remarks"
 msgstr "备注"
@@ -192,345 +192,345 @@ msgstr "备注"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿资料夹"
 
-#: src/addressbook.c:118 src/editaddress.c:759 src/editaddress.c:807
+#: src/addressbook.c:119 src/editaddress.c:759 src/editaddress.c:807
 #: src/editgroup.c:280 src/expldifdlg.c:521 src/exporthtml.c:638
 #: src/exporthtml.c:802 src/ldif.c:835
 msgid "Email Address"
 msgstr "电子邮件"
 
-#: src/addressbook.c:401
+#: src/addressbook.c:402
 msgid "/_Book"
 msgstr "/地址簿(_B)"
 
-#: src/addressbook.c:402
+#: src/addressbook.c:403
 msgid "/_Book/New _Book"
 msgstr "/地址簿(_B)/新增地址簿(_B)"
 
-#: src/addressbook.c:403
+#: src/addressbook.c:404
 msgid "/_Book/New _Folder"
 msgstr "/地址簿(_B)/新资料夹(_F)"
 
-#: src/addressbook.c:404
+#: src/addressbook.c:405
 msgid "/_Book/New _vCard"
 msgstr "/地址簿(_B)/新增_vCard"
 
-#: src/addressbook.c:406
+#: src/addressbook.c:407
 msgid "/_Book/New _JPilot"
 msgstr "/地址簿(_B)/新增_J-Pilot"
 
-#: src/addressbook.c:409
+#: src/addressbook.c:410
 msgid "/_Book/New LDAP _Server"
 msgstr "/地址簿(_B)/新增LDAP服务器(_S)"
 
-#: src/addressbook.c:411 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:415
 msgid "/_Book/---"
 msgstr "/地址簿(_B)/---"
 
-#: src/addressbook.c:412
+#: src/addressbook.c:413
 msgid "/_Book/_Edit book"
 msgstr "/地址簿(_B)/编辑地址簿(_E)"
 
-#: src/addressbook.c:413
+#: src/addressbook.c:414
 msgid "/_Book/_Delete book"
 msgstr "/地址簿(_B)/删除地址簿(_D)"
 
-#: src/addressbook.c:415
+#: src/addressbook.c:416
 msgid "/_Book/_Save"
 msgstr "/地址簿(_B)/保存(_S)"
 
-#: src/addressbook.c:416
+#: src/addressbook.c:417
 msgid "/_Book/_Close"
 msgstr "/地址簿(_B)/关闭(_C)"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:418
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:418
+#: src/addressbook.c:419
 msgid "/_Address/_Select all"
 msgstr "/地址(_A)/全选(_S)"
 
-#: src/addressbook.c:419 src/addressbook.c:423 src/addressbook.c:426
-#: src/addressbook.c:429
+#: src/addressbook.c:420 src/addressbook.c:424 src/addressbook.c:427
+#: src/addressbook.c:430
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:421
 msgid "/_Address/C_ut"
 msgstr "/地址(_A)/剪切(_u)"
 
-#: src/addressbook.c:421
+#: src/addressbook.c:422
 msgid "/_Address/_Copy"
 msgstr "/地址(_A)/拷贝(_C)"
 
-#: src/addressbook.c:422
+#: src/addressbook.c:423
 msgid "/_Address/_Paste"
 msgstr "/地址(_A)/删除(_P)"
 
-#: src/addressbook.c:424
+#: src/addressbook.c:425
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:425
+#: src/addressbook.c:426
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:427
+#: src/addressbook.c:428
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
-#: src/addressbook.c:428
+#: src/addressbook.c:429
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群组(_G)"
 
-#: src/addressbook.c:430
+#: src/addressbook.c:431
 msgid "/_Address/_Mail To"
 msgstr "/地址(_A)/发送邮件(_M)"
 
-#: src/addressbook.c:431 src/compose.c:757 src/mainwindow.c:754
-#: src/messageview.c:300
+#: src/addressbook.c:432 src/compose.c:756 src/mainwindow.c:759
+#: src/messageview.c:295
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/addressbook.c:432
+#: src/addressbook.c:433
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/工具(_T)/导入 _LDIF 文件..."
 
-#: src/addressbook.c:433
+#: src/addressbook.c:434
 msgid "/_Tools/Import M_utt file..."
 msgstr "/工具(_T)/导入 M_utt 文件..."
 
-#: src/addressbook.c:434
+#: src/addressbook.c:435
 msgid "/_Tools/Import _Pine file..."
 msgstr "/工具(_T)/导入 _Pine 文件..."
 
-#: src/addressbook.c:435 src/mainwindow.c:763 src/mainwindow.c:786
-#: src/mainwindow.c:788 src/mainwindow.c:797 src/mainwindow.c:800
-#: src/mainwindow.c:804 src/messageview.c:304 src/messageview.c:325
+#: src/addressbook.c:436 src/mainwindow.c:768 src/mainwindow.c:791
+#: src/mainwindow.c:793 src/mainwindow.c:802 src/mainwindow.c:805
+#: src/mainwindow.c:809 src/messageview.c:299 src/messageview.c:320
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/addressbook.c:436
+#: src/addressbook.c:437
 msgid "/_Tools/Export _HTML..."
 msgstr "/工具(_T)/导出为 _HTML..."
 
-#: src/addressbook.c:437
+#: src/addressbook.c:438
 msgid "/_Tools/Export LDI_F..."
 msgstr "/工具(_T)/导出为 LDI_F..."
 
-#: src/addressbook.c:438 src/compose.c:762 src/mainwindow.c:829
-#: src/messageview.c:328
+#: src/addressbook.c:439 src/compose.c:761 src/mainwindow.c:834
+#: src/messageview.c:323
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:439 src/compose.c:763 src/mainwindow.c:835
-#: src/messageview.c:329
+#: src/addressbook.c:440 src/compose.c:762 src/mainwindow.c:840
+#: src/messageview.c:324
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:444 src/addressbook.c:458 src/compose.c:536
-#: src/mainwindow.c:488 src/messageview.c:164
+#: src/addressbook.c:445 src/addressbook.c:459 src/compose.c:535
+#: src/mainwindow.c:492 src/messageview.c:161
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:445 src/addressbook.c:459
+#: src/addressbook.c:446 src/addressbook.c:460
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:446 src/addressbook.c:448 src/addressbook.c:457
-#: src/addressbook.c:460 src/addressbook.c:463 src/addressbook.c:467
-#: src/compose.c:515 src/imap_gtk.c:59 src/imap_gtk.c:62 src/imap_gtk.c:66
+#: src/addressbook.c:447 src/addressbook.c:449 src/addressbook.c:458
+#: src/addressbook.c:461 src/addressbook.c:464 src/addressbook.c:468
+#: src/compose.c:514 src/imap_gtk.c:59 src/imap_gtk.c:62 src/imap_gtk.c:66
 #: src/mh_gtk.c:54 src/mh_gtk.c:58 src/mh_gtk.c:60 src/news_gtk.c:54
 #: src/news_gtk.c:57 src/news_gtk.c:59 src/plugins/trayicon/trayicon.c:94
 #: src/plugins/trayicon/trayicon.c:97 src/plugins/trayicon/trayicon.c:99
-#: src/summaryview.c:422 src/summaryview.c:426 src/summaryview.c:431
-#: src/summaryview.c:449 src/summaryview.c:470 src/summaryview.c:476
+#: src/summaryview.c:423 src/summaryview.c:427 src/summaryview.c:432
+#: src/summaryview.c:450 src/summaryview.c:471 src/summaryview.c:477
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:447
+#: src/addressbook.c:448
 msgid "/New _Folder"
 msgstr "/新资料夹(_F)"
 
-#: src/addressbook.c:449 src/addressbook.c:464
+#: src/addressbook.c:450 src/addressbook.c:465
 msgid "/C_ut"
 msgstr "/剪切(_u)"
 
-#: src/addressbook.c:450 src/addressbook.c:465
+#: src/addressbook.c:451 src/addressbook.c:466
 msgid "/_Copy"
 msgstr "/复制(_C)"
 
-#: src/addressbook.c:451 src/addressbook.c:466
+#: src/addressbook.c:452 src/addressbook.c:467
 msgid "/_Paste"
 msgstr "/粘贴(_P)"
 
-#: src/addressbook.c:456
+#: src/addressbook.c:457
 msgid "/_Select all"
 msgstr "/全选(_S)"
 
-#: src/addressbook.c:461
+#: src/addressbook.c:462
 msgid "/New _Address"
 msgstr "/新地址(_A)"
 
-#: src/addressbook.c:462
+#: src/addressbook.c:463
 msgid "/New _Group"
 msgstr "/新群组(_G)"
 
-#: src/addressbook.c:469
+#: src/addressbook.c:470
 msgid "/_Mail To"
 msgstr "/发送邮件(_M)"
 
-#: src/addressbook.c:471
+#: src/addressbook.c:472
 msgid "/_Browse Entry"
 msgstr "/查看项目(_B)"
 
-#: src/addressbook.c:484 src/crash.c:450 src/crash.c:469 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:122 src/prefs_themes.c:683
+#: src/addressbook.c:485 src/crash.c:450 src/crash.c:469 src/importldif.c:119
+#: src/plugins/pgpcore/sgpgme.c:123 src/prefs_themes.c:683
 #: src/prefs_themes.c:715 src/prefs_themes.c:716
 msgid "Unknown"
 msgstr "未知"
 
-#: src/addressbook.c:491 src/addressbook.c:510 src/importldif.c:126
+#: src/addressbook.c:492 src/addressbook.c:511 src/importldif.c:126
 msgid "Success"
 msgstr "成功"
 
-#: src/addressbook.c:492 src/importldif.c:127
+#: src/addressbook.c:493 src/importldif.c:127
 msgid "Bad arguments"
 msgstr "错误的参数"
 
-#: src/addressbook.c:493 src/importldif.c:128
+#: src/addressbook.c:494 src/importldif.c:128
 msgid "File not specified"
 msgstr "未指定文件"
 
-#: src/addressbook.c:494 src/importldif.c:129
+#: src/addressbook.c:495 src/importldif.c:129
 msgid "Error opening file"
 msgstr "打开文件错误"
 
-#: src/addressbook.c:495 src/importldif.c:130
+#: src/addressbook.c:496 src/importldif.c:130
 msgid "Error reading file"
 msgstr "读取文件错误"
 
-#: src/addressbook.c:496 src/importldif.c:131
+#: src/addressbook.c:497 src/importldif.c:131
 msgid "End of file encountered"
 msgstr "遇到文件末尾"
 
-#: src/addressbook.c:497 src/importldif.c:132
+#: src/addressbook.c:498 src/importldif.c:132
 msgid "Error allocating memory"
 msgstr "内存分配错误"
 
-#: src/addressbook.c:498 src/importldif.c:133
+#: src/addressbook.c:499 src/importldif.c:133
 msgid "Bad file format"
 msgstr "文件格式错误"
 
-#: src/addressbook.c:499 src/importldif.c:134
+#: src/addressbook.c:500 src/importldif.c:134
 msgid "Error writing to file"
 msgstr "文件写入错误"
 
-#: src/addressbook.c:500 src/importldif.c:135
+#: src/addressbook.c:501 src/importldif.c:135
 msgid "Error opening directory"
 msgstr "打开目录错误"
 
-#: src/addressbook.c:501 src/importldif.c:136
+#: src/addressbook.c:502 src/importldif.c:136
 msgid "No path specified"
 msgstr "未指定文件路径"
 
-#: src/addressbook.c:511
+#: src/addressbook.c:512
 msgid "Error connecting to LDAP server"
 msgstr "LDAP 服务器连接错误"
 
-#: src/addressbook.c:512
+#: src/addressbook.c:513
 msgid "Error initializing LDAP"
 msgstr "LDAP 起始错误"
 
-#: src/addressbook.c:513
+#: src/addressbook.c:514
 msgid "Error binding to LDAP server"
 msgstr "无法连接到LDAP服务器"
 
-#: src/addressbook.c:514
+#: src/addressbook.c:515
 msgid "Error searching LDAP database"
 msgstr "搜寻LDAP资料库时出错"
 
-#: src/addressbook.c:515
+#: src/addressbook.c:516
 msgid "Timeout performing LDAP operation"
 msgstr "进行LDAP操作时超时"
 
-#: src/addressbook.c:516
+#: src/addressbook.c:517
 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜寻条件错误"
 
-#: src/addressbook.c:517
+#: src/addressbook.c:518
 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP搜寻没有结果"
 
-#: src/addressbook.c:518
+#: src/addressbook.c:519
 msgid "LDAP search terminated on request"
 msgstr "LDAP已按请求终止"
 
-#: src/addressbook.c:519
+#: src/addressbook.c:520
 msgid "Error starting TLS connection"
 msgstr "创建TLS链接时发生错误"
 
-#: src/addressbook.c:833
+#: src/addressbook.c:835
 msgid "Sources"
 msgstr "来源"
 
-#: src/addressbook.c:837 src/prefs_other.c:97 src/toolbar.c:190
+#: src/addressbook.c:839 src/prefs_other.c:100 src/toolbar.c:190
 #: src/toolbar.c:1730
 msgid "Address book"
 msgstr "地址簿"
 
-#: src/addressbook.c:960
+#: src/addressbook.c:962
 msgid "Lookup name:"
 msgstr "查找姓名:"
 
-#: src/addressbook.c:1018 src/compose.c:1951 src/compose.c:4145
-#: src/compose.c:5322 src/compose.c:6074 src/prefs_template.c:205
-#: src/summary_search.c:261
+#: src/addressbook.c:1026 src/compose.c:1959 src/compose.c:4187
+#: src/compose.c:5381 src/compose.c:6126 src/prefs_template.c:207
+#: src/summary_search.c:264
 msgid "To:"
 msgstr "To:"
 
-#: src/addressbook.c:1022 src/compose.c:1935 src/compose.c:3942
-#: src/compose.c:4144 src/prefs_template.c:207
+#: src/addressbook.c:1030 src/compose.c:1943 src/compose.c:3966
+#: src/compose.c:4186 src/prefs_template.c:209
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:1026 src/compose.c:1938 src/compose.c:3970
-#: src/prefs_template.c:209
+#: src/addressbook.c:1034 src/compose.c:1946 src/compose.c:3997
+#: src/prefs_template.c:211
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/addressbook.c:1260 src/addressbook.c:1283
+#: src/addressbook.c:1269 src/addressbook.c:1292
 msgid "Delete address(es)"
 msgstr "删除邮件地址"
 
-#: src/addressbook.c:1261
+#: src/addressbook.c:1270
 msgid "This address data is readonly and cannot be deleted."
 msgstr "此邮件地址数据是只读的，不能删除。"
 
-#: src/addressbook.c:1284
+#: src/addressbook.c:1293
 msgid "Really delete the address(es)?"
 msgstr "确定删除邮件地址?"
 
-#: src/addressbook.c:1878
+#: src/addressbook.c:1887
 msgid "Cannot paste. Target address book is readonly."
 msgstr "无法粘贴，该地址簿已设为只读。"
 
-#: src/addressbook.c:1889
+#: src/addressbook.c:1898
 msgid "Cannot paste into an address group."
 msgstr "无法贴入指定的通讯群组。"
 
 # c-format
-#: src/addressbook.c:2545
+#: src/addressbook.c:2554
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "您想要删除'%s'里面的查询结果和地址信息吗?"
 
-#: src/addressbook.c:2548 src/addressbook.c:2574
+#: src/addressbook.c:2557 src/addressbook.c:2583
 #: src/prefs_filtering_action.c:152
 msgid "Delete"
 msgstr "删除"
 
-#: src/addressbook.c:2557
+#: src/addressbook.c:2566
 #, c-format
 msgid ""
 "Do you want to delete '%s' ?If you delete the folder only, the addresses it "
@@ -539,19 +539,19 @@ msgstr ""
 "您确定要删除'%s'这个资料夹以及里面所有的地址吗？ \n"
 "如果只删除资料夹，地址簿会被移到上一层的资料夹中。"
 
-#: src/addressbook.c:2560 src/imap_gtk.c:283 src/mh_gtk.c:179
+#: src/addressbook.c:2569 src/imap_gtk.c:283 src/mh_gtk.c:179
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:2561
+#: src/addressbook.c:2570
 msgid "+Delete _folder only"
 msgstr "+只删除目录(_f)"
 
-#: src/addressbook.c:2561
+#: src/addressbook.c:2570
 msgid "Delete folder and _addresses"
 msgstr "删除目录及地址数据"
 
-#: src/addressbook.c:2572
+#: src/addressbook.c:2581
 #, c-format
 msgid ""
 "Do you want to delete '%s'?\n"
@@ -560,19 +560,19 @@ msgstr ""
 "您想要删除'%s'吗?\n"
 "里面的地址数据将会丢失。"
 
-#: src/addressbook.c:3382
+#: src/addressbook.c:3391
 msgid "New user, could not save index file."
 msgstr "新用户，无法保存索引文件。"
 
-#: src/addressbook.c:3386
+#: src/addressbook.c:3395
 msgid "New user, could not save address book files."
 msgstr "新用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:3396
+#: src/addressbook.c:3405
 msgid "Old address book converted successfully."
 msgstr "转换旧地址簿格式完成。"
 
-#: src/addressbook.c:3401
+#: src/addressbook.c:3410
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file."
@@ -580,7 +580,7 @@ msgstr ""
 "旧地址簿格式已转换，\n"
 "但无法保存新的索引文件。"
 
-#: src/addressbook.c:3414
+#: src/addressbook.c:3423
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -588,7 +588,7 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "但空的新地址簿文件已经生成。"
 
-#: src/addressbook.c:3420
+#: src/addressbook.c:3429
 msgid ""
 "Could not convert address book,\n"
 "could not save new address index file."
@@ -596,7 +596,7 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "无法保存新的地址簿索引文件。"
 
-#: src/addressbook.c:3425
+#: src/addressbook.c:3434
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -604,67 +604,67 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "亦无法产生新的地址簿文件。"
 
-#: src/addressbook.c:3432 src/addressbook.c:3438
+#: src/addressbook.c:3441 src/addressbook.c:3447
 msgid "Addressbook conversion error"
 msgstr "转换地址簿格式时发生错误"
 
-#: src/addressbook.c:3476
+#: src/addressbook.c:3485
 msgid "Addressbook Error"
 msgstr "地址簿发生错误"
 
-#: src/addressbook.c:3477
+#: src/addressbook.c:3486
 msgid "Could not read address index"
 msgstr "无法读取地址簿索引"
 
-#: src/addressbook.c:3804
+#: src/addressbook.c:3813
 msgid "Busy searching..."
 msgstr "正在搜索..."
 
 # c-format
-#: src/addressbook.c:3875
+#: src/addressbook.c:3884
 #, c-format
 msgid "Search '%s'"
 msgstr "搜索 '%s'"
 
-#: src/addressbook.c:4100
+#: src/addressbook.c:4109
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:4116 src/exphtmldlg.c:382 src/expldifdlg.c:394
+#: src/addressbook.c:4125 src/exphtmldlg.c:378 src/expldifdlg.c:394
 #: src/exporthtml.c:1020 src/importldif.c:651
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:4132
+#: src/addressbook.c:4141
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:4148
+#: src/addressbook.c:4157
 msgid "EMail Address"
 msgstr "电子邮件邮箱"
 
-#: src/addressbook.c:4164
+#: src/addressbook.c:4173
 msgid "Group"
 msgstr "群组"
 
-#: src/addressbook.c:4180 src/exporthtml.c:922 src/folderview.c:431
-#: src/prefs_account.c:2410 src/prefs_folder_column.c:79
+#: src/addressbook.c:4189 src/exporthtml.c:922 src/folderview.c:441
+#: src/prefs_account.c:2399 src/prefs_folder_column.c:79
 msgid "Folder"
 msgstr "邮件夹"
 
-#: src/addressbook.c:4196
+#: src/addressbook.c:4205
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:4212 src/addressbook.c:4228
+#: src/addressbook.c:4221 src/addressbook.c:4237
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:4244
+#: src/addressbook.c:4253
 msgid "LDAP servers"
 msgstr "LDAP 服务器"
 
-#: src/addressbook.c:4260
+#: src/addressbook.c:4269
 msgid "LDAP Query"
 msgstr "LDAP 查询"
 
@@ -699,7 +699,7 @@ msgstr "请选取选择需要处理的邮件夹，或者选择一封或多封邮
 msgid "Folder :"
 msgstr "邮件夹 :"
 
-#: src/addrgather.c:365 src/exphtmldlg.c:596 src/expldifdlg.c:626
+#: src/addrgather.c:365 src/exphtmldlg.c:546 src/expldifdlg.c:626
 #: src/importldif.c:909
 msgid "Address Book :"
 msgstr "地址簿 :"
@@ -724,9 +724,9 @@ msgstr "信头名称"
 msgid "Address Count"
 msgstr "邮件地址数目"
 
-#: src/addrgather.c:537 src/alertpanel.c:153 src/compose.c:4473
-#: src/compose.c:8866 src/messageview.c:566 src/messageview.c:579
-#: src/plugins/pgpcore/sgpgme.c:512
+#: src/addrgather.c:537 src/alertpanel.c:153 src/compose.c:4518
+#: src/compose.c:8971 src/messageview.c:561 src/messageview.c:574
+#: src/plugins/pgpcore/sgpgme.c:563
 msgid "Warning"
 msgstr "警告"
 
@@ -734,7 +734,7 @@ msgstr "警告"
 msgid "Header Fields"
 msgstr "信头字段"
 
-#: src/addrgather.c:539 src/exphtmldlg.c:716 src/expldifdlg.c:738
+#: src/addrgather.c:539 src/exphtmldlg.c:666 src/expldifdlg.c:738
 #: src/importldif.c:1029
 msgid "Finish"
 msgstr "完成"
@@ -763,12 +763,12 @@ msgstr "公用邮件地址"
 msgid "Personal address"
 msgstr "个人邮件地址"
 
-#: src/alertpanel.c:140 src/compose.c:7160
+#: src/alertpanel.c:140 src/compose.c:7199
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:166 src/alertpanel.c:188 src/compose.c:4419 src/inc.c:594
-#: src/plugins/pgpcore/sgpgme.c:134 src/plugins/pgpcore/sgpgme.c:225
+#: src/alertpanel.c:166 src/alertpanel.c:188 src/compose.c:4464 src/inc.c:594
+#: src/plugins/pgpcore/sgpgme.c:135 src/plugins/pgpcore/sgpgme.c:226
 msgid "Error"
 msgstr "错误"
 
@@ -776,7 +776,7 @@ msgstr "错误"
 msgid "_View log"
 msgstr "查看日志文件(_V)"
 
-#: src/alertpanel.c:335
+#: src/alertpanel.c:336
 msgid "Show this message next time"
 msgstr "在显示一次讯息"
 
@@ -822,19 +822,19 @@ msgstr "发表文章时发生错误\n"
 msgid "Error occurred while sending command\n"
 msgstr "发送命令时发生错误\n"
 
-#: src/common/plugin.c:244
+#: src/common/plugin.c:251
 msgid "Plugin already loaded"
 msgstr "插件已经加载"
 
-#: src/common/plugin.c:254
+#: src/common/plugin.c:261
 msgid "Failed to allocate memory for Plugin"
 msgstr "为插件分配内存失败"
 
-#: src/common/plugin.c:280
+#: src/common/plugin.c:287
 msgid "This module is not licenced under a GPL compatible licence."
 msgstr "该模块并不以通用许可协议(GPL)兼容协议发布。"
 
-#: src/common/plugin.c:287
+#: src/common/plugin.c:294
 msgid "This module is for Sylpheed-Claws GTK1."
 msgstr "该模块是为GTK1版本的Sylpheed-Claws。"
 
@@ -927,459 +927,458 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: src/compose.c:513
+#: src/compose.c:512
 msgid "/_Add..."
 msgstr "/新增(_A)..."
 
-#: src/compose.c:514
+#: src/compose.c:513
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:516 src/folderview.c:283
+#: src/compose.c:515 src/folderview.c:288
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
-#: src/compose.c:521 src/mainwindow.c:700 src/messageview.c:281
+#: src/compose.c:520 src/mainwindow.c:705 src/messageview.c:278
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
-#: src/compose.c:522
+#: src/compose.c:521
 msgid "/_Message/_Send"
 msgstr "/邮件(_M)/发送(_S)"
 
-#: src/compose.c:524
+#: src/compose.c:523
 msgid "/_Message/Send _later"
 msgstr "/邮件(_M)/稍后发送(_l)"
 
-#: src/compose.c:526 src/compose.c:530 src/compose.c:533 src/mainwindow.c:710
-#: src/mainwindow.c:720 src/mainwindow.c:733 src/mainwindow.c:739
-#: src/mainwindow.c:751 src/messageview.c:284 src/messageview.c:292
-#: src/messageview.c:297
+#: src/compose.c:525 src/compose.c:529 src/compose.c:532 src/mainwindow.c:715
+#: src/mainwindow.c:725 src/mainwindow.c:738 src/mainwindow.c:744
+#: src/mainwindow.c:756 src/messageview.c:281 src/messageview.c:289
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/compose.c:527
+#: src/compose.c:526
 msgid "/_Message/_Attach file"
 msgstr "/邮件(_M)/附加(_A)"
 
-#: src/compose.c:528
+#: src/compose.c:527
 msgid "/_Message/_Insert file"
 msgstr "/邮件(_M)/插入文件(_I)"
 
-#: src/compose.c:529
+#: src/compose.c:528
 msgid "/_Message/Insert si_gnature"
 msgstr "/邮件(_M)/插入签名(_g)"
 
-#: src/compose.c:531
+#: src/compose.c:530
 msgid "/_Message/_Save"
 msgstr "/邮件(_M)/保存(_S)"
 
-#: src/compose.c:534
+#: src/compose.c:533
 msgid "/_Message/_Close"
 msgstr "/邮件(_M)/关闭(_C)"
 
-#: src/compose.c:537
+#: src/compose.c:536
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤消(_U)"
 
-#: src/compose.c:538
+#: src/compose.c:537
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复前一个动作(_R)"
 
-#: src/compose.c:539 src/compose.c:627 src/compose.c:630 src/compose.c:636
-#: src/mainwindow.c:492 src/messageview.c:167
+#: src/compose.c:538 src/compose.c:626 src/compose.c:629 src/compose.c:635
+#: src/mainwindow.c:496 src/messageview.c:164
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
-#: src/compose.c:540
+#: src/compose.c:539
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_t)"
 
-#: src/compose.c:541 src/mainwindow.c:489 src/messageview.c:165
+#: src/compose.c:540 src/mainwindow.c:493 src/messageview.c:162
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/拷贝(_C)"
 
-#: src/compose.c:542
+#: src/compose.c:541
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/compose.c:543
+#: src/compose.c:542
 msgid "/_Edit/Special paste"
 msgstr "/编辑(_E)/选择性粘贴"
 
-#: src/compose.c:544
+#: src/compose.c:543
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/编辑(_E)/选择性粘贴/粘贴为引文(_q)"
 
-#: src/compose.c:546
+#: src/compose.c:545
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/编辑(_E)/选择性粘贴/自动折行(_w)"
 
-#: src/compose.c:548
+#: src/compose.c:547
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/编辑(_E)/选择性粘贴/不自动折行(_u)"
 
-#: src/compose.c:550 src/mainwindow.c:490 src/messageview.c:166
+#: src/compose.c:549 src/mainwindow.c:494 src/messageview.c:163
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_a)"
 
-#: src/compose.c:551
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced"
 msgstr "/编辑(_E)/高级(_d)"
 
-#: src/compose.c:552
+#: src/compose.c:551
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字符"
 
-#: src/compose.c:557
+#: src/compose.c:556
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字符"
 
-#: src/compose.c:562
+#: src/compose.c:561
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字"
 
-#: src/compose.c:567
+#: src/compose.c:566
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字"
 
-#: src/compose.c:572
+#: src/compose.c:571
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/编辑(_E)/高级(_d)/移到行开头"
 
-#: src/compose.c:577
+#: src/compose.c:576
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/编辑(_E)/高级(_d)/移到行尾"
 
-#: src/compose.c:582
+#: src/compose.c:581
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/编辑(_E)/高级(_d)/移到前一行"
 
-#: src/compose.c:587
+#: src/compose.c:586
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/编辑(_E)/高级(_d)/移到下一行"
 
-#: src/compose.c:592
+#: src/compose.c:591
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字符"
 
-#: src/compose.c:597
+#: src/compose.c:596
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字符"
 
-#: src/compose.c:602
+#: src/compose.c:601
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字"
 
-#: src/compose.c:607
+#: src/compose.c:606
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字"
 
-#: src/compose.c:612
+#: src/compose.c:611
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 
-#: src/compose.c:617
+#: src/compose.c:616
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 
-#: src/compose.c:622
+#: src/compose.c:621
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/编辑(_E)/高级(_d)/从游标处起删除至行尾"
 
-#: src/compose.c:628
+#: src/compose.c:627
 msgid "/_Edit/_Find"
 msgstr "/编辑(_E)/查找(_F)"
 
-#: src/compose.c:631
+#: src/compose.c:630
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/将当前段落折行(_W)"
 
-#: src/compose.c:633
+#: src/compose.c:632
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/将所有过长的行折行(_l)"
 
-#: src/compose.c:635
+#: src/compose.c:634
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_o)"
 
-#: src/compose.c:637
+#: src/compose.c:636
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/编辑(_E)/使用外部编辑器(_x)"
 
-#: src/compose.c:640
+#: src/compose.c:639
 msgid "/_Spelling"
 msgstr "/拼写(_S)"
 
-#: src/compose.c:641
+#: src/compose.c:640
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/拼写(_S)/检查全文或选定区域(_C)"
 
-#: src/compose.c:643
+#: src/compose.c:642
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/拼写(_S)/显示所有拼错的单词(_H)"
 
-#: src/compose.c:645
+#: src/compose.c:644
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/拼写(_S)/向后检查拼错的单词(_b)"
 
-#: src/compose.c:647
+#: src/compose.c:646
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/拼写(_S)/向前检查拼错的单词(_F)"
 
-#: src/compose.c:649
+#: src/compose.c:648
 msgid "/_Spelling/---"
 msgstr "/拼写(_S)/---"
 
-#: src/compose.c:650
+#: src/compose.c:649
 msgid "/_Spelling/Options"
 msgstr "/拼写(_S)/选项"
 
-#: src/compose.c:653
+#: src/compose.c:652
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/compose.c:654
+#: src/compose.c:653
 msgid "/_Options/Privacy System"
 msgstr "/选项(_O)/隐私系统"
 
-#: src/compose.c:655
+#: src/compose.c:654
 msgid "/_Options/Privacy System/None"
 msgstr "/选项(_O)/隐私系统/无"
 
-#: src/compose.c:656
+#: src/compose.c:655
 msgid "/_Options/Si_gn"
 msgstr "/选项(_O)/签名(_g)"
 
-#: src/compose.c:657
+#: src/compose.c:656
 msgid "/_Options/_Encrypt"
 msgstr "/选项(_O)/加密(_E)"
 
-#: src/compose.c:658 src/compose.c:665 src/compose.c:667 src/compose.c:669
+#: src/compose.c:657 src/compose.c:664 src/compose.c:666 src/compose.c:668
 msgid "/_Options/---"
 msgstr "/选项(_O)/---"
 
-#: src/compose.c:659
+#: src/compose.c:658
 msgid "/_Options/_Priority"
 msgstr "/选项(_O)/优先级(_P)"
 
-#: src/compose.c:660
+#: src/compose.c:659
 msgid "/_Options/Priority/_Highest"
 msgstr "/选项(_O)/优先顺序/最优先(_H)"
 
-#: src/compose.c:661
+#: src/compose.c:660
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/选项(_O)/优先顺序/优先(_g)"
 
-#: src/compose.c:662
+#: src/compose.c:661
 msgid "/_Options/Priority/_Normal"
 msgstr "/选项(_O)/优先顺序/普通(_N)"
 
-#: src/compose.c:663
+#: src/compose.c:662
 msgid "/_Options/Priority/Lo_w"
 msgstr "/选项(_O)/优先顺序/低(_w)"
 
-#: src/compose.c:664
+#: src/compose.c:663
 msgid "/_Options/Priority/_Lowest"
 msgstr "/选项(_O)/优先顺序/最低(_L)"
 
-#: src/compose.c:666
+#: src/compose.c:665
 msgid "/_Options/_Request Return Receipt"
 msgstr "/选项(_O)/请求回执(_R)"
 
-#: src/compose.c:668
+#: src/compose.c:667
 msgid "/_Options/Remo_ve references"
 msgstr "/选项(_O)/删除引用(_V)"
 
-#: src/compose.c:675
+#: src/compose.c:674
 msgid "/_Options/Character _encoding"
 msgstr "/选项(_O)/字符编码(_e)"
 
-#: src/compose.c:676
+#: src/compose.c:675
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/选项(_O)/字符集(_e)/自动侦测(_A)"
 
-#: src/compose.c:678 src/compose.c:684 src/compose.c:692 src/compose.c:696
-#: src/compose.c:702 src/compose.c:706 src/compose.c:712 src/compose.c:718
-#: src/compose.c:722 src/compose.c:732 src/compose.c:736 src/compose.c:746
-#: src/compose.c:750
+#: src/compose.c:677 src/compose.c:683 src/compose.c:691 src/compose.c:695
+#: src/compose.c:701 src/compose.c:705 src/compose.c:711 src/compose.c:717
+#: src/compose.c:721 src/compose.c:731 src/compose.c:735 src/compose.c:745
+#: src/compose.c:749
 msgid "/_Options/Character _encoding/---"
 msgstr "/选项(_O)/字符编码(_e)/---"
 
-#: src/compose.c:680
+#: src/compose.c:679
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/选项(_O)/字符集(_e)/7bit ascii (US-ASCII)(_ I)"
 
-#: src/compose.c:682
+#: src/compose.c:681
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/选项(_O)/字符集(_e)/Unicode (UTF-8)(_U)"
 
-#: src/compose.c:686
+#: src/compose.c:685
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-1)(_1)"
 
-#: src/compose.c:688
+#: src/compose.c:687
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:690
+#: src/compose.c:689
 msgid "/_Options/Character _encoding/Western European (Windows-1252)"
 msgstr "/选项(_O)/字符集(_e)/西欧(Windows-1252)"
 
-#: src/compose.c:694
+#: src/compose.c:693
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-_2)"
 
-#: src/compose.c:698
+#: src/compose.c:697
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 
-#: src/compose.c:700
+#: src/compose.c:699
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-_4)"
 
-#: src/compose.c:704
+#: src/compose.c:703
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 
-#: src/compose.c:708
+#: src/compose.c:707
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 
-#: src/compose.c:710
+#: src/compose.c:709
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1255)"
 
-#: src/compose.c:714
+#: src/compose.c:713
 msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (ISO-8859-_6"
 
-#: src/compose.c:716
+#: src/compose.c:715
 msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
 msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (Windows-1256)"
 
-#: src/compose.c:720
+#: src/compose.c:719
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/选项(_O)/字符集(_e)/土耳其 (ISO-8859-_9)"
 
-#: src/compose.c:724
+#: src/compose.c:723
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 
-#: src/compose.c:726
+#: src/compose.c:725
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (KOI8-_R)"
 
-#: src/compose.c:728
+#: src/compose.c:727
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫(KOI8-U)"
 
-#: src/compose.c:730
+#: src/compose.c:729
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1251)"
 
-#: src/compose.c:734
+#: src/compose.c:733
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/选项(_O)/字符集(_e)/日文 (ISO-2022-_JP)"
 
-#: src/compose.c:738
+#: src/compose.c:737
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (_GB2312)"
 
-#: src/compose.c:740
+#: src/compose.c:739
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (GBK)"
 
-#: src/compose.c:742
+#: src/compose.c:741
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (_Big5)"
 
-#: src/compose.c:744
+#: src/compose.c:743
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (EUC-_TW)"
 
-#: src/compose.c:748
+#: src/compose.c:747
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/选项(_O)/字符集(_e)/韩文 (EUC-_KR) "
 
-#: src/compose.c:752
+#: src/compose.c:751
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (TIS-620)"
 
-#: src/compose.c:754
+#: src/compose.c:753
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (Windows-874)"
 
-#: src/compose.c:758
+#: src/compose.c:757
 msgid "/_Tools/Show _ruler"
 msgstr "/工具(_T)/显示标尺(_r)"
 
-#: src/compose.c:759 src/messageview.c:301
+#: src/compose.c:758 src/messageview.c:296
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:760
+#: src/compose.c:759
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用邮件模板(_T)"
 
-#: src/compose.c:761 src/mainwindow.c:787 src/messageview.c:326
+#: src/compose.c:760 src/mainwindow.c:792 src/messageview.c:321
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/执行动作(_n)"
 
-#: src/compose.c:1552
+#: src/compose.c:1554
 msgid "Fw: multiple emails"
 msgstr "转发: 多封邮件"
 
-#: src/compose.c:1941
+#: src/compose.c:1949
 msgid "Reply-To:"
 msgstr ""
 
-#: src/compose.c:1944 src/compose.c:5319 src/compose.c:6076
+#: src/compose.c:1952 src/compose.c:5378 src/compose.c:6128
 msgid "Newsgroups:"
 msgstr ""
 
-#: src/compose.c:1947
+#: src/compose.c:1955
 msgid "Followup-To:"
 msgstr ""
 
-#: src/compose.c:2344
+#: src/compose.c:2352
 msgid "Quote mark format error."
 msgstr "引文格式错误。"
 
-#: src/compose.c:2360
+#: src/compose.c:2368
 msgid "Message reply/forward format error."
 msgstr "回复/转发邮件格式错误。"
 
-#: src/compose.c:2905
+#: src/compose.c:2925
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 不存在。"
 
-#: src/compose.c:2909
+#: src/compose.c:2929
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2936
+#: src/compose.c:2956
 #, c-format
 msgid "Message: %s"
 msgstr "邮件: %s"
 
-#: src/compose.c:3747
+#: src/compose.c:3768
 msgid " [Edited]"
 msgstr " [已修改] "
 
-#: src/compose.c:3753
+#: src/compose.c:3774
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新邮件%s"
 
-#: src/compose.c:3756
+#: src/compose.c:3777
 #, c-format
 msgid "[no subject] - Compose message%s"
 msgstr "[无主题] - 撰写新邮件%s"
 
-#: src/compose.c:3781 src/messageview.c:601
+#: src/compose.c:3802 src/messageview.c:596
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1387,32 +1386,32 @@ msgstr ""
 "您选用的帐号并非一个电子邮件帐号，可能是用来在新闻组上发表文章用的。\n"
 "要发送邮件请选择一个电子邮件帐号。"
 
-#: src/compose.c:3952 src/compose.c:3980 src/compose.c:4008 src/toolbar.c:391
+#: src/compose.c:3979 src/compose.c:4010 src/compose.c:4041 src/toolbar.c:391
 #: src/toolbar.c:441
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:3953
+#: src/compose.c:3980
 msgid "The only recipient is the default CC address. Send anyway?"
 msgstr "缺省的抄送地址是仅有的收件人，要发送吗？"
 
-#: src/compose.c:3954 src/compose.c:3982 src/compose.c:4010 src/compose.c:4419
+#: src/compose.c:3981 src/compose.c:4012 src/compose.c:4043 src/compose.c:4464
 msgid "+_Send"
 msgstr "+ 发送(_S)"
 
-#: src/compose.c:3981
+#: src/compose.c:4011
 msgid "The only recipient is the default BCC address. Send anyway?"
 msgstr "缺省的密送地址是仅有的收件若，要发送吗？"
 
-#: src/compose.c:3995
+#: src/compose.c:4028
 msgid "Recipient is not specified."
 msgstr "没有指定收信人。"
 
-#: src/compose.c:4009
+#: src/compose.c:4042
 msgid "Subject is empty. Send it anyway?"
 msgstr "没有标题。确定要发送？"
 
-#: src/compose.c:4048 src/compose.c:7500
+#: src/compose.c:4081 src/compose.c:7549
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
@@ -1422,17 +1421,18 @@ msgstr ""
 "\n"
 "转换字符集失败。"
 
-#: src/compose.c:4051 src/compose.c:7497
+#: src/compose.c:4085 src/compose.c:7546
+#, c-format
 msgid ""
 "Could not queue message for sending:\n"
 "\n"
-"Signature failed."
+"Signature failed: %s"
 msgstr ""
 "无法将邮件加入待发送队列:\n"
 "\n"
-"签名失败。"
+"签名失败: %s"
 
-#: src/compose.c:4054
+#: src/compose.c:4088
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
@@ -1443,11 +1443,11 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:4056
+#: src/compose.c:4090
 msgid "Could not queue message for sending."
 msgstr "无法将邮件加入待发送队列"
 
-#: src/compose.c:4070 src/compose.c:4103
+#: src/compose.c:4104 src/compose.c:4144
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
@@ -1455,7 +1455,16 @@ msgstr ""
 "邮件已加入发送队列，但无法发送出去。\n"
 "请使用主窗口 \"送出待发送邮件\" 再试一次。"
 
-#: src/compose.c:4416
+#: src/compose.c:4138
+#, c-format
+msgid ""
+"%s\n"
+"Use \"Send queued messages\" from the main window to retry."
+msgstr ""
+"%s\n"
+"请使用主窗口 \"送出待发送邮件\" 再试一次。"
+
+#: src/compose.c:4461
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
@@ -1465,7 +1474,7 @@ msgstr ""
 "无法将邮件的字符编码转换为 %s 。\n"
 "以 %s 发送吗？"
 
-#: src/compose.c:4469
+#: src/compose.c:4514
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1478,64 +1487,60 @@ msgstr ""
 "\n"
 "确实要发送吗?"
 
-#: src/compose.c:4648
+#: src/compose.c:4699
 msgid "No account for sending mails available!"
 msgstr "没有发信所需的帐号！"
 
-#: src/compose.c:4658
+#: src/compose.c:4709
 msgid "No account for posting news available!"
 msgstr "没有张贴news所需的帐号！"
 
-#: src/compose.c:5336
+#: src/compose.c:5395
 msgid "Use <tab> to autocomplete from addressbook"
 msgstr "可以使用<tab>键自动完成地址"
 
-#: src/compose.c:5404 src/summary_search.c:254
-msgid "From:"
-msgstr "发信人:"
-
-#: src/compose.c:5455
+#: src/compose.c:5507
 msgid "Mime type"
 msgstr "MIME 类型"
 
-#: src/compose.c:5461 src/compose.c:5757 src/mimeview.c:200
+#: src/compose.c:5513 src/compose.c:5809 src/mimeview.c:202
 #: src/plugins/pgpcore/select-keys.c:336 src/prefs_summary_column.c:86
-#: src/summaryview.c:489
+#: src/summaryview.c:490
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:5522
+#: src/compose.c:5574
 msgid "Save Message to "
 msgstr "将邮件保存至"
 
-#: src/compose.c:5544 src/editjpilot.c:289 src/editldap.c:526
+#: src/compose.c:5596 src/editjpilot.c:289 src/editldap.c:526
 #: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
 #: src/importpine.c:242 src/plugins/clamav/clamav_plugin_gtk.c:147
 #: src/plugins/spamassassin/spamassassin_gtk.c:387 src/prefs_spelling.c:210
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: src/compose.c:5756 src/compose.c:6915
+#: src/compose.c:5808 src/compose.c:6959
 msgid "MIME type"
 msgstr "MIME 类型"
 
-#: src/compose.c:5828
+#: src/compose.c:5880
 msgid "Hea_der"
 msgstr "邮件头(_d)"
 
-#: src/compose.c:5832
+#: src/compose.c:5884
 msgid "_Attachments"
 msgstr "附件(_A)"
 
-#: src/compose.c:5836
+#: src/compose.c:5888
 msgid "Othe_rs"
 msgstr "其他(_r)"
 
-#: src/compose.c:5851 src/prefs_template.c:211 src/summary_search.c:268
+#: src/compose.c:5903 src/prefs_template.c:213 src/summary_search.c:271
 msgid "Subject:"
 msgstr "主题:"
 
-#: src/compose.c:6039
+#: src/compose.c:6091
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -1544,62 +1549,67 @@ msgstr ""
 "无法启动拼写检查器.\n"
 "%s"
 
-#: src/compose.c:6182
+#: src/compose.c:6202
+#, c-format
+msgid "From: <i>%s</i>"
+msgstr ""
+
+#: src/compose.c:6233
 msgid "Account to use for this email"
 msgstr "用于此邮件的帐号"
 
-#: src/compose.c:6184
+#: src/compose.c:6235
 msgid "Sender address to be used"
 msgstr "想要使用的发送邮件地址"
 
-#: src/compose.c:6308
+#: src/compose.c:6359
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 msgstr "无法加载隐私系统`%s'，签名和邮件加密功能将不可用。"
 
-#: src/compose.c:6547
+#: src/compose.c:6598
 msgid "Message To format error."
 msgstr "'收件人'格式错误。"
 
-#: src/compose.c:6560
+#: src/compose.c:6611
 msgid "Message Cc format error."
 msgstr "'抄送人'格式错误。"
 
-#: src/compose.c:6573
+#: src/compose.c:6624
 msgid "Message Bcc format error."
 msgstr "'秘送'格式错误。"
 
-#: src/compose.c:6587
+#: src/compose.c:6638
 msgid "Message subject format error."
 msgstr "'主题'格式错误。"
 
-#: src/compose.c:6806
+#: src/compose.c:6853
 msgid "Invalid MIME type."
 msgstr "不正确的MIME类型。"
 
-#: src/compose.c:6824
+#: src/compose.c:6868
 msgid "File doesn't exist or is empty."
 msgstr "文件是空的或不存在。"
 
-#: src/compose.c:6897
+#: src/compose.c:6941
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:6948
+#: src/compose.c:6992
 msgid "Encoding"
 msgstr "编码"
 
-#: src/compose.c:6973
+#: src/compose.c:7012
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:6974 src/prefs_toolbar.c:1060
+#: src/compose.c:7013 src/prefs_toolbar.c:1060
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:7157
+#: src/compose.c:7196
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1610,15 +1620,19 @@ msgstr ""
 "强制关闭该进程吗？\n"
 "进程祖id: %d"
 
-#: src/compose.c:7199
+#: src/compose.c:7238
 msgid "Compose: input from monitoring process\n"
 msgstr "撰写: 从被监视的进程中输入\n"
 
-#: src/compose.c:7473 src/messageview.c:706
+#: src/compose.c:7519 src/messageview.c:701
 msgid "Sylpheed-Claws needs network access in order to send this email."
 msgstr "Sylpheed-Claws需要访问网络才能发送这封邮件。"
 
-#: src/compose.c:7495
+#: src/compose.c:7541
+msgid "Could not queue message."
+msgstr "无法将邮件加入待发送队列。"
+
+#: src/compose.c:7543
 #, c-format
 msgid ""
 "Could not queue message:\n"
@@ -1629,20 +1643,20 @@ msgstr ""
 "\n"
 "%s."
 
-#: src/compose.c:7591
+#: src/compose.c:7659
 msgid "Could not save draft."
 msgstr "无法保存草稿。"
 
-#: src/compose.c:7667 src/compose.c:7690
+#: src/compose.c:7734 src/compose.c:7757
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:7703
+#: src/compose.c:7770
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "无法读取文件 '%s'。"
 
-#: src/compose.c:7705
+#: src/compose.c:7772
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
@@ -1651,46 +1665,64 @@ msgstr ""
 "文件 '%s' 包含有不属于当前编码集的无效字符,\n"
 "插入部分可能不正确."
 
-#: src/compose.c:7753
+#: src/compose.c:7820
 msgid "Discard message"
 msgstr "摈弃讯息"
 
-#: src/compose.c:7754
+#: src/compose.c:7821
 msgid "This message has been modified. Discard it?"
 msgstr "这封邮件已被更改，是否摈弃？"
 
-#: src/compose.c:7755
+#: src/compose.c:7822
 msgid "_Discard"
 msgstr "摈弃(_D)"
 
-#: src/compose.c:7755
+#: src/compose.c:7822
 msgid "_Save to Drafts"
 msgstr "存为草稿(_S)"
 
-#: src/compose.c:7799
+#: src/compose.c:7866
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "是否应用模板'%s'?"
 
-#: src/compose.c:7801
+#: src/compose.c:7868
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:7802
+#: src/compose.c:7869
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: src/compose.c:7802
+#: src/compose.c:7869
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/compose.c:8860
+#: src/compose.c:8556
+msgid "Insert or attach?"
+msgstr "插入其内容还是添加附件?"
+
+#: src/compose.c:8557
+msgid ""
+"Do you want to insert the contents of the file(s) into the message body, or "
+"attach it to the email?"
+msgstr ""
+"请问是将文件的内容插入到邮件中，还是添加为附件？"
+
+#: src/compose.c:8559
+msgid "+_Insert"
+msgstr "+插入(_I)"
+
+#: src/compose.c:8559
+msgid "_Attach"
+msgstr "附加文件(_A)"
+
+#: src/compose.c:8965
 #, c-format
 msgid ""
 "You are about to reply to %d messages. Opening the windows could take some "
 "time. Do you want to continue?"
-msgstr ""
-"您想要回复%d封邮件。打开这些窗口需要一定时间。是否继续？"
+msgstr "您想要回复%d封邮件。打开这些窗口需要一定时间。是否继续？"
 
 #: src/crash.c:142
 #, c-format
@@ -1771,7 +1803,7 @@ msgstr "绰号"
 msgid "Alias"
 msgstr "别名"
 
-#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:218
+#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:222
 #: src/prefs_matcher.c:490
 msgid "Value"
 msgstr "值"
@@ -1809,7 +1841,7 @@ msgid " Check File "
 msgstr "检查文件"
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1906
+#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1895
 msgid "File"
 msgstr "文件"
 
@@ -2145,19 +2177,19 @@ msgstr "编辑vCard条目"
 msgid "Add New vCard Entry"
 msgstr "增加新的vCard条目"
 
-#: src/exphtmldlg.c:112
+#: src/exphtmldlg.c:113
 msgid "Please specify output directory and file to create."
 msgstr "请指明所要创建的目录以及文件。"
 
-#: src/exphtmldlg.c:115
+#: src/exphtmldlg.c:116
 msgid "Select stylesheet and formatting."
 msgstr "选择形式及格式。"
 
-#: src/exphtmldlg.c:118 src/expldifdlg.c:117
+#: src/exphtmldlg.c:119 src/expldifdlg.c:117
 msgid "File exported successfully."
 msgstr "文件已成功导出。"
 
-#: src/exphtmldlg.c:183
+#: src/exphtmldlg.c:184
 #, c-format
 msgid ""
 "HTML Output Directory '%s'\n"
@@ -2166,11 +2198,11 @@ msgstr ""
 "HTML输出目录 '%s'\n"
 "并不存在。创建新目录？"
 
-#: src/exphtmldlg.c:186 src/expldifdlg.c:193
+#: src/exphtmldlg.c:187 src/expldifdlg.c:193
 msgid "Create Directory"
 msgstr "创建目录"
 
-#: src/exphtmldlg.c:195
+#: src/exphtmldlg.c:196
 #, c-format
 msgid ""
 "Could not create output directory for HTML file:\n"
@@ -2179,102 +2211,102 @@ msgstr ""
 "无法为HTML文件创建输出目录:\n"
 "%s"
 
-#: src/exphtmldlg.c:197 src/expldifdlg.c:204
+#: src/exphtmldlg.c:198 src/expldifdlg.c:204
 msgid "Failed to Create Directory"
 msgstr "创建目录失败"
 
-#: src/exphtmldlg.c:244
+#: src/exphtmldlg.c:240
 msgid "Error creating HTML file"
 msgstr "创建HTML文件时发生错误"
 
-#: src/exphtmldlg.c:330
+#: src/exphtmldlg.c:326
 msgid "Select HTML output file"
 msgstr "选择HTML输出文件"
 
-#: src/exphtmldlg.c:394
+#: src/exphtmldlg.c:390
 msgid "HTML Output File"
 msgstr "HTML输出文件"
 
-#: src/exphtmldlg.c:403 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
+#: src/exphtmldlg.c:399 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
 #: src/importldif.c:682
 msgid "B_rowse"
 msgstr "棕色(_r)"
 
-#: src/exphtmldlg.c:455
+#: src/exphtmldlg.c:452
 msgid "Stylesheet"
 msgstr "样式表"
 
-#: src/exphtmldlg.c:462 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1631
-#: src/gtk/gtkaspell.c:2298 src/mainwindow.c:959 src/prefs_account.c:650
-#: src/summaryview.c:4686
+#: src/exphtmldlg.c:460 src/gtk/colorlabel.c:367 src/gtk/gtkaspell.c:1632
+#: src/gtk/gtkaspell.c:2299 src/mainwindow.c:964 src/prefs_account.c:661
+#: src/summaryview.c:4735
 msgid "None"
 msgstr "无"
 
-#: src/exphtmldlg.c:468 src/prefs_summaries.c:349 src/prefs_summaries.c:690
+#: src/exphtmldlg.c:461 src/prefs_summaries.c:349 src/prefs_summaries.c:690
 msgid "Default"
 msgstr "缺省"
 
-#: src/exphtmldlg.c:474 src/plugins/pgpcore/sgpgme.c:130
+#: src/exphtmldlg.c:462 src/plugins/pgpcore/sgpgme.c:131
 msgid "Full"
 msgstr "完整"
 
-#: src/exphtmldlg.c:480
+#: src/exphtmldlg.c:463
 msgid "Custom"
 msgstr "自定义"
 
-#: src/exphtmldlg.c:486
+#: src/exphtmldlg.c:464
 msgid "Custom-2"
 msgstr "自定义-2"
 
-#: src/exphtmldlg.c:492
+#: src/exphtmldlg.c:465
 msgid "Custom-3"
 msgstr "自定义-3"
 
-#: src/exphtmldlg.c:498
+#: src/exphtmldlg.c:466
 msgid "Custom-4"
 msgstr "自定义-4"
 
-#: src/exphtmldlg.c:512
+#: src/exphtmldlg.c:473
 msgid "Full Name Format"
 msgstr "完整名称格式"
 
-#: src/exphtmldlg.c:519
+#: src/exphtmldlg.c:481
 msgid "First Name, Last Name"
 msgstr "名，姓"
 
-#: src/exphtmldlg.c:525
+#: src/exphtmldlg.c:482
 msgid "Last Name, First Name"
 msgstr "姓，名"
 
-#: src/exphtmldlg.c:539
+#: src/exphtmldlg.c:489
 msgid "Color Banding"
 msgstr "彩色分带显示"
 
-#: src/exphtmldlg.c:545
+#: src/exphtmldlg.c:495
 msgid "Format Email Links"
 msgstr "电子邮件地址格式化为超链接"
 
-#: src/exphtmldlg.c:551
+#: src/exphtmldlg.c:501
 msgid "Format User Attributes"
 msgstr "将用户属性数据格式化"
 
-#: src/exphtmldlg.c:606 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:556 src/expldifdlg.c:636 src/importldif.c:919
 msgid "File Name :"
 msgstr "文件名:"
 
-#: src/exphtmldlg.c:616
+#: src/exphtmldlg.c:566
 msgid "Open with Web Browser"
 msgstr "用网页浏览器打开"
 
-#: src/exphtmldlg.c:648
+#: src/exphtmldlg.c:598
 msgid "Export Address Book to HTML File"
 msgstr "将地址簿输出成HTML文件"
 
-#: src/exphtmldlg.c:714 src/expldifdlg.c:736 src/importldif.c:1027
+#: src/exphtmldlg.c:664 src/expldifdlg.c:736 src/importldif.c:1027
 msgid "File Info"
 msgstr "文件内容"
 
-#: src/exphtmldlg.c:715
+#: src/exphtmldlg.c:665
 msgid "Format"
 msgstr "格式"
 
@@ -2425,7 +2457,7 @@ msgstr "将地址簿输出成LDIF文件"
 msgid "Distguished Name"
 msgstr "唯一名称(DN)"
 
-#: src/export.c:120 src/summaryview.c:6020
+#: src/export.c:120 src/summaryview.c:6069
 msgid "Export to mbox file"
 msgstr "以mbox格式导出邮件夹"
 
@@ -2485,52 +2517,52 @@ msgstr "名字太长。"
 msgid "Not specified."
 msgstr "不确定。"
 
-#: src/folder.c:1223 src/foldersel.c:371
+#: src/folder.c:1275 src/foldersel.c:371 src/prefs_folder_item.c:208
 msgid "Inbox"
 msgstr "收信夹"
 
-#: src/folder.c:1227 src/foldersel.c:375
+#: src/folder.c:1279 src/foldersel.c:375
 msgid "Sent"
 msgstr "已发送"
 
-#: src/folder.c:1231 src/foldersel.c:379
+#: src/folder.c:1283 src/foldersel.c:379 src/prefs_folder_item.c:211
 msgid "Queue"
 msgstr "待发送"
 
-#: src/folder.c:1235 src/foldersel.c:383 src/toolbar.c:366 src/toolbar.c:399
-#: src/toolbar.c:490
+#: src/folder.c:1287 src/foldersel.c:383 src/prefs_folder_item.c:212
+#: src/toolbar.c:366 src/toolbar.c:399 src/toolbar.c:490
 msgid "Trash"
 msgstr "垃圾桶"
 
-#: src/folder.c:1239 src/foldersel.c:387
+#: src/folder.c:1291 src/foldersel.c:387 src/prefs_folder_item.c:210
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/folder.c:1508
+#: src/folder.c:1562
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "处理中(%s)...\n"
 
-#: src/folder.c:1881 src/inc.c:634
+#: src/folder.c:1935 src/inc.c:634
 msgid "Filtering messages...\n"
 msgstr "正在过滤邮件...\n"
 
-#: src/folder.c:2407
+#: src/folder.c:2477
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "正在收取 %s 中所有邮件...\n"
 
-#: src/folder.c:2696
+#: src/folder.c:2766
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "将%s 移到%s...\n"
 
-#: src/folder.c:2930
+#: src/folder.c:3035
 #, c-format
 msgid "Updating cache for %s..."
 msgstr "正在更新邮件夹 %s 的缓存..."
 
-#: src/folder.c:3631
+#: src/folder.c:3739
 msgid "Processing messages..."
 msgstr "正在处理邮件..."
 
@@ -2559,54 +2591,64 @@ msgstr "邮件夹'%s'已存在。"
 msgid "Can't create the folder '%s'."
 msgstr "无法创建邮件夹'%s'。"
 
-#: src/folderview.c:281
+#: src/folderview.c:286
 msgid "/Mark all re_ad"
 msgstr "/标记所有邮件为已读(_a)"
 
-#: src/folderview.c:282
+#: src/folderview.c:287
 msgid "/_Search folder..."
 msgstr "/在邮件夹中搜索(_S)..."
 
-#: src/folderview.c:284
+#: src/folderview.c:289
 msgid "/Process_ing..."
 msgstr "/处理(_i)..."
 
-#: src/folderview.c:288
-msgid "/------"
+#: src/folderview.c:293
+#, fuzzy
+msgid "/------trashsep"
 msgstr "/------"
 
-#: src/folderview.c:289
+#: src/folderview.c:294
 msgid "/Empty _trash..."
 msgstr "/清空垃圾桶(_t)..."
 
-#: src/folderview.c:432 src/prefs_actions.c:440
-#: src/prefs_filtering_action.c:581 src/prefs_folder_column.c:80
-#: src/prefs_matcher.c:726
+#: src/folderview.c:298
+#, fuzzy
+msgid "/------queuesep"
+msgstr "/------"
+
+#: src/folderview.c:299
+msgid "/Send _queue..."
+msgstr "/发送队列(_q)..."
+
+#: src/folderview.c:442 src/prefs_actions.c:450
+#: src/prefs_filtering_action.c:585 src/prefs_folder_column.c:80
+#: src/prefs_matcher.c:730
 msgid "New"
 msgstr "新邮件"
 
-#: src/folderview.c:433 src/prefs_folder_column.c:81
+#: src/folderview.c:443 src/prefs_folder_column.c:81
 msgid "Unread"
 msgstr "未读"
 
 #. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:435 src/summaryview.c:490
+#: src/folderview.c:445 src/summaryview.c:491
 msgid "#"
 msgstr "＃"
 
-#: src/folderview.c:668
+#: src/folderview.c:678
 msgid "Setting folder info..."
 msgstr "设置邮件夹资料..."
 
-#: src/folderview.c:721 src/summaryview.c:3235
+#: src/folderview.c:732 src/summaryview.c:3278
 msgid "Mark all as read"
 msgstr "设所有为已读"
 
-#: src/folderview.c:722 src/summaryview.c:3236
+#: src/folderview.c:733 src/summaryview.c:3279
 msgid "Do you really want to mark all mails in this folder as read ?"
 msgstr "确定要将此邮件夹中所有邮件设置已读？"
 
-#: src/folderview.c:939
+#: src/folderview.c:1018
 msgid ""
 "You have one or more IMAP accounts defined. However this version of Sylpheed-"
 "Claws has been built without IMAP support; your IMAP account(s) are "
@@ -2619,94 +2661,133 @@ msgstr ""
 "\n"
 "你需要安装libetpan并重新编译Sylpheed-Claws。"
 
-#: src/folderview.c:956 src/imap.c:3129 src/mainwindow.c:3670 src/setup.c:90
+#: src/folderview.c:1035 src/imap.c:3110 src/mainwindow.c:3696 src/setup.c:90
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "扫描邮件夹%s%c%s..."
 
-#: src/folderview.c:960 src/imap.c:3134 src/mainwindow.c:3675 src/setup.c:95
+#: src/folderview.c:1039 src/imap.c:3115 src/mainwindow.c:3701 src/setup.c:95
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr " 扫描邮件夹 %s ..."
 
-#: src/folderview.c:987
+#: src/folderview.c:1066
 msgid "Rebuild folder tree"
 msgstr "重建邮件夹树"
 
-#: src/folderview.c:988
+#: src/folderview.c:1067
 msgid ""
 "Rebuilding the folder tree will remove local caches. Do you want to continue?"
 msgstr "重建邮件夹树将删除原有的本地缓存。是否要继续?"
 
-#: src/folderview.c:998
+#: src/folderview.c:1077
 msgid "Rebuilding folder tree..."
 msgstr " 重新建立邮件夹树 ..."
 
-#: src/folderview.c:1000
+#: src/folderview.c:1079
 msgid "Scanning folder tree..."
 msgstr " 正在扫描邮件夹..."
 
-#: src/folderview.c:1118
+#: src/folderview.c:1197
 msgid "Checking for new messages in all folders..."
 msgstr "检查所有邮件夹中的新邮件..."
 
-#: src/folderview.c:1972
+#: src/folderview.c:2031
+#, c-format
+msgid "Closing Folder %s..."
+msgstr "关闭邮件夹%s..."
+
+#: src/folderview.c:2070
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "打开邮件夹%s..."
 
-#: src/folderview.c:1985
+#: src/folderview.c:2083
 msgid "Folder could not be opened."
 msgstr "无法打开邮件夹。"
 
-#: src/folderview.c:2144 src/mainwindow.c:1957
+#: src/folderview.c:2242 src/mainwindow.c:1962
 msgid "Empty trash"
 msgstr "清空垃圾桶"
 
-#: src/folderview.c:2145
+#: src/folderview.c:2243
 msgid "Delete all messages in trash?"
 msgstr "清空垃圾桶内所有邮件？"
 
-#: src/folderview.c:2146 src/mainwindow.c:1959
+#: src/folderview.c:2244 src/mainwindow.c:1964
 msgid "+_Empty trash"
 msgstr "+清空垃圾桶(_E)"
 
-#: src/folderview.c:2227
+#: src/folderview.c:2288 src/inc.c:1447 src/toolbar.c:2091
+msgid "Offline warning"
+msgstr "脱机警告"
+
+#: src/folderview.c:2289 src/toolbar.c:2092
+msgid "You're working offline. Override?"
+msgstr "您正在脱机工作。是否更改？"
+
+#: src/folderview.c:2300 src/toolbar.c:2111
+msgid "Send queued messages"
+msgstr "送出待发送邮件"
+
+#: src/folderview.c:2301 src/toolbar.c:2112
+msgid "Send all queued messages?"
+msgstr "送出所有待发送邮件?"
+
+#: src/folderview.c:2302 src/messageview.c:562 src/messageview.c:579
+#: src/prefs_account.c:1030 src/toolbar.c:2113
+msgid "_Send"
+msgstr "发送(_S)"
+
+#: src/folderview.c:2310 src/toolbar.c:2131
+msgid "Some errors occurred while sending queued messages."
+msgstr "发送邮件时发生错误。"
+
+#: src/folderview.c:2313 src/main.c:1263 src/toolbar.c:2134
+#, c-format
+msgid ""
+"Some errors occurred while sending queued messages:\n"
+"%s"
+msgstr ""
+"发送邮件时发生错误:\n"
+"%s"
+
+#: src/folderview.c:2380
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "确定要将邮件夹 '%s' 改为 '%s' 的一个子邮件夹？"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2383
 msgid "Move folder"
 msgstr "移动邮件夹"
 
-#: src/folderview.c:2241
+#: src/folderview.c:2394
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "将%s 移到%s..."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2423
 msgid "Source and destination are the same."
 msgstr "文件来源和目的相同。"
 
-#: src/folderview.c:2273
+#: src/folderview.c:2426
 msgid "Can't move a folder to one of its children."
 msgstr "无法将上一层邮件夹移到其子邮件夹中。"
 
-#: src/folderview.c:2276
+#: src/folderview.c:2429
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "邮件夹不能跨邮箱移动。"
 
-#: src/folderview.c:2279
+#: src/folderview.c:2432
 msgid "Move failed!"
 msgstr "移动失败！"
 
-#: src/folderview.c:2315
+#: src/folderview.c:2468
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "邮件夹 %s 的邮件分拣配置"
 
-#: src/gedit-print.c:146 src/messageview.c:1409 src/summaryview.c:3900
+#: src/gedit-print.c:146 src/messageview.c:1409 src/summaryview.c:3945
 #: src/toolbar.c:178
 msgid "Print"
 msgstr "打印"
@@ -2777,7 +2858,7 @@ msgstr "未知"
 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 
-#: src/grouplistdialog.c:447 src/summaryview.c:1160
+#: src/grouplistdialog.c:447 src/summaryview.c:1168
 msgid "Done."
 msgstr "完成。"
 
@@ -2786,11 +2867,11 @@ msgstr "完成。"
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收%d新闻组(已读%s)"
 
-#: src/gtk/about.c:78 src/textview.c:222
+#: src/gtk/about.c:78 src/textview.c:226
 msgid "/_Open with Web browser"
 msgstr "/用网页浏览器打开(_O)"
 
-#: src/gtk/about.c:79 src/textview.c:223
+#: src/gtk/about.c:79 src/textview.c:227
 msgid "/Copy this _link"
 msgstr "/拷贝链接地址(_l)"
 
@@ -2974,41 +3055,41 @@ msgstr ""
 msgid ""
 "This product includes software developed by the OpenSSL Project for use in "
 "the OpenSSL Toolkit ("
-msgstr "本产品包含了根据OpenSSL开发包开发的软件, 该开发包由OpenSSL项目组提供。"
+msgstr "本产品包含了根据OpenSSL开发包开发的软件, 该开发包由OpenSSL项目组提供("
 
 #: src/gtk/about.c:503
 msgid ").\n"
-msgstr ""
+msgstr ")。\n"
 
 #: src/gtk/about.c:515
 msgid "_License"
 msgstr "许可协议(_L)"
 
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:291
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:299
 msgid "Orange"
 msgstr "橙色"
 
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:295
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:303
 msgid "Red"
 msgstr "红色"
 
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:299
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:307
 msgid "Pink"
 msgstr "粉红"
 
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:303
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:311
 msgid "Sky blue"
 msgstr "天蓝"
 
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:307
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:315
 msgid "Blue"
 msgstr "蓝色"
 
-#: src/gtk/colorlabel.c:53 src/prefs_common.c:311
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:319
 msgid "Green"
 msgstr "绿色"
 
-#: src/gtk/colorlabel.c:54 src/prefs_common.c:315
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:323
 msgid "Brown"
 msgstr "棕色"
 
@@ -3137,11 +3218,11 @@ msgstr "用于打印页眉和页脚的字体(例如: \"Monospace 10\")"
 msgid "No dictionary selected."
 msgstr "没有选择任何字典。"
 
-#: src/gtk/gtkaspell.c:829 src/gtk/gtkaspell.c:1814 src/gtk/gtkaspell.c:2094
+#: src/gtk/gtkaspell.c:829 src/gtk/gtkaspell.c:1815 src/gtk/gtkaspell.c:2095
 msgid "Normal Mode"
 msgstr "一般模式"
 
-#: src/gtk/gtkaspell.c:831 src/gtk/gtkaspell.c:1820 src/gtk/gtkaspell.c:2105
+#: src/gtk/gtkaspell.c:831 src/gtk/gtkaspell.c:1821 src/gtk/gtkaspell.c:2106
 msgid "Bad Spellers Mode"
 msgstr "拼错字模式"
 
@@ -3149,20 +3230,20 @@ msgstr "拼错字模式"
 msgid "Unknown suggestion mode."
 msgstr "未知的建议模式。"
 
-#: src/gtk/gtkaspell.c:1153
+#: src/gtk/gtkaspell.c:1154
 msgid "No misspelled word found."
 msgstr "没有发现错字。"
 
-#: src/gtk/gtkaspell.c:1501
+#: src/gtk/gtkaspell.c:1502
 msgid "Replace unknown word"
 msgstr "替换未知的字"
 
-#: src/gtk/gtkaspell.c:1516
+#: src/gtk/gtkaspell.c:1517
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
 msgstr "<span weight=\"bold\" size=\"larger\">将 \"%s\" 替换为: </span>"
 
-#: src/gtk/gtkaspell.c:1561
+#: src/gtk/gtkaspell.c:1562
 msgid ""
 "Holding down Control key while pressing Enter\n"
 "will learn from mistake.\n"
@@ -3170,59 +3251,59 @@ msgstr ""
 "学习功能: 按住Control键时按Enter\n"
 "可以将被认为拼写错误的单词加入到单词本。\n"
 
-#: src/gtk/gtkaspell.c:1808 src/gtk/gtkaspell.c:2083
+#: src/gtk/gtkaspell.c:1809 src/gtk/gtkaspell.c:2084
 msgid "Fast Mode"
 msgstr "快速模式"
 
-#: src/gtk/gtkaspell.c:1915
+#: src/gtk/gtkaspell.c:1916
 #, c-format
 msgid "\"%s\" unknown in %s"
 msgstr "%s中的\"%s\"未知"
 
-#: src/gtk/gtkaspell.c:1929
+#: src/gtk/gtkaspell.c:1930
 msgid "Accept in this session"
 msgstr "接受这一次"
 
-#: src/gtk/gtkaspell.c:1939
+#: src/gtk/gtkaspell.c:1940
 msgid "Add to personal dictionary"
 msgstr "加入个人的字典"
 
-#: src/gtk/gtkaspell.c:1949
+#: src/gtk/gtkaspell.c:1950
 msgid "Replace with..."
 msgstr "更换成..."
 
-#: src/gtk/gtkaspell.c:1962
+#: src/gtk/gtkaspell.c:1963
 #, c-format
 msgid "Check with %s"
 msgstr "用%s检查"
 
-#: src/gtk/gtkaspell.c:1984
+#: src/gtk/gtkaspell.c:1985
 msgid "(no suggestions)"
 msgstr "(没有建议)"
 
-#: src/gtk/gtkaspell.c:1995 src/gtk/gtkaspell.c:2157
+#: src/gtk/gtkaspell.c:1996 src/gtk/gtkaspell.c:2158
 msgid "More..."
 msgstr "更多..."
 
-#: src/gtk/gtkaspell.c:2059
+#: src/gtk/gtkaspell.c:2060
 #, c-format
 msgid "Dictionary: %s"
 msgstr "字典: %s"
 
-#: src/gtk/gtkaspell.c:2072
+#: src/gtk/gtkaspell.c:2073
 #, c-format
 msgid "Use alternate (%s)"
 msgstr "用另一个(%s)"
 
-#: src/gtk/gtkaspell.c:2120 src/prefs_spelling.c:221
+#: src/gtk/gtkaspell.c:2121 src/prefs_spelling.c:221
 msgid "Check while typing"
 msgstr "键入时实时检查"
 
-#: src/gtk/gtkaspell.c:2136
+#: src/gtk/gtkaspell.c:2137
 msgid "Change dictionary"
 msgstr "切换字典"
 
-#: src/gtk/gtkaspell.c:2269
+#: src/gtk/gtkaspell.c:2270
 #, c-format
 msgid ""
 "The spell checker could not change dictionary.\n"
@@ -3322,7 +3403,7 @@ msgstr "协议日志"
 msgid "Clear _Log"
 msgstr "清除日志(_L)"
 
-#: src/gtk/pluginwindow.c:149 src/gtk/pluginwindow.c:154
+#: src/gtk/pluginwindow.c:150 src/gtk/pluginwindow.c:155
 msgid ""
 "\n"
 "\n"
@@ -3332,19 +3413,19 @@ msgstr ""
 "\n"
 "版本: "
 
-#: src/gtk/pluginwindow.c:152
+#: src/gtk/pluginwindow.c:153
 msgid "Error: "
 msgstr "错误: "
 
-#: src/gtk/pluginwindow.c:153
+#: src/gtk/pluginwindow.c:154
 msgid "Plugin is not functional."
 msgstr "该插件不能工作。"
 
-#: src/gtk/pluginwindow.c:184
+#: src/gtk/pluginwindow.c:185
 msgid "Select Plugin to load"
 msgstr "选择要加载的插件"
 
-#: src/gtk/pluginwindow.c:198
+#: src/gtk/pluginwindow.c:199
 #, c-format
 msgid ""
 "The following error occured while loading the plugin [%s] :\n"
@@ -3353,7 +3434,7 @@ msgstr ""
 "加载此插件时发生如下错误[%s]:\n"
 "%s\n"
 
-#: src/gtk/pluginwindow.c:281 src/gtk/pluginwindow.c:440
+#: src/gtk/pluginwindow.c:283 src/gtk/pluginwindow.c:433
 #: src/plugins/clamav/clamav_plugin_gtk.c:213
 #: src/plugins/dillo_viewer/dillo_prefs.c:75
 #: src/plugins/pgpcore/prefs_gpg.c:453
@@ -3361,11 +3442,11 @@ msgstr ""
 msgid "Plugins"
 msgstr "插件"
 
-#: src/gtk/pluginwindow.c:312 src/prefs_summaries.c:210
+#: src/gtk/pluginwindow.c:314 src/prefs_summaries.c:210
 msgid "Description"
 msgstr "描述"
 
-#: src/gtk/pluginwindow.c:335 src/prefs_themes.c:866
+#: src/gtk/pluginwindow.c:337 src/prefs_themes.c:866
 msgid "Get more..."
 msgstr "下载更多..."
 
@@ -3373,7 +3454,7 @@ msgstr "下载更多..."
 msgid "Load Plugin..."
 msgstr "加载插件..."
 
-#: src/gtk/pluginwindow.c:351
+#: src/gtk/pluginwindow.c:347
 msgid "Unload Plugin"
 msgstr "卸载插件"
 
@@ -3381,7 +3462,7 @@ msgstr "卸载插件"
 msgid "Page Index"
 msgstr "页面"
 
-#: src/gtk/progressdialog.c:141 src/prefs_account.c:755
+#: src/gtk/progressdialog.c:141 src/prefs_account.c:760
 #: src/prefs_filtering_action.c:378
 msgid "Account"
 msgstr "帐号"
@@ -3556,7 +3637,7 @@ msgstr "区分大小写的搜寻"
 msgid "all filtering expressions are allowed"
 msgstr "允许使用所有过滤表达式"
 
-#: src/gtk/quicksearch.c:302 src/summary_search.c:299
+#: src/gtk/quicksearch.c:302 src/summary_search.c:302
 msgid "Extended Search"
 msgstr "高级搜索"
 
@@ -3571,21 +3652,21 @@ msgstr ""
 "\n"
 "可以使用如下一些符号:"
 
-#: src/gtk/quicksearch.c:399 src/prefs_filtering_action.c:1076
-#: src/prefs_matcher.c:150 src/prefs_matcher.c:1680
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:47 src/summaryview.c:485
+#: src/gtk/quicksearch.c:399 src/prefs_filtering_action.c:1080
+#: src/prefs_matcher.c:150 src/prefs_matcher.c:1684
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:47 src/summaryview.c:486
 msgid "Subject"
 msgstr "主题"
 
-#: src/gtk/quicksearch.c:403 src/prefs_filtering_action.c:1077
-#: src/prefs_matcher.c:151 src/prefs_matcher.c:1681
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:486
+#: src/gtk/quicksearch.c:403 src/prefs_filtering_action.c:1081
+#: src/prefs_matcher.c:151 src/prefs_matcher.c:1685
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
 msgid "From"
 msgstr "发信人"
 
-#: src/gtk/quicksearch.c:407 src/prefs_filtering_action.c:1078
-#: src/prefs_matcher.c:151 src/prefs_matcher.c:1682
-#: src/prefs_summary_column.c:84 src/quote_fmt.c:48 src/summaryview.c:487
+#: src/gtk/quicksearch.c:407 src/prefs_filtering_action.c:1082
+#: src/prefs_matcher.c:151 src/prefs_matcher.c:1686
+#: src/prefs_summary_column.c:84 src/quote_fmt.c:48 src/summaryview.c:488
 msgid "To"
 msgstr "收信人"
 
@@ -3601,7 +3682,7 @@ msgstr "切换邮件夹时保持有效"
 msgid " Clear "
 msgstr "清除"
 
-#: src/gtk/quicksearch.c:480 src/summary_search.c:252
+#: src/gtk/quicksearch.c:480 src/summary_search.c:255
 msgid "Edit search criteria"
 msgstr "编辑搜索条件"
 
@@ -3609,7 +3690,7 @@ msgstr "编辑搜索条件"
 msgid " Extended Symbols... "
 msgstr "扩展符号"
 
-#: src/gtk/quicksearch.c:917 src/summaryview.c:981
+#: src/gtk/quicksearch.c:917 src/summaryview.c:993
 #, c-format
 msgid "Searching in %s... \n"
 msgstr "正在搜索(%s)... \n"
@@ -3628,7 +3709,7 @@ msgid "Signer"
 msgstr "歌者"
 
 #: src/gtk/sslcertwindow.c:142 src/gtk/sslcertwindow.c:163
-#: src/prefs_filtering.c:270 src/prefs_themes.c:883
+#: src/prefs_filtering.c:294 src/prefs_themes.c:883
 msgid "Name: "
 msgstr "名称: "
 
@@ -3727,11 +3808,11 @@ msgstr "查看认证(_V)"
 msgid "Changed SSL Certificate"
 msgstr "更改SSL认证"
 
-#: src/headerview.c:196 src/summaryview.c:2596 src/summaryview.c:2602
+#: src/headerview.c:196 src/summaryview.c:2633 src/summaryview.c:2644
 msgid "(No From)"
 msgstr "(没有发信人)"
 
-#: src/headerview.c:211 src/summaryview.c:2626 src/summaryview.c:2629
+#: src/headerview.c:211 src/summaryview.c:2669 src/summaryview.c:2672
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
@@ -3751,7 +3832,7 @@ msgstr "加载图片"
 msgid "Content-Type:"
 msgstr ""
 
-#: src/imap.c:617
+#: src/imap.c:616
 msgid ""
 "\n"
 "\n"
@@ -3763,36 +3844,36 @@ msgstr ""
 "CRAM-MD5登录方式仅仅在libetpan编译进了SASL支持并且CRAM-MD5 SASL插件已经加载的"
 "情况下可用。"
 
-#: src/imap.c:626
+#: src/imap.c:625
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "连接到 %s 失败: 登录被拒绝。%s"
 
-#: src/imap.c:630
+#: src/imap.c:629
 #, c-format
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "连接到 %s 失败: 登录被拒绝。%s\n"
 
-#: src/imap.c:647
+#: src/imap.c:646
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/imap.c:652 src/imap.c:655
+#: src/imap.c:651 src/imap.c:654
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "与 %s 的IMAP4连接已经断开。正在重新连接...\n"
 
-#: src/imap.c:694 src/imap.c:2173 src/imap.c:2673 src/imap.c:2757
-#: src/imap.c:3095 src/imap.c:3849
+#: src/imap.c:692 src/imap.c:2153 src/imap.c:2653 src/imap.c:2737
+#: src/imap.c:3075 src/imap.c:3831
 msgid "Sylpheed-Claws needs network access in order to access the IMAP server."
 msgstr "Sylpheed-Claws需要访问网络才能连接IMAP服务。"
 
-#: src/imap.c:766 src/inc.c:759 src/news.c:283 src/send_message.c:278
+#: src/imap.c:764 src/inc.c:759 src/news.c:295 src/send_message.c:299
 msgid "Insecure connection"
 msgstr "不安全的连接"
 
-#: src/imap.c:767 src/inc.c:760 src/news.c:284 src/send_message.c:279
+#: src/imap.c:765 src/inc.c:760 src/news.c:296 src/send_message.c:300
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Sylpheed-Claws. \n"
@@ -3804,26 +3885,26 @@ msgstr ""
 "入)。\n"
 "请问是否要继续连接该服务器? 如果继续的话，通讯并不能保证是安全的。"
 
-#: src/imap.c:773 src/inc.c:766 src/news.c:290 src/send_message.c:285
+#: src/imap.c:771 src/inc.c:766 src/news.c:302 src/send_message.c:306
 msgid "Con_tinue connecting"
 msgstr "继续连接(_t)"
 
-#: src/imap.c:783
+#: src/imap.c:781
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "连接到 IMAP4 服务器: %s..."
 
-#: src/imap.c:815
+#: src/imap.c:813
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "无法连接到 IMAP4 服务器: %s:%d"
 
-#: src/imap.c:818
+#: src/imap.c:816
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到 IMAP4 服务器: %s:%d\n"
 
-#: src/imap.c:847
+#: src/imap.c:845
 msgid "Can't start TLS session.\n"
 msgstr "无法启动TLS。\n"
 
@@ -3832,71 +3913,76 @@ msgstr "无法启动TLS。\n"
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "正在连接 IMAP4 服务器 %s...\n"
 
-#: src/imap.c:1058
+#: src/imap.c:894
+#,  c-format
+msgid "Couldn't login to IMAP server %s."
+msgstr "无法登录到 IMAP 服务器 %s。"
+
+#: src/imap.c:1067
 msgid "Adding messages..."
 msgstr "正在添加邮件..."
 
-#: src/imap.c:1211 src/mh.c:512
+#: src/imap.c:1215 src/mh.c:500
 msgid "Copying messages..."
 msgstr "正在拷贝邮件..."
 
-#: src/imap.c:1362
+#: src/imap.c:1342
 msgid "can't set deleted flags\n"
 msgstr "不能设置删除标记\n"
 
-#: src/imap.c:1368 src/imap.c:3601
+#: src/imap.c:1348 src/imap.c:3583
 msgid "can't expunge\n"
 msgstr "无法擦除\n"
 
-#: src/imap.c:1812
+#: src/imap.c:1792
 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建收信夹: LIST失败\n"
 
-#: src/imap.c:1828
+#: src/imap.c:1808
 msgid "can't create mailbox\n"
 msgstr "无法启动收信夹\n"
 
-#: src/imap.c:1909
+#: src/imap.c:1889
 msgid "New folder name must not contain the namespace path separator"
 msgstr "新目录并不能包含名字空间分隔符"
 
-#: src/imap.c:1940
+#: src/imap.c:1920
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱%s 重新命名为 %s\n"
 
-#: src/imap.c:2004
+#: src/imap.c:1984
 msgid "can't delete mailbox\n"
 msgstr "无法删除信夹\n"
 
-#: src/imap.c:2285
+#: src/imap.c:2265
 msgid "LIST failed\n"
 msgstr ""
 
-#: src/imap.c:2393
+#: src/imap.c:2373
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择邮件夹: %s\n"
 
-#: src/imap.c:2678
+#: src/imap.c:2658
 msgid "Fetching message..."
 msgstr "正在收取邮件..."
 
-#: src/imap.c:2844
+#: src/imap.c:2824
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv无法将UTF-7转换成%s\n"
 
-#: src/imap.c:2874
+#: src/imap.c:2854
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv无法将%s转换成UTF-7\n"
 
-#: src/imap.c:2918
+#: src/imap.c:2898
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv无法将UTF-8转换成UTF-7\n"
 
-#: src/imap.c:3586
+#: src/imap.c:3568
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "不能设置删除标记: %d\n"
@@ -4077,7 +4163,7 @@ msgstr "请选择要导入的LDIF文件。"
 msgid "R"
 msgstr ""
 
-#: src/importldif.c:726 src/summaryview.c:483
+#: src/importldif.c:726 src/summaryview.c:484
 msgid "S"
 msgstr "S"
 
@@ -4240,71 +4326,71 @@ msgstr "%s:正在收取邮件"
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器: %s..."
 
-#: src/inc.c:785
+#: src/inc.c:787
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接到POP3服务器: %s:%d\n"
 
-#: src/inc.c:792
+#: src/inc.c:794
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr " 无法连接到POP3服务器: %s:%d"
 
-#: src/inc.c:873 src/send_message.c:451
+#: src/inc.c:875 src/send_message.c:472
 msgid "Authenticating..."
 msgstr "正在授权..."
 
-#: src/inc.c:874
+#: src/inc.c:877
 #, c-format
 msgid "Retrieving messages from %s (%s) ..."
 msgstr "正在从%s收取邮件 (%s)..."
 
-#: src/inc.c:880
+#: src/inc.c:883
 msgid "Getting the number of new messages (STAT)..."
 msgstr "获取新邮件数目中(STAT)..."
 
-#: src/inc.c:884
+#: src/inc.c:887
 msgid "Getting the number of new messages (LAST)..."
 msgstr " 获取新邮件数目中(LAST)..."
 
-#: src/inc.c:888
+#: src/inc.c:891
 msgid "Getting the number of new messages (UIDL)..."
 msgstr " 获取新邮件数目中(UIDL)..."
 
-#: src/inc.c:892
+#: src/inc.c:895
 msgid "Getting the size of messages (LIST)..."
 msgstr "获取邮件大小中(LIST)..."
 
-#: src/inc.c:899 src/send_message.c:469
+#: src/inc.c:902 src/send_message.c:490
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:924
+#: src/inc.c:927
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取回邮件(%d/%d)(%s/%s)"
 
-#: src/inc.c:943
+#: src/inc.c:946
 #, c-format
 msgid "Retrieving (%d message (%s) received)"
 msgid_plural "Retrieving (%d messages (%s) received)"
 msgstr[0] "正在收取邮件(已收到%d个，大小为%s)"
 msgstr[1] "正在收取邮件(已收到%d个，大小为%s)"
 
-#: src/inc.c:1099
+#: src/inc.c:1102
 msgid "Connection failed."
 msgstr "连接失败。"
 
-#: src/inc.c:1102
+#: src/inc.c:1105
 #, c-format
 msgid "Connection to %s:%d failed."
 msgstr "连接到 %s:%d 失败。"
 
-#: src/inc.c:1107
+#: src/inc.c:1110
 msgid "Error occurred while processing mail."
 msgstr " 处理邮件时发生错误。"
 
-#: src/inc.c:1112
+#: src/inc.c:1115
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -4313,37 +4399,37 @@ msgstr ""
 "处理邮件时发生错误:\n"
 "%s"
 
-#: src/inc.c:1118
+#: src/inc.c:1121
 msgid "No disk space left."
 msgstr "磁盘无空间。"
 
-#: src/inc.c:1123
+#: src/inc.c:1126
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1128
+#: src/inc.c:1131
 msgid "Socket error."
 msgstr "Socket错误。"
 
-#: src/inc.c:1131
+#: src/inc.c:1134
 #, c-format
 msgid "Socket error on connection to %s:%d."
 msgstr "连接 %s:%d 时发生套接字错误。"
 
-#: src/inc.c:1136 src/send_message.c:379 src/send_message.c:594
+#: src/inc.c:1139 src/send_message.c:400 src/send_message.c:615
 msgid "Connection closed by the remote host."
 msgstr "连接被远程主机关闭。"
 
-#: src/inc.c:1139
+#: src/inc.c:1142
 #, c-format
 msgid "Connection to %s:%d closed by the remote host."
 msgstr "与%s:%d的连接被远程主机关闭。"
 
-#: src/inc.c:1144
+#: src/inc.c:1147
 msgid "Mailbox is locked."
 msgstr "邮箱已经被锁，无法打开。"
 
-#: src/inc.c:1148
+#: src/inc.c:1151
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -4352,11 +4438,11 @@ msgstr ""
 "邮箱被锁定:\n"
 "%s"
 
-#: src/inc.c:1154 src/send_message.c:579
+#: src/inc.c:1157 src/send_message.c:600
 msgid "Authentication failed."
 msgstr "授权失败。"
 
-#: src/inc.c:1159 src/send_message.c:582
+#: src/inc.c:1162 src/send_message.c:603
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -4365,29 +4451,25 @@ msgstr ""
 "鉴权失败:\n"
 "%s"
 
-#: src/inc.c:1164 src/send_message.c:598
+#: src/inc.c:1167 src/send_message.c:619
 msgid "Session timed out."
 msgstr "会话已超时。"
 
-#: src/inc.c:1167
+#: src/inc.c:1170
 #, c-format
 msgid "Connection to %s:%d timed out."
 msgstr "到 %s:%d 的连接超时。"
 
-#: src/inc.c:1202
+#: src/inc.c:1205
 msgid "Incorporation cancelled\n"
 msgstr "合并操作被取消\n"
 
-#: src/inc.c:1439
+#: src/inc.c:1442
 #, c-format
 msgid "%s%sYou're working offline. Override for %d minutes?"
 msgstr "%s%s您正在脱机工作。是否在%d分钟内更改？"
 
-#: src/inc.c:1444 src/toolbar.c:2090
-msgid "Offline warning"
-msgstr "脱机警告"
-
-#: src/inc.c:1446
+#: src/inc.c:1449
 msgid "On_ly once"
 msgstr "仅一次(_l)"
 
@@ -4437,13 +4519,31 @@ msgstr "迁移失败！"
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib不支持g_thread。\n"
 
-#: src/main.c:542
+#: src/main.c:354
+msgid ""
+"Sylpheed-Claws has been compiled with a more recent GTK+ library than is "
+"currently available. This will cause crashes. You need to upgrade GTK+ or "
+"recompile Sylpheed-Claws."
+msgstr ""
+"Sylpheed-Claws编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。"
+"请升级GTK+的版本，或者重新编译Sylpheed-Claws。"
+
+#: src/main.c:363
+msgid ""
+"Sylpheed-Claws has been compiled with an older GTK+ library than is "
+"currently available. This will cause crashes. You need to recompile Sylpheed-"
+"Claws."
+msgstr ""
+"Sylpheed-Claws编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。"
+"请升级GTK+的版本，或者重新编译Sylpheed-Claws。"
+
+#: src/main.c:561
 msgid ""
 "Some plugin(s) failed to load. Check the Plugins configuration for more "
 "information."
 msgstr "部分插件无法成功加载，请检查插件配置以获取详细信息。"
 
-#: src/main.c:548
+#: src/main.c:571
 msgid ""
 "Sylpheed-Claws has detected a configured mailbox, but could not load it. It "
 "is probably provided by an out-of-date external plugin. Please reinstall the "
@@ -4452,20 +4552,20 @@ msgstr ""
 "Sylpheed-Claws检测到一个已经配置的邮箱，但无法加载。它可能是由一个已经过时的"
 "第三方插件建立的。请重新安装该插件后再尝试。"
 
-#: src/main.c:776
+#: src/main.c:803
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法: %s [选项]...\n"
 
-#: src/main.c:778
+#: src/main.c:805
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [地址]       打开写信窗口"
 
-#: src/main.c:779
+#: src/main.c:806
 msgid "  --subscribe [uri]      subscribe to the given URI if possible"
 msgstr "  --subscribe [uri]      订阅指定的URI"
 
-#: src/main.c:780
+#: src/main.c:807
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -4474,23 +4574,23 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         打开写新邮件窗口，并附上所指定的文件"
 
-#: src/main.c:783
+#: src/main.c:810
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
-#: src/main.c:784
+#: src/main.c:811
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
-#: src/main.c:785
+#: src/main.c:812
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送所有待发送邮件"
 
-#: src/main.c:786
+#: src/main.c:813
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               显示所有邮件的数目"
 
-#: src/main.c:787
+#: src/main.c:814
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -4498,7 +4598,7 @@ msgstr ""
 "  --status-full [邮件夹]...\n"
 "                         显示每个邮件夹的状态"
 
-#: src/main.c:789
+#: src/main.c:816
 msgid ""
 "  --select folder[/msg]  jumps to the specified folder/message\n"
 "                         folder is a folder id like '#mh/Mailbox/inbox'"
@@ -4506,895 +4606,895 @@ msgstr ""
 "  --select folder[/msg]  跳转到指定的邮件夹/邮件\n"
 "                         可采用如下方式指定邮件夹: '#mh/Mailbox/inbox'"
 
-#: src/main.c:791
+#: src/main.c:818
 msgid "  --online               switch to online mode"
 msgstr "  --online               切换到联机模式"
 
-#: src/main.c:792
+#: src/main.c:819
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切换到脱机模式"
 
-#: src/main.c:793
+#: src/main.c:820
 msgid "  --exit                 exit Sylpheed-Claws"
 msgstr "  --exit                 退出Sylpheed-Claws"
 
-#: src/main.c:794
+#: src/main.c:821
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:795
+#: src/main.c:822
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示本说明并结束程序"
 
-#: src/main.c:796
+#: src/main.c:823
 msgid "  --version              output version information and exit"
 msgstr "  --version              显示版本内容并结束程序"
 
-#: src/main.c:797
+#: src/main.c:824
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           显示配置数据目录"
 
-#: src/main.c:862
+#: src/main.c:889
 #, c-format
 msgid "Processing (%s)..."
 msgstr "正在处理(%s)..."
 
-#: src/main.c:865
+#: src/main.c:892
 msgid "top level folder"
 msgstr "最上一层邮件夹"
 
-#: src/main.c:926
+#: src/main.c:953
 msgid "Really quit?"
 msgstr "确定要退出吗?"
 
-#: src/main.c:927
+#: src/main.c:954
 msgid "Composing message exists."
 msgstr "所编辑的文件已经存在。"
 
-#: src/main.c:928
+#: src/main.c:955
 msgid "_Save to Draft"
 msgstr "存为草稿(_S)"
 
-#: src/main.c:928
+#: src/main.c:955
 msgid "_Discard them"
 msgstr "摈弃(_D)"
 
-#: src/main.c:928
+#: src/main.c:955
 msgid "Do_n't quit"
 msgstr "不退出(_n)"
 
-#: src/main.c:942
+#: src/main.c:969
 msgid "Queued messages"
 msgstr "待发送的邮件"
 
-#: src/main.c:943
+#: src/main.c:970
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "待发送邮件夹内尚有邮件。要退出吗？"
 
-#: src/main.c:1230 src/toolbar.c:2128
-msgid "Some errors occurred while sending queued messages."
-msgstr "发送邮件时发生错误。"
-
-#: src/mainwindow.c:466 src/messageview.c:158
+#: src/mainwindow.c:470 src/messageview.c:155
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:471
 msgid "/_File/_Add mailbox"
 msgstr "/文件(_F)/添加邮箱(_A)..."
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:472
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/文件(_F)/增加邮箱(_A)/MH格式..."
 
-#: src/mainwindow.c:469 src/mainwindow.c:471 src/mainwindow.c:476
-#: src/mainwindow.c:478 src/mainwindow.c:481 src/mainwindow.c:484
-#: src/messageview.c:161
+#: src/mainwindow.c:473 src/mainwindow.c:475 src/mainwindow.c:480
+#: src/mainwindow.c:482 src/mainwindow.c:485 src/mainwindow.c:488
+#: src/messageview.c:158
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:474
 msgid "/_File/Change folder order..."
 msgstr "/文件(_F)/修改邮件夹顺序..."
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:476
 msgid "/_File/_Import mbox file..."
 msgstr "/文件(_F)/导入mbox的文件(_I)... "
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:477
 msgid "/_File/_Export to mbox file..."
 msgstr "/文件(_F)/以mbox格式导出邮件夹(_E)..."
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:478
 msgid "/_File/Exp_ort selected to mbox file..."
 msgstr "/文件(_F)/以mbox格式导出选中的邮件(_o)..."
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:481
 msgid "/_File/Empty all _Trash folders"
 msgstr "/文件(_F)/清空所有垃圾桶(_T)"
 
-#: src/mainwindow.c:479 src/messageview.c:159
+#: src/mainwindow.c:483 src/messageview.c:156
 msgid "/_File/_Save as..."
 msgstr "/文件(_F)/保存为(_S)..."
 
-#: src/mainwindow.c:480 src/messageview.c:160
+#: src/mainwindow.c:484 src/messageview.c:157
 msgid "/_File/_Print..."
 msgstr "/文件(_F)/打印(_P)..."
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:486
 msgid "/_File/_Work offline"
 msgstr "/文件(_F)/脱机工作(_W)"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:487
 msgid "/_File/Synchronise folders"
 msgstr "/文件(_F)/同步邮件夹"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:490
 msgid "/_File/E_xit"
 msgstr "/文件(_F)/退出(_x)"
 
-#: src/mainwindow.c:491
+#: src/mainwindow.c:495
 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 
-#: src/mainwindow.c:493 src/messageview.c:168
+#: src/mainwindow.c:497 src/messageview.c:165
 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在邮件中查找(_F)..."
 
-#: src/mainwindow.c:495
+#: src/mainwindow.c:499
 msgid "/_Edit/_Search folder..."
 msgstr "/编辑(_E)/在邮件夹中搜索(_S)..."
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:500
 msgid "/_Edit/_Quick search"
 msgstr "/编辑(_E)/快速搜索(_Q)"
 
-#: src/mainwindow.c:497 src/messageview.c:171 src/summaryview.c:471
+#: src/mainwindow.c:501 src/messageview.c:168 src/summaryview.c:472
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: src/mainwindow.c:498
+#: src/mainwindow.c:502
 msgid "/_View/Show or hi_de"
 msgstr "/查看(_V)/显示或隐藏(_d)"
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:503
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/查看(_V)/显示或隐藏(_d)/邮件夹树(_F)"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:505
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/查看(_V)/显示或隐藏(_d)/邮件内容(_M)"
 
-#: src/mainwindow.c:503
+#: src/mainwindow.c:507
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:509
 msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/文字在图标下方(_b)"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:511
 msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/文字在图标旁边(_s)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:513
 msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/仅显示图标(_I)"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:515
 msgid "/_View/Show or hi_de/_Toolbar/_Text only"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/仅显示文字(_T)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:517
 msgid "/_View/Show or hi_de/_Toolbar/_Hide"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/均不显示(_H)"
 
-#: src/mainwindow.c:515
+#: src/mainwindow.c:519
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_d)/隐藏工具栏(_b)"
 
-#: src/mainwindow.c:517
+#: src/mainwindow.c:521
 msgid "/_View/Set displayed _columns"
 msgstr "/查看(_V)/设置显示列(_c)..."
 
-#: src/mainwindow.c:518
+#: src/mainwindow.c:522
 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr "/查看(_V)/设置显示列(_c)/邮件夹列表(_F)..."
 
-#: src/mainwindow.c:519
+#: src/mainwindow.c:523
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/查看(_V)/设置显示列(_c)/邮件列表(M)..."
 
-#: src/mainwindow.c:521 src/mainwindow.c:524 src/mainwindow.c:552
-#: src/mainwindow.c:576 src/mainwindow.c:693 src/mainwindow.c:697
-#: src/messageview.c:277
+#: src/mainwindow.c:525 src/mainwindow.c:528 src/mainwindow.c:556
+#: src/mainwindow.c:581 src/mainwindow.c:698 src/mainwindow.c:702
+#: src/messageview.c:274
 msgid "/_View/---"
 msgstr "/显示(_V)/---"
 
-#: src/mainwindow.c:522
+#: src/mainwindow.c:526
 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/用单独窗口显示邮件夹树(_o)"
 
-#: src/mainwindow.c:523
+#: src/mainwindow.c:527
 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/用单独窗口中显示邮件内容(_m)"
 
-#: src/mainwindow.c:525
+#: src/mainwindow.c:529
 msgid "/_View/_Sort"
 msgstr "/查看(_V)/排序(_S)"
 
-#: src/mainwindow.c:526
+#: src/mainwindow.c:530
 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按顺序(_n)"
 
-#: src/mainwindow.c:527
+#: src/mainwindow.c:531
 msgid "/_View/_Sort/by S_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_i)"
 
-#: src/mainwindow.c:528
+#: src/mainwindow.c:532
 msgid "/_View/_Sort/by _Date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
-#: src/mainwindow.c:529
+#: src/mainwindow.c:533
 msgid "/_View/_Sort/by _From"
 msgstr "/查看(_V)/排序(_S)/按发信人(_F)"
 
-#: src/mainwindow.c:530
+#: src/mainwindow.c:534
 msgid "/_View/_Sort/by _To"
 msgstr "/查看(_V)/排序(_S)/按收信人(_T)"
 
-#: src/mainwindow.c:531
+#: src/mainwindow.c:535
 msgid "/_View/_Sort/by S_ubject"
 msgstr "/查看(_V)/排序(_S)/按主题(_u)"
 
-#: src/mainwindow.c:532
+#: src/mainwindow.c:536
 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标签(_c)"
 
-#: src/mainwindow.c:534
+#: src/mainwindow.c:538
 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_m)"
 
-#: src/mainwindow.c:535
+#: src/mainwindow.c:539
 msgid "/_View/_Sort/by _status"
 msgstr "/查看(_V)/排序(_S)/按状态(_s)"
 
-#: src/mainwindow.c:536
+#: src/mainwindow.c:540
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_t)"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:542
 msgid "/_View/_Sort/by score"
 msgstr "/查看(_V)/排序(_S)/按得分"
 
-#: src/mainwindow.c:539
+#: src/mainwindow.c:543
 msgid "/_View/_Sort/by locked"
 msgstr "/查看(_V)/排序(_S)/按锁定状态"
 
-#: src/mainwindow.c:540
+#: src/mainwindow.c:544
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_o)"
 
-#: src/mainwindow.c:541 src/mainwindow.c:544
+#: src/mainwindow.c:545 src/mainwindow.c:548
 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 
-#: src/mainwindow.c:542
+#: src/mainwindow.c:546
 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 
-#: src/mainwindow.c:543
+#: src/mainwindow.c:547
 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 
-#: src/mainwindow.c:545
+#: src/mainwindow.c:549
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题排列(_A)"
 
-#: src/mainwindow.c:547
+#: src/mainwindow.c:551
 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 
-#: src/mainwindow.c:548
+#: src/mainwindow.c:552
 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 
-#: src/mainwindow.c:549
+#: src/mainwindow.c:553
 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/折叠所有线索(_L)"
 
-#: src/mainwindow.c:550
+#: src/mainwindow.c:554
 msgid "/_View/_Hide read messages"
 msgstr "/查看(_V)/隐藏已读邮件(_H) "
 
-#: src/mainwindow.c:553
+#: src/mainwindow.c:557
 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 
-#: src/mainwindow.c:554
+#: src/mainwindow.c:558
 msgid "/_View/_Go to/_Previous message"
 msgstr "/查看(_V)/转到(_G)/上一封(_P)"
 
-#: src/mainwindow.c:555
+#: src/mainwindow.c:559
 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一封(_N)"
 
-#: src/mainwindow.c:556 src/mainwindow.c:561 src/mainwindow.c:564
-#: src/mainwindow.c:569 src/mainwindow.c:574
+#: src/mainwindow.c:560 src/mainwindow.c:565 src/mainwindow.c:568
+#: src/mainwindow.c:573 src/mainwindow.c:578
 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 
-#: src/mainwindow.c:557
+#: src/mainwindow.c:561
 msgid "/_View/_Go to/P_revious unread message"
 msgstr "/查看(_V)/转到(_G)/上一封未读邮件(_r)"
 
-#: src/mainwindow.c:559
+#: src/mainwindow.c:563
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一封未读邮件(_e)"
 
-#: src/mainwindow.c:562
+#: src/mainwindow.c:566
 msgid "/_View/_Go to/Previous ne_w message"
 msgstr "/查看(_V)/转到(_G)/前一封新邮件(_w)"
 
-#: src/mainwindow.c:563
+#: src/mainwindow.c:567
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一封新邮件(_x)"
 
-#: src/mainwindow.c:565
+#: src/mainwindow.c:569
 msgid "/_View/_Go to/Previous _marked message"
 msgstr "/查看(_V)/ 转到(_G)/前一封标记过的邮件(_M)"
 
-#: src/mainwindow.c:567
+#: src/mainwindow.c:571
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/ 转到(_G)/下一封标记过的邮件(_a)"
 
-#: src/mainwindow.c:570
+#: src/mainwindow.c:574
 msgid "/_View/_Go to/Previous _labeled message"
 msgstr "/查看(_V)/ 转到(_G)/前一封打标签的邮件(_l)"
 
-#: src/mainwindow.c:572
+#: src/mainwindow.c:576
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/ 转到(_G)/下一封打标签的邮件(_b)"
 
-#: src/mainwindow.c:575
-msgid "/_View/_Go to/Other _folder..."
-msgstr "/查看(_V)/转到(_G)/其他邮件夹(_f)"
+#: src/mainwindow.c:579
+msgid "/_View/_Go to/Next unread _folder"
+msgstr "/查看(_V)/转到(_G)/下一个未读邮件夹(_f)"
 
-#: src/mainwindow.c:579 src/mainwindow.c:586 src/messageview.c:174
+#: src/mainwindow.c:580
+msgid "/_View/_Go to/_Other folder..."
+msgstr "/查看(_V)/转到(_G)/其他邮件夹(_O)..."
+
+#: src/mainwindow.c:584 src/mainwindow.c:591 src/messageview.c:171
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_e)/---"
 
-#: src/mainwindow.c:583 src/messageview.c:178
+#: src/mainwindow.c:588 src/messageview.c:175
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_e)"
 
-#: src/mainwindow.c:584 src/messageview.c:179
+#: src/mainwindow.c:589 src/messageview.c:176
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符集(_e)/自动侦测(_A)"
 
-#: src/mainwindow.c:587 src/messageview.c:182
+#: src/mainwindow.c:592 src/messageview.c:179
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符集(_e)/7bit ascii (US-ASCI_I)"
 
-#: src/mainwindow.c:589 src/messageview.c:185
+#: src/mainwindow.c:594 src/messageview.c:182
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符集(_e)/Unicode (_UTF-8)"
 
-#: src/mainwindow.c:593 src/messageview.c:188
+#: src/mainwindow.c:598 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_1)"
 
-#: src/mainwindow.c:595 src/messageview.c:190
+#: src/mainwindow.c:600 src/messageview.c:187
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-15)"
 
-#: src/mainwindow.c:597 src/messageview.c:192
+#: src/mainwindow.c:602 src/messageview.c:189
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/查看(_V)/字符集(_e)/西欧(Windows-1252)"
 
-#: src/mainwindow.c:601 src/messageview.c:195
+#: src/mainwindow.c:606 src/messageview.c:192
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_2) "
 
-#: src/mainwindow.c:605 src/messageview.c:198
+#: src/mainwindow.c:610 src/messageview.c:195
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 
-#: src/mainwindow.c:607 src/messageview.c:200
+#: src/mainwindow.c:612 src/messageview.c:197
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-_4) "
 
-#: src/mainwindow.c:611 src/messageview.c:203
+#: src/mainwindow.c:616 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符集(_e)/希腊 (ISO-8859-_7)"
 
-#: src/mainwindow.c:615 src/messageview.c:206
+#: src/mainwindow.c:620 src/messageview.c:203
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符集(_e)/希伯来 (ISO-8859-_8)"
 
-#: src/mainwindow.c:617 src/messageview.c:208
+#: src/mainwindow.c:622 src/messageview.c:205
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符集(_e)/希伯来 (Windows-1251)"
 
-#: src/mainwindow.c:621 src/messageview.c:211
+#: src/mainwindow.c:626 src/messageview.c:208
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/查看(_V)/字符集(_e)/阿拉伯语 (ISO-8859-_6) "
 
-#: src/mainwindow.c:623 src/messageview.c:213
+#: src/mainwindow.c:628 src/messageview.c:210
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/查看(_V)/字符集(_e)/阿拉伯语 (Windows-1256)"
 
-#: src/mainwindow.c:627 src/messageview.c:216
+#: src/mainwindow.c:632 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符集(_e)/土耳其 (ISO-8859-_9)"
 
-#: src/mainwindow.c:631 src/messageview.c:219
+#: src/mainwindow.c:636 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 
-#: src/mainwindow.c:633 src/messageview.c:221
+#: src/mainwindow.c:638 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-_R)"
 
-#: src/mainwindow.c:635 src/messageview.c:223
+#: src/mainwindow.c:640 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-U)"
 
-#: src/mainwindow.c:637 src/messageview.c:225
+#: src/mainwindow.c:642 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (Windows-1251)"
 
-#: src/mainwindow.c:641 src/messageview.c:228
+#: src/mainwindow.c:646 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-_JP)"
 
-#: src/mainwindow.c:643 src/messageview.c:230
+#: src/mainwindow.c:648 src/messageview.c:227
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:645 src/messageview.c:232
+#: src/mainwindow.c:650 src/messageview.c:229
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符集(_e)/日文 (_EUC-JP)"
 
-#: src/mainwindow.c:647 src/messageview.c:234
+#: src/mainwindow.c:652 src/messageview.c:231
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符集(_e)/日文 (_Shift__JIS)"
 
-#: src/mainwindow.c:651 src/messageview.c:237
+#: src/mainwindow.c:656 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符集(_e)/简体中文 (_GB2312)"
 
-#: src/mainwindow.c:653 src/messageview.c:239
+#: src/mainwindow.c:658 src/messageview.c:236
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符集(_e)/简体中文 (GBK)"
 
-#: src/mainwindow.c:655 src/messageview.c:241
+#: src/mainwindow.c:660 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符集(_e)/繁体中文 (_Big5)"
 
-#: src/mainwindow.c:657 src/messageview.c:243
+#: src/mainwindow.c:662 src/messageview.c:240
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符集(_e)/繁体中文 (EUC-_TW)"
 
-#: src/mainwindow.c:659 src/messageview.c:245
+#: src/mainwindow.c:664 src/messageview.c:242
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符集(_e)/中文 (ISO-2022-_CN)"
 
-#: src/mainwindow.c:663 src/messageview.c:248
+#: src/mainwindow.c:668 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符集(_e)/韩文 (EUC-_KR) "
 
-#: src/mainwindow.c:665 src/messageview.c:250
+#: src/mainwindow.c:670 src/messageview.c:247
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符集(_e)/韩文 (ISO-2022-KR)"
 
-#: src/mainwindow.c:669 src/messageview.c:253
+#: src/mainwindow.c:674 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符集(_e)/泰国 (TIS-620)"
 
-#: src/mainwindow.c:671 src/messageview.c:255
+#: src/mainwindow.c:676 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符集(_e)/泰国 (Windows-874)"
 
-#: src/mainwindow.c:678 src/mainwindow.c:684 src/messageview.c:262
-#: src/messageview.c:268
+#: src/mainwindow.c:683 src/mainwindow.c:689 src/messageview.c:259
+#: src/messageview.c:265
 msgid "/_View/Decode/---"
 msgstr "/查看(_V)/解码/---"
 
-#: src/mainwindow.c:681 src/messageview.c:265
+#: src/mainwindow.c:686 src/messageview.c:262
 msgid "/_View/Decode"
 msgstr "/查看(_V)/解码"
 
-#: src/mainwindow.c:682 src/messageview.c:266
+#: src/mainwindow.c:687 src/messageview.c:263
 msgid "/_View/Decode/_Auto detect"
 msgstr "/查看(_V)/解码/自动侦测(_A)"
 
-#: src/mainwindow.c:685 src/messageview.c:269
+#: src/mainwindow.c:690 src/messageview.c:266
 msgid "/_View/Decode/_8bit"
 msgstr "/查看(_V)/解码/_8位"
 
-#: src/mainwindow.c:686 src/messageview.c:270
+#: src/mainwindow.c:691 src/messageview.c:267
 msgid "/_View/Decode/_Quoted printable"
 msgstr "/查看(_V)/解码/_Quoted Printable"
 
-#: src/mainwindow.c:687 src/messageview.c:271
+#: src/mainwindow.c:692 src/messageview.c:268
 msgid "/_View/Decode/_Base64"
 msgstr "/查看(_V)/解码/_Base64"
 
-#: src/mainwindow.c:688 src/messageview.c:272
+#: src/mainwindow.c:693 src/messageview.c:269
 msgid "/_View/Decode/_Uuencode"
 msgstr "/查看(_V)/解码/_Uuencode"
 
-#: src/mainwindow.c:694 src/summaryview.c:472
+#: src/mainwindow.c:699 src/summaryview.c:473
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_w)"
 
-#: src/mainwindow.c:695 src/messageview.c:278
+#: src/mainwindow.c:700 src/messageview.c:275
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_a)"
 
-#: src/mainwindow.c:696
+#: src/mainwindow.c:701
 msgid "/_View/Show all headers"
 msgstr "/查看(_V)/显示所有信息头"
 
-#: src/mainwindow.c:698
+#: src/mainwindow.c:703
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新邮件摘要列表(_U)"
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:706
 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/收取(_v)"
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:707
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/收取(_v)/从当前帐号收取(_c)"
 
-#: src/mainwindow.c:704
+#: src/mainwindow.c:709
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/收取(_v)/从所有帐号收取(_c)"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:711
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/邮件(_M)/收取(_v)/取消(_g)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:713
 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/收取(_v)/---"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:714
 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/送出待发送邮件(_S)"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:716
 msgid "/_Message/Compose a_n email message"
 msgstr "/邮件(_M)/写信(_n)"
 
-#: src/mainwindow.c:712
+#: src/mainwindow.c:717
 msgid "/_Message/Compose a news message"
 msgstr "/邮件(_M)/写新闻群留言"
 
-#: src/mainwindow.c:713 src/messageview.c:285
+#: src/mainwindow.c:718 src/messageview.c:282
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回信(_R)"
 
-#: src/mainwindow.c:714
+#: src/mainwindow.c:719
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回信给(_y)"
 
-#: src/mainwindow.c:715 src/messageview.c:286
+#: src/mainwindow.c:720 src/messageview.c:283
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回信给(_y)/全部人(_a)"
 
-#: src/mainwindow.c:716 src/messageview.c:288
+#: src/mainwindow.c:721 src/messageview.c:285
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回信给(_y)/发信人(_s)"
 
-#: src/mainwindow.c:717 src/messageview.c:290
+#: src/mainwindow.c:722 src/messageview.c:287
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回信给(_y)/邮件列表(_l)"
 
-#: src/mainwindow.c:719
+#: src/mainwindow.c:724
 msgid "/_Message/Follow-up and reply to"
 msgstr "/邮件(_M)/Follow-up and reply to"
 
-#: src/mainwindow.c:721 src/messageview.c:293
+#: src/mainwindow.c:726 src/messageview.c:290
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:722 src/messageview.c:294
+#: src/mainwindow.c:727 src/messageview.c:291
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/以附加文件形式转发(_A)"
 
-#: src/mainwindow.c:723
+#: src/mainwindow.c:728
 msgid "/_Message/Redirect"
 msgstr "/邮件(_M)/重定向"
 
-#: src/mainwindow.c:725
+#: src/mainwindow.c:730
 msgid "/_Message/Mailing-_List"
 msgstr "/邮件(_M)/邮件列表(_L)"
 
-#: src/mainwindow.c:726
+#: src/mainwindow.c:731
 msgid "/_Message/Mailing-_List/Post"
 msgstr "/邮件(_M)/邮件列表(_L)/发贴"
 
-#: src/mainwindow.c:727
+#: src/mainwindow.c:732
 msgid "/_Message/Mailing-_List/Help"
 msgstr "/邮件(_M)/邮件列表(_l)/帮助"
 
-#: src/mainwindow.c:728
+#: src/mainwindow.c:733
 msgid "/_Message/Mailing-_List/Subscribe"
 msgstr "/邮件(_M)/邮件列表(_L)/订阅"
 
-#: src/mainwindow.c:729
+#: src/mainwindow.c:734
 msgid "/_Message/Mailing-_List/Unsubscribe"
 msgstr "/邮件(_M)/邮件列表(_L)/退订"
 
-#: src/mainwindow.c:730
+#: src/mainwindow.c:735
 msgid "/_Message/Mailing-_List/View archive"
 msgstr "/邮件(_M)/邮件列表(_L)/查看归档邮件"
 
-#: src/mainwindow.c:731
+#: src/mainwindow.c:736
 msgid "/_Message/Mailing-_List/Contact owner"
 msgstr "/邮件(_M)/邮件列表(_L)/联系作者"
 
-#: src/mainwindow.c:734
+#: src/mainwindow.c:739
 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_o)"
 
-#: src/mainwindow.c:735
+#: src/mainwindow.c:740
 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)"
 
-#: src/mainwindow.c:736
+#: src/mainwindow.c:741
 msgid "/_Message/Move to _trash"
 msgstr "/邮件(_M)/移动到垃圾桶(_t)"
 
-#: src/mainwindow.c:737
+#: src/mainwindow.c:742
 msgid "/_Message/_Delete..."
 msgstr "/邮件(_M)/删除(_D)..."
 
-#: src/mainwindow.c:738
+#: src/mainwindow.c:743
 msgid "/_Message/Cancel a news message"
 msgstr "/邮件(_M)/取消新邮件"
 
-#: src/mainwindow.c:740
+#: src/mainwindow.c:745
 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 
-#: src/mainwindow.c:741
+#: src/mainwindow.c:746
 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/ 标记(_M) "
 
-#: src/mainwindow.c:742
+#: src/mainwindow.c:747
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/ 不标记(_U)"
 
-#: src/mainwindow.c:743 src/mainwindow.c:747
+#: src/mainwindow.c:748 src/mainwindow.c:752
 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 
-#: src/mainwindow.c:744
+#: src/mainwindow.c:749
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_e)"
 
-#: src/mainwindow.c:745
+#: src/mainwindow.c:750
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_d)"
 
-#: src/mainwindow.c:746
+#: src/mainwindow.c:751
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/标记所有为已读(_r)"
 
-#: src/mainwindow.c:748
+#: src/mainwindow.c:753
 msgid "/_Message/_Mark/Mark as _spam"
 msgstr "/邮件(_M)/标记(_M)/标记为垃圾邮件(_s)"
 
-#: src/mainwindow.c:749
+#: src/mainwindow.c:754
 msgid "/_Message/_Mark/Mark as _ham"
 msgstr "/邮件(_M)/标记(_M)/标记为非垃圾邮件(_h)"
 
-#: src/mainwindow.c:750
+#: src/mainwindow.c:755
 msgid "/_Message/Color la_bel"
 msgstr "/邮件(_M)/彩色标记(_b)"
 
-#: src/mainwindow.c:752 src/messageview.c:298
+#: src/mainwindow.c:757
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_e)"
 
-#: src/mainwindow.c:755
+#: src/mainwindow.c:760
 msgid "/_Tools/_Address book..."
 msgstr "/工具(_T)/地址簿(_A)..."
 
-#: src/mainwindow.c:756 src/messageview.c:302
+#: src/mainwindow.c:761 src/messageview.c:297
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/将发信人加入地址簿中(_k)"
 
-#: src/mainwindow.c:758
+#: src/mainwindow.c:763
 msgid "/_Tools/_Harvest addresses"
 msgstr "/工具(_T)/批量提取通讯地址(_H)"
 
-#: src/mainwindow.c:759
+#: src/mainwindow.c:764
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/工具(_T)/批量提取通讯地址(_H)/从邮件夹(_F)"
 
-#: src/mainwindow.c:761
+#: src/mainwindow.c:766
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/工具(_T)/批量提取通讯地址(_H)/从邮件(_M)"
 
-#: src/mainwindow.c:764
+#: src/mainwindow.c:769
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤邮件夹中所有邮件(_F)"
 
-#: src/mainwindow.c:766
+#: src/mainwindow.c:771
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选定的邮件(_F)"
 
-#: src/mainwindow.c:768 src/messageview.c:305
+#: src/mainwindow.c:773 src/messageview.c:300
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:769 src/messageview.c:307
+#: src/mainwindow.c:774 src/messageview.c:302
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动创建(_A)"
 
-#: src/mainwindow.c:771 src/messageview.c:309
+#: src/mainwindow.c:776 src/messageview.c:304
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/由发信人(_F)"
 
-#: src/mainwindow.c:773 src/messageview.c:311
+#: src/mainwindow.c:778 src/messageview.c:306
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/由收信人(_T)"
 
-#: src/mainwindow.c:775 src/messageview.c:313
+#: src/mainwindow.c:780 src/messageview.c:308
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/由主题(_S)"
 
-#: src/mainwindow.c:777
+#: src/mainwindow.c:782
 msgid "/_Tools/C_reate processing rule"
 msgstr "/工具(_T)/创建处理规则(_r)"
 
-#: src/mainwindow.c:778
+#: src/mainwindow.c:783
 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr "/工具(_T)/创建处理规则(_r)/自动创建(_A)"
 
-#: src/mainwindow.c:780
+#: src/mainwindow.c:785
 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr "/工具(_T)/创建处理规则(_r)/由发信人(_F)"
 
-#: src/mainwindow.c:782
+#: src/mainwindow.c:787
 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr "/工具(_T)/创建处理规则(_r)/由收信人(_T)"
 
-#: src/mainwindow.c:784
+#: src/mainwindow.c:789
 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/工具(_T)/创建处理规则(_r)/由主题(_S)"
 
-#: src/mainwindow.c:789
+#: src/mainwindow.c:794
 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr "/工具(_T)/检查所有邮件夹中的新邮件(_e)"
 
-#: src/mainwindow.c:791
+#: src/mainwindow.c:796
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复邮件(_p)"
 
-#: src/mainwindow.c:793
+#: src/mainwindow.c:798
 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr "/工具(_T)/删除重复邮件(_p)/选定邮件夹"
 
-#: src/mainwindow.c:795
+#: src/mainwindow.c:800
 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr "/工具(_T)/删除重复邮件(_p)/所有邮件夹"
 
-#: src/mainwindow.c:798
+#: src/mainwindow.c:803
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/执行(_x)"
 
-#: src/mainwindow.c:801
+#: src/mainwindow.c:806
 msgid "/_Tools/SSL cer_tificates..."
 msgstr "/工具(_T)/SSL认证(_t)"
 
-#: src/mainwindow.c:805
+#: src/mainwindow.c:810
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/日志窗口(_L)"
 
-#: src/mainwindow.c:807
+#: src/mainwindow.c:812
 msgid "/_Configuration"
 msgstr "/设置(_C)"
 
-#: src/mainwindow.c:808
+#: src/mainwindow.c:813
 msgid "/_Configuration/C_hange current account"
 msgstr "/设置(_C)/更改目前帐号(_h)"
 
-#: src/mainwindow.c:810
+#: src/mainwindow.c:815
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/设置(_C)/目前帐号的偏好设置(_P)..."
 
-#: src/mainwindow.c:812
+#: src/mainwindow.c:817
 msgid "/_Configuration/Create _new account..."
 msgstr "/设置(_C)/创建新帐号(_n)..."
 
-#: src/mainwindow.c:814
+#: src/mainwindow.c:819
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/设置(_C)/编辑帐号(_E)..."
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:821
 msgid "/_Configuration/---"
 msgstr "/设置(_C)/---"
 
-#: src/mainwindow.c:817
+#: src/mainwindow.c:822
 msgid "/_Configuration/P_references..."
 msgstr "/设置(_C)/偏好(_r)..."
 
-#: src/mainwindow.c:819
+#: src/mainwindow.c:824
 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr "/设置(_C)/预处理(_o)..."
 
-#: src/mainwindow.c:821
+#: src/mainwindow.c:826
 msgid "/_Configuration/Post-pro_cessing..."
 msgstr "/设置(_C)/后处理(_c)..."
 
-#: src/mainwindow.c:823
+#: src/mainwindow.c:828
 msgid "/_Configuration/_Filtering..."
 msgstr "/设置(_C)/过滤(_F)..."
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:830
 msgid "/_Configuration/_Templates..."
 msgstr "/设置(_C)/模板(_T)..."
 
-#: src/mainwindow.c:826
+#: src/mainwindow.c:831
 msgid "/_Configuration/_Actions..."
 msgstr "/设置(_C)/动作(_A)..."
 
-#: src/mainwindow.c:827
+#: src/mainwindow.c:832
 msgid "/_Configuration/Plu_gins..."
 msgstr "/设置(_C)/插件(_g)..."
 
-#: src/mainwindow.c:830
+#: src/mainwindow.c:835
 msgid "/_Help/_Manual"
 msgstr "/求助(_H)/联机手册(_M)"
 
-#: src/mainwindow.c:831
+#: src/mainwindow.c:836
 msgid "/_Help/_Online User-contributed FAQ"
 msgstr "/帮助(_H)/在线FAQ(_O)"
 
-#: src/mainwindow.c:833
+#: src/mainwindow.c:838
 msgid "/_Help/Icon _Legend"
 msgstr "/帮助(_H)/图标说明(_L)"
 
-#: src/mainwindow.c:834
+#: src/mainwindow.c:839
 msgid "/_Help/---"
 msgstr "/求助(_H)/---"
 
-#: src/mainwindow.c:1127
+#: src/mainwindow.c:1132
 msgid "You are online. Click the icon to go offline"
 msgstr "目前在线。点击图标转到离线模式。"
 
-#: src/mainwindow.c:1131
+#: src/mainwindow.c:1136
 msgid "You are offline. Click the icon to go online"
 msgstr "目前离线。点击图标转到在线状态。"
 
-#: src/mainwindow.c:1148
+#: src/mainwindow.c:1153
 msgid "Select account"
 msgstr "选择帐号"
 
-#: src/mainwindow.c:1540 src/mainwindow.c:1581 src/mainwindow.c:1617
-#: src/mainwindow.c:1653 src/mainwindow.c:1695 src/prefs_folder_item.c:596
+#: src/mainwindow.c:1545 src/mainwindow.c:1586 src/mainwindow.c:1622
+#: src/mainwindow.c:1658 src/mainwindow.c:1700 src/prefs_folder_item.c:668
 msgid "Untitled"
 msgstr "未命名"
 
-#: src/mainwindow.c:1696
+#: src/mainwindow.c:1701
 msgid "none"
 msgstr "无"
 
-#: src/mainwindow.c:1958
+#: src/mainwindow.c:1963
 msgid "Delete all messages in trash folders?"
 msgstr "清空垃圾桶内所有邮件？"
 
-#: src/mainwindow.c:1977
+#: src/mainwindow.c:1982
 msgid "Add mailbox"
 msgstr "添加邮箱"
 
-#: src/mainwindow.c:1978
+#: src/mainwindow.c:1983
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -5403,16 +5503,16 @@ msgstr ""
 "请输入邮箱位置。\n"
 "如果指定已存在的邮箱，它将会自动被扫描。"
 
-#: src/mainwindow.c:1984
+#: src/mainwindow.c:1989
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "邮箱 `%s' 已经存在。"
 
-#: src/mainwindow.c:1989 src/setup.c:51
+#: src/mainwindow.c:1994 src/setup.c:51
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1994 src/setup.c:54
+#: src/mainwindow.c:1999 src/setup.c:54
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -5421,113 +5521,118 @@ msgstr ""
 "创建邮箱失败。\n"
 "也许某些文件已经存在，或者你没有足够的写权限。"
 
-#: src/mainwindow.c:2277
+#: src/mainwindow.c:2281
 msgid "No posting allowed"
-msgstr ""
+msgstr "不允许发贴"
 
-#: src/mainwindow.c:2539
+#: src/mainwindow.c:2543
 msgid "Sylpheed-Claws - Folder View"
 msgstr "Sylpheed-Claws - 邮件夹"
 
-#: src/mainwindow.c:2575 src/messageview.c:826
+#: src/mainwindow.c:2579 src/messageview.c:442 src/messageview.c:825
 msgid "Sylpheed-Claws - Message View"
 msgstr "Sylpheed-Claws - 邮件"
 
-#: src/mainwindow.c:2917
+#: src/mainwindow.c:2929
 msgid "Mbox import has failed."
 msgstr "导入mbox文件失败。"
 
-#: src/mainwindow.c:2926 src/mainwindow.c:2935
+#: src/mainwindow.c:2938 src/mainwindow.c:2947
 msgid "Export to mbox has failed."
 msgstr "导出到mbox失败。"
 
-#: src/mainwindow.c:2958 src/plugins/trayicon/trayicon.c:369
+#: src/mainwindow.c:2970 src/plugins/trayicon/trayicon.c:369
 msgid "Exit"
 msgstr "退出"
 
-#: src/mainwindow.c:2958
+#: src/mainwindow.c:2970
 msgid "Exit Sylpheed-Claws?"
 msgstr "退出 Sylpheed-Claws?"
 
-#: src/mainwindow.c:3104
+#: src/mainwindow.c:3116
 msgid "Folder synchronisation"
 msgstr "邮件夹同步"
 
-#: src/mainwindow.c:3105
+#: src/mainwindow.c:3117
 msgid "Do you want to synchronise your folders now?"
 msgstr "是否现在同步邮件夹?"
 
-#: src/mainwindow.c:3106
+#: src/mainwindow.c:3118
 msgid "+_Synchronise"
 msgstr "+同步(_S)"
 
-#: src/mainwindow.c:3375
+#: src/mainwindow.c:3392
 msgid "Deleting duplicated messages..."
 msgstr "删除重复的邮件..."
 
-#: src/mainwindow.c:3409
+#: src/mainwindow.c:3426
 #, c-format
 msgid "Deleted %d duplicate message in %d folders.\n"
 msgid_plural "Deleted %d duplicate messages in %d folders.\n"
 msgstr[0] "删除 %d 个重复的邮件(分布于 %d 个邮件夹)。\n"
 msgstr[1] "删除 %d 个重复的邮件(分布于 %d 个邮件夹)。\n"
 
-#: src/mainwindow.c:3550 src/summaryview.c:4482
+#: src/mainwindow.c:3573 src/summaryview.c:4527
 msgid "Processing rules to apply before folder rules"
 msgstr "在邮件夹规则前应用的规则"
 
-#: src/mainwindow.c:3558
+#: src/mainwindow.c:3582
 msgid "Processing rules to apply after folder rules"
 msgstr "在邮件夹规则后应用的规则"
 
-#: src/mainwindow.c:3566 src/summaryview.c:4491
+#: src/mainwindow.c:3591 src/summaryview.c:4538
 msgid "Filtering configuration"
 msgstr "过滤/处理 配置"
 
-#: src/mainwindow.c:3819
+#: src/mainwindow.c:3845
 #, c-format
 msgid "not initialized\n"
 msgstr "未初始化\n"
 
-#: src/mainwindow.c:3831 src/mainwindow.c:3842
+#: src/mainwindow.c:3857 src/mainwindow.c:3868
 #, c-format
 msgid "selecting folder '%s'\n"
 msgstr "选择邮件夹: '%s'\n"
 
-#: src/mainwindow.c:3846
+#: src/mainwindow.c:3872
 #, c-format
 msgid "selecting message %d\n"
 msgstr "选择邮件 %d\n"
 
-#: src/matcher.c:1285 src/matcher.c:1286 src/matcher.c:1287 src/matcher.c:1288
-#: src/matcher.c:1289 src/matcher.c:1290 src/matcher.c:1291 src/matcher.c:1292
+#: src/matcher.c:1347 src/matcher.c:1348 src/matcher.c:1349 src/matcher.c:1350
+#: src/matcher.c:1351 src/matcher.c:1352 src/matcher.c:1353 src/matcher.c:1354
 msgid "(none)"
 msgstr "(无)"
 
-#: src/mbox.c:80
+#: src/mbox.c:84
 #, c-format
 msgid ""
 "Could not open mbox file:\n"
 "%s\n"
-msgstr 
+msgstr ""
 "无法打开mbox文件:\n"
 "%s\n"
 
-#: src/mbox.c:415
+#: src/mbox.c:120
+#, c-format
+msgid "Importing from mbox... (%d mails imported)"
+msgstr "正在从mbox文件导入... (已经导入%d封邮件)"
+
+#: src/mbox.c:467
 msgid "Overwrite mbox file"
 msgstr "覆盖mbox文件"
 
-#: src/mbox.c:416
+#: src/mbox.c:468
 msgid "This file already exists. Do you want to overwrite it?"
 msgstr "该文件已经存在, 是否要覆盖?"
 
-#: src/mbox.c:417 src/messageview.c:1106 src/mimeview.c:1379
-#: src/textview.c:2291
+#: src/mbox.c:469 src/messageview.c:1106 src/mimeview.c:1390
+#: src/textview.c:2364
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: src/mbox.c:426
-#,  c-format
+#: src/mbox.c:478
+#, c-format
 msgid ""
 "Could not create mbox file:\n"
 "%s\n"
@@ -5535,83 +5640,83 @@ msgstr ""
 "无法创建mbox文件:\n"
 "%s\n"
 
-#: src/message_search.c:128
+#: src/mbox.c:482
+msgid "Exporting to mbox..."
+msgstr "正在导出邮件夹到mbox文件..."
+
+#: src/message_search.c:131
 msgid "Find in current message"
 msgstr "在当前邮件中查找"
 
-#: src/message_search.c:146
+#: src/message_search.c:149
 msgid "Find text:"
 msgstr "查找文字"
 
-#: src/message_search.c:161 src/prefs_matcher.c:574 src/summary_search.c:294
+#: src/message_search.c:164 src/prefs_matcher.c:578 src/summary_search.c:297
 msgid "Case sensitive"
 msgstr "大小写敏感"
 
-#: src/message_search.c:233 src/summary_search.c:496
+#: src/message_search.c:240 src/summary_search.c:505
 msgid "Search failed"
 msgstr "搜索失败"
 
-#: src/message_search.c:234 src/summary_search.c:497
+#: src/message_search.c:241 src/summary_search.c:506
 msgid "Search string not found."
 msgstr "未找到指定字符串。"
 
-#: src/message_search.c:243
+#: src/message_search.c:250
 msgid "Beginning of message reached; continue from end?"
 msgstr "已到达邮件顶部，是否绕到尾部继续查找？"
 
-#: src/message_search.c:246
+#: src/message_search.c:253
 msgid "End of message reached; continue from beginning?"
 msgstr "已到达邮件末尾，是否重新开始查找？"
 
-#: src/message_search.c:249 src/summary_search.c:508
+#: src/message_search.c:256 src/summary_search.c:517
 msgid "Search finished"
 msgstr "搜索完成"
 
-#: src/messageview.c:162
+#: src/messageview.c:159
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/messageview.c:279
+#: src/messageview.c:276
 msgid "/_View/Show all _headers"
 msgstr "/查看(_V)/显示所有信息头(_H)"
 
-#: src/messageview.c:282
+#: src/messageview.c:279
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
-#: src/messageview.c:296
+#: src/messageview.c:293
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_t)"
 
-#: src/messageview.c:315
+#: src/messageview.c:310
 msgid "/_Tools/Create processing rule"
 msgstr "/工具(_T)/创建处理规则"
 
-#: src/messageview.c:317
+#: src/messageview.c:312
 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/工具(_T)/创建处理规则/自动创建(_A)"
 
-#: src/messageview.c:319
+#: src/messageview.c:314
 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/工具(_T)/创建处理规则/由发信人(_F)"
 
-#: src/messageview.c:321
+#: src/messageview.c:316
 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/工具(_T)/创建处理规则/由收信人(_T)"
 
-#: src/messageview.c:323
+#: src/messageview.c:318
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/工具(_T)/创建处理规则/由主题(_S)"
 
-#: src/messageview.c:447
-msgid "Sylpheed - Message View"
-msgstr "Sylpheed - 邮件"
-
-#: src/messageview.c:552
+#: src/messageview.c:547
 msgid "<No Return-Path found>"
 msgstr "<未找到回信地址>"
 
-#: src/messageview.c:560
+#: src/messageview.c:555
 #, c-format
 msgid ""
 "The notification address to which the return receipt is\n"
@@ -5625,16 +5730,11 @@ msgstr ""
 " 返回路径: %s\n"
 "建议不发送此回执。"
 
-#: src/messageview.c:567 src/messageview.c:584
+#: src/messageview.c:562 src/messageview.c:579
 msgid "_Don't Send"
 msgstr "不发送(_D)"
 
-#: src/messageview.c:567 src/messageview.c:584 src/prefs_account.c:1025
-#: src/toolbar.c:2112
-msgid "_Send"
-msgstr "发送(_S)"
-
-#: src/messageview.c:580
+#: src/messageview.c:575
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
@@ -5646,8 +5746,13 @@ msgstr ""
 "\n"
 "建议不发送回执。"
 
-#: src/messageview.c:1101 src/mimeview.c:1503 src/summaryview.c:3826
-#: src/summaryview.c:3829 src/textview.c:2279
+#: src/messageview.c:787 src/procmime.c:823
+#, c-format
+msgid "Couldn't decrypt: %s"
+msgstr "无法解密: %s"
+
+#: src/messageview.c:1101 src/mimeview.c:1528 src/summaryview.c:3871
+#: src/summaryview.c:3874 src/textview.c:2352
 msgid "Save as"
 msgstr "保存为"
 
@@ -5655,8 +5760,8 @@ msgstr "保存为"
 msgid "Overwrite existing file?"
 msgstr "附加已有文件？"
 
-#: src/messageview.c:1115 src/summaryview.c:3846 src/summaryview.c:3849
-#: src/summaryview.c:3864
+#: src/messageview.c:1115 src/summaryview.c:3891 src/summaryview.c:3894
+#: src/summaryview.c:3909
 #, c-format
 msgid "Can't save the file '%s'."
 msgstr "无法保存文件 '%s'。"
@@ -5738,7 +5843,7 @@ msgstr "发送通知(_S)"
 msgid "+_Cancel"
 msgstr "+取消(_C)"
 
-#: src/messageview.c:1410 src/summaryview.c:3901
+#: src/messageview.c:1410 src/summaryview.c:3946
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -5747,7 +5852,7 @@ msgstr ""
 "请输入用于打印的命令行:\n"
 "(`%s' 将被替换为文件名)"
 
-#: src/messageview.c:1416 src/summaryview.c:3907
+#: src/messageview.c:1416 src/summaryview.c:3952
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5756,21 +5861,21 @@ msgstr ""
 "打印命令行无效:\n"
 "`%s'"
 
-#: src/messageview.c:1427 src/summaryview.c:3878
+#: src/messageview.c:1427 src/summaryview.c:3923
 msgid "Cannot print: the message doesn't contain text."
 msgstr "无法打印: 该邮件不包含任何文字。"
 
-#: src/messageview.c:1654 src/messageview.c:1660 src/summaryview.c:3299
-#: src/summaryview.c:5188
+#: src/messageview.c:1638 src/messageview.c:1644 src/summaryview.c:3342
+#: src/summaryview.c:5237
 msgid "An error happened while learning.\n"
 msgstr "培训时发生错误.\n"
 
-#: src/mh.c:425
+#: src/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "无法将邮件 %s 拷贝到 %s\n"
 
-#: src/mh.c:510
+#: src/mh.c:498
 msgid "Moving messages..."
 msgstr "正在移动邮件..."
 
@@ -5795,82 +5900,82 @@ msgstr "删除邮箱"
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/mimeview.c:156
+#: src/mimeview.c:158
 msgid "/_Open"
 msgstr "/打开(_O)"
 
-#: src/mimeview.c:157
+#: src/mimeview.c:159
 msgid "/Open _with..."
 msgstr "/打开方式(_w)..."
 
-#: src/mimeview.c:158
+#: src/mimeview.c:160
 msgid "/_Display as text"
 msgstr "/以文本方式显示(_D)"
 
-#: src/mimeview.c:159 src/summaryview.c:477
+#: src/mimeview.c:161 src/summaryview.c:478
 msgid "/_Save as..."
 msgstr "/另存为(_S)..."
 
-#: src/mimeview.c:160
+#: src/mimeview.c:162
 msgid "/Save _all..."
 msgstr "/全部保存(_a)..."
 
-#: src/mimeview.c:199
+#: src/mimeview.c:201
 msgid "MIME Type"
 msgstr "MIME类型"
 
-#: src/mimeview.c:691
+#: src/mimeview.c:702
 msgid "Check signature"
 msgstr "检查签名"
 
-#: src/mimeview.c:696 src/mimeview.c:701 src/mimeview.c:706
+#: src/mimeview.c:707 src/mimeview.c:712 src/mimeview.c:717
 msgid "View full information"
 msgstr "查看详细信息"
 
-#: src/mimeview.c:711 src/mimeview.c:715
+#: src/mimeview.c:722 src/mimeview.c:726
 msgid "Check again"
 msgstr "再次检查"
 
-#: src/mimeview.c:724
+#: src/mimeview.c:735
 msgid "Click the icon or hit 'C' to check it."
 msgstr "点击图标或者按'C'选中。"
 
-#: src/mimeview.c:729
+#: src/mimeview.c:740
 msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
 msgstr "检查签名超时。请点击图标或者按'C'以重试。"
 
-#: src/mimeview.c:939
+#: src/mimeview.c:950
 msgid "Checking signature..."
 msgstr "正在检查签名..."
 
-#: src/mimeview.c:981
+#: src/mimeview.c:992
 msgid "Go back to email"
 msgstr "回到邮件"
 
-#: src/mimeview.c:1306 src/mimeview.c:1387 src/mimeview.c:1562
-#: src/mimeview.c:1595
+#: src/mimeview.c:1317 src/mimeview.c:1398 src/mimeview.c:1574
+#: src/mimeview.c:1607
 msgid "Can't save the part of multipart message."
 msgstr "无法保存复合邮件的这一部分。"
 
-#: src/mimeview.c:1376 src/textview.c:2289
+#: src/mimeview.c:1387 src/textview.c:2362
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆盖已有文件 '%s' 吗？"
 
-#: src/mimeview.c:1414
+#: src/mimeview.c:1425
 msgid "Select destination folder"
 msgstr "选择目的邮件夹"
 
-#: src/mimeview.c:1421
+#: src/mimeview.c:1432
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "`%s'不是一个目录。"
 
-#: src/mimeview.c:1616
+#: src/mimeview.c:1636
 msgid "Open with"
 msgstr "打开方式"
 
-#: src/mimeview.c:1617
+#: src/mimeview.c:1637
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -5879,80 +5984,80 @@ msgstr ""
 "请输入用于打开文件的命令行:\n"
 "(`%s' 将被替换为文件名)"
 
-#: src/news.c:243
+#: src/news.c:255
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "正在与 %s 建立NNTP连接:%d ...\n"
 
-#: src/news.c:316
+#: src/news.c:328
 msgid "Sylpheed-Claws needs network access in order to access the News server."
 msgstr "Sylpheed-Claws需要访问网络才能链接倒News服务器。"
 
-#: src/news.c:333
+#: src/news.c:345
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "与 %s:%d 的NNTP连接已经断开。正在重新连接...\n"
 
-#: src/news.c:463
+#: src/news.c:475
 msgid "can't retrieve newsgroup list\n"
 msgstr "无法取回新闻组列表。\n"
 
-#: src/news.c:576
+#: src/news.c:588
 msgid "can't post article.\n"
 msgstr "无法发送帖子.\n"
 
-#: src/news.c:602
+#: src/news.c:614
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "无法取回帖子 %d\n"
 
-#: src/news.c:651
+#: src/news.c:663
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "无法选择新闻组: %s\n"
 
-#: src/news.c:881
+#: src/news.c:888
 #, c-format
 msgid "can't set group: %s\n"
 msgstr "无法设置群组: %s\n"
 
-#: src/news.c:890
+#: src/news.c:897
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "无效帖子索引范围: %d - %d \n"
 
-#: src/news.c:910
+#: src/news.c:917
 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "提取 %s 时发生错误.\n"
 
-#: src/news.c:928
+#: src/news.c:935
 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "正在提取xover %d于 %s...\n"
 
-#: src/news.c:935 src/news.c:1028
+#: src/news.c:942 src/news.c:1035
 msgid "can't get xover\n"
 msgstr "无法取得xover\n"
 
-#: src/news.c:945 src/news.c:1040
+#: src/news.c:952 src/news.c:1047
 msgid "error occurred while getting xover.\n"
 msgstr "提取xover时发生错误。\n"
 
-#: src/news.c:952 src/news.c:1054
+#: src/news.c:959 src/news.c:1061
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr ""
 
-#: src/news.c:969 src/news.c:990 src/news.c:1073 src/news.c:1105
+#: src/news.c:976 src/news.c:997 src/news.c:1080 src/news.c:1112
 msgid "can't get xhdr\n"
 msgstr "无法取得xhdr\n"
 
-#: src/news.c:979 src/news.c:1000 src/news.c:1086 src/news.c:1118
+#: src/news.c:986 src/news.c:1007 src/news.c:1093 src/news.c:1125
 msgid "error occurred while getting xhdr.\n"
 msgstr "提取xhdr时发生错误。\n"
 
-#: src/news.c:1024
+#: src/news.c:1031
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""
@@ -6196,7 +6301,7 @@ msgstr "值"
 msgid "Select"
 msgstr "选择"
 
-#: src/plugins/pgpcore/select-keys.c:362 src/prefs_other.c:260
+#: src/plugins/pgpcore/select-keys.c:362 src/prefs_other.c:271
 msgid "Other"
 msgstr "其它"
 
@@ -6227,107 +6332,150 @@ msgstr ""
 "如果你选择该密钥加密邮件，将不能确保该邮件会被发送给指定的人。\n"
 "你足够信任它并坚持要使用它吗?"
 
-#: src/plugins/pgpcore/sgpgme.c:124
+#: src/plugins/pgpcore/sgpgme.c:125
 msgid "Undefined"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:126 src/prefs_receive.c:199
+#: src/plugins/pgpcore/sgpgme.c:127 src/prefs_receive.c:199
 #: src/prefs_send.c:170
 msgid "Never"
 msgstr "从不显示"
 
-#: src/plugins/pgpcore/sgpgme.c:128
+#: src/plugins/pgpcore/sgpgme.c:129
 msgid "Marginal"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:132
+#: src/plugins/pgpcore/sgpgme.c:133
 msgid "Ultimate"
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:166
-msgid "The signature can't be checked - GPG error."
-msgstr "该签名无法被校验 - GPG错误。"
+#: src/plugins/pgpcore/sgpgme.c:167
+#, c-format
+msgid "The signature can't be checked - %s"
+msgstr "该签名无法被校验 - %s。"
 
-#: src/plugins/pgpcore/sgpgme.c:170 src/plugins/pgpcore/sgpgme.c:174
-#: src/plugins/pgpcore/sgpgme.c:221
+#: src/plugins/pgpcore/sgpgme.c:171 src/plugins/pgpcore/sgpgme.c:175
+#: src/plugins/pgpcore/sgpgme.c:222
 msgid "The signature has not been checked."
 msgstr "该签名尚未被检查。"
 
-#: src/plugins/pgpcore/sgpgme.c:180 src/plugins/pgpcore/sgpgme.c:182
+#: src/plugins/pgpcore/sgpgme.c:181 src/plugins/pgpcore/sgpgme.c:183
 msgid "PGP Core: Can't get key - no gpg-agent running."
 msgstr ""
 
-#: src/plugins/pgpcore/sgpgme.c:195
+#: src/plugins/pgpcore/sgpgme.c:196
 #, c-format
 msgid "Good signature from %s."
 msgstr "来自 \"%s\" 的签名正确。"
 
-#: src/plugins/pgpcore/sgpgme.c:201
+#: src/plugins/pgpcore/sgpgme.c:202
 #, c-format
 msgid "Good signature (untrusted) from %s."
 msgstr "来自 \"%s\" 的签名完好(但尚未被信任)。"
 
-#: src/plugins/pgpcore/sgpgme.c:206
+#: src/plugins/pgpcore/sgpgme.c:207
 #, c-format
 msgid "Expired signature from %s."
 msgstr "来自 %s 的签名已过期。"
 
-#: src/plugins/pgpcore/sgpgme.c:209
+#: src/plugins/pgpcore/sgpgme.c:210
 #, c-format
 msgid "Expired key from %s."
 msgstr "来自 %s 的密钥已过期。"
 
-#: src/plugins/pgpcore/sgpgme.c:212
+#: src/plugins/pgpcore/sgpgme.c:213
 #, c-format
 msgid "Bad signature from %s."
 msgstr "来自 %s 的签名检查不通过。"
 
-#: src/plugins/pgpcore/sgpgme.c:216
+#: src/plugins/pgpcore/sgpgme.c:217
 #, c-format
 msgid "Key 0x%s not available to verify this signature."
 msgstr "没有匹配的密钥0x%s，无法检查此签名。"
 
-#: src/plugins/pgpcore/sgpgme.c:258
+#: src/plugins/pgpcore/sgpgme.c:259
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "签名采用%s制作，密钥ID: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:265
+#: src/plugins/pgpcore/sgpgme.c:266
 #, c-format
 msgid "Good signature from \"%s\" (Trust: %s)\n"
 msgstr "\"%s\"的签名有效 (信任: %s)\n"
 
-#: src/plugins/pgpcore/sgpgme.c:270
+#: src/plugins/pgpcore/sgpgme.c:271
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "来自 \"%s\" 的签名已过期\n"
 
-#: src/plugins/pgpcore/sgpgme.c:275
+#: src/plugins/pgpcore/sgpgme.c:276
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "来自 \"%s\" 的签名检查错误\n"
 
-#: src/plugins/pgpcore/sgpgme.c:286
+#: src/plugins/pgpcore/sgpgme.c:287
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "               又称为 \"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:292
+#: src/plugins/pgpcore/sgpgme.c:293
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "主密钥指纹: %s\n"
 
-#: src/plugins/pgpcore/sgpgme.c:297
+#: src/plugins/pgpcore/sgpgme.c:298
 #, c-format
 msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
 msgstr "警告: 签名者的地址\"%s\"与DNS中的数据并不相符\n"
 
-#: src/plugins/pgpcore/sgpgme.c:303
+#: src/plugins/pgpcore/sgpgme.c:304
 #, c-format
 msgid "Verified signer's address is \"%s\"\n"
 msgstr "经验证的签名者地址是\"%s\"\n"
 
-#: src/plugins/pgpcore/sgpgme.c:513
+#: src/plugins/pgpcore/sgpgme.c:348
+#,  c-format
+msgid "Couldn't get data from message, %s"
+msgstr "无法取得邮件的数据, %s"
+
+#: src/plugins/pgpcore/sgpgme.c:364
+#, c-format
+msgid "Couldn't initialize data, %s"
+msgstr "不能初始化数据, %s"
+
+#: src/plugins/pgpcore/sgpgme.c:480
+#, c-format
+msgid "Private key not found (%s)"
+msgstr "没有找到私有密钥(%s)"
+
+#: src/plugins/pgpcore/sgpgme.c:488
+msgid "Private key specification is ambiguous"
+msgstr ""
+
+#: src/plugins/pgpcore/sgpgme.c:498
+#, c-format
+msgid "Error setting private key: %s"
+msgstr ""
+
+#: src/plugins/pgpcore/sgpgme.c:534
+#, c-format
+msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
+msgstr "GPGME协议 '%s'不可用: '%s'引擎未被正确安装。"
+
+#: src/plugins/pgpcore/sgpgme.c:540
+#, c-format
+msgid ""
+"Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
+"version %s is required.\n"
+msgstr ""
+"GPGME协议'%s'不可用: '%s'引擎虽已安装，但当前版本为%s(至少需要版本%s)。\n"
+
+#: src/plugins/pgpcore/sgpgme.c:548
+#, c-format
+msgid "Gpgme protocol '%s' is unusable (unknown problem)"
+msgstr "GPGME协议'%s'不可用(未知错误)"
+
+#: src/plugins/pgpcore/sgpgme.c:564
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
@@ -6360,6 +6508,69 @@ msgstr ""
 "\n"
 "GPGME的版权归Werner Koch <dd9jn@gnu.org>所有(2001)"
 
+#: src/plugins/pgpinline/pgpinline.c:236 src/plugins/pgpinline/pgpinline.c:384
+msgid "Couldn't get text data."
+msgstr "无法取得文本数据。"
+
+#: src/plugins/pgpinline/pgpinline.c:254
+msgid "Couldn't convert text data to any sane charset."
+msgstr ""
+
+#: src/plugins/pgpinline/pgpinline.c:377
+msgid "Couldn't parse mime part."
+msgstr "无法读取邮件的MIME部分."
+
+#: src/plugins/pgpinline/pgpinline.c:407 src/plugins/pgpmime/pgpmime.c:332
+#, c-format
+msgid "Couldn't open decrypted file %s"
+msgstr "无法打开已解密的文件%s"
+
+#: src/plugins/pgpinline/pgpinline.c:437
+msgid "Couldn't scan decrypted file."
+msgstr "无法扫描已解密的文件。"
+
+#: src/plugins/pgpinline/pgpinline.c:445
+#, fuzzy
+msgid "Couldn't scan decrypted file parts."
+msgstr "无法读取文件。"
+
+#: src/plugins/pgpinline/pgpinline.c:499
+msgid "Couldn't create temporary file."
+msgstr "无法创建临时文件。"
+
+#: src/plugins/pgpinline/pgpinline.c:533 src/plugins/pgpmime/pgpmime.c:479
+#, c-format
+msgid "Data signing failed, %s"
+msgstr ""
+
+#: src/plugins/pgpinline/pgpinline.c:551 src/plugins/pgpmime/pgpmime.c:504
+#, c-format
+msgid "Data signing failed due to invalid signer: %s"
+msgstr ""
+
+#: src/plugins/pgpinline/pgpinline.c:560 src/plugins/pgpmime/pgpmime.c:513
+msgid "Data signing failed, no results."
+msgstr ""
+
+#: src/plugins/pgpinline/pgpinline.c:572 src/plugins/pgpmime/pgpmime.c:525
+msgid "Data signing failed, no contents."
+msgstr ""
+
+#: src/plugins/pgpinline/pgpinline.c:635 src/plugins/pgpmime/pgpmime.c:583
+#, c-format
+msgid "Couldn't add GPG key %s, %s"
+msgstr "无法添加GPG密钥 %s, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:656 src/plugins/pgpmime/pgpmime.c:611
+#, c-format
+msgid "Couldn't create temporary file, %s"
+msgstr "无法创建临时文件, %s"
+
+#: src/plugins/pgpinline/pgpinline.c:681 src/plugins/pgpmime/pgpmime.c:637
+#, c-format
+msgid "Encryption failed, %s"
+msgstr "加密失败, %s"
+
 #: src/plugins/pgpinline/plugin.c:57
 msgid "PGP/inline"
 msgstr ""
@@ -6416,6 +6627,30 @@ msgstr ""
 "有(2001)\n"
 " "
 
+#: src/plugins/pgpmime/pgpmime.c:191
+#, fuzzy
+msgid "Signature boundary not found."
+msgstr "未找到指定字符串。"
+
+#: src/plugins/pgpmime/pgpmime.c:309
+#, c-format
+msgid "Couldn't initialize GPG context, %s"
+msgstr ""
+
+#: src/plugins/pgpmime/pgpmime.c:351
+msgid "Couldn't parse decrypted file."
+msgstr "无法读入已解密的文件。"
+
+#: src/plugins/pgpmime/pgpmime.c:357
+#, fuzzy
+msgid "Couldn't parse decrypted file parts."
+msgstr "无法读取文件。"
+
+#: src/plugins/pgpmime/pgpmime.c:403 src/plugins/pgpmime/pgpmime.c:442
+#,  c-format
+msgid "Couldn't create temporary file: %s"
+msgstr "无法创建临时文件: %s"
+
 #: src/plugins/spamassassin/spamassassin.c:152
 msgid "Spamassassin plugin couldn't connect to spamd.\n"
 msgstr "SpamAssassin插件无法连接到spamd服务器.\n"
@@ -6532,7 +6767,7 @@ msgid ""
 "aborted."
 msgstr "允许垃圾邮件检查的最大时限。超过此时间后将退出检查。"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:184
+#: src/plugins/spamassassin/spamassassin_gtk.c:359 src/prefs_other.c:187
 msgid "seconds"
 msgstr "秒"
 
@@ -6663,179 +6898,179 @@ msgstr "POP3会话中出现错误\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP命令不被支持\n"
 
-#: src/prefs_account.c:705
+#: src/prefs_account.c:231 src/prefs_account.c:1440 src/prefs_account.c:2127
+#: src/wizard.c:991
+msgid "POP3"
+msgstr "POP3"
+
+#: src/prefs_account.c:234 src/prefs_account.c:1566 src/prefs_account.c:2144
+msgid "IMAP4"
+msgstr "IMAP4"
+
+#: src/prefs_account.c:235
+msgid "News (NNTP)"
+msgstr "News (NNTP)"
+
+#: src/prefs_account.c:236 src/wizard.c:1001
+msgid "Local mbox file"
+msgstr "本地mbox文件"
+
+#: src/prefs_account.c:237
+msgid "None (SMTP only)"
+msgstr "无 (仅SMTP)"
+
+#: src/prefs_account.c:716
 #, c-format
 msgid "Account%d"
 msgstr "帐号%d"
 
-#: src/prefs_account.c:984
+#: src/prefs_account.c:989
 msgid "Preferences for new account"
 msgstr "设置新帐号"
 
-#: src/prefs_account.c:986
+#: src/prefs_account.c:991
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帐号设置"
 
-#: src/prefs_account.c:1021
+#: src/prefs_account.c:1026
 msgid "_Basic"
 msgstr "基本设置(_B)"
 
-#: src/prefs_account.c:1023
+#: src/prefs_account.c:1028
 msgid "_Receive"
 msgstr "接收(_R)"
 
-#: src/prefs_account.c:1027
+#: src/prefs_account.c:1032
 msgid "Co_mpose"
 msgstr "撰写(_m)"
 
-#: src/prefs_account.c:1029
+#: src/prefs_account.c:1034
 msgid "_Privacy"
 msgstr "隐私(_P)"
 
-#: src/prefs_account.c:1032
+#: src/prefs_account.c:1037
 msgid "SS_L"
 msgstr "SS_L"
 
-#: src/prefs_account.c:1035
+#: src/prefs_account.c:1040
 msgid "A_dvanced"
 msgstr "高级(_d)"
 
-#: src/prefs_account.c:1114
+#: src/prefs_account.c:1096
 msgid "Name of account"
 msgstr "帐号名称"
 
-#: src/prefs_account.c:1123
+#: src/prefs_account.c:1105
 msgid "Set as default"
 msgstr "设为缺省帐号"
 
-#: src/prefs_account.c:1127
+#: src/prefs_account.c:1109
 msgid "Personal information"
 msgstr "个人资料"
 
-#: src/prefs_account.c:1136
+#: src/prefs_account.c:1118
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account.c:1142
+#: src/prefs_account.c:1124
 msgid "Mail address"
 msgstr "邮件地址"
 
-#: src/prefs_account.c:1148
+#: src/prefs_account.c:1130
 msgid "Organization"
 msgstr "组织"
 
-#: src/prefs_account.c:1172
+#: src/prefs_account.c:1154
 msgid "Server information"
 msgstr "服务器信息"
 
-#: src/prefs_account.c:1193 src/prefs_account.c:1448 src/prefs_account.c:2138
-#: src/wizard.c:977
-msgid "POP3"
-msgstr "POP3"
-
-#: src/prefs_account.c:1195 src/prefs_account.c:1574 src/prefs_account.c:2155
-msgid "IMAP4"
-msgstr "IMAP4"
-
-#: src/prefs_account.c:1197
-msgid "News (NNTP)"
-msgstr "News (NNTP)"
-
-#: src/prefs_account.c:1199 src/wizard.c:987
-msgid "Local mbox file"
-msgstr "本地mbox文件"
-
-#: src/prefs_account.c:1201
-msgid "None (SMTP only)"
-msgstr "无 (仅SMTP)"
-
-#: src/prefs_account.c:1221
+#: src/prefs_account.c:1213
 msgid "This server requires authentication"
 msgstr "服务器需要鉴权"
 
-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1220
 msgid "Authenticate on connect"
 msgstr "连接时鉴权"
 
-#: src/prefs_account.c:1273
+#: src/prefs_account.c:1265
 msgid "News server"
 msgstr "新闻服务器"
 
-#: src/prefs_account.c:1279
+#: src/prefs_account.c:1271
 msgid "Server for receiving"
 msgstr "接收服务器"
 
-#: src/prefs_account.c:1285
+#: src/prefs_account.c:1277
 msgid "Local mailbox"
 msgstr "本地邮箱"
 
-#: src/prefs_account.c:1292
+#: src/prefs_account.c:1284
 msgid "SMTP server (send)"
 msgstr "SMTP 服务器(发送)"
 
-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1292
 msgid "Use mail command rather than SMTP server"
 msgstr "使用mail命令而不是SMTP服务器"
 
-#: src/prefs_account.c:1309
+#: src/prefs_account.c:1301
 msgid "command to send mails"
 msgstr "发送邮件的命令"
 
-#: src/prefs_account.c:1316 src/prefs_account.c:1767
+#: src/prefs_account.c:1308 src/prefs_account.c:1757
 msgid "User ID"
 msgstr "用户ID"
 
-#: src/prefs_account.c:1322 src/prefs_account.c:1776
+#: src/prefs_account.c:1314 src/prefs_account.c:1766
 msgid "Password"
 msgstr "密码"
 
-#: src/prefs_account.c:1415
+#: src/prefs_account.c:1407
 msgid "Local"
 msgstr "本机"
 
-#: src/prefs_account.c:1426 src/prefs_account.c:1521
+#: src/prefs_account.c:1418 src/prefs_account.c:1513
 msgid "Default inbox"
 msgstr "缺省收信夹"
 
-#: src/prefs_account.c:1433 src/prefs_account.c:1441 src/prefs_account.c:1528
-#: src/prefs_account.c:1536
+#: src/prefs_account.c:1425 src/prefs_account.c:1433 src/prefs_account.c:1520
+#: src/prefs_account.c:1528
 msgid "Unfiltered messages will be stored in this folder"
 msgstr "未被过滤的邮件将放入该邮件夹"
 
-#: src/prefs_account.c:1438 src/prefs_account.c:1533 src/prefs_account.c:1938
+#: src/prefs_account.c:1430 src/prefs_account.c:1525 src/prefs_account.c:1927
 msgid "Bro_wse"
 msgstr "浏览(_w)"
 
-#: src/prefs_account.c:1456
+#: src/prefs_account.c:1448
 msgid "Use secure authentication (APOP)"
 msgstr "采用安全鉴权(APOP)"
 
-#: src/prefs_account.c:1459
+#: src/prefs_account.c:1451
 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 
-#: src/prefs_account.c:1470
+#: src/prefs_account.c:1462
 msgid "Remove after"
 msgstr "删除于"
 
-#: src/prefs_account.c:1479
+#: src/prefs_account.c:1471
 msgid "0 days: remove immediately"
 msgstr "(0 天: 立即删除)"
 
-#: src/prefs_account.c:1483
+#: src/prefs_account.c:1475
 msgid "days"
 msgstr "天后"
 
-#: src/prefs_account.c:1490
+#: src/prefs_account.c:1482
 msgid "Download all messages on server"
 msgstr "下载服务器上所有邮件"
 
-#: src/prefs_account.c:1496
+#: src/prefs_account.c:1488
 msgid "Receive size limit"
 msgstr "邮件大小限制"
 
-#: src/prefs_account.c:1499
+#: src/prefs_account.c:1491
 msgid ""
 "Messages over this limit will be partially retrieved. When selecting them "
 "you will be able to download them fully or delete them."
@@ -6843,326 +7078,330 @@ msgstr ""
 "大小超过此限制的邮件只会被部分收取，在您查看它的时候可以选择是否要全部收取或"
 "者删除。"
 
-#: src/prefs_account.c:1509
+#: src/prefs_account.c:1501
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account.c:1543 src/prefs_account.c:2172
+#: src/prefs_account.c:1535 src/prefs_account.c:2161
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account.c:1555
+#: src/prefs_account.c:1547
 msgid "Maximum number of articles to download"
 msgstr "帖子下载最大数量"
 
-#: src/prefs_account.c:1567
+#: src/prefs_account.c:1559
 msgid "unlimited if 0 is specified"
 msgstr "如果设为0为不作限制"
 
-#: src/prefs_account.c:1585 src/prefs_account.c:1737
+#: src/prefs_account.c:1577 src/prefs_account.c:1727
 msgid "Authentication method"
 msgstr "鉴权方式"
 
-#: src/prefs_account.c:1595 src/prefs_account.c:1747 src/prefs_send.c:273
+#: src/prefs_account.c:1587 src/prefs_account.c:1737 src/prefs_send.c:273
 msgid "Automatic"
 msgstr "自动"
 
-#: src/prefs_account.c:1606
+#: src/prefs_account.c:1598
 msgid "IMAP server directory"
 msgstr "IMAP服务器目录:"
 
-#: src/prefs_account.c:1610
+#: src/prefs_account.c:1602
 msgid "(usually empty)"
 msgstr "(一般可保持为空)"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1612
 msgid "Filter messages on receiving"
 msgstr "接收邮件时进行过滤"
 
-#: src/prefs_account.c:1624
+#: src/prefs_account.c:1616
 msgid "'Get Mail' checks for new messages on this account"
 msgstr "`全部收取'包含本帐户的新邮件"
 
-#: src/prefs_account.c:1687 src/prefs_customheader.c:201
+#: src/prefs_account.c:1678 src/prefs_customheader.c:205
 #: src/prefs_matcher.c:154
 msgid "Header"
 msgstr "邮件头"
 
-#: src/prefs_account.c:1694
-msgid "Add Date"
-msgstr "添加日期"
-
-#: src/prefs_account.c:1695
+#: src/prefs_account.c:1685
 msgid "Generate Message-ID"
 msgstr "生成Message-ID"
 
-#: src/prefs_account.c:1702
+#: src/prefs_account.c:1692
 msgid "Add user-defined header"
 msgstr "添加自定义消息头"
 
-#: src/prefs_account.c:1704 src/prefs_account.c:1947 src/prefs_message.c:142
+#: src/prefs_account.c:1694 src/prefs_account.c:1936 src/prefs_message.c:142
 msgid " Edit... "
 msgstr " 编辑... "
 
-#: src/prefs_account.c:1714
+#: src/prefs_account.c:1704
 msgid "Authentication"
 msgstr "鉴权"
 
-#: src/prefs_account.c:1722
+#: src/prefs_account.c:1712
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP鉴权 (SMTP AUTH)"
 
-#: src/prefs_account.c:1798
+#: src/prefs_account.c:1788
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "如果你保持这几项为空，将采用接收邮件的用户ID和口令。"
 
-#: src/prefs_account.c:1809
+#: src/prefs_account.c:1799
 msgid "Authenticate with POP3 before sending"
 msgstr "发送之前采用POP3进行鉴权"
 
-#: src/prefs_account.c:1824
+#: src/prefs_account.c:1814
 msgid "POP authentication timeout: "
 msgstr "POP鉴权超时限制"
 
-#: src/prefs_account.c:1833
+#: src/prefs_account.c:1823
 msgid "minutes"
 msgstr "分钟"
 
-#: src/prefs_account.c:1879 src/prefs_account.c:1930
+#: src/prefs_account.c:1868 src/prefs_account.c:1919
 msgid "Signature"
 msgstr "签名"
 
-#: src/prefs_account.c:1887
+#: src/prefs_account.c:1876
 msgid "Insert signature automatically"
 msgstr "自动插入签名"
 
-#: src/prefs_account.c:1892
+#: src/prefs_account.c:1881
 msgid "Signature separator"
 msgstr "签名分隔符"
 
-#: src/prefs_account.c:1917
+#: src/prefs_account.c:1906
 msgid "Command output"
 msgstr "命令输出"
 
-#: src/prefs_account.c:1954
+#: src/prefs_account.c:1943
 msgid "Automatically set the following addresses"
 msgstr "自动设置如下地址"
 
-#: src/prefs_account.c:1963 src/prefs_filtering_action.c:1079
-#: src/prefs_matcher.c:151 src/prefs_matcher.c:1683 src/quote_fmt.c:49
+#: src/prefs_account.c:1952 src/prefs_filtering_action.c:1083
+#: src/prefs_matcher.c:151 src/prefs_matcher.c:1687 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "回信地址"
 
-#: src/prefs_account.c:1976
+#: src/prefs_account.c:1965
 msgid "Bcc"
 msgstr "抄送地址"
 
-#: src/prefs_account.c:1989
+#: src/prefs_account.c:1978
 msgid "Reply-To"
 msgstr "回信地址"
 
-#: src/prefs_account.c:2041
+#: src/prefs_account.c:2030
 msgid "Default privacy system"
 msgstr "缺省隐私系统"
 
-#: src/prefs_account.c:2050
+#: src/prefs_account.c:2039
 msgid "Always sign messages"
 msgstr "总是添加签名"
 
-#: src/prefs_account.c:2052
+#: src/prefs_account.c:2041
 msgid "Always encrypt messages"
 msgstr "总是加密邮件"
 
-#: src/prefs_account.c:2054
+#: src/prefs_account.c:2043
 msgid "Always encrypt messages when replying to an encrypted message"
 msgstr "回复加密邮件时也采用加密模式"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2046
 msgid "Encrypt sent messages with your own key in addition to recipient's"
 msgstr "采用自己和收件人的密钥进行双重加密"
 
-#: src/prefs_account.c:2059
+#: src/prefs_account.c:2048
 msgid "Save sent encrypted messages as clear text"
 msgstr "将发出的加密邮件以明文保存"
 
-#: src/prefs_account.c:2146 src/prefs_account.c:2163 src/prefs_account.c:2179
+#: src/prefs_account.c:2135 src/prefs_account.c:2152 src/prefs_account.c:2168
 msgid "Don't use SSL"
 msgstr "不采用SSL"
 
-#: src/prefs_account.c:2149
+#: src/prefs_account.c:2138
 msgid "Use SSL for POP3 connection"
 msgstr "用SSL进行POP3连接"
 
-#: src/prefs_account.c:2152 src/prefs_account.c:2169 src/prefs_account.c:2204
+#: src/prefs_account.c:2141 src/prefs_account.c:2158 src/prefs_account.c:2193
 msgid "Use STARTTLS command to start SSL session"
 msgstr "用STARTTLS命令开始SSL会话"
 
-#: src/prefs_account.c:2166
+#: src/prefs_account.c:2155
 msgid "Use SSL for IMAP4 connection"
 msgstr "用SSL进行IMAP连接"
 
-#: src/prefs_account.c:2188
+#: src/prefs_account.c:2177
 msgid "Use SSL for NNTP connection"
 msgstr "用SSL进行NNTP连接"
 
-#: src/prefs_account.c:2190
+#: src/prefs_account.c:2179
 msgid "Send (SMTP)"
 msgstr "发送 (SMTP)"
 
-#: src/prefs_account.c:2198
+#: src/prefs_account.c:2187
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "不采用SSL (但在必要的情况下将启用STARTTLS)"
 
-#: src/prefs_account.c:2201
+#: src/prefs_account.c:2190
 msgid "Use SSL for SMTP connection"
 msgstr "用SSL进行SMTP连接"
 
-#: src/prefs_account.c:2212
+#: src/prefs_account.c:2201
 msgid "Use non-blocking SSL"
 msgstr "采用非阻塞式SSL"
 
-#: src/prefs_account.c:2224
+#: src/prefs_account.c:2213
 msgid "Turn this off if you have SSL connection problems"
 msgstr "(如果你在SSL连接上碰到问题请关闭本项试试)"
 
-#: src/prefs_account.c:2350
+#: src/prefs_account.c:2339
 msgid "SMTP port"
 msgstr "SMTP端口"
 
-#: src/prefs_account.c:2356
+#: src/prefs_account.c:2345
 msgid "POP3 port"
 msgstr "POP3端口"
 
-#: src/prefs_account.c:2362
+#: src/prefs_account.c:2351
 msgid "IMAP4 port"
 msgstr "IMAP4端口"
 
-#: src/prefs_account.c:2368
+#: src/prefs_account.c:2357
 msgid "NNTP port"
 msgstr "NNTP端口"
 
-#: src/prefs_account.c:2373
+#: src/prefs_account.c:2362
 msgid "Domain name"
 msgstr "域名"
 
-#: src/prefs_account.c:2383
+#: src/prefs_account.c:2372
 msgid "Use command to communicate with server"
 msgstr "用如下命令与服务器通讯"
 
-#: src/prefs_account.c:2391
+#: src/prefs_account.c:2380
 msgid "Mark cross-posted messages as read and color:"
 msgstr "将交叉投递(cross-posted)的邮件表示为已读和彩色:"
 
-#: src/prefs_account.c:2438
+#: src/prefs_account.c:2427
 msgid "Browse"
 msgstr "浏览"
 
-#: src/prefs_account.c:2451
+#: src/prefs_account.c:2440
 msgid "Put sent messages in"
 msgstr "将已发送邮件存放到"
 
-#: src/prefs_account.c:2453
+#: src/prefs_account.c:2442
 msgid "Put queued messages in"
 msgstr "将待发送的邮件存放到"
 
-#: src/prefs_account.c:2455
+#: src/prefs_account.c:2444
 msgid "Put draft messages in"
 msgstr "将邮件草稿存放到"
 
-#: src/prefs_account.c:2457
+#: src/prefs_account.c:2446
 msgid "Put deleted messages in"
 msgstr "将已删除的邮件存放到"
 
-#: src/prefs_account.c:2503
+#: src/prefs_account.c:2489
 msgid "Account name is not entered."
 msgstr "未输入帐户名称。"
 
-#: src/prefs_account.c:2507
+#: src/prefs_account.c:2493
 msgid "Mail address is not entered."
 msgstr "未输入邮件地址。"
 
-#: src/prefs_account.c:2514
+#: src/prefs_account.c:2500
 msgid "SMTP server is not entered."
 msgstr "未输入SMTP服务器"
 
-#: src/prefs_account.c:2519
+#: src/prefs_account.c:2505
 msgid "User ID is not entered."
 msgstr "未输入用户ID"
 
-#: src/prefs_account.c:2524
+#: src/prefs_account.c:2510
 msgid "POP3 server is not entered."
 msgstr "未输入POP3服务器"
 
-#: src/prefs_account.c:2529
+#: src/prefs_account.c:2515
 msgid "IMAP4 server is not entered."
 msgstr "未输入IMAP4服务器"
 
-#: src/prefs_account.c:2534
+#: src/prefs_account.c:2520
 msgid "NNTP server is not entered."
 msgstr "尚未输入NNTP服务器"
 
-#: src/prefs_account.c:2540
+#: src/prefs_account.c:2526
 msgid "local mailbox filename is not entered."
 msgstr "尚未输入本地邮箱名称"
 
-#: src/prefs_account.c:2546
+#: src/prefs_account.c:2532
 msgid "mail command is not entered."
 msgstr "尚未输入邮件命令"
 
-#: src/prefs_account.c:2611
+#: src/prefs_account.c:2597
 msgid "Select signature file"
 msgstr "选择签名文件"
 
-#: src/prefs_account.c:2836
+#: src/prefs_account.c:2690
+msgid "Protocol:"
+msgstr "通讯协议:"
+
+#: src/prefs_account.c:2830
 #, c-format
 msgid "Unsupported (%s)"
 msgstr "不支持的 (%s)"
 
-#: src/prefs_actions.c:199
+#: src/prefs_actions.c:202
 msgid "Actions configuration"
 msgstr "动作配置"
 
-#: src/prefs_actions.c:223
+#: src/prefs_actions.c:229
 msgid "Menu name:"
 msgstr "菜单项名称:"
 
-#: src/prefs_actions.c:232
+#: src/prefs_actions.c:238
 msgid "Command line:"
 msgstr "命令行:"
 
-#: src/prefs_actions.c:261 src/prefs_filtering_action.c:489
-#: src/prefs_filtering.c:347 src/prefs_matcher.c:598 src/prefs_template.c:258
+#: src/prefs_actions.c:267 src/prefs_filtering_action.c:493
+#: src/prefs_filtering.c:371 src/prefs_matcher.c:602 src/prefs_template.c:260
 #: src/prefs_toolbar.c:788
 msgid "Replace"
 msgstr "替换"
 
-#: src/prefs_actions.c:505
+#: src/prefs_actions.c:283 src/prefs_filtering_action.c:464
+msgid "Info ..."
+msgstr "说明 ..."
+
+#: src/prefs_actions.c:515
 msgid "Menu name is not set."
 msgstr "未指定菜单项名称"
 
-#: src/prefs_actions.c:510
+#: src/prefs_actions.c:520
 msgid "A leading '/' is not allowed in the menu name."
 msgstr "菜单项名称不允许以'/'开始"
 
-#: src/prefs_actions.c:515
+#: src/prefs_actions.c:525
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "菜单项名称不允许包含冒号':'"
 
-#: src/prefs_actions.c:534
+#: src/prefs_actions.c:544
 msgid "Menu name is too long."
 msgstr "菜单项名称太长"
 
-#: src/prefs_actions.c:543
+#: src/prefs_actions.c:553
 msgid "Command line not set."
 msgstr "未指定命令行"
 
-#: src/prefs_actions.c:548
+#: src/prefs_actions.c:558
 msgid "Menu name and command are too long."
 msgstr "菜单项或者命令太长"
 
-#: src/prefs_actions.c:553
+#: src/prefs_actions.c:563
 #, c-format
 msgid ""
 "The command\n"
@@ -7173,114 +7412,114 @@ msgstr ""
 "%s\n"
 "存在语法错误。"
 
-#: src/prefs_actions.c:613
+#: src/prefs_actions.c:623
 msgid "Delete action"
 msgstr "删除动作"
 
-#: src/prefs_actions.c:614
+#: src/prefs_actions.c:624
 msgid "Do you really want to delete this action?"
 msgstr "你真的要删除此动作码? "
 
-#: src/prefs_actions.c:731 src/prefs_actions.c:751 src/prefs_filtering.c:1102
-#: src/prefs_filtering.c:1124 src/prefs_matcher.c:1636
-#: src/prefs_template.c:400 src/prefs_template.c:417
+#: src/prefs_actions.c:741 src/prefs_actions.c:761 src/prefs_filtering.c:1127
+#: src/prefs_filtering.c:1149 src/prefs_matcher.c:1640
+#: src/prefs_template.c:411 src/prefs_template.c:428
 msgid "Entry not saved"
 msgstr "项目未保存"
 
-#: src/prefs_actions.c:732 src/prefs_actions.c:752 src/prefs_filtering.c:1103
-#: src/prefs_filtering.c:1125 src/prefs_template.c:401
-#: src/prefs_template.c:418
+#: src/prefs_actions.c:742 src/prefs_actions.c:762 src/prefs_filtering.c:1128
+#: src/prefs_filtering.c:1150 src/prefs_template.c:412
+#: src/prefs_template.c:429
 msgid "The entry was not saved. Close anyway?"
 msgstr "该项未保存，真的退出？"
 
-#: src/prefs_actions.c:733 src/prefs_actions.c:753 src/prefs_filtering.c:1104
-#: src/prefs_filtering.c:1126 src/prefs_matcher.c:1638
-#: src/prefs_template.c:402 src/prefs_template.c:419
-msgid "_Continue editing"
-msgstr "继续编辑(_C)"
+#: src/prefs_actions.c:743 src/prefs_actions.c:763 src/prefs_filtering.c:1129
+#: src/prefs_filtering.c:1151 src/prefs_matcher.c:1642
+#: src/prefs_template.c:413 src/prefs_template.c:430
+msgid "+_Continue editing"
+msgstr "+继续编辑(_C)"
 
-#: src/prefs_actions.c:788
+#: src/prefs_actions.c:798
 msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">菜单名称:</span>"
 
-#: src/prefs_actions.c:789
+#: src/prefs_actions.c:799
 msgid "Use / in menu name to make submenus."
 msgstr "菜单项名称中可以用斜线(/)标识子菜单项"
 
-#: src/prefs_actions.c:791
+#: src/prefs_actions.c:801
 msgid "<span weight=\"bold\" underline=\"single\">Command line:</span>"
 msgstr "<span weight=\"bold\" underline=\"single\">命令行:</span>"
 
-#: src/prefs_actions.c:792
+#: src/prefs_actions.c:802
 msgid "<span weight=\"bold\">Begin with:</span>"
 msgstr "<span weight=\"bold\">开始于:</span>"
 
-#: src/prefs_actions.c:793
+#: src/prefs_actions.c:803
 msgid "to send message body or selection to command's standard input"
 msgstr "将邮件内容或者选中部分传递给命令的标准输入"
 
-#: src/prefs_actions.c:794
+#: src/prefs_actions.c:804
 msgid "to send user provided text to command's standard input"
 msgstr "将用户输入的文字传递给命令的标准输入"
 
-#: src/prefs_actions.c:795
+#: src/prefs_actions.c:805
 msgid "to send user provided hidden text to command's standard input"
 msgstr "将用户输入的文字传递给命令的标准输入(输入时不显示明文)"
 
-#: src/prefs_actions.c:796
+#: src/prefs_actions.c:806
 msgid "<span weight=\"bold\">End with:</span>"
 msgstr "<span weight=\"bold\">结束于:</span>"
 
-#: src/prefs_actions.c:797
+#: src/prefs_actions.c:807
 msgid "to replace message body or selection with command's standard output"
 msgstr "以命令的标准输出替换当前邮件内容或者选中部分"
 
-#: src/prefs_actions.c:798
+#: src/prefs_actions.c:808
 msgid "to insert command's standard output without replacing old text"
 msgstr "插入命令的标准输出内容"
 
-#: src/prefs_actions.c:799
+#: src/prefs_actions.c:809
 msgid "to run command asynchronously"
 msgstr "异步运行命令"
 
-#: src/prefs_actions.c:800
+#: src/prefs_actions.c:810
 msgid "<span weight=\"bold\">Use:</span>"
 msgstr "<span weight=\"bold\">采用:</span>"
 
-#: src/prefs_actions.c:801
+#: src/prefs_actions.c:811
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "被选中邮件文件(RFC822/2822格式)"
 
-#: src/prefs_actions.c:802
+#: src/prefs_actions.c:812
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "被选中的多个邮件文件(RFC822/2822格式)"
 
-#: src/prefs_actions.c:803
+#: src/prefs_actions.c:813
 msgid "for the file of the selected decoded message MIME part"
 msgstr "被选中的MIME part(解码后)"
 
-#: src/prefs_actions.c:804
+#: src/prefs_actions.c:814
 msgid "for a user provided argument"
 msgstr "用户提供的参数"
 
-#: src/prefs_actions.c:805
+#: src/prefs_actions.c:815
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "用户提供的隐藏参数(例如: 密码)"
 
-#: src/prefs_actions.c:806
+#: src/prefs_actions.c:816
 msgid "for the text selection"
 msgstr "选中的文字"
 
-#: src/prefs_actions.c:807
+#: src/prefs_actions.c:817
 msgid "apply filtering actions between {} to selected messages"
 msgstr "对选中的邮件执行{}中的过滤动作"
 
-#: src/prefs_actions.c:816 src/prefs_themes.c:982
+#: src/prefs_actions.c:826 src/prefs_themes.c:982
 msgid "Actions"
 msgstr "动作"
 
-#: src/prefs_actions.c:817
+#: src/prefs_actions.c:827
 msgid ""
 "The Actions feature is a way for the user to launch external commands to "
 "process a complete message file or just one of its parts."
@@ -7288,15 +7527,15 @@ msgstr ""
 "'动作'这一功能使得用户可以用外部命令来处理一封邮件的内容(或者只处理其中的一部"
 "分)。"
 
-#: src/prefs_actions.c:903
+#: src/prefs_actions.c:913
 msgid "Current actions"
 msgstr "当前动作"
 
-#: src/prefs_common.c:252
+#: src/prefs_common.c:258
 msgid "On %d\\n%f wrote:\\n\\n%q"
 msgstr "于 %d\\n%f 写道:\\n\\n%q"
 
-#: src/prefs_common.c:258
+#: src/prefs_common.c:264
 msgid ""
 "\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
 "\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
@@ -7304,94 +7543,154 @@ msgstr ""
 "\\n\\n===== 转发邮件:\\n\\n?d{日期: %d\\n}?f{发件人: %f\\n}?t{收件人: %t\\n}?"
 "c{抄送: %c\\n}?n{新闻组: %n\\n}?s{主题: %s\\n}\\n\\n%M"
 
-#: src/prefs_common.c:341
+#: src/prefs_common.c:349
 msgid "%y/%m/%d(%a) %H:%M"
 msgstr ""
 
-#: src/prefs_compose_writing.c:98
+#: src/prefs_compose_writing.c:106
 msgid "Automatic account selection"
 msgstr "自动选择帐户"
 
-#: src/prefs_compose_writing.c:106
+#: src/prefs_compose_writing.c:114
 msgid "when replying"
 msgstr "回信时"
 
-#: src/prefs_compose_writing.c:108
+#: src/prefs_compose_writing.c:116
 msgid "when forwarding"
 msgstr "转发时"
 
-#: src/prefs_compose_writing.c:110
+#: src/prefs_compose_writing.c:118
 msgid "when re-editing"
 msgstr "重新编辑时"
 
-#: src/prefs_compose_writing.c:112
+#: src/prefs_compose_writing.c:120
 msgid "Forwarding"
 msgstr "转发"
 
-#: src/prefs_compose_writing.c:120 src/prefs_filtering_action.c:160
+#: src/prefs_compose_writing.c:128 src/prefs_filtering_action.c:160
 msgid "Forward as attachment"
 msgstr "以附件形式转发"
 
-#: src/prefs_compose_writing.c:123
+#: src/prefs_compose_writing.c:131
 msgid "Keep the original 'From' header when redirecting"
 msgstr "重定向时保持原来的发信人"
 
-#: src/prefs_compose_writing.c:125
+#: src/prefs_compose_writing.c:133
 msgid "Editing"
 msgstr "编辑"
 
-#: src/prefs_compose_writing.c:133
+#: src/prefs_compose_writing.c:141
 msgid "Automatically launch the external editor"
 msgstr "自动启动外部编辑器"
 
-#: src/prefs_compose_writing.c:140
-msgid "Autosave to Drafts folder every"
+#: src/prefs_compose_writing.c:148
+msgid "Autosave message text to Drafts folder every"
 msgstr "自动保存草稿:  每"
 
-#: src/prefs_compose_writing.c:150 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:158 src/prefs_wrapping.c:97
 msgid "characters"
 msgstr "个字符"
 
-#: src/prefs_compose_writing.c:158
+#: src/prefs_compose_writing.c:166
 msgid "Undo level"
-msgstr "复原纪录"
+msgstr "撤销纪录数"
 
-#: src/prefs_compose_writing.c:171
+#: src/prefs_compose_writing.c:179
 msgid "Reply button invokes mailing list reply"
 msgstr "点击回信按钮时回复给邮件列表"
 
-#: src/prefs_compose_writing.c:255 src/prefs_folder_item.c:860
-#: src/prefs_quote.c:281 src/prefs_spelling.c:404 src/prefs_wrapping.c:144
+#: src/prefs_compose_writing.c:182
+msgid "When dropping files into the Compose window"
+msgstr "拖放文件到编写邮件窗口时"
+
+#: src/prefs_compose_writing.c:190
+msgid "Ask whether to insert or attach"
+msgstr "询问用户插入内容还是添加为附件"
+
+#: src/prefs_compose_writing.c:191
+msgid "Always insert"
+msgstr "总是插入内容"
+
+#: src/prefs_compose_writing.c:192
+msgid "Always attach"
+msgstr "总是添加为附件"
+
+#: src/prefs_compose_writing.c:297 src/prefs_folder_item.c:935
+#: src/prefs_quote.c:285 src/prefs_spelling.c:404 src/prefs_wrapping.c:144
 #: src/toolbar.c:392 src/toolbar.c:1514
 msgid "Compose"
 msgstr "撰写"
 
-#: src/prefs_compose_writing.c:256
+#: src/prefs_compose_writing.c:298
 msgid "Writing"
 msgstr "编辑"
 
-#: src/prefs_customheader.c:176
+#: src/prefs_customheader.c:180
 msgid "Custom header configuration"
 msgstr "自定义信头"
 
-#: src/prefs_customheader.c:492 src/prefs_display_header.c:566
-#: src/prefs_matcher.c:1220
+#: src/prefs_customheader.c:236
+msgid "From file..."
+msgstr "从文件读取..."
+
+#: src/prefs_customheader.c:505 src/prefs_display_header.c:566
+#: src/prefs_matcher.c:1224
 msgid "Header name is not set."
 msgstr "为设定信头名称。"
 
-#: src/prefs_customheader.c:496
+#: src/prefs_customheader.c:515
 msgid "This Header name is not allowed as a custom header."
 msgstr "此名称不能作为自定义信头名称。"
 
-#: src/prefs_customheader.c:545
+#: src/prefs_customheader.c:562
+msgid "Choose a png file"
+msgstr "选择一个PNG图片文件"
+
+#: src/prefs_customheader.c:564
+msgid "Choose an xbm file"
+msgstr "选择一个xbm文件"
+
+#: src/prefs_customheader.c:566
+msgid "Choose a text file"
+msgstr "选择一个文本文件"
+
+#: src/prefs_customheader.c:579
+msgid "This file isn't an image."
+msgstr "该文件不是一个图片。"
+
+#: src/prefs_customheader.c:584
+msgid "The chosen image isn't the correct size (48x48)."
+msgstr "选中的图片大小不对(必须是48x48)。"
+
+#: src/prefs_customheader.c:590
+msgid "The image is too big; it must be maximum 725 bytes."
+msgstr "图片太大。不能超过725字节。"
+
+#: src/prefs_customheader.c:595
+msgid "The image isn't in the correct format (PNG)."
+msgstr "图片格式不对。"
+
+#: src/prefs_customheader.c:604
+msgid "The image isn't in the correct format (XBM)."
+msgstr "图片格式不对。"
+
+#: src/prefs_customheader.c:613
+msgid "Couldn't call `compface`. Make sure it's in your $PATH."
+msgstr "无法找到程序`compface`。请确认它存在于您的$PATH所指向的路径中。"
+
+#: src/prefs_customheader.c:664
+msgid "This file contains newlines."
+msgstr "该文件包含换行符。"
+
+#: src/prefs_customheader.c:694
 msgid "Delete header"
 msgstr "删除信头"
 
-#: src/prefs_customheader.c:546
+#: src/prefs_customheader.c:695
 msgid "Do you really want to delete this header?"
 msgstr "确定删除信头？"
 
-#: src/prefs_customheader.c:716
+#: src/prefs_customheader.c:865
 msgid "Current custom headers"
 msgstr "当前自定义信头"
 
@@ -7419,37 +7718,49 @@ msgstr "显示所有未指明的信头字段"
 msgid "This header is already in the list."
 msgstr "该字段已经在列表中存在。"
 
-#: src/prefs_ext_prog.c:102
+#: src/prefs_ext_prog.c:110
 #, c-format
 msgid "%s will be replaced with file name / URI"
 msgstr "%s 将被替换为相应的文件名或者URI"
 
-#: src/prefs_ext_prog.c:119
+#: src/prefs_ext_prog.c:127
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: src/prefs_ext_prog.c:148
-msgid "Print command"
-msgstr "打印命令"
-
-#: src/prefs_ext_prog.c:164
+#: src/prefs_ext_prog.c:156
 msgid "Text editor"
 msgstr "文本编辑器"
 
-#: src/prefs_ext_prog.c:191
+#: src/prefs_ext_prog.c:183
 msgid "Image viewer"
 msgstr "图片查看器"
 
-#: src/prefs_ext_prog.c:209
+#: src/prefs_ext_prog.c:201
+msgid "Command for 'Display as text'"
+msgstr "用于'以文本方式显示'的命令"
+
+#: src/prefs_ext_prog.c:213
+msgid ""
+"This option enables MIME parts to be displayed in the message view via a "
+"script when using the 'Display as text' contextual menu item"
+msgstr ""
+"此选项使得邮件的MIME部分可以通过一个脚本转化为文本格式显示在邮件内容上。"
+"(您仍然需要使用'以文本方式显示'菜单项来运行这个脚本)"
+
+#: src/prefs_ext_prog.c:224
 msgid "Audio player"
 msgstr "音频播放器"
 
-#: src/prefs_ext_prog.c:266 src/prefs_image_viewer.c:128
+#: src/prefs_ext_prog.c:242
+msgid "Print command"
+msgstr "打印命令"
+
+#: src/prefs_ext_prog.c:304 src/prefs_image_viewer.c:128
 #: src/prefs_message.c:312
 msgid "Message View"
 msgstr "邮件视图"
 
-#: src/prefs_ext_prog.c:267
+#: src/prefs_ext_prog.c:305
 msgid "External Programs"
 msgstr "外部程序"
 
@@ -7535,7 +7846,7 @@ msgid "Recipient"
 msgstr "回执"
 
 #: src/prefs_filtering_action.c:439 src/prefs_summary_column.c:88
-#: src/summaryview.c:491
+#: src/summaryview.c:492
 msgid "Score"
 msgstr "得分"
 
@@ -7543,76 +7854,72 @@ msgstr "得分"
 msgid "Select ..."
 msgstr "选择..."
 
-#: src/prefs_filtering_action.c:461
-msgid "Info ..."
-msgstr "说明 ..."
-
-#: src/prefs_filtering_action.c:792
+#: src/prefs_filtering_action.c:796
 msgid "Command line not set"
 msgstr "未指定命令行"
 
-#: src/prefs_filtering_action.c:793
+#: src/prefs_filtering_action.c:797
 msgid "Destination is not set."
 msgstr "没有指定收信人。"
 
-#: src/prefs_filtering_action.c:804
+#: src/prefs_filtering_action.c:808
 msgid "Recipient is not set."
 msgstr "没有指定收信人。"
 
-#: src/prefs_filtering_action.c:819
+#: src/prefs_filtering_action.c:823
 msgid "Score is not set"
 msgstr "未指定积分"
 
-#: src/prefs_filtering_action.c:1038
+#: src/prefs_filtering_action.c:1042
 msgid "No action was defined."
 msgstr "没有定义动作。"
 
-#: src/prefs_filtering_action.c:1075 src/prefs_matcher.c:1679
-#: src/quote_fmt.c:61
+#: src/prefs_filtering_action.c:1079 src/prefs_matcher.c:1683
+#: src/quote_fmt.c:58
 msgid "literal %"
 msgstr "% 符号"
 
-#: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:1684
-#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:488
+#: src/prefs_filtering_action.c:1084 src/prefs_matcher.c:1688
+#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:489
 msgid "Date"
 msgstr "日期"
 
-#: src/prefs_filtering_action.c:1081 src/prefs_matcher.c:1685
+#: src/prefs_filtering_action.c:1085 src/prefs_matcher.c:1689
 #: src/quote_fmt.c:52
 msgid "Message-ID"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1082 src/prefs_matcher.c:152
-#: src/prefs_matcher.c:1686 src/quote_fmt.c:50
+#: src/prefs_filtering_action.c:1086 src/prefs_matcher.c:152
+#: src/prefs_matcher.c:1690 src/quote_fmt.c:50
 msgid "Newsgroups"
 msgstr "新闻组"
 
-#: src/prefs_filtering_action.c:1083 src/prefs_matcher.c:152
-#: src/prefs_matcher.c:1687 src/quote_fmt.c:51
+#: src/prefs_filtering_action.c:1087 src/prefs_matcher.c:152
+#: src/prefs_matcher.c:1691 src/quote_fmt.c:51
 msgid "References"
 msgstr ""
 
-#: src/prefs_filtering_action.c:1084 src/prefs_matcher.c:1688
+#: src/prefs_filtering_action.c:1088 src/prefs_matcher.c:1692
 msgid "filename (should not be modified)"
 msgstr "文件名(请勿更动)"
 
-#: src/prefs_filtering_action.c:1085 src/prefs_matcher.c:1689
+#: src/prefs_filtering_action.c:1089 src/prefs_matcher.c:1693
 msgid "new line"
 msgstr "新行"
 
-#: src/prefs_filtering_action.c:1086 src/prefs_matcher.c:1690
+#: src/prefs_filtering_action.c:1090 src/prefs_matcher.c:1694
 msgid "escape character for quotes"
 msgstr "引文逃逸字符"
 
-#: src/prefs_filtering_action.c:1087 src/prefs_matcher.c:1691
+#: src/prefs_filtering_action.c:1091 src/prefs_matcher.c:1695
 msgid "quote character"
 msgstr "引文字符"
 
-#: src/prefs_filtering_action.c:1095
+#: src/prefs_filtering_action.c:1099
 msgid "Filtering Action: 'Execute'"
 msgstr "过滤动作: '执行'"
 
-#: src/prefs_filtering_action.c:1096
+#: src/prefs_filtering_action.c:1100
 msgid ""
 "'Execute' allows you to send a message or message element to an external "
 "program or script.\n"
@@ -7624,60 +7931,60 @@ msgstr ""
 "\n"
 "可以使用以下符号: "
 
-#: src/prefs_filtering_action.c:1400
+#: src/prefs_filtering_action.c:1404
 msgid "Current action list"
 msgstr "当前动作列表"
 
-#: src/prefs_filtering.c:159 src/prefs_filtering.c:246
+#: src/prefs_filtering.c:164 src/prefs_filtering.c:270
 msgid "Filtering/Processing configuration"
 msgstr "过滤/处理 配置"
 
-#: src/prefs_filtering.c:283
+#: src/prefs_filtering.c:307
 msgid "Condition: "
 msgstr "条件: "
 
-#: src/prefs_filtering.c:296 src/prefs_filtering.c:318
+#: src/prefs_filtering.c:320 src/prefs_filtering.c:342
 msgid " Define... "
 msgstr "定义... "
 
-#: src/prefs_filtering.c:305
+#: src/prefs_filtering.c:329
 msgid "Action: "
 msgstr "动作: "
 
-#: src/prefs_filtering.c:652 src/prefs_filtering.c:653
-#: src/prefs_filtering.c:715 src/prefs_template.c:350
+#: src/prefs_filtering.c:677 src/prefs_filtering.c:678
+#: src/prefs_filtering.c:740 src/prefs_template.c:361
 msgid "(New)"
 msgstr "(新建)"
 
-#: src/prefs_filtering.c:794 src/prefs_filtering.c:877
+#: src/prefs_filtering.c:819 src/prefs_filtering.c:902
 msgid "Condition string is not valid."
 msgstr "无效的条件字符串。"
 
-#: src/prefs_filtering.c:830 src/prefs_filtering.c:885
+#: src/prefs_filtering.c:855 src/prefs_filtering.c:910
 msgid "Action string is not valid."
 msgstr "无效的动作。"
 
-#: src/prefs_filtering.c:864
+#: src/prefs_filtering.c:889
 msgid "Condition string is empty."
 msgstr "条件字符串为空。"
 
-#: src/prefs_filtering.c:870
+#: src/prefs_filtering.c:895
 msgid "Action string is empty."
 msgstr "文件 %s 不存在。"
 
-#: src/prefs_filtering.c:942
+#: src/prefs_filtering.c:967
 msgid "Delete rule"
 msgstr "删除规则"
 
-#: src/prefs_filtering.c:943
+#: src/prefs_filtering.c:968
 msgid "Do you really want to delete this rule?"
 msgstr "确定删除这项规则？"
 
-#: src/prefs_filtering.c:1306
+#: src/prefs_filtering.c:1331
 msgid "Enable"
 msgstr "启用"
 
-#: src/prefs_filtering.c:1326
+#: src/prefs_filtering.c:1351
 msgid "Rule"
 msgstr "规则"
 
@@ -7710,7 +8017,7 @@ msgstr "显示列"
 msgid " Use default "
 msgstr "使用缺省值"
 
-#: src/prefs_folder_item.c:174 src/prefs_folder_item.c:494
+#: src/prefs_folder_item.c:183 src/prefs_folder_item.c:566
 msgid ""
 "Apply to\n"
 "subfolders"
@@ -7718,82 +8025,102 @@ msgstr ""
 "应用于\n"
 "子邮件夹"
 
-#: src/prefs_folder_item.c:181
+#: src/prefs_folder_item.c:207
+msgid "Normal"
+msgstr "普通"
+
+#: src/prefs_folder_item.c:209
+msgid "Outbox"
+msgstr "发信夹"
+
+#: src/prefs_folder_item.c:226
+msgid "Folder type:"
+msgstr "邮件夹类型:"
+
+#: src/prefs_folder_item.c:238
 msgid "Simplify Subject RegExp: "
 msgstr "简化邮件标题的正则表达式: "
 
-#: src/prefs_folder_item.c:201
+#: src/prefs_folder_item.c:258
 msgid "Folder chmod: "
 msgstr "修改文件夹权限: "
 
-#: src/prefs_folder_item.c:227
+#: src/prefs_folder_item.c:284
 msgid "Folder color: "
 msgstr "邮件夹颜色: "
 
-#: src/prefs_folder_item.c:241 src/prefs_folder_item.c:831
+#: src/prefs_folder_item.c:298 src/prefs_folder_item.c:906
 #: src/prefs_msg_colors.c:648
 msgid "Pick color for folder"
 msgstr "选邮件夹的颜色"
 
-#: src/prefs_folder_item.c:258
+#: src/prefs_folder_item.c:315
 msgid "Process at startup"
 msgstr "启动时处理"
 
-#: src/prefs_folder_item.c:272
+#: src/prefs_folder_item.c:329
 msgid "Scan for new mail"
 msgstr "检查新邮件"
 
-#: src/prefs_folder_item.c:285
+#: src/prefs_folder_item.c:342
 msgid "Synchronise for offline use"
 msgstr "同步数据以便离线使用"
 
-#: src/prefs_folder_item.c:503
+#: src/prefs_folder_item.c:575
 msgid "Request Return Receipt"
 msgstr "请求回执"
 
-#: src/prefs_folder_item.c:518
+#: src/prefs_folder_item.c:590
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "将发出的邮件保存一份拷贝到此邮件夹"
 
-#: src/prefs_folder_item.c:531
+#: src/prefs_folder_item.c:603
 msgid "Default To: "
 msgstr "新邮件缺省收件人: "
 
-#: src/prefs_folder_item.c:551
+#: src/prefs_folder_item.c:623
 msgid "Default To for replies: "
 msgstr "回复邮件缺省收件人: "
 
-#: src/prefs_folder_item.c:571
+#: src/prefs_folder_item.c:643
 msgid "Default account: "
 msgstr "缺省帐号: "
 
-#: src/prefs_folder_item.c:622
+#: src/prefs_folder_item.c:694
 msgid "Default dictionary: "
 msgstr "缺省字典: "
 
-#: src/prefs_folder_item.c:843
+#: src/prefs_folder_item.c:918
 msgid "General"
 msgstr "一般"
 
-#: src/prefs_folder_item.c:883
+#: src/prefs_folder_item.c:961
 #, c-format
 msgid "Properties for folder %s"
 msgstr "%s - 邮件夹设置"
 
-#: src/prefs_fonts.c:66
+#: src/prefs_fonts.c:74
 msgid "Folder and Message Lists"
 msgstr "邮件夹和邮件列表"
 
-#: src/prefs_fonts.c:83
+#: src/prefs_fonts.c:91
 msgid "Message"
 msgstr "邮件"
 
-#: src/prefs_fonts.c:145 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1076
+#: src/prefs_fonts.c:110
+msgid "Use different font for printing"
+msgstr "以不同的字体打印"
+
+#: src/prefs_fonts.c:119
+msgid "Message Printing"
+msgstr "打印"
+
+#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:855 src/prefs_summaries.c:1076
 #: src/prefs_themes.c:360
 msgid "Display"
 msgstr "显示"
 
-#: src/prefs_fonts.c:146
+#: src/prefs_fonts.c:198
 msgid "Fonts"
 msgstr "字体"
 
@@ -7953,27 +8280,27 @@ msgstr "条件设置"
 msgid "Match type"
 msgstr "匹配类型"
 
-#: src/prefs_matcher.c:502
+#: src/prefs_matcher.c:505
 msgid " Info... "
 msgstr "说明... "
 
-#: src/prefs_matcher.c:524
+#: src/prefs_matcher.c:528
 msgid "Predicate"
 msgstr "谓词"
 
-#: src/prefs_matcher.c:575
+#: src/prefs_matcher.c:579
 msgid "Use regexp"
 msgstr "使用正则表达式"
 
-#: src/prefs_matcher.c:613
+#: src/prefs_matcher.c:617
 msgid "Boolean Op"
 msgstr "逻辑操作符"
 
-#: src/prefs_matcher.c:1200
+#: src/prefs_matcher.c:1204
 msgid "Value is not set."
 msgstr "尚未赋值"
 
-#: src/prefs_matcher.c:1637
+#: src/prefs_matcher.c:1641
 msgid ""
 "The entry was not saved.\n"
 "Close anyway?"
@@ -7981,11 +8308,11 @@ msgstr ""
 "该项未保存，\n"
 "确实关闭？"
 
-#: src/prefs_matcher.c:1699
+#: src/prefs_matcher.c:1703
 msgid "Match Type: 'Test'"
 msgstr "匹配类型: 'Test'"
 
-#: src/prefs_matcher.c:1700
+#: src/prefs_matcher.c:1704
 msgid ""
 "'Test' allows you to test a message or message element using an external "
 "program or script. The program will return either 0 or 1.\n"
@@ -7997,7 +8324,7 @@ msgstr ""
 "\n"
 "可以使用如下一些符号:"
 
-#: src/prefs_matcher.c:1782
+#: src/prefs_matcher.c:1786
 msgid "Current condition rules"
 msgstr "当前条件规则"
 
@@ -8238,50 +8565,54 @@ msgstr "选择签名颜色"
 msgid "Colors"
 msgstr "颜色"
 
-#: src/prefs_other.c:106
+#: src/prefs_other.c:109
 msgid "Add address to destination when double-clicked"
 msgstr "双击时将地址添加为收信人"
 
-#: src/prefs_other.c:109
+#: src/prefs_other.c:112
 msgid "Log Size"
 msgstr "日志大小"
 
-#: src/prefs_other.c:116
+#: src/prefs_other.c:119
 msgid "Clip the log size"
 msgstr "限制日志文件大小"
 
-#: src/prefs_other.c:121
+#: src/prefs_other.c:124
 msgid "Log window length"
 msgstr "日志窗口长度"
 
-#: src/prefs_other.c:138
+#: src/prefs_other.c:141
 msgid "0 to stop logging in the log window"
 msgstr "0 表示禁止往日志窗口写信息"
 
-#: src/prefs_other.c:144
+#: src/prefs_other.c:147
 msgid "On exit"
 msgstr "退出设置"
 
-#: src/prefs_other.c:152
+#: src/prefs_other.c:155
 msgid "Confirm on exit"
 msgstr "退出时确认"
 
-#: src/prefs_other.c:159
+#: src/prefs_other.c:162
 msgid "Empty trash on exit"
 msgstr "退出时清空垃圾桶"
 
-#: src/prefs_other.c:161
+#: src/prefs_other.c:164
 msgid "Ask before emptying"
 msgstr "清除前请求确认"
 
-#: src/prefs_other.c:165
+#: src/prefs_other.c:168
 msgid "Warn if there are queued messages"
 msgstr "若有待发送的邮件则发出警告"
 
-#: src/prefs_other.c:171
+#: src/prefs_other.c:174
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O 超时时间"
 
+#: src/prefs_other.c:192
+msgid "Never send Return Receipts"
+msgstr "从不请求发送回执"
+
 #: src/prefs_quote.c:90
 msgid "Reply will quote by default"
 msgstr "回信时引用原文"
@@ -8298,19 +8629,19 @@ msgstr "引文符号"
 msgid "Forward format"
 msgstr "转发格式"
 
-#: src/prefs_quote.c:181
+#: src/prefs_quote.c:184
 msgid " Description of symbols... "
 msgstr " 特殊符号说明... "
 
-#: src/prefs_quote.c:189
+#: src/prefs_quote.c:193
 msgid "Quotation characters"
 msgstr "引文标识"
 
-#: src/prefs_quote.c:204
+#: src/prefs_quote.c:208
 msgid "Treat these characters as quotation marks: "
 msgstr "将这些字符作为引文标识: "
 
-#: src/prefs_quote.c:282
+#: src/prefs_quote.c:286
 msgid "Quoting"
 msgstr "引用"
 
@@ -8555,8 +8886,8 @@ msgid ""
 "characters"
 msgstr "指定当邮件含有非ASCII字符时的邮件内容编码方式"
 
-#: src/prefs_send.c:338 src/send_message.c:456 src/send_message.c:460
-#: src/send_message.c:465
+#: src/prefs_send.c:338 src/send_message.c:477 src/send_message.c:481
+#: src/send_message.c:486
 msgid "Sending"
 msgstr "正在发送"
 
@@ -8865,39 +9196,39 @@ msgstr ""
 "请选择要在邮件列表栏显示的字段列。\n"
 "你可以用 上移/下移 按钮或者直接拖曳来调整顺序。"
 
-#: src/prefs_template.c:190
+#: src/prefs_template.c:192
 msgid "Template name"
 msgstr "模板名称"
 
-#: src/prefs_template.c:271
+#: src/prefs_template.c:276
 msgid " Symbols... "
 msgstr " 符号... "
 
-#: src/prefs_template.c:297
+#: src/prefs_template.c:305
 msgid "Template configuration"
 msgstr "模板设置"
 
-#: src/prefs_template.c:510
+#: src/prefs_template.c:521
 msgid "Template format error."
 msgstr "模板格式错误"
 
-#: src/prefs_template.c:519
+#: src/prefs_template.c:531
 msgid "Template name is not set."
 msgstr "未设定模板名称。"
 
-#: src/prefs_template.c:608
+#: src/prefs_template.c:620
 msgid "Delete template"
 msgstr "删除模板"
 
-#: src/prefs_template.c:609
+#: src/prefs_template.c:621
 msgid "Do you really want to delete this template?"
 msgstr "确定删除这个模板吗？"
 
-#: src/prefs_template.c:746
+#: src/prefs_template.c:758
 msgid "Current templates"
 msgstr "目前使用的模板"
 
-#: src/prefs_template.c:771
+#: src/prefs_template.c:783
 msgid "Template"
 msgstr "模板"
 
@@ -9145,37 +9476,82 @@ msgstr "每行最多"
 msgid "Wrapping"
 msgstr "自动折行"
 
-#: src/privacy.c:174 src/privacy.c:178 src/privacy.c:195 src/privacy.c:199
+#: src/privacy.c:61
+msgid "Unknown error"
+msgstr "未知错误"
+
+#: src/privacy.c:211 src/privacy.c:215 src/privacy.c:232 src/privacy.c:236
 msgid "No signature found"
 msgstr "未发现签名"
 
-#: src/privacy.c:180 src/privacy.c:201
+#: src/privacy.c:217 src/privacy.c:238
 msgid "No information available"
 msgstr "没有信息"
 
-#: src/procmime.c:295 src/procmime.c:297
+#: src/privacy.c:406
+#, fuzzy
+msgid "No recipient keys defined."
+msgstr "没有定义动作。"
+
+#: src/procmime.c:296 src/procmime.c:298
 msgid "[Error decoding BASE64]\n"
 msgstr "[BASE64解码错误]\n"
 
-#: src/procmsg.c:885
+#: src/procmsg.c:900
 msgid "Already trying to send\n"
 msgstr ""
 
-#: src/procmsg.c:1557
+#: src/procmsg.c:903
+msgid "Already trying to send."
+msgstr ""
+
+#: src/procmsg.c:1434
+#, c-format
+msgid "Couldn't open file %s."
+msgstr "无法打开文件 %s。"
+
+#: src/procmsg.c:1528
+#, c-format
+msgid "Couldn't encrypt the email: %s"
+msgstr "无法加密邮件: %s"
+
+#: src/procmsg.c:1561
+msgid "Queued message header is broken."
+msgstr "待发送的邮件头已经损坏"
+
+#: src/procmsg.c:1582
+msgid "An error happened during SMTP session."
+msgstr "建立SMTP会话时发生错误."
+
+#: src/procmsg.c:1596
+msgid ""
+"No specific account has been found to send, and an error happened during "
+"SMTP session."
+msgstr ""
+"没有发现可供发送邮件的账户，同时在SMTP会话中发生了一个错误。"
+
+#: src/procmsg.c:1604
+msgid ""
+"Couldn't determine sending informations. Maybe the email hasn't been "
+"generated by Sylpheed-Claws."
+msgstr ""
+"无法判断待发送的信息。也许这封邮件不是用Sylpheed-Claws生成的。"
+
+#: src/procmsg.c:1622
 msgid "Could not create temporary file for news sending."
 msgstr "发送新闻过程中无法创建临时文件。"
 
-#: src/procmsg.c:1568
+#: src/procmsg.c:1635
 msgid "Error when writing temporary file for news sending."
 msgstr "发送新闻过程中写往临时文件时出错。"
 
-#: src/procmsg.c:1580
+#: src/procmsg.c:1649
 #, c-format
-msgid "Error occurred while posting the message to %s ."
-msgstr "å\8f\91表æ\96\87ç« 至 %s 时发生错误。"
+msgid "Error occurred while posting the message to %s."
+msgstr "å\8f\91è´´至 %s 时发生错误。"
 
 #: src/quote_fmt.c:40
-msgid "customized date format (see man strftime)"
+msgid "customized date format (see 'man strftime')"
 msgstr "自定义日期显示格式 (请查看strftime的手册页)"
 
 #: src/quote_fmt.c:43
@@ -9215,49 +9591,98 @@ msgid "cursor position"
 msgstr "光标位置"
 
 #: src/quote_fmt.c:59
-msgid ""
-"insert expr if x is set\n"
-"x is one of the characters above after %"
-msgstr ""
-"如果x已经设置，则插入expr\n"
-"x是以上列出的字符之一"
-
-#: src/quote_fmt.c:62
 msgid "literal backslash"
 msgstr "反斜线"
 
-#: src/quote_fmt.c:63
+#: src/quote_fmt.c:60
 msgid "literal question mark"
 msgstr "问号"
 
-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:61
+msgid "literal exclamation mark"
+msgstr "感叹号"
+
+#: src/quote_fmt.c:62
 msgid "literal pipe"
 msgstr "竖线"
 
-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:63
 msgid "literal opening curly brace"
 msgstr "左大括弧"
 
-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:64
 msgid "literal closing curly brace"
 msgstr "右大括弧"
 
+#: src/quote_fmt.c:65
+msgid "tab"
+msgstr "制表符"
+
+#: src/quote_fmt.c:66
+msgid "linefeed"
+msgstr "换行符"
+
 #: src/quote_fmt.c:68
-msgid "insert file"
-msgstr "插入文件"
+msgid ""
+"insert expr if x is set\n"
+"(where x is one of the dfNFLIstcnri characters)"
+msgstr ""
+"如果x已经设置，则插入expr\n"
+"(x是以上列出的字符之一)"
 
 #: src/quote_fmt.c:69
-msgid "insert program output"
-msgstr "插入程序输出"
+msgid ""
+"insert expr if x is not set\n"
+"(where x is one of the dfNFLIstcnri characters)"
+msgstr ""
+"如果x尚未设置，则插入expr\n"
+"(x是以上列出的字符之一)"
 
-#: src/quote_fmt.c:77
+#: src/quote_fmt.c:70
+msgid ""
+"insert file:\n"
+"sub_expr is evaluated as a filename to insert"
+msgstr ""
+"插入文件:\n"
+"sub_expr将被替换为要插入的文件名"
+
+#: src/quote_fmt.c:71
+msgid ""
+"insert program output:\n"
+"sub_expr is evaluated as a command-line to get\n"
+"the output from"
+msgstr ""
+"插入程序输出:\n"
+"sub_expr将被替换为一命令行，该命令行被用于获取输出\n"
+" "
+
+#: src/quote_fmt.c:72
+msgid ""
+"insert user input:\n"
+"sub_expr is a variable to be replaced by\n"
+"user-entered text"
+msgstr ""
+"插入用户输入:\n"
+"sub_expr将被替换为用户输入的文本\n"
+" "
+
+#: src/quote_fmt.c:84
 msgid "Description of symbols"
 msgstr "符号描述"
 
-#: src/quote_fmt.c:78
+#: src/quote_fmt.c:85
 msgid "The following symbols can be used:"
 msgstr "可以使用下述符号:"
 
+#: src/quote_fmt_parse.y:458
+#, c-format
+msgid "Enter text to replace '%s'"
+msgstr "请输入要替换'%s'的文字"
+
+#: src/quote_fmt_parse.y:459
+msgid "Enter variable"
+msgstr "请输入变量"
+
 #: src/send_message.c:137
 #, c-format
 msgid "Sending message using command: %s\n"
@@ -9273,73 +9698,73 @@ msgstr "无法执行命令: %s"
 msgid "Error occurred while executing command: %s"
 msgstr "执行命令时发生错误: %s"
 
-#: src/send_message.c:301
+#: src/send_message.c:322
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/send_message.c:306
+#: src/send_message.c:327
 msgid "Doing POP before SMTP..."
 msgstr "在SMTP之前进行POP操作..."
 
-#: src/send_message.c:309
+#: src/send_message.c:330
 msgid "POP before SMTP"
 msgstr "在SMTP之前进行POP"
 
-#: src/send_message.c:314
+#: src/send_message.c:335
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "连接到 SMTP 服务器 %s..."
 
-#: src/send_message.c:374
+#: src/send_message.c:395
 msgid "Mail sent successfully."
 msgstr "邮件已成功发送。"
 
-#: src/send_message.c:441
+#: src/send_message.c:462
 msgid "Sending HELO..."
 msgstr "送出 HELO 信头..."
 
-#: src/send_message.c:442 src/send_message.c:447 src/send_message.c:452
+#: src/send_message.c:463 src/send_message.c:468 src/send_message.c:473
 msgid "Authenticating"
 msgstr "正在进行鉴权"
 
-#: src/send_message.c:443 src/send_message.c:448
+#: src/send_message.c:464 src/send_message.c:469
 msgid "Sending message..."
 msgstr "正在发送邮件..."
 
-#: src/send_message.c:446
+#: src/send_message.c:467
 msgid "Sending EHLO..."
 msgstr "送出 EHLO 信头..."
 
-#: src/send_message.c:455
+#: src/send_message.c:476
 msgid "Sending MAIL FROM..."
 msgstr "送出 MAIL FROM 信头..."
 
-#: src/send_message.c:459
+#: src/send_message.c:480
 msgid "Sending RCPT TO..."
 msgstr "送出 RCPT TO 信头..."
 
-#: src/send_message.c:464
+#: src/send_message.c:485
 msgid "Sending DATA..."
 msgstr "正在传送DATA..."
 
-#: src/send_message.c:468
+#: src/send_message.c:489
 msgid "Quitting..."
 msgstr "正在退出..."
 
-#: src/send_message.c:496
+#: src/send_message.c:517
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "正在发送邮件 (%d / %d bytes)"
 
-#: src/send_message.c:524
+#: src/send_message.c:545
 msgid "Sending message"
 msgstr "正在发送邮件"
 
-#: src/send_message.c:570 src/send_message.c:590
+#: src/send_message.c:591 src/send_message.c:611
 msgid "Error occurred while sending the message."
 msgstr "发送该邮件时发生错误。"
 
-#: src/send_message.c:573
+#: src/send_message.c:594
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -9385,386 +9810,390 @@ msgstr "删除认证"
 msgid "Do you really want to delete this certificate?"
 msgstr "确定删除这项认证？"
 
-#: src/summary_search.c:172
+#: src/summary_search.c:175
 msgid "Search messages"
 msgstr "搜索邮件"
 
-#: src/summary_search.c:194
+#: src/summary_search.c:197
 msgid "Match any of the following"
 msgstr "满足下面任意一条件"
 
-#: src/summary_search.c:195
+#: src/summary_search.c:198
 msgid "Match all of the following"
 msgstr "满足下面所有条件"
 
-#: src/summary_search.c:275
+#: src/summary_search.c:257
+msgid "From:"
+msgstr "发信人:"
+
+#: src/summary_search.c:278
 msgid "Body:"
 msgstr "正文:"
 
-#: src/summary_search.c:282
+#: src/summary_search.c:285
 msgid "Condition:"
 msgstr "条件:"
 
-#: src/summary_search.c:310
+#: src/summary_search.c:315
 msgid "Find _all"
 msgstr "查找全部(_a)"
 
-#: src/summary_search.c:504
+#: src/summary_search.c:513
 msgid "Beginning of list reached; continue from end?"
 msgstr "搜寻已到顶端。要从结尾继续搜寻吗？"
 
-#: src/summary_search.c:506
+#: src/summary_search.c:515
 msgid "End of list reached; continue from beginning?"
 msgstr "搜寻已到结尾。要从开头继续搜寻吗？"
 
-#: src/summaryview.c:416
+#: src/summaryview.c:417
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/summaryview.c:417
+#: src/summaryview.c:418
 msgid "/Repl_y to"
 msgstr "/回复给(_y)"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/Repl_y to/_all"
 msgstr "/回复给(_y)/所有人(_a)"
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/Repl_y to/_sender"
 msgstr "/回复给(_y)/发信人(_s)"
 
-#: src/summaryview.c:420
+#: src/summaryview.c:421
 msgid "/Repl_y to/mailing _list"
 msgstr "/回复给(_y)/邮件列表 (_l)"
 
-#: src/summaryview.c:423 src/toolbar.c:234
+#: src/summaryview.c:424 src/toolbar.c:234
 msgid "/_Forward"
 msgstr "转发(_F)"
 
-#: src/summaryview.c:424 src/toolbar.c:235
+#: src/summaryview.c:425 src/toolbar.c:235
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_w)"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/Redirect"
 msgstr "/重定向"
 
-#: src/summaryview.c:427
+#: src/summaryview.c:428
 msgid "/M_ove..."
 msgstr "/移动(_o)..."
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Copy..."
 msgstr "/复制(_C)..."
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Move to _trash"
 msgstr "/移动到垃圾桶(_t)"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:431
 msgid "/_Delete..."
 msgstr "/删除(_D)..."
 
-#: src/summaryview.c:432
+#: src/summaryview.c:433
 msgid "/_Mark"
 msgstr "/标记(_M)"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/_Mark/_Mark"
 msgstr "/标记(_M)/标记(_M)"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:435
 msgid "/_Mark/_Unmark"
 msgstr "/标记(_M)/去除标记(_U)"
 
-#: src/summaryview.c:435 src/summaryview.c:441 src/summaryview.c:444
+#: src/summaryview.c:436 src/summaryview.c:442 src/summaryview.c:445
 msgid "/_Mark/---"
 msgstr "/标记(_M)/---"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:437
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/标记(_M)/标记为未读(_e)"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/_Mark/Mark as rea_d"
 msgstr "/标记(_M)/标记为已读(_d)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/_Mark/Mark all read"
 msgstr "/标记(_M)/标记全部为已读"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:440
 msgid "/_Mark/Ignore thread"
 msgstr "/标记(_M)/忽略邮件线索"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/_Mark/Unignore thread"
 msgstr "/标记(_M)/不忽略邮件线索"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/_Mark/Mark as _spam"
 msgstr "/标记(_M)/标记为垃圾邮件(_s)"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as _ham"
 msgstr "/标记(_M)/标记为非垃圾邮件(_h)"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:446
 msgid "/_Mark/Lock"
 msgstr "/标记(_M)/锁定"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:447
 msgid "/_Mark/Unlock"
 msgstr "/标记(_M)/解锁"
 
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/Color la_bel"
 msgstr "/彩色标记(_b)"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/Add sender to address boo_k"
 msgstr "将发信人加入地址簿中(_k)"
 
-#: src/summaryview.c:452
+#: src/summaryview.c:453
 msgid "/Create f_ilter rule"
 msgstr "/创建邮件过滤规则(_i)"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/创建邮件过滤规则(_i)/自动创建"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:456
 msgid "/Create f_ilter rule/by _From"
 msgstr "/创建邮件过滤规则(_i)/按来源(_F)"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:458
 msgid "/Create f_ilter rule/by _To"
 msgstr "/创建邮件过滤规则(_i)/按收信人(_T)"
 
-#: src/summaryview.c:459
+#: src/summaryview.c:460
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/创建邮件过滤规则(_i)/按标题(_S)"
 
-#: src/summaryview.c:461
+#: src/summaryview.c:462
 msgid "/Create processing rule"
 msgstr "/创建处理规则"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:463
 msgid "/Create processing rule/_Automatically"
 msgstr "/创建处理规则/自动创建(_A)"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:465
 msgid "/Create processing rule/by _From"
 msgstr "/创建处理规则/按来源(_F)"
 
-#: src/summaryview.c:466
+#: src/summaryview.c:467
 msgid "/Create processing rule/by _To"
 msgstr "/创建处理规则/按收信人(_T)"
 
-#: src/summaryview.c:468
+#: src/summaryview.c:469
 msgid "/Create processing rule/by _Subject"
 msgstr "/创建处理规则/按标题(_S)"
 
-#: src/summaryview.c:474
+#: src/summaryview.c:475
 msgid "/_View/_Source"
 msgstr "/查看(_V)/邮件源文件(_S)"
 
-#: src/summaryview.c:475
+#: src/summaryview.c:476
 msgid "/_View/All _header"
 msgstr "/查看(_V)/所有的信头(_h)"
 
-#: src/summaryview.c:478
+#: src/summaryview.c:479
 msgid "/_Print..."
 msgstr "/打印(_P)..."
 
-#: src/summaryview.c:554
+#: src/summaryview.c:555
 msgid "Toggle quick search bar"
 msgstr "切换快速搜索条显示状态"
 
-#: src/summaryview.c:881
+#: src/summaryview.c:893
 msgid "Process mark"
 msgstr "邮件标记"
 
-#: src/summaryview.c:882
+#: src/summaryview.c:894
 msgid "Some marks are left. Process them?"
 msgstr "某些邮件已做了待处理标记。是否进行处理？"
 
-#: src/summaryview.c:937
+#: src/summaryview.c:949
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "扫描邮件夹(%s)..."
 
-#: src/summaryview.c:1403 src/summaryview.c:1455
+#: src/summaryview.c:1411 src/summaryview.c:1463
 msgid "No more unread messages"
 msgstr "没有其他新邮件"
 
-#: src/summaryview.c:1404
+#: src/summaryview.c:1412
 msgid "No unread message found. Search from the end?"
 msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
 
-#: src/summaryview.c:1416 src/summaryview.c:1468 src/summaryview.c:1515
-#: src/summaryview.c:1567
+#: src/summaryview.c:1424 src/summaryview.c:1476 src/summaryview.c:1523
+#: src/summaryview.c:1575 src/summaryview.c:1654
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 
-#: src/summaryview.c:1424
+#: src/summaryview.c:1432
 msgid "No unread messages."
 msgstr "没有未读邮件。"
 
-#: src/summaryview.c:1456
+#: src/summaryview.c:1464
 msgid "No unread message found. Go to next folder?"
 msgstr "没有新邮件。要到下一个邮件夹吗？"
 
-#: src/summaryview.c:1502 src/summaryview.c:1554
+#: src/summaryview.c:1510 src/summaryview.c:1562
 msgid "No more new messages"
 msgstr "没有其他新邮件"
 
-#: src/summaryview.c:1503
+#: src/summaryview.c:1511
 msgid "No new message found. Search from the end?"
 msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
 
-#: src/summaryview.c:1523
+#: src/summaryview.c:1531
 msgid "No new messages."
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1555
+#: src/summaryview.c:1563
 msgid "No new message found. Go to next folder?"
-msgstr "没有新邮件。要到下一个邮件夹吗？"
+msgstr "没有新邮件。要转到下一个邮件夹吗？"
 
-#: src/summaryview.c:1592 src/summaryview.c:1617
+#: src/summaryview.c:1600 src/summaryview.c:1641
 msgid "No more marked messages"
 msgstr "没有其他已标记邮件"
 
-#: src/summaryview.c:1593
+#: src/summaryview.c:1601
 msgid "No marked message found. Search from the end?"
 msgstr "没有找到已标记邮件。要从尾部继续搜寻吗？"
 
-#: src/summaryview.c:1602 src/summaryview.c:1627
+#: src/summaryview.c:1610
 msgid "No marked messages."
 msgstr "没有已标记邮件"
 
-#: src/summaryview.c:1618
-msgid "No marked message found. Search from the beginning?"
-msgstr "没有找到已标记邮件。要从开头继续搜寻吗？"
+#: src/summaryview.c:1642
+msgid "No marked message found. Go to next folder?"
+msgstr "没有已标记的新邮件。要转到下一个邮件夹吗？"
 
-#: src/summaryview.c:1642 src/summaryview.c:1667
+#: src/summaryview.c:1679 src/summaryview.c:1704
 msgid "No more labeled messages"
 msgstr "没有已标记颜色之邮件"
 
-#: src/summaryview.c:1643
+#: src/summaryview.c:1680
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到已标记颜色之邮件。要从尾部继续搜寻吗？"
 
-#: src/summaryview.c:1652 src/summaryview.c:1677
+#: src/summaryview.c:1689 src/summaryview.c:1714
 msgid "No labeled messages."
 msgstr "没有已标记颜色之邮件"
 
-#: src/summaryview.c:1668
+#: src/summaryview.c:1705
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到已标记颜色之邮件。要从开头继续搜寻吗？"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1942
 msgid "Attracting messages by subject..."
 msgstr "正在按主题排列邮件邮件..."
 
-#: src/summaryview.c:2066
+#: src/summaryview.c:2103
 #, c-format
 msgid "%d deleted"
 msgstr "%d 封已删除"
 
-#: src/summaryview.c:2070
+#: src/summaryview.c:2107
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 封已移动"
 
-#: src/summaryview.c:2071 src/summaryview.c:2078
+#: src/summaryview.c:2108 src/summaryview.c:2115
 msgid ", "
 msgstr "，"
 
-#: src/summaryview.c:2076
+#: src/summaryview.c:2113
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已复制"
 
-#: src/summaryview.c:2091
+#: src/summaryview.c:2128
 msgid " item selected"
 msgstr "封已选择"
 
-#: src/summaryview.c:2093
+#: src/summaryview.c:2130
 msgid " items selected"
 msgstr "封已选择"
 
-#: src/summaryview.c:2109
+#: src/summaryview.c:2146
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封新邮件，%d 封未读，共 %d 封 (%s)"
 
-#: src/summaryview.c:2312
+#: src/summaryview.c:2349
 msgid "Sorting summary..."
 msgstr "正在对邮件进行排序..."
 
-#: src/summaryview.c:2401
+#: src/summaryview.c:2438
 msgid "Setting summary from message data..."
 msgstr "正在根据邮件数据提取摘要信息..."
 
-#: src/summaryview.c:2575
+#: src/summaryview.c:2612
 msgid "(No Date)"
 msgstr "(没有日期)"
 
-#: src/summaryview.c:2607
+#: src/summaryview.c:2650
 msgid "(No Recipient)"
 msgstr "(没有收件人)"
 
-#: src/summaryview.c:3393
+#: src/summaryview.c:3436
 msgid "You're not the author of the article.\n"
 msgstr "您不是这篇文章的作者。\n"
 
-#: src/summaryview.c:3476
+#: src/summaryview.c:3520
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:3477
+#: src/summaryview.c:3521
 msgid "Do you really want to delete selected message(s)?"
 msgstr "确定删除选定的邮件吗？"
 
-#: src/summaryview.c:3624
+#: src/summaryview.c:3669
 msgid "Destination is same as current folder."
 msgstr "目标邮件夹与当前邮件夹相同"
 
-#: src/summaryview.c:3713
+#: src/summaryview.c:3758
 msgid "Destination to copy is same as current folder."
 msgstr "目标邮件夹与来源邮件夹相同"
 
-#: src/summaryview.c:3833
+#: src/summaryview.c:3878
 msgid "Append or Overwrite"
 msgstr "附加或覆盖"
 
-#: src/summaryview.c:3834
+#: src/summaryview.c:3879
 msgid "Append or overwrite existing file?"
 msgstr "附加或覆盖文件？"
 
-#: src/summaryview.c:3835
+#: src/summaryview.c:3880
 msgid "_Append"
 msgstr "追加(_A)"
 
-#: src/summaryview.c:3835
+#: src/summaryview.c:3880
 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 
-#: src/summaryview.c:4212
+#: src/summaryview.c:4257
 msgid "Building threads..."
 msgstr "正在建立邮件线索..."
 
-#: src/summaryview.c:4417
+#: src/summaryview.c:4462
 msgid "Filtering..."
 msgstr "正在过滤邮件..."
 
-#: src/summaryview.c:4486
+#: src/summaryview.c:4532
 msgid "Processing configuration"
 msgstr "过滤处理配置"
 
-#: src/summaryview.c:5909
+#: src/summaryview.c:5958
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -9773,27 +10202,27 @@ msgstr ""
 "正则表达式(regexp)错误:\n"
 "%s"
 
-#: src/textview.c:228
+#: src/textview.c:232
 msgid "/Compose _new message"
 msgstr "/撰写新邮件(_n)"
 
-#: src/textview.c:229
+#: src/textview.c:233
 msgid "/Add to _address book"
 msgstr "/将地址加入地址簿(_a)"
 
-#: src/textview.c:230
+#: src/textview.c:234
 msgid "/Copy this add_ress"
 msgstr "/拷贝此地址(_r)"
 
-#: src/textview.c:235
+#: src/textview.c:239
 msgid "/_Open image"
 msgstr "/打开图片(_O)"
 
-#: src/textview.c:236
+#: src/textview.c:240
 msgid "/_Save image..."
 msgstr "/保存图片(_S)..."
 
-#: src/textview.c:784
+#: src/textview.c:790
 msgid ""
 "\n"
 "  This message can't be displayed.\n"
@@ -9807,94 +10236,113 @@ msgstr ""
 "\n"
 "  可用'工具'菜单中的 "
 
-#: src/textview.c:789
+#: src/textview.c:795
 msgid "'View Log'"
 msgstr "查看日志文件"
 
-#: src/textview.c:790
+#: src/textview.c:796
 msgid " in the Tools menu for more information."
 msgstr "一项了解更多信息。"
 
-#: src/textview.c:811
+#: src/textview.c:817
 msgid "  The following can be performed on this part by\n"
 msgstr "  可对该部分执行以下操作\n"
 
-#: src/textview.c:812
+#: src/textview.c:818
 msgid "  right-clicking the icon or list item:\n"
 msgstr "  右键点击图标或者列表项:\n"
 
-#: src/textview.c:814
+#: src/textview.c:820
 msgid "     - To save, select "
 msgstr "     - 若要保存，请选择"
 
-#: src/textview.c:815
+#: src/textview.c:821
 msgid "'Save as...'"
 msgstr "另存为..."
 
-#: src/textview.c:816
+#: src/textview.c:822
 msgid " (Shortcut key: 'y')\n"
 msgstr " (快捷键: 'y')\n"
 
-#: src/textview.c:817
+#: src/textview.c:823
 msgid "     - To display as text, select "
 msgstr "     - 若要以文本方式显示，请选择 "
 
-#: src/textview.c:818
+#: src/textview.c:824
 msgid "'Display as text'"
 msgstr "'以文本方式显示'"
 
-#: src/textview.c:819
+#: src/textview.c:825
 msgid " (Shortcut key: 't')\n"
 msgstr " (快捷键: 't')\n"
 
-#: src/textview.c:820
+#: src/textview.c:826
 msgid "     - To open with an external program, select "
 msgstr "    - 若要用外部程序打开，请选择"
 
-#: src/textview.c:821
+#: src/textview.c:827
 msgid "'Open'"
 msgstr "'打开'"
 
-#: src/textview.c:822
+#: src/textview.c:828
 msgid " (Shortcut key: 'l')\n"
 msgstr " (快捷键: 'l')\n"
 
-#: src/textview.c:823
+#: src/textview.c:829
 msgid "       (alternately double-click, or click the middle "
 msgstr "       (也可以双击或者点击),"
 
-#: src/textview.c:824
+#: src/textview.c:830
 msgid "mouse button)\n"
 msgstr "鼠标中键)\n"
 
-#: src/textview.c:825
+#: src/textview.c:831
 msgid "     - Or use "
 msgstr "     - 或者采用"
 
-#: src/textview.c:826
+#: src/textview.c:832
 msgid "'Open with...'"
 msgstr "'打开方式...'"
 
-#: src/textview.c:827
+#: src/textview.c:833
 msgid " (Shortcut key: 'o')\n"
 msgstr " (快捷键: 'o')\n"
 
-#: src/textview.c:2144
+#: src/textview.c:922
 #, c-format
 msgid ""
-"The real URL (%s) is different from\n"
-"the apparent URL (%s).\n"
+"The command to view attachment as text failed:\n"
+"    %s\n"
+"Exit code %d\n"
+msgstr ""
+"将附件转换为文本的命令运行出现错误:\n"
+"    %s\n"
+"程序退出码 %d\n"
+
+#: src/textview.c:2213
+#, c-format
+msgid ""
+"The real URL is different from the displayed URL.\n"
+"\n"
+"<b>Displayed URL:</b> %s\n"
+"\n"
+"<b>Real URL:</b> %s\n"
 "\n"
 "Open it anyway?"
 msgstr ""
-"真实URL (%s) 与所显示的URL (%s) 不同。\n"
+"真实URL与所显示的URL不同。\n"
+"\n"
+"<b>显示的URL:</b> %s\n"
+"\n"
+"<b>实际的URL:</b> %s\n"
+"\n"
 "真的要打开吗?"
 
-#: src/textview.c:2149
-msgid "Fake URL warning"
-msgstr "虚假URL告警"
+#: src/textview.c:2222
+msgid "Phishing attempt warning"
+msgstr "钓鱼企图警告"
 
-#: src/textview.c:2150
+#: src/textview.c:2223
 msgid "_Open URL"
 msgstr "打开(_O)"
 
@@ -10098,27 +10546,15 @@ msgstr "学习垃圾邮件"
 msgid "Learn Ham"
 msgstr "学习非垃圾邮件"
 
-#: src/toolbar.c:2091
-msgid "You're working offline. Override?"
-msgstr "您正在脱机工作。是否更改？"
-
-#: src/toolbar.c:2110
-msgid "Send queued messages"
-msgstr "送出待发送邮件"
-
-#: src/toolbar.c:2111
-msgid "Send all queued messages?"
-msgstr "送出所有待发送邮件?"
-
-#: src/wizard.c:446
+#: src/wizard.c:459
 msgid "Welcome to Sylpheed-Claws "
 msgstr "欢迎使用Sylpheed-Claws "
 
-#: src/wizard.c:455
+#: src/wizard.c:469
 msgid "Sylpheed-Claws Team"
 msgstr "Sylpheed-Claws开发组"
 
-#: src/wizard.c:461
+#: src/wizard.c:475
 #, c-format
 msgid ""
 "\n"
@@ -10198,55 +10634,55 @@ msgstr ""
 "\n"
 "\n"
 
-#: src/wizard.c:531
+#: src/wizard.c:545
 msgid "Please enter the mailbox name."
 msgstr "请输入邮箱名称。"
 
-#: src/wizard.c:559
+#: src/wizard.c:573
 msgid "Please enter your name and email address."
 msgstr "按输入您的名字和邮件地址。"
 
-#: src/wizard.c:570
+#: src/wizard.c:584
 msgid "Please enter your receiving server and username."
 msgstr "请输入收信服务器和用户名。"
 
-#: src/wizard.c:580
+#: src/wizard.c:594
 msgid "Please enter your username."
 msgstr "请输入用户名。"
 
-#: src/wizard.c:590
+#: src/wizard.c:604
 msgid "Please enter your SMTP server."
 msgstr "请输入SMTP服务器名。"
 
-#: src/wizard.c:601
+#: src/wizard.c:615
 msgid "Please enter your SMTP username."
 msgstr "请输入SMTP用户名。"
 
-#: src/wizard.c:809
+#: src/wizard.c:823
 msgid "<span weight=\"bold\">Your name:</span>"
 msgstr "<span weight=\"bold\">您的名字:</span>"
 
-#: src/wizard.c:814
+#: src/wizard.c:828
 msgid "<span weight=\"bold\">Your email address:</span>"
 msgstr "<span weight=\"bold\">您的邮件地址:</span>"
 
-#: src/wizard.c:818
+#: src/wizard.c:832
 msgid "Your organization:"
 msgstr "您所在的组织"
 
-#: src/wizard.c:838
+#: src/wizard.c:852
 msgid "<span weight=\"bold\">Mailbox name:</span>"
 msgstr "<span weight=\"bold\">邮箱名称:</span>"
 
-#: src/wizard.c:868
+#: src/wizard.c:882
 msgid "<span weight=\"bold\">SMTP server address:</span>"
 msgstr "<span weight=\"bold\">SMTP服务器名称:</span>"
 
-#: src/wizard.c:871
+#: src/wizard.c:885
 msgid "Use authentication"
 msgstr "用户鉴权"
 
-#: src/wizard.c:885
+#: src/wizard.c:899
 msgid ""
 "SMTP username:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
@@ -10254,7 +10690,7 @@ msgstr ""
 "SMTP 用户名:\n"
 "<span size=\"small\">(如果与收信用户名相同，可保持为空)</span>"
 
-#: src/wizard.c:898
+#: src/wizard.c:912
 msgid ""
 "SMTP password:\n"
 "<span size=\"small\">(empty to use the same as reception)</span>"
@@ -10262,51 +10698,51 @@ msgstr ""
 "SMTP 密码:\n"
 "<span size=\"small\">(如果与收信设置相同，可保持为空)</span>"
 
-#: src/wizard.c:925 src/wizard.c:937 src/wizard.c:1021
+#: src/wizard.c:939 src/wizard.c:951 src/wizard.c:1035
 msgid "<span weight=\"bold\">Server address:</span>"
 msgstr "<span weight=\"bold\">服务器地址:</span>"
 
-#: src/wizard.c:942
+#: src/wizard.c:956
 msgid "<span weight=\"bold\">Local mailbox:</span>"
 msgstr "<span weight=\"bold\">本地邮箱:</span>"
 
-#: src/wizard.c:982
+#: src/wizard.c:996
 msgid "IMAP"
 msgstr "IMAP"
 
-#: src/wizard.c:1013
+#: src/wizard.c:1027
 msgid "<span weight=\"bold\">Server type:</span>"
 msgstr "<span weight=\"bold\">服务器类型:</span>"
 
-#: src/wizard.c:1032
+#: src/wizard.c:1046
 msgid "<span weight=\"bold\">Username:</span>"
 msgstr "<span weight=\"bold\">用户名:</span>"
 
-#: src/wizard.c:1048
+#: src/wizard.c:1062
 msgid "Password:"
 msgstr "密码"
 
-#: src/wizard.c:1060
+#: src/wizard.c:1074
 msgid "IMAP server directory:"
 msgstr "IMAP服务器目录:"
 
-#: src/wizard.c:1084
+#: src/wizard.c:1098
 msgid "Use SSL to connect to SMTP server"
 msgstr "采用SSL连接SMTP服务器"
 
-#: src/wizard.c:1091
+#: src/wizard.c:1105
 msgid "Use SSL to connect to receiving server"
 msgstr "采用SSL连接服务器收取邮件"
 
-#: src/wizard.c:1207
+#: src/wizard.c:1221
 msgid "Sylpheed-Claws Setup Wizard"
 msgstr "Sylpheed-Claws 设置向导"
 
-#: src/wizard.c:1239
+#: src/wizard.c:1253
 msgid "Welcome to Sylpheed-Claws"
 msgstr "欢迎使用Sylpheed-Claws"
 
-#: src/wizard.c:1247
+#: src/wizard.c:1261
 msgid ""
 "Welcome to the Sylpheed-Claws setup wizard.\n"
 "\n"
@@ -10319,36 +10755,36 @@ msgstr ""
 "看来这是您第一次使用Sylpheed-Claws。所以我们需要先确定一下关于您和您的邮箱的"
 "一些基本信息，您可以在五分钟之内开始使用Sylpheed-Claws。"
 
-#: src/wizard.c:1260
+#: src/wizard.c:1274
 msgid "About You"
 msgstr "关于您"
 
-#: src/wizard.c:1262 src/wizard.c:1271 src/wizard.c:1280 src/wizard.c:1290
-#: src/wizard.c:1300
+#: src/wizard.c:1276 src/wizard.c:1285 src/wizard.c:1294 src/wizard.c:1304
+#: src/wizard.c:1314
 msgid "Bold fields must be completed"
 msgstr "粗体字段必须填写"
 
-#: src/wizard.c:1269
+#: src/wizard.c:1283
 msgid "Receiving mail"
 msgstr "接收邮件"
 
-#: src/wizard.c:1278
+#: src/wizard.c:1292
 msgid "Sending mail"
 msgstr "发送邮件"
 
-#: src/wizard.c:1288
+#: src/wizard.c:1302
 msgid "Saving mail on disk"
 msgstr "将邮件保存到磁盘"
 
-#: src/wizard.c:1298
+#: src/wizard.c:1312
 msgid "Security"
 msgstr "安全"
 
-#: src/wizard.c:1308
+#: src/wizard.c:1322
 msgid "Configuration finished"
 msgstr "设置完成"
 
-#: src/wizard.c:1316
+#: src/wizard.c:1330
 msgid ""
 "Sylpheed-Claws is now ready.\n"
 "\n"
@@ -10358,3 +10794,20 @@ msgstr ""
 "\n"
 "点击[保存]开始使用。"
 
+#~ msgid "Sylpheed - Message View"
+#~ msgstr "Sylpheed - 邮件"
+
+#~ msgid "Add Date"
+#~ msgstr "添加日期"
+
+#~ msgid "insert file"
+#~ msgstr "插入文件"
+
+#~ msgid "insert program output"
+#~ msgstr "插入程序输出"
+
+#~ msgid "No marked message found. Search from the beginning?"
+#~ msgstr "没有找到已标记邮件。要从开头继续搜寻吗？"
+
+#~ msgid "Fake URL warning"
+#~ msgstr "虚假URL告警"