updated po files.

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

1 files changed, 274 insertions, 274 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f099d0b8..530ae1ec 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-02 19:03+0900\n"
+"POT-Creation-Date: 2006-03-10 16:06+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -502,7 +502,7 @@ msgstr "发现 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "配置已经保存。\n"
 
-#: libsylph/prefs_common.c:491
+#: libsylph/prefs_common.c:496
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "文件夹："
@@ -520,7 +520,7 @@ msgstr "无法打开标记文件\n"
 msgid "can't fetch message %d\n"
 msgstr "无法获取邮件 %d\n"
 
-#: libsylph/procmsg.c:1375
+#: libsylph/procmsg.c:1378
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "打印命令行无效：“%s”\n"
@@ -598,12 +598,12 @@ msgstr "  标题：%s\n"
 msgid "  Issuer: %s\n"
 msgstr "  签发者：%s\n"
 
-#: libsylph/utils.c:2411 src/compose.c:2869 src/compose.c:3132
-#: src/compose.c:3195 src/compose.c:3315
+#: libsylph/utils.c:2430 src/compose.c:2888 src/compose.c:3151
+#: src/compose.c:3214 src/compose.c:3334
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: libsylph/utils.c:2418 libsylph/utils.c:2542
+#: libsylph/utils.c:2437 libsylph/utils.c:2561
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "写入 %s 时失败。\n"
@@ -682,8 +682,8 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:493
-#: src/compose.c:4273 src/editaddress.c:200 src/editaddress.c:942
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4292 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -821,12 +821,12 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:202 src/compose.c:4777 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4796 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:212 src/addressbook.c:495 src/editaddress.c:202
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
 #: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "注释"
@@ -835,110 +835,111 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:338 src/compose.c:515 src/mainwindow.c:489
+#: src/addressbook.c:337 src/compose.c:515 src/mainwindow.c:489
 #: src/messageview.c:140
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/addressbook.c:339
+#: src/addressbook.c:338
 msgid "/_File/New _Book"
 msgstr "/文件(_F)/新建地址簿(_B)"
 
-#: src/addressbook.c:340
+#: src/addressbook.c:339
 msgid "/_File/New _vCard"
 msgstr "/文件(_F)/新建 vCard(_V)"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:341
 msgid "/_File/New _JPilot"
 msgstr "/文件(_F)/新建 JPilot(_J)"
 
-#: src/addressbook.c:345
-msgid "/_File/New _Server"
+#: src/addressbook.c:344
+#, fuzzy
+msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:347 src/addressbook.c:350 src/compose.c:520
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:520
 #: src/compose.c:525 src/compose.c:528 src/compose.c:531 src/mainwindow.c:507
 #: src/mainwindow.c:510 src/mainwindow.c:512 src/mainwindow.c:515
 #: src/mainwindow.c:517 src/messageview.c:143
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:347
 msgid "/_File/_Edit"
 msgstr "/文件(_F)/编辑(_E)"
 
-#: src/addressbook.c:349
+#: src/addressbook.c:348
 msgid "/_File/_Delete"
 msgstr "/文件(_F)/删除(_D)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:350
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:352 src/compose.c:532 src/messageview.c:144
+#: src/addressbook.c:351 src/compose.c:532 src/messageview.c:144
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:352
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:353
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新建地址(_A)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:354
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新建组(_G)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:355
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新建文件夹(_F)"
 
-#: src/addressbook.c:357
+#: src/addressbook.c:356
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:357
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:358
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:360 src/compose.c:645 src/mainwindow.c:758
-#: src/messageview.c:266
+#: src/addressbook.c:359 src/compose.c:645 src/mainwindow.c:758
+#: src/messageview.c:267
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:360
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:362 src/compose.c:666 src/mainwindow.c:812
-#: src/messageview.c:286
+#: src/addressbook.c:361 src/compose.c:666 src/mainwindow.c:812
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:363 src/compose.c:667 src/mainwindow.c:824
-#: src/messageview.c:287
+#: src/addressbook.c:362 src/compose.c:667 src/mainwindow.c:824
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:382 src/addressbook.c:392
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Address"
 msgstr "/新建地址(_A)"
 
