added the option to input signature directly.

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

1 files changed, 193 insertions, 189 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 067d3dae..56278913 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-12-07 16:10+0900\n"
+"POT-Creation-Date: 2006-12-08 18:27+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"
@@ -483,7 +483,7 @@ msgid "error occurred on POP3 session\n"
 msgstr "POP3 会话发生错误\n"
 
 #: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
-#: libsylph/prefs_account.c:217 libsylph/prefs_account.c:231
+#: libsylph/prefs_account.c:218 libsylph/prefs_account.c:232
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "无法写入配置文件\n"
@@ -593,8 +593,8 @@ msgstr "  标题：%s\n"
 msgid "  Issuer: %s\n"
 msgstr "  签发者：%s\n"
 
-#: libsylph/utils.c:2496 src/compose.c:2916 src/compose.c:3208
-#: src/compose.c:3271 src/compose.c:3391
+#: libsylph/utils.c:2496 src/compose.c:2944 src/compose.c:3236
+#: src/compose.c:3299 src/compose.c:3419
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
@@ -678,7 +678,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:366 src/addressadd.c:177 src/addressbook.c:491
-#: src/compose.c:4385 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4413 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
@@ -686,7 +686,7 @@ msgstr ""
 msgid "Name"
 msgstr "名称"
 
-#: src/account_dialog.c:371 src/prefs_account_dialog.c:659
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:662
 msgid "Protocol"
 msgstr "协议"
 
@@ -816,7 +816,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:187 src/compose.c:4889 src/editaddress.c:201
+#: src/addressadd.c:187 src/compose.c:4917 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "地址"
@@ -959,7 +959,7 @@ msgstr "/删除(_D)"
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:496 src/compose.c:4890 src/prefs_common_dialog.c:2264
+#: src/addressbook.c:496 src/compose.c:4918 src/prefs_common_dialog.c:2264
 msgid "Address book"
 msgstr "地址簿"
 
@@ -1144,7 +1144,7 @@ msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1695
+#: src/addressbook.c:3160 src/folderview.c:378 src/prefs_account_dialog.c:1735
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "文件夹"
@@ -1169,7 +1169,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5616 src/main.c:634
+#: src/alertpanel.c:142 src/compose.c:5644 src/main.c:634
 msgid "Notice"
 msgstr "注意"
 
@@ -1535,63 +1535,63 @@ msgstr "引文标记格式错误。"
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:1963
+#: src/compose.c:1991
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:1967
+#: src/compose.c:1995
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:1971
+#: src/compose.c:1999
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:1975
+#: src/compose.c:2003
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2008
+#: src/compose.c:2036
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2068 src/mimeview.c:558
+#: src/compose.c:2096 src/mimeview.c:558
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2552 src/headerview.c:233 src/query_search.c:666
+#: src/compose.c:2580 src/headerview.c:233 src/query_search.c:666
 #: src/summaryview.c:2237
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2555
+#: src/compose.c:2583
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2670
+#: src/compose.c:2698
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2678
+#: src/compose.c:2706
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2679
+#: src/compose.c:2707
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:2738
+#: src/compose.c:2766
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:2758
+#: src/compose.c:2786
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1599,21 +1599,21 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:2772 src/send_message.c:300
+#: src/compose.c:2800 src/send_message.c:300
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:2814
+#: src/compose.c:2842
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:2852
+#: src/compose.c:2880
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:2949
+#: src/compose.c:2977
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1623,12 +1623,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:2955
+#: src/compose.c:2983
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3034
+#: src/compose.c:3062
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1637,15 +1637,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3038
+#: src/compose.c:3066
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3167
+#: src/compose.c:3195
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3168
+#: src/compose.c:3196
 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 "
