X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/19304f7c526fbe36ba0db2fb80bcaf3bd974d81d..c57d201781ba63549ff5d9c6e759beabaef18988:/po/zh_CN.po?ds=inline

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 99bf216..ea30f8b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,896 +1,911 @@
-# Translation for mutt in Traditional Chinese, Big5 encoding.
+# Translation for mutt in simplified Chinese, UTF-8 encoding.
 #
-# Copyright  Cd Chen <cdchen@mail.cynix.com.tw>, Weichung Chau <weichung@mail.cynix.com.tw>, Anthony Wong <ypwong@debian.org>
+# Copyright (C) mutt translators.
+# Cd Chen <cdchen@mail.cynix.com.tw>
+# Weichung Chau <weichung@mail.cynix.com.tw>
+# Anthony Wong <ypwong@debian.org>
+# Deng Xiyue <manphiz@gmail.com>, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Mutt 1.1.2\n"
+"Project-Id-Version: Mutt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-05 16:36-0800\n"
-"PO-Revision-Date: 1999-12-20 20:41+0800\n"
-"Last-Translator: Anthony Wong <ypwong@debian.org>\n"
-"Language-Team: Chinese <zh@li.org>\n"
+"POT-Creation-Date: 2010-09-15 10:09-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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=gb2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:161
-#, fuzzy, c-format
+#: account.c:163
+#, c-format
 msgid "Username at %s: "
-msgstr "¸ü¸ÄÃû³ÆΪ£º"
+msgstr "在 %s 的用户名："
 
-#: account.c:220
+#: account.c:224
 #, c-format
 msgid "Password for %s@%s: "
-msgstr "%s@%s µÄÃÜÂ룺"
+msgstr "%s@%s 的密码："
 
-#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:41 query.c:48
+#: addrbook.c:37 browser.c:46 pager.c:1530 postpone.c:41 query.c:48
 #: recvattach.c:53
 msgid "Exit"
-msgstr "À뿪"
+msgstr "退出"
 
-#: addrbook.c:38 curs_main.c:406 pager.c:1486 postpone.c:42
+#: addrbook.c:38 curs_main.c:406 pager.c:1537 postpone.c:42
 msgid "Del"
-msgstr "ɾ³ý"
+msgstr "删除"
 
 #: addrbook.c:39 curs_main.c:407 postpone.c:43
 msgid "Undel"
-msgstr "·´É¾³ý"
+msgstr "反删除"
 
 #: addrbook.c:40
 msgid "Select"
-msgstr "Ñ¡Ôñ"
+msgstr "选择"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3832 curs_main.c:412
-#: mutt_ssl.c:899 mutt_ssl_gnutls.c:805 pager.c:1578 pgpkey.c:522
-#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:437
+#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:3827 curs_main.c:412
+#: mutt_ssl.c:988 mutt_ssl_gnutls.c:875 pager.c:1629 pgpkey.c:522
+#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:425
 msgid "Help"
-msgstr "°ïÖú"
+msgstr "帮助"
 
 #: addrbook.c:145
 msgid "You have no aliases!"
-msgstr "ÄúûÓбðÃû×ÊÁÏ£¡"
+msgstr "您没有别名信息！"
 
 #: addrbook.c:155
 msgid "Aliases"
-msgstr "±ðÃû"
+msgstr "别名"
 
 #. add a new alias
 #: alias.c:260
 msgid "Alias as: "
-msgstr "È¡±ðÃûΪ£º"
+msgstr "取别名为："
 
 #: alias.c:266
 msgid "You already have an alias defined with that name!"
-msgstr "ÄúÒѾ­ÎªÕâ¸öÃû×Ö¶¨ÒåÁ˱ðÃûÀ²£¡"
+msgstr "您已经为这个名字定义了别名啦！"
 
 #: alias.c:272
 msgid "Warning: This alias name may not work.  Fix it?"
-msgstr ""
+msgstr "警告：此别名可能无法工作。要修正它吗？"
 
 #: alias.c:297
 msgid "Address: "
-msgstr "µØÖ·£º"
+msgstr "地址："
 
 #: alias.c:307 send.c:206
 #, c-format
 msgid "Error: '%s' is a bad IDN."
-msgstr ""
+msgstr "错误：'%s'是错误的 IDN。"
 
 #: alias.c:319
 msgid "Personal name: "
-msgstr "¸öÈËÐÕÃû£º"
+msgstr "个人姓名："
 
 #: alias.c:328
 #, c-format
 msgid "[%s = %s] Accept?"
-msgstr "[%s = %s] ½ÓÊÜ?"
+msgstr "[%s = %s] 接受?"
 
-#: alias.c:347 recvattach.c:431 recvattach.c:454 recvattach.c:467
-#: recvattach.c:480 recvattach.c:510
+#: alias.c:347 recvattach.c:440 recvattach.c:466 recvattach.c:479
+#: recvattach.c:492 recvattach.c:522
 msgid "Save to file: "
-msgstr "´æµ½Îļþ£º"
+msgstr "存到文件："
 
 #: alias.c:361
-#, fuzzy
 msgid "Error reading alias file"
-msgstr "¶ÁÈ¡Ðżþʱ·¢Éú´íÎó£¡"
+msgstr "读取别名文件时出错"
 
-#: alias.c:382
+#: alias.c:383
 msgid "Alias added."
-msgstr "±ðÃûÒѾ­Ôö¼Ó¡£"
+msgstr "别名已添加。"
 
-#: alias.c:390
-#, fuzzy
+#: alias.c:391
 msgid "Error seeking in alias file"
-msgstr "ÎÞ·¨ÊÔÖøÏÔʾÎļþ"
+msgstr "无法在别名文件里查找"
 
-#: attach.c:113 attach.c:245 attach.c:477 attach.c:969
+#: attach.c:113 attach.c:245 attach.c:477 attach.c:973
 msgid "Can't match nametemplate, continue?"
-msgstr "ÎÞ·¨Æ¥ÅäÃû³ÆÄ£°å£¬¼ÌÐø£¿"
+msgstr "无法匹配名称模板，继续？"
 
 #. For now, editing requires a file, no piping
 #: attach.c:126
 #, c-format
 msgid "Mailcap compose entry requires %%s"
-msgstr "Mailcap ±à¼­ÏîÄ¿ÐèÒª %%s"
+msgstr "Mailcap 编写项目需要 %%s"
 
-#: attach.c:134 attach.c:266 commands.c:223 compose.c:1182 curs_lib.c:177
-#: curs_lib.c:543
+#: attach.c:134 attach.c:266 commands.c:223 compose.c:1179 curs_lib.c:180
+#: curs_lib.c:548
 #, c-format
 msgid "Error running \"%s\"!"
-msgstr "Ö´ÐÐ \"%s\" ʱ·¢Éú´íÎó£¡"
+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
-#, fuzzy
 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 撰写条目，正在创建空文件。"
 
 #. For now, editing requires a file, no piping
 #: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "±à¼­ Mailcap ÏîĿʱÐèÒª %%s"
+msgstr "Mailcap 编辑条目需要 %%s"
 
 #: attach.c:280
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "ûÓÐ %s µÄ mailcap ±à¼­µÇ¼"
+msgstr "没有 %s 的 mailcap 编辑条目"
 
 #: attach.c:443
 msgid "No matching mailcap entry found.  Viewing as text."
-msgstr "ûÓз¢ÏÖÅäºÏ mailcap µÄµÇ¼¡£½«ÒÔÎÄ×Öµµ·½Ê½ä¯ÀÀ¡£"
+msgstr "没有发现匹配的 mailcap 条目。以文本方式显示。"
 
 #: attach.c:456
 msgid "MIME type not defined.  Cannot view attachment."
-msgstr "MIME ÐÎʽδ±»¶¨Òå. ÎÞ·¨ÏÔʾ¸½¼þÄÚÈÝ¡£"
+msgstr "MIME 类型未定义。无法显示附件。"
 
 #: attach.c:546
 msgid "Cannot create filter"
-msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
+msgstr "无法创建过滤器"
+
+#: attach.c:554
+#, c-format
+msgid "---Command: %-20.20s Description: %s"
+msgstr "---命令：%-20.20s 描述：%s"
+
+#: attach.c:558
+#, c-format
+msgid "---Command: %-30.30s Attachment: %s"
+msgstr "---命令：%-30.30s 描述：%s"
+
+#: attach.c:604
+#, c-format
+msgid "---Attachment: %s: %s"
+msgstr "---附件: %s: %s"
+
+#: attach.c:607
+#, c-format
+msgid "---Attachment: %s"
+msgstr "---附件: %s"
 
-#: attach.c:677 attach.c:709 attach.c:1002 attach.c:1060 handler.c:1304
+#: attach.c:677 attach.c:709 attach.c:1006 attach.c:1064 handler.c:1285
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
-msgstr "ÎÞ·¨½¨Á¢¹ýÂË"
+msgstr "无法建立过滤器"
 
-#: attach.c:841
+#: attach.c:845
 msgid "Write fault!"
-msgstr "дÈëʧ°Ü£¡"
+msgstr "写入出错！"
 
-#: attach.c:1083
+#: attach.c:1087
 msgid "I don't know how to print that!"
-msgstr "ÎÒ²»ÖªµÀÒªÈçºÎ´òÓ¡Ëü£¡"
+msgstr "我不知道要如何打印它！"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Chdir"
-msgstr "¸Ä±äĿ¼"
+msgstr "改变目录"
 
-#: browser.c:47
+#: browser.c:48
 msgid "Mask"
-msgstr "ÕÚÕÖ"
+msgstr "掩码"
 
-#: browser.c:383 browser.c:1023
+#: browser.c:400 browser.c:1055
 #, c-format
 msgid "%s is not a directory."
-msgstr "%s ²»ÊÇÒ»¸öĿ¼"
+msgstr "%s 不是目录"
 
-#: browser.c:507
+#: browser.c:539
 #, c-format
 msgid "Mailboxes [%d]"
-msgstr "ÐÅÏä [%d]"
+msgstr "ä¿¡ç®± [%d]"
 
-#: browser.c:514
+#: browser.c:546
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
-msgstr "ÒѶ©ÔÄ [%s], ÎļþÕÚÕÖ: %s"
+msgstr "已订阅 [%s], 文件掩码: %s"
 
-#: browser.c:518
+#: browser.c:550
 #, c-format
 msgid "Directory [%s], File mask: %s"
-msgstr "Ŀ¼ [%s], ÎļþÕÚÕÖ: %s"
+msgstr "目录 [%s], 文件掩码: %s"
 
-#: browser.c:530
+#: browser.c:562
 msgid "Can't attach a directory!"
-msgstr "ÎÞ·¨¸½´øĿ¼£¡"
+msgstr "无法附加目录！"
 
-#: browser.c:669 browser.c:1092 browser.c:1190
+#: browser.c:701 browser.c:1123 browser.c:1221
 msgid "No files match the file mask"
-msgstr "ûÓÐÎļþÓëÎļþÕÚÕÖÏà·û"
+msgstr "没有文件与文件掩码相符"
 
-#: browser.c:873
-#, fuzzy
+#: browser.c:905
 msgid "Create is only supported for IMAP mailboxes"
-msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
+msgstr "只有 IMAP 信箱才支持创建"
 
-#: browser.c:897
-#, fuzzy
+#: browser.c:929
 msgid "Rename is only supported for IMAP mailboxes"
-msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
+msgstr "只有 IMAP 信箱才支持改名"
 
-#: browser.c:920
+#: browser.c:952
 msgid "Delete is only supported for IMAP mailboxes"
-msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
+msgstr "只有 IMAP 信箱才支持删除"
 
-#: browser.c:930
-#, fuzzy
+#: browser.c:962
 msgid "Cannot delete root folder"
-msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
+msgstr "无法删除根文件夹"
 
-#: browser.c:933
+#: browser.c:965
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
-msgstr "ÕæµÄҪɾ³ý \"%s\" ÓÊÏ䣿"
+msgstr "真的要删除 \"%s\" 信箱吗？"
 
-#: browser.c:947
+#: browser.c:979
 msgid "Mailbox deleted."
-msgstr "ÓÊÏäÒÑɾ³ý¡£"
+msgstr "信箱已删除。"
 
-#: browser.c:953
+#: browser.c:985
 msgid "Mailbox not deleted."
-msgstr "ÓÊÏäδ±»É¾³ý¡£"
+msgstr "信箱未删除。"
 
-#: browser.c:972
+#: browser.c:1004
 msgid "Chdir to: "
-msgstr "¸Ä±äĿ¼µ½£º"
+msgstr "改变目录到："
 
-#: browser.c:1011 browser.c:1085
+#: browser.c:1043 browser.c:1116
 msgid "Error scanning directory."
-msgstr "ÎÞ·¨É¨ÃèĿ¼¡£"
+msgstr "扫描目录出错。"
 
-#: browser.c:1035
+#: browser.c:1067
 msgid "File Mask: "
-msgstr "ÎļþÕÚÕÖ£º"
+msgstr "文件掩码："
 
-#: browser.c:1108
+#: browser.c:1139
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "·´ÏòÅÅÐò (d)ÈÕÆÚ, (a)×ÖÔª, (z)´óС »ò (n)²»ÅÅÐò ? "
+msgstr "按日期(d)，字母表(a)，大小(z)反向排序或不排序(n)? "
 
-#: browser.c:1109
+#: browser.c:1140
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "ÒÀÕÕ (d)ÈÕÆÚ (a)×ÖÔª (z)´óС À´ÅÅÐò£¬»ò(n)²»ÅÅÐò ? "
+msgstr "按日期(d)，字母表(a)，大小(z)排序或不排序(n)? "
 
-#: browser.c:1110
+#: browser.c:1141
 msgid "dazn"
-msgstr ""
+msgstr "dazn"
 
-#: browser.c:1177
+#: browser.c:1208
 msgid "New file name: "
-msgstr "еµÃû£º"
+msgstr "新文件名："
 
-#: browser.c:1208
+#: browser.c:1239
 msgid "Can't view a directory"
-msgstr "ÎÞ·¨ÏÔʾĿ¼"
+msgstr "无法显示目录"
 
-#: browser.c:1225
+#: browser.c:1256
 msgid "Error trying to view file"
-msgstr "ÎÞ·¨ÊÔÖøÏÔʾÎļþ"
+msgstr "尝试显示文件出错"
 
-#: buffy.c:424
-#, fuzzy
+#: buffy.c:486
 msgid "New mail in "
-msgstr "ÔÚ %s ÓÐÐÂÐżþ¡£"
+msgstr "有新信件在 "
 
 #: color.c:326
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s£ºÖն˻úÎÞ·¨ÏÔʾɫ²Ê"
+msgstr "%s：终端不支持显示颜色"
 
 #: color.c:332
 #, c-format
 msgid "%s: no such color"
-msgstr "%s£ºÃ»ÓÐÕâÖÖÑÕÉ«"
+msgstr "%s：没有这种颜色"
 
-#: color.c:378 color.c:579 color.c:590
+#: color.c:378 color.c:584 color.c:595
 #, c-format
 msgid "%s: no such object"
-msgstr "%s£ºÃ»ÓÐÕâ¸öÎï¼þ"
+msgstr "%s：没有这个对象"
 
-#: color.c:385
+#: color.c:391
 #, c-format
-msgid "%s: command valid only for index object"
-msgstr "%s£ºÃüÁîÖ»ÌṩË÷ÒýÎï¼þ"
+msgid "%s: command valid only for index, body, header objects"
+msgstr "%s：命令只对索引，正文，标头对象有效"
 
-#: color.c:393
+#: color.c:399
 #, c-format
 msgid "%s: too few arguments"
-msgstr "%s£ºÌ«ÉÙ²ÎÊý"
+msgstr "%s：参数太少"
 
-#: color.c:567
+#: color.c:572
 msgid "Missing arguments."
-msgstr "ȱÉÙ²ÎÊý¡£"
+msgstr "缺少参数。"
 
-#: color.c:606 color.c:617
+#: color.c:611 color.c:622
 msgid "color: too few arguments"
-msgstr "É«²Ê£ºÌ«ÉÙ²ÎÊý"
+msgstr "色彩：参数太少"
 
-#: color.c:640
+#: color.c:645
 msgid "mono: too few arguments"
-msgstr "µ¥É«£ºÌ«ÉÙ²ÎÊý"
+msgstr "单色：参数太少"
 
-#: color.c:660
+#: color.c:665
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s£ºÃ»ÓÐÕâ¸öÊôÐÔ"
+msgstr "%s：没有这个属性"
 
-#: color.c:700 hook.c:69 hook.c:77 keymap.c:776
+#: color.c:705 hook.c:69 hook.c:77 keymap.c:902
 msgid "too few arguments"
-msgstr "Ì«ÉÙ²ÎÊý"
+msgstr "参数太少"
 
-#: color.c:709 hook.c:83
+#: color.c:714 hook.c:83
 msgid "too many arguments"
-msgstr "Ì«¶à²ÎÊý"
+msgstr "参数太多"
 
-#: color.c:725
+#: color.c:730
 msgid "default colors not supported"
-msgstr "²»Ö§³ÖÔ¤ÉèµÄÉ«²Ê"
+msgstr "不支持默认的颜色"
 
 #. find out whether or not the verify signature
 #: commands.c:90
 msgid "Verify PGP signature?"
-msgstr "¼ì²é PGP Ç©Ãû?"
+msgstr "验证 PGP 签名?"
 
-#: commands.c:115 mbox.c:754
+#: commands.c:115 mbox.c:787
 msgid "Could not create temporary file!"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
+msgstr "无法创建临时文件！"
 
 #: commands.c:128
-#, fuzzy
 msgid "Cannot create display filter"
-msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
+msgstr "无法创建显示过滤器"
 
 #: commands.c:152
-#, fuzzy
 msgid "Could not copy message"
-msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
+msgstr "无法复制信件"
 
 #: commands.c:189
-#, fuzzy
 msgid "S/MIME signature successfully verified."
-msgstr "S/MIME Ç©ÃûÑéÖ¤³É¹¦¡£"
+msgstr "S/MIME 签名验证成功。"
 
 #: commands.c:191
 msgid "S/MIME certificate owner does not match sender."
-msgstr ""
+msgstr "S/MIME 证书所有者与发送者不匹配。"
 
 #: commands.c:194 commands.c:205
 msgid "Warning: Part of this message has not been signed."
-msgstr ""
+msgstr "警告：此信件的部分内容未签署。"
 
 #: commands.c:196
-#, fuzzy
 msgid "S/MIME signature could NOT be verified."
-msgstr "S/MIME Ç©ÃûÑéÖ¤³É¹¦¡£"
+msgstr "S/MIME 签名“无法”验证。"
 
 #: commands.c:203
 msgid "PGP signature successfully verified."
-msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
+msgstr "PGP 签名验证成功。"
 
 #: commands.c:207
-#, fuzzy
 msgid "PGP signature could NOT be verified."
-msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
+msgstr "PGP 签名“无法”验证。"
 
-#: commands.c:230
+#: commands.c:231
 msgid "Command: "
-msgstr "Ö¸Á"
+msgstr "命令："
+
+#: commands.c:256
+msgid "Warning: message has no From: header"
+msgstr "警告：信件没有 From: 标头"
 
-#: commands.c:250 recvcmd.c:143
+#: commands.c:274 recvcmd.c:171
 msgid "Bounce message to: "
-msgstr "Ö±½Ó´«ËÍÓʼþµ½£º"
+msgstr "回退信件至："
 
-#: commands.c:252 recvcmd.c:145
+#: commands.c:276 recvcmd.c:173
 msgid "Bounce tagged messages to: "
-msgstr "ÎÞ·¨´«ËÍÒѱê¼ÇµÄÓʼþÖÁ£º"
+msgstr "回退已标记的信件至："
 
-#: commands.c:267 recvcmd.c:154
+#: commands.c:291 recvcmd.c:182
 msgid "Error parsing address!"
-msgstr "ÎÞ·¨·ÖÎöλַ£¡"
+msgstr "解析地址出错！"
 
-#: commands.c:275 recvcmd.c:162
+#: commands.c:299 recvcmd.c:190
 #, c-format
 msgid "Bad IDN: '%s'"
-msgstr ""
+msgstr "错误的 IDN: '%s'"
 
-#: commands.c:286 recvcmd.c:176
+#: commands.c:310 recvcmd.c:204
 #, c-format
 msgid "Bounce message to %s"
-msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
+msgstr "回退信件至 %s"
 
-#: commands.c:286 recvcmd.c:176
+#: commands.c:310 recvcmd.c:204
 #, c-format
 msgid "Bounce messages to %s"
-msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
+msgstr "回退信件至 %s"
 
-#: commands.c:302 recvcmd.c:192
-#, fuzzy
+#: commands.c:326 recvcmd.c:220
 msgid "Message not bounced."
-msgstr "ÓʼþÒѱ»´«ËÍ¡£"
+msgstr "信件未回退。"
 
-#: commands.c:302 recvcmd.c:192
-#, fuzzy
+#: commands.c:326 recvcmd.c:220
 msgid "Messages not bounced."
-msgstr "ÓʼþÒÑ´«ËÍ¡£"
+msgstr "信件未回退。"
 
-#: commands.c:312 recvcmd.c:211
+#: commands.c:336 recvcmd.c:239
 msgid "Message bounced."
-msgstr "ÓʼþÒѱ»´«ËÍ¡£"
+msgstr "信件已回退。"
 
-#: commands.c:312 recvcmd.c:211
+#: commands.c:336 recvcmd.c:239
 msgid "Messages bounced."
-msgstr "ÓʼþÒÑ´«ËÍ¡£"
+msgstr "信件已回退。"
 
-#: commands.c:389 commands.c:423 commands.c:440
-#, fuzzy
+#: commands.c:413 commands.c:447 commands.c:464
 msgid "Can't create filter process"
-msgstr "ÎÞ·¨½¨Á¢¹ýÂË"
+msgstr "无法建立过滤进程"
 
-#: commands.c:469
+#: commands.c:493
 msgid "Pipe to command: "
-msgstr "ÓùܵÀÊä³öÖÁÃüÁ"
+msgstr "用管道输出至命令："
 
-#: commands.c:486
-#, fuzzy
+#: commands.c:510
 msgid "No printing command has been defined."
-msgstr "Ȧѡ½øÈëµÄÓÊͲ"
+msgstr "未定义打印命令"
 
-#: commands.c:491
+#: commands.c:515
 msgid "Print message?"
-msgstr "´òÓ¡Ðżþ£¿"
+msgstr "打印信件？"
 
-#: commands.c:491
+#: commands.c:515
 msgid "Print tagged messages?"
-msgstr "´òÓ¡Òѱê¼ÇµÄÐżþ£¿"
+msgstr "打印已标记的信件？"
 
-#: commands.c:500
+#: commands.c:524
 msgid "Message printed"
-msgstr "ÐżþÒÑÓ¡³ö"
+msgstr "信件已打印"
 
-#: commands.c:500
+#: commands.c:524
 msgid "Messages printed"
-msgstr "ÐżþÒÑÓ¡³ö"
+msgstr "信件已打印"
 
-#: commands.c:502
-#, fuzzy
+#: commands.c:526
 msgid "Message could not be printed"
-msgstr "ÐżþÒÑÓ¡³ö"
+msgstr "信件无法打印"
 
-#: commands.c:503
-#, fuzzy
+#: commands.c:527
 msgid "Messages could not be printed"
-msgstr "ÐżþÒÑÓ¡³ö"
+msgstr "信件无法打印"
 
-#: commands.c:512
-#, fuzzy
+#: commands.c:536
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
-"·´·½Ïò d)ÈÕÆÚ,f)·¢ÐÅÈË,r)ÊÕÐÅʱ¼ä,s)±êÌâ,o)ÊÕÐÅÈË,t)ÐòÁÐ,u)²»ÅÅ,z)´óС,c)·Ö"
-"Êý:"
+"按日期d/发信人f/收信时间r/标题s/收信人o/线索t/不排u/大小z/分数c/垃圾邮件p反向"
+"排序?: "
 
-#: commands.c:513
-#, fuzzy
+#: commands.c:537
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
-"ÅÅÐò d)ÈÕÆÚ,f)·¢ÐÅÈË,r)ÊÕÐÅʱ¼ä,s)±êÌâ,o)ÊÕÐÅÈË,t)ÐòÁÐ,u)²»ÅÅÐò,z)´óС,c)·Ö"
-"Êý:"
+"按日期d/发信人f/收信时间r/标题s/收信人o/线索t/不排u/大小z/分数c/垃圾邮件p排"
+"序?: "
 
-#: commands.c:514
+#: commands.c:538
 msgid "dfrsotuzcp"
-msgstr ""
+msgstr "dfrsotuzcp"
 
-#: commands.c:571
+#: commands.c:595
 msgid "Shell command: "
-msgstr "Shell Ö¸Á"
+msgstr "Shell 指令："
 
-#: commands.c:716
-#, fuzzy, c-format
+#: commands.c:738
+#, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "解码保存%s 到信箱"
 
-#: commands.c:717
-#, fuzzy, c-format
+#: commands.c:739
+#, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "解码复制%s 到信箱"
 
-#: commands.c:718
-#, fuzzy, c-format
+#: commands.c:740
+#, c-format
 msgid "Decrypt-save%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "解密保存%s 到信箱"
 
-#: commands.c:719
-#, fuzzy, c-format
+#: commands.c:741
+#, c-format
 msgid "Decrypt-copy%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "解密复制%s 到信箱"
 
-#: commands.c:720
-#, fuzzy, c-format
+#: commands.c:742
+#, c-format
 msgid "Save%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "保存%s 到信箱"
 
-#: commands.c:720
-#, fuzzy, c-format
+#: commands.c:742
+#, c-format
 msgid "Copy%s to mailbox"
-msgstr "%s%s µ½ÐÅÏä"
+msgstr "复制%s 到信箱"
 
-#: commands.c:721
+#: commands.c:743
 msgid " tagged"
-msgstr " Òѱê¼Ç"
+msgstr " 已标记"
 
-#: commands.c:794
+#: commands.c:816
 #, c-format
 msgid "Copying to %s..."
-msgstr "¿½±´µ½ %s¡­"
+msgstr "正在复制到 %s..."
 
-#: commands.c:929
+#: commands.c:932
 #, c-format
 msgid "Convert to %s upon sending?"
-msgstr ""
+msgstr "发送时转换为 %s？"
 
-#: commands.c:939
-#, fuzzy, c-format
+#: commands.c:942
+#, c-format
 msgid "Content-Type changed to %s."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "内容类型(Content-Type)改变为 %s。"
 
-#: commands.c:944
-#, fuzzy, c-format
+#: commands.c:947
+#, c-format
 msgid "Character set changed to %s; %s."
-msgstr "²»Ã÷µÄ×Ö·û¼¯ %s¡£"
+msgstr "字符集改变为 %s；%s。"
 
-#: commands.c:946
+#: commands.c:949
 msgid "not converting"
-msgstr ""
+msgstr "不进行转换"
 
-#: commands.c:946
+#: commands.c:949
 msgid "converting"
-msgstr ""
+msgstr "正在转换"
 
 #: compose.c:47
 msgid "There are no attachments."
-msgstr "ûÓи½¼þ¡£"
+msgstr "没有附件。"
 
 #: compose.c:89
 msgid "Send"
-msgstr "¼Ä³ö"
+msgstr "寄出"
 
 #: compose.c:90 remailer.c:488
 msgid "Abort"
-msgstr "ÖжÏ"
+msgstr "中断"
 
-#: compose.c:94 compose.c:667
+#: compose.c:94 compose.c:664
 msgid "Attach file"
-msgstr "¸½¼ÓÎļþ"
+msgstr "附加文件"
 
 #: compose.c:95
 msgid "Descrip"
-msgstr "ÐðÊö"
+msgstr "描述"
+
+#: compose.c:119
+#, fuzzy
+msgid "Not supported"
+msgstr "不支持标记。"
 
-#: compose.c:132
+#: compose.c:124
 msgid "Sign, Encrypt"
-msgstr "Ç©Ãû£¬¼ÓÃÜ"
+msgstr "签名，加密"
 
-#: compose.c:134
+#: compose.c:126
 msgid "Encrypt"
-msgstr "¼ÓÃÜ"
+msgstr "加密"
 
-#: compose.c:136
+#: compose.c:128
 msgid "Sign"
-msgstr "Ç©Ãû"
+msgstr "签名"
 
-#: compose.c:138
-msgid "Clear"
-msgstr "Çå³ý"
+#: compose.c:130
+msgid "None"
+msgstr ""
 
-#: compose.c:145
+#: compose.c:137
 #, fuzzy
-msgid " (inline)"
-msgstr "£¨¼ÌÐø£©\n"
+msgid " (inline PGP)"
+msgstr " (嵌入)"
 
-#: compose.c:147
+#: compose.c:139
 msgid " (PGP/MIME)"
-msgstr ""
+msgstr " (PGP/MIME)"
+
+#: compose.c:143
+#, fuzzy
+msgid " (S/MIME)"
+msgstr " (PGP/MIME)"
 
-#: compose.c:155 compose.c:159
+#: compose.c:152 compose.c:156
 msgid " sign as: "
-msgstr " Ç©ÃûµÄÉí·ÝÊÇ£º "
+msgstr " 签名的身份为： "
 
-#: compose.c:155 compose.c:159
+#: compose.c:152 compose.c:156
 msgid "<default>"
-msgstr "<Ô¤ÉèÖµ>"
+msgstr "<默认值>"
 
-#: compose.c:167
-#, fuzzy
+#: compose.c:164
 msgid "Encrypt with: "
-msgstr "¼ÓÃÜ"
+msgstr "加密采用："
 
-#: compose.c:221
+#: compose.c:218
 #, c-format
 msgid "%s [#%d] no longer exists!"
-msgstr "%s [#%d] ÒѲ»´æÔÚ!"
+msgstr "%s [#%d] 已不存在!"
 
-#: compose.c:229
+#: compose.c:226
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] ÒÑÐ޸ġ£¸üбàÂ룿"
+msgstr "%s [#%d] 已修改。更新编码？"
 
-#: compose.c:272
+#: compose.c:269
 msgid "-- Attachments"
-msgstr "-- ¸½¼þ"
+msgstr "-- 附件"
 
-#: compose.c:302
+#: compose.c:299
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
-msgstr ""
+msgstr "警告：'%s'是错误的 IDN。"
 
-#: compose.c:325
+#: compose.c:322
 msgid "You may not delete the only attachment."
-msgstr "Äú²»¿ÉÒÔɾ³ýΨһµÄ¸½¼þ¡£"
+msgstr "您不可以删除唯一的附件。"
 
-#: compose.c:600 send.c:1560
+#: compose.c:597 send.c:1586
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
-msgstr ""
+msgstr "在\"%s\"中有错误的 IDN: '%s'"
 
-#: compose.c:683
+#: compose.c:680
 msgid "Attaching selected files..."
-msgstr "ÕýÔÚ¸½¼ÓÑ¡È¡Á˵ÄÎļþ¡­"
+msgstr "正在附加已选择的文件..."
 
-#: compose.c:695
+#: compose.c:692
 #, c-format
 msgid "Unable to attach %s!"
-msgstr "ÎÞ·¨¸½¼Ó %s£¡"
+msgstr "无法附加 %s！"
 
-#: compose.c:714
+#: compose.c:711
 msgid "Open mailbox to attach message from"
-msgstr "´ò¿ªÐÅÏä²¢´ÓËüÑ¡Ôñ¸½¼ÓµÄÐżþ"
+msgstr "打开信箱并从中附加信件"
 
-#: compose.c:752
+#: compose.c:749
 msgid "No messages in that folder."
-msgstr "Îļþ¼ÐÖÐûÓÐÐżþ¡£"
+msgstr "文件夹中没有信件。"
 
-#: compose.c:761
+#: compose.c:758
 msgid "Tag the messages you want to attach!"
-msgstr "Çë±ê¼ÇÄúÒª¸½¼ÓµÄÐżþ£¡"
+msgstr "请标记您要附加的信件！"
 
-#: compose.c:793
+#: compose.c:790
 msgid "Unable to attach!"
-msgstr "ÎÞ·¨¸½¼Ó£¡"
+msgstr "无法附加！"
 
-#: compose.c:844
+#: compose.c:841
 msgid "Recoding only affects text attachments."
-msgstr "Ö»ÖØбàÂëÊÜÓ°ÏìµÄÎÄ×Ö¸½¼þ"
+msgstr "重新编码只对文本附件有效。"
 
-#: compose.c:849
+#: compose.c:846
 msgid "The current attachment won't be converted."
-msgstr "Õâ¸ö¸½¼þ²»»á±»×ª»»¡£"
+msgstr "当前附件不会被转换。"
 
-#: compose.c:851
+#: compose.c:848
 msgid "The current attachment will be converted."
-msgstr "Õâ¸ö¸½¼þ»á±»×ª»»¡£"
+msgstr "当前附件将被转换。"
 
-#: compose.c:926
+#: compose.c:923
 msgid "Invalid encoding."
-msgstr "ÎÞЧµÄ±àÂë¡£"
+msgstr "无效的编码。"
 
-#: compose.c:952
+#: compose.c:949
 msgid "Save a copy of this message?"
-msgstr "´¢´æÕâ·âÐżþµÄ¿½±´Âð£¿"
+msgstr "保存这封信件的副本吗？"
 
-#: compose.c:1008
+#: compose.c:1005
 msgid "Rename to: "
-msgstr "¸ü¸ÄÃû³ÆΪ£º"
+msgstr "改名为："
 
-#: compose.c:1013 editmsg.c:96 editmsg.c:121 sendlib.c:857
-#, fuzzy, c-format
+#: compose.c:1010 editmsg.c:96 editmsg.c:121 sendlib.c:872
+#, c-format
 msgid "Can't stat %s: %s"
-msgstr "ÎÞ·¨¶ÁÈ¡£º%s"
+msgstr "无法 stat %s：%s"
 
-#: compose.c:1040
+#: compose.c:1037
 msgid "New file: "