-#: src/addressbook.c:383 src/addressbook.c:393
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Group"
 msgstr "/新建组(_G)"
 
-#: src/addressbook.c:384 src/addressbook.c:394
+#: src/addressbook.c:383 src/addressbook.c:393
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:509
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:509
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
@@ -948,70 +949,70 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:386 src/addressbook.c:396 src/compose.c:534
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:534
 #: src/mainwindow.c:521 src/messageview.c:146
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:387 src/addressbook.c:397 src/summaryview.c:434
+#: src/addressbook.c:386 src/addressbook.c:396 src/summaryview.c:434
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:494
+#: src/addressbook.c:492
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:498 src/compose.c:4778 src/prefs_common_dialog.c:2183
+#: src/addressbook.c:496 src/compose.c:4797 src/prefs_common_dialog.c:2183
 msgid "Address book"
 msgstr "地址簿"
 
-#: src/addressbook.c:600 src/prefs_filter_edit.c:249
+#: src/addressbook.c:603 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
 #. Buttons
-#: src/addressbook.c:632 src/addressbook.c:1684 src/editaddress.c:884
+#: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/mainwindow.c:2426 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "删除"
 
-#: src/addressbook.c:635 src/editaddress.c:890 src/editaddress.c:1023
+#: src/addressbook.c:639 src/editaddress.c:890 src/editaddress.c:1023
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1552
 msgid "Add"
 msgstr "添加"
 
-#: src/addressbook.c:638
+#: src/addressbook.c:642
 msgid "Lookup"
 msgstr "查找"
 
-#: src/addressbook.c:650 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:654 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:356 src/prefs_template.c:178
+#: src/addressbook.c:658 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:658 src/prefs_folder_item.c:367
+#: src/addressbook.c:662 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "密件抄送："
 
 #. Confirm deletion
-#: src/addressbook.c:845
+#: src/addressbook.c:832
 msgid "Delete address(es)"
 msgstr "删除地址"
 
-#: src/addressbook.c:846
+#: src/addressbook.c:833
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:1675
+#: src/addressbook.c:1669
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1020,38 +1021,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1678 src/folderview.c:2372
+#: src/addressbook.c:1672 src/folderview.c:2372
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:1678
+#: src/addressbook.c:1672
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:1683
+#: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2369 src/addressbook.c:2502
+#: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2373 src/addressbook.c:2506
+#: src/addressbook.c:2367 src/addressbook.c:2500
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2383 src/addressbook.c:2516
+#: src/addressbook.c:2377 src/addressbook.c:2510
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2388
+#: src/addressbook.c:2382
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1059,7 +1060,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2401
+#: src/addressbook.c:2395
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1067,7 +1068,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2407
+#: src/addressbook.c:2401
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1075,90 +1076,90 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2412
+#: src/addressbook.c:2406
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2419
+#: src/addressbook.c:2413
 msgid "Addressbook conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2423
+#: src/addressbook.c:2417
 msgid "Addressbook conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2458
+#: src/addressbook.c:2452
 msgid "Addressbook Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2459 src/addressbook.c:2559
+#: src/addressbook.c:2453 src/addressbook.c:2553
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2521
+#: src/addressbook.c:2515
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2535
+#: src/addressbook.c:2529
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2541
+#: src/addressbook.c:2535
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2547
+#: src/addressbook.c:2541
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2565
+#: src/addressbook.c:2559
 msgid "Addressbook Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2571
+#: src/addressbook.c:2565
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3086 src/prefs_common_dialog.c:2033
+#: src/addressbook.c:3080 src/prefs_common_dialog.c:2033
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3102 src/importldif.c:514
+#: src/addressbook.c:3096 src/importldif.c:514
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3118
+#: src/addressbook.c:3112
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3134
+#: src/addressbook.c:3128
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3150
+#: src/addressbook.c:3144
 msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3166 src/folderview.c:367 src/prefs_account_dialog.c:1694
