made 2.4.0beta2 release.

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

1 files changed, 279 insertions, 280 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e06d1492..b0424a4b 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: 2007-01-31 17:29+0900\n"
+"POT-Creation-Date: 2007-02-01 16:53+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"
@@ -593,8 +593,8 @@ msgstr "  标题：%s\n"
 msgid "  Issuer: %s\n"
 msgstr "  签发者：%s\n"
 
-#: libsylph/utils.c:2524 src/compose.c:2988 src/compose.c:3280
-#: src/compose.c:3343 src/compose.c:3463
+#: libsylph/utils.c:2524 src/compose.c:2994 src/compose.c:3286
+#: src/compose.c:3349 src/compose.c:3469
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
@@ -678,7 +678,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:491
-#: src/compose.c:4461 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4467 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:208 src/prefs_filter.c:259 src/prefs_folder_item.c:171
@@ -816,7 +816,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:49
+#: src/addressadd.c:187 src/editaddress.c:201 src/prefs_toolbar.c:75
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
@@ -830,7 +830,7 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:337 src/compose.c:538 src/mainwindow.c:511
+#: src/addressbook.c:337 src/compose.c:544 src/mainwindow.c:511
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
@@ -852,8 +852,8 @@ msgstr "/文件(_F)/新建 JPilot(_J)"
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:543
-#: src/compose.c:548 src/compose.c:551 src/compose.c:554 src/mainwindow.c:529
+#: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:549
+#: src/compose.c:554 src/compose.c:557 src/compose.c:560 src/mainwindow.c:529
 #: src/mainwindow.c:532 src/mainwindow.c:534 src/mainwindow.c:536
 #: src/mainwindow.c:541 src/mainwindow.c:543 src/messageview.c:151
 #: src/messageview.c:156
@@ -872,7 +872,7 @@ msgstr "/文件(_F)/删除(_D)"
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:351 src/compose.c:555 src/messageview.c:157
+#: src/addressbook.c:351 src/compose.c:561 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
@@ -904,7 +904,7 @@ msgstr "/地址(_A)/编辑(_E)"
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:359 src/compose.c:673 src/mainwindow.c:789
+#: src/addressbook.c:359 src/compose.c:679 src/mainwindow.c:789
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
@@ -913,12 +913,12 @@ msgstr "/工具(_T)"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:361 src/compose.c:694 src/mainwindow.c:843
+#: src/addressbook.c:361 src/compose.c:700 src/mainwindow.c:843
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:362 src/compose.c:695 src/mainwindow.c:855
+#: src/addressbook.c:362 src/compose.c:701 src/mainwindow.c:855
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
@@ -935,7 +935,7 @@ msgstr "/新建组(_G)"
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:532
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:538
 #: src/folderview.c:251 src/folderview.c:253 src/folderview.c:258
 #: src/folderview.c:260 src/folderview.c:273 src/folderview.c:275
 #: src/folderview.c:277 src/folderview.c:282 src/folderview.c:284
@@ -947,7 +947,7 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:557
+#: src/addressbook.c:385 src/addressbook.c:395 src/compose.c:563
 #: src/mainwindow.c:547 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
@@ -960,8 +960,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:496 src/compose.c:4873 src/mainwindow.c:2416
-#: src/prefs_common_dialog.c:2274
+#: src/addressbook.c:496 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:76
 msgid "Address book"
 msgstr "地址簿"
 
@@ -974,7 +973,7 @@ msgstr "姓名："
 #: src/addressbook.c:636 src/addressbook.c:1678 src/editaddress.c:884
 #: src/editaddress.c:1017 src/prefs_actions.c:266
 #: src/prefs_display_header.c:279 src/prefs_display_header.c:334
-#: src/prefs_template.c:239 src/prefs_toolbar.c:44
+#: src/prefs_template.c:239 src/prefs_toolbar.c:60
 msgid "Delete"
 msgstr "删除"
 
@@ -1171,7 +1170,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5720 src/main.c:638
+#: src/alertpanel.c:142 src/compose.c:5724 src/main.c:638
 msgid "Notice"
 msgstr "注意"
 
@@ -1226,379 +1225,379 @@ msgstr "棕色"
 msgid "None"
 msgstr "没有"
 
-#: src/compose.c:530
+#: src/compose.c:536
 msgid "/_Add..."
 msgstr "/添加(_A)..."
 
