msgstr ""
"Project-Id-Version: Mutt 1.1.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-17 12:35-0700\n"
+"POT-Creation-Date: 2009-01-05 16:36-0800\n"
"PO-Revision-Date: 1999-12-20 20:41+0800\n"
"Last-Translator: Anthony Wong <ypwong@debian.org>\n"
"Language-Team: Chinese <zh@li.org>\n"
"Content-Type: text/plain; charset=gb2312\n"
"Content-Transfer-Encoding: 8bit\n"
-#: account.c:164
+#: account.c:161
#, fuzzy, c-format
msgid "Username at %s: "
msgstr "¸ü¸ÄÃû³ÆΪ£º"
-#: account.c:223
+#: account.c:220
#, c-format
msgid "Password for %s@%s: "
msgstr "%s@%s µÄÃÜÂ룺"
-#: addrbook.c:37 browser.c:45 pager.c:1480 postpone.c:43 query.c:49
-#: recvattach.c:54
+#: addrbook.c:37 browser.c:45 pager.c:1479 postpone.c:41 query.c:48
+#: recvattach.c:53
msgid "Exit"
msgstr "À뿪"
-#: addrbook.c:38 curs_main.c:408 pager.c:1487 postpone.c:44
+#: addrbook.c:38 curs_main.c:406 pager.c:1486 postpone.c:42
msgid "Del"
msgstr "ɾ³ý"
-#: addrbook.c:39 curs_main.c:409 postpone.c:45
+#: addrbook.c:39 curs_main.c:407 postpone.c:43
msgid "Undel"
msgstr "·´É¾³ý"
msgstr "Ñ¡Ôñ"
#. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3647 curs_main.c:414
-#: mutt_ssl.c:679 mutt_ssl_gnutls.c:783 pager.c:1579 pgpkey.c:522
-#: postpone.c:46 query.c:54 recvattach.c:58 smime.c:437
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3832 curs_main.c:412
+#: mutt_ssl.c:899 mutt_ssl_gnutls.c:805 pager.c:1578 pgpkey.c:522
+#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:437
msgid "Help"
msgstr "°ïÖú"
msgid "You have no aliases!"
msgstr "ÄúûÓбðÃû×ÊÁÏ£¡"
-#: addrbook.c:156
+#: addrbook.c:155
msgid "Aliases"
msgstr "±ðÃû"
#. add a new alias
-#: alias.c:246
+#: alias.c:260
msgid "Alias as: "
msgstr "È¡±ðÃûΪ£º"
-#: alias.c:252
+#: alias.c:266
msgid "You already have an alias defined with that name!"
msgstr "ÄúÒѾΪÕâ¸öÃû×Ö¶¨ÒåÁ˱ðÃûÀ²£¡"
-#: alias.c:258
+#: alias.c:272
msgid "Warning: This alias name may not work. Fix it?"
msgstr ""
-#: alias.c:283
+#: alias.c:297
msgid "Address: "
msgstr "µØÖ·£º"
-#: alias.c:293 send.c:207
+#: alias.c:307 send.c:206
#, c-format
msgid "Error: '%s' is a bad IDN."
msgstr ""
-#: alias.c:305
+#: alias.c:319
msgid "Personal name: "
msgstr "¸öÈËÐÕÃû£º"
-#: alias.c:314
+#: alias.c:328
#, c-format
msgid "[%s = %s] Accept?"
msgstr "[%s = %s] ½ÓÊÜ?"
-#: alias.c:331 recvattach.c:432 recvattach.c:455 recvattach.c:468
-#: recvattach.c:481 recvattach.c:511
+#: alias.c:347 recvattach.c:431 recvattach.c:454 recvattach.c:467
+#: recvattach.c:480 recvattach.c:510
msgid "Save to file: "
msgstr "´æµ½Îļþ£º"
-#: alias.c:345
+#: alias.c:361
#, fuzzy
msgid "Error reading alias file"
msgstr "¶ÁÈ¡Ðżþʱ·¢Éú´íÎó£¡"
-#: alias.c:364
+#: alias.c:382
msgid "Alias added."
msgstr "±ðÃûÒѾÔö¼Ó¡£"
-#: alias.c:372
+#: alias.c:390
#, fuzzy
msgid "Error seeking in alias file"
msgstr "ÎÞ·¨ÊÔÖøÏÔʾÎļþ"
-#: attach.c:113 attach.c:245 attach.c:477 attach.c:968
+#: attach.c:113 attach.c:245 attach.c:477 attach.c:969
msgid "Can't match nametemplate, continue?"
msgstr "ÎÞ·¨Æ¥ÅäÃû³ÆÄ£°å£¬¼ÌÐø£¿"
msgid "Mailcap compose entry requires %%s"
msgstr "Mailcap ±à¼ÏîÄ¿ÐèÒª %%s"
-#: attach.c:134 attach.c:266 commands.c:223 compose.c:1183 curs_lib.c:179
-#: curs_lib.c:533
+#: attach.c:134 attach.c:266 commands.c:223 compose.c:1182 curs_lib.c:177
+#: curs_lib.c:543
#, c-format
msgid "Error running \"%s\"!"
msgstr "Ö´ÐÐ \"%s\" ʱ·¢Éú´íÎó£¡"
msgid "Cannot create filter"
msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
-#: attach.c:676 attach.c:708 attach.c:1001 attach.c:1059 handler.c:1279
-#: pgpkey.c:571 pgpkey.c:760
+#: attach.c:677 attach.c:709 attach.c:1002 attach.c:1060 handler.c:1304
+#: pgpkey.c:570 pgpkey.c:759
msgid "Can't create filter"
msgstr "ÎÞ·¨½¨Á¢¹ýÂË"
-#: attach.c:840
+#: attach.c:841
msgid "Write fault!"
msgstr "дÈëʧ°Ü£¡"
-#: attach.c:1082
+#: attach.c:1083
msgid "I don't know how to print that!"
msgstr "ÎÒ²»ÖªµÀÒªÈçºÎ´òÓ¡Ëü£¡"
msgid "Mask"
msgstr "ÕÚÕÖ"
-#: browser.c:383 browser.c:1022
+#: browser.c:383 browser.c:1023
#, c-format
msgid "%s is not a directory."
msgstr "%s ²»ÊÇÒ»¸öĿ¼"
msgid "Can't attach a directory!"
msgstr "ÎÞ·¨¸½´øĿ¼£¡"
-#: browser.c:670 browser.c:1091 browser.c:1189
+#: browser.c:669 browser.c:1092 browser.c:1190
msgid "No files match the file mask"
msgstr "ûÓÐÎļþÓëÎļþÕÚÕÖÏà·û"
-#: browser.c:876
+#: browser.c:873
#, fuzzy
msgid "Create is only supported for IMAP mailboxes"
msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
msgid "Rename is only supported for IMAP mailboxes"
msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
-#: browser.c:919
+#: browser.c:920
msgid "Delete is only supported for IMAP mailboxes"
msgstr "Ö»ÓÐ IMAP ÓÊÏä²ÅÖ§³Öɾ³ý"
-#: browser.c:929
+#: browser.c:930
#, fuzzy
msgid "Cannot delete root folder"
msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
-#: browser.c:932
+#: browser.c:933
#, c-format
msgid "Really delete mailbox \"%s\"?"
msgstr "ÕæµÄҪɾ³ý \"%s\" ÓÊÏ䣿"
-#: browser.c:946
+#: browser.c:947
msgid "Mailbox deleted."
msgstr "ÓÊÏäÒÑɾ³ý¡£"
-#: browser.c:952
+#: browser.c:953
msgid "Mailbox not deleted."
msgstr "ÓÊÏäδ±»É¾³ý¡£"
-#: browser.c:971
+#: browser.c:972
msgid "Chdir to: "
msgstr "¸Ä±äĿ¼µ½£º"
-#: browser.c:1010 browser.c:1084
+#: browser.c:1011 browser.c:1085
msgid "Error scanning directory."
msgstr "ÎÞ·¨É¨ÃèĿ¼¡£"
-#: browser.c:1034
+#: browser.c:1035
msgid "File Mask: "
msgstr "ÎļþÕÚÕÖ£º"
-#: browser.c:1107
+#: browser.c:1108
msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
msgstr "·´ÏòÅÅÐò (d)ÈÕÆÚ, (a)×ÖÔª, (z)´óС »ò (n)²»ÅÅÐò ? "
-#: browser.c:1108
+#: browser.c:1109
msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
msgstr "ÒÀÕÕ (d)ÈÕÆÚ (a)×ÖÔª (z)´óС À´ÅÅÐò£¬»ò(n)²»ÅÅÐò ? "
-#: browser.c:1109
+#: browser.c:1110
msgid "dazn"
msgstr ""
-#: browser.c:1176
+#: browser.c:1177
msgid "New file name: "
msgstr "еµÃû£º"
-#: browser.c:1207
+#: browser.c:1208
msgid "Can't view a directory"
msgstr "ÎÞ·¨ÏÔʾĿ¼"
-#: browser.c:1224
+#: browser.c:1225
msgid "Error trying to view file"
msgstr "ÎÞ·¨ÊÔÖøÏÔʾÎļþ"
msgid "%s: no such attribute"
msgstr "%s£ºÃ»ÓÐÕâ¸öÊôÐÔ"
-#: color.c:700 hook.c:69 hook.c:77 keymap.c:751
+#: color.c:700 hook.c:69 hook.c:77 keymap.c:776
msgid "too few arguments"
msgstr "Ì«ÉÙ²ÎÊý"
msgid "Command: "
msgstr "Ö¸Á"
-#: commands.c:250 recvcmd.c:147
+#: commands.c:250 recvcmd.c:143
msgid "Bounce message to: "
msgstr "Ö±½Ó´«ËÍÓʼþµ½£º"
-#: commands.c:252 recvcmd.c:149
+#: commands.c:252 recvcmd.c:145
msgid "Bounce tagged messages to: "
msgstr "ÎÞ·¨´«ËÍÒѱê¼ÇµÄÓʼþÖÁ£º"
-#: commands.c:267 recvcmd.c:158
+#: commands.c:267 recvcmd.c:154
msgid "Error parsing address!"
msgstr "ÎÞ·¨·ÖÎöλַ£¡"
-#: commands.c:275 recvcmd.c:166
+#: commands.c:275 recvcmd.c:162
#, c-format
msgid "Bad IDN: '%s'"
msgstr ""
-#: commands.c:286 recvcmd.c:180
+#: commands.c:286 recvcmd.c:176
#, c-format
msgid "Bounce message to %s"
msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
-#: commands.c:286 recvcmd.c:180
+#: commands.c:286 recvcmd.c:176
#, c-format
msgid "Bounce messages to %s"
msgstr "°ÑÓʼþÖ±½Ó´«ËÍÖÁ %s"
-#: commands.c:302 recvcmd.c:196
+#: commands.c:302 recvcmd.c:192
#, fuzzy
msgid "Message not bounced."
msgstr "ÓʼþÒѱ»´«ËÍ¡£"
-#: commands.c:302 recvcmd.c:196
+#: commands.c:302 recvcmd.c:192
#, fuzzy
msgid "Messages not bounced."
msgstr "ÓʼþÒÑ´«ËÍ¡£"
-#: commands.c:312 recvcmd.c:215
+#: commands.c:312 recvcmd.c:211
msgid "Message bounced."
msgstr "ÓʼþÒѱ»´«ËÍ¡£"
-#: commands.c:312 recvcmd.c:215
+#: commands.c:312 recvcmd.c:211
msgid "Messages bounced."
msgstr "ÓʼþÒÑ´«ËÍ¡£"
msgid "Abort"
msgstr "ÖжÏ"
-#: compose.c:94 compose.c:668
+#: compose.c:94 compose.c:667
msgid "Attach file"
msgstr "¸½¼ÓÎļþ"
msgid "You may not delete the only attachment."
msgstr "Äú²»¿ÉÒÔɾ³ýΨһµÄ¸½¼þ¡£"
-#: compose.c:601 send.c:1561
+#: compose.c:600 send.c:1560
#, c-format
msgid "Bad IDN in \"%s\": '%s'"
msgstr ""
-#: compose.c:684
+#: compose.c:683
msgid "Attaching selected files..."
msgstr "ÕýÔÚ¸½¼ÓÑ¡È¡Á˵ÄÎļþ¡"
-#: compose.c:696
+#: compose.c:695
#, c-format
msgid "Unable to attach %s!"
msgstr "ÎÞ·¨¸½¼Ó %s£¡"
-#: compose.c:715
+#: compose.c:714
msgid "Open mailbox to attach message from"
msgstr "´ò¿ªÐÅÏä²¢´ÓËüÑ¡Ôñ¸½¼ÓµÄÐżþ"
-#: compose.c:753
+#: compose.c:752
msgid "No messages in that folder."
msgstr "Îļþ¼ÐÖÐûÓÐÐżþ¡£"
-#: compose.c:762
+#: compose.c:761
msgid "Tag the messages you want to attach!"
msgstr "Çë±ê¼ÇÄúÒª¸½¼ÓµÄÐżþ£¡"
-#: compose.c:794
+#: compose.c:793
msgid "Unable to attach!"
msgstr "ÎÞ·¨¸½¼Ó£¡"
-#: compose.c:845
+#: compose.c:844
msgid "Recoding only affects text attachments."
msgstr "Ö»ÖØбàÂëÊÜÓ°ÏìµÄÎÄ×Ö¸½¼þ"
-#: compose.c:850
+#: compose.c:849
msgid "The current attachment won't be converted."
msgstr "Õâ¸ö¸½¼þ²»»á±»×ª»»¡£"
-#: compose.c:852
+#: compose.c:851
msgid "The current attachment will be converted."
msgstr "Õâ¸ö¸½¼þ»á±»×ª»»¡£"
-#: compose.c:927
+#: compose.c:926
msgid "Invalid encoding."
msgstr "ÎÞЧµÄ±àÂë¡£"
-#: compose.c:953
+#: compose.c:952
msgid "Save a copy of this message?"
msgstr "´¢´æÕâ·âÐżþµÄ¿½±´Âð£¿"
-#: compose.c:1009
+#: compose.c:1008
msgid "Rename to: "
msgstr "¸ü¸ÄÃû³ÆΪ£º"
-#: compose.c:1014 editmsg.c:96 editmsg.c:121 sendlib.c:857
+#: compose.c:1013 editmsg.c:96 editmsg.c:121 sendlib.c:857
#, fuzzy, c-format
msgid "Can't stat %s: %s"
msgstr "ÎÞ·¨¶ÁÈ¡£º%s"
-#: compose.c:1041
+#: compose.c:1040
msgid "New file: "
msgstr "½¨Á¢Ðµµ£º"
-#: compose.c:1054
+#: compose.c:1053
msgid "Content-Type is of the form base/sub"
msgstr "Content-Type µÄ¸ñʽÊÇ base/sub"
-#: compose.c:1060
+#: compose.c:1059
#, c-format
msgid "Unknown Content-Type %s"
msgstr "²»Ã÷µÄ Content-Type %s"
-#: compose.c:1073
+#: compose.c:1072
#, c-format
msgid "Can't create file %s"
msgstr "ÎÞ·¨½¨Á¢Îļþ %s"
-#: compose.c:1081
+#: compose.c:1080
msgid "What we have here is a failure to make an attachment"
msgstr "ÎÒÃÇÎÞ·¨¼ÓÉϸ½¼þ"
-#: compose.c:1142
+#: compose.c:1141
msgid "Postpone this message?"
msgstr "ÑӳټijöÕâ·âÐżþ£¿"
-#: compose.c:1201
+#: compose.c:1200
msgid "Write message to mailbox"
msgstr "½«ÐżþдÈëµ½ÐÅÏä"
-#: compose.c:1204
+#: compose.c:1203
#, c-format
msgid "Writing message to %s ..."
msgstr "дÈëÐżþµ½ %s ¡"
-#: compose.c:1213
+#: compose.c:1212
msgid "Message written."
msgstr "ÐżþÒÑдÈë¡£"
-#: compose.c:1225
+#: compose.c:1224
msgid "S/MIME already selected. Clear & continue ? "
msgstr ""
-#: compose.c:1251
+#: compose.c:1250
msgid "PGP already selected. Clear & continue ? "
msgstr ""
-#: crypt-gpgme.c:345
+#: crypt-gpgme.c:358
#, fuzzy, c-format
msgid "error creating gpgme context: %s\n"
msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
-#: crypt-gpgme.c:355
+#: crypt-gpgme.c:368
#, c-format
msgid "error enabling CMS protocol: %s\n"
msgstr ""
-#: crypt-gpgme.c:375
+#: crypt-gpgme.c:388
#, fuzzy, c-format
msgid "error creating gpgme data object: %s\n"
msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
-#: crypt-gpgme.c:441 crypt-gpgme.c:459 crypt-gpgme.c:1400
+#: crypt-gpgme.c:454 crypt-gpgme.c:472 crypt-gpgme.c:1431
#, fuzzy, c-format
msgid "error allocating data object: %s\n"
msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
-#: crypt-gpgme.c:477
+#: crypt-gpgme.c:490
#, fuzzy, c-format
msgid "error rewinding data object: %s\n"
msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
-#: crypt-gpgme.c:499 crypt-gpgme.c:546
+#: crypt-gpgme.c:512 crypt-gpgme.c:559
#, fuzzy, c-format
msgid "error reading data object: %s\n"
msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
-#: crypt-gpgme.c:607
+#: crypt-gpgme.c:620
#, fuzzy, c-format
msgid "error adding recipient `%s': %s\n"
msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
-#: crypt-gpgme.c:645
+#: crypt-gpgme.c:658
#, c-format
msgid "secret key `%s' not found: %s\n"
msgstr ""
-#: crypt-gpgme.c:655
+#: crypt-gpgme.c:668
#, c-format
msgid "ambiguous specification of secret key `%s'\n"
msgstr ""
-#: crypt-gpgme.c:667
+#: crypt-gpgme.c:680
#, c-format
msgid "error setting secret key `%s': %s\n"
msgstr ""
-#: crypt-gpgme.c:684
+#: crypt-gpgme.c:697
#, fuzzy, c-format
msgid "error setting PKA signature notation: %s\n"
msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
-#: crypt-gpgme.c:740
+#: crypt-gpgme.c:753
#, fuzzy, c-format
msgid "error encrypting data: %s\n"
msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
-#: crypt-gpgme.c:850
+#: crypt-gpgme.c:870
#, fuzzy, c-format
msgid "error signing data: %s\n"
msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
-#: crypt-gpgme.c:1045
+#: crypt-gpgme.c:1065
msgid "Warning: One of the keys has been revoked\n"
msgstr ""
-#: crypt-gpgme.c:1054
+#: crypt-gpgme.c:1074
msgid "Warning: The key used to create the signature expired at: "
msgstr ""
-#: crypt-gpgme.c:1060
+#: crypt-gpgme.c:1080
msgid "Warning: At least one certification key has expired\n"
msgstr ""
-#: crypt-gpgme.c:1076
+#: crypt-gpgme.c:1096
msgid "Warning: The signature expired at: "
msgstr ""
-#: crypt-gpgme.c:1082
+#: crypt-gpgme.c:1102
msgid "Can't verify due to a missing key or certificate\n"
msgstr ""
-#: crypt-gpgme.c:1087
+#: crypt-gpgme.c:1107
#, fuzzy
msgid "The CRL is not available\n"
msgstr "Ö÷Ðżþ²»´æÔÚ¡£"
-#: crypt-gpgme.c:1093
+#: crypt-gpgme.c:1113
msgid "Available CRL is too old\n"
msgstr ""
-#: crypt-gpgme.c:1098
+#: crypt-gpgme.c:1118
msgid "A policy requirement was not met\n"
msgstr ""
-#: crypt-gpgme.c:1107
+#: crypt-gpgme.c:1127
msgid "A system error occurred"
msgstr ""
-#: crypt-gpgme.c:1141
+#: crypt-gpgme.c:1161
msgid "WARNING: PKA entry does not match signer's address: "
msgstr ""
-#: crypt-gpgme.c:1148
+#: crypt-gpgme.c:1168
msgid "PKA verified signer's address is: "
msgstr ""
-#: crypt-gpgme.c:1165 crypt-gpgme.c:3114
+#: crypt-gpgme.c:1185 crypt-gpgme.c:3299
msgid "Fingerprint: "
msgstr ""
-#: crypt-gpgme.c:1225
+#: crypt-gpgme.c:1245
msgid ""
"WARNING: We have NO indication whether the key belongs to the person named "
"as shown above\n"
msgstr ""
-#: crypt-gpgme.c:1232
+#: crypt-gpgme.c:1252
msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
msgstr ""
-#: crypt-gpgme.c:1236
+#: crypt-gpgme.c:1256
msgid ""
"WARNING: It is NOT certain that the key belongs to the person named as shown "
"above\n"
msgstr ""
-#: crypt-gpgme.c:1311
+#: crypt-gpgme.c:1286
+msgid "aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1297
+#, fuzzy
+msgid "created: "
+msgstr "½¨Á¢ %s£¿"
+
+#: crypt-gpgme.c:1362
msgid "Error getting key information: "
msgstr ""
#. 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:1318 crypt-gpgme.c:1351
-msgid "Good signature from: "
+#: crypt-gpgme.c:1369 crypt-gpgme.c:1384
+msgid "Good signature from:"
msgstr ""
-#: crypt-gpgme.c:1328
-msgid " aka: "
+#: crypt-gpgme.c:1376
+msgid "*BAD* signature from:"
msgstr ""
-#: crypt-gpgme.c:1332 crypt-gpgme.c:1354
-msgid " created: "
+#: crypt-gpgme.c:1392
+msgid "Problem signature from:"
msgstr ""
-#: crypt-gpgme.c:1341
-msgid "*BAD* signature claimed to be from: "
+#: crypt-gpgme.c:1393
+msgid " expires: "
msgstr ""
-#: crypt-gpgme.c:1364
-#, fuzzy
-msgid "Error checking signature"
-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:1408 crypt-gpgme.c:1623 crypt-gpgme.c:2108
+#: crypt-gpgme.c:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2290
msgid "[-- Begin signature information --]\n"
msgstr ""
-#: crypt-gpgme.c:1417
+#: crypt-gpgme.c:1448
#, fuzzy, c-format
msgid "Error: verification failed: %s\n"
msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
-#: crypt-gpgme.c:1466
+#: crypt-gpgme.c:1497
#, c-format
msgid "*** Begin Notation (signature by: %s) ***\n"
msgstr ""
-#: crypt-gpgme.c:1488
+#: crypt-gpgme.c:1519
msgid "*** End Notation ***\n"
msgstr ""
-#: crypt-gpgme.c:1496 crypt-gpgme.c:1636 crypt-gpgme.c:2123
+#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2305
#, fuzzy
msgid ""
"[-- End signature information --]\n"
"\n"
"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
-#: crypt-gpgme.c:1591
+#: crypt-gpgme.c:1622
#, fuzzy, c-format
msgid ""
"[-- Error: decryption failed: %s --]\n"
"\n"
msgstr "[-- ´íÎó£ºÍ»·¢µÄµµÎ²£¡ --]\n"
-#: crypt-gpgme.c:2083
+#: crypt-gpgme.c:2082
+#, fuzzy, c-format
+msgid "Error extracting key data!\n"
+msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
+
+#: crypt-gpgme.c:2265
#, c-format
msgid "Error: decryption/verification failed: %s\n"
msgstr ""
-#: crypt-gpgme.c:2131
+#: crypt-gpgme.c:2313
msgid "Error: copy data failed\n"
msgstr ""
-#: crypt-gpgme.c:2151 pgp.c:428
+#: crypt-gpgme.c:2333 pgp.c:427
msgid ""
"[-- BEGIN PGP MESSAGE --]\n"
"\n"
"[-- PGP Ðżþ¿ªÊ¼ --]\n"
"\n"
-#: crypt-gpgme.c:2153 pgp.c:430
+#: crypt-gpgme.c:2335 pgp.c:429
msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î¿ªÊ¼ --]\n"
-#: crypt-gpgme.c:2156 pgp.c:432
+#: crypt-gpgme.c:2338 pgp.c:431
msgid ""
"[-- BEGIN PGP SIGNED MESSAGE --]\n"
"\n"
"[-- PGP Ç©ÃûµÄÐżþ¿ªÊ¼ --]\n"
"\n"
-#: crypt-gpgme.c:2183 pgp.c:458
+#: crypt-gpgme.c:2365 pgp.c:457
#, fuzzy
msgid "[-- END PGP MESSAGE --]\n"
msgstr ""
"\n"
"[-- PGP Ðżþ½áÊø --]\n"
-#: crypt-gpgme.c:2185 pgp.c:465
+#: crypt-gpgme.c:2367 pgp.c:464
msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
msgstr "[-- PGP ¹«¹²Ô¿³×Çø¶Î½áÊø --]\n"
-#: crypt-gpgme.c:2187 pgp.c:467
+#: crypt-gpgme.c:2369 pgp.c:466
#, fuzzy
msgid "[-- END PGP SIGNED MESSAGE --]\n"
msgstr ""
"\n"
"[-- PGP Ç©ÃûµÄÐżþ½áÊø --]\n"
-#: crypt-gpgme.c:2208 pgp.c:497
+#: crypt-gpgme.c:2393 pgp.c:499
msgid ""
"[-- Error: could not find beginning of PGP message! --]\n"
"\n"
"[-- ´íÎó£ºÕÒ²»µ½ PGP ÐżþµÄ¿ªÍ·£¡ --]\n"
"\n"
-#: crypt-gpgme.c:2239 pgp.c:926
+#: crypt-gpgme.c:2424 pgp.c:931
msgid ""
"[-- Error: malformed PGP/MIME message! --]\n"
"\n"
"[-- ´íÎ󣺲»ÕýÈ·µÄ PGP/MIME Ðżþ£¡ --]\n"
"\n"
-#: crypt-gpgme.c:2251 crypt-gpgme.c:2317 pgp.c:939
+#: crypt-gpgme.c:2436 crypt-gpgme.c:2502 pgp.c:944
msgid "[-- Error: could not create temporary file! --]\n"
msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ÔÝ´æµµ£¡ --]\n"
-#: crypt-gpgme.c:2263
+#: crypt-gpgme.c:2448
#, fuzzy
msgid ""
"[-- The following data is PGP/MIME signed and encrypted --]\n"
"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
"\n"
-#: crypt-gpgme.c:2264 pgp.c:948
+#: crypt-gpgme.c:2449 pgp.c:953
msgid ""
"[-- The following data is PGP/MIME encrypted --]\n"
"\n"
"[-- ÏÂÃæÊÇ PGP/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
"\n"
-#: crypt-gpgme.c:2286
+#: crypt-gpgme.c:2471
#, fuzzy
msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
msgstr ""
"\n"
"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
-#: crypt-gpgme.c:2287 pgp.c:968
+#: crypt-gpgme.c:2472 pgp.c:973
#, fuzzy
msgid "[-- End of PGP/MIME encrypted data --]\n"
msgstr ""
"\n"
"[-- PGP/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
-#: crypt-gpgme.c:2329
+#: crypt-gpgme.c:2514
#, fuzzy
msgid ""
"[-- The following data is S/MIME signed --]\n"
"[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
"\n"
-#: crypt-gpgme.c:2330
+#: crypt-gpgme.c:2515
#, fuzzy
msgid ""
"[-- The following data is S/MIME encrypted --]\n"
"[-- ÏÂÃæÊÇ S/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
"\n"
-#: crypt-gpgme.c:2360
+#: crypt-gpgme.c:2545
#, fuzzy
msgid "[-- End of S/MIME signed data --]\n"
msgstr ""
"\n"
"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
-#: crypt-gpgme.c:2361
+#: crypt-gpgme.c:2546
#, fuzzy
msgid "[-- End of S/MIME encrypted data --]\n"
msgstr ""
"\n"
"[-- S/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
-#: crypt-gpgme.c:2954
+#: crypt-gpgme.c:3139
msgid "[Can't display this user ID (unknown encoding)]"
msgstr ""
-#: crypt-gpgme.c:2956
+#: crypt-gpgme.c:3141
msgid "[Can't display this user ID (invalid encoding)]"
msgstr ""
-#: crypt-gpgme.c:2961
+#: crypt-gpgme.c:3146
msgid "[Can't display this user ID (invalid DN)]"
msgstr ""
-#: crypt-gpgme.c:3040
+#: crypt-gpgme.c:3225
msgid " aka ......: "
msgstr ""
-#: crypt-gpgme.c:3040
+#: crypt-gpgme.c:3225
msgid "Name ......: "
msgstr ""
-#: crypt-gpgme.c:3043 crypt-gpgme.c:3182
+#: crypt-gpgme.c:3228 crypt-gpgme.c:3367
#, fuzzy
msgid "[Invalid]"
msgstr "ÎÞЧµÄÔ·ݣº%s"
-#: crypt-gpgme.c:3063 crypt-gpgme.c:3206
+#: crypt-gpgme.c:3248 crypt-gpgme.c:3391
#, fuzzy, c-format
msgid "Valid From : %s\n"
msgstr "ÎÞЧµÄÔ·ݣº%s"
-#: crypt-gpgme.c:3076 crypt-gpgme.c:3219
+#: crypt-gpgme.c:3261 crypt-gpgme.c:3404
#, fuzzy, c-format
msgid "Valid To ..: %s\n"
msgstr "ÎÞЧµÄÔ·ݣº%s"
-#: crypt-gpgme.c:3089 crypt-gpgme.c:3232
+#: crypt-gpgme.c:3274 crypt-gpgme.c:3417
#, c-format
msgid "Key Type ..: %s, %lu bit %s\n"
msgstr ""
-#: crypt-gpgme.c:3091 crypt-gpgme.c:3234
+#: crypt-gpgme.c:3276 crypt-gpgme.c:3419
#, c-format
msgid "Key Usage .: "
msgstr ""
-#: crypt-gpgme.c:3096 crypt-gpgme.c:3239
+#: crypt-gpgme.c:3281 crypt-gpgme.c:3424
#, fuzzy
msgid "encryption"
msgstr "¼ÓÃÜ"
-#: crypt-gpgme.c:3097 crypt-gpgme.c:3102 crypt-gpgme.c:3107 crypt-gpgme.c:3240
-#: crypt-gpgme.c:3245 crypt-gpgme.c:3250
+#: crypt-gpgme.c:3282 crypt-gpgme.c:3287 crypt-gpgme.c:3292 crypt-gpgme.c:3425
+#: crypt-gpgme.c:3430 crypt-gpgme.c:3435
msgid ", "
msgstr ""
-#: crypt-gpgme.c:3101 crypt-gpgme.c:3244
+#: crypt-gpgme.c:3286 crypt-gpgme.c:3429
msgid "signing"
msgstr ""
-#: crypt-gpgme.c:3106 crypt-gpgme.c:3249
+#: crypt-gpgme.c:3291 crypt-gpgme.c:3434
msgid "certification"
msgstr ""
-#: crypt-gpgme.c:3146
+#: crypt-gpgme.c:3331
#, c-format
msgid "Serial-No .: 0x%s\n"
msgstr ""
-#: crypt-gpgme.c:3154
+#: crypt-gpgme.c:3339
#, c-format
msgid "Issued By .: "
msgstr ""
#. display only the short keyID
-#: crypt-gpgme.c:3173
+#: crypt-gpgme.c:3358
#, fuzzy, c-format
msgid "Subkey ....: 0x%s"
msgstr "Ô¿³× ID£º0x%s"
-#: crypt-gpgme.c:3177
+#: crypt-gpgme.c:3362
msgid "[Revoked]"
msgstr ""
-#: crypt-gpgme.c:3187
+#: crypt-gpgme.c:3372
#, fuzzy
msgid "[Expired]"
msgstr "À뿪 "
-#: crypt-gpgme.c:3192
+#: crypt-gpgme.c:3377
msgid "[Disabled]"
msgstr ""
-#: crypt-gpgme.c:3276 pgpkey.c:560 pgpkey.c:740
+#: crypt-gpgme.c:3461 pgpkey.c:559 pgpkey.c:739
msgid "Can't create temporary file"
msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
-#: crypt-gpgme.c:3279
+#: crypt-gpgme.c:3464
#, fuzzy
msgid "Collecting data..."
msgstr "ÕýÁ¬½Óµ½ %s¡"
-#: crypt-gpgme.c:3305
+#: crypt-gpgme.c:3490
#, fuzzy, c-format
msgid "Error finding issuer key: %s\n"
msgstr "ÕýÁ¬Ïßµ½ %s"
-#: crypt-gpgme.c:3315
+#: crypt-gpgme.c:3500
msgid "Error: certification chain to long - stopping here\n"
msgstr ""
-#: crypt-gpgme.c:3326 pgpkey.c:581
+#: crypt-gpgme.c:3511 pgpkey.c:580
#, c-format
msgid "Key ID: 0x%s"
msgstr "Ô¿³× ID£º0x%s"
-#: crypt-gpgme.c:3409
+#: crypt-gpgme.c:3594
#, fuzzy, c-format
msgid "gpgme_new failed: %s"
msgstr "µÇÈëʧ°Ü¡£"
-#: crypt-gpgme.c:3448 crypt-gpgme.c:3511
+#: crypt-gpgme.c:3633 crypt-gpgme.c:3696
#, c-format
msgid "gpgme_op_keylist_start failed: %s"
msgstr ""
-#: crypt-gpgme.c:3498 crypt-gpgme.c:3539
+#: crypt-gpgme.c:3683 crypt-gpgme.c:3724
#, c-format
msgid "gpgme_op_keylist_next failed: %s"
msgstr ""
-#: crypt-gpgme.c:3610
+#: crypt-gpgme.c:3795
#, fuzzy
msgid "All matching keys are marked expired/revoked."
msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
-#: crypt-gpgme.c:3639 mutt_ssl.c:677 mutt_ssl_gnutls.c:781 pgpkey.c:515
+#: crypt-gpgme.c:3824 mutt_ssl.c:897 mutt_ssl_gnutls.c:803 pgpkey.c:515
#: smime.c:432
msgid "Exit "
msgstr "À뿪 "
#. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3641 pgpkey.c:517 smime.c:434
+#: crypt-gpgme.c:3826 pgpkey.c:517 smime.c:434
msgid "Select "
msgstr "Ñ¡Ôñ "
#. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3644 pgpkey.c:520
+#: crypt-gpgme.c:3829 pgpkey.c:520
msgid "Check key "
msgstr "¼ì²éÔ¿³× "
-#: crypt-gpgme.c:3661
+#: crypt-gpgme.c:3845
#, fuzzy
msgid "PGP and S/MIME keys matching"
msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
-#: crypt-gpgme.c:3663
+#: crypt-gpgme.c:3847
#, fuzzy
msgid "PGP keys matching"
msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
-#: crypt-gpgme.c:3665
+#: crypt-gpgme.c:3849
#, fuzzy
msgid "S/MIME keys matching"
msgstr "S/MIME Ô¿³×·ûºÏ <%s>¡£"
-#: crypt-gpgme.c:3667
+#: crypt-gpgme.c:3851
#, fuzzy
msgid "keys matching"
msgstr "PGP Ô¿³×·ûºÏ <%s>¡£"
-#: crypt-gpgme.c:3670
+#: crypt-gpgme.c:3854
#, c-format
msgid "%s <%s>."
msgstr ""
-#: crypt-gpgme.c:3672
+#: crypt-gpgme.c:3856
#, c-format
msgid "%s \"%s\"."
msgstr ""
-#: crypt-gpgme.c:3699 pgpkey.c:601
+#: crypt-gpgme.c:3883 pgpkey.c:600
msgid "This key can't be used: expired/disabled/revoked."
msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
-#: crypt-gpgme.c:3713 pgpkey.c:613
+#: crypt-gpgme.c:3897 pgpkey.c:612
#, fuzzy
msgid "ID is expired/disabled/revoked."
msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
-#: crypt-gpgme.c:3733 pgpkey.c:617
+#: crypt-gpgme.c:3917 pgpkey.c:616
msgid "ID has undefined validity."
msgstr ""
-#: crypt-gpgme.c:3736 pgpkey.c:620
+#: crypt-gpgme.c:3920 pgpkey.c:619
#, fuzzy
msgid "ID is not valid."
msgstr "Õâ¸ö ID ²»±»ÐÅÈΡ£"
-#: crypt-gpgme.c:3739 pgpkey.c:623
+#: crypt-gpgme.c:3923 pgpkey.c:622
#, fuzzy
msgid "ID is only marginally valid."
msgstr "´Ë ID Ö»ÊÇÃãÇ¿±»ÐÅÈΡ£"
-#: crypt-gpgme.c:3747 pgpkey.c:627
+#: crypt-gpgme.c:3931 pgpkey.c:626
#, fuzzy, c-format
msgid "%s Do you really want to use the key?"
msgstr "%s ÄúÕæµÄҪʹÓÃËü£¿"
-#: crypt-gpgme.c:3804 crypt-gpgme.c:3917 pgpkey.c:840 pgpkey.c:956
+#: crypt-gpgme.c:3988 crypt-gpgme.c:4101 pgpkey.c:834 pgpkey.c:935
#, c-format
msgid "Looking for keys matching \"%s\"..."
msgstr "ÕýÑ°ÕÒÆ¥Åä \"%s\" µÄÔ¿³×¡"
-#: crypt-gpgme.c:4080 pgp.c:1175
+#: crypt-gpgme.c:4264 pgp.c:1180
#, c-format
msgid "Use keyID = \"%s\" for %s?"
msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
-#: crypt-gpgme.c:4116 pgp.c:1209 smime.c:666 smime.c:791
+#: crypt-gpgme.c:4300 pgp.c:1214 smime.c:664 smime.c:789
#, c-format
msgid "Enter keyID for %s: "
msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
-#: crypt-gpgme.c:4181
+#: crypt-gpgme.c:4365
msgid ""
"\n"
"Using GPGME backend, although no gpg-agent is running"
msgstr ""
-#: crypt-gpgme.c:4209
+#: crypt-gpgme.c:4393
#, 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:4210
+#: crypt-gpgme.c:4394
#, fuzzy
msgid "esabpfc"
msgstr "esabif"
-#: crypt-gpgme.c:4213
+#: crypt-gpgme.c:4397
#, 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:4214
+#: crypt-gpgme.c:4398
#, fuzzy
msgid "esabmfc"
msgstr "esabif"
#. sign (a)s
#. unset_option(OPTCRYPTCHECKTRUST);
#. sign (a)s
-#: crypt-gpgme.c:4230 pgp.c:1585 smime.c:2036
+#: crypt-gpgme.c:4414 pgp.c:1590 smime.c:2033 smime.c:2045
msgid "Sign as: "
msgstr "Ç©ÃûµÄÉí·ÝÊÇ£º"
-#: crypt-gpgme.c:4327
+#: crypt-gpgme.c:4511
msgid "Failed to verify sender"
msgstr ""
-#: crypt-gpgme.c:4330
+#: crypt-gpgme.c:4514
#, fuzzy
msgid "Failed to figure out sender"
msgstr "´ò¿ªÎļþÀ´·ÖÎöÎļþͷʧ°Ü¡£"
-#: crypt.c:69
+#: crypt.c:68
#, c-format
msgid " (current time: %c)"
msgstr ""
-#: crypt.c:75
+#: crypt.c:74
#, fuzzy, c-format
msgid "[-- %s output follows%s --]\n"
msgstr "[-- ÒÔÏÂΪ PGP Êä³öµÄ×ÊÁÏ£¨ÏÖÔÚʱ¼ä£º "
-#: crypt.c:90
+#: crypt.c:89
#, fuzzy
msgid "Passphrase(s) forgotten."
msgstr "ÒÑÍü¼Ç PGP ͨÐÐÃÜÂë¡£"
#. they really want to send it inline... go for it
-#: crypt.c:147 cryptglue.c:110 pgpkey.c:564 pgpkey.c:753
+#: crypt.c:146 cryptglue.c:110 pgpkey.c:563 pgpkey.c:752
msgid "Invoking PGP..."
msgstr "Æô¶¯ PGP¡"
#. otherwise inline won't work...ask for revert
-#: crypt.c:156
+#: crypt.c:155
msgid "Message can't be sent inline. Revert to using PGP/MIME?"
msgstr ""
#. abort
-#: crypt.c:158 send.c:1513
+#: crypt.c:157 send.c:1512
msgid "Mail not sent."
msgstr "ÐżþûÓмijö¡£"
-#: crypt.c:409
+#: crypt.c:408
msgid "S/MIME messages with no hints on content are unsupported."
msgstr ""
-#: crypt.c:628 crypt.c:672
+#: crypt.c:627 crypt.c:671
msgid "Trying to extract PGP keys...\n"
msgstr ""
-#: crypt.c:652 crypt.c:692
+#: crypt.c:651 crypt.c:691
msgid "Trying to extract S/MIME certificates...\n"
msgstr ""
-#: crypt.c:814
+#: crypt.c:813
#, fuzzy
msgid ""
"[-- Error: Inconsistent multipart/signed structure! --]\n"
"[-- ´íÎ󣺲»Ò»Ö嵀 multipart/signed ½á¹¹£¡ --]\n"
"\n"
-#: crypt.c:835
+#: crypt.c:834
#, c-format
msgid ""
"[-- Error: Unknown multipart/signed protocol %s! --]\n"
"[-- ´íÎ󣺲»Ã÷µÄ multipart/signed ж¨ %s£¡ --]\n"
"\n"
-#: crypt.c:874
+#: crypt.c:873
#, c-format
msgid ""
"[-- Warning: We can't verify %s/%s signatures. --]\n"
"\n"
#. Now display the signed body
-#: crypt.c:886
+#: crypt.c:885
#, fuzzy
msgid ""
"[-- The following data is signed --]\n"
"[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
"\n"
-#: crypt.c:892
+#: crypt.c:891
msgid ""
"[-- Warning: Can't find any signatures. --]\n"
"\n"
"[-- ¾¯¸æ£ºÕÒ²»µ½ÈκεÄÇ©Ãû¡£ --]\n"
"\n"
-#: crypt.c:898
+#: crypt.c:897
#, fuzzy
msgid ""
"\n"
msgstr "Æô¶¯ S/MIME¡"
# Don't translate this!!
-#: curs_lib.c:189
+#: curs_lib.c:191
msgid "yes"
msgstr ""
# Don't translate this!!
-#: curs_lib.c:190
+#: curs_lib.c:192
msgid "no"
msgstr ""
#. restore blocking operation
-#: curs_lib.c:286
+#: curs_lib.c:288
msgid "Exit Mutt?"
msgstr "À뿪 Mutt£¿"
-#: curs_lib.c:485 mutt_socket.c:570 mutt_ssl.c:329
+#: curs_lib.c:495 mutt_socket.c:577 mutt_ssl.c:337
msgid "unknown error"
msgstr "²»Ã÷µÄ´íÎó"
-#: curs_lib.c:505
+#: curs_lib.c:515
msgid "Press any key to continue..."
msgstr "°´ÏÂÈκÎÒ»¸ö¼ü¼ÌÐø¡"
-#: curs_lib.c:549
+#: curs_lib.c:559
msgid " ('?' for list): "
msgstr " (Óà '?' ÏÔʾÁбí)£º"
-#: curs_main.c:54 curs_main.c:625 curs_main.c:655
+#: curs_main.c:52 curs_main.c:617 curs_main.c:647
msgid "No mailbox is open."
msgstr "ûÓÐÒÑ´ò¿ªÐÅÏä¡£"
-#: curs_main.c:55
+#: curs_main.c:53
msgid "There are no messages."
msgstr "ûÓÐÐżþ¡£"
-#: curs_main.c:56 mx.c:1115 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1115 pager.c:51 recvattach.c:43
msgid "Mailbox is read-only."
msgstr "ÐÅÏäÊÇÖ»¶ÁµÄ¡£"
-#: curs_main.c:57 pager.c:59 recvattach.c:913
+#: curs_main.c:55 pager.c:52 recvattach.c:912
msgid "Function not permitted in attach-message mode."
msgstr "¹¦ÄÜÔÚ attach-message ģʽϲ»±»Ö§³Ö¡£"
-#: curs_main.c:58
+#: curs_main.c:56
#, fuzzy
msgid "No visible messages."
msgstr "ûÓÐÐÂÐżþ"
-#: curs_main.c:98 pager.c:89
+#: curs_main.c:96 pager.c:82
#, c-format
msgid "Cannot %s: Operation not permitted by ACL"
msgstr ""
-#: curs_main.c:253
+#: curs_main.c:251
msgid "Cannot toggle write on a readonly mailbox!"
msgstr "ÎÞ·¨Ð´Èëµ½Ò»¸öÖ»¶ÁµÄÐÅÏ䣡"
-#: curs_main.c:260
+#: curs_main.c:258
msgid "Changes to folder will be written on folder exit."
msgstr "ÔÚÀ뿪֮ºó½«»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
-#: curs_main.c:265
+#: curs_main.c:263
msgid "Changes to folder will not be written."
msgstr "½«²»»á°Ñ¸Ä±äдÈë×ÊÁϼС£"
-#: curs_main.c:407
+#: curs_main.c:405
msgid "Quit"
msgstr "À뿪"
-#: curs_main.c:410 recvattach.c:55
+#: curs_main.c:408 recvattach.c:54
msgid "Save"
msgstr "´¢´æ"
-#: curs_main.c:411 query.c:50
+#: curs_main.c:409 query.c:49
msgid "Mail"
msgstr "Ðżþ"
-#: curs_main.c:412 pager.c:1488
+#: curs_main.c:410 pager.c:1487
msgid "Reply"
msgstr "»Ø¸²"
-#: curs_main.c:413
+#: curs_main.c:411
msgid "Group"
msgstr "Ⱥ×é"
-#: curs_main.c:502
+#: curs_main.c:499
msgid "Mailbox was externally modified. Flags may be wrong."
msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
-#: curs_main.c:505
+#: curs_main.c:502
msgid "New mail in this mailbox."
msgstr "Õâ¸öÐÅÏäÖÐÓÐÐÂÐżþ¡£"
-#: curs_main.c:509
+#: curs_main.c:506
#, fuzzy
msgid "Mailbox was externally modified."
msgstr "ÐÅÏäÒѱ»ÆäËû;¾¶¸Ä±ä¹ý¡£Æì±ê¿ÉÄÜÓдíÎó¡£"
-#: curs_main.c:631
+#: curs_main.c:623
msgid "No tagged messages."
msgstr "ûÓбê¼ÇÁ˵ÄÐżþ¡£"
-#: curs_main.c:667 menu.c:906
+#: curs_main.c:659 menu.c:921
#, fuzzy
msgid "Nothing to do."
msgstr "ÕýÁ¬½Óµ½ %s¡"
-#: curs_main.c:753
+#: curs_main.c:749
msgid "Jump to message: "
msgstr "Ìøµ½Ðżþ£º"
-#: curs_main.c:759
+#: curs_main.c:755
msgid "Argument must be a message number."
msgstr "ÐèÒªÒ»¸öÐżþ±àºÅµÄ²ÎÊý¡£"
-#: curs_main.c:792
+#: curs_main.c:788
msgid "That message is not visible."
msgstr "Õâ·âÐżþÎÞ·¨ÏÔʾ¡£"
-#: curs_main.c:795
+#: curs_main.c:791
msgid "Invalid message number."
msgstr "ÎÞЧµÄÐżþ±àºÅ¡£"
-#: curs_main.c:808 curs_main.c:1849 pager.c:2279
+#: curs_main.c:804 curs_main.c:1845 pager.c:2288
#, fuzzy
msgid "delete message(s)"
msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
-#: curs_main.c:811
+#: curs_main.c:807
msgid "Delete messages matching: "
msgstr "ɾ³ý·ûºÏÕâÑùʽµÄÐżþ£º"
-#: curs_main.c:833
+#: curs_main.c:829
msgid "No limit pattern is in effect."
msgstr "ûÓÐÏÞÖÆÑùʽÊÇÓÐЧµÄ¡£"
#. i18n: ask for a limit to apply
-#: curs_main.c:838
+#: curs_main.c:834
#, c-format
msgid "Limit: %s"
msgstr "ÏÞÖÆ: %s"
-#: curs_main.c:848
+#: curs_main.c:844
msgid "Limit to messages matching: "
msgstr "ÏÞÖÆÖ»·ûºÏÕâÑùʽµÄÐżþ£º"
-#: curs_main.c:870
+#: curs_main.c:866
msgid "To view all messages, limit to \"all\"."
msgstr ""
-#: curs_main.c:882
+#: curs_main.c:878
msgid "Quit Mutt?"
msgstr "À뿪 Mutt£¿"
-#: curs_main.c:967
+#: curs_main.c:963
msgid "Tag messages matching: "
msgstr "±ê¼ÇÐżþµÄÌõ¼þ£º"
-#: curs_main.c:976 curs_main.c:2138 pager.c:2589
+#: curs_main.c:972 curs_main.c:2134 pager.c:2598
#, fuzzy
msgid "undelete message(s)"
msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
-#: curs_main.c:978
+#: curs_main.c:974
msgid "Undelete messages matching: "
msgstr "·´É¾³ýÐżþµÄÌõ¼þ£º"
-#: curs_main.c:986
+#: curs_main.c:982
msgid "Untag messages matching: "
msgstr "·´±ê¼ÇÐżþµÄÌõ¼þ£º"
-#: curs_main.c:1066
+#: curs_main.c:1062
msgid "Open mailbox in read-only mode"
msgstr "ÓÃÖ»¶Áģʽ´ò¿ªÐÅÏä"
-#: curs_main.c:1068
+#: curs_main.c:1064
msgid "Open mailbox"
msgstr "´ò¿ªÐÅÏä"
-#: curs_main.c:1078
+#: curs_main.c:1074
#, fuzzy
msgid "No mailboxes have new mail"
msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
-#: curs_main.c:1106 mx.c:503 mx.c:652
+#: curs_main.c:1102 mx.c:503 mx.c:652
#, c-format
msgid "%s is not a mailbox."
msgstr "%s ²»ÊÇÐÅÏä¡£"
-#: curs_main.c:1201
+#: curs_main.c:1197
msgid "Exit Mutt without saving?"
msgstr "²»´¢´æ±ãÀ뿪 Mutt Âð£¿"
-#: curs_main.c:1219 curs_main.c:1252 curs_main.c:1696 curs_main.c:1728
-#: flags.c:286 thread.c:1026 thread.c:1081 thread.c:1136
+#: curs_main.c:1215 curs_main.c:1248 curs_main.c:1692 curs_main.c:1724
+#: flags.c:282 thread.c:1026 thread.c:1081 thread.c:1136
msgid "Threading is not enabled."
msgstr "ÐòÁй¦ÄÜÉÐδÆô¶¯¡£"
-#: curs_main.c:1231
+#: curs_main.c:1227
msgid "Thread broken"
msgstr ""
-#: curs_main.c:1249
+#: curs_main.c:1245
msgid "link threads"
msgstr ""
-#: curs_main.c:1254
+#: curs_main.c:1250
msgid "No Message-ID: header available to link thread"
msgstr ""
-#: curs_main.c:1256
+#: curs_main.c:1252
#, fuzzy
msgid "First, please tag a message to be linked here"
msgstr "´¢´æÐżþÒÔ±ãÉÔºó¼Ä³ö"
-#: curs_main.c:1268
+#: curs_main.c:1264
msgid "Threads linked"
msgstr ""
-#: curs_main.c:1271
+#: curs_main.c:1267
msgid "No thread linked"
msgstr ""
-#: curs_main.c:1307 curs_main.c:1332
+#: curs_main.c:1303 curs_main.c:1328
msgid "You are on the last message."
msgstr "ÄúÒѾÔÚ×îºóÒ»·âÐÅÁË¡£"
-#: curs_main.c:1314 curs_main.c:1358
+#: curs_main.c:1310 curs_main.c:1354
msgid "No undeleted messages."
msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
-#: curs_main.c:1351 curs_main.c:1375
+#: curs_main.c:1347 curs_main.c:1371
msgid "You are on the first message."
msgstr "ÄúÒѾÔÚµÚÒ»·âÐÅÁË¡£"
-#: curs_main.c:1450 pattern.c:1479
+#: curs_main.c:1446 menu.c:766 pager.c:1986 pattern.c:1466
msgid "Search wrapped to top."
msgstr "ËÑÑ°ÖÁ¿ªÍ·¡£"
-#: curs_main.c:1459 pattern.c:1490
+#: curs_main.c:1455 pager.c:2008 pattern.c:1477
msgid "Search wrapped to bottom."
msgstr "ËÑÑ°ÖÁ½áβ¡£"
-#: curs_main.c:1500
+#: curs_main.c:1496
msgid "No new messages"
msgstr "ûÓÐÐÂÐżþ"
-#: curs_main.c:1500
+#: curs_main.c:1496
msgid "No unread messages"
msgstr "ûÓÐÉÐδ¶ÁÈ¡µÄÐżþ"
-#: curs_main.c:1501
+#: curs_main.c:1497
msgid " in this limited view"
msgstr " ÔÚÕâÏÞ¶¨µÄä¯ÀÀÖÐ"
-#: curs_main.c:1517
+#: curs_main.c:1513
#, fuzzy
msgid "flag message"
msgstr "ÏÔʾһ·âÐżþ"
-#: curs_main.c:1554 pager.c:2555
+#: curs_main.c:1550 pager.c:2564
msgid "toggle new"
msgstr ""
-#: curs_main.c:1631
+#: curs_main.c:1627
msgid "No more threads."
msgstr "ûÓиü¶àµÄÐòÁÐ"
-#: curs_main.c:1633
+#: curs_main.c:1629
msgid "You are on the first thread."
msgstr "ÄúÒѾÔÚµÚÒ»¸öÐòÁÐÉÏ¡£"
-#: curs_main.c:1714
+#: curs_main.c:1710
msgid "Thread contains unread messages."
msgstr "ÐòÁÐÖÐÓÐÉÐδ¶ÁÈ¡µÄÐżþ¡£"
-#: curs_main.c:1808 pager.c:2262
+#: curs_main.c:1804 pager.c:2271
#, fuzzy
msgid "delete message"
msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
-#: curs_main.c:1890
+#: curs_main.c:1886
#, fuzzy
msgid "edit message"
msgstr "±à¼ÐżþÄÚÈÝ"
-#: curs_main.c:2021
+#: curs_main.c:2017
#, fuzzy
msgid "mark message(s) as read"
msgstr "Ìøµ½Õâ¸öÐòÁеÄÖ÷Ðżþ"
-#: curs_main.c:2111 pager.c:2574
+#: curs_main.c:2107 pager.c:2583
#, fuzzy
msgid "undelete message"
msgstr "ûÓÐÒª·´É¾³ýµÄÐżþ¡£"
msgid "Error. Preserving temporary file: %s"
msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
-#: flags.c:329
+#: flags.c:325
msgid "Set flag"
msgstr "É趨Æì±ê"
-#: flags.c:329
+#: flags.c:325
msgid "Clear flag"
msgstr "Çå³ýÆì±ê"
-#: handler.c:1049
+#: handler.c:1070
msgid "[-- Error: Could not display any parts of Multipart/Alternative! --]\n"
msgstr "[-- ´íÎó£º ÎÞ·¨ÏÔʾ Multipart/Alternative£¡ --]\n"
-#: handler.c:1166
+#: handler.c:1187
#, c-format
msgid "[-- Attachment #%d"
msgstr "[-- ¸½¼þ #%d"
-#: handler.c:1178
+#: handler.c:1199
#, c-format
msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
msgstr "[-- ÐÎ̬: %s%s, ±àÂë: %s, ´óС: %s --]\n"
-#: handler.c:1250
+#: handler.c:1223
+msgid "One or more parts of this message could not be displayed"
+msgstr ""
+
+#: handler.c:1275
#, c-format
msgid "[-- Autoview using %s --]\n"
msgstr "[-- ʹÓà %s ×Ô¶¯ÏÔʾ --]\n"
-#: handler.c:1251
+#: handler.c:1276
#, c-format
msgid "Invoking autoview command: %s"
msgstr "Ö´ÐÐ×Ô¶¯ÏÔʾָÁ%s"
-#: handler.c:1283
+#: handler.c:1308
#, fuzzy, c-format
msgid "[-- Can't run %s. --]\n"
msgstr "[-- ÔÚ %s --]\n"
-#: handler.c:1302 handler.c:1323
+#: handler.c:1327 handler.c:1348
#, c-format
msgid "[-- Autoview stderr of %s --]\n"
msgstr "[-- ×Ô¶¯ÏÔʾµÄ %s µÄ stderr ÄÚÈÝ --]\n"
-#: handler.c:1362
+#: handler.c:1387
msgid "[-- Error: message/external-body has no access-type parameter --]\n"
msgstr "[-- ´íÎó: message/external-body ûÓдæÈ¡ÀàÐ͵IJÎÊý --]\n"
-#: handler.c:1383
+#: handler.c:1408
#, c-format
msgid "[-- This %s/%s attachment "
msgstr "[-- %s/%s ¸½¼þ "
-#: handler.c:1390
+#: handler.c:1415
#, c-format
msgid "(size %s bytes) "
msgstr "(%s λԪ×é) "
-#: handler.c:1392
+#: handler.c:1417
msgid "has been deleted --]\n"
msgstr "ÒѾ±»É¾³ýÁË --]\n"
-#: handler.c:1397
+#: handler.c:1422
#, c-format
msgid "[-- on %s --]\n"
msgstr "[-- ÔÚ %s --]\n"
-#: handler.c:1402
+#: handler.c:1427
#, fuzzy, c-format
msgid "[-- name: %s --]\n"
msgstr "[-- ÔÚ %s --]\n"
-#: handler.c:1415 handler.c:1431
+#: handler.c:1440 handler.c:1456
#, fuzzy, c-format
msgid "[-- This %s/%s attachment is not included, --]\n"
msgstr "[-- %s/%s ¸½¼þ "
-#: handler.c:1417
+#: handler.c:1442
#, fuzzy
msgid ""
"[-- and the indicated external source has --]\n"
"[-- ²¢ÇÒ±»Ö¸Ê¾µÄÍⲿÔʼµµÒÑ --]\n"
"[-- ¹ýÆÚ¡£ --]\n"
-#: handler.c:1435
+#: handler.c:1460
#, fuzzy, c-format
msgid "[-- and the indicated access-type %s is unsupported --]\n"
msgstr ""
"[-- %s/%s ¸½¼þÎÞ·¨±»¸½ÉÏ, --]\n"
"[-- ²¢ÇÒ±»Ö¸Ê¾µÄ´æÈ¡ÀàÐÍ %s ²»±»Ö§³Ö --]\n"
-#: handler.c:1550
+#: handler.c:1575
msgid "Error: multipart/signed has no protocol."
msgstr "´íÎó£ºmultipart/signed ûÓÐͨѶж¨¡£"
-#: handler.c:1560
+#: handler.c:1585
msgid "Error: multipart/encrypted has no protocol parameter!"
msgstr "´íÎó£ºmultipart/encrypted ûÓÐÈκÎͨѶж¨²ÎÊý£¡"
-#: handler.c:1600
+#: handler.c:1639
msgid "Unable to open temporary file!"
msgstr "ÎÞ·¨´ò¿ªÔÝ´æµµ£¡"
-#: handler.c:1667
+#: handler.c:1706
#, c-format
msgid "[-- %s/%s is unsupported "
msgstr "[-- %s/%s ÉÐδ֧³Ö "
-#: handler.c:1672
+#: handler.c:1711
#, c-format
msgid "(use '%s' to view this part)"
msgstr "£¨Ê¹Óà '%s' À´ÏÔʾÕⲿ·Ý£©"
-#: handler.c:1674
+#: handler.c:1713
msgid "(need 'view-attachments' bound to key!)"
msgstr "£¨ÐèÒª¶¨ÒåÒ»¸ö¼ü¸ø 'view-attachments' lä¯ÀÀ¸½¼þ)£¡)"
-#: headers.c:177
+#: headers.c:173
#, c-format
msgid "%s: unable to attach file"
msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
msgid "unhook: Can't delete a %s from within a %s."
msgstr ""
-#: imap/auth.c:108 pop_auth.c:398 smtp.c:452
+#: imap/auth.c:108 pop_auth.c:398 smtp.c:483
#, fuzzy
msgid "No authenticators available"
msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
msgstr "CRAM-MD5 Ñé֤ʧ°Ü¡£"
#. now begin login
-#: imap/auth_gss.c:142
+#: imap/auth_gss.c:144
msgid "Authenticating (GSSAPI)..."
msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡"
-#: imap/auth_gss.c:307
+#: imap/auth_gss.c:309
msgid "GSSAPI authentication failed."
msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
msgid "Login failed."
msgstr "µÇÈëʧ°Ü¡£"
-#: imap/auth_sasl.c:97 smtp.c:487
+#: imap/auth_sasl.c:97 smtp.c:519
#, fuzzy, c-format
msgid "Authenticating (%s)..."
msgstr "ÑéÖ¤ÖÐ (GSSAPI)¡"
msgid "SASL authentication failed."
msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
-#: imap/browse.c:58 imap/imap.c:562
+#: imap/browse.c:58 imap/imap.c:567
#, c-format
msgid "%s is an invalid IMAP path"
msgstr ""
msgid "No such folder"
msgstr "%s£ºÃ»ÓÐÕâÖÖÑÕÉ«"
-#: imap/browse.c:276
+#: imap/browse.c:278
#, fuzzy
msgid "Create mailbox: "
msgstr "´ò¿ªÐÅÏä"
-#: imap/browse.c:281 imap/browse.c:327
+#: imap/browse.c:283 imap/browse.c:329
#, fuzzy
msgid "Mailbox must have a name."
msgstr "ÐÅÏäûÓиı䡣"
-#: imap/browse.c:289
+#: imap/browse.c:291
#, fuzzy
msgid "Mailbox created."
msgstr "ÓÊÏäÒÑɾ³ý¡£"
-#: imap/browse.c:320
+#: imap/browse.c:322
#, fuzzy, c-format
msgid "Rename mailbox %s to: "
msgstr "´ò¿ªÐÅÏä"
-#: imap/browse.c:333
+#: imap/browse.c:337
#, fuzzy, c-format
msgid "Rename failed: %s"
msgstr "µÇÈëʧ°Ü¡£"
-#: imap/browse.c:338
+#: imap/browse.c:342
#, fuzzy
msgid "Mailbox renamed."
msgstr "ÓÊÏäÒÑɾ³ý¡£"
-#: imap/command.c:372
+#: imap/command.c:448
#, fuzzy
msgid "Mailbox closed"
msgstr "ÓÊÏäÒÑɾ³ý¡£"
-#: imap/imap.c:185
+#: imap/imap.c:126
+#, fuzzy, c-format
+msgid "CREATE failed: %s"
+msgstr "µÇÈëʧ°Ü¡£"
+
+#: imap/imap.c:190
#, fuzzy, c-format
msgid "Closing connection to %s..."
msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡"
-#: imap/imap.c:306
+#: imap/imap.c:311
msgid "This IMAP server is ancient. Mutt does not work with it."
msgstr "Õâ¸ö IMAP ËÅ·þÆ÷Òѹýʱ£¬Mutt ÎÞ·¨Ê¹ÓÃËü¡£"
-#: imap/imap.c:429 pop_lib.c:286 smtp.c:373
+#: imap/imap.c:434 pop_lib.c:286 smtp.c:392
msgid "Secure connection with TLS?"
msgstr ""
-#: imap/imap.c:438 pop_lib.c:306 smtp.c:385
+#: imap/imap.c:443 pop_lib.c:306 smtp.c:404
msgid "Could not negotiate TLS connection"
msgstr ""
-#: imap/imap.c:454 pop_lib.c:327
+#: imap/imap.c:459 pop_lib.c:327
#, fuzzy
msgid "Encrypted connection unavailable"
msgstr "¼ÓÃܵÄÔ¿³×"
-#: imap/imap.c:594
+#: imap/imap.c:601
#, c-format
msgid "Selecting %s..."
msgstr "Ñ¡Ôñ %s ÖС"
-#: imap/imap.c:749
+#: imap/imap.c:756
#, fuzzy
msgid "Error opening mailbox"
msgstr "дÈëÐÅÏäʱ·¢Éú´íÎó£¡"
-#: imap/imap.c:802 imap/message.c:792 muttlib.c:1466
+#: imap/imap.c:811 imap/message.c:834 muttlib.c:1478
#, c-format
msgid "Create %s?"
msgstr "½¨Á¢ %s£¿"
-#: imap/imap.c:1132
-#, c-format
-msgid "Marking %d messages deleted..."
-msgstr "±êÇ©Á赀 %d ·âÐżþɾȥÁË¡"
-
-#: imap/imap.c:1141
+#: imap/imap.c:1183
#, fuzzy
msgid "Expunge failed"
msgstr "µÇÈëʧ°Ü¡£"
-#: imap/imap.c:1174
+#: imap/imap.c:1195
+#, c-format
+msgid "Marking %d messages deleted..."
+msgstr "±êÇ©Á赀 %d ·âÐżþɾȥÁË¡"
+
+#: imap/imap.c:1224
#, fuzzy, c-format
msgid "Saving changed messages... [%d/%d]"
msgstr "ÕýÔÚ´¢´æÐżþ״̬Æì±ê¡ [%d/%d]"
-#: imap/imap.c:1228
+#: imap/imap.c:1273
msgid "Error saving flags. Close anyway?"
msgstr ""
-#: imap/imap.c:1236
+#: imap/imap.c:1281
#, fuzzy
msgid "Error saving flags"
msgstr "ÎÞ·¨·ÖÎöλַ£¡"
-#: imap/imap.c:1248
+#: imap/imap.c:1293
msgid "Expunging messages from server..."
msgstr "ÕýÔÚɾ³ýËÅ·þÆ÷ÉϵÄÐżþ¡"
-#: imap/imap.c:1253
+#: imap/imap.c:1298
msgid "imap_sync_mailbox: EXPUNGE failed"
msgstr ""
-#: imap/imap.c:1726
+#: imap/imap.c:1746
#, c-format
msgid "Header search without header name: %s"
msgstr ""
-#: imap/imap.c:1798
+#: imap/imap.c:1818
#, fuzzy
msgid "Bad mailbox name"
msgstr "´ò¿ªÐÅÏä"
-#: imap/imap.c:1821
+#: imap/imap.c:1843
#, c-format
msgid "Subscribing to %s..."
msgstr "¶©ÔÄ %s¡"
-#: imap/imap.c:1823
+#: imap/imap.c:1845
#, fuzzy, c-format
msgid "Unsubscribing from %s..."
msgstr "È¡Ïû¶©ÔÄ %s¡"
-#: imap/imap.c:1833
+#: imap/imap.c:1855
#, fuzzy, c-format
msgid "Subscribed to %s"
msgstr "¶©ÔÄ %s¡"
-#: imap/imap.c:1835
+#: imap/imap.c:1857
#, fuzzy, c-format
msgid "Unsubscribed from %s"
msgstr "È¡Ïû¶©ÔÄ %s¡"
#. Unable to fetch headers for lower versions
-#: imap/message.c:97
+#: imap/message.c:98
msgid "Unable to fetch headers from this IMAP server version."
msgstr "ÎÞ·¨È¡»ØʹÓÃÕâ¸ö IMAP ËÅ·þÆ÷°æ±¾µÄÓʼþµÄ±êÍ·¡£"
-#: imap/message.c:107
+#: imap/message.c:108
#, fuzzy, c-format
msgid "Could not create temporary file %s"
msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ£¡"
-#: imap/message.c:137
+#: imap/message.c:140
#, fuzzy
msgid "Evaluating cache..."
msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡ [%d/%d]"
-#: imap/message.c:221 pop.c:272
+#: imap/message.c:232 pop.c:272
#, fuzzy
msgid "Fetching message headers..."
msgstr "ÕýÔÚÈ¡»ØÐżþ±êÍ·¡ [%d/%d]"
-#: imap/message.c:402 imap/message.c:459 pop.c:547
+#: imap/message.c:428 imap/message.c:485 pop.c:547
#, fuzzy
msgid "Fetching message..."
msgstr "¼Ä³öÐżþÖС"
-#: imap/message.c:448 pop.c:542
+#: imap/message.c:474 pop.c:542
msgid "The message index is incorrect. Try reopening the mailbox."
msgstr ""
-#: imap/message.c:599
+#: imap/message.c:627
#, fuzzy
msgid "Uploading message..."
msgstr "¼Ä³öÐżþÖС"
-#: imap/message.c:758
+#: imap/message.c:798
#, fuzzy, c-format
msgid "Copying %d messages to %s..."
msgstr "ÕýÔÚ°áÒÆÒѾ¶ÁÈ¡µÄÐżþµ½ %s ¡"
-#: imap/message.c:762
+#: imap/message.c:802
#, fuzzy, c-format
msgid "Copying message %d to %s..."
msgstr "дÈëÐżþµ½ %s ¡"
-#: imap/util.c:335
+#: imap/util.c:336
#, fuzzy
msgid "Continue?"
msgstr "£¨¼ÌÐø£©\n"
-#: init.c:57 init.c:1755 pager.c:57
+#: init.c:58 init.c:1777 pager.c:50
#, c-format
msgid "Not available in this menu."
msgstr "ÔÚÕâ¸ö²Ëµ¥ÖÐûÓÐÕâ¸ö¹¦ÄÜ¡£"
-#: init.c:465
+#: init.c:466
#, c-format
msgid "Bad regexp: %s"
msgstr ""
-#: init.c:522
+#: init.c:523
#, c-format
msgid "Not enough subexpressions for spam template"
msgstr ""
-#: init.c:748
+#: init.c:749
#, fuzzy
msgid "spam: no matching pattern"
msgstr "±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
-#: init.c:750
+#: init.c:751
#, fuzzy
msgid "nospam: no matching pattern"
msgstr "·´±ê¼Ç·ûºÏij¸ö¸ñʽµÄÐżþ"
-#: init.c:887
+#: init.c:888
msgid "Missing -rx or -addr."
msgstr ""
-#: init.c:900
+#: init.c:901
#, c-format
msgid "Warning: Bad IDN '%s'.\n"
msgstr ""
-#: init.c:1108
+#: init.c:1109
#, fuzzy
msgid "attachments: no disposition"
msgstr "±à¼¼ÐµµµÄ˵Ã÷"
-#: init.c:1146
+#: init.c:1147
#, fuzzy
msgid "attachments: invalid disposition"
msgstr "±à¼¼ÐµµµÄ˵Ã÷"
-#: init.c:1160
+#: init.c:1161
#, fuzzy
msgid "unattachments: no disposition"
msgstr "±à¼¼ÐµµµÄ˵Ã÷"
-#: init.c:1183
+#: init.c:1184
msgid "unattachments: invalid disposition"
msgstr ""
-#: init.c:1310
+#: init.c:1311
msgid "alias: no address"
msgstr "±ðÃû£ºÃ»Óеç×ÓÓʼþλַ"
-#: init.c:1357
+#: init.c:1359
#, c-format
msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
msgstr ""
-#: init.c:1445
+#: init.c:1447
msgid "invalid header field"
msgstr "ÎÞЧµÄ±êÍ·À¸Î»"
-#: init.c:1498
+#: init.c:1500
#, c-format
msgid "%s: unknown sorting method"
msgstr "%s£º²»Ã÷µÄÅÅÐò·½Ê½"
-#: init.c:1608
+#: init.c:1610
#, fuzzy, c-format
msgid "mutt_restore_default(%s): error in regexp: %s\n"
msgstr "mutt_restore_defualt£º´íÎóµÄÕý¹æ±íʾʽ£º%s\n"
-#: init.c:1732 init.c:1845
+#: init.c:1754 init.c:1867
#, c-format
msgid "%s: unknown variable"
msgstr "%s£º²»Ã÷µÄ±äÁ¿"
-#: init.c:1741
+#: init.c:1763
#, c-format
msgid "prefix is illegal with reset"
msgstr "ÖØÐÂÉèÖúó×ÖÊ×ÈÔ²»ºÏ¹æ¶¨"
-#: init.c:1747
+#: init.c:1769
#, c-format
msgid "value is illegal with reset"
msgstr "ÖØÐÂÉèÖúóÖµÈÔ²»ºÏ¹æ¶¨"
-#: init.c:1783 init.c:1795
+#: init.c:1805 init.c:1817
#, c-format
msgid "Usage: set variable=yes|no"
msgstr ""
-#: init.c:1803
+#: init.c:1825
#, c-format
msgid "%s is set"
msgstr "%s Òѱ»É趨"
-#: init.c:1803
+#: init.c:1825
#, c-format
msgid "%s is unset"
msgstr "%s ûÓб»É趨"
-#: init.c:2033
+#: init.c:1926
+#, fuzzy, c-format
+msgid "Invalid value for option %s: \"%s\""
+msgstr "ÎÞЧµÄÈÕ×Ó£º%s"
+
+#: init.c:2064
#, c-format
msgid "%s: invalid mailbox type"
msgstr "%s£ºÎÞЧµÄÐÅÏäÖÖÀà"
-#: init.c:2064 init.c:2117
+#: init.c:2095 init.c:2155
#, c-format
msgid "%s: invalid value"
msgstr "%s£ºÎÞЧµÄÖµ"
-#: init.c:2158
+#: init.c:2196
#, fuzzy, c-format
msgid "%s: Unknown type."
msgstr "%s£º²»Ã÷µÄÖÖÀà"
-#: init.c:2185
+#: init.c:2223
#, c-format
msgid "%s: unknown type"
msgstr "%s£º²»Ã÷µÄÖÖÀà"
-#: init.c:2247
+#: init.c:2285
#, c-format
msgid "Error in %s, line %d: %s"
msgstr "%s ·¢Éú´íÎó£¬ÐкŠ%d£º%s"
#. the muttrc source keyword
-#: init.c:2270
+#: init.c:2308
#, c-format
msgid "source: errors in %s"
msgstr "source£º´íÎó·¢ÉúÔÚ %s"
-#: init.c:2271
+#: init.c:2309
#, c-format
msgid "source: reading aborted due too many errors in %s"
msgstr ""
-#: init.c:2285
+#: init.c:2323
#, c-format
msgid "source: error at %s"
msgstr "source£º´íÎó·¢ÉúÔÚ %s"
-#: init.c:2290
+#: init.c:2328
msgid "source: too many arguments"
msgstr "source£ºÌ«¶à²ÎÊý"
-#: init.c:2341
+#: init.c:2382
#, c-format
msgid "%s: unknown command"
msgstr "%s£º²»Ã÷µÄÖ¸Áî"
-#: init.c:2826
+#: init.c:2867
#, c-format
msgid "Error in command line: %s\n"
msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
-#: init.c:2878
+#: init.c:2922
msgid "unable to determine home directory"
msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
-#: init.c:2886
+#: init.c:2930
msgid "unable to determine username"
msgstr "ÎÞ·¨¾ö¶¨Ê¹ÓÃÕßÃû³Æ"
-#: init.c:3122
+#: init.c:3166
msgid "-group: no group name"
msgstr ""
-#: init.c:3132
+#: init.c:3176
#, fuzzy
msgid "out of arguments"
msgstr "Ì«ÉÙ²ÎÊý"
-#: keymap.c:466
+#: keymap.c:491
msgid "Macro loop detected."
msgstr "¼ì²âµ½¾Þ¼¯ÖÐÓлØȦ¡£"
-#: keymap.c:676 keymap.c:684
+#: keymap.c:701 keymap.c:709
msgid "Key is not bound."
msgstr "Õâ¸ö¼ü»¹Î´±»¶¨Ò幦ÄÜ¡£"
-#: keymap.c:688
+#: keymap.c:713
#, c-format
msgid "Key is not bound. Press '%s' for help."
msgstr "Õâ¸ö¼ü»¹Î´±»¶¨Ò幦ÄÜ¡£ °´ '%s' ÒÔÈ¡µÃ˵Ã÷¡£"
-#: keymap.c:699
+#: keymap.c:724
msgid "push: too many arguments"
msgstr "push£ºÌ«¶à²ÎÊý"
-#: keymap.c:729
+#: keymap.c:754
#, c-format
msgid "%s: no such menu"
msgstr "%s£ºÃ»ÓÐÕâ¸öÑ¡µ¥"
-#: keymap.c:744
+#: keymap.c:769
msgid "null key sequence"
msgstr "¿ÕµÄ¼üÖµÐòÁÐ"
-#: keymap.c:831
+#: keymap.c:856
msgid "bind: too many arguments"
msgstr "bind£ºÌ«¶à²ÎÊý"
-#: keymap.c:854
+#: keymap.c:879
#, c-format
msgid "%s: no such function in map"
msgstr "%s£ºÔÚ¶ÔÓ³±íÖÐûÓÐÕâÑùµÄº¯Êý"
-#: keymap.c:878
+#: keymap.c:903
msgid "macro: empty key sequence"
msgstr "macro£º¿ÕµÄ¼üÖµÐòÁÐ"
-#: keymap.c:889
+#: keymap.c:914
msgid "macro: too many arguments"
msgstr "macro£º²ÎÊýÌ«¶à"
-#: keymap.c:925
+#: keymap.c:950
#, fuzzy
msgid "exec: no arguments"
msgstr "exec£º²ÎÊýÌ«ÉÙ"
-#: keymap.c:945
+#: keymap.c:970
#, fuzzy, c-format
msgid "%s: no such function"
msgstr "%s£ºÔÚ¶ÔÓ³±íÖÐûÓÐÕâÑùµÄº¯Êý"
-#: keymap.c:966
+#: keymap.c:991
#, fuzzy
msgid "Enter keys (^G to abort): "
msgstr "ÇëÊäÈë %s µÄÔ¿³× ID£º"
-#: keymap.c:971
+#: keymap.c:996
#, c-format
msgid "Char = %s, Octal = %o, Decimal = %d"
msgstr ""
-#: lib.c:129
+#: lib.c:131
msgid "Integer overflow -- can't allocate memory!"
msgstr ""
-#: lib.c:136 lib.c:151 lib.c:183
+#: lib.c:138 lib.c:153 lib.c:185
msgid "Out of memory!"
msgstr "¼ÇÒäÌå²»×㣡"
#: main.c:67
#, fuzzy
msgid ""
-"Copyright (C) 1996-2008 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2009 Michael R. Elkins and others.\n"
"Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
"Mutt is free software, and you are welcome to redistribute it\n"
"under certain conditions; type `mutt -vv' for details.\n"
msgid ""
"Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>\n"
"Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2007 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1997-2008 Thomas Roessler <roessler@does-not-exist.org>\n"
"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2008 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2009 Brendan Cully <brendan@kublai.com>\n"
"Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
"Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
+"Copyright (C) 2006-2008 Rocco Rutte <pdmef@gmx.net>\n"
"\n"
"Many others not mentioned here contributed code, fixes,\n"
"and suggestions.\n"
msgstr ""
-#: main.c:85
+#: main.c:86
msgid ""
" This program is free software; you can redistribute it and/or modify\n"
" it under the terms of the GNU General Public License as published by\n"
" GNU General Public License for more details.\n"
msgstr ""
-#: main.c:95
+#: main.c:96
msgid ""
" You should have received a copy of the GNU General Public License\n"
" along with this program; if not, write to the Free Software\n"
"1301, USA.\n"
msgstr ""
-#: main.c:112
+#: main.c:113
msgid ""
"usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
" mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
"<file> [...]] [--] <addr> [...]\n"
+" mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...]] [--] "
+"<addr> [...] < message\n"
" mutt [<options>] -p\n"
" mutt [<options>] -A <alias> [...]\n"
" mutt [<options>] -Q <query> [...]\n"
" mutt -v[v]\n"
msgstr ""
-#: main.c:120
+#: main.c:122
msgid ""
"options:\n"
" -A <alias>\texpand the given alias\n"
" -D\t\tprint the value of all variables to stdout"
msgstr ""
-#: main.c:128
+#: main.c:130
msgid " -d <level>\tlog debugging output to ~/.muttdebug0"
msgstr ""
-#: main.c:131
+#: main.c:133
#, fuzzy
msgid ""
" -e <command>\tspecify a command to be executed after initialization\n"
" -Z ´ò¿ªµÚÒ»¸ö¸½ÓÐÐÂÓʼþµÄ×ÊÁϼУ¬Èç¹ûûÓеĻ°Á¢¼´À뿪\n"
" -h Õâ¸ö˵Ã÷ѶϢ"
-#: main.c:140
+#: main.c:142
#, fuzzy
msgid ""
" -Q <variable>\tquery a configuration variable\n"
" -Z ´ò¿ªµÚÒ»¸ö¸½ÓÐÐÂÓʼþµÄ×ÊÁϼУ¬Èç¹ûûÓеĻ°Á¢¼´À뿪\n"
" -h Õâ¸ö˵Ã÷ѶϢ"
-#: main.c:150
+#: main.c:152
msgid ""
" --\t\ttreat remaining arguments as addr even if starting with a dash\n"
"\t\twhen using -a with multiple filenames using -- is mandatory"
msgstr ""
-#: main.c:195
+#: main.c:197
msgid ""
"\n"
"Compile options:"
"\n"
"±àÒëÑ¡Ï"
-#: main.c:502
+#: main.c:501
msgid "Error initializing terminal."
msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
-#: main.c:620
+#: main.c:635
#, c-format
msgid "Debugging at level %d.\n"
msgstr "³ý´íģʽÔÚµÚ %d ²ã¡£\n"
-#: main.c:622
+#: main.c:637
msgid "DEBUG was not defined during compilation. Ignored.\n"
msgstr "ÔÚ±àÒëʱºòûÓж¨Òå DEBUG¡£·ÅÆúÖ´ÐС£\n"
-#: main.c:785
+#: main.c:802
#, c-format
msgid "%s does not exist. Create it?"
msgstr "%s ²»´æÔÚ¡£ÖÆÔìÂð£¿"
-#: main.c:789
+#: main.c:806
#, c-format
msgid "Can't create %s: %s."
msgstr "ÎÞ·¨½¨Á¢ %s: %s."
-#: main.c:831
+#: main.c:848
msgid "Failed to parse mailto: link\n"
msgstr ""
-#: main.c:843
+#: main.c:860
msgid "No recipients specified.\n"
msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕß¡£\n"
-#: main.c:929
+#: main.c:946
#, c-format
msgid "%s: unable to attach file.\n"
msgstr "%s£ºÎÞ·¨¸½´øÎļþ¡£\n"
-#: main.c:952
+#: main.c:969
msgid "No mailbox with new mail."
msgstr "ûÓÐÐÅÏäÓÐÐÂÐżþ¡£"
-#: main.c:961
+#: main.c:978
#, fuzzy
msgid "No incoming mailboxes defined."
msgstr "Ȧѡ½øÈëµÄÓÊͲ"
-#: main.c:989
+#: main.c:1006
msgid "Mailbox is empty."
msgstr "ÐÅÏäÄÚ¿ÕÎÞÒ»Îï¡£"
-#: mbox.c:123 mbox.c:277 mh.c:1137 mx.c:673
+#: mbox.c:123 mbox.c:277 mh.c:1135 mx.c:673
#, c-format
msgid "Reading %s..."
msgstr "¶ÁÈ¡ %s ÖС"
msgid "Mailbox was corrupted!"
msgstr "ÐÅÏäÒÑËð»µ!"
-#: mbox.c:719 mbox.c:975
+#: mbox.c:719 mbox.c:976
msgid "Fatal error! Could not reopen mailbox!"
msgstr "ÑÏÖØ´íÎó£¡ÎÞ·¨ÖØдò¿ªÐÅÏ䣡"
msgid "sync: mbox modified, but no modified messages! (report this bug)"
msgstr "ͬ²½£ºÐÅÏäÒѱ»Ð޸ģ¬µ«Ã»Óб»Ð޸ĹýµÄÐżþ£¡£¨Çë»Ø±¨Õâ¸ö´íÎó£©"
-#: mbox.c:795 mh.c:1636 mx.c:766
+#: mbox.c:795 mh.c:1640 mx.c:766
#, c-format
msgid "Writing %s..."
msgstr "дÈë %s ÖС"
#. copy the temp mailbox back into place starting at the first
#. * change/deleted message
#.
-#: mbox.c:928
+#: mbox.c:929
#, fuzzy
msgid "Committing changes..."
msgstr "±àÒëËÑÑ°ÑùʽÖС"
-#: mbox.c:959
+#: mbox.c:960
#, c-format
msgid "Write failed! Saved partial mailbox to %s"
msgstr "дÈëʧ°Ü£¡ÒѰѲ¿·ÖµÄÐÅÏä´¢´æÖÁ %s"
-#: mbox.c:1023
+#: mbox.c:1024
msgid "Could not reopen mailbox!"
msgstr "ÎÞ·¨ÖØ¿ªÐÅÏ䣡"
-#: mbox.c:1058
+#: mbox.c:1059
msgid "Reopening mailbox..."
msgstr "ÖØдò¿ªÐÅÏäÖС"
-#: menu.c:425
+#: menu.c:423
msgid "Jump to: "
msgstr "Ìøµ½£º"
-#: menu.c:434
+#: menu.c:432
msgid "Invalid index number."
msgstr "ÎÞЧµÄË÷Òý±àºÅ¡£"
-#: menu.c:438 menu.c:459 menu.c:524 menu.c:567 menu.c:583 menu.c:594
-#: menu.c:605 menu.c:616 menu.c:629 menu.c:642 menu.c:1043
+#: 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
msgid "No entries."
msgstr "ûÓÐ×ÊÁÏ¡£"
-#: menu.c:456
+#: menu.c:454
msgid "You cannot scroll down farther."
msgstr "ÄúÎÞ·¨ÔÙÏòÏÂ¾í¶¯ÁË¡£"
-#: menu.c:474
+#: menu.c:472
msgid "You cannot scroll up farther."
msgstr "ÄúÎÞ·¨ÔÙÏòÉÏ¾í¶¯ÁË¡£"
-#: menu.c:517
+#: menu.c:515
msgid "You are on the first page."
msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ò³¡£"
-#: menu.c:518
+#: menu.c:516
msgid "You are on the last page."
msgstr "ÄúÏÖÔÚÔÚ×îºóÒ»Ò³¡£"
-#: menu.c:653
+#: menu.c:651
msgid "You are on the last entry."
msgstr "ÄúÏÖÔÚÔÚ×îºóÒ»Ïî¡£"
-#: menu.c:664
+#: menu.c:662
msgid "You are on the first entry."
msgstr "ÄúÏÖÔÚÔÚµÚÒ»Ïî¡£"
-#: menu.c:724 pattern.c:1417
+#: menu.c:731 pattern.c:1404
msgid "Search for: "
msgstr "ËÑÑ°£º"
-#: menu.c:725 pattern.c:1418
+#: menu.c:732 pattern.c:1405
msgid "Reverse search for: "
msgstr "·µÏòËÑÑ°£º"
-#: menu.c:735 pattern.c:1450
+#: menu.c:746 pattern.c:1437
msgid "No search pattern."
msgstr "ûÓÐËÑÑ°¸ñʽ¡£"
-#: menu.c:765 pager.c:1987 pager.c:2003 pager.c:2111 pattern.c:1533
+#: menu.c:784 pager.c:1983 pager.c:2005 pager.c:2120 pattern.c:1520
msgid "Not found."
msgstr "ûÓÐÕÒµ½¡£"
-#: menu.c:895
+#: menu.c:910
msgid "No tagged entries."
msgstr "ûÓÐÒѱê¼ÇµÄ¼Ç¼¡£"
-#: menu.c:1000
+#: menu.c:1015
msgid "Search is not implemented for this menu."
msgstr "Õâ¸öÑ¡µ¥ÖÐûÓÐËÑÑ°¹¦ÄÜ¡£"
-#: menu.c:1005
+#: menu.c:1020
msgid "Jumping is not implemented for dialogs."
msgstr "¶Ô»°Ä£Ê½Öв»Ö§³ÖÌøÔ¾¹¦ÄÜ¡£"
-#: menu.c:1046
+#: menu.c:1061
msgid "Tagging is not supported."
msgstr "²»Ö§³Ö±ê¼Ç¹¦ÄÜ¡£"
-#: mh.c:1116
+#: mh.c:1114
#, fuzzy, c-format
msgid "Scanning %s..."
msgstr "Ñ¡Ôñ %s ÖС"
-#: mh.c:1358
+#: mh.c:1314 mh.c:1392
+#, fuzzy
+msgid "Could not flush message to disk"
+msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
+
+#: mh.c:1359
msgid "maildir_commit_message(): unable to set time on file"
msgstr ""
msgid "Error setting SASL external security strength"
msgstr ""
-#: mutt_sasl.c:252
+#: mutt_sasl.c:255
msgid "Error setting SASL external user name"
msgstr ""
-#: mutt_socket.c:103 mutt_socket.c:174
+#: mutt_socket.c:103 mutt_socket.c:181
#, fuzzy, c-format
msgid "Connection to %s closed"
msgstr "ÕýÁ¬½Óµ½ %s¡"
-#: mutt_socket.c:294
+#: mutt_socket.c:300
msgid "SSL is unavailable."
msgstr ""
-#: mutt_socket.c:326
+#: mutt_socket.c:332
#, fuzzy
msgid "Preconnect command failed."
msgstr "Ô¤ÏÈÁ¬½ÓÖ¸Áîʧ°Ü"
-#: mutt_socket.c:397 mutt_socket.c:411
+#: mutt_socket.c:403 mutt_socket.c:417
#, fuzzy, c-format
msgid "Error talking to %s (%s)"
msgstr "ÕýÁ¬Ïßµ½ %s"
-#: mutt_socket.c:464 mutt_socket.c:522
+#: mutt_socket.c:470 mutt_socket.c:529
#, c-format
msgid "Bad IDN \"%s\"."
msgstr ""
-#: mutt_socket.c:471 mutt_socket.c:529
+#: mutt_socket.c:478 mutt_socket.c:537
#, fuzzy, c-format
msgid "Looking up %s..."
msgstr "¿½±´µ½ %s¡"
-#: mutt_socket.c:482 mutt_socket.c:536
+#: mutt_socket.c:488 mutt_socket.c:546
#, fuzzy, c-format
msgid "Could not find the host \"%s\""
msgstr "ÕÒ²»µ½Ö÷»ú %s µÄλַ¡£"
-#: mutt_socket.c:487 mutt_socket.c:545
+#: mutt_socket.c:494 mutt_socket.c:552
#, c-format
msgid "Connecting to %s..."
msgstr "ÕýÁ¬½Óµ½ %s¡"
-#: mutt_socket.c:569
+#: mutt_socket.c:576
#, fuzzy, c-format
msgid "Could not connect to %s (%s)."
msgstr "ÎÞ·¨´ò¿ª %s"
-#: mutt_ssl.c:175
+#: mutt_ssl.c:183
msgid "Failed to find enough entropy on your system"
msgstr ""
-#: mutt_ssl.c:199
+#: mutt_ssl.c:207
#, c-format
msgid "Filling entropy pool: %s...\n"
msgstr ""
-#: mutt_ssl.c:207
+#: mutt_ssl.c:215
#, c-format
msgid "%s has insecure permissions!"
msgstr ""
-#: mutt_ssl.c:226
+#: mutt_ssl.c:234
msgid "SSL disabled due the lack of entropy"
msgstr ""
-#: mutt_ssl.c:323
+#: mutt_ssl.c:331
msgid "I/O error"
msgstr ""
-#: mutt_ssl.c:332
+#: mutt_ssl.c:340
#, fuzzy, c-format
msgid "SSL failed: %s"
msgstr "µÇÈëʧ°Ü¡£"
-#: mutt_ssl.c:341 mutt_ssl_gnutls.c:504 mutt_ssl_gnutls.c:513
-#: mutt_ssl_gnutls.c:542
+#: mutt_ssl.c:349 mutt_ssl_gnutls.c:880 mutt_ssl_gnutls.c:889
+#: mutt_ssl_gnutls.c:912
#, fuzzy
msgid "Unable to get certificate from peer"
msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
-#: mutt_ssl.c:349
+#: mutt_ssl.c:357
#, fuzzy, c-format
msgid "SSL connection using %s (%s)"
msgstr "ÕýÁ¬Ïßµ½ %s"
-#: mutt_ssl.c:393
+#: mutt_ssl.c:401
#, fuzzy
msgid "Unknown"
msgstr "²»Ã÷µÄ´íÎó"
-#: mutt_ssl.c:418 mutt_ssl_gnutls.c:392
+#: mutt_ssl.c:426 mutt_ssl_gnutls.c:457
#, fuzzy, c-format
msgid "[unable to calculate]"
msgstr "%s£ºÎÞ·¨¸½´øÎļþ"
-#: mutt_ssl.c:436 mutt_ssl_gnutls.c:415
+#: mutt_ssl.c:444 mutt_ssl_gnutls.c:480
#, fuzzy
msgid "[invalid date]"
msgstr "%s£ºÎÞЧµÄÖµ"
-#: mutt_ssl.c:557
+#: mutt_ssl.c:570
msgid "Server certificate is not yet valid"
msgstr ""
-#: mutt_ssl.c:564
+#: mutt_ssl.c:577
msgid "Server certificate has expired"
msgstr ""
-#: mutt_ssl.c:630 mutt_ssl_gnutls.c:645
+#: mutt_ssl.c:696
+#, fuzzy
+msgid "cannot get certificate subject"
+msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
+
+#: mutt_ssl.c:708
+#, fuzzy
+msgid "cannot get certificate common name"
+msgstr "ÎÞ·¨¾ö¶¨ home Ŀ¼"
+
+#: mutt_ssl.c:717
+#, c-format
+msgid "certificate owner does not match hostname %s"
+msgstr ""
+
+#: mutt_ssl.c:754
+#, fuzzy, c-format
+msgid "Certificate host check failed: %s"
+msgstr "Ö¸ÁîÐÐÓÐ´í£º%s\n"
+
+#: mutt_ssl.c:845 mutt_ssl_gnutls.c:664
msgid "This certificate belongs to:"
msgstr ""
-#: mutt_ssl.c:641 mutt_ssl_gnutls.c:684
+#: mutt_ssl.c:858 mutt_ssl_gnutls.c:703
msgid "This certificate was issued by:"
msgstr ""
-#: mutt_ssl.c:652 mutt_ssl_gnutls.c:723
+#: mutt_ssl.c:869 mutt_ssl_gnutls.c:742
#, c-format
msgid "This certificate is valid"
msgstr ""
-#: mutt_ssl.c:653 mutt_ssl_gnutls.c:726
+#: mutt_ssl.c:870 mutt_ssl_gnutls.c:745
#, c-format
msgid " from %s"
msgstr ""
-#: mutt_ssl.c:655 mutt_ssl_gnutls.c:730
+#: mutt_ssl.c:872 mutt_ssl_gnutls.c:749
#, c-format
msgid " to %s"
msgstr ""
-#: mutt_ssl.c:661
+#: mutt_ssl.c:878
#, c-format
msgid "Fingerprint: %s"
msgstr ""
-#: mutt_ssl.c:663
-msgid "SSL Certificate check"
+#: mutt_ssl.c:881 mutt_ssl_gnutls.c:786
+#, c-format
+msgid "SSL Certificate check (certificate %d of %d in chain)"
msgstr ""
-#: mutt_ssl.c:667 mutt_ssl_gnutls.c:771
+#: mutt_ssl.c:887 mutt_ssl_gnutls.c:793
msgid "(r)eject, accept (o)nce, (a)ccept always"
msgstr ""
-#: mutt_ssl.c:668 mutt_ssl_gnutls.c:772
+#: mutt_ssl.c:888 mutt_ssl_gnutls.c:794
msgid "roa"
msgstr ""
-#: mutt_ssl.c:672 mutt_ssl_gnutls.c:776
+#: mutt_ssl.c:892 mutt_ssl_gnutls.c:798
msgid "(r)eject, accept (o)nce"
msgstr ""
-#: mutt_ssl.c:673 mutt_ssl_gnutls.c:777
+#: mutt_ssl.c:893 mutt_ssl_gnutls.c:799
msgid "ro"
msgstr ""
-#: mutt_ssl.c:704 mutt_ssl_gnutls.c:826
+#: mutt_ssl.c:924 mutt_ssl_gnutls.c:848
msgid "Warning: Couldn't save certificate"
msgstr ""
-#: mutt_ssl.c:709 mutt_ssl_gnutls.c:831
+#: mutt_ssl.c:929 mutt_ssl_gnutls.c:853
msgid "Certificate saved"
msgstr ""
-#: mutt_ssl_gnutls.c:96 mutt_ssl_gnutls.c:119
+#: mutt_ssl_gnutls.c:96 mutt_ssl_gnutls.c:123
msgid "Error: no TLS socket open"
msgstr ""
-#: mutt_ssl_gnutls.c:215
+#: mutt_ssl_gnutls.c:276
msgid "All available protocols for TLS/SSL connection disabled"
msgstr ""
-#: mutt_ssl_gnutls.c:276
+#: mutt_ssl_gnutls.c:340
#, fuzzy, c-format
msgid "SSL/TLS connection using %s (%s/%s/%s)"
msgstr "ÕýÁ¬Ïßµ½ %s"
-#: mutt_ssl_gnutls.c:519
-#, c-format
-msgid "Certificate verification error (%s)"
-msgstr ""
-
-#: mutt_ssl_gnutls.c:527
-msgid "Certificate is not X.509"
-msgstr ""
-
-#: mutt_ssl_gnutls.c:534
+#: mutt_ssl_gnutls.c:567
#, fuzzy
msgid "Error initialising gnutls certificate data"
msgstr "ÎÞ·¨³õʼ»¯Öն˻ú¡£"
-#: mutt_ssl_gnutls.c:550
+#: mutt_ssl_gnutls.c:574
msgid "Error processing certificate data"
msgstr ""
-#: mutt_ssl_gnutls.c:735
+#: mutt_ssl_gnutls.c:754
#, c-format
msgid "SHA1 Fingerprint: %s"
msgstr ""
-#: mutt_ssl_gnutls.c:738
+#: mutt_ssl_gnutls.c:757
#, c-format
msgid "MD5 Fingerprint: %s"
msgstr ""
-#: mutt_ssl_gnutls.c:743
+#: mutt_ssl_gnutls.c:762
msgid "WARNING: Server certificate is not yet valid"
msgstr ""
-#: mutt_ssl_gnutls.c:748
+#: mutt_ssl_gnutls.c:767
msgid "WARNING: Server certificate has expired"
msgstr ""
-#: mutt_ssl_gnutls.c:753
+#: mutt_ssl_gnutls.c:772
msgid "WARNING: Server certificate has been revoked"
msgstr ""
-#: mutt_ssl_gnutls.c:758
+#: mutt_ssl_gnutls.c:777
msgid "WARNING: Server hostname does not match certificate"
msgstr ""
-#: mutt_ssl_gnutls.c:763
+#: mutt_ssl_gnutls.c:782
msgid "WARNING: Signer of server certificate is not a CA"
msgstr ""
-#: mutt_ssl_gnutls.c:766
-msgid "TLS/SSL Certificate check"
+#: mutt_ssl_gnutls.c:895
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:904
+msgid "Certificate is not X.509"
msgstr ""
#: mutt_tunnel.c:72
msgid "Tunnel error talking to %s: %s"
msgstr "ÕýÁ¬Ïßµ½ %s"
-#: muttlib.c:911
+#: muttlib.c:923
#, fuzzy
msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
-#: muttlib.c:911
+#: muttlib.c:923
msgid "yna"
msgstr ""
-#: muttlib.c:927
+#: muttlib.c:939
msgid "File is a directory, save under it?"
msgstr "ÎļþÊÇÒ»¸öĿ¼, ´¢´æÔÚËüÏÂÃæ ?"
-#: muttlib.c:933
+#: muttlib.c:945
msgid "File under directory: "
msgstr "ÔÚĿ¼µ×ϵÄÎļþ£º"
-#: muttlib.c:945
+#: muttlib.c:957
msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
msgstr "ÎļþÒѾ´æÔÚ, (o)¸²¸Ç, (a)¸½¼Ó, »òÊÇ (c)È¡Ïû ?"
-#: muttlib.c:945
+#: muttlib.c:957
msgid "oac"
msgstr ""
-#: muttlib.c:1429
+#: muttlib.c:1441
#, fuzzy
msgid "Can't save message to POP mailbox."
msgstr "½«ÐżþдÈëµ½ÐÅÏä"
-#: muttlib.c:1438
+#: muttlib.c:1450
#, c-format
msgid "Append messages to %s?"
msgstr "¸½¼ÓÐżþµ½ %s ?"
-#: muttlib.c:1450
+#: muttlib.c:1462
#, c-format
msgid "%s is not a mailbox!"
msgstr "%s ²»ÊÇÐÅÏ䣡"
msgid "Integer overflow -- can't allocate memory."
msgstr ""
-#: pager.c:1481
+#: pager.c:1480
msgid "PrevPg"
msgstr "ÉÏÒ»Ò³"
-#: pager.c:1482
+#: pager.c:1481
msgid "NextPg"
msgstr "ÏÂÒ»Ò³"
-#: pager.c:1486
+#: pager.c:1485
msgid "View Attachm."
msgstr "ÏÔʾ¸½¼þ¡£"
-#: pager.c:1489
+#: pager.c:1488
msgid "Next"
msgstr "ÏÂÒ»¸ö"
#. emulate "less -q" and don't go on to the next message.
-#: pager.c:1895 pager.c:1926 pager.c:1958 pager.c:2199
+#: pager.c:1889 pager.c:1920 pager.c:1952 pager.c:2208
msgid "Bottom of message is shown."
msgstr "ÏÖÕýÏÔʾ×îÏÂÃæµÄÐżþ¡£"
-#: pager.c:1911 pager.c:1933 pager.c:1940 pager.c:1947
+#: pager.c:1905 pager.c:1927 pager.c:1934 pager.c:1941
msgid "Top of message is shown."
msgstr "ÏÖÕýÏÔʾ×îÉÏÃæµÄÐżþ¡£"
-#: pager.c:2016
+#: pager.c:2024
msgid "Reverse search: "
msgstr "·´ÏòËÑÑ°£º"
-#: pager.c:2017
+#: pager.c:2025
msgid "Search: "
msgstr "ËÑÑ°£º"
-#: pager.c:2137
+#: pager.c:2146
msgid "Help is currently being shown."
msgstr "ÏÖÕýÏÔʾ˵Ã÷Îļþ¡£"
-#: pager.c:2166
+#: pager.c:2175
msgid "No more quoted text."
msgstr "²»ÄÜÓÐÔÙ¶àµÄÒýÑÔ¡£"
-#: pager.c:2179
+#: pager.c:2188
msgid "No more unquoted text after quoted text."
msgstr "ÔÚÒýÑÔºóÓйý¶àµÄ·ÇÒýÑÔÎÄ×Ö¡£"
-#: parse.c:622
+#: parse.c:577
msgid "multipart message has no boundary parameter!"
msgstr "¶à²¿·ÝÓʼþûÓзָôµÄ²ÎÊý!"
-#: pattern.c:275
+#: pattern.c:262
#, c-format
msgid "Error in expression: %s"
msgstr "±í´ïʽÓдíÎó£º%s"
-#: pattern.c:280
+#: pattern.c:267
#, fuzzy, c-format
msgid "Empty expression"
msgstr "±í´ïʽÓдíÎó"
-#: pattern.c:411
+#: pattern.c:398
#, c-format
msgid "Invalid day of month: %s"
msgstr "ÎÞЧµÄÈÕ×Ó£º%s"
-#: pattern.c:425
+#: pattern.c:412
#, c-format
msgid "Invalid month: %s"
msgstr "ÎÞЧµÄÔ·ݣº%s"
#. getDate has its own error message, don't overwrite it here
-#: pattern.c:577
+#: pattern.c:564
#, fuzzy, c-format
msgid "Invalid relative date: %s"
msgstr "ÎÞЧµÄÔ·ݣº%s"
-#: pattern.c:591
+#: pattern.c:578
msgid "error in expression"
msgstr "±í´ïʽÓдíÎó"
-#: pattern.c:812 pattern.c:958
+#: pattern.c:799 pattern.c:945
#, c-format
msgid "error in pattern at: %s"
msgstr "ÔÚÑùʽÉÏÓдíÎó£º%s"
-#: pattern.c:842
+#: pattern.c:829
#, fuzzy, c-format
msgid "mismatched brackets: %s"
msgstr "²»¶Ô³ÆµÄÀ¨»¡£º%s"
-#: pattern.c:898
+#: pattern.c:885
#, fuzzy, c-format
msgid "%c: invalid pattern modifier"
msgstr "%c£ºÎÞЧµÄÖ¸Áî"
-#: pattern.c:904
+#: pattern.c:891
#, c-format
msgid "%c: not supported in this mode"
msgstr "%c£ºÔÚÕâ¸öģʽ²»Ö§³Ö"
-#: pattern.c:917
+#: pattern.c:904
#, c-format
msgid "missing parameter"
msgstr "´íʧ²ÎÊý"
-#: pattern.c:933
+#: pattern.c:920
#, c-format
msgid "mismatched parenthesis: %s"
msgstr "²»¶Ô³ÆµÄÀ¨»¡£º%s"
-#: pattern.c:965
+#: pattern.c:952
msgid "empty pattern"
msgstr "¿ÕµÄ¸ñʽ"
-#: pattern.c:1218
+#: pattern.c:1205
#, c-format
msgid "error: unknown op %d (report this error)."
msgstr "´íÎ󣺲»Ã÷µÄ op %d (Çë»Ø±¨Õâ¸ö´íÎó)¡£"
-#: pattern.c:1301 pattern.c:1436
+#: pattern.c:1288 pattern.c:1423
msgid "Compiling search pattern..."
msgstr "±àÒëËÑÑ°ÑùʽÖС"
-#: pattern.c:1320
+#: pattern.c:1307
msgid "Executing command on matching messages..."
msgstr "ÕýÔÚ¶Ô·ûºÏµÄÓʼþÖ´ÐÐÃüÁî¡"
-#: pattern.c:1387
+#: pattern.c:1374
msgid "No messages matched criteria."
msgstr "ûÓÐÓʼþ·ûºÏÒªÇó¡£"
-#: pattern.c:1469
+#: pattern.c:1456
#, fuzzy
msgid "Searching..."
msgstr "´¢´æÖС"
-#: pattern.c:1482
+#: pattern.c:1469
msgid "Search hit bottom without finding match"
msgstr "ÒÑËÑÑ°ÖÁ½á⣬²¢Ã»Óз¢ÏÖÈκηûºÏ"
-#: pattern.c:1493
+#: pattern.c:1480
msgid "Search hit top without finding match"
msgstr "ÒÑËÑÑ°ÖÁ¿ªÍ·£¬²¢Ã»Óз¢ÏÖÈκηûºÏ"
-#: pattern.c:1525
+#: pattern.c:1512
msgid "Search interrupted."
msgstr "ËÑÑ°Òѱ»Öжϡ£"
msgid "PGP passphrase forgotten."
msgstr "ÒÑÍü¼Ç PGP ͨÐÐÃÜÂë¡£"
-#: pgp.c:358
+#: pgp.c:357
msgid "[-- Error: unable to create PGP subprocess! --]\n"
msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
-#: pgp.c:392 pgp.c:641 pgp.c:845
+#: pgp.c:391 pgp.c:643 pgp.c:847
msgid ""
"[-- End of PGP output --]\n"
"\n"
"[-- PGP Êä³ö²¿·Ý½áÊø --]\n"
"\n"
-#: pgp.c:412 pgp.c:460 pgp.c:977
+#: pgp.c:411 pgp.c:459 pgp.c:982
#, fuzzy
msgid "Could not decrypt PGP message"
msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
#. clear 'Invoking...' message, since there's no error
-#: pgp.c:462 pgp.c:973
+#: pgp.c:461 pgp.c:978
#, fuzzy
msgid "PGP message successfully decrypted."
msgstr "PGP Ç©ÃûÑéÖ¤³É¹¦¡£"
-#: pgp.c:749
+#: pgp.c:751
#, fuzzy
msgid "Internal error. Inform <roessler@does-not-exist.org>."
msgstr "ÄÚ²¿´íÎó¡£ÁªÂç <rosessler@does-not-exist.org>¡£"
-#: pgp.c:810
+#: pgp.c:812
msgid ""
"[-- Error: could not create a PGP subprocess! --]\n"
"\n"
"[-- ´íÎó£ºÎÞ·¨½¨Á¢ PGP ×Ó³ÌÐò£¡ --]\n"
"\n"
-#: pgp.c:854
+#: pgp.c:859
#, fuzzy
msgid "Decryption failed"
msgstr "µÇÈëʧ°Ü¡£"
-#: pgp.c:1029
+#: pgp.c:1034
msgid "Can't open PGP subprocess!"
msgstr "ÎÞ·¨´ò¿ª PGP ×Ó³ÌÐò£¡"
-#: pgp.c:1466
+#: pgp.c:1471
msgid "Can't invoke PGP"
msgstr "²»ÄÜÖ´ÐÐ PGP"
-#: pgp.c:1567
+#: pgp.c:1572
#, 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:1568
+#: pgp.c:1573
msgid "PGP/M(i)ME"
msgstr ""
-#: pgp.c:1568
+#: pgp.c:1573
msgid "(i)nline"
msgstr ""
-#: pgp.c:1570
+#: pgp.c:1575
#, fuzzy
msgid "esabifc"
msgstr "esabif"
msgid "All matching keys are expired, revoked, or disabled."
msgstr "Õâ¸öÔ¿³×²»ÄÜʹÓ㺹ýÆÚ/ÎÞЧ/ÒÑÈ¡Ïû¡£"
-#: pgpkey.c:533
+#: pgpkey.c:532
#, fuzzy, c-format
msgid "PGP keys matching <%s>."
msgstr "PGP Ô¿³×·ûºÏ \"%s\"¡£"
-#: pgpkey.c:535
+#: pgpkey.c:534
#, c-format
msgid "PGP keys matching \"%s\"."
msgstr "PGP Ô¿³×·ûºÏ \"%s\"¡£"
-#: pgpkey.c:554 pgpkey.c:746
+#: pgpkey.c:553 pgpkey.c:745
msgid "Can't open /dev/null"
msgstr "ÎÞ·¨´ò¿ª /dev/null"
-#: pgpkey.c:725
+#: pgpkey.c:724
msgid "Please enter the key ID: "
msgstr "ÇëÊäÈëÕâ°ÑÔ¿³×µÄ ID£º"
-#: pgpkey.c:778
+#: pgpkey.c:777
#, c-format
msgid "PGP Key %s."
msgstr "PGP Ô¿³× %s¡£"
msgid "Connection lost. Reconnect to POP server?"
msgstr "ÕýÔڹرÕÓë IMAP ËÅ·þÆ÷µÄÁ¬Ïß¡"
-#: postpone.c:167
+#: postpone.c:164
msgid "Postponed Messages"
msgstr "ÐżþÒѾ±»Ñӳټijö"
-#: postpone.c:247 postpone.c:256
+#: postpone.c:244 postpone.c:253
msgid "No postponed messages."
msgstr "ûÓб»ÑӳټijöµÄÐżþ¡£"
-#: postpone.c:444 postpone.c:465 postpone.c:499
+#: postpone.c:441 postpone.c:462 postpone.c:496
#, fuzzy
msgid "Illegal crypto header"
msgstr "²»ºÏ¹æ¶¨µÄ PGP ±êÍ·"
-#: postpone.c:485
+#: postpone.c:482
#, fuzzy
msgid "Illegal S/MIME header"
msgstr "²»ºÏ¹æ¶¨µÄ S/MIME ±êÍ·"
-#: postpone.c:565
+#: postpone.c:562
#, fuzzy
msgid "Decrypting message..."
msgstr "¼Ä³öÐżþÖС"
-#: postpone.c:574
+#: postpone.c:571
#, fuzzy
msgid "Decryption failed."
msgstr "µÇÈëʧ°Ü¡£"
-#: query.c:51
+#: query.c:50
msgid "New Query"
msgstr "еIJéѯ"
-#: query.c:52
+#: query.c:51
msgid "Make Alias"
msgstr "ÖÆ×÷±ðÃû"
-#: query.c:53
+#: query.c:52
msgid "Search"
msgstr "ËÑÑ°"
-#: query.c:101
+#: query.c:95
msgid "Waiting for response..."
msgstr "µÈ´ý»ØÓ¦ÖС"
-#: query.c:263 query.c:291
+#: query.c:246 query.c:274
msgid "Query command not defined."
msgstr "²éѯָÁîÉÐ䶨Òå¡£"
-#: query.c:318
+#: query.c:301
#, c-format
msgid "Query"
msgstr "²éѯ"
#. Prompt for Query
-#: query.c:331 query.c:356
+#: query.c:313 query.c:338
msgid "Query: "
msgstr "²éѯ£º"
-#: query.c:339 query.c:365
+#: query.c:321 query.c:347
#, 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:473
+#: recvattach.c:472
msgid "Saving..."
msgstr "´¢´æÖС"
-#: recvattach.c:476 recvattach.c:567
+#: recvattach.c:475 recvattach.c:566
msgid "Attachment saved."
msgstr "¸½¼þÒѱ»´¢´æ¡£"
-#: recvattach.c:579
+#: recvattach.c:578
#, c-format
msgid "WARNING! You are about to overwrite %s, continue?"
msgstr "¾¯¸æ! ÄúÕýÔÚ¸²¸Ç %s, ÊÇ·ñÒª¼ÌÐø?"
-#: recvattach.c:597
+#: recvattach.c:596
msgid "Attachment filtered."
msgstr "¸½¼þ±»¹ýÂ˵ô¡£"
-#: recvattach.c:664
+#: recvattach.c:663
msgid "Filter through: "
msgstr "¾¹ý¹ýÂË£º"
-#: recvattach.c:664
+#: recvattach.c:663
msgid "Pipe to: "
msgstr "µ¼ÒýÖÁ£º"
-#: recvattach.c:699
+#: recvattach.c:698
#, c-format
msgid "I dont know how to print %s attachments!"
msgstr "ÎÒ²»ÖªµÀÒªÔõô´òÓ¡ %s ¸½¼þ!"
-#: recvattach.c:764
+#: recvattach.c:763
msgid "Print tagged attachment(s)?"
msgstr "ÊÇ·ñÒª´òÓ¡±ê¼ÇÆðÀ´µÄ¸½¼þ?"
-#: recvattach.c:764
+#: recvattach.c:763
msgid "Print attachment?"
msgstr "ÊÇ·ñÒª´òÓ¡¸½¼þ?"
-#: recvattach.c:997
+#: recvattach.c:996
#, fuzzy
msgid "Can't decrypt encrypted message!"
msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
-#: recvattach.c:1010
+#: recvattach.c:1008
msgid "Attachments"
msgstr "¸½¼þ"
-#: recvattach.c:1046
+#: recvattach.c:1044
#, fuzzy
msgid "There are no subparts to show!"
msgstr "ûÓи½¼þ¡£"
-#: recvattach.c:1107
+#: recvattach.c:1105
#, fuzzy
msgid "Can't delete attachment from POP server."
msgstr "È¡»Ø POP ËÅ·þÆ÷ÉϵÄÐżþ"
-#: recvattach.c:1115
+#: recvattach.c:1113
#, fuzzy
msgid "Deletion of attachments from encrypted messages is unsupported."
msgstr "δ֧³Öɾ³ý PGP ÐżþËù¸½´øµÄ¸½¼þ¡£"
-#: recvattach.c:1134 recvattach.c:1151
+#: recvattach.c:1132 recvattach.c:1149
msgid "Only deletion of multipart attachments is supported."
msgstr "Ö»Ö§³Öɾ³ý¶àÖظ½¼þ"
-#: recvcmd.c:47
+#: recvcmd.c:43
msgid "You may only bounce message/rfc822 parts."
msgstr "ÄúÖ»ÄÜÖ±½Ó´«ËÍ message/rfc822 µÄ²¿·Ö¡£"
-#: recvcmd.c:217
+#: recvcmd.c:213
#, fuzzy
msgid "Error bouncing message!"
msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
-#: recvcmd.c:217
+#: recvcmd.c:213
#, fuzzy
msgid "Error bouncing messages!"
msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
-#: recvcmd.c:417
+#: recvcmd.c:413
#, fuzzy, c-format
msgid "Can't open temporary file %s."
msgstr "ÎÞ·¨½¨Á¢ÔÝ´æµµ"
-#: recvcmd.c:448
+#: recvcmd.c:444
#, fuzzy
msgid "Forward as attachments?"
msgstr "ÏÔʾ MIME ¸½¼þ"
-#: recvcmd.c:462
+#: recvcmd.c:458
msgid "Can't decode all tagged attachments. MIME-forward the others?"
msgstr ""
-#: recvcmd.c:587
+#: recvcmd.c:583
msgid "Forward MIME encapsulated?"
msgstr "Óà MIME µÄ·½Ê½À´×ª¼Ä£¿"
-#: recvcmd.c:595 recvcmd.c:845
+#: recvcmd.c:591 recvcmd.c:841
#, fuzzy, c-format
msgid "Can't create %s."
msgstr "ÎÞ·¨½¨Á¢ %s: %s."
-#: recvcmd.c:728
+#: recvcmd.c:724
#, fuzzy
msgid "Can't find any tagged messages."
msgstr "Ó¦ÓÃÏÂÒ»¸ö¹¦Äܵ½Òѱê¼ÇµÄѶϢ"
-#: recvcmd.c:749 send.c:728
+#: recvcmd.c:745 send.c:727
msgid "No mailing lists found!"
msgstr "ûÓÐÕÒµ½ÓʼÄÂÛ̳£¡"
-#: recvcmd.c:824
+#: recvcmd.c:820
msgid "Can't decode all tagged attachments. MIME-encapsulate the others?"
msgstr ""
msgid "Can't get mixmaster's type2.list!"
msgstr ""
-#: remailer.c:543
+#: remailer.c:542
#, fuzzy
msgid "Select a remailer chain."
msgstr "ɾ³ýijÐÐÉÏËùÓеÄ×Öĸ"
-#: remailer.c:603
+#: remailer.c:602
#, c-format
msgid "Error: %s can't be used as the final remailer of a chain."
msgstr ""
-#: remailer.c:633
+#: remailer.c:632
#, c-format
msgid "Mixmaster chains are limited to %d elements."
msgstr ""
-#: remailer.c:656
+#: remailer.c:655
msgid "The remailer chain is already empty."
msgstr ""
-#: remailer.c:666
+#: remailer.c:665
#, fuzzy
msgid "You already have the first chain element selected."
msgstr "ÄúÒѾÔÚµÚÒ»·âÐÅÁË¡£"
-#: remailer.c:676
+#: remailer.c:675
msgid "You already have the last chain element selected."
msgstr ""
-#: remailer.c:715
+#: remailer.c:714
msgid "Mixmaster doesn't accept Cc or Bcc headers."
msgstr ""
-#: remailer.c:739
+#: remailer.c:738
msgid ""
"Please set the hostname variable to a proper value when using mixmaster!"
msgstr ""
-#: remailer.c:773
+#: remailer.c:772
#, fuzzy, c-format
msgid "Error sending message, child exited %d.\n"
msgstr "¼ÄËÍѶϢ³öÏÖ´íÎó£¬×Ó³ÌÐòÒѽáÊø %d (%s)¡£"
-#: remailer.c:777
+#: remailer.c:776
msgid "Error sending message."
msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
msgid "score: too many arguments"
msgstr "·ÖÊý£ºÌ«¶àµÄ²ÎÊý"
-#: send.c:253
+#: send.c:252
msgid "No subject, abort?"
msgstr "ûÓбêÌ⣬Ҫ²»ÒªÖжϣ¿"
-#: send.c:255
+#: send.c:254
msgid "No subject, aborting."
msgstr "ûÓбêÌ⣬ÕýÔÚÖжÏÖС£"
#. * to send a message to only the sender of the message. This
#. * provides a way to do that.
#.
-#: send.c:497
+#: send.c:496
#, c-format
msgid "Reply to %s%s?"
msgstr "Òª»Ø¸²¸ø %s%s?"
-#: send.c:531
+#: send.c:530
#, c-format
msgid "Follow-up to %s%s?"
msgstr "ÒÔºóµÄ»Ø¸²¶¼¼ÄÖÁ %s%s?"
#. This could happen if the user tagged some messages and then did
#. * a limit such that none of the tagged message are visible.
#.
-#: send.c:703
+#: send.c:702
msgid "No tagged messages are visible!"
msgstr "ûÓб»±ê¼ÇÁ˵ÄÐżþÔÚÏÔʾ£¡"
-#: send.c:754
+#: send.c:753
msgid "Include message in reply?"
msgstr "»ØÐÅʱÊÇ·ñÒª°üº¬Ô±¾µÄÐżþÄÚÈÝ£¿"
-#: send.c:759
+#: send.c:758
msgid "Including quoted message..."
msgstr "ÕýÒýÈëÒýÑÔ²¿·Ö¡"
-#: send.c:769
+#: send.c:768
msgid "Could not include all requested messages!"
msgstr "ÎÞ·¨°üº¬ËùÓÐÒªÇóµÄÐżþ£¡"
-#: send.c:783
+#: send.c:782
#, fuzzy
msgid "Forward as attachment?"
msgstr "ÊÇ·ñÒª´òÓ¡¸½¼þ?"
-#: send.c:787
+#: send.c:786
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:1117
+#: send.c:1116
msgid "Recall postponed message?"
msgstr "Òª½Ð³ö±»ÑÓ³ÙµÄÐżþ?"
-#: send.c:1429
+#: send.c:1428
#, fuzzy
msgid "Edit forwarded message?"
msgstr "×¼±¸×ª¼ÄÐżþ¡"
-#: send.c:1469
+#: send.c:1468
msgid "Abort unmodified message?"
msgstr "ÊÇ·ñÒªÖжÏδÐ޸ĹýµÄÐżþ?"
-#: send.c:1471
+#: send.c:1470
msgid "Aborted unmodified message."
msgstr "ÖжÏûÓÐÐ޸ĹýµÄÐżþ"
-#: send.c:1540
+#: send.c:1539
msgid "Message postponed."
msgstr "Ðżþ±»Ñӳټijö¡£"
-#: send.c:1549
+#: send.c:1548
msgid "No recipients are specified!"
msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕߣ¡"
-#: send.c:1554
+#: send.c:1553
msgid "No recipients were specified."
msgstr "ûÓÐÖ¸¶¨½ÓÊÜÕß¡£"
-#: send.c:1570
+#: send.c:1569
msgid "No subject, abort sending?"
msgstr "ûÓÐÐżþ±êÌ⣬ҪÖжϼÄÐŵŤ×÷?"
-#: send.c:1574
+#: send.c:1573
msgid "No subject specified."
msgstr "ûÓÐÖ¸¶¨±êÌâ¡£"
-#: send.c:1636 smtp.c:158
+#: send.c:1635 smtp.c:161
msgid "Sending message..."
msgstr "¼Ä³öÐżþÖС"
-#: send.c:1777
+#: send.c:1776
msgid "Could not send the message."
msgstr "ÎÞ·¨¼Ä³öÐżþ¡£"
-#: send.c:1782
+#: send.c:1781
msgid "Mail sent."
msgstr "ÐżþÒѾ¼Ä³ö¡£"
-#: send.c:1782
+#: send.c:1781
msgid "Sending in background."
msgstr "ÕýÔÚºǫ́´«ËÍ¡£"
msgid "Could not open %s"
msgstr "ÎÞ·¨´ò¿ª %s"
-#: sendlib.c:2228
+#: sendlib.c:2226
#, c-format
msgid "Error sending message, child exited %d (%s)."
msgstr "¼ÄËÍѶϢ³öÏÖ´íÎó£¬×Ó³ÌÐòÒѽáÊø %d (%s)¡£"
-#: sendlib.c:2234
+#: sendlib.c:2232
msgid "Output of the delivery process"
msgstr "Delivery process µÄÊä³ö"
-#: sendlib.c:2448
+#: sendlib.c:2396
#, c-format
msgid "Bad IDN %s while preparing resent-from."
msgstr ""
msgid "S/MIME certificates matching \"%s\"."
msgstr "S/MIME Ô¿³×·ûºÏ \"%s\"¡£"
-#: smime.c:542 smime.c:612 smime.c:630
+#: smime.c:540 smime.c:610 smime.c:628
#, c-format
msgid "ID %s is unverified. Do you want to use it for %s ?"
msgstr ""
-#: smime.c:546 smime.c:616
+#: smime.c:544 smime.c:614
#, fuzzy, c-format
msgid "Use (untrusted!) ID %s for %s ?"
msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
-#: smime.c:549 smime.c:619
+#: smime.c:547 smime.c:617
#, fuzzy, c-format
msgid "Use ID %s for %s ?"
msgstr "ҪΪ %2$s ʹÓÃÔ¿³× ID = \"%1$s\"£¿"
-#: smime.c:638
+#: smime.c:636
#, c-format
msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
msgstr ""
-#: smime.c:797
+#: smime.c:795
#, c-format
msgid "No (valid) certificate found for %s."
msgstr ""
-#: smime.c:852 smime.c:880 smime.c:945 smime.c:989 smime.c:1054 smime.c:1129
+#: smime.c:850 smime.c:878 smime.c:943 smime.c:987 smime.c:1052 smime.c:1127
#, fuzzy
msgid "Error: unable to create OpenSSL subprocess!"
msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ OpenSSL ×Ó³ÌÐò£¡ --]\n"
-#: smime.c:1207
+#: smime.c:1205
#, fuzzy
msgid "no certfile"
msgstr "ÎÞ·¨½¨Á¢¹ýÂËÆ÷"
-#: smime.c:1210
+#: smime.c:1208
#, fuzzy
msgid "no mbox"
msgstr "£¨Ã»ÓÐÐÅÏ䣩"
#. fatal error while trying to encrypt message
-#: smime.c:1353
+#: smime.c:1351
msgid "No output from OpenSSL.."
msgstr ""
-#: smime.c:1391
+#: smime.c:1389
+msgid "Can't sign: No key specified. Use Sign As."
+msgstr ""
+
+#: smime.c:1395
msgid "Warning: Intermediate certificate not found."
msgstr ""
-#: smime.c:1434
+#: smime.c:1438
#, fuzzy
msgid "Can't open OpenSSL subprocess!"
msgstr "ÎÞ·¨´ò¿ª OpenSSL ×Ó³ÌÐò£¡"
-#: smime.c:1472
+#: smime.c:1476
msgid "No output from OpenSSL..."
msgstr ""
-#: smime.c:1637 smime.c:1762
+#: smime.c:1641 smime.c:1766
#, fuzzy
msgid ""
"[-- End of OpenSSL output --]\n"
"[-- OpenSSL Êä³ö²¿·Ý½áÊø --]\n"
"\n"
-#: smime.c:1721 smime.c:1732
+#: smime.c:1725 smime.c:1736
#, fuzzy
msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
msgstr "[-- ´íÎó£ºÎÞ·¨½¨Á¢ OpenSSL ×Ó³ÌÐò£¡ --]\n"
-#: smime.c:1766
+#: smime.c:1770
#, fuzzy
msgid "[-- The following data is S/MIME encrypted --]\n"
msgstr ""
"[-- ÏÂÃæÊÇ S/MIME ¼ÓÃÜ×ÊÁÏ --]\n"
"\n"
-#: smime.c:1769
+#: smime.c:1773
#, fuzzy
msgid "[-- The following data is S/MIME signed --]\n"
msgstr ""
"[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]\n"
"\n"
-#: smime.c:1833
+#: smime.c:1837
#, fuzzy
msgid ""
"\n"
"\n"
"[-- S/MIME ¼ÓÃÜ×ÊÁϽáÊø --]\n"
-#: smime.c:1835
+#: smime.c:1839
#, fuzzy
msgid ""
"\n"
"\n"
"[-- Ç©ÊðµÄ×ÊÁϽáÊø --]\n"
-#: smime.c:1946
+#: smime.c:1950
#, fuzzy
msgid ""
"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
"(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, Ñ¡Ôñ (m)ic ÑÝËã·¨ »ò (f)·Å"
"Æú£¿"
-#: smime.c:1947
+#: smime.c:1951
#, fuzzy
msgid "eswabfc"
msgstr "esabif"
#. I use "dra" because "123" is recognized anyway
-#: smime.c:1962
+#: smime.c:1966
msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
msgstr ""
-#: smime.c:1965
+#: smime.c:1969
msgid "drac"
msgstr ""
-#: smime.c:1968
+#: smime.c:1972
msgid "1: DES, 2: Triple-DES "
msgstr ""
-#: smime.c:1969
+#: smime.c:1973
msgid "dt"
msgstr ""
-#: smime.c:1981
+#: smime.c:1985
msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
msgstr ""
-#: smime.c:1982
+#: smime.c:1986
msgid "468"
msgstr ""
-#: smime.c:1997
+#: smime.c:2001
msgid "1: AES128, 2: AES192, 3: AES256 "
msgstr ""
-#: smime.c:1998
+#: smime.c:2002
msgid "895"
msgstr ""
-#: smime.c:2026
-msgid "Can't sign: No key specified. Use Sign As."
-msgstr ""
-
-#: smtp.c:113
+#: smtp.c:116
#, fuzzy, c-format
msgid "SMTP session failed: %s"
msgstr "µÇÈëʧ°Ü¡£"
-#: smtp.c:153
+#: smtp.c:156
#, fuzzy, c-format
msgid "SMTP session failed: unable to open %s"
msgstr "µÇÈëʧ°Ü¡£"
-#: smtp.c:269
+#: smtp.c:228
+msgid "No from address given"
+msgstr ""
+
+#: smtp.c:284
msgid "SMTP session failed: read error"
msgstr ""
-#: smtp.c:271
+#: smtp.c:286
msgid "SMTP session failed: write error"
msgstr ""
-#: smtp.c:294
+#: smtp.c:309
#, fuzzy, c-format
msgid "Invalid SMTP URL: %s"
msgstr "ÎÞЧµÄÔ·ݣº%s"
-#: smtp.c:400
+#: smtp.c:419
msgid "SMTP server does not support authentication"
msgstr ""
-#: smtp.c:408
+#: smtp.c:427
#, fuzzy
msgid "SMTP authentication requires SASL"
msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
-#: smtp.c:551
+#: smtp.c:461
+#, fuzzy, c-format
+msgid "%s authentication failed, trying next method"
+msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
+
+#: smtp.c:478
#, fuzzy
msgid "SASL authentication failed"
msgstr "GSSAPI Ñé֤ʧ°Ü¡£"
msgid "show S/MIME options"
msgstr "ÏÔʾ S/MIME Ñ¡Ïî"
+#, fuzzy
+#~ msgid "Error checking signature"
+#~ msgstr "¼ÄÐÅ;Öз¢Éú´íÎó¡£"
+
#, fuzzy
#~ msgid "Getting namespaces..."
#~ msgstr "¼Ä³öÐżþÖС"
projects / software / mutt-debian.git / blobdiff