-#: src/query_search.c:370
+#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/query_search.c:398
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:3182
+#: src/addressbook.c:3176
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3198 src/addressbook.c:3214
+#: src/addressbook.c:3192 src/addressbook.c:3208
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3230
+#: src/addressbook.c:3224
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -1170,7 +1171,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5500 src/main.c:621
+#: src/alertpanel.c:142 src/compose.c:5517 src/main.c:621
 msgid "Notice"
 msgstr "注意"
 
@@ -1178,7 +1179,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:587
+#: src/alertpanel.c:168 src/inc.c:586
 msgid "Error"
 msgstr "错误"
 
@@ -1221,7 +1222,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4761
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4762
 msgid "None"
 msgstr "没有"
 
@@ -1473,7 +1474,7 @@ msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:267
+#: src/compose.c:646 src/mainwindow.c:759 src/messageview.c:268
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
@@ -1481,14 +1482,14 @@ msgstr "/工具(_T)/地址簿(_A)"
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:283
+#: src/compose.c:649 src/mainwindow.c:783 src/messageview.c:284
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
 #: src/compose.c:651 src/compose.c:655 src/compose.c:661 src/mainwindow.c:762
 #: src/mainwindow.c:776 src/mainwindow.c:781 src/mainwindow.c:784
-#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:270
-#: src/messageview.c:282
+#: src/mainwindow.c:788 src/mainwindow.c:790 src/messageview.c:271
+#: src/messageview.c:283
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
@@ -1514,80 +1515,80 @@ msgstr "/工具(_T)/执行(_X)"
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:910
+#: src/compose.c:912
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1014 src/compose.c:1085
+#: src/compose.c:1016 src/compose.c:1087
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1486
+#: src/compose.c:1488
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1498
+#: src/compose.c:1500
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:1918
+#: src/compose.c:1935
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:1922
+#: src/compose.c:1939
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:1926
+#: src/compose.c:1943
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:1930
+#: src/compose.c:1947
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:1963
+#: src/compose.c:1980
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2023 src/mimeview.c:565
+#: src/compose.c:2040 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2507 src/headerview.c:195 src/query_search.c:636
+#: src/compose.c:2524 src/headerview.c:195 src/query_search.c:666
 #: src/summaryview.c:2124
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2510
+#: src/compose.c:2527
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2623
+#: src/compose.c:2642
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2631
+#: src/compose.c:2650
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2632
+#: src/compose.c:2651
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2691
+#: src/compose.c:2710
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2711
+#: src/compose.c:2730
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1595,21 +1596,21 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2725 src/send_message.c:299
+#: src/compose.c:2744 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2767
+#: src/compose.c:2786
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:2805
+#: src/compose.c:2824
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:2902
+#: src/compose.c:2921
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1619,12 +1620,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:2908
+#: src/compose.c:2927
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:2981
+#: src/compose.c:3000
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1633,159 +1634,159 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2985
+#: src/compose.c:3004
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3275
+#: src/compose.c:3294
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3293
+#: src/compose.c:3312
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3375
+#: src/compose.c:3394
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3382
+#: src/compose.c:3401
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:3975
+#: src/compose.c:3994
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4088
+#: src/compose.c:4107
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4139 src/headerview.c:54
+#: src/compose.c:4158 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4213
+#: src/compose.c:4232
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4216
+#: src/compose.c:4235
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4254 src/compose.c:5332
+#: src/compose.c:4273 src/compose.c:5351
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4263 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4908
+#: src/compose.c:4282 src/mimeview.c:197 src/prefs_filter_edit.c:496
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4909
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4698 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
+#: src/compose.c:4717 src/mainwindow.c:2359 src/prefs_account_dialog.c:528
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:4699
+#: src/compose.c:4718
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4707
+#: src/compose.c:4726
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4708
+#: src/compose.c:4727
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4716
+#: src/compose.c:4735
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4717
+#: src/compose.c:4736
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4727
+#: src/compose.c:4746
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4728
+#: src/compose.c:4747
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4736
+#: src/compose.c:4755
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4737
+#: src/compose.c:4756
 msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4747 src/prefs_account_dialog.c:1208
+#: src/compose.c:4766 src/prefs_account_dialog.c:1208
 #: src/prefs_common_dialog.c:953
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4748
+#: src/compose.c:4767
 #, fuzzy
 msgid "Append signature"
 msgstr "签名错误"
 
 #. editor