@@ -1654,155 +1654,155 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3351
+#: src/compose.c:3379
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3369
+#: src/compose.c:3397
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3451
+#: src/compose.c:3479
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3458
+#: src/compose.c:3486
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4087
+#: src/compose.c:4115
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4200
+#: src/compose.c:4228
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4251 src/headerview.c:54
+#: src/compose.c:4279 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4325
+#: src/compose.c:4353
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4328
+#: src/compose.c:4356
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4366 src/compose.c:5450
+#: src/compose.c:4394 src/compose.c:5478
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4375 src/mimeview.c:199 src/prefs_filter_edit.c:496
+#: src/compose.c:4403 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:4810 src/mainwindow.c:2368 src/prefs_account_dialog.c:529
+#: src/compose.c:4838 src/mainwindow.c:2368 src/prefs_account_dialog.c:532
 #: src/prefs_common_dialog.c:680
 msgid "Send"
 msgstr "发送"
 
-#: src/compose.c:4811
+#: src/compose.c:4839
 msgid "Send message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:4819
+#: src/compose.c:4847
 msgid "Send later"
 msgstr "以后发送"
 
-#: src/compose.c:4820
+#: src/compose.c:4848
 msgid "Put into queue folder and send later"
 msgstr "放入队列文件夹，在以后发送"
 
-#: src/compose.c:4828
+#: src/compose.c:4856
 msgid "Draft"
 msgstr "草稿"
 
-#: src/compose.c:4829
+#: src/compose.c:4857
 msgid "Save to draft folder"
 msgstr "保存到草稿文件夹"
 
-#: src/compose.c:4839
+#: src/compose.c:4867
 msgid "Insert"
 msgstr "插入"
 
-#: src/compose.c:4840
+#: src/compose.c:4868
 msgid "Insert file"
 msgstr "插入文件内容"
 
-#: src/compose.c:4848
+#: src/compose.c:4876
 msgid "Attach"
 msgstr "附件"
 
-#: src/compose.c:4849
+#: src/compose.c:4877
 msgid "Attach file"
 msgstr "加入附件"
 
 #. signature
-#: src/compose.c:4859 src/prefs_account_dialog.c:1209
+#: src/compose.c:4887 src/prefs_account_dialog.c:1215
 #: src/prefs_common_dialog.c:1005
 msgid "Signature"
 msgstr "签名"
 
-#: src/compose.c:4860
+#: src/compose.c:4888
 #, fuzzy
 msgid "Append signature"
 msgstr "签名错误"
 
 #. editor
-#: src/compose.c:4869 src/prefs_common_dialog.c:1045
+#: src/compose.c:4897 src/prefs_common_dialog.c:1045
 #: src/prefs_common_dialog.c:2388
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/compose.c:4870
+#: src/compose.c:4898
 msgid "Edit with external editor"
 msgstr "使用外部编辑器编辑"
 
-#: src/compose.c:4878
+#: src/compose.c:4906
 msgid "Linewrap"
 msgstr "换行"
 
-#: src/compose.c:4879
+#: src/compose.c:4907
 msgid "Wrap all long lines"
 msgstr "长行换行"
 
-#: src/compose.c:5346
+#: src/compose.c:5374
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5364
+#: src/compose.c:5392
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5432
+#: src/compose.c:5460
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5452 src/prefs_common_dialog.c:1500
+#: src/compose.c:5480 src/prefs_common_dialog.c:1500
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5475 src/prefs_folder_item.c:202
+#: src/compose.c:5503 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5476
+#: src/compose.c:5504
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5565
+#: src/compose.c:5593
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5613
+#: src/compose.c:5641
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1812,47 +1812,47 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:5989 src/compose.c:5994 src/compose.c:6000
+#: src/compose.c:6017 src/compose.c:6022 src/compose.c:6028
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6091
+#: src/compose.c:6119
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6114
+#: src/compose.c:6142
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6149
+#: src/compose.c:6177
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6150
+#: src/compose.c:6178
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6152
+#: src/compose.c:6180
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6194
+#: src/compose.c:6222
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6196
+#: src/compose.c:6224
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6197
+#: src/compose.c:6225
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6197
+#: src/compose.c:6225
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -1958,7 +1958,7 @@ msgid " Check File "
 msgstr " 检查文件 "
 
 #: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
-#: src/prefs_account_dialog.c:1220
+#: src/prefs_account_dialog.c:1249
 msgid "File"
 msgstr "文件"
 
@@ -2036,7 +2036,7 @@ msgid "Edit JPilot Entry"
 msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1723