-#: src/compose.c:531
+#: src/compose.c:537
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:533 src/folderview.c:264 src/folderview.c:288
+#: src/compose.c:539 src/folderview.c:264 src/folderview.c:288
 #: src/folderview.c:310
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
-#: src/compose.c:539
+#: src/compose.c:545
 msgid "/_File/_Send"
 msgstr "/文件(_F)/发送(_S)"
 
-#: src/compose.c:541
+#: src/compose.c:547
 msgid "/_File/Send _later"
 msgstr "/文件(_F)/以后发送(_L)"
 
-#: src/compose.c:544
+#: src/compose.c:550
 msgid "/_File/Save to _draft folder"
 msgstr "/文件(_F)/保存到草稿夹(_D)"
 
-#: src/compose.c:546
+#: src/compose.c:552
 msgid "/_File/Save and _keep editing"
 msgstr "/文件(_F)/保存并继续编辑(_K)"
 
-#: src/compose.c:549
+#: src/compose.c:555
 msgid "/_File/_Attach file"
 msgstr "/文件(_F)/添加附件(_A)"
 
-#: src/compose.c:550
+#: src/compose.c:556
 msgid "/_File/_Insert file"
 msgstr "/文件(_F)/插入文件(_I)"
 
-#: src/compose.c:552
+#: src/compose.c:558
 msgid "/_File/Insert si_gnature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:553
+#: src/compose.c:559
 #, fuzzy
 msgid "/_File/A_ppend signature"
 msgstr "/文件(_F)/插入签名(_G)"
 
-#: src/compose.c:558
+#: src/compose.c:564
 msgid "/_Edit/_Undo"
 msgstr "/编辑(_E)/撤销(_U)"
 
-#: src/compose.c:559
+#: src/compose.c:565
 msgid "/_Edit/_Redo"
 msgstr "/编辑(_E)/重复(_R)"
 
-#: src/compose.c:560 src/compose.c:567 src/mainwindow.c:551
+#: src/compose.c:566 src/compose.c:573 src/mainwindow.c:551
 #: src/messageview.c:162
 msgid "/_Edit/---"
 msgstr "/编辑(_E)/---"
 
-#: src/compose.c:561
+#: src/compose.c:567
 msgid "/_Edit/Cu_t"
 msgstr "/编辑(_E)/剪切(_T)"
 
-#: src/compose.c:562 src/mainwindow.c:548 src/messageview.c:160
+#: src/compose.c:568 src/mainwindow.c:548 src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/compose.c:563
+#: src/compose.c:569
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/compose.c:564
+#: src/compose.c:570
 msgid "/_Edit/Paste as _quotation"
 msgstr "/编辑(_E)/作为引文粘贴(_Q)"
 
-#: src/compose.c:566 src/mainwindow.c:549 src/messageview.c:161
+#: src/compose.c:572 src/mainwindow.c:549 src/messageview.c:161
 msgid "/_Edit/Select _all"
 msgstr "/编辑(_E)/全选(_A)"
 
-#: src/compose.c:568
+#: src/compose.c:574
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/编辑(_E)/当前段落折行(_W)"
 
-#: src/compose.c:570
+#: src/compose.c:576
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/编辑(_E)/所有长行折行(_L)"
 
-#: src/compose.c:572
+#: src/compose.c:578
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
-#: src/compose.c:573 src/mainwindow.c:556 src/messageview.c:166
+#: src/compose.c:579 src/mainwindow.c:556 src/messageview.c:166
 #: src/summaryview.c:463
 msgid "/_View"
 msgstr "/查看(_V)"
 
-#: src/compose.c:574
+#: src/compose.c:580
 msgid "/_View/_To"
 msgstr "/查看(_V)/收件人(_T)"
 
-#: src/compose.c:575
+#: src/compose.c:581
 msgid "/_View/_Cc"
 msgstr "/查看(_V)/抄送(_C)"
 
-#: src/compose.c:576
+#: src/compose.c:582
 msgid "/_View/_Bcc"
 msgstr "/查看(_V)/密件抄送(_B)"
 
-#: src/compose.c:577
+#: src/compose.c:583
 msgid "/_View/_Reply to"
 msgstr "/查看(_V)/回复至(_R)"
 
