From: lilydjwg <lilydjwg@gmail.com>
Date: Wed, 9 Aug 2017 15:08:24 +0000 (-0700)
Subject: Updated Simplified Chinese translation.
X-Git-Tag: mutt-1-9-rel~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8295a531a385e4dc769a43654e06e1f2c344129c;p=mutt

Updated Simplified Chinese translation.
---

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8eab2494..57b8d17a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,16 +5,16 @@
 # Weichung Chau <weichung@mail.cynix.com.tw>
 # Anthony Wong <ypwong@debian.org>
 # Deng Xiyue <manphiz@gmail.com>, 2009
-#
+# lilydjwg <lilydjwg@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Mutt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-03 18:37-0700\n"
-"PO-Revision-Date: 2009-06-28 14:30+0800\n"
-"Last-Translator: Deng Xiyue <manphiz@gmail.com>\n"
-"Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
-"Language: \n"
+"POT-Creation-Date: 2017-08-09 18:41+0800\n"
+"PO-Revision-Date: 2015-02-07 12:21+0800\n"
+"Last-Translator: lilydjwg <lilydjwg@gmail.com>\n"
+"Language-Team: \n"
+"Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,14 +40,14 @@ msgstr "删除"
 
 #: addrbook.c:39 curs_main.c:488 postpone.c:43
 msgid "Undel"
-msgstr "反删除"
+msgstr "撤销删除"
 
 #: addrbook.c:40
 msgid "Select"
 msgstr "选择"
 
 #: addrbook.c:41 browser.c:49 compose.c:124 crypt-gpgme.c:4088 curs_main.c:493
-#: mutt_ssl.c:1257 mutt_ssl_gnutls.c:1023 pager.c:1973 pgpkey.c:522
+#: mutt_ssl.c:1257 mutt_ssl_gnutls.c:1023 pager.c:1981 pgpkey.c:522
 #: postpone.c:44 query.c:53 recvattach.c:57 smime.c:440
 msgid "Help"
 msgstr "帮助"
@@ -106,7 +106,7 @@ msgstr "别名已添加。"
 
 #: alias.c:391
 msgid "Error seeking in alias file"
-msgstr "无法在别名文件里查找"
+msgstr "无法在别名文件里定位"
 
 #: attach.c:113 attach.c:245 attach.c:400 attach.c:927
 msgid "Can't match nametemplate, continue?"
@@ -125,20 +125,20 @@ msgstr "执行 \"%s\" 时出错！"
 
 #: attach.c:144
 msgid "Failure to open file to parse headers."
-msgstr "打开文件来分析标头失败。"
+msgstr "为分析邮件头而打开文件时失败。"
 
 #: attach.c:175
 msgid "Failure to open file to strip headers."
-msgstr "打开文件时去除标头失败。"
+msgstr "为去除邮件头而打开文件时失败。"
 
 #: attach.c:184
 msgid "Failure to rename file."
-msgstr "将文件改名失败。"
+msgstr "文件重命名失败。"
 
 #: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr "没有 %s 的 mailcap 撰写条目，正在创建空文件。"
+msgstr "没有 %s 的 mailcap 撰写条目，创建空文件。"
 
 #: attach.c:258
 #, c-format
@@ -170,22 +170,22 @@ msgstr "---命令：%-20.20s 描述：%s"
 #: attach.c:481
 #, c-format
 msgid "---Command: %-30.30s Attachment: %s"
-msgstr "---命令：%-30.30s 描述：%s"
+msgstr "---命令：%-30.30s 附件：%s"
 
 #: attach.c:558
 #, c-format
 msgid "---Attachment: %s: %s"
-msgstr "---附件: %s: %s"
+msgstr "---附件：%s: %s"
 
 #: attach.c:561
 #, c-format
 msgid "---Attachment: %s"
-msgstr "---附件: %s"
+msgstr "---附件：%s"
 
 #: attach.c:633 attach.c:665 attach.c:960 attach.c:1018 handler.c:1363
 #: pgpkey.c:572 pgpkey.c:760
 msgid "Can't create filter"
-msgstr "无法建立过滤器"
+msgstr "无法创建过滤器"
 
 #: attach.c:799
 msgid "Write fault!"
@@ -211,7 +211,7 @@ msgstr "%s 不是目录"
 #: browser.c:574
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "ä¿¡ç®± [%d]"
+msgstr "邮箱 [%d]"
 
 #: browser.c:581
 #, c-format
@@ -233,15 +233,15 @@ msgstr "没有文件与文件掩码相符"
 
 #: browser.c:940
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "只有 IMAP 信箱才支持创建"
+msgstr "只有 IMAP 邮箱才支持创建"
 
 #: browser.c:963
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "只有 IMAP 信箱才支持改名"
+msgstr "只有 IMAP 邮箱才支持重命名"
 
 #: browser.c:985
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "只有 IMAP 信箱才支持删除"
+msgstr "只有 IMAP 邮箱才支持删除"
 
 #: browser.c:995
 msgid "Cannot delete root folder"
@@ -250,15 +250,15 @@ msgstr "无法删除根文件夹"
 #: browser.c:998
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "真的要删除 \"%s\" 信箱吗？"
+msgstr "真的要删除 \"%s\" 邮箱吗？"
 
 #: browser.c:1014
 msgid "Mailbox deleted."
-msgstr "信箱已删除。"
+msgstr "邮箱已删除。"
 
 #: browser.c:1019
 msgid "Mailbox not deleted."
-msgstr "信箱未删除。"
+msgstr "邮箱未删除。"
 
 #: browser.c:1038
 msgid "Chdir to: "
@@ -298,7 +298,7 @@ msgstr "尝试显示文件出错"
 
 #: buffy.c:608
 msgid "New mail in "
-msgstr "有新信件在 "
+msgstr "有新邮件在 "
 
 #: color.c:350
 #, c-format
@@ -318,7 +318,7 @@ msgstr "%s：没有这个对象"
 #: color.c:433
 #, c-format
 msgid "%s: command valid only for index, body, header objects"
-msgstr "%s：命令只对索引，正文，标头对象有效"
+msgstr "%s：命令只对索引，正文，邮件头对象有效"
 
 #: color.c:441
 #, c-format
@@ -331,11 +331,11 @@ msgstr "缺少参数。"
 
 #: color.c:669 color.c:680
 msgid "color: too few arguments"
-msgstr "色彩：参数太少"
+msgstr "color：参数太少"
 
 #: color.c:703
 msgid "mono: too few arguments"
-msgstr "单色：参数太少"
+msgstr "mono：参数太少"
 
 #: color.c:723
 #, c-format
@@ -368,7 +368,7 @@ msgstr "无法创建显示过滤器"
 
 #: commands.c:152
 msgid "Could not copy message"
-msgstr "无法复制信件"
+msgstr "无法复制邮件"
 
 #: commands.c:189
 msgid "S/MIME signature successfully verified."
@@ -380,11 +380,11 @@ msgstr "S/MIME 证书所有者与发送者不匹配。"
 
 #: commands.c:194 commands.c:205
 msgid "Warning: Part of this message has not been signed."
-msgstr "警告：此信件的部分内容未签署。"
+msgstr "警告：此邮件的部分内容未签名。"
 
 #: commands.c:196
 msgid "S/MIME signature could NOT be verified."
-msgstr "S/MIME 签名“无法”验证。"
+msgstr "S/MIME 签名无法验证！"
 
 #: commands.c:203
 msgid "PGP signature successfully verified."
@@ -392,7 +392,7 @@ msgstr "PGP 签名验证成功。"
 
 #: commands.c:207
 msgid "PGP signature could NOT be verified."
-msgstr "PGP 签名“无法”验证。"
+msgstr "PGP 签名无法验证！"
 
 #: commands.c:231
 msgid "Command: "
@@ -400,15 +400,15 @@ msgstr "命令："
 
 #: commands.c:256 commands.c:266 recvcmd.c:148 recvcmd.c:161
 msgid "Warning: message contains no From: header"
-msgstr "警告：信件未包含 From: 标头"
+msgstr "警告：邮件未包含 From: 邮件头"
 
 #: commands.c:274 recvcmd.c:171
 msgid "Bounce message to: "
-msgstr "回退信件至："
+msgstr "重发邮件至："
 
 #: commands.c:276 recvcmd.c:173
 msgid "Bounce tagged messages to: "
-msgstr "回退已标记的信件至："
+msgstr "重发已标记的邮件至："
 
 #: commands.c:284 recvcmd.c:182
 msgid "Error parsing address!"
@@ -422,32 +422,32 @@ msgstr "错误的 IDN: '%s'"
 #: commands.c:303 recvcmd.c:204
 #, c-format
 msgid "Bounce message to %s"
-msgstr "回退信件至 %s"
+msgstr "重发邮件至 %s"
 
 #: commands.c:303 recvcmd.c:204
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "回退信件至 %s"
+msgstr "重发邮件至 %s"
 
 #: commands.c:319 recvcmd.c:220
 msgid "Message not bounced."
-msgstr "信件未回退。"
+msgstr "邮件未重发。"
 
 #: commands.c:319 recvcmd.c:220
 msgid "Messages not bounced."
-msgstr "信件未回退。"
+msgstr "邮件未重发。"
 
 #: commands.c:329 recvcmd.c:239
 msgid "Message bounced."
-msgstr "信件已回退。"
+msgstr "邮件已重发。"
 
 #: commands.c:329 recvcmd.c:239
 msgid "Messages bounced."
-msgstr "信件已回退。"
+msgstr "邮件已重发。"
 
 #: commands.c:406 commands.c:442 commands.c:461
 msgid "Can't create filter process"
-msgstr "无法建立过滤进程"
+msgstr "无法创建过滤进程"
 
 #: commands.c:492
 msgid "Pipe to command: "
@@ -459,27 +459,27 @@ msgstr "未定义打印命令"
 
 #: commands.c:514
 msgid "Print message?"
-msgstr "打印信件？"
+msgstr "打印邮件？"
 
 #: commands.c:514
 msgid "Print tagged messages?"
-msgstr "打印已标记的信件？"
+msgstr "打印已标记的邮件？"
 
 #: commands.c:523
 msgid "Message printed"
-msgstr "信件已打印"
+msgstr "邮件已打印"
 
 #: commands.c:523
 msgid "Messages printed"
-msgstr "信件已打印"
+msgstr "邮件已打印"
 
 #: commands.c:525
 msgid "Message could not be printed"
-msgstr "信件无法打印"
+msgstr "邮件无法打印"
 
 #: commands.c:526
 msgid "Messages could not be printed"
-msgstr "信件无法打印"
+msgstr "邮件无法打印"
 
 #. L10N: The following three are the sort/reverse sort prompts.
 #. * Letters must match the order of the characters in the third
@@ -487,23 +487,20 @@ msgstr "信件无法打印"
 #. * it's okay for the translation to take up to three lines.
 #.
 #: commands.c:540
-#, fuzzy
 msgid "Rev-Sort Date/Frm/Recv/Subj/tO/Thread/Unsort/siZe/sCore/sPam/Label?: "
 msgstr ""
-"按日期d/发信人f/收信时间r/标题s/收信人o/线索t/不排u/大小z/分数c/垃圾邮件p反向"
-"排序?: "
+"反向排序：按日期d/发件人f/收信时间r/主题s/收件人o/线索t/不排u/大小z/分数c/垃"
+"圾邮件p/标签l？ "
 
 #: commands.c:541
-#, fuzzy
 msgid "Sort Date/Frm/Recv/Subj/tO/Thread/Unsort/siZe/sCore/sPam/Label?: "
 msgstr ""
-"按日期d/发信人f/收信时间r/标题s/收信人o/线索t/不排u/大小z/分数c/垃圾邮件p排"
-"序?: "
+"排序：按日期d/发件人f/收信时间r/主题s/收件人o/线索t/不排u/大小z/分数c/垃圾邮"
+"件p/标签l？ "
 
 #: commands.c:542
-#, fuzzy
 msgid "dfrsotuzcpl"
-msgstr "dfrsotuzcp"
+msgstr "dfrsotuzcpl"
 
 #: commands.c:603
 msgid "Shell command: "
@@ -512,32 +509,32 @@ msgstr "Shell 指令："
 #: commands.c:746
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "解码保存%s 到信箱"
+msgstr "解码保存%s 到邮箱"
 
 #: commands.c:747
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "解码复制%s 到信箱"
+msgstr "解码复制%s 到邮箱"
 
 #: commands.c:748
 #, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "解密保存%s 到信箱"
+msgstr "解密保存%s 到邮箱"
 
 #: commands.c:749
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "解密复制%s 到信箱"
+msgstr "解密复制%s 到邮箱"
 
 #: commands.c:750
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "保存%s 到信箱"
+msgstr "保存%s 到邮箱"
 
 #: commands.c:750
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "复制%s 到信箱"
+msgstr "复制%s 到邮箱"
 
 #: commands.c:751
 msgid " tagged"
@@ -578,33 +575,32 @@ msgstr "没有附件。"
 #. L10N: Compose menu field.  May not want to translate.
 #: compose.c:82
 msgid "From: "
-msgstr ""
+msgstr "发件人: "
 
 #. L10N: Compose menu field.  May not want to translate.
 #: compose.c:84 send.c:222
 msgid "To: "
-msgstr ""
+msgstr "收件人: "
 
 #. L10N: Compose menu field.  May not want to translate.
 #: compose.c:86 send.c:224
 msgid "Cc: "
-msgstr ""
+msgstr "抄送: "
 
 #. L10N: Compose menu field.  May not want to translate.
 #: compose.c:88 send.c:226
 msgid "Bcc: "
-msgstr ""
+msgstr "密送: "
 
 #. L10N: Compose menu field.  May not want to translate.
 #: compose.c:90 compose.c:722 send.c:251
 msgid "Subject: "
-msgstr ""
+msgstr "主题: "
 
 #. L10N: Compose menu field.  May not want to translate.
 #: compose.c:92
-#, fuzzy
 msgid "Reply-To: "
-msgstr "回覆"
+msgstr "回复到: "
 
 #. L10N: Compose menu field.  May not want to translate.
 #: compose.c:94 compose.c:739
@@ -619,7 +615,7 @@ msgstr ""
 #. L10N: Compose menu field.  Holds "Encrypt", "Sign" related information
 #: compose.c:100
 msgid "Security: "
-msgstr ""
+msgstr "安全性："
 
 #. L10N:
 #. * This string is used by the compose menu.
@@ -632,7 +628,7 @@ msgstr ""
 #.
 #: compose.c:110 crypt-gpgme.c:4837 pgp.c:1821 smime.c:2222 smime.c:2237
 msgid "Sign as: "
-msgstr "选择身份签署："
+msgstr "选择身份签名："
 
 #: compose.c:114
 msgid "Send"
@@ -640,35 +636,34 @@ msgstr "寄出"
 
 #: compose.c:115 remailer.c:484
 msgid "Abort"
-msgstr "中断"
+msgstr "放弃"
 
 #. L10N: compose menu help line entry
 #: compose.c:117
 msgid "To"
-msgstr ""
+msgstr "收件人"
 
 #. L10N: compose menu help line entry
 #: compose.c:119
 msgid "CC"
-msgstr ""
+msgstr "抄送"
 
 #. L10N: compose menu help line entry
 #: compose.c:121
 msgid "Subj"
-msgstr ""
+msgstr "主题"
 
 #: compose.c:122 compose.c:836
 msgid "Attach file"
-msgstr "附加文件"
+msgstr "添加附件"
 
 #: compose.c:123
 msgid "Descrip"
 msgstr "描述"
 
 #: compose.c:191
-#, fuzzy
 msgid "Not supported"
-msgstr "不支持标记。"
+msgstr "不支持"
 
 #: compose.c:198
 msgid "Sign, Encrypt"
@@ -684,25 +679,23 @@ msgstr "签名"
 
 #: compose.c:213
 msgid "None"
-msgstr ""
+msgstr "无"
 
 #: compose.c:222
-#, fuzzy
 msgid " (inline PGP)"
-msgstr " (嵌入)"
+msgstr " (内嵌 PGP)"
 
 #: compose.c:224
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
 #: compose.c:228
-#, fuzzy
 msgid " (S/MIME)"
-msgstr " (PGP/MIME)"
+msgstr " (S/MIME)"
 
 #: compose.c:232
 msgid " (OppEnc mode)"
-msgstr ""
+msgstr " (OppEnc 模式)"
 
 #: compose.c:244 compose.c:253
 msgid "<default>"
@@ -742,33 +735,33 @@ msgstr "在\"%s\"中有错误的 IDN: '%s'"
 
 #: compose.c:852
 msgid "Attaching selected files..."
-msgstr "正在附加已选择的文件..."
+msgstr "正在添加已选择的文件附件..."
 
 #: compose.c:864
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "无法附加 %s！"
+msgstr "无法将 %s 添加为附件！"
 
 #: compose.c:884
 msgid "Open mailbox to attach message from"
-msgstr "打开信箱并从中附加信件"
+msgstr "打开邮箱并选择邮件作为附件"
 
 #: compose.c:914
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open mailbox %s"
-msgstr "无法锁住信箱！"
+msgstr "无法打开邮箱 %s"
 
 #: compose.c:922
 msgid "No messages in that folder."
-msgstr "文件夹中没有信件。"
+msgstr "文件夹中没有邮件。"
 
 #: compose.c:931
 msgid "Tag the messages you want to attach!"
-msgstr "请标记您要附加的信件！"
+msgstr "请标记您要作为附件的邮件！"
 
 #: compose.c:963
 msgid "Unable to attach!"
-msgstr "无法附加！"
+msgstr "无法添加附件！"
 
 #: compose.c:1014
 msgid "Recoding only affects text attachments."
@@ -788,20 +781,19 @@ msgstr "无效的编码。"
 
 #: compose.c:1122
 msgid "Save a copy of this message?"
-msgstr "保存这封信件的副本吗？"
+msgstr "保存这封邮件的副本吗？"
 
 #: compose.c:1185
-#, fuzzy
 msgid "Send attachment with name: "
-msgstr "将附件保存到 Fcc 吗？"
+msgstr "发送附件文件: "
 
 #: compose.c:1203
 msgid "Rename to: "
-msgstr "改名为："
+msgstr "重命名为："
 
 #. L10N:
 #. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1210 editmsg.c:96 editmsg.c:121 sendlib.c:872
+#: compose.c:1210 editmsg.c:96 editmsg.c:121 sendlib.c:877
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "无法 stat %s：%s"
@@ -812,42 +804,42 @@ msgstr "新文件："
 
 #: compose.c:1250
 msgid "Content-Type is of the form base/sub"
-msgstr "内容类型(Content-Type)的格式是 base/sub"
+msgstr "内容类型(Content-Type)的格式是 基础类型/子类型"
 
 #: compose.c:1256
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "不明的内容类型(Content-Type)%s"
+msgstr "未知的内容类型(Content-Type)%s"
 
 #: compose.c:1269
 #, c-format
 msgid "Can't create file %s"
-msgstr "无法建立文件 %s"
+msgstr "无法创建文件 %s"
 
 #: compose.c:1277
 msgid "What we have here is a failure to make an attachment"
-msgstr "目前情况是我们无法加上附件"
+msgstr "目前的情况是我们无法生成附件"
 
 #: compose.c:1337
 msgid "Postpone this message?"
-msgstr "推迟这封信件？"
+msgstr "推迟这封邮件？"
 
 #: compose.c:1401
 msgid "Write message to mailbox"
-msgstr "将信件写入到信箱"
+msgstr "将邮件写入到邮箱"
 
 #: compose.c:1404
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "写入信件到 %s ..."
+msgstr "写入邮件到 %s ..."
 
 #: compose.c:1413
 msgid "Message written."
-msgstr "信件已写入。"
+msgstr "邮件已写入。"
 
 #: compose.c:1427
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr "已经选择了 S/MIME 。清除并继续？"
+msgstr "已经选择了 S/MIME。清除并继续？"
 
 #: compose.c:1460
 msgid "PGP already selected. Clear & continue ? "
@@ -855,45 +847,45 @@ msgstr "已经选择了 PGP。清除并继续？"
 
 #: compress.c:481 compress.c:551 compress.c:706 compress.c:895 mbox.c:847
 msgid "Unable to lock mailbox!"
-msgstr "无法锁住信箱！"
+msgstr "无法锁定邮箱！"
 
 #: compress.c:485 compress.c:558 compress.c:710
 #, c-format
 msgid "Decompressing %s"
-msgstr ""
+msgstr "正在解压 %s"
 
 #: compress.c:494
 msgid "Can't identify the contents of the compressed file"
-msgstr ""
+msgstr "无法确定压缩文件的内容"
 
 #: compress.c:501 compress.c:579
 #, c-format
 msgid "Can't find mailbox ops for mailbox type %d"
-msgstr ""
+msgstr "无法找到对于邮箱类型 %d 的邮箱操作"
 
 #: compress.c:540 compress.c:834
 #, c-format
 msgid "Cannot append without an append-hook or close-hook : %s"
-msgstr ""
+msgstr "在没有 append-hook 或者 close-hook 时不能追加：%s"
 
 #: compress.c:561
-#, fuzzy, c-format
+#, c-format
 msgid "Compress command failed: %s"
-msgstr "预连接命令失败。"
+msgstr "压缩命令失败: %s"
 
 #: compress.c:572
 msgid "Unsupported mailbox type for appending."
-msgstr ""
+msgstr "邮箱类型不支持追加。"
 
 #: compress.c:648
-#, fuzzy, c-format
+#, c-format
 msgid "Compressed-appending to %s..."
-msgstr "正在复制到 %s..."
+msgstr "正在压缩并追加到 %s..."
 
 #: compress.c:653
-#, fuzzy, c-format
+#, c-format
 msgid "Compressing %s..."
-msgstr "正在复制到 %s..."
+msgstr "正在压缩 %s..."
 
 #: compress.c:660 editmsg.c:210
 #, c-format
@@ -902,12 +894,12 @@ msgstr "错误。保留临时文件：%s"
 
 #: compress.c:885
 msgid "Can't sync a compressed file without a close-hook"
-msgstr ""
+msgstr "没有 close-hook 时无法同步压缩文件"
 
 #: compress.c:907
-#, fuzzy, c-format
+#, c-format
 msgid "Compressing %s"
-msgstr "正在复制到 %s..."
+msgstr "正在压缩 %s"
 
 #: crypt-gpgme.c:393
 #, c-format
@@ -917,7 +909,7 @@ msgstr "创建 gpgme 上下文出错：%s\n"
 #: crypt-gpgme.c:403
 #, c-format
 msgid "error enabling CMS protocol: %s\n"
