display the subject line in the window title bar.

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

1 files changed, 173 insertions, 175 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 908ed488..442ffc45 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: 2005-09-26 15:38+0900\n"
+"POT-Creation-Date: 2005-09-27 17:41+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"
@@ -520,7 +520,7 @@ msgstr "无法打开标记文件\n"
 msgid "can't fetch message %d\n"
 msgstr "无法获取邮件 %d\n"
 
-#: libsylph/procmsg.c:1164 src/compose.c:948 src/compose.c:1018
+#: libsylph/procmsg.c:1164 src/compose.c:953 src/compose.c:1024
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
@@ -622,8 +622,8 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2267 src/compose.c:2703 src/compose.c:2962
-#: src/compose.c:3025 src/compose.c:3145
+#: libsylph/utils.c:2267 src/compose.c:2718 src/compose.c:2977
+#: src/compose.c:3040 src/compose.c:3160
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
@@ -707,7 +707,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:360 src/addressadd.c:192 src/addressbook.c:491
-#: src/compose.c:4093 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4108 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:202 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -845,7 +845,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:202 src/compose.c:4540 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4555 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
@@ -859,7 +859,7 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:336 src/compose.c:489 src/mainwindow.c:465
+#: src/addressbook.c:336 src/compose.c:491 src/mainwindow.c:465
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -880,8 +880,8 @@ msgstr "/文件(_F)/新建 JPilot(_J)"
 msgid "/_File/New _Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:494
-#: src/compose.c:499 src/compose.c:503 src/mainwindow.c:483
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:496
+#: src/compose.c:501 src/compose.c:505 src/mainwindow.c:483
 #: src/mainwindow.c:486 src/mainwindow.c:488 src/mainwindow.c:491
 #: src/mainwindow.c:493 src/messageview.c:141
 msgid "/_File/---"
@@ -899,7 +899,7 @@ msgstr "/文件(_F)/删除(_D)"
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:350 src/compose.c:504 src/messageview.c:142
+#: src/addressbook.c:350 src/compose.c:506 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
@@ -931,7 +931,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:358 src/compose.c:613 src/mainwindow.c:721
+#: src/addressbook.c:358 src/compose.c:615 src/mainwindow.c:721
 #: src/messageview.c:257
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -940,12 +940,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:360 src/compose.c:626 src/mainwindow.c:771
+#: src/addressbook.c:360 src/compose.c:628 src/mainwindow.c:771
 #: src/messageview.c:275
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:361 src/compose.c:627 src/mainwindow.c:782
+#: src/addressbook.c:361 src/compose.c:629 src/mainwindow.c:782
 #: src/messageview.c:276
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -962,7 +962,7 @@ msgstr "/新建组(_G)"
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:483
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:485
 #: src/folderview.c:238 src/folderview.c:240 src/folderview.c:244
 #: src/folderview.c:255 src/folderview.c:257 src/folderview.c:259
 #: src/folderview.c:263 src/folderview.c:273 src/folderview.c:275
@@ -972,7 +972,7 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:506
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:508
 #: src/mainwindow.c:497 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/编辑(_E)"
@@ -985,7 +985,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:496 src/compose.c:4541 src/prefs_common_dialog.c:2043
+#: src/addressbook.c:496 src/compose.c:4556 src/prefs_common_dialog.c:2043
 msgid "Address book"
 msgstr "地址簿"
 
@@ -1192,11 +1192,11 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:138 src/compose.c:5227 src/main.c:481
+#: src/alertpanel.c:138 src/compose.c:5242 src/main.c:481
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:151 src/main.c:574
+#: src/alertpanel.c:151 src/main.c:575
 msgid "Warning"
 msgstr "警告"
 
@@ -1247,347 +1247,342 @@ msgstr "棕色"
 msgid "None"
 msgstr "没有"
 
-#: src/compose.c:481
+#: src/compose.c:483
 msgid "/_Add..."
 msgstr "/添加(_A)..."
 