-#: src/compose.c:578 src/compose.c:580 src/compose.c:582 src/compose.c:584
-#: src/compose.c:587 src/mainwindow.c:579 src/mainwindow.c:582
+#: src/compose.c:584 src/compose.c:586 src/compose.c:588 src/compose.c:590
+#: src/compose.c:593 src/mainwindow.c:579 src/mainwindow.c:582
 #: src/mainwindow.c:609 src/mainwindow.c:633 src/mainwindow.c:736
 #: src/mainwindow.c:740 src/messageview.c:258
 msgid "/_View/---"
 msgstr "/查看(_V)/---"
 
-#: src/compose.c:579
+#: src/compose.c:585
 msgid "/_View/_Followup to"
 msgstr "/查看(_V)/跟贴(_F)"
 
-#: src/compose.c:581
+#: src/compose.c:587
 msgid "/_View/R_uler"
 msgstr "/查看(_V)/标尺(_U)"
 
-#: src/compose.c:583
+#: src/compose.c:589
 msgid "/_View/_Attachment"
 msgstr "/查看(_V)/附件(_A)"
 
-#: src/compose.c:585
+#: src/compose.c:591
 #, fuzzy
 msgid "/_View/Cu_stomize toolbar..."
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/compose.c:593 src/mainwindow.c:640 src/messageview.c:173
+#: src/compose.c:599 src/mainwindow.c:640 src/messageview.c:173
 msgid "/_View/Character _encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/compose.c:594
+#: src/compose.c:600
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/查看(_V)/字符编码(_E)/自动(_A)"
 
-#: src/compose.c:596 src/compose.c:602 src/compose.c:608 src/compose.c:612
-#: src/compose.c:620 src/compose.c:624 src/compose.c:630 src/compose.c:636
-#: src/compose.c:640 src/compose.c:650 src/compose.c:654 src/compose.c:662
-#: src/compose.c:666 src/mainwindow.c:636 src/mainwindow.c:643
+#: src/compose.c:602 src/compose.c:608 src/compose.c:614 src/compose.c:618
+#: src/compose.c:626 src/compose.c:630 src/compose.c:636 src/compose.c:642
+#: src/compose.c:646 src/compose.c:656 src/compose.c:660 src/compose.c:668
+#: src/compose.c:672 src/mainwindow.c:636 src/mainwindow.c:643
 #: src/messageview.c:169
 msgid "/_View/Character _encoding/---"
 msgstr "/查看(_V)/字符编码(_E)/---"
 
-#: src/compose.c:598 src/mainwindow.c:644 src/messageview.c:177
+#: src/compose.c:604 src/mainwindow.c:644 src/messageview.c:177
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/查看(_V)/字符编码(_E)/7位 ASCII (US-ASC_II)"
 
-#: src/compose.c:600 src/mainwindow.c:646 src/messageview.c:180
+#: src/compose.c:606 src/mainwindow.c:646 src/messageview.c:180
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/查看(_V)/字符编码(_E)/Unicode (_UTF-8)"
 
-#: src/compose.c:604 src/mainwindow.c:650 src/messageview.c:183
+#: src/compose.c:610 src/mainwindow.c:650 src/messageview.c:183
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-_1)"
 
-#: src/compose.c:606 src/mainwindow.c:652 src/messageview.c:185
+#: src/compose.c:612 src/mainwindow.c:652 src/messageview.c:185
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/查看(_V)/字符编码(_E)/西欧 (ISO-8859-15)"
 
-#: src/compose.c:610 src/mainwindow.c:658 src/messageview.c:190
+#: src/compose.c:616 src/mainwindow.c:658 src/messageview.c:190
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/查看(_V)/字符编码(_E)/中欧 (ISO-8859-_2)"
 
-#: src/compose.c:614 src/mainwindow.c:662 src/messageview.c:193
+#: src/compose.c:620 src/mainwindow.c:662 src/messageview.c:193
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-13)"
 
-#: src/compose.c:616 src/mainwindow.c:664 src/messageview.c:195
+#: src/compose.c:622 src/mainwindow.c:664 src/messageview.c:195
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:618 src/mainwindow.c:666 src/messageview.c:197
+#: src/compose.c:624 src/mainwindow.c:666 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (Windows-1257)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:622 src/mainwindow.c:670 src/messageview.c:200
+#: src/compose.c:628 src/mainwindow.c:670 src/messageview.c:200
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:626 src/mainwindow.c:674 src/messageview.c:203
+#: src/compose.c:632 src/mainwindow.c:674 src/messageview.c:203
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
 msgstr "/查看(_V)/字符编码(_E)/波罗的语 (ISO-8859-_4)"
 