-msgstr "开启 CMS 协议时出错：%s\n"
+msgstr "启用 CMS 协议时出错：%s\n"
 
 #: crypt-gpgme.c:423
 #, c-format
@@ -941,27 +933,27 @@ msgstr "读取数据对象时出错：%s\n"
 
 #: crypt-gpgme.c:573 crypt-gpgme.c:3702 pgpkey.c:560 pgpkey.c:740
 msgid "Can't create temporary file"
-msgstr "无法建立暂存档"
+msgstr "无法创建临时文件"
 
 #: crypt-gpgme.c:681
 #, c-format
 msgid "error adding recipient `%s': %s\n"
-msgstr "添加接收方`%s'时出错：%s\n"
+msgstr "添加收件人“%s”时出错：%s\n"
 
 #: crypt-gpgme.c:721
 #, c-format
 msgid "secret key `%s' not found: %s\n"
-msgstr "未找到密钥`%s'：%s\n"
+msgstr "未找到私钥“%s”：%s\n"
 
 #: crypt-gpgme.c:731
 #, c-format
 msgid "ambiguous specification of secret key `%s'\n"
-msgstr "密钥`%s'的说明有歧义\n"
+msgstr "私钥“%s”的指定有歧义\n"
 
 #: crypt-gpgme.c:743
 #, c-format
 msgid "error setting secret key `%s': %s\n"
-msgstr "设置密钥`%s'时出错：%s\n"
+msgstr "设置私钥“%s”时出错：%s\n"
 
 #: crypt-gpgme.c:760
 #, c-format
@@ -976,11 +968,11 @@ msgstr "加密数据时出错：%s\n"
 #: crypt-gpgme.c:933
 #, c-format
 msgid "error signing data: %s\n"
-msgstr "签署数据时出错：%s\n"
+msgstr "签名数据时出错：%s\n"
 
 #: crypt-gpgme.c:944
 msgid "$pgp_sign_as unset and no default key specified in ~/.gnupg/gpg.conf"
-msgstr ""
+msgstr "$pgp_sign_as 未设置，并且在 ~/.gnupg/gpg.conf 中没有设置默认密钥"
 
 #: crypt-gpgme.c:1144
 msgid "Warning: One of the keys has been revoked\n"
@@ -1034,17 +1026,17 @@ msgstr "指纹："
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
-msgstr "警告：我们“无法”证实密钥是否属于上面列出名字的人\n"
+msgstr "警告：我们无法证实密钥是否属于上述名字的人！\n"
 
 #: crypt-gpgme.c:1331
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
-msgstr "警告：密钥“不属于”上面列出名字的人\n"
+msgstr "警告：密钥不属于上述名字的人！\n"
 
 #: crypt-gpgme.c:1335
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
-msgstr "警告：“无法”确定密钥属于上面列出名字的人\n"
+msgstr "警告：无法确定密钥属于上述名字的人！\n"
 
 #: crypt-gpgme.c:1365 crypt-gpgme.c:1370 crypt-gpgme.c:3390
 msgid "aka: "
@@ -1052,35 +1044,35 @@ msgstr "亦即："
 
 #: crypt-gpgme.c:1380
 msgid "KeyID "
-msgstr ""
+msgstr "密钥ID "
 
 #: crypt-gpgme.c:1389 crypt-gpgme.c:1394
 msgid "created: "
-msgstr "已建立："
+msgstr "创建于："
 
 #: crypt-gpgme.c:1467
-#, fuzzy, c-format
+#, c-format
 msgid "Error getting key information for KeyID %s: %s\n"
-msgstr "获取密钥信息出错："
+msgstr "获取密钥 %s 的信息时出错：%s\n"
 
 #: crypt-gpgme.c:1474 crypt-gpgme.c:1489
 msgid "Good signature from:"
-msgstr "正确的签名来自："
+msgstr "有效的签名来自："
 
 #: crypt-gpgme.c:1481
 msgid "*BAD* signature from:"
-msgstr "*错误*的签名来自："
+msgstr "*无效*的签名来自："
 
 #: crypt-gpgme.c:1497
 msgid "Problem signature from:"
-msgstr "有问题的签名来自："
+msgstr "有疑问的签名来自："
 
 #. L10N:
 #. This is trying to match the width of the
 #. "Problem signature from:" translation just above.
 #: crypt-gpgme.c:1504
 msgid "               expires: "
-msgstr "  已于此日期过期："
+msgstr "                过期于: "
 
 #: crypt-gpgme.c:1551 crypt-gpgme.c:1774 crypt-gpgme.c:2475
 msgid "[-- Begin signature information --]\n"
@@ -1094,7 +1086,7 @@ msgstr "错误：验证失败：%s\n"
 #: crypt-gpgme.c:1617
 #, c-format
 msgid "*** Begin Notation (signature by: %s) ***\n"
-msgstr "*** 注释开始 (由 %s 签署) ***\n"
+msgstr "*** 注释开始 (由 %s 签名) ***\n"
 
 #: crypt-gpgme.c:1639
 msgid "*** End Notation ***\n"
@@ -1147,7 +1139,7 @@ msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP 签署的信件开始 --]\n"
+"[-- PGP 签名的邮件开始 --]\n"
 "\n"
 
 #: crypt-gpgme.c:2549 pgp.c:569
@@ -1160,7 +1152,7 @@ msgstr "[-- PGP 公共钥匙区段结束 --]\n"
 
 #: crypt-gpgme.c:2553 pgp.c:578
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr "[-- PGP 签署的信件结束 --]\n"
+msgstr "[-- PGP 签名的邮件结束 --]\n"
 
 #: crypt-gpgme.c:2576 pgp.c:611
 msgid ""
@@ -1172,14 +1164,14 @@ msgstr ""
 
 #: crypt-gpgme.c:2607 crypt-gpgme.c:2680 pgp.c:1094
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- 错误：无法建立临时文件！ --]\n"
+msgstr "[-- 错误：无法创建临时文件！ --]\n"
 
 #: crypt-gpgme.c:2619
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- 以下数据已由 PGP/MIME 签署并加密 --]\n"
+"[-- 以下数据已使用 PGP/MIME 签名并加密 --]\n"
 "\n"
 
 #: crypt-gpgme.c:2620 pgp.c:1103
@@ -1187,12 +1179,12 @@ msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- 以下数据已由 PGP/MIME 加密 --]\n"
+"[-- 以下数据已使用 PGP/MIME 加密 --]\n"
 "\n"
 
 #: crypt-gpgme.c:2642
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr "[-- PGP/MIME 签署并加密的数据结束 --]\n"
+msgstr "[-- PGP/MIME 签名并加密的数据结束 --]\n"
 
 #: crypt-gpgme.c:2643 pgp.c:1123
 msgid "[-- End of PGP/MIME encrypted data --]\n"
@@ -1200,18 +1192,18 @@ msgstr "[-- PGP/MIME 加密数据结束 --]\n"
 
 #: crypt-gpgme.c:2648 pgp.c:573 pgp.c:1128
 msgid "PGP message successfully decrypted."
-msgstr "PGP 信件成功解密。"
+msgstr "PGP 邮件成功解密。"
 
 #: crypt-gpgme.c:2652 pgp.c:508 pgp.c:571 pgp.c:1132
 msgid "Could not decrypt PGP message"
-msgstr "无法解密 PGP 信件"
+msgstr "无法解密 PGP 邮件"
 
 #: crypt-gpgme.c:2692
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- 以下数据已由 S/MIME 签署 --]\n"
+"[-- 以下数据已使用 S/MIME 签名 --]\n"
 "\n"
 
 #: crypt-gpgme.c:2693
@@ -1219,12 +1211,12 @@ msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- 以下数据已由 S/MIME 加密 --]\n"
+"[-- 以下数据已使用 S/MIME 加密 --]\n"
 "\n"
 
 #: crypt-gpgme.c:2723
 msgid "[-- End of S/MIME signed data --]\n"
-msgstr "[-- S/MIME 签署的数据结束 --]\n"
+msgstr "[-- S/MIME 签名的数据结束 --]\n"
 
 #: crypt-gpgme.c:2724
 msgid "[-- End of S/MIME encrypted data --]\n"
@@ -1247,44 +1239,36 @@ msgstr "[无法显示用户 ID (无效 DN)]"
 #. * GPGME key selection menu (bound to "c" in the key selection menu).
 #. * They will be automatically aligned.
 #: crypt-gpgme.c:3389
-#, fuzzy
 msgid "Name: "
-msgstr "名称 ...: "
+msgstr "名称: "
 
 #: crypt-gpgme.c:3391
-#, fuzzy
 msgid "Valid From: "
-msgstr "从此有效: %s\n"
+msgstr "生效于: "
 
 #: crypt-gpgme.c:3392
-#, fuzzy
 msgid "Valid To: "
-msgstr "有效至 .: %s\n"
+msgstr "有效至: "
 
 #: crypt-gpgme.c:3393
-#, fuzzy
 msgid "Key Type: "
-msgstr "密钥用法: "
+msgstr "密钥类型: "
 
 #: crypt-gpgme.c:3394
-#, fuzzy
 msgid "Key Usage: "
 msgstr "密钥用法: "
 
 #: crypt-gpgme.c:3396
-#, fuzzy
 msgid "Serial-No: "
-msgstr "序列号 .: 0x%s\n"
+msgstr "序列号: "
 
 #: crypt-gpgme.c:3397
-#, fuzzy
 msgid "Issued By: "
-msgstr "发放者 .: "
+msgstr "颁发者: "
 
 #: crypt-gpgme.c:3398
-#, fuzzy
 msgid "Subkey: "
-msgstr "次钥匙 (subkey) 封包"
+msgstr "子密钥: "
 
 #. L10N: comes after the Name or aka if the key is invalid
 #. L10N: describes a subkey
@@ -1295,9 +1279,9 @@ msgstr "[无效]"
 #. L10N: This is printed after "Key Type: " and looks like this:
 #. *       PGP, 2048 bit RSA
 #: crypt-gpgme.c:3501 crypt-gpgme.c:3660
-#, fuzzy, c-format
+#, c-format
 msgid "%s, %lu bit %s\n"
-msgstr "密钥类型: %s, %lu 位 %s\n"
+msgstr "%s, %lu 位 %s\n"
 
 #. L10N: value in Key Usage: field
 #: crypt-gpgme.c:3510 crypt-gpgme.c:3668
@@ -1312,7 +1296,7 @@ msgstr ", "
 #. L10N: value in Key Usage: field
 #: crypt-gpgme.c:3516 crypt-gpgme.c:3673
 msgid "signing"
-msgstr "正在签署"
+msgstr "正在签名"
 
 #. L10N: value in Key Usage: field
 #: crypt-gpgme.c:3522 crypt-gpgme.c:3678
@@ -1341,17 +1325,16 @@ msgstr "正在收集数据..."
 #: crypt-gpgme.c:3731
 #, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "查找发放者密钥出错：%s\n"
+msgstr "查找颁发者密钥出错：%s\n"
 
 #: crypt-gpgme.c:3741
-#, fuzzy
 msgid "Error: certification chain too long - stopping here\n"
 msgstr "错误：证书链过长 - 就此打住\n"
 
 #: crypt-gpgme.c:3752 pgpkey.c:582
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "钥匙 ID：0x%s"
+msgstr "密钥 ID：0x%s"
 
 #: crypt-gpgme.c:3835
 #, c-format
@@ -1419,15 +1402,15 @@ msgstr "%s \"%s\"."
 
 #: crypt-gpgme.c:4146 pgpkey.c:602
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "这个钥匙不能使用：过期/无效/已取消。"
+msgstr "这个钥匙不能使用：过期/无效/已吊销。"
 
 #: crypt-gpgme.c:4160 pgpkey.c:614 smime.c:468
 msgid "ID is expired/disabled/revoked."
-msgstr "ID 已经过期/无效/已取消。"
+msgstr "ID 已经过期/无效/已吊销。"
 
 #: crypt-gpgme.c:4168 pgpkey.c:618 smime.c:471
 msgid "ID has undefined validity."
-msgstr "ID 正确性未定义。"
+msgstr "ID 有效性未定义。"
 
 #: crypt-gpgme.c:4171 pgpkey.c:621
 msgid "ID is not valid."
@@ -1462,32 +1445,30 @@ msgid "Please enter the key ID: "
 msgstr "请输入密钥 ID："
 
 #: crypt-gpgme.c:4657
-#, fuzzy, c-format
+#, c-format
 msgid "Error exporting key: %s\n"
-msgstr "取出密钥数据出错！\n"
+msgstr "导出密钥出错：%s\n"
 
 #. L10N:
 #. MIME description for exported (attached) keys.
 #. You can translate this entry to a non-ASCII string (it will be encoded),
 #. but it may be safer to keep it untranslated.
 #: crypt-gpgme.c:4677
-#, fuzzy, c-format
+#, c-format
 msgid "PGP Key 0x%s."
-msgstr "PGP 钥匙 %s。"
+msgstr "PGP 密钥 0x%s。"
 
 #: crypt-gpgme.c:4719
 msgid "GPGME: OpenPGP protocol not available"
-msgstr ""
+msgstr "GPGME: OpenPGP 协议不可用"
 
 #: crypt-gpgme.c:4727
 msgid "GPGME: CMS protocol not available"
-msgstr ""
+msgstr "GPGME: CMS 协议不可用"
 
 #: crypt-gpgme.c:4764
-#, fuzzy
 msgid "S/MIME (s)ign, sign (a)s, (p)gp, (c)lear, or (o)ppenc mode off? "
-msgstr ""
-"S/MIME 加密(e)，签署(s)，选择身份签署(a)，两者皆要(b)，(p)gp或清除(c)？"
+msgstr "S/MIME 签名(s)，选择身份签名(a)，(p)gp，清除(c)还是关(o)ppenc模式？"
 
 #. L10N: The 'f' is from "forget it", an old undocumented synonym of
 #. 'clear'.  Please use a corresponding letter in your language.
@@ -1495,59 +1476,53 @@ msgstr ""
 #. This comment also applies to the five following letter sequences.
 #: crypt-gpgme.c:4769
 msgid "sapfco"
-msgstr ""
+msgstr "sapfco"
 
 #: crypt-gpgme.c:4774
-#, fuzzy
 msgid "PGP (s)ign, sign (a)s, s/(m)ime, (c)lear, or (o)ppenc mode off? "
-msgstr ""
-"PGP 加密(e)，签署(s)，选择身份签署(a)，两者皆要(b)，s/(m)ime或清除(c)？"
+msgstr "PGP 签名(s)，选择身份签名(a)，s/(m)ime，清除(c)还是关(o)ppenc模式？"
 
 #: crypt-gpgme.c:4775
 msgid "samfco"
-msgstr ""
+msgstr "samfco"
 
 #: crypt-gpgme.c:4787
-#, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp, (c)lear, or (o)ppenc "
 "mode? "
 msgstr ""
-"S/MIME 加密(e)，签署(s)，选择身份签署(a)，两者皆要(b)，(p)gp或清除(c)？"
+"S/MIME 加密(e)，签名(s)，选择身份签名(a)，两者皆要(b)，(p)gp,清除(c)还是"
+"(o)ppenc模式？"
 
 #: crypt-gpgme.c:4788
-#, fuzzy
 msgid "esabpfco"
-msgstr "esabpfc"
+msgstr "esabpfco"
 
 #: crypt-gpgme.c:4793
-#, fuzzy
 msgid ""
 "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime, (c)lear, or (o)ppenc "
 "mode? "
 msgstr ""
-"PGP 加密(e)，签署(s)，选择身份签署(a)，两者皆要(b)，s/(m)ime或清除(c)？"
+"PGP 加密(e)，签名(s)，选择身份签名(a)，两者皆要(b)，s/(m)ime，清除(c)还是"
+"(o)ppenc模式？"
 
 #: crypt-gpgme.c:4794
-#, fuzzy
 msgid "esabmfco"
-msgstr "esabmfc"
+msgstr "esabmfco"
 
 #: crypt-gpgme.c:4805
-#, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear? "
 msgstr ""
-"S/MIME 加密(e)，签署(s)，选择身份签署(a)，两者皆要(b)，(p)gp或清除(c)？"
+"S/MIME 加密(e)，签名(s)，选择身份签名(a)，两者皆要(b)，(p)gp还是清除(c)？"
 
 #: crypt-gpgme.c:4806
 msgid "esabpfc"
 msgstr "esabpfc"
 
 #: crypt-gpgme.c:4811
-#, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear? "
 msgstr ""
-"PGP 加密(e)，签署(s)，选择身份签署(a)，两者皆要(b)，s/(m)ime或清除(c)？"
+"PGP 加密(e)，签名(s)，选择身份签名(a)，两者皆要(b)，s/(m)ime还是清除(c)？"
 
 #: crypt-gpgme.c:4812
 msgid "esabmfc"
@@ -1576,13 +1551,12 @@ msgid "Passphrase(s) forgotten."
 msgstr "已忘记通行密码。"
 
 #: crypt.c:150
-#, fuzzy
 msgid "Inline PGP can't be used with attachments.  Revert to PGP/MIME?"
-msgstr "无法将信件嵌入发送。返回使用 PGP/MIME 吗？"
+msgstr "有附件的情况下无法使用内嵌 PGP。转而使用 PGP/MIME 吗？"
 
 #: crypt.c:152
 msgid "Mail not sent: inline PGP can't be used with attachments."
-msgstr ""
+msgstr "邮件未发送：嵌入 PGP 无法在有附件的时候使用。"
 
 #: crypt.c:159 cryptglue.c:110 pgpkey.c:564 pgpkey.c:753
 msgid "Invoking PGP..."
@@ -1590,11 +1564,11 @@ msgstr "正在调用 PGP..."
 
 #: crypt.c:168
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
-msgstr "无法将信件嵌入发送。返回使用 PGP/MIME 吗？"
+msgstr "无法将邮件嵌入发送。转而使用 PGP/MIME 吗？"
 
 #: crypt.c:170 send.c:1606
 msgid "Mail not sent."
-msgstr "信件没有寄出。"
+msgstr "邮件没有寄出。"
 
 #: crypt.c:483
 msgid "S/MIME messages with no hints on content are unsupported."
@@ -1639,7 +1613,7 @@ msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- 以下数据已签署 --]\n"
+"[-- 以下数据已签名 --]\n"
 "\n"
 
 #: crypt.c:1018
@@ -1647,7 +1621,7 @@ msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- 警告：找不到任何的签名。 --]\n"
+"[-- 警告：找不到任何签名。 --]\n"
 "\n"
 
 #: crypt.c:1024
@@ -1656,22 +1630,20 @@ msgid ""
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- 签署的数据结束 --]\n"
+"[-- 已签名的数据结束 --]\n"
 
 #: cryptglue.c:89
 msgid "\"crypt_use_gpgme\" set but not built with GPGME support."
-msgstr "设置了\"crypt_use_gpgme\"但没有编译 GPGME 支持。"
+msgstr "设置了 \"crypt_use_gpgme\" 但没有编译 GPGME 支持。"
 
 #: cryptglue.c:112
 msgid "Invoking S/MIME..."
 msgstr "正在调用 S/MIME..."
 
-# Don't translate this!!
 #: curs_lib.c:232
 msgid "yes"
 msgstr "yes"
 
-# Don't translate this!!
 #: curs_lib.c:233
 msgid "no"
 msgstr "no"
@@ -1680,13 +1652,13 @@ msgstr "no"
 msgid "Exit Mutt?"
 msgstr "退出 Mutt？"
 
-#: curs_lib.c:761 mutt_socket.c:586 mutt_ssl.c:577
+#: curs_lib.c:761 mutt_socket.c:612 mutt_ssl.c:577
 msgid "unknown error"
 msgstr "未知错误"
 
 #: curs_lib.c:781
 msgid "Press any key to continue..."
-msgstr "按下任何一个键继续..."
+msgstr "按任意键继续..."
 
 #: curs_lib.c:826
 msgid " ('?' for list): "
@@ -1694,33 +1666,33 @@ msgstr " (按'?'显示列表)："
 
 #: curs_main.c:57 curs_main.c:742
 msgid "No mailbox is open."
-msgstr "没有已打开信箱。"
+msgstr "没有已打开的邮箱。"
 
 #: curs_main.c:58
 msgid "There are no messages."
-msgstr "没有信件。"
+msgstr "没有邮件。"
 
 #: curs_main.c:59 mx.c:1131 pager.c:55 recvattach.c:43
 msgid "Mailbox is read-only."
-msgstr "信箱是只读的。"
+msgstr "邮箱是只读的。"
 
 #: curs_main.c:60 pager.c:56 recvattach.c:943
 msgid "Function not permitted in attach-message mode."
-msgstr "功能在附加信件(attach-message)模式下不被支持。"
+msgstr "功能在邮件附件(attach-message)模式下不被支持。"
 
 #: curs_main.c:61
 msgid "No visible messages."
-msgstr "无可见信件"
+msgstr "无可见邮件。"
 
 #. L10N: %s is one of the CHECK_ACL entries below.
 #: curs_main.c:102 pager.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Operation not permitted by ACL"
-msgstr "无法 %s: 操作不被访问控制列表(ACL)所允许"
+msgstr "%s: 访问控制列表(ACL)不允许此操作"
 
 #: curs_main.c:332
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "无法在只读信箱切换可写！"
+msgstr "无法在只读邮箱切换写入！"
 
 #: curs_main.c:339
 msgid "Changes to folder will be written on folder exit."
@@ -1732,131 +1704,128 @@ msgstr "将不会把改变写入文件夹。"
 
 #: curs_main.c:486
 msgid "Quit"
-msgstr "离开"
+msgstr "退出"
 
 #: curs_main.c:489 recvattach.c:54
 msgid "Save"
-msgstr "储存"
+msgstr "保存"
 
 #: curs_main.c:490 query.c:49
 msgid "Mail"
-msgstr "信件"
+msgstr "写信"
 
 #: curs_main.c:491 pager.c:1583
 msgid "Reply"
-msgstr "回覆"
+msgstr "回复"
 
 #: curs_main.c:492
 msgid "Group"
-msgstr "群组"
+msgstr "回复所有人"
 
 #: curs_main.c:633
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "信箱已有外部修改。标记可能有错误。"
+msgstr "邮箱已有外部修改。标记可能有错误。"
 
 #: curs_main.c:636
 msgid "New mail in this mailbox."
-msgstr "此信箱中有新邮件。"
+msgstr "此邮箱中有新邮件。"
 
 #: curs_main.c:640
 msgid "Mailbox was externally modified."