-msgstr "½¨Á¢Ðµµ£º"
+msgstr "新文件："
 
-#: compose.c:1053
+#: compose.c:1050
 msgid "Content-Type is of the form base/sub"
-msgstr "Content-Type µÄ¸ñʽÊÇ base/sub"
+msgstr "内容类型(Content-Type)的格式是 base/sub"
 
-#: compose.c:1059
+#: compose.c:1056
 #, c-format
 msgid "Unknown Content-Type %s"
-msgstr "²»Ã÷µÄ Content-Type %s"
+msgstr "不明的内容类型(Content-Type)%s"
 
-#: compose.c:1072
+#: compose.c:1069
 #, c-format
 msgid "Can't create file %s"
-msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
+msgstr "无法建立文件 %s"
 
-#: compose.c:1080
+#: compose.c:1077
 msgid "What we have here is a failure to make an attachment"
-msgstr "ÎÒÃÇÎÞ·¨¼ÓÉϸ½¼þ"
+msgstr "目前情况是我们无法加上附件"
 
-#: compose.c:1141
+#: compose.c:1138
 msgid "Postpone this message?"
-msgstr "ÑӳټijöÕâ·âÐżþ£¿"
+msgstr "推迟这封信件？"
 
-#: compose.c:1200
+#: compose.c:1197
 msgid "Write message to mailbox"
-msgstr "½«ÐżþдÈëµ½ÐÅÏä"
+msgstr "将信件写入到信箱"
 
-#: compose.c:1203
+#: compose.c:1200
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "дÈëÐżþµ½ %s ¡­"
+msgstr "写入信件到 %s ..."
 
-#: compose.c:1212
+#: compose.c:1209
 msgid "Message written."
-msgstr "ÐżþÒÑдÈë¡£"
+msgstr "信件已写入。"
 
-#: compose.c:1224
+#: compose.c:1221
 msgid "S/MIME already selected. Clear & continue ? "
-msgstr ""
+msgstr "已经选择了 S/MIME 。清除并继续？"
 
-#: compose.c:1250
+#: compose.c:1247
 msgid "PGP already selected. Clear & continue ? "
-msgstr ""
+msgstr "已经选择了 PGP。清除并继续？"
 
 #: crypt-gpgme.c:358
-#, fuzzy, c-format
+#, c-format
 msgid "error creating gpgme context: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "创建 gpgme 上下文出错：%s\n"
 
 #: crypt-gpgme.c:368
 #, c-format
 msgid "error enabling CMS protocol: %s\n"
-msgstr ""
+msgstr "开启 CMS 协议时出错：%s\n"
 
 #: crypt-gpgme.c:388
-#, fuzzy, c-format
+#, c-format
 msgid "error creating gpgme data object: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "创建 gpgme 数据对象时出错：%s\n"
 
 #: crypt-gpgme.c:454 crypt-gpgme.c:472 crypt-gpgme.c:1431
-#, fuzzy, c-format
+#, c-format
 msgid "error allocating data object: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "分配数据对象时出错：%s\n"
 
 #: crypt-gpgme.c:490
-#, fuzzy, c-format
+#, c-format
 msgid "error rewinding data object: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "复卷数据对象时出错：%s\n"
 
 #: crypt-gpgme.c:512 crypt-gpgme.c:559
-#, fuzzy, c-format
+#, c-format
 msgid "error reading data object: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "读取数据对象时出错：%s\n"
 
 #: crypt-gpgme.c:620
-#, fuzzy, c-format
+#, c-format
 msgid "error adding recipient `%s': %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "添加接收方`%s'时出错：%s\n"
 
 #: crypt-gpgme.c:658
 #, c-format
 msgid "secret key `%s' not found: %s\n"
-msgstr ""
+msgstr "未找到密钥`%s'：%s\n"
 
 #: crypt-gpgme.c:668
 #, c-format
 msgid "ambiguous specification of secret key `%s'\n"
-msgstr ""
+msgstr "密钥`%s'的说明有歧义\n"
 
 #: crypt-gpgme.c:680
 #, c-format
 msgid "error setting secret key `%s': %s\n"
-msgstr ""
+msgstr "设置密钥`%s'时出错：%s\n"
 
 #: crypt-gpgme.c:697
-#, fuzzy, c-format
+#, c-format
 msgid "error setting PKA signature notation: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "设置公钥认证(PKA)签名注释时出错：%s\n"
 
 #: crypt-gpgme.c:753
-#, fuzzy, c-format
+#, c-format
 msgid "error encrypting data: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "加密数据时出错：%s\n"
 
 #: crypt-gpgme.c:870
-#, fuzzy, c-format
+#, c-format
 msgid "error signing data: %s\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "签署数据时出错：%s\n"
 
 #: crypt-gpgme.c:1065
 msgid "Warning: One of the keys has been revoked\n"
-msgstr ""
+msgstr "警告：其中一个密钥已经被吊销\n"
 
 #: crypt-gpgme.c:1074
 msgid "Warning: The key used to create the signature expired at: "
-msgstr ""
+msgstr "警告：用来创建签名的密钥已于此日期过期："
 
 #: crypt-gpgme.c:1080
 msgid "Warning: At least one certification key has expired\n"
-msgstr ""
+msgstr "警告：至少有一个证书密钥已过期\n"
 
 #: crypt-gpgme.c:1096
 msgid "Warning: The signature expired at: "
-msgstr ""
+msgstr "警告：签名已于此日期过期："
 
 #: crypt-gpgme.c:1102
 msgid "Can't verify due to a missing key or certificate\n"
-msgstr ""
+msgstr "由于缺少密钥或证书而无法验证\n"
 
 #: crypt-gpgme.c:1107
-#, fuzzy
 msgid "The CRL is not available\n"
-msgstr "Ö÷Ðżþ²»´æÔÚ¡£"
+msgstr "证书吊销列表(CRL)不可用\n"
 
 #: crypt-gpgme.c:1113
 msgid "Available CRL is too old\n"
-msgstr ""
+msgstr "可用的证书吊销列表(CRL)太旧\n"
 
 #: crypt-gpgme.c:1118
 msgid "A policy requirement was not met\n"
-msgstr ""
+msgstr "未满足策略要求\n"
 
 #: crypt-gpgme.c:1127
 msgid "A system error occurred"
-msgstr ""
+msgstr "发生系统错误"
 
 #: crypt-gpgme.c:1161
 msgid "WARNING: PKA entry does not match signer's address: "
-msgstr ""
+msgstr "警告：公钥认证(PKA)项与发送者地址不匹配："
 
 #: crypt-gpgme.c:1168
 msgid "PKA verified signer's address is: "
-msgstr ""
+msgstr "公钥认证(PKA)确认的发送者地址为："
 
-#: crypt-gpgme.c:1185 crypt-gpgme.c:3299
+#: crypt-gpgme.c:1185 crypt-gpgme.c:3294
 msgid "Fingerprint: "
-msgstr ""
+msgstr "指纹："
 
 #: crypt-gpgme.c:1245
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
-msgstr ""
+msgstr "警告：我们“无法”证实密钥是否属于上面列出名字的人\n"
 
 #: crypt-gpgme.c:1252
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
-msgstr ""
+msgstr "警告：密钥“不属于”上面列出名字的人\n"
 
 #: crypt-gpgme.c:1256
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
-msgstr ""
+msgstr "警告：“无法”确定密钥属于上面列出名字的人\n"
 
 #: crypt-gpgme.c:1286
 msgid "aka: "
-msgstr ""
+msgstr "亦即："
 
 #: crypt-gpgme.c:1297
-#, fuzzy
 msgid "created: "
-msgstr "½¨Á¢ %s£¿"
+msgstr "已建立："
 
 #: crypt-gpgme.c:1362
 msgid "Error getting key information: "
-msgstr ""
+msgstr "获取密钥信息出错："
 
 #. We can't decide (yellow) but this is a PGP key with a good
 #. signature, so we display what a PGP user expects: The name,
@@ -898,506 +913,471 @@ msgstr ""
 #. ultimate).
 #: crypt-gpgme.c:1369 crypt-gpgme.c:1384
 msgid "Good signature from:"
-msgstr ""
+msgstr "正确的签名来自："
 
 #: crypt-gpgme.c:1376
 msgid "*BAD* signature from:"
-msgstr ""
+msgstr "*错误*的签名来自："
 
 #: crypt-gpgme.c:1392
 msgid "Problem signature from:"
-msgstr ""
+msgstr "有问题的签名来自："
 
 #: crypt-gpgme.c:1393
 msgid "               expires: "
-msgstr ""
+msgstr "  已于此日期过期："
 
 #. Note: We don't need a current time output because GPGME avoids
 #. such an attack by separating the meta information from the
 #. data.
-#: crypt-gpgme.c:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2290
+#: crypt-gpgme.c:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2287
 msgid "[-- Begin signature information --]\n"
-msgstr ""
+msgstr "[-- 签名信息开始 --]\n"
 
 #: crypt-gpgme.c:1448
-#, fuzzy, c-format
+#, c-format
 msgid "Error: verification failed: %s\n"
-msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
+msgstr "错误：验证失败：%s\n"
 
 #: crypt-gpgme.c:1497
 #, c-format
 msgid "*** Begin Notation (signature by: %s) ***\n"
-msgstr ""
+msgstr "*** 注释开始 (由 %s 签署) ***\n"
 
 #: crypt-gpgme.c:1519
 msgid "*** End Notation ***\n"
-msgstr ""
+msgstr "*** 注释结束 ***\n"
 
-#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2305
-#, fuzzy
+#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2302
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
+"[-- 签名信息结束 --]\n"
 "\n"
-"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
 
 #: crypt-gpgme.c:1622
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
-msgstr "[-- ´íÎó£ºÍ»·¢µÄµµÎ²£¡ --]\n"
+msgstr ""
+"[-- 错误：解密失败：%s --]\n"
+"\n"
 
-#: crypt-gpgme.c:2082
-#, fuzzy, c-format
+#: crypt-gpgme.c:2079
+#, c-format
 msgid "Error extracting key data!\n"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "取出密钥数据出错！\n"
 
-#: crypt-gpgme.c:2265
+#: crypt-gpgme.c:2262
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
-msgstr ""
+msgstr "错误：解密/验证失败：%s\n"
 
-#: crypt-gpgme.c:2313
+#: crypt-gpgme.c:2310
 msgid "Error: copy data failed\n"
-msgstr ""
+msgstr "错误：复制数据失败\n"
 
-#: crypt-gpgme.c:2333 pgp.c:427
+#: crypt-gpgme.c:2330 pgp.c:438
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP Ðżþ¿ªÊ¼ --]\n"
+"[-- PGP 消息开始 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2335 pgp.c:429
+#: crypt-gpgme.c:2332 pgp.c:440
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î¿ªÊ¼ --]\n"
+msgstr "[-- PGP 公共钥匙区段开始 --]\n"
 
-#: crypt-gpgme.c:2338 pgp.c:431
+#: crypt-gpgme.c:2335 pgp.c:442
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgstr ""
-"[-- PGP Ç©ÃûµÄÐżþ¿ªÊ¼ --]\n"
+"[-- PGP 签署的信件开始 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2365 pgp.c:457
-#, fuzzy
+#: crypt-gpgme.c:2362 pgp.c:473
 msgid "[-- END PGP MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP Ðżþ½áÊø --]\n"
+msgstr "[-- PGP 消息结束 --]\n"
 
-#: crypt-gpgme.c:2367 pgp.c:464
+#: crypt-gpgme.c:2364 pgp.c:480
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î½áÊø --]\n"
+msgstr "[-- PGP 公共钥匙区段结束 --]\n"
 
-#: crypt-gpgme.c:2369 pgp.c:466
-#, fuzzy
+#: crypt-gpgme.c:2366 pgp.c:482
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP Ç©ÃûµÄÐżþ½áÊø --]\n"
+msgstr "[-- PGP 签署的信件结束 --]\n"
 
-#: crypt-gpgme.c:2393 pgp.c:499
+#: crypt-gpgme.c:2388 pgp.c:515
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgstr ""
-"[-- ´íÎó£ºÕÒ²»µ½ PGP ÐżþµÄ¿ªÍ·£¡ --]\n"
+"[-- 错误：找不到 PGP 消息的开头！ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2424 pgp.c:931
+#: crypt-gpgme.c:2419 pgp.c:947
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgstr ""
-"[-- ´íÎ󣺲»ÕýÈ·µÄ PGP/MIME Ðżþ£¡ --]\n"
+"[-- 错误：不正确的 PGP/MIME 消息！ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2436 crypt-gpgme.c:2502 pgp.c:944
+#: crypt-gpgme.c:2431 crypt-gpgme.c:2497 pgp.c:960
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ÔÝ´æµµ£¡ --]\n"
+msgstr "[-- 错误：无法建立临时文件！ --]\n"
 
-#: crypt-gpgme.c:2448
-#, fuzzy
+#: crypt-gpgme.c:2443
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
 msgstr ""
-"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"[-- 以下数据已由 PGP/MIME 签署并加密 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2449 pgp.c:953
+#: crypt-gpgme.c:2444 pgp.c:969
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"[-- 以下数据已由 PGP/MIME 加密 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2471
-#, fuzzy
+#: crypt-gpgme.c:2466
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+msgstr "[-- PGP/MIME 签署并加密的数据结束 --]\n"
 
-#: crypt-gpgme.c:2472 pgp.c:973
-#, fuzzy
+#: crypt-gpgme.c:2467 pgp.c:989
 msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+msgstr "[-- PGP/MIME 加密数据结束 --]\n"
 
-#: crypt-gpgme.c:2514
-#, fuzzy
+#: crypt-gpgme.c:2509
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
 msgstr ""
-"[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
+"[-- 以下数据已由 S/MIME 签署 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2515
-#, fuzzy
+#: crypt-gpgme.c:2510
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
 msgstr ""
-"[-- ÏÂÃæÊÇ S/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"[-- 以下数据已由 S/MIME 加密 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2545
-#, fuzzy
+#: crypt-gpgme.c:2540
 msgid "[-- End of S/MIME signed data --]\n"
-msgstr ""
-"\n"
-"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
+msgstr "[-- S/MIME 签署的数据结束 --]\n"
 
-#: crypt-gpgme.c:2546
-#, fuzzy
+#: crypt-gpgme.c:2541
 msgid "[-- End of S/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- S/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+msgstr "[-- S/MIME 加密的数据结束 --]\n"
 
-#: crypt-gpgme.c:3139
+#: crypt-gpgme.c:3134
 msgid "[Can't display this user ID (unknown encoding)]"
-msgstr ""
+msgstr "[无法显示用户 ID (未知编码)]"
 
-#: crypt-gpgme.c:3141
+#: crypt-gpgme.c:3136
 msgid "[Can't display this user ID (invalid encoding)]"
-msgstr ""
+msgstr "[无法显示用户 ID (无效编码)]"
 
-#: crypt-gpgme.c:3146
+#: crypt-gpgme.c:3141
 msgid "[Can't display this user ID (invalid DN)]"
-msgstr ""
+msgstr "[无法显示用户 ID (无效 DN)]"
 
-#: crypt-gpgme.c:3225
+#: crypt-gpgme.c:3220
 msgid " aka ......: "
-msgstr ""
+msgstr "亦即 ...: "
 
-#: crypt-gpgme.c:3225
+#: crypt-gpgme.c:3220
 msgid "Name ......: "
-msgstr ""
+msgstr "名称 ...: "
 
-#: crypt-gpgme.c:3228 crypt-gpgme.c:3367
-#, fuzzy
+#: crypt-gpgme.c:3223 crypt-gpgme.c:3362
 msgid "[Invalid]"
-msgstr "ÎÞЧµÄÔ·ݣº%s"
+msgstr "[无效]"
 
-#: crypt-gpgme.c:3248 crypt-gpgme.c:3391
-#, fuzzy, c-format
+#: crypt-gpgme.c:3243 crypt-gpgme.c:3386
+#, c-format
 msgid "Valid From : %s\n"
-msgstr "ÎÞЧµÄÔ·ݣº%s"
+msgstr "从此有效: %s\n"
 
-#: crypt-gpgme.c:3261 crypt-gpgme.c:3404
-#, fuzzy, c-format
+#: crypt-gpgme.c:3256 crypt-gpgme.c:3399
+#, c-format
 msgid "Valid To ..: %s\n"
-msgstr "ÎÞЧµÄÔ·ݣº%s"
+msgstr "有效至 .: %s\n"
 
-#: crypt-gpgme.c:3274 crypt-gpgme.c:3417
+#: crypt-gpgme.c:3269 crypt-gpgme.c:3412
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
-msgstr ""
+msgstr "密钥类型: %s, %lu 位 %s\n"
 
-#: crypt-gpgme.c:3276 crypt-gpgme.c:3419
+#: crypt-gpgme.c:3271 crypt-gpgme.c:3414
 #, c-format
 msgid "Key Usage .: "
-msgstr ""
+msgstr "密钥用法: "
 
-#: crypt-gpgme.c:3281 crypt-gpgme.c:3424
-#, fuzzy
+#: crypt-gpgme.c:3276 crypt-gpgme.c:3419
 msgid "encryption"
-msgstr "¼ÓÃÜ"
+msgstr "加密"
 
-#: crypt-gpgme.c:3282 crypt-gpgme.c:3287 crypt-gpgme.c:3292 crypt-gpgme.c:3425
-#: crypt-gpgme.c:3430 crypt-gpgme.c:3435
+#: crypt-gpgme.c:3277 crypt-gpgme.c:3282 crypt-gpgme.c:3287 crypt-gpgme.c:3420
+#: crypt-gpgme.c:3425 crypt-gpgme.c:3430
 msgid ", "
-msgstr ""
+msgstr ", "
 
-#: crypt-gpgme.c:3286 crypt-gpgme.c:3429
+#: crypt-gpgme.c:3281 crypt-gpgme.c:3424
 msgid "signing"
-msgstr ""
+msgstr "正在签署"
 
-#: crypt-gpgme.c:3291 crypt-gpgme.c:3434
+#: crypt-gpgme.c:3286 crypt-gpgme.c:3429
 msgid "certification"
-msgstr ""
+msgstr "证书"
 
-#: crypt-gpgme.c:3331
+#: crypt-gpgme.c:3326
 #, c-format
 msgid "Serial-No .: 0x%s\n"
-msgstr ""
+msgstr "序列号 .: 0x%s\n"
 
-#: crypt-gpgme.c:3339
+#: crypt-gpgme.c:3334
 #, c-format
 msgid "Issued By .: "
-msgstr ""
+msgstr "发放者 .: "
 
 #. display only the short keyID
-#: crypt-gpgme.c:3358
-#, fuzzy, c-format
+#: crypt-gpgme.c:3353
+#, c-format
 msgid "Subkey ....: 0x%s"
-msgstr "Ô¿³× ID£º0x%s"
+msgstr "子钥 ...: 0x%s"
 
-#: crypt-gpgme.c:3362
+#: crypt-gpgme.c:3357
 msgid "[Revoked]"
-msgstr ""
+msgstr "[已吊销]"
 
-#: crypt-gpgme.c:3372
-#, fuzzy
+#: crypt-gpgme.c:3367
 msgid "[Expired]"
-msgstr "À뿪  "
+msgstr "[已过期]"
 
-#: crypt-gpgme.c:3377
+#: crypt-gpgme.c:3372
 msgid "[Disabled]"
-msgstr ""
+msgstr "[已禁用]"
 
-#: crypt-gpgme.c:3461 pgpkey.c:559 pgpkey.c:739
+#: crypt-gpgme.c:3456 pgpkey.c:559 pgpkey.c:739
 msgid "Can't create temporary file"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
+msgstr "无法建立暂存档"
 
-#: crypt-gpgme.c:3464
-#, fuzzy
+#: crypt-gpgme.c:3459
 msgid "Collecting data..."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正在收集数据..."
 
-#: crypt-gpgme.c:3490
-#, fuzzy, c-format
+#: crypt-gpgme.c:3485
+#, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "ÕýÁ¬Ïßµ½ %s"
+msgstr "查找发放者密钥出错：%s\n"
 
-#: crypt-gpgme.c:3500
+#: crypt-gpgme.c:3495
 msgid "Error: certification chain to long - stopping here\n"
-msgstr ""
+msgstr "错误：证书链过长 - 就此打住\n"
 
-#: crypt-gpgme.c:3511 pgpkey.c:580
+#: crypt-gpgme.c:3506 pgpkey.c:580
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "Ô¿³× ID£º0x%s"
+msgstr "钥匙 ID：0x%s"
 
-#: crypt-gpgme.c:3594
-#, fuzzy, c-format
+#: crypt-gpgme.c:3589
+#, c-format
 msgid "gpgme_new failed: %s"
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "gpgme_new 失败：%s"
 
-#: crypt-gpgme.c:3633 crypt-gpgme.c:3696
+#: crypt-gpgme.c:3628 crypt-gpgme.c:3691
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
-msgstr ""
+msgstr "gpgme_op_keylist_start 失败：%s"
 
-#: crypt-gpgme.c:3683 crypt-gpgme.c:3724
+#: crypt-gpgme.c:3678 crypt-gpgme.c:3719
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
-msgstr ""
+msgstr "gpgme_op_keylist_next 失败：%s"
 
-#: crypt-gpgme.c:3795
-#, fuzzy
+#: crypt-gpgme.c:3790
 msgid "All matching keys are marked expired/revoked."
-msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+msgstr "所有符合的密钥都被标记为过期/吊销。"
 
-#: crypt-gpgme.c:3824 mutt_ssl.c:897 mutt_ssl_gnutls.c:803 pgpkey.c:515
-#: smime.c:432
+#: crypt-gpgme.c:3819 mutt_ssl.c:986 mutt_ssl_gnutls.c:873 pgpkey.c:515
+#: smime.c:420
 msgid "Exit  "
-msgstr "À뿪  "
+msgstr "退出  "
 
 #. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3826 pgpkey.c:517 smime.c:434
+#: crypt-gpgme.c:3821 pgpkey.c:517 smime.c:422
 msgid "Select  "
-msgstr "Ñ¡Ôñ    "
+msgstr "选择  "
 
 #. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3829 pgpkey.c:520
+#: crypt-gpgme.c:3824 pgpkey.c:520
 msgid "Check key  "
-msgstr "¼ì²éÔ¿³×   "
+msgstr "检查钥匙  "
 
-#: crypt-gpgme.c:3845
-#, fuzzy
+#: crypt-gpgme.c:3840
 msgid "PGP and S/MIME keys matching"
-msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+msgstr "PGP 和 S/MIME 密钥匹配"
 
-#: crypt-gpgme.c:3847
-#, fuzzy
+#: crypt-gpgme.c:3842
 msgid "PGP keys matching"
-msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+msgstr "PGP 密钥匹配"
 
-#: crypt-gpgme.c:3849
-#, fuzzy
+#: crypt-gpgme.c:3844
 msgid "S/MIME keys matching"
-msgstr "S/MIME Ô¿³×·ûºÏ <%s>¡£"
+msgstr "S/MIME 密钥匹配"
 
-#: crypt-gpgme.c:3851
-#, fuzzy
+#: crypt-gpgme.c:3846
 msgid "keys matching"
-msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+msgstr "密钥匹配"
 
-#: crypt-gpgme.c:3854
+#: crypt-gpgme.c:3849
 #, c-format
 msgid "%s <%s>."
-msgstr ""
+msgstr "%s <%s>."
 
-#: crypt-gpgme.c:3856
+#: crypt-gpgme.c:3851
 #, c-format
 msgid "%s \"%s\"."
-msgstr ""
+msgstr "%s \"%s\"."
 
-#: crypt-gpgme.c:3883 pgpkey.c:600
+#: crypt-gpgme.c:3878 pgpkey.c:600
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+msgstr "这个钥匙不能使用：过期/无效/已取消。"
 
-#: crypt-gpgme.c:3897 pgpkey.c:612
-#, fuzzy
+#: crypt-gpgme.c:3892 pgpkey.c:612
 msgid "ID is expired/disabled/revoked."
-msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+msgstr "ID 已经过期/无效/已取消。"
 
-#: crypt-gpgme.c:3917 pgpkey.c:616
+#: crypt-gpgme.c:3912 pgpkey.c:616
 msgid "ID has undefined validity."
-msgstr ""
+msgstr "ID 正确性未定义。"
 
-#: crypt-gpgme.c:3920 pgpkey.c:619
-#, fuzzy
+#: crypt-gpgme.c:3915 pgpkey.c:619
 msgid "ID is not valid."
-msgstr "Õâ¸ö ID ²»±»ÐÅÈΡ£"
+msgstr "ID 无效。"
 
-#: crypt-gpgme.c:3923 pgpkey.c:622
-#, fuzzy
+#: crypt-gpgme.c:3918 pgpkey.c:622
 msgid "ID is only marginally valid."
-msgstr "´Ë ID Ö»ÊÇÃãÇ¿±»ÐÅÈΡ£"
+msgstr "ID 仅勉强有效。"
 
-#: crypt-gpgme.c:3931 pgpkey.c:626
-#, fuzzy, c-format
+#: crypt-gpgme.c:3926 pgpkey.c:626
+#, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s ÄúÕæµÄҪʹÓÃËü£¿"
+msgstr "%s 您真的要使用此密钥吗？"
 
-#: crypt-gpgme.c:3988 crypt-gpgme.c:4101 pgpkey.c:834 pgpkey.c:935
+#: crypt-gpgme.c:3983 crypt-gpgme.c:4096 pgpkey.c:834 pgpkey.c:939
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
-msgstr "ÕýÑ°ÕÒÆ¥Åä \"%s\" µÄÔ¿³×¡­"
+msgstr "正寻找匹配 \"%s\" 的密钥..."
 
-#: crypt-gpgme.c:4264 pgp.c:1180
+#: crypt-gpgme.c:4259 pgp.c:1196
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
-msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
+msgstr "要使用 keyID = \"%s\" 用于 %s 吗？"
 
-#: crypt-gpgme.c:4300 pgp.c:1214 smime.c:664 smime.c:789
+#: crypt-gpgme.c:4295 pgp.c:1230 smime.c:650 smime.c:775
 #, c-format
 msgid "Enter keyID for %s: "
-msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
+msgstr "请输入 %s 的 keyID："
 
-#: crypt-gpgme.c:4365
+#: crypt-gpgme.c:4360
 msgid ""
 "\n"
 "Using GPGME backend, although no gpg-agent is running"
 msgstr ""
+"\n"
+"使用 GPGME 后端，虽然 gpg-agent 没有在运行"
 
-#: crypt-gpgme.c:4393
-#, fuzzy
+#: crypt-gpgme.c:4388
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
-msgstr "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, (i)nline, »ò (f)·ÅÆú£¿"
+msgstr ""
+"S/MIME 加密(e)，签署(s)，选择身份签署(a)，两者皆要(b)，(p)gp或清除(c)？"
 
-#: crypt-gpgme.c:4394
-#, fuzzy
+#: crypt-gpgme.c:4389
 msgid "esabpfc"
-msgstr "esabif"
+msgstr "esabpfc"
 
-#: crypt-gpgme.c:4397
-#, fuzzy
+#: crypt-gpgme.c:4392
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
-msgstr "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, (i)nline, »ò (f)·ÅÆú£¿"
+msgstr ""
+"PGP 加密(e)，签署(s)，选择身份签署(a)，两者皆要(b)，s/(m)ime或清除(c)？"
 
-#: crypt-gpgme.c:4398
-#, fuzzy
+#: crypt-gpgme.c:4393
 msgid "esabmfc"
-msgstr "esabif"
+msgstr "esabmfc"
 
 #. sign (a)s
 #. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s
-#: crypt-gpgme.c:4414 pgp.c:1590 smime.c:2033 smime.c:2045
+#: crypt-gpgme.c:4409 pgp.c:1629 smime.c:2026 smime.c:2038
 msgid "Sign as: "
-msgstr "Ç©ÃûµÄÉí·ÝÊÇ£º"
+msgstr "选择身份签署："
 
-#: crypt-gpgme.c:4511
+#: crypt-gpgme.c:4535
 msgid "Failed to verify sender"
-msgstr ""
+msgstr "验证发送者失败"
 
-#: crypt-gpgme.c:4514
-#, fuzzy
+#: crypt-gpgme.c:4538
 msgid "Failed to figure out sender"
-msgstr "´ò¿ªÎļþÀ´·ÖÎöÎļþͷʧ°Ü¡£"
+msgstr "找出发送者失败"
 
 #: crypt.c:68
 #, c-format
 msgid " (current time: %c)"
-msgstr ""
+msgstr " (当前时间：%c)"
 
 #: crypt.c:74
-#, fuzzy, c-format
+#, c-format
 msgid "[-- %s output follows%s --]\n"
-msgstr "[-- ÒÔÏÂΪ PGP Êä³öµÄ×ÊÁÏ£¨ÏÖÔÚʱ¼ä£º "
+msgstr "[-- %s 输出如下%s --]\n"
 
 #: crypt.c:89
-#, fuzzy
 msgid "Passphrase(s) forgotten."
-msgstr "ÒÑÍü¼Ç PGP ͨÐÐÃÜÂë¡£"
+msgstr "已忘记通行密码。"
 
 #. they really want to send it inline... go for it
 #: crypt.c:146 cryptglue.c:110 pgpkey.c:563 pgpkey.c:752
 msgid "Invoking PGP..."
-msgstr "Æô¶¯ PGP¡­"
+msgstr "正在调用 PGP..."
 
 #. otherwise inline won't work...ask for revert
 #: crypt.c:155
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
-msgstr ""
+msgstr "无法将信件嵌入发送。返回使用 PGP/MIME 吗？"
 
 #. abort
-#: crypt.c:157 send.c:1512
+#: crypt.c:157 send.c:1537
 msgid "Mail not sent."
-msgstr "ÐżþûÓмijö¡£"
+msgstr "信件没有寄出。"
 
 #: crypt.c:408
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr ""
+msgstr "不支持没有内容提示的 S/MIME 消息。"
 
 #: crypt.c:627 crypt.c:671
 msgid "Trying to extract PGP keys...\n"
-msgstr ""
+msgstr "正在尝试提取 PGP 密钥...\n"
 
 #: crypt.c:651 crypt.c:691
 msgid "Trying to extract S/MIME certificates...\n"
-msgstr ""
+msgstr "正在尝试提取 S/MIME 证书...\n"
 
 #: crypt.c:813
-#, fuzzy
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgstr ""
-"[-- ´íÎ󣺲»Ò»Ö嵀 multipart/signed ½á¹¹£¡ --]\n"
+"[-- 错误：不一致的 multipart/signed 结构！ --]\n"
 "\n"
 
 #: crypt.c:834
@@ -1406,7 +1386,7 @@ msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- ´íÎ󣺲»Ã÷µÄ multipart/signed Э¶¨ %s£¡ --]\n"
+"[-- 错误：未知的 multipart/signed 协议 %s！ --]\n"
 "\n"
 
 #: crypt.c:873
@@ -1415,17 +1395,16 @@ msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 "\n"
 msgstr ""
-"[-- ¾¯¸æ£ºÎÒÃDz»ÄÜ֤ʵ %s/%s Ç©Ãû¡£ --]\n"
+"[-- 警告：我们不能证实 %s/%s 签名。 --]\n"
 "\n"
 
 #. Now display the signed body
 #: crypt.c:885
-#, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
 msgstr ""
-"[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
+"[-- 以下数据已签署 --]\n"
 "\n"
 
 #: crypt.c:891
@@ -1433,329 +1412,323 @@ msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgstr ""
-"[-- ¾¯¸æ£ºÕÒ²»µ½ÈκεÄÇ©Ãû¡£ --]\n"
+"[-- 警告：找不到任何的签名。 --]\n"
 "\n"
 
 #: crypt.c:897
-#, fuzzy
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
 msgstr ""
 "\n"
-"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
+"[-- 签署的数据结束 --]\n"
 
 #: cryptglue.c:89
 msgid "\"crypt_use_gpgme\" set but not built with GPGME support."
-msgstr ""
+msgstr "设置了\"crypt_use_gpgme\"但没有编译 GPGME 支持。"
 
 #: cryptglue.c:112
-#, fuzzy
 msgid "Invoking S/MIME..."
-msgstr "Æô¶¯ S/MIME¡­"
+msgstr "正在调用 S/MIME..."
 
 # Don't translate this!!
-#: curs_lib.c:191
+#: curs_lib.c:194
 msgid "yes"
-msgstr ""
+msgstr "yes"
 
 # Don't translate this!!
-#: curs_lib.c:192
+#: curs_lib.c:195
 msgid "no"
-msgstr ""
+msgstr "no"
 
 #. restore blocking operation
-#: curs_lib.c:288
+#: curs_lib.c:297
 msgid "Exit Mutt?"
-msgstr "À뿪 Mutt£¿"
+msgstr "退出 Mutt？"
 
-#: curs_lib.c:495 mutt_socket.c:577 mutt_ssl.c:337
+#: curs_lib.c:500 mutt_socket.c:577 mutt_ssl.c:358
 msgid "unknown error"
-msgstr "²»Ã÷µÄ´íÎó"
+msgstr "未知错误"
 
-#: curs_lib.c:515
+#: curs_lib.c:520
 msgid "Press any key to continue..."
-msgstr "°´ÏÂÈκÎÒ»¸ö¼ü¼ÌÐø¡­"
+msgstr "按下任何一个键继续..."
 
-#: curs_lib.c:559
+#: curs_lib.c:564
 msgid " ('?' for list): "
-msgstr " (Óà '?' ÏÔʾÁбí)£º"
+msgstr " (按'?'显示列表)："
 
-#: curs_main.c:52 curs_main.c:617 curs_main.c:647
+#: curs_main.c:52 curs_main.c:613 curs_main.c:643
 msgid "No mailbox is open."
-msgstr "ûÓÐÒÑ´ò¿ªÐÅÏä¡£"
+msgstr "没有已打开信箱。"
 
 #: curs_main.c:53
 msgid "There are no messages."
-msgstr "ûÓÐÐżþ¡£"
+msgstr "没有信件。"
 
-#: curs_main.c:54 mx.c:1115 pager.c:51 recvattach.c:43
+#: curs_main.c:54 mx.c:1095 pager.c:51 recvattach.c:43
 msgid "Mailbox is read-only."
-msgstr "ÐÅÏäÊÇÖ»¶ÁµÄ¡£"
+msgstr "信箱是只读的。"
 
-#: curs_main.c:55 pager.c:52 recvattach.c:912
+#: curs_main.c:55 pager.c:52 recvattach.c:924
 msgid "Function not permitted in attach-message mode."
-msgstr "¹¦ÄÜÔÚ attach-message ģʽϲ»±»Ö§³Ö¡£"
+msgstr "功能在附加信件(attach-message)模式下不被支持。"
 
 #: curs_main.c:56
-#, fuzzy
 msgid "No visible messages."
-msgstr "ûÓÐÐÂÐżþ"
+msgstr "无可见信件"
 
 #: curs_main.c:96 pager.c:82
 #, c-format
 msgid "Cannot %s: Operation not permitted by ACL"
-msgstr ""
+msgstr "无法 %s: 操作不被访问控制列表(ACL)所允许"
 
 #: curs_main.c:251
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "ÎÞ·¨Ð´Èëµ½Ò»¸öÖ»¶ÁµÄÐÅÏ䣡"
+msgstr "无法在只读信箱切换可写！"
 
 #: curs_main.c:258
 msgid "Changes to folder will be written on folder exit."
-msgstr "ÔÚÀ뿪֮ºó½«»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
+msgstr "在退出文件夹后将会把改变写入文件夹。"
 
 #: curs_main.c:263
 msgid "Changes to folder will not be written."
-msgstr "½«²»»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
+msgstr "将不会把改变写入文件夹。"
 
 #: curs_main.c:405
 msgid "Quit"
-msgstr "À뿪"
+msgstr "离开"
 
 #: curs_main.c:408 recvattach.c:54
 msgid "Save"
-msgstr "´¢´æ"
+msgstr "储存"
 
 #: curs_main.c:409 query.c:49
 msgid "Mail"
-msgstr "Ðżþ"
+msgstr "信件"
 
-#: curs_main.c:410 pager.c:1487
+#: curs_main.c:410 pager.c:1538
 msgid "Reply"
-msgstr "»Ø¸²"
+msgstr "回覆"
 
 #: curs_main.c:411
 msgid "Group"
-msgstr "Ⱥ×é"
+msgstr "群组"
 
-#: curs_main.c:499
+#: curs_main.c:495
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
+msgstr "信箱已有外部修改。标记可能有错误。"
 
-#: curs_main.c:502
+#: curs_main.c:498
 msgid "New mail in this mailbox."
-msgstr "Õâ¸öÐÅÏäÖÐÓÐÐÂÐżþ¡£"
+msgstr "此信箱中有新邮件。"
 
-#: curs_main.c:506
-#, fuzzy
+#: curs_main.c:502
 msgid "Mailbox was externally modified."
-msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
+msgstr "信箱已有外部修改。"
 
-#: curs_main.c:623
+#: curs_main.c:619
 msgid "No tagged messages."
-msgstr "ûÓбê¼ÇÁ˵ÄÐżþ¡£"
+msgstr "没有已标记的信件。"
 
-#: curs_main.c:659 menu.c:921
-#, fuzzy
+#: curs_main.c:655 menu.c:914
 msgid "Nothing to do."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "无事可做。"
 
-#: curs_main.c:749
+#: curs_main.c:741
 msgid "Jump to message: "
-msgstr "Ìøµ½Ðżþ£º"
+msgstr "跳到信件："
 
-#: curs_main.c:755
+#: curs_main.c:747
 msgid "Argument must be a message number."
-msgstr "ÐèÒªÒ»¸öÐżþ±àºÅµÄ²ÎÊý¡£"
+msgstr "参数必须是信件编号。"
 
-#: curs_main.c:788
+#: curs_main.c:779
 msgid "That message is not visible."
-msgstr "Õâ·âÐżþÎÞ·¨ÏÔʾ¡£"
+msgstr "这封信件无法显示。"
 
-#: curs_main.c:791
+#: curs_main.c:782
 msgid "Invalid message number."
-msgstr "ÎÞЧµÄÐżþ±àºÅ¡£"
+msgstr "无效的信件编号。"
 
-#: curs_main.c:804 curs_main.c:1845 pager.c:2288
-#, fuzzy
+#: curs_main.c:795 curs_main.c:1872 pager.c:2373
 msgid "delete message(s)"
-msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
+msgstr "删除信件"
 
-#: curs_main.c:807
+#: curs_main.c:798
 msgid "Delete messages matching: "
-msgstr "ɾ³ý·ûºÏÕâÑùʽµÄÐżþ£º"
+msgstr "删除符合此样式的信件："
 
-#: curs_main.c:829
+#: curs_main.c:820
 msgid "No limit pattern is in effect."
-msgstr "ûÓÐÏÞÖÆÑùʽÊÇÓÐЧµÄ¡£"
+msgstr "当前没有限制样式起作用。"
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:834
+#: curs_main.c:825
 #, c-format
 msgid "Limit: %s"
-msgstr "ÏÞÖÆ: %s"
+msgstr "限制: %s"
 
-#: curs_main.c:844
+#: curs_main.c:835
 msgid "Limit to messages matching: "
-msgstr "ÏÞÖÆÖ»·ûºÏÕâÑùʽµÄÐżþ£º"
+msgstr "限制符合此样式的信件："
 
-#: curs_main.c:866
+#: curs_main.c:857
 msgid "To view all messages, limit to \"all\"."
-msgstr ""
+msgstr "要查看所有信件，请将限制设为\"all\"。"
 
-#: curs_main.c:878
+#: curs_main.c:869
 msgid "Quit Mutt?"
-msgstr "À뿪 Mutt£¿"
+msgstr "离开 Mutt？"
 
-#: curs_main.c:963
+#: curs_main.c:959
 msgid "Tag messages matching: "
-msgstr "±ê¼ÇÐżþµÄÌõ¼þ£º"
+msgstr "标记符合此样式的信件："
 
-#: curs_main.c:972 curs_main.c:2134 pager.c:2598
-#, fuzzy
+#: curs_main.c:968 curs_main.c:2166 pager.c:2683
 msgid "undelete message(s)"
-msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
+msgstr "反删除信件"
 
-#: curs_main.c:974
+#: curs_main.c:970
 msgid "Undelete messages matching: "
-msgstr "·´É¾³ýÐżþµÄÌõ¼þ£º"
+msgstr "反删除符合此样式的信件："
 
-#: curs_main.c:982
+#: curs_main.c:978
 msgid "Untag messages matching: "
-msgstr "·´±ê¼ÇÐżþµÄÌõ¼þ£º"
+msgstr "反标记符合此样式的信件："
 
-#: curs_main.c:1062
+#: curs_main.c:1004
+#, fuzzy
+msgid "Logged out of IMAP servers."
+msgstr "正在关闭与 IMAP 伺服器的连线..."
+
+#: curs_main.c:1083
 msgid "Open mailbox in read-only mode"
-msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÐÅÏä"
+msgstr "用只读模式打开信箱"
 
-#: curs_main.c:1064
+#: curs_main.c:1085
 msgid "Open mailbox"
-msgstr "´ò¿ªÐÅÏä"
+msgstr "打开信箱"
 
-#: curs_main.c:1074
-#, fuzzy
+#: curs_main.c:1095
 msgid "No mailboxes have new mail"
-msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
+msgstr "没有信箱有新信件"
 
-#: curs_main.c:1102 mx.c:503 mx.c:652
+#: curs_main.c:1123 mx.c:472 mx.c:621
 #, c-format
 msgid "%s is not a mailbox."
-msgstr "%s ²»ÊÇÐÅÏä¡£"
+msgstr "%s 不是信箱。"
 
-#: curs_main.c:1197
+#: curs_main.c:1222
 msgid "Exit Mutt without saving?"
-msgstr "²»´¢´æ±ãÀ뿪 Mutt Âð£¿"
+msgstr "不保存便退出 Mutt 吗？"
 
-#: curs_main.c:1215 curs_main.c:1248 curs_main.c:1692 curs_main.c:1724
-#: flags.c:282 thread.c:1026 thread.c:1081 thread.c:1136
+#: curs_main.c:1240 curs_main.c:1275 curs_main.c:1719 curs_main.c:1751
+#: flags.c:282 thread.c:1029 thread.c:1084 thread.c:1139
 msgid "Threading is not enabled."
-msgstr "ÐòÁй¦ÄÜÉÐδÆô¶¯¡£"
+msgstr "线索功能尚未启动。"
 
-#: curs_main.c:1227
+#: curs_main.c:1252
 msgid "Thread broken"
+msgstr "线索有误"
+
+#: curs_main.c:1263
+msgid "Thread cannot be broken, message is not part of a thread"
 msgstr ""
 
-#: curs_main.c:1245
+#: curs_main.c:1272
 msgid "link threads"
-msgstr ""
+msgstr "链接线索"
 
-#: curs_main.c:1250
+#: curs_main.c:1277
 msgid "No Message-ID: header available to link thread"
-msgstr ""
+msgstr "无 Message-ID: 标头可用于链接线索"
 
-#: curs_main.c:1252
-#, fuzzy
+#: curs_main.c:1279
 msgid "First, please tag a message to be linked here"
-msgstr "´¢´æÐżþÒÔ±ãÉÔºó¼Ä³ö"
+msgstr "首先，请标记一个信件以链接于此"
 
-#: curs_main.c:1264
+#: curs_main.c:1291
 msgid "Threads linked"
-msgstr ""
+msgstr "线索已链接"
 
-#: curs_main.c:1267
+#: curs_main.c:1294
 msgid "No thread linked"
-msgstr ""
+msgstr "无线索来链接"
 
-#: curs_main.c:1303 curs_main.c:1328
+#: curs_main.c:1330 curs_main.c:1355
 msgid "You are on the last message."
-msgstr "ÄúÒѾ­ÔÚ×îºóÒ»·âÐÅÁË¡£"
+msgstr "您已经在最后一封信了。"
 
-#: curs_main.c:1310 curs_main.c:1354
+#: curs_main.c:1337 curs_main.c:1381
 msgid "No undeleted messages."
-msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
+msgstr "没有要反删除的信件。"
 
-#: curs_main.c:1347 curs_main.c:1371
+#: curs_main.c:1374 curs_main.c:1398
 msgid "You are on the first message."
-msgstr "ÄúÒѾ­ÔÚµÚÒ»·âÐÅÁË¡£"
+msgstr "您已经在第一封信了。"
 
-#: curs_main.c:1446 menu.c:766 pager.c:1986 pattern.c:1466
+#: curs_main.c:1473 menu.c:759 pager.c:2042 pattern.c:1477
 msgid "Search wrapped to top."
-msgstr "ËÑÑ°ÖÁ¿ªÍ·¡£"
+msgstr "搜寻从开头重新开始。"
 
-#: curs_main.c:1455 pager.c:2008 pattern.c:1477
+#: curs_main.c:1482 pager.c:2064 pattern.c:1488
 msgid "Search wrapped to bottom."
-msgstr "ËÑÑ°ÖÁ½áβ¡£"
+msgstr "搜寻从结尾重新开始。"
 
-#: curs_main.c:1496
+#: curs_main.c:1523
 msgid "No new messages"
-msgstr "ûÓÐÐÂÐżþ"
+msgstr "没有新信件"
 
-#: curs_main.c:1496
+#: curs_main.c:1523
 msgid "No unread messages"
-msgstr "ûÓÐÉÐδ¶ÁÈ¡µÄÐżþ"
+msgstr "没有尚未读取的信件"
 
-#: curs_main.c:1497
+#: curs_main.c:1524
 msgid " in this limited view"
-msgstr " ÔÚÕâÏÞ¶¨µÄä¯ÀÀÖÐ"
+msgstr " 在此限制浏览中"
 
-#: curs_main.c:1513
-#, fuzzy
+#: curs_main.c:1540
 msgid "flag message"
-msgstr "ÏÔʾһ·âÐżþ"
+msgstr "标记信件"
 
-#: curs_main.c:1550 pager.c:2564
+#: curs_main.c:1577 pager.c:2649
 msgid "toggle new"
-msgstr ""
+msgstr "切换新信件标记"
 
-#: curs_main.c:1627
+#: curs_main.c:1654
 msgid "No more threads."
-msgstr "ûÓиü¶àµÄÐòÁÐ"
+msgstr "没有更多的线索。"
 
-#: curs_main.c:1629
+#: curs_main.c:1656
 msgid "You are on the first thread."
-msgstr "ÄúÒѾ­ÔÚµÚÒ»¸öÐòÁÐÉÏ¡£"
+msgstr "您在第一个线索上。"
 
-#: curs_main.c:1710
+#: curs_main.c:1737
 msgid "Thread contains unread messages."
-msgstr "ÐòÁÐÖÐÓÐÉÐδ¶ÁÈ¡µÄÐżþ¡£"
+msgstr "线索中有尚未读取的信件。"
 
-#: curs_main.c:1804 pager.c:2271
-#, fuzzy
+#: curs_main.c:1831 pager.c:2342
 msgid "delete message"
-msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
+msgstr "删除信件"
 
-#: curs_main.c:1886
-#, fuzzy
+#: curs_main.c:1913
 msgid "edit message"
-msgstr "±à¼­ÐżþÄÚÈÝ"
+msgstr "编辑信件"
 
-#: curs_main.c:2017
-#, fuzzy
+#: curs_main.c:2044
 msgid "mark message(s) as read"
-msgstr "Ìøµ½Õâ¸öÐòÁеÄÖ÷Ðżþ"
+msgstr "标记信件为已读"
 
-#: curs_main.c:2107 pager.c:2583
-#, fuzzy
+#: curs_main.c:2139 pager.c:2668
 msgid "undelete message"
-msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
+msgstr "反删除信件"
 
 #.
 #. * SLcurses_waddnstr() can't take a "const char *", so this is only
 #. * declared "static" (sigh)
 #.
 #: edit.c:41
-#, fuzzy
 msgid ""
 "~~\t\tinsert a line begining with a single ~\n"
 "~b users\tadd users to the Bcc: field\n"
@@ -1767,27 +1740,17 @@ msgid ""
 "~M messages\tsame as ~m, except include headers\n"
 "~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"
-"~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Í£Ö¹Ð޸IJ¢À뿪±à¼­Æ÷\n"
-"~?\t\tÕâѶϢ\n"
-".\t\tÈç¹ûÊÇÒ»ÐÐÀïµÄΨһ×Ö·û£¬Ôò´ú±í½áÊøÊäÈë\n"
+"~~\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:52
-#, fuzzy
 msgid ""
 "~q\t\twrite file and quit editor\n"
 "~r file\t\tread a file into the editor\n"
@@ -1799,238 +1762,227 @@ msgid ""
 "~?\t\tthis message\n"
 ".\t\ton a line by itself ends input\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"
-"~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Í£Ö¹Ð޸IJ¢À뿪±à¼­Æ÷\n"
-"~?\t\tÕâѶϢ\n"
-".\t\tÈç¹ûÊÇÒ»ÐÐÀïµÄΨһ×Ö·û£¬Ôò´ú±í½áÊøÊäÈë\n"
-
-#: edit.c:188
+"~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本消息\n"
+".\t\t如果是一行里的唯一字符，则代表结束输入\n"
+
+#: edit.c:187
 #, c-format
 msgid "%d: invalid message number.\n"
-msgstr "%d£ºÎÞЧµÄÐżþºÅÂë¡£\n"
+msgstr "%d：无效的信件编号。\n"
 
-#: edit.c:330
+#: edit.c:329
 msgid "(End message with a . on a line by itself)\n"
-msgstr "£¨ÔÚÒ»ÐÐÀïÊäÈëÒ»¸ö . ·ûºÅÀ´½áÊøÐżþ£©\n"
+msgstr "(在一行里输入一个 . 符号来结束信件)\n"
 
-#: edit.c:389
+#: edit.c:388
 msgid "No mailbox.\n"
-msgstr "ûÓÐÐÅÏä¡£\n"
+msgstr "没有信箱。\n"
 
-#: edit.c:393
+#: edit.c:392
 msgid "Message contains:\n"
-msgstr "Ðżþ°üº¬£º\n"
+msgstr "信件包含：\n"
 
-#: edit.c:397 edit.c:454
+#: edit.c:396 edit.c:453
 msgid "(continue)\n"
-msgstr "£¨¼ÌÐø£©\n"
+msgstr "(继续)\n"
 
-#: edit.c:410
+#: edit.c:409
 msgid "missing filename.\n"
-msgstr "ÒÅʧÁ˵µÃû¡£\n"
+msgstr "缺少文件名。\n"
 
-#: edit.c:430
+#: edit.c:429
 msgid "No lines in message.\n"
-msgstr "ÎÄÕÂÖÐûÓÐÎÄ×Ö¡£\n"
+msgstr "信件中一行也没有。\n"
 
-#: edit.c:447
+#: edit.c:446
 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
-msgstr ""
+msgstr "%s 中有错误的 IDN: '%s'\n"
 
-#: edit.c:465
+#: edit.c:464
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
-msgstr "%s£º²»Ã÷µÄ±à¼­Æ÷Ö¸Á~? ÇóÖú£©\n"
+msgstr "%s：不明的编辑器命令(~? 求助)\n"
 
 #: editmsg.c:78
-#, fuzzy, c-format
+#, c-format
 msgid "could not create temporary folder: %s"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
+msgstr "无法建立临时文件夹：%s"
 
 #: editmsg.c:90
-#, fuzzy, c-format
+#, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
+msgstr "无法建立临时邮件夹：%s"
 
 #: editmsg.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
+msgstr "无法截断临时邮件夹：%s"
 
 #: editmsg.c:127
-#, fuzzy
 msgid "Message file is empty!"
-msgstr "ÐÅÏäÄÚ¿ÕÎÞÒ»Îï¡£"
+msgstr "信件文件是空的！"
 
 #: editmsg.c:134
-#, fuzzy
 msgid "Message not modified!"
-msgstr "ÐżþÒÑÓ¡³ö"
+msgstr "信件未改动！"
 
 #: editmsg.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "Can't open message file: %s"
-msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
+msgstr "无法打开信件文件：%s"
 
 #: editmsg.c:149 editmsg.c:177
-#, fuzzy, c-format
+#, c-format
 msgid "Can't append to folder: %s"
-msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
+msgstr "无法添加到文件夹末尾：%s"
 
 #: editmsg.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
+msgstr "错误。保留临时文件：%s"
 
 #: flags.c:325
 msgid "Set flag"
-msgstr "É趨Æì±ê"
+msgstr "设定标记"
 
 #: flags.c:325
 msgid "Clear flag"
-msgstr "Çå³ýÆì±ê"
+msgstr "清除标记"
 
-#: handler.c:1070
+#: handler.c:1058
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
-msgstr "[-- ´íÎó£º ÎÞ·¨ÏÔʾ Multipart/Alternative£¡ --]\n"
+msgstr "[-- 错误： 无法显示 Multipart/Alternative 的任何部分！ --]\n"
 
-#: handler.c:1187
+#: handler.c:1176
 #, c-format
 msgid "[-- Attachment #%d"
-msgstr "[-- ¸½¼þ #%d"
+msgstr "[-- 附件 #%d"
 
-#: handler.c:1199
+#: handler.c:1188
 #, 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:1223
+#: handler.c:1204
 msgid "One or more parts of this message could not be displayed"
-msgstr ""
+msgstr "本信件的一个或多个部分无法显示"
 
-#: handler.c:1275
+#: handler.c:1256
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- ʹÓà %s ×Ô¶¯ÏÔʾ --]\n"
+msgstr "[-- 使用 %s 自动显示 --]\n"
 