+#: src/importldif.c:535 src/prefs_account_dialog.c:1763
 #: src/prefs_common_dialog.c:1902
 msgid " ... "
 msgstr " ... "
@@ -2101,7 +2101,7 @@ msgstr "超时(秒)"
 msgid "Maximum Entries"
 msgstr "最大项数"
 
-#: src/editldap.c:471 src/prefs_account_dialog.c:525
+#: src/editldap.c:471 src/prefs_account_dialog.c:528
 msgid "Basic"
 msgstr "基本"
 
@@ -2158,7 +2158,7 @@ msgid "Exporting file:"
 msgstr "导出文件："
 
 #: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
-#: src/prefs_account_dialog.c:920
+#: src/prefs_account_dialog.c:923
 msgid " Select... "
 msgstr " 选择... "
 
@@ -3685,7 +3685,7 @@ msgstr "合并所有帐号的新邮件"
 msgid "Send queued message(s)"
 msgstr "发送队列中的邮件"
 
-#: src/mainwindow.c:2379 src/prefs_account_dialog.c:531
+#: src/mainwindow.c:2379 src/prefs_account_dialog.c:534
 #: src/prefs_common_dialog.c:682 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "撰写"
@@ -4005,420 +4005,424 @@ msgstr ""
 "错误的口令串！重试...\n"
 "\n"
 
-#: src/prefs_account_dialog.c:427
+#: src/prefs_account_dialog.c:430
 msgid "Opening account preferences window...\n"
 msgstr "正在打开帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:460
+#: src/prefs_account_dialog.c:463
 #, c-format
 msgid "Account%d"
 msgstr "帐号%d"
 
-#: src/prefs_account_dialog.c:479
+#: src/prefs_account_dialog.c:482
 msgid "Preferences for new account"
 msgstr "新帐号的首选项"
 
-#: src/prefs_account_dialog.c:484
+#: src/prefs_account_dialog.c:487
 msgid "Account preferences"
 msgstr "帐号首选项"
 
-#: src/prefs_account_dialog.c:507
+#: src/prefs_account_dialog.c:510
 msgid "Creating account preferences window...\n"
 msgstr "正在创建帐号首选项窗口...\n"
 
-#: src/prefs_account_dialog.c:527 src/prefs_common_dialog.c:678
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:678
 msgid "Receive"
 msgstr "接收"
 
-#: src/prefs_account_dialog.c:534 src/prefs_common_dialog.c:689
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:689
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/prefs_account_dialog.c:538
+#: src/prefs_account_dialog.c:541
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:541 src/prefs_common_dialog.c:2183
+#: src/prefs_account_dialog.c:544 src/prefs_common_dialog.c:2183
 msgid "Advanced"
 msgstr "高级"
 
-#: src/prefs_account_dialog.c:590
+#: src/prefs_account_dialog.c:593
 msgid "Name of this account"
 msgstr "帐号名称"
 
-#: src/prefs_account_dialog.c:599
+#: src/prefs_account_dialog.c:602
 msgid "Set as default"
 msgstr "设置为默认帐号"
 
-#: src/prefs_account_dialog.c:603
+#: src/prefs_account_dialog.c:606
 msgid "Personal information"
 msgstr "个人资料"
 
-#: src/prefs_account_dialog.c:612
+#: src/prefs_account_dialog.c:615
 msgid "Full name"
 msgstr "全名"
 
-#: src/prefs_account_dialog.c:618
+#: src/prefs_account_dialog.c:621
 msgid "Mail address"
 msgstr "邮件地址"
 
-#: src/prefs_account_dialog.c:624
+#: src/prefs_account_dialog.c:627
 msgid "Organization"
 msgstr "组织"
 
-#: src/prefs_account_dialog.c:648
+#: src/prefs_account_dialog.c:651
 msgid "Server information"
 msgstr "服务器资料"
 
-#: src/prefs_account_dialog.c:669 src/prefs_account_dialog.c:825
-#: src/prefs_account_dialog.c:1468
+#: src/prefs_account_dialog.c:672 src/prefs_account_dialog.c:828
+#: src/prefs_account_dialog.c:1508
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:671 src/prefs_account_dialog.c:933
-#: src/prefs_account_dialog.c:1485 src/prefs_account_dialog.c:1667
+#: src/prefs_account_dialog.c:674 src/prefs_account_dialog.c:936
+#: src/prefs_account_dialog.c:1525 src/prefs_account_dialog.c:1707
 msgid "IMAP4"
 msgstr "IMAP4"
 