-msgstr "信箱已有外部修改。"
+msgstr "邮箱已有外部修改。"
 
 #: curs_main.c:749
 msgid "No tagged messages."
-msgstr "没有已标记的信件。"
+msgstr "没有已标记的邮件。"
 
-#: curs_main.c:753 menu.c:1043
+#: curs_main.c:753 menu.c:1050
 msgid "Nothing to do."
 msgstr "无事可做。"
 
 #: curs_main.c:833
 msgid "Jump to message: "
-msgstr "跳到信件："
+msgstr "跳到邮件："
 
 #: curs_main.c:846
 msgid "Argument must be a message number."
-msgstr "参数必须是信件编号。"
+msgstr "参数必须是邮件编号。"
 
 #: curs_main.c:878
 msgid "That message is not visible."
-msgstr "这封信件无法显示。"
+msgstr "这封邮件不可见。"
 
 #: curs_main.c:881
 msgid "Invalid message number."
-msgstr "无效的信件编号。"
+msgstr "无效的邮件编号。"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:895 curs_main.c:2031 pager.c:2532
-#, fuzzy
+#: curs_main.c:895 curs_main.c:2031 pager.c:2540
 msgid "Cannot delete message(s)"
-msgstr "反删除信件"
+msgstr "无法删除邮件"
 
 #: curs_main.c:898
 msgid "Delete messages matching: "
-msgstr "删除符合此样式的信件："
+msgstr "删除符合此模式的邮件："
 
 #: curs_main.c:920
 msgid "No limit pattern is in effect."
-msgstr "当前没有限制样式起作用。"
+msgstr "当前没有限制模式起作用。"
 
 #. L10N: ask for a limit to apply
 #: curs_main.c:925
 #, c-format
 msgid "Limit: %s"
-msgstr "限制: %s"
+msgstr "限制：%s"
 
 #: curs_main.c:935
 msgid "Limit to messages matching: "
-msgstr "限制符合此样式的信件："
+msgstr "限制符合此模式的邮件："
 
 #: curs_main.c:956
 msgid "To view all messages, limit to \"all\"."
-msgstr "要查看所有信件，请将限制设为\"all\"。"
+msgstr "要查看所有邮件，请将限制设为 \"all\"。"
 
-#: curs_main.c:968 pager.c:2069
+#: curs_main.c:968 pager.c:2077
 msgid "Quit Mutt?"
 msgstr "离开 Mutt？"
 
 #: curs_main.c:1058
 msgid "Tag messages matching: "
-msgstr "标记符合此样式的信件："
+msgstr "标记符合此模式的邮件："
 
 #. L10N: CHECK_ACL
-#: curs_main.c:1068 curs_main.c:2382 pager.c:2787
-#, fuzzy
+#: curs_main.c:1068 curs_main.c:2382 pager.c:2795
 msgid "Cannot undelete message(s)"
-msgstr "反删除信件"
+msgstr "无法撤销删除邮件"
 
 #: curs_main.c:1070
 msgid "Undelete messages matching: "
-msgstr "反删除符合此样式的信件："
+msgstr "撤销删除符合此模式的邮件："
 
 #: curs_main.c:1078
 msgid "Untag messages matching: "
-msgstr "反标记符合此样式的信件："
+msgstr "取消标记符合此模式的邮件："
 
 #: curs_main.c:1104
-#, fuzzy
 msgid "Logged out of IMAP servers."
-msgstr "正在关闭与 IMAP 伺服器的连线..."
+msgstr "已从 IMAP 服务器退出。"
 
 #: curs_main.c:1189
 msgid "Open mailbox in read-only mode"
-msgstr "用只读模式打开信箱"
+msgstr "用只读模式打开邮箱"
 
 #: curs_main.c:1191
 msgid "Open mailbox"
-msgstr "打开信箱"
+msgstr "打开邮箱"
 
 #: curs_main.c:1201
 msgid "No mailboxes have new mail"
-msgstr "没有信箱有新信件"
+msgstr "没有邮箱有新邮件"
 
 #: curs_main.c:1238 mx.c:516 mx.c:614
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s 不是信箱。"
+msgstr "%s 不是邮箱。"
 
 #: curs_main.c:1361
 msgid "Exit Mutt without saving?"
@@ -1865,89 +1834,82 @@ msgstr "不保存便退出 Mutt 吗？"
 #: curs_main.c:1379 curs_main.c:1415 curs_main.c:1875 curs_main.c:1907
 #: flags.c:303 thread.c:1025 thread.c:1081 thread.c:1148
 msgid "Threading is not enabled."
-msgstr "线索功能尚未启动。"
+msgstr "线索功能尚未启用。"
 
 #: curs_main.c:1391
 msgid "Thread broken"
-msgstr "线索有误"
+msgstr "线索已断开"
 
 #: curs_main.c:1402
 msgid "Thread cannot be broken, message is not part of a thread"
-msgstr ""
+msgstr "线索不能断开，因为邮件不是某线索的一部分"
 
 #. L10N: CHECK_ACL
 #: curs_main.c:1412
-#, fuzzy
 msgid "Cannot link threads"
-msgstr "链接线索"
+msgstr "无法连接线索"
 
 #: curs_main.c:1417
 msgid "No Message-ID: header available to link thread"
-msgstr "无 Message-ID: 标头可用于链接线索"
+msgstr "无 Message-ID: 邮件头可用于连接线索"
 
 #: curs_main.c:1419
 msgid "First, please tag a message to be linked here"
-msgstr "首先，请标记一个信件以链接于此"
+msgstr "首先，请标记一个要连接到这里的邮件"
 
 #: curs_main.c:1431
 msgid "Threads linked"
-msgstr "线索已链接"
+msgstr "线索已连接"
 
 #: curs_main.c:1434
 msgid "No thread linked"
-msgstr "无线索来链接"
+msgstr "线索没有连接"
 
 #: curs_main.c:1470 curs_main.c:1495
 msgid "You are on the last message."
-msgstr "您已经在最后一封信了。"
+msgstr "您已经在最后一封邮件了。"
 
 #: curs_main.c:1477 curs_main.c:1521
 msgid "No undeleted messages."
-msgstr "没有要反删除的信件。"
+msgstr "没有要撤销删除的邮件。"
 
 #: curs_main.c:1514 curs_main.c:1538
 msgid "You are on the first message."
-msgstr "您已经在第一封信了。"
+msgstr "您已经在第一封邮件了。"
 
-#: curs_main.c:1613 menu.c:867 pager.c:2187 pattern.c:1575
+#: curs_main.c:1613 menu.c:874 pager.c:2195 pattern.c:1609
 msgid "Search wrapped to top."
-msgstr "搜寻从开头重新开始。"
+msgstr "搜索从开头重新开始。"
 
-#: curs_main.c:1622 pager.c:2209 pattern.c:1586
+#: curs_main.c:1622 pager.c:2217 pattern.c:1620
 msgid "Search wrapped to bottom."
-msgstr "搜寻从结尾重新开始。"
+msgstr "搜索从结尾重新开始。"
 
 #: curs_main.c:1666
-#, fuzzy
 msgid "No new messages in this limited view."
-msgstr "父信件在此限制视图中不可见。"
+msgstr "此限制视图中没有新邮件。"
 
 #: curs_main.c:1668
-#, fuzzy
 msgid "No new messages."
-msgstr "没有新信件"
+msgstr "没有新邮件。"
 
 #: curs_main.c:1673
-#, fuzzy
 msgid "No unread messages in this limited view."
-msgstr "父信件在此限制视图中不可见。"
+msgstr "此限制视图中没有未读邮件。"
 
 #: curs_main.c:1675
-#, fuzzy
 msgid "No unread messages."
-msgstr "没有尚未读取的信件"
+msgstr "没有未读邮件。"
 
 #. L10N: CHECK_ACL
 #: curs_main.c:1693
-#, fuzzy
 msgid "Cannot flag message"
-msgstr "标记信件"
+msgstr "无法标记邮件"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:1731 pager.c:2750
-#, fuzzy
+#: curs_main.c:1731 pager.c:2758
 msgid "Cannot toggle new"
-msgstr "切换新信件标记"
+msgstr "无法切换新邮件标记"
 
 #: curs_main.c:1808
 msgid "No more threads."
@@ -1959,79 +1921,70 @@ msgstr "您在第一个线索上。"
 
 #: curs_main.c:1893
 msgid "Thread contains unread messages."
-msgstr "线索中有尚未读取的信件。"
+msgstr "线索中有未读邮件。"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:1987 pager.c:2499
-#, fuzzy
+#: curs_main.c:1987 pager.c:2507
 msgid "Cannot delete message"
-msgstr "反删除信件"
+msgstr "无法删除邮件"
 
 #. L10N: CHECK_ACL
 #: curs_main.c:2068
-#, fuzzy
 msgid "Cannot edit message"
-msgstr "无法写入信件"
+msgstr "无法编辑邮件"
 
 #. L10N: This is displayed when the x-label on one or more
 #. * messages is edited.
-#: curs_main.c:2114 pager.c:2838
-#, fuzzy, c-format
+#: curs_main.c:2114 pager.c:2846
+#, c-format
 msgid "%d labels changed."
-msgstr "信箱没有改变。"
+msgstr "%d 标签已改变。"
 
 #. L10N: This is displayed when editing an x-label, but no messages
 #. * were updated.  Possibly due to canceling at the prompt or if the new
 #. * label is the same as the old label.
-#: curs_main.c:2120 pager.c:2841
-#, fuzzy
+#: curs_main.c:2120 pager.c:2849
 msgid "No labels changed."
-msgstr "信箱没有改变。"
+msgstr "标签没有改变。"
 
 #. L10N: CHECK_ACL
 #: curs_main.c:2219
-#, fuzzy
 msgid "Cannot mark message(s) as read"
-msgstr "标记信件为已读"
+msgstr "无法标记邮件为已读"
 
 #. L10N: This is the prompt for <mark-message>.  Whatever they
 #. enter will be prefixed by $mark_macro_prefix and will become
 #. a macro hotkey to jump to the currently selected message.
 #: curs_main.c:2255
-#, fuzzy
 msgid "Enter macro stroke: "
-msgstr "请输入字符集："
+msgstr "请输入宏按键："
 
 #. L10N: "message hotkey" is the key bindings menu description of a
 #. macro created by <mark-message>.
 #: curs_main.c:2263
-#, fuzzy
 msgid "message hotkey"
-msgstr "信件被延迟寄出。"
+msgstr "邮件热键"
 
 #. L10N: This is echoed after <mark-message> creates a new hotkey
 #. macro.  %s is the hotkey string ($mark_macro_prefix followed
 #. by whatever they typed at the prompt.)
 #: curs_main.c:2268
-#, fuzzy, c-format
+#, c-format
 msgid "Message bound to %s."
-msgstr "信件已回退。"
+msgstr "邮件已绑定到 %s。"
 
 #. L10N: This error is printed if <mark-message> cannot find a
 #. Message-ID for the currently selected message in the index.
 #: curs_main.c:2276
-#, fuzzy
 msgid "No message ID to macro."
-msgstr "文件夹中没有信件。"
+msgstr "没有邮件 ID 对应到宏。"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:2352 pager.c:2770
-#, fuzzy
+#: curs_main.c:2352 pager.c:2778
 msgid "Cannot undelete message"
-msgstr "反删除信件"
+msgstr "无法撤销删除邮件"
 
 #: edit.c:42
-#, fuzzy
 msgid ""
 "~~\t\tinsert a line beginning with a single ~\n"
 "~b users\tadd users to the Bcc: field\n"
@@ -2044,14 +1997,14 @@ msgid ""
 "~p\t\tprint the message\n"
 msgstr ""
 "~~\t\t插入以一个 ~ 符号开头的一行\n"
-"~b 用户\t新增用户到 Bcc: 域\n"
-"~c 用户\t新增用户到 Cc: 域\n"
-"~f 信件\t包含信件\n"
-"~F 信件\t类似 ~f，除了同时包含标头\n"
-"~h\t\t编辑信件的标头\n"
-"~m 信件\t包含并引用信件\n"
-"~M 信件\t类似 ~m, 除了包含标头\n"
-"~p\t\t打印这封信件\n"
+"~b 用户\t添加用户到 Bcc（密送）域\n"
+"~c 用户\t添加用户到 Cc（抄送）域\n"
+"~f 邮件\t包含邮件\n"
+"~F 邮件\t类似 ~f，但同时包含邮件头\n"
+"~h\t\t编辑邮件头\n"
+"~m 邮件\t包含并引用邮件\n"
+"~M 邮件\t类似 ~m, 但同时包含邮件头\n"
+"~p\t\t打印这封邮件\n"
 
 #: edit.c:53
 msgid ""
@@ -2067,30 +2020,30 @@ msgid ""
 msgstr ""
 "~q\t\t写入文件并退出编辑器\n"
 "~r 文件\t\t将文件读入编辑器\n"
-"~t 用户\t将用户添加到 To: 域\n"
-"~u\t\t唤回之前一行\n"
-"~v\t\t使用 $visual 编辑器编辑信件\n"
-"~w 文件\t\t将信件写入文件\n"
-"~x\t\t中止修改并离开编辑器\n"
+"~t 用户\t将用户添加到 To（收件人）域\n"
+"~u\t\t取回前一行\n"
+"~v\t\t使用 $visual 编辑器编辑邮件\n"
+"~w 文件\t\t将邮件写入文件\n"
+"~x\t\t放弃修改并退出编辑器\n"
 "~?\t\t本消息\n"
-".\t\t如果是一行里的唯一字符，则代表结束输入\n"
+".\t\t只包含 . 字符的行将结束输入\n"
 
 #: edit.c:190
 #, c-format
 msgid "%d: invalid message number.\n"
-msgstr "%d：无效的信件编号。\n"
+msgstr "%d：无效的邮件编号。\n"
 
 #: edit.c:332
 msgid "(End message with a . on a line by itself)\n"
-msgstr "(在一行里输入一个 . 符号来结束信件)\n"
+msgstr "(使用只包含 . 字符的行来结束邮件)\n"
 
 #: edit.c:391
 msgid "No mailbox.\n"
-msgstr "没有信箱。\n"
+msgstr "没有邮箱。\n"
 
 #: edit.c:395
 msgid "Message contains:\n"
-msgstr "信件包含：\n"
+msgstr "邮件包含：\n"
 
 #. L10N:
 #. This entry is shown AFTER the message content,
@@ -2107,7 +2060,7 @@ msgstr "缺少文件名。\n"
 
 #: edit.c:437
 msgid "No lines in message.\n"
-msgstr "信件中一行也没有。\n"
+msgstr "邮件中一行文字也没有。\n"
 
 #: edit.c:454
 #, c-format
@@ -2117,17 +2070,17 @@ msgstr "%s 中有错误的 IDN: '%s'\n"
 #: edit.c:472
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
-msgstr "%s：不明的编辑器命令(~? 求助)\n"
+msgstr "%s：未知的编辑器命令(~? 求助)\n"
 
 #: editmsg.c:78
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "无法建立临时文件夹：%s"
+msgstr "无法创建临时文件夹：%s"
 
 #: editmsg.c:90
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "无法建立临时邮件夹：%s"
+msgstr "无法创建临时邮件夹：%s"
 
 #: editmsg.c:110
 #, c-format
@@ -2136,16 +2089,16 @@ msgstr "无法截断临时邮件夹：%s"
 
 #: editmsg.c:127
 msgid "Message file is empty!"
-msgstr "信件文件是空的！"
+msgstr "邮件文件是空的！"
 
 #: editmsg.c:134
 msgid "Message not modified!"
-msgstr "信件未改动！"
+msgstr "邮件未改动！"
 
 #: editmsg.c:142
 #, c-format
 msgid "Can't open message file: %s"
-msgstr "无法打开信件文件：%s"
+msgstr "无法打开邮件文件：%s"
 
 #. L10N: %s is from strerror(errno)
 #: editmsg.c:150 editmsg.c:178
@@ -2155,7 +2108,7 @@ msgstr "无法添加到文件夹末尾：%s"
 
 #: flags.c:347
 msgid "Set flag"
-msgstr "设定标记"
+msgstr "设置标记"
 
 #: flags.c:347
 msgid "Clear flag"
@@ -2173,11 +2126,11 @@ msgstr "[-- 附件 #%d"
 #: handler.c:1266
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
-msgstr "[-- 形态:  %s/%s, 编码: %s, 大小: %s --]\n"
+msgstr "[-- 类型：%s/%s, 编码：%s, 大小：%s --]\n"
 
 #: handler.c:1282
 msgid "One or more parts of this message could not be displayed"
-msgstr "本信件的一个或多个部分无法显示"
+msgstr "本邮件的一个或多个部分无法显示"
 
 #: handler.c:1334
 #, c-format
@@ -2187,7 +2140,7 @@ msgstr "[-- 使用 %s 自动显示 --]\n"
 #: handler.c:1335
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "执行自动显示指令：%s"
+msgstr "执行自动显示命令：%s"
 
 #: handler.c:1367
 #, c-format
@@ -2197,7 +2150,7 @@ msgstr "[-- 无法运行 %s --]\n"
 #: handler.c:1386 handler.c:1407
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- 自动显示的 %s 输出到标准错误(stderr)的内容 --]\n"
+msgstr "[-- 自动显示命令 %s 输出到标准错误的内容 --]\n"
 
 #: handler.c:1446
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
@@ -2236,9 +2189,7 @@ msgstr "[-- 此 %s/%s 附件未被包含， --]\n"
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
-msgstr ""
-"[-- 并且其标明的外部源已 --]\n"
-"[-- 过期。 --]\n"
+msgstr "[-- 并且其标明的外部源已过期 --]\n"
 
 #: handler.c:1519
 #, c-format
@@ -2269,12 +2220,12 @@ msgstr "(使用 '%s' 来显示这部份)"
 
 #: handler.c:1833
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "(需要将 'view-attachments' 绑定到键！)"
+msgstr "(需要将 'view-attachments' 绑定到快捷键！)"
 
 #: headers.c:186
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s：无法附加文件"
+msgstr "%s：无法添加附件"
 
 #: help.c:310
 msgid "ERROR: please report this bug"
@@ -2316,15 +2267,15 @@ msgstr "错误的历史文件格式 (第 %d 行)"
 
 #: hook.c:97
 msgid "current mailbox shortcut '^' is unset"
-msgstr ""
+msgstr "当前邮箱快捷键 '^' 未设定"
 
 #: hook.c:108
 msgid "mailbox shortcut expanded to empty regexp"
-msgstr ""
+msgstr "邮箱快捷键扩展成了空的正则表达式"
 
 #: hook.c:119
 msgid "badly formatted command string"
-msgstr ""
+msgstr "未格式化好的命令字符串"
 
 #: hook.c:279
 msgid "unhook: Can't do unhook * from within a hook."
@@ -2342,7 +2293,7 @@ msgstr "unhook: 无法从 %2$s 中删除 %1$s"
 
 #: imap/auth.c:108 pop_auth.c:425 smtp.c:557
 msgid "No authenticators available"
-msgstr "无可用认证"
+msgstr "无可用认证方式"
 
 #: imap/auth_anon.c:43
 msgid "Authenticating (anonymous)..."
@@ -2374,11 +2325,11 @@ msgstr "LOGIN 在此服务器已禁用。"
 
 #: imap/auth_login.c:47 pop_auth.c:258
 msgid "Logging in..."
-msgstr "登入中..."
+msgstr "登录中..."
 
 #: imap/auth_login.c:70 pop_auth.c:301
 msgid "Login failed."
-msgstr "登入失败。"
+msgstr "登录失败。"
 
 #: imap/auth_sasl.c:101 smtp.c:594
 #, c-format
@@ -2404,38 +2355,42 @@ msgstr "无此文件夹"
 
 #: imap/browse.c:243
 msgid "Create mailbox: "
-msgstr "创建信箱："
+msgstr "创建邮箱："
 
 #: imap/browse.c:248 imap/browse.c:301
 msgid "Mailbox must have a name."
-msgstr "信箱必须有名字。"
+msgstr "邮箱必须有名字。"
 
 #: imap/browse.c:256
 msgid "Mailbox created."
-msgstr "信箱已创建。"
+msgstr "邮箱已创建。"
 
 #: imap/browse.c:289
-#, fuzzy
 msgid "Cannot rename root folder"
-msgstr "无法删除根文件夹"
+msgstr "无法重命名根文件夹"
 
 #: imap/browse.c:293
 #, c-format
 msgid "Rename mailbox %s to: "
-msgstr "将信箱 %s 改名为："
+msgstr "将邮箱 %s 重命名为："
 
 #: imap/browse.c:309
 #, c-format
 msgid "Rename failed: %s"
-msgstr "改名失败：%s"
+msgstr "重命名失败：%s"
 
 #: imap/browse.c:314
 msgid "Mailbox renamed."
-msgstr "信箱已改名。"
+msgstr "邮箱已重命名。"
 
-#: imap/command.c:447
+#: imap/command.c:260
+#, c-format
+msgid "Connection to %s timed out"
+msgstr "到 %s 的连接已超时"
+
+#: imap/command.c:467
 msgid "Mailbox closed"
-msgstr "信箱已关闭。"
+msgstr "邮箱已关闭。"
 
 #: imap/imap.c:125
 #, c-format
@@ -2470,76 +2425,76 @@ msgstr "正在选择 %s..."
 
 #: imap/imap.c:768
 msgid "Error opening mailbox"
-msgstr "打开信箱时出错"
+msgstr "打开邮箱时出错"
 
-#: imap/imap.c:819 imap/imap.c:2183 imap/message.c:1014 muttlib.c:1683
+#: imap/imap.c:818 imap/imap.c:2190 imap/message.c:1014 muttlib.c:1683
 #, c-format
 msgid "Create %s?"
 msgstr "创建 %s 吗？"
 
-#: imap/imap.c:1212
+#: imap/imap.c:1215
 msgid "Expunge failed"
 msgstr "执行删除失败"
 
-#: imap/imap.c:1224
+#: imap/imap.c:1227
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "已标记的 %d 封信件已删除..."
+msgstr "已标记的 %d 封邮件已删除..."
 
-#: imap/imap.c:1256
+#: imap/imap.c:1259
 #, c-format
 msgid "Saving changed messages... [%d/%d]"
-msgstr "正在储存已改变的信件... [%d/%d]"
+msgstr "正在保存已改变的邮件... [%d/%d]"
 
-#: imap/imap.c:1312
+#: imap/imap.c:1315
 msgid "Error saving flags. Close anyway?"
 msgstr "保存标记出错。仍然关闭吗？"
 
-#: imap/imap.c:1320
+#: imap/imap.c:1323
 msgid "Error saving flags"
 msgstr "保存标记时出错"
 
