X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=po%2Fzh_CN.po;h=2325c91415d6299a408d011d80aac1f84a34b62e;hp=0de20082bf482b9c151b8ae16e924388ccabdeb6;hb=f5b0e714a215eddd4d9f8084b434b713f0a580b4;hpb=09e1bf15b3c55ca9c44c09d2e91dd251af2da706

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0de2008..2325c91 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-13 17:38+0100\n"
+"POT-Creation-Date: 2005-08-13 09:41+0000\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"
@@ -14,341 +14,384 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:148
+#: account.c:162
 #, fuzzy, c-format
 msgid "Username at %s: "
 msgstr "¸ü¸ÄÃû³ÆΪ£º"
 
-#: account.c:176
+#: account.c:219
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s µÄÃÜÂ룺"
 
-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
-#: recvattach.c:54
+#: alias.c:35 browser.c:48 browser.c:57 pager.c:1372 postpone.c:43 query.c:42
+#: recvattach.c:53
 msgid "Exit"
 msgstr "À뿪"
 
-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: alias.c:36 curs_main.c:374 curs_main.c:387 pager.c:1379 pager.c:1389
+#: postpone.c:44
 msgid "Del"
 msgstr "ɾ³ý"
 
-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: alias.c:37 curs_main.c:375 curs_main.c:388 postpone.c:45
 msgid "Undel"
 msgstr "·´É¾³ý"
 
-#: addrbook.c:40
+#: alias.c:38
 msgid "Select"
 msgstr "Ñ¡Ôñ"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
-#: smime.c:436
+#: alias.c:39 browser.c:51 browser.c:63 compose.c:116 compose.c:128
+#: crypt-gpgme.c:3307 curs_main.c:380 curs_main.c:393 mutt_ssl.c:639
+#: mutt_ssl_gnutls.c:745 pager.c:1484 pgpkey.c:496 postpone.c:46 query.c:47
+#: recvattach.c:57 smime.c:427
 msgid "Help"
 msgstr "°ïÖú"
 
-#: addrbook.c:145
-msgid "You have no aliases!"
-msgstr "ÄúûÓбðÃû×ÊÁÏ£¡"
-
-#: addrbook.c:156
-msgid "Aliases"
-msgstr "±ðÃû"
-
 #. add a new alias
-#: alias.c:246
+#: alias.c:236
 msgid "Alias as: "
 msgstr "È¡±ðÃûΪ£º"
 
-#: alias.c:252
+#: alias.c:241
 msgid "You already have an alias defined with that name!"
 msgstr "ÄúÒѾ­ÎªÕâ¸öÃû×Ö¶¨ÒåÁ˱ðÃûÀ²£¡"
 
-#: alias.c:258
+#: alias.c:248
 msgid "Warning: This alias name may not work.  Fix it?"
 msgstr ""
 
-#: alias.c:283
+#: alias.c:271
 msgid "Address: "
 msgstr "µØÖ·£º"
 
-#: alias.c:293 send.c:206
+#: alias.c:279 send.c:195
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: alias.c:305
+#: alias.c:291
 msgid "Personal name: "
 msgstr "¸öÈËÐÕÃû£º"
 
-#: alias.c:314
+#: alias.c:299
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] ½ÓÊÜ?"
 
-#: alias.c:331 recvattach.c:394 recvattach.c:417 recvattach.c:430
-#: recvattach.c:443 recvattach.c:471
+#: alias.c:314 recvattach.c:417 recvattach.c:441 recvattach.c:454
+#: recvattach.c:469 recvattach.c:494
 msgid "Save to file: "
 msgstr "´æµ½Îļþ£º"
 
-#: alias.c:346
+#: alias.c:328
 msgid "Alias added."
 msgstr "±ðÃûÒѾ­Ôö¼Ó¡£"
 
-#: attach.c:112 attach.c:244 attach.c:472 attach.c:963
+#: alias.c:642
+msgid "You have no aliases!"
+msgstr "ÄúûÓбðÃû×ÊÁÏ£¡"
+
+#: alias.c:654
+msgid "Aliases"
+msgstr "±ðÃû"
+
+#: attach.c:106 attach.c:227 attach.c:437 attach.c:903
 msgid "Can't match nametemplate, continue?"
 msgstr "ÎÞ·¨Æ¥ÅäÃû³ÆÄ£°å£¬¼ÌÐø£¿"
 
 #. For now, editing requires a file, no piping
-#: attach.c:125
+#: attach.c:119
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap ±à¼­ÏîÄ¿ÐèÒª %%s"
 
-#: attach.c:133 attach.c:263 commands.c:220 compose.c:1178 curs_lib.c:181
-#: curs_lib.c:428
+#: attach.c:126 attach.c:245 commands.c:219 compose.c:1320 curs_lib.c:179
+#: curs_lib.c:413
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Ö´ÐÐ \"%s\" ʱ·¢Éú´íÎó£¡"
 
-#: attach.c:143
+#: attach.c:134
 msgid "Failure to open file to parse headers."
 msgstr "´ò¿ªÎļþÀ´·ÖÎöÎļþͷʧ°Ü¡£"
 
-#: attach.c:174
+#: attach.c:162
 msgid "Failure to open file to strip headers."
 msgstr "´ò¿ªÎļþʱȥ³ýÎļþ±êͷʧ°Ü¡£"
 
-#: attach.c:183
+#: attach.c:171
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "´ò¿ªÎļþÀ´·ÖÎöÎļþͷʧ°Ü¡£"
 
-#: attach.c:196
+#: attach.c:184
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "ûÓÐ %s µÄ mailcap ×é³ÉµÇ¼£¬ÕýÔÚ½¨Á¢¿ÕµÄÎļþ¡£"
 
 #. For now, editing requires a file, no piping
-#: attach.c:257
+#: attach.c:240
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "±à¼­ Mailcap ÏîĿʱÐèÒª %%s"
 
-#: attach.c:275
+#: attach.c:255
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "ûÓÐ %s µÄ mailcap ±à¼­µÇ¼"
 
-#: attach.c:438
+#: attach.c:407
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "ûÓз¢ÏÖÅäºÏ mailcap µÄµÇ¼¡£½«ÒÔÎÄ×Öµµ·½Ê½ä¯ÀÀ¡£"
 
-#: attach.c:451
+#: attach.c:419
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME ÐÎʽδ±»¶¨Òå. ÎÞ·¨ÏÔʾ¸½¼þÄÚÈÝ¡£"
 
-#: attach.c:541
+#: attach.c:503
 msgid "Cannot create filter"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
 
-#: attach.c:671 attach.c:703 attach.c:996 attach.c:1054 handler.c:1563
-#: pgpkey.c:570 pgpkey.c:759
+#: attach.c:627 attach.c:656 attach.c:934 attach.c:988 handler.c:1308
+#: pgpkey.c:545 pgpkey.c:730
 msgid "Can't create filter"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂË"
 
-#: attach.c:835
+#: attach.c:785
 msgid "Write fault!"
 msgstr "дÈëʧ°Ü£¡"
 
-#: attach.c:1077
+#: attach.c:1011
 msgid "I don't know how to print that!"
 msgstr "ÎÒ²»ÖªµÀÒªÈçºÎ´òÓ¡Ëü£¡"
 
-#: browser.c:45
+#: browser.c:49
 msgid "Chdir"
 msgstr "¸Ä±äĿ¼"
 
-#: browser.c:46
+#: browser.c:50 browser.c:62
 msgid "Mask"
 msgstr "ÕÚÕÖ"
 
-#: browser.c:381 browser.c:989
+#: browser.c:58
+msgid "List"
+msgstr ""
+
+#: browser.c:59
+msgid "Subscribe"
+msgstr ""
+
+#: browser.c:60
+#, fuzzy
+msgid "Unsubscribe"
+msgstr "È¡Ïû¶©ÔÄ %s¡­"
+
+#: browser.c:61 curs_main.c:392
+msgid "Catchup"
+msgstr ""
+
+#: browser.c:522 browser.c:1173
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ²»ÊÇÒ»¸öĿ¼"
 
-#: browser.c:501
+#: browser.c:685
+msgid "Subscribed newsgroups"
+msgstr ""
+
+#: browser.c:687
+#, c-format
+msgid "Newsgroups on server [%s]"
+msgstr ""
+
+#: browser.c:693
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "ÐÅÏä [%d]"
 
-#: browser.c:508
+#: browser.c:699
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "ÒѶ©ÔÄ [%s], ÎļþÕÚÕÖ: %s"
 
-#: browser.c:512
+#: browser.c:703
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Ŀ¼ [%s], ÎļþÕÚÕÖ: %s"
 
-#: browser.c:524
+#: browser.c:716
 msgid "Can't attach a directory!"
 msgstr "ÎÞ·¨¸½´øĿ¼£¡"
 
-#: browser.c:655 browser.c:1056 browser.c:1153
+#: browser.c:861 browser.c:1234 browser.c:1330
 msgid "No files match the file mask"
 msgstr "ûÓÐÎļþÓëÎļþÕÚÕÖÏà·û"
 
-#: browser.c:860
+#: browser.c:1046
 #, fuzzy
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
 
-#: browser.c:880
+#: browser.c:1065
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
 
-#: browser.c:901
+#: browser.c:1085
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
 
-#: browser.c:909
+#: browser.c:1092
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "ÕæµÄҪɾ³ý \"%s\" ÓÊÏ䣿"
 
-#: browser.c:923
+#: browser.c:1105
 msgid "Mailbox deleted."
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
 
-#: browser.c:929
+#: browser.c:1112
 msgid "Mailbox not deleted."
 msgstr "ÓÊÏäδ±»É¾³ý¡£"
 
-#: browser.c:948
+#: browser.c:1137
 msgid "Chdir to: "
 msgstr "¸Ä±äĿ¼µ½£º"
 
-#: browser.c:977 browser.c:1049
+#: browser.c:1161 browser.c:1227
 msgid "Error scanning directory."
 msgstr "ÎÞ·¨É¨ÃèĿ¼¡£"
 
-#: browser.c:1000
+#: browser.c:1184
 msgid "File Mask: "
 msgstr "ÎļþÕÚÕÖ£º"
 
-#: browser.c:1072
+#: browser.c:1252
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "·´ÏòÅÅÐò (d)ÈÕÆÚ, (a)×ÖÔª, (z)´óС »ò (n)²»ÅÅÐò ? "
 
-#: browser.c:1073
+#: browser.c:1255
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "ÒÀÕÕ (d)ÈÕÆÚ (a)×ÖÔª (z)´óС À´ÅÅÐò£¬»ò(n)²»ÅÅÐò ? "
 
-#: browser.c:1074
+#: browser.c:1256
 msgid "dazn"
 msgstr ""
 
-#: browser.c:1140
+#: browser.c:1318
 msgid "New file name: "
 msgstr "еµÃû£º"
 
-#: browser.c:1171
+#: browser.c:1347
 msgid "Can't view a directory"
 msgstr "ÎÞ·¨ÏÔʾĿ¼"
 
-#: browser.c:1188
+#: browser.c:1364
 msgid "Error trying to view file"
 msgstr "ÎÞ·¨ÊÔÖøÏÔʾÎļþ"
 
-#: buffy.c:446
+#: browser.c:1446
+#, c-format
+msgid "Subscribe pattern: "
+msgstr ""
+
+#: browser.c:1448
+#, fuzzy, c-format
+msgid "Unsubscribe pattern: "
+msgstr "È¡Ïû¶©ÔÄ %s¡­"
+
+#: browser.c:1465
+#, fuzzy
+msgid "No newsgroups match the mask"
+msgstr "ûÓÐÎļþÓëÎļþÕÚÕÖÏà·û"
+
+#: buffy.c:515
 #, fuzzy
 msgid "New mail in "
 msgstr "ÔÚ %s ÓÐÐÂÐżþ¡£"
 
-#: color.c:326
+#: color.c:311
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s£ºÖն˻úÎÞ·¨ÏÔʾɫ²Ê"
 
-#: color.c:332
+#: color.c:317
 #, c-format
 msgid "%s: no such color"
 msgstr "%s£ºÃ»ÓÐÕâÖÖÑÕÉ«"
 
-#: color.c:378 color.c:579 color.c:590
+#: color.c:362 color.c:543 color.c:553
 #, c-format
 msgid "%s: no such object"
 msgstr "%s£ºÃ»ÓÐÕâ¸öÎï¼þ"
 
-#: color.c:385
+#: color.c:368
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s£ºÃüÁîÖ»ÌṩË÷ÒýÎï¼þ"
 
-#: color.c:393
+#: color.c:375
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s£ºÌ«ÉÙ²ÎÊý"
 
-#: color.c:567
+#: color.c:534
 msgid "Missing arguments."
 msgstr "ȱÉÙ²ÎÊý¡£"
 
-#: color.c:606 color.c:617
+#: color.c:570 color.c:580
 msgid "color: too few arguments"
 msgstr "É«²Ê£ºÌ«ÉÙ²ÎÊý"
 
-#: color.c:640
+#: color.c:605
 msgid "mono: too few arguments"
 msgstr "µ¥É«£ºÌ«ÉÙ²ÎÊý"
 
-#: color.c:660
+#: color.c:624
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s£ºÃ»ÓÐÕâ¸öÊôÐÔ"
 
-#: color.c:700 hook.c:69 hook.c:77 keymap.c:748
+#: color.c:663 hook.c:68 hook.c:78 keymap.c:709
 msgid "too few arguments"
 msgstr "Ì«ÉÙ²ÎÊý"
 
-#: color.c:709 hook.c:83
+#: color.c:671 hook.c:83
 msgid "too many arguments"
 msgstr "Ì«¶à²ÎÊý"
 
-#: color.c:725
+#: color.c:687
 msgid "default colors not supported"
 msgstr "²»Ö§³ÖÔ¤ÉèµÄÉ«²Ê"
 
-#. find out whether or not the verify signature
-#: commands.c:92
-msgid "Verify PGP signature?"
-msgstr "¼ì²é PGP Ç©Ãû?"
-
-#: commands.c:117 mbox.c:737
+#: commands.c:79 mbox.c:611
 msgid "Could not create temporary file!"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
 
-#: commands.c:130
+#: commands.c:91
 #, fuzzy
 msgid "Cannot create display filter"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
 
-#: commands.c:150
+#. find out whether or not the verify signature
+#: commands.c:122
+msgid "Verify PGP signature?"
+msgstr "¼ì²é PGP Ç©Ãû?"
+
+#: commands.c:153
 #, fuzzy
 msgid "Could not copy message"
 msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
 
-#: commands.c:186
+#: commands.c:185
 #, fuzzy
 msgid "S/MIME signature successfully verified."
 msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
 
-#: commands.c:188
+#: commands.c:187
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
@@ -361,7 +404,7 @@ msgstr ""
 msgid "S/MIME signature could NOT be verified."
 msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
 
-#: commands.c:200
+#: commands.c:199
 msgid "PGP signature successfully verified."
 msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
 
@@ -370,96 +413,96 @@ msgstr "PGP Ç©
 msgid "PGP signature could NOT be verified."
 msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
 
-#: commands.c:227
+#: commands.c:225
 msgid "Command: "
 msgstr "Ö¸Á"
 
-#: commands.c:246 recvcmd.c:147
+#: commands.c:244 recvcmd.c:137
 msgid "Bounce message to: "
 msgstr "Ö±½Ó´«ËÍÓʼþµ½£º"
 
-#: commands.c:248 recvcmd.c:149
+#: commands.c:246 recvcmd.c:139
 msgid "Bounce tagged messages to: "
 msgstr "ÎÞ·¨´«ËÍÒѱê¼ÇµÄÓʼþÖÁ£º"
 
-#: commands.c:263 recvcmd.c:158
+#: commands.c:259 recvcmd.c:147
 msgid "Error parsing address!"
 msgstr "ÎÞ·¨·ÖÎöλַ£¡"
 
-#: commands.c:271 recvcmd.c:166
+#: commands.c:267 recvcmd.c:155
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:278 recvcmd.c:169
 #, c-format
 msgid "Bounce message to %s"
 msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
 
-#: commands.c:282 recvcmd.c:180
+#: commands.c:278 recvcmd.c:169
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:293 recvcmd.c:184
 #, fuzzy
 msgid "Message not bounced."
 msgstr "ÓʼþÒѱ»´«ËÍ¡£"
 
-#: commands.c:298 recvcmd.c:196
+#: commands.c:293 recvcmd.c:184
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "ÓʼþÒÑ´«ËÍ¡£"
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:303 recvcmd.c:201
 msgid "Message bounced."
 msgstr "ÓʼþÒѱ»´«ËÍ¡£"
 
-#: commands.c:308 recvcmd.c:215
+#: commands.c:303 recvcmd.c:201
 msgid "Messages bounced."
 msgstr "ÓʼþÒÑ´«ËÍ¡£"
 
-#: commands.c:385 commands.c:419 commands.c:436
+#: commands.c:371 commands.c:402 commands.c:419
 #, fuzzy
 msgid "Can't create filter process"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂË"
 
-#: commands.c:465
+#: commands.c:449
 msgid "Pipe to command: "
 msgstr "ÓùܵÀÊä³öÖÁÃüÁ"
 
-#: commands.c:482
+#: commands.c:463
 #, fuzzy
 msgid "No printing command has been defined."
 msgstr "Ȧѡ½øÈëµÄÓÊͲ"
 
-#: commands.c:487
+#: commands.c:468
 msgid "Print message?"
 msgstr "´òÓ¡Ðżþ£¿"
 
-#: commands.c:487
+#: commands.c:468
 msgid "Print tagged messages?"
 msgstr "´òÓ¡Òѱê¼ÇµÄÐżþ£¿"
 
-#: commands.c:496
+#: commands.c:475
 msgid "Message printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:496
+#: commands.c:475
 msgid "Messages printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:498
+#: commands.c:477
 #, fuzzy
 msgid "Message could not be printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:499
+#: commands.c:478
 #, fuzzy
 msgid "Messages could not be printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:508
+#: commands.c:488
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
@@ -468,7 +511,7 @@ msgstr ""
 "·´·½Ïò d)ÈÕÆÚ,f)·¢ÐÅÈË,r)ÊÕÐÅʱ¼ä,s)±êÌâ,o)ÊÕÐÅÈË,t)ÐòÁÐ,u)²»ÅÅ,z)´óС,c)·Ö"
 "Êý:"
 
-#: commands.c:509
+#: commands.c:491
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
@@ -477,306 +520,390 @@ msgstr ""
 "ÅÅÐò d)ÈÕÆÚ,f)·¢ÐÅÈË,r)ÊÕÐÅʱ¼ä,s)±êÌâ,o)ÊÕÐÅÈË,t)ÐòÁÐ,u)²»ÅÅÐò,z)´óС,c)·Ö"
 "Êý:"
 
-#: commands.c:510
+#: commands.c:492
 msgid "dfrsotuzcp"
 msgstr ""
 
-#: commands.c:567
+#: commands.c:548
 msgid "Shell command: "
 msgstr "Shell Ö¸Á"
 
-#: commands.c:709
+#: commands.c:689
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:710
+#: commands.c:690
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:711
+#: commands.c:691
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:712
+#: commands.c:692
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:713
+#: commands.c:693
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:713
+#: commands.c:693
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:714
+#: commands.c:694
 msgid " tagged"
 msgstr " Òѱê¼Ç"
 
-#: commands.c:787
+#: commands.c:759
 #, c-format
 msgid "Copying to %s..."
 msgstr "¿½±´µ½ %s¡­"
 
-#: commands.c:909
+#: commands.c:843
+#, fuzzy
+msgid "Unable to create backup file"
+msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
+
+#: commands.c:849
+#, fuzzy
+msgid "Unable to open backup file for reading"
+msgstr "ÎÞ·¨´ò¿ªÔÝ´æµµ£¡"
+
+#: commands.c:856
+#, fuzzy
+msgid "Unable to open new file for writing"
+msgstr "ÎÞ·¨´ò¿ªÔÝ´æµµ£¡"
+
+#: commands.c:863
+#, c-format
+msgid "Unable to lock %s, old file saved as %s"
+msgstr ""
+
+#: commands.c:940
+#, c-format
+msgid "Cannot write new %s, old file saved as %s"
+msgstr ""
+
+#: commands.c:1001
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr ""
 
-#: commands.c:919
+#: commands.c:1011
 #, fuzzy, c-format
 msgid "Content-Type changed to %s."
 msgstr "ÕýÁ¬½Óµ½ %s¡­"
 
-#: commands.c:924
+#: commands.c:1015
 #, fuzzy, c-format
 msgid "Character set changed to %s; %s."
 msgstr "²»Ã÷µÄ×Ö·û¼¯ %s¡£"
 
-#: commands.c:926
+#: commands.c:1017
 msgid "not converting"
 msgstr ""
 
-#: commands.c:926
+#: commands.c:1017
 msgid "converting"
 msgstr ""
 
-#: compose.c:47
+#: compose.c:53
 msgid "There are no attachments."
 msgstr "ûÓи½¼þ¡£"
 
-#: compose.c:89
+#: compose.c:109 compose.c:122
 msgid "Send"
 msgstr "¼Ä³ö"
 
-#: compose.c:90 remailer.c:487
+#: compose.c:110 compose.c:123 remailer.c:458
 msgid "Abort"
 msgstr "ÖжÏ"
 
-#: compose.c:94 compose.c:668
+#: compose.c:114 compose.c:126 compose.c:783
 msgid "Attach file"
 msgstr "¸½¼ÓÎļþ"
 
-#: compose.c:95
+#: compose.c:115 compose.c:127
 msgid "Descrip"
 msgstr "ÐðÊö"
 
-#: compose.c:132
+#: compose.c:164
 msgid "Sign, Encrypt"
 msgstr "Ç©Ãû£¬¼ÓÃÜ"
 
-#: compose.c:134
+#: compose.c:166
 msgid "Encrypt"
 msgstr "¼ÓÃÜ"
 
-#: compose.c:136
+#: compose.c:168
 msgid "Sign"
 msgstr "Ç©Ãû"
 
-#: compose.c:138
+#: compose.c:170
 msgid "Clear"
 msgstr "Çå³ý"
 
-#: compose.c:145
+#: compose.c:176
 #, fuzzy
 msgid " (inline)"
 msgstr "£¨¼ÌÐø£©\n"
 
-#: compose.c:147
+#: compose.c:178
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:155 compose.c:159
-msgid " sign as: "
+#: compose.c:186 compose.c:191
+#, fuzzy
+msgid "     sign as: "
 msgstr " Ç©ÃûµÄÉí·ÝÊÇ£º "
 
-#: compose.c:155 compose.c:159
+#: compose.c:187 compose.c:192
 msgid "<default>"
 msgstr "<Ô¤ÉèÖµ>"
 
-#: compose.c:167
+#: compose.c:199
 #, fuzzy
 msgid "Encrypt with: "
 msgstr "¼ÓÃÜ"
 
-#: compose.c:221
+#: compose.c:248
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] ÒѲ»´æÔÚ!"
 
-#: compose.c:229
+#: compose.c:254
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] ÒÑÐ޸ġ£¸üбàÂ룿"
 
-#: compose.c:272
+#: compose.c:313
 msgid "-- Attachments"
 msgstr "-- ¸½¼þ"
 
-#: compose.c:302
+#: compose.c:340
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
 
-#: compose.c:325
+#: compose.c:362
 msgid "You may not delete the only attachment."
 msgstr "Äú²»¿ÉÒÔɾ³ýΨһµÄ¸½¼þ¡£"
 
-#: compose.c:601 send.c:1486
+#: compose.c:718 send.c:1543
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
 
-#: compose.c:684
+#: compose.c:800
 msgid "Attaching selected files..."
 msgstr "ÕýÔÚ¸½¼ÓÑ¡È¡Á˵ÄÎļþ¡­"
 
-#: compose.c:695
+#: compose.c:812
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "ÎÞ·¨¸½¼Ó %s£¡"
 
-#: compose.c:714
+#: compose.c:835
 msgid "Open mailbox to attach message from"
 msgstr "´ò¿ªÐÅÏä²¢´ÓËüÑ¡Ôñ¸½¼ÓµÄÐżþ"
 
-#: compose.c:752
+#: compose.c:843
+#, fuzzy
+msgid "Open newsgroup to attach message from"
+msgstr "´ò¿ªÐÅÏä²¢´ÓËüÑ¡Ôñ¸½¼ÓµÄÐżþ"
+
+#: compose.c:894
 msgid "No messages in that folder."
 msgstr "Îļþ¼ÐÖÐûÓÐÐżþ¡£"
 
-#: compose.c:761
+#: compose.c:905
 msgid "Tag the messages you want to attach!"
 msgstr "Çë±ê¼ÇÄúÒª¸½¼ÓµÄÐżþ£¡"
 
-#: compose.c:793
+#: compose.c:935
 msgid "Unable to attach!"
 msgstr "ÎÞ·¨¸½¼Ó£¡"
 
-#: compose.c:842
+#: compose.c:985
 msgid "Recoding only affects text attachments."
 msgstr "Ö»ÖØбàÂëÊÜÓ°ÏìµÄÎÄ×Ö¸½¼þ"
 
-#: compose.c:847
+#: compose.c:990
 msgid "The current attachment won't be converted."
 msgstr "Õâ¸ö¸½¼þ²»»á±»×ª»»¡£"
 
-#: compose.c:849
+#: compose.c:992
 msgid "The current attachment will be converted."
 msgstr "Õâ¸ö¸½¼þ»á±»×ª»»¡£"
 
-#: compose.c:924
+#: compose.c:1063
 msgid "Invalid encoding."
 msgstr "ÎÞЧµÄ±àÂë¡£"
 
-#: compose.c:950
+#: compose.c:1087
 msgid "Save a copy of this message?"
 msgstr "´¢´æÕâ·âÐżþµÄ¿½±´Âð£¿"
 
-#: compose.c:1006
+#: compose.c:1143
 msgid "Rename to: "
 msgstr "¸ü¸ÄÃû³ÆΪ£º"
 
-#: compose.c:1011 editmsg.c:116 sendlib.c:914
+#: compose.c:1146 editmsg.c:107 sendlib.c:820
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "ÎÞ·¨¶ÁÈ¡£º%s"
 