-#: handler.c:1276
+#: handler.c:1257
 #, c-format
 msgid "Invoking autoview command: %s"
-msgstr "Ö´ÐÐ×Ô¶¯ÏÔʾָÁ%s"
+msgstr "执行自动显示指令：%s"
 
-#: handler.c:1308
-#, fuzzy, c-format
+#: handler.c:1289
+#, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- ÔÚ %s --]\n"
+msgstr "[-- 无法运行 %s --]\n"
 
-#: handler.c:1327 handler.c:1348
+#: handler.c:1308 handler.c:1329
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- ×Ô¶¯ÏÔʾµÄ %s µÄ stderr ÄÚÈÝ --]\n"
+msgstr "[-- 自动显示的 %s 输出到标准错误(stderr)的内容 --]\n"
 
-#: handler.c:1387
+#: handler.c:1368
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
-msgstr "[-- ´íÎó: message/external-body ûÓдæÈ¡ÀàÐ͵IJÎÊý --]\n"
+msgstr "[-- 错误: message/external-body 没有访问类型参数 --]\n"
 
-#: handler.c:1408
+#: handler.c:1389
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- %s/%s ¸½¼þ "
+msgstr "[-- 此 %s/%s 附件 "
 
-#: handler.c:1415
+#: handler.c:1396
 #, c-format
 msgid "(size %s bytes) "
-msgstr "(%s λԪ×é) "
+msgstr "(大小 %s 字节) "
 
-#: handler.c:1417
+#: handler.c:1398
 msgid "has been deleted --]\n"
-msgstr "ÒѾ­±»É¾³ýÁË --]\n"
+msgstr "已经被删除 --]\n"
 
-#: handler.c:1422
+#: handler.c:1403
 #, c-format
 msgid "[-- on %s --]\n"
-msgstr "[-- ÔÚ %s --]\n"
+msgstr "[-- 在 %s --]\n"
 
-#: handler.c:1427
-#, fuzzy, c-format
+#: handler.c:1408
+#, c-format
 msgid "[-- name: %s --]\n"
-msgstr "[-- ÔÚ %s --]\n"
+msgstr "[-- 名称：%s --]\n"
 
-#: handler.c:1440 handler.c:1456
-#, fuzzy, c-format
+#: handler.c:1421 handler.c:1437
+#, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- %s/%s ¸½¼þ "
+msgstr "[-- 此 %s/%s 附件未被包含， --]\n"
 
-#: handler.c:1442
-#, fuzzy
+#: handler.c:1423
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr ""
-"[-- %s/%s ¸½¼þÎÞ·¨±»¸½ÉÏ, --]\n"
-"[-- ²¢ÇÒ±»Ö¸Ê¾µÄÍⲿԭʼµµÒÑ --]\n"
-"[-- ¹ýÆÚ¡£ --]\n"
+"[-- 并且其标明的外部源已 --]\n"
+"[-- 过期。 --]\n"
 
-#: handler.c:1460
-#, fuzzy, c-format
+#: handler.c:1441
+#, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
-msgstr ""
-"[-- %s/%s ¸½¼þÎÞ·¨±»¸½ÉÏ, --]\n"
-"[-- ²¢ÇÒ±»Ö¸Ê¾µÄ´æÈ¡ÀàÐÍ %s ²»±»Ö§³Ö --]\n"
+msgstr "[-- 并且其标明的访问类型 %s 不被支持 --]\n"
 
-#: handler.c:1575
+#: handler.c:1583
 msgid "Error: multipart/signed has no protocol."
-msgstr "´íÎó£ºmultipart/signed ûÓÐͨѶЭ¶¨¡£"
+msgstr "错误：multipart/signed 没有协议。"
 
-#: handler.c:1585
+#: handler.c:1593
 msgid "Error: multipart/encrypted has no protocol parameter!"
-msgstr "´íÎó£ºmultipart/encrypted ûÓÐÈκÎͨѶЭ¶¨²ÎÊý£¡"
+msgstr "错误：multipart/encrypted 没有协议参数！"
 
-#: handler.c:1639
+#: handler.c:1650
 msgid "Unable to open temporary file!"
-msgstr "ÎÞ·¨´ò¿ªÔÝ´æµµ£¡"
+msgstr "无法打开临时文件！"
 
-#: handler.c:1706
+#: handler.c:1723
+msgid "[-- This is an attachment "
+msgstr "[-- 这是一个附件 "
+
+#: handler.c:1725
 #, c-format
 msgid "[-- %s/%s is unsupported "
-msgstr "[-- %s/%s ÉÐδ֧³Ö "
+msgstr "[-- %s/%s 尚未支持 "
 
-#: handler.c:1711
+#: handler.c:1730
 #, c-format
 msgid "(use '%s' to view this part)"
-msgstr "£¨Ê¹Óà '%s' À´ÏÔʾÕⲿ·Ý£©"
+msgstr "(使用 '%s' 来显示这部份)"
 
-#: handler.c:1713
+#: handler.c:1732
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "£¨ÐèÒª¶¨ÒåÒ»¸ö¼ü¸ø 'view-attachments' lä¯ÀÀ¸½¼þ)£¡)"
+msgstr "(需要将 'view-attachments' 绑定到键！)"
 
-#: headers.c:173
+#: headers.c:189
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
+msgstr "%s：无法附加文件"
 
 #: help.c:306
 msgid "ERROR: please report this bug"
-msgstr "´íÎó£ºÇë»Ø±¨Õâ¸öÎÊÌâ"
+msgstr "错误：请报告这个问题"
 
 #: help.c:348
 msgid "<UNKNOWN>"
-msgstr "<²»Ã÷µÄ>"
+msgstr "<未知>"
 
 #: help.c:360
 msgid ""
@@ -2039,7 +1991,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"±ê×¼¹¦Äܶ¨Ò壺\n"
+"通用绑定：\n"
 "\n"
 
 #: help.c:364
@@ -2049,563 +2001,549 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"δ±»¶¨ÒåµÄ¹¦ÄÜ£º\n"
+"未绑定的功能：\n"
 "\n"
 
 #: help.c:372
 #, c-format
 msgid "Help for %s"
-msgstr "%s µÄÇóÖú"
+msgstr "%s 的帮助"
 
 #: history.c:77 history.c:114 history.c:140
 #, c-format
 msgid "Bad history file format (line %d)"
-msgstr ""
+msgstr "错误的历史文件格式 (第 %d 行)"
 
-#: hook.c:251
+#: hook.c:250
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
-msgstr ""
+msgstr "unhook: 无法在一个钩子里进行 unhook * 操作"
 
-#: hook.c:263
-#, fuzzy, c-format
+#: hook.c:262
+#, c-format
 msgid "unhook: unknown hook type: %s"
-msgstr "%s£º²»Ã÷µÄÖÖÀà"
+msgstr "unhook：未知钩子类型：%s"
 
-#: hook.c:269
+#: hook.c:268
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
-msgstr ""
+msgstr "unhook: 无法从 %2$s 中删除 %1$s"
 
-#: imap/auth.c:108 pop_auth.c:398 smtp.c:483
-#, fuzzy
+#: imap/auth.c:108 pop_auth.c:398 smtp.c:515
 msgid "No authenticators available"
-msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+msgstr "无可用认证"
 
 #: imap/auth_anon.c:43
 msgid "Authenticating (anonymous)..."
-msgstr "ÑéÖ¤ÖÐ (ÄäÃû)¡­"
+msgstr "认证中 (匿名)..."
 
 #: imap/auth_anon.c:73
-#, fuzzy
 msgid "Anonymous authentication failed."
-msgstr "²»Ö§³ÖÄäÃûÑéÖ¤¡£"
+msgstr "匿名认证失败。"
 
 #: imap/auth_cram.c:48
 msgid "Authenticating (CRAM-MD5)..."
-msgstr "ÑéÖ¤ÖÐ (CRAM-MD5)¡­"
+msgstr "认证中 (CRAM-MD5)..."
 
 #: imap/auth_cram.c:128
 msgid "CRAM-MD5 authentication failed."
-msgstr "CRAM-MD5 Ñé֤ʧ°Ü¡£"
+msgstr "CRAM-MD5 认证失败。"
 
 #. now begin login
 #: imap/auth_gss.c:144
 msgid "Authenticating (GSSAPI)..."
-msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
+msgstr "认证中 (GSSAPI)..."
 
 #: imap/auth_gss.c:309
 msgid "GSSAPI authentication failed."
-msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+msgstr "GSSAPI 认证失败。"
 
 #: imap/auth_login.c:38
 msgid "LOGIN disabled on this server."
-msgstr ""
+msgstr "LOGIN 在此服务器已禁用。"
 
 #: imap/auth_login.c:47 pop_auth.c:231
 msgid "Logging in..."
-msgstr "µÇÈëÖС­"
+msgstr "登入中..."
 
 #: imap/auth_login.c:67 pop_auth.c:274
 msgid "Login failed."
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "登入失败。"
 
-#: imap/auth_sasl.c:97 smtp.c:519
-#, fuzzy, c-format
+#: imap/auth_sasl.c:97 smtp.c:551
+#, c-format
 msgid "Authenticating (%s)..."
-msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
+msgstr "认证中 (%s)..."
 
 #: imap/auth_sasl.c:204 pop_auth.c:153
-#, fuzzy
 msgid "SASL authentication failed."
-msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+msgstr "SASL 认证失败。"
 
-#: imap/browse.c:58 imap/imap.c:567
+#: imap/browse.c:58 imap/imap.c:569
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr ""
+msgstr "%s 是无效的 IMAP 路径"
 
 #: imap/browse.c:69
-#, fuzzy
 msgid "Getting folder list..."
-msgstr "ÒѽӴ¥ËÅ·þÆ÷£¬ÕýÄÃȡĿ¼±í¡­"
+msgstr "正在获取文件夹列表..."
 
-#: imap/browse.c:189
-#, fuzzy
+#: imap/browse.c:191
 msgid "No such folder"
-msgstr "%s£ºÃ»ÓÐÕâÖÖÑÕÉ«"
+msgstr "无此文件夹"
 
-#: imap/browse.c:278
-#, fuzzy
+#: imap/browse.c:280
 msgid "Create mailbox: "
-msgstr "´ò¿ªÐÅÏä"
+msgstr "创建信箱："
 
-#: imap/browse.c:283 imap/browse.c:329
-#, fuzzy
+#: imap/browse.c:285 imap/browse.c:331
 msgid "Mailbox must have a name."
-msgstr "ÐÅÏäûÓиı䡣"
+msgstr "信箱必须有名字。"
 
-#: imap/browse.c:291
-#, fuzzy
+#: imap/browse.c:293
 msgid "Mailbox created."
-msgstr "ÓÊÏäÒÑɾ³ý¡£"
+msgstr "信箱已创建。"
 
-#: imap/browse.c:322
-#, fuzzy, c-format
+#: imap/browse.c:324
+#, c-format
 msgid "Rename mailbox %s to: "
-msgstr "´ò¿ªÐÅÏä"
+msgstr "将信箱 %s 改名为："
 
-#: imap/browse.c:337
-#, fuzzy, c-format
+#: imap/browse.c:339
+#, c-format
 msgid "Rename failed: %s"
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "改名失败：%s"
 
-#: imap/browse.c:342
-#, fuzzy
+#: imap/browse.c:344
 msgid "Mailbox renamed."
-msgstr "ÓÊÏäÒÑɾ³ý¡£"
+msgstr "信箱已改名。"
 
-#: imap/command.c:448
-#, fuzzy
+#: imap/command.c:445
 msgid "Mailbox closed"
-msgstr "ÓÊÏäÒÑɾ³ý¡£"
+msgstr "信箱已关闭。"
 
 #: imap/imap.c:126
-#, fuzzy, c-format
+#, c-format
 msgid "CREATE failed: %s"
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "CREATE(创建)失败：%s"
 
 #: imap/imap.c:190
-#, fuzzy, c-format
+#, c-format
 msgid "Closing connection to %s..."
-msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
+msgstr "正在关闭到 %s 的连接..."
 
-#: imap/imap.c:311
+#: imap/imap.c:310
 msgid "This IMAP server is ancient. Mutt does not work with it."
-msgstr "Õâ¸ö IMAP ËÅ·þÆ÷Òѹýʱ£¬Mutt ÎÞ·¨Ê¹ÓÃËü¡£"
+msgstr "这个 IMAP 服务器已过时，Mutt 无法与之工作。"
 
-#: imap/imap.c:434 pop_lib.c:286 smtp.c:392
+#: imap/imap.c:433 pop_lib.c:295 smtp.c:424
 msgid "Secure connection with TLS?"
-msgstr ""
+msgstr "使用 TLS 安全连接？"
 
-#: imap/imap.c:443 pop_lib.c:306 smtp.c:404
+#: imap/imap.c:442 pop_lib.c:315 smtp.c:436
 msgid "Could not negotiate TLS connection"
-msgstr ""
+msgstr "无法协商 TLS 连接"
 
-#: imap/imap.c:459 pop_lib.c:327
-#, fuzzy
+#: imap/imap.c:458 pop_lib.c:336
 msgid "Encrypted connection unavailable"
-msgstr "¼ÓÃܵÄÔ¿³×"
+msgstr "加密连接不可用"
 
-#: imap/imap.c:601
+#: imap/imap.c:603
 #, c-format
 msgid "Selecting %s..."
-msgstr "Ñ¡Ôñ %s ÖС­"
+msgstr "正在选择 %s..."
 
-#: imap/imap.c:756
-#, fuzzy
+#: imap/imap.c:758
 msgid "Error opening mailbox"
-msgstr "дÈëÐÅÏäʱ·¢Éú´íÎó£¡"
+msgstr "打开信箱时出错"
 
-#: imap/imap.c:811 imap/message.c:834 muttlib.c:1478
+#: imap/imap.c:813 imap/message.c:851 muttlib.c:1545
 #, c-format
 msgid "Create %s?"
-msgstr "½¨Á¢ %s£¿"
+msgstr "创建 %s 吗？"
 
-#: imap/imap.c:1183
-#, fuzzy
+#: imap/imap.c:1186
 msgid "Expunge failed"
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "执行删除失败"
 