-#: imap/imap.c:1343
+#: imap/imap.c:1346
 msgid "Expunging messages from server..."
-msgstr "正在服务器上执行信件删除..."
+msgstr "正在从服务器上删除邮件..."
 
-#: imap/imap.c:1349
+#: imap/imap.c:1352
 msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr "imap_sync_mailbox: EXPUNGE(执行删除)失败"
+msgstr "imap_sync_mailbox: EXPUNGE(删除)失败"
 
-#: imap/imap.c:1833
+#: imap/imap.c:1839
 #, c-format
 msgid "Header search without header name: %s"
-msgstr "无标头名称的标头搜索：%s"
+msgstr "无邮件头名的邮件头搜索：%s"
 
-#: imap/imap.c:1904
+#: imap/imap.c:1910
 msgid "Bad mailbox name"
-msgstr "错误的信箱名"
+msgstr "错误的邮箱名"
 
-#: imap/imap.c:1928
+#: imap/imap.c:1934
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "正在订阅 %s..."
 
-#: imap/imap.c:1930
+#: imap/imap.c:1936
 #, c-format
 msgid "Unsubscribing from %s..."
-msgstr "正在取消订阅 %s..."
+msgstr "正在退订 %s..."
 
-#: imap/imap.c:1940
+#: imap/imap.c:1946
 #, c-format
 msgid "Subscribed to %s"
 msgstr "已订阅 %s..."
 
-#: imap/imap.c:1942
+#: imap/imap.c:1948
 #, c-format
 msgid "Unsubscribed from %s"
-msgstr "已取消订阅 %s..."
+msgstr "已退订 %s..."
 
-#: imap/imap.c:2168 imap/message.c:978
+#: imap/imap.c:2175 imap/message.c:978
 #, c-format
 msgid "Copying %d messages to %s..."
-msgstr "正在复制 %d 个信件到 %s ..."
+msgstr "正在复制 %d 个邮件到 %s ..."
 
 #: imap/message.c:84 mx.c:1368
 msgid "Integer overflow -- can't allocate memory."
@@ -2547,7 +2502,7 @@ msgstr "整数溢出 -- 无法分配到内存。"
 
 #: imap/message.c:202
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "无法取回此版本的 IMAP 服务器的标头。"
+msgstr "无法获取此版本的 IMAP 服务器的邮件头。"
 
 #: imap/message.c:212
 #, c-format
@@ -2562,24 +2517,24 @@ msgstr "正在评估缓存..."
 
 #: imap/message.c:340 pop.c:281
 msgid "Fetching message headers..."
-msgstr "正在取回信件标头..."
+msgstr "正在获取邮件头..."
 
 #: imap/message.c:577 imap/message.c:636 pop.c:573
 msgid "Fetching message..."
-msgstr "正在取回信件..."
+msgstr "正在获取邮件..."
 
 #: imap/message.c:623 pop.c:568
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr "信件索引不正确。请尝试重新打开邮件箱。"
+msgstr "邮件索引不正确。请尝试重新打开邮件箱。"
 
 #: imap/message.c:797
 msgid "Uploading message..."
-msgstr "正在上传信件..."
+msgstr "正在上传邮件..."
 
 #: imap/message.c:982
 #, c-format
 msgid "Copying message %d to %s..."
-msgstr "正在复制信件 %d 到 %s ..."
+msgstr "正在复制邮件 %d 到 %s ..."
 
 #: imap/util.c:357
 msgid "Continue?"
@@ -2595,14 +2550,12 @@ msgid "Bad regexp: %s"
 msgstr "错误的正则表达式：%s"
 
 #: init.c:527
-#, fuzzy
 msgid "Not enough subexpressions for template"
-msgstr "没有足够的子表达式来用于垃圾邮件模板"
+msgstr "没有足够的子表达式来用于模板"
 
 #: init.c:770 init.c:778 init.c:799
-#, fuzzy
 msgid "not enough arguments"
-msgstr "参数不够用"
+msgstr "参数不够"
 
 #: init.c:860
 msgid "spam: no matching pattern"
@@ -2613,14 +2566,14 @@ msgid "nospam: no matching pattern"
 msgstr "去掉垃圾邮件：无匹配的模板"
 
 #: init.c:1053
-#, fuzzy, c-format
+#, c-format
 msgid "%sgroup: missing -rx or -addr."
-msgstr "缺少 -rx 或 -addr。"
+msgstr "%sgroup: 缺少 -rx 或 -addr。"
 
 #: init.c:1071
-#, fuzzy, c-format
+#, c-format
 msgid "%sgroup: warning: bad IDN '%s'.\n"
-msgstr "警告：错误的 IDN '%s'.\n"
+msgstr "%sgroup: 警告：错误的 IDN '%s'。\n"
 
 #: init.c:1286
 msgid "attachments: no disposition"
@@ -2649,7 +2602,7 @@ msgstr "警告：错误的 IDN '%s'在别名'%s'中。\n"
 
 #: init.c:1622
 msgid "invalid header field"
-msgstr "无效的标头域"
+msgstr "无效的邮件头域"
 
 #: init.c:1675
 #, c-format
@@ -2673,11 +2626,11 @@ msgstr "%s：未知的变量"
 
 #: init.c:2100
 msgid "prefix is illegal with reset"
-msgstr "带重置的前缀是非法的"
+msgstr "reset 不能与前缀一起使用"
 
 #: init.c:2106
 msgid "value is illegal with reset"
-msgstr "带重置的值是非法的"
+msgstr "reset 时不能指定值"
 
 #: init.c:2141 init.c:2153
 msgid "Usage: set variable=yes|no"
@@ -2696,12 +2649,12 @@ msgstr "选项 %s 的值无效：\"%s\""
 #: init.c:2414
 #, c-format
 msgid "%s: invalid mailbox type"
-msgstr "%s：无效的信箱类型"
+msgstr "%s：无效的邮箱类型"
 
 #: init.c:2445
 #, c-format
 msgid "%s: invalid value (%s)"
-msgstr "%s：无效的值(%s)"
+msgstr "%s：无效的值 (%s)"
 
 #: init.c:2446
 msgid "format error"
@@ -2709,12 +2662,12 @@ msgstr "格式错误"
 
 #: init.c:2446
 msgid "number overflow"
-msgstr "数字溢出"
+msgstr "数值溢出"
 
 #: init.c:2506
 #, c-format
 msgid "%s: invalid value"
-msgstr "%s：无效的值"
+msgstr "%s：无效值"
 
 #: init.c:2550
 #, c-format
@@ -2737,7 +2690,7 @@ msgid "source: errors in %s"
 msgstr "source：%s 中有错误"
 
 #: init.c:2676
-#, fuzzy, c-format
+#, c-format
 msgid "source: reading aborted due to too many errors in %s"
 msgstr "source: 读取因 %s 中错误过多而中止"
 
@@ -2762,16 +2715,15 @@ msgstr "命令行有错：%s\n"
 
 #: init.c:3363
 msgid "unable to determine home directory"
-msgstr "无法确定 home 目录"
+msgstr "无法确定用户主目录"
 
 #: init.c:3371
 msgid "unable to determine username"
 msgstr "无法确定用户名"
 
 #: init.c:3397
-#, fuzzy
 msgid "unable to determine nodename via uname()"
-msgstr "无法确定用户名"
+msgstr "无法通过 uname() 确定主机名"
 
 #: init.c:3638
 msgid "-group: no group name"
@@ -2783,11 +2735,11 @@ msgstr "参数不够用"
 
 #: keymap.c:539
 msgid "Macros are currently disabled."
-msgstr ""
+msgstr "目前宏被禁用。"
 
 #: keymap.c:546
 msgid "Macro loop detected."
-msgstr "检测到宏中有回环。"
+msgstr "检测到宏中有循环。"
 
 #: keymap.c:848 keymap.c:883
 msgid "Key is not bound."
@@ -2805,7 +2757,7 @@ msgstr "push：参数太多"
 #: keymap.c:929
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s：没有这个选单"
+msgstr "%s：没有这个菜单"
 
 #: keymap.c:944
 msgid "null key sequence"
@@ -2818,7 +2770,7 @@ msgstr "bind：参数太多"
 #: keymap.c:1054
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s：在对映表中没有这样的函数"
+msgstr "%s：在对映表中没有此函数"
 
 #: keymap.c:1078
 msgid "macro: empty key sequence"
@@ -2835,7 +2787,7 @@ msgstr "exec：无参数"
 #: keymap.c:1145
 #, c-format
 msgid "%s: no such function"
-msgstr "%s：没有这样的函数"
+msgstr "%s：没有此函数"
 
 #: keymap.c:1166
 msgid "Enter keys (^G to abort): "
@@ -2848,35 +2800,33 @@ msgstr "字符 = %s, 八进制 = %o, 十进制 = %d"
 
 #: lib.c:131
 msgid "Integer overflow -- can't allocate memory!"
-msgstr "整数溢出 -- 无法分配到内存！"
+msgstr "整数溢出 -- 无法分配内存！"
 
 #: lib.c:138 lib.c:153 lib.c:185
 msgid "Out of memory!"
-msgstr "内存用尽！"
+msgstr "内存不足！"
 
 #: main.c:68
 msgid ""
 "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
 "To report a bug, please visit http://bugs.mutt.org/.\n"
 msgstr ""
-"要连络研发人员，请寄信给 <mutt-dev@mutt.org>。\n"
+"要联系开发者，请发邮件到 <mutt-dev@mutt.org>。\n"
 "要报告问题，请访问 http://bugs.mutt.org/。\n"
 
 #: main.c:72
-#, fuzzy
 msgid ""
 "Copyright (C) 1996-2016 Michael R. Elkins and others.\n"
 "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
 "Mutt is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type `mutt -vv' for details.\n"
 msgstr ""
-"Copyright (C) 1996-2009 Michael R. Elkins 与其他人。\n"
-"Mutt 不提供任何保证：请键入 `mutt -vv' 以获取详细信息。\n"
-"Mutt 是自由软件, 欢迎您在某些条件下\n"
-"重新发行它；请键入 `mutt -vv' 以获取详细信息。\n"
+"Copyright (C) 1996-2016 Michael R. Elkins 及其他人。\n"
+"Mutt 不提供任何保证：请键入“mutt -vv”以获取详细信息。\n"
+"Mutt 是自由软件, 欢迎您在遵守指定条款的前提下再次发布；\n"
+"请键入“mutt -vv”以获取详细信息。\n"
 
 #: main.c:78
-#, fuzzy
 msgid ""
 "Copyright (C) 1996-2016 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
@@ -2891,14 +2841,15 @@ msgid ""
 "Many others not mentioned here contributed code, fixes,\n"
 "and suggestions.\n"
 msgstr ""
-"Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2016 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2008 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1997-2009 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2009 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2014 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
-"Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
+"Copyright (C) 2000-2004 Edmund Grimley Evans <edmundo@rano.org>\n"
 "Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n"
+"Copyright (C) 2014-2016 Kevin J. McCarthy <kevin@8t8.us>\n"
 "\n"
 "许多这里没有提到的人也贡献了代码，修正以及建议。\n"
 
@@ -2933,7 +2884,6 @@ msgstr ""
 "02110-1301, USA.\n"
 
 #: main.c:121
-#, fuzzy
 msgid ""
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
 "       mutt [<options>] [-Ex] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
@@ -2947,10 +2897,10 @@ msgid ""
 "       mutt -v[v]\n"
 msgstr ""
 "用法: mutt [<选项>] [-z] [-f <文件> | -yZ]\n"
-"      mutt [<选项>] [-x] [-Hi <文件>] [-s <标题>] [-bc <地址>] [-a <文件> "
-"[...]] [--] <地址> [...]\n"
-"      mutt [<选项>] [-x] [-s <标题>] [-bc <地址>] [-a <文件> [...]] [--] <地"
-"址> [...] < message\n"
+"      mutt [<选项>] [-Ex] [-Hi <文件>] [-s <主题>] [-bc <地址>] [-a <文件> "
+"[...] --] <地址> [...]\n"
+"      mutt [<选项>] [-x] [-s <主题>] [-bc <地址>] [-a <文件> [...] --] <地址"
+"> [...] < 邮件\n"
 "      mutt [<选项>] -p\n"
 "      mutt [<选项>] -A <别名> [...]\n"
 "      mutt [<选项>] -Q <查询> [...]\n"
@@ -2958,7 +2908,6 @@ msgstr ""
 "      mutt -v[v]\n"
 
 #: main.c:130
-#, fuzzy
 msgid ""
 "options:\n"
 "  -A <alias>\texpand the given alias\n"
@@ -2969,10 +2918,10 @@ msgid ""
 "  -D\t\tprint the value of all variables to stdout"
 msgstr ""
 "选项:\n"
-"  -A <alias>\t扩展给出的别名\n"
-"  -a <file>\t附加一个文件到本信件作为附件\n"
-"  -b <address>\t指定一个密件抄送(BCC)地址\n"
-"  -c <address>\t指定一个抄送(CC)地址\n"
+"  -A <别名>\t扩展给出的别名\n"
+"  -a <文件>\t给邮件添加附件\n"
+"  -b <地址>\t指定一个密送(BCC)地址\n"
+"  -c <地址>\t指定一个抄送(CC)地址\n"
 "  -D\t\t打印所有变量的值到标准输出"
 
 #: main.c:139
@@ -2980,7 +2929,6 @@ msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
 msgstr "  -d <级别>\t将调试输出记录到 ~/.muttdebug0"
 
 #: main.c:142
-#, fuzzy
 msgid ""
 "  -E\t\tedit the draft (-H) or include (-i) file\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
@@ -2992,14 +2940,15 @@ msgid ""
 "  -n\t\tcauses Mutt not to read the system Muttrc\n"
 "  -p\t\trecall a postponed message"
 msgstr ""
-"  -e <命令>\t指定一个初始化后要被执行的命令\n"
-"  -f <文件>\t指定要阅读那一个信箱\n"
-"  -F <文件>\t指定一个替代的 muttrc 文件\n"
-"  -H <文件>\t指定一个模板文件以读取标题和正文来源\n"
-"  -i <文件>\t指定一个 Mutt 需要包含在正文中的文件\n"
-"  -m <类型>\t指定一个预设的信箱类型\n"
+"  -E\t\t编辑草稿 (-H) 或者包含文件 (-i)\n"
+"  -e <命令>\t指定初始化后要被执行的命令\n"
+"  -f <文件>\t指定要读取的邮箱\n"
+"  -F <文件>\t指定替代的 muttrc 文件\n"
+"  -H <文件>\t指定草稿文件以读取邮件头和正文\n"
+"  -i <文件>\t指定 Mutt 需要包含在正文中的文件\n"
+"  -m <类型>\t指定默认的邮箱类型\n"
 "  -n\t\t使 Mutt 不去读取系统的 Muttrc\n"
-"  -p\t\t叫回一个延后寄送的信件"
+"  -p\t\t取回一个延迟寄送的邮件"
 
 #: main.c:152
 msgid ""
@@ -3014,13 +2963,13 @@ msgid ""
 "  -h\t\tthis help message"
 msgstr ""
 "  -Q <变量>\t查询一个配置变量\n"
-"  -R\t\t以只读模式打开信箱\n"
-"  -s <主题>\t指定一个标题 (如果有空白的话必须被包括在引号中)\n"
-"  -v\t\t显示版本和编译时的定义\n"
+"  -R\t\t以只读模式打开邮箱\n"
+"  -s <主题>\t指定一个主题 (如果有空格的话必须使用引号引起来)\n"
+"  -v\t\t显示版本和编译时定义\n"
 "  -x\t\t模拟 mailx 寄送模式\n"
-"  -y\t\t选择一个被指定在您`mailboxes'清单中的信箱\n"
-"  -z\t\t如果在信箱中没有信件的话，立即退出\n"
-"  -Z\t\t打开第一个附有新信件的资料夹，如果没有的话立即离开\n"
+"  -y\t\t选择一个在您“mailboxes”列表中的邮箱\n"
+"  -z\t\t如果在邮箱中没有邮件的话，立即退出\n"
+"  -Z\t\t打开第一个有新邮件的文件夹，如果一个也没有的话立即退出\n"
 "  -h\t\t本帮助消息"
 
 #: main.c:233
@@ -3038,16 +2987,16 @@ msgstr "初始化终端时出错。"
 #: main.c:703
 #, c-format
 msgid "Error: value '%s' is invalid for -d.\n"
-msgstr "错误：变量'%s'对于 -d 来说无效。\n"
+msgstr "错误：值“%s”对于 -d 来说无效。\n"
 
 #: main.c:706
 #, c-format
 msgid "Debugging at level %d.\n"
-msgstr "正在使用级别 %d 进行调试。\n"
+msgstr "正在使用调试级别 %d。\n"
 
 #: main.c:708
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
-msgstr "在编译时候没有定义 DEBUG。忽略。\n"
+msgstr "编译时没有定义 DEBUG。已忽略。\n"
 
 #: main.c:886
 #, c-format
@@ -3057,7 +3006,7 @@ msgstr "%s 不存在。创建它吗？"
 #: main.c:890
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "无法创建 %s: %s."
+msgstr "无法创建 %s: %s。"
 
 #: main.c:930
 msgid "Failed to parse mailto: link\n"
@@ -3065,28 +3014,28 @@ msgstr "解析 mailto: 链接失败\n"
 
 #: main.c:942
 msgid "No recipients specified.\n"
-msgstr "没有指定接收者。\n"
+msgstr "没有指定收件人。\n"
 
 #: main.c:968
 msgid "Cannot use -E flag with stdin\n"
-msgstr ""
+msgstr "无法将 -E 标志用于标准输入\n"
 
 #: main.c:1121
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s：无法附加文件。\n"
+msgstr "%s：无法添加附件。\n"
 
 #: main.c:1202
 msgid "No mailbox with new mail."
-msgstr "没有信箱有新信件。"
+msgstr "没有邮箱有新邮件。"
 
 #: main.c:1211
 msgid "No incoming mailboxes defined."
-msgstr "未定义收信信箱"
+msgstr "未定义收信邮箱"
 
 #: main.c:1239
 msgid "Mailbox is empty."
-msgstr "信箱是空的。"
+msgstr "邮箱是空的。"
 
 #: mbox.c:120 mbox.c:271 mh.c:1258 mx.c:632
 #, c-format
@@ -3095,28 +3044,28 @@ msgstr "正在读取 %s..."
 
 #: mbox.c:158 mbox.c:215
 msgid "Mailbox is corrupt!"
-msgstr "信箱损坏了！"
+msgstr "邮箱损坏了！"
 
 #: mbox.c:456
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "无法锁住 %s。\n"
+msgstr "无法锁定 %s。\n"
 
 #: mbox.c:501 mbox.c:516
 msgid "Can't write message"
-msgstr "无法写入信件"
+msgstr "无法写入邮件"
 
 #: mbox.c:756
 msgid "Mailbox was corrupted!"
-msgstr "信箱已损坏!"
+msgstr "邮箱已损坏!"
 
 #: mbox.c:838 mbox.c:1098
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "严重错误！无法重新打开信箱！"
+msgstr "致命错误！无法重新打开邮箱！"
 
 #: mbox.c:890
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
-msgstr "同步：信箱已被修改，但没有被修改过的信件！(请报告这个错误)"
+msgstr "同步：mbox 邮箱已被修改，但没有被修改过的邮件！(请报告这个错误)"
 
 #: mbox.c:914 mh.c:1892 mx.c:714
 #, c-format
@@ -3130,78 +3079,78 @@ msgstr "正在提交修改..."
 #: mbox.c:1084
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "写入失败！已把部分的信箱储存至 %s"
+msgstr "写入失败！已把不完整的邮箱保存至 %s"
 
 #: mbox.c:1153
 msgid "Could not reopen mailbox!"
-msgstr "无法重开信箱！"
+msgstr "无法重新打开邮箱！"
 
 #: mbox.c:1180
 msgid "Reopening mailbox..."
-msgstr "正在重新打开信箱..."
+msgstr "正在重新打开邮箱..."
 
-#: menu.c:435
+#: menu.c:442
 msgid "Jump to: "
 msgstr "跳到："
 
-#: menu.c:444
+#: menu.c:451
 msgid "Invalid index number."
 msgstr "无效的索引编号。"
 
-#: menu.c:448 menu.c:469 menu.c:534 menu.c:577 menu.c:593 menu.c:604 menu.c:615
-#: menu.c:626 menu.c:639 menu.c:652 menu.c:1174
+#: menu.c:455 menu.c:476 menu.c:541 menu.c:584 menu.c:600 menu.c:611 menu.c:622
+#: menu.c:633 menu.c:646 menu.c:659 menu.c:1181
 msgid "No entries."
 msgstr "没有条目。"
 
-#: menu.c:466
+#: menu.c:473
 msgid "You cannot scroll down farther."
 msgstr "您无法再向下滚动了。"
 
-#: menu.c:484
+#: menu.c:491
 msgid "You cannot scroll up farther."
 msgstr "您无法再向上滚动了。"
 
-#: menu.c:527
+#: menu.c:534
 msgid "You are on the first page."
 msgstr "您现在在第一页。"
 
-#: menu.c:528
+#: menu.c:535
 msgid "You are on the last page."
 msgstr "您现在在最后一页。"
 
-#: menu.c:663
+#: menu.c:670
 msgid "You are on the last entry."
 msgstr "您现在在最后一项。"
 
-#: menu.c:674
+#: menu.c:681
 msgid "You are on the first entry."
 msgstr "您现在在第一项。"
 
-#: menu.c:841 pager.c:2231 pattern.c:1514
+#: menu.c:848 pager.c:2239 pattern.c:1548
 msgid "Search for: "
-msgstr "搜寻："
+msgstr "搜索："
 
-#: menu.c:841 pager.c:2231 pattern.c:1514
+#: menu.c:848 pager.c:2239 pattern.c:1548
 msgid "Reverse search for: "
-msgstr "返向搜寻："
+msgstr "反向搜索："
 
-#: menu.c:885 pager.c:2184 pager.c:2206 pager.c:2326 pattern.c:1629
+#: menu.c:892 pager.c:2192 pager.c:2214 pager.c:2334 pattern.c:1663
 msgid "Not found."
 msgstr "没有找到。"
 
-#: menu.c:1037
+#: menu.c:1044
 msgid "No tagged entries."
 msgstr "没有已标记的条目。"
 
-#: menu.c:1138
+#: menu.c:1145
 msgid "Search is not implemented for this menu."
-msgstr "此菜单未实现搜寻。"
+msgstr "此菜单未实现搜索。"
 
