added status label to display number of matched messages in quick search.

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

1 files changed, 195 insertions, 184 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d0850651..71688715 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: 2009-12-08 15:40+0900\n"
+"POT-Creation-Date: 2009-12-09 17:20+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"
@@ -684,7 +684,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:682
-#: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5135 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:311
@@ -821,7 +821,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:187 src/compose.c:3208 src/prefs_toolbar.c:89
+#: src/addressadd.c:187 src/compose.c:3226 src/prefs_toolbar.c:89
 #: src/select-keys.c:312
 msgid "Address"
 msgstr "地址"
@@ -835,7 +835,7 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:341 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:341 src/compose.c:564 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -857,8 +857,8 @@ msgstr "/文件(_F)/新建 JPilot(_J)"
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:565
-#: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
+#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:569
+#: src/compose.c:574 src/compose.c:577 src/compose.c:580 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
 #: src/messageview.c:156
@@ -877,21 +877,21 @@ msgstr "/文件(_F)/删除(_D)"
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:355 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:355 src/compose.c:581 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
 #: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
-#: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
+#: src/compose.c:583 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:358 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:358 src/compose.c:588 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:359 src/compose.c:585
+#: src/addressbook.c:359 src/compose.c:589
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
@@ -923,7 +923,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:369 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:369 src/compose.c:699 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -937,12 +937,12 @@ msgstr "/工具(_T)/导入LDIF文件(_L)"
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:373 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:373 src/compose.c:723 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:374 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:374 src/compose.c:724 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -960,7 +960,7 @@ msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
 #: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
+#: src/compose.c:558 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
 #: src/folderview.c:291 src/folderview.c:305 src/folderview.c:307
@@ -1000,22 +1000,22 @@ msgstr "文件夹"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:750 src/quick_search.c:113
+#: src/addressbook.c:750 src/quick_search.c:114
 #, fuzzy
 msgid "Search:"
 msgstr "搜索"
 
-#: src/addressbook.c:788 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:788 src/compose.c:3171 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:792 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:792 src/compose.c:3188 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:796 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:796 src/compose.c:3205 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件抄送："
@@ -1220,7 +1220,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:743
+#: src/alertpanel.c:142 src/compose.c:6465 src/main.c:743
 msgid "Notice"
 msgstr "注意"
 
@@ -1275,404 +1275,408 @@ msgstr "棕色"
 msgid "None"
 msgstr "没有"
 
-#: src/compose.c:552
+#: src/compose.c:556
 msgid "/_Add..."
 msgstr "/添加(_A)..."
 
-#: src/compose.c:553
+#: src/compose.c:557
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:555 src/folderview.c:270 src/folderview.c:295
+#: src/compose.c:559 src/folderview.c:270 src/folderview.c:295
 #: src/folderview.c:317
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
-#: src/compose.c:561
+#: src/compose.c:565
 msgid "/_File/_Send"
 msgstr "/文件(_F)/发送(_S)"
 
-#: src/compose.c:563
+#: src/compose.c:567
 msgid "/_File/Send _later"
 msgstr "/文件(_F)/以后发送(_L)"
 
-#: src/compose.c:566
+#: src/compose.c:570
 msgid "/_File/Save to _draft folder"
 msgstr "/文件(_F)/保存到草稿夹(_D)"
 
-#: src/compose.c:568
+#: src/compose.c:572
 msgid "/_File/Save and _keep editing"
 msgstr "/文件(_F)/保存并继续编辑(_K)"
 
-#: src/compose.c:571
+#: src/compose.c:575
 msgid "/_File/_Attach file"
 msgstr "/文件(_F)/添加附件(_A)"
 
-#: src/compose.c:572
+#: src/compose.c:576
 msgid "/_File/_Insert file"
 msgstr "/文件(_F)/插入文件(_I)"
 
-#: src/compose.c:574
+#: src/compose.c:578
 msgid "/_File/Insert si_gnature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:575
+#: src/compose.c:579
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:580
+#: src/compose.c:584
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤销(_U)"
 
