Merge branch '1.5.20-1+fix533459'

[software/mutt-debian.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 99bf21668b4d2876157b1023770a7c1b4391b44a..8f8b54ca650112d50d6811da63aa63a06b1610e4 100644 (file)
--- 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: 2009-01-05 16:36-0800\n"
+"POT-Creation-Date: 2009-06-14 11:53-0700\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"
@@ -24,12 +24,12 @@ msgstr "
 msgid "Password for %s@%s: "
 msgstr "%s@%s µÄÃÜÂ룺"
 
-#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:41 query.c:48
+#: addrbook.c:37 browser.c:45 pager.c:1502 postpone.c:41 query.c:48
 #: recvattach.c:53
 msgid "Exit"
 msgstr "À뿪"
 
-#: addrbook.c:38 curs_main.c:406 pager.c:1486 postpone.c:42
+#: addrbook.c:38 curs_main.c:406 pager.c:1509 postpone.c:42
 msgid "Del"
 msgstr "ɾ³ý"
 
@@ -42,8 +42,8 @@ msgid "Select"
 msgstr "Ñ¡Ôñ"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3832 curs_main.c:412
-#: mutt_ssl.c:899 mutt_ssl_gnutls.c:805 pager.c:1578 pgpkey.c:522
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3829 curs_main.c:412
+#: mutt_ssl.c:895 mutt_ssl_gnutls.c:875 pager.c:1601 pgpkey.c:522
 #: postpone.c:44 query.c:53 recvattach.c:57 smime.c:437
 msgid "Help"
 msgstr "°ïÖú"
@@ -87,8 +87,8 @@ msgstr "
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] ½ÓÊÜ?"
 
-#: alias.c:347 recvattach.c:431 recvattach.c:454 recvattach.c:467
-#: recvattach.c:480 recvattach.c:510
+#: alias.c:347 recvattach.c:431 recvattach.c:457 recvattach.c:470
+#: recvattach.c:483 recvattach.c:513
 msgid "Save to file: "
 msgstr "´æµ½Îļþ£º"
 
@@ -97,16 +97,16 @@ msgstr "
 msgid "Error reading alias file"
 msgstr "¶ÁÈ¡Ðżþʱ·¢Éú´íÎó£¡"
 
-#: alias.c:382
+#: alias.c:383
 msgid "Alias added."
 msgstr "±ðÃûÒѾ­Ôö¼Ó¡£"
 
-#: alias.c:390
+#: alias.c:391
 #, fuzzy
 msgid "Error seeking in alias file"
 msgstr "ÎÞ·¨ÊÔÖøÏÔʾÎļþ"
 
-#: attach.c:113 attach.c:245 attach.c:477 attach.c:969
+#: attach.c:113 attach.c:245 attach.c:477 attach.c:973
 msgid "Can't match nametemplate, continue?"
 msgstr "ÎÞ·¨Æ¥ÅäÃû³ÆÄ£°å£¬¼ÌÐø£¿"
 
@@ -117,7 +117,7 @@ msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap ±à¼­ÏîÄ¿ÐèÒª %%s"
 
 #: attach.c:134 attach.c:266 commands.c:223 compose.c:1182 curs_lib.c:177
-#: curs_lib.c:543
+#: curs_lib.c:544
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Ö´ÐÐ \"%s\" ʱ·¢Éú´íÎó£¡"
@@ -163,16 +163,36 @@ msgstr "MIME 
 msgid "Cannot create filter"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
 
-#: attach.c:677 attach.c:709 attach.c:1002 attach.c:1060 handler.c:1304
+#: attach.c:554
+#, c-format
+msgid "---Command: %-20.20s Description: %s"
+msgstr ""
+
+#: attach.c:558
+#, c-format
+msgid "---Command: %-30.30s Attachment: %s"
+msgstr ""
+
+#: attach.c:604
+#, fuzzy, c-format
+msgid "---Attachment: %s: %s"
+msgstr "-- ¸½¼þ"
+
+#: attach.c:607
+#, fuzzy, c-format
+msgid "---Attachment: %s"
+msgstr "-- ¸½¼þ"
+
+#: attach.c:677 attach.c:709 attach.c:1006 attach.c:1064 handler.c:1285
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂË"
 
-#: attach.c:841
+#: attach.c:845
 msgid "Write fault!"
 msgstr "дÈëʧ°Ü£¡"
 
-#: attach.c:1083
+#: attach.c:1087
 msgid "I don't know how to print that!"
 msgstr "ÎÒ²»ÖªµÀÒªÈçºÎ´òÓ¡Ëü£¡"
 
@@ -184,103 +204,103 @@ msgstr "
 msgid "Mask"
 msgstr "ÕÚÕÖ"
 
-#: browser.c:383 browser.c:1023
+#: browser.c:383 browser.c:1038
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ²»ÊÇÒ»¸öĿ¼"
 
-#: browser.c:507
+#: browser.c:522
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "ÐÅÏä [%d]"
 
-#: browser.c:514
+#: browser.c:529
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "ÒѶ©ÔÄ [%s], ÎļþÕÚÕÖ: %s"
 
-#: browser.c:518
+#: browser.c:533
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Ŀ¼ [%s], ÎļþÕÚÕÖ: %s"
 
-#: browser.c:530
+#: browser.c:545
 msgid "Can't attach a directory!"
 msgstr "ÎÞ·¨¸½´øĿ¼£¡"
 
-#: browser.c:669 browser.c:1092 browser.c:1190
+#: browser.c:684 browser.c:1107 browser.c:1205
 msgid "No files match the file mask"
 msgstr "ûÓÐÎļþÓëÎļþÕÚÕÖÏà·û"
 
-#: browser.c:873
+#: browser.c:888
 #, fuzzy
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
 
-#: browser.c:897
+#: browser.c:912
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
 
-#: browser.c:920
+#: browser.c:935
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
 
-#: browser.c:930
+#: browser.c:945
 #, fuzzy
 msgid "Cannot delete root folder"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
 
-#: browser.c:933
+#: browser.c:948
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "ÕæµÄҪɾ³ý \"%s\" ÓÊÏ䣿"
 
-#: browser.c:947
+#: browser.c:962
 msgid "Mailbox deleted."
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
 
-#: browser.c:953
+#: browser.c:968
 msgid "Mailbox not deleted."
 msgstr "ÓÊÏäδ±»É¾³ý¡£"
 
-#: browser.c:972
+#: browser.c:987
 msgid "Chdir to: "
 msgstr "¸Ä±äĿ¼µ½£º"
 
-#: browser.c:1011 browser.c:1085
+#: browser.c:1026 browser.c:1100
 msgid "Error scanning directory."
 msgstr "ÎÞ·¨É¨ÃèĿ¼¡£"
 
-#: browser.c:1035
+#: browser.c:1050
 msgid "File Mask: "
 msgstr "ÎļþÕÚÕÖ£º"
 
-#: browser.c:1108
+#: browser.c:1123
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "·´ÏòÅÅÐò (d)ÈÕÆÚ, (a)×ÖÔª, (z)´óС »ò (n)²»ÅÅÐò ? "
 
-#: browser.c:1109
+#: browser.c:1124
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "ÒÀÕÕ (d)ÈÕÆÚ (a)×ÖÔª (z)´óС À´ÅÅÐò£¬»ò(n)²»ÅÅÐò ? "
 
-#: browser.c:1110
+#: browser.c:1125
 msgid "dazn"
 msgstr ""
 
-#: browser.c:1177
+#: browser.c:1192
 msgid "New file name: "
 msgstr "еµÃû£º"
 
-#: browser.c:1208
+#: browser.c:1223
 msgid "Can't view a directory"
 msgstr "ÎÞ·¨ÏÔʾĿ¼"
 
-#: browser.c:1225
+#: browser.c:1240
 msgid "Error trying to view file"
 msgstr "ÎÞ·¨ÊÔÖøÏÔʾÎļþ"
 
-#: buffy.c:424
+#: buffy.c:459
 #, fuzzy
 msgid "New mail in "
 msgstr "ÔÚ %s ÓÐÐÂÐżþ¡£"
@@ -295,47 +315,47 @@ msgstr "%s
 msgid "%s: no such color"
 msgstr "%s£ºÃ»ÓÐÕâÖÖÑÕÉ«"
 
-#: color.c:378 color.c:579 color.c:590
+#: color.c:378 color.c:584 color.c:595
 #, c-format
 msgid "%s: no such object"
 msgstr "%s£ºÃ»ÓÐÕâ¸öÎï¼þ"
 
-#: color.c:385
-#, c-format
-msgid "%s: command valid only for index object"
+#: color.c:391
+#, fuzzy, c-format
+msgid "%s: command valid only for index, body, header objects"
 msgstr "%s£ºÃüÁîÖ»ÌṩË÷ÒýÎï¼þ"
 
-#: color.c:393
+#: color.c:399
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s£ºÌ«ÉÙ²ÎÊý"
 
-#: color.c:567
+#: color.c:572
 msgid "Missing arguments."
 msgstr "ȱÉÙ²ÎÊý¡£"
 
-#: color.c:606 color.c:617
+#: color.c:611 color.c:622
 msgid "color: too few arguments"
 msgstr "É«²Ê£ºÌ«ÉÙ²ÎÊý"
 
-#: color.c:640
+#: color.c:645
 msgid "mono: too few arguments"
 msgstr "µ¥É«£ºÌ«ÉÙ²ÎÊý"
 
-#: color.c:660
+#: color.c:665
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s£ºÃ»ÓÐÕâ¸öÊôÐÔ"
 
-#: color.c:700 hook.c:69 hook.c:77 keymap.c:776
+#: color.c:705 hook.c:69 hook.c:77 keymap.c:776
 msgid "too few arguments"
 msgstr "Ì«ÉÙ²ÎÊý"
 
-#: color.c:709 hook.c:83
+#: color.c:714 hook.c:83
 msgid "too many arguments"
 msgstr "Ì«¶à²ÎÊý"
 
-#: color.c:725
+#: color.c:730
 msgid "default colors not supported"
 msgstr "²»Ö§³ÖÔ¤ÉèµÄÉ«²Ê"
 
@@ -344,7 +364,7 @@ msgstr "
 msgid "Verify PGP signature?"
 msgstr "¼ì²é PGP Ç©Ãû?"
 
-#: commands.c:115 mbox.c:754
+#: commands.c:115 mbox.c:772
 msgid "Could not create temporary file!"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
 
@@ -389,92 +409,97 @@ msgstr "PGP ǩ
 msgid "Command: "
 msgstr "Ö¸Á"
 
-#: commands.c:250 recvcmd.c:143
+#: commands.c:255
+#, fuzzy
+msgid "Warning: message has no From: header"
+msgstr "Ìøµ½Õâ¸öÐòÁеÄÖ÷Ðżþ"
+
+#: commands.c:273 recvcmd.c:171
 msgid "Bounce message to: "
 msgstr "Ö±½Ó´«ËÍÓʼþµ½£º"
 
-#: commands.c:252 recvcmd.c:145
+#: commands.c:275 recvcmd.c:173
 msgid "Bounce tagged messages to: "
 msgstr "ÎÞ·¨´«ËÍÒѱê¼ÇµÄÓʼþÖÁ£º"
 
-#: commands.c:267 recvcmd.c:154
+#: commands.c:290 recvcmd.c:182
 msgid "Error parsing address!"
 msgstr "ÎÞ·¨·ÖÎöλַ£¡"
 
-#: commands.c:275 recvcmd.c:162
+#: commands.c:298 recvcmd.c:190
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:286 recvcmd.c:176
+#: commands.c:309 recvcmd.c:204
 #, c-format
 msgid "Bounce message to %s"
 msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
 
-#: commands.c:286 recvcmd.c:176
+#: commands.c:309 recvcmd.c:204
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
 
-#: commands.c:302 recvcmd.c:192
+#: commands.c:325 recvcmd.c:220
 #, fuzzy
 msgid "Message not bounced."
 msgstr "ÓʼþÒѱ»´«ËÍ¡£"
 
-#: commands.c:302 recvcmd.c:192
+#: commands.c:325 recvcmd.c:220
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "ÓʼþÒÑ´«ËÍ¡£"
 
-#: commands.c:312 recvcmd.c:211
+#: commands.c:335 recvcmd.c:239
 msgid "Message bounced."
 msgstr "ÓʼþÒѱ»´«ËÍ¡£"
 
-#: commands.c:312 recvcmd.c:211
+#: commands.c:335 recvcmd.c:239
 msgid "Messages bounced."
 msgstr "ÓʼþÒÑ´«ËÍ¡£"
 
-#: commands.c:389 commands.c:423 commands.c:440
+#: commands.c:412 commands.c:446 commands.c:463
 #, fuzzy
 msgid "Can't create filter process"
 msgstr "ÎÞ·¨½¨Á¢¹ýÂË"
 