-#: src/compose.c:482
+#: src/compose.c:484
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:484 src/folderview.c:246 src/folderview.c:265
+#: src/compose.c:486 src/folderview.c:246 src/folderview.c:265
 #: src/folderview.c:280
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
-#: src/compose.c:490
+#: src/compose.c:492
 msgid "/_File/_Send"
 msgstr "/文件(_F)/发送(_S)"
 
-#: src/compose.c:492
+#: src/compose.c:494
 msgid "/_File/Send _later"
 msgstr "/文件(_F)/以后发送(_L)"
 
-#: src/compose.c:495
+#: src/compose.c:497
 msgid "/_File/Save to _draft folder"
 msgstr "/文件(_F)/保存到草稿夹(_D)"
 
-#: src/compose.c:497
+#: src/compose.c:499
 msgid "/_File/Save and _keep editing"
 msgstr "/文件(_F)/保存并继续编辑(_K)"
 
-#: src/compose.c:500
+#: src/compose.c:502
 msgid "/_File/_Attach file"
 msgstr "/文件(_F)/添加附件(_A)"
 
-#: src/compose.c:501
+#: src/compose.c:503
 msgid "/_File/_Insert file"
 msgstr "/文件(_F)/插入文件(_I)"
 
-#: src/compose.c:502
+#: src/compose.c:504
 msgid "/_File/Insert si_gnature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:507
+#: src/compose.c:509
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤销(_U)"
 
-#: src/compose.c:508
+#: src/compose.c:510
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:509 src/compose.c:516 src/mainwindow.c:501
+#: src/compose.c:511 src/compose.c:518 src/mainwindow.c:501
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
-#: src/compose.c:510
+#: src/compose.c:512
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:511 src/mainwindow.c:498 src/messageview.c:145
+#: src/compose.c:513 src/mainwindow.c:498 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/compose.c:512
+#: src/compose.c:514
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/compose.c:513
+#: src/compose.c:515
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:515 src/mainwindow.c:499 src/messageview.c:146
+#: src/compose.c:517 src/mainwindow.c:499 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
-#: src/compose.c:517
+#: src/compose.c:519
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/当前段落折行(_W)"
 
-#: src/compose.c:519
+#: src/compose.c:521
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/所有长行折行(_L)"
 
-#: src/compose.c:521
+#: src/compose.c:523
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:522 src/mainwindow.c:506 src/messageview.c:151
+#: src/compose.c:524 src/mainwindow.c:506 src/messageview.c:151
 #: src/summaryview.c:407
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: src/compose.c:523
+#: src/compose.c:525
 msgid "/_View/_To"
 msgstr "/查看(_V)/收件人(_T)"
 
-#: src/compose.c:524
+#: src/compose.c:526
 msgid "/_View/_Cc"
 msgstr "/查看(_V)/抄送(_C)"
 
-#: src/compose.c:525
+#: src/compose.c:527
 msgid "/_View/_Bcc"
 msgstr "/查看(_V)/密件抄送(_B)"
 
-#: src/compose.c:526
+#: src/compose.c:528
 msgid "/_View/_Reply to"
 msgstr "/查看(_V)/回复至(_R)"
 
-#: src/compose.c:527 src/compose.c:529 src/compose.c:531 src/compose.c:533
+#: src/compose.c:529 src/compose.c:531 src/compose.c:533 src/compose.c:535
 #: src/mainwindow.c:524 src/mainwindow.c:527 src/mainwindow.c:554
 #: src/mainwindow.c:578 src/mainwindow.c:671 src/mainwindow.c:675
 #: src/messageview.c:234
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
-#: src/compose.c:528
+#: src/compose.c:530
 msgid "/_View/_Followup to"
 msgstr "/查看(_V)/跟贴(_F)"
 
-#: src/compose.c:530
+#: src/compose.c:532
 msgid "/_View/R_uler"
 msgstr "/查看(_V)/标尺(_U)"
 