-#: menu.c:1143
+#: menu.c:1150
 msgid "Jumping is not implemented for dialogs."
-msgstr "对话模式中未实现跳跃。"
+msgstr "对话模式中未实现跳转。"
 
-#: menu.c:1177
+#: menu.c:1184
 msgid "Tagging is not supported."
 msgstr "不支持标记。"
 
@@ -3212,12 +3161,11 @@ msgstr "正在扫描 %s..."
 
 #: mh.c:1561 mh.c:1644
 msgid "Could not flush message to disk"
-msgstr "无法将信件导出到硬盘。"
+msgstr "无法刷新邮件到磁盘"
 
 #: mh.c:1606
-#, fuzzy
 msgid "_maildir_commit_message(): unable to set time on file"
-msgstr "maildir_commit_message(): 无法给文件设置时间"
+msgstr "_maildir_commit_message(): 无法给文件设置时间"
 
 #: mutt_sasl.c:196
 msgid "Unknown SASL profile"
@@ -3239,56 +3187,56 @@ msgstr "设置 SASL 外部安全强度时出错"
 msgid "Error setting SASL external user name"
 msgstr "设置 SASL 外部用户名时出错"
 
-#: mutt_socket.c:104 mutt_socket.c:182
+#: mutt_socket.c:105 mutt_socket.c:183
 #, c-format
 msgid "Connection to %s closed"
 msgstr "到 %s 的连接已关闭"
 
-#: mutt_socket.c:301
+#: mutt_socket.c:302
 msgid "SSL is unavailable."
 msgstr "SSL 不可用。"
 
-#: mutt_socket.c:333
+#: mutt_socket.c:334
 msgid "Preconnect command failed."
 msgstr "预连接命令失败。"
 
-#: mutt_socket.c:412 mutt_socket.c:426
+#: mutt_socket.c:413 mutt_socket.c:427
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "与 %s 通话出错(%s)"
 
-#: mutt_socket.c:479 mutt_socket.c:538
+#: mutt_socket.c:505 mutt_socket.c:564
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "错误的 IDN \"%s\"。"
 
-#: mutt_socket.c:487 mutt_socket.c:546
+#: mutt_socket.c:513 mutt_socket.c:572
 #, c-format
 msgid "Looking up %s..."
 msgstr "正在查找 %s..."
 
-#: mutt_socket.c:497 mutt_socket.c:555
+#: mutt_socket.c:523 mutt_socket.c:581
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "无法找到主机\"%s\""
 
-#: mutt_socket.c:503 mutt_socket.c:561
+#: mutt_socket.c:529 mutt_socket.c:587
 #, c-format
 msgid "Connecting to %s..."
 msgstr "正在连接到 %s..."
 
-#: mutt_socket.c:585
+#: mutt_socket.c:611
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "无法连接到 %s (%s)"
 
 #: mutt_ssl.c:247 mutt_ssl.c:500
 msgid "Warning: error enabling ssl_verify_partial_chains"
-msgstr ""
+msgstr "警告：启用 ssl_verify_partial_chains 时出错"
 
 #: mutt_ssl.c:326
 msgid "Failed to find enough entropy on your system"
-msgstr "在您的系统上查找足够的熵时失败"
+msgstr "在您的系统上寻找足够的熵时失败"
 
 #: mutt_ssl.c:350
 #, c-format
@@ -3298,32 +3246,30 @@ msgstr "正在填充熵池：%s...\n"
 #: mutt_ssl.c:358
 #, c-format
 msgid "%s has insecure permissions!"
-msgstr "%s 有不安全的访问许可！"
+msgstr "%s 的访问权限不安全！"
 
 #: mutt_ssl.c:377
-#, fuzzy
 msgid "SSL disabled due to the lack of entropy"
-msgstr "SSL 因缺少足够的熵而禁用"
+msgstr "SSL 因缺少熵而被禁用"
 
 #. L10N: an SSL context is a data structure returned by the OpenSSL
 #. *       function SSL_CTX_new().  In this case it returned NULL: an
 #. *       error condition.
 #.
 #: mutt_ssl.c:444
-#, fuzzy
 msgid "Unable to create SSL context"
-msgstr "错误：无法创建 OpenSSL 子进程！"
+msgstr "无法创建 SSL 上下文"
 
 #. L10N: This is a warning when trying to set the host name for
 #. * TLS Server Name Indication (SNI).  This allows the server to present
 #. * the correct certificate if it supports multiple hosts.
 #: mutt_ssl.c:560 mutt_ssl_gnutls.c:423
 msgid "Warning: unable to set TLS SNI host name"
-msgstr ""
+msgstr "警告：无法设置 TLS SNI 主机名"
 
 #: mutt_ssl.c:571
 msgid "I/O error"
-msgstr "输入输出(I/O)出错"
+msgstr "输入/输出错误"
 
 #: mutt_ssl.c:580
 #, c-format
@@ -3335,9 +3281,9 @@ msgstr "SSL 失败：%s"
 #. %2$s is cipher_version (e.g. "TLSv1/SSLv3")
 #. %3$s is cipher_name (e.g. "ECDHE-RSA-AES128-GCM-SHA256")
 #: mutt_ssl.c:590
-#, fuzzy, c-format
+#, c-format
 msgid "%s connection using %s (%s)"
-msgstr "使用 %s 的 SSL 连接(%s)"
+msgstr "%s 连接，使用 %s (%s)"
 
 #: mutt_ssl.c:717
 msgid "Unknown"
@@ -3354,7 +3300,7 @@ msgstr "[无效日期]"
 
 #: mutt_ssl.c:817
 msgid "Server certificate is not yet valid"
-msgstr "服务器证书尚未有效"
+msgstr "服务器证书尚未生效"
 
 #: mutt_ssl.c:827
 msgid "Server certificate has expired"
@@ -3362,7 +3308,7 @@ msgstr "服务器证书已过期"
 
 #: mutt_ssl.c:976
 msgid "cannot get certificate subject"
-msgstr "无法获取证书标题"
+msgstr "无法获取证书持有者"
 
 #: mutt_ssl.c:986 mutt_ssl.c:995
 msgid "cannot get certificate common name"
@@ -3371,12 +3317,12 @@ msgstr "无法获取证书通用名称"
 #: mutt_ssl.c:1009
 #, c-format
 msgid "certificate owner does not match hostname %s"
-msgstr "证书所有者与主机名称 %s 不匹配"
+msgstr "证书所有者与主机名 %s 不匹配"
 
 #: mutt_ssl.c:1116
 #, c-format
 msgid "Certificate host check failed: %s"
-msgstr "证书主机检查失败：%s"
+msgstr "证书主机名检查失败：%s"
 
 #: mutt_ssl.c:1181 mutt_ssl_gnutls.c:868
 msgid "This certificate belongs to:"
@@ -3384,7 +3330,7 @@ msgstr "此证书属于："
 
 #: mutt_ssl.c:1189 mutt_ssl_gnutls.c:907
 msgid "This certificate was issued by:"
-msgstr "此证书发布自："
+msgstr "此证书颁发自："
 
 #: mutt_ssl.c:1197 mutt_ssl_gnutls.c:946
 #, c-format
@@ -3414,7 +3360,7 @@ msgstr "MD5 指纹：%s"
 #: mutt_ssl.c:1212 mutt_ssl_gnutls.c:990
 #, c-format
 msgid "SSL Certificate check (certificate %d of %d in chain)"
-msgstr "SSL 证书检查 (检查链中有 %d 个证书，共 %d 个)"
+msgstr "SSL 证书检查 (检查链中的第 %d 个证书，共 %d 个)"
 
 #. L10N:
 #. * These four letters correspond to the choices in the next four strings:
@@ -3424,21 +3370,19 @@ msgstr "SSL 证书检查 (检查链中有 %d 个证书，共 %d 个)"
 #.
 #: mutt_ssl.c:1238
 msgid "roas"
-msgstr ""
+msgstr "roas"
 
 #: mutt_ssl.c:1242
-#, fuzzy
 msgid "(r)eject, accept (o)nce, (a)ccept always, (s)kip"
-msgstr ""
+msgstr "拒绝(r)，接受一次(o)，总是接受(a)，跳过(s)"
 
 #: mutt_ssl.c:1244 mutt_ssl_gnutls.c:999
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "拒绝(r)，接受一次(o)，总是接受(a)"
 
 #: mutt_ssl.c:1249
-#, fuzzy
 msgid "(r)eject, accept (o)nce, (s)kip"
-msgstr ""
+msgstr "拒绝(r)，接受一次(o)，跳过(s)"
 
 #: mutt_ssl.c:1251 mutt_ssl_gnutls.c:1010
 msgid "(r)eject, accept (o)nce"
@@ -3462,7 +3406,7 @@ msgstr "所有用于 TLS/SSL 连接的可用协议已禁用"
 
 #: mutt_ssl_gnutls.c:357
 msgid "Explicit ciphersuite selection via $ssl_ciphers not supported"
-msgstr ""
+msgstr "不支持通过 $ssl_ciphers 来显式指定加密套件的选择"
 
 #: mutt_ssl_gnutls.c:472
 #, c-format
@@ -3491,7 +3435,7 @@ msgstr "警告：服务器证书已过期"
 
 #: mutt_ssl_gnutls.c:976
 msgid "WARNING: Server certificate has been revoked"
-msgstr "警告服务器证书已吊销"
+msgstr "警告：服务器证书已吊销"
 
 #: mutt_ssl_gnutls.c:981
 msgid "WARNING: Server hostname does not match certificate"
@@ -3523,7 +3467,7 @@ msgstr "ro"
 
 #: mutt_ssl_gnutls.c:1100 mutt_ssl_gnutls.c:1135 mutt_ssl_gnutls.c:1145
 msgid "Unable to get certificate from peer"
-msgstr "无法从节点获得证书"
+msgstr "无法从对端获取证书"
 
 #: mutt_ssl_gnutls.c:1106
 #, c-format
@@ -3573,7 +3517,7 @@ msgstr "在目录下的文件："
 
 #: muttlib.c:1034
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "文件已经存在, 覆盖(o), 附加(a), 或取消(c)？"
+msgstr "文件已经存在, 覆盖(o), 追加(a), 或取消(c)？"
 
 #: muttlib.c:1034
 msgid "oac"
@@ -3581,17 +3525,17 @@ msgstr "oac"
 
 #: muttlib.c:1649
 msgid "Can't save message to POP mailbox."
-msgstr "无法将新建保存到 POP 信箱。"
+msgstr "无法将邮件保存到 POP 邮箱。"
 
 #: muttlib.c:1658
 #, c-format
 msgid "Append messages to %s?"
-msgstr "附加信件到 %s 末尾?"
+msgstr "追加邮件到 %s 末尾?"
 
 #: muttlib.c:1670
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s 不是信箱！"
+msgstr "%s 不是邮箱！"
 
 #: mx.c:151
 #, c-format
@@ -3610,7 +3554,7 @@ msgstr "尝试 fcntl 加锁时超时！"
 #: mx.c:225
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "正在等待 fcntl 加锁... %d"
+msgstr "正在等待 fcntl 锁... %d"
 
 #: mx.c:252
 msgid "Timeout exceeded while attempting flock lock!"
@@ -3622,38 +3566,36 @@ msgid "Waiting for flock attempt... %d"
 msgstr "正在等待尝试 flock... %d"
 
 #: mx.c:746
-#, fuzzy
 msgid "message(s) not deleted"
-msgstr "正在标记邮件为已删除..."
+msgstr "邮件没有删除"
 
 #: mx.c:779
-#, fuzzy
 msgid "Can't open trash folder"
-msgstr "无法添加到文件夹末尾：%s"
+msgstr "无法打开垃圾箱"
 
 #: mx.c:831
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "移动已读取的信件到 %s？"
+msgstr "移动已读邮件到 %s？"
 
 #: mx.c:847 mx.c:1147
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "清除 %d 封已经被删除的信件？"
+msgstr "清除 %d 封已删除邮件？"
 
 #: mx.c:847 mx.c:1147
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "清除 %d 封已被删除的信件？"
+msgstr "清除 %d 封已删除邮件？"
 
 #: mx.c:868
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "正在搬移已经读取的信件到 %s ..."
+msgstr "正在移动已读邮件到 %s..."
 
 #: mx.c:929 mx.c:1138
 msgid "Mailbox is unchanged."
-msgstr "信箱没有改变。"
+msgstr "邮箱没有改变。"
 
 #: mx.c:982
 #, c-format
@@ -3677,11 +3619,11 @@ msgstr "请使用 'toggle-write' 来重新启动写入!"
 #: mx.c:1126
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "信箱已标记为不可写。%s"
+msgstr "邮箱已标记为不可写。%s"
 
 #: mx.c:1193
 msgid "Mailbox checkpointed."
-msgstr "信箱已检查。"
+msgstr "邮箱已检查。"
 
 #: pager.c:1576
 msgid "PrevPg"
@@ -3699,29 +3641,29 @@ msgstr "显示附件。"
 msgid "Next"
 msgstr "下一个"
 
-#: pager.c:2085 pager.c:2116 pager.c:2148 pager.c:2435
+#: pager.c:2093 pager.c:2124 pager.c:2156 pager.c:2443
 msgid "Bottom of message is shown."
-msgstr "已显示信件的最末端。"
+msgstr "已显示邮件的最末端。"
 
-#: pager.c:2101 pager.c:2123 pager.c:2130 pager.c:2137
+#: pager.c:2109 pager.c:2131 pager.c:2138 pager.c:2145
 msgid "Top of message is shown."
-msgstr "已显示信件的最上端。"
+msgstr "已显示邮件的最上端。"
 
-#: pager.c:2373
+#: pager.c:2381
 msgid "Help is currently being shown."
 msgstr "现在正显示帮助。"
 
-#: pager.c:2402
+#: pager.c:2410
 msgid "No more quoted text."
 msgstr "无更多引用文本。"
 
-#: pager.c:2415
+#: pager.c:2423
 msgid "No more unquoted text after quoted text."
-msgstr "引用文本后没有其他未引用文本。"
+msgstr "引用文本后没有其它未引用文本。"
 
 #: parse.c:588
 msgid "multipart message has no boundary parameter!"
-msgstr "多部份信件没有边界参数！"
+msgstr "多部份邮件没有边界参数！"
 
 #: pattern.c:266 pattern.c:586
 #, c-format
@@ -3747,76 +3689,76 @@ msgstr "无效的月份：%s"
 msgid "Invalid relative date: %s"
 msgstr "无效的相对日期：%s"
 
-#: pattern.c:818 pattern.c:977
+#: pattern.c:819 pattern.c:987
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "模式有错误：%s"
 
-#: pattern.c:845
-#, fuzzy, c-format
+#: pattern.c:846
+#, c-format
 msgid "missing pattern: %s"
-msgstr "缺少参数"
+msgstr "缺少模式：%s"
 
-#: pattern.c:855
+#: pattern.c:865
 #, c-format
 msgid "mismatched brackets: %s"
 msgstr "不匹配的括号：%s"
 
-#: pattern.c:915
+#: pattern.c:925
 #, c-format
 msgid "%c: invalid pattern modifier"
-msgstr "%c：无效模式修饰符"
+msgstr "%c：无效的模式修饰符"
 
-#: pattern.c:921
+#: pattern.c:931
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c：此模式下不支持"
 
-#: pattern.c:934
+#: pattern.c:944
 msgid "missing parameter"
 msgstr "缺少参数"
 
-#: pattern.c:950
+#: pattern.c:960
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "不匹配的圆括号：%s"
 
-#: pattern.c:984
+#: pattern.c:994
 msgid "empty pattern"
 msgstr "空模式"
 
-#: pattern.c:1310
+#: pattern.c:1344
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "错误：未知操作(op) %d (请报告这个错误)。"
 
-#: pattern.c:1393 pattern.c:1535
+#: pattern.c:1427 pattern.c:1569
 msgid "Compiling search pattern..."
-msgstr "正在编译搜寻模式..."
+msgstr "正在编译搜索模式..."
 
-#: pattern.c:1414
+#: pattern.c:1448
 msgid "Executing command on matching messages..."
-msgstr "正在对符合的信件执行命令..."
+msgstr "正在对符合的邮件执行命令..."
 
-#: pattern.c:1483
+#: pattern.c:1517
 msgid "No messages matched criteria."
-msgstr "没有信件符合标准。"
+msgstr "没有邮件符合标准。"
 
-#: pattern.c:1565
+#: pattern.c:1599
 msgid "Searching..."
 msgstr "正在搜索..."
 
-#: pattern.c:1578
+#: pattern.c:1612
 msgid "Search hit bottom without finding match"
-msgstr "已搜寻至结尾而未发现匹配"
+msgstr "已搜索至结尾而未发现匹配"
 
-#: pattern.c:1589
+#: pattern.c:1623
 msgid "Search hit top without finding match"
-msgstr "已搜寻至开头而未发现匹配"
+msgstr "已搜索至开头而未发现匹配"
 
-#: pattern.c:1621
+#: pattern.c:1655
 msgid "Search interrupted."
-msgstr "搜寻已中断。"
+msgstr "搜索已中断。"
 
 #: pgp.c:91
 msgid "Enter PGP passphrase:"
@@ -3828,7 +3770,7 @@ msgstr "已忘记 PGP 通行密码。"
 
 #: pgp.c:452
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
-msgstr "[-- 错误：无法建立 PGP 子进程！ --]\n"
+msgstr "[-- 错误：无法创建 PGP 子进程！ --]\n"
 
 #: pgp.c:486 pgp.c:755 pgp.c:967
 msgid ""
@@ -3840,14 +3782,14 @@ msgstr ""
 
 #: pgp.c:863
 msgid "Internal error.  Please submit a bug report."
-msgstr ""
+msgstr "内部错误。请报告 bug。"
 
 #: pgp.c:924
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
 msgstr ""
-"[-- 错误：无法建立 PGP 子进程！ --]\n"
+"[-- 错误：无法创建 PGP 子进程！ --]\n"
 "\n"
 
 #: pgp.c:955 pgp.c:979
@@ -3863,9 +3805,9 @@ msgid "Can't invoke PGP"
 msgstr "不能调用 PGP"
 
 #: pgp.c:1733
-#, fuzzy, c-format
+#, c-format
 msgid "PGP (s)ign, sign (a)s, %s format, (c)lear, or (o)ppenc mode off? "
-msgstr "PGP 加密(e)，签署(s)，选择身份签署(a)，同时(b)，%s，或清除(c)？"
+msgstr "PGP 签名(s)，选择身份签名(a)，%s 格式，清除(c)还是关(o)ppenc模式？"
 
 #: pgp.c:1734 pgp.c:1764 pgp.c:1786
 msgid "PGP/M(i)ME"
@@ -3881,71 +3823,67 @@ msgstr "嵌入(i)"
 #. This comment also applies to the five following letter sequences.
 #: pgp.c:1740
 msgid "safcoi"
-msgstr ""
+msgstr "safcoi"
 
 #: pgp.c:1745
-#, fuzzy
 msgid "PGP (s)ign, sign (a)s, (c)lear, or (o)ppenc mode off? "
-msgstr "PGP 加密(e)，签署(s)，选择身份签署(a)，同时(b)，%s，或清除(c)？"
+msgstr "PGP 签名(s)，选择身份签名(a)，清除(c)还是关(o)ppenc模式？"
 
 #: pgp.c:1746
 msgid "safco"
-msgstr ""
+msgstr "safco"
 
 #: pgp.c:1763
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, (c)lear, or (o)ppenc "
 "mode? "
-msgstr "PGP 加密(e)，签署(s)，选择身份签署(a)，同时(b)，%s，或清除(c)？"
+msgstr ""
+"PGP 加密(e)，签名(s)，选择身份签名(a)，同时(b)，%s 格式，清除(c)还是(o)ppenc"
+"模式？"
 
 #: pgp.c:1766
-#, fuzzy
 msgid "esabfcoi"
-msgstr "esabpfc"
+msgstr "esabfcoi"
 
 #: pgp.c:1771
-#, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (c)lear, or (o)ppenc mode? "
-msgstr "PGP 加密(e)，签署(s)，选择身份签署(a)，同时(b)，%s，或清除(c)？"
+msgstr ""
+"PGP 加密(e)，签名(s)，选择身份签名(a)，同时(b)，清除(c)还是(o)ppenc模式？"
 
 #: pgp.c:1772
-#, fuzzy
 msgid "esabfco"
-msgstr "esabpfc"
+msgstr "esabfco"
 
 #: pgp.c:1785
-#, fuzzy, c-format
+#, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, or (c)lear? "
-msgstr "PGP 加密(e)，签署(s)，选择身份签署(a)，同时(b)，%s，或清除(c)？"
+msgstr "PGP 加密(e)，签名(s)，选择身份签名(a)，同时(b)，%s 格式，或清除(c)？"
 
 #: pgp.c:1788
-#, fuzzy
 msgid "esabfci"
-msgstr "esabpfc"
+msgstr "esabfci"
 
 #: pgp.c:1793
-#, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? "
-msgstr "PGP 加密(e)，签署(s)，选择身份签署(a)，同时(b)，%s，或清除(c)？"
+msgstr "PGP 加密(e)，签名(s)，选择身份签名(a)，同时(b)，或清除(c)？"
 
 #: pgp.c:1794
-#, fuzzy
 msgid "esabfc"
-msgstr "esabpfc"
+msgstr "esabfc"
 
 #: pgpinvoke.c:310
 msgid "Fetching PGP key..."
-msgstr "正在取回 PGP 密钥..."
+msgstr "正在获取 PGP 密钥..."
 
 #: pgpkey.c:491
 msgid "All matching keys are expired, revoked, or disabled."
-msgstr "所有匹配的迷药已过期，吊销或禁用。"
+msgstr "所有匹配的密钥已过期、被吊销或被禁用。"
 
 #: pgpkey.c:533
 #, c-format
 msgid "PGP keys matching <%s>."
-msgstr "符合<%s>的 PGP 密钥。"
+msgstr "符合 <%s> 的 PGP 密钥。"
 
 #: pgpkey.c:535
 #, c-format
@@ -3959,7 +3897,7 @@ msgstr "无法打开 /dev/null"
 #: pgpkey.c:778
 #, c-format
 msgid "PGP Key %s."
-msgstr "PGP 钥匙 %s。"
+msgstr "PGP 密钥 %s。"
 
 #: pop.c:102 pop_lib.c:210
 msgid "Command TOP is not supported by server."
@@ -3967,7 +3905,7 @@ msgstr "服务器不支持 TOP 命令。"
 
 #: pop.c:129
 msgid "Can't write header to temporary file!"