-#: commands.c:469
+#: commands.c:492
 msgid "Pipe to command: "
 msgstr "ÓùܵÀÊä³öÖÁÃüÁ"
 
-#: commands.c:486
+#: commands.c:509
 #, fuzzy
 msgid "No printing command has been defined."
 msgstr "Ȧѡ½øÈëµÄÓÊͲ"
 
-#: commands.c:491
+#: commands.c:514
 msgid "Print message?"
 msgstr "´òÓ¡Ðżþ£¿"
 
-#: commands.c:491
+#: commands.c:514
 msgid "Print tagged messages?"
 msgstr "´òÓ¡Òѱê¼ÇµÄÐżþ£¿"
 
-#: commands.c:500
+#: commands.c:523
 msgid "Message printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:500
+#: commands.c:523
 msgid "Messages printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:502
+#: commands.c:525
 #, fuzzy
 msgid "Message could not be printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:503
+#: commands.c:526
 #, fuzzy
 msgid "Messages could not be printed"
 msgstr "ÐżþÒÑÓ¡³ö"
 
-#: commands.c:512
+#: commands.c:535
 #, 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"
@@ -483,7 +508,7 @@ msgstr ""
 "·´·½Ïò d)ÈÕÆÚ,f)·¢ÐÅÈË,r)ÊÕÐÅʱ¼ä,s)±êÌâ,o)ÊÕÐÅÈË,t)ÐòÁÐ,u)²»ÅÅ,z)´óС,c)·Ö"
 "Êý:"
 
-#: commands.c:513
+#: commands.c:536
 #, 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)"
@@ -492,73 +517,73 @@ msgstr ""
 "ÅÅÐò d)ÈÕÆÚ,f)·¢ÐÅÈË,r)ÊÕÐÅʱ¼ä,s)±êÌâ,o)ÊÕÐÅÈË,t)ÐòÁÐ,u)²»ÅÅÐò,z)´óС,c)·Ö"
 "Êý:"
 
-#: commands.c:514
+#: commands.c:537
 msgid "dfrsotuzcp"
 msgstr ""
 
-#: commands.c:571
+#: commands.c:594
 msgid "Shell command: "
 msgstr "Shell Ö¸Á"
 
-#: commands.c:716
+#: commands.c:737
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:717
+#: commands.c:738
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:718
+#: commands.c:739
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:719
+#: commands.c:740
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:720
+#: commands.c:741
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:720
+#: commands.c:741
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s µ½ÐÅÏä"
 
-#: commands.c:721
+#: commands.c:742
 msgid " tagged"
 msgstr " Òѱê¼Ç"
 
-#: commands.c:794
+#: commands.c:815
 #, c-format
 msgid "Copying to %s..."
 msgstr "¿½±´µ½ %s¡­"
 
-#: commands.c:929
+#: commands.c:931
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr ""
 
-#: commands.c:939
+#: commands.c:941
 #, fuzzy, c-format
 msgid "Content-Type changed to %s."
 msgstr "ÕýÁ¬½Óµ½ %s¡­"
 
-#: commands.c:944
+#: commands.c:946
 #, fuzzy, c-format
 msgid "Character set changed to %s; %s."
 msgstr "²»Ã÷µÄ×Ö·û¼¯ %s¡£"
 
-#: commands.c:946
+#: commands.c:948
 msgid "not converting"
 msgstr ""
 
-#: commands.c:946
+#: commands.c:948
 msgid "converting"
 msgstr ""
 
@@ -643,7 +668,7 @@ msgstr ""
 msgid "You may not delete the only attachment."
 msgstr "Äú²»¿ÉÒÔɾ³ýΨһµÄ¸½¼þ¡£"
 
-#: compose.c:600 send.c:1560
+#: compose.c:600 send.c:1591
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
@@ -697,7 +722,7 @@ msgstr "
 msgid "Rename to: "
 msgstr "¸ü¸ÄÃû³ÆΪ£º"
 
-#: compose.c:1013 editmsg.c:96 editmsg.c:121 sendlib.c:857
+#: compose.c:1013 editmsg.c:96 editmsg.c:121 sendlib.c:858
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "ÎÞ·¨¶ÁÈ¡£º%s"
@@ -859,7 +884,7 @@ msgstr ""
 msgid "PKA verified signer's address is: "
 msgstr ""
 
-#: crypt-gpgme.c:1185 crypt-gpgme.c:3299
+#: crypt-gpgme.c:1185 crypt-gpgme.c:3296
 msgid "Fingerprint: "
 msgstr ""
 
@@ -915,7 +940,7 @@ msgstr ""
 #. Note: We don't need a current time output because GPGME avoids
 #. such an attack by separating the meta information from the
 #. data.
-#: crypt-gpgme.c:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2290
+#: crypt-gpgme.c:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2287
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
@@ -933,7 +958,7 @@ msgstr ""
 msgid "*** End Notation ***\n"
 msgstr ""
 
-#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2305
+#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2302
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -949,21 +974,21 @@ msgid ""
 "\n"
 msgstr "[-- ´íÎó£ºÍ»·¢µÄµµÎ²£¡ --]\n"
 
-#: crypt-gpgme.c:2082
+#: crypt-gpgme.c:2079
 #, fuzzy, c-format
 msgid "Error extracting key data!\n"
 msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
 
-#: crypt-gpgme.c:2265
+#: crypt-gpgme.c:2262
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:2313
+#: crypt-gpgme.c:2310
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt-gpgme.c:2333 pgp.c:427
+#: crypt-gpgme.c:2330 pgp.c:438
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -971,11 +996,11 @@ msgstr ""
 "[-- PGP Ðżþ¿ªÊ¼ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2335 pgp.c:429
+#: crypt-gpgme.c:2332 pgp.c:440
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î¿ªÊ¼ --]\n"
 
-#: crypt-gpgme.c:2338 pgp.c:431
+#: crypt-gpgme.c:2335 pgp.c:442
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -983,25 +1008,25 @@ msgstr ""
 "[-- PGP Ç©ÃûµÄÐżþ¿ªÊ¼ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2365 pgp.c:457
+#: crypt-gpgme.c:2362 pgp.c:473
 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- PGP Ðżþ½áÊø --]\n"
 
-#: crypt-gpgme.c:2367 pgp.c:464
+#: crypt-gpgme.c:2364 pgp.c:480
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î½áÊø --]\n"
 
-#: crypt-gpgme.c:2369 pgp.c:466
+#: crypt-gpgme.c:2366 pgp.c:482
 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- PGP Ç©ÃûµÄÐżþ½áÊø --]\n"
 
-#: crypt-gpgme.c:2393 pgp.c:499
+#: crypt-gpgme.c:2390 pgp.c:517
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -1009,7 +1034,7 @@ msgstr ""
 "[-- ´íÎó£ºÕÒ²»µ½ PGP ÐżþµÄ¿ªÍ·£¡ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2424 pgp.c:931
+#: crypt-gpgme.c:2421 pgp.c:949
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -1017,11 +1042,11 @@ msgstr ""
 "[-- ´íÎ󣺲»ÕýÈ·µÄ PGP/MIME Ðżþ£¡ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2436 crypt-gpgme.c:2502 pgp.c:944
+#: crypt-gpgme.c:2433 crypt-gpgme.c:2499 pgp.c:962
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ÔÝ´æµµ£¡ --]\n"
 
-#: crypt-gpgme.c:2448
+#: crypt-gpgme.c:2445
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
@@ -1030,7 +1055,7 @@ msgstr ""
 "[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2449 pgp.c:953
+#: crypt-gpgme.c:2446 pgp.c:971
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -1038,21 +1063,21 @@ msgstr ""
 "[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2471
+#: crypt-gpgme.c:2468
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
 
-#: crypt-gpgme.c:2472 pgp.c:973
+#: crypt-gpgme.c:2469 pgp.c:991
 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
 
-#: crypt-gpgme.c:2514
+#: crypt-gpgme.c:2511
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
@@ -1061,7 +1086,7 @@ msgstr ""
 "[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
 "\n"
 
-#: crypt-gpgme.c:2515
+#: crypt-gpgme.c:2512
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
@@ -1070,265 +1095,265 @@ msgstr ""
 "[-- ÏÂÃæÊÇ S/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2545
+#: crypt-gpgme.c:2542
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
 
-#: crypt-gpgme.c:2546
+#: crypt-gpgme.c:2543
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- S/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
 
-#: crypt-gpgme.c:3139
+#: crypt-gpgme.c:3136
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt-gpgme.c:3141
+#: crypt-gpgme.c:3138
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt-gpgme.c:3146
+#: crypt-gpgme.c:3143
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt-gpgme.c:3225
+#: crypt-gpgme.c:3222
 msgid " aka ......: "
 msgstr ""
 
-#: crypt-gpgme.c:3225
+#: crypt-gpgme.c:3222
 msgid "Name ......: "
 msgstr ""
 
-#: crypt-gpgme.c:3228 crypt-gpgme.c:3367
+#: crypt-gpgme.c:3225 crypt-gpgme.c:3364
 #, fuzzy
 msgid "[Invalid]"
 msgstr "ÎÞЧµÄÔ·ݣº%s"
 
-#: crypt-gpgme.c:3248 crypt-gpgme.c:3391
+#: crypt-gpgme.c:3245 crypt-gpgme.c:3388
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
 msgstr "ÎÞЧµÄÔ·ݣº%s"
 
-#: crypt-gpgme.c:3261 crypt-gpgme.c:3404
+#: crypt-gpgme.c:3258 crypt-gpgme.c:3401
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
 msgstr "ÎÞЧµÄÔ·ݣº%s"
 
-#: crypt-gpgme.c:3274 crypt-gpgme.c:3417
+#: crypt-gpgme.c:3271 crypt-gpgme.c:3414
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:3276 crypt-gpgme.c:3419
+#: crypt-gpgme.c:3273 crypt-gpgme.c:3416
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
-#: crypt-gpgme.c:3281 crypt-gpgme.c:3424
+#: crypt-gpgme.c:3278 crypt-gpgme.c:3421
 #, fuzzy
 msgid "encryption"
 msgstr "¼ÓÃÜ"
 
-#: crypt-gpgme.c:3282 crypt-gpgme.c:3287 crypt-gpgme.c:3292 crypt-gpgme.c:3425
-#: crypt-gpgme.c:3430 crypt-gpgme.c:3435
+#: crypt-gpgme.c:3279 crypt-gpgme.c:3284 crypt-gpgme.c:3289 crypt-gpgme.c:3422
+#: crypt-gpgme.c:3427 crypt-gpgme.c:3432
 msgid ", "
 msgstr ""
 
-#: crypt-gpgme.c:3286 crypt-gpgme.c:3429
+#: crypt-gpgme.c:3283 crypt-gpgme.c:3426
 msgid "signing"
 msgstr ""
 
-#: crypt-gpgme.c:3291 crypt-gpgme.c:3434
+#: crypt-gpgme.c:3288 crypt-gpgme.c:3431
 msgid "certification"
 msgstr ""
 
-#: crypt-gpgme.c:3331
+#: crypt-gpgme.c:3328
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
-#: crypt-gpgme.c:3339
+#: crypt-gpgme.c:3336
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
 #. display only the short keyID
-#: crypt-gpgme.c:3358
+#: crypt-gpgme.c:3355
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Ô¿³× ID£º0x%s"
 
-#: crypt-gpgme.c:3362
+#: crypt-gpgme.c:3359
 msgid "[Revoked]"
 msgstr ""
 
-#: crypt-gpgme.c:3372
+#: crypt-gpgme.c:3369
 #, fuzzy
 msgid "[Expired]"
 msgstr "À뿪  "
 
-#: crypt-gpgme.c:3377
+#: crypt-gpgme.c:3374
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt-gpgme.c:3461 pgpkey.c:559 pgpkey.c:739
+#: crypt-gpgme.c:3458 pgpkey.c:559 pgpkey.c:739
 msgid "Can't create temporary file"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
 
-#: crypt-gpgme.c:3464
+#: crypt-gpgme.c:3461
 #, fuzzy
 msgid "Collecting data..."
 msgstr "ÕýÁ¬½Óµ½ %s¡­"
 
-#: crypt-gpgme.c:3490
+#: crypt-gpgme.c:3487
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "ÕýÁ¬Ïßµ½ %s"
 
-#: crypt-gpgme.c:3500
+#: crypt-gpgme.c:3497
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt-gpgme.c:3511 pgpkey.c:580
+#: crypt-gpgme.c:3508 pgpkey.c:580
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "Ô¿³× ID£º0x%s"
 
-#: crypt-gpgme.c:3594
+#: crypt-gpgme.c:3591
 #, fuzzy, c-format
 msgid "gpgme_new failed: %s"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: crypt-gpgme.c:3633 crypt-gpgme.c:3696