-#: src/prefs_account_dialog.c:673
+#: src/prefs_account_dialog.c:676
 msgid "News (NNTP)"
 msgstr "新闻组 (NNTP)"
 
-#: src/prefs_account_dialog.c:675
+#: src/prefs_account_dialog.c:678
 msgid "None (local)"
 msgstr "无(本地)"
 
-#: src/prefs_account_dialog.c:688
+#: src/prefs_account_dialog.c:691
 msgid "This server requires authentication"
 msgstr "该服务器需要验证"
 
-#: src/prefs_account_dialog.c:727
+#: src/prefs_account_dialog.c:730
 msgid "News server"
 msgstr "新闻组服务器"
 
-#: src/prefs_account_dialog.c:733
+#: src/prefs_account_dialog.c:736
 msgid "Server for receiving"
 msgstr "接收服务器"
 
-#: src/prefs_account_dialog.c:739
+#: src/prefs_account_dialog.c:742
 msgid "SMTP server (send)"
 msgstr "SMTP服务器(发送)"
 
-#: src/prefs_account_dialog.c:746 src/prefs_account_dialog.c:1130
+#: src/prefs_account_dialog.c:749 src/prefs_account_dialog.c:1133
 msgid "User ID"
 msgstr "用户名"
 
-#: src/prefs_account_dialog.c:752 src/prefs_account_dialog.c:1139
+#: src/prefs_account_dialog.c:755 src/prefs_account_dialog.c:1142
 msgid "Password"
 msgstr "密码"
 
-#: src/prefs_account_dialog.c:833
+#: src/prefs_account_dialog.c:836
 msgid "Use secure authentication (APOP)"
 msgstr "使用安全验证 (APOP)"
 
-#: src/prefs_account_dialog.c:836
+#: src/prefs_account_dialog.c:839
 msgid "Remove messages on server when received"
 msgstr "收到邮件后从服务器上删除"
 
-#: src/prefs_account_dialog.c:847
+#: src/prefs_account_dialog.c:850
 msgid "Remove after"
 msgstr "以后删除"
 
-#: src/prefs_account_dialog.c:856
+#: src/prefs_account_dialog.c:859
 msgid "days"
 msgstr "天"
 
-#: src/prefs_account_dialog.c:873
+#: src/prefs_account_dialog.c:876
 #, fuzzy
 msgid "0 days: remove immediately"
 msgstr "(0 天：立即删除)"
 
-#: src/prefs_account_dialog.c:883
+#: src/prefs_account_dialog.c:886
 #, fuzzy
 msgid "Download all messages (including already received) on server"
 msgstr "下载服务器上的所有邮件"
 
-#: src/prefs_account_dialog.c:889
+#: src/prefs_account_dialog.c:892
 msgid "Receive size limit"
 msgstr "接收大小限制"
 
-#: src/prefs_account_dialog.c:896 src/prefs_filter_edit.c:574
+#: src/prefs_account_dialog.c:899 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
 msgstr "KB"
 
-#: src/prefs_account_dialog.c:903
+#: src/prefs_account_dialog.c:906
 msgid "Filter messages on receiving"
 msgstr "在接收邮件时进行过滤"
 
-#: src/prefs_account_dialog.c:911
+#: src/prefs_account_dialog.c:914
 msgid "Default inbox"
 msgstr "默认收件箱"
 
-#: src/prefs_account_dialog.c:931
+#: src/prefs_account_dialog.c:934
 #, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "(没有过滤的邮件会保存在该文件夹中)"
 
-#: src/prefs_account_dialog.c:944 src/prefs_account_dialog.c:1100
+#: src/prefs_account_dialog.c:947 src/prefs_account_dialog.c:1103
 msgid "Authentication method"
 msgstr "验证方法"
 