-#: src/compose.c:581
+#: src/compose.c:585
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:582 src/compose.c:589 src/mainwindow.c:580
+#: src/compose.c:586 src/compose.c:593 src/mainwindow.c:580
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
-#: src/compose.c:583
+#: src/compose.c:587
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:586
+#: src/compose.c:590
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:588 src/mainwindow.c:578 src/messageview.c:161
+#: src/compose.c:592 src/mainwindow.c:578 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
-#: src/compose.c:590
+#: src/compose.c:594
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/当前段落折行(_W)"
 
-#: src/compose.c:592
+#: src/compose.c:596
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/所有长行折行(_L)"
 
-#: src/compose.c:594
+#: src/compose.c:598
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:595 src/mainwindow.c:586 src/messageview.c:166
+#: src/compose.c:599 src/mainwindow.c:586 src/messageview.c:166
 #: src/summaryview.c:460
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: src/compose.c:596
+#: src/compose.c:600
 msgid "/_View/_To"
 msgstr "/查看(_V)/收件人(_T)"
 
-#: src/compose.c:597
+#: src/compose.c:601
 msgid "/_View/_Cc"
 msgstr "/查看(_V)/抄送(_C)"
 
-#: src/compose.c:598
+#: src/compose.c:602
 msgid "/_View/_Bcc"
 msgstr "/查看(_V)/密件抄送(_B)"
 
-#: src/compose.c:599
+#: src/compose.c:603
 #, fuzzy
 msgid "/_View/_Reply-To"
 msgstr "/查看(_V)/回复至(_R)"
 
-#: src/compose.c:600 src/compose.c:602 src/compose.c:604 src/compose.c:606
-#: src/compose.c:609 src/mainwindow.c:609 src/mainwindow.c:615
+#: src/compose.c:604 src/compose.c:606 src/compose.c:608 src/compose.c:610
+#: src/compose.c:613 src/mainwindow.c:609 src/mainwindow.c:615
 #: src/mainwindow.c:642 src/mainwindow.c:666 src/mainwindow.c:769
 #: src/mainwindow.c:773 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
-#: src/compose.c:601
+#: src/compose.c:605
 #, fuzzy
 msgid "/_View/_Followup-To"
 msgstr "/查看(_V)/跟贴(_F)"
 
-#: src/compose.c:603
+#: src/compose.c:607
 msgid "/_View/R_uler"
 msgstr "/查看(_V)/标尺(_U)"
 