-msgstr "无法将标头写入临时文件！"
+msgstr "无法将邮件头写入临时文件！"
 
 #: pop.c:276 pop_lib.c:212
 msgid "Command UIDL is not supported by server."
@@ -3976,7 +3914,7 @@ msgstr "服务器不支持 UIDL 命令。"
 #: pop.c:296
 #, c-format
 msgid "%d messages have been lost. Try reopening the mailbox."
-msgstr "%d 个信件已丢失。请尝试重新打开信箱。"
+msgstr "%d 个邮件已丢失。请尝试重新打开邮箱。"
 
 #: pop.c:411 pop.c:809
 #, c-format
@@ -3985,7 +3923,7 @@ msgstr "%s 是无效的 POP 路径"
 
 #: pop.c:455
 msgid "Fetching list of messages..."
-msgstr "正在取回信件列表..."
+msgstr "正在获取邮件列表..."
 
 #: pop.c:613
 msgid "Can't write message to temporary file!"
@@ -4005,25 +3943,25 @@ msgstr "未定义 POP 主机。"
 
 #: pop.c:857
 msgid "No new mail in POP mailbox."
-msgstr "POP 信箱中没有新信件"
+msgstr "POP 邮箱中没有新邮件"
 
 #: pop.c:864
 msgid "Delete messages from server?"
-msgstr "删除服务器上的信件吗？"
+msgstr "删除服务器上的邮件吗？"
 
 #: pop.c:866
 #, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "正在读取新信件 (%d 字节)..."
+msgstr "正在读取新邮件 (%d 字节)..."
 
 #: pop.c:908
 msgid "Error while writing mailbox!"
-msgstr "写入信箱时出错！"
+msgstr "写入邮箱时出错！"
 
 #: pop.c:912
 #, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [已读取 %d 封信件，共 %d 封]"
+msgstr "%s [已读取 %d 封邮件，共 %d 封]"
 
 #: pop.c:935 pop_lib.c:378
 msgid "Server closed connection!"
@@ -4052,11 +3990,11 @@ msgstr "服务器不支持 USER 命令。"
 #: pop_lib.c:57
 #, c-format
 msgid "Invalid POP URL: %s\n"
-msgstr "无效的 POP 地址(URL)：%s\n"
+msgstr "无效的 POP URL：%s\n"
 
 #: pop_lib.c:208
 msgid "Unable to leave messages on server."
-msgstr "无法将信件留在服务器上。"
+msgstr "无法将邮件留在服务器上。"
 
 #: pop_lib.c:238
 #, c-format
@@ -4069,7 +4007,7 @@ msgstr "正在关闭到 POP 服务器的连接..."
 
 #: pop_lib.c:571
 msgid "Verifying message indexes..."
-msgstr "正在验证信件索引..."
+msgstr "正在验证邮件索引..."
 
 #: pop_lib.c:593
 msgid "Connection lost. Reconnect to POP server?"
@@ -4077,23 +4015,23 @@ msgstr "连接丢失。重新连接到 POP 服务器吗？"
 
 #: postpone.c:165
 msgid "Postponed Messages"
-msgstr "信件已经被延迟寄出"
+msgstr "邮件已经被延迟寄出"
 
 #: postpone.c:248 postpone.c:257
 msgid "No postponed messages."
-msgstr "没有被延迟寄出的信件。"
+msgstr "没有被延迟寄出的邮件。"
 
 #: postpone.c:459 postpone.c:480 postpone.c:514
 msgid "Illegal crypto header"
-msgstr "非法的加密(crypto)标头"
+msgstr "非法的加密(crypto)邮件头"
 
 #: postpone.c:500
 msgid "Illegal S/MIME header"
-msgstr "非法的 S/MIME 标头"
+msgstr "非法的 S/MIME 邮件头"
 
 #: postpone.c:597
 msgid "Decrypting message..."
-msgstr "正在解密信件..."
+msgstr "正在解密邮件..."
 
 #: postpone.c:605
 msgid "Decryption failed."
@@ -4101,7 +4039,7 @@ msgstr "解密失败。"
 
 #: query.c:50
 msgid "New Query"
-msgstr "新的查询"
+msgstr "新查询"
 
 #: query.c:51
 msgid "Make Alias"
@@ -4147,7 +4085,7 @@ msgstr "附件已保存。"
 #: recvattach.c:607
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "警告! 您正在覆盖 %s, 是否要继续?"
+msgstr "警告! 您即将覆盖 %s, 继续？"
 
 #: recvattach.c:625
 msgid "Attachment filtered."
@@ -4155,16 +4093,16 @@ msgstr "附件已被过滤。"
 
 #: recvattach.c:694
 msgid "Filter through: "
-msgstr "经过过滤："
+msgstr "使用过滤器过滤："
 
 #: recvattach.c:694
 msgid "Pipe to: "
 msgstr "通过管道传给："
 
 #: recvattach.c:729
-#, fuzzy, c-format
+#, c-format
 msgid "I don't know how to print %s attachments!"
-msgstr "我不知道要怎么打印附件 %s！"
+msgstr "我不知道要怎么打印 %s 附件！"
 
 #: recvattach.c:794
 msgid "Print tagged attachment(s)?"
@@ -4176,7 +4114,7 @@ msgstr "打印附件？"
 
 #: recvattach.c:1028
 msgid "Can't decrypt encrypted message!"
-msgstr "无法解密加密信件！"
+msgstr "无法解密已加密邮件！"
 
 #: recvattach.c:1040
 msgid "Attachments"
@@ -4192,29 +4130,28 @@ msgstr "无法从 POP 服务器上删除附件"
 
 #: recvattach.c:1146
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "不支持从加密信件中删除附件。"
+msgstr "不支持从加密邮件中删除附件。"
 
 #: recvattach.c:1152
-#, fuzzy
 msgid ""
 "Deletion of attachments from signed messages may invalidate the signature."
-msgstr "不支持从加密信件中删除附件。"
+msgstr "从已签名邮件中删除附件会使签名失效。"
 
 #: recvattach.c:1169 recvattach.c:1186
 msgid "Only deletion of multipart attachments is supported."
-msgstr "只支持删除多段附件"
+msgstr "只支持删除多部分附件"
 
 #: recvcmd.c:43
 msgid "You may only bounce message/rfc822 parts."
-msgstr "您只能退回 message/rfc822 的部分。"
+msgstr "您只能重发 message/rfc822 的部分。"
 
 #: recvcmd.c:241
 msgid "Error bouncing message!"
-msgstr "退回信件出错！"
+msgstr "重发邮件出错！"
 
 #: recvcmd.c:241
 msgid "Error bouncing messages!"
-msgstr "退回信件出错！"
+msgstr "重发邮件出错！"
 
 #: recvcmd.c:441
 #, c-format
@@ -4236,11 +4173,11 @@ msgstr "用 MIME 封装并转发？"
 #: recvcmd.c:619 recvcmd.c:869
 #, c-format
 msgid "Can't create %s."
-msgstr "无法建立 %s。"
+msgstr "无法创建 %s。"
 
 #: recvcmd.c:752
 msgid "Can't find any tagged messages."
-msgstr "无法找到任何已标记信件。"
+msgstr "无法找到任何已标记邮件。"
 
 #: recvcmd.c:773 send.c:737
 msgid "No mailing lists found!"
@@ -4252,7 +4189,7 @@ msgstr "无法解码所有已标记的附件。通过 MIME 封装其它的吗？
 
 #: remailer.c:481
 msgid "Append"
-msgstr "附加到末尾"
+msgstr "追加"
 
 #: remailer.c:482
 msgid "Insert"
@@ -4298,7 +4235,7 @@ msgstr "您已经选择了最后的链元素"
 
 #: remailer.c:708
 msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr "Mixmaster 不接受转发(Cc)或密件转发(Bcc)标头"
+msgstr "Mixmaster 不接受抄送(Cc)或密送(Bcc)邮件头"
 
 #: remailer.c:732
 msgid ""
@@ -4308,16 +4245,16 @@ msgstr "使用 mixmaster 时请给 hostname(主机名)变量设置合适的值
 #: remailer.c:766
 #, c-format
 msgid "Error sending message, child exited %d.\n"
-msgstr "发送信件出错，子进程已退出 %d。\n"
+msgstr "发送邮件出错，子进程已退出，退出状态码 %d。\n"
 
 #: remailer.c:770
 msgid "Error sending message."
-msgstr "发送信件出错。"
+msgstr "发送邮件出错。"
 
 #: rfc1524.c:164
 #, c-format
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
-msgstr "在 \"%2$s\" 的第 %3$d 行发现类型 %1$s 为错误的格式纪录"
+msgstr "在 \"%2$s\" 的第 %3$d 行发现类型 %1$s 为错误的格式记录"
 
 #: rfc1524.c:396
 msgid "No mailcap path specified"
@@ -4330,23 +4267,23 @@ msgstr "没有发现类型 %s 的 mailcap 纪录"
 
 #: score.c:76
 msgid "score: too few arguments"
-msgstr "分数：参数太少"
+msgstr "score：参数太少"
 
 #: score.c:85
 msgid "score: too many arguments"
-msgstr "分数：参数太多"
+msgstr "score：参数太多"
 
 #: score.c:123
 msgid "Error: score: invalid number"
-msgstr "错误：分数：无效数字"
+msgstr "错误：score：无效数值"
 
 #: send.c:252
 msgid "No subject, abort?"
-msgstr "没有标题，中止吗？"
+msgstr "没有主题，放弃吗？"
 
 #: send.c:254
 msgid "No subject, aborting."
-msgstr "没有标题，正在中止。"
+msgstr "没有主题，正在放弃。"
 
 #. L10N:
 #. Asks whether the user respects the reply-to header.
@@ -4359,23 +4296,23 @@ msgstr "回信到 %s%s？"
 #: send.c:534
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "发送后续信件到 %s%s？"
+msgstr "发送后续邮件到 %s%s？"
 
 #: send.c:712
 msgid "No tagged messages are visible!"
-msgstr "无可见的已标记信件！"
+msgstr "无可见的已标记邮件！"
 
 #: send.c:763
 msgid "Include message in reply?"
-msgstr "回信使包含原信件吗？"
+msgstr "在回信中包含原邮件吗？"
 
 #: send.c:768
 msgid "Including quoted message..."
-msgstr "正在包含引用信件..."
+msgstr "正在包含引用邮件..."
 
 #: send.c:778
 msgid "Could not include all requested messages!"
-msgstr "无法包含所有请求的信件！"
+msgstr "无法包含所有请求的邮件！"
 
 #: send.c:792
 msgid "Forward as attachment?"
@@ -4383,47 +4320,47 @@ msgstr "作为附件转发？"
 
 #: send.c:796
 msgid "Preparing forwarded message..."
-msgstr "正在准备转发信件..."
+msgstr "正在准备转发邮件..."
 
 #: send.c:1173
 msgid "Recall postponed message?"
-msgstr "叫出延迟寄出的信件吗？"
+msgstr "叫出延迟寄出的邮件吗？"
 
 #: send.c:1423
 msgid "Edit forwarded message?"
-msgstr "编辑已转发的信件吗？"
+msgstr "编辑已转发的邮件吗？"
 
 #: send.c:1472
 msgid "Abort unmodified message?"
-msgstr "中止未修改过的信件？"
+msgstr "放弃未修改过的邮件？"
 
 #: send.c:1474
 msgid "Aborted unmodified message."
-msgstr "已中止未修改过的信件。"
+msgstr "已放弃未修改过的邮件。"
 
 #: send.c:1666
 msgid "Message postponed."
-msgstr "信件被延迟寄出。"
+msgstr "邮件被延迟寄出。"
 
 #: send.c:1677
 msgid "No recipients are specified!"
-msgstr "没有指定接收者！"
+msgstr "没有指定收件人！"
 
 #: send.c:1682
 msgid "No recipients were specified."
-msgstr "没有已指定的接收者。"
+msgstr "没有已指定的收件人。"
 
 #: send.c:1698
 msgid "No subject, abort sending?"
-msgstr "没有信件标题，要中止发送吗?"
+msgstr "没有邮件主题，要放弃发送吗?"
 
 #: send.c:1702
 msgid "No subject specified."
-msgstr "没有指定标题。"
+msgstr "没有指定主题。"
 
 #: send.c:1764 smtp.c:188
 msgid "Sending message..."
-msgstr "正在发送信件..."
+msgstr "正在发送邮件..."
 
 #: send.c:1797
 msgid "Save attachments in Fcc?"
@@ -4431,11 +4368,11 @@ msgstr "将附件保存到 Fcc 吗？"
 
 #: send.c:1907
 msgid "Could not send the message."
-msgstr "无法发送此信件。"
+msgstr "无法发送此邮件。"
 
 #: send.c:1912
 msgid "Mail sent."
-msgstr "信件已发送。"
+msgstr "邮件已发送。"
 
 #: send.c:1912
 msgid "Sending in background."
@@ -4443,37 +4380,37 @@ msgstr "正在后台发送。"
 
 #: sendlib.c:425
 msgid "No boundary parameter found! [report this error]"
-msgstr "没有发现分界变量！[请报告这个错误]"
+msgstr "没有发现 boundary 参数！[请报告这个错误]"
 
 #: sendlib.c:455
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s 已经不存在了！"
 
-#: sendlib.c:878
+#: sendlib.c:883
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s 不是常规文件。"
 
-#: sendlib.c:1051
+#: sendlib.c:1056
 #, c-format
 msgid "Could not open %s"
 msgstr "无法打开 %s"
 
-#: sendlib.c:2364
+#: sendlib.c:2355
 msgid "$sendmail must be set in order to send mail."
-msgstr ""
+msgstr "为了发送邮件，必须设置 $sendmail。"
 
-#: sendlib.c:2463
+#: sendlib.c:2454
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "发送信件出错，子进程已退出 %d (%s)。"
+msgstr "发送邮件出错，子进程已退出，退出状态码 %d (%s)。"
 
-#: sendlib.c:2469
+#: sendlib.c:2460
 msgid "Output of the delivery process"
-msgstr "Delivery process 的输出"
+msgstr "送信进程的输出"
 
-#: sendlib.c:2644
+#: sendlib.c:2635
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "当准备 resent-from 时发生错误的 IDN %s。"
@@ -4531,9 +4468,8 @@ msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME 证书匹配 \"%s\"。"
 
 #: smime.c:474
-#, fuzzy
 msgid "ID is not trusted."
-msgstr "ID 无效。"
+msgstr "ID 不被信任。"
 
 #: smime.c:763
 msgid "Enter keyID: "
@@ -4549,9 +4485,8 @@ msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "错误：无法创建 OpenSSL 子进程！"
 
 #: smime.c:1232
-#, fuzzy
 msgid "Label for certificate: "
-msgstr "无法从节点获得证书"
+msgstr "证书标签："
 
 #: smime.c:1322
 msgid "no certfile"
@@ -4559,7 +4494,7 @@ msgstr "无证书文件"
 
 #: smime.c:1325
 msgid "no mbox"
-msgstr "没有信箱"
+msgstr "没有 mbox 邮箱"
 
 #: smime.c:1469 smime.c:1626
 msgid "No output from OpenSSL..."
@@ -4567,7 +4502,7 @@ msgstr "OpenSSL 没有输出..."
 
 #: smime.c:1536
 msgid "Can't sign: No key specified. Use Sign As."
-msgstr "无法签署：没有指定密钥。请使用指定身份签署(Sign As)。"
+msgstr "无法签名：没有指定密钥。请使用指定身份签名(Sign As)。"
 
 #: smime.c:1588
 msgid "Can't open OpenSSL subprocess!"
@@ -4591,7 +4526,7 @@ msgstr "[-- 以下数据已由 S/MIME 加密 --]\n"
 
 #: smime.c:1924
 msgid "[-- The following data is S/MIME signed --]\n"
-msgstr "[-- 以下数据已由 S/MIME 签署 --]\n"
+msgstr "[-- 以下数据已由 S/MIME 签名 --]\n"
 
 #: smime.c:1988
 msgid ""
@@ -4607,14 +4542,13 @@ msgid ""
 "[-- End of S/MIME signed data. --]\n"
 msgstr ""
 "\n"
-"[-- S/MIME 签署的数据结束 --]\n"
+"[-- S/MIME 签名的数据结束 --]\n"
 
 #: smime.c:2112
-#, fuzzy
 msgid ""
 "S/MIME (s)ign, encrypt (w)ith, sign (a)s, (c)lear, or (o)ppenc mode off? "
 msgstr ""
-"S/MIME 加密(e)，签署(s)，选择身份加密(w)，选择身份签署(s)，同时(b)或清除(c)？"
+"S/MIME 签名(s)，选择身份加密(w)，选择身份签名(s)，清除(c)还是关(o)ppenc模式？"
 
 #. L10N: The 'f' is from "forget it", an old undocumented synonym of
 #. 'clear'.  Please use a corresponding letter in your language.
@@ -4622,26 +4556,25 @@ msgstr ""
 #. This comment also applies to the two following letter sequences.
 #: smime.c:2117
 msgid "swafco"
-msgstr ""
+msgstr "swafco"
 
 #: smime.c:2126
-#, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, (c)lear, or "
 "(o)ppenc mode? "
 msgstr ""
-"S/MIME 加密(e)，签署(s)，选择身份加密(w)，选择身份签署(s)，同时(b)或清除(c)？"
+"S/MIME 加密(e)，签名(s)，选择身份加密(w)，选择身份签名(s)，同时(b)，清除(c)还"
+"是(o)ppenc模式？"
 
 #: smime.c:2127
-#, fuzzy
 msgid "eswabfco"
-msgstr "eswabfc"
+msgstr "eswabfco"
 
 #: smime.c:2135
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
-"S/MIME 加密(e)，签署(s)，选择身份加密(w)，选择身份签署(s)，同时(b)或清除(c)？"
+"S/MIME 加密(e)，签名(s)，选择身份加密(w)，选择身份签名(s)，同时(b)或清除(c)？"
 
 #: smime.c:2136
 msgid "eswabfc"
@@ -4708,7 +4641,7 @@ msgstr "无效的服务器回应"
 #: smtp.c:383
 #, c-format
 msgid "Invalid SMTP URL: %s"
-msgstr "无效的 SMTP 链接(URL)：%s"
+msgstr "无效的 SMTP URL：%s"
 
 #: smtp.c:493
 msgid "SMTP server does not support authentication"
@@ -4729,7 +4662,7 @@ msgstr "SASL 认证失败。"
 
 #: sort.c:297
 msgid "Sorting mailbox..."
-msgstr "正在排序信箱..."
+msgstr "正在排序邮箱..."
 
 #: sort.c:334
 msgid "Could not find sorting function! [report this bug]"
@@ -4737,20 +4670,19 @@ msgstr "找不到排序函数！[请报告这个问题]"
 
 #: status.c:111
 msgid "(no mailbox)"
-msgstr "(没有信箱)"
+msgstr "(没有邮箱)"
 
 #: thread.c:1101
 msgid "Parent message is not available."
-msgstr "父信件不可用。"
+msgstr "父邮件不可用。"
 
 #: thread.c:1107
-#, fuzzy
 msgid "Root message is not visible in this limited view."
-msgstr "父信件在此限制视图中不可见。"
+msgstr "根邮件在此限制视图中不可见。"
 
 #: thread.c:1109
 msgid "Parent message is not visible in this limited view."
-msgstr "父信件在此限制视图中不可见。"
+msgstr "父邮件在此限制视图中不可见。"
 
 #: ../keymap_alldefs.h:5
 msgid "null operation"
@@ -4762,7 +4694,7 @@ msgstr "条件运行结束 (无操作)"
 
 #: ../keymap_alldefs.h:7
 msgid "force viewing of attachment using mailcap"
-msgstr "强迫使用 mailcap 查看附件"
+msgstr "强制使用 mailcap 查看附件"
 
 #: ../keymap_alldefs.h:8
 msgid "view attachment as text"
@@ -4778,7 +4710,7 @@ msgstr "移到页面底端"
 
 #: ../keymap_alldefs.h:11
 msgid "remail a message to another user"
-msgstr "将信件转发给另一用户"
+msgstr "将邮件转发给另一用户"
 
 #: ../keymap_alldefs.h:12
 msgid "select a new file in this directory"
@@ -4794,19 +4726,19 @@ msgstr "显示当前所选择的文件名"
 
 #: ../keymap_alldefs.h:15
 msgid "subscribe to current mailbox (IMAP only)"
-msgstr "订阅当前信箱 (只适用于 IMAP)"
+msgstr "订阅当前邮箱 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:16
 msgid "unsubscribe from current mailbox (IMAP only)"
-msgstr "取消订阅当前信箱 (只适用于 IMAP)"
+msgstr "退订当前邮箱 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:17
 msgid "toggle view all/subscribed mailboxes (IMAP only)"
-msgstr "切换查看 全部/已订阅 的信箱 (只适用于 IMAP)"
+msgstr "切换查看 全部/已订阅 的邮箱 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:18
 msgid "list mailboxes with new mail"
-msgstr "列出有新邮件的信箱"
+msgstr "列出有新邮件的邮箱"
 
 #: ../keymap_alldefs.h:19
 msgid "change directories"
@@ -4814,19 +4746,19 @@ msgstr "改变目录"
 
 #: ../keymap_alldefs.h:20
 msgid "check mailboxes for new mail"
-msgstr "检查信箱是否有新信件"
+msgstr "检查邮箱是否有新邮件"
 
 #: ../keymap_alldefs.h:21
 msgid "attach file(s) to this message"
-msgstr "将文件附加到此信件作为附件"
+msgstr "将文件作为附件添加到此邮件"
 
 #: ../keymap_alldefs.h:22
 msgid "attach message(s) to this message"
-msgstr "将信件附加到此信件作为附件"
+msgstr "将邮件作为附件添加到此邮件"
 
 #: ../keymap_alldefs.h:23
 msgid "edit the BCC list"
-msgstr "编辑密件抄送(BCC)列表"
+msgstr "编辑密送(BCC)列表"
 
 #: ../keymap_alldefs.h:24
 msgid "edit the CC list"
@@ -4842,7 +4774,7 @@ msgstr "编辑附件的传输编码"
 
 #: ../keymap_alldefs.h:27
 msgid "enter a file to save a copy of this message in"
-msgstr "请输入用来储存这封信件副本的文件名称"
+msgstr "请输入用来保存这封邮件副本的文件名称"
 
 #: ../keymap_alldefs.h:28
 msgid "edit the file to be attached"
@@ -4854,11 +4786,11 @@ msgstr "编辑发件人域"
 
 #: ../keymap_alldefs.h:30
 msgid "edit the message with headers"