-#: imap/imap.c:1195
+#: imap/imap.c:1198
 #, c-format
 msgid "Marking %d messages deleted..."
-msgstr "±êÇ©Á赀 %d ·âÐżþɾȥÁË¡­"
+msgstr "已标记的 %d 封信件已删除..."
 
-#: imap/imap.c:1224
-#, fuzzy, c-format
+#: imap/imap.c:1230
+#, c-format
 msgid "Saving changed messages... [%d/%d]"
-msgstr "ÕýÔÚ´¢´æÐżþ״̬Æì±ê¡­ [%d/%d]"
+msgstr "正在储存已改变的信件... [%d/%d]"
 
-#: imap/imap.c:1273
+#: imap/imap.c:1279
 msgid "Error saving flags. Close anyway?"
-msgstr ""
+msgstr "保存标记出错。仍然关闭吗？"
 
-#: imap/imap.c:1281
-#, fuzzy
+#: imap/imap.c:1287
 msgid "Error saving flags"
-msgstr "ÎÞ·¨·ÖÎöλַ£¡"
+msgstr "保存标记时出错"
 
-#: imap/imap.c:1293
+#: imap/imap.c:1299
 msgid "Expunging messages from server..."
-msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+msgstr "正在服务器上执行信件删除..."
 
-#: imap/imap.c:1298
+#: imap/imap.c:1304
 msgid "imap_sync_mailbox: EXPUNGE failed"
-msgstr ""
+msgstr "imap_sync_mailbox: EXPUNGE(执行删除)失败"
 
-#: imap/imap.c:1746
+#: imap/imap.c:1754
 #, c-format
 msgid "Header search without header name: %s"
-msgstr ""
+msgstr "无标头名称的标头搜索：%s"
 
-#: imap/imap.c:1818
-#, fuzzy
+#: imap/imap.c:1826
 msgid "Bad mailbox name"
-msgstr "´ò¿ªÐÅÏä"
+msgstr "错误的信箱名"
 
-#: imap/imap.c:1843
+#: imap/imap.c:1851
 #, c-format
 msgid "Subscribing to %s..."
-msgstr "¶©ÔÄ %s¡­"
+msgstr "正在订阅 %s..."
 
-#: imap/imap.c:1845
-#, fuzzy, c-format
+#: imap/imap.c:1853
+#, c-format
 msgid "Unsubscribing from %s..."
-msgstr "È¡Ïû¶©ÔÄ %s¡­"
+msgstr "正在取消订阅 %s..."
 
-#: imap/imap.c:1855
-#, fuzzy, c-format
+#: imap/imap.c:1863
+#, c-format
 msgid "Subscribed to %s"
-msgstr "¶©ÔÄ %s¡­"
+msgstr "已订阅 %s..."
 
-#: imap/imap.c:1857
-#, fuzzy, c-format
+#: imap/imap.c:1865
+#, c-format
 msgid "Unsubscribed from %s"
-msgstr "È¡Ïû¶©ÔÄ %s¡­"
+msgstr "已取消订阅 %s..."
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:98
+#: imap/message.c:99
 msgid "Unable to fetch headers from this IMAP server version."
-msgstr "ÎÞ·¨È¡»ØʹÓÃÕâ¸ö IMAP ËÅ·þÆ÷°æ±¾µÄÓʼþµÄ±êÍ·¡£"
+msgstr "无法取回此版本的 IMAP 服务器的标头。"
 
-#: imap/message.c:108
-#, fuzzy, c-format
+#: imap/message.c:109
+#, c-format
 msgid "Could not create temporary file %s"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
+msgstr "无法创建临时文件 %s"
 
-#: imap/message.c:140
-#, fuzzy
+#: imap/message.c:141
 msgid "Evaluating cache..."
-msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡­ [%d/%d]"
+msgstr "正在评估缓存..."
 
 #: imap/message.c:232 pop.c:272
-#, fuzzy
 msgid "Fetching message headers..."
-msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡­ [%d/%d]"
+msgstr "正在取回信件标头..."
 
-#: imap/message.c:428 imap/message.c:485 pop.c:547
-#, fuzzy
+#: imap/message.c:441 imap/message.c:498 pop.c:563
 msgid "Fetching message..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "正在取回信件..."
 
-#: imap/message.c:474 pop.c:542
+#: imap/message.c:487 pop.c:558
 msgid "The message index is incorrect. Try reopening the mailbox."
-msgstr ""
+msgstr "信件索引不正确。请尝试重新打开邮件箱。"
 
-#: imap/message.c:627
-#, fuzzy
+#: imap/message.c:641
 msgid "Uploading message..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "正在上传信件..."
 
-#: imap/message.c:798
-#, fuzzy, c-format
+#: imap/message.c:815
+#, c-format
 msgid "Copying %d messages to %s..."
-msgstr "ÕýÔÚ°áÒÆÒѾ­¶ÁÈ¡µÄÐżþµ½ %s ¡­"
+msgstr "正在复制 %d 个信件到 %s ..."
 
-#: imap/message.c:802
-#, fuzzy, c-format
+#: imap/message.c:819
+#, c-format
 msgid "Copying message %d to %s..."
-msgstr "дÈëÐżþµ½ %s ¡­"
+msgstr "正在复制信件 %d 到 %s ..."
 
-#: imap/util.c:336
-#, fuzzy
+#: imap/util.c:358
 msgid "Continue?"
-msgstr "£¨¼ÌÐø£©\n"
+msgstr "继续？"
 
-#: init.c:58 init.c:1777 pager.c:50
+#: init.c:60 init.c:1758 pager.c:50
 #, c-format
 msgid "Not available in this menu."
-msgstr "ÔÚÕâ¸ö²Ëµ¥ÖÐûÓÐÕâ¸ö¹¦ÄÜ¡£"
+msgstr "在此菜单中不可用。"
 
-#: init.c:466
+#: init.c:468
 #, c-format
 msgid "Bad regexp: %s"
-msgstr ""
+msgstr "错误的正则表达式：%s"
 
-#: init.c:523
+#: init.c:525
 #, c-format
 msgid "Not enough subexpressions for spam template"
-msgstr ""
+msgstr "没有足够的子表达式来用于垃圾邮件模板"
 
-#: init.c:749
-#, fuzzy
+#: init.c:715
 msgid "spam: no matching pattern"
-msgstr "±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
+msgstr "垃圾邮件：无匹配的模式"
 
-#: init.c:751
-#, fuzzy
+#: init.c:717
 msgid "nospam: no matching pattern"
-msgstr "·´±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
+msgstr "去掉垃圾邮件：无匹配的模板"
 
-#: init.c:888
-msgid "Missing -rx or -addr."
-msgstr ""
+#: init.c:861
+#, fuzzy, c-format
+msgid "%sgroup: missing -rx or -addr."
+msgstr "缺少 -rx 或 -addr。"
 
-#: init.c:901
-#, c-format
-msgid "Warning: Bad IDN '%s'.\n"
-msgstr ""
+#: init.c:879
+#, fuzzy, c-format
+msgid "%sgroup: warning: bad IDN '%s'.\n"
+msgstr "警告：错误的 IDN '%s'.\n"
 
-#: init.c:1109
-#, fuzzy
+#: init.c:1094
 msgid "attachments: no disposition"
-msgstr "±à¼­¼ÐµµµÄ˵Ã÷"
+msgstr "附件：无处理方式"
 
-#: init.c:1147
-#, fuzzy
+#: init.c:1132
 msgid "attachments: invalid disposition"
-msgstr "±à¼­¼ÐµµµÄ˵Ã÷"
+msgstr "附件：无效的处理方式"
 
-#: init.c:1161
-#, fuzzy
+#: init.c:1146
 msgid "unattachments: no disposition"
-msgstr "±à¼­¼ÐµµµÄ˵Ã÷"
+msgstr "去掉附件：无处理方式"
 
-#: init.c:1184
+#: init.c:1169
 msgid "unattachments: invalid disposition"
-msgstr ""
+msgstr "去掉附件：无效的处理方式"
 
-#: init.c:1311
+#: init.c:1296
 msgid "alias: no address"
-msgstr "±ðÃû£ºÃ»Óеç×ÓÓʼþλַ"
+msgstr "别名：没有邮件地址"
 
-#: init.c:1359
+#: init.c:1344
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr ""
+msgstr "警告：错误的 IDN '%s'在别名'%s'中。\n"
 
-#: init.c:1447
+#: init.c:1432
 msgid "invalid header field"
-msgstr "ÎÞЧµÄ±êÍ·À¸Î»"
+msgstr "无效的标头域"
 
-#: init.c:1500
+#: init.c:1485
 #, c-format
 msgid "%s: unknown sorting method"
-msgstr "%s£º²»Ã÷µÄÅÅÐò·½Ê½"
+msgstr "%s：未知的排序方式"
 
-#: init.c:1610
-#, fuzzy, c-format
+#: init.c:1592
+#, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
-msgstr "mutt_restore_defualt£º´íÎóµÄÕý¹æ±íʾʽ£º%s\n"
+msgstr "mutt_restore_defualt(%s)：正则表达式有错误：%s\n"
 
-#: init.c:1754 init.c:1867
+#: init.c:1735 init.c:1848
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s£º²»Ã÷µÄ±äÁ¿"
+msgstr "%s：未知的变量"
 
-#: init.c:1763
+#: init.c:1744
 #, c-format
 msgid "prefix is illegal with reset"
-msgstr "ÖØÐÂÉèÖúó×ÖÊ×ÈÔ²»ºÏ¹æ¶¨"
+msgstr "带重置的前缀是非法的"
 
-#: init.c:1769
+#: init.c:1750
 #, c-format
 msgid "value is illegal with reset"
-msgstr "ÖØÐÂÉèÖúóÖµÈÔ²»ºÏ¹æ¶¨"
+msgstr "带重置的值是非法的"
 
-#: init.c:1805 init.c:1817
+#: init.c:1786 init.c:1798
 #, c-format
 msgid "Usage: set variable=yes|no"
-msgstr ""
+msgstr "用法：set variable=yes|no"
 
-#: init.c:1825
+#: init.c:1806
 #, c-format
 msgid "%s is set"
-msgstr "%s Òѱ»É趨"
+msgstr "%s 已被设定"
 
-#: init.c:1825
+#: init.c:1806
 #, c-format
 msgid "%s is unset"
-msgstr "%s ûÓб»É趨"
+msgstr "%s 没有被设定"
 
-#: init.c:1926
-#, fuzzy, c-format
+#: init.c:1909
+#, c-format
 msgid "Invalid value for option %s: \"%s\""
-msgstr "ÎÞЧµÄÈÕ×Ó£º%s"
+msgstr "选项 %s 的值无效：\"%s\""
 
-#: init.c:2064
+#: init.c:2046
 #, c-format
 msgid "%s: invalid mailbox type"
-msgstr "%s£ºÎÞЧµÄÐÅÏäÖÖÀà"
+msgstr "%s：无效的信箱类型"
+
+#: init.c:2077
+#, c-format
+msgid "%s: invalid value (%s)"
+msgstr "%s：无效的值(%s)"
+
+#: init.c:2078
+msgid "format error"
+msgstr "格式错误"
 
-#: init.c:2095 init.c:2155
+#: init.c:2078
+msgid "number overflow"
+msgstr "数字溢出"
+
+#: init.c:2138
 #, c-format
 msgid "%s: invalid value"
-msgstr "%s£ºÎÞЧµÄÖµ"
+msgstr "%s：无效的值"
 
-#: init.c:2196
-#, fuzzy, c-format
+#: init.c:2179
+#, c-format
 msgid "%s: Unknown type."
-msgstr "%s£º²»Ã÷µÄÖÖÀà"
+msgstr "%s：未知类型。"
 
-#: init.c:2223
+#: init.c:2206
 #, c-format
 msgid "%s: unknown type"
-msgstr "%s£º²»Ã÷µÄÖÖÀà"
+msgstr "%s：未知类型"
 
-#: init.c:2285
+#: init.c:2268
 #, c-format
 msgid "Error in %s, line %d: %s"
-msgstr "%s ·¢Éú´íÎó£¬ÐкŠ%d£º%s"
+msgstr "%s 发生错误，第 %d 行：%s"
 
 #. the muttrc source keyword
-#: init.c:2308
+#: init.c:2291
 #, c-format
 msgid "source: errors in %s"
-msgstr "source£º´íÎó·¢ÉúÔÚ %s"
+msgstr "source：%s 中有错误"
 
-#: init.c:2309
+#: init.c:2292
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
-msgstr ""
+msgstr "source: 读取因 %s 中错误过多而中止"
 
-#: init.c:2323
+#: init.c:2306
 #, c-format
 msgid "source: error at %s"
-msgstr "source£º´íÎó·¢ÉúÔÚ %s"
+msgstr "source：%s 有错误"
 
-#: init.c:2328
+#: init.c:2311
 msgid "source: too many arguments"
-msgstr "source£ºÌ«¶à²ÎÊý"
+msgstr "source：参数太多"
 
-#: init.c:2382
+#: init.c:2365
 #, c-format
 msgid "%s: unknown command"
-msgstr "%s£º²»Ã÷µÄÖ¸Áî"
+msgstr "%s：未知命令"
 
-#: init.c:2867
+#: init.c:2850
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
+msgstr "命令行有错：%s\n"
 
-#: init.c:2922
+#: init.c:2923
 msgid "unable to determine home directory"
-msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
+msgstr "无法确定 home 目录"
 
-#: init.c:2930
+#: init.c:2931
 msgid "unable to determine username"
-msgstr "ÎÞ·¨¾ö¶¨Ê¹ÓÃÕßÃû³Æ"
+msgstr "无法确定用户名"
 
-#: init.c:3166
+#: init.c:3167
 msgid "-group: no group name"
-msgstr ""
+msgstr "-group: 无组名称"
 
-#: init.c:3176
-#, fuzzy
+#: init.c:3177
 msgid "out of arguments"
-msgstr "Ì«ÉÙ²ÎÊý"
+msgstr "参数不够用"
 
-#: keymap.c:491
+#: keymap.c:526
 msgid "Macro loop detected."
-msgstr "¼ì²âµ½¾Þ¼¯ÖÐÓлØȦ¡£"
+msgstr "检测到宏中有回环。"
 
-#: keymap.c:701 keymap.c:709
+#: keymap.c:827 keymap.c:835
 msgid "Key is not bound."
-msgstr "Õâ¸ö¼ü»¹Î´±»¶¨Ò幦ÄÜ¡£"
+msgstr "此键还未绑定功能。"
 
-#: keymap.c:713
+#: keymap.c:839
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Õâ¸ö¼ü»¹Î´±»¶¨Ò幦ÄÜ¡£ °´ '%s' ÒÔÈ¡µÃ˵Ã÷¡£"
+msgstr "此键还未绑定功能。按 '%s' 以获得帮助信息。"
 
-#: keymap.c:724
+#: keymap.c:850
 msgid "push: too many arguments"
-msgstr "push£ºÌ«¶à²ÎÊý"
+msgstr "push：参数太多"
 
-#: keymap.c:754
+#: keymap.c:880
 #, c-format
 msgid "%s: no such menu"
-msgstr "%s£ºÃ»ÓÐÕâ¸öÑ¡µ¥"
+msgstr "%s：没有这个选单"
 
-#: keymap.c:769
+#: keymap.c:895
 msgid "null key sequence"
-msgstr "¿ÕµÄ¼üÖµÐòÁÐ"
+msgstr "空的键值序列"
 
-#: keymap.c:856
+#: keymap.c:982
 msgid "bind: too many arguments"
-msgstr "bind£ºÌ«¶à²ÎÊý"
+msgstr "bind：参数太多"
 
-#: keymap.c:879
+#: keymap.c:1005
 #, c-format
 msgid "%s: no such function in map"
-msgstr "%s£ºÔÚ¶ÔÓ³±íÖÐûÓÐÕâÑùµÄº¯Êý"
+msgstr "%s：在对映表中没有这样的函数"
 
-#: keymap.c:903
+#: keymap.c:1029
 msgid "macro: empty key sequence"
-msgstr "macro£º¿ÕµÄ¼üÖµÐòÁÐ"
+msgstr "macro：空的键值序列"
 
-#: keymap.c:914
+#: keymap.c:1040
 msgid "macro: too many arguments"
-msgstr "macro£º²ÎÊýÌ«¶à"
+msgstr "macro：参数太多"
 
-#: keymap.c:950
-#, fuzzy
+#: keymap.c:1076
 msgid "exec: no arguments"
-msgstr "exec£º²ÎÊýÌ«ÉÙ"
+msgstr "exec：无参数"
 
-#: keymap.c:970
-#, fuzzy, c-format
+#: keymap.c:1096
+#, c-format
 msgid "%s: no such function"
-msgstr "%s£ºÔÚ¶ÔÓ³±íÖÐûÓÐÕâÑùµÄº¯Êý"
+msgstr "%s：没有这样的函数"
 
-#: keymap.c:991
-#, fuzzy
+#: keymap.c:1117
 msgid "Enter keys (^G to abort): "
-msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
+msgstr "请按键(按 ^G 中止)："
 
-#: keymap.c:996
+#: keymap.c:1122
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
-msgstr ""
+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:63
-#, fuzzy
 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"
+msgstr ""
+"要连络研发人员，请寄信给 <mutt-dev@mutt.org>。\n"
+"要报告问题，请访问 http://bugs.mutt.org/。\n"
 
 #: main.c:67
-#, fuzzy
 msgid ""
 "Copyright (C) 1996-2009 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-2000 Michael R. Elkins and others.\n"
-"Mutt ²»ÌṩÈκα£Ö¤£ºÐèÒª¸üÏêϸµÄ×ÊÁÏ£¬Çë¼üÈë `mutt -vv'¡£\n"
-"Mutt ÊÇÒ»¸ö×ÔÓÉÈí¼þ, »¶Ó­ÄúÔÚijЩȷ¶¨µÄÌõ¼þÉÏ£¬ÖØеķ¢ÐÐËü\n"
-"ÈôÐèÒª¸üÏêϸµÄ×ÊÁÏ, Çë¼üÈë `mutt -vv'\n"
+"Copyright (C) 1996-2009 Michael R. Elkins 与其他人。\n"
+"Mutt 不提供任何保证：请键入 `mutt -vv' 以获取详细信息。\n"
+"Mutt 是自由软件, 欢迎您在某些条件下\n"
+"重新发行它；请键入 `mutt -vv' 以获取详细信息。\n"
 
 #: main.c:73
 msgid ""
@@ -2616,11 +2554,21 @@ msgid ""
 "Copyright (C) 1999-2009 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) 2006-2008 Rocco Rutte <pdmef@gmx.net>\n"
+"Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n"
 "\n"
 "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-2002 Brandon Long <blong@fiction.net>\n"
+"Copyright (C) 1997-2008 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-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
+"Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
+"Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n"
+"\n"
+"许多这里没有提到的人也贡献了代码，修正以及建议。\n"
 
 #: main.c:86
 msgid ""
@@ -2634,6 +2582,12 @@ msgid ""
 "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
 "    GNU General Public License for more details.\n"
 msgstr ""
+"    本程序为自由软件；您可依据自由软件基金会所发表的 GNU 通用公共许可条款\n"
+"    规定，就本程序再为发布与／或修改；无论您依据的是本许可的第二版或（您\n"
+"    自行选择的）任一日后发行的版本。\n"
+"\n"
+"    本程序是基于使用目的而加以发布，然而不负任何担保责任；亦无对适售性或\n"
+"    特定目的适用性所为的默示性担保。详情请参照 GNU 通用公共许可。\n"
 
 #: main.c:96
 msgid ""
@@ -2642,13 +2596,17 @@ msgid ""
 "    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-"
 "1301, USA.\n"
 msgstr ""
+"    您应已收到附随于本程序的 GNU 通用公共许可的副本；如果没有，请写信\n"
+"    至自由软件基金会，51 Franklin Street, Fifth Floor, Boston, MA 02110-"
+"1301, USA.\n"
 
 #: main.c:113
+#, fuzzy
 msgid ""
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
 "       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
-"<file> [...]] [--] <addr> [...]\n"
-"       mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...]] [--] "
+"<file> [...] --] <addr> [...]\n"
+"       mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...] --] "
 "<addr> [...] < message\n"
 "       mutt [<options>] -p\n"
 "       mutt [<options>] -A <alias> [...]\n"
@@ -2656,23 +2614,40 @@ msgid ""
 "       mutt [<options>] -D\n"
 "       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 [<选项>] -p\n"
+"      mutt [<选项>] -A <别名> [...]\n"
+"      mutt [<选项>] -Q <查询> [...]\n"
+"      mutt [<选项>] -D\n"
+"      mutt -v[v]\n"
 
 #: main.c:122
+#, fuzzy
 msgid ""
 "options:\n"
 "  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
+"  -a <file> [...] --\tattach file(s) to the message\n"
+"\t\tthe list of files must be terminated with the \"--\" sequence\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -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"
+"  -D\t\t打印所有变量的值到标准输出"
 
-#: main.c:130
+#: main.c:131
 msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
-msgstr ""
+msgstr "  -d <级别>\t将调试输出记录到 ~/.muttdebug0"
 
-#: main.c:133
-#, fuzzy
+#: main.c:134
 msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
@@ -2683,36 +2658,16 @@ msgid ""
 "  -n\t\tcauses Mutt not to read the system Muttrc\n"
 "  -p\t\trecall a postponed message"
 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            Õâ¸ö˵Ã÷ѶϢ"
-
-#: main.c:142
-#, fuzzy
+"  -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叫回一个延后寄送的信件"
+
+#: main.c:143
 msgid ""
 "  -Q <variable>\tquery a configuration variable\n"
 "  -R\t\topen mailbox in read-only mode\n"
@@ -2724,2555 +2679,2497 @@ msgid ""
 "  -Z\t\topen the first folder with new message, exit immediately if none\n"
 "  -h\t\tthis help message"
 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            Õâ¸ö˵Ã÷ѶϢ"
-
-#: main.c:152
-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 ""
-
-#: main.c:197
+"  -Q <变量>\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"
+"  -h\t\t本帮助消息"
+
+#: main.c:196
 msgid ""
 "\n"
 "Compile options:"
 msgstr ""
 "\n"
-"±àÒëÑ¡Ï"
+"编译选项："
 
-#: main.c:501
+#: main.c:500
 msgid "Error initializing terminal."
-msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
+msgstr "初始化终端时出错。"
 
-#: main.c:635
+#: main.c:636
+#, c-format
+msgid "Error: value '%s' is invalid for -d.\n"
+msgstr "错误：变量'%s'对于 -d 来说无效。\n"
+
+#: main.c:639
 #, c-format
 msgid "Debugging at level %d.\n"
-msgstr "³ý´íģʽÔÚµÚ %d ²ã¡£\n"
+msgstr "正在使用级别 %d 进行调试。\n"
 
-#: main.c:637
+#: main.c:641
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
-msgstr "ÔÚ±àÒëʱºòûÓж¨Òå DEBUG¡£·ÅÆúÖ´ÐС£\n"
+msgstr "在编译时候没有定义 DEBUG。忽略。\n"
 
-#: main.c:802
+#: main.c:806
 #, c-format
 msgid "%s does not exist. Create it?"
-msgstr "%s ²»´æÔÚ¡£ÖÆÔìÂð£¿"
+msgstr "%s 不存在。创建它吗？"
 
-#: main.c:806
+#: main.c:810
 #, c-format
 msgid "Can't create %s: %s."
-msgstr "ÎÞ·¨½¨Á¢ %s: %s."
+msgstr "无法创建 %s: %s."
 
-#: main.c:848
+#: main.c:852
 msgid "Failed to parse mailto: link\n"
-msgstr ""
+msgstr "解析 mailto: 链接失败\n"
 
-#: main.c:860
+#: main.c:864
 msgid "No recipients specified.\n"
-msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕß¡£\n"
+msgstr "没有指定接收者。\n"
 
-#: main.c:946
+#: main.c:950
 #, c-format
 msgid "%s: unable to attach file.\n"
-msgstr "%s£ºÎÞ·¨¸½´øÎļþ¡£\n"
+msgstr "%s：无法附加文件。\n"
 
-#: main.c:969
+#: main.c:973
 msgid "No mailbox with new mail."
-msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
+msgstr "没有信箱有新信件。"
 
-#: main.c:978
-#, fuzzy
+#: main.c:982
 msgid "No incoming mailboxes defined."
-msgstr "Ȧѡ½øÈëµÄÓÊͲ"
+msgstr "未定义收信信箱"
 
-#: main.c:1006
+#: main.c:1010
 msgid "Mailbox is empty."
-msgstr "ÐÅÏäÄÚ¿ÕÎÞÒ»Îï¡£"
+msgstr "信箱是空的。"
 
-#: mbox.c:123 mbox.c:277 mh.c:1135 mx.c:673
+#: mbox.c:119 mbox.c:269 mh.c:1152 mx.c:642
 #, c-format
 msgid "Reading %s..."
-msgstr "¶ÁÈ¡ %s ÖС­"
+msgstr "正在读取 %s..."
 
-#: mbox.c:161 mbox.c:218
+#: mbox.c:157 mbox.c:214
 msgid "Mailbox is corrupt!"
-msgstr "ÐÅÏäÒÑËð»µÁË£¡"
+msgstr "信箱损坏了！"
 
-#: mbox.c:678
+#: mbox.c:670
 msgid "Mailbox was corrupted!"
-msgstr "ÐÅÏäÒÑËð»µ!"
+msgstr "信箱已损坏!"
 
-#: mbox.c:719 mbox.c:976
+#: mbox.c:752 mbox.c:1008
 msgid "Fatal error!  Could not reopen mailbox!"
-msgstr "ÑÏÖØ´íÎó£¡ÎÞ·¨ÖØдò¿ªÐÅÏ䣡"
+msgstr "严重错误！无法重新打开信箱！"
 
-#: mbox.c:728
+#: mbox.c:761
 msgid "Unable to lock mailbox!"
-msgstr "ÎÞ·¨ËøסÐÅÏ䣡"
+msgstr "无法锁住信箱！"
 
 #. this means ctx->changed or ctx->deleted was set, but no
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:771
+#: mbox.c:804
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
-msgstr "ͬ²½£ºÐÅÏäÒѱ»Ð޸ģ¬µ«Ã»Óб»Ð޸ĹýµÄÐżþ£¡£¨Çë»Ø±¨Õâ¸ö´íÎó£©"
+msgstr "同步：信箱已被修改，但没有被修改过的信件！(请报告这个错误)"
 
-#: mbox.c:795 mh.c:1640 mx.c:766
+#: mbox.c:828 mh.c:1658 mx.c:739
 #, c-format
 msgid "Writing %s..."
-msgstr "дÈë %s ÖС­"
+msgstr "正在写入 %s..."
 
-#. copy the temp mailbox back into place starting at the first
-#. * change/deleted message
-#.
-#: mbox.c:929
-#, fuzzy
+#: mbox.c:963
 msgid "Committing changes..."
-msgstr "±àÒëËÑÑ°ÑùʽÖС­"
+msgstr "正在提交修改..."
 
-#: mbox.c:960
+#: mbox.c:994
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
-msgstr "дÈëʧ°Ü£¡ÒѰѲ¿·ÖµÄÐÅÏä´¢´æÖÁ %s"
+msgstr "写入失败！已把部分的信箱储存至 %s"
 
-#: mbox.c:1024
+#: mbox.c:1056
 msgid "Could not reopen mailbox!"
-msgstr "ÎÞ·¨ÖØ¿ªÐÅÏ䣡"
+msgstr "无法重开信箱！"
 
-#: mbox.c:1059
+#: mbox.c:1092
 msgid "Reopening mailbox..."
-msgstr "ÖØдò¿ªÐÅÏäÖС­"
+msgstr "正在重新打开信箱..."
 
 #: menu.c:423
 msgid "Jump to: "
-msgstr "Ìøµ½£º"
+msgstr "跳到："
 
 #: menu.c:432
 msgid "Invalid index number."
-msgstr "ÎÞЧµÄË÷Òý±àºÅ¡£"
+msgstr "无效的索引编号。"
 
 #: menu.c:436 menu.c:457 menu.c:522 menu.c:565 menu.c:581 menu.c:592
-#: menu.c:603 menu.c:614 menu.c:627 menu.c:640 menu.c:1058
+#: menu.c:603 menu.c:614 menu.c:627 menu.c:640 menu.c:1051
 msgid "No entries."
-msgstr "ûÓÐ×ÊÁÏ¡£"
+msgstr "没有条目。"
 
 #: menu.c:454
 msgid "You cannot scroll down farther."
-msgstr "ÄúÎÞ·¨ÔÙÏòÏÂ¾í¶¯ÁË¡£"
+msgstr "您无法再向下滚动了。"
 
 #: menu.c:472
 msgid "You cannot scroll up farther."
-msgstr "ÄúÎÞ·¨ÔÙÏòÉÏ¾í¶¯ÁË¡£"
+msgstr "您无法再向上滚动了。"
 
 #: menu.c:515
 msgid "You are on the first page."
-msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ò³¡£"
+msgstr "您现在在第一页。"
 
 #: menu.c:516
 msgid "You are on the last page."
-msgstr "ÄúÏÖÔÚÔÚ×îºóÒ»Ò³¡£"
+msgstr "您现在在最后一页。"
 
 #: menu.c:651
 msgid "You are on the last entry."
-msgstr "ÄúÏÖÔÚÔÚ×îºóÒ»Ïî¡£"
+msgstr "您现在在最后一项。"
 
 #: menu.c:662
 msgid "You are on the first entry."
-msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ïî¡£"
+msgstr "您现在在第一项。"
 
-#: menu.c:731 pattern.c:1404
+#: menu.c:733 pager.c:2086 pattern.c:1417
 msgid "Search for: "
-msgstr "ËÑÑ°£º"
+msgstr "搜寻："
 
-#: menu.c:732 pattern.c:1405
+#: menu.c:733 pager.c:2086 pattern.c:1417
 msgid "Reverse search for: "
-msgstr "·µÏòËÑÑ°£º"
+msgstr "返向搜寻："
 
-#: menu.c:746 pattern.c:1437
-msgid "No search pattern."
-msgstr "ûÓÐËÑÑ°¸ñʽ¡£"
-
-#: menu.c:784 pager.c:1983 pager.c:2005 pager.c:2120 pattern.c:1520
+#: menu.c:777 pager.c:2039 pager.c:2061 pager.c:2181 pattern.c:1531
 msgid "Not found."
-msgstr "ûÓÐÕÒµ½¡£"
+msgstr "没有找到。"
 
-#: menu.c:910
+#: menu.c:903
 msgid "No tagged entries."
-msgstr "ûÓÐÒѱê¼ÇµÄ¼Ç¼¡£"
+msgstr "没有已标记的条目。"
 
-#: menu.c:1015
+#: menu.c:1008
 msgid "Search is not implemented for this menu."
-msgstr "Õâ¸öÑ¡µ¥ÖÐûÓÐËÑÑ°¹¦ÄÜ¡£"
+msgstr "此菜单未实现搜寻。"
 
-#: menu.c:1020
+#: menu.c:1013
 msgid "Jumping is not implemented for dialogs."
-msgstr "¶Ô»°Ä£Ê½Öв»Ö§³ÖÌøÔ¾¹¦ÄÜ¡£"
+msgstr "对话模式中未实现跳跃。"
 
-#: menu.c:1061
+#: menu.c:1054
 msgid "Tagging is not supported."
-msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
+msgstr "不支持标记。"
 
-#: mh.c:1114
-#, fuzzy, c-format
+#: mh.c:1131
+#, c-format
 msgid "Scanning %s..."
-msgstr "Ñ¡Ôñ %s ÖС­"
+msgstr "正在扫描 %s..."
 
-#: mh.c:1314 mh.c:1392
-#, fuzzy
+#: mh.c:1332 mh.c:1410
 msgid "Could not flush message to disk"
-msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
+msgstr "无法将信件导出到硬盘。"
 
-#: mh.c:1359
+#: mh.c:1377
 msgid "maildir_commit_message(): unable to set time on file"
-msgstr ""
+msgstr "maildir_commit_message(): 无法给文件设置时间"
 
 #: mutt_sasl.c:192
 msgid "Unknown SASL profile"
-msgstr ""
+msgstr "未知的 SASL 配置"
 
 #: mutt_sasl.c:226
-#, fuzzy
 msgid "Error allocating SASL connection"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "分配 SASL 连接时出错"
 
 #: mutt_sasl.c:236
 msgid "Error setting SASL security properties"
-msgstr ""
+msgstr "设置 SASL 安全属性时出错"
 
 #: mutt_sasl.c:246
 msgid "Error setting SASL external security strength"
-msgstr ""
+msgstr "设置 SASL 外部安全强度时出错"
 
 #: mutt_sasl.c:255
 msgid "Error setting SASL external user name"
-msgstr ""
+msgstr "设置 SASL 外部用户名时出错"
 
 #: mutt_socket.c:103 mutt_socket.c:181
-#, fuzzy, c-format
+#, c-format
 msgid "Connection to %s closed"
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "到 %s 的连接已关闭"
 
 #: mutt_socket.c:300
 msgid "SSL is unavailable."
-msgstr ""
+msgstr "SSL 不可用。"
 
 #: mutt_socket.c:332
-#, fuzzy
 msgid "Preconnect command failed."
-msgstr "Ô¤ÏÈÁ¬½ÓÖ¸Áîʧ°Ü"
+msgstr "预连接命令失败。"
 
 #: mutt_socket.c:403 mutt_socket.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "Error talking to %s (%s)"
-msgstr "ÕýÁ¬Ïßµ½ %s"
+msgstr "与 %s 通话出错(%s)"
 
 #: mutt_socket.c:470 mutt_socket.c:529
 #, c-format
 msgid "Bad IDN \"%s\"."
-msgstr ""
+msgstr "错误的 IDN \"%s\"。"
 
 #: mutt_socket.c:478 mutt_socket.c:537
-#, fuzzy, c-format
+#, c-format
 msgid "Looking up %s..."