-#: compose.c:1038
+#: compose.c:1173
 msgid "New file: "
 msgstr "½¨Á¢Ðµµ£º"
 
-#: compose.c:1051
+#: compose.c:1185
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type µÄ¸ñʽÊÇ base/sub"
 
-#: compose.c:1057
+#: compose.c:1191
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "²»Ã÷µÄ Content-Type %s"
 
-#: compose.c:1070
+#: compose.c:1202
 #, c-format
 msgid "Can't create file %s"
 msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
 
-#: compose.c:1078
+#: compose.c:1210
 msgid "What we have here is a failure to make an attachment"
 msgstr "ÎÒÃÇÎÞ·¨¼ÓÉϸ½¼þ"
 
-#: compose.c:1139
+#: compose.c:1281
 msgid "Postpone this message?"
 msgstr "ÑӳټijöÕâ·âÐżþ£¿"
 
-#: compose.c:1196
+#: compose.c:1337
 msgid "Write message to mailbox"
 msgstr "½«ÐżþдÈëµ½ÐÅÏä"
 
-#: compose.c:1199
+#: compose.c:1339
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "дÈëÐżþµ½ %s ¡­"
 
-#: compose.c:1208
+#: compose.c:1348
 msgid "Message written."
 msgstr "ÐżþÒÑдÈë¡£"
 
-#: compose.c:1220
+#: compose.c:1359
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1246
+#: compose.c:1383
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: crypt.c:69
+#: compress.c:202 mbox.c:519
+msgid "Mailbox was corrupted!"
+msgstr "ÐÅÏäÒÑËð»µ!"
+
+#: compress.c:229
+#, fuzzy, c-format
+msgid "Decompressing %s..."
+msgstr "Ñ¡Ôñ %s ÖС­"
+
+#: compress.c:245 compress.c:363 compress.c:438 mbox.c:586
+msgid "Unable to lock mailbox!"
+msgstr "ÎÞ·¨ËøסÐÅÏ䣡"
+
+#: compress.c:253
+#, fuzzy, c-format
+msgid "echo Decompressing %s..."
+msgstr "Ñ¡Ôñ %s ÖС­"
+
+#: compress.c:264
+#, c-format
+msgid "Error executing: %s : unable to open the mailbox!\n"
+msgstr ""
+
+#: compress.c:348 compress.c:420
+#, fuzzy, c-format
+msgid "Compressing %s..."
+msgstr "¿½±´µ½ %s¡­"
+
+#: compress.c:375 compress.c:450
+#, fuzzy, c-format
+msgid "echo Compressing %s..."
+msgstr "¿½±´µ½ %s¡­"
+
+#: compress.c:380
+#, c-format
+msgid ""
+"%s: Error compressing mailbox! Original mailbox deleted, uncompressed one "
+"kept!\n"
+msgstr ""
+
+#: compress.c:422
+#, fuzzy, c-format
+msgid "Compressed-appending to %s..."
+msgstr "¿½±´µ½ %s¡­"
+
+#: compress.c:452
+#, c-format
+msgid "echo Compressed-appending to %s..."
+msgstr ""
+
+#: compress.c:459
+#, c-format
+msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
+msgstr ""
+
+#: crypt.c:65
 #, c-format
 msgid " (current time: %c)"
 msgstr ""
 
-#: crypt.c:75
+#: crypt.c:71
 #, fuzzy, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr "[-- ÒÔÏÂΪ PGP Êä³öµÄ×ÊÁÏ£¨ÏÖÔÚʱ¼ä£º "
 
-#: crypt.c:90
+#: crypt.c:87
 #, fuzzy
 msgid "Passphrase(s) forgotten."
 msgstr "ÒÑÍü¼Ç PGP ͨÐÐÃÜÂë¡£"
 
-#. they really want to send it inline... go for it
-#: crypt.c:148 pgpkey.c:563
+#: crypt.c:144 cryptglue.c:102 pgpkey.c:536
 msgid "Invoking PGP..."
 msgstr "Æô¶¯ PGP¡­"
 
-#. otherwise inline won't work...ask for revert
-#: crypt.c:157
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
-#. abort
-#: crypt.c:159 send.c:1438
+#: crypt.c:158 send.c:1490
 msgid "Mail not sent."
 msgstr "ÐżþûÓмijö¡£"
 
-#: crypt.c:398
+#: crypt.c:385
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:617 crypt.c:661
+#: crypt.c:588 crypt.c:627
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
-#: crypt.c:641 crypt.c:681
+#. else ?
+#: crypt.c:610 crypt.c:646
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
-#: crypt.c:802
+#: crypt.c:762
 #, fuzzy
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
@@ -785,7 +912,7 @@ msgstr ""
 "[-- ´íÎ󣺲»Ò»Ö嵀 multipart/signed ½á¹¹£¡ --]\n"
 "\n"
 
-#: crypt.c:824
+#: crypt.c:779
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -794,7 +921,7 @@ msgstr ""
 "[-- ´íÎ󣺲»Ã÷µÄ multipart/signed Э¶¨ %s£¡ --]\n"
 "\n"
 
-#: crypt.c:864
+#: crypt.c:814
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -804,7 +931,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:876
+#: crypt.c:826
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -813,7 +940,7 @@ msgstr ""
 "[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
 "\n"
 
-#: crypt.c:882
+#: crypt.c:832
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -821,7 +948,7 @@ msgstr ""
 "[-- ¾¯¸æ£ºÕÒ²»µ½ÈκεÄÇ©Ãû¡£ --]\n"
 "\n"
 
-#: crypt.c:888
+#: crypt.c:839
 #, fuzzy
 msgid ""
 "\n"
@@ -830,239 +957,898 @@ msgstr ""
 "\n"
 "[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
 
-# Don't translate this!!
-#: curs_lib.c:190
-msgid "yes"
-msgstr ""
-
-# Don't translate this!!
-#: curs_lib.c:191
-msgid "no"
+#: cryptglue.c:81
+msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
 msgstr ""
 
-#. restore blocking operation
-#: curs_lib.c:287
-msgid "Exit Mutt?"
-msgstr "À뿪 Mutt£¿"
-
-#: curs_lib.c:380 mutt_socket.c:530 mutt_ssl.c:328
-msgid "unknown error"
-msgstr "²»Ã÷µÄ´íÎó"
+#: cryptglue.c:105
+#, fuzzy
+msgid "Invoking SMIME..."
+msgstr "Æô¶¯ PGP¡­"
 
-#: curs_lib.c:400
-msgid "Press any key to continue..."
-msgstr "°´ÏÂÈκÎÒ»¸ö¼ü¼ÌÐø¡­"
+#: crypt-gpgme.c:326
+#, fuzzy, c-format
+msgid "error creating gpgme context: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
 
-#: curs_lib.c:444
-msgid " ('?' for list): "
-msgstr " (Óà '?' ÏÔʾÁбí)£º"
+#: crypt-gpgme.c:334
+#, c-format
+msgid "error enabling CMS protocol: %s\n"
+msgstr ""
 
-#: curs_main.c:51 curs_main.c:615 curs_main.c:645
-msgid "No mailbox is open."
-msgstr "ûÓÐÒÑ´ò¿ªÐÅÏä¡£"
+#: crypt-gpgme.c:352
+#, c-format
+msgid "error creating gpgme data object: %s\n"
+msgstr ""
 
-#: curs_main.c:52
-msgid "There are no messages."
-msgstr "ûÓÐÐżþ¡£"
+#: crypt-gpgme.c:411 crypt-gpgme.c:428 crypt-gpgme.c:1245
+#, fuzzy, c-format
+msgid "error allocating data object: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
 
-#: curs_main.c:53 mx.c:1135 pager.c:58 recvattach.c:44
-msgid "Mailbox is read-only."
-msgstr "ÐÅÏäÊÇÖ»¶ÁµÄ¡£"
+#: crypt-gpgme.c:445
+#, fuzzy, c-format
+msgid "error rewinding data object: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
 
-#: curs_main.c:54 pager.c:59 recvattach.c:873
-msgid "Function not permitted in attach-message mode."
-msgstr "¹¦ÄÜÔÚ attach-message ģʽϲ»±»Ö§³Ö¡£"
+#: crypt-gpgme.c:463 crypt-gpgme.c:505
+#, fuzzy, c-format
+msgid "error reading data object: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
 
-#: curs_main.c:55
-#, fuzzy
-msgid "No visible messages."
-msgstr "ûÓÐÐÂÐżþ"
+#: crypt-gpgme.c:561
+#, fuzzy, c-format
+msgid "error adding recipient `%s': %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
 
-#: curs_main.c:248
-msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "ÎÞ·¨Ð´Èëµ½Ò»¸öÖ»¶ÁµÄÐÅÏ䣡"
+#: crypt-gpgme.c:598
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr ""
 
-#: curs_main.c:255
-msgid "Changes to folder will be written on folder exit."
-msgstr "ÔÚÀ뿪֮ºó½«»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
+#: crypt-gpgme.c:607
+#, c-format
+msgid "ambiguous specification of secret key `%s'\n"
+msgstr ""
 
-#: curs_main.c:260
-msgid "Changes to folder will not be written."
-msgstr "½«²»»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
+#: crypt-gpgme.c:617
+#, c-format
+msgid "error setting secret key `%s': %s\n"
+msgstr ""
 
-#: curs_main.c:401
-msgid "Quit"
-msgstr "À뿪"
+#: crypt-gpgme.c:658
+#, fuzzy, c-format
+msgid "error encrypting data: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
 
-#: curs_main.c:404 recvattach.c:55
-msgid "Save"
-msgstr "´¢´æ"
+#: crypt-gpgme.c:751
+#, fuzzy, c-format
+msgid "error signing data: %s\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
 
-#: curs_main.c:405 query.c:49
-msgid "Mail"
-msgstr "Ðżþ"
+#: crypt-gpgme.c:939
+msgid "Warning: One of the keys has been revoked\n"
+msgstr ""
 
-#: curs_main.c:406 pager.c:1457
-msgid "Reply"
-msgstr "»Ø¸²"
+#: crypt-gpgme.c:947
+msgid "Warning: The key used to create the signature expired at: "
+msgstr ""
 
-#: curs_main.c:407
-msgid "Group"
-msgstr "Ⱥ×é"
+#: crypt-gpgme.c:953
+msgid "Warning: At least one certification key has expired\n"
+msgstr ""
 
-#: curs_main.c:496
-msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
+#: crypt-gpgme.c:967
+msgid "Warning: The signature expired at: "
+msgstr ""
 
-#: curs_main.c:499
-msgid "New mail in this mailbox."
-msgstr "Õâ¸öÐÅÏäÖÐÓÐÐÂÐżþ¡£"
+#: crypt-gpgme.c:973
+msgid "Can't verify due to a missing key or certificate\n"
+msgstr ""
 
-#: curs_main.c:503
+#: crypt-gpgme.c:977
 #, fuzzy
-msgid "Mailbox was externally modified."
-msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
+msgid "The CRL is not available\n"
+msgstr "Ö÷Ðżþ²»´æÔÚ¡£"
 
-#: curs_main.c:621
-msgid "No tagged messages."
-msgstr "ûÓбê¼ÇÁ˵ÄÐżþ¡£"
+#: crypt-gpgme.c:982
+msgid "Available CRL is too old\n"
+msgstr ""
 
-#: curs_main.c:657 menu.c:906
-#, fuzzy
-msgid "Nothing to do."
-msgstr "ÕýÁ¬½Óµ½ %s¡­"
+#: crypt-gpgme.c:987
+msgid "A policy requirement was not met\n"
+msgstr ""
 
-#: curs_main.c:743
-msgid "Jump to message: "
-msgstr "Ìøµ½Ðżþ£º"
+#: crypt-gpgme.c:995
+msgid "A system error occurred"
+msgstr ""
 
-#: curs_main.c:749
-msgid "Argument must be a message number."
-msgstr "ÐèÒªÒ»¸öÐżþ±àºÅµÄ²ÎÊý¡£"
+#: crypt-gpgme.c:1028 crypt-gpgme.c:2826
+msgid "Fingerprint: "
+msgstr ""
 
-#: curs_main.c:782
-msgid "That message is not visible."
-msgstr "Õâ·âÐżþÎÞ·¨ÏÔʾ¡£"
+#: crypt-gpgme.c:1083
+msgid ""
+"WARNING: We have NO indication whether the key belongs to the person named "
+"as shown above\n"
+msgstr ""
 
-#: curs_main.c:785
-msgid "Invalid message number."
-msgstr "ÎÞЧµÄÐżþ±àºÅ¡£"
+#: crypt-gpgme.c:1089
+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
+msgstr ""
 
-#: curs_main.c:804
-msgid "Delete messages matching: "
-msgstr "ɾ³ý·ûºÏÕâÑùʽµÄÐżþ£º"
+#: crypt-gpgme.c:1093
+msgid ""
+"WARNING: It is NOT certain that the key belongs to the person named as shown "
+"above\n"
+msgstr ""
 
-#: curs_main.c:826
-msgid "No limit pattern is in effect."
-msgstr "ûÓÐÏÞÖÆÑùʽÊÇÓÐЧµÄ¡£"
+#: crypt-gpgme.c:1161
+msgid "Error getting key information: "
+msgstr ""
 
-#. i18n: ask for a limit to apply
-#: curs_main.c:831
-#, c-format
-msgid "Limit: %s"
-msgstr "ÏÞÖÆ: %s"
+#. 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,
+#. fingerprint and the key validity (which is neither fully or
+#. ultimate).
+#: crypt-gpgme.c:1167 crypt-gpgme.c:1197
+msgid "Good signature from: "
+msgstr ""
 
-#: curs_main.c:841
-msgid "Limit to messages matching: "
-msgstr "ÏÞÖÆÖ»·ûºÏÕâÑùʽµÄÐżþ£º"
+#: crypt-gpgme.c:1176
+msgid "                aka: "
+msgstr ""
 
-#: curs_main.c:873
-msgid "Quit Mutt?"
-msgstr "À뿪 Mutt£¿"
+#: crypt-gpgme.c:1180 crypt-gpgme.c:1200
+msgid "            created: "
+msgstr ""
 
-#: curs_main.c:952
-msgid "Tag messages matching: "
-msgstr "±ê¼ÇÐżþµÄÌõ¼þ£º"
+#: crypt-gpgme.c:1188
+msgid "*BAD* signature claimed to be from: "
+msgstr ""
 
-#: curs_main.c:966
-msgid "Undelete messages matching: "
-msgstr "·´É¾³ýÐżþµÄÌõ¼þ£º"
+#. can't decide (yellow)
+#: crypt-gpgme.c:1210
+#, fuzzy
+msgid "Error checking signature"
+msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
 
-#: curs_main.c:974
-msgid "Untag messages matching: "
-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:1253 crypt-gpgme.c:1437 crypt-gpgme.c:1900
+msgid "[-- Begin signature information --]\n"
+msgstr ""
 
-#: curs_main.c:1053
-msgid "Open mailbox in read-only mode"
-msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÐÅÏä"
+#: crypt-gpgme.c:1261
+#, fuzzy, c-format
+msgid "Error: verification failed: %s\n"
+msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
 
-#: curs_main.c:1055
-msgid "Open mailbox"
-msgstr "´ò¿ªÐÅÏä"
+#: crypt-gpgme.c:1318 crypt-gpgme.c:1448 crypt-gpgme.c:1913
+#, fuzzy
+msgid ""
+"[-- End signature information --]\n"
+"\n"
+msgstr ""
+"\n"
+"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
+
+#: crypt-gpgme.c:1407
+#, fuzzy, c-format
+msgid ""
+"[-- Error: decryption failed: %s --]\n"
+"\n"
+msgstr "[-- ´íÎó£ºÍ»·¢µÄµµÎ²£¡ --]\n"
 
-#: curs_main.c:1071 mx.c:512 mx.c:658
+#: crypt-gpgme.c:1877
 #, c-format
-msgid "%s is not a mailbox."
-msgstr "%s ²»ÊÇÐÅÏä¡£"
+msgid "Error: decryption/verification failed: %s\n"
+msgstr ""
 
-#: curs_main.c:1165
-msgid "Exit Mutt without saving?"
-msgstr "²»´¢´æ±ãÀ뿪 Mutt Âð£¿"
+#: crypt-gpgme.c:1920
+msgid "Error: copy data failed\n"
+msgstr ""
 
-#: curs_main.c:1199 curs_main.c:1224
-msgid "You are on the last message."
-msgstr "ÄúÒѾ­ÔÚ×îºóÒ»·âÐÅÁË¡£"
+#: crypt-gpgme.c:1938 pgp.c:390
+msgid ""
+"[-- BEGIN PGP MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP Ðżþ¿ªÊ¼ --]\n"
+"\n"
 
-#: curs_main.c:1206 curs_main.c:1250
-msgid "No undeleted messages."
-msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
+#: crypt-gpgme.c:1940 pgp.c:392
+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î¿ªÊ¼ --]\n"
 