-#: src/compose.c:4757 src/prefs_common_dialog.c:991
+#: src/compose.c:4776 src/prefs_common_dialog.c:991
 #: src/prefs_common_dialog.c:2315
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4758
+#: src/compose.c:4777
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4766
+#: src/compose.c:4785
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4767
+#: src/compose.c:4786
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:5228
+#: src/compose.c:5247
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5246
+#: src/compose.c:5265
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5314
+#: src/compose.c:5333
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5334 src/prefs_common_dialog.c:1444
+#: src/compose.c:5353 src/prefs_common_dialog.c:1444
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5357 src/prefs_folder_item.c:202
+#: src/compose.c:5376 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5358
+#: src/compose.c:5377
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5449
+#: src/compose.c:5466
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5497
+#: src/compose.c:5514
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1795,47 +1796,47 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:5872 src/compose.c:5877 src/compose.c:5883
+#: src/compose.c:5889 src/compose.c:5894 src/compose.c:5900
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:5974
+#: src/compose.c:5991
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:5997
+#: src/compose.c:6014
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6032
+#: src/compose.c:6049
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6033
+#: src/compose.c:6050
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6035
+#: src/compose.c:6052
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6077
+#: src/compose.c:6094
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6079
+#: src/compose.c:6096
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6080
+#: src/compose.c:6097
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -1957,52 +1958,52 @@ msgstr "必须提供群组名。"
 msgid "Edit Group Data"
 msgstr "编辑群组信息"
 
-#: src/editgroup.c:300
+#: src/editgroup.c:299
 msgid "Group Name"
 msgstr "群组名"
 
-#: src/editgroup.c:319
+#: src/editgroup.c:318
 msgid "Addresses in Group"
 msgstr "群组中的地址"
 
-#: src/editgroup.c:321
+#: src/editgroup.c:320
 msgid " -> "
 msgstr " -> "
 
-#: src/editgroup.c:348
+#: src/editgroup.c:347
 msgid " <- "
 msgstr " <- "
 
-#: src/editgroup.c:350
+#: src/editgroup.c:349
 msgid "Available Addresses"
 msgstr "可用邮件地址"
 
-#: src/editgroup.c:416
+#: src/editgroup.c:415
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
 msgstr "用箭头按钮将电子邮件地址移入和移出群组"
 
-#: src/editgroup.c:468
+#: src/editgroup.c:467
 msgid "Edit Group Details"
 msgstr "编辑群组细节"
 
-#: src/editgroup.c:471
+#: src/editgroup.c:470
 msgid "Add New Group"
 msgstr "添加新群组"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Edit folder"
 msgstr "编辑文件夹"
 
-#: src/editgroup.c:522
+#: src/editgroup.c:521
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:525 src/foldersel.c:541 src/folderview.c:2121
+#: src/editgroup.c:524 src/foldersel.c:541 src/folderview.c:2121
 #: src/folderview.c:2127
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:526 src/foldersel.c:542 src/folderview.c:2128
+#: src/editgroup.c:525 src/foldersel.c:542 src/folderview.c:2128
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2200,7 +2201,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
 #: src/foldersel.c:561 src/folderview.c:2147 src/folderview.c:2206
-#: src/query_search.c:995
+#: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
@@ -2459,7 +2460,7 @@ msgstr "标题："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:180 src/query_search.c:637 src/summaryview.c:2127
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2127
 msgid "(No From)"
 msgstr "(没有发件人)"
 
@@ -2589,133 +2590,133 @@ msgstr "完成"
 msgid "Sylpheed: %d new messages"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:372
+#: src/inc.c:371
 msgid "Retrieving new messages"
 msgstr "正在获取新邮件"
 
-#: src/inc.c:415
+#: src/inc.c:414
 msgid "Standby"
 msgstr "请等待"
 
-#: src/inc.c:544 src/inc.c:593
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:555
+#: src/inc.c:554
 msgid "Retrieving"
 msgstr "正在获取"
 
-#: src/inc.c:564
+#: src/inc.c:563
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "完成 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:568
+#: src/inc.c:567
 msgid "Done (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:574