-msgstr "¿½±´µ½ %s¡­"
+msgstr "正在查找 %s..."
 
 #: mutt_socket.c:488 mutt_socket.c:546
-#, fuzzy, c-format
+#, c-format
 msgid "Could not find the host \"%s\""
-msgstr "ÕÒ²»µ½Ö÷»ú %s µÄλַ¡£"
+msgstr "无法找到主机\"%s\""
 
 #: mutt_socket.c:494 mutt_socket.c:552
 #, c-format
 msgid "Connecting to %s..."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正在连接到 %s..."
 
 #: mutt_socket.c:576
-#, fuzzy, c-format
+#, c-format
 msgid "Could not connect to %s (%s)."
-msgstr "ÎÞ·¨´ò¿ª %s"
+msgstr "无法连接到 %s (%s)"
 
-#: mutt_ssl.c:183
+#: mutt_ssl.c:187
 msgid "Failed to find enough entropy on your system"
-msgstr ""
+msgstr "在您的系统上查找足够的熵时失败"
 
-#: mutt_ssl.c:207
+#: mutt_ssl.c:211
 #, c-format
 msgid "Filling entropy pool: %s...\n"
-msgstr ""
+msgstr "正在填充熵池：%s...\n"
 
-#: mutt_ssl.c:215
+#: mutt_ssl.c:219
 #, c-format
 msgid "%s has insecure permissions!"
-msgstr ""
+msgstr "%s 有不安全的访问许可！"
 
-#: mutt_ssl.c:234
+#: mutt_ssl.c:238
 msgid "SSL disabled due the lack of entropy"
-msgstr ""
+msgstr "SSL 因缺少足够的熵而禁用"
 
-#: mutt_ssl.c:331
+#: mutt_ssl.c:352
 msgid "I/O error"
-msgstr ""
+msgstr "输入输出(I/O)出错"
 
-#: mutt_ssl.c:340
-#, fuzzy, c-format
+#: mutt_ssl.c:361
+#, c-format
 msgid "SSL failed: %s"
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "SSL 失败：%s"
 
-#: mutt_ssl.c:349 mutt_ssl_gnutls.c:880 mutt_ssl_gnutls.c:889
-#: mutt_ssl_gnutls.c:912
-#, fuzzy
+#: mutt_ssl.c:370 mutt_ssl_gnutls.c:950 mutt_ssl_gnutls.c:984
+#: mutt_ssl_gnutls.c:994
 msgid "Unable to get certificate from peer"
-msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
+msgstr "无法从节点获得证书"
 
-#: mutt_ssl.c:357
-#, fuzzy, c-format
+#: mutt_ssl.c:378
+#, c-format
 msgid "SSL connection using %s (%s)"
-msgstr "ÕýÁ¬Ïßµ½ %s"
+msgstr "使用 %s 的 SSL 连接(%s)"
 
-#: mutt_ssl.c:401
-#, fuzzy
+#: mutt_ssl.c:480
 msgid "Unknown"
-msgstr "²»Ã÷µÄ´íÎó"
+msgstr "未知"
 
-#: mutt_ssl.c:426 mutt_ssl_gnutls.c:457
-#, fuzzy, c-format
+#: mutt_ssl.c:505 mutt_ssl_gnutls.c:473
+#, c-format
 msgid "[unable to calculate]"
-msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
+msgstr "[无法计算]"
 
-#: mutt_ssl.c:444 mutt_ssl_gnutls.c:480
-#, fuzzy
+#: mutt_ssl.c:523 mutt_ssl_gnutls.c:496
 msgid "[invalid date]"
-msgstr "%s£ºÎÞЧµÄÖµ"
+msgstr "[无效日期]"
 
-#: mutt_ssl.c:570
+#: mutt_ssl.c:651
 msgid "Server certificate is not yet valid"
-msgstr ""
+msgstr "服务器证书尚未有效"
 
-#: mutt_ssl.c:577
+#: mutt_ssl.c:658
 msgid "Server certificate has expired"
-msgstr ""
+msgstr "服务器证书已过期"
 
-#: mutt_ssl.c:696
-#, fuzzy
+#: mutt_ssl.c:780
 msgid "cannot get certificate subject"
-msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
+msgstr "无法获取证书标题"
 
-#: mutt_ssl.c:708
-#, fuzzy
+#: mutt_ssl.c:790 mutt_ssl.c:799
 msgid "cannot get certificate common name"
-msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
+msgstr "无法获取证书通用名称"
 
-#: mutt_ssl.c:717
+#: mutt_ssl.c:813
 #, c-format
 msgid "certificate owner does not match hostname %s"
-msgstr ""
+msgstr "证书所有者与主机名称 %s 不匹配"
 
-#: mutt_ssl.c:754
-#, fuzzy, c-format
+#: mutt_ssl.c:854
+#, c-format
 msgid "Certificate host check failed: %s"
-msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
+msgstr "证书主机检查失败：%s"
 
-#: mutt_ssl.c:845 mutt_ssl_gnutls.c:664
+#: mutt_ssl.c:932 mutt_ssl_gnutls.c:732
 msgid "This certificate belongs to:"
-msgstr ""
+msgstr "此证书属于："
 
-#: mutt_ssl.c:858 mutt_ssl_gnutls.c:703
+#: mutt_ssl.c:945 mutt_ssl_gnutls.c:771
 msgid "This certificate was issued by:"
-msgstr ""
+msgstr "此证书发布自："
 
-#: mutt_ssl.c:869 mutt_ssl_gnutls.c:742
+#: mutt_ssl.c:956 mutt_ssl_gnutls.c:810
 #, c-format
 msgid "This certificate is valid"
-msgstr ""
+msgstr "此证书有效"
 
-#: mutt_ssl.c:870 mutt_ssl_gnutls.c:745
+#: mutt_ssl.c:957 mutt_ssl_gnutls.c:813
 #, c-format
 msgid "   from %s"
-msgstr ""
+msgstr "   来自 %s"
 
-#: mutt_ssl.c:872 mutt_ssl_gnutls.c:749
+#: mutt_ssl.c:959 mutt_ssl_gnutls.c:817
 #, c-format
 msgid "     to %s"
-msgstr ""
+msgstr "   发往 %s"
 
-#: mutt_ssl.c:878
+#: mutt_ssl.c:965
 #, c-format
 msgid "Fingerprint: %s"
-msgstr ""
+msgstr "指纹: %s"
 
-#: mutt_ssl.c:881 mutt_ssl_gnutls.c:786
+#: mutt_ssl.c:968 mutt_ssl_gnutls.c:854
 #, c-format
 msgid "SSL Certificate check (certificate %d of %d in chain)"
-msgstr ""
+msgstr "SSL 证书检查 (检查链中有 %d 个证书，共 %d 个)"
 
-#: mutt_ssl.c:887 mutt_ssl_gnutls.c:793
+#: mutt_ssl.c:976 mutt_ssl_gnutls.c:863
 msgid "(r)eject, accept (o)nce, (a)ccept always"
-msgstr ""
+msgstr "拒绝(r)，接受一次(o)，总是接受(a)"
 
-#: mutt_ssl.c:888 mutt_ssl_gnutls.c:794
+#: mutt_ssl.c:977 mutt_ssl_gnutls.c:864
 msgid "roa"
-msgstr ""
+msgstr "roa"
 
-#: mutt_ssl.c:892 mutt_ssl_gnutls.c:798
+#: mutt_ssl.c:981 mutt_ssl_gnutls.c:868
 msgid "(r)eject, accept (o)nce"
-msgstr ""
+msgstr "拒绝(r)，接受一次(o)"
 
-#: mutt_ssl.c:893 mutt_ssl_gnutls.c:799
+#: mutt_ssl.c:982 mutt_ssl_gnutls.c:869
 msgid "ro"
-msgstr ""
+msgstr "ro"
 
-#: mutt_ssl.c:924 mutt_ssl_gnutls.c:848
+#: mutt_ssl.c:1013 mutt_ssl_gnutls.c:918
 msgid "Warning: Couldn't save certificate"
-msgstr ""
+msgstr "警告：无法保存证书"
 
-#: mutt_ssl.c:929 mutt_ssl_gnutls.c:853
+#: mutt_ssl.c:1018 mutt_ssl_gnutls.c:923
 msgid "Certificate saved"
-msgstr ""
+msgstr "证书已保存"
 
-#: mutt_ssl_gnutls.c:96 mutt_ssl_gnutls.c:123
+#: mutt_ssl_gnutls.c:106 mutt_ssl_gnutls.c:133
 msgid "Error: no TLS socket open"
-msgstr ""
+msgstr "错误：没有打开 TLS 套接字"
 
-#: mutt_ssl_gnutls.c:276
+#: mutt_ssl_gnutls.c:292
 msgid "All available protocols for TLS/SSL connection disabled"
-msgstr ""
+msgstr "所有用于 TLS/SSL 连接的可用协议已禁用"
 
-#: mutt_ssl_gnutls.c:340
-#, fuzzy, c-format
+#: mutt_ssl_gnutls.c:356
+#, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
-msgstr "ÕýÁ¬Ïßµ½ %s"
+msgstr "使用 %s 的 SSL/TLS 连接 (%s/%s/%s)"
 
-#: mutt_ssl_gnutls.c:567
-#, fuzzy
+#: mutt_ssl_gnutls.c:563 mutt_ssl_gnutls.c:712
 msgid "Error initialising gnutls certificate data"
-msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
+msgstr "无法初始化 gnutls 证书数据。"
 
-#: mutt_ssl_gnutls.c:574
+#: mutt_ssl_gnutls.c:570 mutt_ssl_gnutls.c:719
 msgid "Error processing certificate data"
-msgstr ""
+msgstr "处理证书数据出错"
+
+#: mutt_ssl_gnutls.c:703
+msgid "Warning: Server certificate was signed using an insecure algorithm"
+msgstr "警告：服务器证书是使用不安全的算法签署的"
 
-#: mutt_ssl_gnutls.c:754
+#: mutt_ssl_gnutls.c:822
 #, c-format
 msgid "SHA1 Fingerprint: %s"
-msgstr ""
+msgstr "SHA1 指纹：%s"
 
-#: mutt_ssl_gnutls.c:757
+#: mutt_ssl_gnutls.c:825
 #, c-format
 msgid "MD5 Fingerprint: %s"
-msgstr ""
+msgstr "MD5 指纹：%s"
 
-#: mutt_ssl_gnutls.c:762
+#: mutt_ssl_gnutls.c:830
 msgid "WARNING: Server certificate is not yet valid"
-msgstr ""
+msgstr "警告：服务器证书尚未有效"
 
-#: mutt_ssl_gnutls.c:767
+#: mutt_ssl_gnutls.c:835
 msgid "WARNING: Server certificate has expired"
-msgstr ""
+msgstr "警告：服务器证书已过期"
 
-#: mutt_ssl_gnutls.c:772
+#: mutt_ssl_gnutls.c:840
 msgid "WARNING: Server certificate has been revoked"
-msgstr ""
+msgstr "警告服务器证书已吊销"
 
-#: mutt_ssl_gnutls.c:777
+#: mutt_ssl_gnutls.c:845
 msgid "WARNING: Server hostname does not match certificate"
-msgstr ""
+msgstr "警告：服务器主机名与证书不匹配"
 
-#: mutt_ssl_gnutls.c:782
+#: mutt_ssl_gnutls.c:850
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr ""
+msgstr "警告：服务器证书签署者不是证书颁发机构(CA)"
 
-#: mutt_ssl_gnutls.c:895
+#: mutt_ssl_gnutls.c:956
 #, c-format
 msgid "Certificate verification error (%s)"
-msgstr ""
+msgstr "证书验证错误 (%s)"
 
-#: mutt_ssl_gnutls.c:904
+#: mutt_ssl_gnutls.c:965
 msgid "Certificate is not X.509"
-msgstr ""
+msgstr "证书不是 X.509"
 
 #: mutt_tunnel.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting with \"%s\"..."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+msgstr "正在通过\"%s\"连接..."
 
 #: mutt_tunnel.c:139
 #, c-format
 msgid "Tunnel to %s returned error %d (%s)"
-msgstr ""
+msgstr "通过隧道连接 %s 时返回错误 %d (%s)"
 
 #: mutt_tunnel.c:157 mutt_tunnel.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "Tunnel error talking to %s: %s"
-msgstr "ÕýÁ¬Ïßµ½ %s"
+msgstr "与 %s 通话时隧道错误：%s"
 
-#: muttlib.c:923
-#, fuzzy
+#: muttlib.c:976
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
-msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
+msgstr "文件是一个目录，在其下保存吗？[是(y), 否(n), 全部(a)]"
 
-#: muttlib.c:923
+#: muttlib.c:976
 msgid "yna"
-msgstr ""
+msgstr "yna"
 
-#: muttlib.c:939
+#: muttlib.c:992
 msgid "File is a directory, save under it?"
-msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
+msgstr "文件是一个目录，在其下保存吗？"
 
-#: muttlib.c:945
+#: muttlib.c:998
 msgid "File under directory: "
-msgstr "ÔÚĿ¼µ×ϵÄÎļþ£º"
+msgstr "在目录下的文件："
 
-#: muttlib.c:957
+#: muttlib.c:1010
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
-msgstr "ÎļþÒѾ­´æÔÚ, (o)¸²¸Ç, (a)¸½¼Ó, »òÊÇ (c)È¡Ïû ?"
+msgstr "文件已经存在, 覆盖(o), 附加(a), 或取消(c)？"
 
-#: muttlib.c:957
+#: muttlib.c:1010
 msgid "oac"
-msgstr ""
+msgstr "oac"
 
-#: muttlib.c:1441
-#, fuzzy
+#: muttlib.c:1511
 msgid "Can't save message to POP mailbox."
-msgstr "½«ÐżþдÈëµ½ÐÅÏä"
+msgstr "无法将新建保存到 POP 信箱。"
 
-#: muttlib.c:1450
+#: muttlib.c:1520
 #, c-format
 msgid "Append messages to %s?"
-msgstr "¸½¼ÓÐżþµ½ %s ?"
+msgstr "附加信件到 %s 末尾?"
 
-#: muttlib.c:1462
+#: muttlib.c:1532
 #, c-format
 msgid "%s is not a mailbox!"
-msgstr "%s ²»ÊÇÐÅÏ䣡"
+msgstr "%s 不是信箱！"
 
 #: mx.c:116
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
-msgstr "Ëø½øÊýÁ¿³¬¹ýÏ޶½« %s µÄËøÒƳý£¿"
+msgstr "超过锁计数上限，将 %s 的锁移除吗？"
 
 #: mx.c:128
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "ÎÞ·¨Óà dotlock Ëøס %s¡£\n"
+msgstr "无法 dotlock %s。\n"
 
 #: mx.c:184
 msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "³¢ÊÔ fcntl µÄËø¶¨Ê±³¬¹ýʱ¼ä!"
+msgstr "尝试 fcntl 加锁时超时！"
 
 #: mx.c:190
 #, c-format
 msgid "Waiting for fcntl lock... %d"
-msgstr "ÕýÔڵȴý fcntl µÄËø¶¨¡­ %d"
+msgstr "正在等待 fcntl 加锁... %d"
 
 #: mx.c:217
 msgid "Timeout exceeded while attempting flock lock!"
-msgstr "³¢ÊÔ flock ʱ³¬¹ýʱ¼ä£¡"
+msgstr "尝试 flock 加锁时超时！"
 
 #: mx.c:224
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "ÕýÔڵȴý flock Ö´Ðгɹ¦¡­ %d"
+msgstr "正在等待尝试 flock... %d"
 
-#: mx.c:586
+#: mx.c:555
 #, c-format
 msgid "Couldn't lock %s\n"
-msgstr "ÎÞ·¨Ëøס %s¡£\n"
+msgstr "无法锁住 %s。\n"
 
-#: mx.c:798
+#: mx.c:771
 #, c-format
 msgid "Could not synchronize mailbox %s!"
-msgstr "ÎÞ·¨Óë %s ÐÅÏäͬ²½£¡"
+msgstr "无法与 %s 信箱同步！"
 
-#: mx.c:862
+#: mx.c:835
 #, c-format
 msgid "Move read messages to %s?"
-msgstr "°áÒÆÒѶÁÈ¡µÄÐżþµ½ %s£¿"
+msgstr "移动已读取的信件到 %s？"
 
-#: mx.c:878 mx.c:1130
+#: mx.c:851 mx.c:1111
 #, c-format
 msgid "Purge %d deleted message?"
-msgstr "Çå³ý %d ·âÒѾ­±»É¾³ýµÄÐżþ£¿"
+msgstr "清除 %d 封已经被删除的信件？"
 
-#: mx.c:878 mx.c:1130
+#: mx.c:851 mx.c:1111
 #, c-format
 msgid "Purge %d deleted messages?"
-msgstr "Çå³ý %d ·âÒѱ»É¾³ýµÄÐżþ£¿"
+msgstr "清除 %d 封已被删除的信件？"
 
-#: mx.c:898
+#: mx.c:872
 #, c-format
 msgid "Moving read messages to %s..."
-msgstr "ÕýÔÚ°áÒÆÒѾ­¶ÁÈ¡µÄÐżþµ½ %s ¡­"
+msgstr "正在搬移已经读取的信件到 %s ..."
 
-#: mx.c:957 mx.c:1121
+#: mx.c:932 mx.c:1102
 msgid "Mailbox is unchanged."
-msgstr "ÐÅÏäûÓиı䡣"
+msgstr "信箱没有改变。"
 
-#: mx.c:993
+#: mx.c:972
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»°áÒÆ, %d ·âÐżþ±»É¾³ý¡£"
+msgstr "保留 %d 封，移动 %d 封，删除 %d 封。"
 
-#: mx.c:996 mx.c:1170
+#: mx.c:975 mx.c:1154
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»É¾³ý¡£"
+msgstr "保留 %d 封，删除 %d 封。"
 
-#: mx.c:1106
+#: mx.c:1086
 #, c-format
 msgid " Press '%s' to toggle write"
-msgstr " Çë°´Ï '%s' À´Çл»Ð´Èëģʽ"
+msgstr " 请按下 '%s' 来切换写入"
 
-#: mx.c:1108
+#: mx.c:1088
 msgid "Use 'toggle-write' to re-enable write!"
-msgstr "ÇëʹÓà 'toggle-write' À´ÖØÐÂÆô¶¯Ð´È빦ÄÜ!"
+msgstr "请使用 'toggle-write' 来重新启动写入!"
 
-#: mx.c:1110
+#: mx.c:1090
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
-msgstr "ÐÅÏä±»±ê¼Ç³ÉΪÎÞ·¨Ð´ÈëµÄ. %s"
+msgstr "信箱已标记为不可写。%s"
 
-#: mx.c:1167
-#, fuzzy
+#: mx.c:1148
 msgid "Mailbox checkpointed."
-msgstr "ÓÊÏäÒÑɾ³ý¡£"
+msgstr "信箱已检查。"
 
-#: mx.c:1479
-#, fuzzy
+#: mx.c:1466
 msgid "Can't write message"
-msgstr "±à¼­ÐżþÄÚÈÝ"
+msgstr "无法写入信件"
 
-#: mx.c:1524
+#: mx.c:1505
 msgid "Integer overflow -- can't allocate memory."
-msgstr ""
+msgstr "整数溢出 -- 无法分配到内存。"
 
-#: pager.c:1480
+#: pager.c:1531
 msgid "PrevPg"
-msgstr "ÉÏÒ»Ò³"
+msgstr "上一页"
 
-#: pager.c:1481
+#: pager.c:1532
 msgid "NextPg"
-msgstr "ÏÂÒ»Ò³"
+msgstr "下一页"
 
-#: pager.c:1485
+#: pager.c:1536
 msgid "View Attachm."
-msgstr "ÏÔʾ¸½¼þ¡£"
+msgstr "显示附件。"
 
-#: pager.c:1488
+#: pager.c:1539
 msgid "Next"
-msgstr "ÏÂÒ»¸ö"
+msgstr "下一个"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1889 pager.c:1920 pager.c:1952 pager.c:2208
+#: pager.c:1940 pager.c:1971 pager.c:2003 pager.c:2279
 msgid "Bottom of message is shown."
-msgstr "ÏÖÕýÏÔʾ×îÏÂÃæµÄÐżþ¡£"
+msgstr "已显示信件的最末端。"
 
-#: pager.c:1905 pager.c:1927 pager.c:1934 pager.c:1941
+#: pager.c:1956 pager.c:1978 pager.c:1985 pager.c:1992
 msgid "Top of message is shown."
-msgstr "ÏÖÕýÏÔʾ×îÉÏÃæµÄÐżþ¡£"
-
-#: pager.c:2024
-msgid "Reverse search: "
-msgstr "·´ÏòËÑÑ°£º"
+msgstr "已显示信件的最上端。"
 
-#: pager.c:2025
-msgid "Search: "
-msgstr "ËÑÑ°£º"
-
-#: pager.c:2146
+#: pager.c:2217
 msgid "Help is currently being shown."
-msgstr "ÏÖÕýÏÔʾ˵Ã÷Îļþ¡£"
+msgstr "现在正显示帮助。"
 
-#: pager.c:2175
+#: pager.c:2246
 msgid "No more quoted text."
-msgstr "²»ÄÜÓÐÔÙ¶àµÄÒýÑÔ¡£"
+msgstr "无更多引用文本。"
 
-#: pager.c:2188
+#: pager.c:2259
 msgid "No more unquoted text after quoted text."
-msgstr "ÔÚÒýÑÔºóÓйý¶àµÄ·ÇÒýÑÔÎÄ×Ö¡£"
+msgstr "引用文本后没有其他未引用文本。"
 
 #: parse.c:577
 msgid "multipart message has no boundary parameter!"
-msgstr "¶à²¿·ÝÓʼþûÓзָôµÄ²ÎÊý!"
+msgstr "多部份信件没有边界参数！"
 
-#: pattern.c:262
+#: pattern.c:264
 #, c-format
 msgid "Error in expression: %s"
-msgstr "±í´ïʽÓдíÎó£º%s"
+msgstr "表达式有错误：%s"
 
-#: pattern.c:267
-#, fuzzy, c-format
+#: pattern.c:269
+#, c-format
 msgid "Empty expression"
-msgstr "±í´ïʽÓдíÎó"
+msgstr "空表达式"
 
-#: pattern.c:398
+#: pattern.c:402
 #, c-format
 msgid "Invalid day of month: %s"
-msgstr "ÎÞЧµÄÈÕ×Ó£º%s"
+msgstr "无效的日子：%s"
 
-#: pattern.c:412
+#: pattern.c:416
 #, c-format
 msgid "Invalid month: %s"
-msgstr "ÎÞЧµÄÔ·ݣº%s"
+msgstr "无效的月份：%s"
 
 #. getDate has its own error message, don't overwrite it here
-#: pattern.c:564
-#, fuzzy, c-format
+#: pattern.c:568
+#, c-format
 msgid "Invalid relative date: %s"
-msgstr "ÎÞЧµÄÔ·ݣº%s"
+msgstr "无效的相对日期：%s"
 
-#: pattern.c:578
+#: pattern.c:582
 msgid "error in expression"
-msgstr "±í´ïʽÓдíÎó"
+msgstr "表达式有错误"
 
-#: pattern.c:799 pattern.c:945
+#: pattern.c:804 pattern.c:956
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+msgstr "模式有错误：%s"
 
-#: pattern.c:829
+#: pattern.c:830
 #, fuzzy, c-format
-msgid "mismatched brackets: %s"
-msgstr "²»¶Ô³ÆµÄÀ¨»¡£º%s"
+msgid "missing pattern: %s"
+msgstr "缺少参数"
 
-#: pattern.c:885
-#, fuzzy, c-format
+#: pattern.c:840
+#, c-format
+msgid "mismatched brackets: %s"
+msgstr "不匹配的括号：%s"
+
+#: pattern.c:896
+#, c-format
 msgid "%c: invalid pattern modifier"
-msgstr "%c£ºÎÞЧµÄÖ¸Áî"
+msgstr "%c：无效模式修饰符"
 
-#: pattern.c:891
+#: pattern.c:902
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c£ºÔÚÕâ¸öģʽ²»Ö§³Ö"
+msgstr "%c：此模式下不支持"
 
-#: pattern.c:904
+#: pattern.c:915
 #, c-format
 msgid "missing parameter"
-msgstr "´íʧ²ÎÊý"
+msgstr "缺少参数"
 
-#: pattern.c:920
+#: pattern.c:931
 #, c-format
 msgid "mismatched parenthesis: %s"
-msgstr "²»¶Ô³ÆµÄÀ¨»¡£º%s"
+msgstr "不匹配的圆括号：%s"
 
-#: pattern.c:952
+#: pattern.c:963
 msgid "empty pattern"
-msgstr "¿ÕµÄ¸ñʽ"
+msgstr "空模式"
 
-#: pattern.c:1205
+#: pattern.c:1217
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "´íÎ󣺲»Ã÷µÄ op %d (Çë»Ø±¨Õâ¸ö´íÎó)¡£"
+msgstr "错误：未知操作(op) %d (请报告这个错误)。"
 
-#: pattern.c:1288 pattern.c:1423
+#: pattern.c:1300 pattern.c:1438
 msgid "Compiling search pattern..."
-msgstr "±àÒëËÑÑ°ÑùʽÖС­"
+msgstr "正在编译搜寻模式..."
 
-#: pattern.c:1307
+#: pattern.c:1320
 msgid "Executing command on matching messages..."
-msgstr "ÕýÔÚ¶Ô·ûºÏµÄÓʼþÖ´ÐÐÃüÁî¡­"
+msgstr "正在对符合的信件执行命令..."
 
-#: pattern.c:1374
+#: pattern.c:1387
 msgid "No messages matched criteria."
-msgstr "ûÓÐÓʼþ·ûºÏÒªÇó¡£"
+msgstr "没有信件符合标准。"
 
-#: pattern.c:1456
-#, fuzzy
+#: pattern.c:1467
 msgid "Searching..."
-msgstr "´¢´æÖС­"
+msgstr "正在搜索..."
 
-#: pattern.c:1469
+#: pattern.c:1480
 msgid "Search hit bottom without finding match"
-msgstr "ÒÑËÑÑ°ÖÁ½á⣬²¢Ã»Óз¢ÏÖÈκηûºÏ"
+msgstr "已搜寻至结尾而未发现匹配"
 
-#: pattern.c:1480
+#: pattern.c:1491
 msgid "Search hit top without finding match"
-msgstr "ÒÑËÑÑ°ÖÁ¿ªÍ·£¬²¢Ã»Óз¢ÏÖÈκηûºÏ"
+msgstr "已搜寻至开头而未发现匹配"
 
-#: pattern.c:1512
+#: pattern.c:1523
 msgid "Search interrupted."
-msgstr "ËÑÑ°Òѱ»Öжϡ£"
+msgstr "搜寻已中断。"
 
 #: pgp.c:90
 msgid "Enter PGP passphrase:"
-msgstr "ÇëÊäÈë PGP ͨÐÐÃÜÂ룺"
+msgstr "请输入 PGP 通行密码："
 
 #: pgp.c:104
 msgid "PGP passphrase forgotten."
-msgstr "ÒÑÍü¼Ç PGP ͨÐÐÃÜÂë¡£"
+msgstr "已忘记 PGP 通行密码。"
 
-#: pgp.c:357
+#: pgp.c:368
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
-msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
+msgstr "[-- 错误：无法建立 PGP 子进程！ --]\n"
 
-#: pgp.c:391 pgp.c:643 pgp.c:847
+#: pgp.c:402 pgp.c:659 pgp.c:863
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
 msgstr ""
-"[-- PGP Êä³ö²¿·Ý½áÊø --]\n"
+"[-- PGP 输出结束 --]\n"
 "\n"
 
-#: pgp.c:411 pgp.c:459 pgp.c:982
-#, fuzzy
+#: pgp.c:424 pgp.c:475 pgp.c:998
 msgid "Could not decrypt PGP message"
-msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
+msgstr "无法解密 PGP 信件"
 
 #. clear 'Invoking...' message, since there's no error
-#: pgp.c:461 pgp.c:978
-#, fuzzy
+#: pgp.c:477 pgp.c:994
 msgid "PGP message successfully decrypted."
-msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
+msgstr "PGP 信件成功解密。"
 
-#: pgp.c:751
-#, fuzzy
+#: pgp.c:767
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
-msgstr "ÄÚ²¿´íÎó¡£ÁªÂç <rosessler@does-not-exist.org>¡£"
+msgstr "内部错误。请通知 <rosessler@does-not-exist.org>。"
 
-#: pgp.c:812
+#: pgp.c:828
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
 msgstr ""
-"[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
+"[-- 错误：无法建立 PGP 子进程！ --]\n"
 "\n"
 
-#: pgp.c:859
-#, fuzzy
+#: pgp.c:875
 msgid "Decryption failed"
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "解密失败。"
 
-#: pgp.c:1034
+#: pgp.c:1050
 msgid "Can't open PGP subprocess!"
-msgstr "ÎÞ·¨´ò¿ª PGP ×Ó³ÌÐò£¡"
+msgstr "无法打开 PGP 子进程！"
 
-#: pgp.c:1471
+#: pgp.c:1487
 msgid "Can't invoke PGP"
-msgstr "²»ÄÜÖ´ÐÐ PGP"
+msgstr "不能调用 PGP"
 
-#: pgp.c:1572
+#: pgp.c:1592
 #, fuzzy, c-format
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
-msgstr "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, (i)nline, »ò (f)·ÅÆú£¿"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, or (c)lear? "
+msgstr "PGP 加密(e)，签署(s)，选择身份签署(a)，同时(b)，%s，或清除(c)？"
 
-#: pgp.c:1573
+#: pgp.c:1593
 msgid "PGP/M(i)ME"
-msgstr ""
+msgstr "PGP/M(i)ME"
 
-#: pgp.c:1573
+#: pgp.c:1593
 msgid "(i)nline"
-msgstr ""
+msgstr "嵌入(i)"
+
+#. The keys accepted for this prompt *must* match the order in the second
+#. * version in the else clause since the switch statement below depends on
+#. * it.  The 'i' key is appended in this version.
+#.
+#: pgp.c:1599
+#, fuzzy
+msgid "esabfci"
+msgstr "esabpfc"
+
+#. The keys accepted *must* be a prefix of the accepted keys in the "if"
+#. * clause above since the switch statement below depends on it.
+#.
+#: pgp.c:1606
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? "
+msgstr "PGP 加密(e)，签署(s)，选择身份签署(a)，同时(b)，%s，或清除(c)？"
 
-#: pgp.c:1575
+#: pgp.c:1607
 #, fuzzy
-msgid "esabifc"
-msgstr "esabif"
+msgid "esabfc"
+msgstr "esabpfc"
 
 #: pgpinvoke.c:308
 msgid "Fetching PGP key..."
-msgstr "ÄÃÈ¡ PGP Ô¿³×ÖС­"
+msgstr "正在取回 PGP 密钥..."
 
 #: pgpkey.c:491
-#, fuzzy
 msgid "All matching keys are expired, revoked, or disabled."
-msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+msgstr "所有匹配的迷药已过期，吊销或禁用。"
 
 #: pgpkey.c:532
-#, fuzzy, c-format
+#, c-format
 msgid "PGP keys matching <%s>."
-msgstr "PGP Ô¿³×·ûºÏ \"%s\"¡£"
+msgstr "符合<%s>的 PGP 密钥。"
 
 #: pgpkey.c:534
 #, c-format
 msgid "PGP keys matching \"%s\"."
-msgstr "PGP Ô¿³×·ûºÏ \"%s\"¡£"
+msgstr "符合 \"%s\" 的 PGP 密钥。"
 
 #: pgpkey.c:553 pgpkey.c:745
 msgid "Can't open /dev/null"
-msgstr "ÎÞ·¨´ò¿ª /dev/null"
+msgstr "无法打开 /dev/null"
 
 #: pgpkey.c:724
 msgid "Please enter the key ID: "
-msgstr "ÇëÊäÈëÕâ°ÑÔ¿³×µÄ ID£º"
+msgstr "请输入密钥 ID："
 
 #: pgpkey.c:777
 #, c-format
 msgid "PGP Key %s."
-msgstr "PGP Ô¿³× %s¡£"
+msgstr "PGP 钥匙 %s。"
 
-#: pop.c:101 pop_lib.c:201
-#, fuzzy, c-format
+#: pop.c:101 pop_lib.c:210
+#, c-format
 msgid "Command TOP is not supported by server."
-msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
+msgstr "服务器不支持 TOP 命令。"
 
 #: pop.c:128
-#, fuzzy
 msgid "Can't write header to temporary file!"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
+msgstr "无法将标头写入临时文件！"
 
-#: pop.c:267 pop_lib.c:203
-#, fuzzy, c-format
+#: pop.c:267 pop_lib.c:212
+#, c-format
 msgid "Command UIDL is not supported by server."
-msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
+msgstr "服务器不支持 UIDL 命令。"
 
-#: pop.c:391 pop.c:761
+#: pop.c:287
+#, c-format
+msgid "%d messages have been lost. Try reopening the mailbox."
+msgstr "%d 个信件已丢失。请尝试重新打开信箱。"
+
+#: pop.c:402 pop.c:785
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr ""
+msgstr "%s 是无效的 POP 路径"
 
-#: pop.c:429
-#, fuzzy
+#: pop.c:445
 msgid "Fetching list of messages..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "正在取回信件列表..."
 
-#: pop.c:587
-#, fuzzy
+#: pop.c:603
 msgid "Can't write message to temporary file!"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
+msgstr "无法将新建写入临时文件！"
 
-#: pop.c:646
-#, fuzzy
+#: pop.c:662
 msgid "Marking messages deleted..."
-msgstr "±êÇ©Á赀 %d ·âÐżþɾȥÁË¡­"
+msgstr "正在标记邮件为已删除..."
 