+#: crypt-gpgme.c:3630 crypt-gpgme.c:3693
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
-#: crypt-gpgme.c:3683 crypt-gpgme.c:3724
+#: crypt-gpgme.c:3680 crypt-gpgme.c:3721
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt-gpgme.c:3795
+#: crypt-gpgme.c:3792
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
 
-#: crypt-gpgme.c:3824 mutt_ssl.c:897 mutt_ssl_gnutls.c:803 pgpkey.c:515
+#: crypt-gpgme.c:3821 mutt_ssl.c:893 mutt_ssl_gnutls.c:873 pgpkey.c:515
 #: smime.c:432
 msgid "Exit  "
 msgstr "À뿪  "
 
 #. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3826 pgpkey.c:517 smime.c:434
+#: crypt-gpgme.c:3823 pgpkey.c:517 smime.c:434
 msgid "Select  "
 msgstr "Ñ¡Ôñ    "
 
 #. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3829 pgpkey.c:520
+#: crypt-gpgme.c:3826 pgpkey.c:520
 msgid "Check key  "
 msgstr "¼ì²éÔ¿³×   "
 
-#: crypt-gpgme.c:3845
+#: crypt-gpgme.c:3842
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
 
-#: crypt-gpgme.c:3847
+#: crypt-gpgme.c:3844
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
 
-#: crypt-gpgme.c:3849
+#: crypt-gpgme.c:3846
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "S/MIME Ô¿³×·ûºÏ <%s>¡£"
 
-#: crypt-gpgme.c:3851
+#: crypt-gpgme.c:3848
 #, fuzzy
 msgid "keys matching"
 msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
 
-#: crypt-gpgme.c:3854
+#: crypt-gpgme.c:3851
 #, c-format
 msgid "%s <%s>."
 msgstr ""
 
-#: crypt-gpgme.c:3856
+#: crypt-gpgme.c:3853
 #, c-format
 msgid "%s \"%s\"."
 msgstr ""
 
-#: crypt-gpgme.c:3883 pgpkey.c:600
+#: crypt-gpgme.c:3880 pgpkey.c:600
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
 
-#: crypt-gpgme.c:3897 pgpkey.c:612
+#: crypt-gpgme.c:3894 pgpkey.c:612
 #, fuzzy
 msgid "ID is expired/disabled/revoked."
 msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
 
-#: crypt-gpgme.c:3917 pgpkey.c:616
+#: crypt-gpgme.c:3914 pgpkey.c:616
 msgid "ID has undefined validity."
 msgstr ""
 
-#: crypt-gpgme.c:3920 pgpkey.c:619
+#: crypt-gpgme.c:3917 pgpkey.c:619
 #, fuzzy
 msgid "ID is not valid."
 msgstr "Õâ¸ö ID ²»±»ÐÅÈΡ£"
 
-#: crypt-gpgme.c:3923 pgpkey.c:622
+#: crypt-gpgme.c:3920 pgpkey.c:622
 #, fuzzy
 msgid "ID is only marginally valid."
 msgstr "´Ë ID Ö»ÊÇÃãÇ¿±»ÐÅÈΡ£"
 
-#: crypt-gpgme.c:3931 pgpkey.c:626
+#: crypt-gpgme.c:3928 pgpkey.c:626
 #, fuzzy, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s ÄúÕæµÄҪʹÓÃËü£¿"
 
-#: crypt-gpgme.c:3988 crypt-gpgme.c:4101 pgpkey.c:834 pgpkey.c:935
+#: crypt-gpgme.c:3985 crypt-gpgme.c:4098 pgpkey.c:834 pgpkey.c:939
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "ÕýÑ°ÕÒÆ¥Åä \"%s\" µÄÔ¿³×¡­"
 
-#: crypt-gpgme.c:4264 pgp.c:1180
+#: crypt-gpgme.c:4261 pgp.c:1198
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
 
-#: crypt-gpgme.c:4300 pgp.c:1214 smime.c:664 smime.c:789
+#: crypt-gpgme.c:4297 pgp.c:1232 smime.c:664 smime.c:789
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
 
-#: crypt-gpgme.c:4365
+#: crypt-gpgme.c:4362
 msgid ""
 "\n"
 "Using GPGME backend, although no gpg-agent is running"
 msgstr ""
 
-#: crypt-gpgme.c:4393
+#: crypt-gpgme.c:4390
 #, 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:4394
+#: crypt-gpgme.c:4391
 #, fuzzy
 msgid "esabpfc"
 msgstr "esabif"
 
-#: crypt-gpgme.c:4397
+#: crypt-gpgme.c:4394
 #, 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:4398
+#: crypt-gpgme.c:4395
 #, fuzzy
 msgid "esabmfc"
 msgstr "esabif"
@@ -1336,15 +1361,15 @@ msgstr "esabif"
 #. sign (a)s
 #. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s
-#: crypt-gpgme.c:4414 pgp.c:1590 smime.c:2033 smime.c:2045
+#: crypt-gpgme.c:4411 pgp.c:1608 smime.c:2040 smime.c:2052
 msgid "Sign as: "
 msgstr "Ç©ÃûµÄÉí·ÝÊÇ£º"
 
-#: crypt-gpgme.c:4511
+#: crypt-gpgme.c:4508
 msgid "Failed to verify sender"
 msgstr ""
 
-#: crypt-gpgme.c:4514
+#: crypt-gpgme.c:4511
 #, fuzzy
 msgid "Failed to figure out sender"
 msgstr "´ò¿ªÎļþÀ´·ÖÎöÎļþͷʧ°Ü¡£"
@@ -1375,7 +1400,7 @@ msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
-#: crypt.c:157 send.c:1512
+#: crypt.c:157 send.c:1542
 msgid "Mail not sent."
 msgstr "ÐżþûÓмijö¡£"
 
@@ -1469,15 +1494,15 @@ msgstr ""
 msgid "Exit Mutt?"
 msgstr "À뿪 Mutt£¿"
 
-#: curs_lib.c:495 mutt_socket.c:577 mutt_ssl.c:337
+#: curs_lib.c:496 mutt_socket.c:577 mutt_ssl.c:337
 msgid "unknown error"
 msgstr "²»Ã÷µÄ´íÎó"
 
-#: curs_lib.c:515
+#: curs_lib.c:516
 msgid "Press any key to continue..."
 msgstr "°´ÏÂÈκÎÒ»¸ö¼ü¼ÌÐø¡­"
 
-#: curs_lib.c:559
+#: curs_lib.c:560
 msgid " ('?' for list): "
 msgstr " (Óà '?' ÏÔʾÁбí)£º"
 
@@ -1489,11 +1514,11 @@ msgstr "û
 msgid "There are no messages."
 msgstr "ûÓÐÐżþ¡£"
 
-#: curs_main.c:54 mx.c:1115 pager.c:51 recvattach.c:43
+#: curs_main.c:54 mx.c:1090 pager.c:51 recvattach.c:43
 msgid "Mailbox is read-only."
 msgstr "ÐÅÏäÊÇÖ»¶ÁµÄ¡£"
 
-#: curs_main.c:55 pager.c:52 recvattach.c:912
+#: curs_main.c:55 pager.c:52 recvattach.c:915
 msgid "Function not permitted in attach-message mode."
 msgstr "¹¦ÄÜÔÚ attach-message ģʽϲ»±»Ö§³Ö¡£"
 
@@ -1531,7 +1556,7 @@ msgstr "
 msgid "Mail"
 msgstr "Ðżþ"
 
-#: curs_main.c:410 pager.c:1487
+#: curs_main.c:410 pager.c:1510
 msgid "Reply"
 msgstr "»Ø¸²"
 
@@ -1556,7 +1581,7 @@ msgstr "
 msgid "No tagged messages."
 msgstr "ûÓбê¼ÇÁ˵ÄÐżþ¡£"
 
-#: curs_main.c:659 menu.c:921
+#: curs_main.c:659 menu.c:915
 #, fuzzy
 msgid "Nothing to do."
 msgstr "ÕýÁ¬½Óµ½ %s¡­"
@@ -1569,183 +1594,183 @@ msgstr "
 msgid "Argument must be a message number."
 msgstr "ÐèÒªÒ»¸öÐżþ±àºÅµÄ²ÎÊý¡£"
 
-#: curs_main.c:788
+#: curs_main.c:787
 msgid "That message is not visible."
 msgstr "Õâ·âÐżþÎÞ·¨ÏÔʾ¡£"
 
-#: curs_main.c:791
+#: curs_main.c:790
 msgid "Invalid message number."
 msgstr "ÎÞЧµÄÐżþ±àºÅ¡£"
 
-#: curs_main.c:804 curs_main.c:1845 pager.c:2288
+#: curs_main.c:803 curs_main.c:1852 pager.c:2346
 #, fuzzy
 msgid "delete message(s)"
 msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
 
-#: curs_main.c:807
+#: curs_main.c:806
 msgid "Delete messages matching: "
 msgstr "ɾ³ý·ûºÏÕâÑùʽµÄÐżþ£º"
 
-#: curs_main.c:829
+#: curs_main.c:828
 msgid "No limit pattern is in effect."
 msgstr "ûÓÐÏÞÖÆÑùʽÊÇÓÐЧµÄ¡£"
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:834
+#: curs_main.c:833
 #, c-format
 msgid "Limit: %s"
 msgstr "ÏÞÖÆ: %s"
 
-#: curs_main.c:844
+#: curs_main.c:843
 msgid "Limit to messages matching: "
 msgstr "ÏÞÖÆÖ»·ûºÏÕâÑùʽµÄÐżþ£º"
 
-#: curs_main.c:866
+#: curs_main.c:865
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
-#: curs_main.c:878
+#: curs_main.c:877
 msgid "Quit Mutt?"
 msgstr "À뿪 Mutt£¿"
 
-#: curs_main.c:963
+#: curs_main.c:962
 msgid "Tag messages matching: "
 msgstr "±ê¼ÇÐżþµÄÌõ¼þ£º"
 
-#: curs_main.c:972 curs_main.c:2134 pager.c:2598
+#: curs_main.c:971 curs_main.c:2141 pager.c:2656
 #, fuzzy
 msgid "undelete message(s)"
 msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
 
-#: curs_main.c:974
+#: curs_main.c:973
 msgid "Undelete messages matching: "
 msgstr "·´É¾³ýÐżþµÄÌõ¼þ£º"
 
-#: curs_main.c:982
+#: curs_main.c:981
 msgid "Untag messages matching: "
 msgstr "·´±ê¼ÇÐżþµÄÌõ¼þ£º"
 
-#: curs_main.c:1062
+#: curs_main.c:1069
 msgid "Open mailbox in read-only mode"
 msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÐÅÏä"
 
-#: curs_main.c:1064
+#: curs_main.c:1071
 msgid "Open mailbox"
 msgstr "´ò¿ªÐÅÏä"
 
-#: curs_main.c:1074
+#: curs_main.c:1081
 #, fuzzy
 msgid "No mailboxes have new mail"
 msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
 
-#: curs_main.c:1102 mx.c:503 mx.c:652
+#: curs_main.c:1109 mx.c:473 mx.c:622
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ²»ÊÇÐÅÏä¡£"
 
-#: curs_main.c:1197
+#: curs_main.c:1204
 msgid "Exit Mutt without saving?"
 msgstr "²»´¢´æ±ãÀ뿪 Mutt Âð£¿"
 
-#: curs_main.c:1215 curs_main.c:1248 curs_main.c:1692 curs_main.c:1724
+#: curs_main.c:1222 curs_main.c:1255 curs_main.c:1699 curs_main.c:1731
 #: flags.c:282 thread.c:1026 thread.c:1081 thread.c:1136
 msgid "Threading is not enabled."
 msgstr "ÐòÁй¦ÄÜÉÐδÆô¶¯¡£"
 
-#: curs_main.c:1227
+#: curs_main.c:1234
 msgid "Thread broken"
 msgstr ""
 
-#: curs_main.c:1245
+#: curs_main.c:1252
 msgid "link threads"
 msgstr ""
 
-#: curs_main.c:1250
+#: curs_main.c:1257
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: curs_main.c:1252
+#: curs_main.c:1259
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "´¢´æÐżþÒÔ±ãÉÔºó¼Ä³ö"
 
-#: curs_main.c:1264
+#: curs_main.c:1271
 msgid "Threads linked"
 msgstr ""
 
-#: curs_main.c:1267
+#: curs_main.c:1274
 msgid "No thread linked"
 msgstr ""
 
-#: curs_main.c:1303 curs_main.c:1328
+#: curs_main.c:1310 curs_main.c:1335
 msgid "You are on the last message."
 msgstr "ÄúÒѾ­ÔÚ×îºóÒ»·âÐÅÁË¡£"
 