-#: src/compose.c:532
+#: src/compose.c:534
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:539 src/mainwindow.c:585 src/messageview.c:158
+#: src/compose.c:541 src/mainwindow.c:585 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/compose.c:540
+#: src/compose.c:542
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 
-#: src/compose.c:542 src/compose.c:548 src/compose.c:554 src/compose.c:558
-#: src/compose.c:564 src/compose.c:568 src/compose.c:574 src/compose.c:578
-#: src/compose.c:588 src/compose.c:592 src/compose.c:602 src/compose.c:606
+#: src/compose.c:544 src/compose.c:550 src/compose.c:556 src/compose.c:560
+#: src/compose.c:566 src/compose.c:570 src/compose.c:576 src/compose.c:580
+#: src/compose.c:590 src/compose.c:594 src/compose.c:604 src/compose.c:608
 #: src/mainwindow.c:581 src/mainwindow.c:588 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:544 src/mainwindow.c:589 src/messageview.c:162
+#: src/compose.c:546 src/mainwindow.c:589 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:546 src/mainwindow.c:591 src/messageview.c:165
+#: src/compose.c:548 src/mainwindow.c:591 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:550 src/mainwindow.c:595 src/messageview.c:168
+#: src/compose.c:552 src/mainwindow.c:595 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:552 src/mainwindow.c:597 src/messageview.c:170
+#: src/compose.c:554 src/mainwindow.c:597 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:556 src/mainwindow.c:601 src/messageview.c:173
+#: src/compose.c:558 src/mainwindow.c:601 src/messageview.c:173
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:560 src/mainwindow.c:605 src/messageview.c:176
+#: src/compose.c:562 src/mainwindow.c:605 src/messageview.c:176
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:562 src/mainwindow.c:607 src/messageview.c:178
+#: src/compose.c:564 src/mainwindow.c:607 src/messageview.c:178
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:566 src/mainwindow.c:611 src/messageview.c:181
+#: src/compose.c:568 src/mainwindow.c:611 src/messageview.c:181
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:570 src/mainwindow.c:615 src/messageview.c:184
+#: src/compose.c:572 src/mainwindow.c:615 src/messageview.c:184
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:572 src/mainwindow.c:617 src/messageview.c:186
+#: src/compose.c:574 src/mainwindow.c:617 src/messageview.c:186
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:576 src/mainwindow.c:621 src/messageview.c:189
+#: src/compose.c:578 src/mainwindow.c:621 src/messageview.c:189
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:580 src/mainwindow.c:625 src/messageview.c:192
+#: src/compose.c:582 src/mainwindow.c:625 src/messageview.c:192
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:582 src/mainwindow.c:627 src/messageview.c:194
+#: src/compose.c:584 src/mainwindow.c:627 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:584 src/mainwindow.c:629 src/messageview.c:196
+#: src/compose.c:586 src/mainwindow.c:629 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:586 src/mainwindow.c:631 src/messageview.c:198
+#: src/compose.c:588 src/mainwindow.c:631 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:590 src/mainwindow.c:635 src/messageview.c:201
+#: src/compose.c:592 src/mainwindow.c:635 src/messageview.c:201
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:594 src/mainwindow.c:645 src/messageview.c:210
+#: src/compose.c:596 src/mainwindow.c:645 src/messageview.c:210
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:596 src/mainwindow.c:647 src/messageview.c:212
+#: src/compose.c:598 src/mainwindow.c:647 src/messageview.c:212
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:598 src/mainwindow.c:649 src/messageview.c:214
+#: src/compose.c:600 src/mainwindow.c:649 src/messageview.c:214
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:600 src/mainwindow.c:651 src/messageview.c:216
+#: src/compose.c:602 src/mainwindow.c:651 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (EUC-_TW)"
 
-#: src/compose.c:604 src/mainwindow.c:657 src/messageview.c:221
+#: src/compose.c:606 src/mainwindow.c:657 src/messageview.c:221
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:608 src/mainwindow.c:663 src/messageview.c:226
+#: src/compose.c:610 src/mainwindow.c:663 src/messageview.c:226
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:610 src/mainwindow.c:665 src/messageview.c:228
+#: src/compose.c:612 src/mainwindow.c:665 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:614 src/mainwindow.c:722 src/messageview.c:258
+#: src/compose.c:616 src/mainwindow.c:722 src/messageview.c:258
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:615
+#: src/compose.c:617
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:616 src/mainwindow.c:745 src/messageview.c:273
+#: src/compose.c:618 src/mainwindow.c:745 src/messageview.c:273
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:617 src/compose.c:621 src/mainwindow.c:725
+#: src/compose.c:619 src/compose.c:623 src/mainwindow.c:725
 #: src/mainwindow.c:739 src/mainwindow.c:744 src/mainwindow.c:746
 #: src/mainwindow.c:749 src/mainwindow.c:751 src/messageview.c:261
 #: src/messageview.c:272
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/compose.c:618
+#: src/compose.c:620
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/用外部编辑器编辑(_X)"
 