-#: src/prefs_account_dialog.c:954 src/prefs_account_dialog.c:1110
+#: src/prefs_account_dialog.c:957 src/prefs_account_dialog.c:1113
 #: src/prefs_common_dialog.c:896 src/prefs_common_dialog.c:2569
 msgid "Automatic"
 msgstr "自动"
 
-#: src/prefs_account_dialog.c:962
+#: src/prefs_account_dialog.c:965
 #, fuzzy
 msgid "Only check INBOX on receiving"
 msgstr "仅在手工接收时"
 
-#: src/prefs_account_dialog.c:964
+#: src/prefs_account_dialog.c:967
 msgid "News"
 msgstr "新闻"
 
-#: src/prefs_account_dialog.c:976
+#: src/prefs_account_dialog.c:979
 #, fuzzy
 msgid "Maximum number of articles to download"
 msgstr ""
 "下载文章的最大数量\n"
 "(指定 0 表示无限制)"
 
-#: src/prefs_account_dialog.c:993
+#: src/prefs_account_dialog.c:996
 #, fuzzy
 msgid "No limit if 0 is specified."
 msgstr "没有指定收件人。"
 
-#: src/prefs_account_dialog.c:997
+#: src/prefs_account_dialog.c:1000
 msgid "`Get all' checks for new messages on this account"
 msgstr "“全部接收”时检查该帐号的新邮件"
 
-#: src/prefs_account_dialog.c:1050 src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1053 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "邮件头"
 
-#: src/prefs_account_dialog.c:1057
+#: src/prefs_account_dialog.c:1060
 msgid "Add Date header field"
 msgstr "添加日期头域"
 
-#: src/prefs_account_dialog.c:1058
+#: src/prefs_account_dialog.c:1061
 msgid "Generate Message-ID"
 msgstr "生成邮件标识"
 
-#: src/prefs_account_dialog.c:1065
+#: src/prefs_account_dialog.c:1068
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account_dialog.c:1067 src/prefs_common_dialog.c:1605
+#: src/prefs_account_dialog.c:1070 src/prefs_common_dialog.c:1605
 #: src/prefs_common_dialog.c:1632
 msgid " Edit... "
 msgstr " 编辑... "
 
-#: src/prefs_account_dialog.c:1077
+#: src/prefs_account_dialog.c:1080
 msgid "Authentication"
 msgstr "验证"
 
-#: src/prefs_account_dialog.c:1085
+#: src/prefs_account_dialog.c:1088
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP验证(SMTP AUTH)"
 
-#: src/prefs_account_dialog.c:1161
+#: src/prefs_account_dialog.c:1164
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr "如果您不填这些项，将使用和接收邮件相同的用户名和口令。"
 
-#: src/prefs_account_dialog.c:1174
+#: src/prefs_account_dialog.c:1177
 msgid "Authenticate with POP3 before sending"
 msgstr "发送前用POP3验证"
 
-#: src/prefs_account_dialog.c:1228
+#: src/prefs_account_dialog.c:1223
+msgid "Direct input"
+msgstr ""
+
+#: src/prefs_account_dialog.c:1257
 msgid "Command output"
 msgstr "命令输出"
 
-#: src/prefs_account_dialog.c:1239 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1278 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "自动设置以下地址"
 
-#: src/prefs_account_dialog.c:1248
+#: src/prefs_account_dialog.c:1287
 msgid "Cc"
 msgstr "抄送"
 
-#: src/prefs_account_dialog.c:1261
+#: src/prefs_account_dialog.c:1300
 msgid "Bcc"
 msgstr "密件抄送"
 
-#: src/prefs_account_dialog.c:1274
+#: src/prefs_account_dialog.c:1313
 msgid "Reply-To"
 msgstr "回复至"
 
-#: src/prefs_account_dialog.c:1327
+#: src/prefs_account_dialog.c:1367
 msgid "Sign message by default"
 msgstr "默认对邮件签名"
 
-#: src/prefs_account_dialog.c:1329
+#: src/prefs_account_dialog.c:1369
 msgid "Encrypt message by default"
 msgstr "默认对邮件加密"
 
-#: src/prefs_account_dialog.c:1331
+#: src/prefs_account_dialog.c:1371
 msgid "Encrypt when replying to encrypted message"
 msgstr ""
 