-#: curs_main.c:1310 curs_main.c:1354
+#: curs_main.c:1317 curs_main.c:1361
 msgid "No undeleted messages."
 msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
 
-#: curs_main.c:1347 curs_main.c:1371
+#: curs_main.c:1354 curs_main.c:1378
 msgid "You are on the first message."
 msgstr "ÄúÒѾ­ÔÚµÚÒ»·âÐÅÁË¡£"
 
-#: curs_main.c:1446 menu.c:766 pager.c:1986 pattern.c:1466
+#: curs_main.c:1453 menu.c:760 pager.c:2014 pattern.c:1465
 msgid "Search wrapped to top."
 msgstr "ËÑÑ°ÖÁ¿ªÍ·¡£"
 
-#: curs_main.c:1455 pager.c:2008 pattern.c:1477
+#: curs_main.c:1462 pager.c:2036 pattern.c:1476
 msgid "Search wrapped to bottom."
 msgstr "ËÑÑ°ÖÁ½áβ¡£"
 
-#: curs_main.c:1496
+#: curs_main.c:1503
 msgid "No new messages"
 msgstr "ûÓÐÐÂÐżþ"
 
-#: curs_main.c:1496
+#: curs_main.c:1503
 msgid "No unread messages"
 msgstr "ûÓÐÉÐδ¶ÁÈ¡µÄÐżþ"
 
-#: curs_main.c:1497
+#: curs_main.c:1504
 msgid " in this limited view"
 msgstr " ÔÚÕâÏÞ¶¨µÄä¯ÀÀÖÐ"
 
-#: curs_main.c:1513
+#: curs_main.c:1520
 #, fuzzy
 msgid "flag message"
 msgstr "ÏÔʾһ·âÐżþ"
 
-#: curs_main.c:1550 pager.c:2564
+#: curs_main.c:1557 pager.c:2622
 msgid "toggle new"
 msgstr ""
 
-#: curs_main.c:1627
+#: curs_main.c:1634
 msgid "No more threads."
 msgstr "ûÓиü¶àµÄÐòÁÐ"
 
-#: curs_main.c:1629
+#: curs_main.c:1636
 msgid "You are on the first thread."
 msgstr "ÄúÒѾ­ÔÚµÚÒ»¸öÐòÁÐÉÏ¡£"
 
-#: curs_main.c:1710
+#: curs_main.c:1717
 msgid "Thread contains unread messages."
 msgstr "ÐòÁÐÖÐÓÐÉÐδ¶ÁÈ¡µÄÐżþ¡£"
 
-#: curs_main.c:1804 pager.c:2271
+#: curs_main.c:1811 pager.c:2315
 #, fuzzy
 msgid "delete message"
 msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
 
-#: curs_main.c:1886
+#: curs_main.c:1893
 #, fuzzy
 msgid "edit message"
 msgstr "±à¼­ÐżþÄÚÈÝ"
 
-#: curs_main.c:2017
+#: curs_main.c:2024
 #, fuzzy
 msgid "mark message(s) as read"
 msgstr "Ìøµ½Õâ¸öÐòÁеÄÖ÷Ðżþ"
 
-#: curs_main.c:2107 pager.c:2583
+#: curs_main.c:2114 pager.c:2641
 #, fuzzy
 msgid "undelete message"
 msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
@@ -1818,41 +1843,41 @@ msgstr ""
 "~?\t\tÕâѶϢ\n"
 ".\t\tÈç¹ûÊÇÒ»ÐÐÀïµÄΨһ×Ö·û£¬Ôò´ú±í½áÊøÊäÈë\n"
 
-#: edit.c:188
+#: edit.c:187
 #, c-format
 msgid "%d: invalid message number.\n"
 msgstr "%d£ºÎÞЧµÄÐżþºÅÂë¡£\n"
 
-#: edit.c:330
+#: edit.c:329
 msgid "(End message with a . on a line by itself)\n"
 msgstr "£¨ÔÚÒ»ÐÐÀïÊäÈëÒ»¸ö . ·ûºÅÀ´½áÊøÐżþ£©\n"
 
-#: edit.c:389
+#: edit.c:388
 msgid "No mailbox.\n"
 msgstr "ûÓÐÐÅÏä¡£\n"
 
-#: edit.c:393
+#: edit.c:392
 msgid "Message contains:\n"
 msgstr "Ðżþ°üº¬£º\n"
 
-#: edit.c:397 edit.c:454
+#: edit.c:396 edit.c:453
 msgid "(continue)\n"
 msgstr "£¨¼ÌÐø£©\n"
 
-#: edit.c:410
+#: edit.c:409
 msgid "missing filename.\n"
 msgstr "ÒÅʧÁ˵µÃû¡£\n"
 
-#: edit.c:430
+#: edit.c:429
 msgid "No lines in message.\n"
 msgstr "ÎÄÕÂÖÐûÓÐÎÄ×Ö¡£\n"
 
-#: edit.c:447
+#: edit.c:446
 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
 msgstr ""
 
-#: edit.c:465
+#: edit.c:464
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr "%s£º²»Ã÷µÄ±à¼­Æ÷Ö¸Á~? ÇóÖú£©\n"
@@ -1905,78 +1930,78 @@ msgstr "
 msgid "Clear flag"
 msgstr "Çå³ýÆì±ê"
 
-#: handler.c:1070
+#: handler.c:1058
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- ´íÎó£º ÎÞ·¨ÏÔʾ Multipart/Alternative£¡ --]\n"
 
-#: handler.c:1187
+#: handler.c:1176
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- ¸½¼þ #%d"
 
-#: handler.c:1199
+#: handler.c:1188
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- ÐÎ̬:  %s%s, ±àÂë: %s, ´óС: %s --]\n"
 
-#: handler.c:1223
+#: handler.c:1204
 msgid "One or more parts of this message could not be displayed"
 msgstr ""
 
-#: handler.c:1275
+#: handler.c:1256
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- ʹÓà %s ×Ô¶¯ÏÔʾ --]\n"
 
-#: handler.c:1276
+#: handler.c:1257
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Ö´ÐÐ×Ô¶¯ÏÔʾָÁ%s"
 
-#: handler.c:1308
+#: handler.c:1289
 #, fuzzy, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- ÔÚ %s --]\n"
 
-#: handler.c:1327 handler.c:1348
+#: handler.c:1308 handler.c:1329
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- ×Ô¶¯ÏÔʾµÄ %s µÄ stderr ÄÚÈÝ --]\n"
 
-#: handler.c:1387
+#: handler.c:1368
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- ´íÎó: message/external-body ûÓдæÈ¡ÀàÐ͵IJÎÊý --]\n"
 
-#: handler.c:1408
+#: handler.c:1389
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- %s/%s ¸½¼þ "
 
-#: handler.c:1415
+#: handler.c:1396
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(%s λԪ×é) "
 
-#: handler.c:1417
+#: handler.c:1398
 msgid "has been deleted --]\n"
 msgstr "ÒѾ­±»É¾³ýÁË --]\n"
 
-#: handler.c:1422
+#: handler.c:1403
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- ÔÚ %s --]\n"
 
-#: handler.c:1427
+#: handler.c:1408
 #, fuzzy, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- ÔÚ %s --]\n"
 
-#: handler.c:1440 handler.c:1456
+#: handler.c:1421 handler.c:1437
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- %s/%s ¸½¼þ "
 
-#: handler.c:1442
+#: handler.c:1423
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
@@ -1986,40 +2011,45 @@ msgstr ""
 "[-- ²¢ÇÒ±»Ö¸Ê¾µÄÍⲿԭʼµµÒÑ --]\n"
 "[-- ¹ýÆÚ¡£ --]\n"
 
-#: handler.c:1460
+#: handler.c:1441
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- %s/%s ¸½¼þÎÞ·¨±»¸½ÉÏ, --]\n"
 "[-- ²¢ÇÒ±»Ö¸Ê¾µÄ´æÈ¡ÀàÐÍ %s ²»±»Ö§³Ö --]\n"
 
-#: handler.c:1575
+#: handler.c:1584
 msgid "Error: multipart/signed has no protocol."
 msgstr "´íÎó£ºmultipart/signed ûÓÐͨѶЭ¶¨¡£"
 
-#: handler.c:1585
+#: handler.c:1594
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "´íÎó£ºmultipart/encrypted ûÓÐÈκÎͨѶЭ¶¨²ÎÊý£¡"
 
-#: handler.c:1639
+#: handler.c:1651
 msgid "Unable to open temporary file!"
 msgstr "ÎÞ·¨´ò¿ªÔÝ´æµµ£¡"
 
-#: handler.c:1706
+#: handler.c:1724
+#, fuzzy
+msgid "[-- This is an attachment "
+msgstr "[-- %s/%s ¸½¼þ "
+
+#: handler.c:1726
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s ÉÐδ֧³Ö "
 
-#: handler.c:1711
+#: handler.c:1731
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "£¨Ê¹Óà '%s' À´ÏÔʾÕⲿ·Ý£©"
 
-#: handler.c:1713
+#: handler.c:1733
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "£¨ÐèÒª¶¨ÒåÒ»¸ö¼ü¸ø 'view-attachments' lä¯ÀÀ¸½¼þ)£¡)"
 
-#: headers.c:173
+#: headers.c:189
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
@@ -2077,7 +2107,7 @@ msgstr "%s
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr ""
 
-#: imap/auth.c:108 pop_auth.c:398 smtp.c:483
+#: imap/auth.c:108 pop_auth.c:398 smtp.c:521
 #, fuzzy
 msgid "No authenticators available"
 msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
@@ -2120,7 +2150,7 @@ msgstr "
 msgid "Login failed."
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: imap/auth_sasl.c:97 smtp.c:519
+#: imap/auth_sasl.c:97 smtp.c:557
 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
 msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡­"
@@ -2130,7 +2160,7 @@ msgstr "
 msgid "SASL authentication failed."
 msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
 
-#: imap/browse.c:58 imap/imap.c:567
+#: imap/browse.c:58 imap/imap.c:569
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
@@ -2140,37 +2170,37 @@ msgstr ""
 msgid "Getting folder list..."
 msgstr "ÒѽӴ¥ËÅ·þÆ÷£¬ÕýÄÃȡĿ¼±í¡­"
 
-#: imap/browse.c:189
+#: imap/browse.c:191
 #, fuzzy
 msgid "No such folder"
 msgstr "%s£ºÃ»ÓÐÕâÖÖÑÕÉ«"
 
-#: imap/browse.c:278
+#: imap/browse.c:280
 #, fuzzy
 msgid "Create mailbox: "
 msgstr "´ò¿ªÐÅÏä"
 
-#: imap/browse.c:283 imap/browse.c:329
+#: imap/browse.c:285 imap/browse.c:331
 #, fuzzy
 msgid "Mailbox must have a name."
 msgstr "ÐÅÏäûÓиı䡣"
 
-#: imap/browse.c:291
+#: imap/browse.c:293
 #, fuzzy
 msgid "Mailbox created."
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
 
-#: imap/browse.c:322
+#: imap/browse.c:324
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "´ò¿ªÐÅÏä"
 
-#: imap/browse.c:337
+#: imap/browse.c:339
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: imap/browse.c:342
+#: imap/browse.c:344
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
@@ -2190,96 +2220,96 @@ msgstr "
 msgid "Closing connection to %s..."
 msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
 
-#: imap/imap.c:311
+#: imap/imap.c:310
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "Õâ¸ö IMAP ËÅ·þÆ÷Òѹýʱ£¬Mutt ÎÞ·¨Ê¹ÓÃËü¡£"
 
-#: imap/imap.c:434 pop_lib.c:286 smtp.c:392
+#: imap/imap.c:433 pop_lib.c:292 smtp.c:424
 msgid "Secure connection with TLS?"
 msgstr ""
 
-#: imap/imap.c:443 pop_lib.c:306 smtp.c:404
+#: imap/imap.c:442 pop_lib.c:312 smtp.c:436
 msgid "Could not negotiate TLS connection"
 msgstr ""
 
-#: imap/imap.c:459 pop_lib.c:327
+#: imap/imap.c:458 pop_lib.c:333
 #, fuzzy
 msgid "Encrypted connection unavailable"
 msgstr "¼ÓÃܵÄÔ¿³×"
 
-#: imap/imap.c:601
+#: imap/imap.c:603
 #, c-format
 msgid "Selecting %s..."
 msgstr "Ñ¡Ôñ %s ÖС­"
 
-#: imap/imap.c:756
+#: imap/imap.c:758
 #, fuzzy
 msgid "Error opening mailbox"
 msgstr "дÈëÐÅÏäʱ·¢Éú´íÎó£¡"
 