-#: curs_main.c:1243 curs_main.c:1267
+#: crypt-gpgme.c:1942 pgp.c:394
+msgid ""
+"[-- BEGIN PGP SIGNED MESSAGE --]\n"
+"\n"
+msgstr ""
+"[-- PGP Ç©ÃûµÄÐżþ¿ªÊ¼ --]\n"
+"\n"
+
+#: crypt-gpgme.c:1965 pgp.c:417
+#, fuzzy
+msgid "[-- END PGP MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- PGP Ðżþ½áÊø --]\n"
+
+#: crypt-gpgme.c:1967 pgp.c:421
+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î½áÊø --]\n"
+
+#: crypt-gpgme.c:1969 pgp.c:423
+#, fuzzy
+msgid "[-- END PGP SIGNED MESSAGE --]\n"
+msgstr ""
+"\n"
+"[-- PGP Ç©ÃûµÄÐżþ½áÊø --]\n"
+
+#: crypt-gpgme.c:1987 pgp.c:451
+msgid ""
+"[-- Error: could not find beginning of PGP message! --]\n"
+"\n"
+msgstr ""
+"[-- ´íÎó£ºÕÒ²»µ½ PGP ÐżþµÄ¿ªÍ·£¡ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2016 pgp.c:857
+msgid ""
+"[-- Error: malformed PGP/MIME message! --]\n"
+"\n"
+msgstr ""
+"[-- ´íÎ󣺲»ÕýÈ·µÄ PGP/MIME Ðżþ£¡ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2027 crypt-gpgme.c:2090 pgp.c:871
+msgid "[-- Error: could not create temporary file! --]\n"
+msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ÔÝ´æµµ£¡ --]\n"
+
+#: crypt-gpgme.c:2039
+#, fuzzy
+msgid ""
+"[-- The following data is PGP/MIME signed and encrypted --]\n"
+"\n"
+msgstr ""
+"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2040 pgp.c:882
+msgid ""
+"[-- The following data is PGP/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2062
+#, fuzzy
+msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+
+#: crypt-gpgme.c:2063 pgp.c:902
+#, fuzzy
+msgid "[-- End of PGP/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+
+#: crypt-gpgme.c:2101
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME signed --]\n"
+"\n"
+msgstr ""
+"[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
+"\n"
+
+#: crypt-gpgme.c:2102
+#, fuzzy
+msgid ""
+"[-- The following data is S/MIME encrypted --]\n"
+"\n"
+msgstr ""
+"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
+"\n"
+
+#: crypt-gpgme.c:2129
+#, fuzzy
+msgid "[-- End of S/MIME signed data --]\n"
+msgstr ""
+"\n"
+"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
+
+#: crypt-gpgme.c:2130
+#, fuzzy
+msgid "[-- End of S/MIME encrypted data --]\n"
+msgstr ""
+"\n"
+"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+
+#: crypt-gpgme.c:2679
+msgid "[Can't display this user ID (unknown encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2681
+msgid "[Can't display this user ID (invalid encoding)]"
+msgstr ""
+
+#: crypt-gpgme.c:2686
+msgid "[Can't display this user ID (invalid DN)]"
+msgstr ""
+
+#: crypt-gpgme.c:2758
+msgid " aka ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2758
+msgid "Name ......: "
+msgstr ""
+
+#: crypt-gpgme.c:2761 crypt-gpgme.c:2882
+#, fuzzy
+msgid "[Invalid]"
+msgstr "ÎÞЧµÄÔ·ݣº%s"
+
+#: crypt-gpgme.c:2780 crypt-gpgme.c:2903
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "ÎÞЧµÄÔ·ݣº%s"
+
+#: crypt-gpgme.c:2792 crypt-gpgme.c:2915
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "ÎÞЧµÄÔ·ݣº%s"
+
+#: crypt-gpgme.c:2805 crypt-gpgme.c:2928
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2807 crypt-gpgme.c:2930
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:2811 crypt-gpgme.c:2934
+#, fuzzy
+msgid "encryption"
+msgstr "¼ÓÃÜ"
+
+#: crypt-gpgme.c:2812 crypt-gpgme.c:2816 crypt-gpgme.c:2820 crypt-gpgme.c:2935
+#: crypt-gpgme.c:2939 crypt-gpgme.c:2943
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:2815 crypt-gpgme.c:2938
+msgid "signing"
+msgstr ""
+
+#: crypt-gpgme.c:2819 crypt-gpgme.c:2942
+msgid "certification"
+msgstr ""
+
+#: crypt-gpgme.c:2853
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2859
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
+#: crypt-gpgme.c:2875
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "Ô¿³× ID£º0x%s"
+
+#: crypt-gpgme.c:2878
+msgid "[Revoked]"
+msgstr ""
+
+#: crypt-gpgme.c:2886
+#, fuzzy
+msgid "[Expired]"
+msgstr "À뿪  "
+
+#: crypt-gpgme.c:2890
+msgid "[Disabled]"
+msgstr ""
+
+#: crypt-gpgme.c:2967 pgpkey.c:531 pgpkey.c:710
+msgid "Can't create temporary file"
+msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
+
+#: crypt-gpgme.c:2971
+#, fuzzy
+msgid "Collecting data..."
+msgstr "ÕýÁ¬½Óµ½ %s¡­"
+
+#: crypt-gpgme.c:2994
+#, fuzzy, c-format
+msgid "Error finding issuer key: %s\n"
+msgstr "ÕýÁ¬Ïßµ½ %s"
+
+#: crypt-gpgme.c:3002
+msgid "Error: certification chain to long - stopping here\n"
+msgstr ""
+
+#: crypt-gpgme.c:3012 pgpkey.c:556
+#, c-format
+msgid "Key ID: 0x%s"
+msgstr "Ô¿³× ID£º0x%s"
+
+#: crypt-gpgme.c:3088
+#, fuzzy, c-format
+msgid "gpgme_new failed: %s"
+msgstr "µÇÈëʧ°Ü¡£"
+
+#: crypt-gpgme.c:3123 crypt-gpgme.c:3179
+#, c-format
+msgid "gpgme_op_keylist_start failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3168 crypt-gpgme.c:3204
+#, c-format
+msgid "gpgme_op_keylist_next failed: %s"
+msgstr ""
+
+#: crypt-gpgme.c:3270
+#, fuzzy
+msgid "All matching keys are marked expired/revoked."
+msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+
+#: crypt-gpgme.c:3299 mutt_ssl.c:637 mutt_ssl_gnutls.c:743 pgpkey.c:488
+#: smime.c:422
+msgid "Exit  "
+msgstr "À뿪  "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3301 pgpkey.c:490 smime.c:424
+msgid "Select  "
+msgstr "Ñ¡Ôñ    "
+
+#. __STRCAT_CHECKED__
+#: crypt-gpgme.c:3304 pgpkey.c:493
+msgid "Check key  "
+msgstr "¼ì²éÔ¿³×   "
+
+#: crypt-gpgme.c:3321
+#, fuzzy
+msgid "PGP and S/MIME keys matching"
+msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+
+#: crypt-gpgme.c:3323
+#, fuzzy
+msgid "PGP keys matching"
+msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+
+#: crypt-gpgme.c:3325
+#, fuzzy
+msgid "S/MIME keys matching"
+msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+
+#: crypt-gpgme.c:3327
+#, fuzzy
+msgid "keys matching"
+msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
+
+#: crypt-gpgme.c:3330
+#, c-format
+msgid "%s <%s>."
+msgstr ""
+
+#: crypt-gpgme.c:3332
+#, c-format
+msgid "%s \"%s\"."
+msgstr ""
+
+#: crypt-gpgme.c:3355 pgpkey.c:576
+msgid "This key can't be used: expired/disabled/revoked."
+msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+
+#: crypt-gpgme.c:3368 pgpkey.c:588
+#, fuzzy
+msgid "ID is expired/disabled/revoked."
+msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
+
+#: crypt-gpgme.c:3385 pgpkey.c:592
+msgid "ID has undefined validity."
+msgstr ""
+
+#: crypt-gpgme.c:3388 pgpkey.c:595
+#, fuzzy
+msgid "ID is not valid."
+msgstr "Õâ¸ö ID ²»±»ÐÅÈΡ£"
+
+#: crypt-gpgme.c:3391 pgpkey.c:598
+#, fuzzy
+msgid "ID is only marginally valid."
+msgstr "´Ë ID Ö»ÊÇÃãÇ¿±»ÐÅÈΡ£"
+
+#: crypt-gpgme.c:3399 pgpkey.c:603
+#, fuzzy, c-format
+msgid "%s Do you really want to use the key?"
+msgstr "%s ÄúÕæµÄҪʹÓÃËü£¿"
+
+#: crypt-gpgme.c:3454 crypt-gpgme.c:3556 pgpkey.c:810 pgpkey.c:915
+#, c-format
+msgid "Looking for keys matching \"%s\"..."
+msgstr "ÕýÑ°ÕÒÆ¥Åä \"%s\" µÄÔ¿³×¡­"
+
+#: crypt-gpgme.c:3712 pgp.c:1105
+#, c-format
+msgid "Use keyID = \"%s\" for %s?"
+msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
+
+#: crypt-gpgme.c:3743 pgp.c:1138 smime.c:644 smime.c:764
+#, c-format
+msgid "Enter keyID for %s: "
+msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
+
+#: crypt-gpgme.c:3833
+#, fuzzy
+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)·ÅÆú£¿"
+
+#: crypt-gpgme.c:3834
+#, fuzzy
+msgid "esabpfc"
+msgstr "esabif"
+
+#: crypt-gpgme.c:3838
+#, fuzzy
+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)·ÅÆú£¿"
+
+#: crypt-gpgme.c:3839
+#, fuzzy
+msgid "esabmfc"
+msgstr "esabif"
+
+#. sign (a)s
+#. unset_option(OPTCRYPTCHECKTRUST);
+#. sign (a)s
+#: crypt-gpgme.c:3854 pgp.c:1498 smime.c:1923
+msgid "Sign as: "
+msgstr "Ç©ÃûµÄÉí·ÝÊÇ£º"
+
+# Don't translate this!!
+#: curs_lib.c:188
+msgid "yes"
+msgstr ""
+
+# Don't translate this!!
+#: curs_lib.c:189
+msgid "no"
+msgstr ""
+
+#. restore blocking operation
+#: curs_lib.c:278
+#, fuzzy
+msgid "Exit Mutt-ng?"
+msgstr "À뿪 Mutt£¿"
+
+#: curs_lib.c:369 mutt_socket.c:491 mutt_ssl.c:313
+msgid "unknown error"
+msgstr "²»Ã÷µÄ´íÎó"
+
+#: curs_lib.c:389
+msgid "Press any key to continue..."
+msgstr "°´ÏÂÈκÎÒ»¸ö¼ü¼ÌÐø¡­"
+
+#: curs_lib.c:431
+msgid " ('?' for list): "
+msgstr " (Óà '?' ÏÔʾÁбí)£º"
+
+#: curs_main.c:57 curs_main.c:619 curs_main.c:647 imap/command.c:174
+msgid "No mailbox is open."
+msgstr "ûÓÐÒÑ´ò¿ªÐÅÏä¡£"
+
+#: curs_main.c:58 curs_main.c:2166
+msgid "There are no messages."
+msgstr "ûÓÐÐżþ¡£"
+
+#: curs_main.c:59 mx.c:1011 pager.c:63 recvattach.c:42
+msgid "Mailbox is read-only."
+msgstr "ÐÅÏäÊÇÖ»¶ÁµÄ¡£"
+
+#: curs_main.c:61 pager.c:65 recvattach.c:874
+msgid "Function not permitted in attach-message mode."
+msgstr "¹¦ÄÜÔÚ attach-message ģʽϲ»±»Ö§³Ö¡£"
+
+#: curs_main.c:62
+#, fuzzy
+msgid "No visible messages."
+msgstr "ûÓÐÐÂÐżþ"
+
+#: curs_main.c:235
+msgid "Cannot toggle write on a readonly mailbox!"
+msgstr "ÎÞ·¨Ð´Èëµ½Ò»¸öÖ»¶ÁµÄÐÅÏ䣡"
+
+#: curs_main.c:242
+msgid "Changes to folder will be written on folder exit."
+msgstr "ÔÚÀ뿪֮ºó½«»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
+
+#: curs_main.c:246
+msgid "Changes to folder will not be written."
+msgstr "½«²»»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
+
+#: curs_main.c:373 curs_main.c:386
+msgid "Quit"
+msgstr "À뿪"
+
+#: curs_main.c:376 curs_main.c:389 recvattach.c:54
+msgid "Save"
+msgstr "´¢´æ"
+
+#: curs_main.c:377 query.c:43
+msgid "Mail"
+msgstr "Ðżþ"
+
+#: curs_main.c:378 pager.c:1380
+msgid "Reply"
+msgstr "»Ø¸²"
+
+#: curs_main.c:379
+msgid "Group"
+msgstr "Ⱥ×é"
+
+#: curs_main.c:390 pager.c:1387
+msgid "Post"
+msgstr ""
+
+#: curs_main.c:391 pager.c:1388
+#, fuzzy
+msgid "Followup"
+msgstr "ÒÔºóµÄ»Ø¸²¶¼¼ÄÖÁ %s%s?"
+
+#: curs_main.c:490
+msgid "Mailbox was externally modified.  Flags may be wrong."
+msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
+
+#: curs_main.c:494
+msgid "New mail in this mailbox."
+msgstr "Õâ¸öÐÅÏäÖÐÓÐÐÂÐżþ¡£"
+
+#: curs_main.c:500
+#, fuzzy
+msgid "Mailbox was externally modified."
+msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
+
+#: curs_main.c:625
+msgid "No tagged messages."
+msgstr "ûÓбê¼ÇÁ˵ÄÐżþ¡£"
+
+#: curs_main.c:660 menu.c:872
+#, fuzzy
+msgid "Nothing to do."
+msgstr "ÕýÁ¬½Óµ½ %s¡­"
+
+#: curs_main.c:751
+#, fuzzy
+msgid "Enter Message-Id: "
+msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
+
+#: curs_main.c:759
+msgid "Article has no parent reference!"
+msgstr ""
+
+#: curs_main.c:779
+#, fuzzy
+msgid "Message not visible in limited view."
+msgstr "ÔÚÏÞÖÆÔÄÀÀģʽÏÂÎÞ·¨ÏÔʾÖ÷Ðżþ¡£"
+
+#: curs_main.c:789
+#, c-format
+msgid "Article %s not found on server"
+msgstr ""
+
+#: curs_main.c:802
+msgid "No Message-Id. Unable to perform operation"
+msgstr ""
+
+#: curs_main.c:822
+#, fuzzy
+msgid "Check for children of message..."
+msgstr "×¼±¸×ª¼ÄÐżþ¡­"
+
+#: curs_main.c:853
+msgid "Jump to message: "
+msgstr "Ìøµ½Ðżþ£º"
+
+#: curs_main.c:858
+msgid "Argument must be a message number."
+msgstr "ÐèÒªÒ»¸öÐżþ±àºÅµÄ²ÎÊý¡£"
+
+#: curs_main.c:886
+msgid "That message is not visible."
+msgstr "Õâ·âÐżþÎÞ·¨ÏÔʾ¡£"
+
+#: curs_main.c:889
+msgid "Invalid message number."
+msgstr "ÎÞЧµÄÐżþ±àºÅ¡£"
+
+#: curs_main.c:903 curs_main.c:1905 curs_main.c:1945 pager.c:2124 pager.c:2143
+#, fuzzy
+msgid "Deletion"
+msgstr "Ñ¡Ôñ"
+
+#: curs_main.c:906
+msgid "Delete messages matching: "
+msgstr "ɾ³ý·ûºÏÕâÑùʽµÄÐżþ£º"
+
+#: curs_main.c:928
+msgid "No limit pattern is in effect."
+msgstr "ûÓÐÏÞÖÆÑùʽÊÇÓÐЧµÄ¡£"
+
+#. i18n: ask for a limit to apply
+#: curs_main.c:934
+#, c-format
+msgid "Limit: %s"
+msgstr "ÏÞÖÆ: %s"
+
+#: curs_main.c:965
+msgid "Limit to messages matching: "
+msgstr "ÏÞÖÆÖ»·ûºÏÕâÑùʽµÄÐżþ£º"
+
+#: curs_main.c:995
+#, fuzzy
+msgid "Quit Mutt-ng?"
+msgstr "À뿪 Mutt£¿"
+
+#: curs_main.c:1071
+msgid "Tag messages matching: "
+msgstr "±ê¼ÇÐżþµÄÌõ¼þ£º"
+
+#: curs_main.c:1081 curs_main.c:2242 curs_main.c:2269 pager.c:2491
+#: pager.c:2507
+#, fuzzy
+msgid "Undeletion"
+msgstr "·´É¾³ý"
+
+#: curs_main.c:1083
+msgid "Undelete messages matching: "
+msgstr "·´É¾³ýÐżþµÄÌõ¼þ£º"
+
+#: curs_main.c:1092
+msgid "Untag messages matching: "
+msgstr "·´±ê¼ÇÐżþµÄÌõ¼þ£º"
+
+#: curs_main.c:1175
+msgid "Open mailbox in read-only mode"
+msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÐÅÏä"
+
+#: curs_main.c:1177
+msgid "Open mailbox"
+msgstr "´ò¿ªÐÅÏä"
+
+#: curs_main.c:1187
+#, fuzzy
+msgid "Open newsgroup in read-only mode"
+msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÐÅÏä"
+
+#: curs_main.c:1189
+msgid "Open newsgroup"
+msgstr ""
+
+#: curs_main.c:1221 mx.c:416 mx.c:556
+#, c-format
+msgid "%s is not a mailbox."
+msgstr "%s ²»ÊÇÐÅÏä¡£"
+
+#: curs_main.c:1325
+#, fuzzy
+msgid "Exit Mutt-ng without saving?"
+msgstr "²»´¢´æ±ãÀ뿪 Mutt Âð£¿"
+
+#: curs_main.c:1357 curs_main.c:1387 curs_main.c:1795 curs_main.c:1825
+#: flags.c:293 thread.c:931 thread.c:978 thread.c:1033
+msgid "Threading is not enabled."
+msgstr "ÐòÁй¦ÄÜÉÐδÆô¶¯¡£"
+
+#: curs_main.c:1369
+msgid "Thread broken"
+msgstr ""
+
+#: curs_main.c:1390
+msgid "No Message-ID: header available to link thread"
+msgstr ""
+
+#: curs_main.c:1393
+#, fuzzy
+msgid "First, please tag a message to be linked here"
+msgstr "´¢´æÐżþÒÔ±ãÉÔºó¼Ä³ö"
+
+#: curs_main.c:1404
+msgid "Threads linked"
+msgstr ""
+
+#: curs_main.c:1407
+msgid "No thread linked"
+msgstr ""
+
+#: curs_main.c:1424 curs_main.c:1447
+msgid "You are on the last message."
+msgstr "ÄúÒѾ­ÔÚ×îºóÒ»·âÐÅÁË¡£"
+
+#: curs_main.c:1431 curs_main.c:1472
+msgid "No undeleted messages."
+msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
+
+#: curs_main.c:1465 curs_main.c:1488
 msgid "You are on the first message."
 msgstr "ÄúÒѾ­ÔÚµÚÒ»·âÐÅÁË¡£"
 
-#: curs_main.c:1342 pattern.c:1296
+#: curs_main.c:1561 pattern.c:1304
 msgid "Search wrapped to top."
 msgstr "ËÑÑ°ÖÁ¿ªÍ·¡£"
 
-#: curs_main.c:1351 pattern.c:1307
+#: curs_main.c:1569 pattern.c:1315
 msgid "Search wrapped to bottom."
 msgstr "ËÑÑ°ÖÁ½áβ¡£"
 
-#: curs_main.c:1392
+#: curs_main.c:1614
 msgid "No new messages"
 msgstr "ûÓÐÐÂÐżþ"
 
-#: curs_main.c:1392
+#: curs_main.c:1615
 msgid "No unread messages"
 msgstr "ûÓÐÉÐδ¶ÁÈ¡µÄÐżþ"
 
-#: curs_main.c:1393
+#: curs_main.c:1616
 msgid " in this limited view"
 msgstr " ÔÚÕâÏÞ¶¨µÄä¯ÀÀÖÐ"
 
-#: curs_main.c:1414 pager.c:2354
-#, fuzzy
-msgid "Can't change 'important' flag on POP server."
-msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+#: curs_main.c:1632 pager.c:2255
+msgid "Flagging"
+msgstr ""
+
+#: curs_main.c:1665 pager.c:2472
+msgid "Toggling"
+msgstr ""
 
-#: curs_main.c:1538
+#: curs_main.c:1736
 msgid "No more threads."
 msgstr "ûÓиü¶àµÄÐòÁÐ"
 
-#: curs_main.c:1540
+#: curs_main.c:1739
 msgid "You are on the first thread."
 msgstr "ÄúÒѾ­ÔÚµÚÒ»¸öÐòÁÐÉÏ¡£"
 
-#: curs_main.c:1606 curs_main.c:1638 flags.c:293 thread.c:1022 thread.c:1077
-#: thread.c:1132
-msgid "Threading is not enabled."
-msgstr "ÐòÁй¦ÄÜÉÐδÆô¶¯¡£"
-
-#: curs_main.c:1624
+#: curs_main.c:1811
 msgid "Thread contains unread messages."
 msgstr "ÐòÁÐÖÐÓÐÉÐδ¶ÁÈ¡µÄÐżþ¡£"
 
-#: curs_main.c:1811
-#, fuzzy
-msgid "Can't edit message on POP server."
-msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+#: curs_main.c:1996
+msgid "Editing"
+msgstr ""
+
+#: curs_main.c:2116
+msgid "Marking as read"
+msgstr ""
+
+#: curs_main.c:2172 pager.c:2334 recvattach.c:1185
+msgid "Reply by mail as poster prefers?"
+msgstr ""
+
+#: curs_main.c:2178 pager.c:2297 pager.c:2311 pager.c:2339
+msgid "Posting to this group not allowed, may be moderated. Continue?"
+msgstr ""
 
 #.
 #. * SLcurses_waddnstr() can't take a "const char *", so this is only
 #. * declared "static" (sigh)
 #.
-#: edit.c:41
+#: edit.c:38
 msgid ""
 "~~\t\tinsert a line begining with a single ~\n"
 "~b users\tadd users to the Bcc: field\n"
@@ -1102,161 +1888,161 @@ msgstr ""
 "~?\t\tÕâѶϢ\n"
 ".\t\tÈç¹ûÊÇÒ»ÐÐÀïµÄΨһ×Ö·û£¬Ôò´ú±í½áÊøÊäÈë\n"
 
-#: edit.c:186
+#: edit.c:177
 #, c-format
 msgid "%d: invalid message number.\n"
 msgstr "%d£ºÎÞЧµÄÐżþºÅÂë¡£\n"
 
-#: edit.c:328
+#: edit.c:307
 msgid "(End message with a . on a line by itself)\n"
 msgstr "£¨ÔÚÒ»ÐÐÀïÊäÈëÒ»¸ö . ·ûºÅÀ´½áÊøÐżþ£©\n"
 
-#: edit.c:386
+#: edit.c:361
 msgid "No mailbox.\n"
 msgstr "ûÓÐÐÅÏä¡£\n"
 
-#: edit.c:390
+#: edit.c:365
 msgid "Message contains:\n"
 msgstr "Ðżþ°üº¬£º\n"
 
-#: edit.c:394 edit.c:451
+#: edit.c:369 edit.c:423
 msgid "(continue)\n"
 msgstr "£¨¼ÌÐø£©\n"
 
-#: edit.c:407
+#: edit.c:381
 msgid "missing filename.\n"
 msgstr "ÒÅʧÁ˵µÃû¡£\n"
 
-#: edit.c:427
+#: edit.c:400
 msgid "No lines in message.\n"
 msgstr "ÎÄÕÂÖÐûÓÐÎÄ×Ö¡£\n"
 
-#: edit.c:444
+#: edit.c:416
 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
 msgstr ""
 
-#: edit.c:462
+#: edit.c:434
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr "%s£º²»Ã÷µÄ±à¼­Æ÷Ö¸Á~? ÇóÖú£©\n"
 
-#: editmsg.c:78
+#: editmsg.c:68
 #, fuzzy, c-format
 msgid "could not create temporary folder: %s"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
 
-#: editmsg.c:90
+#: editmsg.c:80
 #, fuzzy, c-format
 msgid "could not write temporary mail folder: %s"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
 
-#: editmsg.c:107
+#: editmsg.c:99
 #, fuzzy, c-format
 msgid "could not truncate temporary mail folder: %s"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
 
-#: editmsg.c:122
+#: editmsg.c:112
 #, fuzzy
 msgid "Message file is empty!"
 msgstr "ÐÅÏäÄÚ¿ÕÎÞÒ»Îï¡£"
 
-#: editmsg.c:129
+#: editmsg.c:118
 #, fuzzy
 msgid "Message not modified!"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: editmsg.c:137
+#: editmsg.c:125
 #, fuzzy, c-format
 msgid "Can't open message file: %s"
 msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
 
-#: editmsg.c:144 editmsg.c:172
+#: editmsg.c:131 editmsg.c:159
 #, fuzzy, c-format
 msgid "Can't append to folder: %s"
 msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
 
-#: editmsg.c:203
+#: editmsg.c:191
 #, fuzzy, c-format
 msgid "Error. Preserving temporary file: %s"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
 
-#: flags.c:336
+#: flags.c:335
 msgid "Set flag"
 msgstr "É趨Æì±ê"
 
-#: flags.c:336
+#: flags.c:335
 msgid "Clear flag"
 msgstr "Çå³ýÆì±ê"
 
-#: handler.c:1349
+#: handler.c:1094
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- ´íÎó£º ÎÞ·¨ÏÔʾ Multipart/Alternative£¡ --]\n"
 
-#: handler.c:1459
+#: handler.c:1208
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- ¸½¼þ #%d"
 
-#: handler.c:1471
+#: handler.c:1219
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- ÐÎ̬:  %s%s, ±àÂë: %s, ´óС: %s --]\n"
 
-#: handler.c:1534
+#: handler.c:1283
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- ʹÓà %s ×Ô¶¯ÏÔʾ --]\n"
 
-#: handler.c:1535
+#: handler.c:1284
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Ö´ÐÐ×Ô¶¯ÏÔʾָÁ%s"
 
-#: handler.c:1567
+#: handler.c:1312
 #, fuzzy, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- ÔÚ %s --]\n"
 
-#: handler.c:1585 handler.c:1606
+#: handler.c:1327 handler.c:1344
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- ×Ô¶¯ÏÔʾµÄ %s µÄ stderr ÄÚÈÝ --]\n"
 
-#: handler.c:1643
+#: handler.c:1379
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- ´íÎó: message/external-body ûÓдæÈ¡ÀàÐ͵IJÎÊý --]\n"
 
-#: handler.c:1662
+#: handler.c:1396
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- %s/%s ¸½¼þ "
 
-#: handler.c:1669
+#: handler.c:1402
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(%s λԪ×é) "
 
-#: handler.c:1671
+#: handler.c:1404
 msgid "has been deleted --]\n"
 msgstr "ÒѾ­±»É¾³ýÁË --]\n"
 
-#: handler.c:1676
+#: handler.c:1408
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- ÔÚ %s --]\n"
 
-#: handler.c:1681
+#: handler.c:1412
 #, fuzzy, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- ÔÚ %s --]\n"
 
-#: handler.c:1694 handler.c:1710
+#: handler.c:1423 handler.c:1437
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- %s/%s ¸½¼þ "
 
-#: handler.c:1696
+#: handler.c:1425
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
@@ -1266,53 +2052,53 @@ msgstr ""
 "[-- ²¢ÇÒ±»Ö¸Ê¾µÄÍⲿԭʼµµÒÑ --]\n"
 "[-- ¹ýÆÚ¡£ --]\n"
 
-#: handler.c:1714
+#: handler.c:1442
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- %s/%s ¸½¼þÎÞ·¨±»¸½ÉÏ, --]\n"
 "[-- ²¢ÇÒ±»Ö¸Ê¾µÄ´æÈ¡ÀàÐÍ %s ²»±»Ö§³Ö --]\n"
 
-#: handler.c:1822
+#: handler.c:1556
 msgid "Error: multipart/signed has no protocol."
 msgstr "´íÎó£ºmultipart/signed ûÓÐͨѶЭ¶¨¡£"
 
-#: handler.c:1832
+#: handler.c:1567
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "´íÎó£ºmultipart/encrypted ûÓÐÈκÎͨѶЭ¶¨²ÎÊý£¡"
 
-#: handler.c:1872
+#: handler.c:1601
 msgid "Unable to open temporary file!"
 msgstr "ÎÞ·¨´ò¿ªÔÝ´æµµ£¡"
 
-#: handler.c:1933
+#: handler.c:1659
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s ÉÐδ֧³Ö "
 
-#: handler.c:1938
+#: handler.c:1664
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "£¨Ê¹Óà '%s' À´ÏÔʾÕⲿ·Ý£©"
 
-#: handler.c:1940
+#: handler.c:1666
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "£¨ÐèÒª¶¨ÒåÒ»¸ö¼ü¸ø 'view-attachments' lä¯ÀÀ¸½¼þ)£¡)"
 
-#: headers.c:177
+#: headers.c:160
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
 
-#: help.c:282
+#: help.c:253
 msgid "ERROR: please report this bug"
 msgstr "´íÎó£ºÇë»Ø±¨Õâ¸öÎÊÌâ"
 
-#: help.c:324
+#: help.c:293
 msgid "<UNKNOWN>"
 msgstr "<²»Ã÷µÄ>"
 
-#: help.c:336
+#: help.c:303
 msgid ""
 "\n"
 "Generic bindings:\n"
@@ -1322,7 +2108,7 @@ msgstr ""
 "±ê×¼¹¦Äܶ¨Ò壺\n"
 "\n"
 
-#: help.c:340
+#: help.c:307
 msgid ""
 "\n"
 "Unbound functions:\n"
@@ -1332,130 +2118,135 @@ msgstr ""
 "δ±»¶¨ÒåµÄ¹¦ÄÜ£º\n"
 "\n"
 
-#: help.c:348
+#: help.c:315
 #, c-format
 msgid "Help for %s"
 msgstr "%s µÄÇóÖú"
 
-#: hook.c:246
+#: hook.c:97
+msgid "bad formatted command string"
+msgstr ""
+
+#: hook.c:247
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr ""
 
-#: hook.c:258
+#: hook.c:257
 #, fuzzy, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "%s£º²»Ã÷µÄÖÖÀà"
 
-#: hook.c:264
+#: hook.c:262
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr ""
 
-#: imap/auth.c:108 pop_auth.c:415
+#: imap/auth.c:98 pop/pop_auth.c:391
 #, fuzzy
 msgid "No authenticators available"
 msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
 
-#: imap/auth_anon.c:43
+#: imap/auth_anon.c:37
 msgid "Authenticating (anonymous)..."
 msgstr "ÑéÖ¤ÖÐ (ÄäÃû)¡­"
 
-#: imap/auth_anon.c:73
+#: imap/auth_anon.c:65
 #, fuzzy
 msgid "Anonymous authentication failed."
 msgstr "²»Ö§³ÖÄäÃûÑéÖ¤¡£"
 
-#: imap/auth_cram.c:48
+#: imap/auth_cram.c:42
 msgid "Authenticating (CRAM-MD5)..."
 msgstr "ÑéÖ¤ÖÐ (CRAM-MD5)¡­"
 
-#: imap/auth_cram.c:128
+#: imap/auth_cram.c:121
 msgid "CRAM-MD5 authentication failed."
 msgstr "CRAM-MD5 Ñé֤ʧ°Ü¡£"
 
 #. now begin login
-#: imap/auth_gss.c:105
+#: imap/auth_gss.c:98
 msgid "Authenticating (GSSAPI)..."
 msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
 
-#: imap/auth_gss.c:268
+#: imap/auth_gss.c:252
 msgid "GSSAPI authentication failed."
 msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
 
-#: imap/auth_login.c:38
+#: imap/auth_login.c:31
 msgid "LOGIN disabled on this server."
 msgstr ""
 
-#: imap/auth_login.c:47 pop_auth.c:248
+#: imap/auth_login.c:41 nntp/nntp.c:56 pop/pop_auth.c:238
 msgid "Logging in..."
 msgstr "µÇÈëÖС­"
 
-#: imap/auth_login.c:67 pop_auth.c:291
+#: imap/auth_login.c:61 nntp/nntp.c:79 nntp/nntp.c:151 pop/pop_auth.c:276
 msgid "Login failed."
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: imap/auth_sasl.c:116
+#: imap/auth_sasl.c:109
 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
 msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
 
-#: imap/auth_sasl.c:212 pop_auth.c:176
+#: imap/auth_sasl.c:199 pop/pop_auth.c:165
 #, fuzzy
 msgid "SASL authentication failed."
 msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
 
-#: imap/browse.c:68 imap/imap.c:559
+#: imap/browse.c:69 imap/imap.c:544
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 
-#: imap/browse.c:85
+#: imap/browse.c:86
 #, fuzzy
 msgid "Getting namespaces..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: imap/browse.c:94
+#: imap/browse.c:96
 #, fuzzy
 msgid "Getting folder list..."
 msgstr "ÒѽӴ¥ËÅ·þÆ÷£¬ÕýÄÃȡĿ¼±í¡­"
 
-#: imap/browse.c:223
+#: imap/browse.c:212
 #, fuzzy
 msgid "No such folder"
 msgstr "%s£ºÃ»ÓÐÕâÖÖÑÕÉ«"
 
-#: imap/browse.c:281
+#: imap/browse.c:271
 #, fuzzy
 msgid "Create mailbox: "
 msgstr "´ò¿ªÐÅÏä"
 
-#: imap/browse.c:286 imap/browse.c:332
+#: imap/browse.c:275 imap/browse.c:318
 #, fuzzy
 msgid "Mailbox must have a name."
 msgstr "ÐÅÏäûÓиı䡣"
 
-#: imap/browse.c:294
+#: imap/browse.c:283
 #, fuzzy
 msgid "Mailbox created."
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
 
-#: imap/browse.c:325
+#: imap/browse.c:312
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "´ò¿ªÐÅÏä"
 
-#: imap/browse.c:338
+#: imap/browse.c:324
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: imap/browse.c:343
+#: imap/browse.c:329
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
 
-#: imap/command.c:294
+#. mx_fastclose_mailbox (idata->ctx);
+#: imap/command.c:286
 #, fuzzy
 msgid "Mailbox closed"
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
@@ -1463,330 +2254,348 @@ msgstr "
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:336
+#: imap/command.c:327
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "ÑÏÖØ´íÎó¡£ÐżþÊýÁ¿²»Ð­µ÷£¡"
 
-#: imap/imap.c:168
+#: imap/imap.c:172 nntp/nntp.c:1045
 #, fuzzy, c-format
 msgid "Closing connection to %s..."
 msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
 