-#: src/prefs_account_dialog.c:1333
+#: src/prefs_account_dialog.c:1373
 msgid "Use ASCII-armored format for encryption"
 msgstr "使用 ASCII 包裹格式进行加密"
 
-#: src/prefs_account_dialog.c:1335
+#: src/prefs_account_dialog.c:1375
 msgid "Use clear text signature"
 msgstr "使用明文签名"
 
-#: src/prefs_account_dialog.c:1340
+#: src/prefs_account_dialog.c:1380
 msgid "Sign key"
 msgstr "签名密钥"
 
-#: src/prefs_account_dialog.c:1348
+#: src/prefs_account_dialog.c:1388
 msgid "Use default GnuPG key"
 msgstr "使用默认的GnuPG密钥"
 
-#: src/prefs_account_dialog.c:1357
+#: src/prefs_account_dialog.c:1397
 msgid "Select key by your email address"
 msgstr "按照邮件地址选择密钥"
 
-#: src/prefs_account_dialog.c:1366
+#: src/prefs_account_dialog.c:1406
 msgid "Specify key manually"
 msgstr "手工指定密钥"
 
-#: src/prefs_account_dialog.c:1382
+#: src/prefs_account_dialog.c:1422
 msgid "User or key ID:"
 msgstr "用户或者密钥ID："
 
-#: src/prefs_account_dialog.c:1476 src/prefs_account_dialog.c:1493
-#: src/prefs_account_dialog.c:1509 src/prefs_account_dialog.c:1527
+#: src/prefs_account_dialog.c:1516 src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1549 src/prefs_account_dialog.c:1567
 msgid "Don't use SSL"
 msgstr "不使用SSL"
 
-#: src/prefs_account_dialog.c:1479
+#: src/prefs_account_dialog.c:1519
 msgid "Use SSL for POP3 connection"
 msgstr "使用SSL连接POP3服务器"
 
-#: src/prefs_account_dialog.c:1482 src/prefs_account_dialog.c:1499
-#: src/prefs_account_dialog.c:1533
+#: src/prefs_account_dialog.c:1522 src/prefs_account_dialog.c:1539
+#: src/prefs_account_dialog.c:1573
 msgid "Use STARTTLS command to start SSL session"
 msgstr "使用STARTTLS命令开始SSL会话"
 
-#: src/prefs_account_dialog.c:1496
+#: src/prefs_account_dialog.c:1536
 msgid "Use SSL for IMAP4 connection"
 msgstr "使用SSL连接IMAP4服务器"
 
-#: src/prefs_account_dialog.c:1502
+#: src/prefs_account_dialog.c:1542
 msgid "NNTP"
 msgstr "NNTP"
 
-#: src/prefs_account_dialog.c:1517
+#: src/prefs_account_dialog.c:1557
 msgid "Use SSL for NNTP connection"
 msgstr "使用SSL连接NNTP服务器"
 
-#: src/prefs_account_dialog.c:1519
+#: src/prefs_account_dialog.c:1559
 msgid "Send (SMTP)"
 msgstr "发送(SMTP)"
 
-#: src/prefs_account_dialog.c:1530
+#: src/prefs_account_dialog.c:1570
 msgid "Use SSL for SMTP connection"
 msgstr "使用SSL连接SMTP服务器"
 
-#: src/prefs_account_dialog.c:1541
+#: src/prefs_account_dialog.c:1581
 msgid "Use non-blocking SSL"
 msgstr "使用非阻塞式SSL"
 
-#: src/prefs_account_dialog.c:1544
+#: src/prefs_account_dialog.c:1584
 #, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
 msgstr "(如果您遇到SSL连接问题，请关闭该选项)"
 
-#: src/prefs_account_dialog.c:1634
+#: src/prefs_account_dialog.c:1674
 msgid "Specify SMTP port"
 msgstr "指定SMTP端口"
 
-#: src/prefs_account_dialog.c:1640
+#: src/prefs_account_dialog.c:1680
 msgid "Specify POP3 port"
 msgstr "指定POP3端口"
 