-#: src/compose.c:622
+#: src/compose.c:624
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:623
+#: src/compose.c:625
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:849
+#: src/compose.c:853
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1414
+#: src/compose.c:1421
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1426
+#: src/compose.c:1433
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:1795
+#: src/compose.c:1802
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:1799
+#: src/compose.c:1806
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:1803
+#: src/compose.c:1810
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:1807
+#: src/compose.c:1814
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:1842
+#: src/compose.c:1849
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:1914 src/mimeview.c:561
+#: src/compose.c:1921 src/mimeview.c:561
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2356
+#: src/compose.c:2374
 msgid " [Edited]"
 msgstr " [已编辑]"
 
-#: src/compose.c:2358
-#, c-format
-msgid "%s - Compose message%s"
+#: src/compose.c:2375
+#, fuzzy, c-format
+msgid "%s: %s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2361
-#, c-format
-msgid "Compose message%s"
-msgstr "撰写邮件%s"
-
-#: src/compose.c:2472
+#: src/compose.c:2487
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2480
+#: src/compose.c:2495
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2481
+#: src/compose.c:2496
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2532
+#: src/compose.c:2547
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2552
+#: src/compose.c:2567
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1595,21 +1590,21 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2566 src/send_message.c:299
+#: src/compose.c:2581 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2589
+#: src/compose.c:2604
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:2639
+#: src/compose.c:2654
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:2736
+#: src/compose.c:2751
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1619,12 +1614,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:2742
+#: src/compose.c:2757
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:2813
+#: src/compose.c:2828
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1633,157 +1628,157 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2817
+#: src/compose.c:2832
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3105
+#: src/compose.c:3120
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3123
+#: src/compose.c:3138
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3205
+#: src/compose.c:3220
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3212
+#: src/compose.c:3227
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:3804
+#: src/compose.c:3819
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:3913
+#: src/compose.c:3928
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:3961 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3976 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4033
+#: src/compose.c:4048
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4036
+#: src/compose.c:4051
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4074 src/compose.c:5014
+#: src/compose.c:4089 src/compose.c:5029
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4083 src/mimeview.c:193 src/prefs_filter_edit.c:585
+#: src/compose.c:4098 src/mimeview.c:193 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4353
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4461 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
+#: src/compose.c:4476 src/mainwindow.c:2236 src/prefs_account_dialog.c:516
 #: src/prefs_common_dialog.c:593
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:4462
+#: src/compose.c:4477
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4470
+#: src/compose.c:4485
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4471
+#: src/compose.c:4486
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4479
+#: src/compose.c:4494
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4480
+#: src/compose.c:4495
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4490
+#: src/compose.c:4505
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4491
+#: src/compose.c:4506
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4499
+#: src/compose.c:4514
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4500
+#: src/compose.c:4515
 msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4510 src/prefs_account_dialog.c:1188
+#: src/compose.c:4525 src/prefs_account_dialog.c:1188
 #: src/prefs_common_dialog.c:1002
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4511
+#: src/compose.c:4526
 msgid "Insert signature"
 msgstr "插入签名"
 
-#: src/compose.c:4520 src/prefs_common_dialog.c:1024
+#: src/compose.c:4535 src/prefs_common_dialog.c:1024
 #: src/prefs_common_dialog.c:2023
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4521
+#: src/compose.c:4536
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4529
+#: src/compose.c:4544
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4530
+#: src/compose.c:4545
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:4910
+#: src/compose.c:4925
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:4928
+#: src/compose.c:4943
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:4996
+#: src/compose.c:5011
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5016
+#: src/compose.c:5031
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5039 src/prefs_folder_item.c:184
+#: src/compose.c:5054 src/prefs_folder_item.c:184
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5040
+#: src/compose.c:5055
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5198
+#: src/compose.c:5213
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5224
+#: src/compose.c:5239
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1794,74 +1789,74 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:5241
+#: src/compose.c:5256
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "已结束程序组标识号：%d"
 