-#: src/compose.c:628 src/mainwindow.c:676 src/messageview.c:205
+#: src/compose.c:634 src/mainwindow.c:676 src/messageview.c:205
 #, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:632 src/mainwindow.c:680 src/messageview.c:208
+#: src/compose.c:638 src/mainwindow.c:680 src/messageview.c:208
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/查看(_V)/字符编码(_E)/希腊语 (ISO-8859-_7)"
 
-#: src/compose.c:634 src/mainwindow.c:682 src/messageview.c:210
+#: src/compose.c:640 src/mainwindow.c:682 src/messageview.c:210
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:638 src/mainwindow.c:686 src/messageview.c:213
+#: src/compose.c:644 src/mainwindow.c:686 src/messageview.c:213
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/查看(_V)/字符编码(_E)/土耳其语 (ISO-8859-_9)"
 
-#: src/compose.c:642 src/mainwindow.c:690 src/messageview.c:216
+#: src/compose.c:648 src/mainwindow.c:690 src/messageview.c:216
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (ISO-8859-_5)"
 
-#: src/compose.c:644 src/mainwindow.c:692 src/messageview.c:218
+#: src/compose.c:650 src/mainwindow.c:692 src/messageview.c:218
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-_R)"
 
-#: src/compose.c:646 src/mainwindow.c:694 src/messageview.c:220
+#: src/compose.c:652 src/mainwindow.c:694 src/messageview.c:220
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (KOI8-U)"
 
-#: src/compose.c:648 src/mainwindow.c:696 src/messageview.c:222
+#: src/compose.c:654 src/mainwindow.c:696 src/messageview.c:222
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/查看(_V)/字符编码(_E)/斯拉夫语 (Windows-1251)"
 
-#: src/compose.c:652 src/mainwindow.c:700 src/messageview.c:225
+#: src/compose.c:658 src/mainwindow.c:700 src/messageview.c:225
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/查看(_V)/字符编码(_E)/日语 (ISO-2022-_JP)"
 
-#: src/compose.c:656 src/mainwindow.c:710 src/messageview.c:234
+#: src/compose.c:662 src/mainwindow.c:710 src/messageview.c:234
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:658 src/mainwindow.c:712 src/messageview.c:236
+#: src/compose.c:664 src/mainwindow.c:712 src/messageview.c:236
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/查看(_V)/字符编码(_E)/简体中文 (_GB2312)"
 
-#: src/compose.c:660 src/mainwindow.c:714 src/messageview.c:238
+#: src/compose.c:666 src/mainwindow.c:714 src/messageview.c:238
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/查看(_V)/字符编码(_E)/繁体中文 (_Big5)"
 
-#: src/compose.c:664 src/mainwindow.c:722 src/messageview.c:245
+#: src/compose.c:670 src/mainwindow.c:722 src/messageview.c:245
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (EUC-_KR)"
 
-#: src/compose.c:668 src/mainwindow.c:728 src/messageview.c:250
+#: src/compose.c:674 src/mainwindow.c:728 src/messageview.c:250
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (TIS-620)"
 
-#: src/compose.c:670 src/mainwindow.c:730 src/messageview.c:252
+#: src/compose.c:676 src/mainwindow.c:730 src/messageview.c:252
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/查看(_V)/字符编码(_E)/泰国语 (Windows-874)"
 
-#: src/compose.c:674 src/mainwindow.c:790 src/messageview.c:283
+#: src/compose.c:680 src/mainwindow.c:790 src/messageview.c:283
 msgid "/_Tools/_Address book"
 msgstr "/工具(_T)/地址簿(_A)"
 
-#: src/compose.c:675
+#: src/compose.c:681
 msgid "/_Tools/_Template"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:677 src/mainwindow.c:814 src/messageview.c:299
+#: src/compose.c:683 src/mainwindow.c:814 src/messageview.c:299
 msgid "/_Tools/Actio_ns"
 msgstr "/工具(_T)/动作(_N)"
 