-msgstr "编辑有标头的信件"
+msgstr "编辑邮件（带邮件头）"
 
 #: ../keymap_alldefs.h:31
 msgid "edit the message"
-msgstr "编辑信件"
+msgstr "编辑邮件"
 
 #: ../keymap_alldefs.h:32
 msgid "edit attachment using mailcap entry"
@@ -4866,11 +4798,11 @@ msgstr "使用 mailcap 条目编辑附件"
 
 #: ../keymap_alldefs.h:33
 msgid "edit the Reply-To field"
-msgstr "编辑 Reply-To 栏位"
+msgstr "编辑 Reply-To 域"
 
 #: ../keymap_alldefs.h:34
 msgid "edit the subject of this message"
-msgstr "编辑此信件的标题"
+msgstr "编辑此邮件的主题"
 
 #: ../keymap_alldefs.h:35
 msgid "edit the TO list"
@@ -4878,11 +4810,11 @@ msgstr "编辑 TO 列表"
 
 #: ../keymap_alldefs.h:36
 msgid "create a new mailbox (IMAP only)"
-msgstr "创建新信箱 (只适用于 IMAP)"
+msgstr "创建新邮箱 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:37
 msgid "edit attachment content type"
-msgstr "编辑附件内容类型"
+msgstr "编辑附件的内容类型"
 
 #: ../keymap_alldefs.h:38
 msgid "get a temporary copy of an attachment"
@@ -4890,7 +4822,7 @@ msgstr "取得附件的临时副本"
 
 #: ../keymap_alldefs.h:39
 msgid "run ispell on the message"
-msgstr "对这封信件运行 ispell"
+msgstr "对这封邮件运行 ispell"
 
 #: ../keymap_alldefs.h:40
 msgid "compose new attachment using mailcap entry"
@@ -4902,20 +4834,19 @@ msgstr "切换是否为此附件重新编码"
 
 #: ../keymap_alldefs.h:42
 msgid "save this message to send later"
-msgstr "储存信件以便稍后寄出"
+msgstr "保存邮件以便稍后寄出"
 
 #: ../keymap_alldefs.h:43
-#, fuzzy
 msgid "send attachment with a different name"
-msgstr "编辑附件的传输编码"
+msgstr "使用另一个名字发送附件"
 
 #: ../keymap_alldefs.h:44
 msgid "rename/move an attached file"
-msgstr "改名/移动 附件文件"
+msgstr "重命名/移动 附件文件"
 
 #: ../keymap_alldefs.h:45
 msgid "send the message"
-msgstr "发送信件"
+msgstr "发送邮件"
 
 #: ../keymap_alldefs.h:46
 msgid "toggle disposition between inline/attachment"
@@ -4931,15 +4862,15 @@ msgstr "更新附件的编码信息"
 
 #: ../keymap_alldefs.h:49
 msgid "write the message to a folder"
-msgstr "将信件写到文件夹"
+msgstr "将邮件写到文件夹"
 
 #: ../keymap_alldefs.h:50
 msgid "copy a message to a file/mailbox"
-msgstr "复制一封信件到文件/信箱"
+msgstr "复制一封邮件到文件/邮箱"
 
 #: ../keymap_alldefs.h:51
 msgid "create an alias from a message sender"
-msgstr "从信件的发件人创建别名"
+msgstr "从邮件的发件人创建别名"
 
 #: ../keymap_alldefs.h:52
 msgid "move entry to bottom of screen"
@@ -4967,15 +4898,15 @@ msgstr "删除当前条目"
 
 #: ../keymap_alldefs.h:58
 msgid "delete the current mailbox (IMAP only)"
-msgstr "删除当前信箱 (只适用于 IMAP)"
+msgstr "删除当前邮箱 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:59
 msgid "delete all messages in subthread"
-msgstr "删除所有子线索中的信件"
+msgstr "删除所有子线索中的邮件"
 
 #: ../keymap_alldefs.h:60
 msgid "delete all messages in thread"
-msgstr "删除所有线索中的信件"
+msgstr "删除所有线索中的邮件"
 
 #: ../keymap_alldefs.h:61
 msgid "display full address of sender"
@@ -4983,23 +4914,23 @@ msgstr "显示发件人的完整地址"
 
 #: ../keymap_alldefs.h:62
 msgid "display message and toggle header weeding"
-msgstr "显示信件并切换标头资料内容显示"
+msgstr "显示邮件并切换邮件头信息的显示"
 
 #: ../keymap_alldefs.h:63
 msgid "display a message"
-msgstr "显示信件"
+msgstr "显示邮件"
 
 #: ../keymap_alldefs.h:64
 msgid "add, change, or delete a message's label"
-msgstr ""
+msgstr "添加、更改或者删除邮件的标签"
 
 #: ../keymap_alldefs.h:65
 msgid "edit the raw message"
-msgstr "编辑原始信件"
+msgstr "编辑原始邮件"
 
 #: ../keymap_alldefs.h:66
 msgid "delete the char in front of the cursor"
-msgstr "删除光标位置之前的字母"
+msgstr "删除光标位置之前的字符"
 
 #: ../keymap_alldefs.h:67
 msgid "move the cursor one character to the left"
@@ -5015,7 +4946,7 @@ msgstr "跳到行首"
 
 #: ../keymap_alldefs.h:70
 msgid "cycle among incoming mailboxes"
-msgstr "在来信信箱中循环选择"
+msgstr "在收件箱中循环选择"
 
 #: ../keymap_alldefs.h:71
 msgid "complete filename or alias"
@@ -5023,11 +4954,11 @@ msgstr "补全文件名或别名"
 
 #: ../keymap_alldefs.h:72
 msgid "complete address with query"
-msgstr "查询补全地址"
+msgstr "补全带查询的地址"
 
 #: ../keymap_alldefs.h:73
 msgid "delete the char under the cursor"
-msgstr "删除光标下的字母"
+msgstr "删除光标下的字符"
 
 #: ../keymap_alldefs.h:74
 msgid "jump to the end of the line"
@@ -5043,11 +4974,11 @@ msgstr "将光标移到单词结尾"
 
 #: ../keymap_alldefs.h:77
 msgid "scroll down through the history list"
-msgstr "向下卷动历史列表"
+msgstr "向下滚动历史列表"
 
 #: ../keymap_alldefs.h:78
 msgid "scroll up through the history list"
-msgstr "向上卷动历史列表"
+msgstr "向上滚动历史列表"
 
 #: ../keymap_alldefs.h:79
 msgid "delete chars from cursor to end of line"
@@ -5067,11 +4998,11 @@ msgstr "删除光标之前的词"
 
 #: ../keymap_alldefs.h:83
 msgid "quote the next typed key"
-msgstr "对下一个输入的键加引号"
+msgstr "下一个输入的键按本义插入"
 
 #: ../keymap_alldefs.h:84
 msgid "transpose character under cursor with previous"
-msgstr "颠倒光标位置的字符和其前一个字符"
+msgstr "对调光标位置的字符和其前一个字符"
 
 #: ../keymap_alldefs.h:85
 msgid "capitalize the word"
@@ -5087,7 +5018,7 @@ msgstr "将单词转换为大写"
 
 #: ../keymap_alldefs.h:88
 msgid "enter a muttrc command"
-msgstr "输入一条 muttrc 指令"
+msgstr "输入一个 muttrc 命令"
 
 #: ../keymap_alldefs.h:89
 msgid "enter a file mask"
@@ -5099,19 +5030,19 @@ msgstr "退出本菜单"
 
 #: ../keymap_alldefs.h:91
 msgid "filter attachment through a shell command"
-msgstr "透过 shell 指令来过滤附件"
+msgstr "使用 shell 命令过滤附件"
 
 #: ../keymap_alldefs.h:92
 msgid "move to the first entry"
-msgstr "移到第一项条目"
+msgstr "移动到第一项"
 
 #: ../keymap_alldefs.h:93
 msgid "toggle a message's 'important' flag"
-msgstr "切换信件的'重要'标记"
+msgstr "切换邮件的“重要”标记"
 
 #: ../keymap_alldefs.h:94
 msgid "forward a message with comments"
-msgstr "转发信件并注释"
+msgstr "转发邮件并注释"
 
 #: ../keymap_alldefs.h:95
 msgid "select the current entry"
@@ -5119,15 +5050,15 @@ msgstr "选择当前条目"
 
 #: ../keymap_alldefs.h:96
 msgid "reply to all recipients"
-msgstr "回覆给所有收件人"
+msgstr "回复给所有收件人"
 
 #: ../keymap_alldefs.h:97
 msgid "scroll down 1/2 page"
-msgstr "向下卷动半页"
+msgstr "向下滚动半页"
 
 #: ../keymap_alldefs.h:98
 msgid "scroll up 1/2 page"
-msgstr "向上卷动半页"
+msgstr "向上滚动半页"
 
 #: ../keymap_alldefs.h:99
 msgid "this screen"
@@ -5143,7 +5074,7 @@ msgstr "移动到最后一项"
 
 #: ../keymap_alldefs.h:102
 msgid "reply to specified mailing list"
-msgstr "回覆给指定的邮件列表"
+msgstr "回复给指定的邮件列表"
 
 #: ../keymap_alldefs.h:103
 msgid "execute a macro"
@@ -5151,7 +5082,7 @@ msgstr "执行宏"
 
 #: ../keymap_alldefs.h:104
 msgid "compose a new mail message"
-msgstr "撰写新邮件信息"
+msgstr "撰写新邮件"
 
 #: ../keymap_alldefs.h:105
 msgid "break the thread in two"
@@ -5167,43 +5098,43 @@ msgstr "用只读模式打开另一个文件夹"
 
 #: ../keymap_alldefs.h:108
 msgid "clear a status flag from a message"
-msgstr "清除某封信件上的状态标记"
+msgstr "清除邮件上的状态标记"
 
 #: ../keymap_alldefs.h:109
 msgid "delete messages matching a pattern"
-msgstr "删除符合某个模式的信件"
+msgstr "删除符合某个模式的邮件"
 
 #: ../keymap_alldefs.h:110
 msgid "force retrieval of mail from IMAP server"
-msgstr "强制从 IMAP 服务器取回邮件"
+msgstr "强制从 IMAP 服务器获取邮件"
 
 #: ../keymap_alldefs.h:111
 msgid "logout from all IMAP servers"
-msgstr ""
+msgstr "从所有 IMAP 服务器登出"
 
 #: ../keymap_alldefs.h:112
 msgid "retrieve mail from POP server"
-msgstr "从 POP 服务器取回信件"
+msgstr "从 POP 服务器获取邮件"
 
 #: ../keymap_alldefs.h:113
 msgid "show only messages matching a pattern"
-msgstr "只显示匹配某个模式的信件"
+msgstr "只显示匹配某个模式的邮件"
 
 #: ../keymap_alldefs.h:114
 msgid "link tagged message to the current one"
-msgstr "连接已标记的信件到当前信件"
+msgstr "连接已标记的邮件到当前邮件"
 
 #: ../keymap_alldefs.h:115
 msgid "open next mailbox with new mail"
-msgstr "打开下一个有新邮件的信箱"
+msgstr "打开下一个有新邮件的邮箱"
 
 #: ../keymap_alldefs.h:116
 msgid "jump to the next new message"
-msgstr "跳到下一封新信件"
+msgstr "跳到下一封新邮件"
 
 #: ../keymap_alldefs.h:117
 msgid "jump to the next new or unread message"
-msgstr "跳到下一个新的或未读取的信件"
+msgstr "跳到下一个新的或未读取的邮件"
 
 #: ../keymap_alldefs.h:118
 msgid "jump to the next subthread"
@@ -5215,15 +5146,15 @@ msgstr "跳到下一个线索"
 
 #: ../keymap_alldefs.h:120
 msgid "move to the next undeleted message"
-msgstr "移动到下一个未删除信件"
+msgstr "移动到下一个未删除邮件"
 
 #: ../keymap_alldefs.h:121
 msgid "jump to the next unread message"
-msgstr "跳到下一个未读取信件"
+msgstr "跳到下一个未读邮件"
 
 #: ../keymap_alldefs.h:122
 msgid "jump to parent message in thread"
-msgstr "跳到本线索中的父信件"
+msgstr "跳到本线索中的父邮件"
 
 #: ../keymap_alldefs.h:123
 msgid "jump to previous thread"
@@ -5235,56 +5166,55 @@ msgstr "跳到上一个子线索"
 
 #: ../keymap_alldefs.h:125
 msgid "move to the previous undeleted message"
-msgstr "移动到上一个未删除信件"
+msgstr "移动到上一个未删除邮件"
 
 #: ../keymap_alldefs.h:126
 msgid "jump to the previous new message"
-msgstr "跳到上一个新信件"
+msgstr "跳到上一个新邮件"
 
 #: ../keymap_alldefs.h:127
 msgid "jump to the previous new or unread message"
-msgstr "跳到上一个新的或未读取的信件"
+msgstr "跳到上一个新的或未读取的邮件"
 
 #: ../keymap_alldefs.h:128
 msgid "jump to the previous unread message"
-msgstr "跳到上一个未读取的信件"
+msgstr "跳到上一个未读邮件"
 
 #: ../keymap_alldefs.h:129
 msgid "mark the current thread as read"
-msgstr "标记当前线索为已读取"
+msgstr "标记当前线索为已读"
 
 #: ../keymap_alldefs.h:130
 msgid "mark the current subthread as read"
-msgstr "标记当前子线索为已读取"
+msgstr "标记当前子线索为已读"
 
 #: ../keymap_alldefs.h:131
-#, fuzzy
 msgid "jump to root message in thread"
-msgstr "跳到本线索中的父信件"
+msgstr "跳到本线索中的根邮件"
 
 #: ../keymap_alldefs.h:132
 msgid "set a status flag on a message"
-msgstr "设定某一封信件的状态标记"
+msgstr "设定邮件的状态标记"
 
 #: ../keymap_alldefs.h:133
 msgid "save changes to mailbox"
-msgstr "保存修改到信箱"
+msgstr "保存修改到邮箱"
 
 #: ../keymap_alldefs.h:134
 msgid "tag messages matching a pattern"
-msgstr "标记符合某个模式的信件"
+msgstr "标记符合某个模式的邮件"
 
 #: ../keymap_alldefs.h:135
 msgid "undelete messages matching a pattern"
-msgstr "反删除符合某个模式的信件"
+msgstr "撤销删除符合某个模式的邮件"
 
 #: ../keymap_alldefs.h:136
 msgid "untag messages matching a pattern"
-msgstr "反标记符合某个模式的信件"
+msgstr "取消标记符合某个模式的邮件"
 
 #: ../keymap_alldefs.h:137
 msgid "create a hotkey macro for the current message"
-msgstr ""
+msgstr "为当前邮件创建热键宏"
 
 #: ../keymap_alldefs.h:138
 msgid "move to the middle of the page"
@@ -5296,7 +5226,7 @@ msgstr "移动到下一条目"
 
 #: ../keymap_alldefs.h:140
 msgid "scroll down one line"
-msgstr "向下卷动一行"
+msgstr "向下滚动一行"
 
 #: ../keymap_alldefs.h:141
 msgid "move to the next page"
@@ -5304,7 +5234,7 @@ msgstr "移动到下一页"
 
 #: ../keymap_alldefs.h:142
 msgid "jump to the bottom of the message"
-msgstr "跳到信件的底端"
+msgstr "跳到邮件的底端"
 
 #: ../keymap_alldefs.h:143
 msgid "toggle display of quoted text"
@@ -5316,11 +5246,11 @@ msgstr "跳过引用"
 
 #: ../keymap_alldefs.h:145
 msgid "jump to the top of the message"
-msgstr "跳到信件的顶端"
+msgstr "跳到邮件的顶端"
 
 #: ../keymap_alldefs.h:146
 msgid "pipe message/attachment to a shell command"
-msgstr "将 讯息/附件 通过管道传递给 shell 命令"
+msgstr "将邮件/附件通过管道传递给 shell 命令"
 
 #: ../keymap_alldefs.h:147
 msgid "move to the previous entry"
@@ -5328,7 +5258,7 @@ msgstr "移到上一条目"
 
 #: ../keymap_alldefs.h:148
 msgid "scroll up one line"
-msgstr "向上卷动一行"
+msgstr "向上滚动一行"
 
 #: ../keymap_alldefs.h:149
 msgid "move to the previous page"
@@ -5340,7 +5270,7 @@ msgstr "打印当前条目"
 
 #: ../keymap_alldefs.h:151
 msgid "really delete the current entry, bypassing the trash folder"
-msgstr ""
+msgstr "真的删除当前项，绕过垃圾箱"
 
 #: ../keymap_alldefs.h:152
 msgid "query external program for addresses"
@@ -5352,11 +5282,11 @@ msgstr "附加新查询结果到当前结果"
 
 #: ../keymap_alldefs.h:154
 msgid "save changes to mailbox and quit"
-msgstr "保存修改到信箱并且离开"
+msgstr "保存修改到邮箱并退出"
 
 #: ../keymap_alldefs.h:155
 msgid "recall a postponed message"
-msgstr "重新叫出一封被延迟寄出的信件"
+msgstr "重新叫出一封被延迟寄出的邮件"
 
 #: ../keymap_alldefs.h:156
 msgid "clear and redraw the screen"
@@ -5368,51 +5298,51 @@ msgstr "{内部的}"
 
 #: ../keymap_alldefs.h:158
 msgid "rename the current mailbox (IMAP only)"
-msgstr "将当前信箱改名 (只适用于 IMAP)"
+msgstr "重命名当前邮箱 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:159
 msgid "reply to a message"
-msgstr "回覆一封信件"
+msgstr "回复一封邮件"
 
 #: ../keymap_alldefs.h:160
 msgid "use the current message as a template for a new one"
-msgstr "用当前信件作为新信件的模板"
+msgstr "用当前邮件作为新邮件的模板"
 
 #: ../keymap_alldefs.h:161
 msgid "save message/attachment to a mailbox/file"
-msgstr "保存 信件/附件 到 信箱/文件"
+msgstr "保存邮件/附件到邮箱/文件"
 
 #: ../keymap_alldefs.h:162
 msgid "search for a regular expression"
-msgstr "用正则表示式搜索"
+msgstr "用正则表达式搜索"
 
 #: ../keymap_alldefs.h:163
 msgid "search backwards for a regular expression"
-msgstr "用正则表示式向后搜索"
+msgstr "用正则表达式反向搜索"
 
 #: ../keymap_alldefs.h:164
 msgid "search for next match"
-msgstr "搜索下一个匹配"
+msgstr "寻找下一个匹配"
 
 #: ../keymap_alldefs.h:165
 msgid "search for next match in opposite direction"
-msgstr "反向搜索下一个匹配"
+msgstr "反向寻找下一个匹配"
 
 #: ../keymap_alldefs.h:166
 msgid "toggle search pattern coloring"
-msgstr "切换搜寻模式的颜色"
+msgstr "切换搜索模式的颜色标识"
 
 #: ../keymap_alldefs.h:167
 msgid "invoke a command in a subshell"
-msgstr "在 subshell 中调用命令"
+msgstr "在子 shell 中调用命令"
 
 #: ../keymap_alldefs.h:168
 msgid "sort messages"
-msgstr "排序信件"
+msgstr "排序邮件"
 
 #: ../keymap_alldefs.h:169
 msgid "sort messages in reverse order"
-msgstr "反向排序信件"
+msgstr "反向排序邮件"
 
 #: ../keymap_alldefs.h:170
 msgid "tag the current entry"
@@ -5420,11 +5350,11 @@ msgstr "标记当前条目"
 
 #: ../keymap_alldefs.h:171
 msgid "apply next function to tagged messages"
-msgstr "对已标记信息应用下一功能"
+msgstr "对已标记邮件应用下一功能"
 
 #: ../keymap_alldefs.h:172
 msgid "apply next function ONLY to tagged messages"
-msgstr "“仅”对已标记信息应用下一功能"
+msgstr "“仅”对已标记邮件应用下一功能"
 
 #: ../keymap_alldefs.h:173
 msgid "tag the current subthread"
@@ -5436,31 +5366,31 @@ msgstr "标记当前线索"
 
 #: ../keymap_alldefs.h:175
 msgid "toggle a message's 'new' flag"
-msgstr "切换信件的'新邮件'标记"
+msgstr "切换邮件的新邮件标记"
 
 #: ../keymap_alldefs.h:176
 msgid "toggle whether the mailbox will be rewritten"
-msgstr "切换信箱是否要重写"
+msgstr "切换邮箱是否要重写"
 
 #: ../keymap_alldefs.h:177
 msgid "toggle whether to browse mailboxes or all files"
-msgstr "切换是否浏览信箱或所有文件"
+msgstr "切换是否浏览邮箱或所有文件"
 
 #: ../keymap_alldefs.h:178
 msgid "move to the top of the page"
-msgstr "移到页首"
+msgstr "移到页面顶端"
 
 #: ../keymap_alldefs.h:179
 msgid "undelete the current entry"
-msgstr "反删除当前条目"
+msgstr "撤销删除当前条目"
 
 #: ../keymap_alldefs.h:180
 msgid "undelete all messages in thread"
-msgstr "反删除线索中的所有信件"
+msgstr "撤销删除线索中的所有邮件"
 
 #: ../keymap_alldefs.h:181
 msgid "undelete all messages in subthread"
-msgstr "反删除子线索中的所有信件"
+msgstr "撤销删除子线索中的所有邮件"
 
 #: ../keymap_alldefs.h:182
 msgid "show the Mutt version number and date"
@@ -5484,53 +5414,47 @@ msgstr "显示当前激活的限制模式"
 
 #: ../keymap_alldefs.h:187
 msgid "collapse/uncollapse current thread"
-msgstr "折叠/展开 当前线索"
+msgstr "折叠/展开当前线索"
 
 #: ../keymap_alldefs.h:188
 msgid "collapse/uncollapse all threads"
-msgstr "折叠/展开 所有线索"
+msgstr "折叠/展开所有线索"
 
 #: ../keymap_alldefs.h:189
 msgid "move the highlight to next mailbox"
-msgstr ""
+msgstr "移动高亮到下一邮箱"
 
 #: ../keymap_alldefs.h:190
-#, fuzzy
 msgid "move the highlight to next mailbox with new mail"
-msgstr "打开下一个有新邮件的信箱"
+msgstr "移动高亮到下一个有新邮件的邮箱"
 
 #: ../keymap_alldefs.h:191
-#, fuzzy
 msgid "open highlighted mailbox"