-#: imap/imap.c:328
+#: imap/imap.c:321
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Õâ¸ö IMAP ËÅ·þÆ÷Òѹýʱ£¬Mutt ÎÞ·¨Ê¹ÓÃËü¡£"
 
-#: imap/imap.c:419
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:394
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:439 pop_lib.c:284
+#: imap/imap.c:430 pop/pop_lib.c:271
 msgid "Secure connection with TLS?"
 msgstr ""
 
-#: imap/imap.c:452 pop_lib.c:308
+#: imap/imap.c:442 pop/pop_lib.c:293
 msgid "Could not negotiate TLS connection"
 msgstr ""
 
-#: imap/imap.c:590
+#: imap/imap.c:456 pop/pop_lib.c:311
+#, fuzzy
+msgid "Encrypted connection unavailable"
+msgstr "¼ÓÃܵÄÔ¿³×"
+
+#: imap/imap.c:575 nntp/nntp.c:826
 #, c-format
 msgid "Selecting %s..."
 msgstr "Ñ¡Ôñ %s ÖС­"
 
-#: imap/imap.c:726
+#: imap/imap.c:698
 #, fuzzy
 msgid "Error opening mailbox"
 msgstr "дÈëÐÅÏäʱ·¢Éú´íÎó£¡"
 
-#. STATUS not supported
-#: imap/imap.c:780
-msgid "Unable to append to IMAP mailboxes at this server"
-msgstr "ÎÞ·¨¸½¼ÓÔÚÕâ¸öËÅ·þÆ÷É쵀 IMAP ÐÅÏä"
-
-#. command failed cause folder doesn't exist
-#: imap/imap.c:789 imap/message.c:723 muttlib.c:1234
+#: imap/imap.c:747 imap/message.c:695 muttlib.c:1229
 #, c-format
 msgid "Create %s?"
 msgstr "½¨Á¢ %s£¿"
 
-#: imap/imap.c:975 pop.c:465
+#: imap/imap.c:988 pop/pop.c:438
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "±êÇ©Á赀 %d ·âÐżþɾȥÁË¡­"
 
-#: imap/imap.c:984
+#: imap/imap.c:996
 #, fuzzy
 msgid "Expunge failed"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: imap/imap.c:999
+#: imap/imap.c:1008
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "ÕýÔÚ´¢´æÐżþ״̬Æì±ê¡­ [%d/%d]"
 
-#: imap/imap.c:1083
+#: imap/imap.c:1037
 msgid "Expunging messages from server..."
 msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
 
-#: imap/imap.c:1088
+#: imap/imap.c:1042
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1122
+#: imap/imap.c:1050 imap/imap.c:1081
 #, fuzzy
 msgid "CLOSE failed"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: imap/imap.c:1365
+#: imap/imap.c:1314
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "´ò¿ªÐÅÏä"
 
-#: imap/imap.c:1377
+#: imap/imap.c:1337
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "¶©ÔÄ %s¡­"
 
-#: imap/imap.c:1379
+#: imap/imap.c:1339
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "È¡Ïû¶©ÔÄ %s¡­"
 
+#: imap/imap.c:1518
+#, fuzzy
+msgid "Connection lost. Reconnect to IMAP server?"
+msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
+
 #. Unable to fetch headers for lower versions
-#: imap/message.c:94
+#: imap/message.c:95
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "ÎÞ·¨È¡»ØʹÓÃÕâ¸ö IMAP ËÅ·þÆ÷°æ±¾µÄÓʼþµÄ±êÍ·¡£"
 
-#: imap/message.c:107
+#: imap/message.c:105
 #, fuzzy, c-format
 msgid "Could not create temporary file %s"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
 
-#: imap/message.c:134
+#: imap/message.c:130
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡­ [%d/%d]"
 
-#: imap/message.c:202 pop.c:210
+#: imap/message.c:196 pop/pop.c:196
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡­ [%d/%d]"
 
-#: imap/message.c:367 pop.c:344
+#: imap/message.c:351 nntp/nntp.c:889 pop/pop.c:324
 #, fuzzy
 msgid "Fetching message..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: imap/message.c:410 pop.c:381
+#: imap/message.c:389 pop/pop.c:357
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
-#: imap/message.c:589
+#: imap/message.c:551
 #, fuzzy
 msgid "Uploading message ..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: imap/message.c:699
+#: imap/message.c:663
 #, fuzzy, c-format
 msgid "Copying %d messages to %s..."
 msgstr "ÕýÔÚ°áÒÆÒѾ­¶ÁÈ¡µÄÐżþµ½ %s ¡­"
 
-#: imap/message.c:703
+#: imap/message.c:666
 #, fuzzy, c-format
 msgid "Copying message %d to %s..."
 msgstr "дÈëÐżþµ½ %s ¡­"
 
-#: imap/util.c:241
+#: imap/util.c:178
 #, fuzzy
 msgid "Continue?"
 msgstr "£¨¼ÌÐø£©\n"
 
-#: init.c:385
+#: init.c:203
 #, c-format
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:678
+#: init.c:384
+#, fuzzy, c-format
+msgid "ifdef: too few arguments"
+msgstr "%s£ºÌ«ÉÙ²ÎÊý"
+
+#: init.c:386
+#, fuzzy, c-format
+msgid "ifndef: too few arguments"
+msgstr "µ¥É«£ºÌ«ÉÙ²ÎÊý"
+
+#: init.c:498
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: init.c:680
+#: init.c:500
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "·´±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: init.c:883
+#: init.c:691
 msgid "alias: no address"
 msgstr "±ðÃû£ºÃ»Óеç×ÓÓʼþλַ"
 
-#: init.c:928
+#: init.c:732
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:1006
+#: init.c:802
 msgid "invalid header field"
 msgstr "ÎÞЧµÄ±êÍ·À¸Î»"
 
-#: init.c:1059
+#: init.c:849
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s£º²»Ã÷µÄÅÅÐò·½Ê½"
 
-#: init.c:1169
+#: init.c:952
 #, fuzzy, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_defualt£º´íÎóµÄÕý¹æ±íʾʽ£º%s\n"
 
-#: init.c:1234
+#: init.c:1014
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s£º²»Ã÷µÄ±äÁ¿"
 
-#: init.c:1243
+#: init.c:1021
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "ÖØÐÂÉèÖúó×ÖÊ×ÈÔ²»ºÏ¹æ¶¨"
 
-#: init.c:1249
+#: init.c:1026
 #, c-format
 msgid "value is illegal with reset"
 msgstr "ÖØÐÂÉèÖúóÖµÈÔ²»ºÏ¹æ¶¨"
 
-#: init.c:1288
+#: init.c:1059
 #, c-format
 msgid "%s is set"
 msgstr "%s Òѱ»É趨"
 
-#: init.c:1288
+#: init.c:1059
 #, c-format
 msgid "%s is unset"
 msgstr "%s ûÓб»É趨"
 
-#: init.c:1478
+#: init.c:1230
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s£ºÎÞЧµÄÐÅÏäÖÖÀà"
 
-#: init.c:1503 init.c:1548
+#: init.c:1253 init.c:1292
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s£ºÎÞЧµÄÖµ"
 
-#: init.c:1589
+#: init.c:1329
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s£º²»Ã÷µÄÖÖÀà"
 
-#: init.c:1615
+#: init.c:1357
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s£º²»Ã÷µÄÖÖÀà"
 
-#: init.c:1674
+#: init.c:1416
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s ·¢Éú´íÎó£¬ÐкŠ%d£º%s"
 
-#. the muttrc source keyword
-#: init.c:1697
+#: init.c:1438
 #, c-format
 msgid "source: errors in %s"
 msgstr "source£º´íÎó·¢ÉúÔÚ %s"
 
-#: init.c:1698
+#: init.c:1439
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 
-#: init.c:1712
+#: init.c:1456
 #, c-format
 msgid "source: error at %s"
 msgstr "source£º´íÎó·¢ÉúÔÚ %s"
 
-#: init.c:1717
-msgid "source: too many arguments"
-msgstr "source£ºÌ«¶à²ÎÊý"
-
-#: init.c:1768
+#: init.c:1508
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s£º²»Ã÷µÄÖ¸Áî"
 
-#: init.c:2157
+#: init.c:1879
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
 
-#: init.c:2206
+#: init.c:1925
 msgid "unable to determine home directory"
 msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
 
-#: init.c:2214
+#: init.c:1932
 msgid "unable to determine username"
 msgstr "ÎÞ·¨¾ö¶¨Ê¹ÓÃÕßÃû³Æ"
 
-#: keymap.c:463
+#: init.c:2150
+#, c-format
+msgid "Warning: the following synonym variables were found:\n"
+msgstr ""
+
+#: init.c:2157
+#, c-format
+msgid "Warning: Synonym variables are scheduled for removal.\n"
+msgstr ""
+
+#: keymap.c:431
 msgid "Macro loop detected."
 msgstr "¼ì²âµ½¾Þ¼¯ÖÐÓлØȦ¡£"
 
-#: keymap.c:673 keymap.c:681
+#: keymap.c:637 keymap.c:645
 msgid "Key is not bound."
 msgstr "Õâ¸ö¼ü»¹Î´±»¶¨Ò幦ÄÜ¡£"
 
-#: keymap.c:685
+#: keymap.c:650
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Õâ¸ö¼ü»¹Î´±»¶¨Ò幦ÄÜ¡£ °´ '%s' ÒÔÈ¡µÃ˵Ã÷¡£"
 
-#: keymap.c:696
+#: keymap.c:661
 msgid "push: too many arguments"
 msgstr "push£ºÌ«¶à²ÎÊý"
 
-#: keymap.c:726
+#: keymap.c:689
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s£ºÃ»ÓÐÕâ¸öÑ¡µ¥"
 
-#: keymap.c:741
+#: keymap.c:703
 msgid "null key sequence"
 msgstr "¿ÕµÄ¼üÖµÐòÁÐ"
 
-#: keymap.c:828
+#: keymap.c:788
 msgid "bind: too many arguments"
 msgstr "bind£ºÌ«¶à²ÎÊý"
 
-#: keymap.c:851
+#: keymap.c:805
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s£ºÔÚ¶ÔÓ³±íÖÐûÓÐÕâÑùµÄº¯Êý"
 
-#: keymap.c:875
+#: keymap.c:833
 msgid "macro: empty key sequence"
 msgstr "macro£º¿ÕµÄ¼üÖµÐòÁÐ"
 
-#: keymap.c:886
+#: keymap.c:841
 msgid "macro: too many arguments"
 msgstr "macro£º²ÎÊýÌ«¶à"
 
-#: keymap.c:922
+#: keymap.c:873
 #, fuzzy
 msgid "exec: no arguments"
 msgstr "exec£º²ÎÊýÌ«ÉÙ"
 
-#: keymap.c:942
+#: keymap.c:891
 #, fuzzy, c-format
 msgid "%s: no such function"
 msgstr "%s£ºÔÚ¶ÔÓ³±íÖÐûÓÐÕâÑùµÄº¯Êý"
 
-#: keymap.c:963
+#: keymap.c:912
 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
 
-#: keymap.c:968
+#: keymap.c:916
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -1834,12 +2643,12 @@ msgstr "
 
 #: keymap_alldefs.h:15
 #, fuzzy
-msgid "subscribe to current mailbox (IMAP only)"
+msgid "subscribe to current (IMAP/NNTP only)"
 msgstr "¶©ÔÄÕâ¸öÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
 
 #: keymap_alldefs.h:16
 #, fuzzy
-msgid "unsubscribe to current mailbox (IMAP only)"
+msgid "unsubscribe to current (IMAP/NNTP only)"
 msgstr "È¡Ïû¶©ÔÄÕâ¸öÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
 
 #: keymap_alldefs.h:17
@@ -1853,789 +2662,927 @@ msgid "list mailboxes with new mail"
 msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
 
 #: keymap_alldefs.h:19
+msgid "mark all articles in newsgroup as read"
+msgstr ""
+
+#: keymap_alldefs.h:20
 msgid "change directories"
 msgstr "¸Ä±äĿ¼"
 
-#: keymap_alldefs.h:20
+#: keymap_alldefs.h:21
 msgid "check mailboxes for new mail"
 msgstr "¼ì²éÐÅÏäÊÇ·ñÓÐÐÂÐżþ"
 
-#: keymap_alldefs.h:21
+#: keymap_alldefs.h:22
 msgid "attach a file(s) to this message"
 msgstr "ÔÚÕâ·âÐżþÖмдøÎļþ"
 
-#: keymap_alldefs.h:22
+#: keymap_alldefs.h:23
 msgid "attach message(s) to this message"
 msgstr "ÔÚÕâ·âÐżþÖмдøÐżþ"
 
-#: keymap_alldefs.h:23
+#: keymap_alldefs.h:24
+#, fuzzy
+msgid "attach newsmessage(s) to this message"
+msgstr "ÔÚÕâ·âÐżþÖмдøÐżþ"
+
+#: keymap_alldefs.h:25
 msgid "edit the BCC list"
 msgstr "±à¼­ BCC Áбí"
 
-#: keymap_alldefs.h:24
+#: keymap_alldefs.h:26
 msgid "edit the CC list"
 msgstr "±à¼­ CC Áбí"
 
-#: keymap_alldefs.h:25
+#: keymap_alldefs.h:27
 msgid "edit attachment description"
 msgstr "±à¼­¼ÐµµµÄ˵Ã÷"
 
-#: keymap_alldefs.h:26
+#: keymap_alldefs.h:28
 msgid "edit attachment transfer-encoding"
 msgstr "±à¼­¼ÐµµµÄ´«Êä±àÂë·¨Ôò"
 
-#: keymap_alldefs.h:27
+#: keymap_alldefs.h:29
 msgid "enter a file to save a copy of this message in"
 msgstr "ÇëÊäÈëÓÃÀ´´¢´æÕâ·âÐżþ¿½±´µÄÎļþÃû³Æ"
 
-#: keymap_alldefs.h:28
+#: keymap_alldefs.h:30
 msgid "edit the file to be attached"
 msgstr "±à¼­Òª±»¼Ð´øµÄÎļþÃû³Æ"
 
-#: keymap_alldefs.h:29
+#: keymap_alldefs.h:31
 msgid "edit the from field"
 msgstr "±à¼­·¢ÐÅÈËÀ¸Î»"
 
-#: keymap_alldefs.h:30
+#: keymap_alldefs.h:32
 msgid "edit the message with headers"
 msgstr "±à¼­ÐżþµÄ±êÍ·"
 
-#: keymap_alldefs.h:31
+#: keymap_alldefs.h:33
 msgid "edit the message"
 msgstr "±à¼­ÐżþÄÚÈÝ"
 
-#: keymap_alldefs.h:32
+#: keymap_alldefs.h:34
 msgid "edit attachment using mailcap entry"
 msgstr "ʹÓà mailcap ±à¼­¼Ðµµ"
 
-#: keymap_alldefs.h:33
+#: keymap_alldefs.h:35
+#, fuzzy
+msgid "edit the newsgroups list"
+msgstr "±à¼­ CC Áбí"
+
+#: keymap_alldefs.h:36
 msgid "edit the Reply-To field"
 msgstr "±à¼­ Reply-To À¸Î»"
 
-#: keymap_alldefs.h:34
+#: keymap_alldefs.h:37
+#, fuzzy
+msgid "edit the Followup-To field"
+msgstr "±à¼­ Reply-To À¸Î»"
+
+#: keymap_alldefs.h:38
+#, fuzzy
+msgid "edit the X-Comment-To field"
+msgstr "±à¼­ Reply-To À¸Î»"
+
+#: keymap_alldefs.h:39
 msgid "edit the subject of this message"
 msgstr "±à¼­ÐżþµÄ±êÌâ"
 
-#: keymap_alldefs.h:35
+#: keymap_alldefs.h:40
 msgid "edit the TO list"
 msgstr "±à¼­ TO Áбí"
 
-#: keymap_alldefs.h:36
+#: keymap_alldefs.h:41
 msgid "create a new mailbox (IMAP only)"
 msgstr "ÖÆÔìÐÂÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
 
-#: keymap_alldefs.h:37
+#: keymap_alldefs.h:42
 #, fuzzy
 msgid "edit attachment content type"
 msgstr "±à¼­¸½¼þµÄµÄ content type"
 
-#: keymap_alldefs.h:38
+#: keymap_alldefs.h:43
 msgid "get a temporary copy of an attachment"
 msgstr "È¡µÃ¸½¼þµÄÔݴ濽±´"
 
-#: keymap_alldefs.h:39
+#: keymap_alldefs.h:44
 msgid "run ispell on the message"
 msgstr "Õâ·âÐżþÖ´ÐÐ ispell"
 
-#: keymap_alldefs.h:40
+#: keymap_alldefs.h:45
 msgid "compose new attachment using mailcap entry"
 msgstr "ʹÓà mailcap À´×éºÏеļеµ"
 
-#: keymap_alldefs.h:41
+#: keymap_alldefs.h:46
 msgid "toggle recoding of this attachment"
 msgstr "Çл»ÊÇ·ñÔÙΪ¸½¼þÖØбàÂë"
 
-#: keymap_alldefs.h:42
+#: keymap_alldefs.h:47
 msgid "save this message to send later"
 msgstr "´¢´æÐżþÒÔ±ãÉÔºó¼Ä³ö"
 
-#: keymap_alldefs.h:43
+#: keymap_alldefs.h:48
 msgid "rename/move an attached file"
 msgstr "¸ü¸ÄµµÃû/ÒƳý Ò»¸ö¼Ð´øµÄÎļþ"
 
-#: keymap_alldefs.h:44
+#: keymap_alldefs.h:49
 msgid "send the message"
 msgstr "¼Ä³öÐżþ"
 
-#: keymap_alldefs.h:45
+#: keymap_alldefs.h:50
 msgid "toggle disposition between inline/attachment"
 msgstr ""
 
-#: keymap_alldefs.h:46
+#: keymap_alldefs.h:51
 msgid "toggle whether to delete file after sending it"
 msgstr "¼Ä³öºóÇл»ÖÁÊÇ·ñɾ³ýÎļþ"
 
-#: keymap_alldefs.h:47
+#: keymap_alldefs.h:52
 msgid "update an attachment's encoding info"
 msgstr "¸üи½¼þµÄ±àÂë×ÊѶ"
 
-#: keymap_alldefs.h:48
+#: keymap_alldefs.h:53
 msgid "write the message to a folder"
 msgstr "´æÈëÒ»·âÐżþµ½Ä³¸öÎļþ¼Ð"
 
-#: keymap_alldefs.h:49
+#: keymap_alldefs.h:54
 msgid "copy a message to a file/mailbox"
 msgstr "¿½±´Ò»·âÐżþµ½Ä³¸öÎļþ»òÐÅÏä"
 
-#: keymap_alldefs.h:50
+#: keymap_alldefs.h:55
 msgid "create an alias from a message sender"
 msgstr "½¨Á¢Ä³·âÐżþ¼ÄÐÅÈ˵ıðÃû"
 
-#: keymap_alldefs.h:51
+#: keymap_alldefs.h:56
 msgid "move entry to bottom of screen"
 msgstr "ÒÆÖÁÓ©Ä»½áβ"
 
-#: keymap_alldefs.h:52
+#: keymap_alldefs.h:57
 msgid "move entry to middle of screen"
 msgstr "ÒÆÖÁÓ©Ä»ÖÐÑë"
 
-#: keymap_alldefs.h:53
+#: keymap_alldefs.h:58
 msgid "move entry to top of screen"
 msgstr "ÒÆÖÁÓ©Ä»¿ªÍ·"
 
-#: keymap_alldefs.h:54
+#: keymap_alldefs.h:59
 msgid "make decoded (text/plain) copy"
 msgstr "ÖÆ×÷¿É½âÂëµÄ (text/plain) ¿½±´"
 
-#: keymap_alldefs.h:55
+#: keymap_alldefs.h:60
 msgid "make decoded copy (text/plain) and delete"
 msgstr "ÖÆ×÷¿É½âÂëµÄ¿½±´ (text/plain) ²¢ÇÒɾ³ýÖ®"
 
-#: keymap_alldefs.h:56
+#: keymap_alldefs.h:61
 msgid "delete the current entry"
 msgstr "ɾ³ýËùÔÚµÄÐżþ×ÊÁÏ"
 
-#: keymap_alldefs.h:57
+#: keymap_alldefs.h:62
 msgid "delete the current mailbox (IMAP only)"
 msgstr "ɾ³ýÕâ¸öÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
 
-#: keymap_alldefs.h:58
+#: keymap_alldefs.h:63
 msgid "delete all messages in subthread"
 msgstr "ɾ³ýËùÓÐÔÚ×ÓÐòÁÐÖеÄÐżþ"
 
-#: keymap_alldefs.h:59
+#: keymap_alldefs.h:64
 msgid "delete all messages in thread"
 msgstr "ɾ³ýËùÓÐÔÚÐòÁÐÖеÄÐżþ"
 
-#: keymap_alldefs.h:60
+#: keymap_alldefs.h:65
 msgid "display full address of sender"
 msgstr "ÏÔʾ¼ÄÐÅÈ˵ÄÍêÕûλַ"
 
-#: keymap_alldefs.h:61
+#: keymap_alldefs.h:66
 msgid "display message and toggle header weeding"
 msgstr "ÏÔʾÐżþ²¢Çл»Ñ¹ÒÖ±êÍ·×ÊÁÏÏÔʾ"
 
-#: keymap_alldefs.h:62
+#: keymap_alldefs.h:67
 msgid "display a message"
 msgstr "ÏÔʾһ·âÐżþ"
 
-#: keymap_alldefs.h:63
+#: keymap_alldefs.h:68
 #, fuzzy
 msgid "edit the raw message"
 msgstr "±à¼­ÐżþÄÚÈÝ"
 
-#: keymap_alldefs.h:64
+#: keymap_alldefs.h:69
 msgid "delete the char in front of the cursor"
 msgstr "ɾ³ýÓαêËùÔÚλÖÃ֮ǰµÄ×Öĸ"
 
-#: keymap_alldefs.h:65
+#: keymap_alldefs.h:70
 msgid "move the cursor one character to the left"
 msgstr "Ïò×óÒƶ¯Ò»¸ö×ÖÔª"
 
-#: keymap_alldefs.h:66
+#: keymap_alldefs.h:71
 #, fuzzy
 msgid "move the cursor to the beginning of the word"
 msgstr "Ìøµ½ÐÐÊ×"
 
-#: keymap_alldefs.h:67
+#: keymap_alldefs.h:72
 msgid "jump to the beginning of the line"
 msgstr "Ìøµ½ÐÐÊ×"
 
-#: keymap_alldefs.h:68
+#: keymap_alldefs.h:73
 msgid "cycle among incoming mailboxes"
 msgstr "Ȧѡ½øÈëµÄÓÊͲ"
 
-#: keymap_alldefs.h:69
+#: keymap_alldefs.h:74
 msgid "complete filename or alias"
 msgstr "ÍêÕûµÄµµÃû»ò±ðÃû"
 
-#: keymap_alldefs.h:70
+#: keymap_alldefs.h:75
 msgid "complete address with query"
 msgstr "¸½ÉÏÍêÕûµÄλַ²éѯ"
 
-#: keymap_alldefs.h:71
+#: keymap_alldefs.h:76
 msgid "delete the char under the cursor"
 msgstr "ɾ³ýÓαêËùÔÚµÄ×Öĸ"
 
-#: keymap_alldefs.h:72
+#: keymap_alldefs.h:77
 msgid "jump to the end of the line"
 msgstr "Ìøµ½ÐÐβ"
 
-#: keymap_alldefs.h:73
+#: keymap_alldefs.h:78
 msgid "move the cursor one character to the right"
 msgstr "ÏòÓαêÏòÓÒÒƶ¯Ò»¸ö×ÖÔª"
 
-#: keymap_alldefs.h:74
+#: keymap_alldefs.h:79
 #, fuzzy
 msgid "move the cursor to the end of the word"
 msgstr "ÏòÓαêÏòÓÒÒƶ¯Ò»¸ö×ÖÔª"
 
-#: keymap_alldefs.h:75
+#: keymap_alldefs.h:80
 #, fuzzy
 msgid "scroll down through the history list"
 msgstr "ÏòÉÏ¾í¶¯Ê¹ÓüͼÇåµ¥"
 
-#: keymap_alldefs.h:76
+#: keymap_alldefs.h:81
 msgid "scroll up through the history list"
 msgstr "ÏòÉÏ¾í¶¯Ê¹ÓüͼÇåµ¥"
 
-#: keymap_alldefs.h:77
+#: keymap_alldefs.h:82
 msgid "delete chars from cursor to end of line"
 msgstr "ÓÉÓαêËùÔÚλÖÃɾ³ýÖÁÐÐβËùÓеÄ×ÖÔª"
 
-#: keymap_alldefs.h:78
+#: keymap_alldefs.h:83
 #, fuzzy
 msgid "delete chars from the cursor to the end of the word"
 msgstr "ÓÉÓαêËùÔÚλÖÃɾ³ýÖÁÐÐβËùÓеÄ×ÖÔª"
 
-#: keymap_alldefs.h:79
+#: keymap_alldefs.h:84
 msgid "delete all chars on the line"
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: keymap_alldefs.h:80
+#: keymap_alldefs.h:85
 msgid "delete the word in front of the cursor"
 msgstr "ɾ³ýÓαê֮ǰµÄ×Ö"
 
-#: keymap_alldefs.h:81
+#: keymap_alldefs.h:86
 msgid "quote the next typed key"
 msgstr "ÓÃÏÂÒ»¸öÊäÈëµÄ¼üÖµ×÷ÒýÑÔ"
 
-#: keymap_alldefs.h:82
+#: keymap_alldefs.h:87
 msgid "transpose character under cursor with previous"
 msgstr ""
 
-#: keymap_alldefs.h:83
+#: keymap_alldefs.h:88
 msgid "capitalize the word"
 msgstr ""
 
-#: keymap_alldefs.h:84
+#: keymap_alldefs.h:89
 #, fuzzy
 msgid "convert the word to lower case"
 msgstr "ÒƵ½±¾Ò³µÄ×îºóÃæ"
 