-#: src/compose.c:679 src/compose.c:683 src/compose.c:689 src/mainwindow.c:793
+#: src/compose.c:685 src/compose.c:689 src/compose.c:695 src/mainwindow.c:793
 #: src/mainwindow.c:807 src/mainwindow.c:812 src/mainwindow.c:815
 #: src/mainwindow.c:819 src/mainwindow.c:821 src/messageview.c:286
 #: src/messageview.c:298
 msgid "/_Tools/---"
 msgstr "/工具(_T)/---"
 
-#: src/compose.c:680
+#: src/compose.c:686
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/工具(_T)/用外部编辑器编辑(_X)"
 
-#: src/compose.c:684
+#: src/compose.c:690
 msgid "/_Tools/PGP Si_gn"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:685
+#: src/compose.c:691
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:690
+#: src/compose.c:696
 #, fuzzy
 msgid "/_Tools/_Check spell"
 msgstr "/工具(_T)/执行(_X)"
 
-#: src/compose.c:691
+#: src/compose.c:697
 #, fuzzy
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:940
+#: src/compose.c:946
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1044 src/compose.c:1117
+#: src/compose.c:1050 src/compose.c:1123
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1538
+#: src/compose.c:1544
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1550
+#: src/compose.c:1556
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:2035
+#: src/compose.c:2041
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:2039
+#: src/compose.c:2045
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2043
+#: src/compose.c:2049
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:2047
+#: src/compose.c:2053
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2080
+#: src/compose.c:2086
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2140 src/mimeview.c:558
+#: src/compose.c:2146 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2624 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2630 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2627
+#: src/compose.c:2633
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2742
+#: src/compose.c:2748
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2750
+#: src/compose.c:2756
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2751
+#: src/compose.c:2757
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2810
+#: src/compose.c:2816
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2830
+#: src/compose.c:2836
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1606,21 +1605,21 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2844 src/send_message.c:300
+#: src/compose.c:2850 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2886
+#: src/compose.c:2892
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:2924
+#: src/compose.c:2930
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3021
+#: src/compose.c:3027
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1630,12 +1629,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3027
+#: src/compose.c:3033
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3106
+#: src/compose.c:3112
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1644,15 +1643,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3110
+#: src/compose.c:3116
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3239
+#: src/compose.c:3245
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3240
+#: src/compose.c:3246
 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 "
@@ -1661,118 +1660,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3423
+#: src/compose.c:3429
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3441
+#: src/compose.c:3447
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3523
+#: src/compose.c:3529
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3530
+#: src/compose.c:3536
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4159
+#: src/compose.c:4165
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4274
+#: src/compose.c:4280
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4327 src/headerview.c:54
+#: src/compose.c:4333 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4401
+#: src/compose.c:4407
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4404
+#: src/compose.c:4410
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4442 src/compose.c:5546
+#: src/compose.c:4448 src/compose.c:5550
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4451 src/mimeview.c:199 src/prefs_filter_edit.c:496
+#: src/compose.c:4457 src/mimeview.c:199 src/prefs_filter_edit.c:496
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5019
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:4857
-msgid "Send message"
-msgstr "立即发送邮件"
-
-#: src/compose.c:4859
-msgid "Put into queue folder and send later"
-msgstr "放入队列文件夹，在以后发送"
-
-#: src/compose.c:4861
-msgid "Save to draft folder"
-msgstr "保存到草稿文件夹"
-
-#: src/compose.c:4863
-msgid "Insert file"
-msgstr "插入文件内容"
-
-#: src/compose.c:4865
-msgid "Attach file"
-msgstr "加入附件"
-
-#: src/compose.c:4867
-#, fuzzy
-msgid "Append signature"
-msgstr "签名错误"
-
-#: src/compose.c:4869
-msgid "Edit with external editor"
-msgstr "使用外部编辑器编辑"
-
-#: src/compose.c:4871
-msgid "Wrap all long lines"
-msgstr "长行换行"
-
-#: src/compose.c:5442
+#: src/compose.c:5446
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5460
+#: src/compose.c:5464
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5528
+#: src/compose.c:5532
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5548 src/prefs_common_dialog.c:1504
+#: src/compose.c:5552 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5571 src/prefs_folder_item.c:202
+#: src/compose.c:5575 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5572
+#: src/compose.c:5576
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5662
+#: src/compose.c:5666
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5717
+#: src/compose.c:5721
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1782,51 +1748,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6043 src/mainwindow.c:2761
+#: src/compose.c:6057 src/mainwindow.c:2759
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6159 src/compose.c:6164 src/compose.c:6170
+#: src/compose.c:6173 src/compose.c:6178 src/compose.c:6184
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6261
+#: src/compose.c:6275
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6284
+#: src/compose.c:6298
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6319
+#: src/compose.c:6333
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6320
+#: src/compose.c:6334
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6322
+#: src/compose.c:6336
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6364
+#: src/compose.c:6378
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6366
+#: src/compose.c:6380
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6367
+#: src/compose.c:6381
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6367
+#: src/compose.c:6381
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2316,7 +2282,7 @@ msgstr "重建文件夹树失败。"
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:45
+#: src/folderview.c:1232 src/prefs_common_dialog.c:1850 src/prefs_toolbar.c:63
 msgid "Junk"
 msgstr ""
 