-#: pop.c:716 pop.c:781
-#, fuzzy
+#: pop.c:740 pop.c:805
 msgid "Checking for new messages..."
-msgstr "×¼±¸×ª¼ÄÐżþ¡­"
+msgstr "正在检查新邮件..."
 
-#: pop.c:745
+#: pop.c:769
 msgid "POP host is not defined."
-msgstr "POP Ö÷»úûÓỶ¨Òå¡£"
+msgstr "未定义 POP 主机。"
 
-#: pop.c:809
+#: pop.c:833
 msgid "No new mail in POP mailbox."
-msgstr "POP ÐÅÏäÖÐûÓÐеÄÐżþ"
+msgstr "POP 信箱中没有新信件"
 
-#: pop.c:816
-#, fuzzy
+#: pop.c:840
 msgid "Delete messages from server?"
-msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+msgstr "删除服务器上的信件吗？"
 
-#: pop.c:818
-#, fuzzy, c-format
+#: pop.c:842
+#, c-format
 msgid "Reading new messages (%d bytes)..."
-msgstr "¶ÁÈ¡ÐÂÐżþ (%d λԪ×é)¡­"
+msgstr "正在读取新信件 (%d 字节)..."
 
-#: pop.c:860
+#: pop.c:884
 msgid "Error while writing mailbox!"
-msgstr "дÈëÐÅÏäʱ·¢Éú´íÎó£¡"
+msgstr "写入信箱时出错！"
 
-#: pop.c:864
-#, fuzzy, c-format
+#: pop.c:888
+#, c-format
 msgid "%s [%d of %d messages read]"
-msgstr "%s [ÒÑÔĶÁ %2d ·âÐżþÖÐµÄ %1d ·â]"
+msgstr "%s [已读取 %d 封信件，共 %d 封]"
 
-#: pop.c:887 pop_lib.c:369
+#: pop.c:911 pop_lib.c:378
 msgid "Server closed connection!"
-msgstr "ÓëËÅ·þÆ÷µÄÁª½áÖжÏÁË!"
+msgstr "服务器关闭了连接！"
 
 #: pop_auth.c:78
-#, fuzzy
 msgid "Authenticating (SASL)..."
-msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
+msgstr "正在验证(SASL)..."
 
 #: pop_auth.c:188
 msgid "POP timestamp is invalid!"
-msgstr ""
+msgstr "POP 时间戳无效！"
 
 #: pop_auth.c:193
-#, fuzzy
 msgid "Authenticating (APOP)..."
-msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
+msgstr "正在验证(APOP)..."
 
 #: pop_auth.c:216
-#, fuzzy
 msgid "APOP authentication failed."
-msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+msgstr "APOP 验证失败。"
 
 #: pop_auth.c:251
-#, fuzzy, c-format
+#, c-format
 msgid "Command USER is not supported by server."
-msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
+msgstr "服务器不支持 USER 命令。"
 
-#: pop_lib.c:199
-#, fuzzy
+#: pop_lib.c:55
+#, c-format
+msgid "Invalid 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:229
-#, fuzzy, c-format
+#: pop_lib.c:238
+#, c-format
 msgid "Error connecting to server: %s"
-msgstr "ÕýÁ¬Ïßµ½ %s"
+msgstr "连接到服务器时出错：%s"
 
-#: pop_lib.c:383
-#, fuzzy
+#: pop_lib.c:392
 msgid "Closing connection to POP server..."
-msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
+msgstr "正在关闭到 POP 服务器的连接..."
 
-#: pop_lib.c:553
-#, fuzzy
+#: pop_lib.c:563
 msgid "Verifying message indexes..."
-msgstr "дÈëÐżþµ½ %s ¡­"
+msgstr "正在验证信件索引..."
 
-#: pop_lib.c:575
-#, fuzzy
+#: pop_lib.c:585
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
+msgstr "连接丢失。重新连接到 POP 服务器吗？"
 
-#: postpone.c:164
+#: postpone.c:165
 msgid "Postponed Messages"
-msgstr "ÐżþÒѾ­±»Ñӳټijö"
+msgstr "信件已经被延迟寄出"
 
-#: postpone.c:244 postpone.c:253
+#: postpone.c:245 postpone.c:254
 msgid "No postponed messages."
-msgstr "ûÓб»ÑӳټijöµÄÐżþ¡£"
+msgstr "没有被延迟寄出的信件。"
 
-#: postpone.c:441 postpone.c:462 postpone.c:496
-#, fuzzy
+#: postpone.c:442 postpone.c:463 postpone.c:497
 msgid "Illegal crypto header"
-msgstr "²»ºÏ¹æ¶¨µÄ PGP ±êÍ·"
+msgstr "非法的加密(crypto)标头"
 
-#: postpone.c:482
-#, fuzzy
+#: postpone.c:483
 msgid "Illegal S/MIME header"
-msgstr "²»ºÏ¹æ¶¨µÄ S/MIME ±êÍ·"
+msgstr "非法的 S/MIME 标头"
 
-#: postpone.c:562
-#, fuzzy
+#: postpone.c:563
 msgid "Decrypting message..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "正在解密信件..."
 
-#: postpone.c:571
-#, fuzzy
+#: postpone.c:572
 msgid "Decryption failed."
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "解密失败。"
 
 #: query.c:50
 msgid "New Query"
-msgstr "еIJéѯ"
+msgstr "新的查询"
 
 #: query.c:51
 msgid "Make Alias"
-msgstr "ÖÆ×÷±ðÃû"
+msgstr "制作别名"
 
 #: query.c:52
 msgid "Search"
-msgstr "ËÑÑ°"
+msgstr "搜索"
 
 #: query.c:95
 msgid "Waiting for response..."
-msgstr "µÈ´ý»ØÓ¦ÖС­"
+msgstr "正在等待回应..."
 
 #: query.c:246 query.c:274
 msgid "Query command not defined."
-msgstr "²éѯָÁîÉÐ䶨Òå¡£"
+msgstr "查询命令未定义。"
 
 #: query.c:301
 #, c-format
 msgid "Query"
-msgstr "²éѯ"
+msgstr "查询"
 
 #. Prompt for Query
 #: query.c:313 query.c:338
 msgid "Query: "
-msgstr "²éѯ£º"
+msgstr "查询："
 
 #: query.c:321 query.c:347
 #, c-format
 msgid "Query '%s'"
-msgstr "²éѯ '%s'"
+msgstr "查询 '%s'"
 
 #: recvattach.c:55
 msgid "Pipe"
-msgstr "¹ÜÏß"
+msgstr "管道"
 
 #: recvattach.c:56
 msgid "Print"
-msgstr "ÏÔʾ"
+msgstr "打印"
 
-#: recvattach.c:472
+#: recvattach.c:484
 msgid "Saving..."
-msgstr "´¢´æÖС­"
+msgstr "正在保存..."
 
-#: recvattach.c:475 recvattach.c:566
+#: recvattach.c:487 recvattach.c:578
 msgid "Attachment saved."
-msgstr "¸½¼þÒѱ»´¢´æ¡£"
+msgstr "附件已保存。"
 
-#: recvattach.c:578
+#: recvattach.c:590
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "¾¯¸æ! ÄúÕýÔÚ¸²¸Ç %s, ÊÇ·ñÒª¼ÌÐø?"
+msgstr "警告! 您正在覆盖 %s, 是否要继续?"
 
-#: recvattach.c:596
+#: recvattach.c:608
 msgid "Attachment filtered."
-msgstr "¸½¼þ±»¹ýÂ˵ô¡£"
+msgstr "附件已被过滤。"
 
-#: recvattach.c:663
+#: recvattach.c:675
 msgid "Filter through: "
-msgstr "¾­¹ý¹ýÂË£º"
+msgstr "经过过滤："
 
-#: recvattach.c:663
+#: recvattach.c:675
 msgid "Pipe to: "
-msgstr "µ¼ÒýÖÁ£º"
+msgstr "通过管道传给："
 
-#: recvattach.c:698
+#: recvattach.c:710
 #, c-format
 msgid "I dont know how to print %s attachments!"
-msgstr "ÎÒ²»ÖªµÀÒªÔõô´òÓ¡ %s ¸½¼þ!"
+msgstr "我不知道要怎么打印附件 %s！"
 
-#: recvattach.c:763
+#: recvattach.c:775
 msgid "Print tagged attachment(s)?"
-msgstr "ÊÇ·ñÒª´òÓ¡±ê¼ÇÆðÀ´µÄ¸½¼þ?"
+msgstr "打印已标记的附件？"
 
-#: recvattach.c:763
+#: recvattach.c:775
 msgid "Print attachment?"
-msgstr "ÊÇ·ñÒª´òÓ¡¸½¼þ?"
+msgstr "打印附件？"
 
-#: recvattach.c:996
-#, fuzzy
+#: recvattach.c:1008
 msgid "Can't decrypt encrypted message!"
-msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
+msgstr "无法解密加密信件！"
 
-#: recvattach.c:1008
+#: recvattach.c:1020
 msgid "Attachments"
-msgstr "¸½¼þ"
+msgstr "附件"
 
-#: recvattach.c:1044
-#, fuzzy
+#: recvattach.c:1056
 msgid "There are no subparts to show!"
-msgstr "ûÓи½¼þ¡£"
+msgstr "无子部分可显示！"
 
-#: recvattach.c:1105
-#, fuzzy
+#: recvattach.c:1117
 msgid "Can't delete attachment from POP server."
-msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
+msgstr "无法从 POP 服务器上删除附件"
 
-#: recvattach.c:1113
-#, fuzzy
+#: recvattach.c:1125
 msgid "Deletion of attachments from encrypted messages is unsupported."
-msgstr "δ֧³Öɾ³ý PGP ÐżþËù¸½´øµÄ¸½¼þ¡£"
+msgstr "不支持从加密信件中删除附件。"
 
-#: recvattach.c:1132 recvattach.c:1149
+#: recvattach.c:1144 recvattach.c:1161
 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:213
-#, fuzzy
+#: recvcmd.c:148 recvcmd.c:161
+msgid "Warning: message contains no From: header"
+msgstr "警告：信件未包含 From: 标头"
+
+#: recvcmd.c:241
 msgid "Error bouncing message!"
-msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
+msgstr "退回信件出错！"
 
-#: recvcmd.c:213
-#, fuzzy
+#: recvcmd.c:241
 msgid "Error bouncing messages!"
-msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
+msgstr "退回信件出错！"
 
-#: recvcmd.c:413
-#, fuzzy, c-format
+#: recvcmd.c:441
+#, c-format
 msgid "Can't open temporary file %s."
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
+msgstr "无法打开临时文件 %s。"
 
-#: recvcmd.c:444
-#, fuzzy
+#: recvcmd.c:472
 msgid "Forward as attachments?"
-msgstr "ÏÔʾ MIME ¸½¼þ"
+msgstr "作为附件转发？"
 
-#: recvcmd.c:458
+#: recvcmd.c:486
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
-msgstr ""
+msgstr "无法解码所有已标记的附件。通过 MIME 转发其它的吗？"
 
-#: recvcmd.c:583
+#: recvcmd.c:611
 msgid "Forward MIME encapsulated?"
-msgstr "Óà MIME µÄ·½Ê½À´×ª¼Ä£¿"
+msgstr "用 MIME 封装并转发？"
 
-#: recvcmd.c:591 recvcmd.c:841
-#, fuzzy, c-format
+#: recvcmd.c:619 recvcmd.c:869
+#, c-format
 msgid "Can't create %s."
-msgstr "ÎÞ·¨½¨Á¢ %s: %s."
+msgstr "无法建立 %s。"
 
-#: recvcmd.c:724
-#, fuzzy
+#: recvcmd.c:752
 msgid "Can't find any tagged messages."
-msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
+msgstr "无法找到任何已标记信件。"
 
-#: recvcmd.c:745 send.c:727
+#: recvcmd.c:773 send.c:738
 msgid "No mailing lists found!"
-msgstr "ûÓÐÕÒµ½ÓʼÄÂÛ̳£¡"
+msgstr "没有找到邮件列表！"
 
-#: recvcmd.c:820
+#: recvcmd.c:848
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
-msgstr ""
+msgstr "无法解码所有已标记的附件。通过 MIME 封装其它的吗？"
 
 #: remailer.c:485
-#, fuzzy
 msgid "Append"
-msgstr "¼Ä³ö"
+msgstr "附加到末尾"
 
 #: remailer.c:486
 msgid "Insert"
-msgstr ""
+msgstr "插入"
 
 #: remailer.c:487
-#, fuzzy
 msgid "Delete"
-msgstr "Ñ¡Ôñ"
+msgstr "删除"
 
 #: remailer.c:489
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: remailer.c:517
 msgid "Can't get mixmaster's type2.list!"
-msgstr ""
+msgstr "无法获得 mixmaster 的 type2.list！"
 
 #: remailer.c:542
-#, fuzzy
 msgid "Select a remailer chain."
-msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
+msgstr "选择一个转发者链。"
 
 #: remailer.c:602
 #, c-format
 msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr ""
+msgstr "错误：%s 不能用作链的最终转发者。"
 
 #: remailer.c:632
 #, c-format
 msgid "Mixmaster chains are limited to %d elements."
-msgstr ""
+msgstr "Mixmaster 链有 %d 个元素的限制。"
 
 #: remailer.c:655
 msgid "The remailer chain is already empty."
-msgstr ""
+msgstr "转发者链已经为空。"
 
 #: remailer.c:665
-#, fuzzy
 msgid "You already have the first chain element selected."
-msgstr "ÄúÒѾ­ÔÚµÚÒ»·âÐÅÁË¡£"
+msgstr "您已经选择了第一个链元素。"
 
 #: remailer.c:675
 msgid "You already have the last chain element selected."
-msgstr ""
+msgstr "您已经选择了最后的链元素"
 
 #: remailer.c:714
 msgid "Mixmaster doesn't accept Cc or Bcc headers."
-msgstr ""
+msgstr "Mixmaster 不接受转发(Cc)或密件转发(Bcc)标头"
 
 #: remailer.c:738
 msgid ""
 "Please set the hostname variable to a proper value when using mixmaster!"
-msgstr ""
+msgstr "使用 mixmaster 时请给 hostname(主机名)变量设置合适的值！"
 
 #: remailer.c:772
-#, fuzzy, c-format
+#, c-format
 msgid "Error sending message, child exited %d.\n"
-msgstr "¼ÄËÍѶϢ³öÏÖ´íÎó£¬×Ó³ÌÐòÒѽáÊø %d (%s)¡£"
+msgstr "发送信件出错，子进程已退出 %d。\n"
 
 #: remailer.c:776
 msgid "Error sending message."
-msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
+msgstr "发送信件出错。"
 
-#: rfc1524.c:163
+#: rfc1524.c:164
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "ÔÚ \"%2$s\" µÄµÚ %3$d Ðз¢ÏÖÀà±ð %1$s Ϊ´íÎóµÄ¸ñʽ¼Í¼"
+msgstr "在 \"%2$s\" 的第 %3$d 行发现类型 %1$s 为错误的格式纪录"
 
-#: rfc1524.c:395
+#: rfc1524.c:396
 msgid "No mailcap path specified"
-msgstr "ûÓÐÖ¸¶¨ mailcap ·¾¶"
+msgstr "没有指定 mailcap 路径"
 
-#: rfc1524.c:423
+#: rfc1524.c:424
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "ûÓз¢ÏÖÀàÐÍ %s µÄ mailcap ¼Í¼"
+msgstr "没有发现类型 %s 的 mailcap 纪录"
 
 #: score.c:75
 msgid "score: too few arguments"
-msgstr "·ÖÊý£ºÌ«ÉٵIJÎÊý"
+msgstr "分数：参数太少"
 
 #: score.c:84
 msgid "score: too many arguments"
-msgstr "·ÖÊý£ºÌ«¶àµÄ²ÎÊý"
+msgstr "分数：参数太多"
+
+#: score.c:122
+msgid "Error: score: invalid number"
+msgstr "错误：分数：无效数字"
 
 #: send.c:252
 msgid "No subject, abort?"
-msgstr "ûÓбêÌ⣬Ҫ²»ÒªÖжϣ¿"
+msgstr "没有标题，中止吗？"
 
 #: send.c:254
 msgid "No subject, aborting."
-msgstr "ûÓбêÌ⣬ÕýÔÚÖжÏÖС£"
+msgstr "没有标题，正在中止。"
 
 #. There are quite a few mailing lists which set the Reply-To:
 #. * header field to the list address, which makes it quite impossible
 #. * to send a message to only the sender of the message.  This
 #. * provides a way to do that.
 #.
-#: send.c:496
+#: send.c:501
 #, c-format
 msgid "Reply to %s%s?"
-msgstr "Òª»Ø¸²¸ø %s%s?"
+msgstr "回信到 %s%s？"
 
-#: send.c:530
+#: send.c:535
 #, c-format
 msgid "Follow-up to %s%s?"
-msgstr "ÒÔºóµÄ»Ø¸²¶¼¼ÄÖÁ %s%s?"
+msgstr "发送后续信件到 %s%s？"
 
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.
 #.
-#: send.c:702
+#: send.c:713
 msgid "No tagged messages are visible!"
-msgstr "ûÓб»±ê¼ÇÁ˵ÄÐżþÔÚÏÔʾ£¡"
+msgstr "无可见的已标记信件！"
 
-#: send.c:753
+#: send.c:764
 msgid "Include message in reply?"
-msgstr "»ØÐÅʱÊÇ·ñÒª°üº¬Ô­±¾µÄÐżþÄÚÈÝ£¿"
+msgstr "回信使包含原信件吗？"
 
-#: send.c:758
+#: send.c:769
 msgid "Including quoted message..."
-msgstr "ÕýÒýÈëÒýÑÔ²¿·Ö¡­"
+msgstr "正在包含引用信件..."
 
-#: send.c:768
+#: send.c:779
 msgid "Could not include all requested messages!"
-msgstr "ÎÞ·¨°üº¬ËùÓÐÒªÇóµÄÐżþ£¡"
+msgstr "无法包含所有请求的信件！"
 
-#: send.c:782
-#, fuzzy
+#: send.c:793
 msgid "Forward as attachment?"
-msgstr "ÊÇ·ñÒª´òÓ¡¸½¼þ?"
+msgstr "作为附件转发？"
 
-#: send.c:786
+#: send.c:797
 msgid "Preparing forwarded message..."
-msgstr "×¼±¸×ª¼ÄÐżþ¡­"
+msgstr "正在准备转发信件..."
 
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:1116
+#: send.c:1147
 msgid "Recall postponed message?"
-msgstr "Òª½Ð³ö±»ÑÓ³ÙµÄÐżþ?"
+msgstr "叫出延迟寄出的信件吗？"
 
-#: send.c:1428
-#, fuzzy
+#: send.c:1379
 msgid "Edit forwarded message?"
-msgstr "×¼±¸×ª¼ÄÐżþ¡­"
+msgstr "编辑已转发的信件吗？"
 
-#: send.c:1468
+#: send.c:1419
 msgid "Abort unmodified message?"
-msgstr "ÊÇ·ñÒªÖжÏδÐ޸ĹýµÄÐżþ?"
+msgstr "中止未修改过的信件？"
 
-#: send.c:1470
+#: send.c:1421
 msgid "Aborted unmodified message."
-msgstr "ÖжÏûÓÐÐ޸ĹýµÄÐżþ"
+msgstr "已中止未修改过的信件。"
 
-#: send.c:1539
+#: send.c:1564
 msgid "Message postponed."
-msgstr "Ðżþ±»Ñӳټijö¡£"
+msgstr "信件被延迟寄出。"
 
-#: send.c:1548
+#: send.c:1574
 msgid "No recipients are specified!"
-msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕߣ¡"
+msgstr "没有指定接收者！"
 
-#: send.c:1553
+#: send.c:1579
 msgid "No recipients were specified."
-msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕß¡£"
+msgstr "没有已指定的接收者。"
 
-#: send.c:1569
+#: send.c:1595
 msgid "No subject, abort sending?"
-msgstr "ûÓÐÐżþ±êÌ⣬ҪÖжϼÄÐŵŤ×÷?"
+msgstr "没有信件标题，要中止发送吗?"
 
-#: send.c:1573
+#: send.c:1599
 msgid "No subject specified."
-msgstr "ûÓÐÖ¸¶¨±êÌâ¡£"
+msgstr "没有指定标题。"
 
-#: send.c:1635 smtp.c:161
+#: send.c:1661 smtp.c:185
 msgid "Sending message..."
-msgstr "¼Ä³öÐżþÖС­"
+msgstr "正在发送信件..."
 
-#: send.c:1776
+#. check to see if the user wants copies of all attachments
+#: send.c:1694
+msgid "Save attachments in Fcc?"
+msgstr "将附件保存到 Fcc 吗？"
+
+#: send.c:1803
 msgid "Could not send the message."
-msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
+msgstr "无法发送此信件。"
 
-#: send.c:1781
+#: send.c:1808
 msgid "Mail sent."
-msgstr "ÐżþÒѾ­¼Ä³ö¡£"
+msgstr "信件已发送。"
 
-#: send.c:1781
+#: send.c:1808
 msgid "Sending in background."
-msgstr "ÕýÔÚºǫ́´«ËÍ¡£"
+msgstr "正在后台发送。"
 
-#: sendlib.c:410
+#: sendlib.c:425
 msgid "No boundary parameter found! [report this error]"
-msgstr "ûÓз¢ÏÖ·Ö½ç±äÁ¿£¡[»Ø±¨´íÎó]"
+msgstr "没有发现分界变量！[请报告这个错误]"
 
-#: sendlib.c:440
+#: sendlib.c:455
 #, c-format
 msgid "%s no longer exists!"
-msgstr "%s ÒѾ­²»´æÔÚ£¡"
+msgstr "%s 已经不存在了！"
 
-#: sendlib.c:863
-#, fuzzy, c-format
+#: sendlib.c:878
+#, c-format
 msgid "%s isn't a regular file."
-msgstr "%s ²»ÊÇÐÅÏä¡£"
+msgstr "%s 不是常规文件。"
 
-#: sendlib.c:1035
+#: sendlib.c:1050
 #, c-format
 msgid "Could not open %s"
-msgstr "ÎÞ·¨´ò¿ª %s"
+msgstr "无法打开 %s"
 
-#: sendlib.c:2226
+#: sendlib.c:2414
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
-msgstr "¼ÄËÍѶϢ³öÏÖ´íÎó£¬×Ó³ÌÐòÒѽáÊø %d (%s)¡£"
+msgstr "发送信件出错，子进程已退出 %d (%s)。"
 
-#: sendlib.c:2232
+#: sendlib.c:2420
 msgid "Output of the delivery process"
-msgstr "Delivery process µÄÊä³ö"
+msgstr "Delivery process 的输出"
 
-#: sendlib.c:2396
+#: sendlib.c:2594
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
-msgstr ""
+msgstr "当准备 resent-from 时发生错误的 IDN %s。"
 
 #: signal.c:43
 #, c-format
 msgid "%s...  Exiting.\n"
-msgstr "%s¡­ ÕýÔÚÀ뿪¡£\n"
+msgstr "%s...  正在退出。\n"
 
 #: signal.c:46 signal.c:49
 #, c-format
 msgid "Caught %s...  Exiting.\n"
-msgstr "²¶×¥µ½ %s¡­ ÕýÔÚÀ뿪¡£\n"
+msgstr "捕捉到 %s...  正在退出。\n"
 
 #: signal.c:51
 #, c-format
 msgid "Caught signal %d...  Exiting.\n"
-msgstr "²¶×¥µ½ signal %d¡­ ÕýÔÚÀ뿪.\n"
+msgstr "捕捉到信号 %d...  正在退出。\n"
 
 #: smime.c:111
-#, fuzzy
 msgid "Enter S/MIME passphrase:"
-msgstr "ÇëÊäÈë S/MIME ͨÐÐÃÜÂ룺"
+msgstr "请输入 S/MIME 通行密码："
 
 #: smime.c:322
 msgid "Trusted   "
-msgstr ""
+msgstr "ä¿¡ä»»  "
 
 #: smime.c:325
 msgid "Verified  "
-msgstr ""
+msgstr "已验证"
 
 #: smime.c:328
 msgid "Unverified"
-msgstr ""
+msgstr "未验证"
 
 #: smime.c:331
-#, fuzzy
 msgid "Expired   "
-msgstr "À뿪  "
+msgstr "已过期"
 
 #: smime.c:334
 msgid "Revoked   "
-msgstr ""
+msgstr "已吊销"
 
 #: smime.c:337
-#, fuzzy
 msgid "Invalid   "
-msgstr "ÎÞЧµÄÔ·ݣº%s"
+msgstr "无效  "
 
 #: smime.c:340
-#, fuzzy
 msgid "Unknown   "
-msgstr "²»Ã÷µÄ´íÎó"
+msgstr "未知  "
 
-#: smime.c:369
-#, fuzzy
+#: smime.c:368
 msgid "Enter keyID: "
-msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
+msgstr "请输入密钥 ID："
 
-#: smime.c:392
-#, fuzzy, c-format
+#: smime.c:378
+#, c-format
 msgid "S/MIME certificates matching \"%s\"."
-msgstr "S/MIME Ô¿³×·ûºÏ \"%s\"¡£"
+msgstr "S/MIME 证书匹配 \"%s\"。"
 
-#: smime.c:540 smime.c:610 smime.c:628
+#: smime.c:526 smime.c:596 smime.c:614
 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
-msgstr ""
+msgstr "ID %s 未验证。您想要将其用于 %s 吗？"
 
-#: smime.c:544 smime.c:614
-#, fuzzy, c-format
+#: smime.c:530 smime.c:600
+#, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
-msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
+msgstr "要将(不被信任的！) ID %s 用于 %s 吗？"
 
-#: smime.c:547 smime.c:617
-#, fuzzy, c-format
+#: smime.c:533 smime.c:603
+#, c-format
 msgid "Use ID %s for %s ?"
-msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
+msgstr "要将 ID %s 用于 %s 吗？"
 
-#: smime.c:636
+#: smime.c:622
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
-msgstr ""
+msgstr "警告：您还没有决定信任 ID %s。(按任意键继续)"
 
-#: smime.c:795
+#: smime.c:781
 #, c-format
 msgid "No (valid) certificate found for %s."
-msgstr ""
+msgstr "未找到可用于 %s 的(有效)证书。"
 
-#: smime.c:850 smime.c:878 smime.c:943 smime.c:987 smime.c:1052 smime.c:1127
-#, fuzzy
+#: smime.c:836 smime.c:864 smime.c:929 smime.c:973 smime.c:1038 smime.c:1113
 msgid "Error: unable to create OpenSSL subprocess!"
-msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ OpenSSL ×Ó³ÌÐò£¡ --]\n"
+msgstr "错误：无法创建 OpenSSL 子进程！"
 
-#: smime.c:1205
-#, fuzzy
+#: smime.c:1191
 msgid "no certfile"
-msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
+msgstr "无证书文件"
 
-#: smime.c:1208
-#, fuzzy
+#: smime.c:1194
 msgid "no mbox"
-msgstr "£¨Ã»ÓÐÐÅÏ䣩"
+msgstr "没有信箱"
 
 #. fatal error while trying to encrypt message
-#: smime.c:1351
+#: smime.c:1337
 msgid "No output from OpenSSL.."
-msgstr ""
+msgstr "OpenSSL 没有输出.."
 
-#: smime.c:1389
+#: smime.c:1375
 msgid "Can't sign: No key specified. Use Sign As."
-msgstr ""
+msgstr "无法签署：没有指定密钥。请使用指定身份签署(Sign As)。"
 
-#: smime.c:1395
+#: smime.c:1382
 msgid "Warning: Intermediate certificate not found."
-msgstr ""
+msgstr "警告：未找到中间证书"
 
-#: smime.c:1438
-#, fuzzy
+#: smime.c:1429
 msgid "Can't open OpenSSL subprocess!"
-msgstr "ÎÞ·¨´ò¿ª OpenSSL ×Ó³ÌÐò£¡"
+msgstr "无法打开 OpenSSL 子进程！"
 
-#: smime.c:1476
+#: smime.c:1469
 msgid "No output from OpenSSL..."
-msgstr ""
+msgstr "OpenSSL 没有输出..."
 
-#: smime.c:1641 smime.c:1766
-#, fuzzy
+#: smime.c:1634 smime.c:1759
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
 msgstr ""
-"[-- OpenSSL Êä³ö²¿·Ý½áÊø --]\n"
+"[-- OpenSSL 输出结束 --]\n"
 "\n"
 
-#: smime.c:1725 smime.c:1736
-#, fuzzy
+#: smime.c:1718 smime.c:1729
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
-msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ OpenSSL ×Ó³ÌÐò£¡ --]\n"
+msgstr "[-- 错误：无法创建 OpenSSL 子进程！ --]\n"
 
-#: smime.c:1770
-#, fuzzy
+#: smime.c:1763
 msgid "[-- The following data is S/MIME encrypted --]\n"
-msgstr ""
-"[-- ÏÂÃæÊÇ S/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
-"\n"
+msgstr "[-- 以下数据已由 S/MIME 加密 --]\n"
 
-#: smime.c:1773
-#, fuzzy
+#: smime.c:1766
 msgid "[-- The following data is S/MIME signed --]\n"
-msgstr ""
-"[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
-"\n"
+msgstr "[-- 以下数据已由 S/MIME 签署 --]\n"
 
-#: smime.c:1837
-#, fuzzy
+#: smime.c:1830
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
 msgstr ""
 "\n"
-"[-- S/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+"[-- S/MIME 加密数据结束 --]\n"
 
-#: smime.c:1839
-#, fuzzy
+#: smime.c:1832
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
 msgstr ""
 "\n"
-"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
+"[-- S/MIME 签署的数据结束 --]\n"
 
-#: smime.c:1950
-#, fuzzy
+#: smime.c:1943
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
-"(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, Ñ¡Ôñ (m)ic ÑÝËã·¨ »ò (f)·Å"
-"Æú£¿"
+"S/MIME 加密(e)，签署(s)，选择身份加密(w)，选择身份签署(s)，同时(b)或清除(c)？"
 
-#: smime.c:1951
-#, fuzzy
+#: smime.c:1944
 msgid "eswabfc"
-msgstr "esabif"
+msgstr "eswabfc"
 
 #. I use "dra" because "123" is recognized anyway
-#: smime.c:1966
+#: smime.c:1959
 msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
-msgstr ""
+msgstr "选择算法类别：1: DES, 2: RC2, 3: AES, 或(c)清除？"
 
-#: smime.c:1969
+#: smime.c:1962
 msgid "drac"
-msgstr ""
+msgstr "drac"
 
-#: smime.c:1972
+#: smime.c:1965
 msgid "1: DES, 2: Triple-DES "
-msgstr ""
+msgstr "1: DES, 2: 三重DES"
 
-#: smime.c:1973
+#: smime.c:1966
 msgid "dt"
-msgstr ""
+msgstr "dt"
 
-#: smime.c:1985
+#: smime.c:1978
 msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
-msgstr ""
+msgstr "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 
-#: smime.c:1986
+#: smime.c:1979
 msgid "468"
-msgstr ""
+msgstr "468"
 
-#: smime.c:2001
+#: smime.c:1994
 msgid "1: AES128, 2: AES192, 3: AES256 "
-msgstr ""
+msgstr "1: AES128, 2: AES192, 3: AES256 "
 
-#: smime.c:2002
+#: smime.c:1995
 msgid "895"
-msgstr ""
+msgstr "895"
 
-#: smtp.c:116
-#, fuzzy, c-format
+#: smtp.c:134
+#, c-format
 msgid "SMTP session failed: %s"
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "SMTP 会话失败：%s"
 
-#: smtp.c:156
-#, fuzzy, c-format
+#: smtp.c:180
+#, c-format
 msgid "SMTP session failed: unable to open %s"
-msgstr "µÇÈëʧ°Ü¡£"
+msgstr "SMTP 会话失败：无法打开 %s"
 
-#: smtp.c:228
+#: smtp.c:258
 msgid "No from address given"
-msgstr ""
+msgstr "没有给出发信地址"
 
-#: smtp.c:284
+#: smtp.c:314
 msgid "SMTP session failed: read error"
-msgstr ""
+msgstr "SMTP 会话失败：读错误"
 
-#: smtp.c:286
+#: smtp.c:316
 msgid "SMTP session failed: write error"
-msgstr ""
+msgstr "SMTP 会话失败：写错误"
 
-#: smtp.c:309
-#, fuzzy, c-format
+#: smtp.c:318
+msgid "Invalid server response"
+msgstr "无效的服务器回应"
+
+#: smtp.c:341
+#, c-format
 msgid "Invalid SMTP URL: %s"
-msgstr "ÎÞЧµÄÔ·ݣº%s"
+msgstr "无效的 SMTP 链接(URL)：%s"
 
-#: smtp.c:419
+#: smtp.c:451
 msgid "SMTP server does not support authentication"
-msgstr ""
+msgstr "SMTP 服务器不支持认证"
 
-#: smtp.c:427
-#, fuzzy
+#: smtp.c:459
 msgid "SMTP authentication requires SASL"
-msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+msgstr "SMTP 认证需要 SASL"
 
-#: smtp.c:461
-#, fuzzy, c-format
+#: smtp.c:493
+#, c-format
 msgid "%s authentication failed, trying next method"
-msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+msgstr "%s 认证失败，正在尝试下一个方法"
 
-#: smtp.c:478
-#, fuzzy
+#: smtp.c:510
 msgid "SASL authentication failed"
-msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+msgstr "SASL 认证失败。"
 
 #: sort.c:265
 msgid "Sorting mailbox..."
-msgstr "ÐÅÏäÅÅÐòÖС­"
+msgstr "正在排序信箱..."
 
 #: sort.c:302
 msgid "Could not find sorting function! [report this bug]"
-msgstr "ÕÒ²»µ½ÅÅÐòµÄº¯Êý£¡[Çë»Ø±¨Õâ¸öÎÊÌâ]"
+msgstr "找不到排序函数！[请报告这个问题]"
 
 #: status.c:105
 msgid "(no mailbox)"