-#: keymap_alldefs.h:85
+#: keymap_alldefs.h:90
 msgid "convert the word to upper case"
 msgstr ""
 
-#: keymap_alldefs.h:86
+#: keymap_alldefs.h:91
 msgid "enter a muttrc command"
 msgstr "ÊäÈë muttrc Ö¸Áî"
 
-#: keymap_alldefs.h:87
+#: keymap_alldefs.h:92
 msgid "enter a file mask"
 msgstr "ÊäÈëÎļþÕÚÕÖ"
 
-#: keymap_alldefs.h:88
+#: keymap_alldefs.h:93
 msgid "exit this menu"
 msgstr "À뿪Õâ¸öÑ¡µ¥"
 
-#: keymap_alldefs.h:89
+#: keymap_alldefs.h:94
 msgid "filter attachment through a shell command"
 msgstr "͸¹ý shell Ö¸ÁîÀ´¹ýÂ˸½¼þ"
 
-#: keymap_alldefs.h:90
+#: keymap_alldefs.h:95
 msgid "move to the first entry"
 msgstr "ÒƵ½µÚÒ»Ïî×ÊÁÏ"
 
-#: keymap_alldefs.h:91
+#: keymap_alldefs.h:96
 msgid "toggle a message's 'important' flag"
 msgstr "Çл»Ä³·âÐżþµÄ 'ÖØÒª' Æì±ê"
 
-#: keymap_alldefs.h:92
+#: keymap_alldefs.h:97
+#, fuzzy
+msgid "followup to newsgroup"
+msgstr "ÒÔºóµÄ»Ø¸²¶¼¼ÄÖÁ %s%s?"
+
+#: keymap_alldefs.h:98
+msgid "forward to newsgroup"
+msgstr ""
+
+#: keymap_alldefs.h:99
 msgid "forward a message with comments"
 msgstr "ת¼ÄѶϢ²¢¼ÓÉ϶îÍâÎÄ×Ö"
 
-#: keymap_alldefs.h:93
-msgid "select the current entry"
-msgstr "Ñ¡ÔñËùÔÚµÄ×ÊÁϼǼ"
+#: keymap_alldefs.h:100
+msgid "select the current entry"
+msgstr "Ñ¡ÔñËùÔÚµÄ×ÊÁϼǼ"
+
+#: keymap_alldefs.h:101
+#, fuzzy
+msgid "get all children of the current message"
+msgstr "ÄúÒѾ­ÔÚµÚÒ»·âÐÅÁË¡£"
+
+#: keymap_alldefs.h:102
+#, fuzzy
+msgid "get message with Message-Id"
+msgstr "±à¼­ÐżþµÄ±êÍ·"
+
+#: keymap_alldefs.h:103
+#, fuzzy
+msgid "get parent of the current message"
+msgstr "ÄúÒѾ­ÔÚµÚÒ»·âÐÅÁË¡£"
 
-#: keymap_alldefs.h:94
+#: keymap_alldefs.h:104
 msgid "reply to all recipients"
 msgstr "»Ø¸²¸øËùÓÐÊÕ¼þÈË"
 
-#: keymap_alldefs.h:95
+#: keymap_alldefs.h:105
 msgid "scroll down 1/2 page"
 msgstr "ÏòÏÂ¾í¶¯°ëÒ³"
 
-#: keymap_alldefs.h:96
+#: keymap_alldefs.h:106
 msgid "scroll up 1/2 page"
 msgstr "ÏòÉÏ¾í¶¯°ëÒ³"
 
-#: keymap_alldefs.h:97
+#: keymap_alldefs.h:107
 msgid "this screen"
 msgstr "Õâ¸öÆÁÄ»"
 
-#: keymap_alldefs.h:98
+#: keymap_alldefs.h:108
 msgid "jump to an index number"
 msgstr "Ìøµ½Ä³Ò»¸öË÷ÒýºÅÂë"
 
-#: keymap_alldefs.h:99
+#: keymap_alldefs.h:109
 msgid "move to the last entry"
 msgstr "Òƶ¯µ½×îºóÒ»Ïî×ÊÁÏ"
 
-#: keymap_alldefs.h:100
+#: keymap_alldefs.h:110
 msgid "reply to specified mailing list"
 msgstr "»Ø¸²¸øijһ¸öÖ¸¶¨µÄÓʼþÁбí"
 
-#: keymap_alldefs.h:101
+#: keymap_alldefs.h:111
+#, fuzzy
+msgid "load active file from NNTP server"
+msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
+
+#: keymap_alldefs.h:112
 msgid "execute a macro"
 msgstr "Ö´ÐÐÒ»¸ö¾Þ¼¯"
 
-#: keymap_alldefs.h:102
+#: keymap_alldefs.h:113
 msgid "compose a new mail message"
 msgstr "׫дһ·âеÄÐżþ"
 
-#: keymap_alldefs.h:103
+#: keymap_alldefs.h:114
+msgid "break the thread in two"
+msgstr ""
+
+#: keymap_alldefs.h:115
 msgid "open a different folder"
 msgstr "´ò¿ªÁíÒ»¸öÎļþ¼Ð"
 
-#: keymap_alldefs.h:104
+#: keymap_alldefs.h:116
 msgid "open a different folder in read only mode"
 msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÁíÒ»¸öÎļþ¼Ð"
 
-#: keymap_alldefs.h:105
+#: keymap_alldefs.h:117
+#, fuzzy
+msgid "open a different newsgroup"
+msgstr "´ò¿ªÁíÒ»¸öÎļþ¼Ð"
+
+#: keymap_alldefs.h:118
+#, fuzzy
+msgid "open a different newsgroup in read only mode"
+msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÁíÒ»¸öÎļþ¼Ð"
+
+#: keymap_alldefs.h:119
 msgid "clear a status flag from a message"
 msgstr "Çå³ýij·âÐżþÉϵÄ״̬Æì±ê"
 
-#: keymap_alldefs.h:106
+#: keymap_alldefs.h:120
 msgid "delete messages matching a pattern"
 msgstr "ɾ³ý·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: keymap_alldefs.h:107
+#: keymap_alldefs.h:121
+#, fuzzy
+msgid "reconstruct thread containing current message"
+msgstr "ÐòÁÐÖÐÓÐÉÐδ¶ÁÈ¡µÄÐżþ¡£"
+
+#: keymap_alldefs.h:122
 #, fuzzy
 msgid "force retrieval of mail from IMAP server"
 msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
 
-#: keymap_alldefs.h:108
+#: keymap_alldefs.h:123
 msgid "retrieve mail from POP server"
 msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
 
-#: keymap_alldefs.h:109
+#: keymap_alldefs.h:124
 msgid "move to the first message"
 msgstr "Òƶ¯µ½µÚÒ»·âÐżþ"
 
-#: keymap_alldefs.h:110
+#: keymap_alldefs.h:125
 msgid "move to the last message"
 msgstr "Òƶ¯µ½×îºóÒ»·âÐżþ"
 
-#: keymap_alldefs.h:111
+#: keymap_alldefs.h:126
 msgid "show only messages matching a pattern"
 msgstr "Ö»ÏÔʾ·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: keymap_alldefs.h:112
+#: keymap_alldefs.h:127
+#, fuzzy
+msgid "link tagged message to the current one"
+msgstr "ÎÞ·¨´«ËÍÒѱê¼ÇµÄÓʼþÖÁ£º"
+
+#: keymap_alldefs.h:128
 msgid "jump to the next new message"
 msgstr "Ìøµ½ÏÂÒ»·âеÄÐżþ"
 
-#: keymap_alldefs.h:113
+#: keymap_alldefs.h:129
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "Ìøµ½ÏÂÒ»¸öδ¶ÁÈ¡µÄÐżþ"
 
-#: keymap_alldefs.h:114
+#: keymap_alldefs.h:130
 msgid "jump to the next subthread"
 msgstr "Ìøµ½ÏÂÒ»¸ö×ÓÐòÁÐ"
 
-#: keymap_alldefs.h:115
+#: keymap_alldefs.h:131
 msgid "jump to the next thread"
 msgstr "Ìøµ½ÏÂÒ»¸öÐòÁÐ"
 
-#: keymap_alldefs.h:116
+#: keymap_alldefs.h:132
 msgid "move to the next undeleted message"
 msgstr "Òƶ¯µ½ÏÂÒ»¸öδɾ³ýµÄÐżþ"
 
-#: keymap_alldefs.h:117
+#: keymap_alldefs.h:133
 msgid "jump to the next unread message"
 msgstr "Ìøµ½ÏÂÒ»¸öδ¶ÁÈ¡µÄÐżþ"
 
-#: keymap_alldefs.h:118
+#: keymap_alldefs.h:134
 msgid "jump to parent message in thread"
 msgstr "Ìøµ½Õâ¸öÐòÁеÄÖ÷Ðżþ"
 
-#: keymap_alldefs.h:119
+#: keymap_alldefs.h:135
 msgid "jump to previous thread"
 msgstr "Ìøµ½ÉÏÒ»¸öÐòÁÐ"
 
-#: keymap_alldefs.h:120
+#: keymap_alldefs.h:136
 msgid "jump to previous subthread"
 msgstr "Ìøµ½ÉÏÒ»¸ö×ÓÐòÁÐ"
 
-#: keymap_alldefs.h:121
+#: keymap_alldefs.h:137
 #, fuzzy
 msgid "move to the previous undeleted message"
 msgstr "Òƶ¯µ½ÏÂÒ»¸öδɾ³ýµÄÐżþ"
 
-#: keymap_alldefs.h:122
+#: keymap_alldefs.h:138
 msgid "jump to the previous new message"
 msgstr "Ìøµ½ÉÏÒ»¸öеÄÐżþ"
 
-#: keymap_alldefs.h:123
+#: keymap_alldefs.h:139
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "Ìøµ½ÉÏÒ»¸öδ¶ÁÈ¡µÄÐżþ"
 
-#: keymap_alldefs.h:124
+#: keymap_alldefs.h:140
 msgid "jump to the previous unread message"
 msgstr "Ìøµ½ÉÏÒ»¸öδ¶ÁÈ¡µÄÐżþ"
 
-#: keymap_alldefs.h:125
+#: keymap_alldefs.h:141
 msgid "mark the current thread as read"
 msgstr "±ê¼ÇÏÖÔÚµÄÐòÁÐΪÒѶÁÈ¡"
 
-#: keymap_alldefs.h:126
+#: keymap_alldefs.h:142
 msgid "mark the current subthread as read"
 msgstr "±ê¼ÇÏÖÔÚµÄ×ÓÐòÁÐΪÒѶÁÈ¡"
 
-#: keymap_alldefs.h:127
+#: keymap_alldefs.h:143
 msgid "set a status flag on a message"
 msgstr "É趨ijһ·âÐżþµÄ״̬Æì±ê"
 
-#: keymap_alldefs.h:128
+#: keymap_alldefs.h:144
 msgid "save changes to mailbox"
 msgstr "´¢´æ±ä¶¯µ½ÐÅÏä"
 
-#: keymap_alldefs.h:129
+#: keymap_alldefs.h:145
 msgid "tag messages matching a pattern"
 msgstr "±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: keymap_alldefs.h:130
+#: keymap_alldefs.h:146
 msgid "undelete messages matching a pattern"
 msgstr "·´É¾³ý·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: keymap_alldefs.h:131
+#: keymap_alldefs.h:147
 msgid "untag messages matching a pattern"
 msgstr "·´±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
 
-#: keymap_alldefs.h:132
+#: keymap_alldefs.h:148
 msgid "move to the middle of the page"
 msgstr "Òƶ¯µ½±¾Ò³µÄÖмä"
 
-#: keymap_alldefs.h:133
+#: keymap_alldefs.h:149
 msgid "move to the next entry"
 msgstr "Òƶ¯µ½ÏÂÒ»Ïî×ÊÁÏ"
 
-#: keymap_alldefs.h:134
+#: keymap_alldefs.h:150
 msgid "scroll down one line"
 msgstr "ÏòÏÂ¾í¶¯Ò»ÐÐ"
 
-#: keymap_alldefs.h:135
+#: keymap_alldefs.h:151
 msgid "move to the next page"
 msgstr "ÒƵ½ÏÂÒ»Ò³"
 
-#: keymap_alldefs.h:136
+#: keymap_alldefs.h:152
 msgid "jump to the bottom of the message"
 msgstr "Ìøµ½ÐżþµÄ×îºóÃæ"
 
-#: keymap_alldefs.h:137
+#: keymap_alldefs.h:153
 msgid "toggle display of quoted text"
 msgstr "Çл»ÒýÑÔÏÔʾ"
 
-#: keymap_alldefs.h:138
+#: keymap_alldefs.h:154
 msgid "skip beyond quoted text"
 msgstr "Ìø¹ýÒýÑÔ"
 
-#: keymap_alldefs.h:139
+#: keymap_alldefs.h:155
 msgid "jump to the top of the message"
 msgstr "Ìøµ½ÐżþµÄ×îÉÏÃæ"
 
-#: keymap_alldefs.h:140
+#: keymap_alldefs.h:156
 msgid "pipe message/attachment to a shell command"
 msgstr "Êä³öµ¼Ïò ѶϢ/¸½¼þ ÖÁÃüÁî½âÒëÆ÷"
 
-#: keymap_alldefs.h:141
+#: keymap_alldefs.h:157
+#, fuzzy
+msgid "post message to newsgroup"
+msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
+
+#: keymap_alldefs.h:158
 msgid "move to the previous entry"
 msgstr "ÒƵ½ÉÏÒ»Ïî×ÊÁÏ"
 
-#: keymap_alldefs.h:142
+#: keymap_alldefs.h:159
 msgid "scroll up one line"
 msgstr "ÏòÉÏ¾í¶¯Ò»ÐÐ"
 
-#: keymap_alldefs.h:143
+#: keymap_alldefs.h:160
 msgid "move to the previous page"
 msgstr "ÒƵ½ÉÏÒ»Ò³"
 
-#: keymap_alldefs.h:144
+#: keymap_alldefs.h:161
 msgid "print the current entry"
 msgstr "´òÓ¡ÏÖÔÚµÄ×ÊÁÏ"
 
-#: keymap_alldefs.h:145
+#: keymap_alldefs.h:162
+msgid "really delete the current entry, bypassing the trash folder"
+msgstr ""
+
+#: keymap_alldefs.h:163
 msgid "query external program for addresses"
 msgstr "ÀûÓÃÍⲿӦÓóÌÐò²éѯµØÖ·"
 
-#: keymap_alldefs.h:146
+#: keymap_alldefs.h:164
 msgid "append new query results to current results"
 msgstr "¸½¼ÓеIJéѯ½á¹ûÖÁÏÖ½ñµÄ²éѯ½á¹û"
 
-#: keymap_alldefs.h:147
+#: keymap_alldefs.h:165
 msgid "save changes to mailbox and quit"
 msgstr "´¢´æ±ä¶¯¹ýµÄ×ÊÁϵ½ÐÅÏä²¢ÇÒÀ뿪"
 
-#: keymap_alldefs.h:148
+#: keymap_alldefs.h:166
 msgid "recall a postponed message"
 msgstr "ÖØнгöÒ»·â±»ÑӳټijöµÄÐżþ"
 
-#: keymap_alldefs.h:149
+#: keymap_alldefs.h:167
 msgid "clear and redraw the screen"
 msgstr "Çå³ý²¢ÖØлæÖÆÆÁÄ»"
 
-#: keymap_alldefs.h:150
+#: keymap_alldefs.h:168
 msgid "{internal}"
 msgstr "{ÄÚ²¿µÄ}"
 
-#: keymap_alldefs.h:151
+#: keymap_alldefs.h:169
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "ɾ³ýÕâ¸öÓÊÏä (Ö»ÊÊÓÃÓÚ IMAP)"
 
-#: keymap_alldefs.h:152
+#: keymap_alldefs.h:170
 msgid "reply to a message"
 msgstr "»Ø¸²Ò»·âÐżþ"
 
-#: keymap_alldefs.h:153
+#: keymap_alldefs.h:171
 msgid "use the current message as a template for a new one"
 msgstr "ÓÃÕâ·âÐżþ×÷ΪÐÂÐżþµÄÄ£°å"
 
-#: keymap_alldefs.h:154
+#: keymap_alldefs.h:172
 msgid "save message/attachment to a file"
 msgstr "´¢´æÐżþ/¸½¼þµ½Ä³¸öÎļþ"
 
-#: keymap_alldefs.h:155
+#: keymap_alldefs.h:173
 msgid "search for a regular expression"
 msgstr "ÓÃÕý¹æ±íʾʽѰÕÒ"
 
-#: keymap_alldefs.h:156
+#: keymap_alldefs.h:174
 msgid "search backwards for a regular expression"
 msgstr "ÏòºóËÑÑ°Ò»¸öÕý¹æ±íʾʽ"
 
-#: keymap_alldefs.h:157
+#: keymap_alldefs.h:175
 msgid "search for next match"
 msgstr "Ñ°ÕÒÏÂÒ»¸ö·ûºÏµÄ×ÊÁÏ"
 
-#: keymap_alldefs.h:158
+#: keymap_alldefs.h:176
 msgid "search for next match in opposite direction"
 msgstr "·µ·½ÏòËÑÑ°ÏÂÒ»¸ö·ûºÏµÄ×ÊÁÏ"
 
-#: keymap_alldefs.h:159
+#: keymap_alldefs.h:177
 msgid "toggle search pattern coloring"
 msgstr "Çл»ËÑÑ°¸ñʽµÄÑÕÉ«"
 
-#: keymap_alldefs.h:160
+#: keymap_alldefs.h:178
 msgid "invoke a command in a subshell"
 msgstr "ÔÚ×Ó shell Ö´ÐÐÖ¸Áî"
 
-#: keymap_alldefs.h:161
+#: keymap_alldefs.h:179
 msgid "sort messages"
 msgstr "ÐżþÅÅÐò"
 
-#: keymap_alldefs.h:162
+#: keymap_alldefs.h:180
 msgid "sort messages in reverse order"
 msgstr "ÒÔÏà·´µÄ´ÎÐòÀ´×öѶϢÅÅÐò"
 
-#: keymap_alldefs.h:163
+#: keymap_alldefs.h:181
+#, fuzzy
+msgid "subscribe to newsgroups matching a pattern"
+msgstr "·´±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
+
+#: keymap_alldefs.h:182
 msgid "tag the current entry"
 msgstr "±ê¼ÇÏÖÔڵļǼ"
 
-#: keymap_alldefs.h:164
+#: keymap_alldefs.h:183
 msgid "apply next function to tagged messages"
 msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
 
-#: keymap_alldefs.h:165
+#: keymap_alldefs.h:184
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
 
-#: keymap_alldefs.h:166
+#: keymap_alldefs.h:185
 msgid "tag the current subthread"
 msgstr "±ê¼ÇÄ¿Ç°µÄ×ÓÐòÁÐ"
 
-#: keymap_alldefs.h:167
+#: keymap_alldefs.h:186
 msgid "tag the current thread"
 msgstr "±ê¼ÇÄ¿Ç°µÄÐòÁÐ"
 
-#: keymap_alldefs.h:168
+#: keymap_alldefs.h:187
 msgid "toggle a message's 'new' flag"
 msgstr "Çл»½«Ñ¶Ï¢Çл»Îª 'new' Æì±ê"
 
-#: keymap_alldefs.h:169
+#: keymap_alldefs.h:188
+#, fuzzy
+msgid "toggle view of read messages"
+msgstr "Ìøµ½ÉÏÒ»¸öδ¶ÁÈ¡µÄÐżþ"
+
+#: keymap_alldefs.h:189
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "Çл»ÊÇ·ñÖØÐÂдÈëÓÊͲÖÐ"
 
-#: keymap_alldefs.h:170
+#: keymap_alldefs.h:190
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "Çл»ÊÇ·ñä¯ÀÀÓÊͲ»òËùÓеÄÎļþ"
 
-#: keymap_alldefs.h:171
+#: keymap_alldefs.h:191
 msgid "move to the top of the page"
 msgstr "ÒƵ½Ò³Ê×"
 
-#: keymap_alldefs.h:172
+#: keymap_alldefs.h:192
+msgid "mark all articles in newsgroup as unread"
+msgstr ""
+
+#: keymap_alldefs.h:193
 msgid "undelete the current entry"
 msgstr "·´É¾³ýÏÖÔڵļǼ"
 
-#: keymap_alldefs.h:173
+#: keymap_alldefs.h:194
 msgid "undelete all messages in thread"
 msgstr "·´É¾³ýÕâ¸öÐòÁÐÖеÄËùÓÐÐżþ"
 
-#: keymap_alldefs.h:174
+#: keymap_alldefs.h:195
 msgid "undelete all messages in subthread"
 msgstr "·´É¾³ýÕâ¸ö×ÓÐòÁÐÖеÄËùÓÐÐżþ"
 
-#: keymap_alldefs.h:175
+#: keymap_alldefs.h:196
+#, fuzzy
+msgid "unsubscribe from newsgroups matching a pattern"
+msgstr "·´±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
+
+#: keymap_alldefs.h:197
 msgid "show the Mutt version number and date"
 msgstr "ÏÔʾ Mutt µÄ°æ±¾ºÅÂëÓëÈÕÆÚ"
 
-#: keymap_alldefs.h:176
+#: keymap_alldefs.h:198
 msgid "view attachment using mailcap entry if necessary"
 msgstr "Èç¹ûÐèÒªµÄ»°Ê¹Óà mailcap ä¯ÀÀ¸½¼þ"
 
-#: keymap_alldefs.h:177
+#: keymap_alldefs.h:199
 msgid "show MIME attachments"
 msgstr "ÏÔʾ MIME ¸½¼þ"
 
-#: keymap_alldefs.h:178
+#: keymap_alldefs.h:200
 msgid "display the keycode for a key press"
 msgstr ""
 
-#: keymap_alldefs.h:179
+#: keymap_alldefs.h:201
 msgid "show currently active limit pattern"
 msgstr "ÏÔʾĿǰÓÐ×÷ÓõÄÏÞÖÆÑùʽ"
 
-#: keymap_alldefs.h:180
+#: keymap_alldefs.h:202
 msgid "collapse/uncollapse current thread"
 msgstr "´ò¿ª/¹Ø±Õ Ä¿Ç°µÄÐòÁÐ"
 
-#: keymap_alldefs.h:181
+#: keymap_alldefs.h:203
 msgid "collapse/uncollapse all threads"
 msgstr "´ò¿ª/¹Ø±Õ ËùÓеÄÐòÁÐ"
 
-#: keymap_alldefs.h:182
+#: keymap_alldefs.h:204
+#, fuzzy
+msgid "scroll the mailbox pane up 1 page"
+msgstr "ÏòÉÏ¾í¶¯°ëÒ³"
+
+#: keymap_alldefs.h:205
+#, fuzzy
+msgid "scroll the mailbox pane down 1 page"
+msgstr "ÏòÏÂ¾í¶¯°ëÒ³"
+
+#: keymap_alldefs.h:206
+msgid "go down to next mailbox"
+msgstr ""
+
+#: keymap_alldefs.h:207
+#, fuzzy
+msgid "go down to next mailbox with new mail"
+msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
+
+#: keymap_alldefs.h:208
+#, fuzzy
+msgid "go to previous mailbox"
+msgstr "дÈëÐÅÏäʱ·¢Éú´íÎó£¡"
+
+#: keymap_alldefs.h:209
+#, fuzzy
+msgid "go to previous mailbox with new mail"
+msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
+
+#: keymap_alldefs.h:210
+#, fuzzy
+msgid "open hilighted mailbox"
+msgstr "ÖØдò¿ªÐÅÏäÖС­"
+
+#: keymap_alldefs.h:211
 msgid "attach a PGP public key"
 msgstr "¸½´øÒ»°Ñ PGP ¹«¹²Ô¿³×"
 
-#: keymap_alldefs.h:183
+#: keymap_alldefs.h:212
 msgid "show PGP options"
 msgstr "ÏÔʾ PGP Ñ¡Ïî"
 
-#: keymap_alldefs.h:184
+#: keymap_alldefs.h:213
 msgid "mail a PGP public key"
 msgstr "¼Ä³ö PGP ¹«¹²Ô¿³×"
 
-#: keymap_alldefs.h:185
+#: keymap_alldefs.h:214
 msgid "verify a PGP public key"
 msgstr "¼ìÑé PGP ¹«¹²Ô¿³×"
 
-#: keymap_alldefs.h:186
+#: keymap_alldefs.h:215
 msgid "view the key's user id"
 msgstr "¼ìÔÄÕâ°ÑÔ¿³×µÄʹÓÃÕß id"
 
-#: keymap_alldefs.h:187
+#: keymap_alldefs.h:216
 msgid "check for classic pgp"
 msgstr ""
 
-#: keymap_alldefs.h:188
+#: keymap_alldefs.h:217
 msgid "Accept the chain constructed"
 msgstr ""
 
-#: keymap_alldefs.h:189
+#: keymap_alldefs.h:218
 #, fuzzy
 msgid "Append a remailer to the chain"
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: keymap_alldefs.h:190
+#: keymap_alldefs.h:219
 #, fuzzy
 msgid "Insert a remailer into the chain"
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: keymap_alldefs.h:191
+#: keymap_alldefs.h:220
 #, fuzzy
 msgid "Delete a remailer from the chain"
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: keymap_alldefs.h:192
+#: keymap_alldefs.h:221
 #, fuzzy
 msgid "Select the previous element of the chain"
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: keymap_alldefs.h:193
+#: keymap_alldefs.h:222
 #, fuzzy
 msgid "Select the next element of the chain"
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: keymap_alldefs.h:194
+#: keymap_alldefs.h:223
 msgid "send the message through a mixmaster remailer chain"
 msgstr ""
 
-#: keymap_alldefs.h:195
+#: keymap_alldefs.h:224
 msgid "make decrypted copy and delete"
 msgstr "ÖÆ×÷½âÃܵĿ½±´²¢ÇÒɾ³ýÖ®"
 
-#: keymap_alldefs.h:196
+#: keymap_alldefs.h:225
 msgid "make decrypted copy"
 msgstr "ÖÆ×÷Ò»·Ý½âÃܵĿ½±´"
 