@@ -2560,11 +2526,11 @@ msgid "Import LDIF file into Address Book"
 msgstr "导入 LDIF 文件到地址簿"
 
 #. Button panel
-#: src/importldif.c:768 src/prefs_toolbar.c:48
+#: src/importldif.c:768 src/prefs_toolbar.c:69
 msgid "Prev"
 msgstr "上一个"
 
-#: src/importldif.c:769 src/prefs_toolbar.c:47
+#: src/importldif.c:769 src/prefs_toolbar.c:66
 msgid "Next"
 msgstr "下一个"
 
@@ -3619,110 +3585,47 @@ msgstr ""
 "创建邮件箱失败。\n"
 "也许某些文件已经存在，或者您没有写权限。"
 
-#: src/mainwindow.c:2206
+#: src/mainwindow.c:2211
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed－文件夹视图"
 
-#: src/mainwindow.c:2225
+#: src/mainwindow.c:2230
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2377 src/summaryview.c:418
+#: src/mainwindow.c:2382 src/summaryview.c:418
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
-#: src/mainwindow.c:2378
+#: src/mainwindow.c:2383
 msgid "/Reply to _all"
 msgstr "/回复到所有人(_A)"
 
-#: src/mainwindow.c:2379
+#: src/mainwindow.c:2384
 msgid "/Reply to _sender"
 msgstr "/回复到发件人(_S)"
 
-#: src/mainwindow.c:2380
+#: src/mainwindow.c:2385
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2385 src/summaryview.c:425
+#: src/mainwindow.c:2390 src/summaryview.c:425
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2386 src/summaryview.c:426
+#: src/mainwindow.c:2391 src/summaryview.c:426
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2387 src/summaryview.c:427
+#: src/mainwindow.c:2392 src/summaryview.c:427
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
-#: src/mainwindow.c:2392
-msgid "Incorporate new mail"
-msgstr "合并新邮件"
-
-#: src/mainwindow.c:2394
-msgid "Incorporate new mail of all accounts"
-msgstr "合并所有帐号的新邮件"
-
-#: src/mainwindow.c:2396
-msgid "Send queued message(s)"
-msgstr "发送队列中的邮件"
-
-#: src/mainwindow.c:2398
-msgid "Compose new message"
-msgstr "撰写新邮件"
-
-#: src/mainwindow.c:2400
-msgid "Reply to the message"
-msgstr "回复该邮件"
-
-#: src/mainwindow.c:2402
-msgid "Reply to all"
-msgstr "回复给所有人"
-
-#: src/mainwindow.c:2404
-msgid "Forward the message"
-msgstr "转发该邮件"
-
-#: src/mainwindow.c:2406
-msgid "Delete the message"
-msgstr "删除该邮件"
-
-#: src/mainwindow.c:2408
-#, fuzzy
-msgid "Set as junk mail"
-msgstr "设置为默认帐号"
-
-#: src/mainwindow.c:2410
-msgid "Execute marked process"
-msgstr "执行标记的处理"
-
-#: src/mainwindow.c:2412
-msgid "Next unread message"
-msgstr "下一个未读的邮件"
-
-#: src/mainwindow.c:2414
-#, fuzzy
-msgid "Previous unread message"
-msgstr "下一个未读的邮件"
-
-#: src/mainwindow.c:2418
-#, fuzzy
-msgid "Print message"
-msgstr "立即发送邮件"
-
-#: src/mainwindow.c:2420
-msgid "Common preferences"
-msgstr "通用首选项"
-
-#: src/mainwindow.c:2422 src/prefs_account_dialog.c:511
-msgid "Account preferences"
-msgstr "帐号首选项"
-
-#: src/mainwindow.c:2788
+#: src/mainwindow.c:2786
 msgid "You are offline. Click the icon to go online."
 msgstr "您处于离线状态。单击图标切换到在线状态。"
 