-#: src/prefs_account_dialog.c:1646
+#: src/prefs_account_dialog.c:1686
 msgid "Specify IMAP4 port"
 msgstr "指定IMAP4端口"
 
-#: src/prefs_account_dialog.c:1652
+#: src/prefs_account_dialog.c:1692
 msgid "Specify NNTP port"
 msgstr "指定NNTP端口"
 
-#: src/prefs_account_dialog.c:1657
+#: src/prefs_account_dialog.c:1697
 msgid "Specify domain name"
 msgstr "指定域名"
 
-#: src/prefs_account_dialog.c:1678
+#: src/prefs_account_dialog.c:1718
 msgid "IMAP server directory"
 msgstr "IMAP4 服务器目录"
 
-#: src/prefs_account_dialog.c:1688
+#: src/prefs_account_dialog.c:1728
 msgid "Only the subfolders of this directory will be displayed."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1691
+#: src/prefs_account_dialog.c:1731
 #, fuzzy
 msgid "Clear all message caches on exit"
 msgstr "下载服务器上的所有邮件"
 
-#: src/prefs_account_dialog.c:1736
+#: src/prefs_account_dialog.c:1776
 msgid "Put sent messages in"
 msgstr "将已发出的邮件保存于"
 
-#: src/prefs_account_dialog.c:1738
+#: src/prefs_account_dialog.c:1778
 msgid "Put draft messages in"
 msgstr "将邮件草稿保存于"
 
-#: src/prefs_account_dialog.c:1740
+#: src/prefs_account_dialog.c:1780
 #, fuzzy
 msgid "Put queued messages in"
 msgstr "将删除的邮件保存于"
 
-#: src/prefs_account_dialog.c:1742
+#: src/prefs_account_dialog.c:1782
 msgid "Put deleted messages in"
 msgstr "将删除的邮件保存于"
 
-#: src/prefs_account_dialog.c:1806
+#: src/prefs_account_dialog.c:1846
 msgid "Account name is not entered."
 msgstr "没有输入帐号名称。"
 
-#: src/prefs_account_dialog.c:1810
+#: src/prefs_account_dialog.c:1850
 msgid "Mail address is not entered."
 msgstr "没有输入邮件地址。"
 
-#: src/prefs_account_dialog.c:1815
+#: src/prefs_account_dialog.c:1855
 msgid "SMTP server is not entered."
 msgstr "没有输入SMTP服务器。"
 
-#: src/prefs_account_dialog.c:1820
+#: src/prefs_account_dialog.c:1860
 msgid "User ID is not entered."
 msgstr "没有输入用户标识。"
 
-#: src/prefs_account_dialog.c:1825
+#: src/prefs_account_dialog.c:1865
 msgid "POP3 server is not entered."
 msgstr "没有输入POP3服务器。"
 
-#: src/prefs_account_dialog.c:1830
+#: src/prefs_account_dialog.c:1870
 msgid "IMAP4 server is not entered."
 msgstr "没有输入IMAP4服务器。"
 
-#: src/prefs_account_dialog.c:1835
+#: src/prefs_account_dialog.c:1875
 msgid "NNTP server is not entered."
 msgstr "没有输入NNTP服务器。"
 
-#: src/prefs_account_dialog.c:1861
+#: src/prefs_account_dialog.c:1901
 msgid "Specified folder is not a queue folder."
 msgstr ""
 
-#: src/prefs_account_dialog.c:1935
+#: src/prefs_account_dialog.c:1975
 msgid ""
 "It's not recommended to use the old style ASCII-armored\n"
 "mode for encrypted messages. It doesn't comply with the\n"
@@ -5916,20 +5920,20 @@ msgstr "删除模板"
 msgid "Do you really want to delete this template?"
 msgstr "您确实要删除该模板吗？"
 
-#: src/printing.c:449
+#: src/printing.c:450
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/printing.c:450
+#: src/printing.c:451
 #, fuzzy
 msgid "(Default print command)"
 msgstr "执行命令"
 
-#: src/printing.c:452
+#: src/printing.c:453
 msgid "Print"
 msgstr "打印"
 
-#: src/printing.c:460
+#: src/printing.c:461
 #, c-format
 msgid ""
 "Print command line is invalid:\n"