-msgstr "正在重新打开信箱..."
+msgstr "正在打开高亮的邮箱"
 
 #: ../keymap_alldefs.h:192
-#, fuzzy
 msgid "scroll the sidebar down 1 page"
-msgstr "向下卷动半页"
+msgstr "侧栏向下滚动一页"
 
 #: ../keymap_alldefs.h:193
-#, fuzzy
 msgid "scroll the sidebar up 1 page"
-msgstr "向上卷动半页"
+msgstr "侧栏向上滚动一页"
 
 #: ../keymap_alldefs.h:194
-#, fuzzy
 msgid "move the highlight to previous mailbox"
-msgstr "移动到上一页"
+msgstr "移动高亮到上一邮箱"
 
 #: ../keymap_alldefs.h:195
-#, fuzzy
 msgid "move the highlight to previous mailbox with new mail"
-msgstr "打开下一个有新邮件的信箱"
+msgstr "移动高亮到上一个有新邮件的邮箱"
 
 #: ../keymap_alldefs.h:196
 msgid "make the sidebar (in)visible"
-msgstr ""
+msgstr "显示/隐藏侧栏"
 
 #: ../keymap_alldefs.h:197
 msgid "attach a PGP public key"
-msgstr "附加 PGP 公钥"
+msgstr "作为附件添加 PGP 公钥"
 
 #: ../keymap_alldefs.h:198
 msgid "show PGP options"
@@ -5553,38 +5477,32 @@ msgid "check for classic PGP"
 msgstr "检查经典 PGP"
 
 #: ../keymap_alldefs.h:203
-#, fuzzy
 msgid "accept the chain constructed"
 msgstr "接受创建的链"
 
 #: ../keymap_alldefs.h:204
-#, fuzzy
 msgid "append a remailer to the chain"
-msgstr "附加转发者到链"
+msgstr "向链追加转发者"
 
 #: ../keymap_alldefs.h:205
-#, fuzzy
 msgid "insert a remailer into the chain"
-msgstr "插入转发者到链"
+msgstr "向链中插入转发者"
 
 #: ../keymap_alldefs.h:206
-#, fuzzy
 msgid "delete a remailer from the chain"
-msgstr "删除转发者到链"
+msgstr "从链中删除转发者"
 
 #: ../keymap_alldefs.h:207
-#, fuzzy
 msgid "select the previous element of the chain"
 msgstr "选择链中的前一个元素"
 
 #: ../keymap_alldefs.h:208
-#, fuzzy
 msgid "select the next element of the chain"
 msgstr "选择链中的下一个元素"
 
 #: ../keymap_alldefs.h:209
 msgid "send the message through a mixmaster remailer chain"
-msgstr "通过 mixmaster 转发者链发送信件"
+msgstr "通过 mixmaster 转发者链发送邮件"
 
 #: ../keymap_alldefs.h:210
 msgid "make decrypted copy and delete"
@@ -5605,520 +5523,3 @@ msgstr "取出支持的公钥"
 #: ../keymap_alldefs.h:214
 msgid "show S/MIME options"
 msgstr "显示 S/MIME 选项"
-
-#, fuzzy
-#~ msgid "sign as: "
-#~ msgstr " 签名的身份为： "
-
-#~ msgid " aka ......: "
-#~ msgstr "亦即 ...: "
-
-#~ msgid "Subkey ....: 0x%s"
-#~ msgstr "子钥 ...: 0x%s"
-
-#~ msgid "Query"
-#~ msgstr "查询"
-
-#~ msgid "Fingerprint: %s"
-#~ msgstr "指纹: %s"
-
-#~ msgid "Could not synchronize mailbox %s!"
-#~ msgstr "无法与 %s 信箱同步！"
-
-#~ msgid "move to the first message"
-#~ msgstr "移动到第一封信件"
-
-#~ msgid "move to the last message"
-#~ msgstr "移动到最后一封信件"
-
-#~ msgid "delete message(s)"
-#~ msgstr "删除信件"
-
-#~ msgid " in this limited view"
-#~ msgstr " 在此限制浏览中"
-
-#~ msgid "delete message"
-#~ msgstr "删除信件"
-
-#~ msgid "edit message"
-#~ msgstr "编辑信件"
-
-#~ msgid "error in expression"
-#~ msgstr "表达式有错误"
-
-#~ msgid "Internal error. Inform <roessler@does-not-exist.org>."
-#~ msgstr "内部错误。请通知 <rosessler@does-not-exist.org>。"
-
-#~ msgid "Warning: message has no From: header"
-#~ msgstr "警告：信件没有 From: 标头"
-
-#~ msgid ""
-#~ "[-- Error: malformed PGP/MIME message! --]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[-- 错误：不正确的 PGP/MIME 消息！ --]\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using GPGME backend, although no gpg-agent is running"
-#~ msgstr ""
-#~ "\n"
-#~ "使用 GPGME 后端，虽然 gpg-agent 没有在运行"
-
-#~ msgid "Error: multipart/encrypted has no protocol parameter!"
-#~ msgstr "错误：multipart/encrypted 没有协议参数！"
-
-#~ msgid "ID %s is unverified. Do you want to use it for %s ?"
-#~ msgstr "ID %s 未验证。您想要将其用于 %s 吗？"
-
-#~ msgid "Use (untrusted!) ID %s for %s ?"
-#~ msgstr "要将(不被信任的！) ID %s 用于 %s 吗？"
-
-#~ msgid "Use ID %s for %s ?"
-#~ msgstr "要将 ID %s 用于 %s 吗？"
-
-#~ msgid ""
-#~ "Warning: You have not yet decided to trust ID %s. (any key to continue)"
-#~ msgstr "警告：您还没有决定信任 ID %s。(按任意键继续)"
-
-#~ msgid "No output from OpenSSL.."
-#~ msgstr "OpenSSL 没有输出.."
-
-#~ msgid "Warning: Intermediate certificate not found."
-#~ msgstr "警告：未找到中间证书"
-
-#~ msgid "Clear"
-#~ msgstr "清除"
-
-#~ msgid ""
-#~ "  --\t\ttreat remaining arguments as addr even if starting with a dash\n"
-#~ "\t\twhen using -a with multiple filenames using -- is mandatory"
-#~ msgstr ""
-#~ "  --\t\t将余下的参数当做地址，即使是以破折号开头\n"
-#~ "\t\t当与多个文件名同时使用 -a 时使用 -- 是必须的"
-
-#~ msgid "esabifc"
-#~ msgstr "esabifc"
-
-#~ msgid "Interactive SMTP authentication not supported"
-#~ msgstr "不支持交互式 SMTP 认证"
-
-#~ msgid "No search pattern."
-#~ msgstr "没有搜寻格式。"
-
-#~ msgid "Reverse search: "
-#~ msgstr "反向搜寻："
-
-#~ msgid "Search: "
-#~ msgstr "搜寻："
-
-#, fuzzy
-#~ msgid "Error checking signature"
-#~ msgstr "寄信途中发生错误。"
-
-#, fuzzy
-#~ msgid "Getting namespaces..."
-#~ msgstr "寄出信件中..."
-
-#, fuzzy
-#~ msgid ""
-#~ "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-#~ "<file> ]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-#~ "[...]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-#~ "[...]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
-#~ "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H "
-#~ "<file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> "
-#~ "[ ... ]\n"
-#~ "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-#~ "       mutt -v[v]\n"
-#~ msgstr ""
-#~ "用法: mutt [ -nRzZ ] [ -e <命令> ] [ -F <文件> ] [ -m <类型> ] [ -f <文件"
-#~ "> ]\n"
-#~ "        mutt [ -nx ] [ -e <命令> ] [ -a <文件> ] [ -F <文件> ] [ -H <文件"
-#~ "> ] [ -i <文件> ] [ -s <主题> ] [ -b <地址> ] [ -c <地址> ] <地址> "
-#~ "[ ... ]\n"
-#~ "        mutt [ -n ] [ -e <命令> ] [ -F <文件> ] -p\n"
-#~ "        mutt -v[v]\n"
-#~ "\n"
-#~ "参数：\n"
-#~ "  -a <文件>     将文件附在信件中\n"
-#~ "  -b <地址>     指定一个 秘密复制 (BCC) 的地址\n"
-#~ "  -c <地址>     指定一个 复制 (CC) 的地址\n"
-#~ "  -e <命令>     指定一个初始化后要被执行的命令\n"
-#~ "  -f <文件>     指定要阅读那一个信箱\n"
-#~ "  -F <文件>     指定另一个 muttrc 文件\n"
-#~ "  -H <文件>     指定一个模板文件以读取标题来源\n"
-#~ "  -i <文件>     指定一个包括在回覆中的文件\n"
-#~ "  -m <类型>     指定一个预设的信箱类型\n"
-#~ "  -n            使 Mutt 不去读取系统的 Muttrc 档\n"
-#~ "  -p            叫回一个延后寄送的信件\n"
-#~ "  -R            以只读模式打开信箱\n"
-#~ "  -s <主题>     指定一个主题 (如果有空白的话必须被包括在引言中)\n"
-#~ "  -v            显示版本和编译时所定义的参数\n"
-#~ "  -x            模拟 mailx 寄送模式\n"
-#~ "  -y            选择一个被指定在您信箱清单中的信箱\n"
-#~ "  -z            如果没有讯息在信箱中的话，立即离开\n"
-#~ "  -Z            打开第一个附有新信件的资料夹，如果没有的话立即离开\n"
-#~ "  -h            这个说明讯息"
-
-#, fuzzy
-#~ msgid "Can't change 'important' flag on POP server."
-#~ msgstr "正在删除伺服器上的信件..."
-
-#, fuzzy
-#~ msgid "Can't edit message on POP server."
-#~ msgstr "正在删除伺服器上的信件..."
-
-#~ msgid "Reading %s... %d (%d%%)"
-#~ msgstr "读取 %s 中... %d (%d%%)"
-
-#~ msgid "Writing messages... %d (%d%%)"
-#~ msgstr "写入信件中... %d (%d%%)"
-
-#~ msgid "Reading %s... %d"
-#~ msgstr "读取 %s... %d"
-
-#~ msgid "Invoking pgp..."
-#~ msgstr "启动 pgp..."
-
-#~ msgid "Fatal error.  Message count is out of sync!"
-#~ msgstr "严重错误。信件数量不协调！"
-
-#, fuzzy
-#~ msgid "CLOSE failed"
-#~ msgstr "登入失败。"
-
-#, fuzzy
-#~ msgid ""
-#~ "Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
-#~ "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-#~ "Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
-#~ "Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
-#~ "Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
-#~ "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
-#~ "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
-#~ "\n"
-#~ "Lots of others not mentioned here contributed lots of code,\n"
-#~ "fixes, and suggestions.\n"
-#~ "\n"
-#~ "    This program is free software; you can redistribute it and/or modify\n"
-#~ "    it under the terms of the GNU General Public License as published by\n"
-#~ "    the Free Software Foundation; either version 2 of the License, or\n"
-#~ "    (at your option) any later version.\n"
-#~ "\n"
-#~ "    This program is distributed in the hope that it will be useful,\n"
-#~ "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-#~ "    GNU General Public License for more details.\n"
-#~ "\n"
-#~ "    You should have received a copy of the GNU General Public License\n"
-#~ "    along with this program; if not, write to the Free Software\n"
-#~ "    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  "
-#~ "02110-1301, USA.\n"
-#~ msgstr ""
-#~ "Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
-#~ "Copyright (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
-#~ "Copyright (C) 1997-2000 Thomas Roessler <roessler@does-not-exist.org>\n"
-#~ "Copyright (C) 1998-2000 Werner Koch <wk@isil.d.shuttle.de>\n"
-#~ "Copyright (C) 1999-2000 Brendan Cully <brendan@kublai.com>\n"
-#~ "Copyright (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
-#~ "\n"
-#~ "还有许多在这里没有提及到的人仕，他们曾提供程序码，修正，和意见。\n"
-#~ "\n"
-#~ "    这个应用程序是自由软件；您可以在自由软件基金会的 GNU 一般公共\n"
-#~ "    授权书(版本 2，或i随你喜好使用以后的版本)下重复散布并/或修\n"
-#~ "    正它。\n"
-#~ "\n"
-#~ "    发布这个应用程序的目的是希望它会对你有用，但绝不包括任何保证；\n"
-#~ "    就连销售性和适于特定目的之暗示担保亦然。在 GNU 一般公共授权书\n"
-#~ "    中将会获得更多资料。\n"
-#~ "\n"
-#~ "    您应已连同应用程序收到一份 GNU 一般公共授权书；如果没有，请写信\n"
-#~ "    至 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
-#~ "Boston, MA  02110-1301, USA.\n"
-
-#~ msgid "First entry is shown."
-#~ msgstr "正在显示第一项。"
-
-#~ msgid "Last entry is shown."
-#~ msgstr "正在显示最后一项。"
-
-#~ msgid "Unable to append to IMAP mailboxes at this server"
-#~ msgstr "无法附加在这个伺服器上的 IMAP 信箱"
-
-#, fuzzy
-#~ msgid "Create a traditional (inline) PGP message?"
-#~ msgstr "建立一封 application/pgp 的信件？"
-
-#, fuzzy
-#~ msgid "%s: stat: %s"
-#~ msgstr "无法读取：%s"
-
-#, fuzzy
-#~ msgid "%s: not a regular file"
-#~ msgstr "%s 不是信箱。"
-
-#, fuzzy
-#~ msgid "Invoking OpenSSL..."
-#~ msgstr "启动 OpenSSL..."
-
-#~ msgid "Bounce message to %s...?"
-#~ msgstr "把信件直接传送至 %s...？"
-
-#~ msgid "Bounce messages to %s...?"
-#~ msgstr "把信件直接传送至 %s...？"
-
-#, fuzzy
-#~ msgid "This ID's validity level is undefined."
-#~ msgstr "这个 ID 的信任阶层没有定义。"
-
-#~ msgid "Decode-save"
-#~ msgstr "解码并储存"
-
-#~ msgid "Decode-copy"
-#~ msgstr "解码并拷贝"
-
-#~ msgid "Decrypt-save"
-#~ msgstr "解密并储存"
-
-#~ msgid "Decrypt-copy"
-#~ msgstr "解密并拷贝"
-
-#~ msgid "Copy"
-#~ msgstr "拷贝"
-
-#~ msgid ""
-#~ "\n"
-#~ "[-- End of PGP output --]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[-- PGP 输出的资料结束 --]\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "Can't stat %s."
-#~ msgstr "无法读取：%s"
-
-#~ msgid "%s: no such command"
-#~ msgstr "%s：无此指令"
-
-#, fuzzy
-#~ msgid "Authentication method is unknown."
-#~ msgstr "GSSAPI 验证失败。"
-
-#~ msgid "MIC algorithm: "
-#~ msgstr "MIC 演算法："
-
-#~ msgid "This doesn't make sense if you don't want to sign the message."
-#~ msgstr "如果您不想把信件签名，这样做就没有什么意思啦。"
-
-#~ msgid "Unknown MIC algorithm, valid ones are: pgp-md5, pgp-sha1, pgp-rmd160"
-#~ msgstr "不明的 MIC 演算法。有效的如下: pgp-md5, pgp-sha1, pgp-rmd160"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "SHA1 implementation Copyright (C) 1995-1997 Eric A. Young <eay@cryptsoft."
-#~ "com>\n"
-#~ "\n"
-#~ "    Redistribution and use in source and binary forms, with or without\n"
-#~ "    modification, are permitted under certain conditions.\n"
-#~ "\n"
-#~ "    The SHA1 implementation comes AS IS, and ANY EXPRESS OR IMPLIED\n"
-#~ "    WARRANTIES, including, but not limited to, the implied warranties of\n"
-#~ "    merchantability and fitness for a particular purpose ARE DISCLAIMED.\n"
-#~ "\n"
-#~ "    You should have received a copy of the full distribution terms\n"
-#~ "    along with this program; if not, write to the program's developers.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "SHA1 implementation Copyrigt (C) 1995-7 Eric A. Young <eay@cryptsoft."
-#~ "com>\n"
-#~ "\n"
-#~ "     重复散布并使用原始程序码和编译过的程序码，不管有否经过修改，\n"
-#~ "     在某些条件下是许可的。\n"
-#~ "\n"
-#~ "     SHA1 程序不附带任何担保，不论系明示还是暗示，包括但不限于销售性\n"
-#~ "     和适于特定目的之暗示担保。\n"
-#~ "\n"
-#~ "     您应该收到一份此应用程序的完整的散布条文；如果没有，请写信给\n"
-#~ "     应用程序的发展人员.\n"
-
-#, fuzzy
-#~ msgid "POP Username: "
-#~ msgstr "IMAP 用户名称："
-
-#, fuzzy
-#~ msgid "Reading new message (%d bytes)..."
-#~ msgstr "读取新信件 (%d 位元组)..."
-
-#, fuzzy
-#~ msgid "%s [%d message read]"
-#~ msgstr "%s [已阅读 %d 封信件]"
-
-#~ msgid "Creating mailboxes is not yet supported."
-#~ msgstr "未支持制造信箱。"
-
-#~ msgid "We can't currently handle utf-8 at this point."
-#~ msgstr "我们还未能处理 utf-8。"
-
-#~ msgid "Can't open %s: %s."
-#~ msgstr "无法打开 %s：%s."
-
-#, fuzzy
-#~ msgid "Error while recoding %s. Leave it unchanged."
-#~ msgstr "当转换编码 %s 发生错误。看 %s 来修复你的资料。"
-
-#~ msgid "Error while recoding %s. See %s for recovering your data."
-#~ msgstr "当转换编码 %s 发生错误。看 %s 来修复你的资料。"
-
-#~ msgid "Can't change character set for non-text attachments!"
-#~ msgstr "非文字的附件是不能改变字符集的！"
-
-#~ msgid "UTF-8 encoding attachments has not yet been implemented."
-#~ msgstr "还未支持 UTF-8 编码的附件。"
-
-#~ msgid "Compose"
-#~ msgstr "写信"
-
-#~ msgid "We currently can't encode to utf-8."
-#~ msgstr "我们现在还未能重新编码至 utf-8。"
-
-#~ msgid "Recoding successful."
-#~ msgstr "重新编码成功。"
-
-#~ msgid "CRAM key for %s@%s: "
-#~ msgstr "%s@%s 的 CRAM 钥匙"
-
-#~ msgid "Skipping CRAM-MD5 authentication."
-#~ msgstr "掠过 CRAM-MD5 验证"
-
-#~ msgid "Reopening mailbox... %s"
-#~ msgstr "重新打开信箱中... %s"
-
-#~ msgid "Closing mailbox..."
-#~ msgstr "关闭信箱中..."
-
-#~ msgid "Sending APPEND command ..."
-#~ msgstr "正在送出 APPEND 命令..."
-
-#~ msgid "change an attachment's character set"
-#~ msgstr "改变附件的字符集"
-
-#~ msgid "recode this attachment to/from the local charset"
-#~ msgstr "重新将附件编码至本地字符集，或由本地字符集重新编码"
-
-#~ msgid "%d kept."
-#~ msgstr "%d 保留了。"
-
-#~ msgid "POP Password: "
-#~ msgstr "POP 密码："
-
-#~ msgid "No POP username is defined."
-#~ msgstr "没有被定义的 POP 使用者名称。"
-
-#~ msgid "Attachment saved"
-#~ msgstr "附件已被储存。"
-
-#~ msgid "move to the last undelete message"
-#~ msgstr "移动到最后一封未删除的信件"
-
-#~ msgid "return to the main-menu"
-#~ msgstr "回到主选单"
-
-#~ msgid "ignoring empty header field: %s"
-#~ msgstr "不理会空的标头栏位：%s"
-
-#, fuzzy
-#~ msgid "Recoding only affetcs text attachments."
-#~ msgstr "只重新编码受影响的文字附件"
-
-#, fuzzy
-#~ msgid "display message with full headers"
-#~ msgstr "编辑信件的标头"
-
-#, fuzzy
-#~ msgid "This operation is not currently supported for PGP messages."
-#~ msgstr "暂不支持浏览 IMAP 目录"
-
-#~ msgid "imap_error(): unexpected response in %s: %s\n"
-#~ msgstr "imap_error()：%s 的意外回应：%s\n"
-
-#~ msgid "Can't open your secret key ring!"
-#~ msgstr "无法打开您的秘密钥匙环！"
-
-#~ msgid "An unkown PGP version was defined for signing."
-#~ msgstr "定义了一个不明的 PGP 版本来签名"
-
-#~ msgid "===== Attachments ====="
-#~ msgstr "===== 附件 ====="
-
-#~ msgid "Sending CREATE command ..."
-#~ msgstr "正在送出 CREATE 命令..."
-
-#~ msgid "Unknown PGP version \"%s\"."
-#~ msgstr "不明的 PGP 版本 \"%s\"。"
-
-#~ msgid ""
-#~ "[-- Error: this message does not comply with the PGP/MIME specification! "
-#~ "--]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[-- 错误：这封信件不符合 PGP/MIME 的规格！ --]\n"
-#~ "\n"
-
-#~ msgid "reserved"
-#~ msgstr "保留的"
-
-#~ msgid "Signature Packet"
-#~ msgstr "签名封包"
-
-#~ msgid "Conventionally Encrypted Session Key Packet"
-#~ msgstr "一般加密钥匙封包"
-
-#~ msgid "One-Pass Signature Packet"
-#~ msgstr "单一通道的签名封包"
-
-#~ msgid "Secret Key Packet"
-#~ msgstr "秘密钥匙封包"
-
-#~ msgid "Public Key Packet"
-#~ msgstr "公共钥匙封包"
-
-#~ msgid "Secret Subkey Packet"
-#~ msgstr "秘密次钥匙封包"
-
-#~ msgid "Compressed Data Packet"
-#~ msgstr "压缩资料封包"
-
-#~ msgid "Symmetrically Encrypted Data Packet"
-#~ msgstr "对称加密资料封包"
-
-#~ msgid "Marker Packet"
-#~ msgstr "记号封包"
-
-#~ msgid "Literal Data Packet"
-#~ msgstr "文字资料封包"
-
-#~ msgid "Trust Packet"
-#~ msgstr "被信托封包"
-
-#~ msgid "Name Packet"
-#~ msgstr "名称封包"
-
-#~ msgid "Reserved"
-#~ msgstr "保留的"
-
-#~ msgid "Comment Packet"
-#~ msgstr "注解封包"
-
-#~ msgid "Message edited. Really send?"
-#~ msgstr "信件已经编辑过。确定要寄出？"
-
-#~ msgid "Saved output of child process to %s.\n"
-#~ msgstr "输出子程序储存至 %s.\n"