-#: src/mainwindow.c:2799
+#: src/mainwindow.c:2797
 msgid "You are online. Click the icon to go offline."
 msgstr "您处于在线状态。单击图标切换到离线状态。"
 
@@ -3980,6 +3883,10 @@ msgstr "帐号%d"
 msgid "Preferences for new account"
 msgstr "新帐号的首选项"
 
+#: src/prefs_account_dialog.c:511 src/prefs_toolbar.c:85
+msgid "Account preferences"
+msgstr "帐号首选项"
+
 #: src/prefs_account_dialog.c:534
 msgid "Creating account preferences window...\n"
 msgstr "正在创建帐号首选项窗口...\n"
@@ -3989,12 +3896,12 @@ msgid "Receive"
 msgstr "接收"
 
 #: src/prefs_account_dialog.c:556 src/prefs_common_dialog.c:684
-#: src/prefs_toolbar.c:39 src/prefs_toolbar.c:55
+#: src/prefs_toolbar.c:45 src/prefs_toolbar.c:88
 msgid "Send"
 msgstr "发送"
 
 #: src/prefs_account_dialog.c:558 src/prefs_common_dialog.c:686
-#: src/prefs_folder_item.c:140 src/prefs_toolbar.c:40
+#: src/prefs_folder_item.c:140 src/prefs_toolbar.c:48
 msgid "Compose"
 msgstr "撰写"
 
@@ -4208,7 +4115,7 @@ msgstr "发送前用POP3验证"
 
 #. signature
 #: src/prefs_account_dialog.c:1250 src/prefs_common_dialog.c:1009
-#: src/prefs_toolbar.c:60
+#: src/prefs_toolbar.c:103
 msgid "Signature"
 msgstr "签名"
 
@@ -4648,7 +4555,7 @@ msgstr "签名分隔符"
 msgid "Insert automatically"
 msgstr "自动插入"
 
-#: src/prefs_common_dialog.c:1031 src/prefs_toolbar.c:41
+#: src/prefs_common_dialog.c:1031 src/prefs_toolbar.c:51
 msgid "Reply"
 msgstr "回复"
 
@@ -4670,7 +4577,7 @@ msgstr ""
 
 #. editor
 #: src/prefs_common_dialog.c:1049 src/prefs_common_dialog.c:2398
-#: src/prefs_toolbar.c:61
+#: src/prefs_toolbar.c:106
 msgid "Editor"
 msgstr "编辑器"
 
@@ -5707,7 +5614,7 @@ msgstr "设置颜色"
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: src/prefs_filter_edit.c:674 src/prefs_toolbar.c:43
+#: src/prefs_filter_edit.c:674 src/prefs_toolbar.c:57
 msgid "Forward"
 msgstr "转发"
 
@@ -5807,7 +5714,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "回复时删除主题前的 [...] 或 (...)"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:53 src/progressdialog.c:128
+#: src/prefs_toolbar.c:84 src/progressdialog.c:128
 msgid "Account"
 msgstr "帐号"
 
@@ -5931,61 +5838,153 @@ msgstr "删除模板"
 msgid "Do you really want to delete this template?"
 msgstr "您确实要删除该模板吗？"
 
-#: src/prefs_toolbar.c:36
+#: src/prefs_toolbar.c:37
 #, fuzzy
 msgid "Separator"
 msgstr "签名分隔符"
 
-#: src/prefs_toolbar.c:37
+#: src/prefs_toolbar.c:39
 msgid "Get"
 msgstr "接收"
 
-#: src/prefs_toolbar.c:38
+#: src/prefs_toolbar.c:40
+msgid "Incorporate new mail"
+msgstr "合并新邮件"
+
+#: src/prefs_toolbar.c:42
 msgid "Get all"
 msgstr "全部接收"
 