+#: src/inc.c:573
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/inc.c:577
+#: src/inc.c:576
 msgid "Auth failed"
 msgstr "验证失败"
 
-#: src/inc.c:580
+#: src/inc.c:579
 msgid "Locked"
 msgstr "锁住"
 
-#: src/inc.c:590
+#: src/inc.c:589
 msgid "Timeout"
 msgstr "超时"
 
-#: src/inc.c:640
+#: src/inc.c:639
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:643
+#: src/inc.c:642
 msgid "Finished (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:652
+#: src/inc.c:651
 msgid "Some errors occurred while getting mail."
 msgstr "获取邮件时发生错误。"
 
-#: src/inc.c:688
+#: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "正在获取帐号 %s 的新邮件...\n"
 
-#: src/inc.c:691
+#: src/inc.c:690
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s：正在获取新邮件"
 
-#: src/inc.c:710
+#: src/inc.c:709
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s..."
 
-#: src/inc.c:719
+#: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:798 src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:799
+#: src/inc.c:798
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/inc.c:804
+#: src/inc.c:803
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:808
+#: src/inc.c:807
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:812
+#: src/inc.c:811
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:816
+#: src/inc.c:815
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:826
+#: src/inc.c:825
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:833 src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:858
+#: src/inc.c:857
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:879
+#: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "正在获取 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:1107
+#: src/inc.c:1106
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1113
+#: src/inc.c:1112
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1118
+#: src/inc.c:1117
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2724,28 +2725,28 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1124
+#: src/inc.c:1123
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1129
+#: src/inc.c:1128
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1134
+#: src/inc.c:1133
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1140 src/send_message.c:584 src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1146
+#: src/inc.c:1145
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1150
+#: src/inc.c:1149
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -2754,11 +2755,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1156 src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1161 src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2767,15 +2768,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1166 src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1202
+#: src/inc.c:1201
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1285
+#: src/inc.c:1284
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -3243,14 +3244,15 @@ msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-msgid "/_View/Show all _header"
+#, fuzzy
+msgid "/_View/Show all _headers"
 msgstr "/查看(_V)/显示所有邮件头(_H)"
 
 #: src/mainwindow.c:710
 msgid "/_View/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/mainwindow.c:712 src/messageview.c:247
+#: src/mainwindow.c:712 src/messageview.c:248
 msgid "/_Message"
 msgstr "/邮件(_M)"
 
@@ -3280,16 +3282,16 @@ msgstr "/邮件(_M)/发送队列中的邮件(_S)"
 
 #: src/mainwindow.c:722 src/mainwindow.c:724 src/mainwindow.c:731
 #: src/mainwindow.c:736 src/mainwindow.c:739 src/mainwindow.c:750
-#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:250
-#: src/messageview.c:258 src/messageview.c:263
+#: src/mainwindow.c:752 src/mainwindow.c:755 src/messageview.c:251
+#: src/messageview.c:259 src/messageview.c:264
 msgid "/_Message/---"
 msgstr "/邮件(_M)/---"
 
-#: src/mainwindow.c:723 src/messageview.c:248
+#: src/mainwindow.c:723 src/messageview.c:249
 msgid "/_Message/Compose _new message"
 msgstr "/邮件(_M)/撰写新邮件(_N)"
 
-#: src/mainwindow.c:725 src/messageview.c:251
+#: src/mainwindow.c:725 src/messageview.c:252
 msgid "/_Message/_Reply"
 msgstr "/邮件(_M)/回复(_R)"
 
@@ -3297,27 +3299,27 @@ msgstr "/邮件(_M)/回复(_R)"
 msgid "/_Message/Repl_y to"
 msgstr "/邮件(_M)/回复到(_Y)"
 
-#: src/mainwindow.c:727 src/messageview.c:252
+#: src/mainwindow.c:727 src/messageview.c:253
 msgid "/_Message/Repl_y to/_all"
 msgstr "/邮件(_M)/回复到(_Y)/所有人(_AL)"
 
-#: src/mainwindow.c:728 src/messageview.c:254
+#: src/mainwindow.c:728 src/messageview.c:255
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/邮件(_M)/回复到(_Y)/发件人(_S)"
 