-#: imap/imap.c:811 imap/message.c:834 muttlib.c:1478
+#: imap/imap.c:813 imap/message.c:842 muttlib.c:1493
 #, c-format
 msgid "Create %s?"
 msgstr "½¨Á¢ %s£¿"
 
-#: imap/imap.c:1183
+#: imap/imap.c:1186
 #, fuzzy
 msgid "Expunge failed"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: imap/imap.c:1195
+#: imap/imap.c:1198
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "±êÇ©Á赀 %d ·âÐżþɾȥÁË¡­"
 
-#: imap/imap.c:1224
+#: imap/imap.c:1230
 #, fuzzy, c-format
 msgid "Saving changed messages... [%d/%d]"
 msgstr "ÕýÔÚ´¢´æÐżþ״̬Æì±ê¡­ [%d/%d]"
 
-#: imap/imap.c:1273
+#: imap/imap.c:1279
 msgid "Error saving flags. Close anyway?"
 msgstr ""
 
-#: imap/imap.c:1281
+#: imap/imap.c:1287
 #, fuzzy
 msgid "Error saving flags"
 msgstr "ÎÞ·¨·ÖÎöλַ£¡"
 
-#: imap/imap.c:1293
+#: imap/imap.c:1299
 msgid "Expunging messages from server..."
 msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
 
-#: imap/imap.c:1298
+#: imap/imap.c:1304
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1746
+#: imap/imap.c:1754
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
-#: imap/imap.c:1818
+#: imap/imap.c:1826
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "´ò¿ªÐÅÏä"
 
-#: imap/imap.c:1843
+#: imap/imap.c:1851
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "¶©ÔÄ %s¡­"
 
-#: imap/imap.c:1845
+#: imap/imap.c:1853
 #, fuzzy, c-format
 msgid "Unsubscribing from %s..."
 msgstr "È¡Ïû¶©ÔÄ %s¡­"
 
-#: imap/imap.c:1855
+#: imap/imap.c:1863
 #, fuzzy, c-format
 msgid "Subscribed to %s"
 msgstr "¶©ÔÄ %s¡­"
 
-#: imap/imap.c:1857
+#: imap/imap.c:1865
 #, fuzzy, c-format
 msgid "Unsubscribed from %s"
 msgstr "È¡Ïû¶©ÔÄ %s¡­"
@@ -2304,31 +2334,31 @@ msgstr "
 msgid "Fetching message headers..."
 msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡­ [%d/%d]"
 
-#: imap/message.c:428 imap/message.c:485 pop.c:547
+#: imap/message.c:435 imap/message.c:492 pop.c:563
 #, fuzzy
 msgid "Fetching message..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: imap/message.c:474 pop.c:542
+#: imap/message.c:481 pop.c:558
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr ""
 
-#: imap/message.c:627
+#: imap/message.c:634
 #, fuzzy
 msgid "Uploading message..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: imap/message.c:798
+#: imap/message.c:806
 #, fuzzy, c-format
 msgid "Copying %d messages to %s..."
 msgstr "ÕýÔÚ°áÒÆÒѾ­¶ÁÈ¡µÄÐżþµ½ %s ¡­"
 
-#: imap/message.c:802
+#: imap/message.c:810
 #, fuzzy, c-format
 msgid "Copying message %d to %s..."
 msgstr "дÈëÐżþµ½ %s ¡­"
 
-#: imap/util.c:336
+#: imap/util.c:356
 #, fuzzy
 msgid "Continue?"
 msgstr "£¨¼ÌÐø£©\n"
@@ -2449,69 +2479,82 @@ msgstr "
 msgid "%s: invalid mailbox type"
 msgstr "%s£ºÎÞЧµÄÐÅÏäÖÖÀà"
 
-#: init.c:2095 init.c:2155
+#: init.c:2095
+#, fuzzy, c-format
+msgid "%s: invalid value (%s)"
+msgstr "%s£ºÎÞЧµÄÖµ"
+
+#: init.c:2096
+msgid "format error"
+msgstr ""
+
+#: init.c:2096
+msgid "number overflow"
+msgstr ""
+
+#: init.c:2156
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s£ºÎÞЧµÄÖµ"
 
-#: init.c:2196
+#: init.c:2197
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s£º²»Ã÷µÄÖÖÀà"
 
-#: init.c:2223
+#: init.c:2224
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s£º²»Ã÷µÄÖÖÀà"
 
-#: init.c:2285
+#: init.c:2286
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s ·¢Éú´íÎó£¬ÐкŠ%d£º%s"
 
 #. the muttrc source keyword
-#: init.c:2308
+#: init.c:2309
 #, c-format
 msgid "source: errors in %s"
 msgstr "source£º´íÎó·¢ÉúÔÚ %s"
 
-#: init.c:2309
+#: init.c:2310
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr ""
 
-#: init.c:2323
+#: init.c:2324
 #, c-format
 msgid "source: error at %s"
 msgstr "source£º´íÎó·¢ÉúÔÚ %s"
 
-#: init.c:2328
+#: init.c:2329
 msgid "source: too many arguments"
 msgstr "source£ºÌ«¶à²ÎÊý"
 
-#: init.c:2382
+#: init.c:2383
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s£º²»Ã÷µÄÖ¸Áî"
 
-#: init.c:2867
+#: init.c:2868
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
 
-#: init.c:2922
+#: init.c:2923
 msgid "unable to determine home directory"
 msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
 
-#: init.c:2930
+#: init.c:2931
 msgid "unable to determine username"
 msgstr "ÎÞ·¨¾ö¶¨Ê¹ÓÃÕßÃû³Æ"
 
-#: init.c:3166
+#: init.c:3167
 msgid "-group: no group name"
 msgstr ""
 
-#: init.c:3176
+#: init.c:3177
 #, fuzzy
 msgid "out of arguments"
 msgstr "Ì«ÉÙ²ÎÊý"
@@ -2616,7 +2659,7 @@ msgid ""
 "Copyright (C) 1999-2009 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
-"Copyright (C) 2006-2008 Rocco Rutte <pdmef@gmx.net>\n"
+"Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n"
 "\n"
 "Many others not mentioned here contributed code, fixes,\n"
 "and suggestions.\n"
@@ -2770,52 +2813,57 @@ msgstr ""
 msgid "Error initializing terminal."
 msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
 
-#: main.c:635
+#: main.c:636
+#, c-format
+msgid "Error: value '%s' is invalid for -d.\n"
+msgstr ""
+
+#: main.c:639
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "³ý´íģʽÔÚµÚ %d ²ã¡£\n"
 
-#: main.c:637
+#: main.c:641
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "ÔÚ±àÒëʱºòûÓж¨Òå DEBUG¡£·ÅÆúÖ´ÐС£\n"
 
-#: main.c:802
+#: main.c:806
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ²»´æÔÚ¡£ÖÆÔìÂð£¿"
 
-#: main.c:806
+#: main.c:810
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "ÎÞ·¨½¨Á¢ %s: %s."
 
-#: main.c:848
+#: main.c:852
 msgid "Failed to parse mailto: link\n"
 msgstr ""
 
-#: main.c:860
+#: main.c:864
 msgid "No recipients specified.\n"
 msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕß¡£\n"
 
-#: main.c:946
+#: main.c:950
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s£ºÎÞ·¨¸½´øÎļþ¡£\n"
 
-#: main.c:969
+#: main.c:973
 msgid "No mailbox with new mail."
 msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
 
-#: main.c:978
+#: main.c:982
 #, fuzzy
 msgid "No incoming mailboxes defined."
 msgstr "Ȧѡ½øÈëµÄÓÊͲ"
 
-#: main.c:1006
+#: main.c:1010
 msgid "Mailbox is empty."
 msgstr "ÐÅÏäÄÚ¿ÕÎÞÒ»Îï¡£"
 
-#: mbox.c:123 mbox.c:277 mh.c:1135 mx.c:673
+#: mbox.c:123 mbox.c:277 mh.c:1151 mx.c:643
 #, c-format
 msgid "Reading %s..."
 msgstr "¶ÁÈ¡ %s ÖС­"
@@ -2828,11 +2876,11 @@ msgstr "
 msgid "Mailbox was corrupted!"
 msgstr "ÐÅÏäÒÑËð»µ!"
 
-#: mbox.c:719 mbox.c:976
+#: mbox.c:737 mbox.c:981
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "ÑÏÖØ´íÎó£¡ÎÞ·¨ÖØдò¿ªÐÅÏ䣡"
 
-#: mbox.c:728
+#: mbox.c:746
 msgid "Unable to lock mailbox!"
 msgstr "ÎÞ·¨ËøסÐÅÏ䣡"
 
@@ -2840,33 +2888,30 @@ msgstr "
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:771
+#: mbox.c:789
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "ͬ²½£ºÐÅÏäÒѱ»Ð޸ģ¬µ«Ã»Óб»Ð޸ĹýµÄÐżþ£¡£¨Çë»Ø±¨Õâ¸ö´íÎó£©"
 
-#: mbox.c:795 mh.c:1640 mx.c:766
+#: mbox.c:813 mh.c:1657 mx.c:736
 #, c-format
 msgid "Writing %s..."
 msgstr "дÈë %s ÖС­"
 
-#. copy the temp mailbox back into place starting at the first
-#. * change/deleted message
-#.
-#: mbox.c:929
+#: mbox.c:939
 #, fuzzy
 msgid "Committing changes..."
 msgstr "±àÒëËÑÑ°ÑùʽÖС­"
 
-#: mbox.c:960
+#: mbox.c:970
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "дÈëʧ°Ü£¡ÒѰѲ¿·ÖµÄÐÅÏä´¢´æÖÁ %s"
 
-#: mbox.c:1024
+#: mbox.c:1034
 msgid "Could not reopen mailbox!"
 msgstr "ÎÞ·¨ÖØ¿ªÐÅÏ䣡"
 
-#: mbox.c:1059
+#: mbox.c:1070
 msgid "Reopening mailbox..."
 msgstr "ÖØдò¿ªÐÅÏäÖС­"
 
@@ -2879,7 +2924,7 @@ msgid "Invalid index number."
 msgstr "ÎÞЧµÄË÷Òý±àºÅ¡£"
 
 #: menu.c:436 menu.c:457 menu.c:522 menu.c:565 menu.c:581 menu.c:592
-#: menu.c:603 menu.c:614 menu.c:627 menu.c:640 menu.c:1058
+#: menu.c:603 menu.c:614 menu.c:627 menu.c:640 menu.c:1052
 msgid "No entries."
 msgstr "ûÓÐ×ÊÁÏ¡£"
 
@@ -2907,49 +2952,45 @@ msgstr "
 msgid "You are on the first entry."
 msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ïî¡£"
 
-#: menu.c:731 pattern.c:1404
+#: menu.c:733 pager.c:2058 pattern.c:1408
 msgid "Search for: "
 msgstr "ËÑÑ°£º"
 
-#: menu.c:732 pattern.c:1405
+#: menu.c:733 pager.c:2058 pattern.c:1408
 msgid "Reverse search for: "
 msgstr "·µÏòËÑÑ°£º"
 
-#: menu.c:746 pattern.c:1437
-msgid "No search pattern."
-msgstr "ûÓÐËÑÑ°¸ñʽ¡£"
-
-#: menu.c:784 pager.c:1983 pager.c:2005 pager.c:2120 pattern.c:1520
+#: menu.c:778 pager.c:2011 pager.c:2033 pager.c:2154 pattern.c:1519
 msgid "Not found."
 msgstr "ûÓÐÕÒµ½¡£"
 
-#: menu.c:910
+#: menu.c:904
 msgid "No tagged entries."
 msgstr "ûÓÐÒѱê¼ÇµÄ¼Ç¼¡£"
 
-#: menu.c:1015
+#: menu.c:1009
 msgid "Search is not implemented for this menu."
 msgstr "Õâ¸öÑ¡µ¥ÖÐûÓÐËÑÑ°¹¦ÄÜ¡£"
 
-#: menu.c:1020
+#: menu.c:1014
 msgid "Jumping is not implemented for dialogs."
 msgstr "¶Ô»°Ä£Ê½Öв»Ö§³ÖÌøÔ¾¹¦ÄÜ¡£"
 
-#: menu.c:1061
+#: menu.c:1055
 msgid "Tagging is not supported."
 msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
 
-#: mh.c:1114
+#: mh.c:1130
 #, fuzzy, c-format
 msgid "Scanning %s..."
 msgstr "Ñ¡Ôñ %s ÖС­"
 
-#: mh.c:1314 mh.c:1392
+#: mh.c:1331 mh.c:1409
 #, fuzzy
 msgid "Could not flush message to disk"
 msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
 