-#: src/prefs_toolbar.c:42
+#: src/prefs_toolbar.c:43
+msgid "Incorporate new mail of all accounts"
+msgstr "合并所有帐号的新邮件"
+
+#: src/prefs_toolbar.c:46
+msgid "Send queued message(s)"
+msgstr "发送队列中的邮件"
+
+#: src/prefs_toolbar.c:49
+msgid "Compose new message"
+msgstr "撰写新邮件"
+
+#: src/prefs_toolbar.c:52
+msgid "Reply to the message"
+msgstr "回复该邮件"
+
+#: src/prefs_toolbar.c:54
 msgid "Reply all"
 msgstr "全部回复"
 
-#: src/prefs_toolbar.c:46
-msgid "Execute"
-msgstr "执行"
+#: src/prefs_toolbar.c:55
+msgid "Reply to all"
+msgstr "回复给所有人"
+
+#: src/prefs_toolbar.c:58
+msgid "Forward the message"
+msgstr "转发该邮件"
+
+#: src/prefs_toolbar.c:61
+msgid "Delete the message"
+msgstr "删除该邮件"
+
+#: src/prefs_toolbar.c:64
+#, fuzzy
+msgid "Set as junk mail"
+msgstr "设置为默认帐号"
+
+#: src/prefs_toolbar.c:67
+msgid "Next unread message"
+msgstr "下一个未读的邮件"
+
+#: src/prefs_toolbar.c:70
+#, fuzzy
+msgid "Previous unread message"
+msgstr "下一个未读的邮件"
 
-#: src/prefs_toolbar.c:50 src/printing.c:518
+#: src/prefs_toolbar.c:72 src/printing.c:518
 msgid "Print"
 msgstr "打印"
 
-#: src/prefs_toolbar.c:51
+#: src/prefs_toolbar.c:73
+#, fuzzy
+msgid "Print message"
+msgstr "立即发送邮件"
+
+#: src/prefs_toolbar.c:78
+msgid "Execute"
+msgstr "执行"
+
+#: src/prefs_toolbar.c:79
+msgid "Execute marked process"
+msgstr "执行标记的处理"
+
+#: src/prefs_toolbar.c:81
 msgid "Prefs"
 msgstr "首选项"
 
-#: src/prefs_toolbar.c:56
+#: src/prefs_toolbar.c:82
+msgid "Common preferences"
+msgstr "通用首选项"
+
+#: src/prefs_toolbar.c:89
+msgid "Send message"
+msgstr "立即发送邮件"
+
+#: src/prefs_toolbar.c:91
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/prefs_toolbar.c:57
+#: src/prefs_toolbar.c:92
+msgid "Put into queue folder and send later"
+msgstr "放入队列文件夹，在以后发送"
+
+#: src/prefs_toolbar.c:94
 msgid "Draft"
 msgstr "草稿"
 
-#: src/prefs_toolbar.c:58
+#: src/prefs_toolbar.c:95
+msgid "Save to draft folder"
+msgstr "保存到草稿文件夹"
+
+#: src/prefs_toolbar.c:97
 msgid "Insert"
 msgstr "插入"
 
-#: src/prefs_toolbar.c:59
+#: src/prefs_toolbar.c:98
+msgid "Insert file"
+msgstr "插入文件内容"
+
+#: src/prefs_toolbar.c:100
 msgid "Attach"
 msgstr "附件"
 
-#: src/prefs_toolbar.c:62
+#: src/prefs_toolbar.c:101
+msgid "Attach file"
+msgstr "加入附件"
+
+#: src/prefs_toolbar.c:104
+#, fuzzy
+msgid "Append signature"
+msgstr "签名错误"
+
+#: src/prefs_toolbar.c:107
+msgid "Edit with external editor"
+msgstr "使用外部编辑器编辑"
+
+#: src/prefs_toolbar.c:113
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/prefs_toolbar.c:150
+#: src/prefs_toolbar.c:114
+msgid "Wrap all long lines"
+msgstr "长行换行"
+
+#: src/prefs_toolbar.c:208
 #, fuzzy
 msgid "Customize toolbar"
 msgstr "/查看(_V)/转到(_G)/其它文件夹(_F)..."
 
-#: src/prefs_toolbar.c:152
+#: src/prefs_toolbar.c:210
 #, fuzzy
 msgid ""
 "Select items to be displayed on the toolbar. You can modify\n"