-#: src/compose.c:5242
+#: src/compose.c:5257
 #, c-format
 msgid "Temporary file: %s"
 msgstr "临时文件：%s"
 
-#: src/compose.c:5266
+#: src/compose.c:5281
 msgid "Compose: input from monitoring process\n"
 msgstr "撰写：从监听进程中输入\n"
 
 #. failed
-#: src/compose.c:5297
+#: src/compose.c:5312
 msgid "Couldn't exec external editor\n"
 msgstr "无法执行外部编辑器\n"
 
-#: src/compose.c:5301
+#: src/compose.c:5316
 msgid "Couldn't write to file\n"
 msgstr "无法写入文件\n"
 
-#: src/compose.c:5303
+#: src/compose.c:5318
 msgid "Pipe read failed\n"
 msgstr "管道读取失败\n"
 
-#: src/compose.c:5609 src/compose.c:5617 src/compose.c:5623
+#: src/compose.c:5624 src/compose.c:5632 src/compose.c:5638
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:5714
+#: src/compose.c:5729
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:5736
+#: src/compose.c:5751
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:5773
+#: src/compose.c:5788
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:5774
+#: src/compose.c:5789
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:5776
+#: src/compose.c:5791
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5818
+#: src/compose.c:5833
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:5820
+#: src/compose.c:5835
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:5821
+#: src/compose.c:5836
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:5821
+#: src/compose.c:5836
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2883,7 +2878,7 @@ msgstr "队列中的邮件"
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "一些未发送的信件被放入队列。现在退出吗？"
 
-#: src/main.c:575
+#: src/main.c:576
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -2892,15 +2887,15 @@ msgstr ""
 "已禁用 OpenPGP 支持。"
 
 #. remote command mode
-#: src/main.c:622
+#: src/main.c:623
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:822
+#: src/main.c:823
 msgid "Migration of configuration"
 msgstr "正在迁移配置"
 
-#: src/main.c:823
+#: src/main.c:824
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3842,21 +3837,21 @@ msgstr ""
 msgid "_Check signature"
 msgstr "检查签名(_C)"
 
-#: src/mimeview.c:956 src/mimeview.c:1023 src/mimeview.c:1056
-#: src/mimeview.c:1079
+#: src/mimeview.c:955 src/mimeview.c:1022 src/mimeview.c:1055
+#: src/mimeview.c:1078
 msgid "Can't save the part of multipart message."
 msgstr "无法保存分块邮件的分块。"
 
-#: src/mimeview.c:1036
+#: src/mimeview.c:1035
 #, fuzzy
 msgid "Can't save the attachments."
 msgstr "无法保存文件“%s”'。"
 
-#: src/mimeview.c:1089
+#: src/mimeview.c:1088
 msgid "Open with"
 msgstr "打开方式"
 
-#: src/mimeview.c:1090
+#: src/mimeview.c:1089
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
@@ -3865,7 +3860,7 @@ msgstr ""
 "输入打开文件的命令行：\n"
 "(“%s”将被替换为文件名)"
 
-#: src/mimeview.c:1145
+#: src/mimeview.c:1144
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME察看器命令行无效：“%s”"
@@ -5633,7 +5628,7 @@ msgstr "\t\t也就是“%s”\n"
 msgid "Signature made at %s\n"
 msgstr "签名创建于 %s\n"
 
-#: src/rfc2015.c:276 src/sigstatus.c:266
+#: src/rfc2015.c:281 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "验证签名时发生错误"
 
@@ -6316,6 +6311,9 @@ msgstr ""
 msgid "Fake URL warning"
 msgstr ""
 
+#~ msgid "Compose message%s"
+#~ msgstr "撰写邮件%s"
+
 #~ msgid "Translate header name (such as `From:', `Subject:')"
 #~ msgstr "翻译邮件头名(如“发件人：”、“主题：”)"