-#: mh.c:1359
+#: mh.c:1376
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
@@ -3045,8 +3086,8 @@ msgstr ""
 msgid "SSL failed: %s"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: mutt_ssl.c:349 mutt_ssl_gnutls.c:880 mutt_ssl_gnutls.c:889
-#: mutt_ssl_gnutls.c:912
+#: mutt_ssl.c:349 mutt_ssl_gnutls.c:950 mutt_ssl_gnutls.c:984
+#: mutt_ssl_gnutls.c:994
 #, fuzzy
 msgid "Unable to get certificate from peer"
 msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
@@ -3061,159 +3102,163 @@ msgstr "
 msgid "Unknown"
 msgstr "²»Ã÷µÄ´íÎó"
 
-#: mutt_ssl.c:426 mutt_ssl_gnutls.c:457
+#: mutt_ssl.c:426 mutt_ssl_gnutls.c:473
 #, fuzzy, c-format
 msgid "[unable to calculate]"
 msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
 
-#: mutt_ssl.c:444 mutt_ssl_gnutls.c:480
+#: mutt_ssl.c:444 mutt_ssl_gnutls.c:496
 #, fuzzy
 msgid "[invalid date]"
 msgstr "%s£ºÎÞЧµÄÖµ"
 
-#: mutt_ssl.c:570
+#: mutt_ssl.c:572
 msgid "Server certificate is not yet valid"
 msgstr ""
 
-#: mutt_ssl.c:577
+#: mutt_ssl.c:579
 msgid "Server certificate has expired"
 msgstr ""
 
-#: mutt_ssl.c:696
+#: mutt_ssl.c:699
 #, fuzzy
 msgid "cannot get certificate subject"
 msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
 
-#: mutt_ssl.c:708
+#: mutt_ssl.c:711
 #, fuzzy
 msgid "cannot get certificate common name"
 msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
 
-#: mutt_ssl.c:717
+#: mutt_ssl.c:720
 #, c-format
 msgid "certificate owner does not match hostname %s"
 msgstr ""
 
-#: mutt_ssl.c:754
+#: mutt_ssl.c:761
 #, fuzzy, c-format
 msgid "Certificate host check failed: %s"
 msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
 
-#: mutt_ssl.c:845 mutt_ssl_gnutls.c:664
+#: mutt_ssl.c:839 mutt_ssl_gnutls.c:732
 msgid "This certificate belongs to:"
 msgstr ""
 
-#: mutt_ssl.c:858 mutt_ssl_gnutls.c:703
+#: mutt_ssl.c:852 mutt_ssl_gnutls.c:771
 msgid "This certificate was issued by:"
 msgstr ""
 
-#: mutt_ssl.c:869 mutt_ssl_gnutls.c:742
+#: mutt_ssl.c:863 mutt_ssl_gnutls.c:810
 #, c-format
 msgid "This certificate is valid"
 msgstr ""
 
-#: mutt_ssl.c:870 mutt_ssl_gnutls.c:745
+#: mutt_ssl.c:864 mutt_ssl_gnutls.c:813
 #, c-format
 msgid "   from %s"
 msgstr ""
 
-#: mutt_ssl.c:872 mutt_ssl_gnutls.c:749
+#: mutt_ssl.c:866 mutt_ssl_gnutls.c:817
 #, c-format
 msgid "     to %s"
 msgstr ""
 
-#: mutt_ssl.c:878
+#: mutt_ssl.c:872
 #, c-format
 msgid "Fingerprint: %s"
 msgstr ""
 
-#: mutt_ssl.c:881 mutt_ssl_gnutls.c:786
+#: mutt_ssl.c:875 mutt_ssl_gnutls.c:854
 #, c-format
 msgid "SSL Certificate check (certificate %d of %d in chain)"
 msgstr ""
 
-#: mutt_ssl.c:887 mutt_ssl_gnutls.c:793
+#: mutt_ssl.c:883 mutt_ssl_gnutls.c:863
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr ""
 
-#: mutt_ssl.c:888 mutt_ssl_gnutls.c:794
+#: mutt_ssl.c:884 mutt_ssl_gnutls.c:864
 msgid "roa"
 msgstr ""
 
-#: mutt_ssl.c:892 mutt_ssl_gnutls.c:798
+#: mutt_ssl.c:888 mutt_ssl_gnutls.c:868
 msgid "(r)eject, accept (o)nce"
 msgstr ""
 
-#: mutt_ssl.c:893 mutt_ssl_gnutls.c:799
+#: mutt_ssl.c:889 mutt_ssl_gnutls.c:869
 msgid "ro"
 msgstr ""
 
-#: mutt_ssl.c:924 mutt_ssl_gnutls.c:848
+#: mutt_ssl.c:920 mutt_ssl_gnutls.c:918
 msgid "Warning: Couldn't save certificate"
 msgstr ""
 
-#: mutt_ssl.c:929 mutt_ssl_gnutls.c:853
+#: mutt_ssl.c:925 mutt_ssl_gnutls.c:923
 msgid "Certificate saved"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:96 mutt_ssl_gnutls.c:123
+#: mutt_ssl_gnutls.c:106 mutt_ssl_gnutls.c:133
 msgid "Error: no TLS socket open"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:276
+#: mutt_ssl_gnutls.c:292
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:340
+#: mutt_ssl_gnutls.c:356
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "ÕýÁ¬Ïßµ½ %s"
 
-#: mutt_ssl_gnutls.c:567
+#: mutt_ssl_gnutls.c:563 mutt_ssl_gnutls.c:712
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
 
-#: mutt_ssl_gnutls.c:574
+#: mutt_ssl_gnutls.c:570 mutt_ssl_gnutls.c:719
 msgid "Error processing certificate data"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:754
+#: mutt_ssl_gnutls.c:703
+msgid "Warning: Server certificate was signed using an insecure algorithm"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:822
 #, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:757
+#: mutt_ssl_gnutls.c:825
 #, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:762
+#: mutt_ssl_gnutls.c:830
 msgid "WARNING: Server certificate is not yet valid"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:767
+#: mutt_ssl_gnutls.c:835
 msgid "WARNING: Server certificate has expired"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:772
+#: mutt_ssl_gnutls.c:840
 msgid "WARNING: Server certificate has been revoked"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:777
+#: mutt_ssl_gnutls.c:845
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:782
+#: mutt_ssl_gnutls.c:850
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:895
+#: mutt_ssl_gnutls.c:956
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:904
+#: mutt_ssl_gnutls.c:965
 msgid "Certificate is not X.509"
 msgstr ""
 
@@ -3232,42 +3277,42 @@ msgstr ""
 msgid "Tunnel error talking to %s: %s"
 msgstr "ÕýÁ¬Ïßµ½ %s"
 
-#: muttlib.c:923
+#: muttlib.c:938
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
 
-#: muttlib.c:923
+#: muttlib.c:938
 msgid "yna"
 msgstr ""
 
-#: muttlib.c:939
+#: muttlib.c:954
 msgid "File is a directory, save under it?"
 msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
 
-#: muttlib.c:945
+#: muttlib.c:960
 msgid "File under directory: "
 msgstr "ÔÚĿ¼µ×ϵÄÎļþ£º"
 
-#: muttlib.c:957
+#: muttlib.c:972
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "ÎļþÒѾ­´æÔÚ, (o)¸²¸Ç, (a)¸½¼Ó, »òÊÇ (c)È¡Ïû ?"
 
-#: muttlib.c:957
+#: muttlib.c:972
 msgid "oac"
 msgstr ""
 
-#: muttlib.c:1441
+#: muttlib.c:1456
 #, fuzzy
 msgid "Can't save message to POP mailbox."
 msgstr "½«ÐżþдÈëµ½ÐÅÏä"
 
-#: muttlib.c:1450
+#: muttlib.c:1465
 #, c-format
 msgid "Append messages to %s?"
 msgstr "¸½¼ÓÐżþµ½ %s ?"
 
-#: muttlib.c:1462
+#: muttlib.c:1477
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ²»ÊÇÐÅÏ䣡"
@@ -3300,120 +3345,112 @@ msgstr "
 msgid "Waiting for flock attempt... %d"
 msgstr "ÕýÔڵȴý flock Ö´Ðгɹ¦¡­ %d"
 
-#: mx.c:586
+#: mx.c:556
 #, c-format
 msgid "Couldn't lock %s\n"
 msgstr "ÎÞ·¨Ëøס %s¡£\n"
 
-#: mx.c:798
+#: mx.c:768
 #, c-format
 msgid "Could not synchronize mailbox %s!"
 msgstr "ÎÞ·¨Óë %s ÐÅÏäͬ²½£¡"
 
-#: mx.c:862
+#: mx.c:832
 #, c-format
 msgid "Move read messages to %s?"
 msgstr "°áÒÆÒѶÁÈ¡µÄÐżþµ½ %s£¿"
 
-#: mx.c:878 mx.c:1130
+#: mx.c:848 mx.c:1106
 #, c-format
 msgid "Purge %d deleted message?"
 msgstr "Çå³ý %d ·âÒѾ­±»É¾³ýµÄÐżþ£¿"
 
-#: mx.c:878 mx.c:1130
+#: mx.c:848 mx.c:1106
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "Çå³ý %d ·âÒѱ»É¾³ýµÄÐżþ£¿"
 
-#: mx.c:898
+#: mx.c:869
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "ÕýÔÚ°áÒÆÒѾ­¶ÁÈ¡µÄÐżþµ½ %s ¡­"
 
-#: mx.c:957 mx.c:1121
+#: mx.c:929 mx.c:1097
 msgid "Mailbox is unchanged."
 msgstr "ÐÅÏäûÓиı䡣"
 
-#: mx.c:993
+#: mx.c:967
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»°áÒÆ, %d ·âÐżþ±»É¾³ý¡£"
 
-#: mx.c:996 mx.c:1170
+#: mx.c:970 mx.c:1151
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d ·âÐżþ±»±£Áô, %d ·âÐżþ±»É¾³ý¡£"
 
-#: mx.c:1106
+#: mx.c:1081
 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr " Çë°´Ï '%s' À´Çл»Ð´Èëģʽ"
 
-#: mx.c:1108
+#: mx.c:1083
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "ÇëʹÓà 'toggle-write' À´ÖØÐÂÆô¶¯Ð´È빦ÄÜ!"
 
-#: mx.c:1110
+#: mx.c:1085
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
 msgstr "ÐÅÏä±»±ê¼Ç³ÉΪÎÞ·¨Ð´ÈëµÄ. %s"
 
-#: mx.c:1167
+#: mx.c:1145
 #, fuzzy
 msgid "Mailbox checkpointed."
 msgstr "ÓÊÏäÒÑɾ³ý¡£"
 
-#: mx.c:1479
+#: mx.c:1461
 #, fuzzy
 msgid "Can't write message"
 msgstr "±à¼­ÐżþÄÚÈÝ"
 
-#: mx.c:1524
+#: mx.c:1506
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
-#: pager.c:1480
+#: pager.c:1503
 msgid "PrevPg"
 msgstr "ÉÏÒ»Ò³"
 
-#: pager.c:1481
+#: pager.c:1504
 msgid "NextPg"
 msgstr "ÏÂÒ»Ò³"
 
-#: pager.c:1485
+#: pager.c:1508
 msgid "View Attachm."
 msgstr "ÏÔʾ¸½¼þ¡£"
 
-#: pager.c:1488
+#: pager.c:1511
 msgid "Next"
 msgstr "ÏÂÒ»¸ö"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1889 pager.c:1920 pager.c:1952 pager.c:2208
+#: pager.c:1912 pager.c:1943 pager.c:1975 pager.c:2252
 msgid "Bottom of message is shown."
 msgstr "ÏÖÕýÏÔʾ×îÏÂÃæµÄÐżþ¡£"
 
-#: pager.c:1905 pager.c:1927 pager.c:1934 pager.c:1941
+#: pager.c:1928 pager.c:1950 pager.c:1957 pager.c:1964
 msgid "Top of message is shown."
 msgstr "ÏÖÕýÏÔʾ×îÉÏÃæµÄÐżþ¡£"
 
-#: pager.c:2024
-msgid "Reverse search: "
-msgstr "·´ÏòËÑÑ°£º"
-
-#: pager.c:2025
-msgid "Search: "
-msgstr "ËÑÑ°£º"
-
-#: pager.c:2146
+#: pager.c:2190
 msgid "Help is currently being shown."
 msgstr "ÏÖÕýÏÔʾ˵Ã÷Îļþ¡£"
 
-#: pager.c:2175
+#: pager.c:2219
 msgid "No more quoted text."
 msgstr "²»ÄÜÓÐÔÙ¶àµÄÒýÑÔ¡£"
 