-#: keymap_alldefs.h:197
+#: keymap_alldefs.h:226
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "Çå³ý¼ÇÒäÌåÖÐµÄ PGP ͨÐÐÃÜÂë"
 
-#: keymap_alldefs.h:198
+#: keymap_alldefs.h:227
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "ߢȡ PGP ¹«¹²Ô¿³×"
 
-#: keymap_alldefs.h:199
+#: keymap_alldefs.h:228
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "ÏÔʾ PGP Ñ¡Ïî"
 
-#: lib.c:64
-msgid "Integer overflow -- can't allocate memory!"
-msgstr ""
-
-#: lib.c:71 lib.c:86 lib.c:118
-msgid "Out of memory!"
-msgstr "¼ÇÒäÌå²»×㣡"
-
-#: main.c:51
+#: main.c:55
 #, fuzzy
 msgid ""
-"To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
-"To report a bug, please use the flea(1) utility.\n"
+"To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n"
+"To visit the Mutt-ng homepage go to http://www.muttng.org.\n"
+"To report a bug, please use the fleang(1) utility.\n"
 msgstr "ÒªÓëÑз¢ÈËÔ±Á¬Â磬Çë¼ÄПø <mutt-dev@mutt.org>¡£\n"
 
-#: main.c:55
+#: main.c:60
 #, fuzzy
 msgid ""
 "Copyright (C) 1996-2002 Michael R. Elkins and others.\n"
-"Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
+"Mutt-ng comes with ABSOLUTELY NO WARRANTY; for details type `muttng -vv'.\n"
 "Mutt is free software, and you are welcome to redistribute it\n"
-"under certain conditions; type `mutt -vv' for details.\n"
+"under certain conditions; type `muttng -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"
 
-#: main.c:61
+#: main.c:66
 #, fuzzy
 msgid ""
-"Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2002 Thomas Roessler <roessler@does-not-exist.org>\n"
-"Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
+"Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
+"Copyright (C) 2005:\n"
+"  Parts were written/modified by:\n"
+"     Andreas Krennmair <ak@synflood.at>\n"
+"     Nico Golde <nico@ngolde.de>\n"
+"     Rocco Rutte <pdmef@cs.tu-berlin.de>\n"
+"\n"
 "Lots of others not mentioned here contributed lots of code,\n"
 "fixes, and suggestions.\n"
 "\n"
@@ -2655,7 +3602,7 @@ msgid ""
 msgstr ""
 "Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1996-2000 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2000 Thomas Roessler <roessler@guug.de>\n"
+"Copyright (C) 1997-2000 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2000 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1999-2000 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
@@ -2674,32 +3621,73 @@ msgstr ""
 "    ÖÁ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
 "MA  02111, USA.\n"
 
-#: main.c:99
+#: main.c:110
 #, fuzzy
 msgid ""
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+"usage: muttng [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
 "<file> ]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
+"       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
 "[...]\n"
-"       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
+"       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
 "[...]\n"
-"       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
+"       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
+"       muttng [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] "
 "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
-"       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-"       mutt -v[v]\n"
+"       muttng [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+"       muttng -v[v]\n"
 "\n"
 "options:\n"
 "  -A <alias>\texpand the given alias\n"
 "  -a <file>\tattach a file to the message\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 ""
+"Ó÷¨: 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:125
+msgid "  -d <level>\tlog debugging output to ~/.muttngdebug0"
+msgstr ""
+
+#: main.c:127
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
+"  -g <server>\tspecify a newsserver (if compiled with NNTP)\n"
+"  -G\t\tselect a newsgroup (if compiled with NNTP)\n"
 "  -H <file>\tspecify a draft file to read header and body from\n"
-"  -i <file>\tspecify a file which Mutt should include in the body\n"
+"  -i <file>\tspecify a file which Mutt-ng should include in the body\n"
+"  -d <level>\t specify debugging level of Mutt-ng\n"
 "  -m <type>\tspecify a default mailbox type\n"
-"  -n\t\tcauses Mutt not to read the system Muttrc\n"
+"  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n"
 "  -p\t\trecall a postponed message\n"
 "  -Q <variable>\tquery a configuration variable\n"
 "  -R\t\topen mailbox in read-only mode\n"
@@ -2739,7 +3727,7 @@ msgstr ""
 "  -Z            ´ò¿ªµÚÒ»¸ö¸½ÓÐÐÂÓʼþµÄ×ÊÁϼУ¬Èç¹ûûÓеĻ°Á¢¼´À뿪\n"
 "  -h            Õâ¸ö˵Ã÷ѶϢ"
 
-#: main.c:167
+#: main.c:187
 msgid ""
 "\n"
 "Compile options:"
@@ -2747,81 +3735,88 @@ msgstr ""
 "\n"
 "±àÒëÑ¡Ï"
 
-#: main.c:478
+#: main.c:446
+msgid "Mutt-ng is based on the following patches written for mutt:\n"
+msgstr ""
+
+#: main.c:466
 msgid "Error initializing terminal."
 msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
 
-#: main.c:583
+#: main.c:589
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "³ý´íģʽÔÚµÚ %d ²ã¡£\n"
 
-#: main.c:585
+#: main.c:591
+#, c-format
+msgid "Please specify a valid debugging level ("
+msgstr ""
+
+#: main.c:592
+#, c-format
+msgid "-"
+msgstr ""
+
+#: main.c:592
+#, c-format
+msgid ").\n"
+msgstr ""
+
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "ÔÚ±àÒëʱºòûÓж¨Òå DEBUG¡£·ÅÆúÖ´ÐС£\n"
 
-#: main.c:733
+#: main.c:757
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ²»´æÔÚ¡£ÖÆÔìÂð£¿"
 
-#: main.c:737
+#: main.c:761
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "ÎÞ·¨½¨Á¢ %s: %s."
 
-#: main.c:782
+#: main.c:801
 msgid "No recipients specified.\n"
 msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕß¡£\n"
 
-#: main.c:868
+#: main.c:877
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s£ºÎÞ·¨¸½´øÎļþ¡£\n"
 
-#: main.c:888
+#: main.c:894
 msgid "No mailbox with new mail."
 msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
 
-#: main.c:897
+#: main.c:913
 #, fuzzy
 msgid "No incoming mailboxes defined."
 msgstr "Ȧѡ½øÈëµÄÓÊͲ"
 
-#: main.c:924
+#: main.c:948
 msgid "Mailbox is empty."
 msgstr "ÐÅÏäÄÚ¿ÕÎÞÒ»Îï¡£"
 
-#: mbox.c:129 mbox.c:288
+#: mbox.c:135 mbox.c:284
 #, c-format
 msgid "Reading %s... %d (%d%%)"
 msgstr "¶ÁÈ¡ %s ÖС­ %d (%d%%)"
 
-#: mbox.c:153 mbox.c:210
+#: mbox.c:156 mbox.c:210
 msgid "Mailbox is corrupt!"
 msgstr "ÐÅÏäÒÑËð»µÁË£¡"
 
-#: mbox.c:662
-msgid "Mailbox was corrupted!"
-msgstr "ÐÅÏäÒÑËð»µ!"
-
-#: mbox.c:699 mbox.c:953
+#: mbox.c:577 mbox.c:814
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "ÑÏÖØ´íÎó£¡ÎÞ·¨ÖØдò¿ªÐÅÏ䣡"
 
-#: mbox.c:708
-msgid "Unable to lock mailbox!"
-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:754
+#: mbox.c:628
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "ͬ²½£ºÐÅÏäÒѱ»Ð޸ģ¬µ«Ã»Óб»Ð޸ĹýµÄÐżþ£¡£¨Çë»Ø±¨Õâ¸ö´íÎó£©"
 
-#: mbox.c:793
+#: mbox.c:665
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "дÈëÐżþÖС­ %d (%d%%)"
@@ -2829,573 +3824,848 @@ msgstr "д
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:906
+#: mbox.c:768
 #, fuzzy
 msgid "Committing changes..."
 msgstr "±àÒëËÑÑ°ÑùʽÖС­"
 
-#: mbox.c:937
+#: mbox.c:799
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "дÈëʧ°Ü£¡ÒѰѲ¿·ÖµÄÐÅÏä´¢´æÖÁ %s"
 
-#: mbox.c:1003
+#: mbox.c:857
 msgid "Could not reopen mailbox!"
 msgstr "ÎÞ·¨ÖØ¿ªÐÅÏ䣡"
 
-#: mbox.c:1041
+#: mbox.c:912
 msgid "Reopening mailbox..."
 msgstr "ÖØдò¿ªÐÅÏäÖС­"
 
-#: menu.c:416
+#: mbox.c:1126
+#, fuzzy
+msgid "Can't write message"
+msgstr "±à¼­ÐżþÄÚÈÝ"
+
+#: menu.c:411
 msgid "Jump to: "
 msgstr "Ìøµ½£º"
 
-#: menu.c:425
+#: menu.c:418
 msgid "Invalid index number."
 msgstr "ÎÞЧµÄË÷Òý±àºÅ¡£"
 
-#: menu.c:429 menu.c:450 menu.c:488 menu.c:531 menu.c:547 menu.c:558
-#: menu.c:569 menu.c:611 menu.c:622 menu.c:635 menu.c:648 menu.c:1043
+#: menu.c:422 menu.c:443 menu.c:477 menu.c:516 menu.c:531 menu.c:541
+#: menu.c:551 menu.c:588 menu.c:598 menu.c:610 menu.c:622 menu.c:1004
 msgid "No entries."
 msgstr "ûÓÐ×ÊÁÏ¡£"
 
-#: menu.c:447
+#: menu.c:440
 msgid "You cannot scroll down farther."
 msgstr "ÄúÎÞ·¨ÔÙÏòÏÂ¾í¶¯ÁË¡£"
 
-#: menu.c:465
+#: menu.c:457
 msgid "You cannot scroll up farther."
 msgstr "ÄúÎÞ·¨ÔÙÏòÉÏ¾í¶¯ÁË¡£"
 
-#: menu.c:485
+#: menu.c:474
 msgid "You are on the last page."
 msgstr "ÄúÏÖÔÚÔÚ×îºóÒ»Ò³¡£"
 
-#: menu.c:509
+#: menu.c:496
 msgid "You are on the first page."
 msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ò³¡£"
 
-#: menu.c:588
+#: menu.c:568
 msgid "First entry is shown."
 msgstr "ÕýÔÚÏÔʾµÚÒ»Ïî¡£"
 
-#: menu.c:608
+#: menu.c:585
 msgid "Last entry is shown."
 msgstr "ÕýÔÚÏÔʾ×îºóÒ»Ïî¡£"
 
-#: menu.c:659
+#: menu.c:632
 msgid "You are on the last entry."
 msgstr "ÄúÏÖÔÚÔÚ×îºóÒ»Ïî¡£"
 
-#: menu.c:670
+#: menu.c:642
 msgid "You are on the first entry."
 msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ïî¡£"
 
-#: menu.c:730 pattern.c:1242
+#: menu.c:700 pattern.c:1253
 msgid "Search for: "
 msgstr "ËÑÑ°£º"
 
-#: menu.c:731 pattern.c:1243
+#: menu.c:701 pattern.c:1254
 msgid "Reverse search for: "
 msgstr "·µÏòËÑÑ°£º"
 
-#: menu.c:741 pattern.c:1275
+#: menu.c:709 pattern.c:1285
 msgid "No search pattern."
 msgstr "ûÓÐËÑÑ°¸ñʽ¡£"
 
-#: menu.c:771 pager.c:1931 pager.c:1947 pager.c:2055 pattern.c:1340
+#: menu.c:739 pager.c:1853 pager.c:1867 pager.c:1969 pattern.c:1349
 msgid "Not found."
 msgstr "ûÓÐÕÒµ½¡£"
 
-#: menu.c:895
+#: menu.c:859
 msgid "No tagged entries."
 msgstr "ûÓÐÒѱê¼ÇµÄ¼Ç¼¡£"
 
-#: menu.c:1000
+#: menu.c:964
 msgid "Search is not implemented for this menu."
 msgstr "Õâ¸öÑ¡µ¥ÖÐûÓÐËÑÑ°¹¦ÄÜ¡£"
 
-#: menu.c:1005
+#: menu.c:969
 msgid "Jumping is not implemented for dialogs."
 msgstr "¶Ô»°Ä£Ê½Öв»Ö§³ÖÌøÔ¾¹¦ÄÜ¡£"
 
-#: menu.c:1046
+#: menu.c:1007
 msgid "Tagging is not supported."
 msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
 
-#: mh.c:663 mh.c:900
+#: mh.c:637 mh.c:874
 #, c-format
 msgid "Reading %s... %d"
 msgstr "¶ÁÈ¡ %s¡­ %d"
 
-#: mh.c:1151
+#: mh.c:1146
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:846
+#: muttlib.c:824
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
 
-#: muttlib.c:846
+#: muttlib.c:825
 msgid "yna"
 msgstr ""
 
-#: muttlib.c:862
+#: muttlib.c:842
 msgid "File is a directory, save under it?"
 msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
 
-#: muttlib.c:868
+#: muttlib.c:848
 msgid "File under directory: "
 msgstr "ÔÚĿ¼µ×ϵÄÎļþ£º"
 
-#: muttlib.c:880
+#: muttlib.c:859
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "ÎļþÒѾ­´æÔÚ, (o)¸²¸Ç, (a)¸½¼Ó, »òÊÇ (c)È¡Ïû ?"
 
-#: muttlib.c:880
+#: muttlib.c:859
 msgid "oac"
 msgstr ""
 
-#: muttlib.c:1199
+#: muttlib.c:1187
 #, fuzzy
 msgid "Can't save message to POP mailbox."
 msgstr "½«ÐżþдÈëµ½ÐÅÏä"
 
-#: muttlib.c:1208
-#, c-format
-msgid "%s is not a mailbox!"
-msgstr "%s ²»ÊÇÐÅÏ䣡"
+#: muttlib.c:1195
+#, fuzzy
+msgid "Can't save message to newsserver."
+msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
 
-#: muttlib.c:1214
+#. if we're appending to the trash, there's no point in asking
+#: muttlib.c:1205
 #, c-format
 msgid "Append messages to %s?"
 msgstr "¸½¼ÓÐżþµ½ %s ?"
 
-#: mutt_socket.c:91 mutt_socket.c:147
+#: muttlib.c:1215
+#, c-format
+msgid "%s is not a mailbox!"
+msgstr "%s ²»ÊÇÐÅÏ䣡"
+
+#: mutt_socket.c:85 mutt_socket.c:134
 #, fuzzy, c-format
 msgid "Connection to %s closed"
 msgstr "ÕýÁ¬½Óµ½ %s¡­"
 
-#: mutt_socket.c:271
+#: mutt_socket.c:248
 msgid "SSL is unavailable."
 msgstr ""
 
-#: mutt_socket.c:302
+#: mutt_socket.c:277
 #, fuzzy
 msgid "Preconnect command failed."
 msgstr "Ô¤ÏÈÁ¬½ÓÖ¸Áîʧ°Ü"
 
-#: mutt_socket.c:373 mutt_socket.c:387
+#: mutt_socket.c:345 mutt_socket.c:358
 #, fuzzy, c-format
 msgid "Error talking to %s (%s)"
 msgstr "ÕýÁ¬Ïßµ½ %s"
 
-#: mutt_socket.c:426 mutt_socket.c:483
+#: mutt_socket.c:396 mutt_socket.c:449
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:433 mutt_socket.c:490
+#: mutt_socket.c:403 mutt_socket.c:456
 #, fuzzy, c-format
 msgid "Looking up %s..."
 msgstr "¿½±´µ½ %s¡­"
 
-#: mutt_socket.c:444 mutt_socket.c:497
+#: mutt_socket.c:413 mutt_socket.c:462
 #, fuzzy, c-format
 msgid "Could not find the host \"%s\""
 msgstr "ÕÒ²»µ½Ö÷»ú %s µÄλַ¡£"
 
-#: mutt_socket.c:448 mutt_socket.c:506
+#: mutt_socket.c:418 mutt_socket.c:471
 #, c-format
 msgid "Connecting to %s..."
 msgstr "ÕýÁ¬½Óµ½ %s¡­"
 
-#: mutt_socket.c:529
+#: mutt_socket.c:490
 #, fuzzy, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "ÎÞ·¨´ò¿ª %s"
 
-#: mutt_ssl.c:175
+#: mutt_ssl.c:165
 msgid "Failed to find enough entropy on your system"
 msgstr ""
 
-#: mutt_ssl.c:199
+#: mutt_ssl.c:190
 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr ""
 
-#: mutt_ssl.c:207
+#: mutt_ssl.c:196
 #, c-format
 msgid "%s has insecure permissions!"
 msgstr ""
 
-#: mutt_ssl.c:226
+#: mutt_ssl.c:216
 msgid "SSL disabled due the lack of entropy"
 msgstr ""
 
-#: mutt_ssl.c:322
+#: mutt_ssl.c:307
 msgid "I/O error"
 msgstr ""
 
-#: mutt_ssl.c:331
+#: mutt_ssl.c:316
 #, fuzzy, c-format
 msgid "SSL failed: %s"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: mutt_ssl.c:340
+#: mutt_ssl.c:324 mutt_ssl_gnutls.c:467 mutt_ssl_gnutls.c:475
+#: mutt_ssl_gnutls.c:501
 #, fuzzy
 msgid "Unable to get certificate from peer"
 msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
 
-#: mutt_ssl.c:348
+#: mutt_ssl.c:332
 #, fuzzy, c-format
 msgid "SSL connection using %s (%s)"
 msgstr "ÕýÁ¬Ïßµ½ %s"
 
-#: mutt_ssl.c:388
+#: mutt_ssl.c:414
 #, fuzzy
 msgid "Unknown"
 msgstr "²»Ã÷µÄ´íÎó"
 
-#: mutt_ssl.c:413
+#: mutt_ssl.c:437 mutt_ssl_gnutls.c:359
 #, fuzzy, c-format
 msgid "[unable to calculate]"
 msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
 
-#: mutt_ssl.c:431
+#: mutt_ssl.c:454 mutt_ssl_gnutls.c:381
 #, fuzzy
 msgid "[invalid date]"
 msgstr "%s£ºÎÞЧµÄÖµ"
 
-#: mutt_ssl.c:506
+#: mutt_ssl.c:525
 msgid "Server certificate is not yet valid"
 msgstr ""
 
-#: mutt_ssl.c:513
+#: mutt_ssl.c:531
 msgid "Server certificate has expired"
 msgstr ""
 
-#: mutt_ssl.c:586
+#: mutt_ssl.c:590 mutt_ssl_gnutls.c:591
 msgid "This certificate belongs to:"
 msgstr ""
 
-#: mutt_ssl.c:597
+#: mutt_ssl.c:601 mutt_ssl_gnutls.c:636
 msgid "This certificate was issued by:"
 msgstr ""
 
-#: mutt_ssl.c:608
+#: mutt_ssl.c:613 mutt_ssl_gnutls.c:682
 #, c-format
 msgid "This certificate is valid"
 msgstr ""
 
-#: mutt_ssl.c:609
+#: mutt_ssl.c:614 mutt_ssl_gnutls.c:685
 #, c-format
 msgid "   from %s"
 msgstr ""
 
-#: mutt_ssl.c:611
+#: mutt_ssl.c:616 mutt_ssl_gnutls.c:689
 #, c-format
 msgid "     to %s"
 msgstr ""
 
-#: mutt_ssl.c:617
+#: mutt_ssl.c:622
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
 
-#: mutt_ssl.c:619
+#: mutt_ssl.c:624
 msgid "SSL Certificate check"
 msgstr ""
 
-#: mutt_ssl.c:622
+#: mutt_ssl.c:628 mutt_ssl_gnutls.c:734
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr ""
 
-#: mutt_ssl.c:623
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:735
 msgid "roa"
 msgstr ""
 
-#: mutt_ssl.c:627
+#: mutt_ssl.c:632 mutt_ssl_gnutls.c:738
 msgid "(r)eject, accept (o)nce"
 msgstr ""
 
-#: mutt_ssl.c:628
+#: mutt_ssl.c:633 mutt_ssl_gnutls.c:739
 msgid "ro"
 msgstr ""
 
-#: mutt_ssl.c:632 pgpkey.c:514 smime.c:431
-msgid "Exit  "
-msgstr "À뿪  "
-
-#: mutt_ssl.c:659
+#: mutt_ssl.c:660 mutt_ssl_gnutls.c:780
 msgid "Warning: Couldn't save certificate"
 msgstr ""
 
-#: mutt_ssl.c:664
+#: mutt_ssl.c:664 mutt_ssl_gnutls.c:784
 msgid "Certificate saved"
 msgstr ""
 
-#: mx.c:120
+#: mutt_ssl_gnutls.c:59
+#, c-format
+msgid "gnutls_global_init: %s"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:87 mutt_ssl_gnutls.c:107
+msgid "Error: no TLS socket open"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:94
+#, c-format
+msgid "tls_socket_read (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:114
+#, c-format
+msgid "tls_socket_write (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:163
+#, c-format
+msgid "gnutls_certificate_allocate_credentials: %s"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:190
+msgid "All available protocols for TLS/SSL connection disabled"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:228
+#, c-format
+msgid "gnutls_handshake: %s(%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:232
+#, c-format
+msgid "gnutls_handshake: %s"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:246
+#, fuzzy, c-format
+msgid "SSL/TLS connection using %s (%s/%s/%s)"
+msgstr "ÕýÁ¬Ïßµ½ %s"
+
+#: mutt_ssl_gnutls.c:480
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:488
+msgid "Certificate is not X.509"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:494
+#, fuzzy
+msgid "Error initialising gnutls certificate data"
+msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
+
+#: mutt_ssl_gnutls.c:508
+msgid "Error processing certificate data"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:694
+#, c-format
+msgid "SHA1 Fingerprint: %s"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:698
+#, c-format
+msgid "MD5 Fingerprint: %s"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:704
+msgid "WARNING: Server certificate is not yet valid"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:708
+msgid "WARNING: Server certificate has expired"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:714
+msgid "WARNING: Server certificate has been revoked"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:719
+msgid "WARNING: Server hostname does not match certificate"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:725
+msgid "WARNING: Signer of server certificate is not a CA"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:729
+msgid "TLS/SSL Certificate check"
+msgstr ""
+
+#: mutt_tunnel.c:65
+#, fuzzy, c-format
+msgid "Connecting with \"%s\"..."
+msgstr "ÕýÁ¬½Óµ½ %s¡­"
+
+#: mutt_tunnel.c:127
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:143 mutt_tunnel.c:159
+#, fuzzy, c-format
+msgid "Tunnel error talking to %s: %s"
+msgstr "ÕýÁ¬Ïßµ½ %s"
+
+#: mx.c:132
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
 msgstr "Ëø½øÊýÁ¿³¬¹ýÏ޶½« %s µÄËøÒƳý£¿"
 
-#: mx.c:132
+#: mx.c:141
 #, c-format
 msgid "Can't dotlock %s.\n"
 msgstr "ÎÞ·¨Óà dotlock Ëøס %s¡£\n"
 
-#: mx.c:190
+#: mx.c:223
 msgid "Timeout exceeded while attempting fcntl lock!"
 msgstr "³¢ÊÔ fcntl µÄËø¶¨Ê±³¬¹ýʱ¼ä!"
 
-#: mx.c:196
+#: mx.c:230
 #, c-format
 msgid "Waiting for fcntl lock... %d"
 msgstr "ÕýÔڵȴý fcntl µÄËø¶¨¡­ %d"
 
-#: mx.c:224
+#: mx.c:257
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "³¢ÊÔ flock ʱ³¬¹ýʱ¼ä£¡"
 
-#: mx.c:231
+#: mx.c:265
 #, c-format
 msgid "Waiting for flock attempt... %d"
 msgstr "ÕýÔڵȴý flock Ö´Ðгɹ¦¡­ %d"
 