-#: src/compose.c:605
+#: src/compose.c:609
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:607
+#: src/compose.c:611
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/compose.c:615 src/mainwindow.c:673 src/messageview.c:173
+#: src/compose.c:619 src/mainwindow.c:673 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/compose.c:616
+#: src/compose.c:620
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 
-#: src/compose.c:618 src/compose.c:624 src/compose.c:630 src/compose.c:634
-#: src/compose.c:642 src/compose.c:646 src/compose.c:652 src/compose.c:658
-#: src/compose.c:662 src/compose.c:672 src/compose.c:676 src/compose.c:684
-#: src/compose.c:688 src/mainwindow.c:669 src/mainwindow.c:676
+#: src/compose.c:622 src/compose.c:628 src/compose.c:634 src/compose.c:638
+#: src/compose.c:646 src/compose.c:650 src/compose.c:656 src/compose.c:662
+#: src/compose.c:666 src/compose.c:676 src/compose.c:680 src/compose.c:688
+#: src/compose.c:692 src/mainwindow.c:669 src/mainwindow.c:676
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:620 src/mainwindow.c:677 src/messageview.c:177
+#: src/compose.c:624 src/mainwindow.c:677 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:622 src/mainwindow.c:679 src/messageview.c:180
+#: src/compose.c:626 src/mainwindow.c:679 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:626 src/mainwindow.c:683 src/messageview.c:183
+#: src/compose.c:630 src/mainwindow.c:683 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:628 src/mainwindow.c:685 src/messageview.c:185
+#: src/compose.c:632 src/mainwindow.c:685 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:632 src/mainwindow.c:691 src/messageview.c:190
+#: src/compose.c:636 src/mainwindow.c:691 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:636 src/mainwindow.c:695 src/messageview.c:193
+#: src/compose.c:640 src/mainwindow.c:695 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:638 src/mainwindow.c:697 src/messageview.c:195
+#: src/compose.c:642 src/mainwindow.c:697 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:640 src/mainwindow.c:699 src/messageview.c:197
+#: src/compose.c:644 src/mainwindow.c:699 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:644 src/mainwindow.c:703 src/messageview.c:200
+#: src/compose.c:648 src/mainwindow.c:703 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:648 src/mainwindow.c:707 src/messageview.c:203
+#: src/compose.c:652 src/mainwindow.c:707 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:650 src/mainwindow.c:709 src/messageview.c:205
+#: src/compose.c:654 src/mainwindow.c:709 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:654 src/mainwindow.c:713 src/messageview.c:208
+#: src/compose.c:658 src/mainwindow.c:713 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:656 src/mainwindow.c:715 src/messageview.c:210
+#: src/compose.c:660 src/mainwindow.c:715 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:660 src/mainwindow.c:719 src/messageview.c:213
+#: src/compose.c:664 src/mainwindow.c:719 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:664 src/mainwindow.c:723 src/messageview.c:216
+#: src/compose.c:668 src/mainwindow.c:723 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:666 src/mainwindow.c:725 src/messageview.c:218
+#: src/compose.c:670 src/mainwindow.c:725 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:668 src/mainwindow.c:727 src/messageview.c:220
+#: src/compose.c:672 src/mainwindow.c:727 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:670 src/mainwindow.c:729 src/messageview.c:222
+#: src/compose.c:674 src/mainwindow.c:729 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:674 src/mainwindow.c:733 src/messageview.c:225
+#: src/compose.c:678 src/mainwindow.c:733 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:678 src/mainwindow.c:743 src/messageview.c:234
+#: src/compose.c:682 src/mainwindow.c:743 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:680 src/mainwindow.c:745 src/messageview.c:236
+#: src/compose.c:684 src/mainwindow.c:745 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:682 src/mainwindow.c:747 src/messageview.c:238
+#: src/compose.c:686 src/mainwindow.c:747 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:686 src/mainwindow.c:755 src/messageview.c:245
+#: src/compose.c:690 src/mainwindow.c:755 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:690 src/mainwindow.c:761 src/messageview.c:250
+#: src/compose.c:694 src/mainwindow.c:761 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:692 src/mainwindow.c:763 src/messageview.c:252
+#: src/compose.c:696 src/mainwindow.c:763 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:696 src/mainwindow.c:825 src/messageview.c:283
+#: src/compose.c:700 src/mainwindow.c:825 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:697
+#: src/compose.c:701
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:699 src/mainwindow.c:849 src/messageview.c:299
+#: src/compose.c:703 src/mainwindow.c:849 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:701 src/compose.c:705 src/compose.c:711 src/mainwindow.c:828
-#: src/mainwindow.c:842 src/mainwindow.c:847 src/mainwindow.c:850
-#: src/mainwindow.c:854 src/mainwindow.c:856 src/messageview.c:286
-#: src/messageview.c:298
+#: src/compose.c:705 src/compose.c:708 src/compose.c:712 src/compose.c:718
+#: src/mainwindow.c:828 src/mainwindow.c:842 src/mainwindow.c:847
+#: src/mainwindow.c:850 src/mainwindow.c:854 src/mainwindow.c:856
+#: src/messageview.c:286 src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/compose.c:702
+#: src/compose.c:706
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/用外部编辑器编辑(_X)"
 
-#: src/compose.c:706
+#: src/compose.c:709
+msgid "/_Tools/Request _disposition notification"
+msgstr ""
+
+#: src/compose.c:713
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:707
+#: src/compose.c:714
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:712
+#: src/compose.c:719
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/执行(_X)"
 