-#: pager.c:2188
+#: pager.c:2232
 msgid "No more unquoted text after quoted text."
 msgstr "ÔÚÒýÑÔºóÓйý¶àµÄ·ÇÒýÑÔÎÄ×Ö¡£"
 
@@ -3431,91 +3468,91 @@ msgstr "
 msgid "Empty expression"
 msgstr "±í´ïʽÓдíÎó"
 
-#: pattern.c:398
+#: pattern.c:399
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "ÎÞЧµÄÈÕ×Ó£º%s"
 
-#: pattern.c:412
+#: pattern.c:413
 #, c-format
 msgid "Invalid month: %s"
 msgstr "ÎÞЧµÄÔ·ݣº%s"
 
 #. getDate has its own error message, don't overwrite it here
-#: pattern.c:564
+#: pattern.c:565
 #, fuzzy, c-format
 msgid "Invalid relative date: %s"
 msgstr "ÎÞЧµÄÔ·ݣº%s"
 
-#: pattern.c:578
+#: pattern.c:579
 msgid "error in expression"
 msgstr "±í´ïʽÓдíÎó"
 
-#: pattern.c:799 pattern.c:945
+#: pattern.c:801 pattern.c:947
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
 
-#: pattern.c:829
+#: pattern.c:831
 #, fuzzy, c-format
 msgid "mismatched brackets: %s"
 msgstr "²»¶Ô³ÆµÄÀ¨»¡£º%s"
 
-#: pattern.c:885
+#: pattern.c:887
 #, fuzzy, c-format
 msgid "%c: invalid pattern modifier"
 msgstr "%c£ºÎÞЧµÄÖ¸Áî"
 
-#: pattern.c:891
+#: pattern.c:893
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c£ºÔÚÕâ¸öģʽ²»Ö§³Ö"
 
-#: pattern.c:904
+#: pattern.c:906
 #, c-format
 msgid "missing parameter"
 msgstr "´íʧ²ÎÊý"
 
-#: pattern.c:920
+#: pattern.c:922
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "²»¶Ô³ÆµÄÀ¨»¡£º%s"
 
-#: pattern.c:952
+#: pattern.c:954
 msgid "empty pattern"
 msgstr "¿ÕµÄ¸ñʽ"
 
-#: pattern.c:1205
+#: pattern.c:1208
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "´íÎ󣺲»Ã÷µÄ op %d (Çë»Ø±¨Õâ¸ö´íÎó)¡£"
 
-#: pattern.c:1288 pattern.c:1423
+#: pattern.c:1291 pattern.c:1427
 msgid "Compiling search pattern..."
 msgstr "±àÒëËÑÑ°ÑùʽÖС­"
 
-#: pattern.c:1307
+#: pattern.c:1310
 msgid "Executing command on matching messages..."
 msgstr "ÕýÔÚ¶Ô·ûºÏµÄÓʼþÖ´ÐÐÃüÁî¡­"
 
-#: pattern.c:1374
+#: pattern.c:1377
 msgid "No messages matched criteria."
 msgstr "ûÓÐÓʼþ·ûºÏÒªÇó¡£"
 
-#: pattern.c:1456
+#: pattern.c:1455
 #, fuzzy
 msgid "Searching..."
 msgstr "´¢´æÖС­"
 
-#: pattern.c:1469
+#: pattern.c:1468
 msgid "Search hit bottom without finding match"
 msgstr "ÒÑËÑÑ°ÖÁ½á⣬²¢Ã»Óз¢ÏÖÈκηûºÏ"
 
-#: pattern.c:1480
+#: pattern.c:1479
 msgid "Search hit top without finding match"
 msgstr "ÒÑËÑÑ°ÖÁ¿ªÍ·£¬²¢Ã»Óз¢ÏÖÈκηûºÏ"
 
-#: pattern.c:1512
+#: pattern.c:1511
 msgid "Search interrupted."
 msgstr "ËÑÑ°Òѱ»Öжϡ£"
 
@@ -3527,11 +3564,11 @@ msgstr "
 msgid "PGP passphrase forgotten."
 msgstr "ÒÑÍü¼Ç PGP ͨÐÐÃÜÂë¡£"
 
-#: pgp.c:357
+#: pgp.c:368
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
 
-#: pgp.c:391 pgp.c:643 pgp.c:847
+#: pgp.c:402 pgp.c:661 pgp.c:865
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3539,23 +3576,23 @@ msgstr ""
 "[-- PGP Êä³ö²¿·Ý½áÊø --]\n"
 "\n"
 
-#: pgp.c:411 pgp.c:459 pgp.c:982
+#: pgp.c:424 pgp.c:475 pgp.c:1000
 #, fuzzy
 msgid "Could not decrypt PGP message"
 msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
 
 #. clear 'Invoking...' message, since there's no error
-#: pgp.c:461 pgp.c:978
+#: pgp.c:477 pgp.c:996
 #, fuzzy
 msgid "PGP message successfully decrypted."
 msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
 
-#: pgp.c:751
+#: pgp.c:769
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "ÄÚ²¿´íÎó¡£ÁªÂç <rosessler@does-not-exist.org>¡£"
 
-#: pgp.c:812
+#: pgp.c:830
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3563,33 +3600,33 @@ msgstr ""
 "[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
 "\n"
 
-#: pgp.c:859
+#: pgp.c:877
 #, fuzzy
 msgid "Decryption failed"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: pgp.c:1034
+#: pgp.c:1052
 msgid "Can't open PGP subprocess!"
 msgstr "ÎÞ·¨´ò¿ª PGP ×Ó³ÌÐò£¡"
 
-#: pgp.c:1471
+#: pgp.c:1489
 msgid "Can't invoke PGP"
 msgstr "²»ÄÜÖ´ÐÐ PGP"
 
-#: pgp.c:1572
+#: pgp.c:1590
 #, 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:1573
+#: pgp.c:1591
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1573
+#: pgp.c:1591
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1575
+#: pgp.c:1593
 #, fuzzy
 msgid "esabifc"
 msgstr "esabif"
@@ -3626,7 +3663,7 @@ msgstr "
 msgid "PGP Key %s."
 msgstr "PGP Ô¿³× %s¡£"
 
-#: pop.c:101 pop_lib.c:201
+#: pop.c:101 pop_lib.c:207
 #, fuzzy, c-format
 msgid "Command TOP is not supported by server."
 msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
@@ -3636,64 +3673,69 @@ msgstr "
 msgid "Can't write header to temporary file!"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
 
-#: pop.c:267 pop_lib.c:203
+#: pop.c:267 pop_lib.c:209
 #, fuzzy, c-format
 msgid "Command UIDL is not supported by server."
 msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
 
-#: pop.c:391 pop.c:761
+#: pop.c:287
+#, c-format
+msgid "%d messages have been lost. Try reopening the mailbox."
+msgstr ""
+
+#: pop.c:402 pop.c:785
 #, c-format
 msgid "%s is an invalid POP path"
 msgstr ""
 
-#: pop.c:429
+#: pop.c:445
 #, fuzzy
 msgid "Fetching list of messages..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: pop.c:587
+#: pop.c:603
 #, fuzzy
 msgid "Can't write message to temporary file!"
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
 
-#: pop.c:646
+#: pop.c:662
 #, fuzzy
 msgid "Marking messages deleted..."
 msgstr "±êÇ©Á赀 %d ·âÐżþɾȥÁË¡­"
 
-#: pop.c:716 pop.c:781
+#: pop.c:740 pop.c:805
 #, fuzzy
 msgid "Checking for new messages..."
 msgstr "×¼±¸×ª¼ÄÐżþ¡­"
 
-#: pop.c:745
+#: pop.c:769
 msgid "POP host is not defined."
 msgstr "POP Ö÷»úûÓỶ¨Òå¡£"
 
-#: pop.c:809
+#: pop.c:833
 msgid "No new mail in POP mailbox."
 msgstr "POP ÐÅÏäÖÐûÓÐеÄÐżþ"
 
-#: pop.c:816
+#: pop.c:840
 #, fuzzy
 msgid "Delete messages from server?"
 msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
 
-#: pop.c:818
+#: pop.c:842
 #, fuzzy, c-format
 msgid "Reading new messages (%d bytes)..."
 msgstr "¶ÁÈ¡ÐÂÐżþ (%d λԪ×é)¡­"
 
-#: pop.c:860
+#: pop.c:884
 msgid "Error while writing mailbox!"
 msgstr "дÈëÐÅÏäʱ·¢Éú´íÎó£¡"
 
-#: pop.c:864
+#: pop.c:888
 #, fuzzy, c-format
 msgid "%s [%d of %d messages read]"
 msgstr "%s [ÒÑÔĶÁ %2d ·âÐżþÖÐµÄ %1d ·â]"
 
-#: pop.c:887 pop_lib.c:369
+#: pop.c:911 pop_lib.c:375
 msgid "Server closed connection!"
 msgstr "ÓëËÅ·þÆ÷µÄÁª½áÖжÏÁË!"
 
@@ -3721,27 +3763,32 @@ msgstr "GSSAPI 
 msgid "Command USER is not supported by server."
 msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
 
-#: pop_lib.c:199
+#: pop_lib.c:54
+#, fuzzy, c-format
+msgid "Invalid POP URL: %s\n"
+msgstr "ÎÞЧµÄÔ·ݣº%s"
+
+#: pop_lib.c:205
 #, fuzzy
 msgid "Unable to leave messages on server."
 msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡­"
 
-#: pop_lib.c:229
+#: pop_lib.c:235
 #, fuzzy, c-format
 msgid "Error connecting to server: %s"
 msgstr "ÕýÁ¬Ïßµ½ %s"
 
-#: pop_lib.c:383
+#: pop_lib.c:389
 #, fuzzy
 msgid "Closing connection to POP server..."
 msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
 
-#: pop_lib.c:553
+#: pop_lib.c:559
 #, fuzzy
 msgid "Verifying message indexes..."
 msgstr "дÈëÐżþµ½ %s ¡­"
 
-#: pop_lib.c:575
+#: pop_lib.c:581
 #, fuzzy
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡­"
@@ -3817,69 +3864,69 @@ msgstr "
 msgid "Print"
 msgstr "ÏÔʾ"
 
-#: recvattach.c:472
+#: recvattach.c:475
 msgid "Saving..."
 msgstr "´¢´æÖС­"
 
-#: recvattach.c:475 recvattach.c:566
+#: recvattach.c:478 recvattach.c:569
 msgid "Attachment saved."
 msgstr "¸½¼þÒѱ»´¢´æ¡£"
 
-#: recvattach.c:578
+#: recvattach.c:581
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "¾¯¸æ! ÄúÕýÔÚ¸²¸Ç %s, ÊÇ·ñÒª¼ÌÐø?"
 
-#: recvattach.c:596
+#: recvattach.c:599
 msgid "Attachment filtered."
 msgstr "¸½¼þ±»¹ýÂ˵ô¡£"
 
-#: recvattach.c:663
+#: recvattach.c:666
 msgid "Filter through: "
 msgstr "¾­¹ý¹ýÂË£º"
 
-#: recvattach.c:663
+#: recvattach.c:666
 msgid "Pipe to: "
 msgstr "µ¼ÒýÖÁ£º"
 
-#: recvattach.c:698
+#: recvattach.c:701
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "ÎÒ²»ÖªµÀÒªÔõô´òÓ¡ %s ¸½¼þ!"
 
-#: recvattach.c:763
+#: recvattach.c:766
 msgid "Print tagged attachment(s)?"
 msgstr "ÊÇ·ñÒª´òÓ¡±ê¼ÇÆðÀ´µÄ¸½¼þ?"
 
-#: recvattach.c:763
+#: recvattach.c:766
 msgid "Print attachment?"
 msgstr "ÊÇ·ñÒª´òÓ¡¸½¼þ?"
 
-#: recvattach.c:996
+#: recvattach.c:999
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
 msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
 
-#: recvattach.c:1008
+#: recvattach.c:1011
 msgid "Attachments"
 msgstr "¸½¼þ"
 
-#: recvattach.c:1044
+#: recvattach.c:1047
 #, fuzzy
 msgid "There are no subparts to show!"
 msgstr "ûÓи½¼þ¡£"
 
-#: recvattach.c:1105
+#: recvattach.c:1108
 #, fuzzy
 msgid "Can't delete attachment from POP server."
 msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
 
-#: recvattach.c:1113
+#: recvattach.c:1116
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "δ֧³Öɾ³ý PGP ÐżþËù¸½´øµÄ¸½¼þ¡£"
 
-#: recvattach.c:1132 recvattach.c:1149
+#: recvattach.c:1135 recvattach.c:1152
 msgid "Only deletion of multipart attachments is supported."
 msgstr "Ö»Ö§³Öɾ³ý¶àÖظ½¼þ"
 