-#: mx.c:595
+#: mx.c:487
+#, c-format
+msgid "Couldn't lock %s\n"
+msgstr "ÎÞ·¨Ëøס %s¡£\n"
+
+#: mx.c:576
+#, c-format
+msgid "Reading %s..."
+msgstr "¶ÁÈ¡ %s ÖС­"
+
+#: mx.c:638
+#, c-format
+msgid "Writing %s..."
+msgstr "дÈë %s ÖС­"
+
+#: mx.c:669
+#, fuzzy
+msgid "message(s) not deleted"
+msgstr "ÓʼþÒÑ´«ËÍ¡£"
+
+#: mx.c:690
+#, fuzzy
+msgid "Can't open trash folder"
+msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
+
+#: mx.c:757
+#, c-format
+msgid "Move read messages to %s?"
+msgstr "°áÒÆÒѶÁÈ¡µÄÐżþµ½ %s£¿"
+
+#: mx.c:771 mx.c:1026
+#, c-format
+msgid "Purge %d deleted message?"
+msgstr "Çå³ý %d ·âÒѾ­±»É¾³ýµÄÐżþ£¿"
+
+#: mx.c:772 mx.c:1027
+#, c-format
+msgid "Purge %d deleted messages?"
+msgstr "Çå³ý %d ·âÒѱ»É¾³ýµÄÐżþ£¿"
+
+#: mx.c:791
+#, c-format
+msgid "Moving read messages to %s..."
+msgstr "ÕýÔÚ°áÒÆÒѾ­¶ÁÈ¡µÄÐżþµ½ %s ¡­"
+
+#: mx.c:844 mx.c:1017
+msgid "Mailbox is unchanged."
+msgstr "ÐÅÏäûÓиı䡣"
+
+#: mx.c:883
+#, c-format
+msgid "%d kept, %d moved, %d deleted."
+msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»°áÒÆ, %d ·âÐżþ±»É¾³ý¡£"
+
+#: mx.c:886 mx.c:1070
+#, c-format
+msgid "%d kept, %d deleted."
+msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»É¾³ý¡£"
+
+#: mx.c:1002
+#, c-format
+msgid " Press '%s' to toggle write"
+msgstr " Çë°´Ï '%s' À´Çл»Ð´Èëģʽ"
+
+#: mx.c:1004
+msgid "Use 'toggle-write' to re-enable write!"
+msgstr "ÇëʹÓà 'toggle-write' À´ÖØÐÂÆô¶¯Ð´È빦ÄÜ!"
+
+#: mx.c:1007
+#, c-format
+msgid "Mailbox is marked unwritable. %s"
+msgstr "ÐÅÏä±»±ê¼Ç³ÉΪÎÞ·¨Ð´ÈëµÄ. %s"
+
+#: mx.c:1066
+#, fuzzy
+msgid "Mailbox checkpointed."
+msgstr "ÓÊÏäÒÑɾ³ý¡£"
+
+#: mx.c:1295
+msgid "Integer overflow -- can't allocate memory."
+msgstr ""
+
+#: nntp/newsrc.c:189
+#, fuzzy, c-format
+msgid "Directory %s not exist. Create it?"
+msgstr "%s ²»´æÔÚ¡£ÖÆÔìÂð£¿"
+
+#: nntp/newsrc.c:193
+msgid "Cache directory not created!"
+msgstr ""
+
+#: nntp/newsrc.c:341
+#, fuzzy
+msgid "No newsserver defined!"
+msgstr "ûÓỶ¨ÒåµÄ POP ʹÓÃÕßÃû³Æ¡£"
+
+#: nntp/newsrc.c:355
+#, c-format
+msgid "%s is an invalid newsserver specification!"
+msgstr ""
+
+#: nntp/nntp.c:92 pop/pop.c:648 pop/pop_lib.c:351
+msgid "Server closed connection!"
+msgstr "ÓëËÅ·þÆ÷µÄÁª½áÖжÏÁË!"
+
+#: nntp/nntp.c:113
+#, fuzzy, c-format
+msgid "Connected to %s. Posting ok."
+msgstr "ÕýÁ¬½Óµ½ %s¡­"
+
+#: nntp/nntp.c:115
+#, c-format
+msgid "Connected to %s. Posting NOT ok."
+msgstr ""
+
+#: nntp/nntp.c:222
+#, fuzzy, c-format
+msgid "Connection to %s lost. Reconnect?"
+msgstr "ÕýÁ¬½Óµ½ %s¡­"
+
+#: nntp/nntp.c:330
+#, c-format
+msgid "%s (tagged: %d) %d"
+msgstr ""
+
+#: nntp/nntp.c:643
+#, fuzzy
+msgid "Fetching message headers..."
+msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡­ [%d/%d]"
+
+#. fetch list of articles
+#: nntp/nntp.c:657
+#, fuzzy
+msgid "Fetching list of articles..."
+msgstr "¼Ä³öÐżþÖС­"
+
+#: nntp/nntp.c:667
+#, c-format
+msgid "LISTGROUP command failed: %s"
+msgstr ""
+
+#: nntp/nntp.c:682
+#, fuzzy, c-format
+msgid "GROUP command failed: %s"
+msgstr "Ô¤ÏÈÁ¬½ÓÖ¸Áîʧ°Ü"
+
+#: nntp/nntp.c:696
+#, fuzzy
+msgid "Fetching headers from cache..."
+msgstr "¼Ä³öÐżþÖС­"
+
+#: nntp/nntp.c:743
+#, fuzzy, c-format
+msgid "XOVER command failed: %s"
+msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
+
+#: nntp/nntp.c:803
 #, c-format
-msgid "Couldn't lock %s\n"
-msgstr "ÎÞ·¨Ëøס %s¡£\n"
+msgid "%s is an invalid newsgroup specification!"
+msgstr ""
 
-#: mx.c:679
+#: nntp/nntp.c:847
 #, c-format
-msgid "Reading %s..."
-msgstr "¶ÁÈ¡ %s ÖС­"
+msgid "Newsgroup %s not found on server %s"
+msgstr ""
 
-#: mx.c:779
+#: nntp/nntp.c:926
 #, c-format
-msgid "Writing %s..."
-msgstr "дÈë %s ÖС­"
+msgid "Article %d not found on server"
+msgstr ""
 
-#: mx.c:812
-#, c-format
-msgid "Could not synchronize mailbox %s!"
-msgstr "ÎÞ·¨Óë %s ÐÅÏäͬ²½£¡"
+#: nntp/nntp.c:977
+#, fuzzy
+msgid "Can't post article. No connection to news server."
+msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
 
-#: mx.c:878
+#: nntp/nntp.c:984
 #, c-format
-msgid "Move read messages to %s?"
-msgstr "°áÒÆÒѶÁÈ¡µÄÐżþµ½ %s£¿"
+msgid "Can't post article. Unable to open %s"
+msgstr ""
 
-#: mx.c:894 mx.c:1150
-#, c-format
-msgid "Purge %d deleted message?"
-msgstr "Çå³ý %d ·âÒѾ­±»É¾³ýµÄÐżþ£¿"
+#: nntp/nntp.c:990 nntp/nntp.c:1020
+#, fuzzy, c-format
+msgid "Can't post article. Connection to %s lost."
+msgstr "ÕýÁ¬½Óµ½ %s¡­"
 
-#: mx.c:894 mx.c:1150
-#, c-format
-msgid "Purge %d deleted messages?"
-msgstr "Çå³ý %d ·âÒѱ»É¾³ýµÄÐżþ£¿"
+#: nntp/nntp.c:995 nntp/nntp.c:1025
+#, fuzzy, c-format
+msgid "Can't post article: %s"
+msgstr "ÎÞ·¨¶ÁÈ¡£º%s"
 
-#: mx.c:918
-#, c-format
-msgid "Moving read messages to %s..."
-msgstr "ÕýÔÚ°áÒÆÒѾ­¶ÁÈ¡µÄÐżþµ½ %s ¡­"
+#: nntp/nntp.c:1116
+#, fuzzy
+msgid "Quitting newsgroup..."
+msgstr "¼Ä³öÐżþÖС­"
 
-#: mx.c:977 mx.c:1141
-msgid "Mailbox is unchanged."
-msgstr "ÐÅÏäûÓиı䡣"
+#: nntp/nntp.c:1123
+msgid "Mark all articles read?"
+msgstr ""
 
-#: mx.c:1013
-#, c-format
-msgid "%d kept, %d moved, %d deleted."
-msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»°áÒÆ, %d ·âÐżþ±»É¾³ý¡£"
+#: nntp/nntp.c:1276 pop/pop.c:485 pop/pop.c:548
+#, fuzzy
+msgid "Checking for new messages..."
+msgstr "×¼±¸×ª¼ÄÐżþ¡­"
 
-#: mx.c:1016 mx.c:1188
-#, c-format
-msgid "%d kept, %d deleted."
-msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»É¾³ý¡£"
+#: nntp/nntp.c:1287
+#, fuzzy
+msgid "Checking for new newsgroups..."
+msgstr "×¼±¸×ª¼ÄÐżþ¡­"
 
-#: mx.c:1126
-#, c-format
-msgid " Press '%s' to toggle write"
-msgstr " Çë°´Ï '%s' À´Çл»Ð´Èëģʽ"
+#: nntp/nntp.c:1301
+msgid "Adding new newsgroups..."
+msgstr ""
 
-#: mx.c:1128
-msgid "Use 'toggle-write' to re-enable write!"
-msgstr "ÇëʹÓà 'toggle-write' À´ÖØÐÂÆô¶¯Ð´È빦ÄÜ!"
+#: nntp/nntp.c:1309 nntp/nntp.c:1380
+#, fuzzy
+msgid "Loading descriptions..."
+msgstr "µÇÈëÖС­"
 
-#: mx.c:1130
+#: nntp/nntp.c:1340
 #, c-format
-msgid "Mailbox is marked unwritable. %s"
-msgstr "ÐÅÏä±»±ê¼Ç³ÉΪÎÞ·¨Ð´ÈëµÄ. %s"
+msgid "Loading list from cache... %d"
+msgstr ""
 
-#: mx.c:1185
-#, fuzzy
-msgid "Mailbox checkpointed."
-msgstr "ÓÊÏäÒÑɾ³ý¡£"
+#: nntp/nntp.c:1366
+#, c-format
+msgid "Loading list of all newsgroups on server %s..."
+msgstr ""
 
-#: mx.c:1494
-#, fuzzy
-msgid "Can't write message"
-msgstr "±à¼­ÐżþÄÚÈÝ"
+#: nntp/nntp.c:1415
+#, fuzzy, c-format
+msgid "Fetching %s from server..."
+msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
 
-#: mx.c:1539
-msgid "Integer overflow -- can't allocate memory."
+#: nntp/nntp.c:1467
+#, c-format
+msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: pager.c:57
+#: pager.c:62
 msgid "Not available in this menu."
 msgstr "ÔÚÕâ¸ö²Ëµ¥ÖÐûÓÐÕâ¸ö¹¦ÄÜ¡£"
 
-#: pager.c:1450
+#: pager.c:1373
 msgid "PrevPg"
 msgstr "ÉÏÒ»Ò³"
 
-#: pager.c:1451
+#: pager.c:1374
 msgid "NextPg"
 msgstr "ÏÂÒ»Ò³"
 
-#: pager.c:1455
+#: pager.c:1378
 msgid "View Attachm."
 msgstr "ÏÔʾ¸½¼þ¡£"
 
-#: pager.c:1458
+#: pager.c:1381 pager.c:1390
 msgid "Next"
 msgstr "ÏÂÒ»¸ö"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1839 pager.c:1870 pager.c:1902 pager.c:2143
+#: pager.c:1770 pager.c:1798 pager.c:1828 pager.c:2062
 msgid "Bottom of message is shown."
 msgstr "ÏÖÕýÏÔʾ×îÏÂÃæµÄÐżþ¡£"
 
-#: pager.c:1855 pager.c:1877 pager.c:1884 pager.c:1891
+#: pager.c:1785 pager.c:1805 pager.c:1812 pager.c:1819
 msgid "Top of message is shown."
 msgstr "ÏÖÕýÏÔʾ×îÉÏÃæµÄÐżþ¡£"
 
-#: pager.c:1960
+#: pager.c:1880
 msgid "Reverse search: "
 msgstr "·´ÏòËÑÑ°£º"
 
-#: pager.c:1961
+#: pager.c:1881
 msgid "Search: "
 msgstr "ËÑÑ°£º"
 
-#: pager.c:2081
+#: pager.c:1993
 msgid "Help is currently being shown."
 msgstr "ÏÖÕýÏÔʾ˵Ã÷Îļþ¡£"
 
-#: pager.c:2110
+#: pager.c:2023
 msgid "No more quoted text."
 msgstr "²»ÄÜÓÐÔÙ¶àµÄÒýÑÔ¡£"
 
-#: pager.c:2123
+#: pager.c:2040
 msgid "No more unquoted text after quoted text."
 msgstr "ÔÚÒýÑÔºóÓйý¶àµÄ·ÇÒýÑÔÎÄ×Ö¡£"
 
-#: parse.c:602
+#: parse.c:584
 msgid "multipart message has no boundary parameter!"
 msgstr "¶à²¿·ÝÓʼþûÓзָôµÄ²ÎÊý!"
 
-#: pattern.c:244
+#: pattern.c:233
 #, c-format
 msgid "Error in expression: %s"
 msgstr "±í´ïʽÓдíÎó£º%s"
 
-#: pattern.c:354
+#: pattern.c:332
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "ÎÞЧµÄÈÕ×Ó£º%s"
 
-#: pattern.c:368
+#: pattern.c:344
 #, c-format
 msgid "Invalid month: %s"
 msgstr "ÎÞЧµÄÔ·ݣº%s"
 
 #. getDate has its own error message, don't overwrite it here
-#: pattern.c:520
+#: pattern.c:487
 #, fuzzy, c-format
 msgid "Invalid relative date: %s"
 msgstr "ÎÞЧµÄÔ·ݣº%s"
 
-#: pattern.c:534
+#: pattern.c:500
 msgid "error in expression"
 msgstr "±í´ïʽÓдíÎó"
 
-#: pattern.c:740 pattern.c:848
+#: pattern.c:690 pattern.c:792
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
 
-#: pattern.c:788
+#: pattern.c:736
 #, c-format
 msgid "%c: invalid command"
 msgstr "%c£ºÎÞЧµÄÖ¸Áî"
 
-#: pattern.c:794
+#: pattern.c:741
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c£ºÔÚÕâ¸öģʽ²»Ö§³Ö"
 
-#: pattern.c:807
+#: pattern.c:753
 #, c-format
 msgid "missing parameter"
 msgstr "´íʧ²ÎÊý"
 
-#: pattern.c:823
+#: pattern.c:767
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "²»¶Ô³ÆµÄÀ¨»¡£º%s"
 
-#: pattern.c:855
+#: pattern.c:798
 msgid "empty pattern"
 msgstr "¿ÕµÄ¸ñʽ"
 
-#: pattern.c:1061
+#: pattern.c:1076
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "´íÎ󣺲»Ã÷µÄ op %d (Çë»Ø±¨Õâ¸ö´íÎó)¡£"
 
-#: pattern.c:1130 pattern.c:1261
+#: pattern.c:1148 pattern.c:1271
 msgid "Compiling search pattern..."
 msgstr "±àÒëËÑÑ°ÑùʽÖС­"
 
-#: pattern.c:1144
+#: pattern.c:1161
 msgid "Executing command on matching messages..."
 msgstr "ÕýÔÚ¶Ô·ûºÏµÄÓʼþÖ´ÐÐÃüÁî¡­"
 
-#: pattern.c:1206
+#: pattern.c:1219
 msgid "No messages matched criteria."
 msgstr "ûÓÐÓʼþ·ûºÏÒªÇó¡£"
 
-#: pattern.c:1299
+#: pattern.c:1307
 msgid "Search hit bottom without finding match"
 msgstr "ÒÑËÑÑ°ÖÁ½á⣬²¢Ã»Óз¢ÏÖÈκηûºÏ"
 
-#: pattern.c:1310
+#: pattern.c:1318
 msgid "Search hit top without finding match"
 msgstr "ÒÑËÑÑ°ÖÁ¿ªÍ·£¬²¢Ã»Óз¢ÏÖÈκηûºÏ"
 
-#: pattern.c:1332
+#: pattern.c:1340
 msgid "Search interrupted."
 msgstr "ËÑÑ°Òѱ»Öжϡ£"
 
-#: pgp.c:90
+#: pgp.c:89
 msgid "Enter PGP passphrase:"
 msgstr "ÇëÊäÈë PGP ͨÐÐÃÜÂ룺"
 
-#: pgp.c:104
+#: pgp.c:103
 msgid "PGP passphrase forgotten."
 msgstr "ÒÑÍü¼Ç PGP ͨÐÐÃÜÂë¡£"
 
-#: pgp.c:344
+#: pgp.c:331
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
 
-#: pgp.c:379 pgp.c:596 pgp.c:797
+#: pgp.c:367 pgp.c:589 pgp.c:780
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3403,58 +4673,23 @@ msgstr ""
 "[-- PGP Êä³ö²¿·Ý½áÊø --]\n"
 "\n"
 
-#: pgp.c:394
-msgid ""
-"[-- BEGIN PGP MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP Ðżþ¿ªÊ¼ --]\n"
-"\n"
-
-#: pgp.c:396
-msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î¿ªÊ¼ --]\n"
-
-#: pgp.c:398
-msgid ""
-"[-- BEGIN PGP SIGNED MESSAGE --]\n"
-"\n"
-msgstr ""
-"[-- PGP Ç©ÃûµÄÐżþ¿ªÊ¼ --]\n"
-"\n"
-
-#: pgp.c:423
+#: pgp.c:374 pgp.c:909
 #, fuzzy
-msgid "[-- END PGP MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP Ðżþ½áÊø --]\n"
-
-#: pgp.c:425
-msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
-msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î½áÊø --]\n"
+msgid "Could not decrypt PGP message"
+msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
 
-#: pgp.c:427
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:418 pgp.c:907
 #, fuzzy
-msgid "[-- END PGP SIGNED MESSAGE --]\n"
-msgstr ""
-"\n"
-"[-- PGP Ç©ÃûµÄÐżþ½áÊø --]\n"
-
-#: pgp.c:454
-msgid ""
-"[-- Error: could not find beginning of PGP message! --]\n"
-"\n"
-msgstr ""
-"[-- ´íÎó£ºÕÒ²»µ½ PGP ÐżþµÄ¿ªÍ·£¡ --]\n"
-"\n"
+msgid "PGP message successfully decrypted."
+msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
 
-#: pgp.c:704
+#: pgp.c:687
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "ÄÚ²¿´íÎó¡£ÁªÂç <rosessler@guug.de>¡£"
 
-#: pgp.c:764
+#: pgp.c:746
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3462,274 +4697,178 @@ msgstr ""
 "[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
 "\n"
 
-#: pgp.c:873
-msgid ""
-"[-- Error: malformed PGP/MIME message! --]\n"
-"\n"
-msgstr ""
-"[-- ´íÎ󣺲»ÕýÈ·µÄ PGP/MIME Ðżþ£¡ --]\n"
-"\n"
-
-#: pgp.c:886
-msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ÔÝ´æµµ£¡ --]\n"
-
-#: pgp.c:895
-msgid ""
-"[-- The following data is PGP/MIME encrypted --]\n"
-"\n"
-msgstr ""
-"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
-"\n"
-
-#: pgp.c:915
+#: pgp.c:788 postpone.c:555
 #, fuzzy
-msgid "[-- End of PGP/MIME encrypted data --]\n"
-msgstr ""
-"\n"
-"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
+msgid "Decryption failed."
+msgstr "µÇÈëʧ°Ü¡£"
 
-#: pgp.c:965
+#: pgp.c:957
 msgid "Can't open PGP subprocess!"
 msgstr "ÎÞ·¨´ò¿ª PGP ×Ó³ÌÐò£¡"
 
-#: pgp.c:1109
-#, c-format
-msgid "Use keyID = \"%s\" for %s?"
-msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
-
-#: pgp.c:1143 smime.c:665 smime.c:790
-#, c-format
-msgid "Enter keyID for %s: "
-msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
-
-#: pgp.c:1397
+#: pgp.c:1379
 msgid "Can't invoke PGP"
 msgstr "²»ÄÜÖ´ÐÐ PGP"
 
-#: pgp.c:1496
+#: pgp.c:1480
 #, 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)·ÅÆú£¿"
 
-#: pgp.c:1497
+#: pgp.c:1481
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1497
+#: pgp.c:1481
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1499
+#: pgp.c:1483
 #, fuzzy
 msgid "esabifc"
 msgstr "esabif"
 
-#. sign (a)s
-#: pgp.c:1514 smime.c:1981
-msgid "Sign as: "
-msgstr "Ç©ÃûµÄÉí·ÝÊÇ£º"
-
-#: pgpinvoke.c:307
+#: pgpinvoke.c:298
 msgid "Fetching PGP key..."
 msgstr "ÄÃÈ¡ PGP Ô¿³×ÖС­"
 
-#: pgpkey.c:490
+#: pgpkey.c:464
 #, fuzzy
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
 
-#. __STRCAT_CHECKED__
-#: pgpkey.c:516 smime.c:433
-msgid "Select  "
-msgstr "Ñ¡Ôñ    "
-
-#. __STRCAT_CHECKED__
-#: pgpkey.c:519
-msgid "Check key  "
-msgstr "¼ì²éÔ¿³×   "
-
-#: pgpkey.c:532
+#: pgpkey.c:507
 #, fuzzy, c-format
 msgid "PGP keys matching <%s>."
 msgstr "PGP Ô¿³×·ûºÏ \"%s\"¡£"
 
-#: pgpkey.c:534
+#: pgpkey.c:509
 #, c-format
 msgid "PGP keys matching \"%s\"."
 msgstr "PGP Ô¿³×·ûºÏ \"%s\"¡£"
 
-#: pgpkey.c:553 pgpkey.c:745
+#. __FOPEN_CHECKED__
+#: pgpkey.c:525 pgpkey.c:716
 msgid "Can't open /dev/null"
 msgstr "ÎÞ·¨´ò¿ª /dev/null"
 
-#: pgpkey.c:559 pgpkey.c:739
-msgid "Can't create temporary file"
-msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
-
-#: pgpkey.c:580
-#, c-format
-msgid "Key ID: 0x%s"
-msgstr "Ô¿³× ID£º0x%s"
-
-#: pgpkey.c:600
-msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
-
-#: pgpkey.c:612
-#, fuzzy
-msgid "ID is expired/disabled/revoked."
-msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
-
-#: pgpkey.c:616
-msgid "ID has undefined validity."
-msgstr ""
-
-#: pgpkey.c:619
-#, fuzzy
-msgid "ID is not valid."
-msgstr "Õâ¸ö ID ²»±»ÐÅÈΡ£"
-
-#: pgpkey.c:622
-#, fuzzy
-msgid "ID is only marginally valid."
-msgstr "´Ë ID Ö»ÊÇÃãÇ¿±»ÐÅÈΡ£"
-
-#: pgpkey.c:626
-#, fuzzy, c-format
-msgid "%s Do you really want to use the key?"
-msgstr "%s ÄúÕæµÄҪʹÓÃËü£¿"
-
-#: pgpkey.c:724
+#: pgpkey.c:696
 msgid "Please enter the key ID: "
 msgstr "ÇëÊäÈëÕâ°ÑÔ¿³×µÄ ID£º"
 
-#: pgpkey.c:752
+#: pgpkey.c:724
 msgid "Invoking pgp..."
 msgstr "Æô¶¯ pgp¡­"
 
-#: pgpkey.c:777
+#: pgpkey.c:749
 #, c-format
 msgid "PGP Key %s."
 msgstr "PGP Ô¿³× %s¡£"
 
-#: pgpkey.c:839 pgpkey.c:955
-#, c-format
-msgid "Looking for keys matching \"%s\"..."
-msgstr "ÕýÑ°ÕÒÆ¥Åä \"%s\" µÄÔ¿³×¡­"
-
-#: pop.c:90 pop_lib.c:201
+#: pop/pop.c:82 pop/pop_lib.c:192
 #, fuzzy, c-format
 msgid "Command TOP is not supported by server."
 msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
 
-#: pop.c:117
+#: pop/pop.c:107
 #, fuzzy
 msgid "Can't write header to temporary file!"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
 
-#: pop.c:198 pop_lib.c:203
+#: pop/pop.c:186 pop/pop_lib.c:194
 #, fuzzy, c-format
 msgid "Command UIDL is not supported by server."
 msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
 
-#: pop.c:247 pop.c:562
+#: pop/pop.c:231 pop/pop.c:529
 #, c-format
 msgid "%s is an invalid POP path"
 msgstr ""
 
-#: pop.c:278
+#: pop/pop.c:261
 #, fuzzy
 msgid "Fetching list of messages..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: pop.c:415
+#: pop/pop.c:388
 #, fuzzy
 msgid "Can't write message to temporary file!"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
 
-#: pop.c:517 pop.c:582
-#, fuzzy
-msgid "Checking for new messages..."
-msgstr "×¼±¸×ª¼ÄÐżþ¡­"
-
-#: pop.c:546
+#: pop/pop.c:514
 msgid "POP host is not defined."
 msgstr "POP Ö÷»úûÓỶ¨Òå¡£"
 
-#: pop.c:610
+#: pop/pop.c:573
 msgid "No new mail in POP mailbox."
 msgstr "POP ÐÅÏäÖÐûÓÐеÄÐżþ"
 
-#: pop.c:617
+#: pop/pop.c:582
 #, fuzzy
 msgid "Delete messages from server?"
 msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
 
-#: pop.c:619
+#: pop/pop.c:584
 #, fuzzy, c-format
 msgid "Reading new messages (%d bytes)..."
 msgstr "¶ÁÈ¡ÐÂÐżþ (%d λԪ×é)¡­"
 
-#: pop.c:661
+#. this is -3 when ret != 0, because it will keep the value from before *gna*
+#: pop/pop.c:620
 msgid "Error while writing mailbox!"
 msgstr "дÈëÐÅÏäʱ·¢Éú´íÎó£¡"
 
-#: pop.c:665
+#: pop/pop.c:625
 #, fuzzy, c-format
 msgid "%s [%d of %d messages read]"
 msgstr "%s [ÒÑÔĶÁ %2d ·âÐżþÖÐµÄ %1d ·â]"
 
-#: pop.c:688 pop_lib.c:364
-msgid "Server closed connection!"
-msgstr "ÓëËÅ·þÆ÷µÄÁª½áÖжÏÁË!"
-
-#: pop_auth.c:93
+#: pop/pop_auth.c:88
 #, fuzzy
 msgid "Authenticating (SASL)..."
 msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
 
-#: pop_auth.c:209
+#: pop/pop_auth.c:198
 #, fuzzy
 msgid "Authenticating (APOP)..."
 msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
 
-#: pop_auth.c:233
+#: pop/pop_auth.c:222
 #, fuzzy
 msgid "APOP authentication failed."
 msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
 
-#: pop_auth.c:268
+#: pop/pop_auth.c:255
 #, fuzzy, c-format
 msgid "Command USER is not supported by server."
 msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
 
-#: pop_lib.c:199
+#: pop/pop_lib.c:190
 #, fuzzy
 msgid "Unable to leave messages on server."
 msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
 
-#: pop_lib.c:229
+#: pop/pop_lib.c:218
 #, fuzzy, c-format
 msgid "Error connecting to server: %s"
 msgstr "ÕýÁ¬Ïßµ½ %s"
 
-#: pop_lib.c:378
+#: pop/pop_lib.c:365
 #, fuzzy
 msgid "Closing connection to POP server..."
 msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
 
-#: pop_lib.c:544
+#: pop/pop_lib.c:521
 #, fuzzy
 msgid "Verifying message indexes..."
 msgstr "дÈëÐżþµ½ %s ¡­"
 
-#: pop_lib.c:568
+#: pop/pop_lib.c:544
 #, fuzzy
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
 
-#: postpone.c:167
+#: postpone.c:169
 msgid "Postponed Messages"
 msgstr "ÐżþÒѾ­±»Ñӳټijö"
 