-msgstr "£¨Ã»ÓÐÐÅÏ䣩"
+msgstr "(没有信箱)"
 
-#: thread.c:1093
-#, fuzzy
+#: thread.c:1096
 msgid "Parent message is not visible in this limited view."
-msgstr "ÔÚÏÞÖÆÔÄÀÀģʽÏÂÎÞ·¨ÏÔʾÖ÷Ðżþ¡£"
+msgstr "父信件在此限制视图中不可见。"
 
-#: thread.c:1099
+#: thread.c:1102
 msgid "Parent message is not available."
-msgstr "Ö÷Ðżþ²»´æÔÚ¡£"
+msgstr "父信件不可用。"
 
 #: ../keymap_alldefs.h:5
 msgid "null operation"
-msgstr "¿ÕµÄÔËËã"
+msgstr "空操作"
 
 #: ../keymap_alldefs.h:6
 msgid "end of conditional execution (noop)"
-msgstr ""
+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"
-msgstr "ÓÃÎÄ×Ö·½Ê½ÏÔʾ¸½¼þÄÚÈÝ"
+msgstr "作为文本查看附件"
 
 #: ../keymap_alldefs.h:9
-#, fuzzy
 msgid "Toggle display of subparts"
-msgstr "Çл»ÒýÑÔÏÔʾ"
+msgstr "切换子部分的显示"
 
 #: ../keymap_alldefs.h:10
 msgid "move to the bottom of the page"
-msgstr "ÒƵ½±¾Ò³µÄ×îºóÃæ"
+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"
-msgstr "ÇëÑ¡Ôñ±¾Ä¿Â¼ÖÐÒ»¸öеÄÎļþ"
+msgstr "请选择本目录中一个新的文件"
 
 #: ../keymap_alldefs.h:13
 msgid "view file"
-msgstr "ÏÔʾÎļþ"
+msgstr "查看文件"
 
 #: ../keymap_alldefs.h:14
 msgid "display the currently selected file's name"
-msgstr "ÏÔʾËùÑ¡ÔñµÄÎļþ"
+msgstr "显示当前所选择的文件名"
 
 #: ../keymap_alldefs.h:15
-#, fuzzy
 msgid "subscribe to current mailbox (IMAP only)"
-msgstr "¶©ÔÄÕâ¸öÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
+msgstr "订阅当前信箱 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:16
-#, fuzzy
 msgid "unsubscribe from current mailbox (IMAP only)"
-msgstr "È¡Ïû¶©ÔÄÕâ¸öÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
+msgstr "取消订阅当前信箱 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:17
-#, fuzzy
 msgid "toggle view all/subscribed mailboxes (IMAP only)"
-msgstr "Çл»ÏÔʾ È«²¿/ÒѶ©ÔÄ µÄÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
+msgstr "切换查看 全部/已订阅 的信箱 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:18
-#, fuzzy
 msgid "list mailboxes with new mail"
-msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
+msgstr "列出有新邮件的信箱"
 
 #: ../keymap_alldefs.h:19
 msgid "change directories"
-msgstr "¸Ä±äĿ¼"
+msgstr "改变目录"
 
 #: ../keymap_alldefs.h:20
 msgid "check mailboxes for new mail"
-msgstr "¼ì²éÐÅÏäÊÇ·ñÓÐÐÂÐżþ"
+msgstr "检查信箱是否有新信件"
 
 #: ../keymap_alldefs.h:21
-#, fuzzy
 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"
-msgstr "±à¼­ CC Áбí"
+msgstr "编辑抄送(CC)列表"
 
 #: ../keymap_alldefs.h:25
 msgid "edit attachment description"
-msgstr "±à¼­¼ÐµµµÄ˵Ã÷"
+msgstr "编辑附件说明"
 
 #: ../keymap_alldefs.h:26
 msgid "edit attachment transfer-encoding"
-msgstr "±à¼­¼ÐµµµÄ´«Êä±àÂë·¨Ôò"
+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"
-msgstr "±à¼­Òª±»¼Ð´øµÄÎļþÃû³Æ"
+msgstr "编辑附件文件"
 
 #: ../keymap_alldefs.h:29
 msgid "edit the from field"
-msgstr "±à¼­·¢ÐÅÈËÀ¸Î»"
+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"
-msgstr "ʹÓà mailcap ±à¼­¼Ðµµ"
+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"
-msgstr "±à¼­ TO Áбí"
+msgstr "编辑 TO 列表"
 
 #: ../keymap_alldefs.h:36
 msgid "create a new mailbox (IMAP only)"
-msgstr "ÖÆÔìÐÂÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
+msgstr "创建新信箱 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:37
-#, fuzzy
 msgid "edit attachment content type"
-msgstr "±à¼­¸½¼þµÄµÄ content type"
+msgstr "编辑附件内容类型"
 
 #: ../keymap_alldefs.h:38
 msgid "get a temporary copy of an attachment"
-msgstr "È¡µÃ¸½¼þµÄÔݴ濽±´"
+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"
-msgstr "ʹÓà mailcap À´×éºÏеļеµ"
+msgstr "使用 mailcap 条目来编写新附件"
 
 #: ../keymap_alldefs.h:41
 msgid "toggle recoding of this attachment"
-msgstr "Çл»ÊÇ·ñÔÙΪ¸½¼þÖØбàÂë"
+msgstr "切换是否为此附件重新编码"
 
 #: ../keymap_alldefs.h:42
 msgid "save this message to send later"
-msgstr "´¢´æÐżþÒÔ±ãÉÔºó¼Ä³ö"
+msgstr "储存信件以便稍后寄出"
 
 #: ../keymap_alldefs.h:43
 msgid "rename/move an attached file"
-msgstr "¸ü¸ÄµµÃû/ÒƳý Ò»¸ö¼Ð´øµÄÎļþ"
+msgstr "改名/移动 附件文件"
 
 #: ../keymap_alldefs.h:44
 msgid "send the message"
-msgstr "¼Ä³öÐżþ"
+msgstr "发送信件"
 
 #: ../keymap_alldefs.h:45
 msgid "toggle disposition between inline/attachment"
-msgstr ""
+msgstr "在嵌入/附件之间切换"
 
 #: ../keymap_alldefs.h:46
 msgid "toggle whether to delete file after sending it"
-msgstr "¼Ä³öºóÇл»ÖÁÊÇ·ñɾ³ýÎļþ"
+msgstr "切换发送后是否删除文件"
 
 #: ../keymap_alldefs.h:47
 msgid "update an attachment's encoding info"
-msgstr "¸üи½¼þµÄ±àÂë×ÊѶ"
+msgstr "更新附件的编码信息"
 
 #: ../keymap_alldefs.h:48
 msgid "write the message to a folder"
-msgstr "´æÈëÒ»·âÐżþµ½Ä³¸öÎļþ¼Ð"
+msgstr "将信件写到文件夹"
 
 #: ../keymap_alldefs.h:49
 msgid "copy a message to a file/mailbox"
-msgstr "¿½±´Ò»·âÐżþµ½Ä³¸öÎļþ»òÐÅÏä"
+msgstr "复制一封信件到文件/信箱"
 
 #: ../keymap_alldefs.h:50
 msgid "create an alias from a message sender"
-msgstr "½¨Á¢Ä³·âÐżþ¼ÄÐÅÈ˵ıðÃû"
+msgstr "从信件的发件人创建别名"
 
 #: ../keymap_alldefs.h:51
 msgid "move entry to bottom of screen"
-msgstr "ÒÆÖÁÓ©Ä»½áβ"
+msgstr "移动条目到屏幕底端"
 
 #: ../keymap_alldefs.h:52
 msgid "move entry to middle of screen"
-msgstr "ÒÆÖÁÓ©Ä»ÖÐÑë"
+msgstr "移动条目到屏幕中央"
 
 #: ../keymap_alldefs.h:53
 msgid "move entry to top of screen"
-msgstr "ÒÆÖÁÓ©Ä»¿ªÍ·"
+msgstr "移动条目到屏幕顶端"
 
 #: ../keymap_alldefs.h:54
 msgid "make decoded (text/plain) copy"
-msgstr "ÖÆ×÷¿É½âÂëµÄ (text/plain) ¿½±´"
+msgstr "制作已解码的(text/plain)副本"
 
 #: ../keymap_alldefs.h:55
 msgid "make decoded copy (text/plain) and delete"
-msgstr "ÖÆ×÷¿É½âÂëµÄ¿½±´ (text/plain) ²¢ÇÒɾ³ýÖ®"
+msgstr "制作已解码的副本(text/plain)并且删除之"
 
 #: ../keymap_alldefs.h:56
 msgid "delete the current entry"
-msgstr "ɾ³ýËùÔÚµÄÐżþ×ÊÁÏ"
+msgstr "删除当前条目"
 
 #: ../keymap_alldefs.h:57
 msgid "delete the current mailbox (IMAP only)"
-msgstr "ɾ³ýÕâ¸öÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
+msgstr "删除当前信箱 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:58
 msgid "delete all messages in subthread"
-msgstr "ɾ³ýËùÓÐÔÚ×ÓÐòÁÐÖеÄÐżþ"
+msgstr "删除所有子线索中的信件"
 
 #: ../keymap_alldefs.h:59
 msgid "delete all messages in thread"
-msgstr "ɾ³ýËùÓÐÔÚÐòÁÐÖеÄÐżþ"
+msgstr "删除所有线索中的信件"
 
 #: ../keymap_alldefs.h:60
 msgid "display full address of sender"
-msgstr "ÏÔʾ¼ÄÐÅÈ˵ÄÍêÕûλַ"
+msgstr "显示发件人的完整地址"
 
 #: ../keymap_alldefs.h:61
 msgid "display message and toggle header weeding"
-msgstr "ÏÔʾÐżþ²¢Çл»Ñ¹ÒÖ±êÍ·×ÊÁÏÏÔʾ"
+msgstr "显示信件并切换标头资料内容显示"
 
 #: ../keymap_alldefs.h:62
 msgid "display a message"
-msgstr "ÏÔʾһ·âÐżþ"
+msgstr "显示信件"
 
 #: ../keymap_alldefs.h:63
-#, fuzzy
 msgid "edit the raw message"
-msgstr "±à¼­ÐżþÄÚÈÝ"
+msgstr "编辑原始信件"
 
 #: ../keymap_alldefs.h:64
 msgid "delete the char in front of the cursor"
-msgstr "ɾ³ýÓαêËùÔÚλÖÃ֮ǰµÄ×Öĸ"
+msgstr "删除光标位置之前的字母"
 
 #: ../keymap_alldefs.h:65
 msgid "move the cursor one character to the left"
-msgstr "Ïò×óÒƶ¯Ò»¸ö×ÖÔª"
+msgstr "将光标向左移动一个字符"
 
 #: ../keymap_alldefs.h:66
-#, fuzzy
 msgid "move the cursor to the beginning of the word"
-msgstr "Ìøµ½ÐÐÊ×"
+msgstr "将光标移动到单词开头"
 
 #: ../keymap_alldefs.h:67
 msgid "jump to the beginning of the line"
-msgstr "Ìøµ½ÐÐÊ×"
+msgstr "跳到行首"
 
 #: ../keymap_alldefs.h:68
 msgid "cycle among incoming mailboxes"
-msgstr "Ȧѡ½øÈëµÄÓÊͲ"
+msgstr "在来信信箱中循环选择"
 
 #: ../keymap_alldefs.h:69
 msgid "complete filename or alias"
-msgstr "ÍêÕûµÄµµÃû»ò±ðÃû"
+msgstr "补全文件名或别名"
 
 #: ../keymap_alldefs.h:70
 msgid "complete address with query"
-msgstr "¸½ÉÏÍêÕûµÄλַ²éѯ"
+msgstr "查询补全地址"
 
 #: ../keymap_alldefs.h:71
 msgid "delete the char under the cursor"
-msgstr "ɾ³ýÓαêËùÔÚµÄ×Öĸ"
+msgstr "删除光标下的字母"
 
 #: ../keymap_alldefs.h:72
 msgid "jump to the end of the line"
-msgstr "Ìøµ½ÐÐβ"
+msgstr "跳到行尾"
 
 #: ../keymap_alldefs.h:73
 msgid "move the cursor one character to the right"
-msgstr "ÏòÓαêÏòÓÒÒƶ¯Ò»¸ö×ÖÔª"
+msgstr "将光标向右移动一个字符"
 
 #: ../keymap_alldefs.h:74
-#, fuzzy
 msgid "move the cursor to the end of the word"
-msgstr "ÏòÓαêÏòÓÒÒƶ¯Ò»¸ö×ÖÔª"
+msgstr "将光标移到单词结尾"
 
 #: ../keymap_alldefs.h:75
-#, fuzzy
 msgid "scroll down through the history list"
-msgstr "ÏòÉÏ¾í¶¯Ê¹ÓüͼÇåµ¥"
+msgstr "向下卷动历史列表"
 
 #: ../keymap_alldefs.h:76
 msgid "scroll up through the history list"
-msgstr "ÏòÉÏ¾í¶¯Ê¹ÓüͼÇåµ¥"
+msgstr "向上卷动历史列表"
 
 #: ../keymap_alldefs.h:77
 msgid "delete chars from cursor to end of line"
-msgstr "ÓÉÓαêËùÔÚλÖÃɾ³ýÖÁÐÐβËùÓеÄ×ÖÔª"
+msgstr "删除光标所在位置到行尾的字符"
 
 #: ../keymap_alldefs.h:78
-#, fuzzy
 msgid "delete chars from the cursor to the end of the word"
-msgstr "ÓÉÓαêËùÔÚλÖÃɾ³ýÖÁÐÐβËùÓеÄ×ÖÔª"
+msgstr "删除光标所在位置到单词结尾的字符"
 
 #: ../keymap_alldefs.h:79
 msgid "delete all chars on the line"
-msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
+msgstr "删除本行所有字符"
 
 #: ../keymap_alldefs.h:80
 msgid "delete the word in front of the cursor"
-msgstr "ɾ³ýÓαê֮ǰµÄ×Ö"
+msgstr "删除光标之前的词"
 
 #: ../keymap_alldefs.h:81
 msgid "quote the next typed key"
-msgstr "ÓÃÏÂÒ»¸öÊäÈëµÄ¼üÖµ×÷ÒýÑÔ"
+msgstr "对下一个输入的键加引号"
 
 #: ../keymap_alldefs.h:82
 msgid "transpose character under cursor with previous"
-msgstr ""
+msgstr "颠倒光标位置的字符和其前一个字符"
 
 #: ../keymap_alldefs.h:83
 msgid "capitalize the word"
-msgstr ""
+msgstr "将单词首字母转换为大写"
 
 #: ../keymap_alldefs.h:84
-#, fuzzy
 msgid "convert the word to lower case"
-msgstr "ÒƵ½±¾Ò³µÄ×îºóÃæ"
+msgstr "将单词转换为小写"
 
 #: ../keymap_alldefs.h:85
 msgid "convert the word to upper case"
-msgstr ""
+msgstr "将单词转换为大写"
 
 #: ../keymap_alldefs.h:86
 msgid "enter a muttrc command"
-msgstr "ÊäÈë muttrc Ö¸Áî"
+msgstr "输入一条 muttrc 指令"
 
 #: ../keymap_alldefs.h:87
 msgid "enter a file mask"
-msgstr "ÊäÈëÎļþÕÚÕÖ"
+msgstr "输入文件掩码"
 
 #: ../keymap_alldefs.h:88
 msgid "exit this menu"
-msgstr "À뿪Õâ¸öÑ¡µ¥"
+msgstr "退出本菜单"
 
 #: ../keymap_alldefs.h:89
 msgid "filter attachment through a shell command"
-msgstr "͸¹ý shell Ö¸ÁîÀ´¹ýÂ˸½¼þ"
+msgstr "透过 shell 指令来过滤附件"
 
 #: ../keymap_alldefs.h:90
 msgid "move to the first entry"
-msgstr "ÒƵ½µÚÒ»Ïî×ÊÁÏ"
+msgstr "移到第一项条目"
 
 #: ../keymap_alldefs.h:91
 msgid "toggle a message's 'important' flag"
-msgstr "Çл»Ä³·âÐżþµÄ 'ÖØÒª' Æì±ê"
+msgstr "切换信件的'重要'标记"
 
 #: ../keymap_alldefs.h:92
 msgid "forward a message with comments"
-msgstr "ת¼ÄѶϢ²¢¼ÓÉ϶îÍâÎÄ×Ö"
+msgstr "转发信件并注释"
 
 #: ../keymap_alldefs.h:93
 msgid "select the current entry"
-msgstr "Ñ¡ÔñËùÔÚµÄ×ÊÁϼǼ"
+msgstr "选择当前条目"
 
 #: ../keymap_alldefs.h:94
 msgid "reply to all recipients"
-msgstr "»Ø¸²¸øËùÓÐÊÕ¼þÈË"
+msgstr "回覆给所有收件人"
 
 #: ../keymap_alldefs.h:95
 msgid "scroll down 1/2 page"
-msgstr "ÏòÏÂ¾í¶¯°ëÒ³"
+msgstr "向下卷动半页"
 
 #: ../keymap_alldefs.h:96
 msgid "scroll up 1/2 page"
-msgstr "ÏòÉÏ¾í¶¯°ëÒ³"
+msgstr "向上卷动半页"
 
 #: ../keymap_alldefs.h:97
 msgid "this screen"
-msgstr "Õâ¸öÆÁÄ»"
+msgstr "这个屏幕"
 
 #: ../keymap_alldefs.h:98
 msgid "jump to an index number"
-msgstr "Ìøµ½Ä³Ò»¸öË÷ÒýºÅÂë"
+msgstr "跳转到索引号码"
 
 #: ../keymap_alldefs.h:99
 msgid "move to the last entry"
-msgstr "Òƶ¯µ½×îºóÒ»Ïî×ÊÁÏ"
+msgstr "移动到最后一项"
 
 #: ../keymap_alldefs.h:100
 msgid "reply to specified mailing list"
-msgstr "»Ø¸²¸øijһ¸öÖ¸¶¨µÄÓʼþÁбí"
+msgstr "回覆给指定的邮件列表"
 
 #: ../keymap_alldefs.h:101
 msgid "execute a macro"
-msgstr "Ö´ÐÐÒ»¸ö¾Þ¼¯"
+msgstr "执行宏"
 
 #: ../keymap_alldefs.h:102
 msgid "compose a new mail message"
-msgstr "׫дһ·âеÄÐżþ"
+msgstr "撰写新邮件信息"
 
 #: ../keymap_alldefs.h:103
 msgid "break the thread in two"
-msgstr ""
+msgstr "将线索拆为两个"
 
 #: ../keymap_alldefs.h:104
 msgid "open a different folder"
-msgstr "´ò¿ªÁíÒ»¸öÎļþ¼Ð"
+msgstr "打开另一个文件夹"
 
 #: ../keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
-msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÁíÒ»¸öÎļþ¼Ð"
+msgstr "用只读模式打开另一个文件夹"
 
 #: ../keymap_alldefs.h:106
 msgid "clear a status flag from a message"
-msgstr "Çå³ýij·âÐżþÉϵÄ״̬Æì±ê"
+msgstr "清除某封信件上的状态标记"
 
 #: ../keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
-msgstr "ɾ³ý·ûºÏij¸ö¸ñʽµÄÐżþ"
+msgstr "删除符合某个模式的信件"
 
 #: ../keymap_alldefs.h:108
-#, fuzzy
 msgid "force retrieval of mail from IMAP server"
-msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
+msgstr "强制从 IMAP 服务器取回邮件"
 
 #: ../keymap_alldefs.h:109
-msgid "retrieve mail from POP server"
-msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
+msgid "logout from all IMAP servers"
+msgstr ""
 
 #: ../keymap_alldefs.h:110
-msgid "move to the first message"
-msgstr "Òƶ¯µ½µÚÒ»·âÐżþ"
+msgid "retrieve mail from POP server"
+msgstr "从 POP 服务器取回信件"
 
 #: ../keymap_alldefs.h:111
-msgid "move to the last message"
-msgstr "Òƶ¯µ½×îºóÒ»·âÐżþ"
+msgid "move to the first message"
+msgstr "移动到第一封信件"
 
 #: ../keymap_alldefs.h:112
-msgid "show only messages matching a pattern"
-msgstr "Ö»ÏÔʾ·ûºÏij¸ö¸ñʽµÄÐżþ"
+msgid "move to the last message"
+msgstr "移动到最后一封信件"
 
 #: ../keymap_alldefs.h:113
-#, fuzzy
-msgid "link tagged message to the current one"
-msgstr "ÎÞ·¨´«ËÍÒѱê¼ÇµÄÓʼþÖÁ£º"
+msgid "show only messages matching a pattern"
+msgstr "只显示匹配某个模式的信件"
 
 #: ../keymap_alldefs.h:114
-#, fuzzy
-msgid "open next mailbox with new mail"
-msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
+msgid "link tagged message to the current one"
+msgstr "连接已标记的信件到当前信件"
 
 #: ../keymap_alldefs.h:115
-msgid "jump to the next new message"
-msgstr "Ìøµ½ÏÂÒ»·âеÄÐżþ"
+msgid "open next mailbox with new mail"
+msgstr "打开下一个有新邮件的信箱"
 
 #: ../keymap_alldefs.h:116
-#, fuzzy
-msgid "jump to the next new or unread message"
-msgstr "Ìøµ½ÏÂÒ»¸öδ¶ÁÈ¡µÄÐżþ"
+msgid "jump to the next new message"
+msgstr "跳到下一封新信件"
 
 #: ../keymap_alldefs.h:117
-msgid "jump to the next subthread"
-msgstr "Ìøµ½ÏÂÒ»¸ö×ÓÐòÁÐ"
+msgid "jump to the next new or unread message"
+msgstr "跳到下一个新的或未读取的信件"
 
 #: ../keymap_alldefs.h:118
-msgid "jump to the next thread"
-msgstr "Ìøµ½ÏÂÒ»¸öÐòÁÐ"
+msgid "jump to the next subthread"
+msgstr "跳到下一个子线索"
 
 #: ../keymap_alldefs.h:119
-msgid "move to the next undeleted message"
-msgstr "Òƶ¯µ½ÏÂÒ»¸öδɾ³ýµÄÐżþ"
+msgid "jump to the next thread"
+msgstr "跳到下一个线索"
 
 #: ../keymap_alldefs.h:120
-msgid "jump to the next unread message"
-msgstr "Ìøµ½ÏÂÒ»¸öδ¶ÁÈ¡µÄÐżþ"
+msgid "move to the next undeleted message"
+msgstr "移动到下一个未删除信件"
 
 #: ../keymap_alldefs.h:121
-msgid "jump to parent message in thread"
-msgstr "Ìøµ½Õâ¸öÐòÁеÄÖ÷Ðżþ"
+msgid "jump to the next unread message"
+msgstr "跳到下一个未读取信件"
 
 #: ../keymap_alldefs.h:122
-msgid "jump to previous thread"
-msgstr "Ìøµ½ÉÏÒ»¸öÐòÁÐ"
+msgid "jump to parent message in thread"
+msgstr "跳到本线索中的父信件"
 
 #: ../keymap_alldefs.h:123
-msgid "jump to previous subthread"
-msgstr "Ìøµ½ÉÏÒ»¸ö×ÓÐòÁÐ"
+msgid "jump to previous thread"
+msgstr "跳到上一个线索"
 
 #: ../keymap_alldefs.h:124
-#, fuzzy
-msgid "move to the previous undeleted message"
-msgstr "Òƶ¯µ½ÏÂÒ»¸öδɾ³ýµÄÐżþ"
+msgid "jump to previous subthread"
+msgstr "跳到上一个子线索"
 
 #: ../keymap_alldefs.h:125
-msgid "jump to the previous new message"
-msgstr "Ìøµ½ÉÏÒ»¸öеÄÐżþ"
+msgid "move to the previous undeleted message"
+msgstr "移动到上一个未删除信件"
 
 #: ../keymap_alldefs.h:126
-#, fuzzy
-msgid "jump to the previous new or unread message"
-msgstr "Ìøµ½ÉÏÒ»¸öδ¶ÁÈ¡µÄÐżþ"
+msgid "jump to the previous new message"
+msgstr "跳到上一个新信件"
 
 #: ../keymap_alldefs.h:127
-msgid "jump to the previous unread message"
-msgstr "Ìøµ½ÉÏÒ»¸öδ¶ÁÈ¡µÄÐżþ"
+msgid "jump to the previous new or unread message"
+msgstr "跳到上一个新的或未读取的信件"
 
 #: ../keymap_alldefs.h:128
-msgid "mark the current thread as read"
-msgstr "±ê¼ÇÏÖÔÚµÄÐòÁÐΪÒѶÁÈ¡"
+msgid "jump to the previous unread message"
+msgstr "跳到上一个未读取的信件"
 
 #: ../keymap_alldefs.h:129
-msgid "mark the current subthread as read"
-msgstr "±ê¼ÇÏÖÔÚµÄ×ÓÐòÁÐΪÒѶÁÈ¡"
+msgid "mark the current thread as read"
+msgstr "标记当前线索为已读取"
 
 #: ../keymap_alldefs.h:130
-msgid "set a status flag on a message"
-msgstr "É趨ijһ·âÐżþµÄ״̬Æì±ê"
+msgid "mark the current subthread as read"
+msgstr "标记当前子线索为已读取"
 
 #: ../keymap_alldefs.h:131
-msgid "save changes to mailbox"
-msgstr "´¢´æ±ä¶¯µ½ÐÅÏä"
+msgid "set a status flag on a message"
+msgstr "设定某一封信件的状态标记"
 
 #: ../keymap_alldefs.h:132
-msgid "tag messages matching a pattern"
-msgstr "±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
+msgid "save changes to mailbox"
+msgstr "保存修改到信箱"
 
 #: ../keymap_alldefs.h:133
-msgid "undelete messages matching a pattern"
-msgstr "·´É¾³ý·ûºÏij¸ö¸ñʽµÄÐżþ"
+msgid "tag messages matching a pattern"
+msgstr "标记符合某个模式的信件"
 
 #: ../keymap_alldefs.h:134
-msgid "untag messages matching a pattern"
-msgstr "·´±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
+msgid "undelete messages matching a pattern"
+msgstr "反删除符合某个模式的信件"
 
 #: ../keymap_alldefs.h:135
-msgid "move to the middle of the page"
-msgstr "Òƶ¯µ½±¾Ò³µÄÖмä"
+msgid "untag messages matching a pattern"
+msgstr "反标记符合某个模式的信件"
 
 #: ../keymap_alldefs.h:136
-msgid "move to the next entry"
-msgstr "Òƶ¯µ½ÏÂÒ»Ïî×ÊÁÏ"
+msgid "move to the middle of the page"
+msgstr "移动到本页的中间"
 
 #: ../keymap_alldefs.h:137
-msgid "scroll down one line"
-msgstr "ÏòÏÂ¾í¶¯Ò»ÐÐ"
+msgid "move to the next entry"
+msgstr "移动到下一条目"
 
 #: ../keymap_alldefs.h:138
-msgid "move to the next page"
-msgstr "ÒƵ½ÏÂÒ»Ò³"
+msgid "scroll down one line"
+msgstr "向下卷动一行"
 
 #: ../keymap_alldefs.h:139
-msgid "jump to the bottom of the message"
-msgstr "Ìøµ½ÐżþµÄ×îºóÃæ"
+msgid "move to the next page"
+msgstr "移动到下一页"
 
 #: ../keymap_alldefs.h:140
-msgid "toggle display of quoted text"
-msgstr "Çл»ÒýÑÔÏÔʾ"
+msgid "jump to the bottom of the message"
+msgstr "跳到信件的底端"
 
 #: ../keymap_alldefs.h:141
-msgid "skip beyond quoted text"
-msgstr "Ìø¹ýÒýÑÔ"
+msgid "toggle display of quoted text"
+msgstr "切换引用文本的显示"
 
 #: ../keymap_alldefs.h:142
-msgid "jump to the top of the message"
-msgstr "Ìøµ½ÐżþµÄ×îÉÏÃæ"
+msgid "skip beyond quoted text"
+msgstr "跳过引用"
 
 #: ../keymap_alldefs.h:143
-msgid "pipe message/attachment to a shell command"
-msgstr "Êä³öµ¼Ïò ѶϢ/¸½¼þ ÖÁÃüÁî½âÒëÆ÷"
+msgid "jump to the top of the message"
+msgstr "跳到信件的顶端"
 
 #: ../keymap_alldefs.h:144
-msgid "move to the previous entry"
-msgstr "ÒƵ½ÉÏÒ»Ïî×ÊÁÏ"
+msgid "pipe message/attachment to a shell command"
+msgstr "将 讯息/附件 通过管道传递给 shell 命令"
 
 #: ../keymap_alldefs.h:145
-msgid "scroll up one line"
-msgstr "ÏòÉÏ¾í¶¯Ò»ÐÐ"
+msgid "move to the previous entry"
+msgstr "移到上一条目"
 
 #: ../keymap_alldefs.h:146
-msgid "move to the previous page"
-msgstr "ÒƵ½ÉÏÒ»Ò³"
+msgid "scroll up one line"
+msgstr "向上卷动一行"
 
 #: ../keymap_alldefs.h:147
-msgid "print the current entry"
-msgstr "´òÓ¡ÏÖÔÚµÄ×ÊÁÏ"
+msgid "move to the previous page"
+msgstr "移动到上一页"
 
 #: ../keymap_alldefs.h:148
-msgid "query external program for addresses"
-msgstr "ÀûÓÃÍⲿӦÓóÌÐò²éѯµØÖ·"
+msgid "print the current entry"
+msgstr "打印当前条目"
 
 #: ../keymap_alldefs.h:149
-msgid "append new query results to current results"
-msgstr "¸½¼ÓеIJéѯ½á¹ûÖÁÏÖ½ñµÄ²éѯ½á¹û"
+msgid "query external program for addresses"
+msgstr "向外部程序查询地址"
 
 #: ../keymap_alldefs.h:150
-msgid "save changes to mailbox and quit"
-msgstr "´¢´æ±ä¶¯¹ýµÄ×ÊÁϵ½ÐÅÏä²¢ÇÒÀ뿪"
+msgid "append new query results to current results"
+msgstr "附加新查询结果到当前结果"
 
 #: ../keymap_alldefs.h:151
-msgid "recall a postponed message"
-msgstr "ÖØнгöÒ»·â±»ÑӳټijöµÄÐżþ"
+msgid "save changes to mailbox and quit"
+msgstr "保存修改到信箱并且离开"
 
 #: ../keymap_alldefs.h:152
-msgid "clear and redraw the screen"
-msgstr "Çå³ý²¢ÖØлæÖÆÆÁÄ»"
+msgid "recall a postponed message"
+msgstr "重新叫出一封被延迟寄出的信件"
 
 #: ../keymap_alldefs.h:153
-msgid "{internal}"
-msgstr "{ÄÚ²¿µÄ}"
+msgid "clear and redraw the screen"
+msgstr "清除并重新绘制屏幕"
 
 #: ../keymap_alldefs.h:154
-#, fuzzy
-msgid "rename the current mailbox (IMAP only)"
-msgstr "ɾ³ýÕâ¸öÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
+msgid "{internal}"
+msgstr "{内部的}"
 
 #: ../keymap_alldefs.h:155
-msgid "reply to a message"
-msgstr "»Ø¸²Ò»·âÐżþ"
+msgid "rename the current mailbox (IMAP only)"
+msgstr "将当前信箱改名 (只适用于 IMAP)"
 
 #: ../keymap_alldefs.h:156
-msgid "use the current message as a template for a new one"
-msgstr "ÓÃÕâ·âÐżþ×÷ΪÐÂÐżþµÄÄ£°å"
+msgid "reply to a message"
+msgstr "回覆一封信件"
 
 #: ../keymap_alldefs.h:157
-msgid "save message/attachment to a file"
-msgstr "´¢´æÐżþ/¸½¼þµ½Ä³¸öÎļþ"
+msgid "use the current message as a template for a new one"
+msgstr "用当前信件作为新信件的模板"
 
 #: ../keymap_alldefs.h:158
-msgid "search for a regular expression"
-msgstr "ÓÃÕý¹æ±íʾʽѰÕÒ"
+msgid "save message/attachment to a mailbox/file"
+msgstr "保存 信件/附件 到 信箱/文件"
 
 #: ../keymap_alldefs.h:159
-msgid "search backwards for a regular expression"
-msgstr "ÏòºóËÑÑ°Ò»¸öÕý¹æ±íʾʽ"
+msgid "search for a regular expression"
+msgstr "用正则表示式搜索"
 
 #: ../keymap_alldefs.h:160
-msgid "search for next match"
-msgstr "Ñ°ÕÒÏÂÒ»¸ö·ûºÏµÄ×ÊÁÏ"
+msgid "search backwards for a regular expression"
+msgstr "用正则表示式向后搜索"
 
 #: ../keymap_alldefs.h:161
-msgid "search for next match in opposite direction"
-msgstr "·µ·½ÏòËÑÑ°ÏÂÒ»¸ö·ûºÏµÄ×ÊÁÏ"
+msgid "search for next match"
+msgstr "搜索下一个匹配"
 
 #: ../keymap_alldefs.h:162
-msgid "toggle search pattern coloring"
-msgstr "Çл»ËÑÑ°¸ñʽµÄÑÕÉ«"
+msgid "search for next match in opposite direction"
+msgstr "反向搜索下一个匹配"
 
 #: ../keymap_alldefs.h:163
-msgid "invoke a command in a subshell"
-msgstr "ÔÚ×Ó shell Ö´ÐÐÖ¸Áî"
+msgid "toggle search pattern coloring"
+msgstr "切换搜寻模式的颜色"
 
 #: ../keymap_alldefs.h:164