-#: src/compose.c:713
+#: src/compose.c:720
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:977
+#: src/compose.c:984
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1081 src/compose.c:1155
+#: src/compose.c:1088 src/compose.c:1162
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1635
+#: src/compose.c:1653
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1647
+#: src/compose.c:1665
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:2135
+#: src/compose.c:2153
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:2139
+#: src/compose.c:2157
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2143 src/compose.c:4204
+#: src/compose.c:2161 src/compose.c:4222
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:2147
+#: src/compose.c:2165
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2180
+#: src/compose.c:2198
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2240 src/mimeview.c:583
+#: src/compose.c:2258 src/mimeview.c:583
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2730 src/headerview.c:233 src/query_search.c:790
+#: src/compose.c:2748 src/headerview.c:233 src/query_search.c:790
 #: src/rpop3.c:667 src/summaryview.c:2301
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2733
+#: src/compose.c:2751
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2848
+#: src/compose.c:2866
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2856
+#: src/compose.c:2874
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2857
+#: src/compose.c:2875
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2921
+#: src/compose.c:2939
 #, fuzzy
 msgid "Attachment is missing"
 msgstr "附件"
 
-#: src/compose.c:2922
+#: src/compose.c:2940
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:3039 src/compose.c:3065
+#: src/compose.c:3057 src/compose.c:3083
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3085
+#: src/compose.c:3103
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "自动设置以下地址"
 
-#: src/compose.c:3098 src/compose.c:4976 src/headerview.c:54
+#: src/compose.c:3116 src/compose.c:5001 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:3120 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3138 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "标题："
 
-#: src/compose.c:3213
+#: src/compose.c:3231
 #, fuzzy
 msgid "_Send"
 msgstr "发送"
 
-#: src/compose.c:3298
+#: src/compose.c:3316
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:3318
+#: src/compose.c:3336
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1680,40 +1684,40 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:3332 src/send_message.c:315
+#: src/compose.c:3350 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:3382
+#: src/compose.c:3400
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:3420
+#: src/compose.c:3438
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3447 src/compose.c:3832
+#: src/compose.c:3465 src/compose.c:3850
 #, fuzzy
 msgid "Can't sign the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3474 src/compose.c:3875
+#: src/compose.c:3492 src/compose.c:3893
 #, fuzzy
 msgid "Can't encrypt the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3509 src/compose.c:3870
+#: src/compose.c:3527 src/compose.c:3888
 #, fuzzy
 msgid "Can't encrypt or sign the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:3555 src/compose.c:3903 src/compose.c:3966 src/compose.c:4086
+#: src/compose.c:3573 src/compose.c:3921 src/compose.c:3984 src/compose.c:4104
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3588
+#: src/compose.c:3606
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1723,12 +1727,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3594
+#: src/compose.c:3612
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3680
+#: src/compose.c:3698
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1737,15 +1741,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3684
+#: src/compose.c:3702
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3850
+#: src/compose.c:3868
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3851
+#: src/compose.c:3869
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1754,92 +1758,92 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:4046
+#: src/compose.c:4064
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:4064
+#: src/compose.c:4082
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:4152
+#: src/compose.c:4170
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:4159
+#: src/compose.c:4177
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4199
+#: src/compose.c:4217
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:4208
+#: src/compose.c:4226
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "无法打开文件 %s\n"
 
-#: src/compose.c:4808
+#: src/compose.c:4833
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4923
+#: src/compose.c:4948
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:5050
+#: src/compose.c:5075
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:5053
+#: src/compose.c:5078
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:5091 src/compose.c:6257
+#: src/compose.c:5116 src/compose.c:6284
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
+#: src/compose.c:5125 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
 #: src/summaryview.c:5160
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6152
+#: src/compose.c:6179
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:6170
+#: src/compose.c:6197
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:6239
+#: src/compose.c:6266
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:6259 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1620
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:6282 src/prefs_folder_item.c:202
+#: src/compose.c:6309 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:6283
+#: src/compose.c:6310
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:6373
+#: src/compose.c:6400
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:6435
+#: src/compose.c:6462
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1849,51 +1853,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6772 src/mainwindow.c:3016
+#: src/compose.c:6799 src/mainwindow.c:3016
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6892 src/compose.c:6897 src/compose.c:6903
+#: src/compose.c:6919 src/compose.c:6924 src/compose.c:6930
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6994
+#: src/compose.c:7021
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:7017
+#: src/compose.c:7044
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:7068
+#: src/compose.c:7095
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:7069
+#: src/compose.c:7096
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:7071 src/compose.c:7075
+#: src/compose.c:7098 src/compose.c:7102
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:7122
+#: src/compose.c:7149
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:7124
+#: src/compose.c:7151
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:7125
+#: src/compose.c:7152
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:7125
+#: src/compose.c:7152
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2053,12 +2057,12 @@ msgstr "编辑文件夹"
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:540 src/foldersel.c:585 src/folderview.c:2278
+#: src/editgroup.c:540 src/foldersel.c:591 src/folderview.c:2278
 #: src/folderview.c:2284
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:541 src/foldersel.c:586 src/folderview.c:2285
+#: src/editgroup.c:541 src/foldersel.c:592 src/folderview.c:2285
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2273,43 +2277,43 @@ msgstr "邮件池目录"
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: src/foldersel.c:390 src/folderview.c:1224 src/prefs_folder_item.c:235
+#: src/foldersel.c:396 src/folderview.c:1224 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "收件箱"
 