@@ -3737,293 +4876,305 @@ msgstr "
 msgid "No postponed messages."
 msgstr "ûÓб»ÑӳټijöµÄÐżþ¡£"
 
-#: postpone.c:442 postpone.c:463 postpone.c:497
+#: postpone.c:430 postpone.c:449 postpone.c:484
 msgid "Illegal PGP header"
 msgstr "²»ºÏ¹æ¶¨µÄ PGP ±êÍ·"
 
-#: postpone.c:483
+#: postpone.c:469
 #, fuzzy
 msgid "Illegal S/MIME header"
 msgstr "²»ºÏ¹æ¶¨µÄ PGP ±êÍ·"
 
-#: postpone.c:556
+#: postpone.c:544
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: postpone.c:565
-#, fuzzy
-msgid "Decryption failed."
-msgstr "µÇÈëʧ°Ü¡£"
-
-#: query.c:50
+#: query.c:44
 msgid "New Query"
 msgstr "еIJéѯ"
 
-#: query.c:51
+#: query.c:45
 msgid "Make Alias"
 msgstr "ÖÆ×÷±ðÃû"
 
-#: query.c:52
+#: query.c:46
 msgid "Search"
 msgstr "ËÑÑ°"
 
-#: query.c:99
+#: query.c:93
 msgid "Waiting for response..."
 msgstr "µÈ´ý»ØÓ¦ÖС­"
 
-#: query.c:235 query.c:263
+#: query.c:213 query.c:239
 msgid "Query command not defined."
 msgstr "²éѯָÁîÉÐ䶨Òå¡£"
 
-#: query.c:290
+#: query.c:265
 #, c-format
 msgid "Query"
 msgstr "²éѯ"
 
 #. Prompt for Query
-#: query.c:303 query.c:328
+#: query.c:278 query.c:300
 msgid "Query: "
 msgstr "²éѯ£º"
 
-#: query.c:311 query.c:337
+#: query.c:284 query.c:307
 #, c-format
 msgid "Query '%s'"
 msgstr "²éѯ '%s'"
 
-#: recvattach.c:56
+#: recvattach.c:55
 msgid "Pipe"
 msgstr "¹ÜÏß"
 
-#: recvattach.c:57
+#: recvattach.c:56
 msgid "Print"
 msgstr "ÏÔʾ"
 
-#: recvattach.c:435
+#: recvattach.c:404
+msgid "Save to file ('#' for last used folder): "
+msgstr ""
+
+#: recvattach.c:459
 msgid "Saving..."
 msgstr "´¢´æÖС­"
 
-#: recvattach.c:438 recvattach.c:527
+#: recvattach.c:464 recvattach.c:544
 msgid "Attachment saved."
 msgstr "¸½¼þÒѱ»´¢´æ¡£"
 
-#: recvattach.c:539
+#: recvattach.c:555
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "¾¯¸æ! ÄúÕýÔÚ¸²¸Ç %s, ÊÇ·ñÒª¼ÌÐø?"
 
-#: recvattach.c:557
+#: recvattach.c:571
 msgid "Attachment filtered."
 msgstr "¸½¼þ±»¹ýÂ˵ô¡£"
 
-#: recvattach.c:624
+#: recvattach.c:632
 msgid "Filter through: "
 msgstr "¾­¹ý¹ýÂË£º"
 
-#: recvattach.c:624
+#: recvattach.c:632
 msgid "Pipe to: "
 msgstr "µ¼ÒýÖÁ£º"
 
-#: recvattach.c:659
+#: recvattach.c:661
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "ÎÒ²»ÖªµÀÒªÔõô´òÓ¡ %s ¸½¼þ!"
 
-#: recvattach.c:724
+#: recvattach.c:726
 msgid "Print tagged attachment(s)?"
 msgstr "ÊÇ·ñÒª´òÓ¡±ê¼ÇÆðÀ´µÄ¸½¼þ?"
 
-#: recvattach.c:724
+#: recvattach.c:726
 msgid "Print attachment?"
 msgstr "ÊÇ·ñÒª´òÓ¡¸½¼þ?"
 
-#: recvattach.c:957
+#: recvattach.c:954
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
 msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
 
-#: recvattach.c:970
+#: recvattach.c:967
 msgid "Attachments"
 msgstr "¸½¼þ"
 
-#: recvattach.c:1006
+#: recvattach.c:1003
 #, fuzzy
 msgid "There are no subparts to show!"
 msgstr "ûÓи½¼þ¡£"
 
-#: recvattach.c:1067
+#: recvattach.c:1069
 #, fuzzy
 msgid "Can't delete attachment from POP server."
 msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
 
-#: recvattach.c:1075
+#: recvattach.c:1078
+#, fuzzy
+msgid "Can't delete attachment from newsserver."
+msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
+
+#: recvattach.c:1087
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "δ֧³Öɾ³ý PGP ÐżþËù¸½´øµÄ¸½¼þ¡£"
 
-#: recvattach.c:1094 recvattach.c:1111
+#: recvattach.c:1102 recvattach.c:1115
 msgid "Only deletion of multipart attachments is supported."
 msgstr "Ö»Ö§³Öɾ³ý¶àÖظ½¼þ"
 
-#: recvcmd.c:47
+#: recvcmd.c:41
 msgid "You may only bounce message/rfc822 parts."
 msgstr "ÄúÖ»ÄÜÖ±½Ó´«ËÍ message/rfc822 µÄ²¿·Ö¡£"
 
-#: recvcmd.c:217
+#: recvcmd.c:203
 #, fuzzy
 msgid "Error bouncing message!"
 msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
 
-#: recvcmd.c:217
+#: recvcmd.c:204
 #, fuzzy
 msgid "Error bouncing messages!"
 msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
 
-#: recvcmd.c:417
+#: recvcmd.c:394
 #, fuzzy, c-format
 msgid "Can't open temporary file %s."
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
 
-#: recvcmd.c:448
+#: recvcmd.c:423
 #, fuzzy
 msgid "Forward as attachments?"
 msgstr "ÏÔʾ MIME ¸½¼þ"
 
-#: recvcmd.c:462
+#: recvcmd.c:437
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
 
-#: recvcmd.c:587
+#: recvcmd.c:556
 msgid "Forward MIME encapsulated?"
 msgstr "Óà MIME µÄ·½Ê½À´×ª¼Ä£¿"
 
-#: recvcmd.c:595 recvcmd.c:845
+#: recvcmd.c:562 recvcmd.c:813
 #, fuzzy, c-format
 msgid "Can't create %s."
 msgstr "ÎÞ·¨½¨Á¢ %s: %s."
 
-#: recvcmd.c:728
+#: recvcmd.c:681
 #, fuzzy
 msgid "Can't find any tagged messages."
 msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
 
-#: recvcmd.c:749 send.c:715
+#: recvcmd.c:710 send.c:765
 msgid "No mailing lists found!"
 msgstr "ûÓÐÕÒµ½ÓʼÄÂÛ̳£¡"
 
-#: recvcmd.c:824
+#: recvcmd.c:791
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
 
-#: remailer.c:484
+#: remailer.c:455
 #, fuzzy
 msgid "Append"
 msgstr "¼Ä³ö"
 
-#: remailer.c:485
+#: remailer.c:456
 msgid "Insert"
 msgstr ""
 
-#: remailer.c:486
+#: remailer.c:457
 #, fuzzy
 msgid "Delete"
 msgstr "Ñ¡Ôñ"
 
-#: remailer.c:488
+#: remailer.c:459
 msgid "OK"
 msgstr ""
 
-#: remailer.c:516
+#: remailer.c:486
 msgid "Can't get mixmaster's type2.list!"
 msgstr ""
 
-#: remailer.c:542
+#: remailer.c:512
 #, fuzzy
 msgid "Select a remailer chain."
 msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
 
-#: remailer.c:602
+#: remailer.c:568
 #, c-format
 msgid "Error: %s can't be used as the final remailer of a chain."
 msgstr ""
 
-#: remailer.c:632
+#: remailer.c:596
 #, c-format
 msgid "Mixmaster chains are limited to %d elements."
 msgstr ""
 
-#: remailer.c:655
+#: remailer.c:617
 msgid "The remailer chain is already empty."
 msgstr ""
 
-#: remailer.c:665
+#: remailer.c:627
 #, fuzzy
 msgid "You already have the first chain element selected."
 msgstr "ÄúÒѾ­ÔÚµÚÒ»·âÐÅÁË¡£"
 
-#: remailer.c:675
+#: remailer.c:637
 msgid "You already have the last chain element selected."
 msgstr ""
 
-#: remailer.c:714
+#: remailer.c:673
 msgid "Mixmaster doesn't accept Cc or Bcc headers."
 msgstr ""
 
-#: remailer.c:738
+#: remailer.c:696
 msgid ""
 "Please set the hostname variable to a proper value when using mixmaster!"
 msgstr ""
 
-#: remailer.c:772
+#: remailer.c:728
 #, fuzzy, c-format
 msgid "Error sending message, child exited %d.\n"
 msgstr "¼ÄËÍѶϢ³öÏÖ´íÎó£¬×Ó³ÌÐòÒѽáÊø %d (%s)¡£"
 
-#: remailer.c:776
+#: remailer.c:731
 msgid "Error sending message."
 msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
 
-#: rfc1524.c:163
+#: rfc1524.c:150
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "ÔÚ \"%2$s\" µÄµÚ %3$d Ðз¢ÏÖÀà±ð %1$s Ϊ´íÎóµÄ¸ñʽ¼Í¼"
 
-#: rfc1524.c:395
+#: rfc1524.c:360
 msgid "No mailcap path specified"
 msgstr "ûÓÐÖ¸¶¨ mailcap ·¾¶"
 
-#: rfc1524.c:423
+#: rfc1524.c:387
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "ûÓз¢ÏÖÀàÐÍ %s µÄ mailcap ¼Í¼"
 
-#: score.c:75
+#: score.c:67
 msgid "score: too few arguments"
 msgstr "·ÖÊý£ºÌ«ÉٵIJÎÊý"
 
-#: score.c:84
+#: score.c:75
 msgid "score: too many arguments"
 msgstr "·ÖÊý£ºÌ«¶àµÄ²ÎÊý"
 
-#: send.c:252
+#: send.c:282
+msgid "Ignoring $strip_was: Subject would be empty."
+msgstr ""
+
+#: send.c:291
 msgid "No subject, abort?"
 msgstr "ûÓбêÌ⣬Ҫ²»ÒªÖжϣ¿"
 
-#: send.c:254
+#: send.c:293
 msgid "No subject, aborting."
 msgstr "ûÓбêÌ⣬ÕýÔÚÖжÏÖС£"
 
+#: send.c:493
+msgid "Message came from a mailing list. Reply to author only?"
+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:488
+#: send.c:532
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Òª»Ø¸²¸ø %s%s?"
 
-#: send.c:522
+#: send.c:563
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "ÒÔºóµÄ»Ø¸²¶¼¼ÄÖÁ %s%s?"
@@ -4031,240 +5182,250 @@ msgstr "
 #. 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:690
+#: send.c:734
 msgid "No tagged messages are visible!"
 msgstr "ûÓб»±ê¼ÇÁ˵ÄÐżþÔÚÏÔʾ£¡"
 
-#: send.c:741
+#: send.c:792
 msgid "Include message in reply?"
 msgstr "»ØÐÅʱÊÇ·ñÒª°üº¬Ô­±¾µÄÐżþÄÚÈÝ£¿"
 
-#: send.c:746
+#: send.c:796
 msgid "Including quoted message..."
 msgstr "ÕýÒýÈëÒýÑÔ²¿·Ö¡­"
 
-#: send.c:756
+#: send.c:803
 msgid "Could not include all requested messages!"
 msgstr "ÎÞ·¨°üº¬ËùÓÐÒªÇóµÄÐżþ£¡"
 
-#: send.c:770
+#: send.c:819
 #, fuzzy
 msgid "Forward as attachment?"
 msgstr "ÊÇ·ñÒª´òÓ¡¸½¼þ?"
 
-#: send.c:774
+#: send.c:822
 msgid "Preparing forwarded message..."
 msgstr "×¼±¸×ª¼ÄÐżþ¡­"
 
-#. If the user is composing a new message, check to see if there
-#. * are any postponed messages first.
-#.
-#: send.c:1070
+#: send.c:1114
 msgid "Recall postponed message?"
 msgstr "Òª½Ð³ö±»ÑÓ³ÙµÄÐżþ?"
 
-#: send.c:1369
+#: send.c:1421
 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "×¼±¸×ª¼ÄÐżþ¡­"
 
-#: send.c:1394
+#: send.c:1444
 msgid "Abort unmodified message?"
 msgstr "ÊÇ·ñÒªÖжÏδÐ޸ĹýµÄÐżþ?"
 
-#: send.c:1396
+#: send.c:1445
 msgid "Aborted unmodified message."
 msgstr "ÖжÏûÓÐÐ޸ĹýµÄÐżþ"
 
-#: send.c:1465
+#: send.c:1486
+#, fuzzy
+msgid "Article not posted."
+msgstr "¸½¼þÒѱ»´¢´æ¡£"
+
+#: send.c:1520
 msgid "Message postponed."
 msgstr "Ðżþ±»Ñӳټijö¡£"
 
-#: send.c:1474
+#: send.c:1531
 msgid "No recipients are specified!"
 msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕߣ¡"
 
-#: send.c:1479
+#: send.c:1536
 msgid "No recipients were specified."
 msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕß¡£"
 
-#: send.c:1495
+#: send.c:1554
 msgid "No subject, abort sending?"
 msgstr "ûÓÐÐżþ±êÌ⣬ҪÖжϼÄÐŵŤ×÷?"
 
-#: send.c:1499
+#: send.c:1557 send.c:1563
 msgid "No subject specified."
 msgstr "ûÓÐÖ¸¶¨±êÌâ¡£"
 
-#: send.c:1561
+#: send.c:1569
+#, fuzzy
+msgid "No newsgroup specified."
+msgstr "ûÓÐÖ¸¶¨±êÌâ¡£"
+
+#: send.c:1630
 msgid "Sending message..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: send.c:1702
+#: send.c:1754
 msgid "Could not send the message."
 msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
 
-#: send.c:1707
-msgid "Mail sent."
-msgstr "ÐżþÒѾ­¼Ä³ö¡£"
-
-#: send.c:1707
+#: send.c:1760
 msgid "Sending in background."
 msgstr "ÕýÔÚºǫ́´«ËÍ¡£"
 
-#: sendlib.c:468
+#: send.c:1762
+msgid "Article posted."
+msgstr ""
+
+#: send.c:1763 send.c:1765
+msgid "Mail sent."
+msgstr "ÐżþÒѾ­¼Ä³ö¡£"
+
+#: sendlib.c:393
 msgid "No boundary parameter found! [report this error]"
 msgstr "ûÓз¢ÏÖ·Ö½ç±äÁ¿£¡[»Ø±¨´íÎó]"
 
-#: sendlib.c:498
+#: sendlib.c:421
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ÒѾ­²»´æÔÚ£¡"
 
-#: sendlib.c:920
+#: sendlib.c:825
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ²»ÊÇÐÅÏä¡£"
 
-#: sendlib.c:1089
+#: sendlib.c:989
 #, c-format
 msgid "Could not open %s"
 msgstr "ÎÞ·¨´ò¿ª %s"
 
-#: sendlib.c:2060
+#: sendlib.c:2047
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "¼ÄËÍѶϢ³öÏÖ´íÎó£¬×Ó³ÌÐòÒѽáÊø %d (%s)¡£"
 
-#: sendlib.c:2066
+#: sendlib.c:2053
 msgid "Output of the delivery process"
 msgstr "Delivery process µÄÊä³ö"
 
-#: sendlib.c:2272
+#: sendlib.c:2274
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 
-#: signal.c:43
+#: signal.c:36
 #, c-format
 msgid "%s...  Exiting.\n"
 msgstr "%s¡­ ÕýÔÚÀ뿪¡£\n"
 
-#: signal.c:46 signal.c:49
+#: signal.c:39 signal.c:42
 #, c-format
 msgid "Caught %s...  Exiting.\n"
 msgstr "²¶×¥µ½ %s¡­ ÕýÔÚÀ뿪¡£\n"
 
-#: signal.c:51
+#: signal.c:44
 #, c-format
 msgid "Caught signal %d...  Exiting.\n"
 msgstr "²¶×¥µ½ signal %d¡­ ÕýÔÚÀ뿪.\n"
 
-#: smime.c:111
+#: smime.c:109
 #, fuzzy
 msgid "Enter SMIME passphrase:"
 msgstr "ÇëÊäÈë PGP ͨÐÐÃÜÂ룺"
 
-#: smime.c:321
+#: smime.c:310
 msgid "Trusted   "
 msgstr ""
 
-#: smime.c:324
+#: smime.c:313
 msgid "Verified  "
 msgstr ""
 
-#: smime.c:327
+#: smime.c:316
 msgid "Unverified"
 msgstr ""
 
-#: smime.c:330
+#: smime.c:319
 #, fuzzy
 msgid "Expired   "
 msgstr "À뿪  "
 
-#: smime.c:333
+#: smime.c:322
 msgid "Revoked   "
 msgstr ""
 
-#: smime.c:336
+#: smime.c:325
 #, fuzzy
 msgid "Invalid   "
 msgstr "ÎÞЧµÄÔ·ݣº%s"
 
-#: smime.c:339
+#: smime.c:328
 #, fuzzy
 msgid "Unknown   "
 msgstr "²»Ã÷µÄ´íÎó"
 
-#: smime.c:368
+#: smime.c:360
 #, fuzzy
 msgid "Enter keyID: "
 msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
 
-#: smime.c:391
+#: smime.c:382
 #, fuzzy, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "PGP Ô¿³×·ûºÏ \"%s\"¡£"
 
-#: smime.c:541 smime.c:611 smime.c:629
+#: smime.c:532 smime.c:593 smime.c:608
 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
 msgstr ""
 
-#: smime.c:545 smime.c:615
+#: smime.c:536 smime.c:597
 #, fuzzy, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
 
-#: smime.c:548 smime.c:618
+#: smime.c:539 smime.c:599
 #, fuzzy, c-format
 msgid "Use ID %s for %s ?"
 msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
 
-#: smime.c:637
+#: smime.c:616
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr ""
 
-#: smime.c:796
+#: smime.c:768
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr ""
 
-#: smime.c:851 smime.c:879 smime.c:944 smime.c:988 smime.c:1053 smime.c:1128
+#: smime.c:820 smime.c:847 smime.c:910 smime.c:952 smime.c:1014 smime.c:1084
 #, fuzzy
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
 
-#: smime.c:1206
+#: smime.c:1156
 #, fuzzy
 msgid "no certfile"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
 
-#: smime.c:1209
+#: smime.c:1159
 #, fuzzy
 msgid "no mbox"
 msgstr "£¨Ã»ÓÐÐÅÏ䣩"
 
-#. fatal error while trying to encrypt message
-#: smime.c:1352
+#: smime.c:1299
 msgid "No output from OpenSSL.."
 msgstr ""
 
-#: smime.c:1390
+#: smime.c:1337
 msgid "Warning: Intermediate certificate not found."
 msgstr ""
 
-#: smime.c:1433
+#: smime.c:1378
 #, fuzzy
 msgid "Can't open OpenSSL subprocess!"
 msgstr "ÎÞ·¨´ò¿ª PGP ×Ó³ÌÐò£¡"
 
-#: smime.c:1471
+#: smime.c:1415
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1636 smime.c:1758
+#: smime.c:1579 smime.c:1703
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -4273,26 +5434,26 @@ msgstr ""
 "[-- PGP Êä³ö²¿·Ý½áÊø --]\n"
 "\n"
 
-#: smime.c:1719 smime.c:1729
+#: smime.c:1665 smime.c:1677
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
 
-#: smime.c:1762
+#: smime.c:1707
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
 "\n"
 
-#: smime.c:1765
+#: smime.c:1710
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
 "\n"
 
-#: smime.c:1829
+#: smime.c:1768
 #, fuzzy
 msgid ""
 "\n"
@@ -4301,7 +5462,7 @@ msgstr ""
 "\n"
 "[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
 
-#: smime.c:1831
+#: smime.c:1770
 #, fuzzy
 msgid ""
 "\n"
@@ -4310,7 +5471,7 @@ msgstr ""
 "\n"
 "[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
 
-#: smime.c:1935
+#: smime.c:1878
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
@@ -4318,45 +5479,93 @@ msgstr ""
 "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, Ñ¡Ôñ (m)ic ÑÝËã·¨ »ò (f)·Å"
 "Æú£¿"
 
-#: smime.c:1936
+#: smime.c:1879
 #, fuzzy
 msgid "eswabfc"
 msgstr "esabif"
 
-#: smime.c:1945
+#: smime.c:1887
 msgid ""
 "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
 msgstr ""
 
-#: smime.c:1947
+#: smime.c:1889
 msgid "12345f"
 msgstr ""
 
-#: smime.c:1971
+#: smime.c:1913
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
-#: sort.c:259
+#: sort.c:281
 msgid "Sorting mailbox..."
 msgstr "ÐÅÏäÅÅÐòÖС­"
 
-#: sort.c:296
+#: sort.c:313
 msgid "Could not find sorting function! [report this bug]"
 msgstr "ÕÒ²»µ½ÅÅÐòµÄº¯Êý£¡[Çë»Ø±¨Õâ¸öÎÊÌâ]"
 
-#: status.c:106
+#: status.c:96
+#, fuzzy
+msgid "no mailbox"
+msgstr "£¨Ã»ÓÐÐÅÏ䣩"
+
+#: status.c:128
 msgid "(no mailbox)"
 msgstr "£¨Ã»ÓÐÐÅÏ䣩"
 
-#: thread.c:1089
+#: thread.c:988
 #, fuzzy
 msgid "Parent message is not visible in this limited view."
 msgstr "ÔÚÏÞÖÆÔÄÀÀģʽÏÂÎÞ·¨ÏÔʾÖ÷Ðżþ¡£"
 
-#: thread.c:1095
+#: thread.c:995
 msgid "Parent message is not available."
 msgstr "Ö÷Ðżþ²»´æÔÚ¡£"
 
+#. mutt_endwin (NULL);
+#: lib/exit.c:15
+#, c-format
+msgid ""
+"Fatal error in function '%s' called from file '%s', line '%d': %s\n"
+"(please report this error to <mutt-ng-devel@lists.berlios.de>\n"
+msgstr ""
+
+#: lib/mem.c:20
+msgid "Integer overflow -- can't allocate memory!"
+msgstr ""
+
+#. __MEM_CHECKED__
+#: lib/mem.c:26 lib/mem.c:38 lib/mem.c:64
+msgid "Out of memory!"
+msgstr "¼ÇÒäÌå²»×㣡"
+
+#, fuzzy
+#~ msgid "esabtf"
+#~ msgstr "esabif"
+
+#, fuzzy
+#~ msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"
+#~ msgstr ""
+#~ "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, (i)nline, »ò (f)·ÅÆú£¿"
+
+#, fuzzy
+#~ msgid "Unable to connect to host %s"
+#~ msgstr "ÎÞ·¨¸½¼Ó %s£¡"
+
+#, fuzzy
+#~ msgid "Can't change 'important' flag on POP server."
+#~ msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
+
+#~ msgid "Unable to append to IMAP mailboxes at this server"
+#~ msgstr "ÎÞ·¨¸½¼ÓÔÚÕâ¸öËÅ·þÆ÷É쵀 IMAP ÐÅÏä"
+
+#~ msgid "source: too many arguments"
+#~ msgstr "source£ºÌ«¶à²ÎÊý"
+
+#~ msgid "Could not synchronize mailbox %s!"
+#~ msgstr "ÎÞ·¨Óë %s ÐÅÏäͬ²½£¡"
+
 #, fuzzy
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "½¨Á¢Ò»·â application/pgp µÄÐżþ£¿"
@@ -4410,10 +5619,6 @@ msgstr "
 #~ "[-- PGP Êä³öµÄ×ÊÁϽáÊø --]\n"
 #~ "\n"
 
-#, fuzzy
-#~ msgid "Can't stat %s."
-#~ msgstr "ÎÞ·¨¶ÁÈ¡£º%s"
-
 #~ msgid "%s: no such command"
 #~ msgstr "%s£ºÎÞ´ËÖ¸Áî"
 
@@ -4508,9 +5713,6 @@ msgstr "
 #~ msgid "Recoding successful."
 #~ msgstr "ÖØбàÂë³É¹¦¡£"
 
-#~ msgid "[-- Error: unexpected end of file! --]\n"
-#~ msgstr "[-- ´íÎó£ºÍ»·¢µÄµµÎ²£¡ --]\n"
-
 #~ msgid "CRAM key for %s@%s: "
 #~ msgstr "%s@%s µÄ CRAM Ô¿³×"
 
@@ -4538,9 +5740,6 @@ msgstr "
 #~ msgid "POP Password: "
 #~ msgstr "POP ÃÜÂ룺"
 
-#~ msgid "No POP username is defined."
-#~ msgstr "ûÓỶ¨ÒåµÄ POP ʹÓÃÕßÃû³Æ¡£"
-
 #~ msgid "Attachment saved"
 #~ msgstr "¸½¼þÒѱ»´¢´æ¡£"
 
@@ -4561,10 +5760,6 @@ msgstr "
 #~ msgid "display message with full headers"
 #~ msgstr "±à¼­ÐżþµÄ±êÍ·"
 
-#, fuzzy
-#~ msgid "PGP keys matching "
-#~ msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
-
 #, fuzzy
 #~ msgid "This operation is not currently supported for PGP messages."
 #~ msgstr "Ôݲ»Ö§³Öä¯ÀÀ IMAP Ŀ¼"
@@ -4598,9 +5793,6 @@ msgstr "
 #~ msgid "reserved"
 #~ msgstr "±£ÁôµÄ"
 
-#~ msgid "Encrypted Session Key"
-#~ msgstr "¼ÓÃܵÄÔ¿³×"
-
 #~ msgid "Signature Packet"
 #~ msgstr "Ç©Ãû·â°ü"