-msgid "sort messages"
-msgstr "ÐżþÅÅÐò"
+msgid "invoke a command in a subshell"
+msgstr "在 subshell 中调用命令"
 
 #: ../keymap_alldefs.h:165
-msgid "sort messages in reverse order"
-msgstr "ÒÔÏà·´µÄ´ÎÐòÀ´×öѶϢÅÅÐò"
+msgid "sort messages"
+msgstr "排序信件"
 
 #: ../keymap_alldefs.h:166
-msgid "tag the current entry"
-msgstr "±ê¼ÇÏÖÔڵļǼ"
+msgid "sort messages in reverse order"
+msgstr "反向排序信件"
 
 #: ../keymap_alldefs.h:167
-msgid "apply next function to tagged messages"
-msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
+msgid "tag the current entry"
+msgstr "标记当前条目"
 
 #: ../keymap_alldefs.h:168
-#, fuzzy
-msgid "apply next function ONLY to tagged messages"
-msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
+msgid "apply next function to tagged messages"
+msgstr "对已标记信息应用下一功能"
 
 #: ../keymap_alldefs.h:169
-msgid "tag the current subthread"
-msgstr "±ê¼ÇÄ¿Ç°µÄ×ÓÐòÁÐ"
+msgid "apply next function ONLY to tagged messages"
+msgstr "“仅”对已标记信息应用下一功能"
 
 #: ../keymap_alldefs.h:170
-msgid "tag the current thread"
-msgstr "±ê¼ÇÄ¿Ç°µÄÐòÁÐ"
+msgid "tag the current subthread"
+msgstr "标记当前子线索"
 
 #: ../keymap_alldefs.h:171
-msgid "toggle a message's 'new' flag"
-msgstr "Çл»½«Ñ¶Ï¢Çл»Îª 'new' Æì±ê"
+msgid "tag the current thread"
+msgstr "标记当前线索"
 
 #: ../keymap_alldefs.h:172
-msgid "toggle whether the mailbox will be rewritten"
-msgstr "Çл»ÊÇ·ñÖØÐÂдÈëÓÊͲÖÐ"
+msgid "toggle a message's 'new' flag"
+msgstr "切换信件的'新邮件'标记"
 
 #: ../keymap_alldefs.h:173
-msgid "toggle whether to browse mailboxes or all files"
-msgstr "Çл»ÊÇ·ñä¯ÀÀÓÊͲ»òËùÓеÄÎļþ"
+msgid "toggle whether the mailbox will be rewritten"
+msgstr "切换信箱是否要重写"
 
 #: ../keymap_alldefs.h:174
-msgid "move to the top of the page"
-msgstr "ÒƵ½Ò³Ê×"
+msgid "toggle whether to browse mailboxes or all files"
+msgstr "切换是否浏览信箱或所有文件"
 
 #: ../keymap_alldefs.h:175
-msgid "undelete the current entry"
-msgstr "·´É¾³ýÏÖÔڵļǼ"
+msgid "move to the top of the page"
+msgstr "移到页首"
 
 #: ../keymap_alldefs.h:176
-msgid "undelete all messages in thread"
-msgstr "·´É¾³ýÕâ¸öÐòÁÐÖеÄËùÓÐÐżþ"
+msgid "undelete the current entry"
+msgstr "反删除当前条目"
 
 #: ../keymap_alldefs.h:177
-msgid "undelete all messages in subthread"
-msgstr "·´É¾³ýÕâ¸ö×ÓÐòÁÐÖеÄËùÓÐÐżþ"
+msgid "undelete all messages in thread"
+msgstr "反删除线索中的所有信件"
 
 #: ../keymap_alldefs.h:178
-msgid "show the Mutt version number and date"
-msgstr "ÏÔʾ Mutt µÄ°æ±¾ºÅÂëÓëÈÕÆÚ"
+msgid "undelete all messages in subthread"
+msgstr "反删除子线索中的所有信件"
 
 #: ../keymap_alldefs.h:179
-msgid "view attachment using mailcap entry if necessary"
-msgstr "Èç¹ûÐèÒªµÄ»°Ê¹Óà mailcap ä¯ÀÀ¸½¼þ"
+msgid "show the Mutt version number and date"
+msgstr "显示 Mutt 的版本号与日期"
 
 #: ../keymap_alldefs.h:180
-msgid "show MIME attachments"
-msgstr "ÏÔʾ MIME ¸½¼þ"
+msgid "view attachment using mailcap entry if necessary"
+msgstr "如果需要的话使用 mailcap 条目浏览附件"
 
 #: ../keymap_alldefs.h:181
-msgid "display the keycode for a key press"
-msgstr ""
+msgid "show MIME attachments"
+msgstr "显示 MIME 附件"
 
 #: ../keymap_alldefs.h:182
-msgid "show currently active limit pattern"
-msgstr "ÏÔʾĿǰÓÐ×÷ÓõÄÏÞÖÆÑùʽ"
+msgid "display the keycode for a key press"
+msgstr "显示按键的键码"
 
 #: ../keymap_alldefs.h:183
-msgid "collapse/uncollapse current thread"
-msgstr "´ò¿ª/¹Ø±Õ Ä¿Ç°µÄÐòÁÐ"
+msgid "show currently active limit pattern"
+msgstr "显示当前激活的限制模式"
 
 #: ../keymap_alldefs.h:184
-msgid "collapse/uncollapse all threads"
-msgstr "´ò¿ª/¹Ø±Õ ËùÓеÄÐòÁÐ"
+msgid "collapse/uncollapse current thread"
+msgstr "折叠/展开 当前线索"
 
 #: ../keymap_alldefs.h:185
-msgid "attach a PGP public key"
-msgstr "¸½´øÒ»°Ñ PGP ¹«¹²Ô¿³×"
+msgid "collapse/uncollapse all threads"
+msgstr "折叠/展开 所有线索"
 
 #: ../keymap_alldefs.h:186
-msgid "show PGP options"
-msgstr "ÏÔʾ PGP Ñ¡Ïî"
+msgid "attach a PGP public key"
+msgstr "附加 PGP 公钥"
 
 #: ../keymap_alldefs.h:187
-msgid "mail a PGP public key"
-msgstr "¼Ä³ö PGP ¹«¹²Ô¿³×"
+msgid "show PGP options"
+msgstr "显示 PGP 选项"
 
 #: ../keymap_alldefs.h:188
-msgid "verify a PGP public key"
-msgstr "¼ìÑé PGP ¹«¹²Ô¿³×"
+msgid "mail a PGP public key"
+msgstr "邮寄 PGP 公钥"
 
 #: ../keymap_alldefs.h:189
-msgid "view the key's user id"
-msgstr "¼ìÔÄÕâ°ÑÔ¿³×µÄʹÓÃÕß id"
+msgid "verify a PGP public key"
+msgstr "验证 PGP 公钥"
 
 #: ../keymap_alldefs.h:190
-msgid "check for classic PGP"
-msgstr ""
+msgid "view the key's user id"
+msgstr "查看密钥的用户 id"
 
 #: ../keymap_alldefs.h:191
-msgid "Accept the chain constructed"
-msgstr ""
+msgid "check for classic PGP"
+msgstr "检查经典 PGP"
 
 #: ../keymap_alldefs.h:192
-#, fuzzy
-msgid "Append a remailer to the chain"
-msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
+msgid "Accept the chain constructed"
+msgstr "接受创建的链"
 
 #: ../keymap_alldefs.h:193
-#, fuzzy
-msgid "Insert a remailer into the chain"
-msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
+msgid "Append a remailer to the chain"
+msgstr "附加转发者到链"
 
 #: ../keymap_alldefs.h:194
-#, fuzzy
-msgid "Delete a remailer from the chain"
-msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
+msgid "Insert a remailer into the chain"
+msgstr "插入转发者到链"
 
 #: ../keymap_alldefs.h:195
-#, fuzzy
-msgid "Select the previous element of the chain"
-msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
+msgid "Delete a remailer from the chain"
+msgstr "删除转发者到链"
 
 #: ../keymap_alldefs.h:196
-#, fuzzy
-msgid "Select the next element of the chain"
-msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
+msgid "Select the previous element of the chain"
+msgstr "选择链中的前一个元素"
 
 #: ../keymap_alldefs.h:197
-msgid "send the message through a mixmaster remailer chain"
-msgstr ""
+msgid "Select the next element of the chain"
+msgstr "选择链中的下一个元素"
 
 #: ../keymap_alldefs.h:198
-msgid "make decrypted copy and delete"
-msgstr "ÖÆ×÷½âÃܵĿ½±´²¢ÇÒɾ³ýÖ®"
+msgid "send the message through a mixmaster remailer chain"
+msgstr "通过 mixmaster 转发者链发送信件"
 
 #: ../keymap_alldefs.h:199
-msgid "make decrypted copy"
-msgstr "ÖÆ×÷Ò»·Ý½âÃܵĿ½±´"
+msgid "make decrypted copy and delete"
+msgstr "制作解密的副本并且删除之"
 
 #: ../keymap_alldefs.h:200
-#, fuzzy
-msgid "wipe passphrase(s) from memory"
-msgstr "Çå³ý¼ÇÒäÌåÖÐµÄ PGP ͨÐÐÃÜÂë"
+msgid "make decrypted copy"
+msgstr "制作解密的副本"
 
 #: ../keymap_alldefs.h:201
-#, fuzzy
-msgid "extract supported public keys"
-msgstr "ߢȡ PGP ¹«¹²Ô¿³×"
+msgid "wipe passphrase(s) from memory"
+msgstr "从内存中清除通行密钥"
 
 #: ../keymap_alldefs.h:202
-#, fuzzy
+msgid "extract supported public keys"
+msgstr "取出支持的公钥"
+
+#: ../keymap_alldefs.h:203
 msgid "show S/MIME options"
-msgstr "ÏÔʾ S/MIME Ñ¡Ïî"
+msgstr "显示 S/MIME 选项"
+
+#~ 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 "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
+#~ msgstr "寄信途中发生错误。"
 
 #, fuzzy
 #~ msgid "Getting namespaces..."
-#~ msgstr "¼Ä³öÐżþÖС­"
+#~ msgstr "寄出信件中..."
 
 #, fuzzy
 #~ msgid ""
@@ -5289,61 +5186,61 @@ msgstr "
 #~ "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
 #~ "       mutt -v[v]\n"
 #~ msgstr ""
-#~ "Ó÷¨: mutt [ -nRzZ ] [ -e <ÃüÁî> ] [ -F <Îļþ> ] [ -m <ÀàÐÍ> ] [ -f <Îļþ"
+#~ "用法: mutt [ -nRzZ ] [ -e <命令> ] [ -F <文件> ] [ -m <类型> ] [ -f <文件"
 #~ "> ]\n"
-#~ "        mutt [ -nx ] [ -e <ÃüÁî> ] [ -a <Îļþ> ] [ -F <Îļþ> ] [ -H <Îļþ"
-#~ "> ] [ -i <Îļþ> ] [ -s <Ö÷Ìâ> ] [ -b <µØÖ·> ] [ -c <µØÖ·> ] <µØÖ·> "
+#~ "        mutt [ -nx ] [ -e <命令> ] [ -a <文件> ] [ -F <文件> ] [ -H <文件"
+#~ "> ] [ -i <文件> ] [ -s <主题> ] [ -b <地址> ] [ -c <地址> ] <地址> "
 #~ "[ ... ]\n"
-#~ "        mutt [ -n ] [ -e <ÃüÁî> ] [ -F <Îļþ> ] -p\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            Õâ¸ö˵Ã÷ѶϢ"
+#~ "参数：\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 "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+#~ msgstr "正在删除伺服器上的信件..."
 
 #, fuzzy
 #~ msgid "Can't edit message on POP server."
-#~ msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+#~ msgstr "正在删除伺服器上的信件..."
 
 #~ msgid "Reading %s... %d (%d%%)"
-#~ msgstr "¶ÁÈ¡ %s ÖС­ %d (%d%%)"
+#~ msgstr "读取 %s 中... %d (%d%%)"
 
 #~ msgid "Writing messages... %d (%d%%)"
-#~ msgstr "дÈëÐżþÖС­ %d (%d%%)"
+#~ msgstr "写入信件中... %d (%d%%)"
 
 #~ msgid "Reading %s... %d"
-#~ msgstr "¶ÁÈ¡ %s¡­ %d"
+#~ msgstr "读取 %s... %d"
 
 #~ msgid "Invoking pgp..."
-#~ msgstr "Æô¶¯ pgp¡­"
+#~ msgstr "启动 pgp..."
 
 #~ msgid "Fatal error.  Message count is out of sync!"
-#~ msgstr "ÑÏÖØ´íÎó¡£ÐżþÊýÁ¿²»Ð­µ÷£¡"
+#~ msgstr "严重错误。信件数量不协调！"
 
 #, fuzzy
 #~ msgid "CLOSE failed"
-#~ msgstr "µÇÈëʧ°Ü¡£"
+#~ msgstr "登入失败。"
 
 #, fuzzy
 #~ msgid ""
@@ -5380,72 +5277,69 @@ msgstr "
 #~ "Copyright (C) 1999-2000 Brendan Cully <brendan@kublai.com>\n"
 #~ "Copyright (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 #~ "\n"
-#~ "»¹ÓÐÐí¶àÔÚÕâÀïûÓÐÌá¼°µ½µÄÈËÊË£¬ËûÃÇÔøÌṩ³ÌÐòÂ룬ÐÞÕý£¬ºÍÒâ¼û¡£\n"
+#~ "还有许多在这里没有提及到的人仕，他们曾提供程序码，修正，和意见。\n"
 #~ "\n"
-#~ "    Õâ¸öÓ¦ÓóÌÐòÊÇ×ÔÓÉÈí¼þ£»Äú¿ÉÒÔÔÚ×ÔÓÉÈí¼þ»ù½ð»áµÄ GNU Ò»°ã¹«¹²\n"
-#~ "    ÊÚȨÊ飨°æ±¾ 2£¬»òiËæÄãϲºÃʹÓÃÒÔºóµÄ°æ±¾£©ÏÂÖظ´É¢²¼²¢/»òÐÞ\n"
-#~ "    ÕýËü¡£\n"
+#~ "    这个应用程序是自由软件；您可以在自由软件基金会的 GNU 一般公共\n"
+#~ "    授权书(版本 2，或i随你喜好使用以后的版本)下重复散布并/或修\n"
+#~ "    正它。\n"
 #~ "\n"
-#~ "    ·¢²¼Õâ¸öÓ¦ÓóÌÐòµÄÄ¿µÄÊÇÏ£ÍûËü»á¶ÔÄãÓÐÓ㬵«¾ø²»°üÀ¨Èκα£Ö¤£»\n"
-#~ "    ¾ÍÁ¬ÏúÊÛÐÔºÍÊÊÓÚÌض¨Ä¿µÄÖ®°µÊ¾µ£±£ÒàÈ»¡£ÔÚ GNU Ò»°ã¹«¹²ÊÚȨÊé\n"
-#~ "    Öн«»á»ñµÃ¸ü¶à×ÊÁÏ¡£\n"
+#~ "    发布这个应用程序的目的是希望它会对你有用，但绝不包括任何保证；\n"
+#~ "    就连销售性和适于特定目的之暗示担保亦然。在 GNU 一般公共授权书\n"
+#~ "    中将会获得更多资料。\n"
 #~ "\n"
-#~ "    ÄúÓ¦ÒÑÁ¬Í¬Ó¦ÓóÌÐòÊÕµ½Ò»·Ý GNU Ò»°ã¹«¹²ÊÚȨÊ飻Èç¹ûûÓУ¬ÇëдÐÅ\n"
-#~ "    ÖÁ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
+#~ "    您应已连同应用程序收到一份 GNU 一般公共授权书；如果没有，请写信\n"
+#~ "    至 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 #~ "Boston, MA  02110-1301, USA.\n"
 
 #~ msgid "First entry is shown."
-#~ msgstr "ÕýÔÚÏÔʾµÚÒ»Ïî¡£"
+#~ msgstr "正在显示第一项。"
 
 #~ msgid "Last entry is shown."
-#~ msgstr "ÕýÔÚÏÔʾ×îºóÒ»Ïî¡£"
+#~ msgstr "正在显示最后一项。"
 
 #~ msgid "Unable to append to IMAP mailboxes at this server"
-#~ msgstr "ÎÞ·¨¸½¼ÓÔÚÕâ¸öËÅ·þÆ÷É쵀 IMAP ÐÅÏä"
+#~ msgstr "无法附加在这个伺服器上的 IMAP 信箱"
 
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
-#~ msgstr "½¨Á¢Ò»·â application/pgp µÄÐżþ£¿"
-
-#~ msgid "Closing connection to IMAP server..."
-#~ msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
+#~ msgstr "建立一封 application/pgp 的信件？"
 
 #, fuzzy
 #~ msgid "%s: stat: %s"
-#~ msgstr "ÎÞ·¨¶ÁÈ¡£º%s"
+#~ msgstr "无法读取：%s"
 
 #, fuzzy
 #~ msgid "%s: not a regular file"
-#~ msgstr "%s ²»ÊÇÐÅÏä¡£"
+#~ msgstr "%s 不是信箱。"
 
 #, fuzzy
 #~ msgid "Invoking OpenSSL..."
-#~ msgstr "Æô¶¯ OpenSSL¡­"
+#~ msgstr "启动 OpenSSL..."
 
 #~ msgid "Bounce message to %s...?"
-#~ msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s¡­£¿"
+#~ msgstr "把信件直接传送至 %s...？"
 
 #~ msgid "Bounce messages to %s...?"
-#~ msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s¡­£¿"
+#~ msgstr "把信件直接传送至 %s...？"
 
 #, fuzzy
 #~ msgid "This ID's validity level is undefined."
-#~ msgstr "Õâ¸ö ID µÄÐÅÈνײãûÓж¨Òå¡£"
+#~ msgstr "这个 ID 的信任阶层没有定义。"
 
 #~ msgid "Decode-save"
-#~ msgstr "½âÂë²¢´¢´æ"
+#~ msgstr "解码并储存"
 
 #~ msgid "Decode-copy"
-#~ msgstr "½âÂë²¢¿½±´"
+#~ msgstr "解码并拷贝"
 
 #~ msgid "Decrypt-save"
-#~ msgstr "½âÃܲ¢´¢´æ"
+#~ msgstr "解密并储存"
 
 #~ msgid "Decrypt-copy"
-#~ msgstr "½âÃܲ¢¿½±´"
+#~ msgstr "解密并拷贝"
 
 #~ msgid "Copy"
-#~ msgstr "¿½±´"
+#~ msgstr "拷贝"
 
 #~ msgid ""
 #~ "\n"
@@ -5453,28 +5347,28 @@ msgstr "
 #~ "\n"
 #~ msgstr ""
 #~ "\n"
-#~ "[-- PGP Êä³öµÄ×ÊÁϽáÊø --]\n"
+#~ "[-- PGP 输出的资料结束 --]\n"
 #~ "\n"
 
 #, fuzzy
 #~ msgid "Can't stat %s."
-#~ msgstr "ÎÞ·¨¶ÁÈ¡£º%s"
+#~ msgstr "无法读取：%s"
 
 #~ msgid "%s: no such command"
-#~ msgstr "%s£ºÎÞ´ËÖ¸Áî"
+#~ msgstr "%s：无此指令"
 
 #, fuzzy
 #~ msgid "Authentication method is unknown."
-#~ msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+#~ msgstr "GSSAPI 验证失败。"
 
 #~ msgid "MIC algorithm: "
-#~ msgstr "MIC ÑÝËã·¨£º"
+#~ msgstr "MIC 演算法："
 
 #~ msgid "This doesn't make sense if you don't want to sign the message."
-#~ msgstr "Èç¹ûÄú²»Ïë°ÑÐżþÇ©Ãû£¬ÕâÑù×ö¾ÍûÓÐʲôÒâ˼À²¡£"
+#~ msgstr "如果您不想把信件签名，这样做就没有什么意思啦。"
 
 #~ msgid "Unknown MIC algorithm, valid ones are: pgp-md5, pgp-sha1, pgp-rmd160"
-#~ msgstr "²»Ã÷µÄ MIC ÑÝËã·¨¡£ÓÐЧµÄÈçÏÂ: pgp-md5, pgp-sha1, pgp-rmd160"
+#~ msgstr "不明的 MIC 演算法。有效的如下: pgp-md5, pgp-sha1, pgp-rmd160"
 
 #, fuzzy
 #~ msgid ""
@@ -5496,191 +5390,191 @@ msgstr "
 #~ "SHA1 implementation Copyrigt (C) 1995-7 Eric A. Young <eay@cryptsoft."
 #~ "com>\n"
 #~ "\n"
-#~ "     Öظ´É¢²¼²¢Ê¹ÓÃԭʼ³ÌÐòÂëºÍ±àÒë¹ýµÄ³ÌÐòÂ룬²»¹ÜÓзñ¾­¹ýÐ޸ģ¬\n"
-#~ "     ÔÚijЩÌõ¼þÏÂÊÇÐí¿ÉµÄ¡£\n"
+#~ "     重复散布并使用原始程序码和编译过的程序码，不管有否经过修改，\n"
+#~ "     在某些条件下是许可的。\n"
 #~ "\n"
-#~ "     SHA1 ³ÌÐò²»¸½´øÈκε£±££¬²»ÂÛϵÃ÷ʾ»¹ÊÇ°µÊ¾£¬°üÀ¨µ«²»ÏÞÓÚÏúÊÛÐÔ\n"
-#~ "     ºÍÊÊÓÚÌض¨Ä¿µÄÖ®°µÊ¾µ£±£¡£\n"
+#~ "     SHA1 程序不附带任何担保，不论系明示还是暗示，包括但不限于销售性\n"
+#~ "     和适于特定目的之暗示担保。\n"
 #~ "\n"
-#~ "     ÄúÓ¦¸ÃÊÕµ½Ò»·Ý´ËÓ¦ÓóÌÐòµÄÍêÕûµÄÉ¢²¼ÌõÎÄ£»Èç¹ûûÓУ¬ÇëдПø\n"
-#~ "     Ó¦ÓóÌÐòµÄ·¢Õ¹ÈËÔ±.\n"
+#~ "     您应该收到一份此应用程序的完整的散布条文；如果没有，请写信给\n"
+#~ "     应用程序的发展人员.\n"
 
 #, fuzzy
 #~ msgid "POP Username: "
-#~ msgstr "IMAP Óû§Ãû³Æ£º"
+#~ msgstr "IMAP 用户名称："
 
 #, fuzzy
 #~ msgid "Reading new message (%d bytes)..."
-#~ msgstr "¶ÁÈ¡ÐÂÐżþ (%d λԪ×é)¡­"
+#~ msgstr "读取新信件 (%d 位元组)..."
 
 #, fuzzy
 #~ msgid "%s [%d message read]"
-#~ msgstr "%s [ÒÑÔĶÁ %d ·âÐżþ]"
+#~ msgstr "%s [已阅读 %d 封信件]"
 
 #~ msgid "Creating mailboxes is not yet supported."
-#~ msgstr "δ֧³ÖÖÆÔìÓÊÏä¡£"
+#~ msgstr "未支持制造信箱。"
 
 #~ msgid "We can't currently handle utf-8 at this point."
-#~ msgstr "ÎÒÃÇ»¹Î´ÄÜ´¦Àí utf-8¡£"
+#~ msgstr "我们还未能处理 utf-8。"
 
 #~ msgid "Can't open %s: %s."
-#~ msgstr "ÎÞ·¨´ò¿ª %s£º%s."
+#~ msgstr "无法打开 %s：%s."
 
 #, fuzzy
 #~ msgid "Error while recoding %s. Leave it unchanged."
-#~ msgstr "µ±×ª»»±àÂë %s ·¢Éú´íÎ󡣿´ %s À´ÐÞ¸´ÄãµÄ×ÊÁÏ¡£"
+#~ msgstr "当转换编码 %s 发生错误。看 %s 来修复你的资料。"
 
 #~ msgid "Error while recoding %s. See %s for recovering your data."
-#~ msgstr "µ±×ª»»±àÂë %s ·¢Éú´íÎ󡣿´ %s À´ÐÞ¸´ÄãµÄ×ÊÁÏ¡£"
+#~ msgstr "当转换编码 %s 发生错误。看 %s 来修复你的资料。"
 
 #~ msgid "Can't change character set for non-text attachments!"
-#~ msgstr "·ÇÎÄ×ֵĸ½¼þÊDz»Äܸıä×Ö·û¼¯µÄ£¡"
+#~ msgstr "非文字的附件是不能改变字符集的！"
 
 #~ msgid "Enter character set: "
-#~ msgstr "ÇëÊäÈë×Ö·û¼¯£º"
+#~ msgstr "请输入字符集："
 
 #~ msgid "UTF-8 encoding attachments has not yet been implemented."
-#~ msgstr "»¹Î´Ö§³Ö UTF-8 ±àÂëµÄ¸½¼þ¡£"
+#~ msgstr "还未支持 UTF-8 编码的附件。"
 
 #~ msgid "Compose"
-#~ msgstr "дÐÅ"
+#~ msgstr "写信"
 
 #~ msgid "We currently can't encode to utf-8."
-#~ msgstr "ÎÒÃÇÏÖÔÚ»¹Î´ÄÜÖØбàÂëÖÁ utf-8¡£"
+#~ msgstr "我们现在还未能重新编码至 utf-8。"
 
 #~ msgid "Recoding successful."
-#~ msgstr "ÖØбàÂë³É¹¦¡£"
+#~ msgstr "重新编码成功。"
 
 #~ msgid "CRAM key for %s@%s: "
-#~ msgstr "%s@%s µÄ CRAM Ô¿³×"
+#~ msgstr "%s@%s 的 CRAM 钥匙"
 
 #~ msgid "Skipping CRAM-MD5 authentication."
-#~ msgstr "ÂÓ¹ý CRAM-MD5 ÑéÖ¤"
+#~ msgstr "掠过 CRAM-MD5 验证"
 
 #~ msgid "Reopening mailbox... %s"
-#~ msgstr "ÖØдò¿ªÐÅÏäÖС­ %s"
+#~ msgstr "重新打开信箱中... %s"
 
 #~ msgid "Closing mailbox..."
-#~ msgstr "¹Ø±ÕÐÅÏäÖС­"
+#~ msgstr "关闭信箱中..."
 
 #~ msgid "Sending APPEND command ..."
-#~ msgstr "ÕýÔÚËͳö APPEND ÃüÁî¡­"
+#~ msgstr "正在送出 APPEND 命令..."
 
 #~ msgid "change an attachment's character set"
-#~ msgstr "¸Ä±ä¸½¼þµÄ×Ö·û¼¯"
+#~ msgstr "改变附件的字符集"
 
 #~ msgid "recode this attachment to/from the local charset"
-#~ msgstr "ÖØн«¸½¼þ±àÂëÖÁ±¾µØ×Ö·û¼¯£¬»òÓɱ¾µØ×Ö·û¼¯ÖØбàÂë"
+#~ msgstr "重新将附件编码至本地字符集，或由本地字符集重新编码"
 
 #~ msgid "%d kept."
-#~ msgstr "%d ±£ÁôÁË¡£"
+#~ msgstr "%d 保留了。"
 
 #~ msgid "POP Password: "
-#~ msgstr "POP ÃÜÂ룺"
+#~ msgstr "POP 密码："
 
 #~ msgid "No POP username is defined."
-#~ msgstr "ûÓỶ¨ÒåµÄ POP ʹÓÃÕßÃû³Æ¡£"
+#~ msgstr "没有被定义的 POP 使用者名称。"
 
 #~ msgid "Attachment saved"
-#~ msgstr "¸½¼þÒѱ»´¢´æ¡£"
+#~ msgstr "附件已被储存。"
 
 #~ msgid "move to the last undelete message"
-#~ msgstr "Òƶ¯µ½×îºóÒ»·âδɾ³ýµÄÐżþ"
+#~ msgstr "移动到最后一封未删除的信件"
 
 #~ msgid "return to the main-menu"
-#~ msgstr "»Øµ½Ö÷Ñ¡µ¥"
+#~ msgstr "回到主选单"
 
 #~ msgid "ignoring empty header field: %s"
-#~ msgstr "²»Àí»á¿ÕµÄ±êÍ·À¸Î»£º%s"
+#~ msgstr "不理会空的标头栏位：%s"
 
 #, fuzzy
 #~ msgid "Recoding only affetcs text attachments."
-#~ msgstr "Ö»ÖØбàÂëÊÜÓ°ÏìµÄÎÄ×Ö¸½¼þ"
+#~ msgstr "只重新编码受影响的文字附件"
 
 #, fuzzy
 #~ msgid "display message with full headers"
-#~ msgstr "±à¼­ÐżþµÄ±êÍ·"
+#~ msgstr "编辑信件的标头"
 
 #, fuzzy
 #~ msgid "This operation is not currently supported for PGP messages."
-#~ msgstr "Ôݲ»Ö§³Öä¯ÀÀ IMAP Ŀ¼"
+#~ msgstr "暂不支持浏览 IMAP 目录"
 
 #~ msgid "imap_error(): unexpected response in %s: %s\n"
-#~ msgstr "imap_error()£º%s µÄÒâÍâ»ØÓ¦£º%s\n"
+#~ msgstr "imap_error()：%s 的意外回应：%s\n"
 
 #~ msgid "Can't open your secret key ring!"
-#~ msgstr "ÎÞ·¨´ò¿ªÄúµÄÃØÃÜÔ¿³×»·£¡"
+#~ msgstr "无法打开您的秘密钥匙环！"
 
 #~ msgid "An unkown PGP version was defined for signing."
-#~ msgstr "¶¨ÒåÁËÒ»¸ö²»Ã÷µÄ PGP °æ±¾À´Ç©Ãû"
+#~ msgstr "定义了一个不明的 PGP 版本来签名"
 
 #~ msgid "===== Attachments ====="
-#~ msgstr "===== ¸½¼þ ====="
+#~ msgstr "===== 附件 ====="
 
 #~ msgid "Sending CREATE command ..."
-#~ msgstr "ÕýÔÚËͳö CREATE ÃüÁî¡­"
+#~ msgstr "正在送出 CREATE 命令..."
 
 #~ msgid "Unknown PGP version \"%s\"."
-#~ msgstr "²»Ã÷µÄ PGP °æ±¾ \"%s\"¡£"
+#~ msgstr "不明的 PGP 版本 \"%s\"。"
 
 #~ msgid ""
 #~ "[-- Error: this message does not comply with the PGP/MIME specification! "
 #~ "--]\n"
 #~ "\n"
 #~ msgstr ""
-#~ "[-- ´íÎó£ºÕâ·âÐżþ²»·ûºÏ PGP/MIME µÄ¹æ¸ñ£¡ --]\n"
+#~ "[-- 错误：这封信件不符合 PGP/MIME 的规格！ --]\n"
 #~ "\n"
 
 #~ msgid "reserved"
-#~ msgstr "±£ÁôµÄ"
+#~ msgstr "保留的"
 
 #~ msgid "Signature Packet"
-#~ msgstr "Ç©Ãû·â°ü"
+#~ msgstr "签名封包"
 
 #~ msgid "Conventionally Encrypted Session Key Packet"
-#~ msgstr "Ò»°ã¼ÓÃÜÔ¿³×·â°ü"
+#~ msgstr "一般加密钥匙封包"
 
 #~ msgid "One-Pass Signature Packet"
-#~ msgstr "µ¥Ò»Í¨µÀµÄÇ©Ãû·â°ü"
+#~ msgstr "单一通道的签名封包"
 
 #~ msgid "Secret Key Packet"
-#~ msgstr "ÃØÃÜÔ¿³×·â°ü"
+#~ msgstr "秘密钥匙封包"
 
 #~ msgid "Public Key Packet"
-#~ msgstr "¹«¹²Ô¿³×·â°ü"
+#~ msgstr "公共钥匙封包"
 
 #~ msgid "Secret Subkey Packet"
-#~ msgstr "ÃØÃÜ´ÎÔ¿³×·â°ü"
+#~ msgstr "秘密次钥匙封包"
 
 #~ msgid "Compressed Data Packet"
-#~ msgstr "ѹËõ×ÊÁÏ·â°ü"
+#~ msgstr "压缩资料封包"
 
 #~ msgid "Symmetrically Encrypted Data Packet"
-#~ msgstr "¶Ô³Æ¼ÓÃÜ×ÊÁÏ·â°ü"
+#~ msgstr "对称加密资料封包"
 
 #~ msgid "Marker Packet"
-#~ msgstr "¼ÇºÅ·â°ü"
+#~ msgstr "记号封包"
 
 #~ msgid "Literal Data Packet"
-#~ msgstr "ÎÄ×Ö×ÊÁÏ·â°ü"
+#~ msgstr "文字资料封包"
 
 #~ msgid "Trust Packet"
-#~ msgstr "±»ÐÅÍзâ°ü"
+#~ msgstr "被信托封包"
 
 #~ msgid "Name Packet"
-#~ msgstr "Ãû³Æ·â°ü"
+#~ msgstr "名称封包"
 
 #~ msgid "Subkey Packet"
-#~ msgstr "´ÎÔ¿³× (subkey) ·â°ü"
+#~ msgstr "次钥匙 (subkey) 封包"
 
 #~ msgid "Reserved"
-#~ msgstr "±£ÁôµÄ"
+#~ msgstr "保留的"
 
 #~ msgid "Comment Packet"
-#~ msgstr "×¢½â·â°ü"
+#~ msgstr "注解封包"
 
 #~ msgid "Message edited. Really send?"
-#~ msgstr "ÐżþÒѾ­±à¼­¹ý¡£È·¶¨Òª¼Ä³ö£¿"
+#~ msgstr "信件已经编辑过。确定要寄出？"
 
 #~ msgid "Saved output of child process to %s.\n"
-#~ msgstr "Êä³ö×Ó³ÌÐò´¢´æÖÁ %s.\n"
+#~ msgstr "输出子程序储存至 %s.\n"