-#: src/mainwindow.c:729 src/messageview.c:256
+#: src/mainwindow.c:729 src/messageview.c:257
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/邮件(_M)/回复到(_Y)/邮件列表(_L)"
 
-#: src/mainwindow.c:732 src/messageview.c:259
+#: src/mainwindow.c:732 src/messageview.c:260
 msgid "/_Message/_Forward"
 msgstr "/邮件(_M)/转发(_F)"
 
-#: src/mainwindow.c:733 src/messageview.c:260
+#: src/mainwindow.c:733 src/messageview.c:261
 msgid "/_Message/For_ward as attachment"
 msgstr "/邮件(_M)/作为附件转发(_W)"
 
-#: src/mainwindow.c:735 src/messageview.c:262
+#: src/mainwindow.c:735 src/messageview.c:263
 msgid "/_Message/Redirec_t"
 msgstr "/邮件(_M)/重定向(_T)"
 
@@ -3376,7 +3378,7 @@ msgstr "/邮件(_M)/接收新邮件(_i)"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/邮件(_M)/接收新邮件(_i)"
 
-#: src/mainwindow.c:756 src/messageview.c:264
+#: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/邮件(_M)/重新编辑(_E)"
 
@@ -3393,23 +3395,23 @@ msgstr "/工具(_T)/过滤文件夹中所有的邮件(_F)"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/工具(_T)/过滤选中的邮件(_S)"
 
-#: src/mainwindow.c:767 src/messageview.c:271
+#: src/mainwindow.c:767 src/messageview.c:272
 msgid "/_Tools/_Create filter rule"
 msgstr "/工具(_T)/创建过滤规则(_C)"
 
-#: src/mainwindow.c:768 src/messageview.c:273
+#: src/mainwindow.c:768 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/工具(_T)/创建过滤规则(_C)/自动(_A)"
 
-#: src/mainwindow.c:770 src/messageview.c:275
+#: src/mainwindow.c:770 src/messageview.c:276
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/工具(_T)/创建过滤规则(_C)/按发件人(_F)"
 
-#: src/mainwindow.c:772 src/messageview.c:277
+#: src/mainwindow.c:772 src/messageview.c:278
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/工具(_T)/创建过滤规则(_C)/按收件人(_T)"
 
-#: src/mainwindow.c:774 src/messageview.c:279
+#: src/mainwindow.c:774 src/messageview.c:280
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/工具(_T)/创建过滤规则(_C)/按主题(_S)"
 
@@ -3530,7 +3532,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
 #: src/mainwindow.c:1139 src/summaryview.c:2275 src/summaryview.c:2360
-#: src/summaryview.c:3907 src/summaryview.c:4036 src/summaryview.c:4394
+#: src/summaryview.c:3908 src/summaryview.c:4037 src/summaryview.c:4395
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3790,7 +3792,7 @@ msgid "Find text:"
 msgstr "查找文字："
 
 #: src/message_search.c:153 src/prefs_search_folder.c:253
-#: src/query_search.c:326
+#: src/query_search.c:343
 msgid "Case sensitive"
 msgstr "区分大小写"
 
@@ -3814,27 +3816,27 @@ msgstr "已查找到邮件结尾；从开头继续？"
 msgid "Search finished"
 msgstr "搜索结束"
 
-#: src/messageview.c:268
+#: src/messageview.c:269
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/工具(_T)/将发件人添加到地址簿中(_K)"
 
-#: src/messageview.c:300
+#: src/messageview.c:301
 msgid "Creating message view...\n"
 msgstr "正在创建邮件视图...\n"
 
-#: src/messageview.c:325
+#: src/messageview.c:326
 msgid "Text"
 msgstr "文本"
 
-#: src/messageview.c:330
+#: src/messageview.c:331
 msgid "Attachments"
 msgstr "附件"
 
-#: src/messageview.c:380
+#: src/messageview.c:381
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:699 src/summaryview.c:3436
+#: src/messageview.c:700 src/summaryview.c:3436
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
@@ -3852,7 +3854,7 @@ msgstr "执行命令"
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:770 src/summaryview.c:3471
+#: src/messageview.c:769 src/summaryview.c:3470
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3949,11 +3951,11 @@ msgstr ""
 "输入打开文件的命令行：\n"
 "(“%s”将被替换为文件名)"
 
