2005-11-02 [paul] 1.9.99cvs3

[claws.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dcb8086d4ca0c03c050fe42dd18714c1e285e24e..9958fe91bee4ba125df6c973d38934f250488782 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claw\n"
 "Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"
 msgstr ""
 "Project-Id-Version: sylpheed-claw\n"
 "Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"

-"POT-Creation-Date: 2005-10-02 06:24+0100\n"
-"PO-Revision-Date: 2005-10-02 22:58中国标准时间\n"
+"POT-Creation-Date: 2005-10-30 17:54+0000\n"
+"PO-Revision-Date: 2005-10-31 10:19中国标准时间\n"

 "Last-Translator: Ralgh Young <glyoung@users.sourceforge.net>\n"
 "Language-Team: Ralgh Young <glyoung@users.sourceforge.net> \n"
 "MIME-Version: 1.0\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"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 

-#: src/account.c:369
+#: src/account.c:371

 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."


@@ -25,15 +25,15 @@ msgstr ""
 "您正在撰写邮件，\n"
 "请关掉所有撰写中的邮件再进行帐号设置。"
 
 "您正在撰写邮件，\n"
 "请关掉所有撰写中的邮件再进行帐号设置。"
 

-#: src/account.c:416
+#: src/account.c:418

 msgid "Can't create folder."
 msgstr "无法创建邮件夹。"
 
 msgid "Can't create folder."
 msgstr "无法创建邮件夹。"
 

-#: src/account.c:629
+#: src/account.c:643

 msgid "Edit accounts"
 msgstr "编辑帐号设置"
 
 msgid "Edit accounts"
 msgstr "编辑帐号设置"
 

-#: src/account.c:647
+#: src/account.c:661

 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the 'G' column to enable message retrieval by 'Get all'."
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the 'G' column to enable message retrieval by 'Get all'."


@@ -41,47 +41,47 @@ msgstr ""
 "检查新邮件时将会依照下面的顺序。您可以勾选 G 栏位中的方块，\n"
 "来决定是否在「全部收取」时要检查该帐号的邮件。"
 
 "检查新邮件时将会依照下面的顺序。您可以勾选 G 栏位中的方块，\n"
 "来决定是否在「全部收取」时要检查该帐号的邮件。"
 

-#: src/account.c:722
+#: src/account.c:736

 msgid " _Set as default account "
 msgstr " 设为缺省帐号(_S) "
 
 msgid " _Set as default account "
 msgstr " 设为缺省帐号(_S) "
 

-#: src/account.c:799
+#: src/account.c:826

 msgid "Accounts with remote folders cannot be copied."
 msgstr "不能克隆有远程邮件夹的帐户。"
 
 #. copy fields
 msgid "Accounts with remote folders cannot be copied."
 msgstr "不能克隆有远程邮件夹的帐户。"
 
 #. copy fields

-#: src/account.c:805
+#: src/account.c:832

 #, c-format
 msgid "Copy of %s"
 msgstr "%s 副本"
 
 #, c-format
 msgid "Copy of %s"
 msgstr "%s 副本"
 

-#: src/account.c:944
+#: src/account.c:971

 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "您确定要删除帐号 '%s' 吗？"
 
 #, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "您确定要删除帐号 '%s' 吗？"
 

-#: src/account.c:946
+#: src/account.c:973

 msgid "(Untitled)"
 msgstr "(未命名)"
 
 msgid "(Untitled)"
 msgstr "(未命名)"
 

-#: src/account.c:947
+#: src/account.c:974

 msgid "Delete account"
 msgstr "删除帐号"
 
 msgid "Delete account"
 msgstr "删除帐号"
 

-#: src/account.c:1388 src/addressadd.c:185 src/addressbook.c:722
-#: src/compose.c:4862 src/compose.c:5073 src/editaddress.c:928
-#: src/editaddress.c:977 src/editbook.c:175 src/editgroup.c:279
+#: src/account.c:1415 src/addressadd.c:185 src/addressbook.c:737
+#: src/compose.c:5007 src/compose.c:5218 src/editaddress.c:953
+#: src/editaddress.c:1002 src/editbook.c:175 src/editgroup.c:279

 #: src/editjpilot.c:270 src/editldap.c:398 src/editvcard.c:183
 #: src/editjpilot.c:270 src/editldap.c:398 src/editvcard.c:183

-#: src/importmutt.c:227 src/importpine.c:227 src/mimeview.c:198
-#: src/plugins/pgpcore/select-keys.c:332 src/prefs_filtering.c:1230
+#: src/importmutt.c:227 src/importpine.c:227 src/mimeview.c:199
+#: src/plugins/pgpcore/select-keys.c:332 src/prefs_filtering.c:1255

 msgid "Name"
 msgstr "名称"
 
 msgid "Name"
 msgstr "名称"
 

-#: src/account.c:1395 src/prefs_account.c:1145
+#: src/account.c:1422 src/prefs_account.c:1161

 msgid "Protocol"
 msgstr "通讯协议"
 
 msgid "Protocol"
 msgstr "通讯协议"
 

-#: src/account.c:1402 src/ssl_manager.c:98
+#: src/account.c:1429 src/ssl_manager.c:98

 msgid "Server"
 msgstr "服务器"
 
 msgid "Server"
 msgstr "服务器"
 


@@ -98,7 +98,7 @@ msgstr "无法读取邮件内容"
 msgid "Can't get part of multipart message"
 msgstr "无法读取符合邮件的一部分。"
 
 msgid "Can't get part of multipart message"
 msgstr "无法读取符合邮件的一部分。"
 

-#: src/action.c:509
+#: src/action.c:510

 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"


@@ -107,7 +107,7 @@ msgstr ""
 "被选择的动作不能用于邮件撰写窗口\n"
 "因其包含 %%f, %%F, %%as或者%%p。"
 
 "被选择的动作不能用于邮件撰写窗口\n"
 "因其包含 %%f, %%F, %%as或者%%p。"
 

-#: src/action.c:785
+#: src/action.c:786

 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"
 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"


@@ -117,7 +117,7 @@ msgstr ""
 "%s"
 
 #. Fork error
 "%s"
 
 #. Fork error

-#: src/action.c:880
+#: src/action.c:881

 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"


@@ -128,25 +128,25 @@ msgstr ""
 "%s\n"
 "%s"
 
 "%s\n"
 "%s"
 

-#: src/action.c:1090 src/action.c:1240
+#: src/action.c:1091 src/action.c:1241

 msgid "Completed"
 msgstr "已完成"
 
 msgid "Completed"
 msgstr "已完成"
 

-#: src/action.c:1126
+#: src/action.c:1127

 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 正在运行: %s\n"
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- 正在运行: %s\n"
 

-#: src/action.c:1130
+#: src/action.c:1131

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 已经结束: %s\n"
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- 已经结束: %s\n"
 

-#: src/action.c:1163
+#: src/action.c:1164

 msgid "Action's input/output"
 msgstr "动作输入/输出"
 
 msgid "Action's input/output"
 msgstr "动作输入/输出"
 

-#: src/action.c:1430
+#: src/action.c:1431

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -157,11 +157,11 @@ msgstr ""
 "(`%%h' 将被所输入的参数替换)\n"
 "  %s"
 
 "(`%%h' 将被所输入的参数替换)\n"
 "  %s"
 

-#: src/action.c:1435
+#: src/action.c:1436

 msgid "Action's hidden user argument"
 msgstr "用户提供的参数(输入时不回显)"
 
 msgid "Action's hidden user argument"
 msgstr "用户提供的参数(输入时不回显)"
 

-#: src/action.c:1439
+#: src/action.c:1440

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -172,7 +172,7 @@ msgstr ""
 "(`%%u' 将被输入的参数替换)\n"
 "  %s"
 
 "(`%%u' 将被输入的参数替换)\n"
 "  %s"
 

-#: src/action.c:1444
+#: src/action.c:1445

 msgid "Action's user argument"
 msgstr "用户提供的参数"
 
 msgid "Action's user argument"
 msgstr "用户提供的参数"
 


@@ -181,12 +181,12 @@ msgid "Add to address book"
 msgstr "将地址加入地址簿"
 
 #: src/addressadd.c:197 src/plugins/pgpcore/select-keys.c:333
 msgstr "将地址加入地址簿"
 
 #: src/addressadd.c:197 src/plugins/pgpcore/select-keys.c:333

-#: src/toolbar.c:448
+#: src/toolbar.c:441

 msgid "Address"
 msgstr "地址"
 
 msgid "Address"
 msgstr "地址"
 

-#: src/addressadd.c:207 src/addressbook.c:724 src/editaddress.c:736
-#: src/editaddress.c:800 src/editgroup.c:281
+#: src/addressadd.c:207 src/addressbook.c:739 src/editaddress.c:761
+#: src/editaddress.c:825 src/editgroup.c:281

 msgid "Remarks"
 msgstr "备注"
 
 msgid "Remarks"
 msgstr "备注"
 


@@ -194,336 +194,337 @@ msgstr "备注"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿资料夹"
 
 msgid "Select Address Book Folder"
 msgstr "选择地址簿资料夹"
 

-#: src/addressbook.c:402
+#: src/addressbook.c:403

 msgid "/_Book"
 msgstr "/地址簿(_B)"
 
 msgid "/_Book"
 msgstr "/地址簿(_B)"
 

-#: src/addressbook.c:403
+#: src/addressbook.c:404

 msgid "/_Book/New _Book"
 msgstr "/地址簿(_B)/新增地址簿(_B)"
 
 msgid "/_Book/New _Book"
 msgstr "/地址簿(_B)/新增地址簿(_B)"
 

-#: src/addressbook.c:404
+#: src/addressbook.c:405

 msgid "/_Book/New _Folder"
 msgstr "/地址簿(_B)/新资料夹(_F)"
 
 msgid "/_Book/New _Folder"
 msgstr "/地址簿(_B)/新资料夹(_F)"
 

-#: src/addressbook.c:405
+#: src/addressbook.c:406

 msgid "/_Book/New _vCard"
 msgstr "/地址簿(_B)/新增_vCard"
 
 msgid "/_Book/New _vCard"
 msgstr "/地址簿(_B)/新增_vCard"
 

-#: src/addressbook.c:407
+#: src/addressbook.c:408

 msgid "/_Book/New _JPilot"
 msgstr "/地址簿(_B)/新增_J-Pilot"
 
 msgid "/_Book/New _JPilot"
 msgstr "/地址簿(_B)/新增_J-Pilot"
 

-#: src/addressbook.c:410
+#: src/addressbook.c:411

 msgid "/_Book/New _Server"
 msgstr "/地址簿(_B)/新增服务器(_S)"
 
 msgid "/_Book/New _Server"
 msgstr "/地址簿(_B)/新增服务器(_S)"
 

-#: src/addressbook.c:412 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:416

 msgid "/_Book/---"
 msgstr "/地址簿(_B)/---"
 
 msgid "/_Book/---"
 msgstr "/地址簿(_B)/---"
 

-#: src/addressbook.c:413
+#: src/addressbook.c:414

 msgid "/_Book/_Edit book"
 msgstr "/地址簿(_B)/编辑地址簿(_E)"
 
 msgid "/_Book/_Edit book"
 msgstr "/地址簿(_B)/编辑地址簿(_E)"
 

-#: src/addressbook.c:414
+#: src/addressbook.c:415

 msgid "/_Book/_Delete book"
 msgstr "/地址簿(_B)/删除地址簿(_D)"
 
 msgid "/_Book/_Delete book"
 msgstr "/地址簿(_B)/删除地址簿(_D)"
 

-#: src/addressbook.c:416
+#: src/addressbook.c:417

 msgid "/_Book/_Save"
 msgstr "/地址簿(_B)/保存(_S)"
 
 msgid "/_Book/_Save"
 msgstr "/地址簿(_B)/保存(_S)"
 

-#: src/addressbook.c:417
+#: src/addressbook.c:418

 msgid "/_Book/_Close"
 msgstr "/地址簿(_B)/关闭(_C)"
 
 msgid "/_Book/_Close"
 msgstr "/地址簿(_B)/关闭(_C)"
 

-#: src/addressbook.c:418
+#: src/addressbook.c:419

 msgid "/_Address"
 msgstr "/地址(_A)"
 
 msgid "/_Address"
 msgstr "/地址(_A)"
 

-#: src/addressbook.c:419
+#: src/addressbook.c:420

 msgid "/_Address/C_ut"
 msgstr "/地址(_A)/剪切(_u)"
 
 msgid "/_Address/C_ut"
 msgstr "/地址(_A)/剪切(_u)"
 

-#: src/addressbook.c:420
+#: src/addressbook.c:421

 msgid "/_Address/_Copy"
 msgstr "/地址(_A)/拷贝(_C)"
 
 msgid "/_Address/_Copy"
 msgstr "/地址(_A)/拷贝(_C)"
 

-#: src/addressbook.c:421
+#: src/addressbook.c:422

 msgid "/_Address/_Paste"
 msgstr "/地址(_A)/删除(_P)"
 
 msgid "/_Address/_Paste"
 msgstr "/地址(_A)/删除(_P)"
 

-#: src/addressbook.c:422 src/addressbook.c:425 src/addressbook.c:428
+#: src/addressbook.c:423 src/addressbook.c:426 src/addressbook.c:429

 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 

-#: src/addressbook.c:423
+#: src/addressbook.c:424

 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 

-#: src/addressbook.c:424
+#: src/addressbook.c:425

 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 

-#: src/addressbook.c:426
+#: src/addressbook.c:427

 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 

-#: src/addressbook.c:427
+#: src/addressbook.c:428

 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群组(_G)"
 
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群组(_G)"
 

-#: src/addressbook.c:429
+#: src/addressbook.c:430

 msgid "/_Address/_Mail To"
 msgstr "/地址(_A)/发送邮件(_M)"
 
 msgid "/_Address/_Mail To"
 msgstr "/地址(_A)/发送邮件(_M)"
 

-#: src/addressbook.c:430 src/compose.c:734 src/mainwindow.c:714
+#: src/addressbook.c:431 src/compose.c:735 src/mainwindow.c:717

 #: src/messageview.c:291
 msgid "/_Tools"
 msgstr "工具(_T)"
 
 #: src/messageview.c:291
 msgid "/_Tools"
 msgstr "工具(_T)"
 

-#: src/addressbook.c:431
+#: src/addressbook.c:432

 msgid "/_Tools/Import _LDIF file..."
 msgstr "/工具(_T)/导入 _LDIF 文件..."
 
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/工具(_T)/导入 _LDIF 文件..."
 

-#: src/addressbook.c:432
+#: src/addressbook.c:433

 msgid "/_Tools/Import M_utt file..."
 msgstr "/工具(_T)/导入 M_utt 文件..."
 
 msgid "/_Tools/Import M_utt file..."
 msgstr "/工具(_T)/导入 M_utt 文件..."
 

-#: src/addressbook.c:433
+#: src/addressbook.c:434

 msgid "/_Tools/Import _Pine file..."
 msgstr "/工具(_T)/导入 _Pine 文件..."
 
 msgid "/_Tools/Import _Pine file..."
 msgstr "/工具(_T)/导入 _Pine 文件..."
 

-#: src/addressbook.c:434 src/mainwindow.c:723 src/mainwindow.c:746
-#: src/mainwindow.c:748 src/mainwindow.c:757 src/mainwindow.c:760
-#: src/mainwindow.c:764 src/messageview.c:295 src/messageview.c:316
+#: src/addressbook.c:435 src/mainwindow.c:726 src/mainwindow.c:749
+#: src/mainwindow.c:751 src/mainwindow.c:760 src/mainwindow.c:763
+#: src/mainwindow.c:767 src/messageview.c:295 src/messageview.c:316

 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 

-#: src/addressbook.c:435
+#: src/addressbook.c:436

 msgid "/_Tools/Export _HTML..."
 msgstr "/工具(_T)/导出为 _HTML..."
 
 msgid "/_Tools/Export _HTML..."
 msgstr "/工具(_T)/导出为 _HTML..."
 

-#: src/addressbook.c:436
+#: src/addressbook.c:437

 msgid "/_Tools/Export LDI_F..."
 msgstr "/工具(_T)/导出为 LDI_F..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/工具(_T)/导出为 LDI_F..."
 

-#: src/addressbook.c:437 src/compose.c:739 src/mainwindow.c:789
+#: src/addressbook.c:438 src/compose.c:740 src/mainwindow.c:792

 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
 #: src/messageview.c:319
 msgid "/_Help"
 msgstr "/帮助(_H)"
 

-#: src/addressbook.c:438 src/compose.c:740 src/mainwindow.c:795
+#: src/addressbook.c:439 src/compose.c:741 src/mainwindow.c:798

 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
 #: src/messageview.c:320
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 

-#: src/addressbook.c:443 src/addressbook.c:455 src/compose.c:525
-#: src/mainwindow.c:471 src/messageview.c:162
+#: src/addressbook.c:444 src/addressbook.c:456 src/compose.c:525
+#: src/mainwindow.c:472 src/messageview.c:162

 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 

-#: src/addressbook.c:444 src/addressbook.c:456
+#: src/addressbook.c:445 src/addressbook.c:457

 msgid "/_Delete"
 msgstr "/删除(_D)"
 
 msgid "/_Delete"
 msgstr "/删除(_D)"
 

-#: src/addressbook.c:445 src/addressbook.c:447 src/addressbook.c:457
-#: src/addressbook.c:460 src/addressbook.c:464 src/compose.c:504
-#: src/imap_gtk.c:61 src/imap_gtk.c:64 src/imap_gtk.c:67 src/imap_gtk.c:70
-#: src/mh_gtk.c:54 src/mh_gtk.c:57 src/mh_gtk.c:59 src/news_gtk.c:55
-#: src/news_gtk.c:58 src/news_gtk.c:60 src/news_gtk.c:63
-#: src/plugins/trayicon/trayicon.c:93 src/plugins/trayicon/trayicon.c:96
-#: src/summaryview.c:404 src/summaryview.c:407 src/summaryview.c:413
-#: src/summaryview.c:427 src/summaryview.c:429 src/summaryview.c:450
+#: src/addressbook.c:446 src/addressbook.c:448 src/addressbook.c:458
+#: src/addressbook.c:461 src/addressbook.c:465 src/compose.c:504
+#: 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:53 src/news_gtk.c:56
+#: src/news_gtk.c:58 src/plugins/trayicon/trayicon.c:96
+#: src/plugins/trayicon/trayicon.c:99 src/plugins/trayicon/trayicon.c:101
+#: src/summaryview.c:407 src/summaryview.c:411 src/summaryview.c:416
+#: src/summaryview.c:430 src/summaryview.c:451 src/summaryview.c:457

 msgid "/---"
 msgstr "/---"
 
 msgid "/---"
 msgstr "/---"
 

-#: src/addressbook.c:446
+#: src/addressbook.c:447

 msgid "/New _Folder"
 msgstr "/新资料夹(_F)"
 
 msgid "/New _Folder"
 msgstr "/新资料夹(_F)"
 

-#: src/addressbook.c:448 src/addressbook.c:461
+#: src/addressbook.c:449 src/addressbook.c:462

 msgid "/C_ut"
 msgstr "/剪切(_u)"
 
 msgid "/C_ut"
 msgstr "/剪切(_u)"
 

-#: src/addressbook.c:449 src/addressbook.c:462
+#: src/addressbook.c:450 src/addressbook.c:463

 msgid "/_Copy"
 msgstr "/复制(_C)"
 
 msgid "/_Copy"
 msgstr "/复制(_C)"
 

-#: src/addressbook.c:450 src/addressbook.c:463
+#: src/addressbook.c:451 src/addressbook.c:464

 msgid "/_Paste"
 msgstr "/粘贴(_P)"
 
 msgid "/_Paste"
 msgstr "/粘贴(_P)"
 

-#: src/addressbook.c:458
+#: src/addressbook.c:459

 msgid "/New _Address"
 msgstr "/新地址(_A)"
 
 msgid "/New _Address"
 msgstr "/新地址(_A)"
 

-#: src/addressbook.c:459
+#: src/addressbook.c:460

 msgid "/New _Group"
 msgstr "/新群组(_G)"
 
 #. {N_("/Pa_ste Address"),     NULL, addressbook_clip_paste_address_cb, 0, NULL},
 msgid "/New _Group"
 msgstr "/新群组(_G)"
 
 #. {N_("/Pa_ste Address"),     NULL, addressbook_clip_paste_address_cb, 0, NULL},

-#: src/addressbook.c:466
+#: src/addressbook.c:467

 msgid "/_Mail To"
 msgstr "/发送邮件(_M)"
 
 msgid "/_Mail To"
 msgstr "/发送邮件(_M)"
 

-#: src/addressbook.c:468
+#: src/addressbook.c:469

 msgid "/_Browse Entry"
 msgstr "/查看项目(_B)"
 
 msgid "/_Browse Entry"
 msgstr "/查看项目(_B)"
 

-#: src/addressbook.c:481 src/crash.c:439 src/crash.c:458 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:112 src/prefs_themes.c:661
-#: src/prefs_themes.c:693 src/prefs_themes.c:694
+#: src/addressbook.c:482 src/crash.c:443 src/crash.c:462 src/importldif.c:119
+#: src/plugins/pgpcore/sgpgme.c:111 src/prefs_themes.c:688
+#: src/prefs_themes.c:720 src/prefs_themes.c:721

 msgid "Unknown"
 msgstr "未知"
 
 msgid "Unknown"
 msgstr "未知"
 

-#: src/addressbook.c:488 src/addressbook.c:507 src/importldif.c:126
+#: src/addressbook.c:489 src/addressbook.c:508 src/importldif.c:126

 msgid "Success"
 msgstr "成功"
 
 msgid "Success"
 msgstr "成功"
 

-#: src/addressbook.c:489 src/importldif.c:127
+#: src/addressbook.c:490 src/importldif.c:127

 msgid "Bad arguments"
 msgstr "错误的参数"
 
 msgid "Bad arguments"
 msgstr "错误的参数"
 

-#: src/addressbook.c:490 src/importldif.c:128
+#: src/addressbook.c:491 src/importldif.c:128

 msgid "File not specified"
 msgstr "未指定文件"
 
 msgid "File not specified"
 msgstr "未指定文件"
 

-#: src/addressbook.c:491 src/importldif.c:129
+#: src/addressbook.c:492 src/importldif.c:129

 msgid "Error opening file"
 msgstr "打开文件错误"
 
 msgid "Error opening file"
 msgstr "打开文件错误"
 

-#: src/addressbook.c:492 src/importldif.c:130
+#: src/addressbook.c:493 src/importldif.c:130

 msgid "Error reading file"
 msgstr "读取文件错误"
 
 msgid "Error reading file"
 msgstr "读取文件错误"
 

-#: src/addressbook.c:493 src/importldif.c:131
+#: src/addressbook.c:494 src/importldif.c:131

 msgid "End of file encountered"
 msgstr "遇到文件末尾"
 
 msgid "End of file encountered"
 msgstr "遇到文件末尾"
 

-#: src/addressbook.c:494 src/importldif.c:132
+#: src/addressbook.c:495 src/importldif.c:132

 msgid "Error allocating memory"
 msgstr "内存分配错误"
 
 msgid "Error allocating memory"
 msgstr "内存分配错误"
 

-#: src/addressbook.c:495 src/importldif.c:133
+#: src/addressbook.c:496 src/importldif.c:133

 msgid "Bad file format"
 msgstr "文件格式错误"
 
 msgid "Bad file format"
 msgstr "文件格式错误"
 

-#: src/addressbook.c:496 src/importldif.c:134
+#: src/addressbook.c:497 src/importldif.c:134

 msgid "Error writing to file"
 msgstr "文件写入错误"
 
 msgid "Error writing to file"
 msgstr "文件写入错误"
 

-#: src/addressbook.c:497 src/importldif.c:135
+#: src/addressbook.c:498 src/importldif.c:135

 msgid "Error opening directory"
 msgstr "打开目录错误"
 
 msgid "Error opening directory"
 msgstr "打开目录错误"
 

-#: src/addressbook.c:498 src/importldif.c:136
+#: src/addressbook.c:499 src/importldif.c:136

 msgid "No path specified"
 msgstr "未指定文件路径"
 
 msgid "No path specified"
 msgstr "未指定文件路径"
 

-#: src/addressbook.c:508
+#: src/addressbook.c:509

 msgid "Error connecting to LDAP server"
 msgstr "LDAP 服务器连接错误"
 
 msgid "Error connecting to LDAP server"
 msgstr "LDAP 服务器连接错误"
 

-#: src/addressbook.c:509
+#: src/addressbook.c:510

 msgid "Error initializing LDAP"
 msgstr "LDAP 起始错误"
 
 msgid "Error initializing LDAP"
 msgstr "LDAP 起始错误"
 

-#: src/addressbook.c:510
+#: src/addressbook.c:511

 msgid "Error binding to LDAP server"
 msgstr "无法连接到LDAP服务器"
 
 msgid "Error binding to LDAP server"
 msgstr "无法连接到LDAP服务器"
 

-#: src/addressbook.c:511
+#: src/addressbook.c:512

 msgid "Error searching LDAP database"
 msgstr "搜寻LDAP资料库时出错"
 
 msgid "Error searching LDAP database"
 msgstr "搜寻LDAP资料库时出错"
 

-#: src/addressbook.c:512
+#: src/addressbook.c:513

 msgid "Timeout performing LDAP operation"
 msgstr "进行LDAP操作时超时"
 
 msgid "Timeout performing LDAP operation"
 msgstr "进行LDAP操作时超时"
 

-#: src/addressbook.c:513
+#: src/addressbook.c:514

 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜寻标准错误"
 
 msgid "Error in LDAP search criteria"
 msgstr "LDAP搜寻标准错误"
 

-#: src/addressbook.c:514
+#: src/addressbook.c:515

 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP搜寻没有结果"
 
 msgid "No LDAP entries found for search criteria"
 msgstr "LDAP搜寻没有结果"
 

-#: src/addressbook.c:515
+#: src/addressbook.c:516

 msgid "LDAP search terminated on request"
 msgstr "LDAP已按请求终止"
 
 msgid "LDAP search terminated on request"
 msgstr "LDAP已按请求终止"
 

-#: src/addressbook.c:516
+#: src/addressbook.c:517

 msgid "Error starting TLS connection"
 msgstr "创建TLS链接时发生错误"
 
 msgid "Error starting TLS connection"
 msgstr "创建TLS链接时发生错误"
 

-#: src/addressbook.c:721
+#: src/addressbook.c:736

 #, fuzzy
 msgid "Sources"
 #, fuzzy
 msgid "Sources"

-msgstr "æ\88\90å\8a\9f"
+msgstr "æ\9d¥æº\90"

 
 

-#: src/addressbook.c:723
+#: src/addressbook.c:738

 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 

-#: src/addressbook.c:728 src/prefs_other.c:97 src/toolbar.c:186
-#: src/toolbar.c:1622
+#: src/addressbook.c:743 src/prefs_other.c:97 src/toolbar.c:186
+#: src/toolbar.c:1615

 msgid "Address book"
 msgstr "地址簿"
 
 msgid "Address book"
 msgstr "地址簿"
 

-#: src/addressbook.c:844
+#: src/addressbook.c:860

 msgid "Lookup name:"
 msgstr "查找姓名:"
 
 msgid "Lookup name:"
 msgstr "查找姓名:"
 

-#: src/addressbook.c:906 src/compose.c:1694 src/compose.c:3575
-#: src/compose.c:4719 src/compose.c:5388 src/headerview.c:53
-#: src/prefs_template.c:190 src/summary_search.c:218
+#: src/addressbook.c:923 src/compose.c:1739 src/compose.c:3716
+#: src/compose.c:4864 src/compose.c:5533 src/headerview.c:53
+#: src/prefs_template.c:204 src/summary_search.c:218

 msgid "To:"
 msgstr "To:"
 
 msgid "To:"
 msgstr "To:"
 

-#: src/addressbook.c:910 src/compose.c:1678 src/compose.c:3574
-#: src/prefs_template.c:192
+#: src/addressbook.c:927 src/compose.c:1723 src/compose.c:3530
+#: src/compose.c:3715 src/prefs_template.c:206

 msgid "Cc:"
 msgstr "Cc:"
 
 msgid "Cc:"
 msgstr "Cc:"
 

-#: src/addressbook.c:914 src/compose.c:1681 src/prefs_template.c:193
+#: src/addressbook.c:931 src/compose.c:1726 src/compose.c:3558
+#: src/prefs_template.c:207

 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Confirm deletion

-#: src/addressbook.c:1135 src/addressbook.c:1158
+#: src/addressbook.c:1163 src/addressbook.c:1186

 msgid "Delete address(es)"
 msgstr "删除邮件地址"
 
 msgid "Delete address(es)"
 msgstr "删除邮件地址"
 

-#: src/addressbook.c:1136
+#: src/addressbook.c:1164

 msgid "This address data is readonly and cannot be deleted."
 msgstr "此邮件地址数据是只读的，不能删除。"
 
 msgid "This address data is readonly and cannot be deleted."
 msgstr "此邮件地址数据是只读的，不能删除。"
 

-#: src/addressbook.c:1159
+#: src/addressbook.c:1187

 msgid "Really delete the address(es)?"
 msgstr "确定删除邮件地址?"
 
 msgid "Really delete the address(es)?"
 msgstr "确定删除邮件地址?"
 

-#: src/addressbook.c:1728 src/addressbook.c:1802
+#: src/addressbook.c:1763 src/addressbook.c:1837

 msgid "Cannot paste. Target address book is readonly."
 msgstr "无法粘贴，该地址簿已设为只读。"
 
 msgid "Cannot paste. Target address book is readonly."
 msgstr "无法粘贴，该地址簿已设为只读。"
 

-#: src/addressbook.c:1739
+#: src/addressbook.c:1774

 msgid "Cannot paste into an address group."
 msgstr "无法贴入指定的通讯群组。"
 
 # c-format
 msgid "Cannot paste into an address group."
 msgstr "无法贴入指定的通讯群组。"
 
 # c-format

-#: src/addressbook.c:2448
+#: src/addressbook.c:2479

 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "您想要删除'%s'里面的查询结果和地址信息吗?"
 
 #, c-format
 msgid "Do you want to delete the query results and addresses in '%s' ?"
 msgstr "您想要删除'%s'里面的查询结果和地址信息吗?"
 

-#: src/addressbook.c:2451 src/addressbook.c:2477
+#: src/addressbook.c:2482 src/addressbook.c:2508

 #: src/prefs_filtering_action.c:151
 msgid "Delete"
 msgstr "删除"
 
 #: src/prefs_filtering_action.c:151
 msgid "Delete"
 msgstr "删除"
 

-#: src/addressbook.c:2460
+#: src/addressbook.c:2491

 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in '%s' ?\n"
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in '%s' ?\n"


@@ -532,36 +533,36 @@ msgstr ""
 "您确定要删除'%s'这个资料夹以及里面所有的地址吗？ \n"
 "如果只删除资料夹，地址簿会被移到上一层的资料夹中。"
 
 "您确定要删除'%s'这个资料夹以及里面所有的地址吗？ \n"
 "如果只删除资料夹，地址簿会被移到上一层的资料夹中。"
 

-#: src/addressbook.c:2463 src/imap_gtk.c:328 src/mh_gtk.c:177
+#: src/addressbook.c:2494 src/imap_gtk.c:268 src/mh_gtk.c:179

 msgid "Delete folder"
 msgstr "删除邮件夹"
 
 msgid "Delete folder"
 msgstr "删除邮件夹"
 

-#: src/addressbook.c:2464
+#: src/addressbook.c:2495

 msgid "_Folder only"
 msgstr "只删除资料夹(_F)"
 
 msgid "_Folder only"
 msgstr "只删除资料夹(_F)"
 

-#: src/addressbook.c:2464
+#: src/addressbook.c:2495

 msgid "Folder and _addresses"
 msgstr "资料夹及地址数据"
 
 msgid "Folder and _addresses"
 msgstr "资料夹及地址数据"
 

-#: src/addressbook.c:2476
+#: src/addressbook.c:2507

 #, c-format
 msgid "Really delete '%s' ?"
 msgstr "确定要删除 '%s' ?"
 
 #, c-format
 msgid "Really delete '%s' ?"
 msgstr "确定要删除 '%s' ?"
 

-#: src/addressbook.c:3272
+#: src/addressbook.c:3308

 msgid "New user, could not save index file."
 msgstr "新用户，无法保存索引文件。"
 
 msgid "New user, could not save index file."
 msgstr "新用户，无法保存索引文件。"
 

-#: src/addressbook.c:3276
+#: src/addressbook.c:3312

 msgid "New user, could not save address book files."
 msgstr "新用户，无法保存地址簿文件。"
 
 msgid "New user, could not save address book files."
 msgstr "新用户，无法保存地址簿文件。"
 

-#: src/addressbook.c:3286
+#: src/addressbook.c:3322

 msgid "Old address book converted successfully."
 msgstr "转换旧地址簿格式完成。"
 
 msgid "Old address book converted successfully."
 msgstr "转换旧地址簿格式完成。"
 

-#: src/addressbook.c:3291
+#: src/addressbook.c:3327

 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"


@@ -569,7 +570,7 @@ msgstr ""
 "旧地址簿格式已转换，\n"
 "但无法保存新的索引文件。"
 
 "旧地址簿格式已转换，\n"
 "但无法保存新的索引文件。"
 

-#: src/addressbook.c:3304
+#: src/addressbook.c:3340

 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."


@@ -577,7 +578,7 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "但空的新地址簿文件已经生成。"
 
 "无法转换地址簿格式，\n"
 "但空的新地址簿文件已经生成。"
 

-#: src/addressbook.c:3310
+#: src/addressbook.c:3346

 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."


@@ -585,7 +586,7 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "无法产生新的地址簿文件。"
 
 "无法转换地址簿格式，\n"
 "无法产生新的地址簿文件。"
 

-#: src/addressbook.c:3315
+#: src/addressbook.c:3351

 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."


@@ -593,15 +594,15 @@ msgstr ""
 "无法转换地址簿格式，\n"
 "亦无法产生新的地址簿文件。"
 
 "无法转换地址簿格式，\n"
 "亦无法产生新的地址簿文件。"
 

-#: src/addressbook.c:3322 src/addressbook.c:3328
+#: src/addressbook.c:3358 src/addressbook.c:3364

 msgid "Addressbook conversion error"
 msgstr "转换地址簿格式时发生错误"
 
 msgid "Addressbook conversion error"
 msgstr "转换地址簿格式时发生错误"
 

-#: src/addressbook.c:3366
+#: src/addressbook.c:3402

 msgid "Addressbook Error"
 msgstr "地址簿发生错误"
 
 msgid "Addressbook Error"
 msgstr "地址簿发生错误"
 

-#: src/addressbook.c:3367
+#: src/addressbook.c:3403

 msgid "Could not read address index"
 msgstr "无法读取地址簿索引"
 
 msgid "Could not read address index"
 msgstr "无法读取地址簿索引"
 


@@ -609,7 +610,7 @@ msgstr "无法读取地址簿索引"
 #. * Message that is displayed whilst a query is executing in a background
 #. * thread.
 #.
 #. * Message that is displayed whilst a query is executing in a background
 #. * thread.
 #.

-#: src/addressbook.c:3726
+#: src/addressbook.c:3762

 msgid "Busy searching..."
 msgstr "正在搜索..."
 
 msgid "Busy searching..."
 msgstr "正在搜索..."
 


@@ -617,51 +618,51 @@ msgstr "正在搜索..."
 #. *
 #. * Label (a format string) that is used to name each folder.
 #.
 #. *
 #. * Label (a format string) that is used to name each folder.
 #.

-#: src/addressbook.c:3797
+#: src/addressbook.c:3833

 #, c-format
 msgid "Search '%s'"
 msgstr "搜索 '%s'"
 
 #, c-format
 msgid "Search '%s'"
 msgstr "搜索 '%s'"
 

-#: src/addressbook.c:4022
+#: src/addressbook.c:4058

 msgid "Interface"
 msgstr "界面"
 
 msgid "Interface"
 msgstr "界面"
 

-#: src/addressbook.c:4038 src/exphtmldlg.c:382 src/expldifdlg.c:394
+#: src/addressbook.c:4074 src/exphtmldlg.c:382 src/expldifdlg.c:394

 #: src/exporthtml.c:1011 src/importldif.c:651
 msgid "Address Book"
 msgstr "地址簿"
 
 #: src/exporthtml.c:1011 src/importldif.c:651
 msgid "Address Book"
 msgstr "地址簿"
 

-#: src/addressbook.c:4054
+#: src/addressbook.c:4090

 msgid "Person"
 msgstr "人名"
 
 msgid "Person"
 msgstr "人名"
 

-#: src/addressbook.c:4070
+#: src/addressbook.c:4106

 msgid "EMail Address"
 msgstr "电子邮件邮箱"
 
 msgid "EMail Address"
 msgstr "电子邮件邮箱"
 

-#: src/addressbook.c:4086
+#: src/addressbook.c:4122

 msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
 msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)

-#: src/addressbook.c:4102 src/exporthtml.c:913 src/folderview.c:429
-#: src/prefs_account.c:2289
+#: src/addressbook.c:4138 src/exporthtml.c:913 src/folderview.c:430
+#: src/prefs_account.c:2320

 msgid "Folder"
 msgstr "邮件夹"
 
 msgid "Folder"
 msgstr "邮件夹"
 

-#: src/addressbook.c:4118
+#: src/addressbook.c:4154

 msgid "vCard"
 msgstr "vCard"
 
 msgid "vCard"
 msgstr "vCard"
 

-#: src/addressbook.c:4134 src/addressbook.c:4150
+#: src/addressbook.c:4170 src/addressbook.c:4186

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:4166
+#: src/addressbook.c:4202

 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 

-#: src/addressbook.c:4182
+#: src/addressbook.c:4218

 msgid "LDAP Query"
 msgstr "LDAP 查询"
 
 msgid "LDAP Query"
 msgstr "LDAP 查询"
 


@@ -723,9 +724,9 @@ msgid "Address Count"
 msgstr "邮件地址数目"
 
 #. Create notebook pages
 msgstr "邮件地址数目"
 
 #. Create notebook pages

-#: src/addrgather.c:537 src/alertpanel.c:153 src/compose.c:3903
-#: src/messageview.c:558 src/messageview.c:571
-#: src/plugins/pgpcore/sgpgme.c:420
+#: src/addrgather.c:537 src/alertpanel.c:153 src/compose.c:4041
+#: src/messageview.c:557 src/messageview.c:570
+#: src/plugins/pgpcore/sgpgme.c:419

 msgid "Warning"
 msgstr "警告"
 
 msgid "Warning"
 msgstr "警告"
 


@@ -754,12 +755,12 @@ msgstr "公用邮件地址"
 msgid "Personal address"
 msgstr "个人邮件地址"
 
 msgid "Personal address"
 msgstr "个人邮件地址"
 

-#: src/alertpanel.c:140 src/compose.c:6357
+#: src/alertpanel.c:140 src/compose.c:6513

 msgid "Notice"
 msgstr "注意"
 
 msgid "Notice"
 msgstr "注意"
 

-#: src/alertpanel.c:166 src/alertpanel.c:188 src/compose.c:3847 src/inc.c:584
-#: src/plugins/pgpcore/sgpgme.c:124 src/plugins/pgpcore/sgpgme.c:192
+#: src/alertpanel.c:166 src/alertpanel.c:188 src/compose.c:3988 src/inc.c:584
+#: src/plugins/pgpcore/sgpgme.c:123 src/plugins/pgpcore/sgpgme.c:191

 msgid "Error"
 msgstr "错误"
 
 msgid "Error"
 msgstr "错误"
 


@@ -965,11 +966,11 @@ msgstr "/新增(_A)..."
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
 msgid "/_Remove"
 msgstr "/删除(_R)"
 

-#: src/compose.c:505 src/folderview.c:282
+#: src/compose.c:505 src/folderview.c:283

 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 

-#: src/compose.c:510 src/mainwindow.c:672 src/messageview.c:272
+#: src/compose.c:510 src/mainwindow.c:675 src/messageview.c:272

 msgid "/_Message"
 msgstr "/邮件(_M)"
 
 msgid "/_Message"
 msgstr "/邮件(_M)"
 


@@ -981,9 +982,9 @@ msgstr "/邮件(_M)/发送(_S)"
 msgid "/_Message/Send _later"
 msgstr "/邮件(_M)/稍后发送(_l)"
 
 msgid "/_Message/Send _later"
 msgstr "/邮件(_M)/稍后发送(_l)"
 

-#: src/compose.c:515 src/compose.c:519 src/compose.c:522 src/mainwindow.c:683
-#: src/mainwindow.c:693 src/mainwindow.c:696 src/mainwindow.c:702
-#: src/mainwindow.c:711 src/messageview.c:275 src/messageview.c:283
+#: src/compose.c:515 src/compose.c:519 src/compose.c:522 src/mainwindow.c:685
+#: src/mainwindow.c:695 src/mainwindow.c:699 src/mainwindow.c:705
+#: src/mainwindow.c:714 src/messageview.c:275 src/messageview.c:283

 #: src/messageview.c:288
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 #: src/messageview.c:288
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"


@@ -1016,7 +1017,7 @@ msgstr "/编辑(_E)/撤消(_U)"
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复前一个动作(_R)"
 
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复前一个动作(_R)"
 

-#: src/compose.c:528 src/compose.c:615 src/compose.c:621 src/mainwindow.c:475
+#: src/compose.c:528 src/compose.c:616 src/compose.c:622 src/mainwindow.c:476

 #: src/messageview.c:165
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 #: src/messageview.c:165
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"


@@ -1025,7 +1026,7 @@ msgstr "/编辑(_E)/---"
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_t)"
 
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_t)"
 

-#: src/compose.c:530 src/mainwindow.c:472 src/messageview.c:163
+#: src/compose.c:530 src/mainwindow.c:473 src/messageview.c:163

 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/拷贝(_C)"
 
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/拷贝(_C)"
 


@@ -1034,358 +1035,366 @@ msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
 #: src/compose.c:532
 msgstr "/编辑(_E)/粘贴(_P)"
 
 #: src/compose.c:532

+msgid "/_Edit/Special paste"
+msgstr "/编辑(_E)/选择性粘贴"
+
+#: src/compose.c:533

 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/编辑(_E)/选择性粘贴/粘贴为引文(_q)"
 
 msgid "/_Edit/Special paste/as _quotation"
 msgstr "/编辑(_E)/选择性粘贴/粘贴为引文(_q)"
 

-#: src/compose.c:534
+#: src/compose.c:535

 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/编辑(_E)/选择性粘贴/自动换行(_w)"
 
 msgid "/_Edit/Special paste/_wrapped"
 msgstr "/编辑(_E)/选择性粘贴/自动换行(_w)"
 

-#: src/compose.c:536
+#: src/compose.c:537

 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/编辑(_E)/选择性粘贴/不自动换行(_u)"
 
 msgid "/_Edit/Special paste/_unwrapped"
 msgstr "/编辑(_E)/选择性粘贴/不自动换行(_u)"
 

-#: src/compose.c:538 src/mainwindow.c:473 src/messageview.c:164
+#: src/compose.c:539 src/mainwindow.c:474 src/messageview.c:164

 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_a)"
 
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_a)"
 

-#: src/compose.c:539
+#: src/compose.c:540

 msgid "/_Edit/A_dvanced"
 msgstr "/编辑(_E)/高级(_d)"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/编辑(_E)/高级(_d)"
 

-#: src/compose.c:540
+#: src/compose.c:541

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字符"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字符"
 

-#: src/compose.c:545
+#: src/compose.c:546

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字符"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字符"
 

-#: src/compose.c:550
+#: src/compose.c:551

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/编辑(_E)/高级(_d)/后移一字"
 

-#: src/compose.c:555
+#: src/compose.c:556

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/编辑(_E)/高级(_d)/前移一字"
 

-#: src/compose.c:560
+#: src/compose.c:561

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/编辑(_E)/高级(_d)/移到行开头"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/编辑(_E)/高级(_d)/移到行开头"
 

-#: src/compose.c:565
+#: src/compose.c:566

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/编辑(_E)/高级(_d)/移到行尾"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/编辑(_E)/高级(_d)/移到行尾"
 

-#: src/compose.c:570
+#: src/compose.c:571

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/编辑(_E)/高级(_d)/移到前一行"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/编辑(_E)/高级(_d)/移到前一行"
 

-#: src/compose.c:575
+#: src/compose.c:576

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/编辑(_E)/高级(_d)/移到下一行"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/编辑(_E)/高级(_d)/移到下一行"
 

-#: src/compose.c:580
+#: src/compose.c:581

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字符"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字符"
 

-#: src/compose.c:585
+#: src/compose.c:586

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字符"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字符"
 

-#: src/compose.c:590
+#: src/compose.c:591

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/编辑(_E)/高级(_d)/往后删除一字"
 

-#: src/compose.c:595
+#: src/compose.c:596

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/编辑(_E)/高级(_d)/往前删除一字"
 

-#: src/compose.c:600
+#: src/compose.c:601

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 

-#: src/compose.c:605
+#: src/compose.c:606

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/编辑(_E)/高级(_d)/删除一行"
 

-#: src/compose.c:610
+#: src/compose.c:611

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/编辑(_E)/高级(_d)/从游标处起删除至行尾"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/编辑(_E)/高级(_d)/从游标处起删除至行尾"
 

-#: src/compose.c:616
+#: src/compose.c:617

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/将当前段落折行(_W)"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/将当前段落折行(_W)"
 

-#: src/compose.c:618
+#: src/compose.c:619

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/将所有过长的行折行(_l)"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/将所有过长的行折行(_l)"
 

-#: src/compose.c:620
+#: src/compose.c:621

 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动换行(_o)"
 
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动换行(_o)"
 

-#: src/compose.c:622
+#: src/compose.c:623

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/编辑(_E)/使用外部编辑器(_x)"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/编辑(_E)/使用外部编辑器(_x)"
 

-#: src/compose.c:625
+#: src/compose.c:626

 msgid "/_Spelling"
 msgstr "/拼写(_S)"
 
 msgid "/_Spelling"
 msgstr "/拼写(_S)"
 

-#: src/compose.c:626
+#: src/compose.c:627

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/拼写(_S)/检查全文或选定区域(_C)"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/拼写(_S)/检查全文或选定区域(_C)"
 

-#: src/compose.c:628
+#: src/compose.c:629

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/拼写(_S)/显示所有拼错的单词(_H)"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/拼写(_S)/显示所有拼错的单词(_H)"
 

-#: src/compose.c:630
+#: src/compose.c:631

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/拼写(_S)/向后检查拼错的单词(_b)"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/拼写(_S)/向后检查拼错的单词(_b)"
 

-#: src/compose.c:632
+#: src/compose.c:633

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/拼写(_S)/向前检查拼错的单词(_F)"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/拼写(_S)/向前检查拼错的单词(_F)"
 

-#: src/compose.c:634
+#: src/compose.c:635

 msgid "/_Spelling/---"
 msgstr "/拼写(_S)/---"
 
 msgid "/_Spelling/---"
 msgstr "/拼写(_S)/---"
 

-#: src/compose.c:635
+#: src/compose.c:636

 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/拼写(_S)/配置拼写检查器(_S)"
 
 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/拼写(_S)/配置拼写检查器(_S)"
 

-#: src/compose.c:638
+#: src/compose.c:639

 msgid "/_Options"
 msgstr "/选项(_O)"
 
 msgid "/_Options"
 msgstr "/选项(_O)"
 

-#: src/compose.c:639
+#: src/compose.c:640

 msgid "/_Options/Privacy System"
 msgstr "/选项(_O)/隐私系统"
 
 msgid "/_Options/Privacy System"
 msgstr "/选项(_O)/隐私系统"
 

-#: src/compose.c:640
+#: src/compose.c:641

 msgid "/_Options/Privacy System/None"
 msgstr "/选项(_O)/隐私系统/无"
 
 msgid "/_Options/Privacy System/None"
 msgstr "/选项(_O)/隐私系统/无"
 

-#: src/compose.c:641
+#: src/compose.c:642

 msgid "/_Options/Si_gn"
 msgstr "/选项(_O)/签名(_g)"
 
 msgid "/_Options/Si_gn"
 msgstr "/选项(_O)/签名(_g)"
 

-#: src/compose.c:642
+#: src/compose.c:643

 msgid "/_Options/_Encrypt"
 msgstr "/选项(_O)/加密(_E)"
 
 msgid "/_Options/_Encrypt"
 msgstr "/选项(_O)/加密(_E)"
 

-#: src/compose.c:643 src/compose.c:650 src/compose.c:652 src/compose.c:654
+#: src/compose.c:644 src/compose.c:651 src/compose.c:653 src/compose.c:655

 msgid "/_Options/---"
 msgstr "/选项(_O)/---"
 
 msgid "/_Options/---"
 msgstr "/选项(_O)/---"
 

-#: src/compose.c:644
+#: src/compose.c:645

 msgid "/_Options/_Priority"
 msgstr "/选项(_O)/优先级(_P)"
 
 msgid "/_Options/_Priority"
 msgstr "/选项(_O)/优先级(_P)"
 

-#: src/compose.c:645
+#: src/compose.c:646

 msgid "/_Options/Priority/_Highest"
 msgstr "/选项(_O)/优先顺序/最优先(_H)"
 
 msgid "/_Options/Priority/_Highest"
 msgstr "/选项(_O)/优先顺序/最优先(_H)"
 

-#: src/compose.c:646
+#: src/compose.c:647

 msgid "/_Options/Priority/Hi_gh"
 msgstr "/选项(_O)/优先顺序/优先(_g)"
 
 msgid "/_Options/Priority/Hi_gh"
 msgstr "/选项(_O)/优先顺序/优先(_g)"
 

-#: src/compose.c:647
+#: src/compose.c:648

 msgid "/_Options/Priority/_Normal"
 msgstr "/选项(_O)/优先顺序/普通(_N)"
 
 msgid "/_Options/Priority/_Normal"
 msgstr "/选项(_O)/优先顺序/普通(_N)"
 

-#: src/compose.c:648
+#: src/compose.c:649

 msgid "/_Options/Priority/Lo_w"
 msgstr "/选项(_O)/优先顺序/低(_w)"
 
 msgid "/_Options/Priority/Lo_w"
 msgstr "/选项(_O)/优先顺序/低(_w)"
 

-#: src/compose.c:649
+#: src/compose.c:650

 msgid "/_Options/Priority/_Lowest"
 msgstr "/选项(_O)/优先顺序/最低(_L)"
 
 msgid "/_Options/Priority/_Lowest"
 msgstr "/选项(_O)/优先顺序/最低(_L)"
 

-#: src/compose.c:651
+#: src/compose.c:652

 msgid "/_Options/_Request Return Receipt"
 msgstr "/选项(_O)/请求回执(_R)"
 
 msgid "/_Options/_Request Return Receipt"
 msgstr "/选项(_O)/请求回执(_R)"
 

-#: src/compose.c:653
+#: src/compose.c:654

 msgid "/_Options/Remo_ve references"
 msgstr "/选项(_O)/删除引用(_V)"
 
 msgid "/_Options/Remo_ve references"
 msgstr "/选项(_O)/删除引用(_V)"
 

-#: src/compose.c:660
+#: src/compose.c:661

 msgid "/_Options/Character _encoding"
 msgstr "/选项(_O)/字符编码(_e)"
 
 msgid "/_Options/Character _encoding"
 msgstr "/选项(_O)/字符编码(_e)"
 

-#: src/compose.c:661
+#: src/compose.c:662

 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/选项(_O)/字符集(_e)/自动侦测(_A)"
 
 msgid "/_Options/Character _encoding/_Automatic"
 msgstr "/选项(_O)/字符集(_e)/自动侦测(_A)"
 

-#: src/compose.c:663 src/compose.c:669 src/compose.c:675 src/compose.c:679
-#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/compose.c:699
-#: src/compose.c:709 src/compose.c:713 src/compose.c:723 src/compose.c:727
+#: src/compose.c:664 src/compose.c:670 src/compose.c:676 src/compose.c:680
+#: src/compose.c:686 src/compose.c:690 src/compose.c:696 src/compose.c:700
+#: src/compose.c:710 src/compose.c:714 src/compose.c:724 src/compose.c:728

 msgid "/_Options/Character _encoding/---"
 msgstr "/选项(_O)/字符编码(_e)/---"
 
 msgid "/_Options/Character _encoding/---"
 msgstr "/选项(_O)/字符编码(_e)/---"
 

-#: src/compose.c:665
+#: src/compose.c:666

 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/选项(_O)/字符集(_e)/7bit ascii (US-ASCII)(_ I)"
 
 msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/选项(_O)/字符集(_e)/7bit ascii (US-ASCII)(_ I)"
 

-#: src/compose.c:667
+#: src/compose.c:668

 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/选项(_O)/字符集(_e)/Unicode (UTF-8)(_U)"
 
 msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
 msgstr "/选项(_O)/字符集(_e)/Unicode (UTF-8)(_U)"
 

-#: src/compose.c:671
+#: src/compose.c:672

 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-1)(_1)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-1)(_1)"
 

-#: src/compose.c:673
+#: src/compose.c:674

 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-15)"
 
 msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-15)"
 

-#: src/compose.c:677
+#: src/compose.c:678

 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-_2)"
 
 msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-_2)"
 

-#: src/compose.c:681
+#: src/compose.c:682

 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 
 msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 

-#: src/compose.c:683
+#: src/compose.c:684

 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-_4)"
 
 msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-_4)"
 

-#: src/compose.c:687
+#: src/compose.c:688

 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 

-#: src/compose.c:691
+#: src/compose.c:692

 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 
 msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
 

-#: src/compose.c:693
+#: src/compose.c:694

 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1255)"
 
 msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1255)"
 

-#: src/compose.c:697
+#: src/compose.c:698

 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/选项(_O)/字符集(_e)/土耳其 (ISO-8859-_9)"
 
 msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/选项(_O)/字符集(_e)/土耳其 (ISO-8859-_9)"
 

-#: src/compose.c:701
+#: src/compose.c:702

 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 
 msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 

-#: src/compose.c:703
+#: src/compose.c:704

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (KOI8-_R)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (KOI8-_R)"
 

-#: src/compose.c:705
+#: src/compose.c:706

 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫(KOI8-U)"
 
 msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫(KOI8-U)"
 

-#: src/compose.c:707
+#: src/compose.c:708

 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1251)"
 
 msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1251)"
 

-#: src/compose.c:711
+#: src/compose.c:712

 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/选项(_O)/字符集(_e)/日文 (ISO-2022-_JP)"
 
 msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/选项(_O)/字符集(_e)/日文 (ISO-2022-_JP)"
 

-#: src/compose.c:715
+#: src/compose.c:716

 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (_GB2312)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (_GB2312)"
 

-#: src/compose.c:717
+#: src/compose.c:718

 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (GBK)"
 
 msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/选项(_O)/字符集(_e)/简体中文 (GBK)"
 

-#: src/compose.c:719
+#: src/compose.c:720

 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (_Big5)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (_Big5)"
 

-#: src/compose.c:721
+#: src/compose.c:722

 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (EUC-_TW)"
 
 msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/选项(_O)/字符集(_e)/繁体中文 (EUC-_TW)"
 

-#: src/compose.c:725
+#: src/compose.c:726

 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/选项(_O)/字符集(_e)/韩文 (EUC-_KR) "
 
 msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
 msgstr "/选项(_O)/字符集(_e)/韩文 (EUC-_KR) "
 

-#: src/compose.c:729
+#: src/compose.c:730

 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (TIS-620)"
 
 msgid "/_Options/Character _encoding/Thai (TIS-620)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (TIS-620)"
 

-#: src/compose.c:731
+#: src/compose.c:732

 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (Windows-874)"
 
 msgid "/_Options/Character _encoding/Thai (Windows-874)"
 msgstr "/选项(_O)/字符集(_e)/泰国 (Windows-874)"
 

-#: src/compose.c:735
+#: src/compose.c:736

 msgid "/_Tools/Show _ruler"
 msgstr "/工具(_T)/显示标尺(_r)"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/工具(_T)/显示标尺(_r)"
 

-#: src/compose.c:736 src/messageview.c:292
+#: src/compose.c:737 src/messageview.c:292

 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 

-#: src/compose.c:737
+#: src/compose.c:738

 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用邮件模板(_T)"
 
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/套用邮件模板(_T)"
 

-#: src/compose.c:738 src/mainwindow.c:747 src/messageview.c:317
+#: src/compose.c:739 src/mainwindow.c:750 src/messageview.c:317

 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/执行动作(_n)"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/执行动作(_n)"
 

-#: src/compose.c:1684
+#: src/compose.c:1408
+msgid "Fw: multiple emails"
+msgstr "转发: 多封邮件"
+
+#: src/compose.c:1729

 msgid "Reply-To:"
 msgstr ""
 
 msgid "Reply-To:"
 msgstr ""
 

-#: src/compose.c:1687 src/compose.c:4716 src/compose.c:5390
+#: src/compose.c:1732 src/compose.c:4861 src/compose.c:5535

 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr ""
 
 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr ""
 

-#: src/compose.c:1690
+#: src/compose.c:1735

 msgid "Followup-To:"
 msgstr ""
 
 msgid "Followup-To:"
 msgstr ""
 

-#: src/compose.c:2076
+#: src/compose.c:2121

 msgid "Quote mark format error."
 msgstr "引文格式错误。"
 
 msgid "Quote mark format error."
 msgstr "引文格式错误。"
 

-#: src/compose.c:2092
+#: src/compose.c:2137

 msgid "Message reply/forward format error."
 msgstr "回复/转发邮件格式错误。"
 
 msgid "Message reply/forward format error."
 msgstr "回复/转发邮件格式错误。"
 

-#: src/compose.c:2540
+#: src/compose.c:2616

 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 不存在。"
 
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 不存在。"
 

-#: src/compose.c:2544
+#: src/compose.c:2620

 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 

-#: src/compose.c:2571
+#: src/compose.c:2647

 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 

-#: src/compose.c:3325
+#: src/compose.c:3401

 msgid " [Edited]"
 msgstr " [已修改] "
 
 msgid " [Edited]"
 msgstr " [已修改] "
 

-#: src/compose.c:3331 src/compose.c:3334
+#: src/compose.c:3407 src/compose.c:3410

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新邮件%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - 新邮件%s"
 

-#: src/compose.c:3337
+#: src/compose.c:3413

 #, c-format
 msgid "Compose message%s"
 msgstr "新邮件%s"
 
 #, c-format
 msgid "Compose message%s"
 msgstr "新邮件%s"
 

-#: src/compose.c:3362 src/messageview.c:594
+#: src/compose.c:3438 src/messageview.c:592

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1393,21 +1402,29 @@ msgstr ""
 "您选用的帐号并非一个电子邮件帐号，可能是用来在新闻组上发表文章用的。\n"
 "要发送邮件请选择一个电子邮件帐号。"
 
 "您选用的帐号并非一个电子邮件帐号，可能是用来在新闻组上发表文章用的。\n"
 "要发送邮件请选择一个电子邮件帐号。"
 

-#: src/compose.c:3446
-msgid "Recipient is not specified."
-msgstr "没有指定收信人。"
-
-#: src/compose.c:3454 src/messageview.c:559 src/messageview.c:579
-#: src/prefs_account.c:987 src/prefs_send.c:333 src/toolbar.c:388
-#: src/toolbar.c:436
+#: src/compose.c:3540 src/compose.c:3568 src/compose.c:3595
+#: src/prefs_account.c:1003 src/prefs_send.c:333 src/toolbar.c:387
+#: src/toolbar.c:434

 msgid "Send"
 msgstr "发送"
 
 msgid "Send"
 msgstr "发送"
 

-#: src/compose.c:3455
+#: src/compose.c:3541
+msgid "The only recipient is the default CC address. Send anyway?"
+msgstr "缺省的抄送地址是仅有的收件人，要发送吗？"
+
+#: src/compose.c:3569
+msgid "The only recipient is the default BCC address. Send anyway?"
+msgstr "缺省的密送地址是仅有的收件若，要发送吗？"
+
+#: src/compose.c:3583
+msgid "Recipient is not specified."
+msgstr "没有指定收信人。"
+
+#: src/compose.c:3596

 msgid "Subject is empty. Send it anyway?"
 msgstr "没有标题。确定要发送？"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "没有标题。确定要发送？"
 

-#: src/compose.c:3481
+#: src/compose.c:3622

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1417,7 +1434,7 @@ msgstr ""
 "\n"
 "转换字符集失败。"
 
 "\n"
 "转换字符集失败。"
 

-#: src/compose.c:3484
+#: src/compose.c:3625

 msgid ""
 "Could not queue message for sending:\n"
 "\n"
 msgid ""
 "Could not queue message for sending:\n"
 "\n"


@@ -1427,7 +1444,7 @@ msgstr ""
 "\n"
 "签名失败。"
 
 "\n"
 "签名失败。"
 

-#: src/compose.c:3487
+#: src/compose.c:3628

 #, c-format
 msgid ""
 "Could not queue message for sending:\n"
 #, c-format
 msgid ""
 "Could not queue message for sending:\n"


@@ -1438,11 +1455,11 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:3489
+#: src/compose.c:3630

 msgid "Could not queue message for sending."
 msgstr "无法将邮件加入待发送队列"
 
 msgid "Could not queue message for sending."
 msgstr "无法将邮件加入待发送队列"
 

-#: src/compose.c:3504 src/compose.c:3533
+#: src/compose.c:3645 src/compose.c:3674

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1450,7 +1467,7 @@ msgstr ""
 "邮件正加入发送队列，但无法发送出去。\n"
 "请使用主窗口 \"送出待发送邮件\" 再试一次。"
 
 "邮件正加入发送队列，但无法发送出去。\n"
 "请使用主窗口 \"送出待发送邮件\" 再试一次。"
 

-#: src/compose.c:3844
+#: src/compose.c:3985

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message \n"


@@ -1460,7 +1477,7 @@ msgstr ""
 "无法将邮件的字符编码转换为 %s 。\n"
 "以 %s 发送吗？"
 
 "无法将邮件的字符编码转换为 %s 。\n"
 "以 %s 发送吗？"
 

-#: src/compose.c:3899
+#: src/compose.c:4037

 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"


@@ -1473,59 +1490,59 @@ msgstr ""
 "\n"
 "确实要发送吗?"
 
 "\n"
 "确实要发送吗?"
 

-#: src/compose.c:4069
+#: src/compose.c:4214

 msgid "No account for sending mails available!"
 msgstr "没有发信所需的帐号！"
 
 msgid "No account for sending mails available!"
 msgstr "没有发信所需的帐号！"
 

-#: src/compose.c:4079
+#: src/compose.c:4224

 msgid "No account for posting news available!"
 msgstr "没有张贴news所需的帐号！"
 
 msgid "No account for posting news available!"
 msgstr "没有张贴news所需的帐号！"
 

-#: src/compose.c:4799 src/headerview.c:52 src/summary_search.c:211
+#: src/compose.c:4944 src/headerview.c:52 src/summary_search.c:211

 msgid "From:"
 msgstr "发信人:"
 
 msgid "From:"
 msgstr "发信人:"
 

-#: src/compose.c:4850
+#: src/compose.c:4995

 msgid "Mime type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
 msgid "Mime type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE

-#: src/compose.c:4856 src/compose.c:5072 src/mimeview.c:197
+#: src/compose.c:5001 src/compose.c:5217 src/mimeview.c:198

 #: src/plugins/pgpcore/select-keys.c:330 src/prefs_summary_column.c:86
 #: src/plugins/pgpcore/select-keys.c:330 src/prefs_summary_column.c:86

-#: src/summaryview.c:466
+#: src/summaryview.c:470

 msgid "Size"
 msgstr "大小"
 
 #. Save Message to folder
 msgid "Size"
 msgstr "大小"
 
 #. Save Message to folder

-#: src/compose.c:4916
+#: src/compose.c:5061

 msgid "Save Message to "
 msgstr "将邮件保存至"
 
 msgid "Save Message to "
 msgstr "将邮件保存至"
 

-#: src/compose.c:4938 src/prefs_filtering_action.c:435
+#: src/compose.c:5083 src/prefs_filtering_action.c:450

 msgid "Select ..."
 msgstr "选择..."
 
 msgid "Select ..."
 msgstr "选择..."
 

-#: src/compose.c:5071 src/compose.c:6117
+#: src/compose.c:5216 src/compose.c:6273

 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. header labels and entries
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. header labels and entries

-#: src/compose.c:5135 src/prefs_account.c:1581 src/prefs_customheader.c:201
+#: src/compose.c:5280 src/prefs_account.c:1615 src/prefs_customheader.c:201

 #: src/prefs_matcher.c:154
 msgid "Header"
 msgstr "邮件头"
 
 #. attachment list
 #: src/prefs_matcher.c:154
 msgid "Header"
 msgstr "邮件头"
 
 #. attachment list

-#: src/compose.c:5137
+#: src/compose.c:5282

 msgid "Attachments"
 msgstr "附件"
 
 #. Others Tab
 msgid "Attachments"
 msgstr "附件"
 
 #. Others Tab

-#: src/compose.c:5139
+#: src/compose.c:5284

 msgid "Others"
 msgstr "其他"
 
 msgid "Others"
 msgstr "其他"
 

-#: src/compose.c:5154 src/headerview.c:55 src/prefs_template.c:194
+#: src/compose.c:5299 src/headerview.c:55 src/prefs_template.c:208

 #: src/summary_search.c:225
 msgid "Subject:"
 msgstr "主题:"
 #: src/summary_search.c:225
 msgid "Subject:"
 msgstr "主题:"


@@ -1534,13 +1551,13 @@ msgstr "主题:"
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.
 #. * index of label_colors[] as data parameter. for the None color we
 #. * pass an invalid (high) value. also we attach a data pointer so we
 #. * can always get back the SummaryView pointer.

-#: src/compose.c:5338 src/exphtmldlg.c:462 src/gtk/colorlabel.c:280
-#: src/gtk/gtkaspell.c:1615 src/gtk/gtkaspell.c:2363 src/prefs_account.c:614
-#: src/summaryview.c:4327
+#: src/compose.c:5483 src/exphtmldlg.c:462 src/gtk/colorlabel.c:294
+#: src/gtk/gtkaspell.c:1615 src/gtk/gtkaspell.c:2363 src/prefs_account.c:629
+#: src/summaryview.c:4404

 msgid "None"
 msgstr "无"
 
 msgid "None"
 msgstr "无"
 

-#: src/compose.c:5348
+#: src/compose.c:5493

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1549,39 +1566,38 @@ msgstr ""
 "无法启动拼写检查器.\n"
 "%s"
 
 "无法启动拼写检查器.\n"
 "%s"
 

-#: src/compose.c:5581
+#: src/compose.c:5734

 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."
 #, c-format
 msgid ""
 "The privacy system '%s' cannot be loaded. You will not be able to sign or "
 "encrypt this message."

-msgstr ""
-"无法加载隐私系统`%s'，签名和邮件加密功能将不可用。"
+msgstr "无法加载隐私系统`%s'，签名和邮件加密功能将不可用。"

 
 

-#: src/compose.c:6008
+#: src/compose.c:6164

 msgid "Invalid MIME type."
 msgstr "不正确的MIME类型。"
 
 msgid "Invalid MIME type."
 msgstr "不正确的MIME类型。"
 

-#: src/compose.c:6026
+#: src/compose.c:6182

 msgid "File doesn't exist or is empty."
 msgstr "文件是空的或不存在。"
 
 msgid "File doesn't exist or is empty."
 msgstr "文件是空的或不存在。"
 

-#: src/compose.c:6099
+#: src/compose.c:6255

 msgid "Properties"
 msgstr "属性"
 
 msgid "Properties"
 msgstr "属性"
 

-#: src/compose.c:6144
+#: src/compose.c:6300

 msgid "Encoding"
 msgstr "编码"
 
 msgid "Encoding"
 msgstr "编码"
 

-#: src/compose.c:6169
+#: src/compose.c:6325

 msgid "Path"
 msgstr "路径"
 
 msgid "Path"
 msgstr "路径"
 

-#: src/compose.c:6170 src/prefs_toolbar.c:1062
+#: src/compose.c:6326 src/prefs_toolbar.c:1062

 msgid "File name"
 msgstr "文件名"
 
 msgid "File name"
 msgstr "文件名"
 

-#: src/compose.c:6354
+#: src/compose.c:6510

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1592,11 +1608,11 @@ msgstr ""
 "强制关闭该进程吗？\n"
 "进程祖id: %d"
 
 "强制关闭该进程吗？\n"
 "进程祖id: %d"
 

-#: src/compose.c:6396
+#: src/compose.c:6552

 msgid "Compose: input from monitoring process\n"
 msgstr "撰写: 从被监视的进程中输入\n"
 
 msgid "Compose: input from monitoring process\n"
 msgstr "撰写: 从被监视的进程中输入\n"
 

-#: src/compose.c:6681
+#: src/compose.c:6837

 #, c-format
 msgid ""
 "Could not queue message:\n"
 #, c-format
 msgid ""
 "Could not queue message:\n"


@@ -1607,20 +1623,20 @@ msgstr ""
 "\n"
 "%s."
 
 "\n"
 "%s."
 

-#: src/compose.c:6760
+#: src/compose.c:6916

 msgid "Could not save draft."
 msgstr "无法保存草稿。"
 
 msgid "Could not save draft."
 msgstr "无法保存草稿。"
 

-#: src/compose.c:6828 src/compose.c:6851
+#: src/compose.c:6984 src/compose.c:7007

 msgid "Select file"
 msgstr "选择文件"
 
 msgid "Select file"
 msgstr "选择文件"
 

-#: src/compose.c:6864
+#: src/compose.c:7020

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "无法读取文件 '%s'。"
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "无法读取文件 '%s'。"
 

-#: src/compose.c:6866
+#: src/compose.c:7022

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1629,49 +1645,49 @@ msgstr ""
 "文件 '%s' 包含有不属于当前编码集的无效字符,\n"
 "插入部分可能不正确."
 
 "文件 '%s' 包含有不属于当前编码集的无效字符,\n"
 "插入部分可能不正确."
 

-#: src/compose.c:6914
+#: src/compose.c:7070

 msgid "Discard message"
 msgstr "摈弃讯息"
 
 msgid "Discard message"
 msgstr "摈弃讯息"
 

-#: src/compose.c:6915
+#: src/compose.c:7071

 msgid "This message has been modified. Discard it?"
 msgstr "这封邮件已被更改，是否摈弃？"
 
 msgid "This message has been modified. Discard it?"
 msgstr "这封邮件已被更改，是否摈弃？"
 

-#: src/compose.c:6916
-msgid "Discard"
-msgstr "摈弃"
+#: src/compose.c:7072
+msgid "_Discard"
+msgstr "摈弃(_D)"

 
 

-#: src/compose.c:6916
-msgid "Save to Drafts"
-msgstr "存为草稿"
+#: src/compose.c:7072
+msgid "_Save to Drafts"
+msgstr "存为草稿(_S)"

 
 

-#: src/compose.c:6960
+#: src/compose.c:7116

 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "是否应用模板'%s'?"
 
 #, c-format
 msgid "Do you want to apply the template '%s' ?"
 msgstr "是否应用模板'%s'?"
 

-#: src/compose.c:6962
+#: src/compose.c:7118

 msgid "Apply template"
 msgstr "使用模板"
 
 msgid "Apply template"
 msgstr "使用模板"
 

-#: src/compose.c:6963
+#: src/compose.c:7119

 msgid "_Replace"
 msgstr "替换(_R)"
 
 msgid "_Replace"
 msgstr "替换(_R)"
 

-#: src/compose.c:6963
+#: src/compose.c:7119

 msgid "_Insert"
 msgstr "插入(_I)"
 
 #: src/crash.c:142
 #, c-format
 msgid "_Insert"
 msgstr "插入(_I)"
 
 #: src/crash.c:142
 #, c-format

-msgid "Sylpheed process (%ld) received signal %ld"
+msgid "Sylpheed-Claws process (%ld) received signal %ld"

 msgstr "Sylpheed 程序(%ld)接收到%ld讯号"
 
 msgstr "Sylpheed 程序(%ld)接收到%ld讯号"
 

-#: src/crash.c:186
-msgid "Sylpheed has crashed"
+#: src/crash.c:188
+msgid "Sylpheed-Claws has crashed"

 msgstr "Sylpheed已经崩溃"
 
 msgstr "Sylpheed已经崩溃"
 

-#: src/crash.c:202
+#: src/crash.c:204

 #, c-format
 msgid ""
 "%s.\n"
 #, c-format
 msgid ""
 "%s.\n"


@@ -1680,23 +1696,23 @@ msgstr ""
 "%s\n"
 "请填写BUG反馈报告并附上以下讯息。"
 
 "%s\n"
 "请填写BUG反馈报告并附上以下讯息。"
 

-#: src/crash.c:207
+#: src/crash.c:209

 msgid "Debug log"
 msgstr "调试日志"
 
 msgid "Debug log"
 msgstr "调试日志"
 

-#: src/crash.c:242
+#: src/crash.c:246

 msgid "Close"
 msgstr "关闭"
 
 msgid "Close"
 msgstr "关闭"
 

-#: src/crash.c:247
+#: src/crash.c:251

 msgid "Save..."
 msgstr "正在保存..."
 
 msgid "Save..."
 msgstr "正在保存..."
 

-#: src/crash.c:252
+#: src/crash.c:256

 msgid "Create bug report"
 msgstr "创建BUG报告"
 
 msgid "Create bug report"
 msgstr "创建BUG报告"
 

-#: src/crash.c:299
+#: src/crash.c:303

 msgid "Save crash information"
 msgstr "保存崩溃的信息"
 
 msgid "Save crash information"
 msgstr "保存崩溃的信息"
 


@@ -1717,52 +1733,52 @@ msgid "A Name and Value must be supplied."
 msgstr "请务必提供一个用户名称。"
 
 #. gtk_container_set_border_width(GTK_CONTAINER(window), 0);
 msgstr "请务必提供一个用户名称。"
 
 #. gtk_container_set_border_width(GTK_CONTAINER(window), 0);

-#: src/editaddress.c:548
+#: src/editaddress.c:560

 msgid "Edit Person Data"
 msgstr "编辑个人资料"
 
 msgid "Edit Person Data"
 msgstr "编辑个人资料"
 

-#: src/editaddress.c:646 src/expldifdlg.c:508 src/exporthtml.c:790
+#: src/editaddress.c:671 src/expldifdlg.c:508 src/exporthtml.c:790

 #: src/ldif.c:827
 msgid "Display Name"
 msgstr "用户名称"
 
 #: src/ldif.c:827
 msgid "Display Name"
 msgstr "用户名称"
 

-#: src/editaddress.c:652 src/editaddress.c:656 src/ldif.c:835
+#: src/editaddress.c:677 src/editaddress.c:681 src/ldif.c:835

 msgid "Last Name"
 msgstr "姓"
 
 msgid "Last Name"
 msgstr "姓"
 

-#: src/editaddress.c:653 src/editaddress.c:655 src/ldif.c:831
+#: src/editaddress.c:678 src/editaddress.c:680 src/ldif.c:831

 msgid "First Name"
 msgstr "名"
 
 msgid "First Name"
 msgstr "名"
 

-#: src/editaddress.c:658
+#: src/editaddress.c:683

 msgid "Nickname"
 msgstr "绰号"
 
 msgid "Nickname"
 msgstr "绰号"
 

-#: src/editaddress.c:734 src/editaddress.c:782 src/editgroup.c:280
+#: src/editaddress.c:759 src/editaddress.c:807 src/editgroup.c:280

 #: src/expldifdlg.c:521 src/exporthtml.c:629 src/exporthtml.c:793
 #: src/ldif.c:843
 msgid "E-Mail Address"
 msgstr "电子邮件帐号"
 
 #: src/expldifdlg.c:521 src/exporthtml.c:629 src/exporthtml.c:793
 #: src/ldif.c:843
 msgid "E-Mail Address"
 msgstr "电子邮件帐号"
 

-#: src/editaddress.c:735 src/editaddress.c:791
+#: src/editaddress.c:760 src/editaddress.c:816

 msgid "Alias"
 msgstr "别名"
 
 #. value
 msgid "Alias"
 msgstr "别名"
 
 #. value

-#: src/editaddress.c:929 src/editaddress.c:986 src/prefs_customheader.c:218
-#: src/prefs_matcher.c:475
+#: src/editaddress.c:954 src/editaddress.c:1011 src/prefs_customheader.c:218
+#: src/prefs_matcher.c:490

 msgid "Value"
 msgstr "值"
 
 msgid "Value"
 msgstr "值"
 

-#: src/editaddress.c:1045
+#: src/editaddress.c:1070

 msgid "User Data"
 msgstr "用户数据"
 
 msgid "User Data"
 msgstr "用户数据"
 

-#: src/editaddress.c:1046
+#: src/editaddress.c:1071

 msgid "E-Mail Addresses"
 msgstr "电子邮件帐号"
 
 msgid "E-Mail Addresses"
 msgstr "电子邮件帐号"
 

-#: src/editaddress.c:1047
+#: src/editaddress.c:1072

 msgid "Other Attributes"
 msgstr "其他属性"
 
 msgid "Other Attributes"
 msgstr "其他属性"
 


@@ -1787,7 +1803,7 @@ msgid " Check File "
 msgstr "检查文件"
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
 msgstr "检查文件"
 
 #: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195

-#: src/importmutt.c:236 src/importpine.c:236 src/prefs_account.c:1801
+#: src/importmutt.c:236 src/importpine.c:236 src/prefs_account.c:1832

 msgid "File"
 msgstr "文件"
 
 msgid "File"
 msgstr "文件"
 


@@ -1843,11 +1859,11 @@ msgstr "增加新的邮件夹"
 msgid "Input the new name of folder:"
 msgstr "请输入邮件夹的新名字："
 
 msgid "Input the new name of folder:"
 msgstr "请输入邮件夹的新名字："
 

-#: src/editgroup.c:529 src/foldersel.c:532 src/imap_gtk.c:138 src/mh_gtk.c:125
+#: src/editgroup.c:529 src/foldersel.c:532 src/imap_gtk.c:133 src/mh_gtk.c:127

 msgid "New folder"
 msgstr "新邮件夹"
 
 msgid "New folder"
 msgstr "新邮件夹"
 

-#: src/editgroup.c:530 src/foldersel.c:533 src/mh_gtk.c:126
+#: src/editgroup.c:530 src/foldersel.c:533 src/mh_gtk.c:128

 msgid "Input the name of new folder:"
 msgstr " 请导入邮件夹的新名字："
 
 msgid "Input the name of new folder:"
 msgstr " 请导入邮件夹的新名字："
 


@@ -1864,11 +1880,12 @@ msgid "Edit JPilot Entry"
 msgstr "编辑JPilot条目"
 
 #: src/editjpilot.c:289 src/editldap.c:479 src/editvcard.c:202
 msgstr "编辑JPilot条目"
 
 #: src/editjpilot.c:289 src/editldap.c:479 src/editvcard.c:202

-#: src/exphtmldlg.c:403 src/expldifdlg.c:415 src/importldif.c:682
-#: src/importmutt.c:243 src/importpine.c:243 src/prefs_account.c:2317
+#: src/export.c:190 src/import.c:196 src/importmutt.c:243 src/importpine.c:243
+#: src/plugins/clamav/clamav_plugin_gtk.c:174
+#: src/plugins/spamassassin/spamassassin_gtk.c:336 src/prefs_account.c:1864

 #: src/prefs_spelling.c:246
 #: src/prefs_spelling.c:246

-msgid " ... "
-msgstr "..."
+msgid "_Browse"
+msgstr "棕色(_B)"

 
 #: src/editjpilot.c:294
 msgid "Additional e-Mail address item(s)"
 
 #: src/editjpilot.c:294
 msgid "Additional e-Mail address item(s)"


@@ -1935,7 +1952,7 @@ msgid ""
 "This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
 "be appropriate for the \"mydomain.com\" organization. An IP address may also "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "
 "This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
 "be appropriate for the \"mydomain.com\" organization. An IP address may also "
 "be used. You may specify \"localhost\" if running an LDAP server on the same "

-"computer as Sylpheed."
+"computer as Sylpheed-Claws."

 msgstr ""
 "LDAP服务器的机器名。例如\"ldap.mydomain.com\"很可能就是机构\"mydomain.com\"的"
 "LDAP服务器名称。也可以填入IP地址。如果LDAP服务与Sylpheed在同一台机器上运行，"
 msgstr ""
 "LDAP服务器的机器名。例如\"ldap.mydomain.com\"很可能就是机构\"mydomain.com\"的"
 "LDAP服务器名称。也可以填入IP地址。如果LDAP服务与Sylpheed在同一台机器上运行，"


@@ -2080,7 +2097,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "搜索时返回结果的最大条目数"
 
 "The maximum number of entries that should be returned in the search result."
 msgstr "搜索时返回结果的最大条目数"
 

-#: src/editldap.c:754 src/prefs_account.c:983
+#: src/editldap.c:754 src/prefs_account.c:999

 msgid "Basic"
 msgstr "基本设置"
 
 msgid "Basic"
 msgstr "基本设置"
 


@@ -2088,7 +2105,7 @@ msgstr "基本设置"
 msgid "Search"
 msgstr "搜寻"
 
 msgid "Search"
 msgstr "搜寻"
 

-#: src/editldap.c:756 src/gtk/quicksearch.c:310
+#: src/editldap.c:756 src/gtk/quicksearch.c:324

 msgid "Extended"
 msgstr "扩展"
 
 msgid "Extended"
 msgstr "扩展"
 


@@ -2162,15 +2179,20 @@ msgstr "选择HTML输出文件"
 msgid "HTML Output File"
 msgstr "HTML输出文件"
 
 msgid "HTML Output File"
 msgstr "HTML输出文件"
 

+#: src/exphtmldlg.c:403 src/expldifdlg.c:415 src/export.c:196 src/import.c:202
+#: src/importldif.c:682
+msgid "B_rowse"
+msgstr "棕色(_r)"
+

 #: src/exphtmldlg.c:455
 msgid "Stylesheet"
 msgstr "样式表"
 
 #: src/exphtmldlg.c:455
 msgid "Stylesheet"
 msgstr "样式表"
 

-#: src/exphtmldlg.c:468 src/prefs_summaries.c:352 src/prefs_summaries.c:662
+#: src/exphtmldlg.c:468 src/prefs_summaries.c:353 src/prefs_summaries.c:663

 msgid "Default"
 msgstr "缺省"
 
 msgid "Default"
 msgstr "缺省"
 

-#: src/exphtmldlg.c:474 src/plugins/pgpcore/sgpgme.c:120
+#: src/exphtmldlg.c:474 src/plugins/pgpcore/sgpgme.c:119

 msgid "Full"
 msgstr "完整"
 
 msgid "Full"
 msgstr "完整"
 


@@ -2410,7 +2432,7 @@ msgid "Attributes"
 msgstr "属性"
 
 #: src/exporthtml.c:1001
 msgstr "属性"
 
 #: src/exporthtml.c:1001

-msgid "Sylpheed Address Book"
+msgid "Sylpheed-Claws Address Book"

 msgstr "Sylpheed 地址簿"
 
 #: src/exporthtml.c:1115 src/exportldif.c:592
 msgstr "Sylpheed 地址簿"
 
 #: src/exporthtml.c:1115 src/exportldif.c:592


@@ -2429,49 +2451,49 @@ msgstr "名字太长。"
 msgid "Not specified."
 msgstr "不确定。"
 
 msgid "Not specified."
 msgstr "不确定。"
 

-#: src/folder.c:1203 src/foldersel.c:350
+#: src/folder.c:1204 src/foldersel.c:350

 msgid "Inbox"
 msgstr "收信夹"
 
 msgid "Inbox"
 msgstr "收信夹"
 

-#: src/folder.c:1207 src/foldersel.c:354
+#: src/folder.c:1208 src/foldersel.c:354

 msgid "Sent"
 msgstr "已发送"
 
 msgid "Sent"
 msgstr "已发送"
 

-#: src/folder.c:1211 src/foldersel.c:358
+#: src/folder.c:1212 src/foldersel.c:358

 msgid "Queue"
 msgstr "待发送"
 
 msgid "Queue"
 msgstr "待发送"
 

-#: src/folder.c:1215 src/foldersel.c:362 src/toolbar.c:362 src/toolbar.c:396
-#: src/toolbar.c:490
+#: src/folder.c:1216 src/foldersel.c:362 src/toolbar.c:362 src/toolbar.c:395
+#: src/toolbar.c:483

 msgid "Trash"
 msgstr "垃圾桶"
 
 msgid "Trash"
 msgstr "垃圾桶"
 

-#: src/folder.c:1219 src/foldersel.c:366
+#: src/folder.c:1220 src/foldersel.c:366

 msgid "Drafts"
 msgstr "草稿"
 
 #. Processing
 msgid "Drafts"
 msgstr "草稿"
 
 #. Processing

-#: src/folder.c:1473
+#: src/folder.c:1478

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "处理中(%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "处理中(%s)...\n"
 

-#: src/folder.c:1798 src/inc.c:624
+#: src/folder.c:1825 src/inc.c:624

 msgid "Filtering messages...\n"
 msgstr "正在过滤邮件...\n"
 
 msgid "Filtering messages...\n"
 msgstr "正在过滤邮件...\n"
 

-#: src/folder.c:2278
+#: src/folder.c:2306

 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "正在收取 %s 中所有邮件...\n"
 
 #. move messages
 #, c-format
 msgid "Fetching all messages in %s ...\n"
 msgstr "正在收取 %s 中所有邮件...\n"
 
 #. move messages

-#: src/folder.c:2562
+#: src/folder.c:2590

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "将%s 移到%s...\n"
 
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "将%s 移到%s...\n"
 

-#: src/folder.c:3453
+#: src/folder.c:3481

 msgid "Processing messages..."
 msgstr "正在处理邮件..."
 
 msgid "Processing messages..."
 msgstr "正在处理邮件..."
 


@@ -2479,192 +2501,215 @@ msgstr "正在处理邮件..."
 msgid "Select folder"
 msgstr "选择邮件夹"
 
 msgid "Select folder"
 msgstr "选择邮件夹"
 

-#: src/foldersel.c:534 src/imap_gtk.c:142 src/mh_gtk.c:127
+#: src/foldersel.c:534 src/imap_gtk.c:137 src/mh_gtk.c:129

 msgid "NewFolder"
 msgstr "新邮件夹"
 
 msgid "NewFolder"
 msgstr "新邮件夹"
 

-#: src/foldersel.c:542 src/imap_gtk.c:148 src/mh_gtk.c:133 src/mh_gtk.c:236
+#: src/foldersel.c:542 src/imap_gtk.c:143 src/mh_gtk.c:135 src/mh_gtk.c:238

 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "邮件夹名称不能包含`%c'。"
 
 #, c-format
 msgid "'%c' can't be included in folder name."
 msgstr "邮件夹名称不能包含`%c'。"
 

-#: src/foldersel.c:552 src/imap_gtk.c:158 src/imap_gtk.c:207 src/mh_gtk.c:143
-#: src/mh_gtk.c:243
+#: src/foldersel.c:552 src/imap_gtk.c:153 src/imap_gtk.c:202 src/mh_gtk.c:145
+#: src/mh_gtk.c:245

 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "邮件夹'%s'已存在。"
 
 #, c-format
 msgid "The folder '%s' already exists."
 msgstr "邮件夹'%s'已存在。"
 

-#: src/foldersel.c:559 src/imap_gtk.c:164 src/mh_gtk.c:149
+#: src/foldersel.c:559 src/imap_gtk.c:159 src/mh_gtk.c:151

 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "无法创建邮件夹'%s'。"
 
 #, c-format
 msgid "Can't create the folder '%s'."
 msgstr "无法创建邮件夹'%s'。"
 

-#: src/folderview.c:280
+#: src/folderview.c:281

 msgid "/Mark all re_ad"
 msgstr "/标记所有邮件为已读(_a)"
 
 msgid "/Mark all re_ad"
 msgstr "/标记所有邮件为已读(_a)"
 

-#: src/folderview.c:281
+#: src/folderview.c:282

 msgid "/_Search folder..."
 msgstr "/在邮件夹中搜索(_S)..."
 
 msgid "/_Search folder..."
 msgstr "/在邮件夹中搜索(_S)..."
 

-#: src/folderview.c:283
+#: src/folderview.c:284

 msgid "/Process_ing..."
 msgstr "/处理(_i)..."
 
 msgid "/Process_ing..."
 msgstr "/处理(_i)..."
 

-#: src/folderview.c:287
+#: src/folderview.c:288

 msgid "/------"
 msgstr "/------"
 
 msgid "/------"
 msgstr "/------"
 

-#: src/folderview.c:288
+#: src/folderview.c:289

 msgid "/Empty _trash..."
 msgstr "/清空垃圾桶(_t)..."
 
 msgid "/Empty _trash..."
 msgstr "/清空垃圾桶(_t)..."
 

-#: src/folderview.c:430 src/prefs_actions.c:416
-#: src/prefs_filtering_action.c:552 src/prefs_matcher.c:698
+#: src/folderview.c:431 src/prefs_actions.c:440
+#: src/prefs_filtering_action.c:577 src/prefs_matcher.c:726

 msgid "New"
 msgstr "新邮件"
 
 msgid "New"
 msgstr "新邮件"
 

-#: src/folderview.c:431
+#: src/folderview.c:432

 msgid "Unread"
 msgstr "未读"
 
 msgid "Unread"
 msgstr "未读"
 

-#: src/folderview.c:432
+#. S_COL_SIZE
+#: src/folderview.c:433 src/summaryview.c:471

 msgid "#"
 msgstr "＃"
 
 msgid "#"
 msgstr "＃"
 

-#: src/folderview.c:659
+#: src/folderview.c:660

 msgid "Setting folder info..."
 msgstr "设置邮件夹资料..."
 
 msgid "Setting folder info..."
 msgstr "设置邮件夹资料..."
 

-#: src/folderview.c:922 src/mainwindow.c:3181 src/setup.c:90
+#: src/folderview.c:713
+msgid "Mark all as read"
+msgstr "设所有为已读"
+
+#: src/folderview.c:714
+msgid "Do you really want to mark all mails in this folder as read ?"
+msgstr "确定要将此邮件夹中所有邮件设置已读？"
+
+#: src/folderview.c:937 src/mainwindow.c:3174 src/setup.c:90

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "扫描邮件夹%s%c%s..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "扫描邮件夹%s%c%s..."
 

-#: src/folderview.c:926 src/mainwindow.c:3186 src/setup.c:95
+#: src/folderview.c:941 src/mainwindow.c:3179 src/setup.c:95

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr " 扫描邮件夹 %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr " 扫描邮件夹 %s ..."
 

-#: src/folderview.c:967
+#: src/folderview.c:959
+msgid "Rebuild folder tree"
+msgstr "重建邮件夹树"
+
+#: src/folderview.c:960
+msgid ""
+"Rebuilding the folder tree will remove local caches. Do you want to continue?"
+msgstr ""
+"重建邮件夹树将删除原有的本地缓存。是否要继续?"
+
+#: src/folderview.c:970

 msgid "Rebuilding folder tree..."
 msgstr " 重新建立邮件夹树 ..."
 
 msgid "Rebuilding folder tree..."
 msgstr " 重新建立邮件夹树 ..."
 

-#: src/folderview.c:1053
+#: src/folderview.c:972
+msgid "Scanning folder tree..."
+msgstr " 正在扫描邮件夹..."
+
+#: src/folderview.c:1062

 msgid "Checking for new messages in all folders..."
 msgstr "检查所有邮件夹中的新邮件..."
 
 #. Open Folder
 msgid "Checking for new messages in all folders..."
 msgstr "检查所有邮件夹中的新邮件..."
 
 #. Open Folder

-#: src/folderview.c:1835
+#: src/folderview.c:1885

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "打开邮件夹%s..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "打开邮件夹%s..."
 

-#: src/folderview.c:1847
+#: src/folderview.c:1897

 msgid "Folder could not be opened."
 msgstr "无法打开邮件夹。"
 
 msgid "Folder could not be opened."
 msgstr "无法打开邮件夹。"
 

-#: src/folderview.c:1994 src/mainwindow.c:1657
+#: src/folderview.c:2044 src/mainwindow.c:1659

 msgid "Empty trash"
 msgstr "清空垃圾桶"
 
 msgid "Empty trash"
 msgstr "清空垃圾桶"
 

-#: src/folderview.c:1995
+#: src/folderview.c:2045

 msgid "Delete all messages in trash?"
 msgstr "清空垃圾桶内所有邮件？"
 
 msgid "Delete all messages in trash?"
 msgstr "清空垃圾桶内所有邮件？"
 

-#: src/folderview.c:2077
+#: src/folderview.c:2127

 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "确定要将邮件夹 '%s' 改为 '%s' 的一个子邮件夹？"
 
 #, c-format
 msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
 msgstr "确定要将邮件夹 '%s' 改为 '%s' 的一个子邮件夹？"
 

-#: src/folderview.c:2080
+#: src/folderview.c:2130

 msgid "Move folder"
 msgstr "移动邮件夹"
 
 msgid "Move folder"
 msgstr "移动邮件夹"
 

-#: src/folderview.c:2092
+#: src/folderview.c:2142

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "将%s 移到%s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "将%s 移到%s..."
 

-#: src/folderview.c:2121
+#: src/folderview.c:2171

 msgid "Source and destination are the same."
 msgstr "文件来源和目的相同。"
 
 msgid "Source and destination are the same."
 msgstr "文件来源和目的相同。"
 

-#: src/folderview.c:2124
+#: src/folderview.c:2174

 msgid "Can't move a folder to one of its children."
 msgstr "无法将上一层邮件夹移到其子邮件夹中。"
 
 msgid "Can't move a folder to one of its children."
 msgstr "无法将上一层邮件夹移到其子邮件夹中。"
 

-#: src/folderview.c:2127
+#: src/folderview.c:2177

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "邮件夹不能跨邮箱移动。"
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "邮件夹不能跨邮箱移动。"
 

-#: src/folderview.c:2130
+#: src/folderview.c:2180

 msgid "Move failed!"
 msgstr "移动失败！"
 
 msgid "Move failed!"
 msgstr "移动失败！"
 

-#: src/folderview.c:2166
+#: src/folderview.c:2216

 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "邮件夹 %s 的邮件分拣配置"
 
 #, c-format
 msgid "Processing configuration for folder %s"
 msgstr "邮件夹 %s 的邮件分拣配置"
 

-#: src/grouplistdialog.c:172
+#: src/grouplistdialog.c:173

 msgid "Newsgroup subscription"
 msgstr "订阅新闻组"
 
 msgid "Newsgroup subscription"
 msgstr "订阅新闻组"
 

-#: src/grouplistdialog.c:188
+#: src/grouplistdialog.c:189

 msgid "Select newsgroups for subscription:"
 msgstr "选择要订阅的新闻组："
 
 msgid "Select newsgroups for subscription:"
 msgstr "选择要订阅的新闻组："
 

-#: src/grouplistdialog.c:194
+#: src/grouplistdialog.c:195

 msgid "Find groups:"
 msgstr "查找新闻组："
 
 msgid "Find groups:"
 msgstr "查找新闻组："
 

-#: src/grouplistdialog.c:202
+#: src/grouplistdialog.c:203

 msgid " Search "
 msgstr " 搜索 "
 
 msgid " Search "
 msgstr " 搜索 "
 

-#: src/grouplistdialog.c:214
+#: src/grouplistdialog.c:215

 msgid "Newsgroup name"
 msgstr "新闻组名称"
 
 msgid "Newsgroup name"
 msgstr "新闻组名称"
 

-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:216

 msgid "Messages"
 msgstr "邮件"
 
 msgid "Messages"
 msgstr "邮件"
 

-#: src/grouplistdialog.c:216
+#: src/grouplistdialog.c:217

 msgid "Type"
 msgstr "类型"
 
 msgid "Type"
 msgstr "类型"
 

-#: src/grouplistdialog.c:345
+#: src/grouplistdialog.c:346

 msgid "moderated"
 msgstr "有管理的"
 
 msgid "moderated"
 msgstr "有管理的"
 

-#: src/grouplistdialog.c:347
+#: src/grouplistdialog.c:348

 msgid "readonly"
 msgstr "只读"
 
 msgid "readonly"
 msgstr "只读"
 

-#: src/grouplistdialog.c:349
+#: src/grouplistdialog.c:350

 msgid "unknown"
 msgstr "未知"
 
 msgid "unknown"
 msgstr "未知"
 

-#: src/grouplistdialog.c:411
+#: src/grouplistdialog.c:412

 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 
 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 

-#: src/grouplistdialog.c:446 src/summaryview.c:1050
+#: src/grouplistdialog.c:447 src/summaryview.c:1055

 msgid "Done."
 msgstr "完成。"
 
 msgid "Done."
 msgstr "完成。"
 

-#: src/grouplistdialog.c:476
+#: src/grouplistdialog.c:477

 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收%d新闻组(已读%s)"
 
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收%d新闻组(已读%s)"
 

-#: src/gtk/about.c:91
-msgid "About"
-msgstr "关于"
+#: src/gtk/about.c:96
+msgid "About Sylpheed-Claws"
+msgstr "关于Sylpheed Claws"

 
 

-#: src/gtk/about.c:151
+#: src/gtk/about.c:157

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2673,7 +2718,7 @@ msgstr ""
 "GTK+版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
 "操作系统：%s %s (%s)"
 
 "GTK+版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
 "操作系统：%s %s (%s)"
 

-#: src/gtk/about.c:158
+#: src/gtk/about.c:164

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2682,7 +2727,7 @@ msgstr ""
 "GTK+版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
 "操作系统： %s"
 
 "GTK+版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
 "操作系统： %s"
 

-#: src/gtk/about.c:165
+#: src/gtk/about.c:171

 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 #, c-format
 msgid ""
 "GTK+ %d.%d.%d / GLib %d.%d.%d\n"


@@ -2691,12 +2736,103 @@ msgstr ""
 "GTK+版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
 "操作系统：(未知)"
 
 "GTK+版本: %d.%d.%d / GLib版本: %d.%d.%d\n"
 "操作系统：(未知)"
 

-#: src/gtk/about.c:178
+#: src/gtk/about.c:184

 #, c-format
 #, c-format

-msgid "Compiled-in features:%s"
-msgstr "本编译版本所具有的特性：%s"
+msgid ""
+"Compiled-in features:\n"
+"%s"
+msgstr "本版本编译进的特性：\n"
+"%s"
+
+#: src/gtk/about.c:263
+msgid ""
+"Sylpheed-Claws is a lightweight, fast and highly-configurable e-mail "
+"client.\n"
+"\n"
+"For further information visit the Sylpheed-Claws website, "
+msgstr ""
+"Sylpheed-Claws是一个轻量级的邮件客户端，具有速度快、可配置性强的特点。\n"
+"\n"
+"如欲获得进一步的信息，请访问Sylpheed-Claws网站，"
+
+#: src/gtk/about.c:271
+msgid ""
+".\n"
+"\n"
+"Sylpheed-Claws is free software released under the GPL license. If you wish "
+"to donate to the Sylpheed-Claws project you can do so at "
+msgstr ""
+"。\n"
+"Sylpheed-Claws是自由软件，在遵循通用许可协议(GPL)的前提下发布。"
+"如果您想给Sylpheed-Claws项目捐款，可访问如下网址"
+
+#: src/gtk/about.c:280
+msgid ""
+".\n"
+"\n"
+msgstr ""
+
+#: src/gtk/about.c:284
+msgid "Info"
+msgstr "信息"
+
+#: src/gtk/about.c:312
+msgid "The Sylpheed-Claws Team\n"
+msgstr "Sylpheed Claws开发组\n"
+
+#: src/gtk/about.c:332
+msgid ""
+"\n"
+"Previous team members\n"
+msgstr ""
+"\n"
+"以前的开发小组成员\n"

 
 

-#: src/gtk/about.c:241
+#: src/gtk/about.c:352
+msgid ""
+"\n"
+"The translation team\n"
+msgstr ""
+"\n"
+"翻译小组\n"
+
+#: src/gtk/about.c:372
+msgid ""
+"\n"
+"Documentation team\n"
+msgstr ""
+"\n"
+"文档小组\n"
+
+#: src/gtk/about.c:392
+msgid ""
+"\n"
+"Logo\n"
+msgstr ""
+"\n"
+"徽标\n"
+
+#: src/gtk/about.c:412
+msgid ""
+"\n"
+"Icons\n"
+msgstr ""
+"\n"
+"图标\n"
+
+#: src/gtk/about.c:432
+msgid ""
+"\n"
+"Contributors\n"
+msgstr ""
+"\n"
+"其他有贡献人员\n"
+
+#: src/gtk/about.c:455
+msgid "Authors"
+msgstr "作者"
+
+#: src/gtk/about.c:475

 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "


@@ -2708,7 +2844,7 @@ msgstr ""
 "用许可协议(可以是第二版或者更高版本)中列出的条款。\n"
 "\n"
 
 "用许可协议(可以是第二版或者更高版本)中列出的条款。\n"
 "\n"
 

-#: src/gtk/about.c:247
+#: src/gtk/about.c:481

 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "


@@ -2720,53 +2856,65 @@ msgstr ""
 "隐含的质量担保，也没有特殊用途的担保。请阅读GNU通用许可协议以了解详情。\n"
 "\n"
 
 "隐含的质量担保，也没有特殊用途的担保。请阅读GNU通用许可协议以了解详情。\n"
 "\n"
 

-#: src/gtk/about.c:253
+#: src/gtk/about.c:487

 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "

-"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
+"\n"

 msgstr ""
 msgstr ""

-"您应该随同本程序收到一份GNU通用公共许可。如未收到，请写信给以下地址索取："
+"您应该随同本程序收到一份GNU通用公共许可(GPL)。如未收到，请写信给以下地址索取："

 "Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "
 "Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "

-"02111-1307, USA."
+"02111-1307, USA.\n"
+"\n"

 
 

-#: src/gtk/about.c:259
+#: src/gtk/about.c:497

 msgid ""
 msgid ""

-"\n"
-"\n"

 "This product includes software developed by the OpenSSL Project for use in "
 "This product includes software developed by the OpenSSL Project for use in "

-"the OpenSSL Toolkit (http://www.openssl.org/)"
+"the OpenSSL Toolkit ("

 msgstr ""
 msgstr ""

-"\n"
-"\n"
-"本产品包含了根据OpenSSL开发包(http://www.openss.org/)开发的软件, 该开发包由"
+"本产品包含了根据OpenSSL开发包开发的软件, 该开发包由"

 "OpenSSL项目组提供。"
 
 "OpenSSL项目组提供。"
 

-#: src/gtk/colorlabel.c:46
+#: src/gtk/about.c:500
+msgid "http://www.openssl.org/"
+msgstr ""
+
+#: src/gtk/about.c:503
+msgid ""
+").\n"
+"\n"
+msgstr ""
+
+#: src/gtk/about.c:508
+msgid "License"
+msgstr "许可协议"
+
+#: src/gtk/colorlabel.c:47

 msgid "Orange"
 msgstr "橙色"
 
 msgid "Orange"
 msgstr "橙色"
 

-#: src/gtk/colorlabel.c:47
+#: src/gtk/colorlabel.c:48

 msgid "Red"
 msgstr "红色"
 
 msgid "Red"
 msgstr "红色"
 

-#: src/gtk/colorlabel.c:48
+#: src/gtk/colorlabel.c:49

 msgid "Pink"
 msgstr "粉红"
 
 msgid "Pink"
 msgstr "粉红"
 

-#: src/gtk/colorlabel.c:49
+#: src/gtk/colorlabel.c:50

 msgid "Sky blue"
 msgstr "天蓝"
 
 msgid "Sky blue"
 msgstr "天蓝"
 

-#: src/gtk/colorlabel.c:50
+#: src/gtk/colorlabel.c:51

 msgid "Blue"
 msgstr "蓝色"
 
 msgid "Blue"
 msgstr "蓝色"
 

-#: src/gtk/colorlabel.c:51
+#: src/gtk/colorlabel.c:52

 msgid "Green"
 msgstr "绿色"
 
 msgid "Green"
 msgstr "绿色"
 

-#: src/gtk/colorlabel.c:52
+#: src/gtk/colorlabel.c:53

 msgid "Brown"
 msgstr "棕色"
 
 msgid "Brown"
 msgstr "棕色"
 


@@ -2893,11 +3041,11 @@ msgstr "请输入%s在%s上的密码："
 msgid "Input password"
 msgstr "输入密码"
 
 msgid "Input password"
 msgstr "输入密码"
 

-#: src/gtk/logwindow.c:70
+#: src/gtk/logwindow.c:87

 msgid "Protocol log"
 msgstr "协议日志"
 
 msgid "Protocol log"
 msgstr "协议日志"
 

-#: src/gtk/logwindow.c:290
+#: src/gtk/logwindow.c:319

 msgid "Clear _Log"
 msgstr "清除日志(_L)"
 
 msgid "Clear _Log"
 msgstr "清除日志(_L)"
 


@@ -2905,32 +3053,32 @@ msgstr "清除日志(_L)"
 msgid "Select Plugin to load"
 msgstr "选择要加载的插件"
 
 msgid "Select Plugin to load"
 msgstr "选择要加载的插件"
 

-#: src/gtk/pluginwindow.c:225 src/gtk/pluginwindow.c:359
-#: src/plugins/clamav/clamav_plugin_gtk.c:249
+#: src/gtk/pluginwindow.c:240 src/gtk/pluginwindow.c:387
+#: src/plugins/clamav/clamav_plugin_gtk.c:250

 #: src/plugins/dillo_viewer/dillo_prefs.c:74
 #: src/plugins/dillo_viewer/dillo_prefs.c:74

-#: src/plugins/pgpcore/prefs_gpg.c:503
-#: src/plugins/spamassassin/spamassassin_gtk.c:463
+#: src/plugins/pgpcore/prefs_gpg.c:486
+#: src/plugins/spamassassin/spamassassin_gtk.c:464

 msgid "Plugins"
 msgstr "插件"
 
 msgid "Plugins"
 msgstr "插件"
 

-#: src/gtk/pluginwindow.c:256 src/prefs_summaries.c:210
+#: src/gtk/pluginwindow.c:271 src/prefs_summaries.c:211

 msgid "Description"
 msgstr "描述"
 
 msgid "Description"
 msgstr "描述"
 

-#: src/gtk/pluginwindow.c:280
+#: src/gtk/pluginwindow.c:295

 msgid "Load Plugin"
 msgstr "加载插件"
 
 msgid "Load Plugin"
 msgstr "加载插件"
 

-#: src/gtk/pluginwindow.c:285
+#: src/gtk/pluginwindow.c:300

 msgid "Unload Plugin"
 msgstr "卸载插件"
 
 msgid "Unload Plugin"
 msgstr "卸载插件"
 

-#: src/gtk/prefswindow.c:483
+#: src/gtk/prefswindow.c:527

 msgid "Page Index"
 msgstr "页面"
 
 msgid "Page Index"
 msgstr "页面"
 

-#: src/gtk/progressdialog.c:141 src/prefs_account.c:719
-#: src/prefs_filtering_action.c:359
+#: src/gtk/progressdialog.c:141 src/prefs_account.c:734
+#: src/prefs_filtering_action.c:374

 msgid "Account"
 msgstr "帐号"
 
 msgid "Account"
 msgstr "帐号"
 


@@ -2944,168 +3092,168 @@ msgstr "状态"
 msgid "Extended symbols"
 msgstr "扩展符号"
 
 msgid "Extended symbols"
 msgstr "扩展符号"
 

-#: src/gtk/quicksearch.c:208
+#: src/gtk/quicksearch.c:222

 msgid "all messages"
 msgstr "所有邮件"
 
 msgid "all messages"
 msgstr "所有邮件"
 

-#: src/gtk/quicksearch.c:209
+#: src/gtk/quicksearch.c:223

 msgid "messages whose age is greater than #"
 msgstr "比# 旧的邮件"
 
 msgid "messages whose age is greater than #"
 msgstr "比# 旧的邮件"
 

-#: src/gtk/quicksearch.c:210
+#: src/gtk/quicksearch.c:224

 msgid "messages whose age is less than #"
 msgstr "比# 新的邮件"
 
 msgid "messages whose age is less than #"
 msgstr "比# 新的邮件"
 

-#: src/gtk/quicksearch.c:211
+#: src/gtk/quicksearch.c:225

 msgid "messages which contain S in the message body"
 msgstr "在文件主体中包含 S 的邮件"
 
 msgid "messages which contain S in the message body"
 msgstr "在文件主体中包含 S 的邮件"
 

-#: src/gtk/quicksearch.c:212
+#: src/gtk/quicksearch.c:226

 msgid "messages which contain S in the whole message"
 msgstr "整篇文章中包含 S 的邮件"
 
 msgid "messages which contain S in the whole message"
 msgstr "整篇文章中包含 S 的邮件"
 

-#: src/gtk/quicksearch.c:213
+#: src/gtk/quicksearch.c:227

 msgid "messages carbon-copied to S"
 msgstr "被抄送给 S 的邮件"
 
 msgid "messages carbon-copied to S"
 msgstr "被抄送给 S 的邮件"
 

-#: src/gtk/quicksearch.c:214
+#: src/gtk/quicksearch.c:228

 msgid "message is either to: or cc: to S"
 msgstr "寄给或是副本抄送给 S 的邮件"
 
 msgid "message is either to: or cc: to S"
 msgstr "寄给或是副本抄送给 S 的邮件"
 

-#: src/gtk/quicksearch.c:215
+#: src/gtk/quicksearch.c:229

 msgid "deleted messages"
 msgstr "已删除的邮件"
 
 #. * how I can filter deleted messages *
 msgid "deleted messages"
 msgstr "已删除的邮件"
 
 #. * how I can filter deleted messages *

-#: src/gtk/quicksearch.c:216
+#: src/gtk/quicksearch.c:230

 msgid "messages which contain S in the Sender field"
 msgstr "在发信人栏中包含S的邮件"
 
 msgid "messages which contain S in the Sender field"
 msgstr "在发信人栏中包含S的邮件"
 

-#: src/gtk/quicksearch.c:217
+#: src/gtk/quicksearch.c:231

 msgid "true if execute \"S\" succeeds"
 msgstr "如果执行 \"S\"成功"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "如果执行 \"S\"成功"
 

-#: src/gtk/quicksearch.c:218
+#: src/gtk/quicksearch.c:232

 msgid "messages originating from user S"
 msgstr "由S所发出的邮件"
 
 msgid "messages originating from user S"
 msgstr "由S所发出的邮件"
 

-#: src/gtk/quicksearch.c:219
+#: src/gtk/quicksearch.c:233

 msgid "forwarded messages"
 msgstr "已转发的邮件"
 
 msgid "forwarded messages"
 msgstr "已转发的邮件"
 

-#: src/gtk/quicksearch.c:220
+#: src/gtk/quicksearch.c:234

 msgid "messages which contain header S"
 msgstr "在信头中包含S的邮件"
 
 msgid "messages which contain header S"
 msgstr "在信头中包含S的邮件"
 

-#: src/gtk/quicksearch.c:221
+#: src/gtk/quicksearch.c:235

 msgid "messages which contain S in Message-ID header"
 msgstr "在邮件信头中包含 S 的邮件"
 
 msgid "messages which contain S in Message-ID header"
 msgstr "在邮件信头中包含 S 的邮件"
 

-#: src/gtk/quicksearch.c:222
+#: src/gtk/quicksearch.c:236

 msgid "messages which contain S in inreplyto header"
 msgstr "在回复信头中包含S的邮件"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "在回复信头中包含S的邮件"
 

-#: src/gtk/quicksearch.c:223
+#: src/gtk/quicksearch.c:237

 msgid "locked messages"
 msgstr "已锁定的邮件"
 
 msgid "locked messages"
 msgstr "已锁定的邮件"
 

-#: src/gtk/quicksearch.c:224
+#: src/gtk/quicksearch.c:238

 msgid "messages which are in newsgroup S"
 msgstr "在新闻组S中的邮件"
 
 msgid "messages which are in newsgroup S"
 msgstr "在新闻组S中的邮件"
 

-#: src/gtk/quicksearch.c:225
+#: src/gtk/quicksearch.c:239

 msgid "new messages"
 msgstr "新邮件"
 
 msgid "new messages"
 msgstr "新邮件"
 

-#: src/gtk/quicksearch.c:226
+#: src/gtk/quicksearch.c:240

 msgid "old messages"
 msgstr "旧邮件"
 
 msgid "old messages"
 msgstr "旧邮件"
 

-#: src/gtk/quicksearch.c:227
+#: src/gtk/quicksearch.c:241

 msgid "incomplete messages (not entirely downloaded)"
 msgstr "不完整的邮件(未完全下载)"
 
 msgid "incomplete messages (not entirely downloaded)"
 msgstr "不完整的邮件(未完全下载)"
 

-#: src/gtk/quicksearch.c:228
+#: src/gtk/quicksearch.c:242

 msgid "messages which have been replied to"
 msgstr "已回复的邮件"
 
 msgid "messages which have been replied to"
 msgstr "已回复的邮件"
 

-#: src/gtk/quicksearch.c:229
+#: src/gtk/quicksearch.c:243

 msgid "read messages"
 msgstr "已读邮件"
 
 msgid "read messages"
 msgstr "已读邮件"
 

-#: src/gtk/quicksearch.c:230
+#: src/gtk/quicksearch.c:244

 msgid "messages which contain S in subject"
 msgstr "主题中包含S的邮件"
 
 msgid "messages which contain S in subject"
 msgstr "主题中包含S的邮件"
 

-#: src/gtk/quicksearch.c:231
+#: src/gtk/quicksearch.c:245

 msgid "messages whose score is equal to #"
 msgstr "得分与#一样高的邮件"
 
 msgid "messages whose score is equal to #"
 msgstr "得分与#一样高的邮件"
 

-#: src/gtk/quicksearch.c:232
+#: src/gtk/quicksearch.c:246

 msgid "messages whose score is greater than #"
 msgstr "得分较#高的邮件"
 
 msgid "messages whose score is greater than #"
 msgstr "得分较#高的邮件"
 

-#: src/gtk/quicksearch.c:233
+#: src/gtk/quicksearch.c:247

 msgid "messages whose score is lower than #"
 msgstr "得分较#低的邮件"
 
 msgid "messages whose score is lower than #"
 msgstr "得分较#低的邮件"
 

-#: src/gtk/quicksearch.c:234
+#: src/gtk/quicksearch.c:248

 msgid "messages whose size is equal to #"
 msgstr "文件与#一样大的邮件"
 
 msgid "messages whose size is equal to #"
 msgstr "文件与#一样大的邮件"
 

-#: src/gtk/quicksearch.c:235
+#: src/gtk/quicksearch.c:249

 msgid "messages whose size is greater than #"
 msgstr "文件比#大的邮件"
 
 msgid "messages whose size is greater than #"
 msgstr "文件比#大的邮件"
 

-#: src/gtk/quicksearch.c:236
+#: src/gtk/quicksearch.c:250

 msgid "messages whose size is smaller than #"
 msgstr "文件比#小的邮件"
 
 msgid "messages whose size is smaller than #"
 msgstr "文件比#小的邮件"
 

-#: src/gtk/quicksearch.c:237
+#: src/gtk/quicksearch.c:251

 msgid "messages which have been sent to S"
 msgstr "已经送给S的邮件"
 
 msgid "messages which have been sent to S"
 msgstr "已经送给S的邮件"
 

-#: src/gtk/quicksearch.c:238
+#: src/gtk/quicksearch.c:252

 msgid "marked messages"
 msgstr "已标记的邮件"
 
 msgid "marked messages"
 msgstr "已标记的邮件"
 

-#: src/gtk/quicksearch.c:239
+#: src/gtk/quicksearch.c:253

 msgid "unread messages"
 msgstr "未读邮件"
 
 msgid "unread messages"
 msgstr "未读邮件"
 

-#: src/gtk/quicksearch.c:240
+#: src/gtk/quicksearch.c:254

 msgid "messages which contain S in References header"
 msgstr "在References信息头里含有S的邮件"
 
 msgid "messages which contain S in References header"
 msgstr "在References信息头里含有S的邮件"
 

-#: src/gtk/quicksearch.c:241
+#: src/gtk/quicksearch.c:255

 msgid "messages returning 0 when passed to command"
 msgstr "邮件传送给命令进行处理时返回0"
 
 msgid "messages returning 0 when passed to command"
 msgstr "邮件传送给命令进行处理时返回0"
 

-#: src/gtk/quicksearch.c:242
+#: src/gtk/quicksearch.c:256

 msgid "messages which contain S in X-Label header"
 msgstr "在X-Label信息头里含有S的邮件"
 
 msgid "messages which contain S in X-Label header"
 msgstr "在X-Label信息头里含有S的邮件"
 

-#: src/gtk/quicksearch.c:244
+#: src/gtk/quicksearch.c:258

 msgid "logical AND operator"
 msgstr "逻辑运算AND"
 
 msgid "logical AND operator"
 msgstr "逻辑运算AND"
 

-#: src/gtk/quicksearch.c:245
+#: src/gtk/quicksearch.c:259

 msgid "logical OR operator"
 msgstr "逻辑运算OR"
 
 msgid "logical OR operator"
 msgstr "逻辑运算OR"
 

-#: src/gtk/quicksearch.c:246
+#: src/gtk/quicksearch.c:260

 msgid "logical NOT operator"
 msgstr "逻辑运算NOT"
 
 msgid "logical NOT operator"
 msgstr "逻辑运算NOT"
 

-#: src/gtk/quicksearch.c:247
+#: src/gtk/quicksearch.c:261

 msgid "case sensitive search"
 msgstr "区分大小写的搜寻"
 
 msgid "case sensitive search"
 msgstr "区分大小写的搜寻"
 

-#: src/gtk/quicksearch.c:249
+#: src/gtk/quicksearch.c:263

 msgid "all filtering expressions are allowed"
 msgstr "允许使用所有过滤表达式"
 
 msgid "all filtering expressions are allowed"
 msgstr "允许使用所有过滤表达式"
 

-#: src/gtk/quicksearch.c:257
+#: src/gtk/quicksearch.c:271

 msgid "Extended Search symbols"
 msgstr "用于扩展搜索的符号"
 
 msgid "Extended Search symbols"
 msgstr "用于扩展搜索的符号"
 


@@ -3113,39 +3261,43 @@ msgstr "用于扩展搜索的符号"
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME
 #. initial of sender
 #. S_COL_STATUS
 #. S_COL_MIME

-#: src/gtk/quicksearch.c:298 src/prefs_filtering_action.c:1044
-#: src/prefs_matcher.c:150 src/prefs_matcher.c:1653
-#: src/prefs_summary_column.c:82 src/quote_fmt.c:47 src/summaryview.c:462
+#: src/gtk/quicksearch.c:312 src/prefs_filtering_action.c:1069
+#: src/prefs_matcher.c:150 src/prefs_matcher.c:1684
+#: src/prefs_summary_column.c:82 src/quote_fmt.c:47 src/summaryview.c:466

 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
 #. date
 #. S_COL_SUBJECT

-#: src/gtk/quicksearch.c:302 src/prefs_filtering_action.c:1045
-#: src/prefs_matcher.c:151 src/prefs_matcher.c:1654
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:463
+#: src/gtk/quicksearch.c:316 src/prefs_filtering_action.c:1070
+#: src/prefs_matcher.c:151 src/prefs_matcher.c:1685
+#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:467

 msgid "From"
 msgstr "发信人"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM
 msgid "From"
 msgstr "发信人"
 
 #. S_COL_FROM
 #. subject
 #. S_COL_FROM

-#: src/gtk/quicksearch.c:306 src/prefs_filtering_action.c:1046
-#: src/prefs_matcher.c:151 src/prefs_matcher.c:1655
-#: src/prefs_summary_column.c:84 src/quote_fmt.c:48 src/summaryview.c:464
+#: src/gtk/quicksearch.c:320 src/prefs_filtering_action.c:1071
+#: src/prefs_matcher.c:151 src/prefs_matcher.c:1686
+#: src/prefs_summary_column.c:84 src/quote_fmt.c:48 src/summaryview.c:468

 msgid "To"
 msgstr "收信人"
 
 msgid "To"
 msgstr "收信人"
 

-#: src/gtk/quicksearch.c:317
+#: src/gtk/quicksearch.c:331

 msgid "Recursive"
 msgstr "搜索子邮件夹"
 
 msgid "Recursive"
 msgstr "搜索子邮件夹"
 

-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:341
+msgid "Sticky"
+msgstr ""
+
+#: src/gtk/quicksearch.c:373

 msgid "Clear"
 msgstr "清除"
 
 msgid "Clear"
 msgstr "清除"
 

-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:381

 msgid "Extended Symbols"
 msgstr "扩展符号"
 
 msgid "Extended Symbols"
 msgstr "扩展符号"
 


@@ -3163,7 +3315,7 @@ msgid "Signer"
 msgstr "歌者"
 
 #: src/gtk/sslcertwindow.c:126 src/gtk/sslcertwindow.c:147
 msgstr "歌者"
 
 #: src/gtk/sslcertwindow.c:126 src/gtk/sslcertwindow.c:147

-#: src/prefs_filtering.c:266 src/prefs_themes.c:888
+#: src/prefs_filtering.c:266 src/prefs_themes.c:915

 msgid "Name: "
 msgstr "名字"
 
 msgid "Name: "
 msgstr "名字"
 


@@ -3211,12 +3363,12 @@ msgid "Unknown SSL Certificate"
 msgstr "不明的SSL认证"
 
 #: src/gtk/sslcertwindow.c:268 src/gtk/sslcertwindow.c:321
 msgstr "不明的SSL认证"
 
 #: src/gtk/sslcertwindow.c:268 src/gtk/sslcertwindow.c:321

-msgid "Accept and save"
-msgstr "接受并处存"
+msgid "_Accept and save"
+msgstr "接受并保存(_A)"

 
 #: src/gtk/sslcertwindow.c:268 src/gtk/sslcertwindow.c:321
 
 #: src/gtk/sslcertwindow.c:268 src/gtk/sslcertwindow.c:321

-msgid "Cancel connection"
-msgstr "取消连接"
+msgid "_Cancel connection"
+msgstr "取消连接(_C)"

 
 #: src/gtk/sslcertwindow.c:286
 msgid "New certificate:"
 
 #: src/gtk/sslcertwindow.c:286
 msgid "New certificate:"


@@ -3239,11 +3391,11 @@ msgstr "查看认证(_V)"
 msgid "Changed SSL Certificate"
 msgstr "更改SSL认证"
 
 msgid "Changed SSL Certificate"
 msgstr "更改SSL认证"
 

-#: src/headerview.c:199 src/summaryview.c:2403 src/summaryview.c:2408
+#: src/headerview.c:197 src/summaryview.c:2419 src/summaryview.c:2424

 msgid "(No From)"
 msgstr "(没有发信人)"
 
 msgid "(No From)"
 msgstr "(没有发信人)"
 

-#: src/headerview.c:214 src/summaryview.c:2435 src/summaryview.c:2438
+#: src/headerview.c:212 src/summaryview.c:2448 src/summaryview.c:2451

 msgid "(No Subject)"
 msgstr "(没有主题)"
 
 msgid "(No Subject)"
 msgstr "(没有主题)"
 


@@ -3263,7 +3415,7 @@ msgstr "加载图片"
 msgid "Content-Type:"
 msgstr ""
 
 msgid "Content-Type:"
 msgstr ""
 

-#: src/imap.c:602
+#: src/imap.c:610

 msgid ""
 "\n"
 "\n"
 msgid ""
 "\n"
 "\n"


@@ -3275,31 +3427,31 @@ msgstr ""
 "CRAM-MD5登录方式仅仅在libetpan编译进了SASL支持并且CRAM-MD5 SASL插件已经加载的"
 "情况下可用。"
 
 "CRAM-MD5登录方式仅仅在libetpan编译进了SASL支持并且CRAM-MD5 SASL插件已经加载的"
 "情况下可用。"
 

-#: src/imap.c:611
+#: src/imap.c:619

 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "连接到 %s 失败: 登录被拒绝。%s"
 
 #, c-format
 msgid "Connection to %s failed: login refused.%s"
 msgstr "连接到 %s 失败: 登录被拒绝。%s"
 

-#: src/imap.c:615
-#,  c-format
+#: src/imap.c:623
+#, c-format

 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "连接到 %s 失败: 登录被拒绝。%s\n"
 
 msgid "Connection to %s failed: login refused.%s\n"
 msgstr "连接到 %s 失败: 登录被拒绝。%s\n"
 

-#: src/imap.c:632
+#: src/imap.c:640

 #, c-format
 msgid "Connecting to %s failed"
 msgstr "连接到 %s 失败"
 
 #, c-format
 msgid "Connecting to %s failed"
 msgstr "连接到 %s 失败"
 

-#: src/imap.c:637 src/imap.c:640
+#: src/imap.c:645 src/imap.c:648

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "与 %s 的IMAP4连接已经断开。正在重新连接...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "与 %s 的IMAP4连接已经断开。正在重新连接...\n"
 

-#: src/imap.c:734 src/inc.c:755 src/news.c:249 src/send_message.c:259
+#: src/imap.c:750 src/inc.c:755 src/news.c:260 src/send_message.c:259

 msgid "Insecure connection"
 msgstr "不安全的连接"
 
 msgid "Insecure connection"
 msgstr "不安全的连接"
 

-#: src/imap.c:735 src/inc.c:756 src/news.c:250 src/send_message.c:260
+#: src/imap.c:751 src/inc.c:756 src/news.c:261 src/send_message.c:260

 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Sylpheed-Claws. \n"
 msgid ""
 "This connection is configured to be secured using SSL, but SSL is not "
 "available in this build of Sylpheed-Claws. \n"


@@ -3307,171 +3459,167 @@ msgid ""
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""
 "Do you want to continue connecting to this server? The communication would "
 "not be secure."
 msgstr ""

-"该连接已经被配置为使用SSL确保安全，但本版本中并没有SSL功能(编译时没有加入)。"
-"\n"
+"该连接已经被配置为使用SSL确保安全，但本版本中并没有SSL功能(编译时没有加"
+"入)。\n"

 "请问是否要继续连接该服务器? 如果继续的话，通讯并不能保证是安全的。"
 
 "请问是否要继续连接该服务器? 如果继续的话，通讯并不能保证是安全的。"
 

-#: src/imap.c:741 src/inc.c:762 src/news.c:256 src/send_message.c:266
-msgid "Continue connecting"
-msgstr "继续连接"
+#: src/imap.c:757 src/inc.c:762 src/news.c:267 src/send_message.c:266
+msgid "Con_tinue connecting"
+msgstr "继续连接(_t)"

 
 

-#: src/imap.c:752
+#: src/imap.c:768

 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "连接到 IMAP4 服务器： %s..."
 
 #, c-format
 msgid "Connecting to IMAP4 server: %s..."
 msgstr "连接到 IMAP4 服务器： %s..."
 

-#: src/imap.c:784
+#: src/imap.c:800

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "无法连接到 IMAP4 服务器：%s:%d"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d"
 msgstr "无法连接到 IMAP4 服务器：%s:%d"
 

-#: src/imap.c:787
+#: src/imap.c:803

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到 IMAP4 服务器：%s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到 IMAP4 服务器：%s:%d\n"
 

-#: src/imap.c:816
+#: src/imap.c:832

 msgid "Can't start TLS session.\n"
 msgstr "无法启动TLS。\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "无法启动TLS。\n"
 

-#: src/imap.c:849
+#: src/imap.c:865

 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "正在连接 IMAP4 服务器 %s...\n"
 
 #, c-format
 msgid "Connecting to IMAP4 server %s...\n"
 msgstr "正在连接 IMAP4 服务器 %s...\n"
 

-#: src/imap.c:1254
+#: src/imap.c:1036
+msgid "Adding messages..."
+msgstr "正在添加邮件..."
+
+#: src/imap.c:1160
+msgid "Copying messages..."
+msgstr "正在拷贝邮件..."
+
+#: src/imap.c:1300

 msgid "can't set deleted flags\n"
 msgstr "不能设置删除标记\n"
 
 msgid "can't set deleted flags\n"
 msgstr "不能设置删除标记\n"
 

-#: src/imap.c:1259 src/imap.c:3345
+#: src/imap.c:1306 src/imap.c:3535

 msgid "can't expunge\n"
 msgstr "无法擦除\n"
 
 msgid "can't expunge\n"
 msgstr "无法擦除\n"
 

-#: src/imap.c:1684
+#: src/imap.c:1741

 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建收信夹：LIST失败\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建收信夹：LIST失败\n"
 

-#: src/imap.c:1698
+#: src/imap.c:1757

 msgid "can't create mailbox\n"
 msgstr "无法启动收信夹\n"
 
 msgid "can't create mailbox\n"
 msgstr "无法启动收信夹\n"
 

-#: src/imap.c:1741
+#: src/imap.c:1838

 msgid "New folder name must not contain the namespace path separator"
 msgstr "新目录并不能包含名字空间分隔符"
 
 msgid "New folder name must not contain the namespace path separator"
 msgstr "新目录并不能包含名字空间分隔符"
 

-#: src/imap.c:1774
+#: src/imap.c:1869

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱%s 重新命名为 %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱%s 重新命名为 %s\n"
 

-#: src/imap.c:1837
+#: src/imap.c:1933

 msgid "can't delete mailbox\n"
 msgstr "无法删除信夹\n"
 
 msgid "can't delete mailbox\n"
 msgstr "无法删除信夹\n"
 

-#: src/imap.c:2083
+#: src/imap.c:2182

 msgid "LIST failed\n"
 msgstr ""
 
 msgid "LIST failed\n"
 msgstr ""
 

-#: src/imap.c:2187
+#: src/imap.c:2290

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择邮件夹：%s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择邮件夹：%s\n"
 

-#: src/imap.c:2314
+#: src/imap.c:2465

 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4鉴权失败。\n"
 
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4鉴权失败。\n"
 

-#: src/imap.c:2501
+#: src/imap.c:2652

 msgid "Fetching message..."
 msgstr "正在收取邮件..."
 
 msgid "Fetching message..."
 msgstr "正在收取邮件..."
 

-#: src/imap.c:2519
-msgid "Adding messages..."
-msgstr "正在添加邮件..."
-
-#: src/imap.c:2542
-msgid "Copying messages..."
-msgstr "正在拷贝邮件..."
-
-#: src/imap.c:2668
+#: src/imap.c:2815

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv无法将UTF-7转换成%s\n"
 
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv无法将UTF-7转换成%s\n"
 

-#: src/imap.c:2698
+#: src/imap.c:2845

 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv无法将%s转换成UTF-7\n"
 
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv无法将%s转换成UTF-7\n"
 

-#: src/imap.c:2742
+#: src/imap.c:2889

 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv无法将UTF-8转换成UTF-7\n"
 
 msgid "iconv cannot convert UTF-8 to UTF-7\n"
 msgstr "iconv无法将UTF-8转换成UTF-7\n"
 

-#: src/imap.c:3331
+#: src/imap.c:3520

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "不能设置删除标记: %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "不能设置删除标记: %d\n"
 

-#: src/imap_gtk.c:57 src/mh_gtk.c:50
+#: src/imap_gtk.c:55 src/mh_gtk.c:50

 msgid "/Create _new folder..."
 msgstr "/创建新邮件夹(_n)..."
 
 msgid "/Create _new folder..."
 msgstr "/创建新邮件夹(_n)..."
 

-#: src/imap_gtk.c:58 src/mh_gtk.c:51
+#: src/imap_gtk.c:56 src/mh_gtk.c:51

 msgid "/_Rename folder..."
 msgstr "/重命名邮件夹(_R)..."
 
 msgid "/_Rename folder..."
 msgstr "/重命名邮件夹(_R)..."
 

-#: src/imap_gtk.c:59 src/mh_gtk.c:52
+#: src/imap_gtk.c:57 src/mh_gtk.c:52

 msgid "/M_ove folder..."
 msgstr "/移动邮件夹(_o)..."
 
 msgid "/M_ove folder..."
 msgstr "/移动邮件夹(_o)..."
 

-#: src/imap_gtk.c:60 src/mh_gtk.c:53
-msgid "/_Delete folder"
-msgstr "/删除邮件夹(_D)"
+#: src/imap_gtk.c:58 src/mh_gtk.c:53
+msgid "/_Delete folder..."
+msgstr "/删除邮件夹(_D)..."

 
 

-#: src/imap_gtk.c:62 src/news_gtk.c:56
+#: src/imap_gtk.c:60 src/news_gtk.c:54

 msgid "/Synchronise"
 msgstr "/同步"
 
 msgid "/Synchronise"
 msgstr "/同步"
 

-#: src/imap_gtk.c:63 src/news_gtk.c:57
+#: src/imap_gtk.c:61 src/news_gtk.c:55

 msgid "/Down_load messages"
 msgstr "/下载邮件(_l)"
 
 msgid "/Down_load messages"
 msgstr "/下载邮件(_l)"
 

-#: src/imap_gtk.c:65 src/mh_gtk.c:55 src/news_gtk.c:59
+#: src/imap_gtk.c:63 src/mh_gtk.c:55 src/news_gtk.c:57

 msgid "/_Check for new messages"
 msgstr "/检查新邮件(_C)"
 
 msgid "/_Check for new messages"
 msgstr "/检查新邮件(_C)"
 

-#: src/imap_gtk.c:66 src/mh_gtk.c:56
+#: src/imap_gtk.c:64 src/mh_gtk.c:56
+msgid "/C_heck for new folders"
+msgstr "/检查新邮件夹(_C)"
+
+#: src/imap_gtk.c:65 src/mh_gtk.c:57

 msgid "/R_ebuild folder tree"
 msgstr "/重新建立邮件夹树(_e)"
 
 msgid "/R_ebuild folder tree"
 msgstr "/重新建立邮件夹树(_e)"
 

-#: src/imap_gtk.c:68
-msgid "/IMAP4 _account settings"
-msgstr "/IMAP4帐号设置(_a)"
-
-#: src/imap_gtk.c:69
-msgid "/Remove _IMAP4 account"
-msgstr "/删除IMAP4帐号(_I)"
-
-#: src/imap_gtk.c:139
+#: src/imap_gtk.c:134

 msgid ""
 "Input the name of new folder:\n"
 msgid ""
 "Input the name of new folder:\n"

-"(if you want to create a folder to store subfolders,\n"
-" append '/' at the end of the name)"
+"(if you want to create a folder to store subfolders\n"
+"and no mails, append '/' at the end of the name)"

 msgstr ""
 "请输入新邮件夹的名字：\n"
 msgstr ""
 "请输入新邮件夹的名字：\n"

-"(如果想创建一个可包含子夹的邮件夹，\n"
+"(如果想创建一个可包含子夹但不包含邮件的邮件夹，\n"

 "请在名字的后面加上'/')"
 
 "请在名字的后面加上'/')"
 

-#: src/imap_gtk.c:188 src/mh_gtk.c:226
+#: src/imap_gtk.c:183 src/mh_gtk.c:228

 #, c-format
 msgid "Input new name for '%s':"
 msgstr "请输入'%s'的新名字："
 
 #, c-format
 msgid "Input new name for '%s':"
 msgstr "请输入'%s'的新名字："
 

-#: src/imap_gtk.c:190 src/mh_gtk.c:228
+#: src/imap_gtk.c:185 src/mh_gtk.c:230

 msgid "Rename folder"
 msgstr "重新命名邮件夹"
 
 msgid "Rename folder"
 msgstr "重新命名邮件夹"
 

-#: src/imap_gtk.c:217 src/mh_gtk.c:253
+#: src/imap_gtk.c:212 src/mh_gtk.c:255

 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."
 msgid ""
 "The folder could not be renamed.\n"
 "The new folder name is not allowed."


@@ -3479,16 +3627,7 @@ msgstr ""
 "不能重命名该目录。\n"
 "新指定的目录名不合法。"
 
 "不能重命名该目录。\n"
 "新指定的目录名不合法。"
 

-#: src/imap_gtk.c:278
-#, c-format
-msgid "Really delete IMAP4 account '%s'?"
-msgstr "确定删除IMAP4帐号'%s'？"
-
-#: src/imap_gtk.c:279
-msgid "Delete IMAP4 account"
-msgstr "清除IMAP4帐号"
-
-#: src/imap_gtk.c:325 src/mh_gtk.c:174
+#: src/imap_gtk.c:265 src/mh_gtk.c:176

 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted. Recovery "


@@ -3500,12 +3639,12 @@ msgstr ""
 "\n"
 "确实要删除吗？"
 
 "\n"
 "确实要删除吗？"
 

-#: src/imap_gtk.c:347 src/mh_gtk.c:196
+#: src/imap_gtk.c:287 src/mh_gtk.c:198

 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除邮件夹'%s'。"
 
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除邮件夹'%s'。"
 

-#: src/imap_gtk.c:405 src/news_gtk.c:328
+#: src/imap_gtk.c:347 src/news_gtk.c:264

 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "从 `%s' 下载邮件时发生错误。"
 #, c-format
 msgid "Error occurred while downloading messages in '%s'."
 msgstr "从 `%s' 下载邮件时发生错误。"


@@ -3526,7 +3665,7 @@ msgstr "导入文件："
 msgid "Destination dir:"
 msgstr "目标目录："
 
 msgid "Destination dir:"
 msgstr "目标目录："
 

-#: src/import.c:243
+#: src/import.c:242

 msgid "Select importing file"
 msgstr "选择导入文件"
 
 msgid "Select importing file"
 msgstr "选择导入文件"
 


@@ -3585,7 +3724,7 @@ msgid "R"
 msgstr ""
 
 #. S_COL_MARK
 msgstr ""
 
 #. S_COL_MARK

-#: src/importldif.c:726 src/summaryview.c:460
+#: src/importldif.c:726 src/summaryview.c:464

 msgid "S"
 msgstr "S"
 
 msgid "S"
 msgstr "S"
 


@@ -3720,7 +3859,7 @@ msgstr "授权失败"
 msgid "Locked"
 msgstr "已锁定"
 
 msgid "Locked"
 msgstr "已锁定"
 

-#: src/inc.c:587 src/plugins/spamassassin/spamassassin_gtk.c:245
+#: src/inc.c:587 src/plugins/spamassassin/spamassassin_gtk.c:246

 msgid "Timeout"
 msgstr "超时时间"
 
 msgid "Timeout"
 msgstr "超时时间"
 


@@ -3893,15 +4032,19 @@ msgstr "到 %s:%d 的连接超时"
 msgid "Incorporation cancelled\n"
 msgstr "合并操作被取消\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "合并操作被取消\n"
 

-#: src/inc.c:1439
+#: src/inc.c:1446

 #, c-format
 msgid "You're working offline. Override for %d minutes?"
 msgstr "您正在脱机工作。是否在%d分钟内更改？"
 
 #, c-format
 msgid "You're working offline. Override for %d minutes?"
 msgstr "您正在脱机工作。是否在%d分钟内更改？"
 

-#: src/inc.c:1446 src/toolbar.c:1960
+#: src/inc.c:1449 src/toolbar.c:1953

 msgid "Offline warning"
 msgstr "脱机警告"
 
 msgid "Offline warning"
 msgstr "脱机警告"
 

+#: src/inc.c:1451
+msgid "On_ly once"
+msgstr "仅一次(_l)"
+

 #: src/ldif.c:839
 msgid "Nick Name"
 msgstr "绰号"
 #: src/ldif.c:839
 msgid "Nick Name"
 msgstr "绰号"


@@ -3915,20 +4058,49 @@ msgstr ""
 "文件'%s'已存在。\n"
 "无法创建文件夹。"
 
 "文件'%s'已存在。\n"
 "无法创建文件夹。"
 

-#: src/main.c:291
+#: src/main.c:253
+#, c-format
+msgid ""
+"Configuration for Sylpheed-Claws %s found.\n"
+"Do you want to migrate this configuration?"
+msgstr ""
+"找到Sylpheed-Claws %s 的配置。\n"
+"是否要将该配置迁移过来?"
+
+#: src/main.c:256
+msgid "1.0.5 or previous"
+msgstr "1.0.5或者更老版本"
+
+#: src/main.c:256
+msgid "1.9.15 or previous"
+msgstr "1.9.15或者更老版本"
+
+#: src/main.c:259
+msgid "Migration of configuration"
+msgstr "迁移设置"
+
+#: src/main.c:264
+msgid "Copying configuration..."
+msgstr "正在拷贝设置..."
+
+#: src/main.c:269
+msgid "Migration failed!"
+msgstr "迁移失败！"
+
+#: src/main.c:333

 msgid "g_thread is not supported by glib.\n"
 msgstr "glib不支持g_thread。\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib不支持g_thread。\n"
 

-#: src/main.c:653
+#: src/main.c:711

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法： %s[选项]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法： %s[选项]...\n"
 

-#: src/main.c:655
+#: src/main.c:713

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [地址]       打开写信窗口"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [地址]       打开写信窗口"
 

-#: src/main.c:656
+#: src/main.c:714

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -3937,23 +4109,23 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         打开写新邮件窗口，并附上所指定的文件"
 
 "  --attach 文件1 [文件2]...\n"
 "                         打开写新邮件窗口，并附上所指定的文件"
 

-#: src/main.c:659
+#: src/main.c:717

 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 

-#: src/main.c:660
+#: src/main.c:718

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 

-#: src/main.c:661
+#: src/main.c:719

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送所有待发送邮件"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送所有待发送邮件"
 

-#: src/main.c:662
+#: src/main.c:720

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               显示所有邮件的数目"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               显示所有邮件的数目"
 

-#: src/main.c:663
+#: src/main.c:721

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -3961,68 +4133,68 @@ msgstr ""
 "  --status-full [邮件夹]...\n"
 "                         显示每个邮件夹的状态"
 
 "  --status-full [邮件夹]...\n"
 "                         显示每个邮件夹的状态"
 

-#: src/main.c:665
+#: src/main.c:723

 msgid "  --online               switch to online mode"
 msgstr "  --online               切换到联机模式"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               切换到联机模式"
 

-#: src/main.c:666
+#: src/main.c:724

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切换到脱机模式"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              切换到脱机模式"
 

-#: src/main.c:667
+#: src/main.c:725

 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 

-#: src/main.c:668
+#: src/main.c:726

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示本说明并结束程序"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示本说明并结束程序"
 

-#: src/main.c:669
+#: src/main.c:727

 msgid "  --version              output version information and exit"
 msgstr "  --version              显示版本内容并结束程序"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              显示版本内容并结束程序"
 

-#: src/main.c:670
+#: src/main.c:728

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           显示配置数据目录"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           显示配置数据目录"
 

-#: src/main.c:708 src/summaryview.c:5328
+#: src/main.c:766 src/summaryview.c:5422

 #, c-format
 msgid "Processing (%s)..."
 msgstr "正在处理(%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "正在处理(%s)..."
 

-#: src/main.c:711
+#: src/main.c:769

 msgid "top level folder"
 msgstr "最上一层邮件夹"
 
 msgid "top level folder"
 msgstr "最上一层邮件夹"
 

-#: src/main.c:769
+#: src/main.c:827

 msgid "Really quit?"
 msgstr "确定要退出吗?"
 
 msgid "Really quit?"
 msgstr "确定要退出吗?"
 

-#: src/main.c:770
+#: src/main.c:828

 msgid "Composing message exists."
 msgstr "所编辑的文件已经存在。"
 
 msgid "Composing message exists."
 msgstr "所编辑的文件已经存在。"
 

-#: src/main.c:771
-msgid "Draft them"
-msgstr "保存为草稿"
+#: src/main.c:829
+msgid "_Save to Draft"
+msgstr "存为草稿(_S)"

 
 

-#: src/main.c:771
-msgid "Discard them"
-msgstr "摈弃"
+#: src/main.c:829
+msgid "_Discard them"
+msgstr "摈弃(_D)"

 
 

-#: src/main.c:771
-msgid "Don't quit"
-msgstr "不退出"
+#: src/main.c:829
+msgid "Do_n't quit"
+msgstr "不退出(_n)"

 
 

-#: src/main.c:785
+#: src/main.c:843

 msgid "Queued messages"
 msgstr "待发送的邮件"
 
 msgid "Queued messages"
 msgstr "待发送的邮件"
 

-#: src/main.c:786
+#: src/main.c:844

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "待发送邮件夹内尚有邮件。要退出吗？"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "待发送邮件夹内尚有邮件。要退出吗？"
 

-#: src/main.c:1041 src/toolbar.c:1992
+#: src/main.c:1099 src/toolbar.c:1985

 msgid "Some errors occurred while sending queued messages."
 msgstr "发送排队中邮件时发生错误。"
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "发送排队中邮件时发生错误。"
 


@@ -4039,7 +4211,7 @@ msgid "/_File/_Add mailbox/MH..."
 msgstr "/文件(_F)/增加邮箱(_A)/MH格式..."
 
 #: src/mainwindow.c:453 src/mainwindow.c:455 src/mainwindow.c:460
 msgstr "/文件(_F)/增加邮箱(_A)/MH格式..."
 
 #: src/mainwindow.c:453 src/mainwindow.c:455 src/mainwindow.c:460

-#: src/mainwindow.c:462 src/mainwindow.c:465 src/mainwindow.c:467
+#: src/mainwindow.c:462 src/mainwindow.c:465 src/mainwindow.c:468

 #: src/messageview.c:159
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 #: src/messageview.c:159
 msgid "/_File/---"
 msgstr "/文件(_F)/---"


@@ -4076,717 +4248,725 @@ msgstr "/文件(_F)/打印(_P)..."
 msgid "/_File/_Work offline"
 msgstr "/文件(_F)/脱机工作(_W)"
 
 msgid "/_File/_Work offline"
 msgstr "/文件(_F)/脱机工作(_W)"
 

+#: src/mainwindow.c:467
+msgid "/_File/Synchronise folders"
+msgstr "/文件(_F)/同步邮件夹"
+

 #. {N_("/_File/_Close"),               "<alt>W", app_exit_cb, 0, NULL},
 #. {N_("/_File/_Close"),               "<alt>W", app_exit_cb, 0, NULL},

-#: src/mainwindow.c:469
+#: src/mainwindow.c:470

 msgid "/_File/E_xit"
 msgstr "/文件(_F)/退出(_x)"
 
 msgid "/_File/E_xit"
 msgstr "/文件(_F)/退出(_x)"
 

-#: src/mainwindow.c:474
+#: src/mainwindow.c:475

 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 
 msgid "/_Edit/Select _thread"
 msgstr "/编辑(_E)/选择线索(_T)"
 

-#: src/mainwindow.c:476 src/messageview.c:166
+#: src/mainwindow.c:477 src/messageview.c:166

 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在邮件中查找(_F)..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr "/编辑(_E)/在邮件中查找(_F)..."
 

-#: src/mainwindow.c:478
+#: src/mainwindow.c:479

 msgid "/_Edit/_Search folder..."
 msgstr "/编辑(_E)/在邮件夹中搜索(_S)..."
 
 msgid "/_Edit/_Search folder..."
 msgstr "/编辑(_E)/在邮件夹中搜索(_S)..."
 

-#: src/mainwindow.c:479
+#: src/mainwindow.c:480

 msgid "/_Edit/_Quick search"
 msgstr "/编辑(_E)/快速搜索(_Q)"
 
 msgid "/_Edit/_Quick search"
 msgstr "/编辑(_E)/快速搜索(_Q)"
 

-#: src/mainwindow.c:480 src/messageview.c:169 src/summaryview.c:451
+#: src/mainwindow.c:481 src/messageview.c:169 src/summaryview.c:452

 msgid "/_View"
 msgstr "/查看(_V)"
 
 msgid "/_View"
 msgstr "/查看(_V)"
 

-#: src/mainwindow.c:481
+#: src/mainwindow.c:482

 msgid "/_View/Show or hi_de"
 msgstr "/查看(_V)/显示或隐藏(_d)"
 
 msgid "/_View/Show or hi_de"
 msgstr "/查看(_V)/显示或隐藏(_d)"
 

-#: src/mainwindow.c:482
+#: src/mainwindow.c:483

 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/查看(_V)/显示或隐藏(_d)/邮件夹树(_F)"
 
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/查看(_V)/显示或隐藏(_d)/邮件夹树(_F)"
 

-#: src/mainwindow.c:484
+#: src/mainwindow.c:485

 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/查看(_V)/显示或隐藏(_d)/邮件内容(_M)"
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/查看(_V)/显示或隐藏(_d)/邮件内容(_M)"
 

-#: src/mainwindow.c:486
+#: src/mainwindow.c:487

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)"
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)"
 

-#: src/mainwindow.c:488
+#: src/mainwindow.c:489

 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/图像和文字(_a)"
 
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/图像和文字(_a)"
 

-#: src/mainwindow.c:490
+#: src/mainwindow.c:491

 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/图像(_I)"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/图像(_I)"
 

-#: src/mainwindow.c:492
+#: src/mainwindow.c:493

 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/文字(_T)"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/文字(_T)"
 

-#: src/mainwindow.c:494
+#: src/mainwindow.c:495

 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/均不显示(_N)"
 
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/均不显示(_N)"
 

-#: src/mainwindow.c:496
+#: src/mainwindow.c:497

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_d)/隐藏工具栏(_b)"
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/查看(_V)/显示或隐藏(_d)/隐藏工具栏(_b)"
 

-#: src/mainwindow.c:498 src/mainwindow.c:501 src/mainwindow.c:532
-#: src/mainwindow.c:556 src/mainwindow.c:665 src/mainwindow.c:669
+#: src/mainwindow.c:499 src/mainwindow.c:502 src/mainwindow.c:533
+#: src/mainwindow.c:557 src/mainwindow.c:668 src/mainwindow.c:672

 #: src/messageview.c:268
 msgid "/_View/---"
 msgstr "/显示(_V)/---"
 
 #: src/messageview.c:268
 msgid "/_View/---"
 msgstr "/显示(_V)/---"
 

-#: src/mainwindow.c:499
+#: src/mainwindow.c:500

 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/用单独窗口显示邮件夹树(_o)"
 
 msgid "/_View/Separate f_older tree"
 msgstr "/查看(_V)/用单独窗口显示邮件夹树(_o)"
 

-#: src/mainwindow.c:500
+#: src/mainwindow.c:501

 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/用单独窗口中显示邮件内容(_m)"
 
 msgid "/_View/Separate _message view"
 msgstr "/查看(_V)/用单独窗口中显示邮件内容(_m)"
 

-#: src/mainwindow.c:502
+#: src/mainwindow.c:503

 msgid "/_View/_Sort"
 msgstr "/查看(_V)/排序(_S)"
 
 msgid "/_View/_Sort"
 msgstr "/查看(_V)/排序(_S)"
 

-#: src/mainwindow.c:503
+#: src/mainwindow.c:504

 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按顺序(_n)"
 
 msgid "/_View/_Sort/by _number"
 msgstr "/查看(_V)/排序(_S)/按顺序(_n)"
 

-#: src/mainwindow.c:504
+#: src/mainwindow.c:505

 msgid "/_View/_Sort/by S_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_i)"
 
 msgid "/_View/_Sort/by S_ize"
 msgstr "/查看(_V)/排序(_S)/按大小(_i)"
 

-#: src/mainwindow.c:505
+#: src/mainwindow.c:506

 msgid "/_View/_Sort/by _Date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 
 msgid "/_View/_Sort/by _Date"
 msgstr "/查看(_V)/排序(_S)/按日期(_D)"
 

-#: src/mainwindow.c:506
+#: src/mainwindow.c:507

 msgid "/_View/_Sort/by _From"
 msgstr "/查看(_V)/排序(_S)/按发信人(_F)"
 
 msgid "/_View/_Sort/by _From"
 msgstr "/查看(_V)/排序(_S)/按发信人(_F)"
 

-#: src/mainwindow.c:507
+#: src/mainwindow.c:508

 msgid "/_View/_Sort/by _To"
 msgstr "/查看(_V)/排序(_S)/按收信人(_T)"
 
 msgid "/_View/_Sort/by _To"
 msgstr "/查看(_V)/排序(_S)/按收信人(_T)"
 

-#: src/mainwindow.c:508
+#: src/mainwindow.c:509

 msgid "/_View/_Sort/by S_ubject"
 msgstr "/查看(_V)/排序(_S)/按主题(_u)"
 
 msgid "/_View/_Sort/by S_ubject"
 msgstr "/查看(_V)/排序(_S)/按主题(_u)"
 

-#: src/mainwindow.c:509
+#: src/mainwindow.c:510

 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标签(_c)"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/查看(_V)/排序(_S)/按颜色标签(_c)"
 

-#: src/mainwindow.c:511
+#: src/mainwindow.c:512

 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_m)"
 
 msgid "/_View/_Sort/by _mark"
 msgstr "/查看(_V)/排序(_S)/按标记(_m)"
 

-#: src/mainwindow.c:512
+#: src/mainwindow.c:513

 msgid "/_View/_Sort/by _status"
 msgstr "/查看(_V)/排序(_S)/按状态(_s)"
 
 msgid "/_View/_Sort/by _status"
 msgstr "/查看(_V)/排序(_S)/按状态(_s)"
 

-#: src/mainwindow.c:513
+#: src/mainwindow.c:514

 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_t)"
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/查看(_V)/排序(_S)/按附件(_t)"
 

-#: src/mainwindow.c:515
+#: src/mainwindow.c:516

 msgid "/_View/_Sort/by score"
 msgstr "/查看(_V)/排序(_S)/按得分"
 
 msgid "/_View/_Sort/by score"
 msgstr "/查看(_V)/排序(_S)/按得分"
 

-#: src/mainwindow.c:516
+#: src/mainwindow.c:517

 msgid "/_View/_Sort/by locked"
 msgstr "/查看(_V)/排序(_S)/按锁定状态"
 
 msgid "/_View/_Sort/by locked"
 msgstr "/查看(_V)/排序(_S)/按锁定状态"
 

-#: src/mainwindow.c:517
+#: src/mainwindow.c:518

 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_o)"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/查看(_V)/排序(_S)/不排序(_o)"
 

-#: src/mainwindow.c:518 src/mainwindow.c:521
+#: src/mainwindow.c:519 src/mainwindow.c:522

 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/查看(_V)/排序(_S)/---"
 

-#: src/mainwindow.c:519
+#: src/mainwindow.c:520

 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 
 msgid "/_View/_Sort/Ascending"
 msgstr "/查看(_V)/排序(_S)/升序"
 

-#: src/mainwindow.c:520
+#: src/mainwindow.c:521

 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 
 msgid "/_View/_Sort/Descending"
 msgstr "/查看(_V)/排序(_S)/降序"
 

-#: src/mainwindow.c:522
+#: src/mainwindow.c:523

 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题排列(_A)"
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/查看(_V)/排序(_S)/按主题排列(_A)"
 

-#: src/mainwindow.c:524
+#: src/mainwindow.c:525

 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 
 msgid "/_View/Th_read view"
 msgstr "/查看(_V)/按线索查看(_R)"
 

-#: src/mainwindow.c:525
+#: src/mainwindow.c:526

 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 
 msgid "/_View/E_xpand all threads"
 msgstr "/查看(_V)/展开所有线索(_X)"
 

-#: src/mainwindow.c:526
+#: src/mainwindow.c:527

 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/折叠所有线索(_L)"
 
 msgid "/_View/Co_llapse all threads"
 msgstr "/查看(_V)/折叠所有线索(_L)"
 

-#: src/mainwindow.c:527
+#: src/mainwindow.c:528

 msgid "/_View/_Hide read messages"
 msgstr "/查看(_V)/隐藏已读邮件(_H) "
 
 msgid "/_View/_Hide read messages"
 msgstr "/查看(_V)/隐藏已读邮件(_H) "
 

-#: src/mainwindow.c:528
+#: src/mainwindow.c:529

 msgid "/_View/Set displayed _columns"
 msgstr "/查看(_V)/设置显示列(_c)..."
 
 msgid "/_View/Set displayed _columns"
 msgstr "/查看(_V)/设置显示列(_c)..."
 

-#: src/mainwindow.c:529
+#: src/mainwindow.c:530

 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr "/查看(_V)/设置显示列(_c)/邮件夹列表(_F)..."
 
 msgid "/_View/Set displayed _columns/in _Folder list..."
 msgstr "/查看(_V)/设置显示列(_c)/邮件夹列表(_F)..."
 

-#: src/mainwindow.c:530
+#: src/mainwindow.c:531

 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/查看(_V)/设置显示列(_c)/邮件列表(M)..."
 
 msgid "/_View/Set displayed _columns/in _Message list..."
 msgstr "/查看(_V)/设置显示列(_c)/邮件列表(M)..."
 

-#: src/mainwindow.c:533
+#: src/mainwindow.c:534

 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 
 msgid "/_View/_Go to"
 msgstr "/查看(_V)/转到(_G)"
 

-#: src/mainwindow.c:534
+#: src/mainwindow.c:535

 msgid "/_View/_Go to/_Prev message"
 msgstr "/查看(_V)/转到(_G)/上一封(_P)"
 
 msgid "/_View/_Go to/_Prev message"
 msgstr "/查看(_V)/转到(_G)/上一封(_P)"
 

-#: src/mainwindow.c:535
+#: src/mainwindow.c:536

 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一封(_N)"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/查看(_V)/转到(_G)/下一封(_N)"
 

-#: src/mainwindow.c:536 src/mainwindow.c:541 src/mainwindow.c:544
-#: src/mainwindow.c:549 src/mainwindow.c:554
+#: src/mainwindow.c:537 src/mainwindow.c:542 src/mainwindow.c:545
+#: src/mainwindow.c:550 src/mainwindow.c:555

 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/查看(_V)/转到(_G)/---"
 

-#: src/mainwindow.c:537
+#: src/mainwindow.c:538

 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/查看(_V)/转到(_G)/上一封未读邮件(_r)"
 
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/查看(_V)/转到(_G)/上一封未读邮件(_r)"
 

-#: src/mainwindow.c:539
+#: src/mainwindow.c:540

 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一封未读邮件(_e)"
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/查看(_V)/转到(_G)/下一封未读邮件(_e)"
 

-#: src/mainwindow.c:542
+#: src/mainwindow.c:543

 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/查看(_V)/转到(_G)/前一封新邮件(_w)"
 
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/查看(_V)/转到(_G)/前一封新邮件(_w)"
 

-#: src/mainwindow.c:543
+#: src/mainwindow.c:544

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一封新邮件(_x)"
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/查看(_V)/转到(_G)/下一封新邮件(_x)"
 

-#: src/mainwindow.c:545
+#: src/mainwindow.c:546

 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/查看(_V)/ 转到(_G)/前一封标记邮件(_M)"
 
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/查看(_V)/ 转到(_G)/前一封标记邮件(_M)"
 

-#: src/mainwindow.c:547
+#: src/mainwindow.c:548

 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/ 转到(_G)/下一封标记邮件(_a)"
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/查看(_V)/ 转到(_G)/下一封标记邮件(_a)"
 

-#: src/mainwindow.c:550
+#: src/mainwindow.c:551

 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/查看(_V)/ 转到(_G)/前一封标签邮件(_l)"
 
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/查看(_V)/ 转到(_G)/前一封标签邮件(_l)"
 

-#: src/mainwindow.c:552
+#: src/mainwindow.c:553

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/ 转到(_G)/下一封标签邮件(_b)"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/查看(_V)/ 转到(_G)/下一封标签邮件(_b)"
 

-#: src/mainwindow.c:555
+#: src/mainwindow.c:556

 msgid "/_View/_Go to/Other _folder..."
 msgstr "/查看(_V)/转到(_G)/其他邮件夹(_f)"
 
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/查看(_V)/转到(_G)/其他邮件夹(_f)"
 

-#: src/mainwindow.c:559 src/mainwindow.c:566 src/messageview.c:172
+#: src/mainwindow.c:560 src/mainwindow.c:567 src/messageview.c:172

 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_e)/---"
 
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_e)/---"
 

-#: src/mainwindow.c:563 src/messageview.c:176
+#: src/mainwindow.c:564 src/messageview.c:176

 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_e)"
 
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_e)"
 

-#: src/mainwindow.c:564 src/messageview.c:177
+#: src/mainwindow.c:565 src/messageview.c:177

 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符集(_e)/自动侦测(_A)"
 
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/查看(_V)/字符集(_e)/自动侦测(_A)"
 

-#: src/mainwindow.c:567 src/messageview.c:180
+#: src/mainwindow.c:568 src/messageview.c:180

 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符集(_e)/7bit ascii (US-ASCI_I)"
 
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符集(_e)/7bit ascii (US-ASCI_I)"
 

-#: src/mainwindow.c:569 src/messageview.c:183
+#: src/mainwindow.c:570 src/messageview.c:183

 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符集(_e)/Unicode (_UTF-8)"
 
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符集(_e)/Unicode (_UTF-8)"
 

-#: src/mainwindow.c:573 src/messageview.c:186
+#: src/mainwindow.c:574 src/messageview.c:186

 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_1)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_1)"
 

-#: src/mainwindow.c:575 src/messageview.c:188
+#: src/mainwindow.c:576 src/messageview.c:188

 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-15)"
 
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-15)"
 

-#: src/mainwindow.c:579 src/messageview.c:191
+#: src/mainwindow.c:578
+msgid "/_View/Character _encoding/Western European (Windows-1252)"
+msgstr "/查看(_V)/字符集(_e)/西欧(Windows-1252)"
+
+#: src/mainwindow.c:582 src/messageview.c:191

 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_2) "
 
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_2) "
 

-#: src/mainwindow.c:583 src/messageview.c:194
+#: src/mainwindow.c:586 src/messageview.c:194

 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
 

-#: src/mainwindow.c:585 src/messageview.c:196
+#: src/mainwindow.c:588 src/messageview.c:196

 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-_4) "
 
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-_4) "
 

-#: src/mainwindow.c:589 src/messageview.c:199
+#: src/mainwindow.c:592 src/messageview.c:199

 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符集(_e)/希腊 (ISO-8859-_7)"
 
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符集(_e)/希腊 (ISO-8859-_7)"
 

-#: src/mainwindow.c:593 src/messageview.c:202
+#: src/mainwindow.c:596 src/messageview.c:202

 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符集(_e)/希伯来 (ISO-8859-_8)"
 
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符集(_e)/希伯来 (ISO-8859-_8)"
 

-#: src/mainwindow.c:595 src/messageview.c:204
+#: src/mainwindow.c:598 src/messageview.c:204

 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符集(_e)/希伯来 (Windows-1251)"
 
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符集(_e)/希伯来 (Windows-1251)"
 

-#: src/mainwindow.c:599 src/messageview.c:207
+#: src/mainwindow.c:602 src/messageview.c:207

 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符集(_e)/土耳其 (ISO-8859-_9)"
 
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符集(_e)/土耳其 (ISO-8859-_9)"
 

-#: src/mainwindow.c:603 src/messageview.c:210
+#: src/mainwindow.c:606 src/messageview.c:210

 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
 

-#: src/mainwindow.c:605 src/messageview.c:212
+#: src/mainwindow.c:608 src/messageview.c:212

 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-_R)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-_R)"
 

-#: src/mainwindow.c:607 src/messageview.c:214
+#: src/mainwindow.c:610 src/messageview.c:214

 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-U)"
 
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-U)"
 

-#: src/mainwindow.c:609 src/messageview.c:216
+#: src/mainwindow.c:612 src/messageview.c:216

 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (Windows-1251)"
 
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符集(_e)/斯拉夫 (Windows-1251)"
 

-#: src/mainwindow.c:613 src/messageview.c:219
+#: src/mainwindow.c:616 src/messageview.c:219

 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-_JP)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-_JP)"
 

-#: src/mainwindow.c:615 src/messageview.c:221
+#: src/mainwindow.c:618 src/messageview.c:221

 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-JP-2)"
 
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-JP-2)"
 

-#: src/mainwindow.c:617 src/messageview.c:223
+#: src/mainwindow.c:620 src/messageview.c:223

 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符集(_e)/日文 (_EUC-JP)"
 
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/查看(_V)/字符集(_e)/日文 (_EUC-JP)"
 

-#: src/mainwindow.c:619 src/messageview.c:225
+#: src/mainwindow.c:622 src/messageview.c:225

 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符集(_e)/日文 (_Shift__JIS)"
 
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/查看(_V)/字符集(_e)/日文 (_Shift__JIS)"
 

-#: src/mainwindow.c:623 src/messageview.c:228
+#: src/mainwindow.c:626 src/messageview.c:228

 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符集(_e)/简体中文 (_GB2312)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符集(_e)/简体中文 (_GB2312)"
 

-#: src/mainwindow.c:625 src/messageview.c:230
+#: src/mainwindow.c:628 src/messageview.c:230

 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符集(_e)/简体中文 (GBK)"
 
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符集(_e)/简体中文 (GBK)"
 

-#: src/mainwindow.c:627 src/messageview.c:232
+#: src/mainwindow.c:630 src/messageview.c:232

 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符集(_e)/繁体中文 (_Big5)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符集(_e)/繁体中文 (_Big5)"
 

-#: src/mainwindow.c:629 src/messageview.c:234
+#: src/mainwindow.c:632 src/messageview.c:234

 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符集(_e)/繁体中文 (EUC-_TW)"
 
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符集(_e)/繁体中文 (EUC-_TW)"
 

-#: src/mainwindow.c:631 src/messageview.c:236
+#: src/mainwindow.c:634 src/messageview.c:236

 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符集(_e)/中文 (ISO-2022-_CN)"
 
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/查看(_V)/字符集(_e)/中文 (ISO-2022-_CN)"
 

-#: src/mainwindow.c:635 src/messageview.c:239
+#: src/mainwindow.c:638 src/messageview.c:239

 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符集(_e)/韩文 (EUC-_KR) "
 
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符集(_e)/韩文 (EUC-_KR) "
 

-#: src/mainwindow.c:637 src/messageview.c:241
+#: src/mainwindow.c:640 src/messageview.c:241

 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符集(_e)/韩文 (ISO-2022-KR)"
 
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符集(_e)/韩文 (ISO-2022-KR)"
 

-#: src/mainwindow.c:641 src/messageview.c:244
+#: src/mainwindow.c:644 src/messageview.c:244

 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符集(_e)/泰国 (TIS-620)"
 
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符集(_e)/泰国 (TIS-620)"
 

-#: src/mainwindow.c:643 src/messageview.c:246
+#: src/mainwindow.c:646 src/messageview.c:246

 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符集(_e)/泰国 (Windows-874)"
 
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符集(_e)/泰国 (Windows-874)"
 

-#: src/mainwindow.c:650 src/mainwindow.c:656 src/messageview.c:253
+#: src/mainwindow.c:653 src/mainwindow.c:659 src/messageview.c:253

 #: src/messageview.c:259
 msgid "/_View/Decode/---"
 msgstr "/查看(_V)/解码/---"
 
 #: src/messageview.c:259
 msgid "/_View/Decode/---"
 msgstr "/查看(_V)/解码/---"
 

-#: src/mainwindow.c:653 src/messageview.c:256
+#: src/mainwindow.c:656 src/messageview.c:256

 msgid "/_View/Decode"
 msgstr "/查看(_V)/解码"
 
 msgid "/_View/Decode"
 msgstr "/查看(_V)/解码"
 

-#: src/mainwindow.c:654 src/messageview.c:257
+#: src/mainwindow.c:657 src/messageview.c:257

 msgid "/_View/Decode/_Auto detect"
 msgstr "/查看(_V)/解码/自动侦测(_A)"
 
 msgid "/_View/Decode/_Auto detect"
 msgstr "/查看(_V)/解码/自动侦测(_A)"
 

-#: src/mainwindow.c:657 src/messageview.c:260
+#: src/mainwindow.c:660 src/messageview.c:260

 msgid "/_View/Decode/_8bit"
 msgstr "/查看(_V)/解码/_8位"
 
 msgid "/_View/Decode/_8bit"
 msgstr "/查看(_V)/解码/_8位"
 

-#: src/mainwindow.c:658 src/messageview.c:261
+#: src/mainwindow.c:661 src/messageview.c:261

 msgid "/_View/Decode/_Quoted printable"
 msgstr "/查看(_V)/解码/_Quoted Printable"
 
 msgid "/_View/Decode/_Quoted printable"
 msgstr "/查看(_V)/解码/_Quoted Printable"
 

-#: src/mainwindow.c:659 src/messageview.c:262
+#: src/mainwindow.c:662 src/messageview.c:262

 msgid "/_View/Decode/_Base64"
 msgstr "/查看(_V)/解码/_Base64"
 
 msgid "/_View/Decode/_Base64"
 msgstr "/查看(_V)/解码/_Base64"
 

-#: src/mainwindow.c:660 src/messageview.c:263
+#: src/mainwindow.c:663 src/messageview.c:263

 msgid "/_View/Decode/_Uuencode"
 msgstr "/查看(_V)/解码/_Uuencode"
 
 msgid "/_View/Decode/_Uuencode"
 msgstr "/查看(_V)/解码/_Uuencode"
 

-#: src/mainwindow.c:666 src/summaryview.c:452
+#: src/mainwindow.c:669 src/summaryview.c:453

 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_w)"
 
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_w)"
 

-#: src/mainwindow.c:667 src/messageview.c:269
+#: src/mainwindow.c:670 src/messageview.c:269

 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_a)"
 
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_a)"
 

-#: src/mainwindow.c:668
+#: src/mainwindow.c:671

 msgid "/_View/Show all headers"
 msgstr "/查看(_V)/显示所有信息头"
 
 msgid "/_View/Show all headers"
 msgstr "/查看(_V)/显示所有信息头"
 

-#: src/mainwindow.c:670
+#: src/mainwindow.c:673

 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新邮件摘要列表(_U)"
 
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新邮件摘要列表(_U)"
 

-#: src/mainwindow.c:673
+#: src/mainwindow.c:676

 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/收取(_v)"
 
 msgid "/_Message/Recei_ve"
 msgstr "/邮件(_M)/收取(_v)"
 

-#: src/mainwindow.c:674
+#: src/mainwindow.c:677

 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/收取(_v)/从当前帐号收取(_c)"
 
 msgid "/_Message/Recei_ve/Get from _current account"
 msgstr "/邮件(_M)/收取(_v)/从当前帐号收取(_c)"
 

-#: src/mainwindow.c:676
+#: src/mainwindow.c:679

 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/收取(_v)/从所有帐号收取(_c)"
 
 msgid "/_Message/Recei_ve/Get from _all accounts"
 msgstr "/邮件(_M)/收取(_v)/从所有帐号收取(_c)"
 

-#: src/mainwindow.c:678
+#: src/mainwindow.c:681

 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/邮件(_M)/收取(_v)/取消(_g)"
 
 msgid "/_Message/Recei_ve/Cancel receivin_g"
 msgstr "/邮件(_M)/收取(_v)/取消(_g)"
 

-#: src/mainwindow.c:680
+#: src/mainwindow.c:683

 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/收取(_v)/---"
 
 msgid "/_Message/Recei_ve/---"
 msgstr "/邮件(_M)/收取(_v)/---"
 

-#: src/mainwindow.c:681
+#: src/mainwindow.c:684

 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/送出待发送邮件(_S)"
 
 msgid "/_Message/_Send queued messages"
 msgstr "/邮件(_M)/送出待发送邮件(_S)"
 

-#: src/mainwindow.c:682
-msgid "/_Message/Synchronise folders"
-msgstr "/邮件(_M)/同步邮件夹"
-
-#: src/mainwindow.c:684
+#: src/mainwindow.c:686

 msgid "/_Message/Compose a_n email message"
 msgstr "/邮件(_M)/写信(_n)"
 
 msgid "/_Message/Compose a_n email message"
 msgstr "/邮件(_M)/写信(_n)"
 

-#: src/mainwindow.c:685
+#: src/mainwindow.c:687

 msgid "/_Message/Compose a news message"
 msgstr "/邮件(_M)/写新闻群留言"
 
 msgid "/_Message/Compose a news message"
 msgstr "/邮件(_M)/写新闻群留言"
 

-#: src/mainwindow.c:686 src/messageview.c:276
+#: src/mainwindow.c:688 src/messageview.c:276

 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回信(_R)"
 
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回信(_R)"
 

-#: src/mainwindow.c:687
+#: src/mainwindow.c:689

 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回信给(_y)"
 
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回信给(_y)"
 

-#: src/mainwindow.c:688 src/messageview.c:277
+#: src/mainwindow.c:690 src/messageview.c:277

 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回信给(_y)/全部人(_a)"
 
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回信给(_y)/全部人(_a)"
 

-#: src/mainwindow.c:689 src/messageview.c:279
+#: src/mainwindow.c:691 src/messageview.c:279

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回信给(_y)/发信人(_s)"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回信给(_y)/发信人(_s)"
 

-#: src/mainwindow.c:690 src/messageview.c:281
+#: src/mainwindow.c:692 src/messageview.c:281

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回信给(_y)/邮件列表(_l)"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回信给(_y)/邮件列表(_l)"
 

-#: src/mainwindow.c:692
+#: src/mainwindow.c:694

 msgid "/_Message/Follow-up and reply to"
 msgstr "/邮件(_M)/Follow-up and reply to"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/邮件(_M)/Follow-up and reply to"
 

-#: src/mainwindow.c:694 src/messageview.c:284
+#: src/mainwindow.c:696 src/messageview.c:284

 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 

-#: src/mainwindow.c:695
+#: src/mainwindow.c:697 src/messageview.c:285
+msgid "/_Message/For_ward as attachment"
+msgstr "/邮件(_M)/以附加文件形式转发(_A)"
+
+#: src/mainwindow.c:698

 msgid "/_Message/Redirect"
 msgstr "/邮件(_M)/重定向"
 
 msgid "/_Message/Redirect"
 msgstr "/邮件(_M)/重定向"
 

-#: src/mainwindow.c:697
+#: src/mainwindow.c:700

 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_o)"
 
 msgid "/_Message/M_ove..."
 msgstr "/邮件(_M)/移动(_o)"
 

-#: src/mainwindow.c:698
+#: src/mainwindow.c:701

 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)"
 
 msgid "/_Message/_Copy..."
 msgstr "/邮件(_M)/复制(_C)"
 

-#: src/mainwindow.c:699
+#: src/mainwindow.c:702

 msgid "/_Message/Move to _trash"
 msgstr "/邮件(_M)/移动到垃圾桶(_t)"
 
 msgid "/_Message/Move to _trash"
 msgstr "/邮件(_M)/移动到垃圾桶(_t)"
 

-#: src/mainwindow.c:700
+#: src/mainwindow.c:703

 msgid "/_Message/_Delete..."
 msgstr "/邮件(_M)/删除(_D)..."
 
 msgid "/_Message/_Delete..."
 msgstr "/邮件(_M)/删除(_D)..."
 

-#: src/mainwindow.c:701
+#: src/mainwindow.c:704

 msgid "/_Message/Cancel a news message"
 msgstr "/邮件(_M)/取消新邮件"
 
 msgid "/_Message/Cancel a news message"
 msgstr "/邮件(_M)/取消新邮件"
 

-#: src/mainwindow.c:703
+#: src/mainwindow.c:706

 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 
 msgid "/_Message/_Mark"
 msgstr "/邮件(_M)/标记(_M)"
 

-#: src/mainwindow.c:704
+#: src/mainwindow.c:707

 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/ 标记(_M) "
 
 msgid "/_Message/_Mark/_Mark"
 msgstr "/邮件(_M)/标记(_M)/ 标记(_M) "
 

-#: src/mainwindow.c:705
+#: src/mainwindow.c:708

 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/ 不标记(_U)"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/邮件(_M)/标记(_M)/ 不标记(_U)"
 

-#: src/mainwindow.c:706
+#: src/mainwindow.c:709

 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/邮件(_M)/标记(_M)/---"
 

-#: src/mainwindow.c:707
+#: src/mainwindow.c:710

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_e)"
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/邮件(_M)/标记(_M)/标记为未读(_e)"
 

-#: src/mainwindow.c:708
+#: src/mainwindow.c:711

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_d)"
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/邮件(_M)/标记(_M)/标记为已读(_d)"
 

-#: src/mainwindow.c:710
+#: src/mainwindow.c:713

 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/标记所有为已读(_r)"
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/邮件(_M)/标记(_M)/标记所有为已读(_r)"
 

-#: src/mainwindow.c:712 src/messageview.c:289
+#: src/mainwindow.c:715 src/messageview.c:289

 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_e)"
 
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_e)"
 

-#: src/mainwindow.c:715
+#: src/mainwindow.c:718

 msgid "/_Tools/_Address book..."
 msgstr "/工具(_T)/地址簿(_A)..."
 
 msgid "/_Tools/_Address book..."
 msgstr "/工具(_T)/地址簿(_A)..."
 

-#: src/mainwindow.c:716 src/messageview.c:293
+#: src/mainwindow.c:719 src/messageview.c:293

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/将发信人加入地址簿中(_k)"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/将发信人加入地址簿中(_k)"
 

-#: src/mainwindow.c:718
+#: src/mainwindow.c:721

 msgid "/_Tools/_Harvest addresses"
 msgstr "/工具(_T)/批量提取通讯地址(_H)"
 
 msgid "/_Tools/_Harvest addresses"
 msgstr "/工具(_T)/批量提取通讯地址(_H)"
 

-#: src/mainwindow.c:719
+#: src/mainwindow.c:722

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/工具(_T)/批量提取通讯地址(_H)/从邮件夹(_F)"
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/工具(_T)/批量提取通讯地址(_H)/从邮件夹(_F)"
 

-#: src/mainwindow.c:721
+#: src/mainwindow.c:724

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/工具(_T)/批量提取通讯地址(_H)/从邮件(_M)"
 
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/工具(_T)/批量提取通讯地址(_H)/从邮件(_M)"
 

-#: src/mainwindow.c:724
+#: src/mainwindow.c:727

 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤邮件夹中所有邮件(_F)"
 
 msgid "/_Tools/_Filter all messages in folder"
 msgstr "/工具(_T)/过滤邮件夹中所有邮件(_F)"
 

-#: src/mainwindow.c:726
+#: src/mainwindow.c:729

 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选定的邮件(_F)"
 
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选定的邮件(_F)"
 

-#: src/mainwindow.c:728 src/messageview.c:296
+#: src/mainwindow.c:731 src/messageview.c:296

 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 

-#: src/mainwindow.c:729 src/messageview.c:298
+#: src/mainwindow.c:732 src/messageview.c:298

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动创建(_A)"
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动创建(_A)"
 

-#: src/mainwindow.c:731 src/messageview.c:300
+#: src/mainwindow.c:734 src/messageview.c:300

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/由发信人(_F)"
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/由发信人(_F)"
 

-#: src/mainwindow.c:733 src/messageview.c:302
+#: src/mainwindow.c:736 src/messageview.c:302

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/由收信人(_T)"
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/由收信人(_T)"
 

-#: src/mainwindow.c:735 src/messageview.c:304
+#: src/mainwindow.c:738 src/messageview.c:304

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/由主题(_S)"
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/由主题(_S)"
 

-#: src/mainwindow.c:737
+#: src/mainwindow.c:740

 msgid "/_Tools/C_reate processing rule"
 msgstr "/工具(_T)/创建处理规则(_r)"
 
 msgid "/_Tools/C_reate processing rule"
 msgstr "/工具(_T)/创建处理规则(_r)"
 

-#: src/mainwindow.c:738
+#: src/mainwindow.c:741

 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr "/工具(_T)/创建处理规则(_r)/自动创建(_A)"
 
 msgid "/_Tools/C_reate processing rule/_Automatically"
 msgstr "/工具(_T)/创建处理规则(_r)/自动创建(_A)"
 

-#: src/mainwindow.c:740
+#: src/mainwindow.c:743

 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr "/工具(_T)/创建处理规则(_r)/由发信人(_F)"
 
 msgid "/_Tools/C_reate processing rule/by _From"
 msgstr "/工具(_T)/创建处理规则(_r)/由发信人(_F)"
 

-#: src/mainwindow.c:742
+#: src/mainwindow.c:745

 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr "/工具(_T)/创建处理规则(_r)/由收信人(_T)"
 
 msgid "/_Tools/C_reate processing rule/by _To"
 msgstr "/工具(_T)/创建处理规则(_r)/由收信人(_T)"
 

-#: src/mainwindow.c:744
+#: src/mainwindow.c:747

 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/工具(_T)/创建处理规则(_r)/由主题(_S)"
 
 msgid "/_Tools/C_reate processing rule/by _Subject"
 msgstr "/工具(_T)/创建处理规则(_r)/由主题(_S)"
 

-#: src/mainwindow.c:749
+#: src/mainwindow.c:752

 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr "/工具(_T)/检查所有邮件夹中的新邮件(_e)"
 
 msgid "/_Tools/Ch_eck for new messages in all folders"
 msgstr "/工具(_T)/检查所有邮件夹中的新邮件(_e)"
 

-#: src/mainwindow.c:751
+#: src/mainwindow.c:754

 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复邮件(_p)"
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/工具(_T)/删除重复邮件(_p)"
 

-#: src/mainwindow.c:753
+#: src/mainwindow.c:756

 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr "/工具(_T)/删除重复邮件(_p)/选定邮件夹"
 
 msgid "/_Tools/Delete du_plicated messages/In selected folder"
 msgstr "/工具(_T)/删除重复邮件(_p)/选定邮件夹"
 

-#: src/mainwindow.c:755
+#: src/mainwindow.c:758

 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr "/工具(_T)/删除重复邮件(_p)/所有邮件夹"
 
 msgid "/_Tools/Delete du_plicated messages/In all folders"
 msgstr "/工具(_T)/删除重复邮件(_p)/所有邮件夹"
 

-#: src/mainwindow.c:758
+#: src/mainwindow.c:761

 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/执行(_x)"
 
 msgid "/_Tools/E_xecute"
 msgstr "/工具(_T)/执行(_x)"
 

-#: src/mainwindow.c:761
+#: src/mainwindow.c:764

 msgid "/_Tools/SSL cer_tificates..."
 msgstr "/工具(_T)/SSL认证(_t)"
 
 msgid "/_Tools/SSL cer_tificates..."
 msgstr "/工具(_T)/SSL认证(_t)"
 

-#: src/mainwindow.c:765
+#: src/mainwindow.c:768

 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/日志窗口(_L)"
 
 msgid "/_Tools/_Log window"
 msgstr "/工具(_T)/日志窗口(_L)"
 

-#: src/mainwindow.c:767
+#: src/mainwindow.c:770

 msgid "/_Configuration"
 msgstr "/设置(_C)"
 
 msgid "/_Configuration"
 msgstr "/设置(_C)"
 

-#: src/mainwindow.c:768
+#: src/mainwindow.c:771

 msgid "/_Configuration/C_hange current account"
 msgstr "/设置(_C)/更改目前帐号(_h)"
 
 msgid "/_Configuration/C_hange current account"
 msgstr "/设置(_C)/更改目前帐号(_h)"
 

-#: src/mainwindow.c:770
+#: src/mainwindow.c:773

 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/设置(_C)/目前帐号的偏好设置(_P)..."
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/设置(_C)/目前帐号的偏好设置(_P)..."
 

-#: src/mainwindow.c:772
+#: src/mainwindow.c:775

 msgid "/_Configuration/Create _new account..."
 msgstr "/设置(_C)/创建新帐号(_n)..."
 
 msgid "/_Configuration/Create _new account..."
 msgstr "/设置(_C)/创建新帐号(_n)..."
 

-#: src/mainwindow.c:774
+#: src/mainwindow.c:777

 msgid "/_Configuration/_Edit accounts..."
 msgstr "/设置(_C)/编辑帐号(_E)..."
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/设置(_C)/编辑帐号(_E)..."
 

-#: src/mainwindow.c:776
+#: src/mainwindow.c:779

 msgid "/_Configuration/---"
 msgstr "/设置(_C)/---"
 
 msgid "/_Configuration/---"
 msgstr "/设置(_C)/---"
 

-#: src/mainwindow.c:777
+#: src/mainwindow.c:780

 msgid "/_Configuration/P_references..."
 msgstr "/设置(_C)/偏好(_r)..."
 
 msgid "/_Configuration/P_references..."
 msgstr "/设置(_C)/偏好(_r)..."
 

-#: src/mainwindow.c:779
+#: src/mainwindow.c:782

 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr "/设置(_C)/预处理(_o)..."
 
 msgid "/_Configuration/Pre-pr_ocessing..."
 msgstr "/设置(_C)/预处理(_o)..."
 

-#: src/mainwindow.c:781
+#: src/mainwindow.c:784

 msgid "/_Configuration/Post-pro_cessing..."
 msgstr "/设置(_C)/后处理(_c)..."
 
 msgid "/_Configuration/Post-pro_cessing..."
 msgstr "/设置(_C)/后处理(_c)..."
 

-#: src/mainwindow.c:783
+#: src/mainwindow.c:786

 msgid "/_Configuration/_Filtering..."
 msgstr "/设置(_C)/过滤(_F)..."
 
 msgid "/_Configuration/_Filtering..."
 msgstr "/设置(_C)/过滤(_F)..."
 

-#: src/mainwindow.c:785
+#: src/mainwindow.c:788

 msgid "/_Configuration/_Templates..."
 msgstr "/设置(_C)/模板(_T)..."
 
 msgid "/_Configuration/_Templates..."
 msgstr "/设置(_C)/模板(_T)..."
 

-#: src/mainwindow.c:786
+#: src/mainwindow.c:789

 msgid "/_Configuration/_Actions..."
 msgstr "/设置(_C)/动作(_A)..."
 
 msgid "/_Configuration/_Actions..."
 msgstr "/设置(_C)/动作(_A)..."
 

-#: src/mainwindow.c:787
+#: src/mainwindow.c:790

 msgid "/_Configuration/Plu_gins..."
 msgstr "/设置(_C)/插件(_g)..."
 
 msgid "/_Configuration/Plu_gins..."
 msgstr "/设置(_C)/插件(_g)..."
 

-#: src/mainwindow.c:790
+#: src/mainwindow.c:793

 msgid "/_Help/_Manual"
 msgstr "/求助(_H)/联机手册(_M)"
 
 msgid "/_Help/_Manual"
 msgstr "/求助(_H)/联机手册(_M)"
 

-#: src/mainwindow.c:791
+#: src/mainwindow.c:794

 msgid "/_Help/_FAQ"
 msgstr "/帮助(_H)/关于(_F)"
 
 msgid "/_Help/_FAQ"
 msgstr "/帮助(_H)/关于(_F)"
 

-#: src/mainwindow.c:792
+#: src/mainwindow.c:795

 msgid "/_Help/_Online User-contributed FAQ"
 msgstr "/帮助(_H)/在线FAQ(_O)"
 
 msgid "/_Help/_Online User-contributed FAQ"
 msgstr "/帮助(_H)/在线FAQ(_O)"
 

-#: src/mainwindow.c:794
+#: src/mainwindow.c:797

 msgid "/_Help/---"
 msgstr "/求助(_H)/---"
 
 msgid "/_Help/---"
 msgstr "/求助(_H)/---"
 

-#: src/mainwindow.c:941
+#: src/mainwindow.c:944

 msgid "You are online. Click the icon to go offline"
 msgstr "目前在线。点击图标转到离线模式。"
 
 msgid "You are online. Click the icon to go offline"
 msgstr "目前在线。点击图标转到离线模式。"
 

-#: src/mainwindow.c:945
+#: src/mainwindow.c:948

 msgid "You are offline. Click the icon to go online"
 msgstr "目前离线。点击图标转到在线状态。"
 
 msgid "You are offline. Click the icon to go online"
 msgstr "目前离线。点击图标转到在线状态。"
 

-#: src/mainwindow.c:962
+#: src/mainwindow.c:965

 msgid "Select account"
 msgstr "选择帐号"
 
 msgid "Select account"
 msgstr "选择帐号"
 

-#: src/mainwindow.c:1325 src/mainwindow.c:1366 src/mainwindow.c:1394
-#: src/prefs_folder_item.c:573
+#: src/mainwindow.c:1327 src/mainwindow.c:1368 src/mainwindow.c:1396
+#: src/prefs_folder_item.c:592

 msgid "Untitled"
 msgstr "未命名"
 
 msgid "Untitled"
 msgstr "未命名"
 

-#: src/mainwindow.c:1395
+#: src/mainwindow.c:1397

 msgid "none"
 msgstr "无"
 
 msgid "none"
 msgstr "无"
 

-#: src/mainwindow.c:1658
+#: src/mainwindow.c:1660

 msgid "Delete all messages in trash folders?"
 msgstr "清空垃圾桶内所有邮件？"
 
 msgid "Delete all messages in trash folders?"
 msgstr "清空垃圾桶内所有邮件？"
 

-#: src/mainwindow.c:1677
+#: src/mainwindow.c:1679

 msgid "Add mailbox"
 msgstr "添加邮箱"
 
 msgid "Add mailbox"
 msgstr "添加邮箱"
 

-#: src/mainwindow.c:1678
+#: src/mainwindow.c:1680

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -4795,16 +4975,16 @@ msgstr ""
 "请输入邮箱位置。\n"
 "如果指定已存在的邮箱，它将会自动被扫描。"
 
 "请输入邮箱位置。\n"
 "如果指定已存在的邮箱，它将会自动被扫描。"
 

-#: src/mainwindow.c:1684
+#: src/mainwindow.c:1686

 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "邮箱 `%s' 已经存在。"
 
 #, c-format
 msgid "The mailbox '%s' already exists."
 msgstr "邮箱 `%s' 已经存在。"
 

-#: src/mainwindow.c:1689 src/setup.c:51
+#: src/mainwindow.c:1691 src/setup.c:51

 msgid "Mailbox"
 msgstr "邮箱"
 
 msgid "Mailbox"
 msgstr "邮箱"
 

-#: src/mainwindow.c:1694 src/setup.c:54
+#: src/mainwindow.c:1696 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 "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -4813,50 +4993,50 @@ msgstr ""
 "创建邮箱失败。\n"
 "也许某些文件已经存在，或者你没有足够的写权限。"
 
 "创建邮箱失败。\n"
 "也许某些文件已经存在，或者你没有足够的写权限。"
 

-#: src/mainwindow.c:2057
-msgid "Sylpheed - Folder View"
-msgstr "Sylpheed - 邮件夹"
+#: src/mainwindow.c:2051
+msgid "Sylpheed-Claws - Folder View"
+msgstr "Sylpheed-Claws - 邮件夹"

 
 

-#: src/mainwindow.c:2093 src/messageview.c:438 src/messageview.c:780
-msgid "Sylpheed - Message View"
-msgstr "Sylpheed - 邮件"
+#: src/mainwindow.c:2087 src/messageview.c:778
+msgid "Sylpheed-Claws - Message View"
+msgstr "Sylpheed-Claws - 邮件"

 
 

-#: src/mainwindow.c:2484 src/plugins/trayicon/trayicon.c:342
+#: src/mainwindow.c:2478 src/plugins/trayicon/trayicon.c:366

 msgid "Exit"
 msgstr "退出"
 
 msgid "Exit"
 msgstr "退出"
 

-#: src/mainwindow.c:2484 src/plugins/trayicon/trayicon.c:342
-msgid "Exit this program?"
-msgstr "退出本程序？"
+#: src/mainwindow.c:2478
+msgid "Exit Sylpheed-Claws?"
+msgstr "退出 Sylpheed-Claws?"

 
 

-#: src/mainwindow.c:2636
+#: src/mainwindow.c:2630

 msgid "Folder synchronisation"
 msgstr "邮件夹同步"
 
 msgid "Folder synchronisation"
 msgstr "邮件夹同步"
 

-#: src/mainwindow.c:2637
+#: src/mainwindow.c:2631

 msgid "Do you want to synchronise your folders now?"
 msgstr "是否现在同步邮件夹?"
 
 msgid "Do you want to synchronise your folders now?"
 msgstr "是否现在同步邮件夹?"
 

-#: src/mainwindow.c:2899
+#: src/mainwindow.c:2893

 msgid "Deleting duplicated messages..."
 msgstr "删除重复的邮件..."
 
 msgid "Deleting duplicated messages..."
 msgstr "删除重复的邮件..."
 

-#: src/mainwindow.c:2933
+#: src/mainwindow.c:2927

 #, 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"
 
 #, 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:3074 src/summaryview.c:4127
+#: src/mainwindow.c:3068 src/summaryview.c:4204

 msgid "Processing rules to apply before folder rules"
 msgstr "在邮件夹规则前应用的规则"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "在邮件夹规则前应用的规则"
 

-#: src/mainwindow.c:3082
+#: src/mainwindow.c:3076

 msgid "Processing rules to apply after folder rules"
 msgstr "在邮件夹规则后应用的规则"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "在邮件夹规则后应用的规则"
 

-#: src/mainwindow.c:3090 src/summaryview.c:4136
+#: src/mainwindow.c:3084 src/summaryview.c:4213

 msgid "Filtering configuration"
 msgstr "过滤/处理 配置"
 
 msgid "Filtering configuration"
 msgstr "过滤/处理 配置"
 


@@ -4873,7 +5053,7 @@ msgstr "在当前邮件中查找"
 msgid "Find text:"
 msgstr "查找文字"
 
 msgid "Find text:"
 msgstr "查找文字"
 

-#: src/message_search.c:141 src/prefs_matcher.c:559 src/summary_search.c:244
+#: src/message_search.c:141 src/prefs_matcher.c:574 src/summary_search.c:244

 msgid "Case sensitive"
 msgstr "大小写敏感"
 
 msgid "Case sensitive"
 msgstr "大小写敏感"
 


@@ -4909,10 +5089,6 @@ msgstr "/查看(_V)/显示所有信息头(_H)"
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 

-#: src/messageview.c:285
-msgid "/_Message/For_ward as attachment"
-msgstr "/邮件(_M)/以附加文件形式转发(_A)"
-

 #: src/messageview.c:287
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_t)"
 #: src/messageview.c:287
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_t)"


@@ -4937,6 +5113,10 @@ msgstr "/工具(_T)/创建处理规则/由收信人(_T)"
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/工具(_T)/创建处理规则/由主题(_S)"
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/工具(_T)/创建处理规则/由主题(_S)"
 

+#: src/messageview.c:438
+msgid "Sylpheed - Message View"
+msgstr "Sylpheed - 邮件"
+

 #: src/messageview.c:543
 msgid "<No Return-Path found>"
 msgstr "<未找到回信地址>"
 #: src/messageview.c:543
 msgid "<No Return-Path found>"
 msgstr "<未找到回信地址>"


@@ -4944,8 +5124,8 @@ msgstr "<未找到回信地址>"
 #: src/messageview.c:551
 #, c-format
 msgid ""
 #: src/messageview.c:551
 #, c-format
 msgid ""

-"The notification address to which the return receipt is to be sent\n"
-"does not correspond to the return path:\n"
+"The notification address to which the return receipt is\n"
+"to be sent does not correspond to the return path:\n"

 "Notification address: %s\n"
 "Return path: %s\n"
 "It is advised to not to send the return receipt."
 "Notification address: %s\n"
 "Return path: %s\n"
 "It is advised to not to send the return receipt."


@@ -4955,50 +5135,54 @@ msgstr ""
 " 返回路径: %s\n"
 "建议不发送此回执。"
 
 " 返回路径: %s\n"
 "建议不发送此回执。"
 

-#: src/messageview.c:559 src/messageview.c:579
-msgid "+Don't Send"
-msgstr "+不发送"
+#: src/messageview.c:557 src/messageview.c:575
+msgid "_Send"
+msgstr "发送(_S)"
+
+#: src/messageview.c:558 src/messageview.c:575
+msgid "+_Don't Send"
+msgstr "+不发送(_D)"

 
 

-#: src/messageview.c:572
+#: src/messageview.c:571

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 "officially addressed to you.\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 "officially addressed to you.\n"

-"It is advised to not to send the return .receipt."
+"It is advised to not to send the return receipt."

 msgstr ""
 "该邮件要求返回邮件收到通知。\n"
 "但您的邮件地址并未在来信的'收信人(To:)'和'抄送人(CC:)'中被指定。\n"
 msgstr ""
 "该邮件要求返回邮件收到通知。\n"
 "但您的邮件地址并未在来信的'收信人(To:)'和'抄送人(CC:)'中被指定。\n"

+"\n"

 "建议不发送回执。"
 
 "建议不发送回执。"
 

-#: src/messageview.c:1040 src/mimeview.c:1160 src/summaryview.c:3494
-#: src/summaryview.c:3497 src/textview.c:2066
+#: src/messageview.c:1038 src/mimeview.c:1221 src/summaryview.c:3571
+#: src/summaryview.c:3574 src/textview.c:2176

 msgid "Save as"
 msgstr "保存为"
 
 msgid "Save as"
 msgstr "保存为"
 

-#: src/messageview.c:1045 src/mimeview.c:1033 src/summaryview.c:3503
-#: src/textview.c:2078
+#: src/messageview.c:1043 src/mimeview.c:1094 src/textview.c:2188

 msgid "Overwrite"
 msgstr "覆盖"
 
 msgid "Overwrite"
 msgstr "覆盖"
 

-#: src/messageview.c:1046
+#: src/messageview.c:1044

 msgid "Overwrite existing file?"
 msgstr "附加已有文件？"
 
 msgid "Overwrite existing file?"
 msgstr "附加已有文件？"
 

-#: src/messageview.c:1054 src/summaryview.c:3514 src/summaryview.c:3517
-#: src/summaryview.c:3532
+#: src/messageview.c:1052 src/summaryview.c:3591 src/summaryview.c:3594
+#: src/summaryview.c:3609

 #, c-format
 msgid "Can't save the file '%s'."
 msgstr "无法保存文件 '%s'。"
 
 #, c-format
 msgid "Can't save the file '%s'."
 msgstr "无法保存文件 '%s'。"
 

-#: src/messageview.c:1125
+#: src/messageview.c:1124

 msgid "This message asks for a return receipt."
 msgstr "该邮件要求返回回执"
 
 msgid "This message asks for a return receipt."
 msgstr "该邮件要求返回回执"
 

-#: src/messageview.c:1126
+#: src/messageview.c:1125

 msgid "Send receipt"
 msgstr "发送回执"
 
 msgid "Send receipt"
 msgstr "发送回执"
 

-#: src/messageview.c:1166
+#: src/messageview.c:1165

 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."
 msgid ""
 "This message has been partially retrieved,\n"
 "and has been deleted from the server."


@@ -5006,7 +5190,7 @@ msgstr ""
 "这封邮件只有部分被取回, \n"
 "并已经从服务器删除了. "
 
 "这封邮件只有部分被取回, \n"
 "并已经从服务器删除了. "
 

-#: src/messageview.c:1172
+#: src/messageview.c:1171

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -5015,15 +5199,15 @@ msgstr ""
 "这封邮件只有部分被取回; \n"
 "它是 %s"
 
 "这封邮件只有部分被取回; \n"
 "它是 %s"
 

-#: src/messageview.c:1176 src/messageview.c:1198
+#: src/messageview.c:1175 src/messageview.c:1197

 msgid "Mark for download"
 msgstr "标记为待下载"
 
 msgid "Mark for download"
 msgstr "标记为待下载"
 

-#: src/messageview.c:1177 src/messageview.c:1189
+#: src/messageview.c:1176 src/messageview.c:1188

 msgid "Mark for deletion"
 msgstr "标记为待删除"
 
 msgid "Mark for deletion"
 msgstr "标记为待删除"
 

-#: src/messageview.c:1182
+#: src/messageview.c:1181

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -5032,12 +5216,12 @@ msgstr ""
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被下载."
 
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被下载."
 

-#: src/messageview.c:1187 src/messageview.c:1200
+#: src/messageview.c:1186 src/messageview.c:1199

 #: src/prefs_filtering_action.c:153
 msgid "Unmark"
 msgstr "不标记"
 
 #: src/prefs_filtering_action.c:153
 msgid "Unmark"
 msgstr "不标记"
 

-#: src/messageview.c:1193
+#: src/messageview.c:1192

 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"
 #, c-format
 msgid ""
 "This message has been partially retrieved;\n"


@@ -5046,11 +5230,11 @@ msgstr ""
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被删除."
 
 "这封邮件只有部分被取回; \n"
 "它 %s 并将会被删除."
 

-#: src/messageview.c:1269
+#: src/messageview.c:1268

 msgid "Return Receipt Notification"
 msgstr "返回回执"
 
 msgid "Return Receipt Notification"
 msgstr "返回回执"
 

-#: src/messageview.c:1270
+#: src/messageview.c:1269

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -5059,19 +5243,19 @@ msgstr ""
 "该邮件发送到了您的多个帐号中。\n"
 "请选择用以发送回执的帐号: "
 
 "该邮件发送到了您的多个帐号中。\n"
 "请选择用以发送回执的帐号: "
 

-#: src/messageview.c:1274
-msgid "Send Notification"
-msgstr "发送通知"
+#: src/messageview.c:1273
+msgid "_Send Notification"
+msgstr "发送通知(_S)"

 
 

-#: src/messageview.c:1274
-msgid "+Cancel"
-msgstr "+取消"
+#: src/messageview.c:1273
+msgid "+_Cancel"
+msgstr "+取消(_C)"

 
 

-#: src/messageview.c:1336 src/summaryview.c:3566 src/toolbar.c:175
+#: src/messageview.c:1335 src/summaryview.c:3643 src/toolbar.c:175

 msgid "Print"
 msgstr "打印"
 
 msgid "Print"
 msgstr "打印"
 

-#: src/messageview.c:1337 src/summaryview.c:3567
+#: src/messageview.c:1336 src/summaryview.c:3644

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -5080,7 +5264,7 @@ msgstr ""
 "请输入用于打印的命令行:\n"
 "(`%s' 将被替换为文件名)"
 
 "请输入用于打印的命令行:\n"
 "(`%s' 将被替换为文件名)"
 

-#: src/messageview.c:1343 src/summaryview.c:3573
+#: src/messageview.c:1342 src/summaryview.c:3650

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -5089,7 +5273,7 @@ msgstr ""
 "打印命令行无效:\n"
 "`%s'"
 
 "打印命令行无效:\n"
 "`%s'"
 

-#: src/messageview.c:1354 src/summaryview.c:3546
+#: src/messageview.c:1353 src/summaryview.c:3623

 msgid "Cannot print: the message doesn't contain text."
 msgstr "无法打印: 该邮件不包含任何文字。"
 
 msgid "Cannot print: the message doesn't contain text."
 msgstr "无法打印: 该邮件不包含任何文字。"
 


@@ -5098,11 +5282,11 @@ msgstr "无法打印: 该邮件不包含任何文字。"
 msgid "can't copy message %s to %s\n"
 msgstr "无法将邮件 %s 拷贝到 %s\n"
 
 msgid "can't copy message %s to %s\n"
 msgstr "无法将邮件 %s 拷贝到 %s\n"
 

-#: src/mh_gtk.c:58
+#: src/mh_gtk.c:59

 msgid "/Remove _mailbox"
 msgstr "/删除邮箱(_m)"
 
 msgid "/Remove _mailbox"
 msgstr "/删除邮箱(_m)"
 

-#: src/mh_gtk.c:319
+#: src/mh_gtk.c:323

 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox '%s' ?\n"


@@ -5111,70 +5295,82 @@ msgstr ""
 "确定要删除邮箱'%s'？\n"
 "(其中的邮件并不会从磁盘中删除)"
 
 "确定要删除邮箱'%s'？\n"
 "(其中的邮件并不会从磁盘中删除)"
 

-#: src/mh_gtk.c:321
+#: src/mh_gtk.c:325

 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 

-#: src/mimeview.c:153
+#: src/mimeview.c:154

 msgid "/_Open"
 msgstr "/打开(_O)"
 
 msgid "/_Open"
 msgstr "/打开(_O)"
 

-#: src/mimeview.c:154
+#: src/mimeview.c:155

 msgid "/Open _with..."
 msgstr "/打开方式(_w)..."
 
 msgid "/Open _with..."
 msgstr "/打开方式(_w)..."
 

-#: src/mimeview.c:155
+#: src/mimeview.c:156

 msgid "/_Display as text"
 msgstr "/以文本方式显示(_D)"
 
 msgid "/_Display as text"
 msgstr "/以文本方式显示(_D)"
 

-#: src/mimeview.c:156
+#: src/mimeview.c:157 src/summaryview.c:458

 msgid "/_Save as..."
 msgstr "/另存为(_S)..."
 
 msgid "/_Save as..."
 msgstr "/另存为(_S)..."
 

-#: src/mimeview.c:157
+#: src/mimeview.c:158

 msgid "/Save _all..."
 msgstr "/全部保存(_a)..."
 
 msgid "/Save _all..."
 msgstr "/全部保存(_a)..."
 

-#: src/mimeview.c:196
+#: src/mimeview.c:197

 msgid "MIME Type"
 msgstr "MIME类型"
 
 msgid "MIME Type"
 msgstr "MIME类型"
 

-#: src/mimeview.c:641
-msgid "Check"
-msgstr "检查"
+#: src/mimeview.c:644
+msgid "Check signature"
+msgstr "检查签名"

 
 

-#: src/mimeview.c:646 src/mimeview.c:651 src/mimeview.c:656
-msgid "Full info"
-msgstr "全名"
+#: src/mimeview.c:649 src/mimeview.c:654 src/mimeview.c:659
+msgid "View full information"
+msgstr "查看详细信息"

 
 

-#: src/mimeview.c:661
+#: src/mimeview.c:664

 msgid "Check again"
 msgstr "再次检查"
 
 msgid "Check again"
 msgstr "再次检查"
 

-#: src/mimeview.c:969 src/mimeview.c:1041 src/mimeview.c:1220
-#: src/mimeview.c:1252
+#: src/mimeview.c:673
+msgid "Click the icon or hit 'C' to check it."
+msgstr "点击图标或者按'C'选中。"
+
+#: src/mimeview.c:696
+msgid "Checking signature..."
+msgstr "正在检查签名..."
+
+#: src/mimeview.c:730
+msgid "Go back to email"
+msgstr "回到邮件"
+
+#: src/mimeview.c:1021 src/mimeview.c:1102 src/mimeview.c:1281
+#: src/mimeview.c:1314

 msgid "Can't save the part of multipart message."
 msgstr "无法保存复合邮件的这一部分"
 
 msgid "Can't save the part of multipart message."
 msgstr "无法保存复合邮件的这一部分"
 

-#: src/mimeview.c:1031 src/textview.c:2076
+#: src/mimeview.c:1091 src/textview.c:2186

 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆盖已有文件 '%s' 吗？"
 
 #, c-format
 msgid "Overwrite existing file '%s'?"
 msgstr "覆盖已有文件 '%s' 吗？"
 

-#: src/mimeview.c:1068
+#: src/mimeview.c:1129

 msgid "Select destination folder"
 msgstr "选择目的邮件夹"
 
 msgid "Select destination folder"
 msgstr "选择目的邮件夹"
 

-#: src/mimeview.c:1075
+#: src/mimeview.c:1136

 #, c-format
 msgid "'%s' is not a directory."
 msgstr "`%s'不是一个目录。"
 
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "`%s'不是一个目录。"
 

-#: src/mimeview.c:1266
+#: src/mimeview.c:1328

 msgid "Open with"
 msgstr "打开方式"
 
 msgid "Open with"
 msgstr "打开方式"
 

-#: src/mimeview.c:1267
+#: src/mimeview.c:1329

 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"


@@ -5183,120 +5379,103 @@ msgstr ""
 "请输入用于打开文件的命令行:\n"
 "(`%s' 将被替换为文件名)"
 
 "请输入用于打开文件的命令行:\n"
 "(`%s' 将被替换为文件名)"
 

-#: src/news.c:209
+#: src/news.c:220

 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "正在与 %s 建立NNTP连接:%d ...\n"
 
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "正在与 %s 建立NNTP连接:%d ...\n"
 

-#: src/news.c:297
+#: src/news.c:308

 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "与 %s:%d 的NNTP连接已经断开。正在重新连接...\n"
 
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "与 %s:%d 的NNTP连接已经断开。正在重新连接...\n"
 

-#: src/news.c:427
+#: src/news.c:438

 msgid "can't retrieve newsgroup list\n"
 msgstr "无法取回新闻组列表。\n"
 
 msgid "can't retrieve newsgroup list\n"
 msgstr "无法取回新闻组列表。\n"
 

-#: src/news.c:540
+#: src/news.c:551

 msgid "can't post article.\n"
 msgstr "无法发送帖子.\n"
 
 msgid "can't post article.\n"
 msgstr "无法发送帖子.\n"
 

-#: src/news.c:566
+#: src/news.c:577

 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "无法取回帖子 %d\n"
 
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "无法取回帖子 %d\n"
 

-#: src/news.c:615
+#: src/news.c:626

 #, c-format
 msgid "can't select group: %s\n"
 msgstr "无法选择新闻组: %s\n"
 
 #, c-format
 msgid "can't select group: %s\n"
 msgstr "无法选择新闻组: %s\n"
 

-#: src/news.c:843
+#: src/news.c:854

 #, c-format
 msgid "can't set group: %s\n"
 msgstr "无法设置群组: %s\n"
 
 #, c-format
 msgid "can't set group: %s\n"
 msgstr "无法设置群组: %s\n"
 

-#: src/news.c:851
+#: src/news.c:862

 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "无效帖子索引范围: %d - %d \n"
 
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "无效帖子索引范围: %d - %d \n"
 

-#: src/news.c:871
+#: src/news.c:882

 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "提取 %s 时发生错误.\n"
 
 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "提取 %s 时发生错误.\n"
 

-#: src/news.c:889
+#: src/news.c:900

 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "正在提取xover %d于 %s...\n"
 
 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "正在提取xover %d于 %s...\n"
 

-#: src/news.c:893 src/news.c:978
+#: src/news.c:904 src/news.c:989

 msgid "can't get xover\n"
 msgstr "无法取得xover\n"
 
 msgid "can't get xover\n"
 msgstr "无法取得xover\n"
 

-#: src/news.c:902 src/news.c:988
+#: src/news.c:913 src/news.c:999

 msgid "error occurred while getting xover.\n"
 msgstr "提取xover时发生错误。\n"
 
 msgid "error occurred while getting xover.\n"
 msgstr "提取xover时发生错误。\n"
 

-#: src/news.c:908 src/news.c:1001
+#: src/news.c:919 src/news.c:1012

 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr ""
 
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr ""
 

-#: src/news.c:923 src/news.c:942 src/news.c:1020 src/news.c:1055
+#: src/news.c:934 src/news.c:953 src/news.c:1031 src/news.c:1066

 msgid "can't get xhdr\n"
 msgstr "无法取得xhdr\n"
 
 msgid "can't get xhdr\n"
 msgstr "无法取得xhdr\n"
 

-#: src/news.c:932 src/news.c:951 src/news.c:1032 src/news.c:1067
+#: src/news.c:943 src/news.c:962 src/news.c:1043 src/news.c:1078

 msgid "error occurred while getting xhdr.\n"
 msgstr "提取xhdr时发生错误。\n"
 
 msgid "error occurred while getting xhdr.\n"
 msgstr "提取xhdr时发生错误。\n"
 

-#: src/news.c:974
+#: src/news.c:985

 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""
 
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""
 

-#: src/news_gtk.c:53
+#: src/news_gtk.c:51

 msgid "/_Subscribe to newsgroup..."
 msgstr "/订阅新闻组 (_S)..."
 
 msgid "/_Subscribe to newsgroup..."
 msgstr "/订阅新闻组 (_S)..."
 

-#: src/news_gtk.c:54
+#: src/news_gtk.c:52

 msgid "/_Unsubscribe newsgroup"
 msgstr "/退订新闻组 (_S)..."
 
 msgid "/_Unsubscribe newsgroup"
 msgstr "/退订新闻组 (_S)..."
 

-#: src/news_gtk.c:61
-msgid "/News _account settings"
-msgstr "/新闻组帐号设置(_a)"
-
-#: src/news_gtk.c:62
-msgid "/Remove _news account"
-msgstr "/清除帐号(_n)"
-
-#: src/news_gtk.c:208
+#: src/news_gtk.c:201

 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "确定要退订新闻组'%s'？"
 
 #, c-format
 msgid "Really unsubscribe newsgroup '%s'?"
 msgstr "确定要退订新闻组'%s'？"
 

-#: src/news_gtk.c:209
+#: src/news_gtk.c:202

 msgid "Unsubscribe newsgroup"
 msgstr "退订新闻组"
 
 msgid "Unsubscribe newsgroup"
 msgstr "退订新闻组"
 

-#: src/news_gtk.c:258
-#, c-format
-msgid "Really delete news account '%s'?"
-msgstr "确定删除新闻组帐号'%s'？"
-
-#: src/news_gtk.c:259
-msgid "Delete news account"
-msgstr "删除新闻群帐号"
-

 #: src/plugins/clamav/clamav_plugin.c:118
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: 正在扫描邮件..."
 
 #: src/plugins/clamav/clamav_plugin.c:238
 #: src/plugins/clamav/clamav_plugin.c:118
 msgid "ClamAV: scanning message..."
 msgstr "ClamAV: 正在扫描邮件..."
 
 #: src/plugins/clamav/clamav_plugin.c:238

-#: src/plugins/clamav/clamav_plugin_gtk.c:250
+#: src/plugins/clamav/clamav_plugin_gtk.c:251

 msgid "Clam AntiVirus"
 msgstr ""
 
 msgid "Clam AntiVirus"
 msgstr ""
 


@@ -5319,40 +5498,40 @@ msgstr ""
 "本插件仅包含邮件的扫描、删除/移动功能。如果要进行参数配置，您还需要加载相应的"
 "用户界面插件(clamav_plugin_gtk)。\n"
 
 "本插件仅包含邮件的扫描、删除/移动功能。如果要进行参数配置，您还需要加载相应的"
 "用户界面插件(clamav_plugin_gtk)。\n"
 

-#: src/plugins/clamav/clamav_plugin_gtk.c:94
+#: src/plugins/clamav/clamav_plugin_gtk.c:95

 msgid "Enable virus scanning"
 msgstr "启用病毒扫描"
 
 msgid "Enable virus scanning"
 msgstr "启用病毒扫描"
 

-#: src/plugins/clamav/clamav_plugin_gtk.c:108
+#: src/plugins/clamav/clamav_plugin_gtk.c:109

 msgid "Scan archive contents"
 msgstr "扫描压缩包内容"
 
 msgid "Scan archive contents"
 msgstr "扫描压缩包内容"
 

-#: src/plugins/clamav/clamav_plugin_gtk.c:121
+#: src/plugins/clamav/clamav_plugin_gtk.c:122

 msgid "Maximum attachment size"
 msgstr "最大附件大小"
 
 msgid "Maximum attachment size"
 msgstr "最大附件大小"
 

-#: src/plugins/clamav/clamav_plugin_gtk.c:139
+#: src/plugins/clamav/clamav_plugin_gtk.c:140

 msgid "MB"
 msgstr "MB"
 
 msgid "MB"
 msgstr "MB"
 

-#: src/plugins/clamav/clamav_plugin_gtk.c:143
+#: src/plugins/clamav/clamav_plugin_gtk.c:144

 msgid "Save infected messages"
 msgstr "保存受感染的邮件"
 
 msgid "Save infected messages"
 msgstr "保存受感染的邮件"
 

-#: src/plugins/clamav/clamav_plugin_gtk.c:156
+#: src/plugins/clamav/clamav_plugin_gtk.c:157

 msgid "Save folder"
 msgstr "保存位置"
 
 msgid "Save folder"
 msgstr "保存位置"
 

-#: src/plugins/clamav/clamav_plugin_gtk.c:170
-#: src/plugins/clamav/clamav_plugin_gtk.c:179
+#: src/plugins/clamav/clamav_plugin_gtk.c:171
+#: src/plugins/clamav/clamav_plugin_gtk.c:180

 msgid "Leave empty to use the default trash folder"
 msgstr "不设置时将缺省使用垃圾桶"
 
 msgid "Leave empty to use the default trash folder"
 msgstr "不设置时将缺省使用垃圾桶"
 

-#: src/plugins/clamav/clamav_plugin_gtk.c:276
+#: src/plugins/clamav/clamav_plugin_gtk.c:277

 msgid "Clam AntiVirus GTK"
 msgstr "Clam AntiVirus GTK"
 
 msgid "Clam AntiVirus GTK"
 msgstr "Clam AntiVirus GTK"
 

-#: src/plugins/clamav/clamav_plugin_gtk.c:281
+#: src/plugins/clamav/clamav_plugin_gtk.c:282

 msgid ""
 "This plugin provides a Preferences page for the Clam AntiVirus plugin.\n"
 "\n"
 msgid ""
 "This plugin provides a Preferences page for the Clam AntiVirus plugin.\n"
 "\n"


@@ -5379,8 +5558,8 @@ msgstr "演示"
 
 #: src/plugins/demo/demo.c:79
 msgid ""
 
 #: src/plugins/demo/demo.c:79
 msgid ""

-"This Plugin is only a demo of how to write plugins for Sylpheed. It installs "
-"a hook for new log output and writes it to stdout.\n"
+"This Plugin is only a demo of how to write plugins for Sylpheed-Claws. It "
+"installs a hook for new log output and writes it to stdout.\n"

 "\n"
 "It is not really useful"
 msgstr ""
 "\n"
 "It is not really useful"
 msgstr ""


@@ -5432,78 +5611,76 @@ msgid ""
 msgstr ""
 "本插件使用GtkMathView控件显示MathML类型的附件(Content-Type: text/mathml)"
 
 msgstr ""
 "本插件使用GtkMathView控件显示MathML类型的附件(Content-Type: text/mathml)"
 

-#: src/plugins/pgpcore/passphrase.c:89
+#: src/plugins/pgpcore/passphrase.c:95

 msgid "Passphrase"
 msgstr ""
 
 msgid "Passphrase"
 msgstr ""
 

-#: src/plugins/pgpcore/passphrase.c:249
+#: src/plugins/pgpcore/passphrase.c:254

 msgid "[no user id]"
 msgstr ""
 
 msgid "[no user id]"
 msgstr ""
 

-#: src/plugins/pgpcore/passphrase.c:257
+#: src/plugins/pgpcore/passphrase.c:268

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"%sPlease enter the passphrase for:\n"
+"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
+"span>\n"

 "\n"
 "\n"

-"  %.*s  \n"
-"(%.*s)\n"
+"%.*s\n"

 msgstr ""
 
 msgstr ""
 

-#: src/plugins/pgpcore/passphrase.c:261
-msgid ""
-"Bad passphrase! Try again...\n"
-"\n"
-msgstr "无效的passphrase! 重试...\n"
+#: src/plugins/pgpcore/passphrase.c:271
+msgid "Bad passphrase.\n"
+msgstr "无效的passphrase!\n"

 
 

-#: src/plugins/pgpcore/prefs_gpg.c:122
+#: src/plugins/pgpcore/prefs_gpg.c:101
+msgid "Grab input while entering a passphrase"
+msgstr "导入 passphrase 时抓取导入"
+
+#: src/plugins/pgpcore/prefs_gpg.c:107

 msgid "Store passphrase in memory"
 msgstr "将passphrase暂时存在内存中"
 
 msgid "Store passphrase in memory"
 msgstr "将passphrase暂时存在内存中"
 

-#: src/plugins/pgpcore/prefs_gpg.c:129
+#: src/plugins/pgpcore/prefs_gpg.c:114

 msgid "Automatically check signatures"
 msgstr "自动检查数字签名"
 
 msgid "Automatically check signatures"
 msgstr "自动检查数字签名"
 

-#: src/plugins/pgpcore/prefs_gpg.c:137
-msgid "Grab input while entering a passphrase"
-msgstr "导入 passphrase 时抓取导入"
-
-#: src/plugins/pgpcore/prefs_gpg.c:146
+#: src/plugins/pgpcore/prefs_gpg.c:122

 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "若 GnuPG 无法运作，则在启动时发出警告"
 
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "若 GnuPG 无法运作，则在启动时发出警告"
 

-#: src/plugins/pgpcore/prefs_gpg.c:159
+#: src/plugins/pgpcore/prefs_gpg.c:134

 msgid "Expire after"
 msgstr " 有限期："
 
 msgid "Expire after"
 msgstr " 有限期："
 

-#: src/plugins/pgpcore/prefs_gpg.c:174
+#: src/plugins/pgpcore/prefs_gpg.c:151

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "若设置为 '0' 则会在整个会话期内保存passphrase"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "若设置为 '0' 则会在整个会话期内保存passphrase"
 

-#: src/plugins/pgpcore/prefs_gpg.c:179 src/prefs_receive.c:169
+#: src/plugins/pgpcore/prefs_gpg.c:156 src/prefs_receive.c:169

 msgid "minute(s)"
 msgstr "分钟"
 
 msgid "minute(s)"
 msgstr "分钟"
 

-#: src/plugins/pgpcore/prefs_gpg.c:275
+#: src/plugins/pgpcore/prefs_gpg.c:258

 msgid "Sign key"
 msgstr ""
 
 msgid "Sign key"
 msgstr ""
 

-#: src/plugins/pgpcore/prefs_gpg.c:308
+#: src/plugins/pgpcore/prefs_gpg.c:291

 msgid "Use default GnuPG key"
 msgstr "使用缺省 GnuPG 密钥"
 
 msgid "Use default GnuPG key"
 msgstr "使用缺省 GnuPG 密钥"
 

-#: src/plugins/pgpcore/prefs_gpg.c:315
+#: src/plugins/pgpcore/prefs_gpg.c:298

 msgid "Select key by your email address"
 msgstr "按邮件地址选择密钥"
 
 msgid "Select key by your email address"
 msgstr "按邮件地址选择密钥"
 

-#: src/plugins/pgpcore/prefs_gpg.c:322
+#: src/plugins/pgpcore/prefs_gpg.c:305

 msgid "Specify key manually"
 msgstr "手工指定密钥"
 
 msgid "Specify key manually"
 msgstr "手工指定密钥"
 

-#: src/plugins/pgpcore/prefs_gpg.c:329
+#: src/plugins/pgpcore/prefs_gpg.c:312

 msgid "User or key ID:"
 msgstr "用户ID或者密钥ID:"
 
 msgid "User or key ID:"
 msgstr "用户ID或者密钥ID:"
 

-#: src/plugins/pgpcore/prefs_gpg.c:504
+#: src/plugins/pgpcore/prefs_gpg.c:487

 msgid "GPG"
 msgstr ""
 
 msgid "GPG"
 msgstr ""
 


@@ -5551,7 +5728,7 @@ msgstr "导入另一个用户代号或 key 的识别码："
 
 #: src/plugins/pgpcore/select-keys.c:519
 msgid "Trust key"
 
 #: src/plugins/pgpcore/select-keys.c:519
 msgid "Trust key"

-msgstr ""
+msgstr "信任密钥"

 
 #: src/plugins/pgpcore/select-keys.c:520
 msgid ""
 
 #: src/plugins/pgpcore/select-keys.c:520
 msgid ""


@@ -5564,87 +5741,87 @@ msgstr ""
 "如果你选择该密钥加密邮件，将不能确保该邮件会被发送给指定的人。\n"
 "你足够信任它并坚持要使用它吗?"
 
 "如果你选择该密钥加密邮件，将不能确保该邮件会被发送给指定的人。\n"
 "你足够信任它并坚持要使用它吗?"
 

-#: src/plugins/pgpcore/sgpgme.c:114
+#: src/plugins/pgpcore/sgpgme.c:113

 msgid "Undefined"
 msgstr ""
 
 msgid "Undefined"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:116 src/prefs_receive.c:201
+#: src/plugins/pgpcore/sgpgme.c:115 src/prefs_receive.c:201

 #: src/prefs_send.c:163
 msgid "Never"
 msgstr "从不显示"
 
 #: src/prefs_send.c:163
 msgid "Never"
 msgstr "从不显示"
 

-#: src/plugins/pgpcore/sgpgme.c:118
+#: src/plugins/pgpcore/sgpgme.c:117

 msgid "Marginal"
 msgstr ""
 
 msgid "Marginal"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:122
+#: src/plugins/pgpcore/sgpgme.c:121

 msgid "Ultimate"
 msgstr ""
 
 msgid "Ultimate"
 msgstr ""
 

-#: src/plugins/pgpcore/sgpgme.c:154
+#: src/plugins/pgpcore/sgpgme.c:153

 msgid "The signature can't be checked - GPG error."
 msgstr "该签名无法被校验 - GPG错误。"
 
 msgid "The signature can't be checked - GPG error."
 msgstr "该签名无法被校验 - GPG错误。"
 

-#: src/plugins/pgpcore/sgpgme.c:158 src/plugins/pgpcore/sgpgme.c:162
-#: src/plugins/pgpcore/sgpgme.c:188
+#: src/plugins/pgpcore/sgpgme.c:157 src/plugins/pgpcore/sgpgme.c:161
+#: src/plugins/pgpcore/sgpgme.c:187

 msgid "The signature has not been checked."
 msgstr "该签名尚未被检查。"
 
 msgid "The signature has not been checked."
 msgstr "该签名尚未被检查。"
 

-#: src/plugins/pgpcore/sgpgme.c:172
+#: src/plugins/pgpcore/sgpgme.c:171

 #, c-format
 #, c-format

-msgid "Good signature from %s (Trust: %s)."
-msgstr "%s的签名有效 (信任: %s)。"
+msgid "Good signature from %s."
+msgstr "来自 \"%s\" 的签名正确。"

 
 

-#: src/plugins/pgpcore/sgpgme.c:176
+#: src/plugins/pgpcore/sgpgme.c:175

 #, c-format
 msgid "Expired signature from %s."
 msgstr "来自 %s 的签名已过期。"
 
 #, c-format
 msgid "Expired signature from %s."
 msgstr "来自 %s 的签名已过期。"
 

-#: src/plugins/pgpcore/sgpgme.c:179
+#: src/plugins/pgpcore/sgpgme.c:178

 #, c-format
 msgid "Expired key from %s."
 msgstr "来自 %s 的密钥已过期。"
 
 #, c-format
 msgid "Expired key from %s."
 msgstr "来自 %s 的密钥已过期。"
 

-#: src/plugins/pgpcore/sgpgme.c:182
+#: src/plugins/pgpcore/sgpgme.c:181

 #, c-format
 msgid "Bad signature from %s."
 msgstr "来自 %s 的签名检查不通过。"
 
 #, c-format
 msgid "Bad signature from %s."
 msgstr "来自 %s 的签名检查不通过。"
 

-#: src/plugins/pgpcore/sgpgme.c:185
+#: src/plugins/pgpcore/sgpgme.c:184

 msgid "No key available to verify this signature."
 msgstr "没有匹配的密钥，无法检查此签名"
 
 msgid "No key available to verify this signature."
 msgstr "没有匹配的密钥，无法检查此签名"
 

-#: src/plugins/pgpcore/sgpgme.c:225
+#: src/plugins/pgpcore/sgpgme.c:224

 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "签名采用%s制作，密钥ID: %s\n"
 
 #, c-format
 msgid "Signature made using %s key ID %s\n"
 msgstr "签名采用%s制作，密钥ID: %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:232
+#: src/plugins/pgpcore/sgpgme.c:231

 #, c-format
 #, c-format

-msgid "Good signature from \"%s\"\n"
-msgstr "来自 \"%s\" 的签名正确\n"
+msgid "Good signature from \"%s\" (Trust: %s)\n"
+msgstr "\"%s\"的签名有效 (信任: %s)\n"

 
 

-#: src/plugins/pgpcore/sgpgme.c:237
+#: src/plugins/pgpcore/sgpgme.c:236

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "来自 \"%s\" 的签名已过期\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "来自 \"%s\" 的签名已过期\n"
 

-#: src/plugins/pgpcore/sgpgme.c:242
+#: src/plugins/pgpcore/sgpgme.c:241

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "来自 \"%s\" 的签名检查错误\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "来自 \"%s\" 的签名检查错误\n"
 

-#: src/plugins/pgpcore/sgpgme.c:253
+#: src/plugins/pgpcore/sgpgme.c:252

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "               又称为 \"%s\"\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "               又称为 \"%s\"\n"
 

-#: src/plugins/pgpcore/sgpgme.c:259
+#: src/plugins/pgpcore/sgpgme.c:258

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "主密钥指纹: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "主密钥指纹: %s\n"
 

-#: src/plugins/pgpcore/sgpgme.c:421
+#: src/plugins/pgpcore/sgpgme.c:420

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -5692,7 +5869,7 @@ msgid "SpamAssassin: filtering message..."
 msgstr "SpamAssassin: 正在过滤邮件..."
 
 #: src/plugins/spamassassin/spamassassin.c:328
 msgstr "SpamAssassin: 正在过滤邮件..."
 
 #: src/plugins/spamassassin/spamassassin.c:328

-#: src/plugins/spamassassin/spamassassin_gtk.c:464
+#: src/plugins/spamassassin/spamassassin_gtk.c:465

 msgid "SpamAssassin"
 msgstr ""
 
 msgid "SpamAssassin"
 msgstr ""
 


@@ -5717,47 +5894,47 @@ msgstr ""
 "本插件只包含邮件的删除和移动功能。您需要加载SpamAssassin的界面插件来进行配"
 "置，否则您需要手工填写插件的配置数据。\n"
 
 "本插件只包含邮件的删除和移动功能。您需要加载SpamAssassin的界面插件来进行配"
 "置，否则您需要手工填写插件的配置数据。\n"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:78
+#: src/plugins/spamassassin/spamassassin_gtk.c:79

 msgid "Disabled"
 msgstr "已禁用"
 
 msgid "Disabled"
 msgstr "已禁用"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:79
+#: src/plugins/spamassassin/spamassassin_gtk.c:80

 msgid "Localhost"
 msgstr "本机"
 
 msgid "Localhost"
 msgstr "本机"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:80
+#: src/plugins/spamassassin/spamassassin_gtk.c:81

 msgid "TCP"
 msgstr ""
 
 msgid "TCP"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:81
+#: src/plugins/spamassassin/spamassassin_gtk.c:82

 msgid "Unix Socket"
 msgstr ""
 
 msgid "Unix Socket"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:178
+#: src/plugins/spamassassin/spamassassin_gtk.c:179

 msgid "Transport"
 msgstr ""
 
 msgid "Transport"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:185
+#: src/plugins/spamassassin/spamassassin_gtk.c:186

 msgid "spamd "
 msgstr ""
 
 msgid "spamd "
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:222
+#: src/plugins/spamassassin/spamassassin_gtk.c:223

 msgid "Hostname or IP address of spamd server"
 msgstr "spamd服务的主机名或者IP地址"
 
 msgid "Hostname or IP address of spamd server"
 msgstr "spamd服务的主机名或者IP地址"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:225
+#: src/plugins/spamassassin/spamassassin_gtk.c:226

 msgid ":"
 msgstr ":"
 
 msgid ":"
 msgstr ":"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:235
+#: src/plugins/spamassassin/spamassassin_gtk.c:236

 msgid "Port of spamd server"
 msgstr "spamd服务器端口"
 
 msgid "Port of spamd server"
 msgstr "spamd服务器端口"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:242
+#: src/plugins/spamassassin/spamassassin_gtk.c:243

 msgid "Path of Unix socket"
 msgid "Path of Unix socket"

-msgstr ""
+msgstr "UNIX套接字路径"

 
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:265
+#: src/plugins/spamassassin/spamassassin_gtk.c:266

 msgid ""
 "Time that is allowed for checking. If the check takes longer the check will "
 "be aborted and the message will be handled as not spam."
 msgid ""
 "Time that is allowed for checking. If the check takes longer the check will "
 "be aborted and the message will be handled as not spam."


@@ -5765,49 +5942,45 @@ msgstr ""
 "允许垃圾邮件检查的最大时限。超过此时间后将退出检查，邮件将不被认为是垃圾邮"
 "件。"
 
 "允许垃圾邮件检查的最大时限。超过此时间后将退出检查，邮件将不被认为是垃圾邮"
 "件。"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:269
+#: src/plugins/spamassassin/spamassassin_gtk.c:270

 msgid "s"
 msgstr ""
 
 msgid "s"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:276
+#: src/plugins/spamassassin/spamassassin_gtk.c:277

 msgid "Save Spam"
 msgstr "保存垃圾邮件"
 
 msgid "Save Spam"
 msgstr "保存垃圾邮件"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:290
+#: src/plugins/spamassassin/spamassassin_gtk.c:291

 msgid "Save mails that where identified as spam to a folder"
 msgstr "将被认为是垃圾邮件的保存到某邮件夹"
 
 msgid "Save mails that where identified as spam to a folder"
 msgstr "将被认为是垃圾邮件的保存到某邮件夹"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:306
+#: src/plugins/spamassassin/spamassassin_gtk.c:307

 msgid "Maximum size a message is allowed to have to be checked"
 msgstr "允许被检查的最大邮件尺寸"
 
 msgid "Maximum size a message is allowed to have to be checked"
 msgstr "允许被检查的最大邮件尺寸"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:310
+#: src/plugins/spamassassin/spamassassin_gtk.c:311

 msgid "kB"
 msgstr "kB"
 
 msgid "kB"
 msgstr "kB"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:317
+#: src/plugins/spamassassin/spamassassin_gtk.c:318

 msgid "Save Folder"
 msgstr "保存位置"
 
 msgid "Save Folder"
 msgstr "保存位置"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:332
+#: src/plugins/spamassassin/spamassassin_gtk.c:333

 msgid ""
 "Folder that will be used to save spam. Leave empty to use the default trash "
 "folder"
 msgstr "用于保存垃圾邮件的邮件夹。如果要使用缺省的垃圾桶，可以不填"
 
 msgid ""
 "Folder that will be used to save spam. Leave empty to use the default trash "
 "folder"
 msgstr "用于保存垃圾邮件的邮件夹。如果要使用缺省的垃圾桶，可以不填"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:335
-msgid "..."
-msgstr "..."
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:341
+#: src/plugins/spamassassin/spamassassin_gtk.c:342

 msgid "Maximum Size"
 msgstr "最大尺寸"
 
 msgid "Maximum Size"
 msgstr "最大尺寸"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:490
+#: src/plugins/spamassassin/spamassassin_gtk.c:491

 msgid "SpamAssassin GTK"
 msgstr "SpamAssassin GTK"
 
 msgid "SpamAssassin GTK"
 msgstr "SpamAssassin GTK"
 

-#: src/plugins/spamassassin/spamassassin_gtk.c:495
+#: src/plugins/spamassassin/spamassassin_gtk.c:496

 msgid ""
 "This plugin provides a Preferences page for the SpamAssassin plugin.\n"
 "\n"
 msgid ""
 "This plugin provides a Preferences page for the SpamAssassin plugin.\n"
 "\n"


@@ -5828,36 +6001,44 @@ msgstr ""
 "检查的最大邮件尺寸(超过此尺寸将不被检查)，还可以设置是否接收这些邮件(缺省:是)"
 "以及保存这些邮件的邮件夹。\n"
 
 "检查的最大邮件尺寸(超过此尺寸将不被检查)，还可以设置是否接收这些邮件(缺省:是)"
 "以及保存这些邮件的邮件夹。\n"
 

-#: src/plugins/trayicon/trayicon.c:91
+#: src/plugins/trayicon/trayicon.c:94

 msgid "/_Get"
 msgstr "/收信(_G)"
 
 msgid "/_Get"
 msgstr "/收信(_G)"
 

-#: src/plugins/trayicon/trayicon.c:92
+#: src/plugins/trayicon/trayicon.c:95

 msgid "/Get _All"
 msgstr "/全部收取(_A)"
 
 msgid "/Get _All"
 msgstr "/全部收取(_A)"
 

-#: src/plugins/trayicon/trayicon.c:94
+#: src/plugins/trayicon/trayicon.c:97

 msgid "/_Email"
 msgstr "/写新邮件(_E)"
 
 msgid "/_Email"
 msgstr "/写新邮件(_E)"
 

-#: src/plugins/trayicon/trayicon.c:95
+#: src/plugins/trayicon/trayicon.c:98

 msgid "/Open A_ddressbook"
 msgstr "/打开地址簿(_d)"
 
 msgid "/Open A_ddressbook"
 msgstr "/打开地址簿(_d)"
 

-#: src/plugins/trayicon/trayicon.c:97
-msgid "/E_xit Sylpheed"
-msgstr "/退出 Sylpheed(_x)"
+#: src/plugins/trayicon/trayicon.c:100
+msgid "/_Work Offline"
+msgstr "/脱机工作(_W)"
+
+#: src/plugins/trayicon/trayicon.c:102
+msgid "/E_xit Sylpheed-Claws"
+msgstr "/退出 Sylpheed-Claws(_x)"

 
 

-#: src/plugins/trayicon/trayicon.c:144
+#: src/plugins/trayicon/trayicon.c:150

 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "%d 封新邮件，%d 封未读，共 %d 封"
 
 #, c-format
 msgid "New %d, Unread: %d, Total: %d"
 msgstr "%d 封新邮件，%d 封未读，共 %d 封"
 

-#: src/plugins/trayicon/trayicon.c:297
+#: src/plugins/trayicon/trayicon.c:206
+msgid "/Work Offline"
+msgstr "/脱机工作"
+
+#: src/plugins/trayicon/trayicon.c:312

 msgid "Trayicon"
 msgstr ""
 
 msgid "Trayicon"
 msgstr ""
 

-#: src/plugins/trayicon/trayicon.c:302
+#: src/plugins/trayicon/trayicon.c:317

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -5870,13 +6051,9 @@ msgstr ""
 "如果你没有未读的邮件，该图标将是一个空邮箱，否则则是含有邮件图样。提示信息将"
 "能够显示新邮件、未读邮件的数量和邮件总数."
 
 "如果你没有未读的邮件，该图标将是一个空邮箱，否则则是含有邮件图样。提示信息将"
 "能够显示新邮件、未读邮件的数量和邮件总数."
 

-#: src/plugins/trayicon/trayicon.c:343
-msgid "OK"
-msgstr "确定"
-
-#: src/plugins/trayicon/trayicon.c:343
-msgid "Cancel"
-msgstr "取消"
+#: src/plugins/trayicon/trayicon.c:366
+msgid "Exit this program?"
+msgstr "退出本程序？"

 
 #: src/pop.c:150
 msgid "Required APOP timestamp not found in greeting\n"
 
 #: src/pop.c:150
 msgid "Required APOP timestamp not found in greeting\n"


@@ -5925,471 +6102,483 @@ msgstr "POP3会话中出现错误\n"
 msgid "TOP command unsupported\n"
 msgstr "TOP命令不被支持\n"
 
 msgid "TOP command unsupported\n"
 msgstr "TOP命令不被支持\n"
 

-#: src/prefs_account.c:669
+#: src/prefs_account.c:684

 #, c-format
 msgid "Account%d"
 msgstr "帐号%d"
 
 #, c-format
 msgid "Account%d"
 msgstr "帐号%d"
 

-#: src/prefs_account.c:947
+#: src/prefs_account.c:962

 msgid "Preferences for new account"
 msgstr "设置新帐号"
 
 msgid "Preferences for new account"
 msgstr "设置新帐号"
 

-#: src/prefs_account.c:949
+#: src/prefs_account.c:964

 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帐号设置"
 
 #, c-format
 msgid "%s - Account preferences"
 msgstr "%s - 帐号设置"
 

-#: src/prefs_account.c:985 src/prefs_receive.c:353
+#: src/prefs_account.c:1001 src/prefs_receive.c:353

 msgid "Receive"
 msgstr "接收"
 
 msgid "Receive"
 msgstr "接收"
 

-#: src/prefs_account.c:989 src/prefs_compose_writing.c:249
-#: src/prefs_folder_item.c:823 src/prefs_quote.c:281 src/prefs_spelling.c:376
-#: src/prefs_wrapping.c:168
+#: src/prefs_account.c:1005 src/prefs_compose_writing.c:249
+#: src/prefs_folder_item.c:852 src/prefs_quote.c:281 src/prefs_spelling.c:376
+#: src/prefs_wrapping.c:168 src/toolbar.c:388 src/toolbar.c:1424

 msgid "Compose"
 msgstr "撰写"
 
 msgid "Compose"
 msgstr "撰写"
 

-#: src/prefs_account.c:991
+#: src/prefs_account.c:1007

 msgid "Privacy"
 msgstr "隐私"
 
 msgid "Privacy"
 msgstr "隐私"
 

-#: src/prefs_account.c:994
+#: src/prefs_account.c:1010

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: src/prefs_account.c:997
+#: src/prefs_account.c:1013

 msgid "Advanced"
 msgstr "高级"
 
 msgid "Advanced"
 msgstr "高级"
 

-#: src/prefs_account.c:1076
+#: src/prefs_account.c:1092

 msgid "Name of account"
 msgstr "帐号名称"
 
 msgid "Name of account"
 msgstr "帐号名称"
 

-#: src/prefs_account.c:1085
+#: src/prefs_account.c:1101

 msgid "Set as default"
 msgstr "设为缺省帐号"
 
 msgid "Set as default"
 msgstr "设为缺省帐号"
 

-#: src/prefs_account.c:1089
+#: src/prefs_account.c:1105

 msgid "Personal information"
 msgstr "个人资料"
 
 msgid "Personal information"
 msgstr "个人资料"
 

-#: src/prefs_account.c:1098
+#: src/prefs_account.c:1114

 msgid "Full name"
 msgstr "全名"
 
 msgid "Full name"
 msgstr "全名"
 

-#: src/prefs_account.c:1104
+#: src/prefs_account.c:1120

 msgid "Mail address"
 msgstr "邮件地址"
 
 msgid "Mail address"
 msgstr "邮件地址"
 

-#: src/prefs_account.c:1110
+#: src/prefs_account.c:1126

 msgid "Organization"
 msgstr "组织"
 
 msgid "Organization"
 msgstr "组织"
 

-#: src/prefs_account.c:1134
+#: src/prefs_account.c:1150

 msgid "Server information"
 msgstr "服务器信息"
 
 msgid "Server information"
 msgstr "服务器信息"
 

-#: src/prefs_account.c:1155 src/prefs_account.c:1361 src/prefs_account.c:2007
-#: src/wizard.c:358
+#: src/prefs_account.c:1171 src/prefs_account.c:1380 src/prefs_account.c:2048
+#: src/wizard.c:564

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:1157 src/prefs_account.c:1496 src/prefs_account.c:2024
+#: src/prefs_account.c:1173 src/prefs_account.c:1515 src/prefs_account.c:2065

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:1159
+#: src/prefs_account.c:1175

 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:1161
+#: src/prefs_account.c:1177 src/wizard.c:572

 msgid "Local mbox file"
 msgstr "本地mbox文件"
 
 msgid "Local mbox file"
 msgstr "本地mbox文件"
 

-#: src/prefs_account.c:1163
+#: src/prefs_account.c:1179

 msgid "None (SMTP only)"
 msgstr "无 (仅SMTP)"
 
 msgid "None (SMTP only)"
 msgstr "无 (仅SMTP)"
 

-#: src/prefs_account.c:1183
+#: src/prefs_account.c:1199

 msgid "This server requires authentication"
 msgstr "服务器需要鉴权"
 
 msgid "This server requires authentication"
 msgstr "服务器需要鉴权"
 

-#: src/prefs_account.c:1190
+#: src/prefs_account.c:1206

 msgid "Authenticate on connect"
 msgstr "连接时鉴权"
 
 msgid "Authenticate on connect"
 msgstr "连接时鉴权"
 

-#: src/prefs_account.c:1235
+#: src/prefs_account.c:1251

 msgid "News server"
 msgstr "新闻服务器"
 
 msgid "News server"
 msgstr "新闻服务器"
 

-#: src/prefs_account.c:1241
+#: src/prefs_account.c:1257

 msgid "Server for receiving"
 msgstr "接收服务器"
 
 msgid "Server for receiving"
 msgstr "接收服务器"
 

-#: src/prefs_account.c:1247
+#: src/prefs_account.c:1263

 msgid "Local mailbox"
 msgstr "本地邮箱"
 
 #. gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0);
 msgid "Local mailbox"
 msgstr "本地邮箱"
 
 #. gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0);

-#: src/prefs_account.c:1254
+#: src/prefs_account.c:1270

 msgid "SMTP server (send)"
 msgstr "SMTP 服务器(发送)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP 服务器(发送)"
 

-#: src/prefs_account.c:1262
+#: src/prefs_account.c:1278

 msgid "Use mail command rather than SMTP server"
 msgstr "使用mail命令而不是SMTP服务器"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "使用mail命令而不是SMTP服务器"
 

-#: src/prefs_account.c:1271
+#: src/prefs_account.c:1287

 msgid "command to send mails"
 msgstr "发送邮件的命令"
 
 #. gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0);
 msgid "command to send mails"
 msgstr "发送邮件的命令"
 
 #. gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0);

-#: src/prefs_account.c:1278 src/prefs_account.c:1661
+#: src/prefs_account.c:1294 src/prefs_account.c:1695

 msgid "User ID"
 msgstr "用户ID"
 
 msgid "User ID"
 msgstr "用户ID"
 

-#: src/prefs_account.c:1284 src/prefs_account.c:1670
+#: src/prefs_account.c:1300 src/prefs_account.c:1704

 msgid "Password"
 msgstr "密码"
 
 msgid "Password"
 msgstr "密码"
 

-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1388

 msgid "Use secure authentication (APOP)"
 msgstr "采用安全鉴权(APOP)"
 
 msgid "Use secure authentication (APOP)"
 msgstr "采用安全鉴权(APOP)"
 

-#: src/prefs_account.c:1372
+#: src/prefs_account.c:1391

 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 
 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1402

 msgid "Remove after"
 msgstr "删除于"
 
 msgid "Remove after"
 msgstr "删除于"
 

-#: src/prefs_account.c:1392
+#: src/prefs_account.c:1411

 msgid "days"
 msgstr "天后"
 
 msgid "days"
 msgstr "天后"
 

-#: src/prefs_account.c:1409
+#: src/prefs_account.c:1428

 msgid "(0 days: remove immediately)"
 msgstr "(0 天: 立即删除)"
 
 msgid "(0 days: remove immediately)"
 msgstr "(0 天: 立即删除)"
 

-#: src/prefs_account.c:1418
+#: src/prefs_account.c:1437

 msgid "Download all messages on server"
 msgstr "下载服务器上所有邮件"
 
 msgid "Download all messages on server"
 msgstr "下载服务器上所有邮件"
 

-#: src/prefs_account.c:1424
+#: src/prefs_account.c:1443

 msgid "Receive size limit"
 msgstr "邮件大小限制"
 
 msgid "Receive size limit"
 msgstr "邮件大小限制"
 

-#: src/prefs_account.c:1431
+#: src/prefs_account.c:1450

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1443
+#: src/prefs_account.c:1462

 msgid "Default inbox"
 msgstr "缺省收信夹"
 
 msgid "Default inbox"
 msgstr "缺省收信夹"
 

-#: src/prefs_account.c:1452
+#: src/prefs_account.c:1471

 msgid " Select... "
 msgstr " 选择... "
 
 msgid " Select... "
 msgstr " 选择... "
 

-#: src/prefs_account.c:1466
+#: src/prefs_account.c:1485

 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(未被过滤的邮件将放入该邮件夹)"
 
 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(未被过滤的邮件将放入该邮件夹)"
 

-#: src/prefs_account.c:1472
+#: src/prefs_account.c:1491

 msgid "Maximum number of articles to download"
 msgstr "帖子下载最大数量"
 
 msgid "Maximum number of articles to download"
 msgstr "帖子下载最大数量"
 

-#: src/prefs_account.c:1491
+#: src/prefs_account.c:1510

 msgid "unlimited if 0 is specified"
 msgstr "如果设为0为不作限制"
 
 msgid "unlimited if 0 is specified"
 msgstr "如果设为0为不作限制"
 

-#: src/prefs_account.c:1507 src/prefs_account.c:1631
+#: src/prefs_account.c:1526 src/prefs_account.c:1665

 msgid "Authentication method"
 msgstr "鉴权方式"
 
 msgid "Authentication method"
 msgstr "鉴权方式"
 

-#: src/prefs_account.c:1517 src/prefs_account.c:1641 src/prefs_send.c:264
+#: src/prefs_account.c:1536 src/prefs_account.c:1675 src/prefs_send.c:264

 msgid "Automatic"
 msgstr "自动"
 
 msgid "Automatic"
 msgstr "自动"
 

-#: src/prefs_account.c:1524
+#: src/prefs_account.c:1546
+msgid "IMAP server directory (usually empty)"
+msgstr "IMAP服务器目录(通常为空)"
+
+#: src/prefs_account.c:1555

 msgid "Filter messages on receiving"
 msgstr "接收邮件时进行过滤"
 
 msgid "Filter messages on receiving"
 msgstr "接收邮件时进行过滤"
 

-#: src/prefs_account.c:1528
+#: src/prefs_account.c:1559

 msgid "'Get all' checks for new messages on this account"
 msgstr "`全部收取'包含本帐户的新邮件"
 
 msgid "'Get all' checks for new messages on this account"
 msgstr "`全部收取'包含本帐户的新邮件"
 

-#: src/prefs_account.c:1588
+#: src/prefs_account.c:1622

 msgid "Add Date"
 msgstr "添加日期"
 
 msgid "Add Date"
 msgstr "添加日期"
 

-#: src/prefs_account.c:1589
+#: src/prefs_account.c:1623

 msgid "Generate Message-ID"
 msgstr "生成Message-ID"
 
 msgid "Generate Message-ID"
 msgstr "生成Message-ID"
 

-#: src/prefs_account.c:1596
+#: src/prefs_account.c:1630

 msgid "Add user-defined header"
 msgstr "添加自定义消息头"
 
 msgid "Add user-defined header"
 msgstr "添加自定义消息头"
 

-#: src/prefs_account.c:1598 src/prefs_message.c:117
+#: src/prefs_account.c:1632 src/prefs_message.c:145

 msgid " Edit... "
 msgstr " 编辑... "
 
 msgid " Edit... "
 msgstr " 编辑... "
 

-#: src/prefs_account.c:1608
+#: src/prefs_account.c:1642

 msgid "Authentication"
 msgstr "鉴权"
 
 msgid "Authentication"
 msgstr "鉴权"
 

-#: src/prefs_account.c:1616
+#: src/prefs_account.c:1650

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP鉴权 (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP鉴权 (SMTP AUTH)"
 

-#: src/prefs_account.c:1692
+#: src/prefs_account.c:1726

 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "如果你保持这几项为空，将采用接收邮件的用户ID和口令。"
 
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "如果你保持这几项为空，将采用接收邮件的用户ID和口令。"
 

-#: src/prefs_account.c:1703
+#: src/prefs_account.c:1737

 msgid "Authenticate with POP3 before sending"
 msgstr "发送之前采用POP3进行鉴权"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "发送之前采用POP3进行鉴权"
 

-#: src/prefs_account.c:1718
+#: src/prefs_account.c:1752

 msgid "POP authentication timeout: "
 msgstr "POP鉴权超时限制"
 
 msgid "POP authentication timeout: "
 msgstr "POP鉴权超时限制"
 

-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1761

 msgid "minutes"
 msgstr "分钟"
 
 msgid "minutes"
 msgstr "分钟"
 

-#: src/prefs_account.c:1774 src/prefs_account.c:1821 src/toolbar.c:442
+#: src/prefs_account.c:1805 src/prefs_account.c:1856

 msgid "Signature"
 msgstr "签名"
 
 msgid "Signature"
 msgstr "签名"
 

-#: src/prefs_account.c:1782
+#: src/prefs_account.c:1813

 msgid "Insert signature automatically"
 msgstr "自动插入签名"
 
 msgid "Insert signature automatically"
 msgstr "自动插入签名"
 

-#: src/prefs_account.c:1787
+#: src/prefs_account.c:1818

 msgid "Signature separator"
 msgstr "签名分隔符"
 
 msgid "Signature separator"
 msgstr "签名分隔符"
 

-#: src/prefs_account.c:1810
+#: src/prefs_account.c:1843

 msgid "Command output"
 msgstr "命令输出"
 
 msgid "Command output"
 msgstr "命令输出"
 

-#: src/prefs_account.c:1829
+#: src/prefs_account.c:1870

 msgid "Automatically set the following addresses"
 msgstr "自动设置如下地址"
 
 #. to
 msgid "Automatically set the following addresses"
 msgstr "自动设置如下地址"
 
 #. to

-#: src/prefs_account.c:1838 src/prefs_filtering_action.c:1047
-#: src/prefs_matcher.c:151 src/prefs_matcher.c:1656 src/quote_fmt.c:49
+#: src/prefs_account.c:1879 src/prefs_filtering_action.c:1072
+#: src/prefs_matcher.c:151 src/prefs_matcher.c:1687 src/quote_fmt.c:49

 msgid "Cc"
 msgstr "回信地址"
 
 msgid "Cc"
 msgstr "回信地址"
 

-#: src/prefs_account.c:1851
+#: src/prefs_account.c:1892

 msgid "Bcc"
 msgstr "抄送地址"
 
 msgid "Bcc"
 msgstr "抄送地址"
 

-#: src/prefs_account.c:1864
+#: src/prefs_account.c:1905

 msgid "Reply-To"
 msgstr "回信地址"
 
 msgid "Reply-To"
 msgstr "回信地址"
 

-#: src/prefs_account.c:1915
+#: src/prefs_account.c:1956

 msgid "Default privacy system"
 msgstr "缺省隐私系统"
 
 msgid "Default privacy system"
 msgstr "缺省隐私系统"
 

-#: src/prefs_account.c:1924
+#: src/prefs_account.c:1965

 msgid "Encrypt message by default"
 msgstr "缺省情况下对消息进行加密"
 
 msgid "Encrypt message by default"
 msgstr "缺省情况下对消息进行加密"
 

-#: src/prefs_account.c:1926
+#: src/prefs_account.c:1967

 msgid "Encrypt message by default when replying to an encrypted message"
 msgstr "回复加密邮件时缺省也采用加密模式"
 
 msgid "Encrypt message by default when replying to an encrypted message"
 msgstr "回复加密邮件时缺省也采用加密模式"
 

-#: src/prefs_account.c:1929
+#: src/prefs_account.c:1970

 msgid "Sign message by default"
 msgstr "缺省情况下添加签名"
 
 msgid "Sign message by default"
 msgstr "缺省情况下添加签名"
 

-#: src/prefs_account.c:1931
+#: src/prefs_account.c:1972

 msgid "Save sent encrypted messages as clear text"
 msgstr "将发出的加密邮件以明文保存"
 
 msgid "Save sent encrypted messages as clear text"
 msgstr "将发出的加密邮件以明文保存"
 

-#: src/prefs_account.c:2015 src/prefs_account.c:2032 src/prefs_account.c:2048
+#: src/prefs_account.c:2056 src/prefs_account.c:2073 src/prefs_account.c:2089

 msgid "Don't use SSL"
 msgstr "不采用SSL"
 
 msgid "Don't use SSL"
 msgstr "不采用SSL"
 

-#: src/prefs_account.c:2018
+#: src/prefs_account.c:2059

 msgid "Use SSL for POP3 connection"
 msgstr "用SSL进行POP3连接"
 
 msgid "Use SSL for POP3 connection"
 msgstr "用SSL进行POP3连接"
 

-#: src/prefs_account.c:2021 src/prefs_account.c:2038 src/prefs_account.c:2073
+#: src/prefs_account.c:2062 src/prefs_account.c:2079 src/prefs_account.c:2114

 msgid "Use STARTTLS command to start SSL session"
 msgstr "用STARTTLS命令开始SSL会话"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "用STARTTLS命令开始SSL会话"
 

-#: src/prefs_account.c:2035
+#: src/prefs_account.c:2076

 msgid "Use SSL for IMAP4 connection"
 msgstr "用SSL进行IMAP连接"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "用SSL进行IMAP连接"
 

-#: src/prefs_account.c:2041
+#: src/prefs_account.c:2082

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2098

 msgid "Use SSL for NNTP connection"
 msgstr "用SSL进行NNTP连接"
 
 msgid "Use SSL for NNTP connection"
 msgstr "用SSL进行NNTP连接"
 

-#: src/prefs_account.c:2059
+#: src/prefs_account.c:2100

 msgid "Send (SMTP)"
 msgstr "发送 (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "发送 (SMTP)"
 

-#: src/prefs_account.c:2067
+#: src/prefs_account.c:2108

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "不采用SSL (但在必要的情况下将启用STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "不采用SSL (但在必要的情况下将启用STARTTLS)"
 

-#: src/prefs_account.c:2070
+#: src/prefs_account.c:2111

 msgid "Use SSL for SMTP connection"
 msgstr "用SSL进行SMTP连接"
 
 msgid "Use SSL for SMTP connection"
 msgstr "用SSL进行SMTP连接"
 

-#: src/prefs_account.c:2081
+#: src/prefs_account.c:2122

 msgid "Use non-blocking SSL"
 msgstr "采用非阻塞式SSL"
 
 msgid "Use non-blocking SSL"
 msgstr "采用非阻塞式SSL"
 

-#: src/prefs_account.c:2093
+#: src/prefs_account.c:2134

 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(如果你在SSL连接上碰到问题请打开本项)"
 
 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(如果你在SSL连接上碰到问题请打开本项)"
 

-#: src/prefs_account.c:2221
+#: src/prefs_account.c:2260

 msgid "Specify SMTP port"
 msgstr "指定SMTP端口"
 
 msgid "Specify SMTP port"
 msgstr "指定SMTP端口"
 

-#: src/prefs_account.c:2227
+#: src/prefs_account.c:2266

 msgid "Specify POP3 port"
 msgstr "指定POP3端口"
 
 msgid "Specify POP3 port"
 msgstr "指定POP3端口"
 

-#: src/prefs_account.c:2233
+#: src/prefs_account.c:2272

 msgid "Specify IMAP4 port"
 msgstr "指定IMAP4端口"
 
 msgid "Specify IMAP4 port"
 msgstr "指定IMAP4端口"
 

-#: src/prefs_account.c:2239
+#: src/prefs_account.c:2278

 msgid "Specify NNTP port"
 msgstr "指定NNTP端口"
 
 msgid "Specify NNTP port"
 msgstr "指定NNTP端口"
 

-#: src/prefs_account.c:2244
+#: src/prefs_account.c:2283

 msgid "Specify domain name"
 msgstr "指定域名"
 
 msgid "Specify domain name"
 msgstr "指定域名"
 

-#: src/prefs_account.c:2254
+#: src/prefs_account.c:2293

 msgid "Use command to communicate with server"
 msgstr "用如下命令与服务器通讯"
 
 msgid "Use command to communicate with server"
 msgstr "用如下命令与服务器通讯"
 

-#: src/prefs_account.c:2262
+#: src/prefs_account.c:2301

 msgid "Mark cross-posted messages as read and color:"
 msgstr "将交叉投递(cross-posted)的邮件表示为已读和彩色:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "将交叉投递(cross-posted)的邮件表示为已读和彩色:"
 

-#: src/prefs_account.c:2276
-msgid "IMAP server directory"
-msgstr "IMAP服务器目录"
+#: src/prefs_account.c:2348
+msgid " ... "
+msgstr "..."

 
 

-#: src/prefs_account.c:2330
+#: src/prefs_account.c:2361

 msgid "Put sent messages in"
 msgstr "将已发送邮件存放到"
 
 msgid "Put sent messages in"
 msgstr "将已发送邮件存放到"
 

-#: src/prefs_account.c:2332
+#: src/prefs_account.c:2363

 msgid "Put queued messages in"
 msgstr "将待发送的邮件存放到"
 
 msgid "Put queued messages in"
 msgstr "将待发送的邮件存放到"
 

-#: src/prefs_account.c:2334
+#: src/prefs_account.c:2365

 msgid "Put draft messages in"
 msgstr "将邮件草稿存放到"
 
 msgid "Put draft messages in"
 msgstr "将邮件草稿存放到"
 

-#: src/prefs_account.c:2336
+#: src/prefs_account.c:2367

 msgid "Put deleted messages in"
 msgstr "将已删除的邮件存放到"
 
 msgid "Put deleted messages in"
 msgstr "将已删除的邮件存放到"
 

-#: src/prefs_account.c:2384
+#: src/prefs_account.c:2413

 msgid "Account name is not entered."
 msgstr "未输入帐户名称"
 
 msgid "Account name is not entered."
 msgstr "未输入帐户名称"
 

-#: src/prefs_account.c:2388
+#: src/prefs_account.c:2417

 msgid "Mail address is not entered."
 msgstr "未输入邮件地址"
 
 msgid "Mail address is not entered."
 msgstr "未输入邮件地址"
 

-#: src/prefs_account.c:2395
+#: src/prefs_account.c:2424

 msgid "SMTP server is not entered."
 msgstr "未输入SMTP服务器"
 
 msgid "SMTP server is not entered."
 msgstr "未输入SMTP服务器"
 

-#: src/prefs_account.c:2400
+#: src/prefs_account.c:2429

 msgid "User ID is not entered."
 msgstr "未输入用户ID"
 
 msgid "User ID is not entered."
 msgstr "未输入用户ID"
 

-#: src/prefs_account.c:2405
+#: src/prefs_account.c:2434

 msgid "POP3 server is not entered."
 msgstr "未输入POP3服务器"
 
 msgid "POP3 server is not entered."
 msgstr "未输入POP3服务器"
 

-#: src/prefs_account.c:2410
+#: src/prefs_account.c:2439

 msgid "IMAP4 server is not entered."
 msgstr "未输入IMAP4服务器"
 
 msgid "IMAP4 server is not entered."
 msgstr "未输入IMAP4服务器"
 

-#: src/prefs_account.c:2415
+#: src/prefs_account.c:2444

 msgid "NNTP server is not entered."
 msgstr "尚未输入NNTP服务器"
 
 msgid "NNTP server is not entered."
 msgstr "尚未输入NNTP服务器"
 

-#: src/prefs_account.c:2421
+#: src/prefs_account.c:2450

 msgid "local mailbox filename is not entered."
 msgstr "尚未输入本地邮箱名称"
 
 msgid "local mailbox filename is not entered."
 msgstr "尚未输入本地邮箱名称"
 

-#: src/prefs_account.c:2427
+#: src/prefs_account.c:2456

 msgid "mail command is not entered."
 msgstr "尚未输入邮件命令"
 
 msgid "mail command is not entered."
 msgstr "尚未输入邮件命令"
 

-#: src/prefs_account.c:2675
+#: src/prefs_account.c:2515
+msgid "Select signature file"
+msgstr "选择签名文件"
+
+#: src/prefs_account.c:2731

 #, c-format
 msgid "Unsupported (%s)"
 msgstr ""
 
 #, c-format
 msgid "Unsupported (%s)"
 msgstr ""
 

-#: src/prefs_actions.c:187
+#: src/prefs_actions.c:199

 msgid "Actions configuration"
 msgstr "动作配置"
 
 msgid "Actions configuration"
 msgstr "动作配置"
 

-#: src/prefs_actions.c:209
+#: src/prefs_actions.c:223

 msgid "Menu name:"
 msgstr "菜单项名称:"
 
 msgid "Menu name:"
 msgstr "菜单项名称:"
 

-#: src/prefs_actions.c:218
+#: src/prefs_actions.c:232

 msgid "Command line:"
 msgstr "命令行:"
 
 msgid "Command line:"
 msgstr "命令行:"
 

-#: src/prefs_actions.c:247
+#: src/prefs_actions.c:261

 msgid " Replace "
 msgstr " 替换 "
 
 msgid " Replace "
 msgstr " 替换 "
 

-#: src/prefs_actions.c:260
+#: src/prefs_actions.c:274

 msgid " Syntax help "
 msgstr " 语法帮助 "
 
 msgid " Syntax help "
 msgstr " 语法帮助 "
 

-#: src/prefs_actions.c:481
+#: src/prefs_actions.c:505

 msgid "Menu name is not set."
 msgstr "未指定菜单项名称"
 
 msgid "Menu name is not set."
 msgstr "未指定菜单项名称"
 

-#: src/prefs_actions.c:486
+#: src/prefs_actions.c:510
+msgid "A leading '/' is not allowed in the menu name."
+msgstr "菜单项名称不允许以'/'开始"
+
+#: src/prefs_actions.c:515

 msgid "Colon ':' is not allowed in the menu name."
 msgstr "菜单项名称不允许包含冒号':'"
 
 msgid "Colon ':' is not allowed in the menu name."
 msgstr "菜单项名称不允许包含冒号':'"
 

-#: src/prefs_actions.c:505
+#: src/prefs_actions.c:534

 msgid "Menu name is too long."
 msgstr "菜单项名称太长"
 
 msgid "Menu name is too long."
 msgstr "菜单项名称太长"
 

-#: src/prefs_actions.c:514
+#: src/prefs_actions.c:543

 msgid "Command line not set."
 msgstr "未指定命令行"
 
 msgid "Command line not set."
 msgstr "未指定命令行"
 

-#: src/prefs_actions.c:519
+#: src/prefs_actions.c:548

 msgid "Menu name and command are too long."
 msgstr "菜单项或者命令太长"
 
 msgid "Menu name and command are too long."
 msgstr "菜单项或者命令太长"
 

-#: src/prefs_actions.c:524
+#: src/prefs_actions.c:553

 #, c-format
 msgid ""
 "The command\n"
 #, c-format
 msgid ""
 "The command\n"


@@ -6400,107 +6589,109 @@ msgstr ""
 "%s\n"
 "存在语法错误。"
 
 "%s\n"
 "存在语法错误。"
 

-#: src/prefs_actions.c:584
+#: src/prefs_actions.c:613

 msgid "Delete action"
 msgstr "删除动作"
 
 msgid "Delete action"
 msgstr "删除动作"
 

-#: src/prefs_actions.c:585
+#: src/prefs_actions.c:614

 msgid "Do you really want to delete this action?"
 msgstr "你真的要删除此动作码? "
 
 msgid "Do you really want to delete this action?"
 msgstr "你真的要删除此动作码? "
 

-#: src/prefs_actions.c:702 src/prefs_actions.c:721 src/prefs_filtering.c:1077
-#: src/prefs_matcher.c:1605 src/prefs_template.c:371 src/prefs_template.c:387
+#: src/prefs_actions.c:731 src/prefs_actions.c:750 src/prefs_filtering.c:1081
+#: src/prefs_filtering.c:1103 src/prefs_matcher.c:1636
+#: src/prefs_template.c:397 src/prefs_template.c:413

 msgid "Entry not saved"
 msgstr "项目未保存"
 
 msgid "Entry not saved"
 msgstr "项目未保存"
 

-#: src/prefs_actions.c:703 src/prefs_actions.c:722 src/prefs_filtering.c:1078
-#: src/prefs_template.c:372 src/prefs_template.c:388
+#: src/prefs_actions.c:732 src/prefs_actions.c:751 src/prefs_filtering.c:1082
+#: src/prefs_filtering.c:1104 src/prefs_template.c:398
+#: src/prefs_template.c:414

 msgid "The entry was not saved. Close anyway?"
 msgstr "该项未保存，真的退出？"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "该项未保存，真的退出？"
 

-#: src/prefs_actions.c:756
+#: src/prefs_actions.c:785

 msgid "MENU NAME:"
 msgstr "菜单项名称:"
 
 msgid "MENU NAME:"
 msgstr "菜单项名称:"
 

-#: src/prefs_actions.c:757
+#: src/prefs_actions.c:786

 msgid "Use / in menu name to make submenus."
 msgstr "菜单项名称中可以用斜线(/)标识子菜单项"
 
 msgid "Use / in menu name to make submenus."
 msgstr "菜单项名称中可以用斜线(/)标识子菜单项"
 

-#: src/prefs_actions.c:759
+#: src/prefs_actions.c:788

 msgid "COMMAND LINE:"
 msgstr "命令行:"
 
 msgid "COMMAND LINE:"
 msgstr "命令行:"
 

-#: src/prefs_actions.c:760
+#: src/prefs_actions.c:789

 msgid "Begin with:"
 msgstr "开始符号:"
 
 msgid "Begin with:"
 msgstr "开始符号:"
 

-#: src/prefs_actions.c:761
+#: src/prefs_actions.c:790

 msgid "to send message body or selection to command's standard input"
 msgstr "将邮件内容或者选中部分传递给命令的标准输入"
 
 msgid "to send message body or selection to command's standard input"
 msgstr "将邮件内容或者选中部分传递给命令的标准输入"
 

-#: src/prefs_actions.c:762
+#: src/prefs_actions.c:791

 msgid "to send user provided text to command's standard input"
 msgstr "将用户输入的文字传递给命令的标准输入"
 
 msgid "to send user provided text to command's standard input"
 msgstr "将用户输入的文字传递给命令的标准输入"
 

-#: src/prefs_actions.c:763
+#: src/prefs_actions.c:792

 msgid "to send user provided hidden text to command's standard input"
 msgstr "将用户输入的文字传递给命令的标准输入(输入时不显示明文)"
 
 msgid "to send user provided hidden text to command's standard input"
 msgstr "将用户输入的文字传递给命令的标准输入(输入时不显示明文)"
 

-#: src/prefs_actions.c:764
+#: src/prefs_actions.c:793

 msgid "End with:"
 msgstr "结束符号:"
 
 msgid "End with:"
 msgstr "结束符号:"
 

-#: src/prefs_actions.c:765
+#: src/prefs_actions.c:794

 msgid "to replace message body or selection with command's standard output"
 msgstr "以命令的标准输出替换当前邮件内容或者选中部分"
 
 msgid "to replace message body or selection with command's standard output"
 msgstr "以命令的标准输出替换当前邮件内容或者选中部分"
 

-#: src/prefs_actions.c:766
+#: src/prefs_actions.c:795

 msgid "to insert command's standard output without replacing old text"
 msgstr "插入命令的标准输出内容"
 
 msgid "to insert command's standard output without replacing old text"
 msgstr "插入命令的标准输出内容"
 

-#: src/prefs_actions.c:767
+#: src/prefs_actions.c:796

 msgid "to run command asynchronously"
 msgstr "异步运行命令"
 
 msgid "to run command asynchronously"
 msgstr "异步运行命令"
 

-#: src/prefs_actions.c:768
+#: src/prefs_actions.c:797

 msgid "Use:"
 msgstr "使用:"
 
 msgid "Use:"
 msgstr "使用:"
 

-#: src/prefs_actions.c:769
+#: src/prefs_actions.c:798

 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "被选中邮件文件(RFC822/2822格式)"
 
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "被选中邮件文件(RFC822/2822格式)"
 

-#: src/prefs_actions.c:770
+#: src/prefs_actions.c:799

 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "被选中的多个邮件文件(RFC822/2822格式)"
 
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "被选中的多个邮件文件(RFC822/2822格式)"
 

-#: src/prefs_actions.c:771
+#: src/prefs_actions.c:800

 msgid "for the file of the selected decoded message MIME part"
 msgstr "被选中的MIME part(解码后)"
 
 msgid "for the file of the selected decoded message MIME part"
 msgstr "被选中的MIME part(解码后)"
 

-#: src/prefs_actions.c:772
+#: src/prefs_actions.c:801

 msgid "for a user provided argument"
 msgstr "用户提供的参数"
 
 msgid "for a user provided argument"
 msgstr "用户提供的参数"
 

-#: src/prefs_actions.c:773
+#: src/prefs_actions.c:802

 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "用户提供的隐藏参数(例如: 密码)"
 
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "用户提供的隐藏参数(例如: 密码)"
 

-#: src/prefs_actions.c:774
+#: src/prefs_actions.c:803

 msgid "for the text selection"
 msgstr "选中的文字"
 
 msgid "for the text selection"
 msgstr "选中的文字"
 

-#: src/prefs_actions.c:775
+#: src/prefs_actions.c:804

 msgid "apply filtering actions between {} to selected messages"
 msgstr "对选中的邮件执行{}中的过滤动作"
 
 msgid "apply filtering actions between {} to selected messages"
 msgstr "对选中的邮件执行{}中的过滤动作"
 

-#: src/prefs_actions.c:784 src/prefs_filtering_action.c:1063
+#: src/prefs_actions.c:813 src/prefs_filtering_action.c:1088

 #: src/quote_fmt.c:77
 msgid "Description of symbols"
 msgstr "符号描述"
 
 #: src/quote_fmt.c:77
 msgid "Description of symbols"
 msgstr "符号描述"
 

-#: src/prefs_actions.c:867
+#: src/prefs_actions.c:896

 msgid "Current actions"
 msgstr "当前动作"
 
 msgid "Current actions"
 msgstr "当前动作"
 


@@ -6558,7 +6749,7 @@ msgid "Custom header configuration"
 msgstr "自定义信头"
 
 #: src/prefs_customheader.c:492 src/prefs_display_header.c:560
 msgstr "自定义信头"
 
 #: src/prefs_customheader.c:492 src/prefs_display_header.c:560

-#: src/prefs_matcher.c:1192
+#: src/prefs_matcher.c:1220

 msgid "Header name is not set."
 msgstr "为设定信头名称。"
 
 msgid "Header name is not set."
 msgstr "为设定信头名称。"
 


@@ -6583,7 +6774,7 @@ msgid "Displayed header configuration"
 msgstr "信头字段显示配置"
 
 #. header name
 msgstr "信头字段显示配置"
 
 #. header name

-#: src/prefs_display_header.c:251 src/prefs_matcher.c:454
+#: src/prefs_display_header.c:251 src/prefs_matcher.c:469

 msgid "Header name"
 msgstr "信头名称"
 
 msgid "Header name"
 msgstr "信头名称"
 


@@ -6628,8 +6819,8 @@ msgstr "图片查看器"
 msgid "Audio player"
 msgstr "音频播放器"
 
 msgid "Audio player"
 msgstr "音频播放器"
 

-#: src/prefs_ext_prog.c:266 src/prefs_image_viewer.c:145
-#: src/prefs_message.c:275 src/prefs_msg_colors.c:394
+#: src/prefs_ext_prog.c:266 src/prefs_image_viewer.c:122
+#: src/prefs_message.c:314 src/prefs_msg_colors.c:394

 msgid "Message View"
 msgstr "邮件视图"
 
 msgid "Message View"
 msgstr "邮件视图"
 


@@ -6665,7 +6856,7 @@ msgstr "设为已读"
 msgid "Mark as unread"
 msgstr "设为未读"
 
 msgid "Mark as unread"
 msgstr "设为未读"
 

-#: src/prefs_filtering_action.c:158 src/toolbar.c:394 src/toolbar.c:488
+#: src/prefs_filtering_action.c:158 src/toolbar.c:393 src/toolbar.c:481

 msgid "Forward"
 msgstr "转发"
 
 msgid "Forward"
 msgstr "转发"
 


@@ -6673,12 +6864,12 @@ msgstr "转发"
 msgid "Redirect"
 msgstr "重新指定"
 
 msgid "Redirect"
 msgstr "重新指定"
 

-#: src/prefs_filtering_action.c:161 src/prefs_filtering_action.c:410
-#: src/toolbar.c:171 src/toolbar.c:397 src/toolbar.c:1546
+#: src/prefs_filtering_action.c:161 src/prefs_filtering_action.c:425
+#: src/toolbar.c:171 src/toolbar.c:1539

 msgid "Execute"
 msgstr "执行"
 
 msgid "Execute"
 msgstr "执行"
 

-#: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:415
+#: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:430

 msgid "Color"
 msgstr "颜色"
 
 msgid "Color"
 msgstr "颜色"
 


@@ -6698,100 +6889,100 @@ msgstr "隐藏"
 msgid "Stop filter"
 msgstr "停止过滤"
 
 msgid "Stop filter"
 msgstr "停止过滤"
 

-#: src/prefs_filtering_action.c:300
+#: src/prefs_filtering_action.c:313

 msgid "Filtering action configuration"
 msgstr "过滤动作配置"
 
 msgid "Filtering action configuration"
 msgstr "过滤动作配置"
 

-#: src/prefs_filtering_action.c:323
+#: src/prefs_filtering_action.c:338

 msgid "Action"
 msgstr "动作"
 
 msgid "Action"
 msgstr "动作"
 

-#: src/prefs_filtering_action.c:400
+#: src/prefs_filtering_action.c:415

 msgid "Destination"
 msgstr "目的地"
 
 msgid "Destination"
 msgstr "目的地"
 

-#: src/prefs_filtering_action.c:405
+#: src/prefs_filtering_action.c:420

 msgid "Recipient"
 msgstr "回执"
 
 #. S_COL_NUMBER
 msgid "Recipient"
 msgstr "回执"
 
 #. S_COL_NUMBER

-#: src/prefs_filtering_action.c:420 src/prefs_summary_column.c:88
-#: src/summaryview.c:468
+#: src/prefs_filtering_action.c:435 src/prefs_summary_column.c:88
+#: src/summaryview.c:472

 msgid "Score"
 msgstr "得分"
 
 msgid "Score"
 msgstr "得分"
 

-#: src/prefs_filtering_action.c:442 src/prefs_matcher.c:487
+#: src/prefs_filtering_action.c:457 src/prefs_matcher.c:502

 msgid "Info ..."
 msgstr "说明 ..."
 
 msgid "Info ..."
 msgstr "说明 ..."
 

-#: src/prefs_filtering_action.c:470 src/prefs_filtering.c:343
-#: src/prefs_matcher.c:583 src/prefs_template.c:241 src/prefs_toolbar.c:792
+#: src/prefs_filtering_action.c:485 src/prefs_filtering.c:343
+#: src/prefs_matcher.c:598 src/prefs_template.c:255 src/prefs_toolbar.c:792

 msgid "  Replace  "
 msgstr " 替换 "
 
 msgid "  Replace  "
 msgstr " 替换 "
 

-#: src/prefs_filtering_action.c:761
+#: src/prefs_filtering_action.c:786

 msgid "Command line not set"
 msgstr "未指定命令行"
 
 msgid "Command line not set"
 msgstr "未指定命令行"
 

-#: src/prefs_filtering_action.c:762
+#: src/prefs_filtering_action.c:787

 msgid "Destination is not set."
 msgstr "没有指定收信人。"
 
 msgid "Destination is not set."
 msgstr "没有指定收信人。"
 

-#: src/prefs_filtering_action.c:773
+#: src/prefs_filtering_action.c:798

 msgid "Recipient is not set."
 msgstr "没有指定收信人。"
 
 msgid "Recipient is not set."
 msgstr "没有指定收信人。"
 

-#: src/prefs_filtering_action.c:788
+#: src/prefs_filtering_action.c:813

 msgid "Score is not set"
 msgstr "未指定积分"
 
 msgid "Score is not set"
 msgstr "未指定积分"
 

-#: src/prefs_filtering_action.c:1006
+#: src/prefs_filtering_action.c:1031

 msgid "No action was defined."
 msgstr "没有定义动作。"
 
 #. S_COL_TO
 #. date expression
 #. S_COL_TO
 msgid "No action was defined."
 msgstr "没有定义动作。"
 
 #. S_COL_TO
 #. date expression
 #. S_COL_TO

-#: src/prefs_filtering_action.c:1048 src/prefs_matcher.c:1657
-#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:465
+#: src/prefs_filtering_action.c:1073 src/prefs_matcher.c:1688
+#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:469

 msgid "Date"
 msgstr "日期"
 
 #. references
 msgid "Date"
 msgstr "日期"
 
 #. references

-#: src/prefs_filtering_action.c:1049 src/prefs_matcher.c:1658
+#: src/prefs_filtering_action.c:1074 src/prefs_matcher.c:1689

 #: src/quote_fmt.c:52
 msgid "Message-ID"
 msgstr ""
 
 #. cc
 #: src/quote_fmt.c:52
 msgid "Message-ID"
 msgstr ""
 
 #. cc

-#: src/prefs_filtering_action.c:1050 src/prefs_matcher.c:152
-#: src/prefs_matcher.c:1659 src/quote_fmt.c:50
+#: src/prefs_filtering_action.c:1075 src/prefs_matcher.c:152
+#: src/prefs_matcher.c:1690 src/quote_fmt.c:50

 msgid "Newsgroups"
 msgstr "新闻组"
 
 #. newsgroups
 msgid "Newsgroups"
 msgstr "新闻组"
 
 #. newsgroups

-#: src/prefs_filtering_action.c:1051 src/prefs_matcher.c:152
-#: src/prefs_matcher.c:1660 src/quote_fmt.c:51
+#: src/prefs_filtering_action.c:1076 src/prefs_matcher.c:152
+#: src/prefs_matcher.c:1691 src/quote_fmt.c:51

 msgid "References"
 msgstr ""
 
 msgid "References"
 msgstr ""
 

-#: src/prefs_filtering_action.c:1052 src/prefs_matcher.c:1661
+#: src/prefs_filtering_action.c:1077 src/prefs_matcher.c:1692

 msgid "Filename - should not be modified"
 msgstr "文件名 - 请勿更动"
 
 msgid "Filename - should not be modified"
 msgstr "文件名 - 请勿更动"
 

-#: src/prefs_filtering_action.c:1053 src/prefs_matcher.c:1662
+#: src/prefs_filtering_action.c:1078 src/prefs_matcher.c:1693

 msgid "new line"
 msgstr "新行"
 
 msgid "new line"
 msgstr "新行"
 

-#: src/prefs_filtering_action.c:1054 src/prefs_matcher.c:1663
+#: src/prefs_filtering_action.c:1079 src/prefs_matcher.c:1694

 msgid "escape character for quotes"
 msgstr "引文逃逸字符"
 
 msgid "escape character for quotes"
 msgstr "引文逃逸字符"
 

-#: src/prefs_filtering_action.c:1055 src/prefs_matcher.c:1664
+#: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:1695

 msgid "quote character"
 msgstr "引文字符"
 
 msgid "quote character"
 msgstr "引文字符"
 

-#: src/prefs_filtering_action.c:1364
+#: src/prefs_filtering_action.c:1389

 msgid "Current action list"
 msgstr "当前动作列表"
 
 msgid "Current action list"
 msgstr "当前动作列表"
 


@@ -6814,7 +7005,7 @@ msgstr "动作: "
 #. FIXME: this strcmp() is bogus: "(New)" should never
 #. * be inserted in the storage
 #: src/prefs_filtering.c:647 src/prefs_filtering.c:648
 #. FIXME: this strcmp() is bogus: "(New)" should never
 #. * be inserted in the storage
 #: src/prefs_filtering.c:647 src/prefs_filtering.c:648

-#: src/prefs_filtering.c:709 src/prefs_template.c:321
+#: src/prefs_filtering.c:709 src/prefs_template.c:347

 msgid "(New)"
 msgstr "(新建)"
 
 msgid "(New)"
 msgstr "(新建)"
 


@@ -6834,20 +7025,20 @@ msgstr "条件字符串为空。"
 msgid "Action string is empty."
 msgstr "文件 %s 不存在。"
 
 msgid "Action string is empty."
 msgstr "文件 %s 不存在。"
 

-#: src/prefs_filtering.c:917
+#: src/prefs_filtering.c:921

 msgid "Delete rule"
 msgstr "删除规则"
 
 msgid "Delete rule"
 msgstr "删除规则"
 

-#: src/prefs_filtering.c:918
+#: src/prefs_filtering.c:922

 msgid "Do you really want to delete this rule?"
 msgstr "确定删除这项规则？"
 
 msgid "Do you really want to delete this rule?"
 msgstr "确定删除这项规则？"
 

-#: src/prefs_filtering.c:1239
+#: src/prefs_filtering.c:1264

 msgid "Rule"
 msgstr ""
 
 #. Apply to subfolders
 msgid "Rule"
 msgstr ""
 
 #. Apply to subfolders

-#: src/prefs_folder_item.c:173 src/prefs_folder_item.c:480
+#: src/prefs_folder_item.c:173 src/prefs_folder_item.c:490

 msgid ""
 "Apply to\n"
 "subfolders"
 msgid ""
 "Apply to\n"
 "subfolders"


@@ -6885,43 +7076,43 @@ msgstr "检查新邮件"
 msgid "Synchronise for offline use"
 msgstr "同步数据以便离线使用"
 
 msgid "Synchronise for offline use"
 msgstr "同步数据以便离线使用"
 

-#: src/prefs_folder_item.c:488
+#: src/prefs_folder_item.c:499

 msgid "Request Return Receipt"
 msgstr "请求回执"
 
 msgid "Request Return Receipt"
 msgstr "请求回执"
 

-#: src/prefs_folder_item.c:503
+#: src/prefs_folder_item.c:514

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "将发出的邮件保存一份拷贝到此邮件夹"
 
 #. Default To
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "将发出的邮件保存一份拷贝到此邮件夹"
 
 #. Default To

-#: src/prefs_folder_item.c:516
+#: src/prefs_folder_item.c:527

 msgid "Default To: "
 msgid "Default To: "

-msgstr "邮件缺省存入: "
+msgstr "新邮件缺省收件人: "

 
 #. Default address to reply to
 
 #. Default address to reply to

-#: src/prefs_folder_item.c:536
-msgid "Send replies to: "
-msgstr "å\8f\91é\80\81å\9b\9eå¤\8dç»\99: "
+#: src/prefs_folder_item.c:547
+msgid "Default To for replies: "
+msgstr "å\9b\9eå¤\8dé\82®ä»¶ç¼ºç\9c\81æ\94¶ä»¶äºº: "

 
 #. Default account
 
 #. Default account

-#: src/prefs_folder_item.c:556
+#: src/prefs_folder_item.c:567

 msgid "Default account: "
 msgstr "缺省帐号："
 
 #. Default dictionary
 msgid "Default account: "
 msgstr "缺省帐号："
 
 #. Default dictionary

-#: src/prefs_folder_item.c:600
+#: src/prefs_folder_item.c:618

 msgid "Default dictionary: "
 msgstr "缺省字典："
 
 msgid "Default dictionary: "
 msgstr "缺省字典："
 

-#: src/prefs_folder_item.c:794
+#: src/prefs_folder_item.c:823

 msgid "Pick color for folder"
 msgstr "选邮件夹的颜色"
 
 msgid "Pick color for folder"
 msgstr "选邮件夹的颜色"
 

-#: src/prefs_folder_item.c:806
+#: src/prefs_folder_item.c:835

 msgid "General"
 msgstr "一般"
 
 msgid "General"
 msgstr "一般"
 

-#: src/prefs_folder_item.c:846
+#: src/prefs_folder_item.c:875

 #, c-format
 msgid "Properties for folder %s"
 msgstr "%s - 邮件夹设置"
 #, c-format
 msgid "Properties for folder %s"
 msgstr "%s - 邮件夹设置"


@@ -6934,7 +7125,7 @@ msgstr "邮件夹和邮件列表"
 msgid "Message"
 msgstr "邮件"
 
 msgid "Message"
 msgstr "邮件"
 

-#: src/prefs_fonts.c:145 src/prefs_summaries.c:1017 src/prefs_themes.c:333
+#: src/prefs_fonts.c:145 src/prefs_summaries.c:1028 src/prefs_themes.c:359

 msgid "Display"
 msgstr "显示"
 
 msgid "Display"
 msgstr "显示"
 


@@ -6942,15 +7133,15 @@ msgstr "显示"
 msgid "Fonts"
 msgstr "字体"
 
 msgid "Fonts"
 msgstr "字体"
 

-#: src/prefs_gtk.c:848
+#: src/prefs_gtk.c:849

 msgid "Preferences"
 msgstr "偏好设置"
 
 msgid "Preferences"
 msgstr "偏好设置"
 

-#: src/prefs_image_viewer.c:68
+#: src/prefs_image_viewer.c:66

 msgid "Automatically display attached images"
 msgstr "自动显示邮件中的图片"
 
 msgid "Automatically display attached images"
 msgstr "自动显示邮件中的图片"
 

-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:72

 msgid ""
 "Resize attached images by default\n"
 "(Clicking image toggles scaling)"
 msgid ""
 "Resize attached images by default\n"
 "(Clicking image toggles scaling)"


@@ -6958,11 +7149,11 @@ msgstr ""
 "缺省将缩放附件里的图片\n"
 "(点击图片切换缩放状态)"
 
 "缺省将缩放附件里的图片\n"
 "(点击图片切换缩放状态)"
 

-#: src/prefs_image_viewer.c:82
+#: src/prefs_image_viewer.c:78

 msgid "Display images inline"
 msgstr "嵌入显示图片"
 
 msgid "Display images inline"
 msgstr "嵌入显示图片"
 

-#: src/prefs_image_viewer.c:146
+#: src/prefs_image_viewer.c:123

 msgid "Image Viewer"
 msgstr "图片查看器"
 
 msgid "Image Viewer"
 msgstr "图片查看器"
 


@@ -7090,111 +7281,115 @@ msgstr "是"
 msgid "no"
 msgstr "不"
 
 msgid "no"
 msgstr "不"
 

-#: src/prefs_matcher.c:397
+#: src/prefs_matcher.c:410

 msgid "Condition configuration"
 msgstr "条件设置"
 
 #. criteria combo box
 msgid "Condition configuration"
 msgstr "条件设置"
 
 #. criteria combo box

-#: src/prefs_matcher.c:422
+#: src/prefs_matcher.c:437

 msgid "Match type"
 msgstr "匹配类型"
 
 msgid "Match type"
 msgstr "匹配类型"
 

-#: src/prefs_matcher.c:509
+#: src/prefs_matcher.c:524

 msgid "Predicate"
 msgstr "谓词"
 
 msgid "Predicate"
 msgstr "谓词"
 

-#: src/prefs_matcher.c:560
+#: src/prefs_matcher.c:575

 msgid "Use regexp"
 msgstr "使用正则表达式"
 
 #. boolean operation
 msgid "Use regexp"
 msgstr "使用正则表达式"
 
 #. boolean operation

-#: src/prefs_matcher.c:598
+#: src/prefs_matcher.c:613

 msgid "Boolean Op"
 msgstr "逻辑操作符"
 
 msgid "Boolean Op"
 msgstr "逻辑操作符"
 

-#: src/prefs_matcher.c:1172
+#: src/prefs_matcher.c:1200

 msgid "Value is not set."
 msgstr "尚未赋值"
 
 msgid "Value is not set."
 msgstr "尚未赋值"
 

-#: src/prefs_matcher.c:1606
+#: src/prefs_matcher.c:1637

 msgid ""
 msgid ""

-"The entry was not saved\n"
+"The entry was not saved.\n"

 "Have you really finished?"
 msgstr ""
 "该项尚未保存\n"
 "确定已经完成配置了吗?"
 
 "Have you really finished?"
 msgstr ""
 "该项尚未保存\n"
 "确定已经完成配置了吗?"
 

-#: src/prefs_matcher.c:1648
+#: src/prefs_matcher.c:1679

 msgid "'Test' allows you to test a message or message element"
 msgstr "'测试'允许您使用外部程序或者脚本"
 
 msgid "'Test' allows you to test a message or message element"
 msgstr "'测试'允许您使用外部程序或者脚本"
 

-#: src/prefs_matcher.c:1649
+#: src/prefs_matcher.c:1680

 msgid "using an external program or script. The program will"
 msgstr "测试一个邮件或者邮件元素。程序应该"
 
 msgid "using an external program or script. The program will"
 msgstr "测试一个邮件或者邮件元素。程序应该"
 

-#: src/prefs_matcher.c:1650
+#: src/prefs_matcher.c:1681

 msgid "return either 0 or 1"
 msgstr "返回0或者1"
 
 msgid "return either 0 or 1"
 msgstr "返回0或者1"
 

-#: src/prefs_matcher.c:1651
+#: src/prefs_matcher.c:1682

 msgid "The following symbols can be used:"
 msgstr "可以使用下述符号:"
 
 msgid "The following symbols can be used:"
 msgstr "可以使用下述符号:"
 

-#: src/prefs_matcher.c:1672
+#: src/prefs_matcher.c:1703

 msgid "Match Type: 'Test'"
 msgstr "匹配类型: 'Test'"
 
 msgid "Match Type: 'Test'"
 msgstr "匹配类型: 'Test'"
 

-#: src/prefs_matcher.c:1751
+#: src/prefs_matcher.c:1782

 msgid "Current condition rules"
 msgstr "当前条件规则"
 
 msgid "Current condition rules"
 msgstr "当前条件规则"
 

-#: src/prefs_message.c:102
+#: src/prefs_message.c:119

 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"
 msgstr "将全角英文与数字以半角来显示 (只适用日文)"
 
 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"
 msgstr "将全角英文与数字以半角来显示 (只适用日文)"
 

-#: src/prefs_message.c:108
+#: src/prefs_message.c:125

 msgid "Display header pane above message view"
 msgstr "在邮件视图上方显示信头信息面板"
 
 msgid "Display header pane above message view"
 msgstr "在邮件视图上方显示信头信息面板"
 

-#: src/prefs_message.c:115
+#: src/prefs_message.c:129
+msgid "Display X-Face in message view"
+msgstr "在邮件视图显示邮件的X-Face"
+
+#: src/prefs_message.c:143

 msgid "Display short headers on message view"
 msgstr "在邮件视图显示邮件的简要信头"
 
 msgid "Display short headers on message view"
 msgstr "在邮件视图显示邮件的简要信头"
 

-#: src/prefs_message.c:128
+#: src/prefs_message.c:156

 msgid "Render HTML messages as text"
 msgstr "以文本方式显示HTML邮件"
 
 msgid "Render HTML messages as text"
 msgstr "以文本方式显示HTML邮件"
 

-#: src/prefs_message.c:140
+#: src/prefs_message.c:168

 msgid "Line space"
 msgstr "行间距"
 
 msgid "Line space"
 msgstr "行间距"
 

-#: src/prefs_message.c:154 src/prefs_message.c:192
+#: src/prefs_message.c:182 src/prefs_message.c:220

 msgid "pixel(s)"
 msgstr "像素"
 
 msgid "pixel(s)"
 msgstr "像素"
 

-#: src/prefs_message.c:159
+#: src/prefs_message.c:187

 msgid "Scroll"
 msgstr "卷动"
 
 msgid "Scroll"
 msgstr "卷动"
 

-#: src/prefs_message.c:166
+#: src/prefs_message.c:194

 msgid "Half page"
 msgstr "一次半页"
 
 msgid "Half page"
 msgstr "一次半页"
 

-#: src/prefs_message.c:172
+#: src/prefs_message.c:200

 msgid "Smooth scroll"
 msgstr "平滑卷动"
 
 msgid "Smooth scroll"
 msgstr "平滑卷动"
 

-#: src/prefs_message.c:178
+#: src/prefs_message.c:206

 msgid "Step"
 msgstr "每次卷动"
 
 msgid "Step"
 msgstr "每次卷动"
 

-#: src/prefs_message.c:203
+#: src/prefs_message.c:231

 msgid "Show attachment descriptions (rather than names)"
 msgstr "显示附件的描述信息(而不是附件名称)"
 
 msgid "Show attachment descriptions (rather than names)"
 msgstr "显示附件的描述信息(而不是附件名称)"
 

-#: src/prefs_message.c:276
+#: src/prefs_message.c:315

 msgid "Text options"
 msgstr "文本选项"
 
 msgid "Text options"
 msgstr "文本选项"
 


@@ -7375,7 +7570,7 @@ msgstr "合并邮件后更新所有本地邮件夹"
 msgid "Show receive dialog"
 msgstr "显示收邮件进度对话框"
 
 msgid "Show receive dialog"
 msgstr "显示收邮件进度对话框"
 

-#: src/prefs_receive.c:198 src/prefs_send.c:162 src/prefs_summaries.c:899
+#: src/prefs_receive.c:198 src/prefs_send.c:162 src/prefs_summaries.c:905

 msgid "Always"
 msgstr "总显示"
 
 msgid "Always"
 msgstr "总显示"
 


@@ -7596,202 +7791,206 @@ msgstr ""
 msgid "Spell Checking"
 msgstr "拼写检查"
 
 msgid "Spell Checking"
 msgstr "拼写检查"
 

-#: src/prefs_summaries.c:141
+#: src/prefs_summaries.c:142

 msgid "the full abbreviated weekday name"
 msgstr "(星期)：一、二、..."
 
 msgid "the full abbreviated weekday name"
 msgstr "(星期)：一、二、..."
 

-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:143

 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 
 msgid "the full weekday name"
 msgstr "星期一、星期二、..."
 

-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:144

 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 
 msgid "the abbreviated month name"
 msgstr "1月、2月、..."
 

-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:145

 msgid "the full month name"
 msgstr "一月、二月、..."
 
 msgid "the full month name"
 msgstr "一月、二月、..."
 

-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:146

 msgid "the preferred date and time for the current locale"
 msgstr "完整的西元日期与时间（本地时间）"
 
 msgid "the preferred date and time for the current locale"
 msgstr "完整的西元日期与时间（本地时间）"
 

-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:147

 msgid "the century number (year/100)"
 msgstr "世纪 (年/100)"
 
 msgid "the century number (year/100)"
 msgstr "世纪 (年/100)"
 

-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:148

 msgid "the day of the month as a decimal number"
 msgstr "今天是几号 (以数字表示)"
 
 msgid "the day of the month as a decimal number"
 msgstr "今天是几号 (以数字表示)"
 

-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:149

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "现在几点钟 (廿四时制，以数字表示)"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "现在几点钟 (廿四时制，以数字表示)"
 

-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:150

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "现在几点钟 (十二时制，以数字表示)"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "现在几点钟 (十二时制，以数字表示)"
 

-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:151

 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第几天 (以数字表示)"
 
 msgid "the day of the year as a decimal number"
 msgstr "今天是今年的第几天 (以数字表示)"
 

-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:152

 msgid "the month as a decimal number"
 msgstr "现在是几月 (以数字表示)"
 
 msgid "the month as a decimal number"
 msgstr "现在是几月 (以数字表示)"
 

-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:153

 msgid "the minute as a decimal number"
 msgstr "现在是几分 (以数字表示)"
 
 msgid "the minute as a decimal number"
 msgstr "现在是几分 (以数字表示)"
 

-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:154

 msgid "either AM or PM"
 msgstr "上午或下午"
 
 msgid "either AM or PM"
 msgstr "上午或下午"
 

-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:155

 msgid "the second as a decimal number"
 msgstr "现在是几秒 (以数字表示)"
 
 msgid "the second as a decimal number"
 msgstr "现在是几秒 (以数字表示)"
 

-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:156

 msgid "the day of the week as a decimal number"
 msgstr "现在是一周的第几天 (以数字表示)"
 
 msgid "the day of the week as a decimal number"
 msgstr "现在是一周的第几天 (以数字表示)"
 

-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:157

 msgid "the preferred date for the current locale"
 msgstr "完整的西元日期 (本地时间)"
 
 msgid "the preferred date for the current locale"
 msgstr "完整的西元日期 (本地时间)"
 

-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:158

 msgid "the last two digits of a year"
 msgstr "西元年份的末两位数字"
 
 msgid "the last two digits of a year"
 msgstr "西元年份的末两位数字"
 

-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:159

 msgid "the year as a decimal number"
 msgstr "西元年份 (以数字表示)"
 
 msgid "the year as a decimal number"
 msgstr "西元年份 (以数字表示)"
 

-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:160

 msgid "the time zone or name or abbreviation"
 msgstr "时区"
 
 msgid "the time zone or name or abbreviation"
 msgstr "时区"
 

-#: src/prefs_summaries.c:180 src/prefs_summaries.c:228
-#: src/prefs_summaries.c:783
+#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
+#: src/prefs_summaries.c:785

 msgid "Date format"
 msgstr "日期格式"
 
 msgid "Date format"
 msgstr "日期格式"
 

-#: src/prefs_summaries.c:204
+#: src/prefs_summaries.c:205

 msgid "Specifier"
 msgstr "特殊符号"
 
 msgid "Specifier"
 msgstr "特殊符号"
 

-#: src/prefs_summaries.c:246
+#: src/prefs_summaries.c:247

 msgid "Example"
 msgstr "示例"
 
 msgid "Example"
 msgstr "示例"
 

-#: src/prefs_summaries.c:328
+#: src/prefs_summaries.c:329

 msgid "Key bindings"
 msgstr "键绑定"
 
 msgid "Key bindings"
 msgstr "键绑定"
 

-#: src/prefs_summaries.c:342
+#: src/prefs_summaries.c:343

 msgid "Select preset:"
 msgstr "选择预设值"
 
 msgid "Select preset:"
 msgstr "选择预设值"
 

-#: src/prefs_summaries.c:355 src/prefs_summaries.c:671
+#: src/prefs_summaries.c:356 src/prefs_summaries.c:672

 msgid "Old Sylpheed"
 msgstr "老 Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "老 Sylpheed"
 

-#: src/prefs_summaries.c:363
+#: src/prefs_summaries.c:364

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr "提示: 在鼠标移动到菜单项上面时，你可以通过按键来修改该菜单项的快捷键。"
 
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgstr "提示: 在鼠标移动到菜单项上面时，你可以通过按键来修改该菜单项的快捷键。"
 

-#: src/prefs_summaries.c:733
+#: src/prefs_summaries.c:735

 msgid "Translate header name (such as 'From:', 'Subject:')"
 msgstr "将信头名称(比如'From:', 'Subject:')翻译出来"
 
 msgid "Translate header name (such as 'From:', 'Subject:')"
 msgstr "将信头名称(比如'From:', 'Subject:')翻译出来"
 

-#: src/prefs_summaries.c:736
+#: src/prefs_summaries.c:738

 msgid "Display unread number next to folder name"
 msgstr "在邮件夹名称后显示未读邮件数"
 
 msgid "Display unread number next to folder name"
 msgstr "在邮件夹名称后显示未读邮件数"
 

-#: src/prefs_summaries.c:745
+#: src/prefs_summaries.c:747

 msgid "Abbreviate newsgroup names longer than"
 msgstr "缩写新闻组名称，如果其长度大于"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "缩写新闻组名称，如果其长度大于"
 

-#: src/prefs_summaries.c:759
+#: src/prefs_summaries.c:761

 msgid "letters"
 msgstr "个字母"
 
 msgid "letters"
 msgstr "个字母"
 

-#: src/prefs_summaries.c:772
+#: src/prefs_summaries.c:774

 msgid "Display sender using address book"
 msgstr "以地址簿中的名字显示发信人"
 
 msgid "Display sender using address book"
 msgstr "以地址簿中的名字显示发信人"
 

-#: src/prefs_summaries.c:775
+#: src/prefs_summaries.c:777

 msgid "Thread using subject in addition to standard headers"
 msgstr "建立线索时也采用邮件主题（除了标准信头中的信息）"
 
 msgid "Thread using subject in addition to standard headers"
 msgstr "建立线索时也采用邮件主题（除了标准信头中的信息）"
 

-#: src/prefs_summaries.c:800
+#: src/prefs_summaries.c:802

 msgid "Set displayed columns"
 msgstr "设置显示列"
 
 msgid "Set displayed columns"
 msgstr "设置显示列"
 

-#: src/prefs_summaries.c:808
+#: src/prefs_summaries.c:810

 msgid " Folder list... "
 msgstr " 邮件夹列表..."
 
 msgid " Folder list... "
 msgstr " 邮件夹列表..."
 

-#: src/prefs_summaries.c:816
+#: src/prefs_summaries.c:818

 msgid " Message list... "
 msgstr " 邮件列表... "
 
 msgid " Message list... "
 msgstr " 邮件列表... "
 

-#: src/prefs_summaries.c:835
+#: src/prefs_summaries.c:837

 msgid "Always open message when selected"
 msgstr "选中邮件夹时总打开里面的邮件"
 
 msgid "Always open message when selected"
 msgstr "选中邮件夹时总打开里面的邮件"
 

-#: src/prefs_summaries.c:839
+#: src/prefs_summaries.c:841

 msgid "Only mark message as read when opened in new window"
 msgstr "只在用新窗口打开邮件时标记为已读"
 
 msgid "Only mark message as read when opened in new window"
 msgstr "只在用新窗口打开邮件时标记为已读"
 

-#: src/prefs_summaries.c:843
+#: src/prefs_summaries.c:845

 msgid "Go to inbox after receiving new mail"
 msgstr "接收完新邮件后直接进入收信夹"
 
 msgid "Go to inbox after receiving new mail"
 msgstr "接收完新邮件后直接进入收信夹"
 

-#: src/prefs_summaries.c:853
+#: src/prefs_summaries.c:855

 msgid "Execute immediately when moving or deleting messages"
 msgstr "移动或删除邮件时立即执行"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "移动或删除邮件时立即执行"
 

-#: src/prefs_summaries.c:855
+#: src/prefs_summaries.c:857

 msgid "Messages will be marked until execution if this is turned off"
 msgstr "（若此选项关闭，则必须按下「执行」才会执行移动或删除）"
 
 msgid "Messages will be marked until execution if this is turned off"
 msgstr "（若此选项关闭，则必须按下「执行」才会执行移动或删除）"
 

-#: src/prefs_summaries.c:867
+#: src/prefs_summaries.c:863
+msgid "Confirm before marking all mails in a folder as read"
+msgstr "在标记邮件夹里所有邮件为只读时请求确认"
+
+#: src/prefs_summaries.c:873

 msgid "When entering a folder"
 msgstr "进入邮件夹时"
 
 msgid "When entering a folder"
 msgstr "进入邮件夹时"
 

-#: src/prefs_summaries.c:877
+#: src/prefs_summaries.c:883

 msgid "Do nothing"
 msgstr "不错"
 
 msgid "Do nothing"
 msgstr "不错"
 

-#: src/prefs_summaries.c:878
+#: src/prefs_summaries.c:884

 msgid "Select first unread (or new) message"
 msgstr "选择第一个未读/新邮件"
 
 msgid "Select first unread (or new) message"
 msgstr "选择第一个未读/新邮件"
 

-#: src/prefs_summaries.c:880
+#: src/prefs_summaries.c:886

 msgid "Select first new (or unread) message"
 msgstr "选择第一个新/未读邮件"
 
 msgid "Select first new (or unread) message"
 msgstr "选择第一个新/未读邮件"
 

-#: src/prefs_summaries.c:890
+#: src/prefs_summaries.c:896

 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "显示\"没有未读邮件和新邮件\"对话框"
 
 msgid "Show \"no unread (or new) message\" dialog"
 msgstr "显示\"没有未读邮件和新邮件\"对话框"
 

-#: src/prefs_summaries.c:900
+#: src/prefs_summaries.c:906

 msgid "Assume 'Yes'"
 msgstr "缺省回答'是'"
 
 msgid "Assume 'Yes'"
 msgstr "缺省回答'是'"
 

-#: src/prefs_summaries.c:902
+#: src/prefs_summaries.c:908

 msgid "Assume 'No'"
 msgstr "缺省回答'否'"
 
 msgid "Assume 'No'"
 msgstr "缺省回答'否'"
 

-#: src/prefs_summaries.c:911
+#: src/prefs_summaries.c:917

 msgid " Set key bindings... "
 msgstr " 设置键绑定... "
 
 msgid " Set key bindings... "
 msgstr " 设置键绑定... "
 

-#: src/prefs_summaries.c:1018
+#: src/prefs_summaries.c:1029

 msgid "Summaries"
 msgstr "邮件列表"
 
 msgid "Summaries"
 msgstr "邮件列表"
 


@@ -7829,65 +8028,65 @@ msgstr "显示列"
 msgid " Use default "
 msgstr "使用缺省值"
 
 msgid " Use default "
 msgstr "使用缺省值"
 

-#: src/prefs_template.c:175
+#: src/prefs_template.c:189

 msgid "Template name"
 msgstr "模板名称"
 
 msgid "Template name"
 msgstr "模板名称"
 

-#: src/prefs_template.c:254
+#: src/prefs_template.c:268

 msgid " Symbols "
 msgstr " 符号 "
 
 msgid " Symbols "
 msgstr " 符号 "
 

-#: src/prefs_template.c:280
+#: src/prefs_template.c:294

 msgid "Template configuration"
 msgstr "模板设置"
 
 msgid "Template configuration"
 msgstr "模板设置"
 

-#: src/prefs_template.c:478
+#: src/prefs_template.c:504

 msgid "Template format error."
 msgstr "模板格式错误"
 
 msgid "Template format error."
 msgstr "模板格式错误"
 

-#: src/prefs_template.c:573
+#: src/prefs_template.c:599

 msgid "Delete template"
 msgstr "删除模板"
 
 msgid "Delete template"
 msgstr "删除模板"
 

-#: src/prefs_template.c:574
+#: src/prefs_template.c:600

 msgid "Do you really want to delete this template?"
 msgstr "确定删除这个模板吗？"
 
 msgid "Do you really want to delete this template?"
 msgstr "确定删除这个模板吗？"
 

-#: src/prefs_template.c:650
+#: src/prefs_template.c:676

 msgid "Current templates"
 msgstr "目前使用的模板"
 
 msgid "Current templates"
 msgstr "目前使用的模板"
 

-#: src/prefs_template.c:675
+#: src/prefs_template.c:701

 msgid "Template"
 msgstr "模板"
 
 msgid "Template"
 msgstr "模板"
 

-#: src/prefs_themes.c:315 src/prefs_themes.c:683
+#: src/prefs_themes.c:338 src/prefs_themes.c:710

 msgid "Default internal theme"
 msgstr "缺省内置主题"
 
 msgid "Default internal theme"
 msgstr "缺省内置主题"
 

-#: src/prefs_themes.c:334
+#: src/prefs_themes.c:360

 msgid "Themes"
 msgstr "主题"
 
 msgid "Themes"
 msgstr "主题"
 

-#: src/prefs_themes.c:421
+#: src/prefs_themes.c:448

 msgid "Only root can remove system themes"
 msgstr "只有root用户才能删除系统主题"
 
 msgid "Only root can remove system themes"
 msgstr "只有root用户才能删除系统主题"
 

-#: src/prefs_themes.c:424
+#: src/prefs_themes.c:451

 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "删除系统主题 '%s' "
 
 #, c-format
 msgid "Remove system theme '%s'"
 msgstr "删除系统主题 '%s' "
 

-#: src/prefs_themes.c:427
+#: src/prefs_themes.c:454

 #, c-format
 msgid "Remove theme '%s'"
 msgstr "删除主题 '%s'"
 
 #, c-format
 msgid "Remove theme '%s'"
 msgstr "删除主题 '%s'"
 

-#: src/prefs_themes.c:433
+#: src/prefs_themes.c:460

 msgid "Are you sure you want to remove this theme?"
 msgstr "确定要删除这个主题吗？"
 
 msgid "Are you sure you want to remove this theme?"
 msgstr "确定要删除这个主题吗？"
 

-#: src/prefs_themes.c:443
+#: src/prefs_themes.c:470

 #, c-format
 msgid ""
 "File %s failed\n"
 #, c-format
 msgid ""
 "File %s failed\n"


@@ -7896,24 +8095,24 @@ msgstr ""
 "删除主题时\n"
 "文件 %s 发生错误。"
 
 "删除主题时\n"
 "文件 %s 发生错误。"
 

-#: src/prefs_themes.c:447
+#: src/prefs_themes.c:474

 msgid "Removing theme directory failed."
 msgstr "删除主题目录失败。"
 
 msgid "Removing theme directory failed."
 msgstr "删除主题目录失败。"
 

-#: src/prefs_themes.c:450
+#: src/prefs_themes.c:477

 msgid "Theme removed succesfully"
 msgstr "主题删除成功"
 
 msgid "Theme removed succesfully"
 msgstr "主题删除成功"
 

-#: src/prefs_themes.c:470
+#: src/prefs_themes.c:497

 msgid "Select theme folder"
 msgstr "选择主题目录"
 
 msgid "Select theme folder"
 msgstr "选择主题目录"
 

-#: src/prefs_themes.c:485
+#: src/prefs_themes.c:512

 #, c-format
 msgid "Install theme '%s'"
 msgstr "安装主题 '%s'"
 
 #, c-format
 msgid "Install theme '%s'"
 msgstr "安装主题 '%s'"
 

-#: src/prefs_themes.c:488
+#: src/prefs_themes.c:515

 msgid ""
 "This folder doesn't seem to be a theme folder.\n"
 "Install anyway?"
 msgid ""
 "This folder doesn't seem to be a theme folder.\n"
 "Install anyway?"


@@ -7921,11 +8120,11 @@ msgstr ""
 "该目录似乎并不包含主题布景。\n"
 "继续安装吗?"
 
 "该目录似乎并不包含主题布景。\n"
 "继续安装吗?"
 

-#: src/prefs_themes.c:495
+#: src/prefs_themes.c:522

 msgid "Do you want to install theme for all users?"
 msgstr "是否安装此主题到系统目录以供所有用户使用?"
 
 msgid "Do you want to install theme for all users?"
 msgstr "是否安装此主题到系统目录以供所有用户使用?"
 

-#: src/prefs_themes.c:516
+#: src/prefs_themes.c:543

 msgid ""
 "A theme with the same name is\n"
 "already installed in this location"
 msgid ""
 "A theme with the same name is\n"
 "already installed in this location"


@@ -7933,19 +8132,19 @@ msgstr ""
 "该位置已经安装有一个同名主题。\n"
 " "
 
 "该位置已经安装有一个同名主题。\n"
 " "
 

-#: src/prefs_themes.c:520
+#: src/prefs_themes.c:547

 msgid "Couldn't create destination directory"
 msgstr "无法创建目的目录"
 
 msgid "Couldn't create destination directory"
 msgstr "无法创建目的目录"
 

-#: src/prefs_themes.c:533
+#: src/prefs_themes.c:560

 msgid "Theme installed succesfully"
 msgstr "主题安装成功"
 
 msgid "Theme installed succesfully"
 msgstr "主题安装成功"
 

-#: src/prefs_themes.c:540
+#: src/prefs_themes.c:567

 msgid "Failed installing theme"
 msgstr "安装主题失败"
 
 msgid "Failed installing theme"
 msgstr "安装主题失败"
 

-#: src/prefs_themes.c:543
+#: src/prefs_themes.c:570

 #, c-format
 msgid ""
 "File %s failed\n"
 #, c-format
 msgid ""
 "File %s failed\n"


@@ -7954,74 +8153,74 @@ msgstr ""
 "安装主题时\n"
 "文件 %s 失败."
 
 "安装主题时\n"
 "文件 %s 失败."
 

-#: src/prefs_themes.c:644
+#: src/prefs_themes.c:671

 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "共有%d个主题可用 (用户目录%d个，系统目录%d个，内置1个)"
 
 #, c-format
 msgid "%d themes available (%d user, %d system, 1 internal)"
 msgstr "共有%d个主题可用 (用户目录%d个，系统目录%d个，内置1个)"
 

-#: src/prefs_themes.c:684
-msgid "The Sylpheed Claws Team"
-msgstr "Sylpheed Claws开发组"
+#: src/prefs_themes.c:711
+msgid "The Sylpheed-Claws Team"
+msgstr "Sylpheed-Claws开发组"

 
 

-#: src/prefs_themes.c:686
+#: src/prefs_themes.c:713

 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "内置主题包含有 %d 个图标"
 
 #, c-format
 msgid "Internal theme has %d icons"
 msgstr "内置主题包含有 %d 个图标"
 

-#: src/prefs_themes.c:692
+#: src/prefs_themes.c:719

 msgid "No info file available for this theme"
 msgstr "该主题没有说明文件"
 
 msgid "No info file available for this theme"
 msgstr "该主题没有说明文件"
 

-#: src/prefs_themes.c:710
+#: src/prefs_themes.c:737

 msgid "Error: can't get theme status"
 msgstr "错误： 无法取得主题状态"
 
 msgid "Error: can't get theme status"
 msgstr "错误： 无法取得主题状态"
 

-#: src/prefs_themes.c:734
+#: src/prefs_themes.c:761

 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d 个文件(%d 个图标), 大小: %s"
 
 #, c-format
 msgid "%d files (%d icons), size: %s"
 msgstr "%d 个文件(%d 个图标), 大小: %s"
 

-#: src/prefs_themes.c:825
+#: src/prefs_themes.c:852

 msgid "Selector"
 msgstr "选择器"
 
 msgid "Selector"
 msgstr "选择器"
 

-#: src/prefs_themes.c:845
+#: src/prefs_themes.c:872

 msgid "Install new..."
 msgstr "安装新主题"
 
 msgid "Install new..."
 msgstr "安装新主题"
 

-#: src/prefs_themes.c:850
+#: src/prefs_themes.c:877

 msgid "Get more..."
 msgstr "下载更多..."
 
 msgid "Get more..."
 msgstr "下载更多..."
 

-#: src/prefs_themes.c:882
+#: src/prefs_themes.c:909

 msgid "Information"
 msgstr "信息"
 
 msgid "Information"
 msgstr "信息"
 

-#: src/prefs_themes.c:896
+#: src/prefs_themes.c:923

 msgid "Author: "
 msgstr "作者: "
 
 msgid "Author: "
 msgstr "作者: "
 

-#: src/prefs_themes.c:904
+#: src/prefs_themes.c:931

 msgid "URL:"
 msgstr "URL:"
 
 msgid "URL:"
 msgstr "URL:"
 

-#: src/prefs_themes.c:932
+#: src/prefs_themes.c:959

 msgid "Status:"
 msgstr "状态"
 
 msgid "Status:"
 msgstr "状态"
 

-#: src/prefs_themes.c:946
+#: src/prefs_themes.c:973

 msgid "Preview"
 msgstr "预览"
 
 msgid "Preview"
 msgstr "预览"
 

-#: src/prefs_themes.c:987
+#: src/prefs_themes.c:1014

 msgid "Actions"
 msgstr "动作"
 
 msgid "Actions"
 msgstr "动作"
 

-#: src/prefs_themes.c:997
+#: src/prefs_themes.c:1024

 msgid "Use this"
 msgstr "采用此主题"
 
 msgid "Use this"
 msgstr "采用此主题"
 

-#: src/prefs_themes.c:1002
+#: src/prefs_themes.c:1029

 msgid "Remove"
 msgstr "删除"
 
 msgid "Remove"
 msgstr "删除"
 


@@ -8046,8 +8245,8 @@ msgid "Message view toolbar configuration"
 msgstr "邮件视图工具条设置"
 
 #: src/prefs_toolbar.c:641
 msgstr "邮件视图工具条设置"
 
 #: src/prefs_toolbar.c:641

-msgid "Sylpheed Action"
-msgstr "Sylpheed 动作"
+msgid "Sylpheed-Claws Action"
+msgstr "Sylpheed-Claws 动作"

 
 #: src/prefs_toolbar.c:650
 msgid "Toolbar text"
 
 #: src/prefs_toolbar.c:650
 msgid "Toolbar text"


@@ -8392,364 +8591,350 @@ msgstr "搜寻已到顶端。要从结尾继续搜寻吗？"
 msgid "End of list reached; continue from beginning?"
 msgstr "搜寻已到结尾。要从开头继续搜寻吗？"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "搜寻已到结尾。要从开头继续搜寻吗？"
 

-#: src/summaryview.c:397
+#: src/summaryview.c:401

 msgid "/_Reply"
 msgstr "/回复(_R)"
 
 msgid "/_Reply"
 msgstr "/回复(_R)"
 

-#: src/summaryview.c:398
+#: src/summaryview.c:402

 msgid "/Repl_y to"
 msgstr "/回复给(_y)"
 
 msgid "/Repl_y to"
 msgstr "/回复给(_y)"
 

-#: src/summaryview.c:399
+#: src/summaryview.c:403

 msgid "/Repl_y to/_all"
 msgstr "/回复给(_y)/所有人(_a)"
 
 msgid "/Repl_y to/_all"
 msgstr "/回复给(_y)/所有人(_a)"
 

-#: src/summaryview.c:400
+#: src/summaryview.c:404

 msgid "/Repl_y to/_sender"
 msgstr "/回复给(_y)/发信人(_s)"
 
 msgid "/Repl_y to/_sender"
 msgstr "/回复给(_y)/发信人(_s)"
 

-#: src/summaryview.c:401
+#: src/summaryview.c:405

 msgid "/Repl_y to/mailing _list"
 msgstr "/回复给(_y)/邮件列表 (_l)"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/回复给(_y)/邮件列表 (_l)"
 

-#: src/summaryview.c:403
-msgid "/Follow-up and reply to"
-msgstr "/Follow-up and reply to"
-
-#: src/summaryview.c:405 src/toolbar.c:230
+#: src/summaryview.c:408 src/toolbar.c:230

 msgid "/_Forward"
 msgstr "转发(_F)"
 
 msgid "/_Forward"
 msgstr "转发(_F)"
 

-#: src/summaryview.c:406
+#: src/summaryview.c:409 src/toolbar.c:231
+msgid "/For_ward as attachment"
+msgstr "/作为附件转发(_w)"
+
+#: src/summaryview.c:410

 msgid "/Redirect"
 msgstr "/重定向"
 
 msgid "/Redirect"
 msgstr "/重定向"
 

-#: src/summaryview.c:408
+#: src/summaryview.c:412

 msgid "/M_ove..."
 msgstr "/移动(_o)..."
 
 msgid "/M_ove..."
 msgstr "/移动(_o)..."
 

-#: src/summaryview.c:409
+#: src/summaryview.c:413

 msgid "/_Copy..."
 msgstr "/复制(_C)..."
 
 msgid "/_Copy..."
 msgstr "/复制(_C)..."
 

-#: src/summaryview.c:410
+#: src/summaryview.c:414

 msgid "/Move to _trash"
 msgstr "/移动到垃圾桶(_t)"
 
 msgid "/Move to _trash"
 msgstr "/移动到垃圾桶(_t)"
 

-#: src/summaryview.c:411
+#: src/summaryview.c:415

 msgid "/_Delete..."
 msgstr "/删除(_D)..."
 
 msgid "/_Delete..."
 msgstr "/删除(_D)..."
 

-#: src/summaryview.c:412
-msgid "/Cancel a news message"
-msgstr "/取消新闻组邮件"
-
-#: src/summaryview.c:414
+#: src/summaryview.c:417

 msgid "/_Mark"
 msgstr "/标记(_M)"
 
 msgid "/_Mark"
 msgstr "/标记(_M)"
 

-#: src/summaryview.c:415
+#: src/summaryview.c:418

 msgid "/_Mark/_Mark"
 msgstr "/标记(_M)/标记(_M)"
 
 msgid "/_Mark/_Mark"
 msgstr "/标记(_M)/标记(_M)"
 

-#: src/summaryview.c:416
+#: src/summaryview.c:419

 msgid "/_Mark/_Unmark"
 msgstr "/标记(_M)/去除标记(_U)"
 
 msgid "/_Mark/_Unmark"
 msgstr "/标记(_M)/去除标记(_U)"
 

-#: src/summaryview.c:417
+#: src/summaryview.c:420

 msgid "/_Mark/---"
 msgstr "/标记(_M)/---"
 
 msgid "/_Mark/---"
 msgstr "/标记(_M)/---"
 

-#: src/summaryview.c:418
+#: src/summaryview.c:421

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/标记(_M)/标记为未读(_e)"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/标记(_M)/标记为未读(_e)"
 

-#: src/summaryview.c:419
+#: src/summaryview.c:422

 msgid "/_Mark/Mark as rea_d"
 msgstr "/标记(_M)/标记为已读(_d)"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/标记(_M)/标记为已读(_d)"
 

-#: src/summaryview.c:420
+#: src/summaryview.c:423

 msgid "/_Mark/Mark all read"
 msgstr "/标记(_M)/标记全部为已读"
 
 msgid "/_Mark/Mark all read"
 msgstr "/标记(_M)/标记全部为已读"
 

-#: src/summaryview.c:421
+#: src/summaryview.c:424

 msgid "/_Mark/Ignore thread"
 msgstr "/标记(_M)/忽略邮件线索"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/标记(_M)/忽略邮件线索"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:425

 msgid "/_Mark/Unignore thread"
 msgstr "/标记(_M)/不忽略邮件线索"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/标记(_M)/不忽略邮件线索"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:426

 msgid "/_Mark/Lock"
 msgstr "/标记(_M)/锁定"
 
 msgid "/_Mark/Lock"
 msgstr "/标记(_M)/锁定"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:427

 msgid "/_Mark/Unlock"
 msgstr "/标记(_M)/解锁"
 
 msgid "/_Mark/Unlock"
 msgstr "/标记(_M)/解锁"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:428

 msgid "/Color la_bel"
 msgstr "/彩色标记(_b)"
 
 msgid "/Color la_bel"
 msgstr "/彩色标记(_b)"
 

-#: src/summaryview.c:428
-msgid "/Re-_edit"
-msgstr "/重新编辑(_e)"
-
-#: src/summaryview.c:430
+#: src/summaryview.c:431

 msgid "/Add sender to address boo_k"
 msgstr "将发信人加入地址簿中(_k)"
 
 msgid "/Add sender to address boo_k"
 msgstr "将发信人加入地址簿中(_k)"
 

-#: src/summaryview.c:432
+#: src/summaryview.c:433

 msgid "/Create f_ilter rule"
 msgstr "/创建邮件过滤规则(_i)"
 
 msgid "/Create f_ilter rule"
 msgstr "/创建邮件过滤规则(_i)"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:434

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/创建邮件过滤规则(_i)/自动创建"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/创建邮件过滤规则(_i)/自动创建"
 

-#: src/summaryview.c:435
+#: src/summaryview.c:436

 msgid "/Create f_ilter rule/by _From"
 msgstr "/创建邮件过滤规则(_i)/按来源(_F)"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "/创建邮件过滤规则(_i)/按来源(_F)"
 

-#: src/summaryview.c:437
+#: src/summaryview.c:438

 msgid "/Create f_ilter rule/by _To"
 msgstr "/创建邮件过滤规则(_i)/按收信人(_T)"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/创建邮件过滤规则(_i)/按收信人(_T)"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:440

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/创建邮件过滤规则(_i)/按标题(_S)"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/创建邮件过滤规则(_i)/按标题(_S)"
 

-#: src/summaryview.c:441
+#: src/summaryview.c:442

 msgid "/Create processing rule"
 msgstr "/创建处理规则"
 
 msgid "/Create processing rule"
 msgstr "/创建处理规则"
 

-#: src/summaryview.c:442
+#: src/summaryview.c:443

 msgid "/Create processing rule/_Automatically"
 msgstr "/创建处理规则/自动创建(_A)"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "/创建处理规则/自动创建(_A)"
 

-#: src/summaryview.c:444
+#: src/summaryview.c:445

 msgid "/Create processing rule/by _From"
 msgstr "/创建处理规则/按来源(_F)"
 
 msgid "/Create processing rule/by _From"
 msgstr "/创建处理规则/按来源(_F)"
 

-#: src/summaryview.c:446
+#: src/summaryview.c:447

 msgid "/Create processing rule/by _To"
 msgstr "/创建处理规则/按收信人(_T)"
 
 msgid "/Create processing rule/by _To"
 msgstr "/创建处理规则/按收信人(_T)"
 

-#: src/summaryview.c:448
+#: src/summaryview.c:449

 msgid "/Create processing rule/by _Subject"
 msgstr "/创建处理规则/按标题(_S)"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/创建处理规则/按标题(_S)"
 

-#: src/summaryview.c:454
+#: src/summaryview.c:455

 msgid "/_View/_Source"
 msgstr "/查看(_V)/邮件源文件(_S)"
 
 msgid "/_View/_Source"
 msgstr "/查看(_V)/邮件源文件(_S)"
 

-#: src/summaryview.c:455
+#: src/summaryview.c:456

 msgid "/_View/All _header"
 msgstr "/查看(_V)/所有的信头(_h)"
 
 #: src/summaryview.c:459
 msgid "/_View/All _header"
 msgstr "/查看(_V)/所有的信头(_h)"
 
 #: src/summaryview.c:459

-msgid "M"
-msgstr "M"
-
-#. S_COL_SIZE
-#: src/summaryview.c:467
-msgid "No."
-msgstr "No."
-
-#. S_COL_SCORE
-#: src/summaryview.c:469
-msgid "L"
-msgstr "L"
+msgid "/_Print..."
+msgstr "/打印(_P)..."

 
 

-#: src/summaryview.c:526
+#: src/summaryview.c:530

 msgid "Toggle quick-search bar"
 msgstr "切换快速搜索条显示状态"
 
 msgid "Toggle quick-search bar"
 msgstr "切换快速搜索条显示状态"
 

-#: src/summaryview.c:842
+#: src/summaryview.c:849

 msgid "Process mark"
 msgstr "邮件标记"
 
 msgid "Process mark"
 msgstr "邮件标记"
 

-#: src/summaryview.c:843
+#: src/summaryview.c:850

 msgid "Some marks are left. Process it?"
 msgstr "某些邮件已做了处理标记。是否进行处理？"
 
 msgid "Some marks are left. Process it?"
 msgstr "某些邮件已做了处理标记。是否进行处理？"
 

-#: src/summaryview.c:895
+#: src/summaryview.c:901

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "扫描邮件夹(%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "扫描邮件夹(%s)..."
 

-#: src/summaryview.c:1296 src/summaryview.c:1348
+#: src/summaryview.c:1293 src/summaryview.c:1345

 msgid "No more unread messages"
 msgstr "没有其他新邮件"
 
 msgid "No more unread messages"
 msgstr "没有其他新邮件"
 

-#: src/summaryview.c:1297
+#: src/summaryview.c:1294

 msgid "No unread message found. Search from the end?"
 msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
 
 msgid "No unread message found. Search from the end?"
 msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
 

-#: src/summaryview.c:1309 src/summaryview.c:1361 src/summaryview.c:1408
-#: src/summaryview.c:1460
+#: src/summaryview.c:1306 src/summaryview.c:1358 src/summaryview.c:1405
+#: src/summaryview.c:1457

 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 

-#: src/summaryview.c:1317
+#: src/summaryview.c:1314

 msgid "No unread messages."
 msgstr "没有未读邮件。"
 
 msgid "No unread messages."
 msgstr "没有未读邮件。"
 

-#: src/summaryview.c:1349
+#: src/summaryview.c:1346

 msgid "No unread message found. Go to next folder?"
 msgstr "没有新邮件。要到下一个邮件夹吗？"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "没有新邮件。要到下一个邮件夹吗？"
 

-#: src/summaryview.c:1395 src/summaryview.c:1447
+#: src/summaryview.c:1392 src/summaryview.c:1444

 msgid "No more new messages"
 msgstr "没有其他新邮件"
 
 msgid "No more new messages"
 msgstr "没有其他新邮件"
 

-#: src/summaryview.c:1396
+#: src/summaryview.c:1393

 msgid "No new message found. Search from the end?"
 msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
 
 msgid "No new message found. Search from the end?"
 msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
 

-#: src/summaryview.c:1416
+#: src/summaryview.c:1413

 msgid "No new messages."
 msgstr "没有新邮件"
 
 msgid "No new messages."
 msgstr "没有新邮件"
 

-#: src/summaryview.c:1448
+#: src/summaryview.c:1445

 msgid "No new message found. Go to next folder?"
 msgstr "没有新邮件。要到下一个邮件夹吗？"
 
 msgid "No new message found. Go to next folder?"
 msgstr "没有新邮件。要到下一个邮件夹吗？"
 

-#: src/summaryview.c:1485 src/summaryview.c:1510
+#: src/summaryview.c:1482 src/summaryview.c:1507

 msgid "No more marked messages"
 msgstr "没有其他已标记邮件"
 
 msgid "No more marked messages"
 msgstr "没有其他已标记邮件"
 

-#: src/summaryview.c:1486
+#: src/summaryview.c:1483

 msgid "No marked message found. Search from the end?"
 msgstr "没有找到已标记邮件。要从尾部继续搜寻吗？"
 
 msgid "No marked message found. Search from the end?"
 msgstr "没有找到已标记邮件。要从尾部继续搜寻吗？"
 

-#: src/summaryview.c:1495 src/summaryview.c:1520
+#: src/summaryview.c:1492 src/summaryview.c:1517

 msgid "No marked messages."
 msgstr "没有已标记邮件"
 
 msgid "No marked messages."
 msgstr "没有已标记邮件"
 

-#: src/summaryview.c:1511
+#: src/summaryview.c:1508

 msgid "No marked message found. Search from the beginning?"
 msgstr "没有找到已标记邮件。要从开头继续搜寻吗？"
 
 msgid "No marked message found. Search from the beginning?"
 msgstr "没有找到已标记邮件。要从开头继续搜寻吗？"
 

-#: src/summaryview.c:1535 src/summaryview.c:1560
+#: src/summaryview.c:1532 src/summaryview.c:1557

 msgid "No more labeled messages"
 msgstr "没有已标记颜色之邮件"
 
 msgid "No more labeled messages"
 msgstr "没有已标记颜色之邮件"
 

-#: src/summaryview.c:1536
+#: src/summaryview.c:1533

 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到已标记颜色之邮件。要从尾部继续搜寻吗？"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到已标记颜色之邮件。要从尾部继续搜寻吗？"
 

-#: src/summaryview.c:1545 src/summaryview.c:1570
+#: src/summaryview.c:1542 src/summaryview.c:1567

 msgid "No labeled messages."
 msgstr "没有已标记颜色之邮件"
 
 msgid "No labeled messages."
 msgstr "没有已标记颜色之邮件"
 

-#: src/summaryview.c:1561
+#: src/summaryview.c:1558

 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到已标记颜色之邮件。要从开头继续搜寻吗？"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到已标记颜色之邮件。要从开头继续搜寻吗？"
 

-#: src/summaryview.c:1779
+#: src/summaryview.c:1787

 msgid "Attracting messages by subject..."
 msgstr "正在按主题排列邮件邮件..."
 
 msgid "Attracting messages by subject..."
 msgstr "正在按主题排列邮件邮件..."
 

-#: src/summaryview.c:1926
+#: src/summaryview.c:1927

 #, c-format
 msgid "%d deleted"
 msgstr "%d 封已删除"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d 封已删除"
 

-#: src/summaryview.c:1930
+#: src/summaryview.c:1931

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 封已移动"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 封已移动"
 

-#: src/summaryview.c:1931 src/summaryview.c:1938
+#: src/summaryview.c:1932 src/summaryview.c:1939

 msgid ", "
 msgstr "，"
 
 msgid ", "
 msgstr "，"
 

-#: src/summaryview.c:1936
+#: src/summaryview.c:1937

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已复制"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已复制"
 

-#: src/summaryview.c:1951
+#: src/summaryview.c:1952

 msgid " item selected"
 msgstr "封已选择"
 
 msgid " item selected"
 msgstr "封已选择"
 

-#: src/summaryview.c:1953
+#: src/summaryview.c:1954

 msgid " items selected"
 msgstr "封已选择"
 
 msgid " items selected"
 msgstr "封已选择"
 

-#: src/summaryview.c:1969
+#: src/summaryview.c:1970

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封新邮件，%d 封未读，共 %d 封 (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封新邮件，%d 封未读，共 %d 封 (%s)"
 

-#: src/summaryview.c:2161
+#: src/summaryview.c:2171

 msgid "Sorting summary..."
 msgstr "正在对邮件进行排序..."
 
 msgid "Sorting summary..."
 msgstr "正在对邮件进行排序..."
 

-#: src/summaryview.c:2239
+#: src/summaryview.c:2249

 msgid "Setting summary from message data..."
 msgstr "正在根据邮件数据提取摘要信息..."
 
 msgid "Setting summary from message data..."
 msgstr "正在根据邮件数据提取摘要信息..."
 

-#: src/summaryview.c:2384
+#: src/summaryview.c:2400

 msgid "(No Date)"
 msgstr "(没有日期)"
 
 msgid "(No Date)"
 msgstr "(没有日期)"
 

-#: src/summaryview.c:2413
+#: src/summaryview.c:2429

 msgid "(No Recipient)"
 msgstr "(没有收件人)"
 
 msgid "(No Recipient)"
 msgstr "(没有收件人)"
 

-#: src/summaryview.c:3067
-msgid "You're not the author of the article\n"
-msgstr "您不是这篇文章的作者\n"
+#: src/summaryview.c:3149
+msgid "You're not the author of the article.\n"
+msgstr "您不是这篇文章的作者。\n"

 
 

-#: src/summaryview.c:3153
+#: src/summaryview.c:3231

 msgid "Delete message(s)"
 msgstr "删除邮件"
 
 msgid "Delete message(s)"
 msgstr "删除邮件"
 

-#: src/summaryview.c:3154
+#: src/summaryview.c:3232

 msgid "Do you really want to delete selected message(s)?"
 msgstr "确定删除选定的邮件吗？"
 
 msgid "Do you really want to delete selected message(s)?"
 msgstr "确定删除选定的邮件吗？"
 

-#: src/summaryview.c:3300
+#: src/summaryview.c:3377

 msgid "Destination is same as current folder."
 msgstr "目标邮件夹与当前邮件夹相同"
 
 msgid "Destination is same as current folder."
 msgstr "目标邮件夹与当前邮件夹相同"
 

-#: src/summaryview.c:3381
+#: src/summaryview.c:3458

 msgid "Destination to copy is same as current folder."
 msgstr "目标邮件夹与来源邮件夹相同"
 
 msgid "Destination to copy is same as current folder."
 msgstr "目标邮件夹与来源邮件夹相同"
 

-#: src/summaryview.c:3501
+#: src/summaryview.c:3578

 msgid "Append or Overwrite"
 msgstr "附加或覆盖"
 
 msgid "Append or Overwrite"
 msgstr "附加或覆盖"
 

-#: src/summaryview.c:3502
+#: src/summaryview.c:3579

 msgid "Append or overwrite existing file?"
 msgstr "附加或覆盖文件？"
 
 msgid "Append or overwrite existing file?"
 msgstr "附加或覆盖文件？"
 

-#: src/summaryview.c:3503
-msgid "Append"
-msgstr "附加"
+#: src/summaryview.c:3580
+msgid "_Append"
+msgstr "追加(_A)"

 
 

-#: src/summaryview.c:3841
+#: src/summaryview.c:3580
+msgid "_Overwrite"
+msgstr "覆盖(_O)"
+
+#: src/summaryview.c:3918

 msgid "Building threads..."
 msgstr "正在建立邮件线索..."
 
 msgid "Building threads..."
 msgstr "正在建立邮件线索..."
 

-#: src/summaryview.c:3929
+#: src/summaryview.c:4006

 msgid "Unthreading..."
 msgstr "正在解除邮件线索..."
 
 msgid "Unthreading..."
 msgstr "正在解除邮件线索..."
 

-#: src/summaryview.c:4068
+#: src/summaryview.c:4145

 msgid "Filtering..."
 msgstr "正在过滤邮件..."
 
 msgid "Filtering..."
 msgstr "正在过滤邮件..."
 

-#: src/summaryview.c:4131
+#: src/summaryview.c:4208

 msgid "Processing configuration"
 msgstr "过滤处理配置"
 
 msgid "Processing configuration"
 msgstr "过滤处理配置"
 

-#: src/summaryview.c:5458
+#: src/summaryview.c:5558

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -8758,83 +8943,83 @@ msgstr ""
 "正则表达式(regexp)错误:\n"
 "%s"
 
 "正则表达式(regexp)错误:\n"
 "%s"
 

-#: src/summaryview.c:5572
+#: src/summaryview.c:5674

 msgid "Export to mbox file"
 msgstr "以mbox格式导出邮件夹"
 
 msgid "Export to mbox file"
 msgstr "以mbox格式导出邮件夹"
 

-#: src/textview.c:217
+#: src/textview.c:224

 msgid "/_Open with Web browser"
 msgstr "/用网页浏览器打开(_O)"
 
 msgid "/_Open with Web browser"
 msgstr "/用网页浏览器打开(_O)"
 

-#: src/textview.c:218
+#: src/textview.c:225

 msgid "/Copy this _link"
 msgstr "/拷贝链接地址(_l)"
 
 msgid "/Copy this _link"
 msgstr "/拷贝链接地址(_l)"
 

-#: src/textview.c:223
+#: src/textview.c:230

 msgid "/Compose _new message"
 msgstr "/撰写新邮件(_n)"
 
 msgid "/Compose _new message"
 msgstr "/撰写新邮件(_n)"
 

-#: src/textview.c:224
+#: src/textview.c:231

 msgid "/Add to _address book"
 msgstr "/将地址加入地址簿(_a)"
 
 msgid "/Add to _address book"
 msgstr "/将地址加入地址簿(_a)"
 

-#: src/textview.c:225
+#: src/textview.c:232

 msgid "/Copy this add_ress"
 msgstr "/拷贝此地址(_r)"
 
 msgid "/Copy this add_ress"
 msgstr "/拷贝此地址(_r)"
 

-#: src/textview.c:230
+#: src/textview.c:237

 msgid "/_Open image"
 msgstr "/打开图片(_O)"
 
 msgid "/_Open image"
 msgstr "/打开图片(_O)"
 

-#: src/textview.c:231
+#: src/textview.c:238

 msgid "/_Save image..."
 msgstr "/保存图片(_S)..."
 
 msgid "/_Save image..."
 msgstr "/保存图片(_S)..."
 

-#: src/textview.c:695
+#: src/textview.c:731

 msgid "This message can't be displayed.\n"
 msgstr "无法显示该邮件.\n"
 
 msgid "This message can't be displayed.\n"
 msgstr "无法显示该邮件.\n"
 

-#: src/textview.c:714
+#: src/textview.c:750

 msgid "The following can be performed on this part by "
 msgstr "可对该部分执行以下操作"
 
 msgid "The following can be performed on this part by "
 msgstr "可对该部分执行以下操作"
 

-#: src/textview.c:715
+#: src/textview.c:751

 msgid "right-clicking the icon or list item:\n"
 msgstr "(右键点击图标或者列表项打开操作菜单):\n"
 
 msgid "right-clicking the icon or list item:\n"
 msgstr "(右键点击图标或者列表项打开操作菜单):\n"
 

-#: src/textview.c:717
+#: src/textview.c:753

 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    选择'另存为...'进行保存 (快捷键: 'y')\n"
 
 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    选择'另存为...'进行保存 (快捷键: 'y')\n"
 

-#: src/textview.c:718
+#: src/textview.c:754

 msgid "    To display as text select 'Display as text' "
 msgstr "    选择'以文本方式显示'可以以文本方式查看"
 
 msgid "    To display as text select 'Display as text' "
 msgstr "    选择'以文本方式显示'可以以文本方式查看"
 

-#: src/textview.c:719
+#: src/textview.c:755

 msgid "(Shortcut key: 't')\n"
 msgstr "(快捷键: 't')\n"
 
 msgid "(Shortcut key: 't')\n"
 msgstr "(快捷键: 't')\n"
 

-#: src/textview.c:720
+#: src/textview.c:756

 msgid "    To open with an external program select 'Open' "
 msgstr "    要用外部程序打开请选择'打开'"
 
 msgid "    To open with an external program select 'Open' "
 msgstr "    要用外部程序打开请选择'打开'"
 

-#: src/textview.c:721
+#: src/textview.c:757

 msgid "(Shortcut key: 'l'),\n"
 msgstr "(快捷键: 'l'), \n"
 
 msgid "(Shortcut key: 'l'),\n"
 msgstr "(快捷键: 'l'), \n"
 

-#: src/textview.c:722
+#: src/textview.c:758

 msgid "    (alternately double-click, or click the middle "
 msgstr "    (也可以双击或者点击),"
 
 msgid "    (alternately double-click, or click the middle "
 msgstr "    (也可以双击或者点击),"
 

-#: src/textview.c:723
+#: src/textview.c:759

 msgid "mouse button),\n"
 msgstr "鼠标中键\n"
 
 msgid "mouse button),\n"
 msgstr "鼠标中键\n"
 

-#: src/textview.c:724
+#: src/textview.c:760

 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    或者'用...打开' (快捷键: 'o')\n"
 
 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    或者'用...打开' (快捷键: 'o')\n"
 

-#: src/textview.c:1931
+#: src/textview.c:2041

 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"


@@ -8845,109 +9030,109 @@ msgstr ""
 "真实URL (%s) 与所显示的URL (%s) 不同。\n"
 "真的要打开吗?"
 
 "真实URL (%s) 与所显示的URL (%s) 不同。\n"
 "真的要打开吗?"
 

-#: src/textview.c:1936
+#: src/textview.c:2046

 msgid "Fake URL warning"
 msgstr "虚假URL告警"
 
 msgid "Fake URL warning"
 msgstr "虚假URL告警"
 

-#: src/toolbar.c:159 src/toolbar.c:1414
+#: src/toolbar.c:159 src/toolbar.c:1407

 msgid "Receive Mail on all Accounts"
 msgstr "收所有帐号的信"
 
 msgid "Receive Mail on all Accounts"
 msgstr "收所有帐号的信"
 

-#: src/toolbar.c:160 src/toolbar.c:1420
+#: src/toolbar.c:160 src/toolbar.c:1413

 msgid "Receive Mail on current Account"
 msgstr "用目前的帐号收信"
 
 msgid "Receive Mail on current Account"
 msgstr "用目前的帐号收信"
 

-#: src/toolbar.c:161 src/toolbar.c:1426
+#: src/toolbar.c:161 src/toolbar.c:1419

 msgid "Send Queued Messages"
 msgstr "送出待发送邮件"
 
 msgid "Send Queued Messages"
 msgstr "送出待发送邮件"
 

-#: src/toolbar.c:162 src/toolbar.c:1439
+#: src/toolbar.c:162 src/toolbar.c:1432

 msgid "Compose Email"
 msgstr "写信"
 
 msgid "Compose Email"
 msgstr "写信"
 

-#: src/toolbar.c:163 src/toolbar.c:1443
+#: src/toolbar.c:163 src/toolbar.c:1436

 msgid "Compose News"
 msgstr "撰写文章"
 
 msgid "Compose News"
 msgstr "撰写文章"
 

-#: src/toolbar.c:164 src/toolbar.c:1449 src/toolbar.c:1459
+#: src/toolbar.c:164 src/toolbar.c:1442 src/toolbar.c:1452

 msgid "Reply to Message"
 msgstr "回应原文"
 
 msgid "Reply to Message"
 msgstr "回应原文"
 

-#: src/toolbar.c:165 src/toolbar.c:1466 src/toolbar.c:1476
+#: src/toolbar.c:165 src/toolbar.c:1459 src/toolbar.c:1469

 msgid "Reply to Sender"
 msgstr "回复给发信人"
 
 msgid "Reply to Sender"
 msgstr "回复给发信人"
 

-#: src/toolbar.c:166 src/toolbar.c:1483 src/toolbar.c:1493
+#: src/toolbar.c:166 src/toolbar.c:1476 src/toolbar.c:1486

 msgid "Reply to All"
 msgstr "回复给所有人"
 
 msgid "Reply to All"
 msgstr "回复给所有人"
 

-#: src/toolbar.c:167 src/toolbar.c:1500 src/toolbar.c:1510
+#: src/toolbar.c:167 src/toolbar.c:1493 src/toolbar.c:1503

 msgid "Reply to Mailing-list"
 msgstr "回复至邮件列表"
 
 msgid "Reply to Mailing-list"
 msgstr "回复至邮件列表"
 

-#: src/toolbar.c:168 src/toolbar.c:1517 src/toolbar.c:1527
+#: src/toolbar.c:168 src/toolbar.c:1510 src/toolbar.c:1520

 msgid "Forward Message"
 msgstr "转发邮件"
 
 msgid "Forward Message"
 msgstr "转发邮件"
 

-#: src/toolbar.c:169 src/toolbar.c:1534
+#: src/toolbar.c:169 src/toolbar.c:1527

 msgid "Trash Message"
 msgstr "将邮件转移到垃圾桶"
 
 msgid "Trash Message"
 msgstr "将邮件转移到垃圾桶"
 

-#: src/toolbar.c:170 src/toolbar.c:1540
+#: src/toolbar.c:170 src/toolbar.c:1533

 msgid "Delete Message"
 msgstr "删除邮件"
 
 msgid "Delete Message"
 msgstr "删除邮件"
 

-#: src/toolbar.c:172 src/toolbar.c:1552
+#: src/toolbar.c:172 src/toolbar.c:1545

 msgid "Go to Previous Unread Message"
 msgstr "转到上一封未读邮件"
 
 msgid "Go to Previous Unread Message"
 msgstr "转到上一封未读邮件"
 

-#: src/toolbar.c:173 src/toolbar.c:1559
+#: src/toolbar.c:173 src/toolbar.c:1552

 msgid "Go to Next Unread Message"
 msgstr "转到下一封未读邮件"
 
 msgid "Go to Next Unread Message"
 msgstr "转到下一封未读邮件"
 

-#: src/toolbar.c:177 src/toolbar.c:1568
+#: src/toolbar.c:177 src/toolbar.c:1561

 msgid "Send Message"
 msgstr "发送邮件"
 
 msgid "Send Message"
 msgstr "发送邮件"
 

-#: src/toolbar.c:178 src/toolbar.c:1574
+#: src/toolbar.c:178 src/toolbar.c:1567

 msgid "Put into queue folder and send later"
 msgstr "放入待发送邮件夹稍后再送"
 
 msgid "Put into queue folder and send later"
 msgstr "放入待发送邮件夹稍后再送"
 

-#: src/toolbar.c:179 src/toolbar.c:1580
+#: src/toolbar.c:179 src/toolbar.c:1573

 msgid "Save to draft folder"
 msgstr "存入草稿邮件夹"
 
 msgid "Save to draft folder"
 msgstr "存入草稿邮件夹"
 

-#: src/toolbar.c:180 src/toolbar.c:1586
+#: src/toolbar.c:180 src/toolbar.c:1579

 msgid "Insert file"
 msgstr "插入文件"
 
 msgid "Insert file"
 msgstr "插入文件"
 

-#: src/toolbar.c:181 src/toolbar.c:1592
+#: src/toolbar.c:181 src/toolbar.c:1585

 msgid "Attach file"
 msgstr "附加文件"
 
 msgid "Attach file"
 msgstr "附加文件"
 

-#: src/toolbar.c:182 src/toolbar.c:1598
+#: src/toolbar.c:182 src/toolbar.c:1591

 msgid "Insert signature"
 msgstr "插入签名"
 
 msgid "Insert signature"
 msgstr "插入签名"
 

-#: src/toolbar.c:183 src/toolbar.c:1604
+#: src/toolbar.c:183 src/toolbar.c:1597

 msgid "Edit with external editor"
 msgstr "以外部编辑器编辑"
 
 msgid "Edit with external editor"
 msgstr "以外部编辑器编辑"
 

-#: src/toolbar.c:184 src/toolbar.c:1610
+#: src/toolbar.c:184 src/toolbar.c:1603

 msgid "Wrap long lines of current paragraph"
 msgstr "拆分当前段落中超长的行"
 
 msgid "Wrap long lines of current paragraph"
 msgstr "拆分当前段落中超长的行"
 

-#: src/toolbar.c:185 src/toolbar.c:1616
+#: src/toolbar.c:185 src/toolbar.c:1609

 msgid "Wrap all long lines"
 msgstr "拆分所有超长的行"
 
 msgid "Wrap all long lines"
 msgstr "拆分所有超长的行"
 

-#: src/toolbar.c:188 src/toolbar.c:1629
+#: src/toolbar.c:188 src/toolbar.c:1622

 msgid "Check spelling"
 msgstr "检查拼写"
 
 #: src/toolbar.c:190
 msgid "Check spelling"
 msgstr "检查拼写"
 
 #: src/toolbar.c:190

-msgid "Sylpheed Actions Feature"
-msgstr "Sylpheed 动作特性"
+msgid "Sylpheed-Claws Actions Feature"
+msgstr "Sylpheed-Claws 动作特性"

 
 #: src/toolbar.c:210
 msgid "/Reply with _quote"
 
 #: src/toolbar.c:210
 msgid "/Reply with _quote"


@@ -8981,182 +9166,345 @@ msgstr "/回信时引用原文(_q)"
 msgid "/_Reply to sender without quote"
 msgstr "/回信时不引用原文(_R)"
 
 msgid "/_Reply to sender without quote"
 msgstr "/回信时不引用原文(_R)"
 

-#: src/toolbar.c:231
-msgid "/For_ward as attachment"
-msgstr "/作为附件转发(_w)"
-

 #: src/toolbar.c:232
 msgid "/Redirec_t"
 msgstr "/重定向(_t)"
 
 #: src/toolbar.c:385
 #: src/toolbar.c:232
 msgid "/Redirec_t"
 msgstr "/重定向(_t)"
 
 #: src/toolbar.c:385

-msgid "Get"
+msgid "Get Mail"

 msgstr "收信"
 
 msgstr "收信"
 

-#: src/toolbar.c:386
-msgid "Get All"
-msgstr "全部收取"
-
-#: src/toolbar.c:389
-msgid "Email"
-msgstr "电子邮件"
-
-#: src/toolbar.c:391 src/toolbar.c:485
+#: src/toolbar.c:390 src/toolbar.c:478

 msgid "Reply"
 msgstr "回复"
 
 msgid "Reply"
 msgstr "回复"
 

-#: src/toolbar.c:392 src/toolbar.c:486
+#: src/toolbar.c:391 src/toolbar.c:479

 msgid "All"
 msgstr "全部"
 
 msgid "All"
 msgstr "全部"
 

-#: src/toolbar.c:393 src/toolbar.c:487
+#: src/toolbar.c:392 src/toolbar.c:480

 msgid "Sender"
 msgstr "发信人"
 
 msgid "Sender"
 msgstr "发信人"
 

-#: src/toolbar.c:398
-msgid "Previous"
-msgstr "前一个"
-
-#: src/toolbar.c:399 src/toolbar.c:491
+#: src/toolbar.c:397 src/toolbar.c:484

 msgid "Next"
 msgstr "下一个"
 
 msgid "Next"
 msgstr "下一个"
 

-#: src/toolbar.c:437
+#: src/toolbar.c:435

 msgid "Send later"
 msgstr "稍后再送"
 
 msgid "Send later"
 msgstr "稍后再送"
 

-#: src/toolbar.c:438
+#: src/toolbar.c:436

 msgid "Draft"
 msgstr "草稿"
 
 msgid "Draft"
 msgstr "草稿"
 

-#: src/toolbar.c:440
+#: src/toolbar.c:438

 msgid "Insert"
 msgstr "插入"
 
 msgid "Insert"
 msgstr "插入"
 

-#: src/toolbar.c:441
+#: src/toolbar.c:439

 msgid "Attach"
 msgstr "附加文件"
 
 msgid "Attach"
 msgstr "附加文件"
 

-#: src/toolbar.c:444
-msgid "Editor"
-msgstr "编辑器"
-
-#: src/toolbar.c:445
-msgid "Wrap paragraph"
-msgstr "段落折行"
-
-#: src/toolbar.c:446
-msgid "Wrap all"
-msgstr "全部折行"
-
-#: src/toolbar.c:1431
-msgid "News"
-msgstr "新闻组"
-
-#: src/toolbar.c:1961
+#: src/toolbar.c:1954

 msgid "You're working offline. Override?"
 msgstr "您正在脱机工作。是否更改？"
 
 msgid "You're working offline. Override?"
 msgstr "您正在脱机工作。是否更改？"
 

-#: src/toolbar.c:1979
+#: src/toolbar.c:1972

 msgid "Send queued messages"
 msgstr "送出待发送邮件"
 
 msgid "Send queued messages"
 msgstr "送出待发送邮件"
 

-#: src/toolbar.c:1980
+#: src/toolbar.c:1973

 msgid "Send all queued messages?"
 msgstr "送出所有待发送邮件?"
 
 msgid "Send all queued messages?"
 msgstr "送出所有待发送邮件?"
 

-#: src/wizard.c:272
+#. welcome page: 0
+#: src/wizard.c:160 src/wizard.c:786
+msgid "Welcome to Sylpheed-Claws"
+msgstr "欢迎使用Sylpheed-Claws"
+
+#: src/wizard.c:169
+msgid "Sylpheed-Claws Team"
+msgstr "Sylpheed-Claws开发组"
+
+#: src/wizard.c:174
+#, c-format
+msgid ""
+"\n"
+"Welcome to Sylpheed-Claws\n"
+"-------------------------\n"
+"\n"
+"Now that you have set up your account you can fetch your\n"
+"mail by clicking the 'Get Mail' button at the left of the\n"
+"toolbar.\n"
+"\n"
+"You can change your Account Preferences by using the menu\n"
+"entry '/Configuration/Preferences for current account'\n"
+"and change the general Preferences by using\n"
+"'/Configuration/Preferences'.\n"
+"\n"
+"You can find futher information in the Sylpheed-Claws manual,\n"
+"which can be accessed by using the menu entry '/Help/Manual'\n"
+"or online at the URL given below.\n"
+"\n"
+"Useful URLs\n"
+"-----------\n"
+"Homepage:      <%s>\n"
+"Manual:        <%s>\n"
+"FAQ:\t       <%s>\n"
+"Themes:        <%s>\n"
+"Mailing Lists: <%s>\n"
+"\n"
+"LICENSE\n"
+"-------\n"
+"Sylpheed-Claws is free software, released under the terms\n"
+"of the GNU General Public License, version 2 or later, as\n"
+"published by the Free Software Foundation, 51 Franklin Street,\n"
+"Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
+"found at <%s>.\n"
+"\n"
+"DONATIONS\n"
+"---------\n"
+"If you wish to donate to the Sylpheed-Claws project you can do\n"
+"so at <%s>.\n"
+"\n"
+msgstr ""
+"\n"
+"欢迎使用Sylpheed-Claws\n"
+"-------------------------\n"
+"\n"
+"你已经配置了帐号，现在可以点击工具栏上的'收信'图标收取邮件。\n"
+"\n"
+"\n"
+"\n"
+"你可以通过菜单项'/设置/目前帐号的偏好设置'进入帐号设置界面\n"
+"修改当前帐号的设置；通过菜单项'/设置/偏好'进行其他设置。\n"
+"\n"
+"\n"
+"\n"
+"你可以在Sylpheed-Claws的手册中找到更详细的说明，它可以通过菜单项目\n"
+"'/帮助/手册/'或者如下网址找到: \n"
+"\n"
+"一些有用的网址\n"
+"-----------\n"
+"主页:      <%s>\n"
+"手册:        <%s>\n"
+"FAQ:\t       <%s>\n"
+"主题:        <%s>\n"
+"邮件列表: <%s>\n"
+"\n"
+"许可协议\n"
+"-------\n"
+"Sylpheed-Claws是自由软件，受GNU通用许可协议(GPL)的条款所约束\n"
+"(GPL V2或者更高版本)。GPL协议由自由软件基金会\n"
+"(Free Software Foundation, 51 Franklin Street,\n"
+"Fifth Floor, Boston, MA 02110-1301, USA)\n"
+"发布，可以在 <%s> 找到\n"
+"\n"
+"捐款\n"
+"---------\n"
+"如果你想捐款给Sylpheed-Claws项目，可访问 <%s>。\n"
+"\n"
+"\n"
+
+#: src/wizard.c:453

 msgid "Your name:"
 msgstr "您的姓名:"
 
 msgid "Your name:"
 msgstr "您的姓名:"
 

-#: src/wizard.c:279
+#: src/wizard.c:460

 msgid "Your email address:"
 msgstr "您的邮件地址:"
 
 msgid "Your email address:"
 msgstr "您的邮件地址:"
 

-#: src/wizard.c:283
+#: src/wizard.c:464

 msgid "Your organization:"
 msgstr "您所在的组织"
 
 msgid "Your organization:"
 msgstr "您所在的组织"
 

-#: src/wizard.c:302
+#: src/wizard.c:483

 msgid "Mailbox name:"
 msgstr "邮箱名称"
 
 msgid "Mailbox name:"
 msgstr "邮箱名称"
 

-#: src/wizard.c:321
+#: src/wizard.c:502

 msgid "SMTP server address:"
 msgstr "SMTP 服务器地址:"
 
 msgid "SMTP server address:"
 msgstr "SMTP 服务器地址:"
 

-#: src/wizard.c:362
+#: src/wizard.c:524 src/wizard.c:535 src/wizard.c:586
+msgid "Server address:"
+msgstr "服务器地址:"
+
+#: src/wizard.c:541
+msgid "Local mailbox:"
+msgstr "本地邮箱:"
+
+#: src/wizard.c:568

 msgid "IMAP"
 msgstr "IMAP"
 
 msgid "IMAP"
 msgstr "IMAP"
 

-#: src/wizard.c:367
+#: src/wizard.c:578

 msgid "Server type:"
 msgstr "服务器类型:"
 
 msgid "Server type:"
 msgstr "服务器类型:"
 

-#: src/wizard.c:374
-msgid "Server address:"
-msgstr "服务器地址:"
-
-#: src/wizard.c:379
+#: src/wizard.c:596

 msgid "Username:"
 msgstr "用户名"
 
 msgid "Username:"
 msgstr "用户名"
 

-#: src/wizard.c:384
+#: src/wizard.c:610

 msgid "Password:"
 msgstr "密码"
 
 msgid "Password:"
 msgstr "密码"
 

-#: src/wizard.c:400
+#: src/wizard.c:621
+msgid "IMAP server directory:"
+msgstr "IMAP服务器目录:"
+
+#: src/wizard.c:645

 msgid "Use SSL to connect to SMTP server"
 msgstr "采用SSL连接SMTP服务器"
 
 msgid "Use SSL to connect to SMTP server"
 msgstr "采用SSL连接SMTP服务器"
 

-#: src/wizard.c:405
+#: src/wizard.c:650

 msgid "Use SSL to connect to receiving server"
 msgstr "采用SSL连接服务器收取邮件"
 
 msgid "Use SSL to connect to receiving server"
 msgstr "采用SSL连接服务器收取邮件"
 

-#: src/wizard.c:475
-msgid "New User"
-msgstr "新用户"
+#: src/wizard.c:755
+msgid "Sylpheed-Claws Setup Wizard"
+msgstr "Sylpheed-Claws 设置想到"

 
 

-#. welcome page
-#: src/wizard.c:506
-msgid "Welcome to Sylpheed-Claws."
-msgstr "欢迎使用Sylpheed Claws"
-
-#: src/wizard.c:514
+#: src/wizard.c:794

 msgid ""
 msgid ""

-"Welcome to Sylpheed-Claws.\n"
+"Welcome to the Sylpheed-Claws setup wizard.\n"

 "\n"
 "\n"

-"It looks like it's the first time you use \n"
-"Sylpheed-Claws. So, we'll now define some basic\n"
-"information about yourself and your most common\n"
-"mail parameters; so that you can begin to use\n"
-"Sylpheed-Claws in less than five minutes."
+"We will begin by defining some basic information about you and your most "
+"common mail options so that you can start to use Sylpheed-Claws in less than "
+"five minutes."

 msgstr ""
 msgstr ""

-"欢迎使用Sylpheed-Claws。\n"
+"欢迎使用Sylpheed-Claws 设置想到\n"

 "\n"
 "看来这是您第一次使用Sylpheed-Claws。所以我们需要先确定一下关于您和您的邮箱的"
 "一些基本信息，您可以在五分钟之内开始使用Sylpheed-Claws。"
 
 "\n"
 "看来这是您第一次使用Sylpheed-Claws。所以我们需要先确定一下关于您和您的邮箱的"
 "一些基本信息，您可以在五分钟之内开始使用Sylpheed-Claws。"
 

-#. user page
-#: src/wizard.c:525
+#. user page: 1
+#: src/wizard.c:805

 msgid "About You"
 msgstr "关于您"
 
 msgid "About You"
 msgstr "关于您"
 

-#: src/wizard.c:531
-msgid "Saving mail on disk"
-msgstr "将邮件保存到磁盘"
-
-#. smtp page
-#: src/wizard.c:536
+#. smtp page: 2
+#: src/wizard.c:810

 msgid "Sending mail"
 msgstr "发送邮件"
 
 msgid "Sending mail"
 msgstr "发送邮件"
 

-#. recv+auth page
-#: src/wizard.c:541
+#. recv+auth page: 3
+#: src/wizard.c:815

 msgid "Receiving mail"
 msgstr "接收邮件"
 
 msgid "Receiving mail"
 msgstr "接收邮件"
 

-#: src/wizard.c:547
+#: src/wizard.c:821
+msgid "Saving mail on disk"
+msgstr "将邮件保存到磁盘"
+
+#: src/wizard.c:827

 msgid "Security"
 msgstr "安全"
 
 msgid "Security"
 msgstr "安全"
 

+#. done page: 6
+#: src/wizard.c:833
+msgid "Configuration finished"
+msgstr "设置完成"
+
+#: src/wizard.c:841
+msgid ""
+"Sylpheed-Claws is now ready.\n"
+"\n"
+"Click Save to start."
+msgstr ""
+"Sylpheed-Claws配置完成。\n"
+"\n"
+"点击[保存]开始使用。"
+
+
+#~ msgid "About"
+#~ msgstr "关于"
+
+#~ msgid "/IMAP4 _account settings"
+#~ msgstr "/IMAP4帐号设置(_a)"
+
+#~ msgid "/Remove _IMAP4 account"
+#~ msgstr "/删除IMAP4帐号(_I)"
+
+#~ msgid "Really delete IMAP4 account '%s'?"
+#~ msgstr "确定删除IMAP4帐号'%s'？"
+
+#~ msgid "Delete IMAP4 account"
+#~ msgstr "清除IMAP4帐号"
+
+#~ msgid "Draft them"
+#~ msgstr "保存为草稿"
+
+#~ msgid "Check"
+#~ msgstr "检查"
+
+#~ msgid "Full info"
+#~ msgstr "全名"
+
+#~ msgid "/News _account settings"
+#~ msgstr "/新闻组帐号设置(_a)"
+
+#~ msgid "/Remove _news account"
+#~ msgstr "/清除帐号(_n)"
+
+#~ msgid "Really delete news account '%s'?"
+#~ msgstr "确定删除新闻组帐号'%s'？"
+
+#~ msgid "Delete news account"
+#~ msgstr "删除新闻群帐号"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "OK"
+#~ msgstr "确定"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "Send replies to: "
+#~ msgstr "发送回复给: "
+
+#~ msgid "/Follow-up and reply to"
+#~ msgstr "/Follow-up and reply to"
+
+#~ msgid "/Cancel a news message"
+#~ msgstr "/取消新闻组邮件"
+
+#~ msgid "/Re-_edit"
+#~ msgstr "/重新编辑(_e)"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#~ msgid "No."
+#~ msgstr "No."
+
+#~ msgid "L"
+#~ msgstr "L"
+
+#~ msgid "Get"
+#~ msgstr "收信"
+
+#~ msgid "Email"
+#~ msgstr "电子邮件"
+
+#~ msgid "Previous"
+#~ msgstr "前一个"
+
+#~ msgid "Editor"
+#~ msgstr "编辑器"
+
+#~ msgid "Wrap paragraph"
+#~ msgstr "段落折行"
+
+#~ msgid "Wrap all"
+#~ msgstr "全部折行"
+
+#~ msgid "News"
+#~ msgstr "新闻组"
+
+#~ msgid "New User"
+#~ msgstr "新用户"