@@ -3887,49 +3934,53 @@ msgstr "ֻ֧
 msgid "You may only bounce message/rfc822 parts."
 msgstr "ÄúÖ»ÄÜÖ±½Ó´«ËÍ message/rfc822 µÄ²¿·Ö¡£"
 
-#: recvcmd.c:213
+#: recvcmd.c:148 recvcmd.c:161
+msgid "Warning: message contains no From: header"
+msgstr ""
+
+#: recvcmd.c:241
 #, fuzzy
 msgid "Error bouncing message!"
 msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
 
-#: recvcmd.c:213
+#: recvcmd.c:241
 #, fuzzy
 msgid "Error bouncing messages!"
 msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
 
-#: recvcmd.c:413
+#: recvcmd.c:441
 #, fuzzy, c-format
 msgid "Can't open temporary file %s."
 msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
 
-#: recvcmd.c:444
+#: recvcmd.c:472
 #, fuzzy
 msgid "Forward as attachments?"
 msgstr "ÏÔʾ MIME ¸½¼þ"
 
-#: recvcmd.c:458
+#: recvcmd.c:486
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
 
-#: recvcmd.c:583
+#: recvcmd.c:611
 msgid "Forward MIME encapsulated?"
 msgstr "Óà MIME µÄ·½Ê½À´×ª¼Ä£¿"
 
-#: recvcmd.c:591 recvcmd.c:841
+#: recvcmd.c:619 recvcmd.c:869
 #, fuzzy, c-format
 msgid "Can't create %s."
 msgstr "ÎÞ·¨½¨Á¢ %s: %s."
 
-#: recvcmd.c:724
+#: recvcmd.c:752
 #, fuzzy
 msgid "Can't find any tagged messages."
 msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
 
-#: recvcmd.c:745 send.c:727
+#: recvcmd.c:773 send.c:738
 msgid "No mailing lists found!"
 msgstr "ûÓÐÕÒµ½ÓʼÄÂÛ̳£¡"
 
-#: recvcmd.c:820
+#: recvcmd.c:848
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
 
@@ -4023,6 +4074,10 @@ msgstr "
 msgid "score: too many arguments"
 msgstr "·ÖÊý£ºÌ«¶àµÄ²ÎÊý"
 
+#: score.c:122
+msgid "Error: score: invalid number"
+msgstr ""
+
 #: send.c:252
 msgid "No subject, abort?"
 msgstr "ûÓбêÌ⣬Ҫ²»ÒªÖжϣ¿"
@@ -4036,12 +4091,12 @@ msgstr "û
 #. * to send a message to only the sender of the message.  This
 #. * provides a way to do that.
 #.
-#: send.c:496
+#: send.c:501
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "Òª»Ø¸²¸ø %s%s?"
 
-#: send.c:530
+#: send.c:535
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "ÒÔºóµÄ»Ø¸²¶¼¼ÄÖÁ %s%s?"
@@ -4049,116 +4104,122 @@ 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:702
+#: send.c:713
 msgid "No tagged messages are visible!"
 msgstr "ûÓб»±ê¼ÇÁ˵ÄÐżþÔÚÏÔʾ£¡"
 
-#: send.c:753
+#: send.c:764
 msgid "Include message in reply?"
 msgstr "»ØÐÅʱÊÇ·ñÒª°üº¬Ô­±¾µÄÐżþÄÚÈÝ£¿"
 
-#: send.c:758
+#: send.c:769
 msgid "Including quoted message..."
 msgstr "ÕýÒýÈëÒýÑÔ²¿·Ö¡­"
 
-#: send.c:768
+#: send.c:779
 msgid "Could not include all requested messages!"
 msgstr "ÎÞ·¨°üº¬ËùÓÐÒªÇóµÄÐżþ£¡"
 
-#: send.c:782
+#: send.c:793
 #, fuzzy
 msgid "Forward as attachment?"
 msgstr "ÊÇ·ñÒª´òÓ¡¸½¼þ?"
 
-#: send.c:786
+#: send.c:797
 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:1116
+#: send.c:1146
 msgid "Recall postponed message?"
 msgstr "Òª½Ð³ö±»ÑÓ³ÙµÄÐżþ?"
 
-#: send.c:1428
+#: send.c:1458
 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "×¼±¸×ª¼ÄÐżþ¡­"
 
-#: send.c:1468
+#: send.c:1498
 msgid "Abort unmodified message?"
 msgstr "ÊÇ·ñÒªÖжÏδÐ޸ĹýµÄÐżþ?"
 
-#: send.c:1470
+#: send.c:1500
 msgid "Aborted unmodified message."
 msgstr "ÖжÏûÓÐÐ޸ĹýµÄÐżþ"
 
-#: send.c:1539
+#: send.c:1569
 msgid "Message postponed."
 msgstr "Ðżþ±»Ñӳټijö¡£"
 
-#: send.c:1548
+#: send.c:1579
 msgid "No recipients are specified!"
 msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕߣ¡"
 
-#: send.c:1553
+#: send.c:1584
 msgid "No recipients were specified."
 msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕß¡£"
 
-#: send.c:1569
+#: send.c:1600
 msgid "No subject, abort sending?"
 msgstr "ûÓÐÐżþ±êÌ⣬ҪÖжϼÄÐŵŤ×÷?"
 
-#: send.c:1573
+#: send.c:1604
 msgid "No subject specified."
 msgstr "ûÓÐÖ¸¶¨±êÌâ¡£"
 
-#: send.c:1635 smtp.c:161
+#: send.c:1666 smtp.c:185
 msgid "Sending message..."
 msgstr "¼Ä³öÐżþÖС­"
 
-#: send.c:1776
+#. check to see if the user wants copies of all attachments
+#: send.c:1699
+#, fuzzy
+msgid "Save attachments in Fcc?"
+msgstr "ÓÃÎÄ×Ö·½Ê½ÏÔʾ¸½¼þÄÚÈÝ"
+
+#: send.c:1808
 msgid "Could not send the message."
 msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
 
-#: send.c:1781
+#: send.c:1813
 msgid "Mail sent."
 msgstr "ÐżþÒѾ­¼Ä³ö¡£"
 
-#: send.c:1781
+#: send.c:1813
 msgid "Sending in background."
 msgstr "ÕýÔÚºǫ́´«ËÍ¡£"
 
-#: sendlib.c:410
+#: sendlib.c:411
 msgid "No boundary parameter found! [report this error]"
 msgstr "ûÓз¢ÏÖ·Ö½ç±äÁ¿£¡[»Ø±¨´íÎó]"
 
-#: sendlib.c:440
+#: sendlib.c:441
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ÒѾ­²»´æÔÚ£¡"
 
-#: sendlib.c:863
+#: sendlib.c:864
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ²»ÊÇÐÅÏä¡£"
 
-#: sendlib.c:1035
+#: sendlib.c:1036
 #, c-format
 msgid "Could not open %s"
 msgstr "ÎÞ·¨´ò¿ª %s"
 
-#: sendlib.c:2226
+#: sendlib.c:2320
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "¼ÄËÍѶϢ³öÏÖ´íÎó£¬×Ó³ÌÐòÒѽáÊø %d (%s)¡£"
 
-#: sendlib.c:2232
+#: sendlib.c:2326
 msgid "Output of the delivery process"
 msgstr "Delivery process µÄÊä³ö"
 
-#: sendlib.c:2396
+#: sendlib.c:2500
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -4273,20 +4334,20 @@ msgstr ""
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
-#: smime.c:1395
+#: smime.c:1396
 msgid "Warning: Intermediate certificate not found."
 msgstr ""
 
-#: smime.c:1438
+#: smime.c:1443
 #, fuzzy
 msgid "Can't open OpenSSL subprocess!"
 msgstr "ÎÞ·¨´ò¿ª OpenSSL ×Ó³ÌÐò£¡"
 
-#: smime.c:1476
+#: smime.c:1483
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1641 smime.c:1766
+#: smime.c:1648 smime.c:1773
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -4295,26 +4356,26 @@ msgstr ""
 "[-- OpenSSL Êä³ö²¿·Ý½áÊø --]\n"
 "\n"
 
-#: smime.c:1725 smime.c:1736
+#: smime.c:1732 smime.c:1743
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ OpenSSL ×Ó³ÌÐò£¡ --]\n"
 
-#: smime.c:1770
+#: smime.c:1777
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- ÏÂÃæÊÇ S/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
 "\n"
 
-#: smime.c:1773
+#: smime.c:1780
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
 "\n"
 
-#: smime.c:1837
+#: smime.c:1844
 #, fuzzy
 msgid ""
 "\n"
@@ -4323,7 +4384,7 @@ msgstr ""
 "\n"
 "[-- S/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
 
-#: smime.c:1839
+#: smime.c:1846
 #, fuzzy
 msgid ""
 "\n"
@@ -4332,7 +4393,7 @@ msgstr ""
 "\n"
 "[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
 
-#: smime.c:1950
+#: smime.c:1957
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
@@ -4340,86 +4401,94 @@ msgstr ""
 "(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, Ñ¡Ôñ (m)ic ÑÝËã·¨ »ò (f)·Å"
 "Æú£¿"
 
-#: smime.c:1951
+#: smime.c:1958
 #, fuzzy
 msgid "eswabfc"
 msgstr "esabif"
 
 #. I use "dra" because "123" is recognized anyway
-#: smime.c:1966
+#: smime.c:1973
 msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
 msgstr ""
 
-#: smime.c:1969
+#: smime.c:1976
 msgid "drac"
 msgstr ""
 
-#: smime.c:1972
+#: smime.c:1979
 msgid "1: DES, 2: Triple-DES "
 msgstr ""
 
-#: smime.c:1973
+#: smime.c:1980
 msgid "dt"
 msgstr ""
 
-#: smime.c:1985
+#: smime.c:1992
 msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 msgstr ""
 
-#: smime.c:1986
+#: smime.c:1993
 msgid "468"
 msgstr ""
 
-#: smime.c:2001
+#: smime.c:2008
 msgid "1: AES128, 2: AES192, 3: AES256 "
 msgstr ""
 
-#: smime.c:2002
+#: smime.c:2009
 msgid "895"
 msgstr ""
 
-#: smtp.c:116
+#: smtp.c:134
 #, fuzzy, c-format
 msgid "SMTP session failed: %s"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: smtp.c:156
+#: smtp.c:180
 #, fuzzy, c-format
 msgid "SMTP session failed: unable to open %s"
 msgstr "µÇÈëʧ°Ü¡£"
 
-#: smtp.c:228
+#: smtp.c:258
 msgid "No from address given"
 msgstr ""
 
-#: smtp.c:284
+#: smtp.c:314
 msgid "SMTP session failed: read error"
 msgstr ""
 
-#: smtp.c:286
+#: smtp.c:316
 msgid "SMTP session failed: write error"
 msgstr ""
 
-#: smtp.c:309
+#: smtp.c:318
+msgid "Invalid server response"
+msgstr ""
+
+#: smtp.c:341
 #, fuzzy, c-format
 msgid "Invalid SMTP URL: %s"
 msgstr "ÎÞЧµÄÔ·ݣº%s"
 
-#: smtp.c:419
+#: smtp.c:451
 msgid "SMTP server does not support authentication"
 msgstr ""
 
-#: smtp.c:427
+#: smtp.c:459
+msgid "Interactive SMTP authentication not supported"
+msgstr ""
+
+#: smtp.c:465
 #, fuzzy
 msgid "SMTP authentication requires SASL"
 msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
 
-#: smtp.c:461
+#: smtp.c:499
 #, fuzzy, c-format
 msgid "%s authentication failed, trying next method"
 msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
 
-#: smtp.c:478
+#: smtp.c:516
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
@@ -5074,7 +5143,8 @@ msgid "use the current message as a template for a new one"
 msgstr "ÓÃÕâ·âÐżþ×÷ΪÐÂÐżþµÄÄ£°å"
 
 #: ../keymap_alldefs.h:157
-msgid "save message/attachment to a file"
+#, fuzzy
+msgid "save message/attachment to a mailbox/file"
 msgstr "´¢´æÐżþ/¸½¼þµ½Ä³¸öÎļþ"
 
 #: ../keymap_alldefs.h:158
@@ -5266,6 +5336,15 @@ msgstr "ߢȡ PGP 
 msgid "show S/MIME options"
 msgstr "ÏÔʾ S/MIME Ñ¡Ïî"
 
+#~ msgid "No search pattern."
+#~ msgstr "ûÓÐËÑÑ°¸ñʽ¡£"
+
+#~ msgid "Reverse search: "
+#~ msgstr "·´ÏòËÑÑ°£º"
+
+#~ msgid "Search: "
+#~ msgstr "ËÑÑ°£º"
+
 #, fuzzy
 #~ msgid "Error checking signature"
 #~ msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"