-#: src/mimeview.c:1147
+#: src/mimeview.c:1140
 msgid "Opening executable file"
 msgstr ""
 
-#: src/mimeview.c:1148
+#: src/mimeview.c:1141
 msgid ""
 "This is an executable file. Opening executable file is restricted for "
 "security.\n"
@@ -3961,11 +3963,6 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/mimeview.c:1184
-#, c-format
-msgid "MIME viewer command line is invalid: `%s'"
-msgstr "MIME察看器命令行无效：“%s”"
-
 #: src/passphrase.c:96
 msgid "Passphrase"
 msgstr "口令串"
@@ -5730,20 +5727,20 @@ msgstr "回复至："
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:209 src/query_search.c:257
+#: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
 msgstr "匹配以下任何"
 
-#: src/prefs_search_folder.c:211 src/query_search.c:259
+#: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
 msgstr "匹配以下所有"
 
-#: src/prefs_search_folder.c:231 src/query_search.c:303
+#: src/prefs_search_folder.c:231 src/query_search.c:320
 #, fuzzy
 msgid "Folder:"
 msgstr "文件夹"
 
-#: src/prefs_search_folder.c:248 src/query_search.c:321
+#: src/prefs_search_folder.c:248 src/query_search.c:338
 #, fuzzy
 msgid "Search subfolders"
 msgstr "搜索失败"
@@ -5758,17 +5755,17 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:371 src/summaryview.c:4901
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4902
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:372 src/summaryview.c:4904
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4905
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:373 src/summaryview.c:4906
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4907
 msgid "Date"
 msgstr "日期"
 
@@ -5861,43 +5858,43 @@ msgstr "正在创建进度对话框...\n"
 msgid "Status"
 msgstr "状态"
 
-#: src/query_search.c:234
+#: src/query_search.c:251
 msgid "Search messages"
 msgstr "查找邮件"
 
-#: src/query_search.c:395
+#: src/query_search.c:423
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "保存到草稿文件夹"
 
-#: src/query_search.c:512 src/subscribedialog.c:526 src/summaryview.c:842
+#: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:842
 msgid "Done."
 msgstr "完成。"
 
-#: src/query_search.c:536
+#: src/query_search.c:566
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/query_search.c:564
+#: src/query_search.c:594
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/query_search.c:645 src/summaryview.c:2051
+#: src/query_search.c:675 src/summaryview.c:2051
 msgid "(No Date)"
 msgstr "(没有日期)"
 
-#: src/query_search.c:833
+#: src/query_search.c:869
 #, fuzzy
 msgid "Save as search folder"
 msgstr "保存到草稿文件夹"
 
-#: src/query_search.c:854
+#: src/query_search.c:890
 msgid "Location:"
 msgstr ""
 
-#: src/query_search.c:869
+#: src/query_search.c:905
 #, fuzzy
 msgid "Folder name:"
 msgstr "文件名"
@@ -6528,37 +6525,37 @@ msgstr "邮件 %d 被设置为复制到 %s\n"
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3506
+#: src/summaryview.c:3507
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3814 src/summaryview.c:3815
+#: src/summaryview.c:3815 src/summaryview.c:3816
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:3965 src/summaryview.c:3966
+#: src/summaryview.c:3966 src/summaryview.c:3967
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4259 src/summaryview.c:4315
+#: src/summaryview.c:4260 src/summaryview.c:4316
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4364
+#: src/summaryview.c:4365
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4365
+#: src/summaryview.c:4366
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4401
+#: src/summaryview.c:4402
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:4910
+#: src/summaryview.c:4911
 msgid "No."
 msgstr "No."
 
@@ -6649,6 +6646,9 @@ msgstr "退出"
 msgid "Sylpheed"
 msgstr "旧式的Sylpheed"
 
+#~ msgid "MIME viewer command line is invalid: `%s'"
+#~ msgstr "MIME察看器命令行无效：“%s”"
+
 #~ msgid "%dB"
 #~ msgstr "%dB"