# Copyright (C) 2003 Tsu-Fan Cheng
# This file is distributed under the same license as the sylpheed-claws package.
# Tsu-Fan Cheng <tscheng@ic.sunysb.edu> 2003
-# Ralgh Young <bamanzi@gmail.com> 2004-2006
+# Ralgh Young <bamanzi@gmail.com> 2004-2007
#
msgid ""
msgstr ""
"Project-Id-Version: sylpheed-claw\n"
"Report-Msgid-Bugs-To: paul@claws-mail.org\n"
-"POT-Creation-Date: 2007-02-19 08:16+0000\n"
-"PO-Revision-Date: 2007-02-22 23:54+0800\n"
+"POT-Creation-Date: 2008-02-01 10:17+0000\n"
+"PO-Revision-Date: 2008-02-07 02:15China Standard Time\n"
"Last-Translator: Ralgh Young <bamanzi@gmail.com>\n"
"Language-Team: Sylpheed-Claws <sylpheed-claws-translators@lists.sourceforge."
"net> \n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: src/account.c:372
+#: src/account.c:381
msgid ""
"Some composing windows are open.\n"
"Please close all the composing windows before editing the accounts."
"你正在撰写邮件，\n"
"请关掉所有撰写中的邮件再进行帐号设置。"
-#: src/account.c:419
+#: src/account.c:428
msgid "Can't create folder."
-msgstr "无法创建文件夹。"
+msgstr "无法创建目录。"
-#: src/account.c:676
+#: src/account.c:699
msgid "Edit accounts"
msgstr "编辑帐号设置"
-#: src/account.c:694
+#: src/account.c:721
msgid ""
"Using 'Get Mail' will retrieve messages from your Accounts in the order "
-"given, the checkbox in the 'G' column indicates which accounts will be "
-"included."
+"given, the checkbox indicates which accounts will be included. Bold text "
+"indicates the default account."
msgstr ""
-"用'收信'收取邮件时将按以下顺序进行, 'G'栏的构选框表示要收取该账户的邮件。"
+"用'收信'收取邮件时将按以下顺序进行, 构选框表示要收取该账户的邮件。"
+"粗体显示的是缺省账户。"
-#: src/account.c:767
+#: src/account.c:792
msgid " _Set as default account "
msgstr " 设为缺省帐号(_S) "
-#: src/account.c:861
+#: src/account.c:884
msgid "Accounts with remote folders cannot be copied."
-msgstr "不能克隆有远程文件夹的帐户。"
+msgstr "不能克隆有远程目录的帐户。"
-#: src/account.c:867
+#: src/account.c:891
#, c-format
msgid "Copy of %s"
msgstr "%s 副本"
-#: src/account.c:1006
+#: src/account.c:1052
#, c-format
msgid "Do you really want to delete the account '%s'?"
msgstr "你确定要删除帐号 '%s' 吗？"
-#: src/account.c:1008
+#: src/account.c:1054
msgid "(Untitled)"
msgstr "(未命名)"
-#: src/account.c:1009
+#: src/account.c:1055
msgid "Delete account"
msgstr "删除帐号"
-#: src/account.c:1455
-msgid "Accounts List Default Column Name|D"
-msgstr "缺省"
-
-#: src/account.c:1461 src/prefs_folder_item.c:740
-msgid "Default account"
-msgstr "缺省帐号"
-
-#: src/account.c:1469
+#: src/account.c:1508
msgid "Accounts List Get Column Name|G"
msgstr "收取"
-#: src/account.c:1475
+#: src/account.c:1514
msgid "'Get Mail' retrieves mail from the checked accounts"
msgstr "'收信'时收取下面选中账户的邮件"
-#: src/account.c:1482 src/addressadd.c:196 src/addressbook.c:132
-#: src/compose.c:5857 src/compose.c:6148 src/editaddress.c:1043
-#: src/editaddress.c:1092 src/editbook.c:175 src/editgroup.c:287
-#: src/editjpilot.c:270 src/editldap.c:424 src/editvcard.c:183
-#: src/importmutt.c:226 src/importpine.c:226 src/mimeview.c:213
-#: src/plugins/pgpcore/select-keys.c:404 src/prefs_filtering.c:364
-#: src/prefs_filtering.c:1481 src/prefs_template.c:185
+#: src/account.c:1521 src/addressadd.c:196 src/addressbook.c:137
+#: src/addrduplicates.c:479 src/compose.c:6296 src/compose.c:6594
+#: src/editaddress.c:1270 src/editaddress.c:1327 src/editaddress.c:1343
+#: src/editbook.c:175 src/editgroup.c:287 src/editjpilot.c:270
+#: src/editldap.c:434 src/editvcard.c:183 src/importmutt.c:228
+#: src/importpine.c:227 src/mimeview.c:254
+#: src/plugins/pgpcore/select-keys.c:407 src/prefs_filtering.c:378
+#: src/prefs_filtering.c:1884 src/prefs_template.c:210
msgid "Name"
msgstr "名称"
-#: src/account.c:1489 src/prefs_account.c:1232 src/prefs_account.c:2783
+#: src/account.c:1529 src/prefs_account.c:1017 src/prefs_account.c:3577
msgid "Protocol"
msgstr "通讯协议"
-#: src/account.c:1496 src/ssl_manager.c:102
+#: src/account.c:1537 src/ssl_manager.c:102
msgid "Server"
msgstr "服务器"
-#: src/action.c:355
+#: src/action.c:363
#, c-format
msgid "Could not get message file %d"
msgstr "无法取得邮件文件 %d"
-#: src/action.c:386
+#: src/action.c:394
msgid "Could not get message part."
msgstr "无法读取邮件内容。"
-#: src/action.c:403
+#: src/action.c:411
#, c-format
msgid "Can't get part of multipart message: %s"
msgstr "无法读取复合邮件的一部分: %s"
-#: src/action.c:517
+#: src/action.c:525
#, c-format
msgid ""
"The selected action cannot be used in the compose window\n"
"被选择的动作不能用于邮件撰写窗口\n"
"因其包含 %%f, %%F, %%as或者%%p。"
-#: src/action.c:829
+#: src/action.c:623
+msgid "There is no filtering action set"
+msgstr "未设置过滤动作"
+
+#: src/action.c:625
+#, c-format
+msgid ""
+"Invalid filtering action(s):\n"
+"%s"
+msgstr ""
+"无效的过滤动作:\n"
+"%s"
+
+#: src/action.c:847
#, c-format
msgid ""
"Command could not be started. Pipe creation failed.\n"
"无法启动命令。创建管道失败。\n"
"%s"
-#: src/action.c:924
+#: src/action.c:942
#, c-format
msgid ""
"Could not fork to execute the following command:\n"
"%s\n"
"%s"
-#: src/action.c:1144 src/action.c:1294
+#: src/action.c:1162 src/action.c:1318
msgid "Completed"
msgstr "已完成"
-#: src/action.c:1180
+#: src/action.c:1198
#, c-format
msgid "--- Running: %s\n"
msgstr "--- 正在运行: %s\n"
-#: src/action.c:1184
+#: src/action.c:1202
#, c-format
msgid "--- Ended: %s\n"
msgstr "--- 已经结束: %s\n"
-#: src/action.c:1217
+#: src/action.c:1235
msgid "Action's input/output"
msgstr "动作输入/输出"
-#: src/action.c:1529
+#: src/action.c:1554
#, c-format
msgid ""
"Enter the argument for the following action:\n"
"(`%%h' 将被所输入的参数替换)\n"
" %s"
-#: src/action.c:1534
+#: src/action.c:1559
msgid "Action's hidden user argument"
msgstr "用户提供的参数(输入时不回显)"
-#: src/action.c:1538
+#: src/action.c:1563
#, c-format
msgid ""
"Enter the argument for the following action:\n"
"(`%%u' 将被输入的参数替换)\n"
" %s"
-#: src/action.c:1543
+#: src/action.c:1568
msgid "Action's user argument"
msgstr "用户提供的参数"
-#: src/addr_compl.c:554 src/addressbook.c:4399
+#: src/addr_compl.c:597 src/addressbook.c:4695
msgid "Group"
msgstr "群组"
-#: src/addressadd.c:174
+#: src/addrcustomattr.c:64
+msgid "date of birth"
+msgstr "生日"
+
+#: src/addrcustomattr.c:65
+msgid "address"
+msgstr "地址"
+
+#: src/addrcustomattr.c:66
+msgid "phone"
+msgstr "电话"
+
+#: src/addrcustomattr.c:67
+msgid "mobile phone"
+msgstr "移动电话"
+
+#: src/addrcustomattr.c:68
+msgid "organization"
+msgstr "组织"
+
+#: src/addrcustomattr.c:69
+msgid "office address"
+msgstr "办公室地址"
+
+#: src/addrcustomattr.c:70
+msgid "office phone"
+msgstr "办公室电话"
+
+#: src/addrcustomattr.c:71
+msgid "fax"
+msgstr "传真"
+
+#: src/addrcustomattr.c:72
+msgid "website"
+msgstr "网站"
+
+#: src/addrcustomattr.c:140
+msgid "Attribute name"
+msgstr "属性"
+
+#: src/addrcustomattr.c:155
+msgid "Delete all attribute names"
+msgstr "删除所有属性？"
+
+#: src/addrcustomattr.c:156
+msgid "Do you really want to delete all attribute names?"
+msgstr "确定要删除所有属性吗？"
+
+#: src/addrcustomattr.c:180
+msgid "Delete attribute name"
+msgstr "删除属性"
+
+#: src/addrcustomattr.c:181
+msgid "Do you really want to delete this attribute name?"
+msgstr "你真的要删除此属性吗? "
+
+#: src/addrcustomattr.c:190
+msgid "Reset to default"
+msgstr "恢复为缺省值"
+
+#: src/addrcustomattr.c:191
+msgid ""
+"Do you really want to replace all attribute names\n"
+"with the default set?"
+msgstr "你确定要采用缺省的属性列表覆盖当前的设置么\n"
+" "
+
+#: src/addrcustomattr.c:210 src/addressbook.c:480 src/addressbook.c:496
+#: src/edittags.c:269 src/prefs_actions.c:1013 src/prefs_filtering.c:1729
+#: src/prefs_template.c:997
+msgid "/_Delete"
+msgstr "/删除(_D)"
+
+#: src/addrcustomattr.c:211 src/edittags.c:270 src/prefs_actions.c:1014
+#: src/prefs_filtering.c:1730 src/prefs_template.c:998
+msgid "/Delete _all"
+msgstr "/全部删除(_a)"
+
+#: src/addrcustomattr.c:212
+msgid "/_Reset to default"
+msgstr "/恢复到缺省值(_R)"
+
+#: src/addrcustomattr.c:408
+msgid "Attribute name is not set."
+msgstr "未指定属性名。"
+
+#: src/addrcustomattr.c:467
+msgid "Dialog title|Edit attribute names"
+msgstr "编辑属性名"
+
+#: src/addrcustomattr.c:481
+msgid "New attribute name:"
+msgstr "新属性名称:"
+
+#: src/addrcustomattr.c:518
+msgid ""
+"Adding or removing attribute names won't affect attributes already set for "
+"contacts."
+msgstr ""
+"添加或删除属性不会影响地址簿中原有属性值。"
+
+#: src/addressadd.c:165 src/prefs_filtering_action.c:185
msgid "Add to address book"
msgstr "将地址加入地址簿"
-#: src/addressadd.c:208 src/plugins/pgpcore/select-keys.c:405
-#: src/toolbar.c:459
+#: src/addressadd.c:188
+msgid "Contact"
+msgstr "联系人"
+
+#: src/addressadd.c:208 src/addrduplicates.c:451
+#: src/plugins/pgpcore/select-keys.c:408 src/toolbar.c:445
msgid "Address"
msgstr "地址"
-#: src/addressadd.c:218 src/addressbook.c:134 src/editaddress.c:851
-#: src/editaddress.c:915 src/editgroup.c:289
+#: src/addressadd.c:219 src/addressbook.c:139 src/editaddress.c:1062
+#: src/editaddress.c:1137 src/editgroup.c:289
msgid "Remarks"
msgstr "备注"
-#: src/addressadd.c:240 src/addressbook_foldersel.c:164
+#: src/addressadd.c:241 src/addressbook_foldersel.c:164
msgid "Select Address Book Folder"
-msgstr "选择地址簿文件夹"
+msgstr "选择地址簿目录"
+
+#: src/addressadd.c:425 src/editaddress.c:1577 src/headerview.c:352
+#: src/textview.c:1947
+#, c-format
+msgid ""
+"Failed to save image: \n"
+"%s"
+msgstr ""
+"保存图片失败: \n"
+"%s"
+
+#: src/addressadd.c:438 src/addressbook.c:3066 src/addressbook.c:3116
+msgid "Add address(es)"
+msgstr "添加邮件地址"
-#: src/addressbook.c:133 src/editaddress.c:849 src/editaddress.c:897
-#: src/editgroup.c:288 src/expldifdlg.c:521 src/exporthtml.c:591
-#: src/exporthtml.c:755 src/ldif.c:779
+#: src/addressadd.c:439
+msgid "Can't add the specified address"
+msgstr "无法添加指定的地址"
+
+#: src/addressbook.c:138 src/addressbook.c:4679 src/editaddress.c:1059
+#: src/editaddress.c:1120 src/editgroup.c:288 src/expldifdlg.c:525
+#: src/exporthtml.c:595 src/exporthtml.c:759 src/ldif.c:781
msgid "Email Address"
msgstr "电子邮件"
-#: src/addressbook.c:426
+#: src/addressbook.c:433
msgid "/_Book"
msgstr "/地址簿(_B)"
-#: src/addressbook.c:427
+#: src/addressbook.c:434
msgid "/_Book/New _Book"
msgstr "/地址簿(_B)/新增地址簿(_B)"
-#: src/addressbook.c:428
+#: src/addressbook.c:435
msgid "/_Book/New _Folder"
-msgstr "/地址簿(_B)/新增文件夹(_F)"
+msgstr "/地址簿(_B)/新增目录(_F)"
-#: src/addressbook.c:429
+#: src/addressbook.c:436
msgid "/_Book/New _vCard"
msgstr "/地址簿(_B)/新增_vCard"
-#: src/addressbook.c:431
+#: src/addressbook.c:438
msgid "/_Book/New _JPilot"
msgstr "/地址簿(_B)/新增_J-Pilot"
-#: src/addressbook.c:434
+#: src/addressbook.c:441
msgid "/_Book/New LDAP _Server"
msgstr "/地址簿(_B)/新增LDAP服务器(_S)"
-#: src/addressbook.c:436 src/addressbook.c:439
+#: src/addressbook.c:443 src/addressbook.c:446
msgid "/_Book/---"
msgstr "/地址簿(_B)/---"
-#: src/addressbook.c:437
+#: src/addressbook.c:444
msgid "/_Book/_Edit book"
msgstr "/地址簿(_B)/编辑地址簿(_E)"
-#: src/addressbook.c:438
+#: src/addressbook.c:445
msgid "/_Book/_Delete book"
msgstr "/地址簿(_B)/删除地址簿(_D)"
-#: src/addressbook.c:440
+#: src/addressbook.c:447
msgid "/_Book/_Save"
msgstr "/地址簿(_B)/保存(_S)"
-#: src/addressbook.c:441
+#: src/addressbook.c:448
msgid "/_Book/_Close"
msgstr "/地址簿(_B)/关闭(_C)"
-#: src/addressbook.c:442
+#: src/addressbook.c:449
msgid "/_Address"
msgstr "/地址(_A)"
-#: src/addressbook.c:443
+#: src/addressbook.c:450
msgid "/_Address/_Select all"
msgstr "/地址(_A)/全选(_S)"
-#: src/addressbook.c:444 src/addressbook.c:448 src/addressbook.c:451
-#: src/addressbook.c:454
+#: src/addressbook.c:451 src/addressbook.c:455 src/addressbook.c:458
+#: src/addressbook.c:461
msgid "/_Address/---"
msgstr "/地址(_A)/---"
-#: src/addressbook.c:445
+#: src/addressbook.c:452
msgid "/_Address/C_ut"
msgstr "/地址(_A)/剪切(_u)"
-#: src/addressbook.c:446
+#: src/addressbook.c:453
msgid "/_Address/_Copy"
msgstr "/地址(_A)/复制(_C)"
-#: src/addressbook.c:447
+#: src/addressbook.c:454
msgid "/_Address/_Paste"
msgstr "/地址(_A)/删除(_P)"
-#: src/addressbook.c:449
+#: src/addressbook.c:456
msgid "/_Address/_Edit"
msgstr "/地址(_A)/编辑(_E)"
-#: src/addressbook.c:450
+#: src/addressbook.c:457
msgid "/_Address/_Delete"
msgstr "/地址(_A)/删除(_D)"
-#: src/addressbook.c:452
+#: src/addressbook.c:459
msgid "/_Address/New _Address"
msgstr "/地址(_A)/新增地址(_A)"
-#: src/addressbook.c:453
+#: src/addressbook.c:460
msgid "/_Address/New _Group"
msgstr "/地址(_A)/新增群组(_G)"
-#: src/addressbook.c:455
+#: src/addressbook.c:462
msgid "/_Address/_Mail To"
msgstr "/地址(_A)/发送邮件(_M)"
-#: src/addressbook.c:456 src/compose.c:791 src/mainwindow.c:805
-#: src/messageview.c:306
+#: src/addressbook.c:463 src/compose.c:812 src/mainwindow.c:853
+#: src/messageview.c:394
msgid "/_Tools"
msgstr "工具(_T)"
-#: src/addressbook.c:457
+#: src/addressbook.c:464
msgid "/_Tools/Import _LDIF file..."
msgstr "/工具(_T)/导入 _LDIF 文件..."
-#: src/addressbook.c:458
+#: src/addressbook.c:465
msgid "/_Tools/Import M_utt file..."
msgstr "/工具(_T)/导入 M_utt 文件..."
-#: src/addressbook.c:459
+#: src/addressbook.c:466
msgid "/_Tools/Import _Pine file..."
msgstr "/工具(_T)/导入 _Pine 文件..."
-#: src/addressbook.c:460 src/mainwindow.c:814 src/mainwindow.c:837
-#: src/mainwindow.c:839 src/mainwindow.c:841 src/mainwindow.c:850
-#: src/mainwindow.c:853 src/mainwindow.c:857 src/messageview.c:310
-#: src/messageview.c:331 src/messageview.c:333
+#: src/addressbook.c:467 src/addressbook.c:470 src/mainwindow.c:862
+#: src/mainwindow.c:887 src/mainwindow.c:889 src/mainwindow.c:891
+#: src/mainwindow.c:900 src/mainwindow.c:903 src/mainwindow.c:907
+#: src/messageview.c:398 src/messageview.c:419 src/messageview.c:421
msgid "/_Tools/---"
msgstr "/工具(_T)/---"
-#: src/addressbook.c:461
+#: src/addressbook.c:468
msgid "/_Tools/Export _HTML..."
msgstr "/工具(_T)/导出为 _HTML..."
-#: src/addressbook.c:462
+#: src/addressbook.c:469
msgid "/_Tools/Export LDI_F..."
msgstr "/工具(_T)/导出为 LDI_F..."
-#: src/addressbook.c:463 src/compose.c:796 src/mainwindow.c:882
-#: src/messageview.c:336
+#: src/addressbook.c:471
+msgid "/_Tools/Find duplicates..."
+msgstr "/工具(_T)/查找重复..."
+
+#: src/addressbook.c:472
+msgid "/_Tools/Edit custom attributes..."
+msgstr "/工具(_T)/编辑自定义属性..."
+
+#: src/addressbook.c:473 src/compose.c:817 src/mainwindow.c:935
+#: src/messageview.c:424
msgid "/_Help"
msgstr "/帮助(_H)"
-#: src/addressbook.c:464 src/compose.c:797 src/mainwindow.c:888
-#: src/messageview.c:337
+#: src/addressbook.c:474 src/compose.c:818 src/mainwindow.c:941
+#: src/messageview.c:425
msgid "/_Help/_About"
msgstr "/帮助(_H)/关于(_A)"
-#: src/addressbook.c:469 src/addressbook.c:485 src/compose.c:564
-#: src/mainwindow.c:522 src/messageview.c:168
+#: src/addressbook.c:479 src/addressbook.c:495 src/compose.c:579
+#: src/mainwindow.c:558 src/messageview.c:226
msgid "/_Edit"
msgstr "/编辑(_E)"
-#: src/addressbook.c:470 src/addressbook.c:486
-msgid "/_Delete"
-msgstr "/删除(_D)"
-
-#: src/addressbook.c:472
+#: src/addressbook.c:482
msgid "/New _Book"
msgstr "/新建地址簿(_B)"
-#: src/addressbook.c:473
+#: src/addressbook.c:483
msgid "/New _Folder"
-msgstr "/新建文件夹(_F)"
+msgstr "/新建目录(_F)"
-#: src/addressbook.c:474 src/addressbook.c:489
+#: src/addressbook.c:484 src/addressbook.c:499
msgid "/New _Group"
msgstr "/新建群组(_G)"
-#: src/addressbook.c:476 src/addressbook.c:491
+#: src/addressbook.c:486 src/addressbook.c:501
msgid "/C_ut"
msgstr "/剪切(_u)"
-#: src/addressbook.c:477 src/addressbook.c:492
+#: src/addressbook.c:487 src/addressbook.c:502
msgid "/_Copy"
msgstr "/复制(_C)"
-#: src/addressbook.c:478 src/addressbook.c:493
+#: src/addressbook.c:488 src/addressbook.c:503
msgid "/_Paste"
msgstr "/粘贴(_P)"
-#: src/addressbook.c:483
+#: src/addressbook.c:493
msgid "/_Select all"
msgstr "/全选(_S)"
-#: src/addressbook.c:488
+#: src/addressbook.c:498
msgid "/New _Address"
msgstr "/新建联系地址(_A)"
-#: src/addressbook.c:496
+#: src/addressbook.c:506
msgid "/_Mail To"
msgstr "/发送邮件(_M)"
-#: src/addressbook.c:498
+#: src/addressbook.c:508
msgid "/_Browse Entry"
msgstr "/查看项目(_B)"
-#: src/addressbook.c:511 src/crash.c:451 src/crash.c:470 src/importldif.c:119
-#: src/plugins/pgpcore/sgpgme.c:136 src/prefs_themes.c:684
-#: src/prefs_themes.c:716 src/prefs_themes.c:717
+#: src/addressbook.c:521 src/crash.c:455 src/crash.c:474 src/importldif.c:120
+#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_themes.c:690
+#: src/prefs_themes.c:722 src/prefs_themes.c:723
msgid "Unknown"
msgstr "未知"
-#: src/addressbook.c:518 src/addressbook.c:537 src/importldif.c:126
+#: src/addressbook.c:528 src/addressbook.c:547 src/importldif.c:127
msgid "Success"
msgstr "成功"
-#: src/addressbook.c:519 src/importldif.c:127
+#: src/addressbook.c:529 src/importldif.c:128
msgid "Bad arguments"
msgstr "错误的参数"
-#: src/addressbook.c:520 src/importldif.c:128
+#: src/addressbook.c:530 src/importldif.c:129
msgid "File not specified"
msgstr "未指定文件"
-#: src/addressbook.c:521 src/importldif.c:129
+#: src/addressbook.c:531 src/importldif.c:130
msgid "Error opening file"
msgstr "打开文件错误"
-#: src/addressbook.c:522 src/importldif.c:130
+#: src/addressbook.c:532 src/importldif.c:131
msgid "Error reading file"
msgstr "读取文件错误"
-#: src/addressbook.c:523 src/importldif.c:131
+#: src/addressbook.c:533 src/importldif.c:132
msgid "End of file encountered"
msgstr "遇到文件末尾"
-#: src/addressbook.c:524 src/importldif.c:132
+#: src/addressbook.c:534 src/importldif.c:133
msgid "Error allocating memory"
msgstr "内存分配错误"
-#: src/addressbook.c:525 src/importldif.c:133
+#: src/addressbook.c:535 src/importldif.c:134
msgid "Bad file format"
msgstr "文件格式错误"
-#: src/addressbook.c:526 src/importldif.c:134
+#: src/addressbook.c:536 src/importldif.c:135
msgid "Error writing to file"
msgstr "文件写入错误"
-#: src/addressbook.c:527 src/importldif.c:135
+#: src/addressbook.c:537 src/importldif.c:136
msgid "Error opening directory"
msgstr "打开目录错误"
-#: src/addressbook.c:528 src/importldif.c:136
+#: src/addressbook.c:538 src/importldif.c:137
msgid "No path specified"
msgstr "未指定文件路径"
-#: src/addressbook.c:538
+#: src/addressbook.c:548
msgid "Error connecting to LDAP server"
msgstr "LDAP 服务器连接错误"
-#: src/addressbook.c:539
+#: src/addressbook.c:549
msgid "Error initializing LDAP"
msgstr "LDAP 起始错误"
-#: src/addressbook.c:540
+#: src/addressbook.c:550
msgid "Error binding to LDAP server"
msgstr "无法连接到LDAP服务器"
-#: src/addressbook.c:541
+#: src/addressbook.c:551
msgid "Error searching LDAP database"
msgstr "搜寻LDAP资料库时出错"
-#: src/addressbook.c:542
+#: src/addressbook.c:552
msgid "Timeout performing LDAP operation"
msgstr "进行LDAP操作时超时"
-#: src/addressbook.c:543
+#: src/addressbook.c:553
msgid "Error in LDAP search criteria"
msgstr "LDAP搜寻条件错误"
-#: src/addressbook.c:544
+#: src/addressbook.c:554
msgid "No LDAP entries found for search criteria"
msgstr "LDAP搜寻没有结果"
-#: src/addressbook.c:545
+#: src/addressbook.c:555
msgid "LDAP search terminated on request"
msgstr "LDAP已按请求终止"
-#: src/addressbook.c:546
+#: src/addressbook.c:556
msgid "Error starting TLS connection"
msgstr "创建TLS链接时发生错误"
-#: src/addressbook.c:916
+#: src/addressbook.c:557
+#, fuzzy
+msgid "Distinguished Name (dn) is missing"
+msgstr "没有提供DN"
+
+#: src/addressbook.c:558
+msgid "Missing required information"
+msgstr "缺乏必须的信息"
+
+#: src/addressbook.c:559
+msgid "Another contact exists with that key"
+msgstr "已有另一个联系人使用了这个key"
+
+#: src/addressbook.c:560
+msgid "Strong(er) authentication required"
+msgstr "需要更强的鉴权"
+
+#: src/addressbook.c:934
msgid "Sources"
msgstr "来源"
-#: src/addressbook.c:920 src/prefs_other.c:524 src/toolbar.c:194
-#: src/toolbar.c:1787
+#: src/addressbook.c:938 src/prefs_matcher.c:589 src/prefs_other.c:513
+#: src/toolbar.c:207 src/toolbar.c:2044
msgid "Address book"
msgstr "地址簿"
-#: src/addressbook.c:1052
+#: src/addressbook.c:1070
msgid "Lookup name:"
msgstr "查找姓名:"
-#: src/addressbook.c:1125 src/compose.c:2132 src/compose.c:4479
-#: src/compose.c:5703 src/compose.c:6468 src/compose.c:9548
-#: src/summary_search.c:359
-msgid "To:"
-msgstr "To:"
-
-#: src/addressbook.c:1129 src/compose.c:2116 src/compose.c:4215
-#: src/compose.c:4478 src/compose.c:9557
-msgid "Cc:"
-msgstr "Cc:"
-
-#: src/addressbook.c:1133 src/compose.c:2119 src/compose.c:4246
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: src/addressbook.c:1383 src/addressbook.c:1429
+#: src/addressbook.c:1385 src/addressbook.c:1431 src/addrduplicates.c:801
msgid "Delete address(es)"
msgstr "删除邮件地址"
-#: src/addressbook.c:1384
+#: src/addressbook.c:1386 src/addrduplicates.c:850
msgid "This address data is readonly and cannot be deleted."
msgstr "此邮件地址数据是只读的，不能删除。"
-#: src/addressbook.c:1423
+#: src/addressbook.c:1425
msgid "Delete group"
msgstr "删除群组"
-#: src/addressbook.c:1424
+#: src/addressbook.c:1426
msgid ""
"Really delete the group(s)?\n"
"The addresses it contains will not be lost."
"你想要删除这个群组吗?\n"
"里面的地址数据将会丢失。"
-#: src/addressbook.c:1430
+#: src/addressbook.c:1432 src/addrduplicates.c:802
msgid "Really delete the address(es)?"
msgstr "确定删除邮件地址?"
-#: src/addressbook.c:2034
+#: src/addressbook.c:2064
msgid "Cannot paste. Target address book is readonly."
msgstr "无法粘贴，该地址簿已设为只读。"
-#: src/addressbook.c:2045
+#: src/addressbook.c:2074
msgid "Cannot paste into an address group."
msgstr "无法贴入指定的通讯群组。"
# c-format
-#: src/addressbook.c:2728
+#: src/addressbook.c:2767
#, c-format
msgid "Do you want to delete the query results and addresses in '%s' ?"
msgstr "你想要删除'%s'里面的查询结果和地址信息吗?"
-#: src/addressbook.c:2731 src/addressbook.c:2757 src/addressbook.c:2764
-#: src/prefs_filtering_action.c:152
+#: src/addressbook.c:2770 src/addressbook.c:2796 src/addressbook.c:2803
+#: src/prefs_filtering_action.c:163 src/toolbar.c:428
msgid "Delete"
msgstr "删除"
-#: src/addressbook.c:2740
+#: src/addressbook.c:2779
#, c-format
msgid ""
"Do you want to delete '%s' ?If you delete the folder only, the addresses it "
"contains will be moved into the parent folder."
msgstr ""
-"你确定要删除'%s'这个文件夹以及里面所有的地址吗？ \n"
-"如果只删除文件夹，地址簿会被移到上一层的文件夹中。"
+"你确定要删除'%s'这个目录以及里面所有的地址吗？ \n"
+"如果只删除目录，地址簿会被移到上一层的目录中。"
-#: src/addressbook.c:2743 src/imap_gtk.c:301 src/mh_gtk.c:182
+#: src/addressbook.c:2782 src/imap_gtk.c:302 src/mh_gtk.c:182
msgid "Delete folder"
-msgstr "删除文件夹"
+msgstr "删除目录"
-#: src/addressbook.c:2744
+#: src/addressbook.c:2783
msgid "+Delete _folder only"
msgstr "+只删除目录(_f)"
-#: src/addressbook.c:2744
+#: src/addressbook.c:2783
msgid "Delete folder and _addresses"
msgstr "删除目录及地址数据"
-#: src/addressbook.c:2755
+#: src/addressbook.c:2794
#, c-format
msgid ""
"Do you want to delete '%s'?\n"
"你想要删除'%s'吗?\n"
"里面的地址数据将会丢失。"
-#: src/addressbook.c:2762
+#: src/addressbook.c:2801
#, c-format
msgid ""
"Do you want to delete '%s'?\n"
"你想要删除'%s'吗?\n"
"里面的地址数据将会丢失。"
-#: src/addressbook.c:3634
+# c-format
+#: src/addressbook.c:2911
+#, c-format
+msgid "Search '%s'"
+msgstr "搜索 '%s'"
+
+#: src/addressbook.c:3049 src/addressbook.c:3098
+msgid "New Contacts"
+msgstr "添加联系人"
+
+#: src/addressbook.c:3878
msgid "New user, could not save index file."
msgstr "新用户，无法保存索引文件。"
-#: src/addressbook.c:3638
+#: src/addressbook.c:3882
msgid "New user, could not save address book files."
msgstr "新用户，无法保存地址簿文件。"
-#: src/addressbook.c:3648
+#: src/addressbook.c:3892
msgid "Old address book converted successfully."
msgstr "转换旧地址簿格式完成。"
-#: src/addressbook.c:3653
+#: src/addressbook.c:3897
msgid ""
"Old address book converted,\n"
"could not save new address index file."
"旧地址簿格式已转换，\n"
"但无法保存新的索引文件。"
-#: src/addressbook.c:3666
+#: src/addressbook.c:3910
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
"无法转换地址簿格式，\n"
"但空的新地址簿文件已经生成。"
-#: src/addressbook.c:3672
+#: src/addressbook.c:3916
msgid ""
"Could not convert address book,\n"
"could not save new address index file."
"无法转换地址簿格式，\n"
"无法保存新的地址簿索引文件。"
-#: src/addressbook.c:3677
+#: src/addressbook.c:3921
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
"无法转换地址簿格式，\n"
"亦无法产生新的地址簿文件。"
-#: src/addressbook.c:3684 src/addressbook.c:3690
+#: src/addressbook.c:3928 src/addressbook.c:3934
msgid "Addressbook conversion error"
msgstr "转换地址簿格式时发生错误"
-#: src/addressbook.c:3728
+#: src/addressbook.c:4041
msgid "Addressbook Error"
msgstr "地址簿发生错误"
-#: src/addressbook.c:3729
+#: src/addressbook.c:4042
msgid "Could not read address index"
msgstr "无法读取地址簿索引"
-#: src/addressbook.c:4056
+#: src/addressbook.c:4369
msgid "Busy searching..."
msgstr "正在搜索..."
-# c-format
-#: src/addressbook.c:4110
-#, c-format
-msgid "Search '%s'"
-msgstr "搜索 '%s'"
-
-#: src/addressbook.c:4335
+#: src/addressbook.c:4631
msgid "Interface"
msgstr "界面"
-#: src/addressbook.c:4351 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
-#: src/expldifdlg.c:394 src/exporthtml.c:973 src/importldif.c:651
+#: src/addressbook.c:4647 src/addressbook_foldersel.c:192 src/exphtmldlg.c:375
+#: src/expldifdlg.c:392 src/exporthtml.c:979 src/importldif.c:660
msgid "Address Book"
msgstr "地址簿"
-#: src/addressbook.c:4367
+#: src/addressbook.c:4663
msgid "Person"
msgstr "人名"
-#: src/addressbook.c:4383
-msgid "EMail Address"
-msgstr "电子邮件邮箱"
-
-#: src/addressbook.c:4415 src/exporthtml.c:875 src/folderview.c:469
-#: src/prefs_account.c:2491 src/prefs_folder_column.c:79
+#: src/addressbook.c:4711 src/exporthtml.c:879 src/folderview.c:405
+#: src/folderview.c:493 src/prefs_account.c:2517 src/prefs_folder_column.c:81
+#: src/prefs_folder_item.c:1511 src/prefs_folder_item.c:1529
+#: src/prefs_folder_item.c:1546
msgid "Folder"
-msgstr "文件夹"
+msgstr "目录"
-#: src/addressbook.c:4431
+#: src/addressbook.c:4727
msgid "vCard"
msgstr "vCard"
-#: src/addressbook.c:4447 src/addressbook.c:4463
+#: src/addressbook.c:4743 src/addressbook.c:4759
msgid "JPilot"
msgstr "JPilot"
-#: src/addressbook.c:4479
+#: src/addressbook.c:4775
msgid "LDAP servers"
msgstr "LDAP 服务器"
-#: src/addressbook.c:4495
+#: src/addressbook.c:4791
msgid "LDAP Query"
msgstr "LDAP 查询"
-#: src/addressbook.c:4811 src/addressbook_foldersel.c:389 src/matcher.c:305
-#: src/matcher.c:762 src/matcher.c:895 src/plugins/bogofilter/bogofilter.c:215
-#: src/plugins/bogofilter/bogofilter_gtk.c:67 src/prefs_matcher.c:220
-#: src/prefs_matcher.c:523 src/prefs_matcher.c:1343 src/prefs_matcher.c:1360
-#: src/prefs_matcher.c:1362 src/prefs_matcher.c:2115 src/prefs_matcher.c:2119
+#: src/addressbook.c:5113 src/addressbook_foldersel.c:391 src/matcher.c:364
+#: src/matcher.c:1274 src/matcher.c:1407
+#: src/plugins/bogofilter/bogofilter.c:103
+#: src/plugins/bogofilter/bogofilter.c:217
+#: src/plugins/bogofilter/bogofilter_gtk.c:234
+#: src/plugins/dillo_viewer/dillo_prefs.c:66
+#: src/plugins/dillo_viewer/dillo_prefs.c:199
+#: src/plugins/dillo_viewer/dillo_viewer.c:123
+#: src/plugins/spamassassin/spamassassin.c:116
+#: src/plugins/spamassassin/spamassassin.c:254
+#: src/plugins/spamassassin/spamassassin_gtk.c:449 src/prefs_matcher.c:623
+#: src/prefs_matcher.c:653 src/prefs_matcher.c:1460 src/prefs_matcher.c:1475
+#: src/prefs_matcher.c:1477 src/prefs_matcher.c:2323 src/prefs_matcher.c:2327
msgid "Any"
msgstr "任意"
#: src/addrgather.c:294
msgid "No folder or message was selected."
-msgstr "未选取文件夹或讯息。"
+msgstr "未选取目录或讯息。"
#: src/addrgather.c:302
msgid ""
"Please select a folder to process from the folder\n"
"list. Alternatively, select one or messages from\n"
"the message list."
-msgstr "请选取选择需要处理的文件夹，或者选择一封或多封邮件。"
+msgstr "请选取选择需要处理的目录，或者选择一封或多封邮件。"
#: src/addrgather.c:354
msgid "Folder :"
-msgstr "文件夹 :"
+msgstr "目录 :"
-#: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:626
+#: src/addrgather.c:365 src/exphtmldlg.c:543 src/expldifdlg.c:629
#: src/importldif.c:909
msgid "Address Book :"
msgstr "地址簿 :"
#: src/addrgather.c:375
msgid "Folder Size :"
-msgstr "文件夹大小 :"
+msgstr "目录大小 :"
#: src/addrgather.c:390
msgid "Process these mail header fields"
msgstr "检索如下信头字段"
#: src/addrgather.c:408
-msgid "Include sub-folders"
-msgstr "包括子文件夹"
+msgid "Include subfolders"
+msgstr "包括子目录"
-#: src/addrgather.c:431
+#: src/addrgather.c:431 src/prefs_filtering_action.c:1350
msgid "Header Name"
msgstr "信头名称"
msgid "Address Count"
msgstr "邮件地址数目"
-#: src/addrgather.c:537 src/alertpanel.c:154 src/compose.c:4830
-#: src/compose.c:9469 src/messageview.c:586 src/messageview.c:599
-#: src/plugins/pgpcore/sgpgme.c:575
+#: src/addrgather.c:537 src/alertpanel.c:158 src/compose.c:5147
+#: src/compose.c:10192 src/messageview.c:690 src/messageview.c:703
+#: src/plugins/pgpcore/sgpgme.c:581 src/summaryview.c:4553
msgid "Warning"
msgstr "警告"
msgid "Header Fields"
msgstr "信头字段"
-#: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:737
-#: src/importldif.c:1029
+#: src/addrgather.c:539 src/exphtmldlg.c:663 src/expldifdlg.c:740
+#: src/importldif.c:1041
msgid "Finish"
msgstr "完成"
#: src/addrgather.c:608
msgid "Harvest Email Addresses - from Folder"
-msgstr "批量获取Email地址 - 文件夹"
+msgstr "批量获取Email地址 - 目录"
-#: src/addrindex.c:116
+#: src/addrindex.c:118
msgid "Common addresses"
msgstr "公用邮件地址"
-#: src/addrindex.c:117
+#: src/addrindex.c:119
msgid "Personal addresses"
msgstr "个人邮件地址"
-#: src/addrindex.c:123
+#: src/addrindex.c:125
msgid "Common address"
msgstr "公用邮件地址"
-#: src/addrindex.c:124
+#: src/addrindex.c:126
msgid "Personal address"
msgstr "个人邮件地址"
-#: src/alertpanel.c:141 src/compose.c:7618
+#: src/addrindex.c:1825
+msgid "Address(es) update"
+msgstr "地址更新"
+
+#: src/addrindex.c:1826
+msgid "Update failed. Changes not written to Directory."
+msgstr "更新失败。所做变更未能写入目录。"
+
+#: src/addrduplicates.c:126
+msgid "Show duplicates in the same book"
+msgstr "显示同一地址簿中的重复项"
+
+#: src/addrduplicates.c:132
+msgid "Show duplicates in different books"
+msgstr "显示不同地址簿中的重复项"
+
+#: src/addrduplicates.c:143
+msgid "Find address book email duplicates"
+msgstr "查找地址薄中重复的email地址"
+
+#: src/addrduplicates.c:144
+msgid ""
+"Claws Mail will now search for duplicate email addresses in the address book."
+msgstr ""
+"Claws Mail现在将在地址簿中搜索重复的email地址。"
+
+#: src/addrduplicates.c:325
+msgid "No duplicate email addresses found in the address book"
+msgstr "地址簿中没有重复的email地址"
+
+#: src/addrduplicates.c:356
+msgid "Duplicate email addresses"
+msgstr "重复的email地址"
+
+#: src/addrduplicates.c:472
+msgid "Address book path"
+msgstr "地址簿路径"
+
+#: src/addrduplicates.c:849
+msgid "Delete address"
+msgstr "删除邮件地址"
+
+#: src/alertpanel.c:145 src/compose.c:8187
msgid "Notice"
msgstr "注意"
-#: src/alertpanel.c:167 src/alertpanel.c:190 src/compose.c:4770 src/inc.c:616
-#: src/plugins/pgpcore/sgpgme.c:148 src/plugins/pgpcore/sgpgme.c:239
+#: src/alertpanel.c:171 src/alertpanel.c:194 src/compose.c:5087 src/inc.c:649
+#: src/plugins/pgpcore/sgpgme.c:152 src/plugins/pgpcore/sgpgme.c:243
msgid "Error"
msgstr "错误"
-#: src/alertpanel.c:191
+#: src/alertpanel.c:195
msgid "_View log"
msgstr "查看日志文件(_V)"
-#: src/alertpanel.c:339
+#: src/alertpanel.c:345
msgid "Show this message next time"
msgstr "在显示一次讯息"
-#: src/browseldap.c:218
+#: src/browseldap.c:223
msgid "Browse Directory Entry"
msgstr "浏览目录项"
-#: src/browseldap.c:238
+#: src/browseldap.c:243
msgid "Server Name :"
msgstr "服务器名:"
-#: src/browseldap.c:248
+#: src/browseldap.c:253
msgid "Distinguished Name (dn) :"
msgstr "名"
-#: src/browseldap.c:271
+#: src/browseldap.c:276
msgid "LDAP Name"
msgstr "LDAP名称"
-#: src/browseldap.c:273
+#: src/browseldap.c:278
msgid "Attribute Value"
msgstr "属性值"
-#: src/common/nntp.c:73
-#, c-format
-msgid "Can't connect to NNTP server: %s:%d\n"
-msgstr "无法连接NNTP服务器: %s:%d\n"
-
-#: src/common/nntp.c:80 src/common/session.c:166 src/imap.c:841
-msgid "SSL handshake failed\n"
-msgstr "SSL握手失败\n"
-
-#: src/common/nntp.c:182 src/common/nntp.c:245
-#, c-format
-msgid "protocol error: %s\n"
-msgstr "通讯协议错误: %s\n"
-
-#: src/common/nntp.c:205 src/common/nntp.c:251
-msgid "protocol error\n"
-msgstr "通讯协议错误\n"
-
-#: src/common/nntp.c:301
-msgid "Error occurred while posting\n"
-msgstr "发表文章时发生错误\n"
-
-#: src/common/nntp.c:381
-msgid "Error occurred while sending command\n"
-msgstr "发送命令时发生错误\n"
-
-#: src/common/plugin.c:54
+#: src/common/plugin.c:58
msgid "Nothing"
msgstr "无用"
-#: src/common/plugin.c:55
+#: src/common/plugin.c:59
msgid "a viewer"
msgstr "图片查看器"
-#: src/common/plugin.c:56
+#: src/common/plugin.c:60
+msgid "a MIME parser"
+msgstr "MIME解析器"
+
+#: src/common/plugin.c:61
msgid "folders"
-msgstr "文件夹"
+msgstr "目录"
-#: src/common/plugin.c:57
+#: src/common/plugin.c:62
msgid "filtering"
msgstr "过滤器"
-#: src/common/plugin.c:58
+#: src/common/plugin.c:63
msgid "a privacy interface"
msgstr "隐私系统"
-#: src/common/plugin.c:59
+#: src/common/plugin.c:64
msgid "a notifier"
msgstr "通知器"
-#: src/common/plugin.c:60
+#: src/common/plugin.c:65
msgid "an utility"
msgstr "工具"
-#: src/common/plugin.c:61
+#: src/common/plugin.c:66
msgid "things"
msgstr "其它"
-#: src/common/plugin.c:259
+#: src/common/plugin.c:284
#, c-format
msgid ""
"This plugin provides %s (%s), which is already provided by the %s plugin."
msgstr "该账户提供%s(%s)功能，但%s插件已经提供了此功能。"
-#: src/common/plugin.c:294
+#: src/common/plugin.c:323
msgid "Plugin already loaded"
msgstr "插件已经加载"
-#: src/common/plugin.c:304
+#: src/common/plugin.c:334
msgid "Failed to allocate memory for Plugin"
msgstr "为插件分配内存失败"
-#: src/common/plugin.c:331
-msgid "This module is not licenced under a GPL compatible licence."
-msgstr "该模块并不以通用许可协议(GPL)兼容协议发布。"
+#: src/common/plugin.c:364
+msgid "This module is not licensed under a GPL v2 or later compatible license."
+msgstr "该模块的版权协议并不与通用许可协议(GPL)v2或者更高版本兼容。"
-#: src/common/plugin.c:338
+#: src/common/plugin.c:373
msgid "This module is for Claws Mail GTK1."
msgstr "该模块是为GTK1版本的Claws Mail。"
-#: src/common/plugin.c:550
+#: src/common/plugin.c:613
#, c-format
msgid ""
"Your version of Claws Mail is newer than the version the '%s' plugin was "
"built with."
-msgstr ""
-"您的Claws Mail版本比编译'%s'插件所采用的版本更新。"
+msgstr "您的Claws Mail版本比编译'%s'插件所采用的版本更新。"
-#: src/common/plugin.c:553
+#: src/common/plugin.c:616
msgid ""
"Your version of Claws Mail is newer than the version the plugin was built "
"with."
-msgstr ""
-"您的Claws Mail版本比编译此插件所采用的版本更新。"
+msgstr "您的Claws Mail版本比编译此插件所采用的版本更新。"
-#: src/common/plugin.c:562
+#: src/common/plugin.c:625
#, c-format
msgid "Your version of Claws Mail is too old for the '%s' plugin."
msgstr "您的Claws Mail版本太老，不能使用'%s'插件。"
-#: src/common/plugin.c:564
+#: src/common/plugin.c:627
msgid "Your version of Claws Mail is too old for the plugin."
msgstr "您的Claws Mail版本太老，不能使用此插件。"
+#: src/common/session.c:166 src/imap.c:1098
+msgid "SSL handshake failed\n"
+msgstr "SSL握手失败\n"
+
#: src/common/smtp.c:176
msgid "SMTP AUTH not available\n"
msgstr "SMTP 认证失败\n"
msgid "error occurred on SMTP session\n"
msgstr "连接SMTP错误\n"
-#: src/common/smtp.c:548 src/pop.c:842
+#: src/common/smtp.c:548 src/pop.c:891
msgid "error occurred on authentication\n"
msgstr "认证时发生错误\n"
msgid "Message is too big (Maximum size is %s)\n"
msgstr "邮件太大(最大允许尺寸为%s)\n"
-#: src/common/smtp.c:635 src/pop.c:835
+#: src/common/smtp.c:635 src/pop.c:884
msgid "couldn't start TLS session\n"
msgstr "无法启动TLS会话\n"
-#: src/common/socket.c:1393
+#: src/common/socket.c:1426
#, c-format
msgid "write on fd%d: %s\n"
msgstr ""
-#: src/common/ssl.c:159
+#: src/common/ssl.c:214
msgid "Error creating ssl context\n"
msgstr "创建SSL环境出错\n"
-#: src/common/ssl.c:178
+#: src/common/ssl.c:233
#, c-format
msgid "SSL connect failed (%s)\n"
msgstr "SSL连接失败 (%s)\n"
-#: src/common/ssl_certificate.c:203 src/common/ssl_certificate.c:214
-#: src/common/ssl_certificate.c:220 src/common/ssl_certificate.c:227
-#: src/common/ssl_certificate.c:238 src/common/ssl_certificate.c:244
-#: src/gtk/sslcertwindow.c:68 src/gtk/sslcertwindow.c:79
-#: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:92
-#: src/gtk/sslcertwindow.c:103 src/gtk/sslcertwindow.c:109
-msgid "<not in certificate>"
-msgstr "<不在认证之内>"
-
-#: src/common/ssl_certificate.c:253
-#, c-format
-msgid ""
-" Owner: %s (%s) in %s\n"
-" Signed by: %s (%s) in %s\n"
-" Fingerprint: %s\n"
-" Signature status: %s"
-msgstr ""
-" 所有者: %s (%s) 在 %s\n"
-" 签收者: %s (%s) 在 %s\n"
-" 指纹: %s\n"
-" 签名状态: %s"
-
-#: src/common/ssl_certificate.c:380
+#: src/common/ssl_certificate.c:513
msgid "Couldn't load X509 default paths"
msgstr "无法加载X509缺省路径"
+#: src/common/ssl_certificate.c:535
+msgid "Uncheckable"
+msgstr "无法检查的"
+
+#: src/common/ssl_certificate.c:539
+msgid "Self-signed certificate"
+msgstr "自签名的证书"
+
+#: src/common/ssl_certificate.c:542
+msgid "Revoked certificate"
+msgstr "已撤销的证书"
+
+#: src/common/ssl_certificate.c:544
+#, fuzzy
+msgid "No certificate issuer found"
+msgstr "未发现证书发布者"
+
+#: src/common/ssl_certificate.c:546
+msgid "Certificate issuer is not a CA"
+msgstr "证书不是由CA发布"
+
#: src/common/string_match.c:79
msgid "(Subject cleared by RegExp)"
msgstr "（主题被RegExp清除了）"
-#: src/common/utils.c:348
+#: src/common/utils.c:332
#, c-format
msgid "%dB"
msgstr "%dB"
-#: src/common/utils.c:349
+#: src/common/utils.c:333
#, c-format
msgid "%d.%02dKB"
msgstr ""
-#: src/common/utils.c:350
+#: src/common/utils.c:334
#, c-format
msgid "%d.%02dMB"
msgstr ""
-#: src/common/utils.c:351
+#: src/common/utils.c:335
#, c-format
msgid "%.2fGB"
msgstr ""
-#: src/common/utils.c:4805
+#: src/common/utils.c:4698
msgid "Complete day name for use by strftime|Sunday"
msgstr "星期日"
-#: src/common/utils.c:4806
+#: src/common/utils.c:4699
msgid "Complete day name for use by strftime|Monday"
msgstr "星期一"
-#: src/common/utils.c:4807
+#: src/common/utils.c:4700
msgid "Complete day name for use by strftime|Tuesday"
msgstr "星期二"
-#: src/common/utils.c:4808
+#: src/common/utils.c:4701
msgid "Complete day name for use by strftime|Wednesday"
msgstr "星期三"
-#: src/common/utils.c:4809
+#: src/common/utils.c:4702
msgid "Complete day name for use by strftime|Thursday"
msgstr "星期四"
-#: src/common/utils.c:4810
+#: src/common/utils.c:4703
msgid "Complete day name for use by strftime|Friday"
msgstr "星期五"
-#: src/common/utils.c:4811
+#: src/common/utils.c:4704
msgid "Complete day name for use by strftime|Saturday"
msgstr "星期六"
-#: src/common/utils.c:4813
+#: src/common/utils.c:4706
msgid "Complete month name for use by strftime|January"
msgstr "一月"
-#: src/common/utils.c:4814
+#: src/common/utils.c:4707
msgid "Complete month name for use by strftime|February"
msgstr "二月"
-#: src/common/utils.c:4815
+#: src/common/utils.c:4708
msgid "Complete month name for use by strftime|March"
msgstr "三月"
-#: src/common/utils.c:4816
+#: src/common/utils.c:4709
msgid "Complete month name for use by strftime|April"
msgstr "四月"
-#: src/common/utils.c:4817
+#: src/common/utils.c:4710
msgid "Complete month name for use by strftime|May"
msgstr "五月"
-#: src/common/utils.c:4818
+#: src/common/utils.c:4711
msgid "Complete month name for use by strftime|June"
msgstr "六月"
-#: src/common/utils.c:4819
+#: src/common/utils.c:4712
msgid "Complete month name for use by strftime|July"
msgstr "七月"
-#: src/common/utils.c:4820
+#: src/common/utils.c:4713
msgid "Complete month name for use by strftime|August"
msgstr "八月"
-#: src/common/utils.c:4821
+#: src/common/utils.c:4714
msgid "Complete month name for use by strftime|September"
msgstr "九月"
-#: src/common/utils.c:4822
+#: src/common/utils.c:4715
msgid "Complete month name for use by strftime|October"
msgstr "十月"
-#: src/common/utils.c:4823
+#: src/common/utils.c:4716
msgid "Complete month name for use by strftime|November"
msgstr "十一月"
-#: src/common/utils.c:4824
+#: src/common/utils.c:4717
msgid "Complete month name for use by strftime|December"
msgstr "十二月"
-#: src/common/utils.c:4826
+#: src/common/utils.c:4719
msgid "Abbr. day name for use by strftime|Sun"
msgstr "日"
-#: src/common/utils.c:4827
+#: src/common/utils.c:4720
msgid "Abbr. day name for use by strftime|Mon"
msgstr "一"
-#: src/common/utils.c:4828
+#: src/common/utils.c:4721
msgid "Abbr. day name for use by strftime|Tue"
msgstr "二"
-#: src/common/utils.c:4829
+#: src/common/utils.c:4722
msgid "Abbr. day name for use by strftime|Wed"
msgstr "三"
-#: src/common/utils.c:4830
+#: src/common/utils.c:4723
msgid "Abbr. day name for use by strftime|Thu"
msgstr "四"
-#: src/common/utils.c:4831
+#: src/common/utils.c:4724
msgid "Abbr. day name for use by strftime|Fri"
msgstr "五"
-#: src/common/utils.c:4832
+#: src/common/utils.c:4725
msgid "Abbr. day name for use by strftime|Sat"
msgstr "六"
-#: src/common/utils.c:4834
+#: src/common/utils.c:4727
msgid "Abbr. month name for use by strftime|Jan"
msgstr "一"
-#: src/common/utils.c:4835
+#: src/common/utils.c:4728
msgid "Abbr. month name for use by strftime|Feb"
msgstr "二"
-#: src/common/utils.c:4836
+#: src/common/utils.c:4729
msgid "Abbr. month name for use by strftime|Mar"
msgstr "三"
-#: src/common/utils.c:4837
+#: src/common/utils.c:4730
msgid "Abbr. month name for use by strftime|Apr"
msgstr "四"
-#: src/common/utils.c:4838
+#: src/common/utils.c:4731
msgid "Abbr. month name for use by strftime|May"
msgstr "五"
-#: src/common/utils.c:4839
+#: src/common/utils.c:4732
msgid "Abbr. month name for use by strftime|Jun"
msgstr "六"
-#: src/common/utils.c:4840
+#: src/common/utils.c:4733
msgid "Abbr. month name for use by strftime|Jul"
msgstr "七"
-#: src/common/utils.c:4841
+#: src/common/utils.c:4734
msgid "Abbr. month name for use by strftime|Aug"
msgstr "八"
-#: src/common/utils.c:4842
+#: src/common/utils.c:4735
msgid "Abbr. month name for use by strftime|Sep"
msgstr "九"
-#: src/common/utils.c:4843
+#: src/common/utils.c:4736
msgid "Abbr. month name for use by strftime|Oct"
msgstr "十"
-#: src/common/utils.c:4844
+#: src/common/utils.c:4737
msgid "Abbr. month name for use by strftime|Nov"
msgstr "十一"
-#: src/common/utils.c:4845
+#: src/common/utils.c:4738
msgid "Abbr. month name for use by strftime|Dec"
msgstr "十二"
-#: src/common/utils.c:4847
+#: src/common/utils.c:4740
msgid "For use by strftime (morning)|AM"
msgstr "上午"
-#: src/common/utils.c:4848
+#: src/common/utils.c:4741
msgid "For use by strftime (afternoon)|PM"
msgstr "下午"
-#: src/common/utils.c:4849
+#: src/common/utils.c:4742
msgid "For use by strftime (morning, lowercase)|am"
msgstr "am"
-#: src/common/utils.c:4850
+#: src/common/utils.c:4743
msgid "For use by strftime (afternoon, lowercase)|pm"
msgstr "pm"
-#: src/common/utils.c:4852
+#: src/common/utils.c:4745
msgid "For use by strftime (default date+time format)|%a %b %e %H:%M:%S %Y"
msgstr ""
-#: src/common/utils.c:4853
+#: src/common/utils.c:4746
msgid "For use by strftime (default date format)|%m/%d/%y"
msgstr ""
-#: src/common/utils.c:4854
+#: src/common/utils.c:4747
msgid "For use by strftime (default time format)|%H:%M:%S"
msgstr ""
-#: src/common/utils.c:4856
+#: src/common/utils.c:4749
msgid "For use by strftime (default 12-hour time format)|%I:%M:%S %p"
msgstr ""
-#: src/compose.c:541
+#: src/compose.c:556
msgid "/_Add..."
msgstr "/新增(_A)..."
-#: src/compose.c:542
+#: src/compose.c:557
msgid "/_Remove"
msgstr "/删除(_R)"
-#: src/compose.c:544 src/folderview.c:293
+#: src/compose.c:559 src/folderview.c:299
msgid "/_Properties..."
msgstr "/属性(_P)..."
-#: src/compose.c:549 src/mainwindow.c:746 src/messageview.c:289
+#: src/compose.c:564 src/mainwindow.c:791 src/messageview.c:377
msgid "/_Message"
msgstr "/邮件(_M)"
-#: src/compose.c:550
+#: src/compose.c:565
msgid "/_Message/S_end"
msgstr "/邮件(_M)/发送(_e)"
-#: src/compose.c:552
+#: src/compose.c:567
msgid "/_Message/Send _later"
msgstr "/邮件(_M)/稍后发送(_l)"
-#: src/compose.c:554 src/compose.c:558 src/compose.c:561 src/mainwindow.c:756
-#: src/mainwindow.c:766 src/mainwindow.c:779 src/mainwindow.c:785
-#: src/mainwindow.c:802 src/messageview.c:292 src/messageview.c:300
+#: src/compose.c:569 src/compose.c:573 src/compose.c:576 src/mainwindow.c:801
+#: src/mainwindow.c:811 src/mainwindow.c:824 src/mainwindow.c:830
+#: src/mainwindow.c:850 src/messageview.c:380 src/messageview.c:388
msgid "/_Message/---"
msgstr "/邮件(_M)/---"
-#: src/compose.c:555
+#: src/compose.c:570
msgid "/_Message/_Attach file"
msgstr "/邮件(_M)/附加(_A)"
-#: src/compose.c:556
+#: src/compose.c:571
msgid "/_Message/_Insert file"
msgstr "/邮件(_M)/插入文件(_I)"
-#: src/compose.c:557
+#: src/compose.c:572
msgid "/_Message/Insert si_gnature"
msgstr "/邮件(_M)/插入签名(_g)"
-#: src/compose.c:559
+#: src/compose.c:574
msgid "/_Message/_Save"
msgstr "/邮件(_M)/保存(_S)"
-#: src/compose.c:562
+#: src/compose.c:577
msgid "/_Message/_Close"
msgstr "/邮件(_M)/关闭(_C)"
-#: src/compose.c:565
+#: src/compose.c:580
msgid "/_Edit/_Undo"
msgstr "/编辑(_E)/撤消(_U)"
-#: src/compose.c:566
+#: src/compose.c:581
msgid "/_Edit/_Redo"
msgstr "/编辑(_E)/重复前一个动作(_R)"
-#: src/compose.c:567 src/compose.c:655 src/compose.c:658 src/compose.c:664
-#: src/mainwindow.c:527 src/messageview.c:171
+#: src/compose.c:582 src/compose.c:670 src/compose.c:673 src/compose.c:679
+#: src/mainwindow.c:563 src/messageview.c:229
msgid "/_Edit/---"
msgstr "/编辑(_E)/---"
-#: src/compose.c:568
+#: src/compose.c:583
msgid "/_Edit/Cu_t"
msgstr "/编辑(_E)/剪切(_t)"
-#: src/compose.c:569 src/mainwindow.c:523 src/messageview.c:169
+#: src/compose.c:584 src/mainwindow.c:559 src/messageview.c:227
msgid "/_Edit/_Copy"
msgstr "/编辑(_E)/复制(_C)"
-#: src/compose.c:570
+#: src/compose.c:585
msgid "/_Edit/_Paste"
msgstr "/编辑(_E)/粘贴(_P)"
-#: src/compose.c:571
+#: src/compose.c:586
msgid "/_Edit/Special paste"
msgstr "/编辑(_E)/选择性粘贴"
-#: src/compose.c:572
+#: src/compose.c:587
msgid "/_Edit/Special paste/as _quotation"
msgstr "/编辑(_E)/选择性粘贴/粘贴为引文(_q)"
-#: src/compose.c:574
+#: src/compose.c:589
msgid "/_Edit/Special paste/_wrapped"
msgstr "/编辑(_E)/选择性粘贴/自动折行(_w)"
-#: src/compose.c:576
+#: src/compose.c:591
msgid "/_Edit/Special paste/_unwrapped"
msgstr "/编辑(_E)/选择性粘贴/不自动折行(_u)"
-#: src/compose.c:578 src/mainwindow.c:524 src/messageview.c:170
+#: src/compose.c:593 src/mainwindow.c:560 src/messageview.c:228
msgid "/_Edit/Select _all"
msgstr "/编辑(_E)/全选(_a)"
-#: src/compose.c:579
+#: src/compose.c:594
msgid "/_Edit/A_dvanced"
msgstr "/编辑(_E)/高级(_d)"
-#: src/compose.c:580
+#: src/compose.c:595
msgid "/_Edit/A_dvanced/Move a character backward"
msgstr "/编辑(_E)/高级(_d)/后移一字符"
-#: src/compose.c:585
+#: src/compose.c:600
msgid "/_Edit/A_dvanced/Move a character forward"
msgstr "/编辑(_E)/高级(_d)/前移一字符"
-#: src/compose.c:590
+#: src/compose.c:605
msgid "/_Edit/A_dvanced/Move a word backward"
msgstr "/编辑(_E)/高级(_d)/后移一字"
-#: src/compose.c:595
+#: src/compose.c:610
msgid "/_Edit/A_dvanced/Move a word forward"
msgstr "/编辑(_E)/高级(_d)/前移一字"
-#: src/compose.c:600
+#: src/compose.c:615
msgid "/_Edit/A_dvanced/Move to beginning of line"
msgstr "/编辑(_E)/高级(_d)/移到行开头"
-#: src/compose.c:605
+#: src/compose.c:620
msgid "/_Edit/A_dvanced/Move to end of line"
msgstr "/编辑(_E)/高级(_d)/移到行尾"
-#: src/compose.c:610
+#: src/compose.c:625
msgid "/_Edit/A_dvanced/Move to previous line"
msgstr "/编辑(_E)/高级(_d)/移到前一行"
-#: src/compose.c:615
+#: src/compose.c:630
msgid "/_Edit/A_dvanced/Move to next line"
msgstr "/编辑(_E)/高级(_d)/移到下一行"
-#: src/compose.c:620
+#: src/compose.c:635
msgid "/_Edit/A_dvanced/Delete a character backward"
msgstr "/编辑(_E)/高级(_d)/往后删除一字符"
-#: src/compose.c:625
+#: src/compose.c:640
msgid "/_Edit/A_dvanced/Delete a character forward"
msgstr "/编辑(_E)/高级(_d)/往前删除一字符"
-#: src/compose.c:630
+#: src/compose.c:645
msgid "/_Edit/A_dvanced/Delete a word backward"
msgstr "/编辑(_E)/高级(_d)/往后删除一字"
-#: src/compose.c:635
+#: src/compose.c:650
msgid "/_Edit/A_dvanced/Delete a word forward"
msgstr "/编辑(_E)/高级(_d)/往前删除一字"
-#: src/compose.c:640
+#: src/compose.c:655
msgid "/_Edit/A_dvanced/Delete line"
msgstr "/编辑(_E)/高级(_d)/删除一行"
-#: src/compose.c:645
+#: src/compose.c:660
msgid "/_Edit/A_dvanced/Delete entire line"
msgstr "/编辑(_E)/高级(_d)/删除一行"
-#: src/compose.c:650
+#: src/compose.c:665
msgid "/_Edit/A_dvanced/Delete to end of line"
msgstr "/编辑(_E)/高级(_d)/从游标处起删除至行尾"
-#: src/compose.c:656
+#: src/compose.c:671
msgid "/_Edit/_Find"
msgstr "/编辑(_E)/查找(_F)"
-#: src/compose.c:659
+#: src/compose.c:674
msgid "/_Edit/_Wrap current paragraph"
msgstr "/编辑(_E)/将当前段落折行(_W)"
-#: src/compose.c:661
+#: src/compose.c:676
msgid "/_Edit/Wrap all long _lines"
msgstr "/编辑(_E)/将所有过长的行折行(_l)"
-#: src/compose.c:663
+#: src/compose.c:678
msgid "/_Edit/Aut_o wrapping"
msgstr "/编辑(_E)/自动折行(_o)"
-#: src/compose.c:665
+#: src/compose.c:680
msgid "/_Edit/Edit with e_xternal editor"
msgstr "/编辑(_E)/使用外部编辑器(_x)"
-#: src/compose.c:668
+#: src/compose.c:683
msgid "/_Spelling"
msgstr "/拼写(_S)"
-#: src/compose.c:669
+#: src/compose.c:684
msgid "/_Spelling/_Check all or check selection"
msgstr "/拼写(_S)/检查全文或选定区域(_C)"
-#: src/compose.c:671
+#: src/compose.c:686
msgid "/_Spelling/_Highlight all misspelled words"
msgstr "/拼写(_S)/显示所有拼错的单词(_H)"
-#: src/compose.c:673
+#: src/compose.c:688
msgid "/_Spelling/Check _backwards misspelled word"
msgstr "/拼写(_S)/向后检查拼错的单词(_b)"
-#: src/compose.c:675
+#: src/compose.c:690
msgid "/_Spelling/_Forward to next misspelled word"
msgstr "/拼写(_S)/向前检查拼错的单词(_F)"
-#: src/compose.c:677
+#: src/compose.c:692
msgid "/_Spelling/---"
msgstr "/拼写(_S)/---"
-#: src/compose.c:678
+#: src/compose.c:693
msgid "/_Spelling/Options"
msgstr "/拼写(_S)/选项"
-#: src/compose.c:681
+#: src/compose.c:696
msgid "/_Options"
msgstr "/选项(_O)"
-#: src/compose.c:682
+#: src/compose.c:697
msgid "/_Options/Reply _mode"
msgstr "/选项(_O)/回复方式(_m)"
-#: src/compose.c:683
+#: src/compose.c:698
msgid "/_Options/Reply _mode/_Normal"
msgstr "/选项(_O)/回复方式(_m)/普通(_N)"
-#: src/compose.c:684
+#: src/compose.c:699
msgid "/_Options/Reply _mode/_All"
msgstr "/选项(_O)/回复方式(_m)/全部人(_a)"
-#: src/compose.c:685
+#: src/compose.c:700
msgid "/_Options/Reply _mode/_Sender"
msgstr "/选项(_O)/回复方式(_m)/发信人(_s)"
-#: src/compose.c:686
+#: src/compose.c:701
msgid "/_Options/Reply _mode/_Mailing-list"
msgstr "/选项(_O)/回复方式(_m)/邮件列表(_M)"
-#: src/compose.c:687 src/compose.c:692 src/compose.c:699 src/compose.c:701
-#: src/compose.c:703
+#: src/compose.c:702 src/compose.c:707 src/compose.c:714 src/compose.c:716
+#: src/compose.c:718
msgid "/_Options/---"
msgstr "/选项(_O)/---"
-#: src/compose.c:688
+#: src/compose.c:703
msgid "/_Options/Privacy _System"
msgstr "/选项(_O)/隐私系统(_S)"
-#: src/compose.c:689
+#: src/compose.c:704
msgid "/_Options/Privacy _System/None"
msgstr "/选项(_O)/隐私系统(_S)/无"
-#: src/compose.c:690
+#: src/compose.c:705
msgid "/_Options/Si_gn"
msgstr "/选项(_O)/签名(_g)"
-#: src/compose.c:691
+#: src/compose.c:706
msgid "/_Options/_Encrypt"
msgstr "/选项(_O)/加密(_E)"
-#: src/compose.c:693
+#: src/compose.c:708
msgid "/_Options/_Priority"
msgstr "/选项(_O)/优先级(_P)"
-#: src/compose.c:694
+#: src/compose.c:709
msgid "/_Options/Priority/_Highest"
msgstr "/选项(_O)/优先顺序/最优先(_H)"
-#: src/compose.c:695
+#: src/compose.c:710
msgid "/_Options/Priority/Hi_gh"
msgstr "/选项(_O)/优先顺序/优先(_g)"
-#: src/compose.c:696
+#: src/compose.c:711
msgid "/_Options/Priority/_Normal"
msgstr "/选项(_O)/优先顺序/普通(_N)"
-#: src/compose.c:697
+#: src/compose.c:712
msgid "/_Options/Priority/Lo_w"
msgstr "/选项(_O)/优先顺序/低(_w)"
-#: src/compose.c:698
+#: src/compose.c:713
msgid "/_Options/Priority/_Lowest"
msgstr "/选项(_O)/优先顺序/最低(_L)"
-#: src/compose.c:700
+#: src/compose.c:715
msgid "/_Options/_Request Return Receipt"
msgstr "/选项(_O)/请求回执(_R)"
-#: src/compose.c:702
+#: src/compose.c:717
msgid "/_Options/Remo_ve references"
msgstr "/选项(_O)/删除引用(_V)"
-#: src/compose.c:709
+#: src/compose.c:724
msgid "/_Options/Character _encoding"
msgstr "/选项(_O)/字符编码(_e)"
-#: src/compose.c:710
+#: src/compose.c:725
msgid "/_Options/Character _encoding/_Automatic"
-msgstr "/选项(_O)/字符集(_e)/自动侦测(_A)"
+msgstr "/选项(_O)/字符编码(_e)/自动侦测(_A)"
-#: src/compose.c:712 src/compose.c:718 src/compose.c:726 src/compose.c:730
-#: src/compose.c:736 src/compose.c:740 src/compose.c:746 src/compose.c:752
-#: src/compose.c:756 src/compose.c:766 src/compose.c:770 src/compose.c:780
-#: src/compose.c:784
+#: src/compose.c:727 src/compose.c:733
msgid "/_Options/Character _encoding/---"
msgstr "/选项(_O)/字符编码(_e)/---"
-#: src/compose.c:714
-msgid "/_Options/Character _encoding/7bit ascii (US-ASC_II)"
-msgstr "/选项(_O)/字符集(_e)/7bit ascii (US-ASCII)(_ I)"
+#: src/compose.c:729
+msgid "/_Options/Character _encoding/7bit ASCII (US-ASC_II)"
+msgstr "/选项(_O)/字符编码(_e)/7bit ascii (US-ASCI_I)"
-#: src/compose.c:716
+#: src/compose.c:731
msgid "/_Options/Character _encoding/Unicode (_UTF-8)"
-msgstr "/选项(_O)/字符集(_e)/Unicode (UTF-8)(_U)"
-
-#: src/compose.c:720
-msgid "/_Options/Character _encoding/Western European (ISO-8859-_1)"
-msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-1)(_1)"
+msgstr "/选项(_O)/字符编码(_e)/Unicode (UTF-8)(_U)"
-#: src/compose.c:722
-msgid "/_Options/Character _encoding/Western European (ISO-8859-15)"
-msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-15)"
+#: src/compose.c:735
+msgid "/_Options/Character _encoding/Western European"
+msgstr "/选项(_O)/字符编码(_e)/西欧"
-#: src/compose.c:724
-msgid "/_Options/Character _encoding/Western European (Windows-1252)"
-msgstr "/选项(_O)/字符集(_e)/西欧(Windows-1252)"
+#: src/compose.c:736
+msgid "/_Options/Character _encoding/Western European/ISO-8859-_1"
+msgstr "/选项(_O)/字符编码(_e)/西欧/ISO-8859-_1"
-#: src/compose.c:728
-msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
-msgstr "/选项(_O)/字符集(_e)/西欧 (ISO-8859-_2)"
+#: src/compose.c:738
+msgid "/_Options/Character _encoding/Western European/ISO-8859-15"
+msgstr "/选项(_O)/字符编码(_e)/西欧/ISO-8859-15"
-#: src/compose.c:732
-msgid "/_Options/Character _encoding/_Baltic (ISO-8859-13)"
-msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
+#: src/compose.c:740
+msgid "/_Options/Character _encoding/Western European/Windows-1252"
+msgstr "/选项(_O)/字符编码(_e)/西欧/Windows-1252"
-#: src/compose.c:734
-msgid "/_Options/Character _encoding/Baltic (ISO-8859-_4)"
-msgstr "/选项(_O)/字符集(_e)/波罗的海 (ISO-8859-_4)"
+#: src/compose.c:743
+msgid "/_Options/Character _encoding/Central European (ISO-8859-_2)"
+msgstr "/选项(_O)/字符编码(_e)/中欧 (ISO-8859-_2)"
-#: src/compose.c:738
-msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
-msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
+#: src/compose.c:746
+msgid "/_Options/Character _encoding/Baltic"
+msgstr "/选项(_O)/字符编码(_e)/波罗的海"
-#: src/compose.c:742
-msgid "/_Options/Character _encoding/Hebrew (ISO-8859-_8)"
-msgstr "/选项(_O)/字符集(_e)/希腊 (ISO-8859-_7)"
+#: src/compose.c:747
+msgid "/_Options/Character _encoding/Baltic/ISO-8859-13"
+msgstr "/选项(_O)/字符编码(_e)/波罗的海/ISO-8859-13"
-#: src/compose.c:744
-msgid "/_Options/Character _encoding/Hebrew (Windows-1255)"
-msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1255)"
+#: src/compose.c:749
+msgid "/_Options/Character _encoding/Baltic/ISO-8859-_4"
+msgstr "/选项(_O)/字符编码(_e)/波罗的海/ISO-8859-_4"
-#: src/compose.c:748
-msgid "/_Options/Character _encoding/Arabic (ISO-8859-_6)"
-msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (ISO-8859-_6"
+#: src/compose.c:752
+msgid "/_Options/Character _encoding/Greek (ISO-8859-_7)"
+msgstr "/选项(_O)/字符编码(_e)/希腊 (ISO-8859-_7)"
-#: src/compose.c:750
-msgid "/_Options/Character _encoding/Arabic (Windows-1256)"
-msgstr "/选项(_O)/字符集(_e)/阿拉伯语 (Windows-1256)"
+#: src/compose.c:755
+msgid "/_Options/Character _encoding/Hebrew"
+msgstr "/选项(_O)/字符编码(_e)/希伯来语"
-#: src/compose.c:754
-msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
-msgstr "/选项(_O)/字符集(_e)/土耳其 (ISO-8859-_9)"
+#: src/compose.c:756
+msgid "/_Options/Character _encoding/Hebrew/ISO-8859-_8"
+msgstr "/选项(_O)/字符编码(_e)/希伯来语/ISO-8859-_8"
#: src/compose.c:758
-msgid "/_Options/Character _encoding/Cyrillic (ISO-8859-_5)"
-msgstr "/选项(_O)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
+msgid "/_Options/Character _encoding/Hebrew/Windows-1255"
+msgstr "/选项(_O)/字符编码(_e)/希伯来语/Windows-1255"
-#: src/compose.c:760
-msgid "/_Options/Character _encoding/Cyrillic (KOI8-_R)"
-msgstr "/选项(_O)/字符集(_e)/斯拉夫 (KOI8-_R)"
+#: src/compose.c:761
+msgid "/_Options/Character _encoding/Arabic"
+msgstr "/选项(_O)/字符编码(_e)/阿拉伯语"
#: src/compose.c:762
-msgid "/_Options/Character _encoding/Cyrillic (KOI8-U)"
-msgstr "/选项(_O)/字符集(_e)/斯拉夫(KOI8-U)"
+msgid "/_Options/Character _encoding/Arabic/ISO-8859-_6"
+msgstr "/选项(_O)/字符编码(_e)/阿拉伯语/ISO-8859-_6"
#: src/compose.c:764
-msgid "/_Options/Character _encoding/Cyrillic (Windows-1251)"
-msgstr "/选项(_O)/字符集(_e)/斯拉夫 (Windows-1251)"
+msgid "/_Options/Character _encoding/Arabic/Windows-1256"
+msgstr "/选项(_O)/字符编码(_e)/阿拉伯语/Windows-1256"
-#: src/compose.c:768
-msgid "/_Options/Character _encoding/Japanese (ISO-2022-_JP)"
-msgstr "/选项(_O)/字符集(_e)/日文 (ISO-2022-_JP)"
+#: src/compose.c:767
+msgid "/_Options/Character _encoding/Turkish (ISO-8859-_9)"
+msgstr "/选项(_O)/字符编码(_e)/土耳其/ISO-8859-_9"
-#: src/compose.c:772
-msgid "/_Options/Character _encoding/Simplified Chinese (_GB2312)"
-msgstr "/选项(_O)/字符集(_e)/简体中文 (_GB2312)"
+#: src/compose.c:770
+msgid "/_Options/Character _encoding/Cyrillic"
+msgstr "/选项(_O)/字符编码(_e)/斯拉夫"
-#: src/compose.c:774
-msgid "/_Options/Character _encoding/Simplified Chinese (GBK)"
-msgstr "/选项(_O)/字符集(_e)/简体中文 (GBK)"
+#: src/compose.c:771
+msgid "/_Options/Character _encoding/Cyrillic/ISO-8859-_5"
+msgstr "/选项(_O)/字符编码(_e)/斯拉夫/ISO-8859-_5"
-#: src/compose.c:776
-msgid "/_Options/Character _encoding/Traditional Chinese (_Big5)"
-msgstr "/选项(_O)/字符集(_e)/繁体中文 (_Big5)"
+#: src/compose.c:773
+msgid "/_Options/Character _encoding/Cyrillic/KOI8-_R"
+msgstr "/选项(_O)/字符编码(_e)/斯拉夫/KOI8-_R"
-#: src/compose.c:778
-msgid "/_Options/Character _encoding/Traditional Chinese (EUC-_TW)"
-msgstr "/选项(_O)/字符集(_e)/繁体中文 (EUC-_TW)"
+#: src/compose.c:775
+msgid "/_Options/Character _encoding/Cyrillic/KOI8-U"
+msgstr "/选项(_O)/字符编码(_e)/斯拉夫/KOI8-U"
-#: src/compose.c:782
-msgid "/_Options/Character _encoding/Korean (EUC-_KR)"
-msgstr "/选项(_O)/字符集(_e)/韩文 (EUC-_KR) "
+#: src/compose.c:777
+msgid "/_Options/Character _encoding/Cyrillic/Windows-1251"
+msgstr "/选项(_O)/字符编码(_e)/斯拉夫/Windows-1251"
-#: src/compose.c:786
-msgid "/_Options/Character _encoding/Thai (TIS-620)"
-msgstr "/选项(_O)/字符集(_e)/泰国 (TIS-620)"
+#: src/compose.c:780
+msgid "/_Options/Character _encoding/Japanese"
+msgstr "/选项(_O)/字符编码(_e)/日文"
-#: src/compose.c:788
-msgid "/_Options/Character _encoding/Thai (Windows-874)"
-msgstr "/选项(_O)/字符集(_e)/泰国 (Windows-874)"
+#: src/compose.c:781
+msgid "/_Options/Character _encoding/Japanese/ISO-2022-_JP"
+msgstr "/选项(_O)/字符编码(_e)/日文/ISO-2022-_JP"
-#: src/compose.c:792
-msgid "/_Tools/Show _ruler"
+#: src/compose.c:783
+msgid "/_Options/Character _encoding/Japanese/ISO-2022-JP-2"
+msgstr "/选项(_O)/字符编码(_e)/日文/ISO-2022-JP-2"
+
+#: src/compose.c:785
+msgid "/_Options/Character _encoding/Japanese/_EUC-JP"
+msgstr "/查看(_V)/字符编码(_e)/日文/_EUC-JP"
+
+#: src/compose.c:787
+msgid "/_Options/Character _encoding/Japanese/_Shift__JIS"
+msgstr "/查看(_V)/字符编码(_e)/日文/_Shift__JIS"
+
+#: src/compose.c:790
+msgid "/_Options/Character _encoding/Chinese"
+msgstr "/选项(_O)/字符编码(_e)/中文"
+
+#: src/compose.c:791
+msgid "/_Options/Character _encoding/Chinese/Simplified (_GB2312)"
+msgstr "/选项(_O)/字符编码(_e)/中文/简体中文 (_GB2312)"
+
+#: src/compose.c:793
+msgid "/_Options/Character _encoding/Chinese/Simplified (GBK)"
+msgstr "/选项(_O)/字符编码(_e)/中文/简体中文 (GBK)"
+
+#: src/compose.c:795
+msgid "/_Options/Character _encoding/Chinese/Traditional (_Big5)"
+msgstr "/选项(_O)/字符编码(_e)/中文/繁体中文 (_Big5)"
+
+#: src/compose.c:797
+msgid "/_Options/Character _encoding/Chinese/Traditional (EUC-_TW)"
+msgstr "/选项(_O)/字符编码(_e)/中文/繁体中文 (EUC-_TW)"
+
+#: src/compose.c:800
+msgid "/_Options/Character _encoding/Korean"
+msgstr "/选项(_O)/字符编码(_e)/韩文"
+
+#: src/compose.c:801
+msgid "/_Options/Character _encoding/Korean/EUC-_KR"
+msgstr "/选项(_O)/字符编码(_e)/韩文/EUC-_KR"
+
+#: src/compose.c:803
+msgid "/_Options/Character _encoding/Korean/ISO-2022-KR"
+msgstr "/查看(_V)/字符编码(_e)/韩文/ISO-2022-KR"
+
+#: src/compose.c:806
+msgid "/_Options/Character _encoding/Thai"
+msgstr "/选项(_O)/字符编码(_e)/泰文"
+
+#: src/compose.c:807
+msgid "/_Options/Character _encoding/Thai/TIS-620"
+msgstr "/选项(_O)/字符编码(_e)/泰文/TIS-620"
+
+#: src/compose.c:809
+msgid "/_Options/Character _encoding/Thai/Windows-874"
+msgstr "/选项(_O)/字符编码(_e)/泰文/Windows-874"
+
+#: src/compose.c:813
+msgid "/_Tools/Show _ruler"
msgstr "/工具(_T)/显示标尺(_r)"
-#: src/compose.c:793 src/messageview.c:307
+#: src/compose.c:814 src/messageview.c:395
msgid "/_Tools/_Address book"
msgstr "/工具(_T)/地址簿(_A)"
-#: src/compose.c:794
+#: src/compose.c:815
msgid "/_Tools/_Template"
msgstr "/工具(_T)/套用邮件模板(_T)"
-#: src/compose.c:795 src/mainwindow.c:840 src/messageview.c:334
+#: src/compose.c:816 src/mainwindow.c:890 src/messageview.c:422
msgid "/_Tools/Actio_ns"
msgstr "/工具(_T)/执行动作(_n)"
-#: src/compose.c:1050 src/prefs_compose_writing.c:369
+#: src/compose.c:1124 src/quote_fmt.c:421
msgid "New message subject format error."
msgstr "新邮件'主题'格式错误。"
-#: src/compose.c:1079 src/prefs_compose_writing.c:373
-msgid "New message body format error."
-msgstr "新邮件内容格式错误。"
+#: src/compose.c:1154 src/quote_fmt.c:424
+#, c-format
+msgid "New message body format error at line %d."
+msgstr "新邮件内容格式错误: 第%d行。"
+
+#: src/compose.c:1349
+msgid "Unable to reply. The original email probably doesn't exist."
+msgstr "无法回复。原始的email地址可能不存在。"
-#: src/compose.c:1441 src/prefs_quote.c:281
-msgid "Message reply format error."
-msgstr "邮件回复格式错误。"
+#: src/compose.c:1540 src/quote_fmt.c:440
+#, c-format
+msgid "Message reply format error at line %d."
+msgstr "邮件回复格式错误: 第%d行"
-#: src/compose.c:1558 src/prefs_quote.c:286
-msgid "Message forward format error."
-msgstr "邮件转发格式错误。"
+#: src/compose.c:1676 src/quote_fmt.c:457
+#, c-format
+msgid "Message forward format error at line %d."
+msgstr "邮件转发格式错误: 第%d行"
-#: src/compose.c:1678
+#: src/compose.c:1799
msgid "Fw: multiple emails"
msgstr "转发: 多封邮件"
-#: src/compose.c:2053
-msgid "Message redirect format error."
-msgstr "邮件重定向格式错误。"
+#: src/compose.c:2207
+#, c-format
+msgid "Message redirect format error at line %d."
+msgstr "邮件重定向格式错误: 第%d行"
+
+#: src/compose.c:2272 src/gtk/headers.h:13
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/compose.c:2275 src/gtk/headers.h:14
+msgid "Bcc:"
+msgstr "Bcc:"
-#: src/compose.c:2122
+#: src/compose.c:2278 src/gtk/headers.h:11
msgid "Reply-To:"
msgstr ""
-#: src/compose.c:2125 src/compose.c:5700 src/compose.c:6470 src/compose.c:9567
+#: src/compose.c:2281 src/gtk/headers.h:32
msgid "Newsgroups:"
msgstr "新闻组:"
-#: src/compose.c:2128
+#: src/compose.c:2284 src/gtk/headers.h:33
msgid "Followup-To:"
msgstr ""
-#: src/compose.c:2307
-#, c-format
-msgid "The file '%s' has been attached."
-msgstr "已经添加附件'%s'。"
+#: src/compose.c:2288 src/gtk/headers.h:12 src/summary_search.c:363
+msgid "To:"
+msgstr "To:"
-#: src/compose.c:2311
+#: src/compose.c:2479
msgid "Couldn't attach a file (charset conversion failed)."
msgstr "无法添加附件(转换字符集失败)。"
-#: src/compose.c:2542
+#: src/compose.c:2485
+#, c-format
+msgid ""
+"The following file has been attached: \n"
+"%s"
+msgid_plural ""
+"The following files have been attached: \n"
+"%s"
+msgstr[0] "已经添加下列文件为附件: \n"
+"%s"
+
+#: src/compose.c:2724
msgid "Quote mark format error."
msgstr "引文格式错误。"
-#: src/compose.c:3147
+#: src/compose.c:3338
#, c-format
msgid "File %s is empty."
msgstr "文件 %s 不存在。"
-#: src/compose.c:3151
+#: src/compose.c:3342
#, c-format
msgid "Can't read %s."
msgstr "无法读取 %s。"
-#: src/compose.c:3178
+#: src/compose.c:3369
#, c-format
msgid "Message: %s"
msgstr "邮件: %s"
-#: src/compose.c:4001
+#: src/compose.c:4279
msgid " [Edited]"
msgstr " [已修改] "
-#: src/compose.c:4007
+#: src/compose.c:4286
#, c-format
msgid "%s - Compose message%s"
msgstr "%s - 新邮件%s"
-#: src/compose.c:4010
+#: src/compose.c:4289
#, c-format
msgid "[no subject] - Compose message%s"
msgstr "[无主题] - 撰写新邮件%s"
-#: src/compose.c:4035 src/messageview.c:621
+#: src/compose.c:4291
+msgid "Compose message"
+msgstr "撰写新邮件"
+
+#: src/compose.c:4318 src/messageview.c:725
msgid ""
"Account for sending mail is not specified.\n"
"Please select a mail account before sending."
"你选用的帐号并非一个电子邮件帐号，可能是用来在新闻组上发表文章用的。\n"
"要发送邮件请选择一个电子邮件帐号。"
-#: src/compose.c:4228 src/compose.c:4259 src/compose.c:4291 src/toolbar.c:401
-#: src/toolbar.c:452
+#: src/compose.c:4512 src/compose.c:4544 src/compose.c:4586
+#: src/prefs_account.c:3011 src/toolbar.c:419 src/toolbar.c:436
msgid "Send"
msgstr "发送"
-#: src/compose.c:4229
+#: src/compose.c:4513
msgid "The only recipient is the default CC address. Send anyway?"
msgstr "缺省的抄送地址是仅有的收件人，要发送吗？"
-#: src/compose.c:4230 src/compose.c:4261 src/compose.c:4293 src/compose.c:4770
+#: src/compose.c:4514 src/compose.c:4546 src/compose.c:4579 src/compose.c:5087
msgid "+_Send"
msgstr "+ 发送(_S)"
-#: src/compose.c:4260
+#: src/compose.c:4545
msgid "The only recipient is the default BCC address. Send anyway?"
msgstr "缺省的密送地址是仅有的收件若，要发送吗？"
-#: src/compose.c:4277
+#: src/compose.c:4562
msgid "Recipient is not specified."
msgstr "没有指定收信人。"
-#: src/compose.c:4292
-msgid "Subject is empty. Send it anyway?"
-msgstr "没有标题。确定要发送？"
+#: src/compose.c:4581
+msgid "+_Queue"
+msgstr "+稍后发送(_Q)"
+
+#: src/compose.c:4582
+#, c-format
+msgid "Subject is empty. %s"
+msgstr "没有标题。%s"
+
+#: src/compose.c:4583
+msgid "Send it anyway?"
+msgstr "确定要发送？"
+
+#: src/compose.c:4584
+msgid "Queue it anyway?"
+msgstr "确定要加入队列？"
-#: src/compose.c:4339 src/compose.c:7971
+#: src/compose.c:4586 src/toolbar.c:437
+msgid "Send later"
+msgstr "稍后再送"
+
+#: src/compose.c:4634 src/compose.c:8540
msgid ""
"Could not queue message for sending:\n"
"\n"
"\n"
"转换字符集失败。"
-#: src/compose.c:4342 src/compose.c:7974
+#: src/compose.c:4637 src/compose.c:8543
msgid ""
"Could not queue message for sending:\n"
"\n"
"\n"
"无法获取收件人的加密密钥。"
-#: src/compose.c:4346 src/compose.c:7968
+#: src/compose.c:4643 src/compose.c:8537
#, c-format
msgid ""
"Could not queue message for sending:\n"
"\n"
"签名失败: %s"
-#: src/compose.c:4349
+#: src/compose.c:4646
#, c-format
msgid ""
"Could not queue message for sending:\n"
"\n"
"%s."
-#: src/compose.c:4351
+#: src/compose.c:4648
msgid "Could not queue message for sending."
msgstr "无法将邮件加入待发送队列"
-#: src/compose.c:4366 src/compose.c:4427
+#: src/compose.c:4663 src/compose.c:4723
msgid ""
"The message was queued but could not be sent.\n"
"Use \"Send queued messages\" from the main window to retry."
"邮件已加入发送队列，但无法发送出去。\n"
"请使用主窗口 \"送出待发送邮件\" 再试一次。"
-#: src/compose.c:4421
+#: src/compose.c:4719
#, c-format
msgid ""
"%s\n"
"%s\n"
"请使用主窗口 \"送出待发送邮件\" 再试一次。"
-#: src/compose.c:4767
+#: src/compose.c:5084
#, c-format
msgid ""
"Can't convert the character encoding of the message \n"
"无法将邮件的字符编码转换为 %s 。\n"
"以 %s 发送吗？"
-#: src/compose.c:4826
+#: src/compose.c:5143
#, c-format
msgid ""
"Line %d exceeds the line length limit (998 bytes).\n"
"\n"
"确实要发送吗?"
-#: src/compose.c:5014
+#: src/compose.c:5304
+msgid "Encryption warning"
+msgstr "加密告警"
+
+#: src/compose.c:5305
+msgid "+C_ontinue"
+msgstr "+继续编辑(_o)"
+
+#: src/compose.c:5360
msgid "No account for sending mails available!"
msgstr "没有发信所需的帐号！"
-#: src/compose.c:5024
+#: src/compose.c:5370
msgid "No account for posting news available!"
msgstr "没有张贴news所需的帐号！"
-#: src/compose.c:5717
+#: src/compose.c:6062
+msgid "Add to address _book"
+msgstr "添加到地址簿(_b)"
+
+#: src/compose.c:6136
msgid "Use <tab> to autocomplete from addressbook"
msgstr "可以使用<tab>键自动完成地址"
-#: src/compose.c:5845
+#: src/compose.c:6284
msgid "Mime type"
msgstr "MIME 类型"
-#: src/compose.c:5851 src/compose.c:6147 src/mimeview.c:212
-#: src/plugins/pgpcore/select-keys.c:402 src/prefs_summary_column.c:86
-#: src/summaryview.c:490
+#: src/compose.c:6290 src/compose.c:6593 src/mimeview.c:253
+#: src/plugins/pgpcore/select-keys.c:405 src/prefs_matcher.c:587
+#: src/prefs_summary_column.c:88 src/summaryview.c:550
msgid "Size"
msgstr "大小"
-#: src/compose.c:5912
+#: src/compose.c:6360
msgid "Save Message to "
msgstr "将邮件保存至"
-#: src/compose.c:5934 src/editjpilot.c:289 src/editldap.c:526
-#: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:242
-#: src/importpine.c:242 src/plugins/bogofilter/bogofilter_gtk.c:190
-#: src/plugins/bogofilter/bogofilter_gtk.c:212
-#: src/plugins/clamav/clamav_plugin_gtk.c:146
-#: src/plugins/spamassassin/spamassassin_gtk.c:383 src/prefs_spelling.c:207
+#: src/compose.c:6382 src/editjpilot.c:289 src/editldap.c:536
+#: src/editvcard.c:202 src/export.c:172 src/import.c:171 src/importmutt.c:244
+#: src/importpine.c:243 src/plugins/bogofilter/bogofilter_gtk.c:188
+#: src/plugins/bogofilter/bogofilter_gtk.c:210
+#: src/plugins/spamassassin/spamassassin_gtk.c:423 src/prefs_spelling.c:198
msgid "_Browse"
msgstr "浏览(_B)"
-#: src/compose.c:6146 src/compose.c:7378
+#: src/compose.c:6592 src/compose.c:7947
msgid "MIME type"
msgstr "MIME 类型"
-#: src/compose.c:6218
+#: src/compose.c:6672
msgid "Hea_der"
msgstr "邮件头(_d)"
-#: src/compose.c:6222
+#: src/compose.c:6677
msgid "_Attachments"
msgstr "附件(_A)"
-#: src/compose.c:6226
+#: src/compose.c:6691
msgid "Othe_rs"
msgstr "其他(_r)"
-#: src/compose.c:6241 src/summary_search.c:366
+#: src/compose.c:6706 src/gtk/headers.h:18 src/summary_search.c:370
msgid "Subject:"
msgstr "主题:"
-#: src/compose.c:6432
+#: src/compose.c:6915
#, c-format
msgid ""
"Spell checker could not be started.\n"
"无法启动拼写检查器.\n"
"%s"
-#: src/compose.c:6544
+#: src/compose.c:7033
#, c-format
msgid "From: <i>%s</i>"
msgstr "发信人: <i>%s</i>"
-#: src/compose.c:6575
+#: src/compose.c:7067
msgid "Account to use for this email"
msgstr "用于此邮件的帐号"
-#: src/compose.c:6577
+#: src/compose.c:7069
msgid "Sender address to be used"
msgstr "想要使用的发送邮件地址"
-#: src/compose.c:6738
+#: src/compose.c:7228
#, c-format
msgid ""
"The privacy system '%s' cannot be loaded. You will not be able to sign or "
"encrypt this message."
msgstr "无法加载隐私系统`%s'，签名和邮件加密功能将不可用。"
-#: src/compose.c:6900 src/prefs_template.c:549
-msgid "Template body format error."
-msgstr "模板内容格式错误。"
+#: src/compose.c:7426 src/prefs_template.c:663
+#, c-format
+msgid "Template body format error at line %d."
+msgstr "模板内容格式错误: 第%d行。"
-#: src/compose.c:7008 src/prefs_template.c:587
+#: src/compose.c:7537 src/prefs_template.c:702
msgid "Template To format error."
msgstr "模板中'收件人'格式错误。"
-#: src/compose.c:7021 src/prefs_template.c:592
+#: src/compose.c:7555 src/prefs_template.c:708
msgid "Template Cc format error."
msgstr "模板中'抄送'格式错误。"
-#: src/compose.c:7034 src/prefs_template.c:597
+#: src/compose.c:7573 src/prefs_template.c:714
msgid "Template Bcc format error."
msgstr "模板中'密送'格式错误。"
-#: src/compose.c:7048 src/prefs_template.c:602
+#: src/compose.c:7592 src/prefs_template.c:720
msgid "Template subject format error."
msgstr "模板中'主题'格式错误。"
-#: src/compose.c:7272
+#: src/compose.c:7841
msgid "Invalid MIME type."
msgstr "不正确的MIME类型。"
-#: src/compose.c:7287
+#: src/compose.c:7856
msgid "File doesn't exist or is empty."
msgstr "文件是空的或不存在。"
-#: src/compose.c:7360
+#: src/compose.c:7929
msgid "Properties"
msgstr "属性"
-#: src/compose.c:7411
+#: src/compose.c:7980
msgid "Encoding"
msgstr "编码"
-#: src/compose.c:7431
+#: src/compose.c:8000
msgid "Path"
msgstr "路径"
-#: src/compose.c:7432 src/prefs_toolbar.c:1060
+#: src/compose.c:8001
msgid "File name"
msgstr "文件名"
-#: src/compose.c:7615
+#: src/compose.c:8184
#, c-format
msgid ""
"The external editor is still working.\n"
"强制关闭该进程吗？\n"
"进程祖id: %d"
-#: src/compose.c:7657
+#: src/compose.c:8226
msgid "Compose: input from monitoring process\n"
msgstr "撰写: 从被监视的进程中输入\n"
-#: src/compose.c:7938 src/messageview.c:726
+#: src/compose.c:8507 src/messageview.c:956
msgid "Claws Mail needs network access in order to send this email."
msgstr "Claws Mail需要访问网络才能发送这封邮件。"
-#: src/compose.c:7963
+#: src/compose.c:8532
msgid "Could not queue message."
msgstr "无法将邮件加入待发送队列。"
-#: src/compose.c:7965
+#: src/compose.c:8534
#, c-format
msgid ""
"Could not queue message:\n"
"\n"
"%s."
-#: src/compose.c:8138
+#: src/compose.c:8694
msgid "Could not save draft."
msgstr "无法保存草稿。"
-#: src/compose.c:8216 src/compose.c:8239
+#: src/compose.c:8698
+msgid "Could not save draft"
+msgstr "无法保存草稿。"
+
+#: src/compose.c:8699
+msgid ""
+"Could not save draft.\n"
+"Do you want to cancel exit or discard this email?"
+msgstr ""
+"无法保存草稿。\n"
+"请问是取消退出还是摒弃这封邮件？"
+
+#: src/compose.c:8701
+msgid "_Cancel exit"
+msgstr "取消退出(_C)"
+
+#: src/compose.c:8701
+msgid "_Discard email"
+msgstr "摈弃邮件(_D)"
+
+#: src/compose.c:8855 src/compose.c:8869
msgid "Select file"
msgstr "选择文件"
-#: src/compose.c:8252
+#: src/compose.c:8882
#, c-format
msgid "File '%s' could not be read."
msgstr "无法读取文件 '%s'。"
-#: src/compose.c:8254
+#: src/compose.c:8884
#, c-format
msgid ""
"File '%s' contained invalid characters\n"
"文件 '%s' 包含有不属于当前编码集的无效字符,\n"
"插入部分可能不正确."
-#: src/compose.c:8302
+#: src/compose.c:8937
msgid "Discard message"
msgstr "摈弃讯息"
-#: src/compose.c:8303
+#: src/compose.c:8938
msgid "This message has been modified. Discard it?"
msgstr "这封邮件已被更改，是否摈弃？"
-#: src/compose.c:8304
+#: src/compose.c:8939
msgid "_Discard"
msgstr "摈弃(_D)"
-#: src/compose.c:8304
+#: src/compose.c:8939
msgid "_Save to Drafts"
msgstr "存为草稿(_S)"
-#: src/compose.c:8348
+#: src/compose.c:8983
#, c-format
msgid "Do you want to apply the template '%s' ?"
msgstr "是否应用模板'%s'?"
-#: src/compose.c:8350
+#: src/compose.c:8985
msgid "Apply template"
msgstr "使用模板"
-#: src/compose.c:8351
+#: src/compose.c:8986
msgid "_Replace"
msgstr "替换(_R)"
-#: src/compose.c:8351
+#: src/compose.c:8986
msgid "_Insert"
msgstr "插入(_I)"
-#: src/compose.c:9042
+#: src/compose.c:9750
msgid "Insert or attach?"
msgstr "插入其内容还是添加附件?"
-#: src/compose.c:9043
+#: src/compose.c:9751
msgid ""
"Do you want to insert the contents of the file(s) into the message body, or "
"attach it to the email?"
msgstr "请问是将文件的内容插入到邮件中，还是添加为附件？"
-#: src/compose.c:9045
+#: src/compose.c:9753
msgid "+_Insert"
msgstr "+插入(_I)"
-#: src/compose.c:9045
+#: src/compose.c:9753
msgid "_Attach"
msgstr "附加文件(_A)"
-#: src/compose.c:9244
-msgid "Quote format error."
-msgstr "引文格式错误。"
+#: src/compose.c:9955
+#, c-format
+msgid "Quote format error at line %d."
+msgstr "引文格式错误: 第%d行"
-#: src/compose.c:9463
+#: src/compose.c:10186
#, c-format
msgid ""
"You are about to reply to %d messages. Opening the windows could take some "
msgid "Debug log"
msgstr "调试日志"
-#: src/crash.c:251
+#: src/crash.c:251 src/toolbar.c:435
msgid "Close"
msgstr "关闭"
msgid "Create bug report"
msgstr "创建BUG报告"
-#: src/crash.c:308
+#: src/crash.c:309
msgid "Save crash information"
msgstr "保存崩溃的信息"
-#: src/editaddress.c:185
+#: src/editaddress.c:159 src/editaddress.c:235
msgid "Add New Person"
msgstr "加入新的用户"
-#: src/editaddress.c:186
+#: src/editaddress.c:161
+msgid ""
+"Adding a new person requires at least one of the\n"
+"following values to be set:\n"
+" - Display Name\n"
+" - First Name\n"
+" - Last Name\n"
+" - Nickname\n"
+" - any email address\n"
+" - any additional attribute\n"
+"\n"
+"Click OK to keep editing this contact.\n"
+"Click Cancel to close without saving."
+msgstr ""
+"添加一个新的联系人需要至少设置如下数据中的一项:\n"
+" - 显示名\n"
+" - 姓\n"
+" - 名\n"
+" - 昵称\n"
+" - 任何email地址\n"
+" - 任何地址属性\n"
+"\n"
+"点击[确定]以继续编辑此项联系人。\n"
+"点击[取消]关闭窗口(不保存)。"
+
+#: src/editaddress.c:172
+msgid ""
+"Adding a new person requires at least one of the\n"
+"following values to be set:\n"
+" - First Name\n"
+" - Last Name\n"
+" - any email address\n"
+" - any additional attribute\n"
+"\n"
+"Click OK to keep editing this contact.\n"
+"Click Cancel to close without saving."
+msgstr ""
+"添加一个新的联系人需要至少设置如下数据中的一项:\n"
+" - 姓\n"
+" - 名\n"
+" - 任何email地址\n"
+" - 任何地址属性\n"
+"\n"
+"点击[确定]以继续编辑此项联系人。\n"
+"点击[取消]关闭窗口(不保存)。"
+
+#: src/editaddress.c:236
msgid "Edit Person Details"
msgstr "编辑个人的详细资料"
-#: src/editaddress.c:357
+#: src/editaddress.c:414
msgid "An Email address must be supplied."
msgstr "请务必提供一个电子邮件地址。"
-#: src/editaddress.c:531
+#: src/editaddress.c:590
msgid "A Name and Value must be supplied."
msgstr "请务必提供名称和值。"
-#: src/editaddress.c:620
+#: src/editaddress.c:679
msgid "Discard"
msgstr "摈弃"
-#: src/editaddress.c:621
+#: src/editaddress.c:680
msgid "Apply"
msgstr "应用"
-#: src/editaddress.c:651 src/editaddress.c:700
+#: src/editaddress.c:710 src/editaddress.c:759
msgid "Edit Person Data"
msgstr "编辑个人资料"
-#: src/editaddress.c:761 src/expldifdlg.c:508 src/exporthtml.c:752
-#: src/ldif.c:763
+#: src/editaddress.c:788
+msgid "Choose a picture"
+msgstr "选择一个图片文件"
+
+#: src/editaddress.c:807
+#, c-format
+msgid ""
+"Failed to import image: \n"
+"%s"
+msgstr ""
+"导入图片失败: \n"
+"%s"
+
+#: src/editaddress.c:849
+msgid "/_Set picture"
+msgstr "/设置图片(_P)"
+
+#: src/editaddress.c:850
+msgid "/_Unset picture"
+msgstr "/清除图片(_U)"
+
+#: src/editaddress.c:905
+msgid "Photo"
+msgstr "图片"
+
+#: src/editaddress.c:959 src/editaddress.c:961 src/expldifdlg.c:524
+#: src/exporthtml.c:756 src/ldif.c:765
msgid "Display Name"
msgstr "用户名称"
-#: src/editaddress.c:767 src/editaddress.c:771 src/ldif.c:771
+#: src/editaddress.c:968 src/editaddress.c:972 src/ldif.c:773
msgid "Last Name"
msgstr "姓"
-#: src/editaddress.c:768 src/editaddress.c:770 src/ldif.c:767
+#: src/editaddress.c:969 src/editaddress.c:971 src/ldif.c:769
msgid "First Name"
msgstr "名"
-#: src/editaddress.c:773
+#: src/editaddress.c:975 src/editaddress.c:977
msgid "Nickname"
msgstr "绰号"
-#: src/editaddress.c:850 src/editaddress.c:906
+#: src/editaddress.c:1061 src/editaddress.c:1129
msgid "Alias"
msgstr "别名"
-#: src/editaddress.c:1044 src/editaddress.c:1101 src/prefs_customheader.c:222
-#: src/prefs_matcher.c:532
+#: src/editaddress.c:1271 src/editaddress.c:1336 src/editaddress.c:1352
+#: src/prefs_customheader.c:220
msgid "Value"
msgstr "值"
-#: src/editaddress.c:1163
+#: src/editaddress.c:1419
msgid "_User Data"
msgstr "用户数据(_U)"
-#: src/editaddress.c:1164
+#: src/editaddress.c:1420
msgid "_Email Addresses"
msgstr "电子邮件帐号(_E)"
-#: src/editaddress.c:1165
+#: src/editaddress.c:1423 src/editaddress.c:1426
msgid "O_ther Attributes"
msgstr "其他属性(_t)"
#: src/editbook.c:113
-msgid "File appears to be Ok."
-msgstr "æ\96\87件似ä¹\8eæ£å¸¸。"
+msgid "File appears to be OK."
+msgstr "æ\96\87件似ä¹\8e没æ\9c\89é\97®é¢\98。"
#: src/editbook.c:116
msgid "File does not appear to be a valid address book format."
msgstr "检查文件"
#: src/editbook.c:187 src/editjpilot.c:282 src/editvcard.c:195
-#: src/importmutt.c:235 src/importpine.c:235 src/prefs_account.c:1953
+#: src/importmutt.c:237 src/importpine.c:236 src/prefs_account.c:1853
msgid "File"
msgstr "文件"
msgid "Edit Group Data"
msgstr "编辑群组资料"
-#: src/editgroup.c:323 src/exporthtml.c:588
+#: src/editgroup.c:323 src/exporthtml.c:592
msgid "Group Name"
msgstr "群组名称"
#: src/editgroup.c:546
msgid "Edit folder"
-msgstr "增加新的文件夹"
+msgstr "增加新的目录"
#: src/editgroup.c:546
msgid "Input the new name of folder:"
-msgstr "请输入文件夹的新名字:"
+msgstr "请输入目录的新名字:"
-#: src/editgroup.c:549 src/foldersel.c:539 src/imap_gtk.c:154 src/mh_gtk.c:130
+#: src/editgroup.c:549 src/foldersel.c:539 src/imap_gtk.c:155 src/mh_gtk.c:130
msgid "New folder"
-msgstr "新文件夹"
+msgstr "新目录"
#: src/editgroup.c:550 src/foldersel.c:540 src/mh_gtk.c:131
msgid "Input the name of new folder:"
-msgstr "请输入文件夹的新名字:"
+msgstr "请输入目录的新名字:"
#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgid "Edit LDAP - Select Search Base"
msgstr "编辑LDAP - 选择搜寻资料库"
-#: src/editldap_basedn.c:163 src/editldap.c:439
+#: src/editldap_basedn.c:163 src/editldap.c:449
msgid "Hostname"
msgstr "主机名"
-#: src/editldap_basedn.c:173 src/editldap.c:458 src/ssl_manager.c:110
+#: src/editldap_basedn.c:173 src/editldap.c:468 src/ssl_manager.c:110
msgid "Port"
msgstr "端口"
-#: src/editldap_basedn.c:183 src/editldap.c:508
+#: src/editldap_basedn.c:183 src/editldap.c:518
msgid "Search Base"
msgstr "搜寻Base"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "无法从服务器中读取搜查资料库 - 请手动设置"
-#: src/editldap_basedn.c:298 src/editldap.c:278
+#: src/editldap_basedn.c:298 src/editldap.c:285
msgid "Could not connect to server"
msgstr "无法连接服务器"
-#: src/editldap.c:153
+#: src/editldap.c:156
msgid "A Name must be supplied."
msgstr "请务必提供一个名字。"
-#: src/editldap.c:165
+#: src/editldap.c:168
msgid "A Hostname must be supplied for the server."
msgstr "请提供服务器的网域名称。"
-#: src/editldap.c:178
+#: src/editldap.c:181
msgid "At least one LDAP search attribute should be supplied."
msgstr "请提供起码一项LDAP搜寻条目。"
-#: src/editldap.c:275
+#: src/editldap.c:282
msgid "Connected successfully to server"
msgstr "成功连接服务器"
-#: src/editldap.c:331 src/editldap.c:999
+#: src/editldap.c:340 src/editldap.c:1013
msgid "Edit LDAP Server"
msgstr "编辑LDAP服务器"
-#: src/editldap.c:434
+#: src/editldap.c:444
msgid "A name that you wish to call the server."
msgstr "你对服务器想给的称呼。"
-#: src/editldap.c:449
+#: src/editldap.c:459
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 "
"LDAP服务器名称。也可以填入IP地址。如果LDAP服务与Claws Mail在同一台机器上运"
"行，则可以填入\"localhost\"。"
-#: src/editldap.c:470
+#: src/editldap.c:480
msgid "TLS"
msgstr ""
-#: src/editldap.c:471
+#: src/editldap.c:481 src/prefs_account.c:3084
msgid "SSL"
msgstr "SSL"
-#: src/editldap.c:475
+#: src/editldap.c:485
msgid ""
"Enable secure connection to the LDAP server via TLS.If connection fails, be "
"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
"采用TLS方式安全连接到LDAP服务器。如果连接失败，请检查配置文件ldap.conf中的"
"TLS_CACERTDIR和TLS_REQCERT两项设置。"
-#: src/editldap.c:480
+#: src/editldap.c:490
msgid ""
"Enable secure connection to the LDAP server via SSL.If connection fails, be "
"sure to check the correct configuration in ldap.conf (TLS_CACERTDIR and "
"采用TLS方式安全连接到LDAP服务器。如果连接失败，请检查配置文件ldap.conf中的"
"TLS_CACERTDIR和TLS_REQCERT两项设置。"
-#: src/editldap.c:494
+#: src/editldap.c:504
msgid "The port number that the server listens on. Port 389 is the default."
msgstr "服务器监听的端口号。缺省端口号为389。"
-#: src/editldap.c:498
+#: src/editldap.c:508
msgid " Check Server "
msgstr "检查服务器"
-#: src/editldap.c:503
+#: src/editldap.c:513
msgid "Press this button to test the connection to the server."
msgstr "点击此按钮测试到服务器的连接。"
-#: src/editldap.c:518
+#: src/editldap.c:528
msgid ""
"This specifies the name of the directory to be searched on the server. "
"Examples include:\n"
" ou=people,dc=domainname,dc=com\n"
" o=Organization Name,c=Country\n"
-#: src/editldap.c:531
+#: src/editldap.c:541
msgid ""
"Press this button to lookup the name of available directory names on the "
"server."
msgstr "点击此按钮检索服务器上可访问的目录名称。"
-#: src/editldap.c:589
+#: src/editldap.c:599
msgid "Search Attributes"
msgstr "搜索属性"
-#: src/editldap.c:599
+#: src/editldap.c:609
msgid ""
"A list of LDAP attribute names that should be searched when attempting to "
"find a name or address."
msgstr "为查找名称和地址需要搜索的LDAP属性名称列表。"
-#: src/editldap.c:603
+#: src/editldap.c:613
msgid " Defaults "
msgstr " 缺省值 "
-#: src/editldap.c:608
+#: src/editldap.c:618
msgid ""
"This resets the attribute names to a default value that should find most "
"names and addresses during a name or address search process."
msgstr "重置属性名称。缺省值能够在搜索中发现绝大多数名称和地址。"
-#: src/editldap.c:615
+#: src/editldap.c:625
msgid "Max Query Age (secs)"
msgstr "询问时间上限(秒)"
-#: src/editldap.c:631
+#: src/editldap.c:641
msgid ""
"This defines the maximum period of time (in seconds) that an address search "
"result is valid for address completion purposes. Search results are stored "
"足够的。如果采用更大的值，将可以进一步减少后面查询所需要的时间。虽然要多消耗"
"一点内存来保存结果，但这在服务器响应较慢的情况下是非常有用的。"
-#: src/editldap.c:649
+#: src/editldap.c:659
msgid "Include server in dynamic search"
msgstr "将服务器包含在动态搜寻中"
-#: src/editldap.c:655
+#: src/editldap.c:665
msgid ""
"Check this option to include this server for dynamic searches when using "
"address completion."
msgstr "要在自动完成地址时动态搜索服务器，请选中此选项。"
-#: src/editldap.c:662
+#: src/editldap.c:672
msgid "Match names 'containing' search term"
msgstr "匹配项'包含'指定词语"
-#: src/editldap.c:668
+#: src/editldap.c:678
msgid ""
"Searches for names and addresses can be performed either using \"begins-with"
"\" or \"contains\" search term. Check this option to perform a \"contains\" "
"行\"contains\"搜索，这种方式将会多耗一点时间。注意: 为了性能方面的考虑, 同其"
"他数据不一样的是，对地址的自动完成将采用\"begins-with\"方式。"
-#: src/editldap.c:723
+#: src/editldap.c:733
msgid "Bind DN"
msgstr "绑定 DN"
-#: src/editldap.c:733
+#: src/editldap.c:743
msgid ""
"The LDAP user account name to be used to connect to the server. This is "
"usually only used for protected servers. This name is typically formatted "
"用于连接LDAP服务器的用户名。这通常只在带有保护的服务器上使用。这个值的形式通"
"常是这样: \"cn=user,dc=claws-mail,dc=com\"。只用于搜索时这项通常为空。"
-#: src/editldap.c:741
+#: src/editldap.c:751
msgid "Bind Password"
msgstr "绑定密码"
-#: src/editldap.c:752
+#: src/editldap.c:766
msgid "The password to be used when connecting as the \"Bind DN\" user."
msgstr "用\"Bind DN\"用户连接时的密码。"
-#: src/editldap.c:758
+#: src/editldap.c:772
msgid "Timeout (secs)"
msgstr "超时(秒)"
-#: src/editldap.c:773
+#: src/editldap.c:787
msgid "The timeout period in seconds."
msgstr "超时时间，单位为秒。"
-#: src/editldap.c:777
+#: src/editldap.c:791
msgid "Maximum Entries"
msgstr "条目上限"
-#: src/editldap.c:792
+#: src/editldap.c:806
msgid ""
"The maximum number of entries that should be returned in the search result."
msgstr "搜索时返回结果的最大条目数"
-#: src/editldap.c:808
+#: src/editldap.c:822 src/prefs_account.c:2975
msgid "Basic"
msgstr "基本设置"
-#: src/editldap.c:809
+#: src/editldap.c:823
msgid "Search"
msgstr "搜寻"
-#: src/editldap.c:810 src/gtk/quicksearch.c:492
+#: src/editldap.c:824 src/gtk/quicksearch.c:590
msgid "Extended"
msgstr "扩展"
-#: src/editldap.c:1004
+#: src/editldap.c:1018
msgid "Add New LDAP Server"
msgstr "增加新的LDAP服务器"
+#: src/edittags.c:186 src/matcher.c:915 src/prefs_filtering_action.c:1369
+msgid "Tag"
+msgstr "标签"
+
+#: src/edittags.c:215
+msgid "Delete tag"
+msgstr "删除标签"
+
+#: src/edittags.c:216
+msgid "Do you really want to delete this tag?"
+msgstr "确定删除这个标签吗？"
+
+#: src/edittags.c:243
+msgid "Delete all tags"
+msgstr "删除所有标签"
+
+#: src/edittags.c:244
+msgid "Do you really want to delete all tags?"
+msgstr "确定删除所有标签吗？"
+
+#: src/edittags.c:447
+msgid "Tag is not set."
+msgstr "标签尚未设置。"
+
+#: src/edittags.c:512
+msgid "Dialog title|Apply tags"
+msgstr "应用标签"
+
+#: src/edittags.c:526
+msgid "New tag:"
+msgstr "新标签:"
+
+#: src/edittags.c:559
+msgid "Please select tags to apply/remove. Changes are immediate."
+msgstr "请选择要添加或者删除的标签（变化会立即生效）。"
+
#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "文件不是vCard格式。"
msgid "Select stylesheet and formatting."
msgstr "选择形式及格式。"
-#: src/exphtmldlg.c:116 src/expldifdlg.c:117
+#: src/exphtmldlg.c:116 src/expldifdlg.c:118
msgid "File exported successfully."
msgstr "文件已成功导出。"
"HTML输出目录 '%s'\n"
"并不存在。创建新目录？"
-#: src/exphtmldlg.c:184 src/expldifdlg.c:193
+#: src/exphtmldlg.c:184 src/expldifdlg.c:194
msgid "Create Directory"
msgstr "创建目录"
"无法为HTML文件创建输出目录:\n"
"%s"
-#: src/exphtmldlg.c:195 src/expldifdlg.c:204
+#: src/exphtmldlg.c:195 src/expldifdlg.c:205
msgid "Failed to Create Directory"
msgstr "创建目录失败"
msgid "HTML Output File"
msgstr "HTML输出文件"
-#: src/exphtmldlg.c:396 src/expldifdlg.c:415 src/export.c:179 src/import.c:178
-#: src/importldif.c:682
+#: src/exphtmldlg.c:396 src/expldifdlg.c:413 src/export.c:179 src/import.c:178
+#: src/importldif.c:691
msgid "B_rowse"
msgstr "棕色(_r)"
msgid "Stylesheet"
msgstr "样式表"
-#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:345 src/gtk/gtkaspell.c:1661
-#: src/gtk/gtkaspell.c:2394 src/mainwindow.c:1012 src/prefs_account.c:705
-#: src/summaryview.c:5039
+#: src/exphtmldlg.c:457 src/gtk/colorlabel.c:380 src/gtk/gtkaspell.c:1667
+#: src/gtk/gtkaspell.c:2377 src/mainwindow.c:1177 src/prefs_account.c:866
+#: src/prefs_toolbar.c:701 src/prefs_toolbar.c:1180 src/summaryview.c:5505
msgid "None"
msgstr "无"
-#: src/exphtmldlg.c:458 src/prefs_other.c:113 src/prefs_other.c:454
+#: src/exphtmldlg.c:458 src/prefs_other.c:111 src/prefs_other.c:451
msgid "Default"
msgstr "缺省"
-#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:144
+#: src/exphtmldlg.c:459 src/plugins/pgpcore/sgpgme.c:148
msgid "Full"
msgstr "完整"
msgid "Format User Attributes"
msgstr "将用户属性数据格式化"
-#: src/exphtmldlg.c:553 src/expldifdlg.c:636 src/importldif.c:919
+#: src/exphtmldlg.c:553 src/expldifdlg.c:639 src/importldif.c:919
msgid "File Name :"
msgstr "文件名:"
msgid "Export Address Book to HTML File"
msgstr "将地址簿输出成HTML文件"
-#: src/exphtmldlg.c:661 src/expldifdlg.c:735 src/importldif.c:1027
+#: src/exphtmldlg.c:661 src/expldifdlg.c:738 src/importldif.c:1039
msgid "File Info"
msgstr "文件内容"
msgid "Format"
msgstr "格式"
-#: src/expldifdlg.c:111
+#: src/expldifdlg.c:112
msgid "Please specify output directory and LDIF filename to create."
-msgstr "请指明所要创建的文件夹和LDIF文件名。"
+msgstr "请指明所要创建的目录和LDIF文件名。"
-#: src/expldifdlg.c:114
+#: src/expldifdlg.c:115
msgid "Specify parameters to format distinguished name."
msgstr "指定创建唯一名称(DN)的参数。"
-#: src/expldifdlg.c:190
+#: src/expldifdlg.c:191
#, c-format
msgid ""
"LDIF Output Directory '%s'\n"
"LDIF输出目录 '%s'\n"
"并不存在。是否创建新的目录？"
-#: src/expldifdlg.c:202
+#: src/expldifdlg.c:203
#, c-format
msgid ""
"Could not create output directory for LDIF file:\n"
"无法为LDIF文件创建输出目录:\n"
"%s"
-#: src/expldifdlg.c:247
+#: src/expldifdlg.c:245
msgid "Suffix was not supplied"
msgstr "未指定后缀"
-#: src/expldifdlg.c:249
+#: src/expldifdlg.c:247
msgid ""
"A suffix is required if data is to be used for an LDAP server. Are you sure "
"you wish to proceed without a suffix?"
msgstr ""
"如果数据要用于LDAP服务器的话，后缀是必须的。你确定不用指定后缀就继续么？"
-#: src/expldifdlg.c:267
+#: src/expldifdlg.c:265
msgid "Error creating LDIF file"
msgstr "创建LDIF文件出错"
-#: src/expldifdlg.c:342
+#: src/expldifdlg.c:340
msgid "Select LDIF output file"
msgstr "选择LDIF输出文件"
-#: src/expldifdlg.c:406
+#: src/expldifdlg.c:404
msgid "LDIF Output File"
msgstr "LDIF输出文件"
-#: src/expldifdlg.c:467
-msgid "Suffix"
-msgstr "后缀"
-
-#: src/expldifdlg.c:479
-msgid ""
-"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
-"entry. Examples include:\n"
-" dc=claws-mail,dc=org\n"
-" ou=people,dc=domainname,dc=com\n"
-" o=Organization Name,c=Country\n"
-msgstr ""
-"此后缀用于为LDAP条目创建唯一标识\"Distinguished Name\" (简称 DN)。示例: \n"
-" dc=claws-mail,dc=org\n"
-" ou=people,dc=domainname,dc=com\n"
-" o=Organization Name,c=Country\n"
-
-#: src/expldifdlg.c:488
-msgid "Relative DN"
-msgstr "相对唯一标识"
-
-#: src/expldifdlg.c:495
-msgid "Unique ID"
-msgstr "唯一ID"
-
-#: src/expldifdlg.c:503
+#: src/expldifdlg.c:435
msgid ""
"The address book Unique ID is used to create a DN that is formatted similar "
"to:\n"
"用地址簿里面的唯一ID生成DN数据，结果格式如下:\n"
" uid=102376,ou=people,dc=claws-mail,dc=org"
-#: src/expldifdlg.c:516
+#: src/expldifdlg.c:441
msgid ""
"The address book Display Name is used to create a DN that is formatted "
"similar to:\n"
"用地址簿里面的显示名生成DN数据，结果格式如下:\n"
" cn=John Doe,ou=people,dc=claws-mail,dc=org"
-#: src/expldifdlg.c:529
+#: src/expldifdlg.c:447
msgid ""
"The first Email Address belonging to a person is used to create a DN that is "
"formatted similar to:\n"
"用该人所拥有的第一个邮件地址生成DN数据，结果格式如下:\n"
" mail=john.doe@domain.com,ou=people,dc=claws-mail,dc=org"
-#: src/expldifdlg.c:543
+#: src/expldifdlg.c:494
+msgid "Suffix"
+msgstr "后缀"
+
+#: src/expldifdlg.c:506
+msgid ""
+"The suffix is used to create a \"Distinguished Name\" (or DN) for an LDAP "
+"entry. Examples include:\n"
+" dc=claws-mail,dc=org\n"
+" ou=people,dc=domainname,dc=com\n"
+" o=Organization Name,c=Country\n"
+msgstr ""
+"此后缀用于为LDAP条目创建唯一标识\"Distinguished Name\" (简称 DN)。示例: \n"
+" dc=claws-mail,dc=org\n"
+" ou=people,dc=domainname,dc=com\n"
+" o=Organization Name,c=Country\n"
+
+#: src/expldifdlg.c:515
+msgid "Relative DN"
+msgstr "相对唯一标识"
+
+#: src/expldifdlg.c:523
+msgid "Unique ID"
+msgstr "唯一ID"
+
+#: src/expldifdlg.c:533
msgid ""
"The LDIF file contains several data records that are usually loaded into an "
"LDAP server. Each data record in the LDIF file is uniquely identified by a "
"Distinguished Name\" (简称 RDN) 后面添加后缀来创建DN唯一标识。请在可行的RDN选"
"项中选择一个用于创建DN唯一表示。"
-#: src/expldifdlg.c:556
+#: src/expldifdlg.c:554
msgid "Use DN attribute if present in data"
msgstr "使用数据中已有的DN属性"
-#: src/expldifdlg.c:563
+#: src/expldifdlg.c:561
msgid ""
"The addressbook may contain entries that were previously imported from an "
"LDIF file. The \"Distinguished Name\" (DN) user attribute, if present in the "
"\"Distinguished Name\"(DN)数据，这里可以直接使用它们。如果不能找到DN数据，则"
"使用RDN数据。"
-#: src/expldifdlg.c:574
+#: src/expldifdlg.c:572
msgid "Exclude record if no Email Address"
msgstr "忽略没有Email地址的联系人"
-#: src/expldifdlg.c:581
+#: src/expldifdlg.c:579
msgid ""
"An addressbook may contain entries without Email Addresses. Check this "
"option to ignore these records."
msgstr "地址簿中的联系人可能没有邮件地址。选中此项则可以忽略这些记录。"
-#: src/expldifdlg.c:669
+#: src/expldifdlg.c:672
msgid "Export Address Book to LDIF File"
msgstr "将地址簿输出成LDIF文件"
-#: src/expldifdlg.c:736
-msgid "Distguished Name"
+#: src/expldifdlg.c:739
+#, fuzzy
+msgid "Distinguished Name"
msgstr "唯一名称(DN)"
-#: src/export.c:120 src/summaryview.c:6420
+#: src/export.c:120 src/summaryview.c:7487
msgid "Export to mbox file"
-msgstr "以mbox格式导出文件夹"
+msgstr "以mbox格式导出目录"
#: src/export.c:139
msgid "Locate the folder to export and specify the mbox file."
-msgstr "指定要导出的文件夹和输出mbox文件。"
+msgstr "指定要导出的目录和输出mbox文件。"
#: src/export.c:150
msgid "Source folder:"
-msgstr "原始文件夹:"
+msgstr "原始目录:"
#: src/export.c:156 src/import.c:150
msgid "Mbox file:"
#: src/export.c:216
msgid "Source folder can't be left empty."
-msgstr "源文件夹不能为空。"
+msgstr "源目录不能为空。"
#: src/export.c:229
msgid "Couldn't find the source folder."
-msgstr "无法找到源文件夹。"
+msgstr "无法找到源目录。"
#: src/export.c:252
msgid "Select exporting file"
msgstr "选择输出文件"
-#: src/exporthtml.c:758
+#: src/exporthtml.c:762
msgid "Full Name"
msgstr "全名"
-#: src/exporthtml.c:762 src/importldif.c:1028
+#: src/exporthtml.c:766 src/importldif.c:1040
msgid "Attributes"
msgstr "属性"
-#: src/exporthtml.c:963
+#: src/exporthtml.c:969
msgid "Claws Mail Address Book"
msgstr "Claws Mail地址簿"
-#: src/exporthtml.c:1077 src/exportldif.c:551
+#: src/exporthtml.c:1083 src/exportldif.c:551
msgid "Name already exists but is not a directory."
msgstr "这个名字已经存在但不是一个目录名称。"
-#: src/exporthtml.c:1080 src/exportldif.c:554
+#: src/exporthtml.c:1086 src/exportldif.c:554
msgid "No permissions to create directory."
msgstr "你没有创建目录的权限。"
-#: src/exporthtml.c:1083 src/exportldif.c:557
+#: src/exporthtml.c:1089 src/exportldif.c:557
msgid "Name is too long."
msgstr "名字太长。"
-#: src/exporthtml.c:1086 src/exportldif.c:560
+#: src/exporthtml.c:1092 src/exportldif.c:560
msgid "Not specified."
msgstr "不确定。"
-#: src/folder.c:1331 src/foldersel.c:370 src/prefs_folder_item.c:239
+#: src/folder.c:1388 src/foldersel.c:370 src/prefs_folder_item.c:286
msgid "Inbox"
msgstr "收信夹"
-#: src/folder.c:1335 src/foldersel.c:374
+#: src/folder.c:1392 src/foldersel.c:374
msgid "Sent"
msgstr "已发送"
-#: src/folder.c:1339 src/foldersel.c:378 src/prefs_folder_item.c:242
+#: src/folder.c:1396 src/foldersel.c:378 src/prefs_folder_item.c:289
msgid "Queue"
msgstr "待发送"
-#: src/folder.c:1343 src/foldersel.c:382 src/prefs_folder_item.c:243
-#: src/toolbar.c:376 src/toolbar.c:410 src/toolbar.c:501
+#: src/folder.c:1400 src/foldersel.c:382 src/prefs_folder_item.c:290
+#: src/toolbar.c:392 src/toolbar.c:427
msgid "Trash"
-msgstr "å\9e\83å\9c¾æ¡¶"
+msgstr "åº\9f件夹"
-#: src/folder.c:1347 src/foldersel.c:386 src/prefs_folder_item.c:241
+#: src/folder.c:1404 src/foldersel.c:386 src/prefs_folder_item.c:288
msgid "Drafts"
msgstr "草稿"
-#: src/folder.c:1621
+#: src/folder.c:1840
#, c-format
msgid "Processing (%s)...\n"
msgstr "处理中(%s)...\n"
-#: src/folder.c:2542
-#, c-format
-msgid "Fetching all messages in %s ...\n"
-msgstr "正在收取 %s 中所有邮件...\n"
-
-#: src/folder.c:2831
+#: src/folder.c:2991
#, c-format
msgid "Copying %s to %s...\n"
msgstr "将%s 复制到%s...\n"
-#: src/folder.c:2831
+#: src/folder.c:2991
#, c-format
msgid "Moving %s to %s...\n"
msgstr "将%s 移动到%s...\n"
-#: src/folder.c:3118
+#: src/folder.c:3278
#, c-format
msgid "Updating cache for %s..."
-msgstr "正在更新文件夹 %s 的缓存..."
+msgstr "正在更新目录 %s 的缓存..."
-#: src/folder.c:3829
+#: src/folder.c:4094
msgid "Processing messages..."
msgstr "正在处理邮件..."
+#: src/folder.c:4230
+#, c-format
+msgid "Synchronising %s for offline use...\n"
+msgstr "正在同步%s以便离线使用...\n"
+
#: src/foldersel.c:228
msgid "Select folder"
-msgstr "选择文件夹"
+msgstr "选择目录"
-#: src/foldersel.c:541 src/imap_gtk.c:158 src/mh_gtk.c:132
+#: src/foldersel.c:541 src/imap_gtk.c:159 src/mh_gtk.c:132
msgid "NewFolder"
-msgstr "新文件夹"
+msgstr "新目录"
-#: src/foldersel.c:549 src/imap_gtk.c:166 src/imap_gtk.c:172
-#: src/imap_gtk.c:224 src/mh_gtk.c:138 src/mh_gtk.c:241
+#: src/foldersel.c:549 src/imap_gtk.c:167 src/imap_gtk.c:173
+#: src/imap_gtk.c:225 src/mh_gtk.c:138 src/mh_gtk.c:241
#, c-format
msgid "'%c' can't be included in folder name."
-msgstr "文件夹名称不能包含`%c'。"
+msgstr "目录名称不能包含`%c'。"
-#: src/foldersel.c:559 src/imap_gtk.c:182 src/imap_gtk.c:236 src/mh_gtk.c:148
+#: src/foldersel.c:559 src/imap_gtk.c:183 src/imap_gtk.c:237 src/mh_gtk.c:148
#: src/mh_gtk.c:248
#, c-format
msgid "The folder '%s' already exists."
-msgstr "文件夹'%s'已存在。"
+msgstr "目录'%s'已存在。"
-#: src/foldersel.c:566 src/imap_gtk.c:188 src/mh_gtk.c:154
+#: src/foldersel.c:566 src/imap_gtk.c:189 src/mh_gtk.c:154
#, c-format
msgid "Can't create the folder '%s'."
-msgstr "无法创建文件夹'%s'。"
+msgstr "无法创建目录'%s'。"
-#: src/folderview.c:290
+#: src/folderview.c:295
msgid "/Mark all re_ad"
msgstr "/标记所有邮件为已读(_a)"
-#: src/folderview.c:292
+#: src/folderview.c:297
+msgid "/R_un processing rules"
+msgstr "/运行处理规则(_u)"
+
+#: src/folderview.c:298
msgid "/_Search folder..."
-msgstr "/在文件夹中搜索(_S)..."
+msgstr "/在目录中搜索(_S)..."
-#: src/folderview.c:294
+#: src/folderview.c:300
msgid "/Process_ing..."
msgstr "/处理(_i)..."
-#: src/folderview.c:299
+#: src/folderview.c:305
msgid "/Empty _trash..."
-msgstr "/æ¸\85空å\9e\83å\9c¾æ¡¶(_t)..."
+msgstr "/æ¸\85空åº\9f件夹(_t)..."
-#: src/folderview.c:304
+#: src/folderview.c:310
msgid "/Send _queue..."
msgstr "/发送队列(_q)..."
-#: src/folderview.c:423 src/folderview.c:470 src/prefs_folder_column.c:80
+#: src/folderview.c:447 src/folderview.c:494 src/prefs_folder_column.c:82
+#: src/prefs_matcher.c:365 src/summaryview.c:5764
msgid "New"
msgstr "新邮件"
-#: src/folderview.c:424 src/folderview.c:471 src/prefs_folder_column.c:81
+#: src/folderview.c:448 src/folderview.c:495 src/prefs_folder_column.c:83
+#: src/prefs_matcher.c:364 src/summaryview.c:5766
msgid "Unread"
msgstr "未读"
-#: src/folderview.c:425 src/prefs_folder_column.c:82
+#: src/folderview.c:449 src/prefs_folder_column.c:84
msgid "Total"
msgstr "全部"
#. TRANSLATORS: This in Number sign in American style
-#: src/folderview.c:473 src/summaryview.c:491
+#: src/folderview.c:497 src/summaryview.c:551
msgid "#"
msgstr "＃"
-#: src/folderview.c:719
+#: src/folderview.c:796
msgid "Setting folder info..."
-msgstr "设置文件夹资料..."
+msgstr "设置目录资料..."
-#: src/folderview.c:781 src/summaryview.c:3491
+#: src/folderview.c:859 src/summaryview.c:3813
msgid "Mark all as read"
msgstr "设所有为已读"
-#: src/folderview.c:782 src/summaryview.c:3492
+#: src/folderview.c:860 src/summaryview.c:3814
msgid "Do you really want to mark all mails in this folder as read ?"
-msgstr "确定要将此文件夹中所有邮件设置已读？"
+msgstr "确定要将此目录中所有邮件设置已读？"
-#: src/folderview.c:999 src/imap.c:3347 src/mainwindow.c:3755 src/setup.c:90
+#: src/folderview.c:1082 src/imap.c:3911 src/mainwindow.c:4448 src/setup.c:90
#, c-format
msgid "Scanning folder %s%c%s ..."
-msgstr "扫描文件夹%s%c%s..."
+msgstr "扫描目录%s%c%s..."
-#: src/folderview.c:1003 src/imap.c:3352 src/mainwindow.c:3760 src/setup.c:95
+#: src/folderview.c:1086 src/imap.c:3916 src/mainwindow.c:4453 src/setup.c:95
#, c-format
msgid "Scanning folder %s ..."
-msgstr " 扫描文件夹 %s ..."
+msgstr " 扫描目录 %s ..."
-#: src/folderview.c:1034
+#: src/folderview.c:1117
msgid "Rebuild folder tree"
-msgstr "重建文件夹树"
+msgstr "重建目录树"
-#: src/folderview.c:1035
+#: src/folderview.c:1118
msgid ""
"Rebuilding the folder tree will remove local caches. Do you want to continue?"
-msgstr "重建文件夹树将删除原有的本地缓存。是否要继续?"
+msgstr "重建目录树将删除原有的本地缓存。是否要继续?"
-#: src/folderview.c:1045
+#: src/folderview.c:1128
msgid "Rebuilding folder tree..."
-msgstr " 重新建立文件夹树 ..."
+msgstr " 重新建立目录树 ..."
-#: src/folderview.c:1047 src/folderview.c:1087
+#: src/folderview.c:1130 src/folderview.c:1171
msgid "Scanning folder tree..."
-msgstr " 正在扫描文件夹..."
+msgstr " 正在扫描目录..."
-#: src/folderview.c:1172
+#: src/folderview.c:1262
#, c-format
msgid "Couldn't scan folder %s\n"
-msgstr "无法扫描文件夹 %s\n"
+msgstr "无法扫描目录 %s\n"
-#: src/folderview.c:1225
+#: src/folderview.c:1316
msgid "Checking for new messages in all folders..."
-msgstr "检查所有文件夹中的新邮件..."
+msgstr "检查所有目录中的新邮件..."
-#: src/folderview.c:2043
+#: src/folderview.c:2136
#, c-format
msgid "Closing Folder %s..."
-msgstr "关闭文件夹%s..."
+msgstr "关闭目录%s..."
-#: src/folderview.c:2082
+#: src/folderview.c:2228
#, c-format
msgid "Opening Folder %s..."
-msgstr "打开文件夹%s..."
+msgstr "打开目录%s..."
-#: src/folderview.c:2095
+#: src/folderview.c:2246
msgid "Folder could not be opened."
-msgstr "无法打开文件夹。"
+msgstr "无法打开目录。"
-#: src/folderview.c:2256 src/mainwindow.c:2047
+#: src/folderview.c:2408 src/mainwindow.c:2574
msgid "Empty trash"
-msgstr "æ¸\85空å\9e\83å\9c¾æ¡¶"
+msgstr "æ¸\85空åº\9f件夹"
-#: src/folderview.c:2257
+#: src/folderview.c:2409
msgid "Delete all messages in trash?"
-msgstr "æ¸\85空å\9e\83å\9c¾æ¡¶内所有邮件？"
+msgstr "æ¸\85空åº\9f件夹内所有邮件？"
-#: src/folderview.c:2258
+#: src/folderview.c:2410
msgid "+_Empty trash"
-msgstr "+æ¸\85空å\9e\83å\9c¾æ¡¶(_E)"
+msgstr "+æ¸\85空åº\9f件夹(_E)"
-#: src/folderview.c:2302 src/inc.c:1465 src/toolbar.c:2196
+#: src/folderview.c:2454 src/inc.c:1599 src/toolbar.c:2521
msgid "Offline warning"
msgstr "脱机警告"
-#: src/folderview.c:2303 src/toolbar.c:2197
+#: src/folderview.c:2455 src/toolbar.c:2522
msgid "You're working offline. Override?"
msgstr "你正在脱机工作。是否更改？"
-#: src/folderview.c:2314 src/toolbar.c:2216
+#: src/folderview.c:2466 src/toolbar.c:2541
msgid "Send queued messages"
msgstr "送出待发送邮件"
-#: src/folderview.c:2315 src/toolbar.c:2217
+#: src/folderview.c:2467 src/toolbar.c:2542
msgid "Send all queued messages?"
msgstr "送出所有待发送邮件?"
-#: src/folderview.c:2316 src/messageview.c:587 src/messageview.c:604
-#: src/prefs_account.c:1100 src/toolbar.c:2218
+#: src/folderview.c:2468 src/messageview.c:691 src/messageview.c:708
+#: src/toolbar.c:2543
msgid "_Send"
msgstr "发送(_S)"
-#: src/folderview.c:2324 src/toolbar.c:2236
+#: src/folderview.c:2476 src/toolbar.c:2561
msgid "Some errors occurred while sending queued messages."
msgstr "发送邮件时发生错误。"
-#: src/folderview.c:2327 src/main.c:1616 src/toolbar.c:2239
+#: src/folderview.c:2479 src/main.c:2202 src/toolbar.c:2564
#, c-format
msgid ""
"Some errors occurred while sending queued messages:\n"
"发送邮件时发生错误:\n"
"%s"
-#: src/folderview.c:2394
+#: src/folderview.c:2561
#, c-format
msgid "Do you really want to copy folder '%s' in '%s' ?"
-msgstr "确定要复制文件夹 '%s' 到 '%s'？"
+msgstr "确定要复制目录 '%s' 到 '%s'？"
-#: src/folderview.c:2395
+#: src/folderview.c:2562
#, c-format
-msgid "Do you really want to make folder '%s' a sub-folder of '%s' ?"
-msgstr "ç¡®å®\9aè¦\81å°\86æ\96\87件夹 '%s' æ\94¹ä¸º '%s' ç\9a\84ä¸\80个å\90æ\96\87件夹？"
+msgid "Do you really want to make folder '%s' a subfolder of '%s' ?"
+msgstr "ç¡®å®\9eè¦\81å°\86ç\9b®å½\95 '%s' æ\94¹ä¸º '%s' ç\9a\84ä¸\80个å\90ç\9b®å½\95？"
-#: src/folderview.c:2397
+#: src/folderview.c:2564
msgid "Copy folder"
-msgstr "复制文件夹"
+msgstr "复制目录"
-#: src/folderview.c:2397
+#: src/folderview.c:2564
msgid "Move folder"
-msgstr "移动文件夹"
+msgstr "移动目录"
-#: src/folderview.c:2408
+#: src/folderview.c:2575
#, c-format
msgid "Copying %s to %s..."
msgstr "将%s 复制到%s..."
-#: src/folderview.c:2408
+#: src/folderview.c:2575
#, c-format
msgid "Moving %s to %s..."
msgstr "将%s 移动到%s..."
-#: src/folderview.c:2439
+#: src/folderview.c:2606
msgid "Source and destination are the same."
msgstr "文件来源和目的相同。"
-#: src/folderview.c:2442
+#: src/folderview.c:2609
msgid "Can't copy a folder to one of its children."
-msgstr "无法将文件夹复制到其子文件夹中。"
+msgstr "无法将目录复制到其子目录中。"
-#: src/folderview.c:2443
+#: src/folderview.c:2610
msgid "Can't move a folder to one of its children."
-msgstr "无法将文件夹移到其子文件夹中。"
+msgstr "无法将目录移到其子目录中。"
-#: src/folderview.c:2446
-msgid "Folder moving cannot be done between different mailboxes."
-msgstr "文件夹不能跨邮箱移动。"
+#: src/folderview.c:2613
+msgid "A folder cannot be moved between different mailboxes."
+msgstr "目录不能跨邮箱移动。"
-#: src/folderview.c:2449
+#: src/folderview.c:2616
msgid "Copy failed!"
msgstr "复制失败！"
-#: src/folderview.c:2449
+#: src/folderview.c:2616
msgid "Move failed!"
msgstr "移动失败！"
-#: src/folderview.c:2485
+#: src/folderview.c:2667
#, c-format
msgid "Processing configuration for folder %s"
-msgstr "文件夹 %s 的邮件分拣配置"
+msgstr "目录 %s 的邮件分拣配置"
-#: src/gedit-print.c:147 src/messageview.c:1507 src/summaryview.c:4172
-#: src/toolbar.c:182
+#: src/folderview.c:3055 src/summaryview.c:4242 src/summaryview.c:4339
+msgid "The destination folder can only be used to store subfolders."
+msgstr "目标目录只能用于存放子目录。"
+
+#: src/gedit-print.c:145 src/messageview.c:1803 src/summaryview.c:4562
+#: src/toolbar.c:194 src/toolbar.c:434
msgid "Print"
msgstr "打印"
-#: src/gedit-print.c:245
+#: src/gedit-print.c:243
msgid "Preparing pages..."
msgstr "正在准备页面..."
-#: src/gedit-print.c:272
+#: src/gedit-print.c:270
#, c-format
msgid "Rendering page %d of %d..."
msgstr "正在绘制第%d页(共%d页)..."
-#: src/gedit-print.c:274
+#: src/gedit-print.c:272
#, c-format
msgid "Printing page %d of %d..."
msgstr "正在打印第%d页(共%d页)..."
-#: src/gedit-print.c:296
+#: src/gedit-print.c:294 src/printing.c:349
msgid "Print preview"
msgstr "打印预览"
-#: src/gedit-print.c:437
+#: src/gedit-print.c:435
msgid "Page %N of %Q"
msgstr "第%d页(共%d页)"
-#: src/grouplistdialog.c:173
+#: src/grouplistdialog.c:174
msgid "Newsgroup subscription"
msgstr "订阅新闻组"
-#: src/grouplistdialog.c:189
+#: src/grouplistdialog.c:190
msgid "Select newsgroups for subscription:"
msgstr "选择要订阅的新闻组:"
-#: src/grouplistdialog.c:195
+#: src/grouplistdialog.c:196
msgid "Find groups:"
msgstr "查找新闻组:"
-#: src/grouplistdialog.c:203
+#: src/grouplistdialog.c:204
msgid " Search "
msgstr " 搜索 "
-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:216
msgid "Newsgroup name"
msgstr "新闻组名称"
-#: src/grouplistdialog.c:216
+#: src/grouplistdialog.c:217
msgid "Messages"
msgstr "邮件"
-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:218
msgid "Type"
msgstr "类型"
-#: src/grouplistdialog.c:346
+#: src/grouplistdialog.c:347
msgid "moderated"
msgstr "有管理的"
-#: src/grouplistdialog.c:348
+#: src/grouplistdialog.c:349
msgid "readonly"
msgstr "只读"
-#: src/grouplistdialog.c:350
+#: src/grouplistdialog.c:351
msgid "unknown"
msgstr "未知"
-#: src/grouplistdialog.c:412
+#: src/grouplistdialog.c:420
msgid "Can't retrieve newsgroup list."
msgstr "无法取回新闻组列表。"
-#: src/grouplistdialog.c:447 src/summaryview.c:1324
+#: src/grouplistdialog.c:457 src/summaryview.c:1474
msgid "Done."
msgstr "完成。"
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:490
#, c-format
msgid "%d newsgroups received (%s read)"
msgstr "已接收%d新闻组(已读%s)"
-#: src/gtk/about.c:79 src/textview.c:214
+#: src/gtk/about.c:79 src/textview.c:215
msgid "/_Open with Web browser"
msgstr "/用网页浏览器打开(_O)"
-#: src/gtk/about.c:80 src/textview.c:215
+#: src/gtk/about.c:80 src/textview.c:216
msgid "/Copy this _link"
msgstr "/复制链接地址(_l)"
-#: src/gtk/about.c:138
+#: src/gtk/about.c:139
msgid ""
"Claws Mail is a lightweight, fast and highly-configurable email client.\n"
"\n"
"\n"
"如欲获得进一步的信息，请访问Claws Mail网站:\n"
-#: src/gtk/about.c:144
+#: src/gtk/about.c:145
msgid ""
"\n"
"\n"
"Claws Mail是自由软件，在遵循通用许可协议(GPL)的前提下发布。如果你想给Claws "
"Mail项目捐款，可访问如下网址:\n"
-#: src/gtk/about.c:159
+#: src/gtk/about.c:161
+msgid ""
+"\n"
+"\n"
+"Copyright (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"and the Claws Mail team"
+msgstr ""
+"\n"
+"\n"
+"版本所有 (C) 1999-2007\n"
+"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
+"和Claws Mail开发组"
+
+#: src/gtk/about.c:164
msgid ""
"\n"
"\n"
"\n"
"系统信息\n"
-#: src/gtk/about.c:165
+#: src/gtk/about.c:170
#, c-format
msgid ""
"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
"本地语言: %s (字符集: %s)\n"
"操作系统: %s %s (%s)"
-#: src/gtk/about.c:174
+#: src/gtk/about.c:179
#, c-format
msgid ""
"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
"本地语言: %s (字符集: %s)\n"
"操作系统: %s"
-#: src/gtk/about.c:183
+#: src/gtk/about.c:188
#, c-format
msgid ""
"GTK+ %d.%d.%d / GLib %d.%d.%d\n"
"本地语言: %s (字符集: %s)\n"
"操作系统: (未知)"
-#: src/gtk/about.c:240 src/prefs_themes.c:707 src/wizard.c:475
+#: src/gtk/about.c:245 src/prefs_themes.c:713 src/wizard.c:502
msgid "The Claws Mail Team"
msgstr "Claws Mail开发组"
-#: src/gtk/about.c:259
+#: src/gtk/about.c:264
msgid "Previous team members"
msgstr "以前的开发小组成员"
-#: src/gtk/about.c:278
+#: src/gtk/about.c:283
msgid "The translation team"
msgstr "翻译小组"
-#: src/gtk/about.c:297
+#: src/gtk/about.c:302
msgid "Documentation team"
msgstr "文档小组"
-#: src/gtk/about.c:316
+#: src/gtk/about.c:321
msgid "Logo"
msgstr "徽标"
-#: src/gtk/about.c:335
+#: src/gtk/about.c:340
msgid "Icons"
msgstr "图标"
-#: src/gtk/about.c:354
+#: src/gtk/about.c:359
msgid "Contributors"
msgstr "其他有贡献人员"
-#: src/gtk/about.c:402
+#: src/gtk/about.c:407
msgid "Compiled-in Features\n"
msgstr "本版本编译进的特性\n"
-#: src/gtk/about.c:418
+#: src/gtk/about.c:423
+msgid "compface|adds support for the X-Face header\n"
+msgstr "提供X-Face邮件头的支持\n"
+
+#: src/gtk/about.c:433
+msgid "GNU/aspell|adds support for spell checking\n"
+msgstr "提供拼写检查功能\n"
+
+#: src/gtk/about.c:443
+msgid "GnuTLS|adds support for encrypted connections to servers\n"
+msgstr "提供采用加密方式连接服务器的功能\n"
+
+#: src/gtk/about.c:453
+msgid "GTK+ >= 2.10.0|adds support for a complete print dialog\n"
+msgstr "提供完整的打印设置对话框\n"
+
+#: src/gtk/about.c:463
msgid ""
-"IPv6|adds support for IPv6 addresses, the new internet addressing protocol\n"
+"IPv6|adds support for IPv6 addresses, the new Internet addressing protocol\n"
msgstr "提供对IPv6地址的支持，IPv6是新一代的因特网寻址协议\n"
-#: src/gtk/about.c:429
+#: src/gtk/about.c:474
msgid "iconv|allows converting to and from different character sets\n"
msgstr "提供在不同字符集之间的转换功能\n"
-#: src/gtk/about.c:439
-msgid "compface|adds support for the X-Face header\n"
-msgstr "提供X-Face邮件头的支持\n"
-
-#: src/gtk/about.c:449
-msgid "OpenSSL|adds support for encrypted connections to servers\n"
-msgstr "提供安全连接服务器的功能\n"
-
-#: src/gtk/about.c:459
-msgid "LDAP|adds support for LDAP shared addressbooks\n"
-msgstr "提供LDAP共享地址簿支持\n"
-
-#: src/gtk/about.c:469
+#: src/gtk/about.c:484
msgid "JPilot|adds support for PalmOS addressbooks\n"
msgstr "提供PalmOS地址簿支持\n"
-#: src/gtk/about.c:479
-msgid "GNU/aspell|adds support for spell checking\n"
-msgstr "提供拼写检查功能\n"
+#: src/gtk/about.c:494
+msgid "LDAP|adds support for LDAP shared addressbooks\n"
+msgstr "提供LDAP共享地址簿支持\n"
-#: src/gtk/about.c:489
-msgid "libetpan|adds support for IMAP servers\n"
-msgstr "提供连接IMAP服务器的功能\n"
+#: src/gtk/about.c:504
+msgid "libetpan|adds support for IMAP and NNTP servers\n"
+msgstr "提供连接IMAP和NNTP服务器的功能\n"
-#: src/gtk/about.c:499
+#: src/gtk/about.c:514
msgid "libgnomeprint|adds support for a complete print dialog\n"
msgstr "提供打印设置对话框\n"
-#: src/gtk/about.c:509
+#: src/gtk/about.c:524
msgid "libSM|adds support for session handling\n"
msgstr "提供会话管理接口\n"
-#: src/gtk/about.c:541
+#: src/gtk/about.c:534
+msgid ""
+"NetworkManager|adds support for detection of network connection changes\n"
+msgstr "提供检测网络连接是否正常的功能\n"
+
+#: src/gtk/about.c:544
+msgid "OpenSSL|adds support for encrypted connections to servers\n"
+msgstr "提供安全连接服务器的功能\n"
+
+#: src/gtk/about.c:576
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 "
-"Software Foundation; either version 2, or (at your option) any later "
+"Software Foundation; either version 3, or (at your option) any later "
"version.\n"
"\n"
msgstr ""
"本程序为自由软件；你可以任意传播或是修改它，但需遵循自由软件基金会发布的GNU通"
-"ç\94¨è®¸å\8f¯å\8d\8fè®®(å\8f¯ä»¥æ\98¯ç¬¬äº\8c版或者更高版本)中列出的条款。\n"
+"ç\94¨è®¸å\8f¯å\8d\8fè®®(å\8f¯ä»¥æ\98¯ç¬¬ä¸\89版或者更高版本)中列出的条款。\n"
"\n"
-#: src/gtk/about.c:547
+#: src/gtk/about.c:582
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 "
"隐含的质量担保，也没有特殊用途的担保。请阅读GNU通用许可协议以了解详情。\n"
"\n"
-#: src/gtk/about.c:553
+#: src/gtk/about.c:600
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.\n"
+"this program. If not, see <"
+msgstr "你应该随同本程序收到一份GNU通用公共许可(GPL)。如未收到，请访问: "
+
+#: src/gtk/about.c:605
+msgid ""
+">. \n"
"\n"
msgstr ""
-"你应该随同本程序收到一份GNU通用公共许可(GPL)。如未收到，请写信给以下地址索"
-"取: Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "
-"02111-1307, USA.\n"
-"\n"
-#: src/gtk/about.c:571
+#: src/gtk/about.c:608
msgid ""
"This product includes software developed by the OpenSSL Project for use in "
"the OpenSSL Toolkit ("
msgstr "本产品包含了根据OpenSSL开发包开发的软件, 该开发包由OpenSSL项目组提供("
-#: src/gtk/about.c:575
+#: src/gtk/about.c:612
msgid ").\n"
msgstr ")。\n"
-#: src/gtk/about.c:668
+#: src/gtk/about.c:706
msgid "About Claws Mail"
msgstr "关于Claws Mail"
-#: src/gtk/about.c:719
+#: src/gtk/about.c:757
msgid ""
"Copyright (C) 1999-2007\n"
"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
"Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
"和Claws Mail开发组"
-#: src/gtk/about.c:733
+#: src/gtk/about.c:771
msgid "_Info"
msgstr "说明(_I)"
-#: src/gtk/about.c:739
+#: src/gtk/about.c:777
msgid "_Authors"
msgstr "作者(_A)"
-#: src/gtk/about.c:745
+#: src/gtk/about.c:783
msgid "_Features"
msgstr "特性(_F)"
-#: src/gtk/about.c:751
+#: src/gtk/about.c:789
msgid "_License"
msgstr "许可协议(_L)"
-#: src/gtk/about.c:759
+#: src/gtk/about.c:797
msgid "_Release Notes"
msgstr "发布说明(_R)"
-#: src/gtk/colorlabel.c:48 src/prefs_common.c:313
+#: src/gtk/colorlabel.c:48 src/prefs_common.c:359
msgid "Orange"
msgstr "橙色"
-#: src/gtk/colorlabel.c:49 src/prefs_common.c:317
+#: src/gtk/colorlabel.c:49 src/prefs_common.c:363
msgid "Red"
msgstr "红色"
-#: src/gtk/colorlabel.c:50 src/prefs_common.c:321
+#: src/gtk/colorlabel.c:50 src/prefs_common.c:367
msgid "Pink"
msgstr "粉红"
-#: src/gtk/colorlabel.c:51 src/prefs_common.c:325
+#: src/gtk/colorlabel.c:51 src/prefs_common.c:371
msgid "Sky blue"
msgstr "天蓝"
-#: src/gtk/colorlabel.c:52 src/prefs_common.c:329
+#: src/gtk/colorlabel.c:52 src/prefs_common.c:375
msgid "Blue"
msgstr "蓝色"
-#: src/gtk/colorlabel.c:53 src/prefs_common.c:333
+#: src/gtk/colorlabel.c:53 src/prefs_common.c:379
msgid "Green"
msgstr "绿色"
-#: src/gtk/colorlabel.c:54 src/prefs_common.c:337
+#: src/gtk/colorlabel.c:54 src/prefs_common.c:383
msgid "Brown"
msgstr "棕色"
+#: src/gtk/colorlabel.c:55 src/prefs_common.c:387
+msgid "Grey"
+msgstr "灰色"
+
+#: src/gtk/colorlabel.c:56 src/prefs_common.c:391
+msgid "Light brown"
+msgstr "亮褐"
+
+#: src/gtk/colorlabel.c:57 src/prefs_common.c:395
+msgid "Dark red"
+msgstr "暗红"
+
+#: src/gtk/colorlabel.c:58 src/prefs_common.c:399
+msgid "Dark pink"
+msgstr "暗粉"
+
+#: src/gtk/colorlabel.c:59 src/prefs_common.c:403
+msgid "Steel blue"
+msgstr "金属蓝"
+
+#: src/gtk/colorlabel.c:60 src/prefs_common.c:407
+msgid "Gold"
+msgstr "金色"
+
+#: src/gtk/colorlabel.c:61 src/prefs_common.c:411
+msgid "Bright green"
+msgstr "亮绿"
+
+#: src/gtk/colorlabel.c:62 src/prefs_common.c:415
+msgid "Magenta"
+msgstr "洋红"
+
+#: src/gtk/colorlabel.c:342
+#, c-format
+msgid "Ctrl+%c"
+msgstr ""
+
#: src/gtk/foldersort.c:156
msgid "Set folder order"
-msgstr "设置文件夹顺序"
+msgstr "设置目录顺序"
#: src/gtk/foldersort.c:190
msgid "Move folders up or down to change the sort order in the folder list."
-msgstr "上下移动文件夹以改变文件夹视图中的排列顺序。"
+msgstr "上下移动目录以改变目录视图中的排列顺序。"
-#: src/gtk/foldersort.c:214
+#: src/gtk/foldersort.c:216 src/toolbar.c:415
msgid "Folders"
-msgstr "文件夹"
+msgstr "目录"
-#: src/gtk/gtkaspell.c:638
+#: src/gtk/gtkaspell.c:644
msgid "No dictionary selected."
msgstr "没有选择任何字典。"
-#: src/gtk/gtkaspell.c:851 src/gtk/gtkaspell.c:1852 src/gtk/gtkaspell.c:2147
+#: src/gtk/gtkaspell.c:857 src/gtk/gtkaspell.c:1875 src/gtk/gtkaspell.c:2138
msgid "Normal Mode"
msgstr "一般模式"
-#: src/gtk/gtkaspell.c:853 src/gtk/gtkaspell.c:1858 src/gtk/gtkaspell.c:2159
+#: src/gtk/gtkaspell.c:859 src/gtk/gtkaspell.c:1876 src/gtk/gtkaspell.c:2150
msgid "Bad Spellers Mode"
msgstr "拼错字模式"
-#: src/gtk/gtkaspell.c:892
+#: src/gtk/gtkaspell.c:898
msgid "Unknown suggestion mode."
msgstr "未知的建议模式。"
-#: src/gtk/gtkaspell.c:1183
+#: src/gtk/gtkaspell.c:1189
msgid "No misspelled word found."
msgstr "没有发现错字。"
-#: src/gtk/gtkaspell.c:1531
+#: src/gtk/gtkaspell.c:1537
msgid "Replace unknown word"
msgstr "替换未知的字"
-#: src/gtk/gtkaspell.c:1546
+#: src/gtk/gtkaspell.c:1552
#, c-format
msgid "<span weight=\"bold\" size=\"larger\">Replace \"%s\" with: </span>"
msgstr "<span weight=\"bold\" size=\"larger\">将 \"%s\" 替换为: </span>"
-#: src/gtk/gtkaspell.c:1591
+#: src/gtk/gtkaspell.c:1597
msgid ""
"Holding down Control key while pressing Enter\n"
"will learn from mistake.\n"
"学习功能: 按住Control键时按Enter\n"
"可以将被认为拼写错误的单词加入到单词本。\n"
-#: src/gtk/gtkaspell.c:1846 src/gtk/gtkaspell.c:2135
+#: src/gtk/gtkaspell.c:1874 src/gtk/gtkaspell.c:2126
msgid "Fast Mode"
msgstr "快速模式"
-#: src/gtk/gtkaspell.c:1953
+#: src/gtk/gtkaspell.c:1944
#, c-format
msgid "\"%s\" unknown in %s"
msgstr "%s中的\"%s\"未知"
-#: src/gtk/gtkaspell.c:1967
+#: src/gtk/gtkaspell.c:1958
msgid "Accept in this session"
msgstr "接受这一次"
-#: src/gtk/gtkaspell.c:1977
+#: src/gtk/gtkaspell.c:1968
msgid "Add to personal dictionary"
msgstr "加入个人的字典"
-#: src/gtk/gtkaspell.c:1987
+#: src/gtk/gtkaspell.c:1978
msgid "Replace with..."
msgstr "更换成..."
-#: src/gtk/gtkaspell.c:2000
+#: src/gtk/gtkaspell.c:1991
#, c-format
msgid "Check with %s"
msgstr "用%s检查"
-#: src/gtk/gtkaspell.c:2022
+#: src/gtk/gtkaspell.c:2013
msgid "(no suggestions)"
msgstr "(没有建议)"
-#: src/gtk/gtkaspell.c:2033 src/gtk/gtkaspell.c:2212
+#: src/gtk/gtkaspell.c:2024 src/gtk/gtkaspell.c:2203
msgid "More..."
msgstr "更多..."
-#: src/gtk/gtkaspell.c:2097
+#: src/gtk/gtkaspell.c:2088
#, c-format
msgid "Dictionary: %s"
msgstr "字典: %s"
-#: src/gtk/gtkaspell.c:2110
+#: src/gtk/gtkaspell.c:2101
#, c-format
msgid "Use alternate (%s)"
msgstr "用另一个(%s)"
-#: src/gtk/gtkaspell.c:2121
+#: src/gtk/gtkaspell.c:2112
msgid "Use both dictionaries"
msgstr "使用两个字典"
-#: src/gtk/gtkaspell.c:2175 src/prefs_spelling.c:214
+#: src/gtk/gtkaspell.c:2166 src/prefs_spelling.c:205
msgid "Check while typing"
msgstr "键入时实时检查"
-#: src/gtk/gtkaspell.c:2191
+#: src/gtk/gtkaspell.c:2182
msgid "Change dictionary"
msgstr "切换字典"
-#: src/gtk/gtkaspell.c:2323
+#: src/gtk/gtkaspell.c:2313
#, c-format
msgid ""
"The spell checker could not change dictionary.\n"
"拼写检查器切换字典失败\n"
"%s"
-#: src/gtk/gtkaspell.c:2369
+#: src/gtk/gtkaspell.c:2355
#, c-format
msgid ""
"The spell checker could not change the alternate dictionary.\n"
"拼写检查器切换字典失败。\n"
"%s"
-#: src/gtk/gtksourceprintjob.c:272
+#: src/gtk/gtksourceprintjob.c:270
msgid "Configuration"
msgstr "设置"
-#: src/gtk/gtksourceprintjob.c:273
+#: src/gtk/gtksourceprintjob.c:271
msgid "Configuration options for the print job"
msgstr "设置打印任务的选项"
-#: src/gtk/gtksourceprintjob.c:280
+#: src/gtk/gtksourceprintjob.c:278
msgid "Source Buffer"
msgstr "待打印内容"
-#: src/gtk/gtksourceprintjob.c:281
+#: src/gtk/gtksourceprintjob.c:279
msgid "GtkTextBuffer object to print"
msgstr "要打印的GtkTextBuffer对象"
-#: src/gtk/gtksourceprintjob.c:287
+#: src/gtk/gtksourceprintjob.c:285
msgid "Tabs Width"
msgstr "制表符宽度"
-#: src/gtk/gtksourceprintjob.c:288
+#: src/gtk/gtksourceprintjob.c:286
msgid "Width in equivalent space characters of tabs"
msgstr "一个制表符的宽度等于多少个空格"
-#: src/gtk/gtksourceprintjob.c:295
+#: src/gtk/gtksourceprintjob.c:293
msgid "Wrap Mode"
msgstr "自动折行"
-#: src/gtk/gtksourceprintjob.c:296
+#: src/gtk/gtksourceprintjob.c:294
msgid "Word wrapping mode"
msgstr "自动折行模式"
-#: src/gtk/gtksourceprintjob.c:303
+#: src/gtk/gtksourceprintjob.c:301
msgid "Highlight"
msgstr "语法高亮"
-#: src/gtk/gtksourceprintjob.c:304
+#: src/gtk/gtksourceprintjob.c:302
msgid "Whether to print the document with highlighted syntax"
msgstr "是否以语法高亮方式打印文件"
-#: src/gtk/gtksourceprintjob.c:312
+#: src/gtk/gtksourceprintjob.c:310
msgid "Font"
msgstr "字体"
-#: src/gtk/gtksourceprintjob.c:313
+#: src/gtk/gtksourceprintjob.c:311
msgid "GnomeFont name to use for the document text (deprecated)"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:320
+#: src/gtk/gtksourceprintjob.c:318
msgid "Font Description"
msgstr "字体描述"
-#: src/gtk/gtksourceprintjob.c:321
+#: src/gtk/gtksourceprintjob.c:319
msgid "Font to use for the document text (e.g. \"Monospace 10\")"
msgstr "用于打印的字体(例如. \"Monospace 10\")"
-#: src/gtk/gtksourceprintjob.c:328 src/gtk/gtksourceprintjob.c:336
+#: src/gtk/gtksourceprintjob.c:326 src/gtk/gtksourceprintjob.c:334
msgid "Numbers Font"
msgstr "行号字体"
-#: src/gtk/gtksourceprintjob.c:329
+#: src/gtk/gtksourceprintjob.c:327
msgid "GnomeFont name to use for the line numbers (deprecated)"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:337
+#: src/gtk/gtksourceprintjob.c:335
msgid "Font description to use for the line numbers"
msgstr "用于行号的字体"
-#: src/gtk/gtksourceprintjob.c:344
+#: src/gtk/gtksourceprintjob.c:342
msgid "Print Line Numbers"
msgstr "打印行号"
-#: src/gtk/gtksourceprintjob.c:345
+#: src/gtk/gtksourceprintjob.c:343
msgid "Interval of printed line numbers (0 means no numbers)"
msgstr "打印行号的间隔(0表示不打印行号)"
-#: src/gtk/gtksourceprintjob.c:352
+#: src/gtk/gtksourceprintjob.c:350
msgid "Print Header"
msgstr "打印页眉"
-#: src/gtk/gtksourceprintjob.c:353
+#: src/gtk/gtksourceprintjob.c:351
msgid "Whether to print a header in each page"
msgstr "是否在每页头部添加页眉"
-#: src/gtk/gtksourceprintjob.c:360
+#: src/gtk/gtksourceprintjob.c:358
msgid "Print Footer"
msgstr "打印页脚"
-#: src/gtk/gtksourceprintjob.c:361
+#: src/gtk/gtksourceprintjob.c:359
msgid "Whether to print a footer in each page"
msgstr "是否在每页底部打印页脚"
-#: src/gtk/gtksourceprintjob.c:368
+#: src/gtk/gtksourceprintjob.c:366
msgid "Header and Footer Font"
msgstr "页眉和页脚字体"
-#: src/gtk/gtksourceprintjob.c:369
+#: src/gtk/gtksourceprintjob.c:367
msgid "GnomeFont name to use for the header and footer (deprecated)"
msgstr ""
-#: src/gtk/gtksourceprintjob.c:376
+#: src/gtk/gtksourceprintjob.c:374
msgid "Header and Footer Font Description"
msgstr "页眉和页脚字体"
-#: src/gtk/gtksourceprintjob.c:377
+#: src/gtk/gtksourceprintjob.c:375
msgid "Font to use for headers and footers (e.g. \"Monospace 10\")"
msgstr "用于打印页眉和页脚的字体(例如: \"Monospace 10\")"
-#: src/gtk/icon_legend.c:67
-msgid "New message"
-msgstr "新邮件"
-
-#: src/gtk/icon_legend.c:68
-msgid "Unread message"
-msgstr "未读邮件"
+#: src/gtk/headers.h:8 src/prefs_filtering_action.c:1195
+#: src/prefs_matcher.c:1988 src/prefs_summary_column.c:87 src/quote_fmt.c:48
+#: src/summaryview.c:549
+msgid "Date"
+msgstr "日期"
-#: src/gtk/icon_legend.c:69
-msgid "Message has been replied to"
-msgstr "已回复的邮件"
+#: src/gtk/headers.h:8
+msgid "Date:"
+msgstr "日期:"
-#: src/gtk/icon_legend.c:70
-msgid "Message has been forwarded"
-msgstr "已转发的邮件"
+#: src/gtk/headers.h:9 src/prefs_filtering_action.c:1192
+#: src/prefs_matcher.c:1985 src/prefs_summary_column.c:85 src/quote_fmt.c:49
+#: src/summaryview.c:547
+msgid "From"
+msgstr "发信人"
-#: src/gtk/icon_legend.c:71
-msgid "Message is in an ignored thread"
-msgstr "忽ç\95¥è®¨è®ºçº¿ç´¢"
+#: src/gtk/headers.h:9 src/summary_search.c:356
+msgid "From:"
+msgstr "å\8f\91信人:"
-#: src/gtk/icon_legend.c:72
-msgid "Message is spam"
-msgstr "å\9e\83å\9c¾é\82®ä»¶"
+#: src/gtk/headers.h:10 src/toolbar.c:424
+msgid "Sender"
+msgstr "å\8f\91信人"
-#: src/gtk/icon_legend.c:74
-msgid "Message has attachment(s)"
-msgstr "有附件的邮件"
+#: src/gtk/headers.h:10
+msgid "Sender:"
+msgstr "发信人:"
-#: src/gtk/icon_legend.c:75
-msgid "Digitally signed message"
-msgstr "有数字签名的邮件"
+#: src/gtk/headers.h:11 src/prefs_account.c:1932
+msgid "Reply-To"
+msgstr "回信地址:"
-#: src/gtk/icon_legend.c:76
-msgid "Encrypted message"
-msgstr "加密的邮件"
+#: src/gtk/headers.h:12 src/prefs_filtering_action.c:1193
+#: src/prefs_matcher.c:1986 src/prefs_summary_column.c:86
+#: src/prefs_template.c:212 src/quote_fmt.c:56 src/summaryview.c:548
+msgid "To"
+msgstr "收信人"
-#: src/gtk/icon_legend.c:77
-msgid "Message is signed and has attachment(s)"
-msgstr "有签名且有附件的邮件"
+#: src/gtk/headers.h:13 src/prefs_account.c:1906
+#: src/prefs_filtering_action.c:1194 src/prefs_matcher.c:1987
+#: src/prefs_template.c:213 src/quote_fmt.c:57
+msgid "Cc"
+msgstr "回信地址"
-#: src/gtk/icon_legend.c:78
-msgid "Message is encrypted and has attachment(s)"
-msgstr "加密且有附件的邮件"
+#: src/gtk/headers.h:14 src/prefs_account.c:1919 src/prefs_template.c:214
+msgid "Bcc"
+msgstr "抄送地址"
-#: src/gtk/icon_legend.c:80
-msgid "Marked message"
-msgstr "已标记的邮件"
+#: src/gtk/headers.h:15 src/prefs_filtering_action.c:1196
+#: src/prefs_matcher.c:1989 src/quote_fmt.c:60
+msgid "Message-ID"
+msgstr ""
-#: src/gtk/icon_legend.c:81
-msgid "Message is marked for deletion"
-msgstr "待删除的邮件"
+#: src/gtk/headers.h:15
+msgid "Message-ID:"
+msgstr ""
-#: src/gtk/icon_legend.c:82
-msgid "Message is marked for moving"
-msgstr "待移动的邮件"
+#: src/gtk/headers.h:16
+msgid "In-Reply-To"
+msgstr ""
-#: src/gtk/icon_legend.c:83
-msgid "Message is marked for copying"
-msgstr "待复制的邮件"
+#: src/gtk/headers.h:16
+msgid "In-Reply-To:"
+msgstr ""
+
+#: src/gtk/headers.h:17 src/prefs_filtering_action.c:1198
+#: src/prefs_matcher.c:1991 src/quote_fmt.c:59
+msgid "References"
+msgstr "引用"
+
+#: src/gtk/headers.h:17
+msgid "References:"
+msgstr ""
+
+#: src/gtk/headers.h:18 src/prefs_filtering_action.c:1191
+#: src/prefs_matcher.c:1984 src/prefs_summary_column.c:84
+#: src/prefs_template.c:215 src/quote_fmt.c:55 src/quote_fmt.c:154
+#: src/summaryview.c:546
+msgid "Subject"
+msgstr "主题"
+
+#: src/gtk/headers.h:19
+msgid "Comments"
+msgstr ""
+
+#: src/gtk/headers.h:19
+msgid "Comments:"
+msgstr ""
+
+#: src/gtk/headers.h:20
+msgid "Keywords"
+msgstr ""
+
+#: src/gtk/headers.h:20
+msgid "Keywords:"
+msgstr ""
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date"
+msgstr ""
+
+#: src/gtk/headers.h:21
+msgid "Resent-Date:"
+msgstr ""
+
+#: src/gtk/headers.h:22
+msgid "Resent-From"
+msgstr ""
+
+#: src/gtk/headers.h:22
+msgid "Resent-From:"
+msgstr ""
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender"
+msgstr ""
+
+#: src/gtk/headers.h:23
+msgid "Resent-Sender:"
+msgstr ""
+
+#: src/gtk/headers.h:24
+msgid "Resent-To"
+msgstr ""
+
+#: src/gtk/headers.h:24
+msgid "Resent-To:"
+msgstr ""
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc"
+msgstr ""
+
+#: src/gtk/headers.h:25
+msgid "Resent-Cc:"
+msgstr ""
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc"
+msgstr ""
+
+#: src/gtk/headers.h:26
+msgid "Resent-Bcc:"
+msgstr ""
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID"
+msgstr ""
+
+#: src/gtk/headers.h:27
+msgid "Resent-Message-ID:"
+msgstr ""
+
+#: src/gtk/headers.h:28
+msgid "Return-Path"
+msgstr ""
+
+#: src/gtk/headers.h:28
+msgid "Return-Path:"
+msgstr ""
+
+#: src/gtk/headers.h:29
+msgid "Received"
+msgstr ""
+
+#: src/gtk/headers.h:29
+msgid "Received:"
+msgstr ""
+
+#: src/gtk/headers.h:32 src/prefs_filtering_action.c:1197
+#: src/prefs_matcher.c:1990 src/quote_fmt.c:58
+msgid "Newsgroups"
+msgstr "新闻组"
+
+#: src/gtk/headers.h:33
+msgid "Followup-To"
+msgstr ""
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To"
+msgstr ""
+
+#: src/gtk/headers.h:34
+msgid "Delivered-To:"
+msgstr ""
+
+#: src/gtk/headers.h:35
+msgid "Seen"
+msgstr ""
+
+#: src/gtk/headers.h:35
+msgid "Seen:"
+msgstr ""
+
+#: src/gtk/headers.h:36 src/gtk/progressdialog.c:148
+#: src/gtk/sslcertwindow.c:226 src/prefs_summary_column.c:82
+#: src/summaryview.c:2614
+msgid "Status"
+msgstr "状态"
+
+#: src/gtk/headers.h:36 src/prefs_themes.c:923
+msgid "Status:"
+msgstr "状态"
+
+#: src/gtk/headers.h:37
+msgid "Face"
+msgstr ""
+
+#: src/gtk/headers.h:37
+msgid "Face:"
+msgstr ""
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To"
+msgstr ""
+
+#: src/gtk/headers.h:38
+msgid "Disposition-Notification-To:"
+msgstr ""
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To"
+msgstr ""
+
+#: src/gtk/headers.h:39
+msgid "Return-Receipt-To:"
+msgstr ""
+
+#: src/gtk/headers.h:40
+msgid "User-Agent"
+msgstr ""
+
+#: src/gtk/headers.h:40
+msgid "User-Agent:"
+msgstr ""
+
+#: src/gtk/headers.h:41
+msgid "Content-Type"
+msgstr ""
+
+#: src/gtk/headers.h:41 src/image_viewer.c:329
+msgid "Content-Type:"
+msgstr ""
+
+#: src/gtk/headers.h:42
+#, fuzzy
+msgid "Content-Transfer-Encoding"
+msgstr "传送编码"
+
+#: src/gtk/headers.h:42
+#, fuzzy
+msgid "Content-Transfer-Encoding:"
+msgstr "传送编码"
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version"
+msgstr ""
+
+#: src/gtk/headers.h:43
+msgid "MIME-Version:"
+msgstr ""
+
+#: src/gtk/headers.h:44
+msgid "Precedence"
+msgstr ""
+
+#: src/gtk/headers.h:44
+msgid "Precedence:"
+msgstr ""
+
+#: src/gtk/headers.h:45 src/prefs_account.c:987
+msgid "Organization"
+msgstr "组织"
+
+#: src/gtk/headers.h:45
+msgid "Organization:"
+msgstr "组织:"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List"
+msgstr "邮件列表"
+
+#: src/gtk/headers.h:47
+msgid "Mailing-List:"
+msgstr "邮件列表:"
+
+#: src/gtk/headers.h:48
+msgid "List-Post"
+msgstr ""
+
+#: src/gtk/headers.h:48
+msgid "List-Post:"
+msgstr ""
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe"
+msgstr ""
+
+#: src/gtk/headers.h:49
+msgid "List-Subscribe:"
+msgstr ""
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe"
+msgstr ""
+
+#: src/gtk/headers.h:50
+msgid "List-Unsubscribe:"
+msgstr ""
+
+#: src/gtk/headers.h:51
+msgid "List-Help"
+msgstr ""
+
+#: src/gtk/headers.h:51
+msgid "List-Help:"
+msgstr ""
+
+#: src/gtk/headers.h:52
+msgid "List-Archive"
+msgstr ""
+
+#: src/gtk/headers.h:52
+msgid "List-Archive:"
+msgstr ""
+
+#: src/gtk/headers.h:53
+msgid "List-Owner"
+msgstr ""
+
+#: src/gtk/headers.h:53
+msgid "List-Owner:"
+msgstr ""
+
+#: src/gtk/headers.h:55
+msgid "X-Label"
+msgstr ""
+
+#: src/gtk/headers.h:55
+msgid "X-Label:"
+msgstr ""
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer"
+msgstr ""
+
+#: src/gtk/headers.h:56
+msgid "X-Mailer:"
+msgstr ""
+
+#: src/gtk/headers.h:57
+msgid "X-Status"
+msgstr ""
+
+#: src/gtk/headers.h:57
+msgid "X-Status:"
+msgstr ""
+
+#: src/gtk/headers.h:58
+msgid "X-Face"
+msgstr ""
+
+#: src/gtk/headers.h:58
+msgid "X-Face:"
+msgstr ""
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive"
+msgstr ""
+
+#: src/gtk/headers.h:59
+msgid "X-No-Archive:"
+msgstr ""
+
+#: src/gtk/headers.h:62
+msgid "In reply to"
+msgstr ""
+
+#: src/gtk/headers.h:62
+msgid "In reply to:"
+msgstr ""
+
+#: src/gtk/headers.h:63
+msgid "To or Cc"
+msgstr ""
+
+#: src/gtk/headers.h:63
+msgid "To or Cc:"
+msgstr ""
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject"
+msgstr ""
+
+#: src/gtk/headers.h:64
+msgid "From, To or Subject:"
+msgstr ""
+
+#: src/gtk/icon_legend.c:68
+msgid "New message"
+msgstr "新邮件"
+
+#: src/gtk/icon_legend.c:69
+msgid "Unread message"
+msgstr "未读邮件"
+
+#: src/gtk/icon_legend.c:70
+msgid "Message has been replied to"
+msgstr "已回复的邮件"
+
+#: src/gtk/icon_legend.c:71
+msgid "Message has been forwarded"
+msgstr "已转发的邮件"
+
+#: src/gtk/icon_legend.c:72
+msgid "Message is in an ignored thread"
+msgstr "忽略讨论线索"
+
+#: src/gtk/icon_legend.c:73
+msgid "Message is in a watched thread"
+msgstr "被监视的讨论线索"
+
+#: src/gtk/icon_legend.c:74
+msgid "Message is spam"
+msgstr "垃圾邮件"
+
+#: src/gtk/icon_legend.c:76
+msgid "Message has attachment(s)"
+msgstr "有附件的邮件"
+
+#: src/gtk/icon_legend.c:77
+msgid "Digitally signed message"
+msgstr "有数字签名的邮件"
+
+#: src/gtk/icon_legend.c:78
+msgid "Encrypted message"
+msgstr "加密的邮件"
+
+#: src/gtk/icon_legend.c:79
+msgid "Message is signed and has attachment(s)"
+msgstr "有签名且有附件的邮件"
+
+#: src/gtk/icon_legend.c:80
+msgid "Message is encrypted and has attachment(s)"
+msgstr "加密且有附件的邮件"
+
+#: src/gtk/icon_legend.c:82
+msgid "Marked message"
+msgstr "已标记的邮件"
+
+#: src/gtk/icon_legend.c:83
+msgid "Message is marked for deletion"
+msgstr "待删除的邮件"
+
+#: src/gtk/icon_legend.c:84
+msgid "Message is marked for moving"
+msgstr "待移动的邮件"
#: src/gtk/icon_legend.c:85
+msgid "Message is marked for copying"
+msgstr "待复制的邮件"
+
+#: src/gtk/icon_legend.c:87
msgid "Locked message"
msgstr "已锁定的邮件"
-#: src/gtk/icon_legend.c:87
+#: src/gtk/icon_legend.c:89
msgid "Folder (normal, opened)"
-msgstr "文件夹(普通，已打开)"
+msgstr "目录(普通，已打开)"
-#: src/gtk/icon_legend.c:88
+#: src/gtk/icon_legend.c:90
msgid "Folder with read messages hidden"
-msgstr "隐藏已读邮件的文件夹"
+msgstr "隐藏已读邮件的目录"
-#: src/gtk/icon_legend.c:89
+#: src/gtk/icon_legend.c:91
msgid "Folder contains marked messages"
-msgstr "含有已标记邮件的文件夹"
+msgstr "含有已标记邮件的目录"
-#: src/gtk/icon_legend.c:122
+#: src/gtk/icon_legend.c:125
msgid "Icon Legend"
msgstr "图标说明"
-#: src/gtk/icon_legend.c:140
+#: src/gtk/icon_legend.c:143
msgid ""
"<span weight=\"bold\">The following icons are used to show the status of "
"messages and folders:</span>"
-msgstr "<span weight=\"bold\">下列图标用于标识邮件和文件夹的状态: </span>"
+msgstr "<span weight=\"bold\">下列图标用于标识邮件和目录的状态: </span>"
-#: src/gtk/inputdialog.c:189
+#: src/gtk/inputdialog.c:188
#, c-format
msgid "Input password for %s on %s:"
msgstr "请输入%s在%s上的密码:"
-#: src/gtk/inputdialog.c:191
+#: src/gtk/inputdialog.c:190
msgid "Input password"
msgstr "输入密码"
-#: src/gtk/inputdialog.c:278
+#: src/gtk/inputdialog.c:277
msgid "Remember this"
msgstr "不再询问"
-#: src/gtk/logwindow.c:87
-msgid "Protocol log"
-msgstr "协议日志"
-
-#: src/gtk/logwindow.c:384
+#: src/gtk/logwindow.c:445
msgid "Clear _Log"
msgstr "清除日志(_L)"
-#: src/gtk/pluginwindow.c:151 src/gtk/pluginwindow.c:156
+#: src/gtk/pluginwindow.c:158 src/gtk/pluginwindow.c:163
msgid ""
"\n"
"\n"
"\n"
"版本: "
-#: src/gtk/pluginwindow.c:154
+#: src/gtk/pluginwindow.c:161
msgid "Error: "
msgstr "错误: "
-#: src/gtk/pluginwindow.c:155
+#: src/gtk/pluginwindow.c:162
msgid "Plugin is not functional."
msgstr "该插件不能工作。"
-#: src/gtk/pluginwindow.c:186
+#: src/gtk/pluginwindow.c:193
msgid "Select the Plugins to load"
msgstr "选择要加载的插件"
-#: src/gtk/pluginwindow.c:201
+#: src/gtk/pluginwindow.c:208
#, c-format
msgid ""
-"The following error occured while loading %s :\n"
+"The following error occurred while loading %s :\n"
"\n"
"%s\n"
msgstr ""
-"å\8a è½½æ¤æ\8f\92件æ\97¶å\8f\91ç\94\9få¦\82ä¸\8bé\94\99误[%s]:\n"
+"å\8a è½½æ\8f\92件[%s]æ\97¶å\8f\91ç\94\9få¦\82ä¸\8bé\94\99误:\n"
"\n"
"%s\n"
-#: src/gtk/pluginwindow.c:287 src/plugins/bogofilter/bogofilter_gtk.c:428
-#: src/plugins/clamav/clamav_plugin_gtk.c:211
-#: src/plugins/dillo_viewer/dillo_prefs.c:75
-#: src/plugins/pgpcore/prefs_gpg.c:525
-#: src/plugins/spamassassin/spamassassin_gtk.c:544
-#: src/plugins/trayicon/trayicon_prefs.c:67
+#: src/gtk/pluginwindow.c:297 src/plugins/bogofilter/bogofilter_gtk.c:429
+#: src/plugins/dillo_viewer/dillo_prefs.c:124
+#: src/plugins/pgpcore/prefs_gpg.c:556
+#: src/plugins/spamassassin/spamassassin_gtk.c:634
+#: src/plugins/trayicon/trayicon_prefs.c:68
msgid "Plugins"
msgstr "插件"
-#: src/gtk/pluginwindow.c:321 src/prefs_summaries.c:211
+#: src/gtk/pluginwindow.c:330
+msgid "Load..."
+msgstr "加载..."
+
+#: src/gtk/pluginwindow.c:331
+msgid "Unload"
+msgstr "卸载"
+
+#: src/gtk/pluginwindow.c:344 src/prefs_summaries.c:218
msgid "Description"
msgstr "描述"
-#: src/gtk/pluginwindow.c:338
+#: src/gtk/pluginwindow.c:366
msgid "More plugins are available from the Claws Mail website."
msgstr "可从Claws Mail网站下载更多插件。"
-#: src/gtk/pluginwindow.c:344 src/prefs_themes.c:862
+#: src/gtk/pluginwindow.c:372 src/prefs_themes.c:862
msgid "Get more..."
msgstr "下载更多..."
-#: src/gtk/pluginwindow.c:354
-msgid "Load Plugin..."
-msgstr "加载插件..."
-
-#: src/gtk/pluginwindow.c:355
-msgid "Unload Plugin"
-msgstr "卸载插件"
-
-#: src/gtk/pluginwindow.c:382
+#: src/gtk/pluginwindow.c:410
msgid "Click here to load one or more plugins"
msgstr "点击此处加载插件(可多选)"
-#: src/gtk/pluginwindow.c:386
+#: src/gtk/pluginwindow.c:414
msgid "Unload the selected plugin"
msgstr "卸载选中的插件"
-#: src/gtk/pluginwindow.c:451
+#: src/gtk/pluginwindow.c:479
msgid "Loaded plugins"
msgstr "已加载的插件"
-#: src/gtk/prefswindow.c:527
+#: src/gtk/prefswindow.c:659
msgid "Page Index"
msgstr "页面"
-#: src/gtk/progressdialog.c:140 src/prefs_account.c:820
-#: src/prefs_filtering_action.c:378 src/prefs_filtering.c:377
-#: src/prefs_filtering.c:1490
+#: src/gtk/progressdialog.c:140 src/prefs_account.c:2974
+#: src/prefs_account.c:2992 src/prefs_account.c:3010 src/prefs_account.c:3028
+#: src/prefs_account.c:3046 src/prefs_account.c:3064 src/prefs_account.c:3083
+#: src/prefs_account.c:3102 src/prefs_filtering_action.c:1346
+#: src/prefs_filtering.c:391 src/prefs_filtering.c:1893
msgid "Account"
msgstr "帐号"
-#: src/gtk/progressdialog.c:148 src/gtk/sslcertwindow.c:136
-#: src/prefs_summary_column.c:80 src/summaryview.c:2415
-msgid "Status"
-msgstr "状态"
-
-#: src/gtk/quicksearch.c:333
+#: src/gtk/quicksearch.c:414
msgid "all messages"
msgstr "所有邮件"
-#: src/gtk/quicksearch.c:334
+#: src/gtk/quicksearch.c:415
msgid "messages whose age is greater than #"
msgstr "比# 旧的邮件"
-#: src/gtk/quicksearch.c:335
+#: src/gtk/quicksearch.c:416
msgid "messages whose age is less than #"
msgstr "比# 新的邮件"
-#: src/gtk/quicksearch.c:336
+#: src/gtk/quicksearch.c:417
msgid "messages which contain S in the message body"
msgstr "在文件主体中包含 S 的邮件"
-#: src/gtk/quicksearch.c:337
+#: src/gtk/quicksearch.c:418
msgid "messages which contain S in the whole message"
msgstr "整篇文章中包含 S 的邮件"
-#: src/gtk/quicksearch.c:338
+#: src/gtk/quicksearch.c:419
msgid "messages carbon-copied to S"
msgstr "被抄送给 S 的邮件"
-#: src/gtk/quicksearch.c:339
+#: src/gtk/quicksearch.c:420
msgid "message is either to: or cc: to S"
msgstr "寄给或是副本抄送给 S 的邮件"
-#: src/gtk/quicksearch.c:340
+#: src/gtk/quicksearch.c:421
msgid "deleted messages"
msgstr "已删除的邮件"
-#: src/gtk/quicksearch.c:341
+#: src/gtk/quicksearch.c:422
msgid "messages which contain S in the Sender field"
msgstr "在发信人栏中包含S的邮件"
-#: src/gtk/quicksearch.c:342
+#: src/gtk/quicksearch.c:423
msgid "true if execute \"S\" succeeds"
msgstr "如果执行 \"S\"成功"
-#: src/gtk/quicksearch.c:343
+#: src/gtk/quicksearch.c:424
msgid "messages originating from user S"
msgstr "由S所发出的邮件"
-#: src/gtk/quicksearch.c:344
+#: src/gtk/quicksearch.c:425
msgid "forwarded messages"
msgstr "已转发的邮件"
-#: src/gtk/quicksearch.c:345
+#: src/gtk/quicksearch.c:426
msgid "messages which contain header S"
msgstr "在信头中包含S的邮件"
-#: src/gtk/quicksearch.c:346
+#: src/gtk/quicksearch.c:427
msgid "messages which contain S in Message-ID header"
msgstr "在邮件信头中包含 S 的邮件"
-#: src/gtk/quicksearch.c:347
-msgid "messages which contain S in inreplyto header"
+#: src/gtk/quicksearch.c:428
+#, fuzzy
+msgid "messages which contain S in In-Reply-To header"
msgstr "在回复信头中包含S的邮件"
-#: src/gtk/quicksearch.c:348
+#: src/gtk/quicksearch.c:429
msgid "messages which are marked with color #"
msgstr "带颜色标记#的邮件"
-#: src/gtk/quicksearch.c:349
+#: src/gtk/quicksearch.c:430
msgid "locked messages"
msgstr "已锁定的邮件"
-#: src/gtk/quicksearch.c:350
+#: src/gtk/quicksearch.c:431
msgid "messages which are in newsgroup S"
msgstr "在新闻组S中的邮件"
-#: src/gtk/quicksearch.c:351
+#: src/gtk/quicksearch.c:432
msgid "new messages"
msgstr "新邮件"
-#: src/gtk/quicksearch.c:352
+#: src/gtk/quicksearch.c:433
msgid "old messages"
msgstr "旧邮件"
-#: src/gtk/quicksearch.c:353
+#: src/gtk/quicksearch.c:434
msgid "incomplete messages (not entirely downloaded)"
msgstr "不完整的邮件(未完全下载)"
-#: src/gtk/quicksearch.c:354
+#: src/gtk/quicksearch.c:435
msgid "messages which have been replied to"
msgstr "已回复的邮件"
-#: src/gtk/quicksearch.c:355
+#: src/gtk/quicksearch.c:436
msgid "read messages"
msgstr "已读邮件"
-#: src/gtk/quicksearch.c:356
+#: src/gtk/quicksearch.c:437
msgid "messages which contain S in subject"
msgstr "主题中包含S的邮件"
-#: src/gtk/quicksearch.c:357
+#: src/gtk/quicksearch.c:438
msgid "messages whose score is equal to #"
msgstr "得分与#一样高的邮件"
-#: src/gtk/quicksearch.c:358
+#: src/gtk/quicksearch.c:439
msgid "messages whose score is greater than #"
msgstr "得分较#高的邮件"
-#: src/gtk/quicksearch.c:359
+#: src/gtk/quicksearch.c:440
msgid "messages whose score is lower than #"
msgstr "得分较#低的邮件"
-#: src/gtk/quicksearch.c:360
+#: src/gtk/quicksearch.c:441
msgid "messages whose size is equal to #"
msgstr "文件与#一样大的邮件"
-#: src/gtk/quicksearch.c:361
+#: src/gtk/quicksearch.c:442
msgid "messages whose size is greater than #"
msgstr "文件比#大的邮件"
-#: src/gtk/quicksearch.c:362
+#: src/gtk/quicksearch.c:443
msgid "messages whose size is smaller than #"
msgstr "文件比#小的邮件"
-#: src/gtk/quicksearch.c:363
+#: src/gtk/quicksearch.c:444
msgid "messages which have been sent to S"
msgstr "已经送给S的邮件"
-#: src/gtk/quicksearch.c:364
+#: src/gtk/quicksearch.c:445
+msgid "messages which tags contain S"
+msgstr "在标签中包含S的邮件"
+
+#: src/gtk/quicksearch.c:446
+msgid "messages which have tag(s)"
+msgstr "已经包含标签的邮件"
+
+#: src/gtk/quicksearch.c:447
msgid "marked messages"
msgstr "已标记的邮件"
-#: src/gtk/quicksearch.c:365
+#: src/gtk/quicksearch.c:448
msgid "unread messages"
msgstr "未读邮件"
-#: src/gtk/quicksearch.c:366
+#: src/gtk/quicksearch.c:449
msgid "messages which contain S in References header"
msgstr "在References信息头里含有S的邮件"
-#: src/gtk/quicksearch.c:367
+#: src/gtk/quicksearch.c:450
#, c-format
msgid "messages returning 0 when passed to command - %F is message file"
msgstr "邮件传送给命令进行处理时返回0 - %F为邮件文件名称"
-#: src/gtk/quicksearch.c:368
+#: src/gtk/quicksearch.c:451
msgid "messages which contain S in X-Label header"
msgstr "在X-Label信息头里含有S的邮件"
-#: src/gtk/quicksearch.c:370
+#: src/gtk/quicksearch.c:453
msgid "logical AND operator"
msgstr "逻辑运算AND"
-#: src/gtk/quicksearch.c:371
+#: src/gtk/quicksearch.c:454
msgid "logical OR operator"
msgstr "逻辑运算OR"
-#: src/gtk/quicksearch.c:372
+#: src/gtk/quicksearch.c:455
msgid "logical NOT operator"
msgstr "逻辑运算NOT"
-#: src/gtk/quicksearch.c:373
+#: src/gtk/quicksearch.c:456
msgid "case sensitive search"
msgstr "区分大小写的搜寻"
-#: src/gtk/quicksearch.c:375
+#: src/gtk/quicksearch.c:458
msgid "all filtering expressions are allowed"
msgstr "允许使用所有过滤表达式"
-#: src/gtk/quicksearch.c:383 src/summary_search.c:397
+#: src/gtk/quicksearch.c:466 src/summary_search.c:401
msgid "Extended Search"
msgstr "高级搜索"
-#: src/gtk/quicksearch.c:384
+#: src/gtk/quicksearch.c:467
msgid ""
"Extended Search allows the user to define criteria that messages must have "
"in order to match and be displayed in the message list.\n"
-"\n"
"The following symbols can be used:"
msgstr ""
-"高级搜索允许用户自行定义较为复杂的条件。\n"
+"高级搜索允许用户自行定义较为复杂的条件。搜索结果将显示在邮件列表窗口。\n"
"\n"
"可以使用如下一些符号:"
-#: src/gtk/quicksearch.c:480 src/prefs_compose_writing.c:224
-#: src/prefs_filtering_action.c:1080 src/prefs_matcher.c:159
-#: src/prefs_matcher.c:1878 src/prefs_summary_column.c:82
-#: src/prefs_template.c:190 src/quote_fmt.c:47 src/summaryview.c:486
-msgid "Subject"
-msgstr "主题"
-
-#: src/gtk/quicksearch.c:484 src/prefs_filtering_action.c:1081
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1879
-#: src/prefs_summary_column.c:83 src/quote_fmt.c:42 src/summaryview.c:487
-msgid "From"
-msgstr "发信人"
-
-#: src/gtk/quicksearch.c:488 src/prefs_filtering_action.c:1082
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1880
-#: src/prefs_summary_column.c:84 src/prefs_template.c:187 src/quote_fmt.c:48
-#: src/summaryview.c:488
-msgid "To"
-msgstr "收信人"
+#: src/gtk/quicksearch.c:586
+msgid "From/To/Subject/Tag"
+msgstr "发件人/收件人/主题/标签"
-#: src/gtk/quicksearch.c:499
+#: src/gtk/quicksearch.c:597
msgid "Recursive"
-msgstr "搜索子文件夹"
+msgstr "搜索子目录"
-#: src/gtk/quicksearch.c:509
+#: src/gtk/quicksearch.c:607
msgid "Sticky"
-msgstr "切换文件夹时保持有效"
+msgstr "切换目录时保持有效"
-#: src/gtk/quicksearch.c:519
+#: src/gtk/quicksearch.c:617
msgid "Type-ahead"
msgstr "递增式"
-#: src/gtk/quicksearch.c:550 src/gtk/quicksearch.c:643
+#: src/gtk/quicksearch.c:629
+msgid "Run on select"
+msgstr "选中时运行"
+
+#: src/gtk/quicksearch.c:666 src/gtk/quicksearch.c:758
msgid " Clear "
msgstr " 清除 "
-#: src/gtk/quicksearch.c:558
+#: src/gtk/quicksearch.c:674
msgid "Clear the current search"
msgstr "清除当前搜索"
-#: src/gtk/quicksearch.c:573 src/summary_search.c:350
+#: src/gtk/quicksearch.c:689 src/summary_search.c:354
msgid "Edit search criteria"
msgstr "编辑搜索条件"
-#: src/gtk/quicksearch.c:579 src/gtk/quicksearch.c:641
+#: src/gtk/quicksearch.c:695 src/gtk/quicksearch.c:756
msgid " Extended Symbols... "
msgstr "扩展符号"
-#: src/gtk/quicksearch.c:587
+#: src/gtk/quicksearch.c:703
msgid "Information about extended symbols"
msgstr "扩展符号说明"
-#: src/gtk/quicksearch.c:659
+#: src/gtk/quicksearch.c:774
msgid "Info"
msgstr "说明"
-#: src/gtk/quicksearch.c:661
+#: src/gtk/quicksearch.c:776
msgid "Clear"
msgstr "清除 "
-#: src/gtk/quicksearch.c:1086 src/summaryview.c:1132
+#: src/gtk/quicksearch.c:1259 src/summaryview.c:1288
#, c-format
msgid "Searching in %s... \n"
msgstr "正在搜索(%s)... \n"
-#: src/gtk/sslcertwindow.c:129 src/gtk/sslcertwindow.c:282
-#: src/gtk/sslcertwindow.c:322 src/gtk/sslcertwindow.c:376
+#: src/gtk/sslcertwindow.c:85 src/gtk/sslcertwindow.c:96
+#: src/gtk/sslcertwindow.c:102 src/gtk/sslcertwindow.c:109
+#: src/gtk/sslcertwindow.c:120 src/gtk/sslcertwindow.c:126
+#: src/gtk/sslcertwindow.c:144 src/gtk/sslcertwindow.c:151
+#: src/gtk/sslcertwindow.c:166 src/gtk/sslcertwindow.c:171
+#: src/gtk/sslcertwindow.c:178 src/gtk/sslcertwindow.c:193
+msgid "<not in certificate>"
+msgstr "<不在认证之内>"
+
+#: src/gtk/sslcertwindow.c:219 src/gtk/sslcertwindow.c:375
+#: src/gtk/sslcertwindow.c:419 src/gtk/sslcertwindow.c:477
msgid "correct"
msgstr "正确"
-#: src/gtk/sslcertwindow.c:134
+#: src/gtk/sslcertwindow.c:224
msgid "Owner"
msgstr "所有者"
-#: src/gtk/sslcertwindow.c:135
+#: src/gtk/sslcertwindow.c:225
msgid "Signer"
msgstr "歌者"
-#: src/gtk/sslcertwindow.c:142 src/gtk/sslcertwindow.c:163
+#: src/gtk/sslcertwindow.c:232 src/gtk/sslcertwindow.c:253
#: src/prefs_themes.c:879
msgid "Name: "
msgstr "名称: "
-#: src/gtk/sslcertwindow.c:149 src/gtk/sslcertwindow.c:170
+#: src/gtk/sslcertwindow.c:239 src/gtk/sslcertwindow.c:260
msgid "Organization: "
msgstr "组织"
-#: src/gtk/sslcertwindow.c:156 src/gtk/sslcertwindow.c:177
+#: src/gtk/sslcertwindow.c:246 src/gtk/sslcertwindow.c:267
msgid "Location: "
msgstr "位置"
-#: src/gtk/sslcertwindow.c:184
+#: src/gtk/sslcertwindow.c:274
msgid "Fingerprint: "
msgstr "指纹"
-#: src/gtk/sslcertwindow.c:190
+#: src/gtk/sslcertwindow.c:280
msgid "Signature status: "
msgstr "签名状况: "
-#: src/gtk/sslcertwindow.c:196
+#: src/gtk/sslcertwindow.c:286
msgid "Expires on: "
msgstr "有效期至: "
-#: src/gtk/sslcertwindow.c:257
+#: src/gtk/sslcertwindow.c:347
#, c-format
msgid "SSL certificate for %s"
msgstr "%s的SSL认证"
-#: src/gtk/sslcertwindow.c:273
+#: src/gtk/sslcertwindow.c:363
#, c-format
msgid ""
"Certificate for %s is unknown.\n"
"对 %s 的认证是未知的。\n"
"是否接受？"
-#: src/gtk/sslcertwindow.c:284 src/gtk/sslcertwindow.c:324
-#: src/gtk/sslcertwindow.c:378
+#: src/gtk/sslcertwindow.c:377 src/gtk/sslcertwindow.c:421
+#: src/gtk/sslcertwindow.c:479
#, c-format
msgid "Signature status: %s"
msgstr "签名状态: %s"
-#: src/gtk/sslcertwindow.c:291 src/gtk/sslcertwindow.c:331
+#: src/gtk/sslcertwindow.c:384 src/gtk/sslcertwindow.c:428
msgid "_View certificate"
msgstr "查看认证(_V)"
-#: src/gtk/sslcertwindow.c:296
+#: src/gtk/sslcertwindow.c:389
msgid "Unknown SSL Certificate"
msgstr "不明的SSL认证"
-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:337
-#: src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:390 src/gtk/sslcertwindow.c:434
+#: src/gtk/sslcertwindow.c:491
msgid "_Cancel connection"
msgstr "取消连接(_C)"
-#: src/gtk/sslcertwindow.c:297 src/gtk/sslcertwindow.c:390
+#: src/gtk/sslcertwindow.c:390 src/gtk/sslcertwindow.c:491
msgid "_Accept and save"
msgstr "接受并保存(_A)"
-#: src/gtk/sslcertwindow.c:313
+#: src/gtk/sslcertwindow.c:406
#, c-format
msgid ""
"Certificate for %s is expired.\n"
"对 %s 的认证已经过期。\n"
"是否继续？"
-#: src/gtk/sslcertwindow.c:336
+#: src/gtk/sslcertwindow.c:433
msgid "Expired SSL Certificate"
msgstr "已过期的SSL认证"
-#: src/gtk/sslcertwindow.c:337
+#: src/gtk/sslcertwindow.c:434
msgid "_Accept"
msgstr "接受(_A)"
-#: src/gtk/sslcertwindow.c:355
+#: src/gtk/sslcertwindow.c:452
msgid "New certificate:"
msgstr "新的认证:"
-#: src/gtk/sslcertwindow.c:360
+#: src/gtk/sslcertwindow.c:457
msgid "Known certificate:"
msgstr "已知的认证:"
-#: src/gtk/sslcertwindow.c:367
+#: src/gtk/sslcertwindow.c:464
#, c-format
msgid "Certificate for %s has changed. Do you want to accept it?"
msgstr "%s的认证已更改。是否接受？"
-#: src/gtk/sslcertwindow.c:385
+#: src/gtk/sslcertwindow.c:486
msgid "_View certificates"
msgstr "查看认证(_V)"
-#: src/gtk/sslcertwindow.c:389
+#: src/gtk/sslcertwindow.c:490
msgid "Changed SSL Certificate"
msgstr "更改SSL认证"
-#: src/headerview.c:195 src/summaryview.c:2823 src/summaryview.c:2834
+#: src/headerview.c:112
+msgid "Tags:"
+msgstr "标签"
+
+#: src/headerview.c:221 src/summaryview.c:3115 src/summaryview.c:3125
msgid "(No From)"
msgstr "(没有发信人)"
-#: src/headerview.c:210 src/summaryview.c:2858 src/summaryview.c:2861
+#: src/headerview.c:236 src/summaryview.c:3148 src/summaryview.c:3151
msgid "(No Subject)"
msgstr "(没有主题)"
-#: src/image_viewer.c:284
+#: src/image_viewer.c:97
+msgid "Error:"
+msgstr "错误:"
+
+#: src/image_viewer.c:301
msgid "Filename:"
msgstr "文件名"
-#: src/image_viewer.c:291
+#: src/image_viewer.c:308
msgid "Filesize:"
msgstr "文件大小 :"
-#: src/image_viewer.c:312
+#: src/image_viewer.c:357
msgid "Load Image"
msgstr "加载图片"
-#: src/image_viewer.c:318
-msgid "Content-Type:"
+#: src/imap.c:554
+msgid "IMAP4 connection broken\n"
+msgstr "IMAP4连接已经断开\n"
+
+#: src/imap.c:578
+#, fuzzy
+msgid "IMAP error: authenticated\n"
+msgstr "认证时发生错误\n"
+
+#: src/imap.c:581
+#, fuzzy
+msgid "IMAP error: not authenticated\n"
+msgstr "认证时发生错误\n"
+
+#: src/imap.c:584
+msgid "IMAP error: bad state\n"
+msgstr ""
+
+#: src/imap.c:587
+msgid "IMAP error: stream error\n"
+msgstr ""
+
+#: src/imap.c:590
+msgid ""
+"IMAP error: parse error (very probably non-RFC compliance from the server)\n"
+msgstr ""
+
+#: src/imap.c:594
+msgid "IMAP error: connection refused\n"
+msgstr ""
+
+#: src/imap.c:597
+msgid "IMAP error: memory error\n"
+msgstr ""
+
+#: src/imap.c:600
+msgid "IMAP error: fatal error\n"
+msgstr ""
+
+#: src/imap.c:603
+msgid ""
+"IMAP error: protocol error(very probably non-RFC compliance from the "
+"server)\n"
+msgstr ""
+
+#: src/imap.c:607
+msgid "IMAP error: connection not accepted\n"
+msgstr ""
+
+#: src/imap.c:610
+msgid "IMAP error: APPEND error\n"
+msgstr ""
+
+#: src/imap.c:613
+msgid "IMAP error: NOOP error\n"
+msgstr ""
+
+#: src/imap.c:616
+msgid "IMAP error: LOGOUT error\n"
+msgstr ""
+
+#: src/imap.c:619
+msgid "IMAP error: CAPABILITY error\n"
+msgstr ""
+
+#: src/imap.c:622
+msgid "IMAP error: CHECK error\n"
+msgstr ""
+
+#: src/imap.c:625
+msgid "IMAP error: CLOSE error\n"
+msgstr ""
+
+#: src/imap.c:628
+msgid "IMAP error: EXPUNGE error\n"
+msgstr ""
+
+#: src/imap.c:631
+msgid "IMAP error: COPY error\n"
+msgstr ""
+
+#: src/imap.c:634
+msgid "IMAP error: UID COPY error\n"
+msgstr ""
+
+#: src/imap.c:637
+msgid "IMAP error: CREATE error\n"
+msgstr ""
+
+#: src/imap.c:640
+msgid "IMAP error: DELETE error\n"
+msgstr ""
+
+#: src/imap.c:643
+msgid "IMAP error: EXAMINE error\n"
+msgstr ""
+
+#: src/imap.c:646
+msgid "IMAP error: FETCH error\n"
+msgstr ""
+
+#: src/imap.c:649
+msgid "IMAP error: UID FETCH error\n"
+msgstr ""
+
+#: src/imap.c:652
+msgid "IMAP error: LIST error\n"
+msgstr ""
+
+#: src/imap.c:655
+msgid "IMAP error: LOGIN error\n"
+msgstr ""
+
+#: src/imap.c:658
+msgid "IMAP error: LSUB error\n"
+msgstr ""
+
+#: src/imap.c:661
+msgid "IMAP error: RENAME error\n"
+msgstr ""
+
+#: src/imap.c:664
+msgid "IMAP error: SEARCH error\n"
+msgstr ""
+
+#: src/imap.c:667
+msgid "IMAP error: UID SEARCH error\n"
+msgstr ""
+
+#: src/imap.c:670
+msgid "IMAP error: SELECT error\n"
+msgstr ""
+
+#: src/imap.c:673
+msgid "IMAP error: STATUS error\n"
+msgstr ""
+
+#: src/imap.c:676
+msgid "IMAP error: STORE error\n"
+msgstr ""
+
+#: src/imap.c:679
+msgid "IMAP error: UID STORE error\n"
+msgstr ""
+
+#: src/imap.c:682
+msgid "IMAP error: SUBSCRIBE error\n"
+msgstr ""
+
+#: src/imap.c:685
+msgid "IMAP error: UNSUBSCRIBE error\n"
+msgstr ""
+
+#: src/imap.c:688
+msgid "IMAP error: STARTTLS error\n"
+msgstr ""
+
+#: src/imap.c:691
+msgid "IMAP error: INVAL error\n"
+msgstr ""
+
+#: src/imap.c:694
+msgid "IMAP error: EXTENSION error\n"
+msgstr ""
+
+#: src/imap.c:697
+msgid "IMAP error: SASL error\n"
+msgstr ""
+
+#: src/imap.c:702
+msgid "IMAP error: SSL error\n"
+msgstr ""
+
+#: src/imap.c:707
+#, c-format
+msgid "IMAP error: Unknown error [%d]\n"
msgstr ""
-#: src/imap.c:633
+#: src/imap.c:890
msgid ""
"\n"
"\n"
"CRAM-MD5登录方式仅仅在libetpan编译进了SASL支持并且CRAM-MD5 SASL插件已经加载的"
"情况下可用。"
-#: src/imap.c:640
+#: src/imap.c:896
+#, fuzzy
+msgid ""
+"\n"
+"\n"
+"DIGEST-MD5 logins only work if libetpan has been compiled with SASL support "
+"and the DIGEST-MD5 SASL plugin is installed."
+msgstr ""
+"\n"
+"\n"
+"CRAM-MD5登录方式仅仅在libetpan编译进了SASL支持并且CRAM-MD5 SASL插件已经加载的"
+"情况下可用。"
+
+#: src/imap.c:903
#, c-format
msgid "Connection to %s failed: login refused.%s"
msgstr "连接到 %s 失败: 登录被拒绝。%s"
-#: src/imap.c:644
+#: src/imap.c:907
#, c-format
msgid "Connection to %s failed: login refused.%s\n"
msgstr "连接到 %s 失败: 登录被拒绝。%s\n"
-#: src/imap.c:661
+#: src/imap.c:924
#, c-format
msgid "Connecting to %s failed"
msgstr "连接到 %s 失败"
-#: src/imap.c:666 src/imap.c:669
+#: src/imap.c:930 src/imap.c:933
#, c-format
msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
msgstr "与 %s 的IMAP4连接已经断开。正在重新连接...\n"
-#: src/imap.c:718 src/imap.c:2396 src/imap.c:2894 src/imap.c:2979
-#: src/imap.c:3313 src/imap.c:4071
+#: src/imap.c:962 src/imap.c:2994 src/imap.c:3633 src/imap.c:3723
+#: src/imap.c:3900 src/imap.c:4673
msgid "Claws Mail needs network access in order to access the IMAP server."
msgstr "Claws Mail需要访问网络才能连接IMAP服务。"
-#: src/imap.c:790 src/inc.c:770 src/news.c:295 src/send_message.c:299
+#: src/imap.c:1044 src/inc.c:803 src/news.c:349 src/send_message.c:299
msgid "Insecure connection"
msgstr "不安全的连接"
-#: src/imap.c:791 src/inc.c:771 src/news.c:296 src/send_message.c:300
+#: src/imap.c:1045 src/inc.c:804 src/news.c:350 src/send_message.c:300
msgid ""
"This connection is configured to be secured using SSL, but SSL is not "
"available in this build of Claws Mail. \n"
"有加入)。\n"
"请问是否要继续连接该服务器? 如果继续的话，并不能保证通讯是安全的。"
-#: src/imap.c:797 src/inc.c:777 src/news.c:302 src/send_message.c:306
+#: src/imap.c:1051 src/inc.c:810 src/news.c:356 src/send_message.c:306
msgid "Con_tinue connecting"
msgstr "继续连接(_t)"
-#: src/imap.c:807
+#: src/imap.c:1061
#, c-format
msgid "Connecting to IMAP4 server: %s..."
msgstr "连接到 IMAP4 服务器: %s..."
-#: src/imap.c:845
+#: src/imap.c:1105
#, c-format
msgid "Can't connect to IMAP4 server: %s:%d"
msgstr "无法连接到 IMAP4 服务器: %s:%d"
-#: src/imap.c:848
+#: src/imap.c:1108
#, c-format
msgid "Can't connect to IMAP4 server: %s:%d\n"
msgstr "无法连接到 IMAP4 服务器: %s:%d\n"
-#: src/imap.c:877 src/imap.c:2702
+#: src/imap.c:1140 src/imap.c:3392
msgid "Can't start TLS session.\n"
msgstr "无法启动TLS。\n"
-#: src/imap.c:914
+#: src/imap.c:1177
#, c-format
msgid "Connecting to IMAP4 server %s...\n"
msgstr "正在连接 IMAP4 服务器 %s...\n"
-#: src/imap.c:925 src/imap.c:928
+#: src/imap.c:1188 src/imap.c:1191
#, c-format
msgid "Couldn't login to IMAP server %s."
msgstr "无法登录到 IMAP 服务器 %s。"
-#: src/imap.c:1101
+#: src/imap.c:1585
msgid "Adding messages..."
msgstr "正在添加邮件..."
-#: src/imap.c:1253 src/mh.c:500
+#: src/imap.c:1778 src/mh.c:517
msgid "Copying messages..."
msgstr "正在复制邮件..."
-#: src/imap.c:1429
+#: src/imap.c:1968
msgid "can't set deleted flags\n"
msgstr "不能设置删除标记\n"
-#: src/imap.c:1435 src/imap.c:3822
+#: src/imap.c:1974 src/imap.c:4329
msgid "can't expunge\n"
msgstr "无法擦除\n"
-#: src/imap.c:1762
+#: src/imap.c:2307
#, c-format
msgid "Looking for unsubscribed folders in %s..."
-msgstr ""
+msgstr "正在%s中查找未订阅的目录..."
-#: src/imap.c:1765
+#: src/imap.c:2310
#, c-format
msgid "Looking for subfolders of %s..."
msgstr "正在查找%s的子目录..."
-#: src/imap.c:2001
+#: src/imap.c:2546
msgid "can't create mailbox: LIST failed\n"
msgstr "无法创建收信夹: LIST失败\n"
-#: src/imap.c:2017
+#: src/imap.c:2561
msgid "can't create mailbox\n"
msgstr "无法启动收信夹\n"
-#: src/imap.c:2104
+#: src/imap.c:2651
msgid "New folder name must not contain the namespace path separator"
msgstr "新目录并不能包含名字空间分隔符"
-#: src/imap.c:2135
+#: src/imap.c:2683
#, c-format
msgid "can't rename mailbox: %s to %s\n"
msgstr "无法将邮箱%s 重新命名为 %s\n"
-#: src/imap.c:2227
+#: src/imap.c:2784
msgid "can't delete mailbox\n"
msgstr "无法删除信夹\n"
-#: src/imap.c:2473
+#: src/imap.c:3075
msgid "LIST failed\n"
msgstr ""
-#: src/imap.c:2590
+#: src/imap.c:3154
+msgid "Flagging messages..."
+msgstr "正在标记邮件..."
+
+#: src/imap.c:3244
#, c-format
msgid "can't select folder: %s\n"
-msgstr "无法选择文件夹: %s\n"
+msgstr "无法选择目录: %s\n"
-#: src/imap.c:2699
+#: src/imap.c:3389
msgid "Server requires TLS to log in.\n"
msgstr "需要TLS特性才能登录服务器。\n"
-#: src/imap.c:2708
+#: src/imap.c:3399
msgid "Can't refresh capabilities.\n"
msgstr "无法更新能力基线数据。\n"
-#: src/imap.c:2713
+#: src/imap.c:3404
#, c-format
msgid ""
"Connection to %s failed: server requires TLS, but Claws Mail has been "
"不能成功连接上%s: 需要TLS特性才能登录该服务器，但编译时Claws Mail没有指定要包"
"含OpenSSL支持。\n"
-#: src/imap.c:2721
+#: src/imap.c:3412
msgid "Server logins are disabled.\n"
msgstr "登录功能已被禁用。\n"
-#: src/imap.c:2899
+#: src/imap.c:3638
msgid "Fetching message..."
msgstr "正在收取邮件..."
-#: src/imap.c:3066
-#, c-format
-msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "iconv无法将UTF-7转换成%s\n"
-
-#: src/imap.c:3096
-#, c-format
-msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "iconv无法将%s转换成UTF-7\n"
-
-#: src/imap.c:3140
-msgid "iconv cannot convert UTF-8 to UTF-7\n"
-msgstr "iconv无法将UTF-8转换成UTF-7\n"
-
-#: src/imap.c:3807
+#: src/imap.c:4315
#, c-format
msgid "can't set deleted flags: %d\n"
msgstr "不能设置删除标记: %d\n"
-#: src/imap.c:4532
+#: src/imap.c:5320
msgid ""
"You have one or more IMAP accounts defined. However this version of Claws "
"Mail has been built without IMAP support; your IMAP account(s) are "
"\n"
"你需要安装libetpan并重新编译Claws Mail。"
-#: src/imap_gtk.c:57 src/mh_gtk.c:50
+#: src/imap_gtk.c:58 src/mh_gtk.c:50
msgid "/Create _new folder..."
-msgstr "/创建新文件夹(_n)..."
+msgstr "/创建新目录(_n)..."
-#: src/imap_gtk.c:59 src/mh_gtk.c:52
+#: src/imap_gtk.c:60 src/mh_gtk.c:52
msgid "/_Rename folder..."
-msgstr "/重命名文件夹(_R)..."
+msgstr "/重命名目录(_R)..."
-#: src/imap_gtk.c:60 src/mh_gtk.c:53
+#: src/imap_gtk.c:61 src/mh_gtk.c:53
msgid "/M_ove folder..."
-msgstr "/移动文件夹(_o)..."
+msgstr "/移动目录(_o)..."
-#: src/imap_gtk.c:61 src/mh_gtk.c:54
+#: src/imap_gtk.c:62 src/mh_gtk.c:54
msgid "/Cop_y folder..."
-msgstr "/复制文件夹(_y)..."
+msgstr "/复制目录(_y)..."
-#: src/imap_gtk.c:63 src/mh_gtk.c:56
+#: src/imap_gtk.c:64 src/mh_gtk.c:56
msgid "/_Delete folder..."
-msgstr "/删除文件夹(_D)..."
+msgstr "/删除目录(_D)..."
-#: src/imap_gtk.c:65
+#: src/imap_gtk.c:66
msgid "/_Synchronise"
msgstr "/同步(_S)"
-#: src/imap_gtk.c:66 src/news_gtk.c:56
+#: src/imap_gtk.c:67 src/news_gtk.c:57
msgid "/Down_load messages"
msgstr "/下载邮件(_l)"
-#: src/imap_gtk.c:68
+#: src/imap_gtk.c:69
msgid "/S_ubscriptions"
msgstr "/订阅(_u)"
-#: src/imap_gtk.c:69
+#: src/imap_gtk.c:70
msgid "/Subscriptions/Show only subscribed _folders"
-msgstr "/订阅/只显示已订阅的邮件夹"
+msgstr "/订阅/只显示已订阅的目录"
-#: src/imap_gtk.c:71
+#: src/imap_gtk.c:72
msgid "/Subscriptions/---"
msgstr "/选项/---"
-#: src/imap_gtk.c:72
+#: src/imap_gtk.c:73
msgid "/Subscriptions/_Subscribe..."
msgstr "/订阅/订阅(_S)..."
-#: src/imap_gtk.c:73
+#: src/imap_gtk.c:74
msgid "/Subscriptions/_Unsubscribe..."
msgstr "/订阅/取消订阅(_U)..."
-#: src/imap_gtk.c:76 src/mh_gtk.c:58 src/news_gtk.c:58
+#: src/imap_gtk.c:77 src/mh_gtk.c:58 src/news_gtk.c:59
msgid "/_Check for new messages"
msgstr "/检查新邮件(_C)"
-#: src/imap_gtk.c:77 src/mh_gtk.c:59
+#: src/imap_gtk.c:78 src/mh_gtk.c:59
msgid "/C_heck for new folders"
-msgstr "/检查新文件夹(_C)"
+msgstr "/检查新目录(_C)"
-#: src/imap_gtk.c:78 src/mh_gtk.c:60
+#: src/imap_gtk.c:79 src/mh_gtk.c:60
msgid "/R_ebuild folder tree"
-msgstr "/重新建立文件夹树(_e)"
+msgstr "/重新建立目录树(_e)"
-#: src/imap_gtk.c:155
+#: src/imap_gtk.c:156
msgid ""
"Input the name of new folder:\n"
"(if you want to create a folder to store subfolders\n"
-"and no mails, append '/' at the end of the name)"
+"only and no mail, append '/' to the folder name)"
msgstr ""
-"请输入新文件夹的名字:\n"
-"(如果想创建一个可包含子夹但不包含邮件的文件夹，\n"
+"请输入新目录的名字:\n"
+"(如果想创建一个可包含子夹但不包含邮件的目录，\n"
"请在名字的后面加上'/')"
-#: src/imap_gtk.c:213 src/mh_gtk.c:231
+#: src/imap_gtk.c:214 src/mh_gtk.c:231
#, c-format
msgid "Input new name for '%s':"
msgstr "请输入'%s'的新名字:"
-#: src/imap_gtk.c:215 src/mh_gtk.c:233
+#: src/imap_gtk.c:216 src/mh_gtk.c:233
msgid "Rename folder"
-msgstr "重新命名文件夹"
+msgstr "重新命名目录"
-#: src/imap_gtk.c:229
+#: src/imap_gtk.c:230
#, c-format
msgid "`%c' can't be included in folder name."
-msgstr "文件夹名称不能包含`%c'。"
+msgstr "目录名称不能包含`%c'。"
-#: src/imap_gtk.c:246 src/mh_gtk.c:258
+#: src/imap_gtk.c:247 src/mh_gtk.c:258
msgid ""
"The folder could not be renamed.\n"
"The new folder name is not allowed."
"不能重命名该目录。\n"
"新指定的目录名不合法。"
-#: src/imap_gtk.c:298 src/mh_gtk.c:179
+#: src/imap_gtk.c:299 src/mh_gtk.c:179
#, c-format
msgid ""
"All folders and messages under '%s' will be permanently deleted. Recovery "
"\n"
"Do you really want to delete?"
msgstr ""
-"在'%s'之下的所有文件夹以及其中所有的邮件将被永久删除，不可能恢复。\n"
+"在'%s'之下的所有目录以及其中所有的邮件将被永久删除，不可能恢复。\n"
"\n"
"确实要删除吗？"
-#: src/imap_gtk.c:320 src/mh_gtk.c:201 src/news_gtk.c:241
+#: src/imap_gtk.c:321 src/mh_gtk.c:201 src/news_gtk.c:242
#, c-format
msgid "Can't remove the folder '%s'."
-msgstr "无法删除文件夹'%s'。"
-
-#: src/imap_gtk.c:380 src/news_gtk.c:302
-#, c-format
-msgid "Error occurred while downloading messages in '%s'."
-msgstr "从 `%s' 下载邮件时发生错误。"
+msgstr "无法删除目录'%s'。"
-#: src/imap_gtk.c:432
+#: src/imap_gtk.c:448
#, c-format
msgid "Do you want to search for unsubscribed subfolders of '%s'?"
msgstr "是否要搜索'%s'的尚未订阅的子目录?"
-#: src/imap_gtk.c:435
+#: src/imap_gtk.c:451
msgid "Search recursively"
msgstr "递归搜索"
-#: src/imap_gtk.c:440 src/imap_gtk.c:483
+#: src/imap_gtk.c:456 src/imap_gtk.c:513
msgid "Subscriptions"
msgstr "订阅"
-#: src/imap_gtk.c:441
+#: src/imap_gtk.c:457
msgid "+_Search"
msgstr "+搜索(_S)"
-#: src/imap_gtk.c:450
+#: src/imap_gtk.c:467
#, c-format
msgid "Choose a subfolder of %s to subscribe to: "
msgstr "请选择%s的一个子目录订阅: "
-#: src/imap_gtk.c:452
+#: src/imap_gtk.c:476
msgid "Subscribe"
msgstr "订阅"
-#: src/imap_gtk.c:454 src/imap_gtk.c:456
+#: src/imap_gtk.c:478 src/imap_gtk.c:480
msgid "All of them"
msgstr "全部"
-#: src/imap_gtk.c:468
-msgid "This folder is already subscribed and has no unsubscribed subfolders."
-msgstr "该目录已经订阅，没有尚未订阅的子目录。"
+#: src/imap_gtk.c:496
+msgid ""
+"This folder is already subscribed and has no unsubscribed subfolders.\n"
+"\n"
+"If there are new folders, created and subscribed to from another client, use "
+"\"Check for new folders\" at the mailbox's root folder."
+msgstr ""
+"已经订阅此目录，且没有尚未订阅的子目录。\n"
+"\n"
+"如果有新目录（采用其它客户端创建或者订阅的），可用邮箱根目录的\"检查新目录"
+"\"命令。"
-#: src/imap_gtk.c:475
+#: src/imap_gtk.c:505
#, c-format
msgid "Do you want to %s the '%s' folder?"
-msgstr ""
+msgstr "是否 %s 目录 '%s'?"
-#: src/imap_gtk.c:476
+#: src/imap_gtk.c:506
msgid "subscribe"
msgstr "订阅"
-#: src/imap_gtk.c:476
+#: src/imap_gtk.c:506
msgid "unsubscribe"
msgstr "退订"
-#: src/imap_gtk.c:478
+#: src/imap_gtk.c:508 src/prefs_folder_item.c:1185
+#: src/prefs_folder_item.c:1203 src/prefs_folder_item.c:1221
msgid "Apply to subfolders"
-msgstr "应用于子文件夹"
+msgstr "应用于子目录"
-#: src/imap_gtk.c:484
+#: src/imap_gtk.c:514
msgid "+_Subscribe"
msgstr "+订阅(_S)"
-#: src/imap_gtk.c:484
+#: src/imap_gtk.c:514
msgid "+_Unsubscribe"
msgstr "+退订新闻组(_U)"
#: src/import.c:139
msgid "Locate the mbox file and specify the destination folder."
-msgstr "请指定mbox文件和目标文件夹。"
+msgstr "请指定mbox文件和目标目录。"
#: src/import.c:156
msgid "Destination folder:"
#: src/import.c:215
msgid ""
"Destination folder is not set.\n"
-"Import mbox file to the inbox folder?"
+"Import mbox file to the Inbox folder?"
msgstr ""
-"未设置目标文件夹.\n"
+"未设置目标目录.\n"
"是否要将mbox文件导入收信夹?"
#: src/import.c:237
msgid "Can't find the destination folder."
-msgstr "无法找到目标文件夹。"
+msgstr "无法找到目标目录。"
#: src/import.c:261
msgid "Select importing file"
msgstr "选择导入文件"
-#: src/importldif.c:190
+#: src/importldif.c:191
msgid "Please specify address book name and file to import."
msgstr "请选择欲导入的地址簿及文件名。"
-#: src/importldif.c:193
+#: src/importldif.c:194
msgid "Select and rename LDIF field names to import."
msgstr "选择并重命名要导入的LDIF字段名。"
-#: src/importldif.c:196
+#: src/importldif.c:197
msgid "File imported."
msgstr "文件导入完成。"
-#: src/importldif.c:451 src/importmutt.c:125 src/importpine.c:125
+#: src/importldif.c:452 src/importmutt.c:127 src/importpine.c:126
msgid "Please select a file."
msgstr "请选择一个文件。"
-#: src/importldif.c:457 src/importmutt.c:130 src/importpine.c:130
+#: src/importldif.c:458 src/importmutt.c:132 src/importpine.c:131
msgid "Address book name must be supplied."
msgstr "必须提供地址簿名称。"
-#: src/importldif.c:472
-msgid "Error reading LDIF fields."
-msgstr "读取LDIF字段失败。"
-
-#: src/importldif.c:495
+#: src/importldif.c:498
msgid "LDIF file imported successfully."
msgstr "LDIF文件导入成功。"
-#: src/importldif.c:574
+#: src/importldif.c:583
msgid "Select LDIF File"
msgstr "选择LDIF文件"
-#: src/importldif.c:662
+#: src/importldif.c:671
msgid ""
"Specify the name for the address book that will be created from the LDIF "
"file data."
msgstr "指定地址簿的名称, 该地址簿用于存放从LDIF文件中导入的数据。"
-#: src/importldif.c:668
+#: src/importldif.c:677
msgid "File Name"
msgstr "文件名称"
-#: src/importldif.c:679
+#: src/importldif.c:688
msgid "The full file specification of the LDIF file to import."
msgstr "需要导入的LDIF文件的位置"
-#: src/importldif.c:688
+#: src/importldif.c:697
msgid "Select the LDIF file to import."
msgstr "请选择要导入的LDIF文件。"
-#: src/importldif.c:725
+#: src/importldif.c:735
msgid "R"
msgstr ""
-#: src/importldif.c:726 src/summaryview.c:484
+#: src/importldif.c:736 src/summaryview.c:544
msgid "S"
msgstr "S"
-#: src/importldif.c:727
+#: src/importldif.c:737
msgid "LDIF Field Name"
msgstr "LDIF字段名"
-#: src/importldif.c:728
+#: src/importldif.c:738
msgid "Attribute Name"
msgstr "条目名称"
-#: src/importldif.c:783
+#: src/importldif.c:793
msgid "LDIF Field"
msgstr "LDIF域"
-#: src/importldif.c:795
+#: src/importldif.c:805
msgid "Attribute"
msgstr "条目"
-#: src/importldif.c:806
-msgid "The LDIF field can be renamed to the User Attribute name."
-msgstr "LDIF域可以重命名为用户属性名称。"
-
-#: src/importldif.c:811
-msgid "???"
-msgstr ""
-
-#: src/importldif.c:829
+#: src/importldif.c:818
msgid ""
"Choose the LDIF field that will be renamed or selected for import in the "
"list above. Reserved fields (marked with a tick in the \"R\" column), are "
"行的其他地方将使得该字段的详细内容显示在下面，可以进行重命名；双击一行重任何"
"地方也可以使该字段处于选中状态。"
+#: src/importldif.c:835
+msgid "The LDIF field can be renamed to the User Attribute name."
+msgstr "LDIF域可以重命名为用户属性名称。"
+
#: src/importldif.c:841
msgid "Select for Import"
msgstr "选择导入该项"
msgid "Records Imported :"
msgstr "已导入的记录:"
-#: src/importldif.c:960
+#: src/importldif.c:961
msgid "Import LDIF file into Address Book"
msgstr "将LDIF文件导入至地址簿"
-#: src/importmutt.c:144
+#: src/importldif.c:999
+#, fuzzy
+msgid "Proceed"
+msgstr "已锁定"
+
+#: src/importmutt.c:146
msgid "Error importing MUTT file."
msgstr "导入MUTT文件失败。"
-#: src/importmutt.c:159
+#: src/importmutt.c:161
msgid "Select MUTT File"
msgstr "选择MUTT文件"
-#: src/importmutt.c:206
+#: src/importmutt.c:208
msgid "Import MUTT file into Address Book"
msgstr "将MUTT文件导入至地址簿"
-#: src/importmutt.c:291 src/importpine.c:292
+#: src/importmutt.c:293 src/importpine.c:293
msgid "Please select a file to import."
msgstr "请选择导入的文件。"
-#: src/importpine.c:144
+#: src/importpine.c:145
msgid "Error importing Pine file."
msgstr "导入Pine文件失败。"
-#: src/importpine.c:159
+#: src/importpine.c:160
msgid "Select Pine File"
msgstr "选择Pine文件"
-#: src/importpine.c:206
+#: src/importpine.c:207
msgid "Import Pine file into Address Book"
msgstr "将Pine文件导入至地址簿中"
-#: src/inc.c:173 src/inc.c:278 src/inc.c:304
+#: src/inc.c:195 src/inc.c:300 src/inc.c:326
msgid "Claws Mail needs network access in order to get mails."
msgstr "Claws Mail需要访问网络才能收取邮件。"
-#: src/inc.c:384
+#: src/inc.c:347
+#, fuzzy, c-format
+msgid "%s failed\n"
+msgstr "授权失败"
+
+#: src/inc.c:417
msgid "Retrieving new messages"
msgstr "取回新邮件"
-#: src/inc.c:443
+#: src/inc.c:476
msgid "Standby"
msgstr "待命"
-#: src/inc.c:572 src/inc.c:622
+#: src/inc.c:605 src/inc.c:655
msgid "Cancelled"
msgstr "取消"
-#: src/inc.c:583
+#: src/inc.c:616
msgid "Retrieving"
msgstr "正在收取"
-#: src/inc.c:592
+#: src/inc.c:625
#, c-format
msgid "Done (%d message (%s) received)"
msgid_plural "Done (%d messages (%s) received)"
msgstr[0] "完成(取回%d个邮件(%s))"
-#: src/inc.c:598
+#: src/inc.c:631
msgid "Done (no new messages)"
msgstr "完成(没有新邮件)"
-#: src/inc.c:603
+#: src/inc.c:636
msgid "Connection failed"
msgstr "连接失败"
-#: src/inc.c:606
+#: src/inc.c:639
msgid "Auth failed"
-msgstr "授权失败"
+msgstr "鉴权失败"
-#: src/inc.c:609 src/prefs_summary_column.c:89 src/summaryview.c:2411
+#: src/inc.c:642 src/prefs_matcher.c:370 src/prefs_summary_column.c:91
+#: src/summaryview.c:2610 src/summaryview.c:5788
msgid "Locked"
msgstr "已锁定"
-#: src/inc.c:619 src/plugins/spamassassin/spamassassin_gtk.c:341
+#: src/inc.c:652 src/plugins/spamassassin/spamassassin_gtk.c:381
msgid "Timeout"
msgstr "超时时间"
-#: src/inc.c:712
+#: src/inc.c:745
#, c-format
msgid "Finished (%d new message)"
msgid_plural "Finished (%d new messages)"
msgstr[0] "完成 (%d个新邮件)"
-#: src/inc.c:716
+#: src/inc.c:749
msgid "Finished (no new messages)"
msgstr "完成 (没有新邮件)"
-#: src/inc.c:754
+#: src/inc.c:787
#, c-format
msgid "%s: Retrieving new messages"
msgstr "%s:正在收取邮件"
-#: src/inc.c:786
+#: src/inc.c:819
#, c-format
msgid "Connecting to POP3 server: %s..."
msgstr "正在连接POP3服务器: %s..."
-#: src/inc.c:803
+#: src/inc.c:836
#, c-format
msgid "Can't connect to POP3 server: %s:%d"
msgstr " 无法连接到POP3服务器: %s:%d"
-#: src/inc.c:807
+#: src/inc.c:840
#, c-format
msgid "Can't connect to POP3 server: %s:%d\n"
msgstr "无法连接到POP3服务器: %s:%d\n"
-#: src/inc.c:887 src/send_message.c:472
+#: src/inc.c:920 src/send_message.c:472
msgid "Authenticating..."
msgstr "正在授权..."
-#: src/inc.c:889
+#: src/inc.c:922
#, c-format
msgid "Retrieving messages from %s (%s) ..."
msgstr "正在从%s收取邮件 (%s)..."
-#: src/inc.c:895
+#: src/inc.c:928
msgid "Getting the number of new messages (STAT)..."
msgstr "获取新邮件数目中(STAT)..."
-#: src/inc.c:899
+#: src/inc.c:932
msgid "Getting the number of new messages (LAST)..."
msgstr " 获取新邮件数目中(LAST)..."
-#: src/inc.c:903
+#: src/inc.c:936
msgid "Getting the number of new messages (UIDL)..."
msgstr " 获取新邮件数目中(UIDL)..."
-#: src/inc.c:907
+#: src/inc.c:940
msgid "Getting the size of messages (LIST)..."
msgstr "获取邮件大小中(LIST)..."
-#: src/inc.c:914 src/send_message.c:490
+#: src/inc.c:947 src/send_message.c:490
msgid "Quitting"
msgstr "正在退出"
-#: src/inc.c:939
+#: src/inc.c:972
#, c-format
msgid "Retrieving message (%d / %d) (%s / %s)"
msgstr "取回邮件(%d/%d)(%s/%s)"
-#: src/inc.c:958
+#: src/inc.c:991
#, c-format
msgid "Retrieving (%d message (%s) received)"
msgid_plural "Retrieving (%d messages (%s) received)"
msgstr[0] "正在收取邮件(已收到%d个，大小为%s)"
-#: src/inc.c:1114
+#: src/inc.c:1147
msgid "Connection failed."
msgstr "连接失败。"
-#: src/inc.c:1118
+#: src/inc.c:1151
#, c-format
msgid "Connection to %s:%d failed."
msgstr "连接到 %s:%d 失败。"
-#: src/inc.c:1123
+#: src/inc.c:1156
msgid "Error occurred while processing mail."
msgstr " 处理邮件时发生错误。"
-#: src/inc.c:1129
+#: src/inc.c:1162
#, c-format
msgid ""
"Error occurred while processing mail:\n"
"处理邮件时发生错误:\n"
"%s"
-#: src/inc.c:1135
+#: src/inc.c:1168
msgid "No disk space left."
msgstr "磁盘无空间。"
-#: src/inc.c:1140
+#: src/inc.c:1173
msgid "Can't write file."
msgstr "无法写入文件。"
-#: src/inc.c:1145
+#: src/inc.c:1178
msgid "Socket error."
msgstr "Socket错误。"
-#: src/inc.c:1148
+#: src/inc.c:1181
#, c-format
msgid "Socket error on connection to %s:%d."
msgstr "连接 %s:%d 时发生套接字错误。"
-#: src/inc.c:1153 src/send_message.c:400 src/send_message.c:637
+#: src/inc.c:1186 src/send_message.c:400 src/send_message.c:648
msgid "Connection closed by the remote host."
msgstr "连接被远程主机关闭。"
-#: src/inc.c:1156
+#: src/inc.c:1189
#, c-format
msgid "Connection to %s:%d closed by the remote host."
msgstr "与%s:%d的连接被远程主机关闭。"
-#: src/inc.c:1161
+#: src/inc.c:1194
msgid "Mailbox is locked."
msgstr "邮箱已经被锁，无法打开。"
-#: src/inc.c:1165
+#: src/inc.c:1198
#, c-format
msgid ""
"Mailbox is locked:\n"
"邮箱被锁定:\n"
"%s"
-#: src/inc.c:1171 src/send_message.c:622
+#: src/inc.c:1204 src/send_message.c:633
msgid "Authentication failed."
msgstr "授权失败。"
-#: src/inc.c:1177 src/send_message.c:625
+#: src/inc.c:1210 src/send_message.c:636
#, c-format
msgid ""
"Authentication failed:\n"
"鉴权失败:\n"
"%s"
-#: src/inc.c:1182 src/send_message.c:641
+#: src/inc.c:1215 src/send_message.c:652
msgid "Session timed out."
msgstr "会话已超时。"
-#: src/inc.c:1185
+#: src/inc.c:1218
#, c-format
msgid "Connection to %s:%d timed out."
msgstr "到 %s:%d 的连接超时。"
-#: src/inc.c:1223
+#: src/inc.c:1256
msgid "Incorporation cancelled\n"
msgstr "合并操作被取消\n"
-#: src/inc.c:1460
+#: src/inc.c:1442
+#, c-format
+msgid "Claws Mail: %d new message"
+msgid_plural "Claws Mail: %d new messages"
+msgstr[0] "Claws Mail: %d个新邮件"
+
+#: src/inc.c:1563
+msgid "Unable to connect: you are offline."
+msgstr "无法连接: 您正在脱机模式下。"
+
+#: src/inc.c:1589
#, c-format
msgid "%s%sYou're working offline. Override for %d minutes?"
msgstr "%s%s你正在脱机工作。是否在%d分钟内更改？"
-#: src/inc.c:1467
+#: src/inc.c:1595
+#, c-format
+msgid "%s%sYou're working offline. Override?"
+msgstr "%s%s你正在脱机工作。是否临时切换到离线模式？"
+
+#: src/inc.c:1602
msgid "On_ly once"
msgstr "仅一次(_l)"
-#: src/ldif.c:775
+#: src/ldif.c:777
msgid "Nick Name"
msgstr "绰号"
-#: src/main.c:175
+#: src/main.c:228
#, c-format
msgid ""
"File '%s' already exists.\n"
"Can't create folder."
msgstr ""
"文件'%s'已存在。\n"
-"无法创建文件夹。"
+"无法创建目录。"
+
+#: src/main.c:250 src/main.c:263
+msgid "Exiting..."
+msgstr "正在退出..."
-#: src/main.c:271
+#: src/main.c:394
#, c-format
msgid ""
-"Configuration for %s (or previous) found.\n"
+"Configuration for %s found.\n"
"Do you want to migrate this configuration?"
msgstr ""
-"找到 %s (或者以前版本) 的配置。\n"
+"找到 %s 的配置。\n"
"是否要将该配置迁移过来?"
-#: src/main.c:279
+#: src/main.c:396
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Your Sylpheed filtering rules can be converted by a\n"
+"script available at %s."
+msgstr ""
+"\n"
+"\n"
+"您的Sylpheed过滤规则可以采用下面位置指定的脚本进行转换:\n"
+"%s"
+
+#: src/main.c:409
msgid "Keep old configuration"
msgstr "保存旧版本的配置"
-#: src/main.c:282
+#: src/main.c:412
msgid ""
"Keeping a backup will allow you to go back to an older version, but may take "
"a while if you have cached IMAP or News data, and will take some extra room "
"on your disk."
msgstr ""
-"保留备份使得你可以转回使用一个旧版本，但升级过程会多消耗一些时间"
-"(尤其是您有缓冲的IMAP或者新闻组邮件的话)，并且会多占用一些磁盘空间。"
+"保留备份使得你可以转回使用一个旧版本，但升级过程会多消耗一些时间(尤其是您有缓"
+"冲的IMAP或者新闻组邮件的话)，并且会多占用一些磁盘空间。"
-#: src/main.c:291
+#: src/main.c:421
msgid "Migration of configuration"
msgstr "迁移设置"
-#: src/main.c:302
+#: src/main.c:432
msgid "Copying configuration... This may take a while..."
msgstr "正在复制配置文件...这将需要一会儿..."
-#: src/main.c:311
+#: src/main.c:441
msgid "Migration failed!"
msgstr "迁移失败！"
-#: src/main.c:320
+#: src/main.c:450
msgid "Migrating configuration..."
msgstr "正在迁移配置..."
-#: src/main.c:619
+#: src/main.c:993
msgid "g_thread is not supported by glib.\n"
msgstr "glib不支持g_thread。\n"
-#: src/main.c:625
+#: src/main.c:999
msgid ""
"Claws Mail has been compiled with a more recent GTK+ library than is "
"currently available. This will cause crashes. You need to upgrade GTK+ or "
"Claws Mail编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。请升"
"级GTK+的版本，或者重新编译Claws Mail。"
-#: src/main.c:634
+#: src/main.c:1011
msgid ""
"Claws Mail has been compiled with an older GTK+ library than is currently "
"available. This will cause crashes. You need to recompile Claws Mail."
"Claws Mail编译时采用的GTK+库比当前系统的版本更高，这可能会导致程序崩溃。请升"
"级GTK+的版本，或者重新编译Claws Mail。"
-#: src/main.c:887
+#: src/main.c:1048
+msgid "Sylpheed-Claws 2.6.0 (or older)"
+msgstr "Sylpheed-Claws 2.6.0或者更老"
+
+#: src/main.c:1051
+msgid "Sylpheed-Claws 1.9.15 (or older)"
+msgstr "Sylpheed-Claws 1.9.15或者更老"
+
+#: src/main.c:1054
+msgid "Sylpheed-Claws 1.0.5 (or older)"
+msgstr "Sylpheed-Claws 1.0.5或者更老"
+
+#: src/main.c:1338
msgid ""
"Some plugin(s) failed to load. Check the Plugins configuration for more "
"information."
msgstr "部分插件无法成功加载，请检查插件配置以获取详细信息。"
-#: src/main.c:899
+#: src/main.c:1357
msgid ""
-"Claws Mail has detected a configured mailbox, but is it incomplete. It is "
+"Claws Mail has detected a configured mailbox, but it is incomplete. It is "
"possibly due to a failing IMAP account. Use \"Rebuild folder tree\" on the "
-"mailbox's folder to try to fix it."
+"mailbox parent folder's context menu to try to fix it."
msgstr ""
"Claws Mail检测到一个尚未配置完全的邮箱。它很可能是由于IMAP帐号失败造成的。请"
-"选择邮箱，用\"重建邮件夹树\"来尝试修复它。"
+"选择邮箱，用右键菜单中的\"重建邮件夹树\"来尝试修复它。"
-#: src/main.c:905
+#: src/main.c:1363
msgid ""
"Claws Mail has detected a configured mailbox, but could not load it. It is "
"probably provided by an out-of-date external plugin. Please reinstall the "
"Claws Mail检测到一个已经配置的邮箱，但无法加载。它可能是由一个已经过时的第三"
"方插件建立的。请重新安装该插件后再尝试。"
-#: src/main.c:1162
+#: src/main.c:1392
+#, c-format
+msgid "Claws Mail can not start without its data volume (%s)."
+msgstr "Claws Mail没有找到其数据卷(%s)，无法启动。"
+
+#: src/main.c:1697
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "用法: %s [选项]...\n"
-#: src/main.c:1164
+#: src/main.c:1699
msgid " --compose [address] open composition window"
msgstr " --compose [地址] 打开写信窗口"
-#: src/main.c:1165
+#: src/main.c:1700
msgid " --subscribe [uri] subscribe to the given URI if possible"
msgstr " --subscribe [uri] 订阅指定的URI"
-#: src/main.c:1166
+#: src/main.c:1701
msgid ""
" --attach file1 [file2]...\n"
" open composition window with specified files\n"
" --attach 文件1 [文件2]...\n"
" 打开写新邮件窗口，并附上所指定的文件"
-#: src/main.c:1169
+#: src/main.c:1704
msgid " --receive receive new messages"
msgstr " --receive 接收新邮件"
-#: src/main.c:1170
+#: src/main.c:1705
msgid " --receive-all receive new messages of all accounts"
msgstr " --receive-all 接收所有帐号的新邮件"
-#: src/main.c:1171
+#: src/main.c:1706
msgid " --send send all queued messages"
msgstr " --send 发送所有待发送邮件"
-#: src/main.c:1172
+#: src/main.c:1707
msgid " --status [folder]... show the total number of messages"
msgstr " --status 显示所有邮件的数目"
-#: src/main.c:1173
+#: src/main.c:1708
msgid ""
" --status-full [folder]...\n"
" show the status of each folder"
msgstr ""
-" --status-full [文件夹]...\n"
-" 显示每个文件夹的状态"
+" --status-full [目录]...\n"
+" 显示每个目录的状态"
-#: src/main.c:1175
+#: src/main.c:1710
msgid ""
" --select folder[/msg] jumps to the specified folder/message\n"
" folder is a folder id like 'folder/sub_folder'"
msgstr ""
-" --select folder[/msg] 跳转到指定的文件夹/邮件\n"
-" 可采用如下方式指定文件夹: 'folder/sub_folder'"
+" --select folder[/msg] 跳转到指定的目录/邮件\n"
+" 可采用如下方式指定目录: 'folder/sub_folder'"
-#: src/main.c:1177
+#: src/main.c:1712
msgid " --online switch to online mode"
msgstr " --online 切换到联机模式"
-#: src/main.c:1178
+#: src/main.c:1713
msgid " --offline switch to offline mode"
msgstr " --offline 切换到脱机模式"
-#: src/main.c:1179
+#: src/main.c:1714
msgid " --exit --quit -q exit Claws Mail"
msgstr " --exit --quit -q 退出Claws Mail"
-#: src/main.c:1180
+#: src/main.c:1715
msgid " --debug debug mode"
msgstr " --debug 调试模式"
-#: src/main.c:1181
+#: src/main.c:1716
msgid " --help -h display this help and exit"
msgstr " --help - 显示本说明并结束程序"
-#: src/main.c:1182
+#: src/main.c:1717
msgid " --version -v output version information and exit"
-msgstr " --version -v 显示版本内容并结束程序"
+msgstr " --version -v 显示版本信息并结束程序"
+
+#: src/main.c:1718
+msgid ""
+" --version-full -V output version and built-in features information "
+"and exit"
+msgstr " --version-full -V 显示详细版本信息并结束程序"
-#: src/main.c:1183
+#: src/main.c:1719
msgid " --config-dir output configuration directory"
msgstr " --config-dir 显示配置数据目录"
-#: src/main.c:1223
+#: src/main.c:1720
+msgid ""
+" --alternate-config-dir [dir]\n"
+" use specified configuration directory"
+msgstr " --alternate-config-dir [dir]\n"
+" 使用指定的目录作为存放配置文件的目录"
+
+#: src/main.c:1767
msgid "Unknown option\n"
msgstr "未知选项\n"
-#: src/main.c:1241
+#: src/main.c:1785
#, c-format
msgid "Processing (%s)..."
msgstr "正在处理(%s)..."
-#: src/main.c:1244
+#: src/main.c:1788
msgid "top level folder"
-msgstr "最上一层文件夹"
+msgstr "最上一层目录"
-#: src/main.c:1313
+#: src/main.c:1867
msgid "Queued messages"
msgstr "待发送的邮件"
-#: src/main.c:1314
+#: src/main.c:1868
msgid "Some unsent messages are queued. Exit now?"
-msgstr "待发送文件夹内尚有邮件。要退出吗？"
+msgstr "待发送目录内尚有邮件。要退出吗？"
-#: src/mainwindow.c:500 src/messageview.c:162
+#: src/mainwindow.c:533 src/messageview.c:217
msgid "/_File"
msgstr "/文件(_F)"
-#: src/mainwindow.c:501
+#: src/mainwindow.c:534
msgid "/_File/_Add mailbox"
msgstr "/文件(_F)/添加邮箱(_A)..."
-#: src/mainwindow.c:502
+#: src/mainwindow.c:535
msgid "/_File/_Add mailbox/MH..."
msgstr "/文件(_F)/增加邮箱(_A)/MH格式..."
-#: src/mainwindow.c:503 src/mainwindow.c:505 src/mainwindow.c:510
-#: src/mainwindow.c:512 src/mainwindow.c:515 src/mainwindow.c:518
-#: src/messageview.c:165
+#: src/mainwindow.c:536 src/mainwindow.c:538 src/mainwindow.c:543
+#: src/mainwindow.c:545 src/mainwindow.c:551 src/mainwindow.c:554
+#: src/messageview.c:223
msgid "/_File/---"
msgstr "/文件(_F)/---"
-#: src/mainwindow.c:504
+#: src/mainwindow.c:537
msgid "/_File/Change folder order..."
-msgstr "/文件(_F)/修改文件夹顺序..."
+msgstr "/文件(_F)/修改目录顺序..."
-#: src/mainwindow.c:506
+#: src/mainwindow.c:539
msgid "/_File/_Import mbox file..."
msgstr "/文件(_F)/导入mbox的文件(_I)... "
-#: src/mainwindow.c:507
+#: src/mainwindow.c:540
msgid "/_File/_Export to mbox file..."
-msgstr "/文件(_F)/以mbox格式导出文件夹(_E)..."
+msgstr "/文件(_F)/以mbox格式导出目录(_E)..."
-#: src/mainwindow.c:508
+#: src/mainwindow.c:541
msgid "/_File/Exp_ort selected to mbox file..."
msgstr "/文件(_F)/以mbox格式导出选中的邮件(_o)..."
-#: src/mainwindow.c:511
+#: src/mainwindow.c:544
msgid "/_File/Empty all _Trash folders"
-msgstr "/æ\96\87件(_F)/æ¸\85空æ\89\80æ\9c\89å\9e\83å\9c¾æ¡¶(_T)"
+msgstr "/æ\96\87件(_F)/æ¸\85空æ\89\80æ\9c\89åº\9f件夹(_T)"
-#: src/mainwindow.c:513 src/messageview.c:163
+#: src/mainwindow.c:546 src/messageview.c:218
msgid "/_File/_Save as..."
msgstr "/文件(_F)/保存为(_S)..."
-#: src/mainwindow.c:514 src/messageview.c:164
+#: src/mainwindow.c:548 src/messageview.c:220
+msgid "/_File/Page setup..."
+msgstr "/文件(_F)/页面设置..."
+
+#: src/mainwindow.c:550 src/messageview.c:222
msgid "/_File/_Print..."
msgstr "/文件(_F)/打印(_P)..."
-#: src/mainwindow.c:516
+#: src/mainwindow.c:552
msgid "/_File/_Work offline"
msgstr "/文件(_F)/脱机工作(_W)"
-#: src/mainwindow.c:517
+#: src/mainwindow.c:553
msgid "/_File/Synchronise folders"
-msgstr "/文件(_F)/同步文件夹"
+msgstr "/文件(_F)/同步目录"
-#: src/mainwindow.c:520
+#: src/mainwindow.c:556
msgid "/_File/E_xit"
msgstr "/文件(_F)/退出(_x)"
-#: src/mainwindow.c:525
+#: src/mainwindow.c:561
msgid "/_Edit/Select _thread"
msgstr "/编辑(_E)/选择线索(_T)"
-#: src/mainwindow.c:526
+#: src/mainwindow.c:562
msgid "/_Edit/_Delete thread"
msgstr "/编辑(_E)/删除线索(_D)"
-#: src/mainwindow.c:528 src/messageview.c:172
+#: src/mainwindow.c:564 src/messageview.c:230
msgid "/_Edit/_Find in current message..."
msgstr "/编辑(_E)/在邮件中查找(_F)..."
-#: src/mainwindow.c:530
+#: src/mainwindow.c:566
msgid "/_Edit/_Search folder..."
-msgstr "/编辑(_E)/在文件夹中搜索(_S)..."
+msgstr "/编辑(_E)/在目录中搜索(_S)..."
-#: src/mainwindow.c:531
+#: src/mainwindow.c:567
msgid "/_Edit/_Quick search"
msgstr "/编辑(_E)/快速搜索(_Q)"
-#: src/mainwindow.c:532 src/messageview.c:175 src/summaryview.c:472
+#: src/mainwindow.c:568 src/messageview.c:233 src/summaryview.c:528
msgid "/_View"
msgstr "/查看(_V)"
-#: src/mainwindow.c:533
+#: src/mainwindow.c:569
msgid "/_View/Show or hi_de"
msgstr "/查看(_V)/显示或隐藏(_d)"
-#: src/mainwindow.c:534
-msgid "/_View/Show or hi_de/_Message view"
-msgstr "/查看(_V)/显示或隐藏(_d)/邮件内容(_M)"
-
-#: src/mainwindow.c:536
+#: src/mainwindow.c:570
msgid "/_View/Show or hi_de/_Toolbar"
msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)"
-#: src/mainwindow.c:538
+#: src/mainwindow.c:572
msgid "/_View/Show or hi_de/_Toolbar/Text _below icons"
msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/文字在图标下方(_b)"
-#: src/mainwindow.c:540
+#: src/mainwindow.c:574
msgid "/_View/Show or hi_de/_Toolbar/Text be_side icons"
msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/文字在图标旁边(_s)"
-#: src/mainwindow.c:542
+#: src/mainwindow.c:576
msgid "/_View/Show or hi_de/_Toolbar/_Icons only"
msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/仅显示图标(_I)"
-#: src/mainwindow.c:544
+#: src/mainwindow.c:578
msgid "/_View/Show or hi_de/_Toolbar/_Text only"
msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/仅显示文字(_T)"
-#: src/mainwindow.c:546
+#: src/mainwindow.c:581
msgid "/_View/Show or hi_de/_Toolbar/_Hide"
msgstr "/查看(_V)/显示或隐藏(_d)/工具栏(_T)/均不显示(_H)"
-#: src/mainwindow.c:548
+#: src/mainwindow.c:584
+msgid "/_View/Show or hi_de/_Message view"
+msgstr "/查看(_V)/显示或隐藏(_d)/邮件内容(_M)"
+
+#: src/mainwindow.c:587
msgid "/_View/Show or hi_de/Status _bar"
msgstr "/查看(_V)/显示或隐藏(_d)/隐藏工具栏(_b)"
-#: src/mainwindow.c:550
+#: src/mainwindow.c:590
+msgid "/_View/Show or hi_de/Column headers"
+msgstr "/查看(_V)/显示或隐藏(_d)/列头"
+
+#: src/mainwindow.c:592
msgid "/_View/Set displayed _columns"
msgstr "/查看(_V)/设置显示列(_c)..."
-#: src/mainwindow.c:551
+#: src/mainwindow.c:593
msgid "/_View/Set displayed _columns/in _Folder list..."
-msgstr "/查看(_V)/设置显示列(_c)/文件夹列表(_F)..."
+msgstr "/查看(_V)/设置显示列(_c)/目录列表(_F)..."
-#: src/mainwindow.c:552
+#: src/mainwindow.c:594
msgid "/_View/Set displayed _columns/in _Message list..."
-msgstr "/查看(_V)/设置显示列(_c)/邮件列表(M)..."
+msgstr "/查看(_V)/设置显示列(_c)/邮件摘要列表(M)..."
-#: src/mainwindow.c:554 src/mainwindow.c:560 src/mainwindow.c:588
-#: src/mainwindow.c:618 src/mainwindow.c:735 src/mainwindow.c:743
-#: src/messageview.c:281
+#: src/mainwindow.c:596 src/mainwindow.c:604 src/mainwindow.c:634
+#: src/mainwindow.c:664 src/mainwindow.c:780 src/mainwindow.c:788
+#: src/messageview.c:263 src/messageview.c:369
msgid "/_View/---"
msgstr "/显示(_V)/---"
-#: src/mainwindow.c:555
+#: src/mainwindow.c:598
msgid "/_View/La_yout"
msgstr "/查看(_V)/布局(_o)"
-#: src/mainwindow.c:556
+#: src/mainwindow.c:599
msgid "/_View/Layout/_Standard"
msgstr "/查看(_V)/布局(_o)/标准(_S)"
-#: src/mainwindow.c:557
+#: src/mainwindow.c:600
msgid "/_View/Layout/_Three columns"
msgstr "/查看(_V)/布局(_o)/三列模式(_T)"
-#: src/mainwindow.c:558
+#: src/mainwindow.c:601
msgid "/_View/Layout/_Wide message"
msgstr "/查看(_V)/布局/宽邮件阅读器(_W)"
-#: src/mainwindow.c:559
+#: src/mainwindow.c:602
msgid "/_View/Layout/W_ide message list"
-msgstr "/查看(_V)/布局/宽邮件列表(_i) "
+msgstr "/查看(_V)/布局/宽邮件摘要(_i) "
-#: src/mainwindow.c:561
+#: src/mainwindow.c:603
+msgid "/_View/Layout/S_mall screen"
+msgstr "/查看(_V)/布局(_o)/小屏幕模式(_m)"
+
+#: src/mainwindow.c:606
msgid "/_View/_Sort"
msgstr "/查看(_V)/排序(_S)"
-#: src/mainwindow.c:562
+#: src/mainwindow.c:607
msgid "/_View/_Sort/by _number"
msgstr "/查看(_V)/排序(_S)/按顺序(_n)"
-#: src/mainwindow.c:563
+#: src/mainwindow.c:608
msgid "/_View/_Sort/by S_ize"
msgstr "/查看(_V)/排序(_S)/按大小(_i)"
-#: src/mainwindow.c:564
+#: src/mainwindow.c:609
msgid "/_View/_Sort/by _Date"
msgstr "/查看(_V)/排序(_S)/按日期(_D)"
-#: src/mainwindow.c:565
+#: src/mainwindow.c:610
+msgid "/_View/_Sort/by Thread date"
+msgstr "/查看(_V)/排序(_S)/按线索日期"
+
+#: src/mainwindow.c:611
msgid "/_View/_Sort/by _From"
msgstr "/查看(_V)/排序(_S)/按发信人(_F)"
-#: src/mainwindow.c:566
+#: src/mainwindow.c:612
msgid "/_View/_Sort/by _To"
msgstr "/查看(_V)/排序(_S)/按收信人(_T)"
-#: src/mainwindow.c:567
+#: src/mainwindow.c:613
msgid "/_View/_Sort/by S_ubject"
msgstr "/查看(_V)/排序(_S)/按主题(_u)"
-#: src/mainwindow.c:568
+#: src/mainwindow.c:614
msgid "/_View/_Sort/by _color label"
msgstr "/查看(_V)/排序(_S)/按颜色标签(_c)"
-#: src/mainwindow.c:570
+#: src/mainwindow.c:615
+msgid "/_View/_Sort/by tag"
+msgstr "/查看(_V)/排序(_S)/按标签"
+
+#: src/mainwindow.c:616
msgid "/_View/_Sort/by _mark"
msgstr "/查看(_V)/排序(_S)/按标记(_m)"
-#: src/mainwindow.c:571
+#: src/mainwindow.c:617
msgid "/_View/_Sort/by _status"
msgstr "/查看(_V)/排序(_S)/按状态(_s)"
-#: src/mainwindow.c:572
+#: src/mainwindow.c:618
msgid "/_View/_Sort/by a_ttachment"
msgstr "/查看(_V)/排序(_S)/按附件(_t)"
-#: src/mainwindow.c:574
+#: src/mainwindow.c:620
msgid "/_View/_Sort/by score"
msgstr "/查看(_V)/排序(_S)/按得分"
-#: src/mainwindow.c:575
+#: src/mainwindow.c:621
msgid "/_View/_Sort/by locked"
msgstr "/查看(_V)/排序(_S)/按锁定状态"
-#: src/mainwindow.c:576
+#: src/mainwindow.c:622
msgid "/_View/_Sort/D_on't sort"
msgstr "/查看(_V)/排序(_S)/不排序(_o)"
-#: src/mainwindow.c:577 src/mainwindow.c:580
+#: src/mainwindow.c:623 src/mainwindow.c:626
msgid "/_View/_Sort/---"
msgstr "/查看(_V)/排序(_S)/---"
-#: src/mainwindow.c:578
+#: src/mainwindow.c:624
msgid "/_View/_Sort/Ascending"
msgstr "/查看(_V)/排序(_S)/升序"
-#: src/mainwindow.c:579
+#: src/mainwindow.c:625
msgid "/_View/_Sort/Descending"
msgstr "/查看(_V)/排序(_S)/降序"
-#: src/mainwindow.c:581
+#: src/mainwindow.c:627
msgid "/_View/_Sort/_Attract by subject"
msgstr "/查看(_V)/排序(_S)/按主题排列(_A)"
-#: src/mainwindow.c:583
+#: src/mainwindow.c:629
msgid "/_View/Th_read view"
msgstr "/查看(_V)/按线索查看(_R)"
-#: src/mainwindow.c:584
+#: src/mainwindow.c:630
msgid "/_View/E_xpand all threads"
msgstr "/查看(_V)/展开所有线索(_X)"
-#: src/mainwindow.c:585
+#: src/mainwindow.c:631
msgid "/_View/Co_llapse all threads"
msgstr "/查看(_V)/折叠所有线索(_L)"
-#: src/mainwindow.c:586
+#: src/mainwindow.c:632
msgid "/_View/_Hide read messages"
msgstr "/查看(_V)/隐藏已读邮件(_H) "
-#: src/mainwindow.c:589
+#: src/mainwindow.c:635 src/messageview.c:234
msgid "/_View/_Go to"
msgstr "/查看(_V)/转到(_G)"
-#: src/mainwindow.c:590
+#: src/mainwindow.c:636 src/messageview.c:235
msgid "/_View/_Go to/_Previous message"
msgstr "/查看(_V)/转到(_G)/上一封(_P)"
-#: src/mainwindow.c:591
+#: src/mainwindow.c:637 src/messageview.c:236
msgid "/_View/_Go to/_Next message"
msgstr "/查看(_V)/转到(_G)/下一封(_N)"
-#: src/mainwindow.c:592 src/mainwindow.c:597 src/mainwindow.c:600
-#: src/mainwindow.c:605 src/mainwindow.c:610 src/mainwindow.c:615
+#: src/mainwindow.c:638 src/mainwindow.c:643 src/mainwindow.c:646
+#: src/mainwindow.c:651 src/mainwindow.c:656 src/mainwindow.c:661
+#: src/messageview.c:237 src/messageview.c:242 src/messageview.c:245
+#: src/messageview.c:250 src/messageview.c:255 src/messageview.c:260
msgid "/_View/_Go to/---"
msgstr "/查看(_V)/转到(_G)/---"
-#: src/mainwindow.c:593
+#: src/mainwindow.c:639 src/messageview.c:238
msgid "/_View/_Go to/P_revious unread message"
msgstr "/查看(_V)/转到(_G)/上一封未读邮件(_r)"
-#: src/mainwindow.c:595
+#: src/mainwindow.c:641 src/messageview.c:240
msgid "/_View/_Go to/N_ext unread message"
msgstr "/查看(_V)/转到(_G)/下一封未读邮件(_e)"
-#: src/mainwindow.c:598
+#: src/mainwindow.c:644 src/messageview.c:243
msgid "/_View/_Go to/Previous ne_w message"
msgstr "/查看(_V)/转到(_G)/前一封新邮件(_w)"
-#: src/mainwindow.c:599
+#: src/mainwindow.c:645 src/messageview.c:244
msgid "/_View/_Go to/Ne_xt new message"
msgstr "/查看(_V)/转到(_G)/下一封新邮件(_x)"
-#: src/mainwindow.c:601
+#: src/mainwindow.c:647 src/messageview.c:246
msgid "/_View/_Go to/Previous _marked message"
msgstr "/查看(_V)/ 转到(_G)/前一封标记过的邮件(_M)"
-#: src/mainwindow.c:603
+#: src/mainwindow.c:649 src/messageview.c:248
msgid "/_View/_Go to/Next m_arked message"
msgstr "/查看(_V)/ 转到(_G)/下一封标记过的邮件(_a)"
-#: src/mainwindow.c:606
+#: src/mainwindow.c:652 src/messageview.c:251
msgid "/_View/_Go to/Previous _labeled message"
msgstr "/查看(_V)/ 转到(_G)/前一封打标签的邮件(_l)"
-#: src/mainwindow.c:608
+#: src/mainwindow.c:654 src/messageview.c:253
msgid "/_View/_Go to/Next la_beled message"
msgstr "/查看(_V)/ 转到(_G)/下一封打标签的邮件(_b)"
-#: src/mainwindow.c:611
+#: src/mainwindow.c:657 src/messageview.c:256
msgid "/_View/_Go to/Last read message"
msgstr "/查看(_V)/转到(_G)/最近阅读过的邮件"
-#: src/mainwindow.c:613
+#: src/mainwindow.c:659 src/messageview.c:258
msgid "/_View/_Go to/Parent message"
msgstr "/查看(_V)/转到(_G)/下一封(_N)"
-#: src/mainwindow.c:616
+#: src/mainwindow.c:662 src/messageview.c:261
msgid "/_View/_Go to/Next unread _folder"
-msgstr "/查看(_V)/转到(_G)/下一个未读文件夹(_f)"
+msgstr "/查看(_V)/转到(_G)/下一个未读目录(_f)"
-#: src/mainwindow.c:617
+#: src/mainwindow.c:663 src/messageview.c:262
msgid "/_View/_Go to/_Other folder..."
-msgstr "/查看(_V)/转到(_G)/其他文件夹(_O)..."
+msgstr "/查看(_V)/转到(_G)/其他目录(_O)..."
-#: src/mainwindow.c:621 src/mainwindow.c:628 src/messageview.c:178
+#: src/mainwindow.c:667 src/messageview.c:266
msgid "/_View/Character _encoding/---"
msgstr "/查看(_V)/字符编码(_e)/---"
-#: src/mainwindow.c:625 src/messageview.c:182
+#: src/mainwindow.c:671 src/messageview.c:270
msgid "/_View/Character _encoding"
msgstr "/查看(_V)/字符编码(_e)"
-#: src/mainwindow.c:626 src/messageview.c:183
+#: src/mainwindow.c:672 src/messageview.c:271
msgid "/_View/Character _encoding/_Auto detect"
-msgstr "/查看(_V)/字符集(_e)/自动侦测(_A)"
+msgstr "/查看(_V)/字符编码(_e)/自动侦测(_A)"
-#: src/mainwindow.c:629 src/messageview.c:186
-msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
-msgstr "/查看(_V)/字符集(_e)/7bit ascii (US-ASCI_I)"
+#: src/mainwindow.c:676 src/messageview.c:274
+msgid "/_View/Character _encoding/7bit ASCII (US-ASC_II)"
+msgstr "/查看(_V)/字符编码(_e)/7bit ascii (US-ASCI_I)"
-#: src/mainwindow.c:631 src/messageview.c:189
+#: src/mainwindow.c:678 src/messageview.c:277
msgid "/_View/Character _encoding/Unicode (_UTF-8)"
-msgstr "/查看(_V)/字符集(_e)/Unicode (_UTF-8)"
+msgstr "/查看(_V)/字符编码(_e)/Unicode (_UTF-8)"
-#: src/mainwindow.c:635 src/messageview.c:192
-msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
-msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_1)"
+#: src/mainwindow.c:682
+msgid "/_View/Character _encoding/Western European"
+msgstr "/查看(_V)/字符编码(_e)/西欧"
-#: src/mainwindow.c:637 src/messageview.c:194
-msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
-msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-15)"
+#: src/mainwindow.c:683
+msgid "/_View/Character _encoding/Western European/ISO-8859-_1"
+msgstr "/查看(_V)/字符编码(_e)/西欧/ISO-8859-_1"
-#: src/mainwindow.c:639 src/messageview.c:196
-msgid "/_View/Character _encoding/Western European (Windows-1252)"
-msgstr "/查看(_V)/字符集(_e)/西欧(Windows-1252)"
+#: src/mainwindow.c:685
+msgid "/_View/Character _encoding/Western European/ISO-8859-15"
+msgstr "/查看(_V)/字符编码(_e)/西欧/ISO-8859-15"
-#: src/mainwindow.c:643 src/messageview.c:199
+#: src/mainwindow.c:687
+msgid "/_View/Character _encoding/Western European/Windows-1252"
+msgstr "/查看(_V)/字符编码(_e)/西欧/Windows-1252"
+
+#: src/mainwindow.c:690 src/messageview.c:287
msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
-msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_2) "
+msgstr "/查看(_V)/字符编码(_e)/中欧(ISO-8859-_2)"
-#: src/mainwindow.c:647 src/messageview.c:202
-msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
-msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
+#: src/mainwindow.c:693
+msgid "/_View/Character _encoding/Baltic"
+msgstr "/查看(_V)/字符编码(_e)/波罗的海"
-#: src/mainwindow.c:649 src/messageview.c:204
-msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
-msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-_4) "
+#: src/mainwindow.c:694
+msgid "/_View/Character _encoding/Baltic/ISO-8859-13"
+msgstr "/查看(_V)/字符编码(_e)/波罗的海/ISO-8859-13"
+
+#: src/mainwindow.c:696
+msgid "/_View/Character _encoding/Baltic/ISO-8859-_4"
+msgstr "/查看(_V)/字符编码(_e)/波罗的海/ISO-8859-_4"
-#: src/mainwindow.c:653 src/messageview.c:207
+#: src/mainwindow.c:699 src/messageview.c:295
msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
-msgstr "/查看(_V)/字符集(_e)/希腊 (ISO-8859-_7)"
+msgstr "/查看(_V)/字符编码(_e)/希腊 (ISO-8859-_7)"
-#: src/mainwindow.c:657 src/messageview.c:210
-msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
-msgstr "/查看(_V)/字符集(_e)/希伯来 (ISO-8859-_8)"
+#: src/mainwindow.c:702
+msgid "/_View/Character _encoding/Hebrew"
+msgstr "/查看(_V)/字符编码(_e)/希伯来语"
-#: src/mainwindow.c:659 src/messageview.c:212
-msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
-msgstr "/查看(_V)/字符集(_e)/希伯来 (Windows-1251)"
+#: src/mainwindow.c:703
+msgid "/_View/Character _encoding/Hebrew/ISO-8859-_8"
+msgstr "/查看(_V)/字符编码(_e)/希伯来/ISO-8859-_8"
-#: src/mainwindow.c:663 src/messageview.c:215
-msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
-msgstr "/查看(_V)/字符集(_e)/阿拉伯语 (ISO-8859-_6) "
+#: src/mainwindow.c:705
+msgid "/_View/Character _encoding/Hebrew/Windows-1255"
+msgstr "/查看(_V)/字符编码(_e)/希伯来/Windows-1251"
-#: src/mainwindow.c:665 src/messageview.c:217
-msgid "/_View/Character _encoding/Arabic (Windows-1256)"
-msgstr "/查看(_V)/字符集(_e)/阿拉伯语 (Windows-1256)"
+#: src/mainwindow.c:708
+msgid "/_View/Character _encoding/Arabic"
+msgstr "/查看(_V)/字符编码(_e)/阿拉伯语"
+
+#: src/mainwindow.c:709
+msgid "/_View/Character _encoding/Arabic/ISO-8859-_6"
+msgstr "/查看(_V)/字符编码(_e)/阿拉伯语/ISO-8859-_6"
+
+#: src/mainwindow.c:711
+msgid "/_View/Character _encoding/Arabic/Windows-1256"
+msgstr "/查看(_V)/字符编码(_e)/阿拉伯语/Windows-1256"
-#: src/mainwindow.c:669 src/messageview.c:220
+#: src/mainwindow.c:714 src/messageview.c:308
msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
-msgstr "/查看(_V)/字符集(_e)/土耳其 (ISO-8859-_9)"
+msgstr "/查看(_V)/字符编码(_e)/土耳其 (ISO-8859-_9)"
-#: src/mainwindow.c:673 src/messageview.c:223
-msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
-msgstr "/查看(_V)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
+#: src/mainwindow.c:717
+msgid "/_View/Character _encoding/Cyrillic"
+msgstr "/查看(_V)/字符编码(_e)/斯拉夫语"
-#: src/mainwindow.c:675 src/messageview.c:225
-msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
-msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-_R)"
+#: src/mainwindow.c:718
+msgid "/_View/Character _encoding/Cyrillic/ISO-8859-_5"
+msgstr "/查看(_V)/字符编码(_e)/斯拉夫语/ISO-8859-_5"
-#: src/mainwindow.c:677 src/messageview.c:227
-msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
-msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-U)"
+#: src/mainwindow.c:720
+msgid "/_View/Character _encoding/Cyrillic/KOI8-_R"
+msgstr "/查看(_V)/字符编码(_e)/斯拉夫语/KOI8-_R"
-#: src/mainwindow.c:679 src/messageview.c:229
-msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
-msgstr "/查看(_V)/字符集(_e)/斯拉夫 (Windows-1251)"
+#: src/mainwindow.c:722
+msgid "/_View/Character _encoding/Cyrillic/KOI8-U"
+msgstr "/查看(_V)/字符编码(_e)/斯拉夫语/KOI8-U"
-#: src/mainwindow.c:683 src/messageview.c:232
-msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
-msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-_JP)"
+#: src/mainwindow.c:724
+msgid "/_View/Character _encoding/Cyrillic/Windows-1251"
+msgstr "/查看(_V)/字符编码(_e)/斯拉夫/Windows-1251"
-#: src/mainwindow.c:685 src/messageview.c:234
-msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
-msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-JP-2)"
+#: src/mainwindow.c:727
+msgid "/_View/Character _encoding/Japanese"
+msgstr "/查看(_V)/字符编码(_e)/日文"
-#: src/mainwindow.c:687 src/messageview.c:236
-msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
-msgstr "/查看(_V)/字符集(_e)/日文 (_EUC-JP)"
+#: src/mainwindow.c:728
+msgid "/_View/Character _encoding/Japanese/ISO-2022-_JP"
+msgstr "/查看(_V)/字符编码(_e)/日文/ISO-2022-_JP"
-#: src/mainwindow.c:689 src/messageview.c:238
-msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
-msgstr "/查看(_V)/字符集(_e)/日文 (_Shift__JIS)"
+#: src/mainwindow.c:730
+msgid "/_View/Character _encoding/Japanese/ISO-2022-JP-2"
+msgstr "/查看(_V)/字符编码(_e)/日文/ISO-2022-JP-2"
-#: src/mainwindow.c:693 src/messageview.c:241
-msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
-msgstr "/查看(_V)/字符集(_e)/简体中文 (_GB2312)"
+#: src/mainwindow.c:732
+msgid "/_View/Character _encoding/Japanese/_EUC-JP"
+msgstr "/查看(_V)/字符编码(_e)/日文/_EUC-JP"
-#: src/mainwindow.c:695 src/messageview.c:243
-msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
-msgstr "/查看(_V)/字符集(_e)/简体中文 (GBK)"
+#: src/mainwindow.c:734
+msgid "/_View/Character _encoding/Japanese/_Shift__JIS"
+msgstr "/查看(_V)/字符编码(_e)/日文/_Shift__JIS"
-#: src/mainwindow.c:697 src/messageview.c:245
-msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
-msgstr "/查看(_V)/字符集(_e)/繁体中文 (_Big5)"
+#: src/mainwindow.c:737
+msgid "/_View/Character _encoding/Chinese"
+msgstr "/查看(_V)/字符编码(_e)/中文"
-#: src/mainwindow.c:699 src/messageview.c:247
-msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
-msgstr "/查看(_V)/字符集(_e)/繁体中文 (EUC-_TW)"
+#: src/mainwindow.c:738
+msgid "/_View/Character _encoding/Chinese/Simplified (_GB2312)"
+msgstr "/查看(_V)/字符编码(_e)/中文/简体中文 (_GB2312)"
-#: src/mainwindow.c:701 src/messageview.c:249
-msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
-msgstr "/查看(_V)/字符集(_e)/中文 (ISO-2022-_CN)"
+#: src/mainwindow.c:740
+msgid "/_View/Character _encoding/Chinese/Simplified (GBK)"
+msgstr "/查看(_V)/字符编码(_e)/中文/简体中文 (GBK)"
-#: src/mainwindow.c:705 src/messageview.c:252
-msgid "/_View/Character _encoding/Korean (EUC-_KR)"
-msgstr "/查看(_V)/字符集(_e)/韩文 (EUC-_KR) "
+#: src/mainwindow.c:742
+msgid "/_View/Character _encoding/Chinese/Traditional (_Big5)"
+msgstr "/查看(_V)/字符编码(_e)/中文/繁体中文 (_Big5)"
-#: src/mainwindow.c:707 src/messageview.c:254
-msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
-msgstr "/查看(_V)/字符集(_e)/韩文 (ISO-2022-KR)"
+#: src/mainwindow.c:744
+msgid "/_View/Character _encoding/Chinese/Traditional (EUC-_TW)"
+msgstr "/查看(_V)/字符编码(_e)/中文/繁体中文 (EUC-_TW)"
-#: src/mainwindow.c:711 src/messageview.c:257
-msgid "/_View/Character _encoding/Thai (TIS-620)"
-msgstr "/查看(_V)/字符集(_e)/泰国 (TIS-620)"
+#: src/mainwindow.c:746
+msgid "/_View/Character _encoding/Chinese/ISO-2022-_CN"
+msgstr "/查看(_V)/字符编码(_e)/中文/ISO-2022-_CN"
-#: src/mainwindow.c:713 src/messageview.c:259
-msgid "/_View/Character _encoding/Thai (Windows-874)"
-msgstr "/查看(_V)/字符集(_e)/泰国 (Windows-874)"
+#: src/mainwindow.c:749
+msgid "/_View/Character _encoding/Korean"
+msgstr "/查看(_V)/字符编码(_e)/韩文"
-#: src/mainwindow.c:720 src/mainwindow.c:726 src/messageview.c:266
-#: src/messageview.c:272
+#: src/mainwindow.c:750
+msgid "/_View/Character _encoding/Korean/EUC-_KR"
+msgstr "/查看(_V)/字符编码(_e)/韩文/EUC-_KR"
+
+#: src/mainwindow.c:752
+msgid "/_View/Character _encoding/Korean/ISO-2022-KR"
+msgstr "/查看(_V)/字符编码(_e)/韩文/ISO-2022-KR"
+
+#: src/mainwindow.c:755
+msgid "/_View/Character _encoding/Thai"
+msgstr "/查看(_V)/字符编码(_e)/泰文"
+
+#: src/mainwindow.c:756
+msgid "/_View/Character _encoding/Thai/TIS-620"
+msgstr "/查看(_V)/字符编码(_e)/泰国/TIS-620"
+
+#: src/mainwindow.c:758
+msgid "/_View/Character _encoding/Thai/Windows-874"
+msgstr "/查看(_V)/字符编码(_e)/泰国/Windows-874"
+
+#: src/mainwindow.c:765 src/mainwindow.c:771 src/messageview.c:354
+#: src/messageview.c:360
msgid "/_View/Decode/---"
msgstr "/查看(_V)/解码/---"
-#: src/mainwindow.c:723 src/messageview.c:269
+#: src/mainwindow.c:768 src/messageview.c:357
msgid "/_View/Decode"
msgstr "/查看(_V)/解码"
-#: src/mainwindow.c:724 src/messageview.c:270
+#: src/mainwindow.c:769 src/messageview.c:358
msgid "/_View/Decode/_Auto detect"
msgstr "/查看(_V)/解码/自动侦测(_A)"
-#: src/mainwindow.c:727 src/messageview.c:273
+#: src/mainwindow.c:772 src/messageview.c:361
msgid "/_View/Decode/_8bit"
msgstr "/查看(_V)/解码/_8位"
-#: src/mainwindow.c:728 src/messageview.c:274
+#: src/mainwindow.c:773 src/messageview.c:362
msgid "/_View/Decode/_Quoted printable"
msgstr "/查看(_V)/解码/_Quoted Printable"
-#: src/mainwindow.c:729 src/messageview.c:275
+#: src/mainwindow.c:774 src/messageview.c:363
msgid "/_View/Decode/_Base64"
msgstr "/查看(_V)/解码/_Base64"
-#: src/mainwindow.c:730 src/messageview.c:276
+#: src/mainwindow.c:775 src/messageview.c:364
msgid "/_View/Decode/_Uuencode"
msgstr "/查看(_V)/解码/_Uuencode"
-#: src/mainwindow.c:736 src/summaryview.c:473
+#: src/mainwindow.c:781 src/summaryview.c:529
msgid "/_View/Open in new _window"
msgstr "/查看(_V)/在新窗口中打开(_w)"
-#: src/mainwindow.c:737 src/messageview.c:282
+#: src/mainwindow.c:782 src/messageview.c:370
msgid "/_View/Mess_age source"
msgstr "/查看(_V)/邮件源文件(_a)"
-#: src/mainwindow.c:738
+#: src/mainwindow.c:783
msgid "/_View/All headers"
msgstr "/查看(_V)/所有信头"
-#: src/mainwindow.c:739 src/messageview.c:284
+#: src/mainwindow.c:784 src/messageview.c:372
msgid "/_View/Quotes"
msgstr "/查看(_V)/引文"
-#: src/mainwindow.c:740 src/messageview.c:285
+#: src/mainwindow.c:785 src/messageview.c:373
msgid "/_View/Quotes/_Fold all"
msgstr "/查看(_V)/引文/全部折叠"
-#: src/mainwindow.c:741 src/messageview.c:286
+#: src/mainwindow.c:786 src/messageview.c:374
msgid "/_View/Quotes/Fold from level _2"
msgstr "/查看(_V)/引文/从第二级开始折叠(_2)"
-#: src/mainwindow.c:742 src/messageview.c:287
+#: src/mainwindow.c:787 src/messageview.c:375
msgid "/_View/Quotes/Fold from level _3"
msgstr "/查看(_V)/引文/从第三级开始折叠(_3)"
-#: src/mainwindow.c:744
+#: src/mainwindow.c:789
msgid "/_View/_Update summary"
msgstr "/查看(_V)/更新邮件摘要列表(_U)"
-#: src/mainwindow.c:747
+#: src/mainwindow.c:792
msgid "/_Message/Recei_ve"
msgstr "/邮件(_M)/收取(_v)"
-#: src/mainwindow.c:748
+#: src/mainwindow.c:793
msgid "/_Message/Recei_ve/Get from _current account"
msgstr "/邮件(_M)/收取(_v)/从当前帐号收取(_c)"
-#: src/mainwindow.c:750
+#: src/mainwindow.c:795
msgid "/_Message/Recei_ve/Get from _all accounts"
msgstr "/邮件(_M)/收取(_v)/从所有帐号收取(_c)"
-#: src/mainwindow.c:752
+#: src/mainwindow.c:797
msgid "/_Message/Recei_ve/Cancel receivin_g"
msgstr "/邮件(_M)/收取(_v)/取消(_g)"
-#: src/mainwindow.c:754
+#: src/mainwindow.c:799
msgid "/_Message/Recei_ve/---"
msgstr "/邮件(_M)/收取(_v)/---"
-#: src/mainwindow.c:755
+#: src/mainwindow.c:800
msgid "/_Message/_Send queued messages"
msgstr "/邮件(_M)/送出待发送邮件(_S)"
-#: src/mainwindow.c:757
+#: src/mainwindow.c:802
msgid "/_Message/Compose a_n email message"
msgstr "/邮件(_M)/写信(_n)"
-#: src/mainwindow.c:758
+#: src/mainwindow.c:803
msgid "/_Message/Compose a news message"
msgstr "/邮件(_M)/写新闻群留言"
-#: src/mainwindow.c:759 src/messageview.c:293
+#: src/mainwindow.c:804 src/messageview.c:381
msgid "/_Message/_Reply"
msgstr "/邮件(_M)/回信(_R)"
-#: src/mainwindow.c:760
+#: src/mainwindow.c:805
msgid "/_Message/Repl_y to"
msgstr "/邮件(_M)/回信给(_y)"
-#: src/mainwindow.c:761 src/messageview.c:294
+#: src/mainwindow.c:806 src/messageview.c:382
msgid "/_Message/Repl_y to/_all"
msgstr "/邮件(_M)/回信给(_y)/全部人(_a)"
-#: src/mainwindow.c:762 src/messageview.c:296
+#: src/mainwindow.c:807 src/messageview.c:384
msgid "/_Message/Repl_y to/_sender"
msgstr "/邮件(_M)/回信给(_y)/发信人(_s)"
-#: src/mainwindow.c:763 src/messageview.c:298
+#: src/mainwindow.c:808 src/messageview.c:386
msgid "/_Message/Repl_y to/mailing _list"
msgstr "/邮件(_M)/回信给(_y)/邮件列表(_l)"
-#: src/mainwindow.c:765
+#: src/mainwindow.c:810
msgid "/_Message/Follow-up and reply to"
msgstr "/邮件(_M)/跟贴"
-#: src/mainwindow.c:767 src/messageview.c:301
+#: src/mainwindow.c:812 src/messageview.c:389
msgid "/_Message/_Forward"
msgstr "/邮件(_M)/转发(_F)"
-#: src/mainwindow.c:768 src/messageview.c:302
+#: src/mainwindow.c:813 src/messageview.c:390
msgid "/_Message/For_ward as attachment"
msgstr "/邮件(_M)/以附加文件形式转发(_A)"
-#: src/mainwindow.c:769
+#: src/mainwindow.c:814
msgid "/_Message/Redirect"
msgstr "/邮件(_M)/重定向"
-#: src/mainwindow.c:771
+#: src/mainwindow.c:816
msgid "/_Message/Mailing-_List"
msgstr "/邮件(_M)/邮件列表(_L)"
-#: src/mainwindow.c:772
+#: src/mainwindow.c:817
msgid "/_Message/Mailing-_List/Post"
msgstr "/邮件(_M)/邮件列表(_L)/发贴"
-#: src/mainwindow.c:773
+#: src/mainwindow.c:818
msgid "/_Message/Mailing-_List/Help"
msgstr "/邮件(_M)/邮件列表(_l)/帮助"
-#: src/mainwindow.c:774
+#: src/mainwindow.c:819
msgid "/_Message/Mailing-_List/Subscribe"
msgstr "/邮件(_M)/邮件列表(_L)/订阅"
-#: src/mainwindow.c:775
+#: src/mainwindow.c:820
msgid "/_Message/Mailing-_List/Unsubscribe"
msgstr "/邮件(_M)/邮件列表(_L)/退订"
-#: src/mainwindow.c:776
+#: src/mainwindow.c:821
msgid "/_Message/Mailing-_List/View archive"
msgstr "/邮件(_M)/邮件列表(_L)/查看归档邮件"
-#: src/mainwindow.c:777
+#: src/mainwindow.c:822
msgid "/_Message/Mailing-_List/Contact owner"
msgstr "/邮件(_M)/邮件列表(_L)/联系作者"
-#: src/mainwindow.c:780
+#: src/mainwindow.c:825
msgid "/_Message/M_ove..."
msgstr "/邮件(_M)/移动(_o)"
-#: src/mainwindow.c:781
+#: src/mainwindow.c:826
msgid "/_Message/_Copy..."
msgstr "/邮件(_M)/复制(_C)"
-#: src/mainwindow.c:782
+#: src/mainwindow.c:827
msgid "/_Message/Move to _trash"
-msgstr "/é\82®ä»¶(_M)/移å\8a¨å\88°å\9e\83å\9c¾æ¡¶(_t)"
+msgstr "/é\82®ä»¶(_M)/移å\8a¨å\88°åº\9f件夹(_t)"
-#: src/mainwindow.c:783
+#: src/mainwindow.c:828
msgid "/_Message/_Delete..."
msgstr "/邮件(_M)/删除(_D)..."
-#: src/mainwindow.c:784
+#: src/mainwindow.c:829
msgid "/_Message/Cancel a news message"
msgstr "/邮件(_M)/取消新邮件"
-#: src/mainwindow.c:786
+#: src/mainwindow.c:831
msgid "/_Message/_Mark"
msgstr "/邮件(_M)/标记(_M)"
-#: src/mainwindow.c:787
+#: src/mainwindow.c:832
msgid "/_Message/_Mark/_Mark"
msgstr "/邮件(_M)/标记(_M)/ 标记(_M) "
-#: src/mainwindow.c:788
+#: src/mainwindow.c:833
msgid "/_Message/_Mark/_Unmark"
msgstr "/邮件(_M)/标记(_M)/ 不标记(_U)"
-#: src/mainwindow.c:789 src/mainwindow.c:795 src/mainwindow.c:798
+#: src/mainwindow.c:834 src/mainwindow.c:842 src/mainwindow.c:845
msgid "/_Message/_Mark/---"
msgstr "/邮件(_M)/标记(_M)/---"
-#: src/mainwindow.c:790
+#: src/mainwindow.c:835
msgid "/_Message/_Mark/Mark as unr_ead"
msgstr "/邮件(_M)/标记(_M)/标记为未读(_e)"
-#: src/mainwindow.c:791
+#: src/mainwindow.c:836
msgid "/_Message/_Mark/Mark as rea_d"
msgstr "/邮件(_M)/标记(_M)/标记为已读(_d)"
-#: src/mainwindow.c:792
+#: src/mainwindow.c:837
msgid "/_Message/_Mark/Mark all _read"
msgstr "/邮件(_M)/标记(_M)/标记所有为已读(_r)"
-#: src/mainwindow.c:793
+#: src/mainwindow.c:838
msgid "/_Message/_Mark/Ignore thread"
msgstr "/邮件(_M)/标记(_M)/忽略邮件线索"
-#: src/mainwindow.c:794
+#: src/mainwindow.c:839
msgid "/_Message/_Mark/Unignore thread"
msgstr "/邮件(_M)/标记(_M)/不忽略邮件线索"
-#: src/mainwindow.c:796
+#: src/mainwindow.c:840
+msgid "/_Message/_Mark/Watch thread"
+msgstr "/邮件(_M)/标记(_M)/监视此邮件线索"
+
+#: src/mainwindow.c:841
+msgid "/_Message/_Mark/Unwatch thread"
+msgstr "/邮件(_M)/标记(_M)/取消监视此邮件线索"
+
+#: src/mainwindow.c:843
msgid "/_Message/_Mark/Mark as _spam"
msgstr "/邮件(_M)/标记(_M)/标记为垃圾邮件(_s)"
-#: src/mainwindow.c:797
+#: src/mainwindow.c:844
msgid "/_Message/_Mark/Mark as _ham"
msgstr "/邮件(_M)/标记(_M)/标记为非垃圾邮件(_h)"
-#: src/mainwindow.c:799
+#: src/mainwindow.c:846
msgid "/_Message/_Mark/Lock"
msgstr "/邮件(_M)/标记(_M)/锁定"
-#: src/mainwindow.c:800
+#: src/mainwindow.c:847
msgid "/_Message/_Mark/Unlock"
msgstr "/邮件(_M)/标记(_M)/解除锁定"
-#: src/mainwindow.c:801
+#: src/mainwindow.c:848
msgid "/_Message/Color la_bel"
msgstr "/邮件(_M)/彩色标记(_b)"
-#: src/mainwindow.c:803
+#: src/mainwindow.c:849
+msgid "/_Message/T_ags"
+msgstr "/邮件(_M)/标签(_a)"
+
+#: src/mainwindow.c:851
msgid "/_Message/Re-_edit"
msgstr "/邮件(_M)/重新编辑(_e)"
-#: src/mainwindow.c:806
+#: src/mainwindow.c:854
msgid "/_Tools/_Address book..."
msgstr "/工具(_T)/地址簿(_A)..."
-#: src/mainwindow.c:807 src/messageview.c:308
+#: src/mainwindow.c:855 src/messageview.c:396
msgid "/_Tools/Add sender to address boo_k"
msgstr "/工具(_T)/将发信人加入地址簿中(_k)"
-#: src/mainwindow.c:809
+#: src/mainwindow.c:857
msgid "/_Tools/_Harvest addresses"
msgstr "/工具(_T)/批量提取通讯地址(_H)"
-#: src/mainwindow.c:810
+#: src/mainwindow.c:858
msgid "/_Tools/_Harvest addresses/from _Folder..."
-msgstr "/工具(_T)/批量提取通讯地址(_H)/从文件夹(_F)"
+msgstr "/工具(_T)/批量提取通讯地址(_H)/从目录(_F)"
-#: src/mainwindow.c:812
+#: src/mainwindow.c:860
msgid "/_Tools/_Harvest addresses/from _Messages..."
msgstr "/工具(_T)/批量提取通讯地址(_H)/从邮件(_M)"
-#: src/mainwindow.c:815
+#: src/mainwindow.c:863
msgid "/_Tools/_Filter all messages in folder"
-msgstr "/工具(_T)/过滤文件夹中所有邮件(_F)"
+msgstr "/工具(_T)/过滤目录中所有邮件(_F)"
-#: src/mainwindow.c:817
+#: src/mainwindow.c:865
msgid "/_Tools/Filter _selected messages"
msgstr "/工具(_T)/过滤选定的邮件(_F)"
-#: src/mainwindow.c:819 src/messageview.c:311
+#: src/mainwindow.c:867
+msgid "/_Tools/Run folder processing rules"
+msgstr "/工具(_T)/运行目录的处理规则"
+
+#: src/mainwindow.c:869 src/messageview.c:399
msgid "/_Tools/_Create filter rule"
msgstr "/工具(_T)/创建过滤规则(_C)"
-#: src/mainwindow.c:820 src/messageview.c:313
+#: src/mainwindow.c:870 src/messageview.c:401
msgid "/_Tools/_Create filter rule/_Automatically"
msgstr "/工具(_T)/创建过滤规则(_C)/自动创建(_A)"
-#: src/mainwindow.c:822 src/messageview.c:315
+#: src/mainwindow.c:872 src/messageview.c:403
msgid "/_Tools/_Create filter rule/by _From"
msgstr "/工具(_T)/创建过滤规则(_C)/由发信人(_F)"
-#: src/mainwindow.c:824 src/messageview.c:317
+#: src/mainwindow.c:874 src/messageview.c:405
msgid "/_Tools/_Create filter rule/by _To"
msgstr "/工具(_T)/创建过滤规则(_C)/由收信人(_T)"
-#: src/mainwindow.c:826 src/messageview.c:319
+#: src/mainwindow.c:876 src/messageview.c:407
msgid "/_Tools/_Create filter rule/by _Subject"
msgstr "/工具(_T)/创建过滤规则(_C)/由主题(_S)"
-#: src/mainwindow.c:828
+#: src/mainwindow.c:878
msgid "/_Tools/C_reate processing rule"
msgstr "/工具(_T)/创建处理规则(_r)"
-#: src/mainwindow.c:829
+#: src/mainwindow.c:879
msgid "/_Tools/C_reate processing rule/_Automatically"
msgstr "/工具(_T)/创建处理规则(_r)/自动创建(_A)"
-#: src/mainwindow.c:831
+#: src/mainwindow.c:881
msgid "/_Tools/C_reate processing rule/by _From"
msgstr "/工具(_T)/创建处理规则(_r)/由发信人(_F)"
-#: src/mainwindow.c:833
+#: src/mainwindow.c:883
msgid "/_Tools/C_reate processing rule/by _To"
msgstr "/工具(_T)/创建处理规则(_r)/由收信人(_T)"
-#: src/mainwindow.c:835
+#: src/mainwindow.c:885
msgid "/_Tools/C_reate processing rule/by _Subject"
msgstr "/工具(_T)/创建处理规则(_r)/由主题(_S)"
-#: src/mainwindow.c:838 src/messageview.c:332
+#: src/mainwindow.c:888 src/messageview.c:420
msgid "/_Tools/List _URLs..."
msgstr "/工具(_T)/列出所有_URL..."
-#: src/mainwindow.c:842
+#: src/mainwindow.c:892
msgid "/_Tools/Ch_eck for new messages in all folders"
-msgstr "/工具(_T)/检查所有文件夹中的新邮件(_e)"
+msgstr "/工具(_T)/检查所有目录中的新邮件(_e)"
-#: src/mainwindow.c:844
+#: src/mainwindow.c:894
msgid "/_Tools/Delete du_plicated messages"
msgstr "/工具(_T)/删除重复邮件(_p)"
-#: src/mainwindow.c:846
+#: src/mainwindow.c:896
msgid "/_Tools/Delete du_plicated messages/In selected folder"
-msgstr "/工具(_T)/删除重复邮件(_p)/选定文件夹"
+msgstr "/工具(_T)/删除重复邮件(_p)/选定目录"
-#: src/mainwindow.c:848
+#: src/mainwindow.c:898
msgid "/_Tools/Delete du_plicated messages/In all folders"
-msgstr "/工具(_T)/删除重复邮件(_p)/所有文件夹"
+msgstr "/工具(_T)/删除重复邮件(_p)/所有目录"
-#: src/mainwindow.c:851
+#: src/mainwindow.c:901
msgid "/_Tools/E_xecute"
msgstr "/工具(_T)/执行(_x)"
-#: src/mainwindow.c:854
+#: src/mainwindow.c:904
msgid "/_Tools/SSL cer_tificates..."
msgstr "/工具(_T)/SSL认证(_t)"
-#: src/mainwindow.c:858
-msgid "/_Tools/_Log window"
-msgstr "/工具(_T)/日志窗口(_L)"
+#: src/mainwindow.c:908
+msgid "/_Tools/Filtering Log"
+msgstr "/工具(_T)/过滤日志"
-#: src/mainwindow.c:860
+#: src/mainwindow.c:909
+msgid "/_Tools/Network _Log"
+msgstr "/工具(_T)/网络日志(_L)"
+
+#: src/mainwindow.c:911
msgid "/_Configuration"
msgstr "/设置(_C)"
-#: src/mainwindow.c:861
+#: src/mainwindow.c:912
msgid "/_Configuration/C_hange current account"
msgstr "/设置(_C)/更改目前帐号(_h)"
-#: src/mainwindow.c:863
+#: src/mainwindow.c:914
msgid "/_Configuration/_Preferences for current account..."
msgstr "/设置(_C)/目前帐号的偏好设置(_P)..."
-#: src/mainwindow.c:865
+#: src/mainwindow.c:916
msgid "/_Configuration/Create _new account..."
msgstr "/设置(_C)/创建新帐号(_n)..."
-#: src/mainwindow.c:867
+#: src/mainwindow.c:918
msgid "/_Configuration/_Edit accounts..."
msgstr "/设置(_C)/编辑帐号(_E)..."
-#: src/mainwindow.c:869
+#: src/mainwindow.c:920 src/mainwindow.c:932
msgid "/_Configuration/---"
msgstr "/设置(_C)/---"
-#: src/mainwindow.c:870
+#: src/mainwindow.c:921
msgid "/_Configuration/P_references..."
msgstr "/设置(_C)/偏好(_r)..."
-#: src/mainwindow.c:872
+#: src/mainwindow.c:923
msgid "/_Configuration/Pre-pr_ocessing..."
msgstr "/设置(_C)/预处理(_o)..."
-#: src/mainwindow.c:874
+#: src/mainwindow.c:925
msgid "/_Configuration/Post-pro_cessing..."
msgstr "/设置(_C)/后处理(_c)..."
-#: src/mainwindow.c:876
+#: src/mainwindow.c:927
msgid "/_Configuration/_Filtering..."
msgstr "/设置(_C)/过滤(_F)..."
-#: src/mainwindow.c:878
+#: src/mainwindow.c:929
msgid "/_Configuration/_Templates..."
msgstr "/设置(_C)/模板(_T)..."
-#: src/mainwindow.c:879
+#: src/mainwindow.c:930
msgid "/_Configuration/_Actions..."
msgstr "/设置(_C)/动作(_A)..."
-#: src/mainwindow.c:880
+#: src/mainwindow.c:931
+msgid "/_Configuration/Tag_s..."
+msgstr "/设置(_C)/标签(_s)..."
+
+#: src/mainwindow.c:933
msgid "/_Configuration/Plu_gins..."
msgstr "/设置(_C)/插件(_g)..."
-#: src/mainwindow.c:883
+#: src/mainwindow.c:936
msgid "/_Help/_Manual"
msgstr "/求助(_H)/联机手册(_M)"
-#: src/mainwindow.c:884
+#: src/mainwindow.c:937
msgid "/_Help/_Online User-contributed FAQ"
msgstr "/帮助(_H)/在线FAQ(_O)"
-#: src/mainwindow.c:886
+#: src/mainwindow.c:939
msgid "/_Help/Icon _Legend"
msgstr "/帮助(_H)/图标说明(_L)"
-#: src/mainwindow.c:887
+#: src/mainwindow.c:940
msgid "/_Help/---"
msgstr "/求助(_H)/---"
-#: src/mainwindow.c:1236
+#: src/mainwindow.c:1294 src/summaryview.c:5716
+msgid "Apply tags..."
+msgstr "添加标签..."
+
+#: src/mainwindow.c:1651
msgid "Some error(s) happened. Click here to view log."
msgstr "有错误发生，请点击此处查看日志。"
-#: src/mainwindow.c:1250
+#: src/mainwindow.c:1665
msgid "You are online. Click the icon to go offline"
msgstr "目前在线。点击图标转到离线模式。"
-#: src/mainwindow.c:1253
+#: src/mainwindow.c:1668
msgid "You are offline. Click the icon to go online"
msgstr "目前离线。点击图标转到在线状态。"
-#: src/mainwindow.c:1269
+#: src/mainwindow.c:1684
msgid "Select account"
msgstr "选择帐号"
-#: src/mainwindow.c:1676 src/mainwindow.c:1717 src/mainwindow.c:1753
-#: src/mainwindow.c:1789 src/mainwindow.c:1832
-#: src/plugins/trayicon/trayicon.c:146 src/prefs_folder_item.c:765
+#: src/mainwindow.c:1710 src/prefs_logging.c:139
+msgid "Network log"
+msgstr "网络标记"
+
+#: src/mainwindow.c:1714
+msgid "Filtering/processing debug log"
+msgstr "过滤/处理 调试日志"
+
+#: src/mainwindow.c:1733 src/prefs_logging.c:395
+msgid "filtering log enabled\n"
+msgstr "已经开启过滤日志功能\n"
+
+#: src/mainwindow.c:1735 src/prefs_logging.c:397
+msgid "filtering log disabled\n"
+msgstr "已经关闭过滤日志功能\n"
+
+#: src/mainwindow.c:2181 src/mainwindow.c:2222 src/mainwindow.c:2252
+#: src/mainwindow.c:2284 src/mainwindow.c:2329
+#: src/plugins/trayicon/trayicon.c:138 src/prefs_folder_item.c:896
msgid "Untitled"
msgstr "未命名"
-#: src/mainwindow.c:1833
+#: src/mainwindow.c:2330 src/prefs_summary_open.c:113
msgid "none"
msgstr "无"
-#: src/mainwindow.c:2048
+#: src/mainwindow.c:2575
msgid "Delete all messages in trash folders?"
-msgstr "æ¸\85空å\9e\83å\9c¾æ¡¶内所有邮件？"
+msgstr "æ¸\85空åº\9f件夹内所有邮件？"
-#: src/mainwindow.c:2067
+#: src/mainwindow.c:2594
msgid "Add mailbox"
msgstr "添加邮箱"
-#: src/mainwindow.c:2068
+#: src/mainwindow.c:2595
msgid ""
"Input the location of mailbox.\n"
-"If the existing mailbox is specified, it will be\n"
+"If an existing mailbox is specified, it will be\n"
"scanned automatically."
msgstr ""
"请输入邮箱位置。\n"
-"如果指定已存在的邮箱，它将会自动被扫描。"
+"如果指定已存在的邮箱，它将会自动被扫描。\n"
+" "
-#: src/mainwindow.c:2074
+#: src/mainwindow.c:2601
#, c-format
msgid "The mailbox '%s' already exists."
msgstr "邮箱 `%s' 已经存在。"
-#: src/mainwindow.c:2079 src/setup.c:51
+#: src/mainwindow.c:2606 src/setup.c:51 src/wizard.c:731
msgid "Mailbox"
msgstr "邮箱"
-#: src/mainwindow.c:2084 src/setup.c:54
+#: src/mainwindow.c:2611 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 "
"创建邮箱失败。\n"
"也许某些文件已经存在，或者你没有足够的写权限。"
-#: src/mainwindow.c:2411
+#: src/mainwindow.c:2959
msgid "No posting allowed"
msgstr "不允许发贴"
-#: src/mainwindow.c:2918
+#: src/mainwindow.c:3523
msgid "Mbox import has failed."
msgstr "导入mbox文件失败。"
-#: src/mainwindow.c:2927 src/mainwindow.c:2936
+#: src/mainwindow.c:3532 src/mainwindow.c:3541
msgid "Export to mbox has failed."
msgstr "导出到mbox失败。"
-#: src/mainwindow.c:2959 src/plugins/trayicon/trayicon.c:520
+#: src/mainwindow.c:3577 src/plugins/trayicon/trayicon.c:548
msgid "Exit"
msgstr "退出"
-#: src/mainwindow.c:2959 src/plugins/trayicon/trayicon.c:520
+#: src/mainwindow.c:3577 src/plugins/trayicon/trayicon.c:548
msgid "Exit Claws Mail?"
msgstr "退出 Claws Mail?"
-#: src/mainwindow.c:3088
+#: src/mainwindow.c:3733
msgid "Folder synchronisation"
-msgstr "文件夹同步"
+msgstr "目录同步"
-#: src/mainwindow.c:3089
+#: src/mainwindow.c:3734
msgid "Do you want to synchronise your folders now?"
-msgstr "是否现在同步文件夹?"
+msgstr "是否现在同步目录?"
-#: src/mainwindow.c:3090
+#: src/mainwindow.c:3735
msgid "+_Synchronise"
msgstr "+同步(_S)"
-#: src/mainwindow.c:3430
+#: src/mainwindow.c:4108
msgid "Deleting duplicated messages..."
msgstr "删除重复的邮件..."
-#: src/mainwindow.c:3467
+#: src/mainwindow.c:4145
#, 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[0] "删除 %d 个重复的邮件(分布于 %d 个目录)。\n"
-#: src/mainwindow.c:3632 src/summaryview.c:4831
+#: src/mainwindow.c:4320 src/summaryview.c:5228
msgid "Processing rules to apply before folder rules"
-msgstr "在文件夹规则前应用的规则"
+msgstr "在目录规则前应用的规则"
-#: src/mainwindow.c:3641
+#: src/mainwindow.c:4329
msgid "Processing rules to apply after folder rules"
-msgstr "在文件夹规则后应用的规则"
+msgstr "在目录规则后应用的规则"
-#: src/mainwindow.c:3650 src/summaryview.c:4842
+#: src/mainwindow.c:4338 src/summaryview.c:5239
msgid "Filtering configuration"
msgstr "过滤/处理 配置"
-#: src/matcher.c:764 src/matcher.c:897 src/prefs_matcher.c:522
-#: src/prefs_matcher.c:1340 src/prefs_matcher.c:1357 src/prefs_matcher.c:2112
+#: src/matcher.c:497 src/matcher.c:502 src/matcher.c:522 src/matcher.c:527
+#: src/message_search.c:210 src/prefs_matcher.c:683 src/summary_search.c:396
+msgid "Case sensitive"
+msgstr "大小写敏感"
+
+#: src/matcher.c:497 src/matcher.c:502 src/matcher.c:522 src/matcher.c:527
+msgid "Case insensitive"
+msgstr "忽略大小写"
+
+#: src/matcher.c:857 src/matcher.c:868 src/matcher.c:879 src/matcher.c:889
+#: src/matcher.c:890 src/matcher.c:902 src/matcher.c:903 src/matcher.c:1135
+#: src/matcher.c:1147 src/matcher.c:1159
+#, c-format
+msgid "%s header"
+msgstr "%s 邮件头"
+
+#: src/matcher.c:1248 src/matcher.c:1250
+msgid "header"
+msgstr "邮件头"
+
+#: src/matcher.c:1259
+#, fuzzy
+msgid "header line"
+msgstr "信头名称"
+
+#: src/matcher.c:1261
+#, fuzzy
+msgid "headers line"
+msgstr "信头名称"
+
+#: src/matcher.c:1263 src/matcher.c:1265
+#, fuzzy
+msgid "message line"
+msgstr "邮件内容"
+
+#: src/matcher.c:1276 src/matcher.c:1409 src/prefs_matcher.c:653
+#: src/prefs_matcher.c:1457 src/prefs_matcher.c:1472 src/prefs_matcher.c:2320
msgid "Filtering Matcher Menu|All"
msgstr "全部"
-#: src/matcher.c:1473 src/matcher.c:1474 src/matcher.c:1475 src/matcher.c:1476
-#: src/matcher.c:1477 src/matcher.c:1478 src/matcher.c:1479 src/matcher.c:1480
+#: src/matcher.c:1483 src/matcher.c:1486
+#, fuzzy
+msgid "body line"
+msgstr "命令行"
+
+#: src/matcher.c:1662
+#, c-format
+msgid "checking if message matches [ %s ]\n"
+msgstr "正在检查邮件是否匹配[ %s ]\n"
+
+#: src/matcher.c:1725 src/matcher.c:1744 src/matcher.c:1757
+msgid "message matches\n"
+msgstr "邮件匹配\n"
+
+#: src/matcher.c:1732 src/matcher.c:1750 src/matcher.c:1759
+msgid "message does not match\n"
+msgstr "邮件不匹配\n"
+
+#: src/matcher.c:2016 src/matcher.c:2017 src/matcher.c:2018 src/matcher.c:2019
+#: src/matcher.c:2020 src/matcher.c:2021 src/matcher.c:2022 src/matcher.c:2023
msgid "(none)"
msgstr "(无)"
-#: src/mbox.c:98
+#: src/mbox.c:102
#, c-format
msgid ""
"Could not open mbox file:\n"
"无法打开mbox文件:\n"
"%s\n"
-#: src/mbox.c:134
+#: src/mbox.c:138
#, c-format
msgid "Importing from mbox... (%d mails imported)"
msgstr "正在从mbox文件导入... (已经导入%d封邮件)"
-#: src/mbox.c:529
+#: src/mbox.c:542
msgid "Overwrite mbox file"
msgstr "覆盖mbox文件"
-#: src/mbox.c:530
+#: src/mbox.c:543
msgid "This file already exists. Do you want to overwrite it?"
msgstr "该文件已经存在, 是否要覆盖?"
-#: src/mbox.c:531 src/messageview.c:1150 src/mimeview.c:1464
-#: src/textview.c:2660
+#: src/mbox.c:544 src/messageview.c:1418 src/mimeview.c:1564
+#: src/textview.c:2914
msgid "Overwrite"
msgstr "覆盖"
-#: src/mbox.c:540
+#: src/mbox.c:553
#, c-format
msgid ""
"Could not create mbox file:\n"
"无法创建mbox文件:\n"
"%s\n"
-#: src/mbox.c:548
+#: src/mbox.c:561
msgid "Exporting to mbox..."
-msgstr "正在导出文件夹到mbox文件..."
+msgstr "正在导出目录到mbox文件..."
#: src/message_search.c:169
msgid "Find in current message"
msgid "Find text:"
msgstr "查找文字"
-#: src/message_search.c:210 src/prefs_matcher.c:651 src/summary_search.c:392
-msgid "Case sensitive"
-msgstr "大小写敏感"
-
-#: src/message_search.c:323 src/summary_search.c:637
+#: src/message_search.c:326 src/summary_search.c:667
msgid "Search failed"
msgstr "搜索失败"
-#: src/message_search.c:324 src/summary_search.c:638
+#: src/message_search.c:327 src/summary_search.c:668
msgid "Search string not found."
msgstr "未找到指定字符串。"
-#: src/message_search.c:333
+#: src/message_search.c:336
msgid "Beginning of message reached; continue from end?"
msgstr "已到达邮件顶部，是否绕到尾部继续查找？"
-#: src/message_search.c:336
+#: src/message_search.c:339
msgid "End of message reached; continue from beginning?"
msgstr "已到达邮件末尾，是否重新开始查找？"
-#: src/message_search.c:339 src/summary_search.c:649
+#: src/message_search.c:342 src/summary_search.c:679
msgid "Search finished"
msgstr "搜索完成"
-#: src/messageview.c:166
+#: src/messageview.c:224
msgid "/_File/_Close"
msgstr "/文件(_F)/关闭(_C)"
-#: src/messageview.c:283
+#: src/messageview.c:280
+msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
+msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-_1)"
+
+#: src/messageview.c:282
+msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
+msgstr "/查看(_V)/字符集(_e)/西欧(ISO-8859-15)"
+
+#: src/messageview.c:284
+msgid "/_View/Character _encoding/Western European (Windows-1252)"
+msgstr "/查看(_V)/字符集(_e)/西欧(Windows-1252)"
+
+#: src/messageview.c:290
+msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
+msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-13)(_B)"
+
+#: src/messageview.c:292
+msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
+msgstr "/查看(_V)/字符集(_e)/波罗的海 (ISO-8859-_4) "
+
+#: src/messageview.c:298
+msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
+msgstr "/查看(_V)/字符集(_e)/希伯来 (ISO-8859-_8)"
+
+#: src/messageview.c:300
+msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
+msgstr "/查看(_V)/字符集(_e)/希伯来 (Windows-1251)"
+
+#: src/messageview.c:303
+msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
+msgstr "/查看(_V)/字符集(_e)/阿拉伯语 (ISO-8859-_6) "
+
+#: src/messageview.c:305
+msgid "/_View/Character _encoding/Arabic (Windows-1256)"
+msgstr "/查看(_V)/字符集(_e)/阿拉伯语 (Windows-1256)"
+
+#: src/messageview.c:311
+msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
+msgstr "/查看(_V)/字符集(_e)/斯拉夫 (ISO-8859-_5)"
+
+#: src/messageview.c:313
+msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
+msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-_R)"
+
+#: src/messageview.c:315
+msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
+msgstr "/查看(_V)/字符集(_e)/斯拉夫 (KOI8-U)"
+
+#: src/messageview.c:317
+msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
+msgstr "/查看(_V)/字符集(_e)/斯拉夫 (Windows-1251)"
+
+#: src/messageview.c:320
+msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
+msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-_JP)"
+
+#: src/messageview.c:322
+msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
+msgstr "/查看(_V)/字符集(_e)/日文 (ISO-2022-JP-2)"
+
+#: src/messageview.c:324
+msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
+msgstr "/查看(_V)/字符集(_e)/日文 (_EUC-JP)"
+
+#: src/messageview.c:326
+msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
+msgstr "/查看(_V)/字符集(_e)/日文 (_Shift__JIS)"
+
+#: src/messageview.c:329
+msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
+msgstr "/查看(_V)/字符集(_e)/简体中文 (_GB2312)"
+
+#: src/messageview.c:331
+msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
+msgstr "/查看(_V)/字符集(_e)/简体中文 (GBK)"
+
+#: src/messageview.c:333
+msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
+msgstr "/查看(_V)/字符集(_e)/繁体中文 (_Big5)"
+
+#: src/messageview.c:335
+msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
+msgstr "/查看(_V)/字符集(_e)/繁体中文 (EUC-_TW)"
+
+#: src/messageview.c:337
+msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
+msgstr "/查看(_V)/字符集(_e)/中文 (ISO-2022-_CN)"
+
+#: src/messageview.c:340
+msgid "/_View/Character _encoding/Korean (EUC-_KR)"
+msgstr "/查看(_V)/字符集(_e)/韩文 (EUC-_KR) "
+
+#: src/messageview.c:342
+msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
+msgstr "/查看(_V)/字符集(_e)/韩文 (ISO-2022-KR)"
+
+#: src/messageview.c:345
+msgid "/_View/Character _encoding/Thai (TIS-620)"
+msgstr "/查看(_V)/字符集(_e)/泰国 (TIS-620)"
+
+#: src/messageview.c:347
+msgid "/_View/Character _encoding/Thai (Windows-874)"
+msgstr "/查看(_V)/字符集(_e)/泰国 (Windows-874)"
+
+#: src/messageview.c:371
msgid "/_View/Show all _headers"
msgstr "/查看(_V)/显示所有信息头(_H)"
-#: src/messageview.c:290
+#: src/messageview.c:378
msgid "/_Message/Compose _new message"
msgstr "/邮件(_M)/撰写新邮件(_N)"
-#: src/messageview.c:304
+#: src/messageview.c:392
msgid "/_Message/Redirec_t"
msgstr "/邮件(_M)/重定向(_t)"
-#: src/messageview.c:321
+#: src/messageview.c:409
msgid "/_Tools/Create processing rule"
msgstr "/工具(_T)/创建处理规则"
-#: src/messageview.c:323
+#: src/messageview.c:411
msgid "/_Tools/Create processing rule/_Automatically"
msgstr "/工具(_T)/创建处理规则/自动创建(_A)"
-#: src/messageview.c:325
+#: src/messageview.c:413
msgid "/_Tools/Create processing rule/by _From"
msgstr "/工具(_T)/创建处理规则/由发信人(_F)"
-#: src/messageview.c:327
+#: src/messageview.c:415
msgid "/_Tools/Create processing rule/by _To"
msgstr "/工具(_T)/创建处理规则/由收信人(_T)"
-#: src/messageview.c:329
+#: src/messageview.c:417
msgid "/_Tools/Create processing rule/by _Subject"
msgstr "/工具(_T)/创建处理规则/由主题(_S)"
-#: src/messageview.c:455 src/messageview.c:862
+#: src/messageview.c:552 src/messageview.c:1088
msgid "Claws Mail - Message View"
msgstr "Claws Mail - 邮件"
-#: src/messageview.c:572
+#: src/messageview.c:676
msgid "<No Return-Path found>"
msgstr "<未找到回信地址>"
-#: src/messageview.c:580
+#: src/messageview.c:684
#, c-format
msgid ""
"The notification address to which the return receipt is\n"
" 返回路径: %s\n"
"建议不发送此回执。"
-#: src/messageview.c:587 src/messageview.c:604
+#: src/messageview.c:691 src/messageview.c:708
msgid "_Don't Send"
msgstr "不发送(_D)"
-#: src/messageview.c:600
+#: src/messageview.c:704
msgid ""
"This message is asking for a return receipt notification\n"
"but according to its 'To:' and 'CC:' headers it was not\n"
"\n"
"建议不发送回执。"
-#: src/messageview.c:814 src/procmime.c:883
+#: src/messageview.c:1057 src/procmime.c:836
#, c-format
msgid "Couldn't decrypt: %s"
msgstr "无法解密: %s"
-#: src/messageview.c:1145 src/mimeview.c:1606 src/summaryview.c:4113
-#: src/summaryview.c:4116 src/textview.c:2648
+#: src/messageview.c:1410 src/messageview.c:1413 src/mimeview.c:1713
+#: src/summaryview.c:4492 src/summaryview.c:4495 src/textview.c:2902
msgid "Save as"
msgstr "保存为"
-#: src/messageview.c:1151
+#: src/messageview.c:1419
msgid "Overwrite existing file?"
msgstr "附加已有文件？"
-#: src/messageview.c:1159 src/summaryview.c:4133 src/summaryview.c:4136
-#: src/summaryview.c:4151
+#: src/messageview.c:1427 src/summaryview.c:4512 src/summaryview.c:4515
+#: src/summaryview.c:4530
#, c-format
msgid "Couldn't save the file '%s'."
msgstr "无法保存文件 '%s'。"
-#: src/messageview.c:1219
+#: src/messageview.c:1488
+#, fuzzy
+msgid ""
+"You got a return receipt in this message : it has been displayed by the "
+"recipient."
+msgstr "该邮件要求返回回执。"
+
+#: src/messageview.c:1491
msgid "You asked for a return receipt in this message."
msgstr "该邮件要求返回回执。"
-#: src/messageview.c:1224
+#: src/messageview.c:1497
msgid "This message asks for a return receipt."
msgstr "该邮件要求返回回执。"
-#: src/messageview.c:1225
+#: src/messageview.c:1498
msgid "Send receipt"
msgstr "发送回执"
-#: src/messageview.c:1268
+#: src/messageview.c:1541
msgid ""
"This message has been partially retrieved,\n"
"and has been deleted from the server."
"这封邮件只有部分被取回, \n"
"并已经从服务器删除了。"
-#: src/messageview.c:1274
+#: src/messageview.c:1547
#, c-format
msgid ""
"This message has been partially retrieved;\n"
"这封邮件只有部分被取回; \n"
"它是 %s。"
-#: src/messageview.c:1278 src/messageview.c:1300
+#: src/messageview.c:1551 src/messageview.c:1573
msgid "Mark for download"
msgstr "标记为待下载"
-#: src/messageview.c:1279 src/messageview.c:1291
+#: src/messageview.c:1552 src/messageview.c:1564
msgid "Mark for deletion"
msgstr "标记为待删除"
-#: src/messageview.c:1284
+#: src/messageview.c:1557
#, c-format
msgid ""
"This message has been partially retrieved;\n"
"这封邮件只有部分被取回; \n"
"它 %s 并将会被下载。"
-#: src/messageview.c:1289 src/messageview.c:1302
-#: src/prefs_filtering_action.c:154
+#: src/messageview.c:1562 src/messageview.c:1575
+#: src/prefs_filtering_action.c:166
msgid "Unmark"
msgstr "不标记"
-#: src/messageview.c:1295
+#: src/messageview.c:1568
#, c-format
msgid ""
"This message has been partially retrieved;\n"
"这封邮件只有部分被取回; \n"
"它 %s 并将会被删除。"
-#: src/messageview.c:1372
+#: src/messageview.c:1641
msgid "Return Receipt Notification"
msgstr "返回回执"
-#: src/messageview.c:1373
+#: src/messageview.c:1642
msgid ""
"The message was sent to several of your accounts.\n"
"Please choose which account do you want to use for sending the receipt "
"该邮件发送到了你的多个帐号中。\n"
"请选择用以发送回执的帐号: "
-#: src/messageview.c:1377
+#: src/messageview.c:1646
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: src/messageview.c:1646
msgid "_Send Notification"
msgstr "发送通知(_S)"
-#: src/messageview.c:1377
-msgid "+_Cancel"
-msgstr "+取消(_C)"
-
-#: src/messageview.c:1444
+#: src/messageview.c:1716
msgid "Cannot print: the message doesn't contain text."
msgstr "无法打印: 该邮件不包含任何文字。"
-#: src/messageview.c:1508 src/summaryview.c:4173
+#: src/messageview.c:1804 src/summaryview.c:4563
#, c-format
msgid ""
"Enter the print command line:\n"
"请输入用于打印的命令行:\n"
"(`%s' 将被替换为文件名)"
-#: src/messageview.c:1514 src/summaryview.c:4179
+#: src/messageview.c:1810 src/summaryview.c:4569
#, c-format
msgid ""
"Print command line is invalid:\n"
"打印命令行无效:\n"
"`%s'"
-#: src/messageview.c:1792 src/messageview.c:1798 src/summaryview.c:3560
-#: src/summaryview.c:5590
+#: src/messageview.c:2472 src/messageview.c:2478 src/summaryview.c:3886
+#: src/summaryview.c:6431
msgid "An error happened while learning.\n"
msgstr "培训时发生错误.\n"
-#: src/mh.c:423
+#: src/mh.c:428
#, c-format
msgid "can't copy message %s to %s\n"
msgstr "无法将邮件 %s 复制到 %s\n"
-#: src/mh.c:498
+#: src/mh.c:515
msgid "Moving messages..."
msgstr "正在移动邮件..."
-#: src/mh.c:638
+#: src/mh.c:660
msgid "Deleting messages..."
msgstr "正在删除邮件..."
msgid "_Remove"
msgstr "删除(_R)"
-#: src/mimeview.c:168
-msgid "/_Open"
+#: src/mimeview.c:177
+msgid "/_Open (l)"
msgstr "/打开(_O)"
-#: src/mimeview.c:169
-msgid "/Open _with..."
+#: src/mimeview.c:179
+msgid "/Open _with (o)..."
msgstr "/打开方式(_w)..."
-#: src/mimeview.c:170
-msgid "/_Display as text"
+#: src/mimeview.c:181
+msgid "/_Display as text (t)"
msgstr "/以文本方式显示(_D)"
-#: src/mimeview.c:171 src/summaryview.c:478
-msgid "/_Save as..."
+#: src/mimeview.c:182
+msgid "/_Save as (y)..."
msgstr "/另存为(_S)..."
-#: src/mimeview.c:172
+#: src/mimeview.c:183
msgid "/Save _all..."
msgstr "/全部保存(_a)..."
-#: src/mimeview.c:211
+#: src/mimeview.c:184
+msgid "/Next part (a)"
+msgstr "/下一区段(a)"
+
+#: src/mimeview.c:252
msgid "MIME Type"
msgstr "MIME类型"
-#: src/mimeview.c:759
+#: src/mimeview.c:816
msgid "Check signature"
msgstr "检查签名"
-#: src/mimeview.c:764 src/mimeview.c:769 src/mimeview.c:774
+#: src/mimeview.c:821 src/mimeview.c:826 src/mimeview.c:831
msgid "View full information"
msgstr "查看详细信息"
-#: src/mimeview.c:779 src/mimeview.c:783
+#: src/mimeview.c:836 src/mimeview.c:840
msgid "Check again"
msgstr "再次检查"
-#: src/mimeview.c:792
+#: src/mimeview.c:849
msgid "Click the icon or hit 'C' to check it."
msgstr "点击图标或者按'C'选中。"
-#: src/mimeview.c:797
+#: src/mimeview.c:854
msgid "Timeout checking the signature. Click the icon or hit 'C' to try again."
msgstr "检查签名超时。请点击图标或者按'C'以重试。"
-#: src/mimeview.c:1007
+#: src/mimeview.c:1062
msgid "Checking signature..."
msgstr "正在检查签名..."
-#: src/mimeview.c:1049
+#: src/mimeview.c:1104
msgid "Go back to email"
msgstr "回到邮件"
-#: src/mimeview.c:1388 src/mimeview.c:1472 src/mimeview.c:1653
-#: src/mimeview.c:1687
+#: src/mimeview.c:1486 src/mimeview.c:1572 src/mimeview.c:1760
+#: src/mimeview.c:1802
#, c-format
msgid "Couldn't save the part of multipart message: %s"
msgstr "无法保存复合邮件的这一部分: %s"
-#: src/mimeview.c:1461 src/textview.c:2658
+#: src/mimeview.c:1561 src/textview.c:2912
#, c-format
msgid "Overwrite existing file '%s'?"
msgstr "覆盖已有文件 '%s' 吗？"
-#: src/mimeview.c:1502
+#: src/mimeview.c:1602
msgid "Select destination folder"
-msgstr "选择目的文件夹"
+msgstr "选择目的目录"
-#: src/mimeview.c:1509
+#: src/mimeview.c:1609
#, c-format
msgid "'%s' is not a directory."
msgstr "`%s'不是一个目录。"
-#: src/mimeview.c:1734 src/mimeview.c:1742 src/textview.c:2589
+#: src/mimeview.c:1834
+msgid "No registered viewer for this file type."
+msgstr "系统中没有注册可查看此文件类型的程序"
+
+#: src/mimeview.c:1866 src/mimeview.c:1873 src/textview.c:2843
msgid "Open with"
msgstr "打开方式"
-#: src/mimeview.c:1735 src/mimeview.c:1743 src/textview.c:2590
+#: src/mimeview.c:1867 src/mimeview.c:1874 src/textview.c:2844
#, c-format
msgid ""
"Enter the command line to open file:\n"
"请输入用于打开文件的命令行:\n"
"(`%s' 将被替换为文件名)"
-#: src/news.c:255
+#: src/news.c:294
#, c-format
msgid "creating NNTP connection to %s:%d ...\n"
msgstr "正在与 %s 建立NNTP连接:%d ...\n"
-#: src/news.c:328
+#: src/news.c:313
+#, c-format
+msgid "Error logging in to %s:%d ...\n"
+msgstr "登录到%s时发生了错误: %d ...\n"
+
+#: src/news.c:368
+#, c-format
+msgid "Error authenticating to %s:%d ...\n"
+msgstr "对%s授权时发生了错误: %d ...\n"
+
+#: src/news.c:391
msgid "Claws Mail needs network access in order to access the News server."
msgstr "Claws Mail需要访问网络才能链接倒News服务器。"
-#: src/news.c:345
+#: src/news.c:409
#, c-format
msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
msgstr "与 %s:%d 的NNTP连接已经断开。正在重新连接...\n"
-#: src/news.c:475
-msgid "can't retrieve newsgroup list\n"
-msgstr "无法取回新闻组列表。\n"
-
-#: src/news.c:588
-msgid "couldn't post article.\n"
-msgstr "无法发送帖子.\n"
-
-#: src/news.c:614
-#, c-format
-msgid "couldn't retrieve article %d\n"
-msgstr "无法取回帖子 %d\n"
-
-#: src/news.c:663
+#: src/news.c:769
#, c-format
msgid "couldn't select group: %s\n"
msgstr "无法选择新闻组: %s\n"
-#: src/news.c:888
+#: src/news.c:965
#, c-format
msgid "couldn't set group: %s\n"
msgstr "无法设置群组: %s\n"
-#: src/news.c:897
+#: src/news.c:974
#, c-format
msgid "invalid article range: %d - %d\n"
msgstr "无效帖子索引范围: %d - %d \n"
-#: src/news.c:917
-#, c-format
-msgid "error occurred while getting %s.\n"
-msgstr "提取 %s 时发生错误.\n"
-
-#: src/news.c:955
+#: src/news.c:1025
#, c-format
msgid "getting xover %d in %s...\n"
msgstr "正在提取xover %d于 %s...\n"
-#: src/news.c:962 src/news.c:1056
+#: src/news.c:1031 src/news.c:1110
msgid "couldn't get xover\n"
msgstr "无法取得xover\n"
-#: src/news.c:972 src/news.c:1068
-msgid "error occurred while getting xover.\n"
-msgstr "提取xover时发生错误。\n"
-
-#: src/news.c:979 src/news.c:1082
-#, c-format
-msgid "invalid xover line: %s\n"
-msgstr ""
+#: src/news.c:1043 src/news.c:1124
+#, fuzzy
+msgid "invalid xover line\n"
+msgstr "信头名称"
-#: src/news.c:997 src/news.c:1018 src/news.c:1101 src/news.c:1133
+#: src/news.c:1060 src/news.c:1075
msgid "couldn't get xhdr\n"
msgstr "无法取得xhdr\n"
-#: src/news.c:1007 src/news.c:1028 src/news.c:1114 src/news.c:1146
-msgid "error occurred while getting xhdr.\n"
-msgstr "提取xhdr时发生错误。\n"
-
-#: src/news.c:1052
+#: src/news.c:1102
#, c-format
msgid "getting xover %d - %d in %s...\n"
msgstr ""
-#: src/news_gtk.c:52
+#: src/news.c:1250
+msgid ""
+"You have one or more News accounts defined. However this version of Claws "
+"Mail has been built without News support; your News account(s) are "
+"disabled.\n"
+"\n"
+"You probably need to install libetpan and recompile Claws Mail."
+msgstr ""
+"你定义了多个新闻组(News)帐号, 但当前的这个Claws Mail编译时并没有添加新闻组支持，"
+"故新闻组帐号将被禁用。\n"
+"\n"
+"你可能需要安装libetpan并重新编译Claws Mail。"
+
+#: src/news_gtk.c:53
msgid "/_Subscribe to newsgroup..."
msgstr "/订阅新闻组 (_S)..."
-#: src/news_gtk.c:53
+#: src/news_gtk.c:54
msgid "/_Unsubscribe newsgroup"
msgstr "/退订新闻组 (_S)..."
-#: src/news_gtk.c:55
+#: src/news_gtk.c:56
msgid "/Synchronise"
msgstr "/同步"
-#: src/news_gtk.c:226
+#: src/news_gtk.c:227
#, c-format
msgid "Really unsubscribe newsgroup '%s'?"
msgstr "确定要退订新闻组'%s'？"
-#: src/news_gtk.c:227
+#: src/news_gtk.c:228
msgid "Unsubscribe newsgroup"
msgstr "退订新闻组"
-#: src/news_gtk.c:228
+#: src/news_gtk.c:229
msgid "_Unsubscribe"
msgstr "/退订新闻组(_S)"
#: src/plugins/bogofilter/bogofilter.c:77
-#: src/plugins/bogofilter/bogofilter_gtk.c:429
+#: src/plugins/bogofilter/bogofilter_gtk.c:430
msgid "Bogofilter"
msgstr ""
-#: src/plugins/bogofilter/bogofilter.c:454
+#: src/plugins/bogofilter/bogofilter.c:466
msgid "Bogofilter: fetching bodies..."
msgstr "Bogofilter: 正在提取邮件内容..."
-#: src/plugins/bogofilter/bogofilter.c:467
+#: src/plugins/bogofilter/bogofilter.c:479
msgid "Bogofilter: filtering messages..."
msgstr "Bogofilter: 正在过滤邮件..."
-#: src/plugins/bogofilter/bogofilter.c:559
+#: src/plugins/bogofilter/bogofilter.c:573
msgid ""
"The Bogofilter plugin couldn't filter a message. The probable cause of the "
"error is that it didn't learn from any mail.\n"
"with a few hundred spam and ham messages."
msgstr ""
"Bogofilter无法过滤邮件。很可能是因为它还没有接受过培训。\n"
-"请使用\"标记/标记为垃圾邮件\"和\"标记/标记为非垃圾邮件\"来培训Bogofilter，"
-"一般得培训几百封邮件后才能有较高的识别率。"
+"请使用\"标记/标记为垃圾邮件\"和\"标记/标记为非垃圾邮件\"来培训Bogofilter，一"
+"般得培训几百封邮件后才能有较高的识别率。"
-#: src/plugins/bogofilter/bogofilter.c:566
+#: src/plugins/bogofilter/bogofilter.c:580
#, c-format
msgid ""
"The Bogofilter plugin couldn't filter a message. The command `%s %s %s` "
"couldn't be run."
-msgstr ""
+msgstr "Bogofilter插件无法过滤邮件: 无法运行命令 `%s %s %s`。"
-#: src/plugins/bogofilter/bogofilter.c:670
+#: src/plugins/bogofilter/bogofilter.c:726
msgid "Bogofilter: learning from message..."
msgstr "Bogofilter: 正在从邮件接受培训..."
-#: src/plugins/bogofilter/bogofilter.c:683
-#: src/plugins/bogofilter/bogofilter.c:732
+#: src/plugins/bogofilter/bogofilter.c:739
+#: src/plugins/bogofilter/bogofilter.c:788
#, c-format
msgid "Learning failed; `%s` returned with status %d."
-msgstr ""
+msgstr "培训失败: `%s`返回状态%d。"
-#: src/plugins/bogofilter/bogofilter.c:700
+#: src/plugins/bogofilter/bogofilter.c:756
msgid "Bogofilter: learning from messages..."
msgstr "Bogofilter: 正在从邮件接受培训..."
-#: src/plugins/bogofilter/bogofilter.c:788
+#: src/plugins/bogofilter/bogofilter.c:844
#, c-format
msgid ""
"Learning failed; `%s %s %s` returned with error:\n"
"%s"
msgstr ""
+"培训失败: `%s %s %s`返回错误:\n"
+"%s"
-#: src/plugins/bogofilter/bogofilter.c:790 src/privacy.c:61
+#: src/plugins/bogofilter/bogofilter.c:846 src/privacy.c:61
msgid "Unknown error"
msgstr "未知错误"
-#: src/plugins/bogofilter/bogofilter.c:914
+#: src/plugins/bogofilter/bogofilter.c:973
msgid ""
"This plugin can check all messages that are received from an IMAP, LOCAL or "
"POP account for spam using Bogofilter. You will need Bogofilter installed "
"\n"
"Options can be found in /Configuration/Preferences/Plugins/Bogofilter"
msgstr ""
-"本插件用Botofilter程序检查所有从IMAP, LOCAL或者POP帐号收到的邮件, 以判断"
-"æ\9d¥ä¿¡æ\98¯å\90¦æ\98¯å\9e\83å\9c¾é\82®ä»¶ã\80\82ä½ é\9c\80è¦\81å\85\88å\9c¨æ\9c¬æ\9cºå®\89è£\85Bogofilterã\80\82\n"
+"本插件用Botofilter程序检查所有从IMAP, LOCAL或者POP帐号收到的邮件, 以判断来信"
+"是否是垃圾邮件。你需要先在本机安装Bogofilter。\n"
"\n"
-"在Bogofilter能够正确识别垃圾邮件之前，你得先对它进行一下培训。培训方法就是"
-"先告诉它哪些是垃圾邮件(\"标记/标记为垃圾邮件\")，哪些不是(\"标记/标记为非垃圾邮件\")。\n"
+"在Bogofilter能够正确识别垃圾邮件之前，你得先对它进行一下培训。培训方法就是先"
+"告诉它哪些是垃圾邮件(\"标记/标记为垃圾邮件\")，哪些不是(\"标记/标记为非垃圾邮"
+"件\")。\n"
"\n"
-"如果一个邮件被判断为垃圾邮件，它将会被删除或者保存到一个特殊文件夹。\n"
+"如果一个邮件被判断为垃圾邮件，它将会被删除或者保存到一个特殊目录。\n"
"\n"
"相关选项可以在'/配置/偏好/插件/Bogofilter'中设置"
-#: src/plugins/bogofilter/bogofilter.c:947
-#: src/plugins/spamassassin/spamassassin.c:562
+#: src/plugins/bogofilter/bogofilter.c:1006
+#: src/plugins/spamassassin/spamassassin.c:649
msgid "Spam detection"
msgstr "垃圾邮件检测"
-#: src/plugins/bogofilter/bogofilter.c:948
-#: src/plugins/spamassassin/spamassassin.c:563
+#: src/plugins/bogofilter/bogofilter.c:1007
+#: src/plugins/spamassassin/spamassassin.c:650
msgid "Spam learning"
msgstr "学习识别能力"
-#: src/plugins/bogofilter/bogofilter_gtk.c:151
-#: src/plugins/spamassassin/spamassassin_gtk.c:364
+#: src/plugins/bogofilter/bogofilter_gtk.c:149
+#: src/plugins/spamassassin/spamassassin_gtk.c:404
msgid "Process messages on receiving"
msgstr "接收邮件时进行过滤"
-#: src/plugins/bogofilter/bogofilter_gtk.c:159
-#: src/plugins/spamassassin/spamassassin_gtk.c:321
+#: src/plugins/bogofilter/bogofilter_gtk.c:157
+#: src/plugins/spamassassin/spamassassin_gtk.c:361
msgid "Maximum size"
msgstr "最大尺寸"
-#: src/plugins/bogofilter/bogofilter_gtk.c:168
-#: src/plugins/spamassassin/spamassassin_gtk.c:330
+#: src/plugins/bogofilter/bogofilter_gtk.c:166
+#: src/plugins/spamassassin/spamassassin_gtk.c:370
msgid "Messages larger than this will not be checked"
msgstr "大于此值的邮件将不会被检查"
-#: src/plugins/bogofilter/bogofilter_gtk.c:171
-#: src/plugins/spamassassin/spamassassin_gtk.c:333
-msgid "kB"
-msgstr "kB"
+#: src/plugins/bogofilter/bogofilter_gtk.c:169
+#: src/plugins/spamassassin/spamassassin_gtk.c:373 src/prefs_account.c:1410
+msgid "KB"
+msgstr "KB"
-#: src/plugins/bogofilter/bogofilter_gtk.c:179
-#: src/plugins/spamassassin/spamassassin_gtk.c:372
+#: src/plugins/bogofilter/bogofilter_gtk.c:177
+#: src/plugins/spamassassin/spamassassin_gtk.c:412
msgid "Save spam in"
msgstr "保存垃圾邮件到"
-#: src/plugins/bogofilter/bogofilter_gtk.c:187
-#: src/plugins/spamassassin/spamassassin_gtk.c:380
+#: src/plugins/bogofilter/bogofilter_gtk.c:185
+#: src/plugins/spamassassin/spamassassin_gtk.c:420
msgid ""
"Folder for storing identified spam. Leave empty to use the trash folder."
-msgstr "用于保存垃圾邮件的文件夹，不设置时将缺省使用垃圾桶"
+msgstr "用于保存垃圾邮件的目录，不设置时将缺省使用废件夹"
-#: src/plugins/bogofilter/bogofilter_gtk.c:194
-#: src/plugins/spamassassin/spamassassin_gtk.c:387
+#: src/plugins/bogofilter/bogofilter_gtk.c:192
+#: src/plugins/spamassassin/spamassassin_gtk.c:427
msgid "Click this button to select a folder for storing spam"
-msgstr "点击此按钮选择用于存放垃圾邮件的文件夹"
+msgstr "点击此按钮选择用于存放垃圾邮件的目录"
-#: src/plugins/bogofilter/bogofilter_gtk.c:201
-msgid "When unsure, move in"
-msgstr "å°\86ä¸\8dç¡®å®\9aç\9a\84é\82®ä»¶è½¬到"
+#: src/plugins/bogofilter/bogofilter_gtk.c:199
+msgid "When unsure, move to"
+msgstr "å¦\82æ\9e\9cä¸\8dç¡®å®\9aï¼\8c移å\8a¨到"
-#: src/plugins/bogofilter/bogofilter_gtk.c:209
+#: src/plugins/bogofilter/bogofilter_gtk.c:207
msgid ""
"Folder for storing mail for which spam status is Unsure. Leave empty to use "
-"the inbox folder."
-msgstr "用于保存不能确定是否是垃圾邮件的文件夹，不设置时将缺省使用收件箱"
+"the Inbox folder."
+msgstr "此目录用于保存那些不能明确判定是否是垃圾的邮件，不设置时将缺省使用收件箱"
-#: src/plugins/bogofilter/bogofilter_gtk.c:216
+#: src/plugins/bogofilter/bogofilter_gtk.c:214
msgid "Click this button to select a folder for storing Unsure mails."
-msgstr "点击此按钮可选择一个文件夹，以用于存放不确定是否是垃圾的邮件"
+msgstr "点击此按钮可选择一个目录，以用于存放不确定是否是垃圾的邮件"
-#: src/plugins/bogofilter/bogofilter_gtk.c:219
+#: src/plugins/bogofilter/bogofilter_gtk.c:217
msgid "Insert X-Bogosity header"
-msgstr ""
+msgstr "插入X-Bogosity邮件头"
-#: src/plugins/bogofilter/bogofilter_gtk.c:223
+#: src/plugins/bogofilter/bogofilter_gtk.c:221
msgid "Only done for messages in MH folders"
msgstr "只检查MH格式的邮箱"
-#: src/plugins/bogofilter/bogofilter_gtk.c:230
-msgid "Whitelist senders present in addressbook/folder"
-msgstr "地址簿中的白名单"
+#: src/plugins/bogofilter/bogofilter_gtk.c:228
+#: src/plugins/spamassassin/spamassassin_gtk.c:443
+msgid "Whitelist senders found in address book/folder"
+msgstr "将地址簿中的地址作为白名单"
-#: src/plugins/bogofilter/bogofilter_gtk.c:234
+#: src/plugins/bogofilter/bogofilter_gtk.c:232
+#: src/plugins/spamassassin/spamassassin_gtk.c:447
msgid ""
-"Messages coming from your addressbook contacts will be received in the "
+"Messages coming from your address book contacts will be received in the "
"normal folder even if detected as spam"
msgstr ""
+"如果邮件来自一个您地址簿中已有的地址，则该邮件即使被识别为一个垃圾邮件，也将"
+"会保存在普通邮件夹中"
-#: src/plugins/bogofilter/bogofilter_gtk.c:252
-#: src/prefs_filtering_action.c:454 src/prefs_matcher.c:580
+#: src/plugins/bogofilter/bogofilter_gtk.c:238
+#: src/plugins/dillo_viewer/dillo_prefs.c:203
+#: src/plugins/spamassassin/spamassassin_gtk.c:453
+#: src/prefs_filtering_action.c:525 src/prefs_filtering_action.c:531
+#: src/prefs_matcher.c:627
msgid "Select ..."
msgstr "选择..."
-#: src/plugins/bogofilter/bogofilter_gtk.c:256
-msgid "Click this button to select a book or folder in the addressbook"
+#: src/plugins/bogofilter/bogofilter_gtk.c:242
+#: src/plugins/spamassassin/spamassassin_gtk.c:457
+msgid "Click this button to select a book or folder in the address book"
msgstr "点击此按钮选择地址簿的目录"
-#: src/plugins/bogofilter/bogofilter_gtk.c:263
+#: src/plugins/bogofilter/bogofilter_gtk.c:249
msgid "Bogofilter call"
msgstr ""
-#: src/plugins/bogofilter/bogofilter_gtk.c:271
+#: src/plugins/bogofilter/bogofilter_gtk.c:257
msgid "Path to bogofilter executable"
msgstr "bogofilter程序目录"
-#: src/plugins/clamav/clamav_plugin.c:49
-#: src/plugins/clamav/clamav_plugin_gtk.c:212
-msgid "Clam AntiVirus"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin.c:140
-msgid "ClamAV: scanning message..."
-msgstr "ClamAV: 正在扫描邮件..."
-
-#: src/plugins/clamav/clamav_plugin.c:238
-msgid "Failed to register mail filtering hook"
-msgstr "注册邮件过滤器失败"
-
-#: src/plugins/clamav/clamav_plugin.c:303
-msgid ""
-"This plugin uses Clam AntiVirus to scan all messages that are received from "
-"an IMAP, LOCAL or POP account.\n"
-"\n"
-"When a message attachment is found to contain a virus it can be deleted or "
-"saved in a specially designated folder.\n"
-"\n"
-"Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus"
-msgstr ""
-"本插件调用Clam AntiVirus扫描从IMAP, LOCAL以及POP帐户收取的所有邮件。\n"
-"\n"
-"当邮件附件被发现含有病毒时，它会被删除或者存入一个特殊的文件夹。\n"
-"\n"
-"你可以在/配置/偏好/插件/Clam AntiVirus中配置选项。"
-
-#: src/plugins/clamav/clamav_plugin.c:330
-msgid "Virus detection"
-msgstr "检查病毒"
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:96
-msgid "Enable virus scanning"
-msgstr "启用病毒扫描"
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:97
-msgid "Scan archive contents"
-msgstr "扫描压缩包内容"
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:106
-msgid "Maximum attachment size"
-msgstr "最大附件大小"
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:117
-msgid "Message attachments larger than this will not be scanned"
-msgstr "附件大于此值的将不被扫描"
+#: src/plugins/bogofilter/bogofilter_gtk.c:264
+#: src/plugins/spamassassin/spamassassin_gtk.c:435
+msgid "Mark spam as read"
+msgstr "将垃圾邮件设置为已读"
-#: src/plugins/clamav/clamav_plugin_gtk.c:121
-msgid "MB"
-msgstr "MB"
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:130
-msgid "Save infected mail in"
-msgstr "保存受感染的邮件到"
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:134
-msgid "Save mail that contains viruses"
-msgstr "保存带有病毒的邮件"
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:142
-msgid ""
-"Folder for storing infected mail. Leave empty to use the default trash folder"
-msgstr "用于保存受感染邮件的文件夹，不设置时将缺省使用垃圾桶"
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:150
-msgid "Click this button to select a folder for storing infected mail"
-msgstr "点击此按钮可选择一个文件夹，以用于存放受感染的邮件"
-
-#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:99
+#: src/plugins/demo/demo.c:31 src/plugins/demo/demo.c:100
msgid "Demo"
msgstr "演示"
msgid "Failed to register log text hook"
msgstr "注册写日志钩子失败"
-#: src/plugins/demo/demo.c:75
+#: src/plugins/demo/demo.c:76
msgid ""
"This Plugin is only a demo of how to write plugins for Claws Mail. It "
"installs a hook for new log output and writes it to stdout.\n"
"\n"
"它没有什么实际用途"
-#: src/plugins/dillo_viewer/dillo_prefs.c:76
+#: src/plugins/dillo_viewer/dillo_prefs.c:125
msgid "Dillo Browser"
msgstr "Dillo网页查看器"
-#: src/plugins/dillo_viewer/dillo_prefs.c:116
-msgid "Do not load remote links in mails"
-msgstr "禁止访问邮件中的远程链接"
+#: src/plugins/dillo_viewer/dillo_prefs.c:170
+msgid "Load remote links in mails"
+msgstr "加载邮件中的远程链接"
-#: src/plugins/dillo_viewer/dillo_prefs.c:122
+#: src/plugins/dillo_viewer/dillo_prefs.c:176
msgid "Equivalent to Dillo's '--local' option"
msgstr "等价于Dillo的'--local'选项"
-#: src/plugins/dillo_viewer/dillo_prefs.c:124
+#: src/plugins/dillo_viewer/dillo_prefs.c:178
msgid "You can still load remote links by reloading the page"
msgstr "你仍然可以通过重新载入该页的方式访问远程链接"
-#: src/plugins/dillo_viewer/dillo_prefs.c:133
+#: src/plugins/dillo_viewer/dillo_prefs.c:195
+msgid "Only for senders found in address book/folder"
+msgstr "仅限于地址簿列出中的地址"
+
+#: src/plugins/dillo_viewer/dillo_prefs.c:214
msgid "Full window mode (hide controls)"
msgstr "全窗口模式(隐藏工具条)"
-#: src/plugins/dillo_viewer/dillo_prefs.c:139
+#: src/plugins/dillo_viewer/dillo_prefs.c:220
msgid "Equivalent to Dillo's '--fullwindow' option"
msgstr "等价于Dillo的'--fullwindow'选项"
-#: src/plugins/dillo_viewer/dillo_viewer.c:39
+#: src/plugins/dillo_viewer/dillo_viewer.c:40
msgid "Dillo HTML Viewer"
msgstr "Dillo网页查看器"
-#: src/plugins/dillo_viewer/dillo_viewer.c:195
+#: src/plugins/dillo_viewer/dillo_viewer.c:248
+msgid "Can't find the dillo executable in PATH. Is it installed?"
+msgstr "无法在PATH中找到dillo程序。请问确实安装了么?"
+
+#: src/plugins/dillo_viewer/dillo_viewer.c:275
msgid ""
"This plugin renders HTML mail using the Dillo web browser.\n"
"\n"
"\n"
"你以在'/配置/偏好/插件/Dillo浏览器'中配置选项。"
-#: src/plugins/dillo_viewer/dillo_viewer.c:219
-msgid "text/html"
-msgstr ""
-
-#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:102
+#: src/plugins/pgpcore/passphrase.c:97 src/plugins/pgpcore/prefs_gpg.c:106
msgid "Passphrase"
msgstr "密码"
-#: src/plugins/pgpcore/passphrase.c:259
+#: src/plugins/pgpcore/passphrase.c:263
msgid "[no user id]"
msgstr ""
-#: src/plugins/pgpcore/passphrase.c:274
+#: src/plugins/pgpcore/passphrase.c:278
#, c-format
msgid ""
"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for the "
"\n"
"%.*s\n"
-#: src/plugins/pgpcore/passphrase.c:277
+#: src/plugins/pgpcore/passphrase.c:281
msgid "Passphrases did not match.\n"
msgstr "密码不匹配。\n"
-#: src/plugins/pgpcore/passphrase.c:280
+#: src/plugins/pgpcore/passphrase.c:284
#, c-format
msgid ""
"<span weight=\"bold\" size=\"larger\">Please re-enter the passphrase for the "
"\n"
"%.*s\n"
-#: src/plugins/pgpcore/passphrase.c:284
+#: src/plugins/pgpcore/passphrase.c:288
#, c-format
msgid ""
"<span weight=\"bold\" size=\"larger\">%sPlease enter the passphrase for:</"
"\n"
"%.*s\n"
-#: src/plugins/pgpcore/passphrase.c:287
+#: src/plugins/pgpcore/passphrase.c:291
msgid "Bad passphrase.\n"
msgstr "无效的passphrase!\n"
-#: src/plugins/pgpcore/pgp_viewer.c:118
+#: src/plugins/pgpcore/pgp_viewer.c:120
msgid "Key import"
msgstr "导入密钥"
-#: src/plugins/pgpcore/pgp_viewer.c:119
+#: src/plugins/pgpcore/pgp_viewer.c:121
msgid ""
"This key is not in your keyring. Do you want Claws Mail to try and import it "
"from a keyserver?"
msgstr "该密钥上不在你的密钥环内，是否连接密钥服务器导入它？"
-#: src/plugins/pgpcore/pgp_viewer.c:126 src/plugins/pgpcore/pgp_viewer.c:193
+#: src/plugins/pgpcore/pgp_viewer.c:128 src/plugins/pgpcore/pgp_viewer.c:195
msgid ""
"\n"
" Key ID "
"\n"
" 密钥ID "
-#: src/plugins/pgpcore/pgp_viewer.c:129 src/plugins/pgpcore/pgp_viewer.c:186
+#: src/plugins/pgpcore/pgp_viewer.c:131 src/plugins/pgpcore/pgp_viewer.c:188
msgid " This key is not in your keyring.\n"
msgstr " 该密钥上不在你的密钥环中.\n"
-#: src/plugins/pgpcore/pgp_viewer.c:130
+#: src/plugins/pgpcore/pgp_viewer.c:132
msgid " It should be possible to import it "
msgstr " 可以按如下方式导入它"
-#: src/plugins/pgpcore/pgp_viewer.c:132
+#: src/plugins/pgpcore/pgp_viewer.c:134
msgid ""
"when working online,\n"
" or "
"转到联机模式,\n"
" 或者"
-#: src/plugins/pgpcore/pgp_viewer.c:133
+#: src/plugins/pgpcore/pgp_viewer.c:135
msgid ""
"with the following command: \n"
"\n"
"\n"
" "
-#: src/plugins/pgpcore/pgp_viewer.c:140
+#: src/plugins/pgpcore/pgp_viewer.c:142
msgid ""
"\n"
" Importing key ID "
"\n"
" 导入密钥ID"
-#: src/plugins/pgpcore/pgp_viewer.c:179
+#: src/plugins/pgpcore/pgp_viewer.c:181
msgid " This key has been imported to your keyring.\n"
msgstr " 该密钥已经被导入您的密钥环。\n"
-#: src/plugins/pgpcore/pgp_viewer.c:181
+#: src/plugins/pgpcore/pgp_viewer.c:183
msgid " This key couldn't be imported to your keyring.\n"
msgstr " 该密钥无法被导入到您的密钥环。\n"
-#: src/plugins/pgpcore/pgp_viewer.c:182
+#: src/plugins/pgpcore/pgp_viewer.c:184
msgid ""
" You can try to import it manually with the command:\n"
"\n"
"\n"
" "
-#: src/plugins/pgpcore/pgp_viewer.c:187
+#: src/plugins/pgpcore/pgp_viewer.c:189
msgid " Key import isn't implemented in Windows.\n"
msgstr " Windows上尚未实现密钥导入功能.\n"
-#: src/plugins/pgpcore/pgp_viewer.c:196
+#: src/plugins/pgpcore/pgp_viewer.c:198
msgid " This key is in your keyring.\n"
msgstr " 该密钥已在你的密钥环里面.\n"
msgid "PGP/Core"
msgstr ""
-#: src/plugins/pgpcore/plugin.c:64
+#: src/plugins/pgpcore/plugin.c:65
msgid ""
"This plugin handles PGP core operations, it is used by other plugins, like "
"PGP/Mime.\n"
"\n"
"GPGME的版权归Werner Koch <dd9jn@gnu.org>所有(2001)"
-#: src/plugins/pgpcore/plugin.c:93
+#: src/plugins/pgpcore/plugin.c:94
msgid "Core operations"
msgstr "核心操作"
-#: src/plugins/pgpcore/prefs_gpg.c:100
+#: src/plugins/pgpcore/prefs_gpg.c:104
msgid "Automatically check signatures"
msgstr "自动检查数字签名"
-#: src/plugins/pgpcore/prefs_gpg.c:105
+#: src/plugins/pgpcore/prefs_gpg.c:109
msgid "Use gpg-agent to manage passwords"
msgstr "采用gpg-agent管理密码"
-#: src/plugins/pgpcore/prefs_gpg.c:110
+#: src/plugins/pgpcore/prefs_gpg.c:114
msgid "Store passphrase in memory"
msgstr "将passphrase暂时存在内存中"
-#: src/plugins/pgpcore/prefs_gpg.c:120
+#: src/plugins/pgpcore/prefs_gpg.c:124
msgid "Expire after"
msgstr "到期时间"
-#: src/plugins/pgpcore/prefs_gpg.c:135
+#: src/plugins/pgpcore/prefs_gpg.c:139
msgid "Setting to '0' will store the passphrase for the whole session"
msgstr "若设置为 '0' 则会在整个会话期内保存passphrase"
-#: src/plugins/pgpcore/prefs_gpg.c:140 src/prefs_receive.c:157
+#: src/plugins/pgpcore/prefs_gpg.c:144 src/prefs_receive.c:172
msgid "minute(s)"
msgstr "分钟"
-#: src/plugins/pgpcore/prefs_gpg.c:150
+#: src/plugins/pgpcore/prefs_gpg.c:154
msgid "Grab input while entering a passphrase"
msgstr "导入 passphrase 时抓取导入"
-#: src/plugins/pgpcore/prefs_gpg.c:157
+#: src/plugins/pgpcore/prefs_gpg.c:161
msgid "Display warning on start-up if GnuPG doesn't work"
msgstr "若 GnuPG 无法运作，则在启动时发出警告"
-#: src/plugins/pgpcore/prefs_gpg.c:289
+#: src/plugins/pgpcore/prefs_gpg.c:295
msgid "Sign key"
msgstr ""
-#: src/plugins/pgpcore/prefs_gpg.c:297
+#: src/plugins/pgpcore/prefs_gpg.c:303
msgid "Use default GnuPG key"
msgstr "使用缺省 GnuPG 密钥"
-#: src/plugins/pgpcore/prefs_gpg.c:308
+#: src/plugins/pgpcore/prefs_gpg.c:314
msgid "Select key by your email address"
msgstr "按邮件地址选择密钥"
-#: src/plugins/pgpcore/prefs_gpg.c:319
+#: src/plugins/pgpcore/prefs_gpg.c:325
msgid "Specify key manually"
msgstr "手工指定密钥"
-#: src/plugins/pgpcore/prefs_gpg.c:329
+#: src/plugins/pgpcore/prefs_gpg.c:335
msgid "User or key ID:"
msgstr "用户ID或者密钥ID:"
-#: src/plugins/pgpcore/prefs_gpg.c:370
+#: src/plugins/pgpcore/prefs_gpg.c:376
msgid "No secret key found."
msgstr "没有找到密钥。"
-#: src/plugins/pgpcore/prefs_gpg.c:373
+#: src/plugins/pgpcore/prefs_gpg.c:379
msgid "Generate a new key pair"
msgstr "生成新的密钥对"
-#: src/plugins/pgpcore/prefs_gpg.c:526
+#: src/plugins/pgpcore/prefs_gpg.c:557
msgid "GPG"
msgstr ""
msgid "Collecting info for '%s' ... %c"
msgstr "正在收集 '%s' 的信息 ... %c"
-#: src/plugins/pgpcore/select-keys.c:376
+#: src/plugins/pgpcore/select-keys.c:379
msgid "Select Keys"
msgstr "选择密钥"
-#: src/plugins/pgpcore/select-keys.c:403
+#: src/plugins/pgpcore/select-keys.c:406
msgid "Key ID"
msgstr "密钥ID"
-#: src/plugins/pgpcore/select-keys.c:406
+#: src/plugins/pgpcore/select-keys.c:409
msgid "Val"
msgstr "值"
-#: src/plugins/pgpcore/select-keys.c:427
+#: src/plugins/pgpcore/select-keys.c:430
msgid "Select"
msgstr "选择"
-#: src/plugins/pgpcore/select-keys.c:428 src/prefs_other.c:737
+#: src/plugins/pgpcore/select-keys.c:431 src/prefs_logging.c:428
+#: src/prefs_msg_colors.c:145 src/prefs_other.c:682
msgid "Other"
msgstr "其它"
-#: src/plugins/pgpcore/select-keys.c:429
+#: src/plugins/pgpcore/select-keys.c:432
msgid "Don't encrypt"
msgstr "不加密"
-#: src/plugins/pgpcore/select-keys.c:571
+#: src/plugins/pgpcore/select-keys.c:574
msgid "Add key"
msgstr "加入key 的识别码"
-#: src/plugins/pgpcore/select-keys.c:572
+#: src/plugins/pgpcore/select-keys.c:575
msgid "Enter another user or key ID:"
msgstr "导入另一个用户代号或 key 的识别码:"
-#: src/plugins/pgpcore/select-keys.c:594
+#: src/plugins/pgpcore/select-keys.c:597
#, c-format
msgid ""
"The key of '%s' is not fully trusted.\n"
"如果你选择该密钥加密邮件，将不能确保该邮件会被发送给指定的人。\n"
"你足够信任它并坚持要使用它吗?"
-#: src/plugins/pgpcore/select-keys.c:599
+#: src/plugins/pgpcore/select-keys.c:602
msgid "Trust key"
msgstr "信任密钥"
-#: src/plugins/pgpcore/sgpgme.c:76 src/privacy.c:211 src/privacy.c:215
+#: src/plugins/pgpcore/sgpgme.c:80 src/privacy.c:211 src/privacy.c:215
#: src/privacy.c:232 src/privacy.c:236
msgid "No signature found"
msgstr "未发现签名"
-#: src/plugins/pgpcore/sgpgme.c:138
+#: src/plugins/pgpcore/sgpgme.c:142
msgid "Undefined"
msgstr "未定义"
-#: src/plugins/pgpcore/sgpgme.c:140 src/prefs_receive.c:181
-#: src/prefs_send.c:175
+#: src/plugins/pgpcore/sgpgme.c:144 src/prefs_receive.c:196
msgid "Never"
msgstr "从不显示"
-#: src/plugins/pgpcore/sgpgme.c:142
+#: src/plugins/pgpcore/sgpgme.c:146
msgid "Marginal"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:146
+#: src/plugins/pgpcore/sgpgme.c:150
msgid "Ultimate"
msgstr ""
-#: src/plugins/pgpcore/sgpgme.c:180
+#: src/plugins/pgpcore/sgpgme.c:184
#, c-format
msgid "The signature can't be checked - %s"
msgstr "该签名无法被校验 - %s。"
-#: src/plugins/pgpcore/sgpgme.c:184 src/plugins/pgpcore/sgpgme.c:188
-#: src/plugins/pgpcore/sgpgme.c:235
+#: src/plugins/pgpcore/sgpgme.c:188 src/plugins/pgpcore/sgpgme.c:192
+#: src/plugins/pgpcore/sgpgme.c:239
msgid "The signature has not been checked."
msgstr "该签名尚未被检查。"
-#: src/plugins/pgpcore/sgpgme.c:194 src/plugins/pgpcore/sgpgme.c:196
+#: src/plugins/pgpcore/sgpgme.c:198 src/plugins/pgpcore/sgpgme.c:200
msgid "PGP Core: Can't get key - no gpg-agent running."
msgstr "PGP Core: 无法获取密钥 - gpg-agent没有启动运行"
-#: src/plugins/pgpcore/sgpgme.c:209
+#: src/plugins/pgpcore/sgpgme.c:213
#, c-format
msgid "Good signature from %s."
msgstr "来自 \"%s\" 的签名正确。"
-#: src/plugins/pgpcore/sgpgme.c:215
+#: src/plugins/pgpcore/sgpgme.c:219
#, c-format
msgid "Good signature (untrusted) from %s."
msgstr "来自 \"%s\" 的签名完好(但尚未被信任)。"
-#: src/plugins/pgpcore/sgpgme.c:220
+#: src/plugins/pgpcore/sgpgme.c:224
#, c-format
msgid "Expired signature from %s."
msgstr "来自 %s 的签名已过期。"
-#: src/plugins/pgpcore/sgpgme.c:223
+#: src/plugins/pgpcore/sgpgme.c:227
#, c-format
msgid "Expired key from %s."
msgstr "来自 %s 的密钥已过期。"
-#: src/plugins/pgpcore/sgpgme.c:226
+#: src/plugins/pgpcore/sgpgme.c:230
#, c-format
msgid "Bad signature from %s."
msgstr "来自 %s 的签名检查不通过。"
-#: src/plugins/pgpcore/sgpgme.c:230
+#: src/plugins/pgpcore/sgpgme.c:234
#, c-format
msgid "Key 0x%s not available to verify this signature."
msgstr "没有匹配的密钥0x%s，无法检查此签名。"
-#: src/plugins/pgpcore/sgpgme.c:272
+#: src/plugins/pgpcore/sgpgme.c:276
#, c-format
msgid "Signature made using %s key ID %s\n"
msgstr "签名采用%s制作，密钥ID: %s\n"
-#: src/plugins/pgpcore/sgpgme.c:279
+#: src/plugins/pgpcore/sgpgme.c:283
#, c-format
msgid "Good signature from \"%s\" (Trust: %s)\n"
msgstr "\"%s\"的签名有效 (信任: %s)\n"
-#: src/plugins/pgpcore/sgpgme.c:284
+#: src/plugins/pgpcore/sgpgme.c:288
#, c-format
msgid "Expired signature from \"%s\"\n"
msgstr "来自 \"%s\" 的签名已过期\n"
-#: src/plugins/pgpcore/sgpgme.c:289
+#: src/plugins/pgpcore/sgpgme.c:293
#, c-format
msgid "BAD signature from \"%s\"\n"
msgstr "来自 \"%s\" 的签名检查错误\n"
-#: src/plugins/pgpcore/sgpgme.c:300
+#: src/plugins/pgpcore/sgpgme.c:304
#, c-format
msgid " aka \"%s\"\n"
msgstr " 又称为 \"%s\"\n"
-#: src/plugins/pgpcore/sgpgme.c:306
+#: src/plugins/pgpcore/sgpgme.c:310
#, c-format
msgid "Primary key fingerprint: %s\n"
msgstr "主密钥指纹: %s\n"
-#: src/plugins/pgpcore/sgpgme.c:311
+#: src/plugins/pgpcore/sgpgme.c:315
#, c-format
msgid "WARNING: Signer's address \"%s\" does not match DNS entry\n"
msgstr "警告: 签名者的地址\"%s\"与DNS中的数据并不相符\n"
-#: src/plugins/pgpcore/sgpgme.c:317
+#: src/plugins/pgpcore/sgpgme.c:321
#, c-format
msgid "Verified signer's address is \"%s\"\n"
msgstr "经验证的签名者地址是\"%s\"\n"
-#: src/plugins/pgpcore/sgpgme.c:359
+#: src/plugins/pgpcore/sgpgme.c:363
#, c-format
msgid "Couldn't get data from message, %s"
msgstr "无法取得邮件的数据, %s"
-#: src/plugins/pgpcore/sgpgme.c:375
+#: src/plugins/pgpcore/sgpgme.c:379
#, c-format
msgid "Couldn't initialize data, %s"
msgstr "不能初始化数据, %s"
-#: src/plugins/pgpcore/sgpgme.c:492
+#: src/plugins/pgpcore/sgpgme.c:498
#, c-format
msgid "Secret key not found (%s)"
msgstr "没有找到密钥(%s)"
-#: src/plugins/pgpcore/sgpgme.c:500
+#: src/plugins/pgpcore/sgpgme.c:506
msgid "Secret key specification is ambiguous"
msgstr "密钥存在二义性"
-#: src/plugins/pgpcore/sgpgme.c:510
+#: src/plugins/pgpcore/sgpgme.c:516
#, c-format
msgid "Error setting secret key: %s"
msgstr "设置密钥时出错: %s"
-#: src/plugins/pgpcore/sgpgme.c:546
+#: src/plugins/pgpcore/sgpgme.c:552
#, c-format
msgid "Gpgme protocol '%s' is unusable: Engine '%s' isn't installed properly."
msgstr "GPGME协议 '%s'不可用: '%s'引擎未被正确安装。"
-#: src/plugins/pgpcore/sgpgme.c:552
+#: src/plugins/pgpcore/sgpgme.c:558
#, c-format
msgid ""
"Gpgme protocol '%s' is unusable: Engine '%s' version %s is installed, but "
msgstr ""
"GPGME协议'%s'不可用: '%s'引擎虽已安装，但当前版本为%s(至少需要版本%s)。\n"
-#: src/plugins/pgpcore/sgpgme.c:560
+#: src/plugins/pgpcore/sgpgme.c:566
#, c-format
msgid "Gpgme protocol '%s' is unusable (unknown problem)"
msgstr "GPGME协议'%s'不可用(未知错误)"
-#: src/plugins/pgpcore/sgpgme.c:576
+#: src/plugins/pgpcore/sgpgme.c:582
msgid ""
"GnuPG is not installed properly, or needs to be upgraded.\n"
"OpenPGP support disabled."
"GnuPG的安装不正常，或需要升级。\n"
"OpenPGP支持已被禁用。"
-#: src/plugins/pgpcore/sgpgme.c:610
+#: src/plugins/pgpcore/sgpgme.c:616
msgid ""
"You have to save the account's information with \"OK\" before being able to "
"generate a key pair.\n"
msgstr "您必须先点击\"确定\"按钮保存账户信息，然后才能生成一个密钥对。\n"
-#: src/plugins/pgpcore/sgpgme.c:615
+#: src/plugins/pgpcore/sgpgme.c:621
msgid "No PGP key found"
msgstr "没有找到PGP密钥"
-#: src/plugins/pgpcore/sgpgme.c:616
+#: src/plugins/pgpcore/sgpgme.c:622
msgid ""
"Claws Mail did not find a secret PGP key, which means that you won't be able "
"to sign emails or receive encrypted emails.\n"
"没有找到一个PGP密钥, 这意味着你不能加密邮件，也不能收取已加密的邮件。\n"
"是否现在就生成一对?"
-#: src/plugins/pgpcore/sgpgme.c:686 src/plugins/pgpcore/sgpgme.c:702
+#: src/plugins/pgpcore/sgpgme.c:692 src/plugins/pgpcore/sgpgme.c:708
#, c-format
msgid "Couldn't generate a new key pair: %s"
msgstr "无法生成新的密钥对: %s"
-#: src/plugins/pgpcore/sgpgme.c:693
+#: src/plugins/pgpcore/sgpgme.c:699
msgid ""
"Generating your new key pair... Please move the mouse around to help "
"generate entropy..."
msgstr "正在生成密钥对...请晃动鼠标以增加熵值 :-)..."
-#: src/plugins/pgpcore/sgpgme.c:708
+#: src/plugins/pgpcore/sgpgme.c:714
msgid "Couldn't generate a new key pair: unknown error"
msgstr "无法生成新的密钥对: 错误原因未知"
-#: src/plugins/pgpcore/sgpgme.c:712
+#: src/plugins/pgpcore/sgpgme.c:718
#, c-format
msgid ""
"Your new key pair has been generated. Its fingerprint is:\n"
"\n"
"是否要将其输出到一个密钥服务器上？"
-#: src/plugins/pgpcore/sgpgme.c:716
+#: src/plugins/pgpcore/sgpgme.c:722
msgid "Key generated"
msgstr "密钥已生成"
-#: src/plugins/pgpcore/sgpgme.c:755
+#: src/plugins/pgpcore/sgpgme.c:761
msgid "Key exported."
msgstr "完成密钥导出。"
-#: src/plugins/pgpcore/sgpgme.c:757
+#: src/plugins/pgpcore/sgpgme.c:763
msgid "Couldn't export key."
msgstr "无法导出密钥。"
-#: src/plugins/pgpcore/sgpgme.c:761
+#: src/plugins/pgpcore/sgpgme.c:767
msgid "Key export isn't implemented in Windows."
msgstr "尚不支持Windows上导出密钥功能."
-#: src/plugins/pgpinline/pgpinline.c:249 src/plugins/pgpinline/pgpinline.c:402
+#: src/plugins/pgpinline/pgpinline.c:244
+#, fuzzy
+msgid "Incorrect part"
+msgstr "正确"
+
+#: src/plugins/pgpinline/pgpinline.c:248
+#, fuzzy
+msgid "Not a text part"
+msgstr "/下一区段(a)"
+
+#: src/plugins/pgpinline/pgpinline.c:259 src/plugins/pgpinline/pgpinline.c:415
msgid "Couldn't get text data."
msgstr "无法取得文本数据。"
-#: src/plugins/pgpinline/pgpinline.c:267
+#: src/plugins/pgpinline/pgpinline.c:277
msgid "Couldn't convert text data to any sane charset."
msgstr "无法将文本数据转换到任意字符集。"
-#: src/plugins/pgpinline/pgpinline.c:275 src/plugins/pgpinline/pgpinline.c:532
-#: src/plugins/pgpinline/pgpinline.c:653 src/plugins/pgpinline/pgpinline.c:700
+#: src/plugins/pgpinline/pgpinline.c:285 src/plugins/pgpinline/pgpinline.c:613
+#: src/plugins/pgpinline/pgpinline.c:752 src/plugins/pgpinline/pgpinline.c:799
#: src/plugins/pgpmime/pgpmime.c:72 src/plugins/pgpmime/pgpmime.c:181
-#: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:468
-#: src/plugins/pgpmime/pgpmime.c:593
+#: src/plugins/pgpmime/pgpmime.c:320 src/plugins/pgpmime/pgpmime.c:493
+#: src/plugins/pgpmime/pgpmime.c:636
#, c-format
msgid "Couldn't initialize GPG context, %s"
msgstr "无法初始化GPG，%s"
-#: src/plugins/pgpinline/pgpinline.c:395
+#: src/plugins/pgpinline/pgpinline.c:408
msgid "Couldn't parse mime part."
msgstr "无法读取邮件的MIME部分."
-#: src/plugins/pgpinline/pgpinline.c:425 src/plugins/pgpmime/pgpmime.c:343
+#: src/plugins/pgpinline/pgpinline.c:438 src/plugins/pgpmime/pgpmime.c:343
+#, c-format
+msgid "Couldn't open decrypted file %s"
+msgstr "无法打开已解密的文件%s"
+
+#: src/plugins/pgpinline/pgpinline.c:455 src/plugins/pgpinline/pgpinline.c:467
+#: src/plugins/pgpinline/pgpinline.c:479 src/plugins/pgpinline/pgpinline.c:489
+#: src/plugins/pgpinline/pgpinline.c:501 src/plugins/pgpinline/pgpinline.c:513
+#: src/plugins/pgpmime/pgpmime.c:353 src/plugins/pgpmime/pgpmime.c:365
+#, c-format
+msgid "Couldn't write to decrypted file %s"
+msgstr "无法写入已解密的文件%s"
+
+#: src/plugins/pgpinline/pgpinline.c:475 src/plugins/pgpinline/pgpinline.c:476
+#: src/plugins/pgpinline/pgpinline.c:477
+msgid ""
+"\n"
+"--- Start of PGP/Inline encrypted data ---\n"
+msgstr ""
+
+#: src/plugins/pgpinline/pgpinline.c:497 src/plugins/pgpinline/pgpinline.c:498
+#: src/plugins/pgpinline/pgpinline.c:499
+msgid "--- End of PGP/Inline encrypted data ---\n"
+msgstr ""
+
+#: src/plugins/pgpinline/pgpinline.c:524 src/plugins/pgpmime/pgpmime.c:375
#, c-format
-msgid "Couldn't open decrypted file %s"
-msgstr "无法打开已解密的文件%s"
+msgid "Couldn't close decrypted file %s"
+msgstr "无法关闭已解密的文件%s"
-#: src/plugins/pgpinline/pgpinline.c:455
+#: src/plugins/pgpinline/pgpinline.c:536
msgid "Couldn't scan decrypted file."
msgstr "无法扫描已解密的文件。"
-#: src/plugins/pgpinline/pgpinline.c:463
+#: src/plugins/pgpinline/pgpinline.c:544
msgid "Couldn't scan decrypted file parts."
msgstr "无法扫描已经解密的部分。"
-#: src/plugins/pgpinline/pgpinline.c:517
+#: src/plugins/pgpinline/pgpinline.c:598
msgid "Couldn't create temporary file."
msgstr "无法创建临时文件。"
-#: src/plugins/pgpinline/pgpinline.c:555 src/plugins/pgpmime/pgpmime.c:494
+#: src/plugins/pgpinline/pgpinline.c:637 src/plugins/pgpmime/pgpmime.c:520
#, c-format
msgid "Data signing failed, %s"
msgstr "数据加密失败, %s"
-#: src/plugins/pgpinline/pgpinline.c:573 src/plugins/pgpmime/pgpmime.c:519
+#: src/plugins/pgpinline/pgpinline.c:655 src/plugins/pgpmime/pgpmime.c:545
#, c-format
msgid "Data signing failed due to invalid signer: %s"
msgstr "数据加密失败: 无效的签名: %s"
-#: src/plugins/pgpinline/pgpinline.c:582 src/plugins/pgpmime/pgpmime.c:528
+#: src/plugins/pgpinline/pgpinline.c:664 src/plugins/pgpmime/pgpmime.c:554
msgid "Data signing failed, no results."
msgstr "数据加密失败，结果为空。"
-#: src/plugins/pgpinline/pgpinline.c:592 src/plugins/pgpmime/pgpmime.c:539
+#: src/plugins/pgpinline/pgpinline.c:674 src/plugins/pgpmime/pgpmime.c:565
msgid "Data signing failed, no contents."
msgstr "数据加密失败，内容为空。"
-#: src/plugins/pgpinline/pgpinline.c:662 src/plugins/pgpmime/pgpmime.c:602
+#: src/plugins/pgpinline/pgpinline.c:718
+msgid ""
+"Please note that attachments are not encrypted by the PGP/Inline system, nor "
+"are email headers, like Subject."
+msgstr "请注意PGP/Inline系统无法加密附件，也无法加密邮件头(比如邮件主题)。"
+
+#: src/plugins/pgpinline/pgpinline.c:761 src/plugins/pgpmime/pgpmime.c:645
#, c-format
msgid "Couldn't add GPG key %s, %s"
msgstr "无法添加GPG密钥 %s, %s"
-#: src/plugins/pgpinline/pgpinline.c:683 src/plugins/pgpmime/pgpmime.c:630
+#: src/plugins/pgpinline/pgpinline.c:782 src/plugins/pgpmime/pgpmime.c:673
#, c-format
msgid "Couldn't create temporary file, %s"
msgstr "无法创建临时文件, %s"
-#: src/plugins/pgpinline/pgpinline.c:711 src/plugins/pgpmime/pgpmime.c:655
+#: src/plugins/pgpinline/pgpinline.c:810 src/plugins/pgpmime/pgpmime.c:698
#, c-format
msgid "Encryption failed, %s"
msgstr "加密失败, %s"
-#: src/plugins/pgpinline/pgpinline.c:776
+#: src/plugins/pgpinline/pgpinline.c:877
msgid "PGP/Inline"
msgstr ""
msgid "PGP/inline"
msgstr ""
-#: src/plugins/pgpinline/plugin.c:58
+#: src/plugins/pgpinline/plugin.c:59
msgid ""
"This plugin handles the deprecated Inline method of signing and/or "
"encrypting mails. You can decrypt mails, verify signatures or sign and "
msgid "Signature boundary not found."
msgstr "未找到签名。"
-#: src/plugins/pgpmime/pgpmime.c:362
+#: src/plugins/pgpmime/pgpmime.c:387
msgid "Couldn't parse decrypted file."
msgstr "无法读入已解密的文件。"
-#: src/plugins/pgpmime/pgpmime.c:368
+#: src/plugins/pgpmime/pgpmime.c:393
msgid "Couldn't parse decrypted file parts."
msgstr "无法读取已解密的部分。"
-#: src/plugins/pgpmime/pgpmime.c:414 src/plugins/pgpmime/pgpmime.c:453
+#: src/plugins/pgpmime/pgpmime.c:439 src/plugins/pgpmime/pgpmime.c:478
#, c-format
msgid "Couldn't create temporary file: %s"
msgstr "无法创建临时文件: %s"
-#: src/plugins/pgpmime/pgpmime.c:723
+#: src/plugins/pgpmime/pgpmime.c:602
+msgid ""
+"Please note that email headers, like Subject, are not encrypted by the PGP/"
+"Mime system."
+msgstr "请注意PGP/Mimei无法加密邮件头(比如邮件主题)。"
+
+#: src/plugins/pgpmime/pgpmime.c:768
msgid "PGP/Mime"
msgstr "PGP/Mime"
msgid "PGP/MIME"
msgstr "PGP/MIME"
-#: src/plugins/pgpmime/plugin.c:58
+#: src/plugins/pgpmime/plugin.c:59
msgid ""
"This plugin handles PGP/MIME signed and/or encrypted mails. You can decrypt "
"mails, verify signatures or sign and encrypt your own mails.\n"
"有(2001)\n"
" "
-#: src/plugins/spamassassin/spamassassin.c:75
-#: src/plugins/spamassassin/spamassassin_gtk.c:545
+#: src/plugins/spamassassin/spamassassin.c:76
+#: src/plugins/spamassassin/spamassassin_gtk.c:635
msgid "SpamAssassin"
msgstr ""
-#: src/plugins/spamassassin/spamassassin.c:161
+#: src/plugins/spamassassin/spamassassin.c:168
msgid "SpamAssassin plugin couldn't connect to spamd.\n"
msgstr "SpamAssassin插件无法连接到spamd服务器.\n"
-#: src/plugins/spamassassin/spamassassin.c:177
+#: src/plugins/spamassassin/spamassassin.c:184
msgid "SpamAssassin plugin filtering failed.\n"
msgstr "SpamAssassin插件过滤失败。\n"
-#: src/plugins/spamassassin/spamassassin.c:203
+#: src/plugins/spamassassin/spamassassin.c:237
msgid "SpamAssassin plugin is disabled by its preferences.\n"
msgstr "SpamAssassin插件已经被设置为禁用.\n"
-#: src/plugins/spamassassin/spamassassin.c:208
+#: src/plugins/spamassassin/spamassassin.c:242
msgid "SpamAssassin: filtering message..."
msgstr "SpamAssassin: 正在过滤邮件..."
-#: src/plugins/spamassassin/spamassassin.c:284
+#: src/plugins/spamassassin/spamassassin.c:370
msgid ""
"The SpamAssassin plugin couldn't filter a message. The probable cause of the "
"error is an unreachable spamd daemon. Please make sure spamd is running and "
"SpamAssassin无法过滤邮件，因为无法连接上spamd服务程序。请确定该服务器已经启动"
"并可访问。"
-#: src/plugins/spamassassin/spamassassin.c:343
+#: src/plugins/spamassassin/spamassassin.c:427
msgid ""
"Claws Mail needs network access in order to feed this mail(s) to the remote "
"learner."
msgstr "Claws Mail需要访问网络才能将此邮件的内容反馈给远端的垃圾邮件识别器。"
-#: src/plugins/spamassassin/spamassassin.c:486
+#: src/plugins/spamassassin/spamassassin.c:572
msgid "Failed to get username"
msgstr "获取用户名失败"
-#: src/plugins/spamassassin/spamassassin.c:498
+#: src/plugins/spamassassin/spamassassin.c:584
msgid "SpamAssassin plugin is loaded but disabled by its preferences.\n"
msgstr "SpamAssassin插件已经加载，但用户选择了禁用。\n"
-#: src/plugins/spamassassin/spamassassin.c:531
+#: src/plugins/spamassassin/spamassassin.c:618
msgid ""
"This plugin can check all messages that are received from an IMAP, LOCAL or "
"POP account for spam using a SpamAssassin server. You will need a "
"\n"
"它也可以用于手工标识垃圾邮件。\n"
"\n"
-"如果一个邮件被判断为垃圾邮件，它将会被删除或者保存到一个特殊文件夹。\n"
+"如果一个邮件被判断为垃圾邮件，它将会被删除或者保存到一个特殊目录。\n"
"\n"
"相关选项可以在'/配置/偏好/插件/SpamAssassin'中设置"
-#: src/plugins/spamassassin/spamassassin_gtk.c:85
+#: src/plugins/spamassassin/spamassassin_gtk.c:90
msgid "Localhost"
msgstr "本机"
-#: src/plugins/spamassassin/spamassassin_gtk.c:86
+#: src/plugins/spamassassin/spamassassin_gtk.c:91
msgid "TCP"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:87
+#: src/plugins/spamassassin/spamassassin_gtk.c:92
msgid "Unix Socket"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:235
+#: src/plugins/spamassassin/spamassassin_gtk.c:270
msgid "Enable SpamAssassin plugin"
msgstr "启用SpamAssassin插件"
-#: src/plugins/spamassassin/spamassassin_gtk.c:239
+#: src/plugins/spamassassin/spamassassin_gtk.c:274
msgid "Transport"
msgstr "传输"
-#: src/plugins/spamassassin/spamassassin_gtk.c:247
+#: src/plugins/spamassassin/spamassassin_gtk.c:282
msgid "Type of transport"
msgstr "传输方式"
-#: src/plugins/spamassassin/spamassassin_gtk.c:263
+#: src/plugins/spamassassin/spamassassin_gtk.c:303
msgid "User"
msgstr "用户ID"
-#: src/plugins/spamassassin/spamassassin_gtk.c:276
+#: src/plugins/spamassassin/spamassassin_gtk.c:316
msgid "User to use with spamd server"
msgstr "用于使用spamd服务器的用户名"
-#: src/plugins/spamassassin/spamassassin_gtk.c:279
+#: src/plugins/spamassassin/spamassassin_gtk.c:319
msgid "spamd"
msgstr ""
-#: src/plugins/spamassassin/spamassassin_gtk.c:297
+#: src/plugins/spamassassin/spamassassin_gtk.c:337
msgid "Hostname or IP address of spamd server"
msgstr "spamd服务的主机名或者IP地址"
-#: src/plugins/spamassassin/spamassassin_gtk.c:308
+#: src/plugins/spamassassin/spamassassin_gtk.c:348
msgid "Port of spamd server"
msgstr "spamd服务器端口"
-#: src/plugins/spamassassin/spamassassin_gtk.c:314
+#: src/plugins/spamassassin/spamassassin_gtk.c:354
msgid "Path of Unix socket"
msgstr "UNIX套接字路径"
-#: src/plugins/spamassassin/spamassassin_gtk.c:350
+#: src/plugins/spamassassin/spamassassin_gtk.c:390
msgid ""
"Maximum time allowed for checking. If the check takes longer it will be "
"aborted."
msgstr "允许垃圾邮件检查的最大时限。超过此时间后将退出检查。"
-#: src/plugins/spamassassin/spamassassin_gtk.c:355 src/prefs_other.c:623
-#: src/prefs_summaries.c:476
+#: src/plugins/spamassassin/spamassassin_gtk.c:395 src/prefs_other.c:575
+#: src/prefs_summaries.c:489
msgid "seconds"
msgstr "秒"
-#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:123
+#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:121
msgid "Orientation"
msgstr "方向"
-#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:124
+#: src/plugins/trayicon/libeggtrayicon/eggtrayicon.c:122
msgid "The orientation of the tray."
msgstr "通知栏图标的方向。"
-#: src/plugins/trayicon/trayicon.c:61 src/plugins/trayicon/trayicon.c:543
-#: src/plugins/trayicon/trayicon_prefs.c:68
+#: src/plugins/trayicon/trayicon.c:52 src/plugins/trayicon/trayicon.c:571
+#: src/plugins/trayicon/trayicon_prefs.c:69
msgid "Trayicon"
msgstr ""
-#: src/plugins/trayicon/trayicon.c:109
+#: src/plugins/trayicon/trayicon.c:101
msgid "/_Get Mail"
msgstr "/收信(_G)"
-#: src/plugins/trayicon/trayicon.c:111
+#: src/plugins/trayicon/trayicon.c:103
msgid "/_Email"
msgstr "/写新邮件(_E)"
-#: src/plugins/trayicon/trayicon.c:112
+#: src/plugins/trayicon/trayicon.c:104
msgid "/_Email from account"
msgstr "/账户邮件(_E)"
-#: src/plugins/trayicon/trayicon.c:114
+#: src/plugins/trayicon/trayicon.c:106
msgid "/Open A_ddressbook"
msgstr "/打开地址簿(_d)"
-#: src/plugins/trayicon/trayicon.c:116
+#: src/plugins/trayicon/trayicon.c:108
msgid "/_Work Offline"
msgstr "/脱机工作(_W)"
-#: src/plugins/trayicon/trayicon.c:118
+#: src/plugins/trayicon/trayicon.c:110
msgid "/E_xit Claws Mail"
msgstr "/退出 Claws Mail(_x)"
-#: src/plugins/trayicon/trayicon.c:207
+#: src/plugins/trayicon/trayicon.c:199
#, c-format
msgid "New %d, Unread: %d, Total: %d"
msgstr "%d 封新邮件，%d 封未读，共 %d 封"
-#: src/plugins/trayicon/trayicon.c:306
-msgid "/Work Offline"
-msgstr "/脱机工作"
-
-#: src/plugins/trayicon/trayicon.c:309
-msgid "/Get Mail"
-msgstr "/收信"
-
-#: src/plugins/trayicon/trayicon.c:389
+#: src/plugins/trayicon/trayicon.c:395
msgid "Failed to register folder item update hook"
msgstr "注册folder item update hook失败"
-#: src/plugins/trayicon/trayicon.c:395
+#: src/plugins/trayicon/trayicon.c:401
msgid "Failed to register folder update hook"
msgstr "注册folder update hook失败"
-#: src/plugins/trayicon/trayicon.c:401
+#: src/plugins/trayicon/trayicon.c:407
msgid "Failed to register offline switch hook"
msgstr "注册离线开关钩子失败"
-#: src/plugins/trayicon/trayicon.c:407
+#: src/plugins/trayicon/trayicon.c:413
msgid "Failed to register account list changed hook"
msgstr "注册账户变更钩子失败"
-#: src/plugins/trayicon/trayicon.c:413
+#: src/plugins/trayicon/trayicon.c:419
msgid "Failed to register close hook"
msgstr "注册程序关闭钩子失败"
-#: src/plugins/trayicon/trayicon.c:461
+#: src/plugins/trayicon/trayicon.c:425
+msgid "Failed to register got iconified hook"
+msgstr "注册程序最小化钩子失败"
+
+#: src/plugins/trayicon/trayicon.c:489
msgid ""
"This plugin places a mailbox icon in the system tray that indicates if you "
"have new or unread mail.\n"
"如果你没有未读的邮件，该图标将是一个空邮箱，否则则是含有邮件图样。提示信息将"
"能够显示新邮件、未读邮件的数量和邮件总数。"
-#: src/plugins/trayicon/trayicon_prefs.c:107
+#: src/plugins/trayicon/trayicon_prefs.c:110
msgid "Hide at start-up"
-msgstr "启动时隐藏"
+msgstr "启动时隐藏Claws-Mail"
-#: src/plugins/trayicon/trayicon_prefs.c:113
+#: src/plugins/trayicon/trayicon_prefs.c:116
msgid "Hide Claws Mail at start-up"
-msgstr "启动时隐藏Claws Mail"
+msgstr "启动时隐藏Claws Mail主窗口"
-#: src/plugins/trayicon/trayicon_prefs.c:117
+#: src/plugins/trayicon/trayicon_prefs.c:120
msgid "Close to tray"
msgstr "关闭到通知栏"
-#: src/plugins/trayicon/trayicon_prefs.c:123
+#: src/plugins/trayicon/trayicon_prefs.c:126
msgid ""
"Hide Claws Mail using the tray icon instead of closing it\n"
"when the window close button is clicked"
"点击主窗口的关闭按钮时隐藏Claws Mail到通知栏\n"
"(而不是退出程序)"
-#: src/pop.c:150
+#: src/plugins/trayicon/trayicon_prefs.c:130
+msgid "Minimize to tray"
+msgstr "最小化到通知栏"
+
+#: src/plugins/trayicon/trayicon_prefs.c:136
+msgid "Hide Claws Mail using the tray icon instead of minimizing it"
+msgstr "利用通知栏图标隐藏Claws Mail(而不是最小化程序)"
+
+#: src/pop.c:151
msgid "Required APOP timestamp not found in greeting\n"
msgstr "未找到握手信息中需要的APOP时间戳\n"
-#: src/pop.c:157
+#: src/pop.c:158
msgid "Timestamp syntax error in greeting\n"
msgstr "握手信息中时间戳格式错误\n"
-#: src/pop.c:183 src/pop.c:210
+#: src/pop.c:165
+msgid "Timestamp syntax error in greeting (not ASCII)\n"
+msgstr "握手信息中时间戳格式错误(并非ASCII格式)\n"
+
+#: src/pop.c:189 src/pop.c:216
msgid "POP3 protocol error\n"
msgstr "POP3协议错误\n"
-#: src/pop.c:256
+#: src/pop.c:262
#, c-format
msgid "invalid UIDL response: %s\n"
msgstr "无效的UIDL响应: %s\n"
-#: src/pop.c:778
+#: src/pop.c:827
#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr "POP3: 删除过期邮件 %d\n"
+msgid "POP3: Deleting expired message %d [%s]\n"
+msgstr "POP3: 删除过期邮件 %d [%s]\n"
-#: src/pop.c:794
+#: src/pop.c:843
#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr "POP3: 跳过旧邮件 %d (%d字节)\n"
+msgid "POP3: Skipping message %d [%s] (%d bytes)\n"
+msgstr "POP3: 跳过旧邮件 %d [%s] (%d字节)\n"
-#: src/pop.c:826
+#: src/pop.c:875
msgid "mailbox is locked\n"
msgstr "邮箱已被锁住\n"
-#: src/pop.c:829
+#: src/pop.c:878
msgid "Session timeout\n"
msgstr "会话超时\n"
-#: src/pop.c:848
+#: src/pop.c:897
msgid "command not supported\n"
msgstr "命令不被支持\n"
-#: src/pop.c:853
+#: src/pop.c:902
msgid "error occurred on POP3 session\n"
msgstr "POP3会话中出现错误\n"
-#: src/pop.c:1047
+#: src/pop.c:1096
msgid "TOP command unsupported\n"
msgstr "TOP命令不被支持\n"
-#: src/prefs_account.c:240 src/prefs_account.c:1513 src/prefs_account.c:2235
-#: src/wizard.c:1137
+#: src/prefs_account.c:306 src/prefs_account.c:1360 src/prefs_account.c:2268
+#: src/wizard.c:1394
msgid "POP3"
msgstr "POP3"
-#: src/prefs_account.c:243 src/prefs_account.c:1628 src/prefs_account.c:2248
+#: src/prefs_account.c:309 src/prefs_account.c:1470 src/prefs_account.c:2281
msgid "IMAP4"
msgstr "IMAP4"
-#: src/prefs_account.c:244
+#: src/prefs_account.c:310
msgid "News (NNTP)"
msgstr "News (NNTP)"
-#: src/prefs_account.c:245 src/wizard.c:1147
+#: src/prefs_account.c:311 src/wizard.c:1396
msgid "Local mbox file"
msgstr "本地mbox文件"
-#: src/prefs_account.c:246
+#: src/prefs_account.c:312
msgid "None (SMTP only)"
msgstr "无 (仅SMTP)"
-#: src/prefs_account.c:776
-#, c-format
-msgid "Account%d"
-msgstr "帐号%d"
-
-#: src/prefs_account.c:1059
-msgid "Preferences for new account"
-msgstr "设置新帐号"
-
-#: src/prefs_account.c:1061
-#, c-format
-msgid "%s - Account preferences"
-msgstr "%s - 帐号设置"
-
-#: src/prefs_account.c:1096
-msgid "_Basic"
-msgstr "基本设置(_B)"
-
-#: src/prefs_account.c:1098
-msgid "_Receive"
-msgstr "接收(_R)"
-
-#: src/prefs_account.c:1102
-msgid "Co_mpose"
-msgstr "撰写(_m)"
-
-#: src/prefs_account.c:1104
-msgid "_Privacy"
-msgstr "隐私(_P)"
-
-#: src/prefs_account.c:1107
-msgid "SS_L"
-msgstr "SS_L"
-
-#: src/prefs_account.c:1110
-msgid "A_dvanced"
-msgstr "高级(_d)"
-
-#: src/prefs_account.c:1168
+#: src/prefs_account.c:949
msgid "Name of account"
msgstr "帐号名称"
-#: src/prefs_account.c:1177
+#: src/prefs_account.c:958
msgid "Set as default"
msgstr "设为缺省帐号"
-#: src/prefs_account.c:1181
+#: src/prefs_account.c:966
msgid "Personal information"
msgstr "个人资料"
-#: src/prefs_account.c:1190
+#: src/prefs_account.c:975
msgid "Full name"
msgstr "全名"
-#: src/prefs_account.c:1196
+#: src/prefs_account.c:981
msgid "Mail address"
msgstr "邮件地址"
-#: src/prefs_account.c:1202
-msgid "Organization"
-msgstr "组织"
-
-#: src/prefs_account.c:1226
+#: src/prefs_account.c:1011
msgid "Server information"
msgstr "服务器信息"
-#: src/prefs_account.c:1261 src/wizard.c:1241
+#: src/prefs_account.c:1046
msgid ""
"<span weight=\"bold\">Warning: this version of Claws Mail\n"
-"has been built without IMAP support.</span>"
+"has been built without IMAP and News support.</span>"
msgstr ""
"<span weight=\"bold\">警告: 当前的Claws Mail\n"
-"编译时没有启用IMAP支持。</span>"
+"编译时没有启用IMAP和News支持。</span>"
-#: src/prefs_account.c:1290
+#: src/prefs_account.c:1075
msgid "This server requires authentication"
msgstr "服务器需要鉴权"
-#: src/prefs_account.c:1297
+#: src/prefs_account.c:1082
msgid "Authenticate on connect"
msgstr "连接时鉴权"
-#: src/prefs_account.c:1342
+#: src/prefs_account.c:1140
msgid "News server"
msgstr "新闻服务器"
-#: src/prefs_account.c:1348
+#: src/prefs_account.c:1146
msgid "Server for receiving"
msgstr "接收服务器"
-#: src/prefs_account.c:1354
+#: src/prefs_account.c:1152
msgid "Local mailbox"
msgstr "本地邮箱"
-#: src/prefs_account.c:1361
+#: src/prefs_account.c:1159
msgid "SMTP server (send)"
msgstr "SMTP 服务器(发送)"
-#: src/prefs_account.c:1369
+#: src/prefs_account.c:1167
msgid "Use mail command rather than SMTP server"
msgstr "使用mail命令而不是SMTP服务器"
-#: src/prefs_account.c:1378
+#: src/prefs_account.c:1176
msgid "command to send mails"
msgstr "发送邮件的命令"
-#: src/prefs_account.c:1385 src/prefs_account.c:1812
+#: src/prefs_account.c:1183 src/prefs_account.c:1683
msgid "User ID"
msgstr "用户ID"
-#: src/prefs_account.c:1391 src/prefs_account.c:1821
+#: src/prefs_account.c:1189 src/prefs_account.c:1703
msgid "Password"
msgstr "密码"
-#: src/prefs_account.c:1485
+#: src/prefs_account.c:1239
+#, c-format
+msgid "Account%d"
+msgstr "帐号%d"
+
+#: src/prefs_account.c:1332
msgid "Local"
msgstr "本机"
-#: src/prefs_account.c:1491 src/prefs_account.c:1580
-msgid "Default inbox"
+#: src/prefs_account.c:1338 src/prefs_account.c:1422
+msgid "Default Inbox"
msgstr "缺省收信夹"
-#: src/prefs_account.c:1498 src/prefs_account.c:1506 src/prefs_account.c:1587
-#: src/prefs_account.c:1595
+#: src/prefs_account.c:1345 src/prefs_account.c:1353 src/prefs_account.c:1429
+#: src/prefs_account.c:1437
msgid "Unfiltered messages will be stored in this folder"
-msgstr "未被过滤的邮件将放入该文件夹"
+msgstr "未被过滤的邮件将放入该目录"
-#: src/prefs_account.c:1503 src/prefs_account.c:1592 src/prefs_account.c:1985
+#: src/prefs_account.c:1350 src/prefs_account.c:1434 src/prefs_account.c:1885
msgid "Bro_wse"
msgstr "浏览(_w)"
-#: src/prefs_account.c:1515
+#: src/prefs_account.c:1362
msgid "Use secure authentication (APOP)"
msgstr "采用安全鉴权(APOP)"
-#: src/prefs_account.c:1518
+#: src/prefs_account.c:1365
msgid "Remove messages on server when received"
msgstr "收到邮件后从服务器上删除"
-#: src/prefs_account.c:1529
+#: src/prefs_account.c:1376
msgid "Remove after"
msgstr "删除于"
-#: src/prefs_account.c:1538
+#: src/prefs_account.c:1385
msgid "0 days: remove immediately"
msgstr "(0 天: 立即删除)"
-#: src/prefs_account.c:1542
+#: src/prefs_account.c:1388 src/prefs_folder_item.c:507
+#: src/prefs_matcher.c:312
msgid "days"
msgstr "天后"
-#: src/prefs_account.c:1549
-msgid "Download all messages on server"
-msgstr "下载服务器上所有邮件"
-
-#: src/prefs_account.c:1555
+#: src/prefs_account.c:1398
msgid "Receive size limit"
msgstr "邮件大小限制"
-#: src/prefs_account.c:1558
+#: src/prefs_account.c:1401
msgid ""
"Messages over this limit will be partially retrieved. When selecting them "
"you will be able to download them fully or delete them."
"大小超过此限制的邮件只会被部分收取，在你查看它的时候可以选择是否要全部收取或"
"者删除。"
-#: src/prefs_account.c:1568
-msgid "KB"
-msgstr "KB"
-
-#: src/prefs_account.c:1602 src/prefs_account.c:2261
+#: src/prefs_account.c:1444 src/prefs_account.c:2294
msgid "NNTP"
msgstr "NNTP"
-#: src/prefs_account.c:1609
+#: src/prefs_account.c:1451
msgid "Maximum number of articles to download"
msgstr "帖子下载最大数量"
-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1463
msgid "unlimited if 0 is specified"
msgstr "如果设为0为不作限制"
-#: src/prefs_account.c:1634 src/prefs_account.c:1782
+#: src/prefs_account.c:1476 src/prefs_account.c:1656
msgid "Authentication method"
msgstr "鉴权方式"
-#: src/prefs_account.c:1644 src/prefs_account.c:1792 src/prefs_send.c:278
+#: src/prefs_account.c:1486 src/prefs_account.c:1665 src/prefs_send.c:292
msgid "Automatic"
msgstr "自动"
-#: src/prefs_account.c:1656
+#: src/prefs_account.c:1497
msgid "IMAP server directory"
msgstr "IMAP服务器目录:"
-#: src/prefs_account.c:1660
+#: src/prefs_account.c:1501
msgid "(usually empty)"
msgstr "(一般可保持为空)"
-#: src/prefs_account.c:1674
+#: src/prefs_account.c:1515
msgid "Show subscribed folders only"
msgstr "只显示已订阅的目录"
-#: src/prefs_account.c:1677
+#: src/prefs_account.c:1522
+msgid "Bandwidth-efficient mode (prevents retrieving remote tags)"
+msgstr "高效带宽模式(不读取远端标签)"
+
+#: src/prefs_account.c:1524
+msgid "This mode uses less bandwidth, but can be slower with some servers."
+msgstr "此模式将使用较少带宽，但在某些服务器上可能会慢一些。"
+
+#: src/prefs_account.c:1528
msgid "Filter messages on receiving"
msgstr "接收邮件时进行过滤"
-#: src/prefs_account.c:1681
+#: src/prefs_account.c:1535
+msgid "Allow filtering using plugins on receiving"
+msgstr "接收邮件时允许采用插件进行过滤"
+
+#: src/prefs_account.c:1539
msgid "'Get Mail' checks for new messages on this account"
msgstr "`全部收取'包含本帐户的新邮件"
-#: src/prefs_account.c:1743 src/prefs_customheader.c:205
-#: src/prefs_matcher.c:163
+#: src/prefs_account.c:1617 src/prefs_customheader.c:206
+#: src/prefs_matcher.c:584 src/prefs_matcher.c:1797 src/prefs_matcher.c:1818
msgid "Header"
msgstr "邮件头"
-#: src/prefs_account.c:1745
+#: src/prefs_account.c:1619
msgid "Generate Message-ID"
msgstr "生成Message-ID"
-#: src/prefs_account.c:1752
+#: src/prefs_account.c:1626
msgid "Add user-defined header"
msgstr "添加自定义消息头"
-#: src/prefs_account.c:1764
+#: src/prefs_account.c:1638
msgid "Authentication"
msgstr "鉴权"
-#: src/prefs_account.c:1767
+#: src/prefs_account.c:1641
msgid "SMTP Authentication (SMTP AUTH)"
msgstr "SMTP鉴权 (SMTP AUTH)"
-#: src/prefs_account.c:1843
+#: src/prefs_account.c:1729
msgid ""
"If you leave these entries empty, the same user ID and password as receiving "
"will be used."
msgstr "如果你保持这几项为空，将采用接收邮件的用户ID和口令。"
-#: src/prefs_account.c:1854
+#: src/prefs_account.c:1740
msgid "Authenticate with POP3 before sending"
msgstr "发送之前采用POP3进行鉴权"
-#: src/prefs_account.c:1869
+#: src/prefs_account.c:1755
msgid "POP authentication timeout: "
msgstr "POP鉴权超时限制"
-#: src/prefs_account.c:1878
+#: src/prefs_account.c:1763
msgid "minutes"
msgstr "分钟"
-#: src/prefs_account.c:1931 src/prefs_account.c:1977
+#: src/prefs_account.c:1831 src/prefs_account.c:1877
msgid "Signature"
msgstr "签名"
-#: src/prefs_account.c:1934
+#: src/prefs_account.c:1834
msgid "Insert signature automatically"
msgstr "自动插入签名"
-#: src/prefs_account.c:1939
+#: src/prefs_account.c:1839
msgid "Signature separator"
msgstr "签名分隔符"
-#: src/prefs_account.c:1964
+#: src/prefs_account.c:1864
msgid "Command output"
msgstr "命令输出"
-#: src/prefs_account.c:1997
+#: src/prefs_account.c:1897
msgid "Automatically set the following addresses"
msgstr "自动设置如下地址"
-#: src/prefs_account.c:2006 src/prefs_filtering_action.c:1083
-#: src/prefs_matcher.c:160 src/prefs_matcher.c:1881 src/prefs_template.c:188
-#: src/quote_fmt.c:49
-msgid "Cc"
-msgstr "回信地址"
-
-#: src/prefs_account.c:2019 src/prefs_template.c:189
-msgid "Bcc"
-msgstr "抄送地址"
-
-#: src/prefs_account.c:2032
-msgid "Reply-To"
-msgstr "回信地址"
-
-#: src/prefs_account.c:2046
+#: src/prefs_account.c:1946
msgid "Spell check dictionaries"
msgstr "拼写检查字典"
-#: src/prefs_account.c:2056 src/prefs_folder_item.c:791
-#: src/prefs_spelling.c:233
+#: src/prefs_account.c:1956 src/prefs_folder_item.c:923
+#: src/prefs_spelling.c:224
msgid "Default dictionary"
msgstr "缺省字典"
-#: src/prefs_account.c:2073 src/prefs_folder_item.c:824
-#: src/prefs_spelling.c:251
+#: src/prefs_account.c:1970 src/prefs_folder_item.c:948
+#: src/prefs_spelling.c:238
msgid "Default alternate dictionary"
msgstr "缺省的备选字典"
-#: src/prefs_account.c:2137
+#: src/prefs_account.c:2057 src/prefs_account.c:3029
+#: src/prefs_compose_writing.c:343 src/prefs_folder_item.c:1187
+#: src/prefs_folder_item.c:1530 src/prefs_quote.c:90 src/prefs_quote.c:194
+#: src/prefs_spelling.c:403 src/prefs_wrapping.c:144
+msgid "Compose"
+msgstr "撰写"
+
+#: src/prefs_account.c:2071 src/prefs_folder_item.c:1205 src/prefs_quote.c:104
+#: src/toolbar.c:422
+msgid "Reply"
+msgstr "回复"
+
+#: src/prefs_account.c:2085 src/prefs_filtering_action.c:175
+#: src/prefs_folder_item.c:1223 src/prefs_quote.c:118 src/toolbar.c:426
+msgid "Forward"
+msgstr "转发"
+
+#: src/prefs_account.c:2133
msgid "Default privacy system"
msgstr "缺省隐私系统"
-#: src/prefs_account.c:2146
+#: src/prefs_account.c:2162
msgid "Always sign messages"
msgstr "总是添加签名"
-#: src/prefs_account.c:2148
+#: src/prefs_account.c:2164
msgid "Always encrypt messages"
msgstr "总是加密邮件"
-#: src/prefs_account.c:2150
+#: src/prefs_account.c:2166
msgid "Always encrypt messages when replying to an encrypted message"
msgstr "回复加密邮件时也采用加密模式"
-#: src/prefs_account.c:2153
+#: src/prefs_account.c:2169
msgid "Encrypt sent messages with your own key in addition to recipient's"
msgstr "采用自己和收件人的密钥进行双重加密"
-#: src/prefs_account.c:2155
+#: src/prefs_account.c:2171
msgid "Save sent encrypted messages as clear text"
msgstr "将发出的加密邮件以明文保存"
-#: src/prefs_account.c:2239 src/prefs_account.c:2252 src/prefs_account.c:2264
+#: src/prefs_account.c:2272 src/prefs_account.c:2285 src/prefs_account.c:2297
msgid "Don't use SSL"
msgstr "不采用SSL"
-#: src/prefs_account.c:2242
+#: src/prefs_account.c:2275
msgid "Use SSL for POP3 connection"
msgstr "用SSL进行POP3连接"
-#: src/prefs_account.c:2245 src/prefs_account.c:2258 src/prefs_account.c:2285
+#: src/prefs_account.c:2278 src/prefs_account.c:2291 src/prefs_account.c:2318
msgid "Use STARTTLS command to start SSL session"
msgstr "用STARTTLS命令开始SSL会话"
-#: src/prefs_account.c:2255
+#: src/prefs_account.c:2288
msgid "Use SSL for IMAP4 connection"
msgstr "用SSL进行IMAP连接"
-#: src/prefs_account.c:2273
+#: src/prefs_account.c:2306
msgid "Use SSL for NNTP connection"
msgstr "用SSL进行NNTP连接"
-#: src/prefs_account.c:2275
+#: src/prefs_account.c:2308
msgid "Send (SMTP)"
msgstr "发送 (SMTP)"
-#: src/prefs_account.c:2279
+#: src/prefs_account.c:2312
msgid "Don't use SSL (but, if necessary, use STARTTLS)"
msgstr "不采用SSL (但在必要的情况下将启用STARTTLS)"
-#: src/prefs_account.c:2282
+#: src/prefs_account.c:2315
msgid "Use SSL for SMTP connection"
msgstr "用SSL进行SMTP连接"
-#: src/prefs_account.c:2293
+#: src/prefs_account.c:2326
msgid "Use non-blocking SSL"
msgstr "采用非阻塞式SSL"
-#: src/prefs_account.c:2305
+#: src/prefs_account.c:2338
msgid "Turn this off if you have SSL connection problems"
msgstr "(如果你在SSL连接上碰到问题请关闭本项试试)"
-#: src/prefs_account.c:2431
+#: src/prefs_account.c:2445
msgid "SMTP port"
msgstr "SMTP端口"
-#: src/prefs_account.c:2437
+#: src/prefs_account.c:2451
msgid "POP3 port"
msgstr "POP3端口"
-#: src/prefs_account.c:2443
+#: src/prefs_account.c:2457
msgid "IMAP4 port"
msgstr "IMAP4端口"
-#: src/prefs_account.c:2449
+#: src/prefs_account.c:2463
msgid "NNTP port"
msgstr "NNTP端口"
-#: src/prefs_account.c:2454
+#: src/prefs_account.c:2468
msgid "Domain name"
msgstr "域名"
-#: src/prefs_account.c:2464
+#: src/prefs_account.c:2471 src/prefs_account.c:2481
+msgid ""
+"The domain name will be used in the right part of the generated Message-Ids, "
+"and when connecting to SMTP servers."
+msgstr ""
+"域名将用于生成Message-Id的一部分，并用于连接SMTP服务器。"
+
+#: src/prefs_account.c:2490
msgid "Use command to communicate with server"
msgstr "用如下命令与服务器通讯"
-#: src/prefs_account.c:2472
+#: src/prefs_account.c:2498
msgid "Mark cross-posted messages as read and color:"
msgstr "将交叉投递(cross-posted)的邮件表示为已读和彩色:"
-#: src/prefs_account.c:2514
+#: src/prefs_account.c:2540
msgid "Browse"
msgstr "浏览"
-#: src/prefs_account.c:2527
+#: src/prefs_account.c:2553
msgid "Put sent messages in"
msgstr "将已发送邮件存放到"
-#: src/prefs_account.c:2529
+#: src/prefs_account.c:2555
msgid "Put queued messages in"
msgstr "将待发送的邮件存放到"
-#: src/prefs_account.c:2531
+#: src/prefs_account.c:2557
msgid "Put draft messages in"
msgstr "将邮件草稿存放到"
-#: src/prefs_account.c:2533
+#: src/prefs_account.c:2559
msgid "Put deleted messages in"
msgstr "将已删除的邮件存放到"
-#: src/prefs_account.c:2576
+#: src/prefs_account.c:2614
msgid "Account name is not entered."
msgstr "未输入帐户名称。"
-#: src/prefs_account.c:2580
+#: src/prefs_account.c:2618
msgid "Mail address is not entered."
msgstr "未输入邮件地址。"
-#: src/prefs_account.c:2587
+#: src/prefs_account.c:2625
msgid "SMTP server is not entered."
msgstr "未输入SMTP服务器"
-#: src/prefs_account.c:2592
+#: src/prefs_account.c:2630
msgid "User ID is not entered."
msgstr "未输入用户ID"
-#: src/prefs_account.c:2597
+#: src/prefs_account.c:2635
msgid "POP3 server is not entered."
msgstr "未输入POP3服务器"
-#: src/prefs_account.c:2605
-msgid "The default inbox folder doesn't exist."
+#: src/prefs_account.c:2656
+msgid "The default Inbox folder doesn't exist."
msgstr "缺省的收件夹不存在。"
-#: src/prefs_account.c:2611
+#: src/prefs_account.c:2662
msgid "IMAP4 server is not entered."
msgstr "未输入IMAP4服务器"
-#: src/prefs_account.c:2616
+#: src/prefs_account.c:2667
msgid "NNTP server is not entered."
msgstr "尚未输入NNTP服务器"
-#: src/prefs_account.c:2622
+#: src/prefs_account.c:2673
msgid "local mailbox filename is not entered."
msgstr "尚未输入本地邮箱名称"
-#: src/prefs_account.c:2628
+#: src/prefs_account.c:2679
msgid "mail command is not entered."
msgstr "尚未输入邮件命令"
-#: src/prefs_account.c:2694
+#: src/prefs_account.c:2993
+msgid "Receive"
+msgstr "接收"
+
+#: src/prefs_account.c:3047 src/prefs_folder_item.c:1547 src/prefs_quote.c:195
+msgid "Templates"
+msgstr "模板"
+
+#: src/prefs_account.c:3065
+msgid "Privacy"
+msgstr "隐私"
+
+#: src/prefs_account.c:3103
+msgid "Advanced"
+msgstr "高级"
+
+#: src/prefs_account.c:3389
+msgid "Preferences for new account"
+msgstr "设置新帐号"
+
+#: src/prefs_account.c:3391
+#, c-format
+msgid "%s - Account preferences"
+msgstr "%s - 帐号设置"
+
+#: src/prefs_account.c:3486
msgid "Select signature file"
msgstr "选择签名文件"
-#: src/prefs_account.c:2787
+#: src/prefs_account.c:3581
msgid "Protocol:"
msgstr "通讯协议:"
-#: src/prefs_account.c:2940
+#: src/prefs_account.c:3720
#, c-format
msgid "%s (plugin not loaded)"
msgstr "%s (插件未加载)"
-#: src/prefs_actions.c:201
+#: src/prefs_actions.c:207
msgid "Actions configuration"
msgstr "动作配置"
-#: src/prefs_actions.c:228
+#: src/prefs_actions.c:234
msgid "Menu name"
msgstr "菜单项名称"
-#: src/prefs_actions.c:241
+#: src/prefs_actions.c:247
msgid "Command line"
msgstr "命令行"
-#: src/prefs_actions.c:275 src/prefs_filtering_action.c:493
-#: src/prefs_filtering.c:455 src/prefs_matcher.c:675 src/prefs_template.c:270
-#: src/prefs_toolbar.c:788
+#: src/prefs_actions.c:281
+msgid "Append the new action above to the list"
+msgstr "将上面定义的新动作添加到列表"
+
+#: src/prefs_actions.c:283 src/prefs_filtering_action.c:564
+#: src/prefs_filtering.c:471 src/prefs_matcher.c:716 src/prefs_template.c:301
+#: src/prefs_toolbar.c:905
msgid "Replace"
msgstr "替换"
-#: src/prefs_actions.c:291 src/prefs_filtering_action.c:464
-#: src/prefs_matcher.c:571
+#: src/prefs_actions.c:289
+msgid "Replace the selected action in list with the action above"
+msgstr "将当前选中的动作用上一动作替换"
+
+#: src/prefs_actions.c:297
+msgid "Delete the selected action from the list"
+msgstr "从列表中删除选中的动作"
+
+#: src/prefs_actions.c:305 src/prefs_filtering.c:494 src/prefs_template.c:324
+msgid "Clear all the input fields in the dialog"
+msgstr "清除对话框中的所有输入项"
+
+#: src/prefs_actions.c:310 src/prefs_filtering_action.c:540
+#: src/prefs_matcher.c:693
msgid "Info..."
msgstr "说明..."
-#: src/prefs_actions.c:458 src/prefs_filtering_action.c:585
-#: src/prefs_filtering.c:762 src/prefs_filtering.c:764
-#: src/prefs_filtering.c:765 src/prefs_filtering.c:840 src/prefs_matcher.c:813
-#: src/prefs_template.c:367
+#: src/prefs_actions.c:317
+#, fuzzy
+msgid "Show information on configuring actions"
+msgstr "迁移设置"
+
+#: src/prefs_actions.c:346
+msgid "Move the selected action up"
+msgstr "将选中的项上移"
+
+#: src/prefs_actions.c:354
+msgid "Move selected action down"
+msgstr "将选中的项下移"
+
+#: src/prefs_actions.c:481 src/prefs_filtering_action.c:652
+#: src/prefs_filtering.c:896 src/prefs_filtering.c:898
+#: src/prefs_filtering.c:899 src/prefs_filtering.c:986 src/prefs_matcher.c:833
+#: src/prefs_template.c:462
msgid "(New)"
msgstr "(新建)"
-#: src/prefs_actions.c:523
+#: src/prefs_actions.c:558
msgid "Menu name is not set."
msgstr "未指定菜单项名称"
-#: src/prefs_actions.c:528
+#: src/prefs_actions.c:563
msgid "A leading '/' is not allowed in the menu name."
msgstr "菜单项名称不允许以'/'开始"
-#: src/prefs_actions.c:533
+#: src/prefs_actions.c:568
msgid "Colon ':' is not allowed in the menu name."
msgstr "菜单项名称不允许包含冒号':'"
-#: src/prefs_actions.c:552
+#: src/prefs_actions.c:587
msgid "Menu name is too long."
msgstr "菜单项名称太长"
-#: src/prefs_actions.c:561
+#: src/prefs_actions.c:596
msgid "Command line not set."
msgstr "未指定命令行"
-#: src/prefs_actions.c:566
+#: src/prefs_actions.c:601
msgid "Menu name and command are too long."
msgstr "菜单项或者命令太长"
-#: src/prefs_actions.c:571
+#: src/prefs_actions.c:607
#, c-format
msgid ""
"The command\n"
"%s\n"
"存在语法错误。"
-#: src/prefs_actions.c:631
+#: src/prefs_actions.c:665
msgid "Delete action"
msgstr "删除动作"
-#: src/prefs_actions.c:632
+#: src/prefs_actions.c:666
msgid "Do you really want to delete this action?"
msgstr "你真的要删除此动作码? "
-#: src/prefs_actions.c:749 src/prefs_actions.c:769 src/prefs_filtering.c:1253
-#: src/prefs_filtering.c:1275 src/prefs_matcher.c:1834
-#: src/prefs_template.c:426 src/prefs_template.c:443
+#: src/prefs_actions.c:686
+msgid "Delete all actions"
+msgstr "删除所有动作"
+
+#: src/prefs_actions.c:687
+msgid "Do you really want to delete all the actions?"
+msgstr "你真的要删除所有动作码? "
+
+#: src/prefs_actions.c:828 src/prefs_actions.c:858 src/prefs_filtering.c:1534
+#: src/prefs_filtering.c:1556 src/prefs_matcher.c:1940
+#: src/prefs_template.c:518 src/prefs_template.c:540
msgid "Entry not saved"
msgstr "项目未保存"
-#: src/prefs_actions.c:750 src/prefs_actions.c:770 src/prefs_filtering.c:1254
-#: src/prefs_filtering.c:1276 src/prefs_template.c:427
-#: src/prefs_template.c:444
+#: src/prefs_actions.c:829 src/prefs_actions.c:859 src/prefs_filtering.c:1535
+#: src/prefs_filtering.c:1557 src/prefs_template.c:519
+#: src/prefs_template.c:541
msgid "The entry was not saved. Close anyway?"
msgstr "该项未保存，真的退出？"
-#: src/prefs_actions.c:751 src/prefs_actions.c:771 src/prefs_filtering.c:1255
-#: src/prefs_filtering.c:1277 src/prefs_matcher.c:1836
-#: src/prefs_template.c:428 src/prefs_template.c:445
+#: src/prefs_actions.c:830 src/prefs_actions.c:835 src/prefs_actions.c:860
+#: src/prefs_filtering.c:1514 src/prefs_filtering.c:1536
+#: src/prefs_filtering.c:1558 src/prefs_matcher.c:1942
+#: src/prefs_template.c:520 src/prefs_template.c:542 src/prefs_template.c:547
msgid "+_Continue editing"
msgstr "+继续编辑(_C)"
-#: src/prefs_actions.c:806
+#: src/prefs_actions.c:833
+msgid "Actions list not saved"
+msgstr "动作列表没有保存"
+
+#: src/prefs_actions.c:834
+msgid "The actions list has been modified. Close anyway?"
+msgstr "动作列表已经被修改，确实要关闭？"
+
+#: src/prefs_actions.c:899
msgid "<span weight=\"bold\" underline=\"single\">Menu name:</span>"
msgstr "<span weight=\"bold\" underline=\"single\">菜单名称:</span>"
-#: src/prefs_actions.c:807
+#: src/prefs_actions.c:900
msgid "Use / in menu name to make submenus."
msgstr "菜单项名称中可以用斜线(/)标识子菜单项"
-#: src/prefs_actions.c:809
+#: src/prefs_actions.c:902
msgid "<span weight=\"bold\" underline=\"single\">Command line:</span>"
msgstr "<span weight=\"bold\" underline=\"single\">命令行:</span>"
-#: src/prefs_actions.c:810
+#: src/prefs_actions.c:903
msgid "<span weight=\"bold\">Begin with:</span>"
msgstr "<span weight=\"bold\">开始于:</span>"
-#: src/prefs_actions.c:811
+#: src/prefs_actions.c:904
msgid "to send message body or selection to command's standard input"
msgstr "将邮件内容或者选中部分传递给命令的标准输入"
-#: src/prefs_actions.c:812
+#: src/prefs_actions.c:905
msgid "to send user provided text to command's standard input"
msgstr "将用户输入的文字传递给命令的标准输入"
-#: src/prefs_actions.c:813
+#: src/prefs_actions.c:906
msgid "to send user provided hidden text to command's standard input"
msgstr "将用户输入的文字传递给命令的标准输入(输入时不显示明文)"
-#: src/prefs_actions.c:814
+#: src/prefs_actions.c:907
msgid "<span weight=\"bold\">End with:</span>"
msgstr "<span weight=\"bold\">结束于:</span>"
-#: src/prefs_actions.c:815
+#: src/prefs_actions.c:908
msgid "to replace message body or selection with command's standard output"
msgstr "以命令的标准输出替换当前邮件内容或者选中部分"
-#: src/prefs_actions.c:816
+#: src/prefs_actions.c:909
msgid "to insert command's standard output without replacing old text"
msgstr "插入命令的标准输出内容"
-#: src/prefs_actions.c:817
+#: src/prefs_actions.c:910
msgid "to run command asynchronously"
msgstr "异步运行命令"
-#: src/prefs_actions.c:818
+#: src/prefs_actions.c:911
msgid "<span weight=\"bold\">Use:</span>"
msgstr "<span weight=\"bold\">采用:</span>"
-#: src/prefs_actions.c:819
+#: src/prefs_actions.c:912
msgid "for the file of the selected message in RFC822/2822 format "
msgstr "被选中邮件文件(RFC822/2822格式)"
-#: src/prefs_actions.c:820
+#: src/prefs_actions.c:913
msgid ""
"for the list of the files of the selected messages in RFC822/2822 format"
msgstr "被选中的多个邮件文件(RFC822/2822格式)"
-#: src/prefs_actions.c:821
+#: src/prefs_actions.c:914
msgid "for the file of the selected decoded message MIME part"
msgstr "被选中的MIME part(解码后)"
-#: src/prefs_actions.c:822
+#: src/prefs_actions.c:915
msgid "for a user provided argument"
msgstr "用户提供的参数"
-#: src/prefs_actions.c:823
+#: src/prefs_actions.c:916
msgid "for a user provided hidden argument (e.g. password)"
msgstr "用户提供的隐藏参数(例如: 密码)"
-#: src/prefs_actions.c:824
+#: src/prefs_actions.c:917
msgid "for the text selection"
msgstr "选中的文字"
-#: src/prefs_actions.c:825
+#: src/prefs_actions.c:918
msgid "apply filtering actions between {} to selected messages"
msgstr "对选中的邮件执行{}中的过滤动作"
-#: src/prefs_actions.c:834 src/prefs_themes.c:978
+#: src/prefs_actions.c:919
+msgid "for a literal %"
+msgstr "% 符号本身"
+
+#: src/prefs_actions.c:928 src/prefs_themes.c:978
msgid "Actions"
msgstr "动作"
-#: src/prefs_actions.c:835
+#: src/prefs_actions.c:929
msgid ""
"The Actions feature is a way for the user to launch external commands to "
"process a complete message file or just one of its parts."
"'动作'这一功能使得用户可以用外部命令来处理一封邮件的内容(或者只处理其中的一部"
"分)。"
-#: src/prefs_actions.c:921
+#: src/prefs_actions.c:1015 src/prefs_filtering.c:1731
+#: src/prefs_template.c:999
+msgid "/D_uplicate"
+msgstr "/重复(_u)"
+
+#: src/prefs_actions.c:1122
msgid "Current actions"
msgstr "当前动作"
-#: src/prefs_common.c:210
+#: src/prefs_common.c:229
msgid "Hello,\\n"
msgstr "你好,\\n"
-#: src/prefs_common.c:272
+#: src/prefs_common.c:296
msgid "On %d\\n%f wrote:\\n\\n%q"
msgstr "于 %d\\n%f 写道:\\n\\n%q"
-#: src/prefs_common.c:278
+#: src/prefs_common.c:302
msgid ""
"\\n\\nBegin forwarded message:\\n\\n?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t"
"\\n}?c{Cc: %c\\n}?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"
"\\n\\n===== 转发邮件:\\n\\n?d{日期: %d\\n}?f{发件人: %f\\n}?t{收件人: %t\\n}?"
"c{抄送: %c\\n}?n{新闻组: %n\\n}?s{主题: %s\\n}\\n\\n%M"
-#: src/prefs_common.c:363
+#: src/prefs_common.c:441
msgid "%y/%m/%d(%a) %H:%M"
msgstr ""
-#: src/prefs_compose_writing.c:124
+#: src/prefs_compose_writing.c:121
msgid "Automatic account selection"
msgstr "自动选择帐户"
-#: src/prefs_compose_writing.c:132
+#: src/prefs_compose_writing.c:129
msgid "when replying"
msgstr "回信时"
-#: src/prefs_compose_writing.c:134
+#: src/prefs_compose_writing.c:131
msgid "when forwarding"
msgstr "转发时"
-#: src/prefs_compose_writing.c:136
+#: src/prefs_compose_writing.c:133
msgid "when re-editing"
msgstr "重新编辑时"
-#: src/prefs_compose_writing.c:138
-msgid "Forwarding"
-msgstr "转发"
-
-#: src/prefs_compose_writing.c:141 src/prefs_filtering_action.c:160
-msgid "Forward as attachment"
-msgstr "以附件形式转发"
-
-#: src/prefs_compose_writing.c:144
-msgid "Keep the original 'From' header when redirecting"
-msgstr "重定向时保持原来的发信人"
-
-#: src/prefs_compose_writing.c:146
+#: src/prefs_compose_writing.c:135
msgid "Editing"
msgstr "编辑"
-#: src/prefs_compose_writing.c:149
+#: src/prefs_compose_writing.c:138
msgid "Automatically launch the external editor"
msgstr "自动启动外部编辑器"
-#: src/prefs_compose_writing.c:156
+#: src/prefs_compose_writing.c:145
msgid "Autosave message text to Drafts folder every"
msgstr "自动保存草稿: 每"
-#: src/prefs_compose_writing.c:166 src/prefs_wrapping.c:97
+#: src/prefs_compose_writing.c:155 src/prefs_wrapping.c:97
msgid "characters"
msgstr "个字符"
-#: src/prefs_compose_writing.c:174
+#: src/prefs_compose_writing.c:163
msgid "Undo level"
msgstr "撤销纪录数"
-#: src/prefs_compose_writing.c:187
+#: src/prefs_compose_writing.c:175
+msgid "Replying"
+msgstr "回复"
+
+#: src/prefs_compose_writing.c:178
+msgid "Reply will quote by default"
+msgstr "回信时引用原文"
+
+#: src/prefs_compose_writing.c:181
msgid "Reply button invokes mailing list reply"
msgstr "点击回信按钮时回复给邮件列表"
-#: src/prefs_compose_writing.c:190
+#: src/prefs_compose_writing.c:183
+msgid "Forwarding"
+msgstr "转发"
+
+#: src/prefs_compose_writing.c:186 src/prefs_filtering_action.c:176
+msgid "Forward as attachment"
+msgstr "以附件形式转发"
+
+#: src/prefs_compose_writing.c:189
+msgid "Keep the original 'From' header when redirecting"
+msgstr "重定向时保持原来的发信人"
+
+#: src/prefs_compose_writing.c:192
msgid "When dropping files into the Compose window"
msgstr "拖放文件到编写邮件窗口时"
-#: src/prefs_compose_writing.c:198
+#: src/prefs_compose_writing.c:201
msgid "Ask"
msgstr "询问"
-#: src/prefs_compose_writing.c:199 src/toolbar.c:456
+#: src/prefs_compose_writing.c:202 src/toolbar.c:439
msgid "Insert"
msgstr "插入"
-#: src/prefs_compose_writing.c:200 src/toolbar.c:457
+#: src/prefs_compose_writing.c:203 src/toolbar.c:440
msgid "Attach"
msgstr "附加文件"
-#: src/prefs_compose_writing.c:216
-msgid "Use format when composing new messages"
-msgstr "撰写新邮件时使用格式"
-
#: src/prefs_compose_writing.c:218
-msgid "New message format"
-msgstr "新邮件格式"
-
-#: src/prefs_compose_writing.c:267 src/prefs_quote.c:206
-msgid " Description of symbols... "
-msgstr " 特殊符号说明... "
+msgid "Quotation characters"
+msgstr "引文标识"
-#: src/prefs_compose_writing.c:387 src/prefs_folder_item.c:1173
-#: src/prefs_quote.c:311 src/prefs_spelling.c:441 src/prefs_wrapping.c:144
-#: src/toolbar.c:1560
-msgid "Compose"
-msgstr "撰写"
+#: src/prefs_compose_writing.c:233
+msgid "Treat these characters as quotation marks: "
+msgstr "将这些字符作为引文标识: "
-#: src/prefs_compose_writing.c:388
+#: src/prefs_compose_writing.c:344
msgid "Writing"
msgstr "编辑"
-#: src/prefs_customheader.c:180
+#: src/prefs_customheader.c:181
msgid "Custom header configuration"
msgstr "自定义信头"
-#: src/prefs_customheader.c:236
+#: src/prefs_customheader.c:234
msgid "From file..."
msgstr "从文件读取..."
-#: src/prefs_customheader.c:505 src/prefs_display_header.c:565
-#: src/prefs_matcher.c:1323 src/prefs_matcher.c:1333
+#: src/prefs_customheader.c:503 src/prefs_display_header.c:598
+#: src/prefs_matcher.c:1436 src/prefs_matcher.c:1451
msgid "Header name is not set."
msgstr "为设定信头名称。"
-#: src/prefs_customheader.c:515
+#: src/prefs_customheader.c:513
msgid "This Header name is not allowed as a custom header."
msgstr "此名称不能作为自定义信头名称。"
-#: src/prefs_customheader.c:562
-msgid "Choose a png file"
+#: src/prefs_customheader.c:560
+msgid "Choose a PNG file"
msgstr "选择一个PNG图片文件"
-#: src/prefs_customheader.c:564
-msgid "Choose an xbm file"
-msgstr "选择一个xbm文件"
+#: src/prefs_customheader.c:562
+msgid "Choose an XBM file"
+msgstr "选择一个XBM文件"
-#: src/prefs_customheader.c:566
+#: src/prefs_customheader.c:564
msgid "Choose a text file"
msgstr "选择一个文本文件"
-#: src/prefs_customheader.c:579
+#: src/prefs_customheader.c:577
msgid "This file isn't an image."
msgstr "该文件不是一个图片。"
-#: src/prefs_customheader.c:584
+#: src/prefs_customheader.c:582
msgid "The chosen image isn't the correct size (48x48)."
msgstr "选中的图片大小不对(必须是48x48)。"
-#: src/prefs_customheader.c:590
+#: src/prefs_customheader.c:588
msgid "The image is too big; it must be maximum 725 bytes."
msgstr "图片太大。不能超过725字节。"
-#: src/prefs_customheader.c:595
+#: src/prefs_customheader.c:593
msgid "The image isn't in the correct format (PNG)."
msgstr "图片格式不对。"
-#: src/prefs_customheader.c:604
+#: src/prefs_customheader.c:602
msgid "The image isn't in the correct format (XBM)."
msgstr "图片格式不对。"
-#: src/prefs_customheader.c:613
+#: src/prefs_customheader.c:611
msgid "Couldn't call `compface`. Make sure it's in your $PATH."
msgstr "无法找到程序`compface`。请确认它存在于你的$PATH所指向的路径中。"
-#: src/prefs_customheader.c:664
+#: src/prefs_customheader.c:617
+#, c-format
+msgid "Compface error: %s"
+msgstr "Compface错误: %s"
+
+#: src/prefs_customheader.c:668
msgid "This file contains newlines."
msgstr "该文件包含换行符。"
-#: src/prefs_customheader.c:694
+#: src/prefs_customheader.c:698
msgid "Delete header"
msgstr "删除信头"
-#: src/prefs_customheader.c:695
+#: src/prefs_customheader.c:699
msgid "Do you really want to delete this header?"
msgstr "确定删除信头？"
-#: src/prefs_customheader.c:865
+#: src/prefs_customheader.c:869
msgid "Current custom headers"
msgstr "当前自定义信头"
-#: src/prefs_display_header.c:227
+#: src/prefs_display_header.c:257
msgid "Displayed header configuration"
msgstr "信头字段显示配置"
-#: src/prefs_display_header.c:251 src/prefs_matcher.c:493
+#: src/prefs_display_header.c:281
msgid "Header name"
msgstr "信头名称"
-#: src/prefs_display_header.c:286
+#: src/prefs_display_header.c:316
msgid "Displayed Headers"
msgstr "要显示的信头"
-#: src/prefs_display_header.c:352
+#: src/prefs_display_header.c:382
msgid "Hidden headers"
msgstr "需隐藏的信头"
-#: src/prefs_display_header.c:378
+#: src/prefs_display_header.c:408
msgid "Show all unspecified headers"
msgstr "显示所有未指明的信头字段"
-#: src/prefs_display_header.c:575
+#: src/prefs_display_header.c:608
msgid "This header is already in the list."
msgstr "该字段已经在列表中存在。"
-#: src/prefs_ext_prog.c:100
+#: src/prefs_ext_prog.c:105
#, c-format
msgid "%s will be replaced with file name / URI"
msgstr "%s 将被替换为相应的文件名或者URI"
-#: src/prefs_ext_prog.c:117
+#: src/prefs_ext_prog.c:123
+msgid "Use system defaults when possible"
+msgstr "系统有缺省设置时采用该设置"
+
+#: src/prefs_ext_prog.c:148
msgid "Web browser"
msgstr "网页浏览器"
-#: src/prefs_ext_prog.c:146
+#: src/prefs_ext_prog.c:182
msgid "Text editor"
msgstr "文本编辑器"
-#: src/prefs_ext_prog.c:174
+#: src/prefs_ext_prog.c:210
msgid "Command for 'Display as text'"
msgstr "用于'以文本方式显示'的命令"
-#: src/prefs_ext_prog.c:186
+#: src/prefs_ext_prog.c:223
msgid ""
"This option enables MIME parts to be displayed in the message view via a "
"script when using the 'Display as text' contextual menu item"
"此选项使得邮件的MIME部分可以通过一个脚本转化为文本格式显示在邮件内容上。(你仍"
"然需要使用'以文本方式显示'菜单项来运行这个脚本)"
-#: src/prefs_ext_prog.c:197
+#: src/prefs_ext_prog.c:234
msgid "Print command"
msgstr "打印命令"
-#: src/prefs_ext_prog.c:253 src/prefs_image_viewer.c:128
+#: src/prefs_ext_prog.c:300 src/prefs_image_viewer.c:143
#: src/prefs_message.c:293
msgid "Message View"
msgstr "邮件视图"
-#: src/prefs_ext_prog.c:254
+#: src/prefs_ext_prog.c:301
msgid "External Programs"
msgstr "外部程序"
-#: src/prefs_filtering_action.c:150
+#: src/prefs_filtering_action.c:161
msgid "Move"
msgstr "移动"
-#: src/prefs_filtering_action.c:151
+#: src/prefs_filtering_action.c:162
msgid "Copy"
msgstr "复制"
-#: src/prefs_filtering_action.c:153 src/prefs_summary_column.c:79
-#: src/summaryview.c:2405
+#: src/prefs_filtering_action.c:164
+msgid "Hide"
+msgstr "隐藏"
+
+#: src/prefs_filtering_action.c:165 src/prefs_filtering_action.c:166
+#: src/prefs_filtering_action.c:167 src/prefs_filtering_action.c:168
+#: src/prefs_filtering_action.c:169 src/prefs_filtering_action.c:170
+#: src/prefs_filtering_action.c:171 src/prefs_filtering_action.c:172
+msgid "Message flags"
+msgstr "邮件标记"
+
+#: src/prefs_filtering_action.c:165 src/prefs_summary_column.c:81
+#: src/summaryview.c:2604
msgid "Mark"
msgstr "标记"
-#: src/prefs_filtering_action.c:155
+#: src/prefs_filtering_action.c:167
msgid "Lock"
msgstr "锁定"
-#: src/prefs_filtering_action.c:156
+#: src/prefs_filtering_action.c:168
msgid "Unlock"
msgstr "解锁"
-#: src/prefs_filtering_action.c:157
+#: src/prefs_filtering_action.c:169
msgid "Mark as read"
msgstr "设为已读"
-#: src/prefs_filtering_action.c:158
+#: src/prefs_filtering_action.c:170
msgid "Mark as unread"
msgstr "设为未读"
-#: src/prefs_filtering_action.c:159 src/toolbar.c:408 src/toolbar.c:499
-msgid "Forward"
-msgstr "转发"
+#: src/prefs_filtering_action.c:171
+msgid "Mark as spam"
+msgstr "标记为垃圾邮件"
-#: src/prefs_filtering_action.c:161
-msgid "Redirect"
-msgstr "重新指定"
+#: src/prefs_filtering_action.c:172
+msgid "Mark as ham"
+msgstr "标记为非垃圾邮件"
-#: src/prefs_filtering_action.c:162 src/prefs_filtering_action.c:429
-#: src/toolbar.c:178 src/toolbar.c:1711
+#: src/prefs_filtering_action.c:173 src/prefs_filtering_action.c:1361
+#: src/toolbar.c:189 src/toolbar.c:447 src/toolbar.c:1994
msgid "Execute"
msgstr "执行"
-#: src/prefs_filtering_action.c:163 src/prefs_filtering_action.c:434
-msgid "Color"
-msgstr "颜色"
+#: src/prefs_filtering_action.c:174
+msgid "Color label"
+msgstr "颜色标签"
-#: src/prefs_filtering_action.c:164
+#: src/prefs_filtering_action.c:175 src/prefs_filtering_action.c:176
+#: src/prefs_filtering_action.c:177
+msgid "Resend"
+msgstr "再次发送"
+
+#: src/prefs_filtering_action.c:177
+msgid "Redirect"
+msgstr "重新指定"
+
+#: src/prefs_filtering_action.c:178 src/prefs_filtering_action.c:179
+#: src/prefs_filtering_action.c:1365 src/prefs_matcher.c:587
+#: src/prefs_summary_column.c:90 src/summaryview.c:552
+msgid "Score"
+msgstr "得分"
+
+#: src/prefs_filtering_action.c:178
msgid "Change score"
msgstr "修改积分"
-#: src/prefs_filtering_action.c:165
+#: src/prefs_filtering_action.c:179
msgid "Set score"
msgstr "设置积分"
-#: src/prefs_filtering_action.c:166
-msgid "Hide"
-msgstr "隐藏"
+#: src/prefs_filtering_action.c:180 src/prefs_filtering_action.c:181
+#: src/prefs_filtering_action.c:182 src/prefs_matcher.c:589
+#: src/prefs_summary_column.c:92 src/summaryview.c:554
+msgid "Tags"
+msgstr "标签"
+
+#: src/prefs_filtering_action.c:180
+msgid "Apply tag"
+msgstr "使用标签"
+
+#: src/prefs_filtering_action.c:181
+msgid "Unset tag"
+msgstr "去除标签"
-#: src/prefs_filtering_action.c:167 src/toolbar.c:181
+#: src/prefs_filtering_action.c:182
+msgid "Clear tags"
+msgstr "清除标签"
+
+#: src/prefs_filtering_action.c:183 src/prefs_filtering_action.c:184
+msgid "Threads"
+msgstr "讨论线索"
+
+#: src/prefs_filtering_action.c:183 src/toolbar.c:192 src/toolbar.c:432
msgid "Ignore thread"
msgstr "忽略讨论线索"
-#: src/prefs_filtering_action.c:168
+#: src/prefs_filtering_action.c:184 src/toolbar.c:193 src/toolbar.c:433
+msgid "Watch thread"
+msgstr "监视邮件线索"
+
+#: src/prefs_filtering_action.c:186
msgid "Stop filter"
msgstr "停止过滤"
-#: src/prefs_filtering_action.c:317
+#: src/prefs_filtering_action.c:382
msgid "Filtering action configuration"
msgstr "过滤动作配置"
-#: src/prefs_filtering_action.c:342 src/prefs_filtering.c:413
+#: src/prefs_filtering_action.c:399 src/prefs_filtering.c:1904
+#: src/prefs_matcher.c:551
+msgid "Rule"
+msgstr "规则"
+
+#: src/prefs_filtering_action.c:412 src/prefs_filtering.c:427
msgid "Action"
msgstr "动作"
-#: src/prefs_filtering_action.c:419
-msgid "Destination"
-msgstr "目的地"
-
-#: src/prefs_filtering_action.c:424
-msgid "Recipient"
-msgstr "回执"
-
-#: src/prefs_filtering_action.c:439 src/prefs_summary_column.c:88
-#: src/summaryview.c:492
-msgid "Score"
-msgstr "得分"
-
-#: src/prefs_filtering_action.c:796
+#: src/prefs_filtering_action.c:877
msgid "Command line not set"
msgstr "未指定命令行"
-#: src/prefs_filtering_action.c:797
+#: src/prefs_filtering_action.c:878
msgid "Destination is not set."
msgstr "没有指定收信人。"
-#: src/prefs_filtering_action.c:808
+#: src/prefs_filtering_action.c:889
msgid "Recipient is not set."
msgstr "没有指定收信人。"
-#: src/prefs_filtering_action.c:823
+#: src/prefs_filtering_action.c:905
msgid "Score is not set"
msgstr "未指定积分"
-#: src/prefs_filtering_action.c:1042
+#: src/prefs_filtering_action.c:913
+msgid "Header is not set."
+msgstr "未设定信头名称。"
+
+#: src/prefs_filtering_action.c:920
+msgid "Target addressbook/folder is not set."
+msgstr "未输入目标地址簿/目录。"
+
+#: src/prefs_filtering_action.c:930
+msgid "Tag name is empty."
+msgstr "标签名为空。"
+
+#: src/prefs_filtering_action.c:1152
msgid "No action was defined."
msgstr "没有定义动作。"
-#: src/prefs_filtering_action.c:1079 src/prefs_matcher.c:1877
-#: src/quote_fmt.c:62
+#: src/prefs_filtering_action.c:1190 src/prefs_matcher.c:1983
+#: src/quote_fmt.c:76
msgid "literal %"
msgstr "% 符号"
-#: src/prefs_filtering_action.c:1084 src/prefs_matcher.c:1882
-#: src/prefs_summary_column.c:85 src/quote_fmt.c:41 src/summaryview.c:489
-msgid "Date"
-msgstr "日期"
-
-#: src/prefs_filtering_action.c:1085 src/prefs_matcher.c:1883
-#: src/quote_fmt.c:52
-msgid "Message-ID"
-msgstr ""
-
-#: src/prefs_filtering_action.c:1086 src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1884 src/quote_fmt.c:50
-msgid "Newsgroups"
-msgstr "新闻组"
-
-#: src/prefs_filtering_action.c:1087 src/prefs_matcher.c:161
-#: src/prefs_matcher.c:1885 src/quote_fmt.c:51
-msgid "References"
-msgstr "引用"
-
-#: src/prefs_filtering_action.c:1088 src/prefs_matcher.c:1886
+#: src/prefs_filtering_action.c:1199 src/prefs_matcher.c:1992
msgid "filename (should not be modified)"
msgstr "文件名(请勿更动)"
-#: src/prefs_filtering_action.c:1089 src/prefs_matcher.c:1887
+#: src/prefs_filtering_action.c:1200 src/prefs_matcher.c:1993
+#: src/quote_fmt.c:84
msgid "new line"
msgstr "新行"
-#: src/prefs_filtering_action.c:1090 src/prefs_matcher.c:1888
+#: src/prefs_filtering_action.c:1201 src/prefs_matcher.c:1994
msgid "escape character for quotes"
msgstr "引文逃逸字符"
-#: src/prefs_filtering_action.c:1091 src/prefs_matcher.c:1889
+#: src/prefs_filtering_action.c:1202 src/prefs_matcher.c:1995
msgid "quote character"
msgstr "引文字符"
-#: src/prefs_filtering_action.c:1099
+#: src/prefs_filtering_action.c:1210
msgid "Filtering Action: 'Execute'"
msgstr "过滤动作: '执行'"
-#: src/prefs_filtering_action.c:1100
+#: src/prefs_filtering_action.c:1211
msgid ""
"'Execute' allows you to send a message or message element to an external "
"program or script.\n"
-"\n"
"The following symbols can be used:"
msgstr ""
"'执行'这一功能使得用户可以将邮件内容或者其中一部分信息传递给外部程序或者脚"
"本。\n"
-"\n"
"可以使用以下符号: "
-#: src/prefs_filtering_action.c:1408
+#: src/prefs_filtering_action.c:1347
+msgid "Recipient"
+msgstr "回执"
+
+#: src/prefs_filtering_action.c:1351
+msgid "Book/Folder"
+msgstr "地址簿/目录"
+
+#: src/prefs_filtering_action.c:1355
+msgid "Destination"
+msgstr "目的地"
+
+#: src/prefs_filtering_action.c:1358
+msgid "Color"
+msgstr "颜色"
+
+#: src/prefs_filtering_action.c:1442
msgid "Current action list"
msgstr "当前动作列表"
-#: src/prefs_filtering.c:188 src/prefs_filtering.c:339
+#: src/prefs_filtering.c:190 src/prefs_filtering.c:353
msgid "Filtering/Processing configuration"
msgstr "过滤/处理 配置"
-#: src/prefs_filtering.c:250 src/prefs_filtering.c:781
-#: src/prefs_filtering.c:872
+#: src/prefs_filtering.c:257 src/prefs_filtering.c:927
+#: src/prefs_filtering.c:1018
msgid "Filtering Account Menu|All"
msgstr "全部"
-#: src/prefs_filtering.c:391
+#: src/prefs_filtering.c:405
msgid "Condition"
msgstr "条件"
-#: src/prefs_filtering.c:404 src/prefs_filtering.c:426
+#: src/prefs_filtering.c:418 src/prefs_filtering.c:440
msgid " Define... "
msgstr "定义... "
-#: src/prefs_filtering.c:928 src/prefs_filtering.c:1014
+#: src/prefs_filtering.c:469
+msgid "Append the new rule above to the list"
+msgstr "将上面定义的新规则添加到列表"
+
+#: src/prefs_filtering.c:478
+msgid "Replace the selected rule in list with the rule above"
+msgstr "将选中的规则采用上面定义的替换"
+
+#: src/prefs_filtering.c:486
+msgid "Delete the selected rule from the list"
+msgstr "从列表中删除选中项"
+
+#: src/prefs_filtering.c:523
+msgid "Move the selected rule to the top"
+msgstr "将选中的项移到顶部"
+
+#: src/prefs_filtering.c:526
+msgid "Page up"
+msgstr "上一页"
+
+#: src/prefs_filtering.c:534
+msgid "Move the selected rule one page up"
+msgstr "将选中项上移一页"
+
+#: src/prefs_filtering.c:543
+msgid "Move the selected rule up"
+msgstr "将选中项上移"
+
+#: src/prefs_filtering.c:551
+msgid "Move the selected rule down"
+msgstr "将选中项下移"
+
+#: src/prefs_filtering.c:554
+msgid "Page down"
+msgstr "下一页"
+
+#: src/prefs_filtering.c:562
+msgid "Move the selected rule one page down"
+msgstr "将选中项下移一页"
+
+#: src/prefs_filtering.c:571
+msgid "Move the selected rule to the bottom"
+msgstr "将选中项移动到底部"
+
+#: src/prefs_filtering.c:1074 src/prefs_filtering.c:1160
msgid "Condition string is not valid."
msgstr "无效的条件字符串。"
-#: src/prefs_filtering.c:964 src/prefs_filtering.c:1022
+#: src/prefs_filtering.c:1110 src/prefs_filtering.c:1168
msgid "Action string is not valid."
msgstr "无效的动作。"
-#: src/prefs_filtering.c:1001
+#: src/prefs_filtering.c:1147
msgid "Condition string is empty."
msgstr "条件字符串为空。"
-#: src/prefs_filtering.c:1007
+#: src/prefs_filtering.c:1153
msgid "Action string is empty."
msgstr "文件 %s 不存在。"
-#: src/prefs_filtering.c:1091
+#: src/prefs_filtering.c:1239
msgid "Delete rule"
msgstr "删除规则"
-#: src/prefs_filtering.c:1092
+#: src/prefs_filtering.c:1240
msgid "Do you really want to delete this rule?"
msgstr "确定删除这项规则？"
-#: src/prefs_filtering.c:1469
+#: src/prefs_filtering.c:1258
+msgid "Delete all rules"
+msgstr "删除所有规则"
+
+#: src/prefs_filtering.c:1259
+msgid "Do you really want to delete all the rules?"
+msgstr "确定删除所有规则？"
+
+#: src/prefs_filtering.c:1512
+msgid "Filtering rules not saved"
+msgstr "过滤规则没有保存"
+
+#: src/prefs_filtering.c:1513
+msgid "The list of filtering rules have been modified. Close anyway?"
+msgstr "过滤规则列表已经修改，是否关闭窗口?"
+
+#: src/prefs_filtering.c:1733
+msgid "/---"
+msgstr ""
+
+#: src/prefs_filtering.c:1734
+msgid "/Move one page up"
+msgstr "/上移一页"
+
+#: src/prefs_filtering.c:1735
+msgid "/Move one page down"
+msgstr "/下移一页"
+
+#: src/prefs_filtering.c:1872
msgid "Enable"
msgstr "启用"
-#: src/prefs_filtering.c:1501
-msgid "Rule"
-msgstr "规则"
-
-#: src/prefs_folder_column.c:205
+#: src/prefs_folder_column.c:214
msgid "Folder list columns configuration"
-msgstr "文件夹栏目设置"
+msgstr "目录栏目设置"
-#: src/prefs_folder_column.c:222
+#: src/prefs_folder_column.c:231
msgid ""
"Select columns to be displayed in the folder list. You can modify\n"
"the order by using the Up / Down buttons or by dragging the items."
msgstr ""
-"请选择要在文件夹列表窗口要显示的字段列。\n"
+"请选择要在目录列表窗口要显示的字段列。\n"
"你可以用 上移/下移 按钮或者直接拖曳来调整顺序。"
-#: src/prefs_folder_column.c:251 src/prefs_summary_column.c:265
+#: src/prefs_folder_column.c:260 src/prefs_summary_column.c:275
msgid "Hidden columns"
msgstr "隐藏列"
-#: src/prefs_folder_column.c:280 src/prefs_summaries.c:377
-#: src/prefs_summaries.c:519 src/prefs_summary_column.c:294
+#: src/prefs_folder_column.c:292 src/prefs_summaries.c:408
+#: src/prefs_summaries.c:539 src/prefs_summary_column.c:307
msgid "Displayed columns"
msgstr "显示列"
-#: src/prefs_folder_column.c:316 src/prefs_msg_colors.c:497
-#: src/prefs_summary_column.c:330 src/prefs_toolbar.c:800
+#: src/prefs_folder_column.c:331 src/prefs_msg_colors.c:500
+#: src/prefs_summary_column.c:346 src/prefs_toolbar.c:917
msgid " Use default "
msgstr "使用缺省值"
-#: src/prefs_folder_item.c:202 src/prefs_folder_item.c:649
+#: src/prefs_folder_item.c:248 src/prefs_folder_item.c:781
msgid ""
"<i>These preferences will not be saved as this folder is a top-level one. "
"However you can use them to set them to the whole mailbox tree using \"Apply "
"to subfolders\".</i>"
msgstr ""
-"<i>这些设置不会保存，因为当前文件夹是一个顶级目录。但你可以点击\"应用到子文件"
-"夹\"按钮，将这些设置保存到当前邮箱的所有子文件夹中去。</i>"
+"<i>这些设置不会保存，因为当前目录是一个顶级目录。但你可以点击\"应用到子文件夹"
+"\"按钮，将这些设置保存到当前邮箱的所有子目录中去。</i>"
-#: src/prefs_folder_item.c:214 src/prefs_folder_item.c:661
+#: src/prefs_folder_item.c:260 src/prefs_folder_item.c:793
msgid ""
"Apply to\n"
"subfolders"
msgstr ""
"应用于\n"
-"子文件夹"
+"子目录"
-#: src/prefs_folder_item.c:238
+#: src/prefs_folder_item.c:285
msgid "Normal"
msgstr "普通"
-#: src/prefs_folder_item.c:240
+#: src/prefs_folder_item.c:287
msgid "Outbox"
msgstr "发信夹"
-#: src/prefs_folder_item.c:257
+#: src/prefs_folder_item.c:303
msgid "Folder type"
-msgstr "文件夹类型"
+msgstr "目录类型"
-#: src/prefs_folder_item.c:269
+#: src/prefs_folder_item.c:315
msgid "Simplify Subject RegExp"
msgstr "简化邮件标题的正则表达式"
-#: src/prefs_folder_item.c:295
+#: src/prefs_folder_item.c:341
msgid "Test RegExp"
msgstr "测试正则表达式"
-#: src/prefs_folder_item.c:327
+#: src/prefs_folder_item.c:373
msgid "Folder chmod"
-msgstr "修改文件夹权限: "
+msgstr "修改目录权限: "
-#: src/prefs_folder_item.c:353
+#: src/prefs_folder_item.c:399
msgid "Folder color"
-msgstr "文件夹颜色"
+msgstr "目录颜色"
-#: src/prefs_folder_item.c:367 src/prefs_folder_item.c:1048
+#: src/prefs_folder_item.c:412 src/prefs_folder_item.c:1376
msgid "Pick color for folder"
-msgstr "选文件夹的颜色"
+msgstr "选目录的颜色"
+
+#: src/prefs_folder_item.c:430
+msgid "Run Processing rules at start-up"
+msgstr "启动时运行处理规则"
-#: src/prefs_folder_item.c:384
-msgid "Process at start-up"
-msgstr "启动时处理"
+#: src/prefs_folder_item.c:445
+msgid "Run Processing rules when opening"
+msgstr "打开时运行处理规则"
-#: src/prefs_folder_item.c:398
+#: src/prefs_folder_item.c:459
msgid "Scan for new mail"
msgstr "检查新邮件"
-#: src/prefs_folder_item.c:411
-msgid "Synchronise for offline use"
-msgstr "同步数据以便离线使用"
+#: src/prefs_folder_item.c:461
+msgid ""
+"Turn this option on if mail is delivered directly to this folder by server "
+"side filtering on IMAP or by an external application"
+msgstr ""
+"如果IMAP的服务器端过滤程序或者其它应用程序会将邮件直接存放到邮件目录下，应该"
+"打开此选项"
+
+#: src/prefs_folder_item.c:476
+msgid "Synchronise for offline use"
+msgstr "同步数据以便离线使用"
+
+#: src/prefs_folder_item.c:497
+msgid "Fetch message bodies from the last"
+msgstr "提取邮件内容时从最后的邮件开始"
+
+#: src/prefs_folder_item.c:504
+msgid "0: all bodies"
+msgstr ""
+
+#: src/prefs_folder_item.c:512
+msgid "Remove older messages bodies"
+msgstr "删除旧的邮件主体内容"
+
+#: src/prefs_folder_item.c:529
+msgid "Discard folder cache"
+msgstr "摈弃邮件夹缓存"
-#: src/prefs_folder_item.c:670
+#: src/prefs_folder_item.c:802
msgid "Request Return Receipt"
msgstr "请求回执"
-#: src/prefs_folder_item.c:685
+#: src/prefs_folder_item.c:817
msgid "Save copy of outgoing messages to this folder instead of Sent"
-msgstr "将发出的邮件保存一份复制到此文件夹"
+msgstr "将发出的邮件保存一份复制到此目录"
-#: src/prefs_folder_item.c:698
+#: src/prefs_folder_item.c:830
msgid "Default To:"
msgstr "新邮件缺省收件人:"
-#: src/prefs_folder_item.c:719
+#: src/prefs_folder_item.c:851
msgid "Default To: for replies"
msgstr "回复邮件缺省收件人:"
-#: src/prefs_folder_item.c:1156
+#: src/prefs_folder_item.c:872
+msgid "Default account"
+msgstr "缺省帐号"
+
+#: src/prefs_folder_item.c:1389
+msgid "Discard cache"
+msgstr "摈弃缓存"
+
+#: src/prefs_folder_item.c:1390
+msgid "Do you really want to discard the local cached data for this folder?"
+msgstr "确定要删除此邮件夹的本地缓存？"
+
+#: src/prefs_folder_item.c:1392
+msgid "+Discard"
+msgstr "+摈弃"
+
+#: src/prefs_folder_item.c:1512
msgid "General"
msgstr "一般"
-#: src/prefs_folder_item.c:1201
+#: src/prefs_folder_item.c:1576
#, c-format
msgid "Properties for folder %s"
-msgstr "%s - 文件夹设置"
+msgstr "%s - 目录设置"
-#: src/prefs_fonts.c:74
+#: src/prefs_fonts.c:82
msgid "Folder and Message Lists"
-msgstr "文件夹和邮件列表"
+msgstr "目录和邮件摘要列表"
-#: src/prefs_fonts.c:91
+#: src/prefs_fonts.c:102 src/prefs_matcher.c:1862
msgid "Message"
msgstr "邮件"
-#: src/prefs_fonts.c:110
+#: src/prefs_fonts.c:129
+msgid "Derive small and bold fonts from Folder and Message Lists font"
+msgstr "继承目录和邮件摘要列表字体"
+
+#: src/prefs_fonts.c:139
+msgid "Small"
+msgstr "小字体"
+
+#: src/prefs_fonts.c:161
+msgid "Bold"
+msgstr "粗体"
+
+#: src/prefs_fonts.c:184
msgid "Use different font for printing"
msgstr "以不同的字体打印"
-#: src/prefs_fonts.c:119
+#: src/prefs_fonts.c:194
msgid "Message Printing"
msgstr "打印"
-#: src/prefs_fonts.c:197 src/prefs_msg_colors.c:834 src/prefs_summaries.c:648
-#: src/prefs_themes.c:361
+#: src/prefs_fonts.c:277 src/prefs_msg_colors.c:838 src/prefs_summaries.c:669
+#: src/prefs_themes.c:362
msgid "Display"
msgstr "显示"
-#: src/prefs_fonts.c:198
+#: src/prefs_fonts.c:278
msgid "Fonts"
msgstr "字体"
-#: src/prefs_gtk.c:908
+#: src/prefs_gtk.c:938
msgid "Preferences"
msgstr "偏好设置"
-#: src/prefs_image_viewer.c:67
+#: src/prefs_image_viewer.c:69
msgid "Automatically display attached images"
msgstr "自动显示邮件中的图片"
-#: src/prefs_image_viewer.c:75
+#: src/prefs_image_viewer.c:77
msgid "Resize attached images by default"
msgstr "缺省将缩放附件里的图片"
-#: src/prefs_image_viewer.c:78
+#: src/prefs_image_viewer.c:80
msgid "Clicking image toggles scaling"
msgstr "点击图片切换缩放状态"
-#: src/prefs_image_viewer.c:84
+#: src/prefs_image_viewer.c:86
msgid "Display images inline"
msgstr "嵌入显示图片"
-#: src/prefs_image_viewer.c:129
+#: src/prefs_image_viewer.c:92
+msgid "Print images"
+msgstr "打印图片"
+
+#: src/prefs_image_viewer.c:144
msgid "Image Viewer"
msgstr "图片查看器"
-#: src/prefs_matcher.c:159
-msgid "All messages"
-msgstr "所有邮件"
+#: src/prefs_logging.c:146 src/prefs_logging.c:261
+msgid "Restrict the log window to"
+msgstr "限制日志窗口信息行数: "
-#: src/prefs_matcher.c:160
-msgid "To or Cc"
-msgstr ""
+#: src/prefs_logging.c:160 src/prefs_logging.c:275
+msgid "0 to stop logging in the log window"
+msgstr "0 表示禁止往日志窗口写信息"
-#: src/prefs_matcher.c:161
-msgid "In reply to"
-msgstr "回复"
+#: src/prefs_logging.c:163 src/prefs_logging.c:278
+msgid "lines"
+msgstr "行"
+
+#: src/prefs_logging.c:172
+msgid "Filtering/processing log"
+msgstr "过滤/过滤日志"
+
+#: src/prefs_logging.c:175
+msgid "Enable logging of filtering/processing rules"
+msgstr "开启过滤/处理的日志功能"
+
+#: src/prefs_logging.c:183
+msgid ""
+"If checked, turns on logging of filtering and processing rules.\n"
+"The log is accessible from 'Tools/Filtering log'.\n"
+"Caution: enabling this option will slow down the filtering/processing, this "
+"might be critical when applying many rules upon thousands of messages."
+msgstr ""
+"如果选中此项，邮件过滤和处理规则的日志功能将打开。\n"
+"您可以通过菜单'工具/过滤日志'访问此日志。\n"
+"注意: 打开此功能将降低过滤速度。当您有上千封邮件，过滤规则又比较多时，影响会"
+"很明显"
+
+#: src/prefs_logging.c:191
+msgid "Log filtering/processing when..."
+msgstr "记录以下过滤/处理中的日志..."
+
+#: src/prefs_logging.c:195
+msgid "filtering at incorporation"
+msgstr "合并时也之星过滤"
-#: src/prefs_matcher.c:162
-msgid "Age greater than"
-msgstr "邮件年龄大于"
+#: src/prefs_logging.c:197
+msgid "pre-processing folders"
+msgstr "前处理"
-#: src/prefs_matcher.c:162
-msgid "Age lower than"
-msgstr "邮件年龄小于"
+#: src/prefs_logging.c:202
+msgid "manually filtering"
+msgstr "手工过滤"
-#: src/prefs_matcher.c:163
-msgid "Headers part"
-msgstr "信头"
+#: src/prefs_logging.c:204
+msgid "post-processing folders"
+msgstr "后处理"
-#: src/prefs_matcher.c:164
-msgid "Body part"
-msgstr "主体"
+#: src/prefs_logging.c:211
+msgid "processing folders"
+msgstr "邮件夹自动过滤"
-#: src/prefs_matcher.c:164
-msgid "Whole message"
-msgstr "完整邮件"
+#: src/prefs_logging.c:226
+msgid "Log level"
+msgstr "记录量"
+
+#: src/prefs_logging.c:235
+msgid "Low"
+msgstr "低"
-#: src/prefs_matcher.c:165
-msgid "Unread flag"
-msgstr "未读标记"
+#: src/prefs_logging.c:236
+msgid "Medium"
+msgstr "中"
-#: src/prefs_matcher.c:165
-msgid "New flag"
-msgstr "新邮件标记"
+#: src/prefs_logging.c:237
+msgid "High"
+msgstr "高"
-#: src/prefs_matcher.c:166
-msgid "Marked flag"
-msgstr "记号标记"
+#: src/prefs_logging.c:244
+msgid ""
+"Select the level of detail of the logging.\n"
+"Choose Low to see when rules are applied, which conditions match or don't "
+"match and what actions are performed.\n"
+"Choose Medium to see more details about the message that is being processed, "
+"and why rules are skipped.\n"
+"Choose High to explicitly show the reason why all rules are processed or "
+"skipped, and why all conditions are matched or not matched.\n"
+"Caution: the higher the level, the greater the impact on performance."
+msgstr ""
+"请选择日志详细程度级别。\n"
+"低: 主要记录过滤条件是否匹配、执行了哪些动作。\n"
+"中: 记录邮件处理过程的详细信息，以及为什么某个规则会被跳过。\n"
+"高: 会记录所有的处理过程日志信息，包含每一步的解释。\n"
+"注意选择高的级别时，性能方面受到的影响也越大。"
-#: src/prefs_matcher.c:166
-msgid "Deleted flag"
-msgstr "已删除标记"
+#: src/prefs_logging.c:290
+msgid "Disk log"
+msgstr "日志文件"
-#: src/prefs_matcher.c:167
-msgid "Replied flag"
-msgstr "å·²å\9b\9eå¤\8dæ \87è®°"
+#: src/prefs_logging.c:292
+msgid "Write the following information to disk..."
+msgstr "å°\86以ä¸\8bä¿¡æ\81¯å\86\99å\85¥ç£\81ç\9b\98..."
-#: src/prefs_matcher.c:167
-msgid "Forwarded flag"
-msgstr "已转发标记"
+#: src/prefs_logging.c:300
+msgid "Warning messages"
+msgstr "警告信息"
-#: src/prefs_matcher.c:168
-msgid "Locked flag"
-msgstr "已锁定标记"
+#: src/prefs_logging.c:301
+msgid "Network protocol messages"
+msgstr "网络协议信息"
-#: src/prefs_matcher.c:169
-msgid "Spam flag"
-msgstr "垃圾邮件标识"
+#: src/prefs_logging.c:305
+msgid "Error messages"
+msgstr "错误信息"
-#: src/prefs_matcher.c:170
-msgid "Color label"
-msgstr "颜色标签"
+#: src/prefs_logging.c:306
+msgid "Status messages for filtering/processing log"
+msgstr "过滤/过滤日志的状态信息"
-#: src/prefs_matcher.c:171
-msgid "Ignored thread"
-msgstr "忽略讨论线索"
+#: src/prefs_logging.c:429
+msgid "Logging"
+msgstr "日志"
-#: src/prefs_matcher.c:172
-msgid "Score greater than"
-msgstr "积分大于"
+#: src/prefs_matcher.c:307
+msgid "more than"
+msgstr "多于"
-#: src/prefs_matcher.c:172
-msgid "Score lower than"
-msgstr "积分少于"
+#: src/prefs_matcher.c:308
+msgid "less than"
+msgstr "少于"
-#: src/prefs_matcher.c:173
-msgid "Score equal to"
-msgstr "积分等于"
+#: src/prefs_matcher.c:313
+msgid "weeks"
+msgstr "周"
-#: src/prefs_matcher.c:174
-msgid "Test"
-msgstr "测试"
+#: src/prefs_matcher.c:317
+msgid "higher than"
+msgstr "高于"
-#: src/prefs_matcher.c:175
-msgid "Size greater than"
-msgstr "尺寸大于"
+#: src/prefs_matcher.c:318
+msgid "lower than"
+msgstr "低于"
-#: src/prefs_matcher.c:176
-msgid "Size smaller than"
-msgstr "尺寸小于"
+#: src/prefs_matcher.c:319 src/prefs_matcher.c:325
+msgid "exactly"
+msgstr ""
-#: src/prefs_matcher.c:177
-msgid "Size exactly"
-msgstr "尺寸ç\89于"
+#: src/prefs_matcher.c:323
+msgid "greater than"
+msgstr "大于"
-#: src/prefs_matcher.c:178
-msgid "Partially downloaded"
-msgstr "仅部分下载"
+#: src/prefs_matcher.c:324
+msgid "smaller than"
+msgstr "小于"
-#: src/prefs_matcher.c:179
-msgid "Found in addressbook"
-msgstr "å·²å\9c¨å\9c°å\9d\80ç°¿ä¸æ\89¾å\88°"
+#: src/prefs_matcher.c:329
+msgid "bytes"
+msgstr "å\97è\8a\82æ\95°"
-#: src/prefs_matcher.c:196
-msgid "or"
-msgstr "或"
+#: src/prefs_matcher.c:330
+msgid "kilobytes"
+msgstr "千字节数"
-#: src/prefs_matcher.c:196
-msgid "and"
-msgstr "与"
+#: src/prefs_matcher.c:331
+msgid "megabytes"
+msgstr "兆字节数"
-#: src/prefs_matcher.c:213
+#: src/prefs_matcher.c:335
msgid "contains"
msgstr "包含"
-#: src/prefs_matcher.c:213
-msgid "does not contain"
+#: src/prefs_matcher.c:336
+msgid "doesn't contain"
msgstr "不包含"
-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:358
+msgid "headers part"
+msgstr "信头部分"
+
+#: src/prefs_matcher.c:359
+msgid "body part"
+msgstr "内容部分"
+
+#: src/prefs_matcher.c:360
+msgid "whole message"
+msgstr "整个邮件"
+
+#: src/prefs_matcher.c:366 src/summaryview.c:5778
+msgid "Marked"
+msgstr "已标记的"
+
+#: src/prefs_matcher.c:367 src/summaryview.c:5776
+msgid "Deleted"
+msgstr "已删除的"
+
+#: src/prefs_matcher.c:368
+msgid "Replied"
+msgstr "已回复"
+
+#: src/prefs_matcher.c:369 src/summaryview.c:5770
+msgid "Forwarded"
+msgstr "已转发"
+
+#: src/prefs_matcher.c:371 src/summaryview.c:5762 src/toolbar.c:429
+#: src/toolbar.c:923 src/toolbar.c:1903
+msgid "Spam"
+msgstr "垃圾邮件"
+
+#: src/prefs_matcher.c:375
+msgid "set"
+msgstr "已经设置"
+
+#: src/prefs_matcher.c:376
+msgid "not set"
+msgstr "尚未设置"
+
+#: src/prefs_matcher.c:380
msgid "yes"
msgstr "是"
-#: src/prefs_matcher.c:237
+#: src/prefs_matcher.c:381
msgid "no"
-msgstr "不"
+msgstr "否"
+
+#: src/prefs_matcher.c:385
+msgid "Any tags"
+msgstr "任何标签"
+
+#: src/prefs_matcher.c:386
+msgid "Specific tag"
+msgstr "指定标签"
+
+#: src/prefs_matcher.c:390
+msgid "ignored"
+msgstr "已忽略的"
+
+#: src/prefs_matcher.c:391
+msgid "not ignored"
+msgstr "未被忽略的"
+
+#: src/prefs_matcher.c:392
+msgid "watched"
+msgstr "已被监视的"
+
+#: src/prefs_matcher.c:393
+msgid "not watched"
+msgstr "未被监视的"
+
+#: src/prefs_matcher.c:397
+msgid "found"
+msgstr ""
+
+#: src/prefs_matcher.c:398
+msgid "not found"
+msgstr ""
+
+#: src/prefs_matcher.c:402
+msgid "0 (Passed)"
+msgstr "0 (通过的)"
-#: src/prefs_matcher.c:434
+#: src/prefs_matcher.c:403
+msgid "non-0 (Failed)"
+msgstr "非0 (失败的)"
+
+#: src/prefs_matcher.c:534
msgid "Condition configuration"
msgstr "条件设置"
-#: src/prefs_matcher.c:461
-msgid "Match type"
-msgstr "匹配类型"
+#: src/prefs_matcher.c:578
+msgid "Match criteria:"
+msgstr "匹配条件:"
+
+#: src/prefs_matcher.c:584
+msgid "All messages"
+msgstr "所有信息"
+
+#: src/prefs_matcher.c:585
+msgid "Age"
+msgstr "年龄"
+
+#: src/prefs_matcher.c:585
+msgid "Phrase"
+msgstr "密码"
+
+#: src/prefs_matcher.c:585
+msgid "Flags"
+msgstr "标记"
+
+#: src/prefs_matcher.c:586 src/prefs_msg_colors.c:413
+msgid "Color labels"
+msgstr "颜色标签"
-#: src/prefs_matcher.c:514
-msgid "Address header"
-msgstr "地址信头"
+#: src/prefs_matcher.c:586
+msgid "Thread"
+msgstr "讨论线索"
-#: src/prefs_matcher.c:546
-msgid "Book/folder"
-msgstr "地址簿/文件夹"
+#: src/prefs_matcher.c:588
+msgid "Partially downloaded"
+msgstr "仅部分下载"
-#: src/prefs_matcher.c:601
-msgid "Predicate"
-msgstr "谓词"
+#: src/prefs_matcher.c:590
+msgid "External program test"
+msgstr "外部程序测试"
-#: src/prefs_matcher.c:652
+#: src/prefs_matcher.c:684
msgid "Use regexp"
msgstr "使用正则表达式"
-#: src/prefs_matcher.c:690
-msgid "Boolean Op"
-msgstr "逻辑操作符"
+#: src/prefs_matcher.c:760
+msgid "Message must match"
+msgstr "邮件必须匹配"
+
+#: src/prefs_matcher.c:764
+msgid "at least one"
+msgstr "至少一个"
+
+#: src/prefs_matcher.c:765
+msgid "all"
+msgstr "全部"
+
+#: src/prefs_matcher.c:768
+msgid "of above rules"
+msgstr "上述规则"
+
+#: src/prefs_matcher.c:1383 src/prefs_matcher.c:1441
+msgid "Search pattern is not set."
+msgstr "搜索条件尚未设置。"
-#: src/prefs_matcher.c:1305
-msgid "Value is not set."
-msgstr "尚未赋值"
+#: src/prefs_matcher.c:1392
+msgid "Test command is not set."
+msgstr "未指定测试命令。"
-#: src/prefs_matcher.c:1341
+#: src/prefs_matcher.c:1458
msgid "all addresses in all headers"
msgstr "所有信头中的所有地址"
-#: src/prefs_matcher.c:1344
+#: src/prefs_matcher.c:1461
msgid "any address in any header"
msgstr "任意信头中的任意地址"
-#: src/prefs_matcher.c:1346
+#: src/prefs_matcher.c:1463
#, c-format
msgid "the address(es) in header '%s'"
msgstr "信头'%s'中的地址"
-#: src/prefs_matcher.c:1347
+#: src/prefs_matcher.c:1464
#, c-format
msgid ""
"Book/folder path is not set.\n"
"If you want to match %s against the whole address book, you have to select "
"'Any' from the book/folder drop-down list."
msgstr ""
-"未设置对应地址簿/文件夹。\n"
+"未设置对应地址簿/目录。\n"
"\n"
-"如果你对整个地址簿匹配%s, 请在地址簿/文件夹下拉列表中选择'任意'"
+"如果你对整个地址簿匹配%s, 请在地址簿/目录下拉列表中选择'任意'"
+
+#: src/prefs_matcher.c:1677
+msgid "Headers part"
+msgstr "信头"
+
+#: src/prefs_matcher.c:1681
+msgid "Body part"
+msgstr "主体"
+
+#: src/prefs_matcher.c:1685
+msgid "Whole message"
+msgstr "完整邮件"
+
+#: src/prefs_matcher.c:1796 src/prefs_matcher.c:1835
+#, fuzzy
+msgid "in"
+msgstr "粉红"
+
+#: src/prefs_matcher.c:1798
+msgid "content is"
+msgstr "内容为"
+
+#: src/prefs_matcher.c:1806
+msgid "Age is"
+msgstr ""
+
+#: src/prefs_matcher.c:1811
+msgid "Flag"
+msgstr ""
+
+#: src/prefs_matcher.c:1812 src/prefs_matcher.c:1826
+msgid "is"
+msgstr ""
+
+#: src/prefs_matcher.c:1817
+msgid "Name:"
+msgstr "名称:"
+
+#: src/prefs_matcher.c:1825
+msgid "Label"
+msgstr "标签"
+
+#: src/prefs_matcher.c:1830
+msgid "Value:"
+msgstr "值:"
+
+#: src/prefs_matcher.c:1845
+msgid "Score is"
+msgstr "得分"
+
+#: src/prefs_matcher.c:1846
+#, fuzzy
+msgid "points"
+msgstr "字体"
+
+#: src/prefs_matcher.c:1856
+#, fuzzy
+msgid "Size is"
+msgstr "大小"
-#: src/prefs_matcher.c:1835
+#: src/prefs_matcher.c:1861
+#, fuzzy
+msgid "Scope:"
+msgstr "得分"
+
+#: src/prefs_matcher.c:1863
+#, fuzzy
+msgid "tags"
+msgstr "标签"
+
+#: src/prefs_matcher.c:1868
+#, fuzzy
+msgid "type is"
+msgstr "是"
+
+#: src/prefs_matcher.c:1872
+msgid "Program returns"
+msgstr "程序返回"
+
+#: src/prefs_matcher.c:1941
msgid ""
"The entry was not saved.\n"
"Close anyway?"
"该项未保存，\n"
"确实关闭？"
-#: src/prefs_matcher.c:1897
+#: src/prefs_matcher.c:2003
msgid "Match Type: 'Test'"
msgstr "匹配类型: 'Test'"
-#: src/prefs_matcher.c:1898
+#: src/prefs_matcher.c:2004
msgid ""
"'Test' allows you to test a message or message element using an external "
"program or script. The program will return either 0 or 1.\n"
"\n"
"可以使用如下一些符号:"
-#: src/prefs_matcher.c:1992
+#: src/prefs_matcher.c:2101
msgid "Current condition rules"
msgstr "当前条件规则"
msgid "Text Options"
msgstr "文本选项"
-#: src/prefs_msg_colors.c:143
+#: src/prefs_msg_colors.c:147
msgid "Message view"
msgstr "邮件视图"
-#: src/prefs_msg_colors.c:158
+#: src/prefs_msg_colors.c:154
msgid "Enable coloration of message text"
msgstr "彩色显示邮件内容"
-#: src/prefs_msg_colors.c:160
+#: src/prefs_msg_colors.c:164
msgid "Quote"
msgstr "引文"
-#: src/prefs_msg_colors.c:171
+#: src/prefs_msg_colors.c:176
msgid "Cycle quote colors"
msgstr "循环使用引文颜色"
-#: src/prefs_msg_colors.c:175
+#: src/prefs_msg_colors.c:180
msgid "If there are more than 3 quote levels, the colors will be reused"
msgstr "如果多余三层，则重用这些颜色"
-#: src/prefs_msg_colors.c:182
+#: src/prefs_msg_colors.c:187
msgid "1st Level"
msgstr "第一层"
-#: src/prefs_msg_colors.c:188 src/prefs_msg_colors.c:214
-#: src/prefs_msg_colors.c:240
+#: src/prefs_msg_colors.c:193 src/prefs_msg_colors.c:219
+#: src/prefs_msg_colors.c:245
msgid "Text"
msgstr "文字"
-#: src/prefs_msg_colors.c:202
+#: src/prefs_msg_colors.c:207
msgid "Tooltip|Pick color for 1st level text"
msgstr "选择第一层引文颜色"
-#: src/prefs_msg_colors.c:208
+#: src/prefs_msg_colors.c:213
msgid "2nd Level"
msgstr "第二层"
-#: src/prefs_msg_colors.c:228
+#: src/prefs_msg_colors.c:233
msgid "Tooltip|Pick color for 2nd level text"
msgstr "选择第二层引文颜色"
-#: src/prefs_msg_colors.c:234
+#: src/prefs_msg_colors.c:239
msgid "3rd Level"
msgstr "第三层"
-#: src/prefs_msg_colors.c:254
+#: src/prefs_msg_colors.c:259
msgid "Tooltip|Pick color for 3rd level text"
msgstr "选择第三层引文颜色"
-#: src/prefs_msg_colors.c:261
+#: src/prefs_msg_colors.c:266
msgid "Enable coloration of text background"
msgstr "允许彩色背景"
-#: src/prefs_msg_colors.c:277
+#: src/prefs_msg_colors.c:282
msgid "Tooltip|Pick color for 1st level text background"
msgstr "选择第一层引文的背景色"
-#: src/prefs_msg_colors.c:279 src/prefs_msg_colors.c:300
-#: src/prefs_msg_colors.c:321
+#: src/prefs_msg_colors.c:284 src/prefs_msg_colors.c:305
+#: src/prefs_msg_colors.c:326
msgid "Background"
msgstr "背景色"
-#: src/prefs_msg_colors.c:298
+#: src/prefs_msg_colors.c:303
msgid "Tooltip|Pick color for 2nd level text background"
msgstr "选择第二层引文的背景色"
-#: src/prefs_msg_colors.c:319
+#: src/prefs_msg_colors.c:324
msgid "Tooltip|Pick color for 3rd level text background"
msgstr "选择第三层引文的背景色"
-#: src/prefs_msg_colors.c:339
+#: src/prefs_msg_colors.c:344
msgid "Tooltip|Pick color for links"
msgstr "选择超级链接的颜色"
-#: src/prefs_msg_colors.c:341
+#: src/prefs_msg_colors.c:346
msgid "URI link"
msgstr "URI 链接"
-#: src/prefs_msg_colors.c:358
+#: src/prefs_msg_colors.c:363
msgid "Tooltip|Pick color for signatures"
msgstr "选择签名的颜色"
-#: src/prefs_msg_colors.c:360
+#: src/prefs_msg_colors.c:365
msgid "Signatures"
msgstr "签名"
-#: src/prefs_msg_colors.c:365 src/prefs_summaries.c:345
+#: src/prefs_msg_colors.c:370 src/prefs_summaries.c:356
msgid "Folder list"
-msgstr "文件夹列表"
+msgstr "目录列表"
-#: src/prefs_msg_colors.c:378
+#: src/prefs_msg_colors.c:383
msgid ""
"Pick color for Target folder. Target folder is used when the option 'Execute "
"immediately when moving or deleting messages' is turned off"
-msgstr "选择目标文件夹的颜色。当'移动或删除邮件时立即执行'选项关闭时有效。"
+msgstr "选择目标目录的颜色。当'移动或删除邮件时立即执行'选项关闭时有效。"
-#: src/prefs_msg_colors.c:382
+#: src/prefs_msg_colors.c:387
msgid "Target folder"
-msgstr "目标文件夹"
+msgstr "目标目录"
-#: src/prefs_msg_colors.c:397
+#: src/prefs_msg_colors.c:402
msgid "Pick color for folders containing new messages"
-msgstr "选择有新邮件的文件夹颜色"
+msgstr "选择有新邮件的目录颜色"
-#: src/prefs_msg_colors.c:399
+#: src/prefs_msg_colors.c:404
msgid "Folder containing new messages"
-msgstr "有新邮件的文件夹"
-
-#: src/prefs_msg_colors.c:405
-msgid "Color labels"
-msgstr "颜色标签"
+msgstr "有新邮件的目录"
#. TRANSLATORS: 'color %d' refers to the filtering/processing
#. rule name and should not be translated
-#: src/prefs_msg_colors.c:428 src/prefs_msg_colors.c:460
+#: src/prefs_msg_colors.c:431 src/prefs_msg_colors.c:463
#, c-format
msgid "Tooltip|Pick color for 'color %d'"
msgstr "选择颜色 'color %d'"
#. TRANSLATORS: 'color %d' refers to the filtering/processing
#. rule name and should not be translated
-#: src/prefs_msg_colors.c:432 src/prefs_msg_colors.c:464
+#: src/prefs_msg_colors.c:435 src/prefs_msg_colors.c:467
#, c-format
msgid "Set label for 'color %d'"
msgstr "设置'color %d'的文字"
#. TRANSLATORS: 'color %d' refers to the filtering/processing
#. rule name and should not be translated
-#: src/prefs_msg_colors.c:592
+#: src/prefs_msg_colors.c:596
#, c-format
msgid "Dialog title|Pick color for 'color %d'"
msgstr "选择颜色 'color %d'"
-#: src/prefs_msg_colors.c:600
+#: src/prefs_msg_colors.c:604
msgid "Dialog title|Pick color for 1st level text"
msgstr "选择第一层引文颜色"
-#: src/prefs_msg_colors.c:603
+#: src/prefs_msg_colors.c:607
msgid "Dialog title|Pick color for 2nd level text"
msgstr "选择第二层引文颜色"
-#: src/prefs_msg_colors.c:606
+#: src/prefs_msg_colors.c:610
msgid "Dialog title|Pick color for 3rd level text"
msgstr "选择第三层引文颜色"
-#: src/prefs_msg_colors.c:609
+#: src/prefs_msg_colors.c:613
msgid "Dialog title|Pick color for 1st level text background"
msgstr "选择第一层引文的背景色"
-#: src/prefs_msg_colors.c:612
+#: src/prefs_msg_colors.c:616
msgid "Dialog title|Pick color for 2nd level text background"
msgstr "选择第二层引文的背景色"
-#: src/prefs_msg_colors.c:615
+#: src/prefs_msg_colors.c:619
msgid "Dialog title|Pick color for 3rd level text background"
msgstr "选择第三层引文的背景色"
-#: src/prefs_msg_colors.c:618
+#: src/prefs_msg_colors.c:622
msgid "Dialog title|Pick color for links"
msgstr "选择超级链接颜色"
-#: src/prefs_msg_colors.c:621
+#: src/prefs_msg_colors.c:625
msgid "Dialog title|Pick color for target folder"
-msgstr "选择目标文件夹颜色"
+msgstr "选择目标目录颜色"
-#: src/prefs_msg_colors.c:624
+#: src/prefs_msg_colors.c:628
msgid "Dialog title|Pick color for signatures"
msgstr "选择签名的颜色"
-#: src/prefs_msg_colors.c:627
+#: src/prefs_msg_colors.c:631
msgid "Dialog title|Pick color for folder"
-msgstr "选择文件夹颜色"
+msgstr "选择目录颜色"
-#: src/prefs_msg_colors.c:835
+#: src/prefs_msg_colors.c:839
msgid "Colors"
msgstr "颜色"
msgid "Select preset:"
msgstr "选择预设值:"
-#: src/prefs_other.c:116 src/prefs_other.c:463
+#: src/prefs_other.c:114 src/prefs_other.c:460
msgid "Old Sylpheed"
msgstr "老 Sylpheed"
-#: src/prefs_other.c:124
+#: src/prefs_other.c:122
msgid ""
"You can also modify each menu shortcut by pressing\n"
"any key(s) when focusing the mouse pointer on the item."
"提示: 在鼠标移动到菜单项上面时，\n"
"你可以通过按键来修改该菜单项的快捷键。"
-#: src/prefs_other.c:528
+#: src/prefs_other.c:517
msgid "Add address to destination when double-clicked"
msgstr "双击时将地址添加为收信人"
-#: src/prefs_other.c:531
-msgid "Log Size"
-msgstr "日志大小"
-
-#: src/prefs_other.c:534
-msgid "Clip the log size"
-msgstr "限制日志文件大小"
-
-#: src/prefs_other.c:539
-msgid "Log window length"
-msgstr "日志窗口长度"
-
-#: src/prefs_other.c:556
-msgid "0 to stop logging in the log window"
-msgstr "0 表示禁止往日志窗口写信息"
-
-#: src/prefs_other.c:559
-msgid "lines"
-msgstr "行"
-
-#: src/prefs_other.c:568
+#: src/prefs_other.c:520
msgid "On exit"
msgstr "退出设置"
-#: src/prefs_other.c:571
+#: src/prefs_other.c:523
msgid "Confirm on exit"
msgstr "退出时确认"
-#: src/prefs_other.c:578
+#: src/prefs_other.c:530
msgid "Empty trash on exit"
-msgstr "é\80\80å\87ºæ\97¶æ¸\85空å\9e\83å\9c¾æ¡¶"
+msgstr "é\80\80å\87ºæ\97¶æ¸\85空åº\9f件夹"
-#: src/prefs_other.c:581
+#: src/prefs_other.c:533
msgid "Warn if there are queued messages"
msgstr "若有待发送的邮件则发出警告"
-#: src/prefs_other.c:583
+#: src/prefs_other.c:535
msgid "Keyboard shortcuts"
msgstr "键盘快捷键"
-#: src/prefs_other.c:586
+#: src/prefs_other.c:538
msgid "Enable customisable menu shortcuts"
msgstr "启用菜单项上的自定义快捷键功能"
-#: src/prefs_other.c:590
+#: src/prefs_other.c:542
msgid ""
"If checked, you can change the keyboard shortcuts of most of the menu items "
"by focusing on the menu item and pressing a key combination.\n"
"Uncheck this option if you want to lock all existing menu shortcuts."
msgstr ""
+"若选中此项，您可以直接设置菜单项的快捷键: 当焦点在菜单项上时，直接按下组合键"
+"即可。\n"
+"如果您想锁定当前已有的快捷键，可关闭此项。"
-#: src/prefs_other.c:597
+#: src/prefs_other.c:549
msgid " Set key bindings... "
msgstr " 设置键绑定... "
-#: src/prefs_other.c:610
+#: src/prefs_other.c:562
msgid "Socket I/O timeout"
msgstr "Socket I/O 超时时间"
-#: src/prefs_other.c:632
+#: src/prefs_other.c:584
msgid "Ask before emptying trash"
msgstr "清除前请求确认"
-#: src/prefs_other.c:634
+#: src/prefs_other.c:586
msgid "Ask about account specific filtering rules when filtering manually"
-msgstr ""
-
-#: src/prefs_quote.c:92
-msgid "Reply will quote by default"
-msgstr "回信时引用原文"
-
-#: src/prefs_quote.c:94
-msgid "Reply format"
-msgstr "回复格式"
-
-#: src/prefs_quote.c:109 src/prefs_quote.c:161
-msgid "Quotation mark"
-msgstr "引文符号"
-
-#: src/prefs_quote.c:146
-msgid "Forward format"
-msgstr "转发格式"
+msgstr "手工启动过滤时确认与帐号相关的过滤规则"
-#: src/prefs_quote.c:215
-msgid "Quotation characters"
-msgstr "引文标识"
-
-#: src/prefs_quote.c:230
-msgid "Treat these characters as quotation marks: "
-msgstr "将这些字符作为引文标识: "
-
-#: src/prefs_quote.c:312
-msgid "Quoting"
-msgstr "引用"
+#: src/prefs_other.c:589
+msgid "Synchronise offline folders as soon as possible"
+msgstr "尽可能地同步离线邮件夹"
-#: src/prefs_receive.c:121
+#: src/prefs_receive.c:136
msgid "External incorporation program"
-msgstr "用于合并邮件的外部程序"
+msgstr "外部合并程序"
-#: src/prefs_receive.c:124
+#: src/prefs_receive.c:139
msgid "Use external program for receiving mail"
msgstr "使用外部程序收取邮件"
-#: src/prefs_receive.c:131
+#: src/prefs_receive.c:146
msgid "Command"
msgstr "命令"
-#: src/prefs_receive.c:140
+#: src/prefs_receive.c:155
msgid "Automatic checking"
msgstr "自动检查"
-#: src/prefs_receive.c:147
+#: src/prefs_receive.c:162
msgid "Automatically check for new mail every"
-msgstr "自动检查新邮件"
+msgstr "自动检查新邮件, 每隔"
-#: src/prefs_receive.c:165
+#: src/prefs_receive.c:180
msgid "Check for new mail on start-up"
msgstr "启动时检查新邮件"
-#: src/prefs_receive.c:168
+#: src/prefs_receive.c:183
msgid "Dialogs"
msgstr "对话框"
-#: src/prefs_receive.c:170
+#: src/prefs_receive.c:185
msgid "Show receive dialog"
msgstr "显示收邮件进度对话框"
-#: src/prefs_receive.c:178 src/prefs_send.c:174 src/prefs_summaries.c:431
+#: src/prefs_receive.c:194 src/prefs_summaries.c:446
msgid "Always"
msgstr "总显示"
-#: src/prefs_receive.c:179
+#: src/prefs_receive.c:195
msgid "Only on manual receiving"
msgstr "仅手工收取时显示"
-#: src/prefs_receive.c:193
+#: src/prefs_receive.c:206
msgid "Close receive dialog when finished"
msgstr "收件完成后关闭收件对话框"
-#: src/prefs_receive.c:196
+#: src/prefs_receive.c:209
msgid "Don't popup error dialog on receive error"
msgstr "接收有错误时不要显示错误讯息"
-#: src/prefs_receive.c:198
+#: src/prefs_receive.c:211
msgid "After receiving new mail"
msgstr "接收完新邮件后"
-#: src/prefs_receive.c:200
-msgid "Go to inbox"
+#: src/prefs_receive.c:213
+msgid "Go to Inbox"
msgstr "转到收信夹"
-#: src/prefs_receive.c:202
+#: src/prefs_receive.c:215
msgid "Update all local folders"
-msgstr "更新所有本地文件夹"
+msgstr "更新所有本地目录"
-#: src/prefs_receive.c:204
+#: src/prefs_receive.c:218
msgid "Run command"
msgstr "运行命令"
-#: src/prefs_receive.c:209
+#: src/prefs_receive.c:223
msgid "after automatic check"
msgstr "自动检查后"
-#: src/prefs_receive.c:211
+#: src/prefs_receive.c:225
msgid "after manual check"
msgstr "手工检查后"
-#: src/prefs_receive.c:219
+#: src/prefs_receive.c:233
#, c-format
msgid ""
"Command to execute:\n"
"要执行的命令:\n"
"(用 %d 表示新邮件数量)"
-#: src/prefs_receive.c:345 src/prefs_send.c:347
+#: src/prefs_receive.c:258
+msgid "Blink LED"
+msgstr "闪烁LED灯"
+
+#: src/prefs_receive.c:259
+msgid "Play sound"
+msgstr "播放声音"
+
+#: src/prefs_receive.c:261
+msgid "Show info banner"
+msgstr "显示信息标语"
+
+#: src/prefs_receive.c:395 src/prefs_send.c:353
msgid "Mail Handling"
msgstr "邮件处理"
-#: src/prefs_receive.c:346
+#: src/prefs_receive.c:396
msgid "Receiving"
msgstr "邮件收取"
-#: src/prefs_send.c:144
+#: src/prefs_send.c:160
msgid "Save sent messages to Sent folder"
-msgstr "将已经发送的邮件保存到已发送文件夹"
+msgstr "将已经发送的邮件保存到已发送目录"
-#: src/prefs_send.c:147
+#: src/prefs_send.c:163
msgid "Confirm before sending queued messages"
msgstr "发送待发送邮件时请求确认"
-#: src/prefs_send.c:150
+#: src/prefs_send.c:166
msgid "Never send Return Receipts"
msgstr "从不请求发送回执"
-#: src/prefs_send.c:158
+#: src/prefs_send.c:169
msgid "Show send dialog"
msgstr "显示发送对话框"
-#: src/prefs_send.c:179
+#: src/prefs_send.c:177
msgid "Outgoing encoding"
msgstr "发送邮件字符集"
-#: src/prefs_send.c:192
+#: src/prefs_send.c:204
msgid ""
"If 'Automatic' is selected, the optimal encoding for the current locale will "
"be used"
msgstr "如果选择了`自动'，当前locale设置将被优先选用"
-#: src/prefs_send.c:206
+#: src/prefs_send.c:220
msgid "Automatic (Recommended)"
msgstr "自动 (推荐)"
-#: src/prefs_send.c:208
-msgid "7bit ascii (US-ASCII)"
+#: src/prefs_send.c:222
+msgid "7bit ASCII (US-ASCII)"
msgstr "7位ASCII (US-ASCII)"
-#: src/prefs_send.c:209
+#: src/prefs_send.c:223
msgid "Unicode (UTF-8)"
msgstr ""
-#: src/prefs_send.c:211
+#: src/prefs_send.c:225
msgid "Western European (ISO-8859-1)"
msgstr "西欧 (ISO-8859-1)"
-#: src/prefs_send.c:212
+#: src/prefs_send.c:226
msgid "Western European (ISO-8859-15)"
msgstr "西欧 (ISO-8859-15)"
-#: src/prefs_send.c:214
+#: src/prefs_send.c:228
msgid "Central European (ISO-8859-2)"
msgstr "中欧 (ISO-8859-2)"
-#: src/prefs_send.c:216
+#: src/prefs_send.c:230
msgid "Baltic (ISO-8859-13)"
msgstr "波罗的海 (ISO-8859-13)"
-#: src/prefs_send.c:217
+#: src/prefs_send.c:231
msgid "Baltic (ISO-8859-4)"
msgstr "波罗的海 (ISO-8859-4)"
-#: src/prefs_send.c:219
+#: src/prefs_send.c:233
msgid "Greek (ISO-8859-7)"
msgstr "希腊 (ISO-8859-7)"
-#: src/prefs_send.c:221
+#: src/prefs_send.c:235
msgid "Hebrew (ISO-8859-8)"
msgstr "希伯来 (ISO-8859-8)"
-#: src/prefs_send.c:222
+#: src/prefs_send.c:236
msgid "Hebrew (Windows-1255)"
msgstr "希伯来 (Windows-1255)"
-#: src/prefs_send.c:224
+#: src/prefs_send.c:238
msgid "Arabic (ISO-8859-6)"
msgstr "阿拉伯语 (ISO-8859-6)"
-#: src/prefs_send.c:225
+#: src/prefs_send.c:239
msgid "Arabic (Windows-1256)"
msgstr "阿拉伯语 (Windows-1256)"
-#: src/prefs_send.c:227
+#: src/prefs_send.c:241
msgid "Turkish (ISO-8859-9)"
msgstr "土耳其 (ISO-8859-9)"
-#: src/prefs_send.c:229
+#: src/prefs_send.c:243
msgid "Cyrillic (ISO-8859-5)"
msgstr "斯拉夫语 (ISO-8859-5)"
-#: src/prefs_send.c:230
+#: src/prefs_send.c:244
msgid "Cyrillic (KOI8-R)"
msgstr "斯拉夫语 (KOI8-R)"
-#: src/prefs_send.c:231
+#: src/prefs_send.c:245
msgid "Cyrillic (KOI8-U)"
msgstr "斯拉夫语 (KOI8-U)"
-#: src/prefs_send.c:232
+#: src/prefs_send.c:246
msgid "Cyrillic (Windows-1251)"
msgstr "斯拉夫语 (Windows-1251)"
-#: src/prefs_send.c:234
+#: src/prefs_send.c:248
msgid "Japanese (ISO-2022-JP)"
msgstr "日语 (ISO-2022-JP)"
-#: src/prefs_send.c:236
+#: src/prefs_send.c:250
msgid "Japanese (EUC-JP)"
msgstr "日语 (EUC-JP)"
-#: src/prefs_send.c:237
+#: src/prefs_send.c:251
msgid "Japanese (Shift_JIS)"
msgstr "日语 (Shift_JIS)"
-#: src/prefs_send.c:240
+#: src/prefs_send.c:254
msgid "Simplified Chinese (GB2312)"
msgstr "简体中文 (GB2312)"
-#: src/prefs_send.c:241
+#: src/prefs_send.c:255
msgid "Simplified Chinese (GBK)"
msgstr "简体中文 (GBK)"
-#: src/prefs_send.c:242
+#: src/prefs_send.c:256
msgid "Traditional Chinese (Big5)"
msgstr "繁体中文 (Big5)"
-#: src/prefs_send.c:244
+#: src/prefs_send.c:258
msgid "Traditional Chinese (EUC-TW)"
msgstr "繁体中文 (EUC-TW)"
-#: src/prefs_send.c:245
+#: src/prefs_send.c:259
msgid "Chinese (ISO-2022-CN)"
msgstr "中文 (ISO-2022-CN)"
-#: src/prefs_send.c:248
+#: src/prefs_send.c:262
msgid "Korean (EUC-KR)"
msgstr "朝鲜语 (EUC-KR)"
-#: src/prefs_send.c:250
+#: src/prefs_send.c:264
msgid "Thai (TIS-620)"
msgstr "泰语 (TIS-620)"
-#: src/prefs_send.c:251
+#: src/prefs_send.c:265
msgid "Thai (Windows-874)"
msgstr "泰语 (Windows-874)"
-#: src/prefs_send.c:256
+#: src/prefs_send.c:269
msgid "Transfer encoding"
msgstr "传送编码"
-#: src/prefs_send.c:269
+#: src/prefs_send.c:282
msgid ""
"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
"characters"
msgstr "指定当邮件含有非ASCII字符时的邮件内容编码方式"
-#: src/prefs_send.c:348 src/send_message.c:477 src/send_message.c:481
+#: src/prefs_send.c:354 src/send_message.c:477 src/send_message.c:481
#: src/send_message.c:486
msgid "Sending"
msgstr "邮件发送"
-#: src/prefs_spelling.c:91
+#: src/prefs_spelling.c:87
msgid "Select dictionaries location"
msgstr "选择词典位置"
-#: src/prefs_spelling.c:126
+#: src/prefs_spelling.c:120
msgid "Pick color for misspelled word"
msgstr "为拼写错误选择颜色"
-#: src/prefs_spelling.c:183
+#: src/prefs_spelling.c:174
msgid "Enable spell checker"
msgstr "启用语法检查器"
-#: src/prefs_spelling.c:188
+#: src/prefs_spelling.c:179
msgid "Enable alternate dictionary"
msgstr "启用备选字典"
-#: src/prefs_spelling.c:194
+#: src/prefs_spelling.c:185
msgid "Faster switching with last used dictionary"
msgstr "快速切换最后使用的字典"
-#: src/prefs_spelling.c:196
+#: src/prefs_spelling.c:187
msgid "Path to dictionaries"
msgstr "字典文件位置"
-#: src/prefs_spelling.c:211
-msgid "Automatic spelling"
-msgstr "自动检查"
+#: src/prefs_spelling.c:202
+msgid "Automatic spell checking"
+msgstr "自动检查拼写"
-#: src/prefs_spelling.c:219
+#: src/prefs_spelling.c:210
msgid "Re-check message when changing dictionary"
msgstr "改变字典时重新检查邮件"
-#: src/prefs_spelling.c:223
+#: src/prefs_spelling.c:214
msgid "Dictionary"
msgstr "字典"
-#: src/prefs_spelling.c:270
+#: src/prefs_spelling.c:253
msgid "Check with both dictionaries"
msgstr "采用主、备两个字典检查"
-#: src/prefs_spelling.c:276
+#: src/prefs_spelling.c:258
msgid "Default suggestion mode"
msgstr "缺省的建议模式"
-#: src/prefs_spelling.c:298
+#: src/prefs_spelling.c:275
msgid "Misspelled word color"
msgstr "错误单词的颜色"
-#: src/prefs_spelling.c:312
+#: src/prefs_spelling.c:289
msgid "Pick color for misspelled word. Use black to underline"
msgstr "选择拼写错误时的颜色(黑色表示下划线)"
-#: src/prefs_spelling.c:442
+#: src/prefs_spelling.c:404
msgid "Spell Checking"
msgstr "拼写检查"
-#: src/prefs_summaries.c:142
+#: src/prefs_summaries.c:149
msgid "the full abbreviated weekday name"
msgstr "(星期)一、二、..."
-#: src/prefs_summaries.c:143
+#: src/prefs_summaries.c:150
msgid "the full weekday name"
msgstr "星期一、星期二、..."
-#: src/prefs_summaries.c:144
+#: src/prefs_summaries.c:151
msgid "the abbreviated month name"
msgstr "1月、2月、..."
-#: src/prefs_summaries.c:145
+#: src/prefs_summaries.c:152
msgid "the full month name"
msgstr "一月、二月、..."
-#: src/prefs_summaries.c:146
+#: src/prefs_summaries.c:153
msgid "the preferred date and time for the current locale"
msgstr "完整的西元日期与时间（本地时间）"
-#: src/prefs_summaries.c:147
+#: src/prefs_summaries.c:154
msgid "the century number (year/100)"
msgstr "世纪 (年/100)"
-#: src/prefs_summaries.c:148
+#: src/prefs_summaries.c:155
msgid "the day of the month as a decimal number"
msgstr "今天是几号 (以数字表示)"
-#: src/prefs_summaries.c:149
+#: src/prefs_summaries.c:156
msgid "the hour as a decimal number using a 24-hour clock"
msgstr "现在几点钟 (廿四时制，以数字表示)"
-#: src/prefs_summaries.c:150
+#: src/prefs_summaries.c:157
msgid "the hour as a decimal number using a 12-hour clock"
msgstr "现在几点钟 (十二时制，以数字表示)"
-#: src/prefs_summaries.c:151
+#: src/prefs_summaries.c:158
msgid "the day of the year as a decimal number"
msgstr "今天是今年的第几天 (以数字表示)"
-#: src/prefs_summaries.c:152
+#: src/prefs_summaries.c:159
msgid "the month as a decimal number"
msgstr "现在是几月 (以数字表示)"
-#: src/prefs_summaries.c:153
+#: src/prefs_summaries.c:160
msgid "the minute as a decimal number"
msgstr "现在是几分 (以数字表示)"
-#: src/prefs_summaries.c:154
+#: src/prefs_summaries.c:161
msgid "either AM or PM"
msgstr "上午或下午"
-#: src/prefs_summaries.c:155
+#: src/prefs_summaries.c:162
msgid "the second as a decimal number"
msgstr "现在是几秒 (以数字表示)"
-#: src/prefs_summaries.c:156
+#: src/prefs_summaries.c:163
msgid "the day of the week as a decimal number"
msgstr "现在是一周的第几天 (以数字表示)"
-#: src/prefs_summaries.c:157
+#: src/prefs_summaries.c:164
msgid "the preferred date for the current locale"
msgstr "完整的西元日期 (本地时间)"
-#: src/prefs_summaries.c:158
+#: src/prefs_summaries.c:165
msgid "the last two digits of a year"
msgstr "西元年份的末两位数字"
-#: src/prefs_summaries.c:159
+#: src/prefs_summaries.c:166
msgid "the year as a decimal number"
msgstr "西元年份 (以数字表示)"
-#: src/prefs_summaries.c:160
+#: src/prefs_summaries.c:167
msgid "the time zone or name or abbreviation"
msgstr "时区"
-#: src/prefs_summaries.c:181 src/prefs_summaries.c:229
-#: src/prefs_summaries.c:487
+#: src/prefs_summaries.c:188 src/prefs_summaries.c:236
+#: src/prefs_summaries.c:507
msgid "Date format"
msgstr "日期格式"
-#: src/prefs_summaries.c:205
+#: src/prefs_summaries.c:212
msgid "Specifier"
msgstr "特殊符号"
-#: src/prefs_summaries.c:247
+#: src/prefs_summaries.c:254
msgid "Example"
msgstr "示例"
-#: src/prefs_summaries.c:348
-msgid "Display unread number next to folder name"
-msgstr "在文件夹名称后显示未读邮件数"
+#: src/prefs_summaries.c:362
+msgid "Display message number next to folder name"
+msgstr "在目录名称后显示邮件数"
+
+#: src/prefs_summaries.c:371
+msgid "No"
+msgstr "无"
+
+#: src/prefs_summaries.c:372
+msgid "Unread messages"
+msgstr "未读邮件"
+
+#: src/prefs_summaries.c:373
+msgid "Unread and Total messages"
+msgstr "未读邮件和邮件总数"
-#: src/prefs_summaries.c:355
+#: src/prefs_summaries.c:383
+msgid "Open last opened folder at startup"
+msgstr "在启动时自动打开上次最后访问的邮件夹"
+
+#: src/prefs_summaries.c:386
msgid "Abbreviate newsgroup names longer than"
msgstr "缩写新闻组名称，如果其长度大于"
-#: src/prefs_summaries.c:369
+#: src/prefs_summaries.c:400
msgid "letters"
msgstr "个字母"
-#: src/prefs_summaries.c:387
+#: src/prefs_summaries.c:418
msgid "Message list"
-msgstr " 邮件列表"
-
-#: src/prefs_summaries.c:393
-msgid "When entering a folder"
-msgstr "进入文件夹时"
+msgstr " 邮件摘要列表"
-#: src/prefs_summaries.c:401
-msgid "Do nothing"
-msgstr "不错"
+#: src/prefs_summaries.c:424
+msgid "Set default selection when entering a folder"
+msgstr "进入目录时设置缺省选中项"
-#: src/prefs_summaries.c:402
-msgid "Select first unread (or new or marked) message"
-msgstr "选择第一个未读/新/已标记邮件"
-
-#: src/prefs_summaries.c:404
-msgid "Select first unread (or marked or new) message"
-msgstr "选择第一个未读/已标记/新邮件"
-
-#: src/prefs_summaries.c:406
-msgid "Select first new (or unread or marked) message"
-msgstr "选择第一个新/未读/已标记邮件"
-
-#: src/prefs_summaries.c:408
-msgid "Select first new (or marked or unread) message"
-msgstr "选择第一个新/已标记/未读邮件"
-
-#: src/prefs_summaries.c:410
-msgid "Select first marked (or new or unread) message"
-msgstr "选择第一个已标记/新/未读邮件"
-
-#: src/prefs_summaries.c:412
-msgid "Select first marked (or unread or new) message"
-msgstr "选择第一个已标记/未读/新邮件"
-
-#: src/prefs_summaries.c:423
+#: src/prefs_summaries.c:437
msgid "Show \"no unread (or new) message\" dialog"
msgstr "显示\"没有未读邮件和新邮件\"对话框"
-#: src/prefs_summaries.c:432
+#: src/prefs_summaries.c:447
msgid "Assume 'Yes'"
msgstr "缺省回答'是'"
-#: src/prefs_summaries.c:434
+#: src/prefs_summaries.c:448
msgid "Assume 'No'"
msgstr "缺省回答'否'"
-#: src/prefs_summaries.c:442
+#: src/prefs_summaries.c:454
msgid "Always open message when selected"
-msgstr "选中文件夹时总打开里面的邮件"
+msgstr "选中目录时总打开里面的邮件"
-#: src/prefs_summaries.c:445
+#: src/prefs_summaries.c:457
msgid "Thread using subject in addition to standard headers"
msgstr "按线索分组时也考虑邮件主题（除了标准信头中的信息）"
-#: src/prefs_summaries.c:451
+#: src/prefs_summaries.c:463
msgid "Execute immediately when moving or deleting messages"
msgstr "移动或删除邮件时立即执行"
-#: src/prefs_summaries.c:453
+#: src/prefs_summaries.c:465
msgid ""
"Defers moving, copying and deleting of messages until you choose 'Tools/"
"Execute'"
msgstr "将移动、复制和删除操作延迟到选择了'工具/执行'之后再处理"
-#: src/prefs_summaries.c:458
-msgid "Only mark message as read when opened in a new window"
-msgstr "只在用新窗口打开邮件时标记为已读"
+#: src/prefs_summaries.c:470
+msgid ""
+"Only mark message as read when opened \n"
+"in a new window, or replied to"
+msgstr "只将用新窗口打开过邮件或者回复过的邮件标记为已读"
-#: src/prefs_summaries.c:465
+#: src/prefs_summaries.c:478
msgid "Mark messages as read after"
msgstr "一段时间后将邮件标记为已读"
-#: src/prefs_summaries.c:481
+#: src/prefs_summaries.c:494
msgid "Display sender using address book"
msgstr "以地址簿中的名字显示发信人"
-#: src/prefs_summaries.c:513
+#: src/prefs_summaries.c:498
+msgid "Show tooltips"
+msgstr "显示提示"
+
+#: src/prefs_summaries.c:533
msgid "Date format help"
msgstr "日期格式说明"
-#: src/prefs_summaries.c:531
+#: src/prefs_summaries.c:551
msgid "Confirm before marking all mails in a folder as read"
-msgstr "在标记文件夹里所有邮件为只读时请求确认"
+msgstr "在标记目录里所有邮件为只读时请求确认"
-#: src/prefs_summaries.c:534
+#: src/prefs_summaries.c:554
msgid "Translate header names"
msgstr "翻译信头名称"
-#: src/prefs_summaries.c:536
+#: src/prefs_summaries.c:556
msgid ""
"The display of standard headers (such as 'From:', 'Subject:') will be "
"translated into your language."
"标准信头(比如'From:', 'Subject')也将翻译为你所采用的语言(比如'发件人', '主"
"题')。"
-#: src/prefs_summaries.c:649
+#: src/prefs_summaries.c:670
msgid "Summaries"
-msgstr "邮件列表"
+msgstr "邮件摘要列表"
-#: src/prefs_summary_column.c:81 src/summaryview.c:2399
+#: src/prefs_summary_column.c:83 src/summaryview.c:2598
msgid "Attachment"
msgstr "附件"
-#: src/prefs_summary_column.c:87
+#: src/prefs_summary_column.c:89
msgid "Number"
msgstr "号码"
-#: src/prefs_summary_column.c:219
+#: src/prefs_summary_column.c:229
msgid "Message list columns configuration"
-msgstr "邮件列表列设置"
+msgstr "邮件摘要列表列设置"
-#: src/prefs_summary_column.c:236
+#: src/prefs_summary_column.c:246
msgid ""
"Select columns to be displayed in the message list. You can modify\n"
"the order by using the Up / Down buttons or by dragging the items."
msgstr ""
-"请选择要在邮件列表栏显示的字段列。\n"
+"请选择要在邮件摘要列表栏显示的字段列。\n"
"你可以用 上移/下移 按钮或者直接拖曳来调整顺序。"
-#: src/prefs_template.c:186
+#: src/prefs_summary_open.c:108
+msgid "first marked email"
+msgstr "第一个标记过的邮件"
+
+#: src/prefs_summary_open.c:109
+msgid "first new email"
+msgstr "第一个新邮件"
+
+#: src/prefs_summary_open.c:110
+msgid "first unread email"
+msgstr "第一封未读邮件"
+
+#: src/prefs_summary_open.c:111
+msgid "last opened email"
+msgstr "最后打开的邮件"
+
+#: src/prefs_summary_open.c:112
+msgid "last email in the list"
+msgstr "列表中的最后一封邮件"
+
+#: src/prefs_summary_open.c:114
+msgid "first email in the list"
+msgstr "列表中的第一封邮件"
+
+#: src/prefs_summary_open.c:183
+msgid " Selection when entering a folder"
+msgstr " 进入邮件夹时选中"
+
+#: src/prefs_summary_open.c:229
+msgid "Possible selections"
+msgstr "允许的选择"
+
+#: src/prefs_summary_open.c:265
+msgid "Selection on folder opening"
+msgstr "打开邮件夹时选中"
+
+#: src/prefs_template.c:211
msgid "This name is used as the Menu item"
msgstr "该名称已经用于菜单项"
-#: src/prefs_template.c:286
+#: src/prefs_template.c:299
+msgid "Append the new template above to the list"
+msgstr "将上面定义的新模板添加到列表"
+
+#: src/prefs_template.c:308
+msgid "Replace the selected template in list with the template above"
+msgstr "用上面定义的模板替换当前选中的模板"
+
+#: src/prefs_template.c:316
+msgid "Delete the selected template from the list"
+msgstr "删除列表中选中的模板"
+
+#: src/prefs_template.c:329
msgid " Symbols... "
msgstr " 符号... "
-#: src/prefs_template.c:315
+#: src/prefs_template.c:336
+msgid "Show information on configuring templates"
+msgstr "显示配置模板的信息"
+
+#: src/prefs_template.c:360
+msgid "Move the selected template to the top"
+msgstr "将选中的模板移动到顶部"
+
+#: src/prefs_template.c:370
+msgid "Move the selected template up"
+msgstr "将选中的模板上移"
+
+#: src/prefs_template.c:378
+msgid "Move the selected template down"
+msgstr "将选中的模板下移"
+
+#: src/prefs_template.c:388
+msgid "Move the selected template to the bottom"
+msgstr "将选中的模板移动到底部"
+
+#: src/prefs_template.c:404
msgid "Template configuration"
msgstr "模板设置"
-#: src/prefs_template.c:557
+#: src/prefs_template.c:545
+msgid "Templates list not saved"
+msgstr "模板列表未保存"
+
+#: src/prefs_template.c:546
+msgid "The templates list has been modified. Close anyway?"
+msgstr "模板列表已经修改，真的关闭？"
+
+#: src/prefs_template.c:671
msgid "Template name is not set."
msgstr "未设定模板名称。"
-#: src/prefs_template.c:667
+#: src/prefs_template.c:789
msgid "Delete template"
msgstr "删除模板"
-#: src/prefs_template.c:668
+#: src/prefs_template.c:790
msgid "Do you really want to delete this template?"
msgstr "确定删除这个模板吗？"
-#: src/prefs_template.c:805
+#: src/prefs_template.c:803
+msgid "Delete all templates"
+msgstr "删除所有模板"
+
+#: src/prefs_template.c:804
+msgid "Do you really want to delete all the templates?"
+msgstr "确定删除所有模板吗？"
+
+#: src/prefs_template.c:1106
msgid "Current templates"
msgstr "目前使用的模板"
-#: src/prefs_template.c:830
+#: src/prefs_template.c:1133
msgid "Template"
msgstr "模板"
-#: src/prefs_themes.c:340 src/prefs_themes.c:706
+#: src/prefs_themes.c:341 src/prefs_themes.c:712
msgid "Default internal theme"
msgstr "缺省内置主题"
-#: src/prefs_themes.c:362
+#: src/prefs_themes.c:363
msgid "Themes"
msgstr "主题"
-#: src/prefs_themes.c:449
+#: src/prefs_themes.c:450
msgid "Only root can remove system themes"
msgstr "只有root用户才能删除系统主题"
-#: src/prefs_themes.c:452
+#: src/prefs_themes.c:453
#, c-format
msgid "Remove system theme '%s'"
msgstr "删除系统主题 '%s' "
-#: src/prefs_themes.c:455
+#: src/prefs_themes.c:456
#, c-format
msgid "Remove theme '%s'"
msgstr "删除主题 '%s'"
-#: src/prefs_themes.c:461
+#: src/prefs_themes.c:462
msgid "Are you sure you want to remove this theme?"
msgstr "确定要删除这个主题吗？"
-#: src/prefs_themes.c:471
+#: src/prefs_themes.c:472
#, c-format
msgid ""
"File %s failed\n"
"删除主题时\n"
"文件 %s 发生错误。"
-#: src/prefs_themes.c:475
+#: src/prefs_themes.c:476
msgid "Removing theme directory failed."
msgstr "删除主题目录失败。"
-#: src/prefs_themes.c:478
-msgid "Theme removed succesfully"
+#: src/prefs_themes.c:479
+msgid "Theme removed successfully"
msgstr "主题删除成功"
-#: src/prefs_themes.c:498
+#: src/prefs_themes.c:499
msgid "Select theme folder"
msgstr "选择主题目录"
-#: src/prefs_themes.c:513
+#: src/prefs_themes.c:514
#, c-format
msgid "Install theme '%s'"
msgstr "安装主题 '%s'"
-#: src/prefs_themes.c:516
+#: src/prefs_themes.c:517
msgid ""
"This folder doesn't seem to be a theme folder.\n"
"Install anyway?"
"该目录似乎并不包含主题布景。\n"
"继续安装吗?"
-#: src/prefs_themes.c:523
+#: src/prefs_themes.c:524
msgid "Do you want to install theme for all users?"
msgstr "是否安装此主题到系统目录以供所有用户使用?"
-#: src/prefs_themes.c:544
+#: src/prefs_themes.c:545
msgid ""
"A theme with the same name is\n"
"already installed in this location"
"该位置已经安装有一个同名主题。\n"
" "
-#: src/prefs_themes.c:548
+#: src/prefs_themes.c:549
msgid "Couldn't create destination directory"
msgstr "无法创建目的目录"
-#: src/prefs_themes.c:561
-msgid "Theme installed succesfully"
+#: src/prefs_themes.c:562
+msgid "Theme installed successfully"
msgstr "主题安装成功"
-#: src/prefs_themes.c:568
+#: src/prefs_themes.c:569
msgid "Failed installing theme"
msgstr "安装主题失败"
-#: src/prefs_themes.c:571
+#: src/prefs_themes.c:572
#, c-format
msgid ""
"File %s failed\n"
"安装主题时\n"
"文件 %s 失败。"
-#: src/prefs_themes.c:667
+#: src/prefs_themes.c:673
#, c-format
msgid "%d themes available (%d user, %d system, 1 internal)"
msgstr "共有%d个主题可用 (用户目录%d个，系统目录%d个，内置1个)"
-#: src/prefs_themes.c:709
+#: src/prefs_themes.c:715
#, c-format
msgid "Internal theme has %d icons"
msgstr "内置主题包含有 %d 个图标"
-#: src/prefs_themes.c:715
+#: src/prefs_themes.c:721
msgid "No info file available for this theme"
msgstr "该主题没有说明文件"
-#: src/prefs_themes.c:733
+#: src/prefs_themes.c:739
msgid "Error: couldn't get theme status"
msgstr "错误: 无法取得主题状态"
-#: src/prefs_themes.c:757
+#: src/prefs_themes.c:763
#, c-format
msgid "%d files (%d icons), size: %s"
msgstr "%d 个文件(%d 个图标), 大小: %s"
-#: src/prefs_themes.c:841
+#: src/prefs_themes.c:846
msgid "Selector"
msgstr "选择器"
msgid "URL:"
msgstr "URL:"
-#: src/prefs_themes.c:923
-msgid "Status:"
-msgstr "状态"
-
#: src/prefs_themes.c:937
msgid "Preview"
msgstr "预览"
msgid "Remove"
msgstr "删除"
-#: src/prefs_toolbar.c:86
+#: src/prefs_toolbar.c:166
msgid ""
"Selected Action already set.\n"
"Please choose another Action from List"
"选中的动作已经被使用。\n"
"请从列表中另外选取一个"
-#: src/prefs_toolbar.c:131
+#: src/prefs_toolbar.c:167
+msgid "Item has no icon defined."
+msgstr "按钮未设置图标。"
+
+#: src/prefs_toolbar.c:168
+msgid "Item has no text defined."
+msgstr "按钮未设置文字。"
+
+#: src/prefs_toolbar.c:215
msgid "Main toolbar configuration"
msgstr "主工具条设置"
-#: src/prefs_toolbar.c:132
+#: src/prefs_toolbar.c:216
msgid "Compose toolbar configuration"
msgstr "编辑窗口工具条设置"
-#: src/prefs_toolbar.c:133
+#: src/prefs_toolbar.c:217
msgid "Message view toolbar configuration"
msgstr "邮件视图工具条设置"
-#: src/prefs_toolbar.c:643
-msgid "Claws Mail Action"
-msgstr "Claws Mail动作"
+#: src/prefs_toolbar.c:797
+msgid "Toolbar item"
+msgstr "工具条按钮"
-#: src/prefs_toolbar.c:652
-msgid "Toolbar text"
-msgstr "工具条文字"
+#: src/prefs_toolbar.c:813
+msgid "Item type"
+msgstr "按钮类型"
+
+#: src/prefs_toolbar.c:820
+msgid "Internal Function"
+msgstr "内部功能"
+
+#: src/prefs_toolbar.c:821
+msgid "User Action"
+msgstr "自定义动作"
-#: src/prefs_toolbar.c:702
-msgid "Available toolbar icons"
-msgstr "å\8f¯ç\94¨ç\9a\84å·¥å\85·æ\9d¡å\9b¾æ \87"
+#: src/prefs_toolbar.c:821 src/toolbar.c:214
+msgid "Separator"
+msgstr "å\88\86é\9a\94符"
-#: src/prefs_toolbar.c:755
+#: src/prefs_toolbar.c:828
msgid "Event executed on click"
msgstr "点击时执行"
-#: src/prefs_toolbar.c:807
-msgid "Displayed toolbar items"
-msgstr "需显示的工具条项目"
+#: src/prefs_toolbar.c:848
+msgid "Toolbar text"
+msgstr "工具条文字"
+
+#: src/prefs_toolbar.c:863 src/prefs_toolbar.c:1096
+msgid "Icon"
+msgstr "图标"
-#: src/prefs_toolbar.c:874 src/prefs_toolbar.c:888 src/prefs_toolbar.c:902
+#: src/prefs_toolbar.c:994 src/prefs_toolbar.c:1008 src/prefs_toolbar.c:1022
msgid "Customize Toolbars"
msgstr "设置工具条"
-#: src/prefs_toolbar.c:875
+#: src/prefs_toolbar.c:995
msgid "Main Window"
msgstr "主窗口"
-#: src/prefs_toolbar.c:889
+#: src/prefs_toolbar.c:1009
msgid "Message Window"
msgstr "邮件窗口"
-#: src/prefs_toolbar.c:903
+#: src/prefs_toolbar.c:1023
msgid "Compose Window"
msgstr "撰写窗口"
-#: src/prefs_toolbar.c:1037
-msgid "Icon"
-msgstr "图标"
-
-#: src/prefs_toolbar.c:1070
+#: src/prefs_toolbar.c:1119
msgid "Icon text"
msgstr "图标文字"
-#: src/prefs_toolbar.c:1079
+#: src/prefs_toolbar.c:1128
msgid "Mapped event"
msgstr "对应事件"
+#: src/prefs_toolbar.c:1411
+msgid "Toolbar item icon"
+msgstr "工具条按钮图标"
+
#: src/prefs_wrapping.c:77
msgid "Auto wrapping"
msgstr "自动折行"
msgid "Wrapping"
msgstr "自动折行"
+#: src/printing.c:386
+msgid "First page"
+msgstr "第一页"
+
+#: src/printing.c:387
+msgid "Previous page"
+msgstr "上一页"
+
+#: src/printing.c:393
+msgid "Next page"
+msgstr "下一页"
+
+#: src/printing.c:394
+msgid "Last page"
+msgstr "最后一页"
+
+#: src/printing.c:399
+msgid "Zoom 100%"
+msgstr "恢复原始大小"
+
+#: src/printing.c:400
+msgid "Zoom fit"
+msgstr "最合适大小"
+
+#: src/printing.c:401
+msgid "Zoom in"
+msgstr "放大"
+
+#: src/printing.c:402
+msgid "Zoom out"
+msgstr "缩小"
+
+#: src/printing.c:594
+#, c-format
+msgid "Page %d"
+msgstr "第 %d 页"
+
#: src/privacy.c:217 src/privacy.c:238
msgid "No information available"
msgstr "没有信息"
-#: src/privacy.c:406
+#: src/privacy.c:440
#, fuzzy
msgid "No recipient keys defined."
msgstr "没有定义动作。"
-#: src/procmime.c:341 src/procmime.c:343
+#: src/procmime.c:371 src/procmime.c:373 src/procmime.c:374
msgid "[Error decoding BASE64]\n"
msgstr "[BASE64解码错误]\n"
-#: src/procmsg.c:858 src/procmsg.c:861
+#: src/procmsg.c:861 src/procmsg.c:864
msgid "Already trying to send."
msgstr "已经在发送。"
-#: src/procmsg.c:1444
+#: src/procmsg.c:1469
#, c-format
msgid "Couldn't open file %s."
msgstr "无法打开文件 %s。"
-#: src/procmsg.c:1542
+#: src/procmsg.c:1567
#, c-format
msgid "Couldn't encrypt the email: %s"
msgstr "无法加密邮件: %s"
-#: src/procmsg.c:1575
+#: src/procmsg.c:1600
msgid "Queued message header is broken."
msgstr "待发送的邮件头已经损坏"
-#: src/procmsg.c:1596
+#: src/procmsg.c:1621
msgid "An error happened during SMTP session."
msgstr "建立SMTP会话时发生错误."
-#: src/procmsg.c:1610
+#: src/procmsg.c:1635
msgid ""
"No specific account has been found to send, and an error happened during "
"SMTP session."
msgstr "没有发现可供发送邮件的账户，同时在SMTP会话中发生了一个错误。"
-#: src/procmsg.c:1618
+#: src/procmsg.c:1643
msgid ""
"Couldn't determine sending informations. Maybe the email hasn't been "
"generated by Claws Mail."
msgstr "无法判断待发送的信息。也许这封邮件不是用Claws Mail生成的。"
-#: src/procmsg.c:1636
+#: src/procmsg.c:1661
msgid "Couldn't create temporary file for news sending."
msgstr "发送新闻过程中无法创建临时文件。"
-#: src/procmsg.c:1649
+#: src/procmsg.c:1674
msgid "Error when writing temporary file for news sending."
msgstr "发送新闻过程中写往临时文件时出错。"
-#: src/procmsg.c:1663
+#: src/procmsg.c:1688
#, c-format
msgid "Error occurred while posting the message to %s."
msgstr "发贴至 %s 时发生错误。"
-#: src/procmsg.c:2154
+#: src/procmsg.c:2192
msgid "Filtering messages...\n"
msgstr "正在过滤邮件...\n"
-#: src/quote_fmt.c:40
+#: src/quote_fmt.c:46
+msgid "<span weight=\"bold\">symbols:</span>"
+msgstr "<span weight=\"bold\">符号:</span>"
+
+#: src/quote_fmt.c:47
msgid "customized date format (see 'man strftime')"
msgstr "自定义日期显示格式 (请查看strftime的手册页)"
-#: src/quote_fmt.c:43
+#: src/quote_fmt.c:50
+msgid "email address of sender"
+msgstr "发件人邮件地址"
+
+#: src/quote_fmt.c:51
msgid "full name of sender"
msgstr "发信人全名"
-#: src/quote_fmt.c:44
+#: src/quote_fmt.c:52
msgid "first name of sender"
msgstr "发信人的姓"
-#: src/quote_fmt.c:45
+#: src/quote_fmt.c:53
msgid "last name of sender"
msgstr "发信人的名"
-#: src/quote_fmt.c:46
+#: src/quote_fmt.c:54
msgid "initials of sender"
msgstr "发信人缩写"
-#: src/quote_fmt.c:53
+#: src/quote_fmt.c:61
msgid "message body"
msgstr "邮件内容"
-#: src/quote_fmt.c:54
+#: src/quote_fmt.c:62
msgid "quoted message body"
msgstr "引文"
-#: src/quote_fmt.c:55
+#: src/quote_fmt.c:63
msgid "message body without signature"
msgstr "邮件内容（不含签名）"
-#: src/quote_fmt.c:56
+#: src/quote_fmt.c:64
msgid "quoted message body without signature"
msgstr "引文（不含签名）"
-#: src/quote_fmt.c:57
+#: src/quote_fmt.c:65
+msgid "message tags"
+msgstr "邮件标签"
+
+#: src/quote_fmt.c:66
+msgid "current dictionary"
+msgstr "当前目录"
+
+#: src/quote_fmt.c:67
msgid "cursor position"
msgstr "光标位置"
-#: src/quote_fmt.c:58
-msgid "Account property: your name"
+#: src/quote_fmt.c:68
+msgid "account property: your name"
msgstr "账户属性: 你的名字"
-#: src/quote_fmt.c:59
-msgid "Account property: your email address"
+#: src/quote_fmt.c:69
+msgid "account property: your email address"
msgstr "账户属性: 你的邮件地址"
-#: src/quote_fmt.c:60
-msgid "Account property: account name"
+#: src/quote_fmt.c:70
+msgid "account property: account name"
msgstr "账户属性: 账户名称"
-#: src/quote_fmt.c:61
-msgid "Account property: organization"
+#: src/quote_fmt.c:71
+msgid "account property: organization"
msgstr "账户属性: 组织名称"
-#: src/quote_fmt.c:63
+#: src/quote_fmt.c:72
+msgid "account property: default dictionary"
+msgstr "账户属性: 账户名称"
+
+#: src/quote_fmt.c:73
+msgid "address book <span style=\"oblique\">completion</span>: Cc"
+msgstr ""
+
+#: src/quote_fmt.c:74
+msgid "address book <span style=\"oblique\">completion</span>: From"
+msgstr ""
+
+#: src/quote_fmt.c:75
+msgid "address book <span style=\"oblique\">completion</span>: To"
+msgstr ""
+
+#: src/quote_fmt.c:77
msgid "literal backslash"
msgstr "反斜线"
-#: src/quote_fmt.c:64
+#: src/quote_fmt.c:78
msgid "literal question mark"
msgstr "问号"
-#: src/quote_fmt.c:65
+#: src/quote_fmt.c:79
msgid "literal exclamation mark"
msgstr "感叹号"
-#: src/quote_fmt.c:66
+#: src/quote_fmt.c:80
msgid "literal pipe"
msgstr "竖线"
-#: src/quote_fmt.c:67
+#: src/quote_fmt.c:81
msgid "literal opening curly brace"
msgstr "左大括弧"
-#: src/quote_fmt.c:68
+#: src/quote_fmt.c:82
msgid "literal closing curly brace"
msgstr "右大括弧"
-#: src/quote_fmt.c:69
+#: src/quote_fmt.c:83
msgid "tab"
msgstr "制表符"
-#: src/quote_fmt.c:70
-msgid "linefeed"
-msgstr "换行符"
+#: src/quote_fmt.c:86
+msgid "<span weight=\"bold\">commands:</span>"
+msgstr "<span weight=\"bold\">命令:</span>"
-#: src/quote_fmt.c:72
+#: src/quote_fmt.c:87
msgid ""
-"insert expr if x is set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is set, where x is one of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"
msgstr ""
-"如果x已经设置，则插入expr\n"
-"(x可以是dfNFLIstcnri中的任意一个，或者af, ao)"
+"当x标志已经设置时，插入<span style=\"oblique\">expr</span>。\n"
+"其中x为[dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]中的任何一个\n"
+"(或者它们的长表达式)"
-#: src/quote_fmt.c:73
+#: src/quote_fmt.c:88
msgid ""
-"insert expr if x is not set\n"
-"(where x is one of the dfNFLIstcnri characters or af, ao)"
+"insert <span style=\"oblique\">expr</span> if x is not set, where x is one "
+"of\n"
+"the [dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]\n"
+"symbols (or their long equivalent)"
msgstr ""
-"如果x尚未设置，则插入expr\n"
-"(x可以是dfNFLIstcnri中的任意一个，或者af, ao)"
+"当x标志未被设置时，插入<span style=\"oblique\">expr</span>。\n"
+"其中x为[dfNFLIstcnriT, ad, af, ao, aT, ABc, ABf, ABt]中的任何一个\n"
+"(或者它们的长表达式)"
-#: src/quote_fmt.c:74
+#: src/quote_fmt.c:89
msgid ""
"insert file:\n"
-"sub_expr is evaluated as a filename to insert"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to insert"
msgstr ""
"插入文件:\n"
-"sub_expr将被替换为要插入的文件名"
+"<span style=\"oblique\">sub_expr</span>将被替换为要插入的文件名"
-#: src/quote_fmt.c:75
+#: src/quote_fmt.c:90
msgid ""
"insert program output:\n"
-"sub_expr is evaluated as a command-line to get\n"
+"<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to "
+"get\n"
"the output from"
msgstr ""
"插入程序输出:\n"
-"sub_expr将被替换为一命令行，该命令行被用于获取输出\n"
+"<span style=\"oblique\">sub_expr</span>将被替换为一命令行，该命令行被用于获取"
+"输出\n"
" "
-#: src/quote_fmt.c:76
+#: src/quote_fmt.c:91
msgid ""
"insert user input:\n"
-"sub_expr is a variable to be replaced by\n"
+"<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\n"
"user-entered text"
msgstr ""
"插入用户输入:\n"
-"sub_expr将被替换为用户输入的文本\n"
+"<span style=\"oblique\">sub_expr</span>将被替换为用户输入的文本\n"
" "
-#: src/quote_fmt.c:78
-msgid "terms definition:"
-msgstr "术语定义:"
+#: src/quote_fmt.c:92
+msgid ""
+"attach file:\n"
+"<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file "
+"to attach"
+msgstr ""
+"附加文件:\n"
+"<span style=\"oblique\">sub_expr</span>将被替换为要插入的附件文件名"
-#: src/quote_fmt.c:79
-msgid "text that can contain any of the symbols above"
-msgstr "可以包含上述符号的文字"
+#: src/quote_fmt.c:94
+msgid "<span weight=\"bold\">definition of terms:</span>"
+msgstr "<span weight=\"bold\">术语定义:</span>"
-#: src/quote_fmt.c:80
+#: src/quote_fmt.c:95
msgid ""
-"text that can contain any of the symbols above\n"
-"but ?x{}, !x{}, |f{}, |p{} and |i{}"
+"text that can contain any of the symbols or\n"
+"commands above"
+msgstr "可以包含上述符号或者命令的文字"
+
+#: src/quote_fmt.c:96
+msgid ""
+"text that can contain any of the symbols (no\n"
+"commands) above"
+msgstr "可以包含上述符号(不能包含命令)的文字"
+
+#: src/quote_fmt.c:97
+msgid ""
+"completion from address book only works with the first\n"
+"address of the header, it outputs the full name\n"
+"of the contact if that address matches exactly\n"
+"one contact in the address book"
msgstr ""
-"可以包含上述符号，除了:\n"
-"?x{}, !x{}, |f{}, |p{}和|i{}"
-#: src/quote_fmt.c:88
+#: src/quote_fmt.c:105
msgid "Description of symbols"
msgstr "符号描述"
-#: src/quote_fmt.c:89
-msgid "The following symbols can be used:"
-msgstr "可以使用下述符号:"
+#: src/quote_fmt.c:106
+msgid "The following symbols and commands can be used:"
+msgstr "可以使用下述符号和命令:"
+
+#: src/quote_fmt.c:143
+msgid "Use template when composing new messages"
+msgstr "撰写新邮件时使用模板"
+
+#: src/quote_fmt.c:231
+msgid "Use template when replying to messages"
+msgstr "回复邮件时使用模板"
-#: src/quote_fmt_parse.y:464
+#: src/quote_fmt.c:246 src/quote_fmt.c:338
+msgid "Quotation mark"
+msgstr "引文符号"
+
+#: src/quote_fmt.c:323
+msgid "Use template when forwarding messages"
+msgstr "转发邮件时使用模板"
+
+#: src/quote_fmt.c:404
+msgid "Description of symbols..."
+msgstr "特殊符号说明... "
+
+#: src/quote_fmt.c:437
+msgid "Message reply quotation mark format error."
+msgstr "邮件回复格式中引文标志错误。"
+
+#: src/quote_fmt.c:453
+msgid "Message forward quotation mark format error."
+msgstr "邮件转发格式中引文标志错误。"
+
+#: src/quote_fmt_parse.y:508
#, c-format
msgid "Enter text to replace '%s'"
msgstr "请输入要替换'%s'的文字"
-#: src/quote_fmt_parse.y:465
+#: src/quote_fmt_parse.y:509
msgid "Enter variable"
msgstr "请输入变量"
msgid "Quitting..."
msgstr "正在退出..."
-#: src/send_message.c:517
+#: src/send_message.c:518
#, c-format
msgid "Sending message (%d / %d bytes)"
msgstr "正在发送邮件 (%d / %d bytes)"
-#: src/send_message.c:555
+#: src/send_message.c:566
msgid "Sending message"
msgstr "正在发送邮件"
-#: src/send_message.c:613 src/send_message.c:633
+#: src/send_message.c:624 src/send_message.c:644
msgid "Error occurred while sending the message."
msgstr "发送该邮件时发生错误。"
-#: src/send_message.c:616
+#: src/send_message.c:627
#, c-format
msgid ""
"Error occurred while sending the message:\n"
"直接使用。\n"
"如果你不确定有没有，请直接按下「确定」。"
-#: src/sourcewindow.c:66
+#: src/sourcewindow.c:69
msgid "Source of the message"
msgstr "邮件源文件"
-#: src/sourcewindow.c:161
+#: src/sourcewindow.c:164
#, c-format
msgid "%s - Source"
msgstr "%s - 邮件源文件"
msgid "Search messages"
msgstr "搜索邮件"
-#: src/summary_search.c:252
+#: src/summary_search.c:256
msgid "Match any of the following"
msgstr "满足下面任意一条件"
-#: src/summary_search.c:253
+#: src/summary_search.c:258
msgid "Match all of the following"
msgstr "满足下面所有条件"
-#: src/summary_search.c:352
-msgid "From:"
-msgstr "发信人:"
-
-#: src/summary_search.c:373
+#: src/summary_search.c:377
msgid "Body:"
msgstr "正文:"
-#: src/summary_search.c:380
+#: src/summary_search.c:384
msgid "Condition:"
msgstr "条件:"
-#: src/summary_search.c:410
+#: src/summary_search.c:414
msgid "Find _all"
msgstr "查找全部(_a)"
-#: src/summary_search.c:645
+#: src/summary_search.c:675
msgid "Beginning of list reached; continue from end?"
msgstr "搜寻已到顶端。要从结尾继续搜寻吗？"
-#: src/summary_search.c:647
+#: src/summary_search.c:677
msgid "End of list reached; continue from beginning?"
msgstr "搜寻已到结尾。要从开头继续搜寻吗？"
-#: src/summaryview.c:417
+#: src/summaryview.c:460
msgid "/_Reply"
msgstr "/回复(_R)"
-#: src/summaryview.c:418
+#: src/summaryview.c:462
msgid "/Repl_y to"
msgstr "/回复给(_y)"
-#: src/summaryview.c:419
+#: src/summaryview.c:463
msgid "/Repl_y to/_all"
msgstr "/回复给(_y)/所有人(_a)"
-#: src/summaryview.c:420
+#: src/summaryview.c:464
msgid "/Repl_y to/_sender"
msgstr "/回复给(_y)/发信人(_s)"
-#: src/summaryview.c:421
+#: src/summaryview.c:465
msgid "/Repl_y to/mailing _list"
msgstr "/回复给(_y)/邮件列表 (_l)"
-#: src/summaryview.c:424 src/toolbar.c:239
+#: src/summaryview.c:469 src/toolbar.c:253
msgid "/_Forward"
msgstr "转发(_F)"
-#: src/summaryview.c:425 src/toolbar.c:240
+#: src/summaryview.c:471 src/toolbar.c:254
msgid "/For_ward as attachment"
msgstr "/作为附件转发(_w)"
-#: src/summaryview.c:426
+#: src/summaryview.c:472
msgid "/Redirect"
msgstr "/重定向"
-#: src/summaryview.c:428
+#: src/summaryview.c:475
msgid "/M_ove..."
msgstr "/移动(_o)..."
-#: src/summaryview.c:429
+#: src/summaryview.c:476
msgid "/_Copy..."
msgstr "/复制(_C)..."
-#: src/summaryview.c:430
+#: src/summaryview.c:477
msgid "/Move to _trash"
-msgstr "/移å\8a¨å\88°å\9e\83å\9c¾æ¡¶(_t)"
+msgstr "/移å\8a¨å\88°åº\9f件夹(_t)"
-#: src/summaryview.c:431
+#: src/summaryview.c:479
msgid "/_Delete..."
msgstr "/删除(_D)..."
-#: src/summaryview.c:433
+#: src/summaryview.c:482
msgid "/_Mark"
msgstr "/标记(_M)"
-#: src/summaryview.c:434
+#: src/summaryview.c:483
msgid "/_Mark/_Mark"
msgstr "/标记(_M)/标记(_M)"
-#: src/summaryview.c:435
+#: src/summaryview.c:484
msgid "/_Mark/_Unmark"
msgstr "/标记(_M)/去除标记(_U)"
-#: src/summaryview.c:436 src/summaryview.c:442 src/summaryview.c:445
+#: src/summaryview.c:485 src/summaryview.c:493 src/summaryview.c:496
msgid "/_Mark/---"
msgstr "/标记(_M)/---"
-#: src/summaryview.c:437
+#: src/summaryview.c:486
msgid "/_Mark/Mark as unr_ead"
msgstr "/标记(_M)/标记为未读(_e)"
-#: src/summaryview.c:438
+#: src/summaryview.c:487
msgid "/_Mark/Mark as rea_d"
msgstr "/标记(_M)/标记为已读(_d)"
-#: src/summaryview.c:439
+#: src/summaryview.c:488
msgid "/_Mark/Mark all read"
msgstr "/标记(_M)/标记全部为已读"
-#: src/summaryview.c:440
+#: src/summaryview.c:489
msgid "/_Mark/Ignore thread"
msgstr "/标记(_M)/忽略邮件线索"
-#: src/summaryview.c:441
+#: src/summaryview.c:490
msgid "/_Mark/Unignore thread"
msgstr "/标记(_M)/不忽略邮件线索"
-#: src/summaryview.c:443
+#: src/summaryview.c:491
+msgid "/_Mark/Watch thread"
+msgstr "/标记(_M)/监视此话题"
+
+#: src/summaryview.c:492
+msgid "/_Mark/Unwatch thread"
+msgstr "/标记(_M)/取消话题监视"
+
+#: src/summaryview.c:494
msgid "/_Mark/Mark as _spam"
msgstr "/标记(_M)/标记为垃圾邮件(_s)"
-#: src/summaryview.c:444
+#: src/summaryview.c:495
msgid "/_Mark/Mark as _ham"
msgstr "/标记(_M)/标记为非垃圾邮件(_h)"
-#: src/summaryview.c:446
+#: src/summaryview.c:497
msgid "/_Mark/Lock"
msgstr "/标记(_M)/锁定"
-#: src/summaryview.c:447
+#: src/summaryview.c:498
msgid "/_Mark/Unlock"
msgstr "/标记(_M)/解锁"
-#: src/summaryview.c:448
+#: src/summaryview.c:499
msgid "/Color la_bel"
msgstr "/彩色标记(_b)"
-#: src/summaryview.c:451
+#: src/summaryview.c:500
+msgid "/Ta_gs"
+msgstr ""
+
+#: src/summaryview.c:504
msgid "/Add sender to address boo_k"
msgstr "将发信人加入地址簿中(_k)"
-#: src/summaryview.c:453
+#: src/summaryview.c:507
msgid "/Create f_ilter rule"
msgstr "/创建邮件过滤规则(_i)"
-#: src/summaryview.c:454
+#: src/summaryview.c:508
msgid "/Create f_ilter rule/_Automatically"
msgstr "/创建邮件过滤规则(_i)/自动创建"
-#: src/summaryview.c:456
+#: src/summaryview.c:510
msgid "/Create f_ilter rule/by _From"
msgstr "/创建邮件过滤规则(_i)/按来源(_F)"
-#: src/summaryview.c:458
+#: src/summaryview.c:512
msgid "/Create f_ilter rule/by _To"
msgstr "/创建邮件过滤规则(_i)/按收信人(_T)"
-#: src/summaryview.c:460
+#: src/summaryview.c:514
msgid "/Create f_ilter rule/by _Subject"
msgstr "/创建邮件过滤规则(_i)/按标题(_S)"
-#: src/summaryview.c:462
+#: src/summaryview.c:517
msgid "/Create processing rule"
msgstr "/创建处理规则"
-#: src/summaryview.c:463
+#: src/summaryview.c:518
msgid "/Create processing rule/_Automatically"
msgstr "/创建处理规则/自动创建(_A)"
-#: src/summaryview.c:465
+#: src/summaryview.c:520
msgid "/Create processing rule/by _From"
msgstr "/创建处理规则/按来源(_F)"
-#: src/summaryview.c:467
+#: src/summaryview.c:522
msgid "/Create processing rule/by _To"
msgstr "/创建处理规则/按收信人(_T)"
-#: src/summaryview.c:469
+#: src/summaryview.c:524
msgid "/Create processing rule/by _Subject"
msgstr "/创建处理规则/按标题(_S)"
-#: src/summaryview.c:475
+#: src/summaryview.c:531
msgid "/_View/Message _source"
msgstr "/查看(_V)/邮件源文件(_s)"
-#: src/summaryview.c:476
+#: src/summaryview.c:533
msgid "/_View/All _headers"
msgstr "/查看(_V)/所有信头(_h)"
-#: src/summaryview.c:479
+#: src/summaryview.c:536
+msgid "/_Save as..."
+msgstr "/另存为(_S)..."
+
+#: src/summaryview.c:538
msgid "/_Print..."
msgstr "/打印(_P)..."
-#: src/summaryview.c:597
+#: src/summaryview.c:660
msgid "Toggle quick search bar"
msgstr "切换快速搜索条显示状态"
-#: src/summaryview.c:1022
+#: src/summaryview.c:698
+#, fuzzy
+msgid "Toggle multiple selection"
+msgstr "选中的文字"
+
+#: src/summaryview.c:1178
msgid "Process mark"
msgstr "邮件标记"
-#: src/summaryview.c:1023
+#: src/summaryview.c:1179
msgid "Some marks are left. Process them?"
msgstr "某些邮件已做了待处理标记。是否进行处理？"
-#: src/summaryview.c:1080
+#: src/summaryview.c:1236
#, c-format
msgid "Scanning folder (%s)..."
-msgstr "扫描文件夹(%s)..."
+msgstr "扫描目录(%s)..."
-#: src/summaryview.c:1548 src/summaryview.c:1600
+#: src/summaryview.c:1717 src/summaryview.c:1769
msgid "No more unread messages"
msgstr "没有其他新邮件"
-#: src/summaryview.c:1549
+#: src/summaryview.c:1718
msgid "No unread message found. Search from the end?"
msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
-#: src/summaryview.c:1561 src/summaryview.c:1613 src/summaryview.c:1660
-#: src/summaryview.c:1712 src/summaryview.c:1791
+#: src/summaryview.c:1730 src/summaryview.c:1782 src/summaryview.c:1829
+#: src/summaryview.c:1881 src/summaryview.c:1960
msgid ""
"Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
msgstr ""
-#: src/summaryview.c:1569
+#: src/summaryview.c:1738
msgid "No unread messages."
msgstr "没有未读邮件。"
-#: src/summaryview.c:1601
+#: src/summaryview.c:1770
msgid "No unread message found. Go to next folder?"
-msgstr "没有新邮件。要到下一个文件夹吗？"
+msgstr "没有新邮件。要到下一个目录吗？"
-#: src/summaryview.c:1647 src/summaryview.c:1699
+#: src/summaryview.c:1816 src/summaryview.c:1868
msgid "No more new messages"
msgstr "没有其他新邮件"
-#: src/summaryview.c:1648
+#: src/summaryview.c:1817
msgid "No new message found. Search from the end?"
msgstr "没有找到新邮件。要从尾部继续搜寻吗？"
-#: src/summaryview.c:1668
+#: src/summaryview.c:1837
msgid "No new messages."
msgstr "没有新邮件"
-#: src/summaryview.c:1700
+#: src/summaryview.c:1869
msgid "No new message found. Go to next folder?"
-msgstr "没有新邮件。要转到下一个文件夹吗？"
+msgstr "没有新邮件。要转到下一个目录吗？"
-#: src/summaryview.c:1737 src/summaryview.c:1778
+#: src/summaryview.c:1906 src/summaryview.c:1947
msgid "No more marked messages"
msgstr "没有其他已标记邮件"
-#: src/summaryview.c:1738
+#: src/summaryview.c:1907
msgid "No marked message found. Search from the end?"
msgstr "没有找到已标记邮件。要从尾部继续搜寻吗？"
-#: src/summaryview.c:1747
+#: src/summaryview.c:1916
msgid "No marked messages."
msgstr "没有已标记邮件"
-#: src/summaryview.c:1779
+#: src/summaryview.c:1948
msgid "No marked message found. Go to next folder?"
-msgstr "没有已标记的新邮件。要转到下一个文件夹吗？"
+msgstr "没有已标记的新邮件。要转到下一个目录吗？"
-#: src/summaryview.c:1816 src/summaryview.c:1841
+#: src/summaryview.c:1985 src/summaryview.c:2010
msgid "No more labeled messages"
msgstr "没有已标记颜色之邮件"
-#: src/summaryview.c:1817
+#: src/summaryview.c:1986
msgid "No labeled message found. Search from the end?"
msgstr "没有找到已标记颜色之邮件。要从尾部继续搜寻吗？"
-#: src/summaryview.c:1826 src/summaryview.c:1851
+#: src/summaryview.c:1995 src/summaryview.c:2020
msgid "No labeled messages."
msgstr "没有已标记颜色之邮件"
-#: src/summaryview.c:1842
+#: src/summaryview.c:2011
msgid "No labeled message found. Search from the beginning?"
msgstr "没有找到已标记颜色之邮件。要从开头继续搜寻吗？"
-#: src/summaryview.c:2133
+#: src/summaryview.c:2302
msgid "Attracting messages by subject..."
msgstr "正在按主题排列邮件邮件..."
-#: src/summaryview.c:2291
+#: src/summaryview.c:2463
#, c-format
msgid "%d deleted"
msgstr "%d 封已删除"
-#: src/summaryview.c:2295
+#: src/summaryview.c:2467
#, c-format
msgid "%s%d moved"
msgstr "%s%d 封已移动"
-#: src/summaryview.c:2296 src/summaryview.c:2303
+#: src/summaryview.c:2468 src/summaryview.c:2475
msgid ", "
msgstr "，"
-#: src/summaryview.c:2301
+#: src/summaryview.c:2473
#, c-format
msgid "%s%d copied"
msgstr "%s%d 已复制"
-#: src/summaryview.c:2316
+#: src/summaryview.c:2488
msgid " item selected"
msgstr "封已选择"
-#: src/summaryview.c:2318
+#: src/summaryview.c:2490
msgid " items selected"
msgstr "封已选择"
-#: src/summaryview.c:2334
+#: src/summaryview.c:2508 src/summaryview.c:2525
#, c-format
msgid "%d new, %d unread, %d total (%s)"
msgstr "%d 封新邮件，%d 封未读，共 %d 封 (%s)"
-#: src/summaryview.c:2543
+#: src/summaryview.c:2520
+#, c-format
+msgid "%d/%d selected (%s/%s), %d unread"
+msgstr "%d/%d选中 (%s/%s), %d未读"
+
+#: src/summaryview.c:2792
msgid "Sorting summary..."
msgstr "正在对邮件进行排序..."
-#: src/summaryview.c:2624
+#: src/summaryview.c:2900
msgid "Setting summary from message data..."
msgstr "正在根据邮件数据提取摘要信息..."
-#: src/summaryview.c:2802
+#: src/summaryview.c:3094
msgid "(No Date)"
msgstr "(没有日期)"
-#: src/summaryview.c:2840
+#: src/summaryview.c:3131
msgid "(No Recipient)"
msgstr "(没有收件人)"
-#: src/summaryview.c:3661
+#: src/summaryview.c:3989
msgid "You're not the author of the article.\n"
msgstr "你不是这篇文章的作者。\n"
-#: src/summaryview.c:3746
+#: src/summaryview.c:4077
+#, c-format
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the %d selected messages?"
+msgstr[0] ""
+
+#: src/summaryview.c:4080
msgid "Delete message(s)"
msgstr "删除邮件"
-#: src/summaryview.c:3747
-msgid "Do you really want to delete selected message(s)?"
-msgstr "确定删除选定的邮件吗？"
-
-#: src/summaryview.c:3900
+#: src/summaryview.c:4237
msgid "Destination is same as current folder."
-msgstr "目标文件夹与当前文件夹相同"
+msgstr "目标目录与当前目录相同"
-#: src/summaryview.c:3991
+#: src/summaryview.c:4334
msgid "Destination to copy is same as current folder."
-msgstr "目标文件夹与来源文件夹相同"
+msgstr "目标目录与来源目录相同"
-#: src/summaryview.c:4120
+#: src/summaryview.c:4499
msgid "Append or Overwrite"
msgstr "附加或覆盖"
-#: src/summaryview.c:4121
+#: src/summaryview.c:4500
msgid "Append or overwrite existing file?"
msgstr "附加或覆盖文件？"
-#: src/summaryview.c:4122
+#: src/summaryview.c:4501
msgid "_Append"
msgstr "追加(_A)"
-#: src/summaryview.c:4122
+#: src/summaryview.c:4501
msgid "_Overwrite"
msgstr "覆盖(_O)"
-#: src/summaryview.c:4479
+#: src/summaryview.c:4548
+#, c-format
+msgid ""
+"You are about to print %d messages, one by one. Do you want to continue?"
+msgstr "你想要打印%d封邮件。是否继续？"
+
+#: src/summaryview.c:4869
msgid "Building threads..."
msgstr "正在建立邮件线索..."
-#: src/summaryview.c:4698
+#: src/summaryview.c:5088
msgid "Skip these rules"
msgstr "忽略这些规则"
-#: src/summaryview.c:4701
+#: src/summaryview.c:5091
msgid "Apply these rules regardless of the account they belong to"
msgstr "使用这些规则(不管它们属于那个账户)"
-#: src/summaryview.c:4704
+#: src/summaryview.c:5094
msgid "Apply these rules if they apply to the current account"
msgstr "使用这些规则(如果它们可用于当前账户)"
-#: src/summaryview.c:4733
+#: src/summaryview.c:5123
msgid "Filtering"
msgstr "正在过滤邮件..."
-#: src/summaryview.c:4734
+#: src/summaryview.c:5124
msgid ""
"There are some filtering rules that belong to an account.\n"
"Please choose what to do with these rules:"
"有些规则是专属于某个账户的。\n"
"请选择如何使用它们:"
-#: src/summaryview.c:4736
-msgid "+_Filter"
-msgstr "+过滤(_F)"
+#: src/summaryview.c:5126
+msgid "_Filter"
+msgstr "过滤(_F)"
-#: src/summaryview.c:4763
+#: src/summaryview.c:5154
msgid "Filtering..."
msgstr "正在过滤邮件..."
-#: src/summaryview.c:4836
+#: src/summaryview.c:5233
msgid "Processing configuration"
msgstr "过滤处理配置"
-#: src/summaryview.c:6284
+#: src/summaryview.c:5758
+msgid "Ignored thread"
+msgstr "忽略讨论线索"
+
+#: src/summaryview.c:5760
+msgid "Watched thread"
+msgstr "监视此话题"
+
+#: src/summaryview.c:5768
+msgid "Replied - click to see reply"
+msgstr "已回复 - 点击此处查看回复"
+
+#: src/summaryview.c:5780
+msgid "To be moved"
+msgstr "待移动"
+
+#: src/summaryview.c:5782
+msgid "To be copied"
+msgstr "待拷贝"
+
+#: src/summaryview.c:5794
+msgid "Signed, has attachment(s)"
+msgstr "有签名，有附件"
+
+#: src/summaryview.c:5796
+msgid "Signed"
+msgstr "有签名"
+
+#: src/summaryview.c:5798
+msgid "Encrypted, has attachment(s)"
+msgstr "已加密，有附件"
+
+#: src/summaryview.c:5800
+msgid "Encrypted"
+msgstr "已加密"
+
+#: src/summaryview.c:5802
+msgid "Has attachment(s)"
+msgstr "有附件"
+
+#: src/summaryview.c:7300
#, c-format
msgid ""
"Regular expression (regexp) error:\n"
"正则表达式(regexp)错误:\n"
"%s"
-#: src/textview.c:220
+#: src/summaryview.c:7403
+msgid "Go back to the folder list (You have unread messages)"
+msgstr "回到邮件夹列表(您有未读邮件)"
+
+#: src/summaryview.c:7409
+msgid "Go back to the folder list"
+msgstr "回到邮件夹列表"
+
+#: src/textview.c:221
msgid "/Compose _new message"
msgstr "/撰写新邮件(_n)"
-#: src/textview.c:221
+#: src/textview.c:222
msgid "/Add to _address book"
msgstr "/将地址加入地址簿(_a)"
-#: src/textview.c:222
+#: src/textview.c:223
msgid "/Copy this add_ress"
msgstr "/复制此地址(_r)"
-#: src/textview.c:227
+#: src/textview.c:228
msgid "/_Open image"
msgstr "/打开图片(_O)"
-#: src/textview.c:228
+#: src/textview.c:229
msgid "/_Save image..."
msgstr "/保存图片(_S)..."
-#: src/textview.c:637
+#: src/textview.c:662
#, c-format
msgid "[%s %s (%d bytes)]"
msgstr "[%s %s (%d字节)]"
-#: src/textview.c:640
+#: src/textview.c:665
#, c-format
msgid "[%s (%d bytes)]"
msgstr "[%s (%d字节)]"
-#: src/textview.c:811
+#: src/textview.c:841
msgid ""
"\n"
" This message can't be displayed.\n"
"\n"
" 可用'工具'菜单中的 "
-#: src/textview.c:816
+#: src/textview.c:846
msgid "'View Log'"
msgstr "查看日志文件"
-#: src/textview.c:817
+#: src/textview.c:847
msgid " in the Tools menu for more information."
msgstr "一项了解更多信息。"
-#: src/textview.c:838
-msgid " The following can be performed on this part by\n"
-msgstr " 可对该部分执行以下操作\n"
+#: src/textview.c:887
+msgid " The following can be performed on this part\n"
+msgstr " 可对此部分执行以下操作\n"
-#: src/textview.c:839
-msgid " right-clicking the icon or list item:\n"
-msgstr " 右键点击图标或者列表项:\n"
+#: src/textview.c:889
+msgid " by right-clicking the icon or list item:"
+msgstr " 右键点击图标或者列表项:"
-#: src/textview.c:841
+#: src/textview.c:893
msgid " - To save, select "
msgstr " - 若要保存，请选择"
-#: src/textview.c:842
+#: src/textview.c:894
msgid "'Save as...'"
msgstr "另存为..."
-#: src/textview.c:843
-msgid " (Shortcut key: 'y')\n"
-msgstr " (快捷键: 'y')\n"
+#: src/textview.c:896
+msgid " (Shortcut key: 'y')"
+msgstr " (快捷键: 'y')"
-#: src/textview.c:844
+#: src/textview.c:900
msgid " - To display as text, select "
msgstr " - 若要以文本方式显示，请选择 "
-#: src/textview.c:845
+#: src/textview.c:901
msgid "'Display as text'"
msgstr "'以文本方式显示'"
-#: src/textview.c:846
-msgid " (Shortcut key: 't')\n"
-msgstr " (快捷键: 't')\n"
+#: src/textview.c:904
+msgid " (Shortcut key: 't')"
+msgstr " (快捷键: 't')"
-#: src/textview.c:847
+#: src/textview.c:908
msgid " - To open with an external program, select "
msgstr " - 若要用外部程序打开，请选择"
-#: src/textview.c:848
+#: src/textview.c:909
msgid "'Open'"
msgstr "'打开'"
-#: src/textview.c:849
+#: src/textview.c:912
msgid " (Shortcut key: 'l')\n"
msgstr " (快捷键: 'l')\n"
-#: src/textview.c:850
+#: src/textview.c:913
msgid " (alternately double-click, or click the middle "
msgstr " (也可以双击或者点击),"
-#: src/textview.c:851
+#: src/textview.c:914
msgid "mouse button)\n"
msgstr "鼠标中键)\n"
-#: src/textview.c:852
+#: src/textview.c:915
msgid " - Or use "
msgstr " - 或者采用"
-#: src/textview.c:853
+#: src/textview.c:916
msgid "'Open with...'"
msgstr "'打开方式...'"
-#: src/textview.c:854
-msgid " (Shortcut key: 'o')\n"
-msgstr " (快捷键: 'o')\n"
+#: src/textview.c:917
+msgid " (Shortcut key: 'o')"
+msgstr " (快捷键: 'o')"
-#: src/textview.c:943
+#: src/textview.c:1008
#, c-format
msgid ""
"The command to view attachment as text failed:\n"
" %s\n"
"程序退出码 %d\n"
-#: src/textview.c:2498
+#: src/textview.c:2068
+msgid "Tags: "
+msgstr "标签: "
+
+#: src/textview.c:2752
#, c-format
msgid ""
"The real URL is different from the displayed URL.\n"
"\n"
"真的要打开吗?"
-#: src/textview.c:2507
+#: src/textview.c:2761
msgid "Phishing attempt warning"
msgstr "钓鱼企图警告"
-#: src/textview.c:2508
+#: src/textview.c:2762
msgid "_Open URL"
msgstr "打开(_O)"
-#: src/toolbar.c:166 src/toolbar.c:1535
+#: src/toolbar.c:176 src/toolbar.c:1859
msgid "Receive Mail on all Accounts"
msgstr "收所有帐号的信"
-#: src/toolbar.c:167 src/toolbar.c:1549
+#: src/toolbar.c:177 src/toolbar.c:1864
msgid "Receive Mail on current Account"
msgstr "用目前的帐号收信"
-#: src/toolbar.c:168 src/toolbar.c:1555
+#: src/toolbar.c:178 src/toolbar.c:1868
msgid "Send Queued Messages"
msgstr "送出待发送邮件"
-#: src/toolbar.c:169 src/toolbar.c:1568
+#: src/toolbar.c:179 src/toolbar.c:894 src/toolbar.c:1882 src/toolbar.c:1893
msgid "Compose Email"
msgstr "写信"
-#: src/toolbar.c:170 src/toolbar.c:1572
+#: src/toolbar.c:180
msgid "Compose News"
msgstr "撰写文章"
-#: src/toolbar.c:171 src/toolbar.c:1614 src/toolbar.c:1624
+#: src/toolbar.c:181 src/toolbar.c:1918 src/toolbar.c:1925
msgid "Reply to Message"
msgstr "回应原文"
-#: src/toolbar.c:172 src/toolbar.c:1631 src/toolbar.c:1641
+#: src/toolbar.c:182 src/toolbar.c:1932 src/toolbar.c:1939
msgid "Reply to Sender"
msgstr "回复给发信人"
-#: src/toolbar.c:173 src/toolbar.c:1648 src/toolbar.c:1658
+#: src/toolbar.c:183 src/toolbar.c:1946 src/toolbar.c:1953
msgid "Reply to All"
msgstr "回复给所有人"
-#: src/toolbar.c:174 src/toolbar.c:1665 src/toolbar.c:1675
+#: src/toolbar.c:184 src/toolbar.c:1960 src/toolbar.c:1967
msgid "Reply to Mailing-list"
msgstr "回复至邮件列表"
-#: src/toolbar.c:175 src/toolbar.c:1682 src/toolbar.c:1692
+#: src/toolbar.c:185 src/toolbar.c:1876
+msgid "Open email"
+msgstr "打开邮件"
+
+#: src/toolbar.c:186 src/toolbar.c:1974 src/toolbar.c:1981
msgid "Forward Message"
msgstr "转发邮件"
-#: src/toolbar.c:176 src/toolbar.c:1699
+#: src/toolbar.c:187 src/toolbar.c:1986
msgid "Trash Message"
-msgstr "将邮件转移到垃圾桶"
+msgstr "将邮件移到废件夹"
-#: src/toolbar.c:177 src/toolbar.c:1705
+#: src/toolbar.c:188 src/toolbar.c:1990
msgid "Delete Message"
msgstr "删除邮件"
-#: src/toolbar.c:179 src/toolbar.c:1717
+#: src/toolbar.c:190 src/toolbar.c:1998
msgid "Go to Previous Unread Message"
msgstr "转到上一封未读邮件"
-#: src/toolbar.c:180 src/toolbar.c:1724
+#: src/toolbar.c:191 src/toolbar.c:2002
msgid "Go to Next Unread Message"
msgstr "转到下一封未读邮件"
-#: src/toolbar.c:183
+#: src/toolbar.c:195
msgid "Learn Spam or Ham"
msgstr "训练识别垃圾邮件的能力"
-#: src/toolbar.c:185 src/toolbar.c:1733
+#: src/toolbar.c:196
+msgid "Open folder/Go to folder list"
+msgstr "打开邮件夹/转到邮件夹列表"
+
+#: src/toolbar.c:198 src/toolbar.c:2008
msgid "Send Message"
msgstr "发送邮件"
-#: src/toolbar.c:186 src/toolbar.c:1739
+#: src/toolbar.c:199 src/toolbar.c:2012
msgid "Put into queue folder and send later"
-msgstr "放入待发送文件夹稍后再送"
+msgstr "放入待发送目录稍后再送"
-#: src/toolbar.c:187 src/toolbar.c:1745
+#: src/toolbar.c:200 src/toolbar.c:2016
msgid "Save to draft folder"
-msgstr "存入草稿文件夹"
+msgstr "存入草稿目录"
-#: src/toolbar.c:188 src/toolbar.c:1751
+#: src/toolbar.c:201 src/toolbar.c:2020
msgid "Insert file"
msgstr "插入文件"
-#: src/toolbar.c:189 src/toolbar.c:1757
+#: src/toolbar.c:202 src/toolbar.c:2024
msgid "Attach file"
msgstr "附加文件"
-#: src/toolbar.c:190 src/toolbar.c:1763
+#: src/toolbar.c:203 src/toolbar.c:2028
msgid "Insert signature"
msgstr "插入签名"
-#: src/toolbar.c:191 src/toolbar.c:1769
+#: src/toolbar.c:204 src/toolbar.c:2032
msgid "Edit with external editor"
msgstr "以外部编辑器编辑"
-#: src/toolbar.c:192 src/toolbar.c:1775
+#: src/toolbar.c:205 src/toolbar.c:2036
msgid "Wrap long lines of current paragraph"
msgstr "拆分当前段落中超长的行"
-#: src/toolbar.c:193 src/toolbar.c:1781
+#: src/toolbar.c:206 src/toolbar.c:2040
msgid "Wrap all long lines"
msgstr "拆分所有超长的行"
-#: src/toolbar.c:196 src/toolbar.c:1794
+#: src/toolbar.c:209 src/toolbar.c:449 src/toolbar.c:2049
msgid "Check spelling"
msgstr "检查拼写"
-#: src/toolbar.c:198
+#: src/toolbar.c:211
msgid "Claws Mail Actions Feature"
msgstr "Claws Mail 动作特性"
-#: src/toolbar.c:199 src/toolbar.c:1817
+#: src/toolbar.c:212 src/toolbar.c:2065
msgid "Cancel receiving"
msgstr "取消收信"
-#: src/toolbar.c:219
+#: src/toolbar.c:213 src/toolbar.c:1872
+msgid "Close window"
+msgstr "关闭窗口"
+
+#: src/toolbar.c:233
msgid "/Reply with _quote"
msgstr "/回信时引用原文(_q)"
-#: src/toolbar.c:220
+#: src/toolbar.c:234
msgid "/_Reply without quote"
msgstr "/回信时不引用原文(_R)"
-#: src/toolbar.c:224
+#: src/toolbar.c:238
msgid "/Reply to all with _quote"
msgstr "/回信给所有人时引用原文(_q)"
-#: src/toolbar.c:225
+#: src/toolbar.c:239
msgid "/_Reply to all without quote"
msgstr "/回信给所有人时不引用原文(_R)"
-#: src/toolbar.c:229
+#: src/toolbar.c:243
msgid "/Reply to list with _quote"
msgstr "/回信给列表且引用原文(_q)"
-#: src/toolbar.c:230
+#: src/toolbar.c:244
msgid "/_Reply to list without quote"
msgstr "/回信到列表不引用原文(_R)"
-#: src/toolbar.c:234
+#: src/toolbar.c:248
msgid "/Reply to sender with _quote"
msgstr "/回信时引用原文(_q)"
-#: src/toolbar.c:235
+#: src/toolbar.c:249
msgid "/_Reply to sender without quote"
msgstr "/回信时不引用原文(_R)"
-#: src/toolbar.c:241
+#: src/toolbar.c:255
msgid "/Redirec_t"
msgstr "/重定向(_t)"
-#: src/toolbar.c:245
+#: src/toolbar.c:260
msgid "/Learn as _Spam"
msgstr "/学习垃圾邮件"
-#: src/toolbar.c:246
+#: src/toolbar.c:261
msgid "/Learn as _Ham"
msgstr "/学习非垃圾邮件"
-#: src/toolbar.c:399
+#: src/toolbar.c:416
+msgid "Open"
+msgstr "打开"
+
+#: src/toolbar.c:417
msgid "Get Mail"
msgstr "收信"
-#: src/toolbar.c:403
+#: src/toolbar.c:418
+msgid "Get"
+msgstr "收取"
+
+#: src/toolbar.c:420 src/toolbar.c:421
msgid "Toolbar|Compose"
msgstr "撰写"
-#: src/toolbar.c:405 src/toolbar.c:496
-msgid "Reply"
-msgstr "回复"
-
-#: src/toolbar.c:406 src/toolbar.c:497
+#: src/toolbar.c:423
msgid "All"
msgstr "全部"
-#: src/toolbar.c:407 src/toolbar.c:498
-msgid "Sender"
-msgstr "å\8f\91信人"
+#: src/toolbar.c:425
+msgid "List"
+msgstr "å\88\97表"
-#: src/toolbar.c:412 src/toolbar.c:503
-msgid "Spam"
-msgstr "垃圾邮件"
+#: src/toolbar.c:430
+msgid "Prev"
+msgstr "上一个"
-#: src/toolbar.c:415 src/toolbar.c:505
+#: src/toolbar.c:431
msgid "Next"
msgstr "下一个"
-#: src/toolbar.c:453
-msgid "Send later"
-msgstr "稍后再送"
-
-#: src/toolbar.c:454
+#: src/toolbar.c:438
msgid "Draft"
msgstr "草稿"
-#: src/toolbar.c:1542
-msgid "Receive Mail on selected Account"
-msgstr "æ\94¶é\80\89ä¸å¸\90å\8f·ç\9a\84ä¿¡"
+#: src/toolbar.c:441
+msgid "Insert sig."
+msgstr "æ\8f\92å\85¥ç¾å\90\8d"
-#: src/toolbar.c:1579
-msgid "Compose with selected Account"
-msgstr "以选中帐号撰写邮件"
+#: src/toolbar.c:442
+msgid "Edit"
+msgstr "编辑"
-#: src/toolbar.c:1585
-msgid "Ham"
-msgstr "非垃圾"
+#: src/toolbar.c:443
+msgid "Wrap para."
+msgstr "段落折行"
+
+#: src/toolbar.c:444
+msgid "Wrap all"
+msgstr "全部折行"
+
+#: src/toolbar.c:446
+msgid "Stop"
+msgstr "停止"
-#: src/toolbar.c:1593
-msgid "Learn Spam"
+#: src/toolbar.c:885
+msgid "Compose News message"
+msgstr "撰写新邮件"
+
+#: src/toolbar.c:926
+msgid "Learn spam"
msgstr "学习垃圾邮件"
-#: src/toolbar.c:1597
-msgid "Learn Ham"
+#: src/toolbar.c:935
+msgid "Ham"
+msgstr "非垃圾"
+
+#: src/toolbar.c:938
+msgid "Learn ham"
msgstr "学习非垃圾邮件"
-#: src/toolbar.c:1607
+#: src/toolbar.c:1854
+msgid "Go to folder list"
+msgstr "转到邮件夹列表"
+
+#: src/toolbar.c:1860
+msgid "Receive Mail on selected Account"
+msgstr "收选中帐号的信"
+
+#: src/toolbar.c:1883
+msgid "Compose with selected Account"
+msgstr "以选中帐号撰写邮件"
+
+#: src/toolbar.c:1904
msgid "Learn as..."
msgstr "学习..."
-#: src/toolbar.c:1607
-msgid "Learn"
-msgstr "学习"
+#: src/toolbar.c:1919
+msgid "Reply to Message options"
+msgstr "回复选项"
+
+#: src/toolbar.c:1933
+msgid "Reply to Sender options"
+msgstr "回复给发信人选项"
-#: src/uri_opener.c:84
+#: src/toolbar.c:1947
+msgid "Reply to All options"
+msgstr "回复给所有人选项"
+
+#: src/toolbar.c:1961
+msgid "Reply to Mailing-list options"
+msgstr "回复给邮件列表选项"
+
+#: src/toolbar.c:1975
+msgid "Forward Message options"
+msgstr "转发邮件选项"
+
+#: src/uri_opener.c:87
msgid "There are no URLs in this email."
msgstr "此邮件中没有网址。"
-#: src/uri_opener.c:112
+#: src/uri_opener.c:123
msgid "Available URLs:"
msgstr "可用网址:"
-#: src/uri_opener.c:159
+#: src/uri_opener.c:171
msgid "Dialog title|Open URLs"
msgstr "打开网络地址"
-#: src/uri_opener.c:173
-msgid "Open _All"
-msgstr "全部打开(_A)"
-
-#: src/uri_opener.c:187
+#: src/uri_opener.c:196
msgid "Please select the URL to open."
msgstr "请选择要打开的URL"
-#: src/wizard.c:469
+#: src/uri_opener.c:208
+msgid "Select All"
+msgstr "全选"
+
+#: src/wizard.c:496
msgid "Welcome Mail Subject|Welcome to Claws Mail"
msgstr "欢迎使用Claws Mail"
-#: src/wizard.c:492
+#: src/wizard.c:519
#, c-format
msgid ""
"\n"
"LICENSE\n"
"-------\n"
"Claws Mail is free software, released under the terms\n"
-"of the GNU General Public License, version 2 or later, as\n"
+"of the GNU General Public License, version 3 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"
"-------\n"
"Claws Mail是自由软件，受GNU通用许可协议(GPL)的条款所约束\n"
-"(GPL V2或者更高版本)。GPL协议由自由软件基金会\n"
+"(GPL V3或者更高版本)。GPL协议由自由软件基金会\n"
"(Free Software Foundation, 51 Franklin Street,\n"
"Fifth Floor, Boston, MA 02110-1301, USA)\n"
"发布，可以在 <%s> 找到\n"
"\n"
"\n"
-#: src/wizard.c:572
+#: src/wizard.c:595
msgid "Please enter the mailbox name."
msgstr "请输入邮箱名称。"
-#: src/wizard.c:600
+#: src/wizard.c:638
msgid "Please enter your name and email address."
msgstr "按输入你的名字和邮件地址。"
-#: src/wizard.c:611
+#: src/wizard.c:649
msgid "Please enter your receiving server and username."
msgstr "请输入收信服务器和用户名。"
-#: src/wizard.c:621
+#: src/wizard.c:659
msgid "Please enter your username."
msgstr "请输入用户名。"
-#: src/wizard.c:631
+#: src/wizard.c:669
msgid "Please enter your SMTP server."
msgstr "请输入SMTP服务器名。"
-#: src/wizard.c:642
+#: src/wizard.c:680
msgid "Please enter your SMTP username."
msgstr "请输入SMTP用户名。"
-#: src/wizard.c:892
+#: src/wizard.c:961
msgid "<span weight=\"bold\">Your name:</span>"
msgstr "<span weight=\"bold\">你的名字:</span>"
-#: src/wizard.c:897
+#: src/wizard.c:968
msgid "<span weight=\"bold\">Your email address:</span>"
msgstr "<span weight=\"bold\">你的邮件地址:</span>"
-#: src/wizard.c:901
+#: src/wizard.c:975
msgid "Your organization:"
msgstr "你所在的组织"
-#: src/wizard.c:924
+#: src/wizard.c:1077
+msgid "<span weight=\"bold\">Mailbox name:</span>"
+msgstr "<span weight=\"bold\">邮箱名称:</span>"
+
+#: src/wizard.c:1086
msgid ""
"You can also specify an absolute path, for example: \"/home/john/Documents/"
"Mail\""
msgstr "您可以指定一个绝对路径，比如: \"/home/john/Documents/Mail\""
-#: src/wizard.c:928
-msgid "<span weight=\"bold\">Mailbox name:</span>"
-msgstr "<span weight=\"bold\">邮箱名称:</span>"
+#: src/wizard.c:1095
+msgid "on internal memory"
+msgstr "在内置内存中"
+
+#: src/wizard.c:1098
+msgid "on external memory card"
+msgstr "在存储卡中"
+
+#: src/wizard.c:1101
+msgid "on internal memory card"
+msgstr "在内置内存中"
-#: src/wizard.c:965
+#: src/wizard.c:1151
+msgid "<span weight=\"bold\">Store data</span>"
+msgstr "<span weight=\"bold\">保存数据</span>"
+
+#: src/wizard.c:1194
msgid ""
"You can specify the port number by appending it at the end: \"mail.example."
"com:25\""
msgstr "您可以在尾端指定端口号: \"mail.example.com:25\""
-#: src/wizard.c:969
+#: src/wizard.c:1198
msgid "<span weight=\"bold\">SMTP server address:</span>"
msgstr "<span weight=\"bold\">SMTP服务器名称:</span>"
-#: src/wizard.c:972
+#: src/wizard.c:1205
msgid "Use authentication"
msgstr "用户鉴权"
-#: src/wizard.c:986
+#: src/wizard.c:1220
msgid ""
"SMTP username:\n"
-"<span size=\"small\">(empty to use the same as reception)</span>"
+"<span size=\"small\">(empty to use the same as receive)</span>"
msgstr ""
"SMTP 用户名:\n"
"<span size=\"small\">(如果与收信用户名相同，可保持为空)</span>"
-#: src/wizard.c:999
+#: src/wizard.c:1237
msgid ""
"SMTP password:\n"
-"<span size=\"small\">(empty to use the same as reception)</span>"
+"<span size=\"small\">(empty to use the same as receive)</span>"
msgstr ""
"SMTP 密码:\n"
"<span size=\"small\">(如果与收信设置相同，可保持为空)</span>"
-#: src/wizard.c:1011
+#: src/wizard.c:1248
msgid "Use SSL to connect to SMTP server"
msgstr "采用SSL连接SMTP服务器"
-#: src/wizard.c:1018 src/wizard.c:1255
+#: src/wizard.c:1256 src/wizard.c:1478
msgid "Use SSL via STARTTLS"
msgstr "通过STARTTLS使用SSL"
-#: src/wizard.c:1049 src/wizard.c:1069 src/wizard.c:1180
+#: src/wizard.c:1285 src/wizard.c:1309 src/wizard.c:1430
msgid "<span weight=\"bold\">Server address:</span>"
msgstr "<span weight=\"bold\">服务器地址:</span>"
-#: src/wizard.c:1090
+#: src/wizard.c:1338
msgid "<span weight=\"bold\">Local mailbox:</span>"
msgstr "<span weight=\"bold\">本地邮箱:</span>"
-#: src/wizard.c:1142
+#: src/wizard.c:1395
msgid "IMAP"
msgstr "IMAP"
-#: src/wizard.c:1167
+#: src/wizard.c:1415
msgid "<span weight=\"bold\">Server type:</span>"
msgstr "<span weight=\"bold\">服务器类型:</span>"
-#: src/wizard.c:1176
+#: src/wizard.c:1426
msgid ""
"You can specify the port number by appending it at the end: \"mail.example."
"com:110\""
msgstr "您可以在尾端指定端口号: \"mail.example.com:110\""
-#: src/wizard.c:1191
+#: src/wizard.c:1440
msgid "<span weight=\"bold\">Username:</span>"
msgstr "<span weight=\"bold\">用户名:</span>"
-#: src/wizard.c:1207
+#: src/wizard.c:1455
msgid "Password:"
msgstr "密码"
-#: src/wizard.c:1219
+#: src/wizard.c:1470
+msgid "Use SSL to connect to receiving server"
+msgstr "采用SSL连接服务器收取邮件"
+
+#: src/wizard.c:1488
msgid "IMAP server directory:"
msgstr "IMAP服务器目录:"
-#: src/wizard.c:1231
+#: src/wizard.c:1497
msgid "Show only subscribed folders"
msgstr "只显示已订阅的目录"
-#: src/wizard.c:1248
-msgid "Use SSL to connect to receiving server"
-msgstr "采用SSL连接服务器收取邮件"
+#: src/wizard.c:1505
+msgid ""
+"<span weight=\"bold\">Warning: this version of Claws Mail\n"
+"has been built without IMAP support.</span>"
+msgstr ""
+"<span weight=\"bold\">警告: 当前的Claws Mail\n"
+"编译时没有启用IMAP支持。</span>"
-#: src/wizard.c:1372
+#: src/wizard.c:1625
msgid "Claws Mail Setup Wizard"
msgstr "Claws Mail 设置向导"
-#: src/wizard.c:1404
+#: src/wizard.c:1657
msgid "Welcome to Claws Mail"
msgstr "欢迎使用Claws Mail "
-#: src/wizard.c:1412
+#: src/wizard.c:1665
msgid ""
"Welcome to the Claws Mail setup wizard.\n"
"\n"
"看来这是你第一次使用Claws Mail。所以我们需要先确定一下关于你和你的邮箱的一些"
"基本信息，你可以在五分钟之内开始使用Claws Mail。"
-#: src/wizard.c:1425
+#: src/wizard.c:1688
msgid "About You"
msgstr "关于你"
-#: src/wizard.c:1427 src/wizard.c:1436 src/wizard.c:1445 src/wizard.c:1455
+#: src/wizard.c:1696 src/wizard.c:1711 src/wizard.c:1726 src/wizard.c:1742
msgid "Bold fields must be completed"
msgstr "粗体字段必须填写"
-#: src/wizard.c:1434
+#: src/wizard.c:1703
msgid "Receiving mail"
msgstr "接收邮件"
-#: src/wizard.c:1443
+#: src/wizard.c:1718
msgid "Sending mail"
msgstr "发送邮件"
-#: src/wizard.c:1453
+#: src/wizard.c:1734
msgid "Saving mail on disk"
msgstr "将邮件保存到磁盘"
-#: src/wizard.c:1463
+#: src/wizard.c:1750
msgid "Configuration finished"
msgstr "设置完成"
-#: src/wizard.c:1471
+#: src/wizard.c:1758
msgid ""
"Claws Mail is now ready.\n"
-"\n"
"Click Save to start."
msgstr ""
"Claws Mail配置完成。\n"
-"\n"
"点击[保存]开始使用。"
-#~ msgid "Really quit?"
-#~ msgstr "确定要退出吗?"
-
-#~ msgid "Composing message exists."
-#~ msgstr "所编辑的文件已经存在。"
-
-#~ msgid "_Save to Draft"
-#~ msgstr "存为草稿(_S)"
-
-#~ msgid "_Discard them"
-#~ msgstr "摈弃(_D)"
-
-#~ msgid "Do_n't quit"
-#~ msgstr "不退出(_n)"
-
-#~ msgid "/_View/Show or hi_de/_Folder tree"
-#~ msgstr "/查看(_V)/显示或隐藏(_d)/文件夹树(_F)"
-
-#~ msgid "/_View/Separate f_older tree"
-#~ msgstr "/查看(_V)/用单独窗口显示文件夹树(_o)"
-
-#~ msgid "/_View/Separate _message view"
-#~ msgstr "/查看(_V)/用单独窗口中显示邮件内容(_m)"
-
-#~ msgid "Claws Mail - Folder View"
-#~ msgstr "Claws Mail - 文件夹"
-
-#~ msgid "Exit this program?"
-#~ msgstr "退出本程序？"
-
-#~ msgid "Default account: "
-#~ msgstr "缺省帐号: "
-
-#~ msgid "Default dictionary: "
-#~ msgstr "缺省字典: "
-
-#~ msgid "Default alternate dictionary: "
-#~ msgstr "缺省的备选字典: "
-
-#~ msgid " Select... "
-#~ msgstr " 选择... "
-
-#~ msgid "Pick color for 1st level text "
-#~ msgstr "选择第一层引文颜色"
-
-#~ msgid "Pick color for 2nd level text "
-#~ msgstr "选择第二层引文颜色"
-
-#~ msgid "Pick color for 3rd level text "
-#~ msgstr "选择第三层引文颜色"
-
-#~ msgid "Pick color for 1st level text background "
-#~ msgstr "选择第一层引文的背景色"
-
-#~ msgid "Pick color for 2nd level text background "
-#~ msgstr "选择第二层引文的背景色"
-
-#~ msgid "Pick color for 3rd level text background "
-#~ msgstr "选择第三层引文的背景色"
-
-#~ msgid "Pick color for links "
-#~ msgstr "选择超级链接的颜色"
-
-#~ msgid "Pick color for signatures "
-#~ msgstr "选择签名颜色"
-
-#~ msgid "not initialized\n"
-#~ msgstr "未初始化\n"
-
-#~ msgid "selecting folder '%s'\n"
-#~ msgstr "选择文件夹: '%s'\n"
-
-#~ msgid "selecting message %d\n"
-#~ msgstr "选择邮件 %d\n"
projects / claws.git / blobdiff