-#: src/foldersel.c:394 src/folderview.c:1230 src/prefs_folder_item.c:236
+#: src/foldersel.c:400 src/folderview.c:1230 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "已发送"
 
-#: src/foldersel.c:398 src/folderview.c:1236 src/prefs_folder_item.c:238
+#: src/foldersel.c:404 src/folderview.c:1236 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "队列"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:239
+#: src/foldersel.c:408 src/folderview.c:1242 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "废件箱"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:237
+#: src/foldersel.c:412 src/folderview.c:1248 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:587 src/folderview.c:2282 src/folderview.c:2286
+#: src/foldersel.c:593 src/folderview.c:2282 src/folderview.c:2286
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:595 src/folderview.c:2296 src/folderview.c:2304
+#: src/foldersel.c:601 src/folderview.c:2296 src/folderview.c:2304
 #: src/folderview.c:2366
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:605 src/folderview.c:2315 src/folderview.c:2374
+#: src/foldersel.c:611 src/folderview.c:2315 src/folderview.c:2374
 #: src/query_search.c:1155
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:613 src/folderview.c:2322
+#: src/foldersel.c:619 src/folderview.c:2322
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
@@ -2389,7 +2393,7 @@ msgstr "新建"
 #. S_COL_MARK
 #: src/folderview.c:431 src/prefs_common_dialog.c:1539
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
-#: src/quick_search.c:97
+#: src/quick_search.c:98
 msgid "Unread"
 msgstr "未读"
 
@@ -5951,7 +5955,7 @@ msgstr "命令结果"
 msgid "Age"
 msgstr "邮件时间"
 
-#: src/prefs_filter_edit.c:508 src/quick_search.c:98
+#: src/prefs_filter_edit.c:508 src/quick_search.c:99
 #, fuzzy
 msgid "Marked"
 msgstr "标记"
@@ -6540,38 +6544,48 @@ msgstr ""
 msgid "Folder name:"
 msgstr "文件名"
 
-#: src/quick_search.c:96
+#: src/quick_search.c:97
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:99
+#: src/quick_search.c:100
 #, fuzzy
 msgid "Have color label"
 msgstr "/颜色标签(_B)"
 
-#: src/quick_search.c:100
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Have attachment"
 msgstr "附件"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:103
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:103
+#: src/quick_search.c:104
 #, fuzzy
 msgid "Last 5 days"
 msgstr "姓氏"
 
-#: src/quick_search.c:104
+#: src/quick_search.c:105
 #, fuzzy
 msgid "Last 7 days"
 msgstr "姓氏"
 
-#: src/quick_search.c:131
+#: src/quick_search.c:132
 msgid "Search for Subject or From"
 msgstr ""
 
+#: src/quick_search.c:285
+#, c-format
+msgid "%1$d in %2$d matched"
+msgstr ""
+
+#: src/quick_search.c:288
+#, fuzzy, c-format
+msgid "No messages matched"
+msgstr "没有选择邮件部分。"
+
 #: src/rfc2015.c:144
 msgid "Cannot find user ID for this key."
 msgstr "无法为该密钥找到用户标识。"
@@ -8073,9 +8087,6 @@ msgstr ""
 #~ msgid "Some errors occurred while sending queued messages."
 #~ msgstr "发送队列中的邮件时发生错误。"
 
-#~ msgid "No message part selected."
-#~ msgstr "没有选择邮件部分。"
-
 #~ msgid "Predicate"
 #~ msgstr "谓词"