changeset: 6350:cbe2e875619d user: Brendan Cully <bren...@kublai.com> date: Wed Mar 12 09:15:35 2014 -0700 link: http://dev.mutt.org/hg/mutt/rev/cbe2e875619d
No more devel changeset: 6351:8afe68aff947 user: Brendan Cully <bren...@kublai.com> date: Wed Mar 12 09:25:27 2014 -0700 link: http://dev.mutt.org/hg/mutt/rev/8afe68aff947 mkchangelog: only show log entries on current branch changeset: 6352:07556816c588 user: Brendan Cully <bren...@kublai.com> date: Wed Mar 12 09:25:57 2014 -0700 link: http://dev.mutt.org/hg/mutt/rev/07556816c588 build-release: make sure version is picked up by autoconf changeset: 6353:b8a63730c848 user: Brendan Cully <bren...@kublai.com> date: Wed Mar 12 09:28:10 2014 -0700 link: http://dev.mutt.org/hg/mutt/rev/b8a63730c848 automatic post-release commit for mutt-1.5.23 changeset: 6354:4790aa52f0f2 user: Brendan Cully <bren...@kublai.com> date: Wed Mar 12 09:28:10 2014 -0700 link: http://dev.mutt.org/hg/mutt/rev/4790aa52f0f2 Added tag mutt-1-5-23-rel for changeset b8a63730c848 diffs (truncated from 28438 to 950 lines): diff -r 3c13c4188912 -r 4790aa52f0f2 .hgtags --- a/.hgtags Tue Mar 11 10:04:47 2014 -0700 +++ b/.hgtags Wed Mar 12 09:28:10 2014 -0700 @@ -98,3 +98,4 @@ f399371bb9b0176c35adc9ca3b88ce1d0bc9667b mutt-1-5-20-rel 25a7f8f7d50dbd2f301417fcb1c9d1337a8268bd mutt-1-5-21-rel 8c5ea668e7e072cfd7161023553b68072545f2d1 mutt-1-5-22-rel +b8a63730c8489a0dff577da8f1c8e31219a179e8 mutt-1-5-23-rel diff -r 3c13c4188912 -r 4790aa52f0f2 ChangeLog --- a/ChangeLog Tue Mar 11 10:04:47 2014 -0700 +++ b/ChangeLog Wed Mar 12 09:28:10 2014 -0700 @@ -1,3 +1,140 @@ +2014-03-12 09:25 -0700 Brendan Cully <bren...@kublai.com> (07556816c588) + + * build-release: build-release: make sure version is picked up by + autoconf + + * mkchangelog.sh: mkchangelog: only show log entries on current branch + + * build-release: No more devel + +2014-03-11 10:04 -0700 Michael Elkins <m...@sigpipe.org> (3c13c4188912) + + * UPDATING: add user visible changes since 1.5.22 release. + + * copy.c: Fix buffer overrun caused by not updating a string length + after address expansion. + +2013-10-24 09:55 -0700 Michael Elkins <m...@sigpipe.org> (3d5e23a66a1a) + + * init.h: remove trailing period from documentation for + $pgp_list_secring_command + + * init.h: remove trailing period from documentation for + $pgp_list_pubring_command + +2013-04-26 12:10 -0700 Kevin McCarthy <ke...@8t8.us> (914e13a3694d) + + * postpone.c: Fix postpone/resume to not remove a Mail-Followup-To + header (closes #3070) + + This solution changes mutt_prepare_template() to check whether the + message_id field is NULL to decide whether to wipe the message-id + and mail-followup-to headers when instantiating the message. + + If we are resending a message, we don't want the previous message-id + and mail-followup-to headers. If we are resuming a postponed + message, however, we want to keep the mail-followup-to header if any + was set before the postpone. (grafted from + d7d83298011a6e7aa31bde49e0b6b21209a85fd2) + +2013-10-22 15:12 -0500 Aaron Schrab <aa...@schrab.com> (4a24e6233a5f) + + * version.sh: version.sh: step back from $() to ``. closes #3661 + (grafted from 01cf5814dfe5e79b65b1d950aab1276d19a9f031) + +2013-07-14 19:48 -0700 Kevin McCarthy <ke...@8t8.us> (b5c894182719) + + * muttlib.c: Allow filename prompt when saving multiple attachments to + a directory. (closes #3083) + + Currently, if you specify a directory when saving multiple + attachments and choose (a)ll, the first attachment is saved without + confirming the filename. Subsequent attachments prompt for the + filename. + +2013-10-04 18:22 +0000 Michael Elkins <m...@sigpipe.org> (95a2230ef889) + + * mutt.h, postpone.c, send.c: When recalling a postponed message that + does not have a x-mutt-fcc header field, generate a default FCC just + as we do for new messages. If x-mutt-fcc is present but empty, we + assume that means the user does not want a copy. + + closes #3653 + +2013-10-23 11:11 -0700 Michael Elkins <m...@sigpipe.org> (331d48da153b) + + * crypt-gpgme.c: Ensure that at least one signature was generated to + catch the case where $pgp_sign_as is unset and no default key is + specified in ~/.gnupg/gpg.conf + + closes #3658 + +2013-10-06 09:15 -0700 Michael Elkins <m...@sigpipe.org> (99d913f46eb9) + + * handler.c, smime.c: use LOFF_T as the type for variables used in + fseeko() + + closes #3487 + +2013-10-04 18:04 +0000 Michael Elkins <m...@sigpipe.org> (dd67e8649ea4) + + * crypt-gpgme.c: Display the KeyID when the pubkey is not found in the + user's keyring during signature verification. + + closes #3654 + +2013-10-23 11:11 -0700 Michael Elkins <m...@sigpipe.org> (db3028e34ce0) + + * mutt_ssl_gnutls.c: return 0 if import of cert failed to match other + error conditions. + +2013-10-23 11:11 -0700 Michael Elkins <m...@sigpipe.org> (4dde4bcda519) + + * mutt_ssl_gnutls.c: only terminate the write-half of the TLS + connection to avoid hanging if the remote doesn't respond. + + RFC5246 section 7.2.4 states that the initiator of the closure need + not wait for the remote to response before closing the read-half. + + closes #3633 + +2013-10-22 21:11 -0700 Brendan Cully <bren...@kublai.com> (2ab618f4f6b0) + + * create stable branch + +2013-10-21 11:58 -0700 Michael Elkins <m...@sigpipe.org> (0d9d7c486331) + + * doc/manual.xml.head: add note about use of ! ~Q in send-hook when + paired with reply-hook. + +2013-10-19 11:23 -0700 Michael Elkins <m...@sigpipe.org> (84acf5f0ce92) + + * crypt-gpgme.c: remove <stdbool.h> and use "1" instead of "true". + closes #3657 + + see #3642 for the change that caused this bug. + +2013-10-18 14:12 -0700 Michael Elkins <m...@sigpipe.org> (b9693e10f431) + + * UPDATING: update UPDATING with 1.5.22 release date + +2013-10-17 22:55 -0700 Brendan Cully <bren...@kublai.com> (6f5fe49fdf64) + + * .hgsigs: mutt-1.5.22 signed + +2013-10-17 22:43 -0700 Brendan Cully <bren...@kublai.com> (941ba77040a8) + + * .hgtags: Added tag mutt-1-5-22-rel for changeset 8c5ea668e7e0 + +2013-10-17 22:43 -0700 Brendan Cully <bren...@kublai.com> (8c5ea668e7e0) + + * ChangeLog, VERSION, po/bg.po, po/ca.po, po/cs.po, po/da.po, + po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/eu.po, + po/fr.po, po/ga.po, po/gl.po, po/hu.po, po/id.po, po/it.po, + po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, + po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, + po/zh_TW.po: automatic post-release commit for mutt-1.5.22 + 2013-10-16 16:04 +0000 Michael Elkins <m...@sigpipe.org> (5648f4b2ed44) * rfc822.c: Rework logic to avoid advancing list pointer inside the diff -r 3c13c4188912 -r 4790aa52f0f2 VERSION --- a/VERSION Tue Mar 11 10:04:47 2014 -0700 +++ b/VERSION Wed Mar 12 09:28:10 2014 -0700 @@ -1,1 +1,1 @@ -1.5.22 +1.5.23 diff -r 3c13c4188912 -r 4790aa52f0f2 build-release --- a/build-release Tue Mar 11 10:04:47 2014 -0700 +++ b/build-release Wed Mar 12 09:28:10 2014 -0700 @@ -21,7 +21,7 @@ fi -devel="devel/" # comment out for the stable branch +#devel="devel/" # comment out for the stable branch # test for uncommitted changes if hg id | grep -q '+' @@ -53,8 +53,8 @@ # now, prepare the distribution tar balls -#automake -#touch configure.in +automake +touch configure.ac make config.status ./config.status make update-doc diff -r 3c13c4188912 -r 4790aa52f0f2 mkchangelog.sh --- a/mkchangelog.sh Tue Mar 11 10:04:47 2014 -0700 +++ b/mkchangelog.sh Wed Mar 12 09:28:10 2014 -0700 @@ -2,4 +2,4 @@ lrev=$(hg log --limit 1 --template '{rev}' ChangeLog) -hg log --style=./hg-changelog-map -r tip:$lrev +hg log --style=./hg-changelog-map -r "reverse($lrev::.)" diff -r 3c13c4188912 -r 4790aa52f0f2 po/bg.po --- a/po/bg.po Tue Mar 11 10:04:47 2014 -0700 +++ b/po/bg.po Wed Mar 12 09:28:10 2014 -0700 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Mutt 1.5.5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-17 22:42-0700\n" +"POT-Creation-Date: 2014-03-12 09:18-0700\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1251\n" "Content-Transfer-Encoding: 8bit\n" @@ -42,8 +42,8 @@ msgstr "Èçáîð" #. __STRCAT_CHECKED__ -#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:3832 curs_main.c:412 -#: mutt_ssl.c:1034 mutt_ssl_gnutls.c:893 pager.c:1630 pgpkey.c:522 +#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:3866 curs_main.c:412 +#: mutt_ssl.c:1034 mutt_ssl_gnutls.c:904 pager.c:1630 pgpkey.c:522 #: postpone.c:44 query.c:53 recvattach.c:57 smime.c:425 msgid "Help" msgstr "Ïîìîù" @@ -777,62 +777,62 @@ msgid "PGP already selected. Clear & continue ? " msgstr "PGP-øèôðîâàíå âå÷å å èçáðàíî. Clear & continue? " -#: crypt-gpgme.c:348 +#: crypt-gpgme.c:347 #, fuzzy, c-format msgid "error creating gpgme context: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:358 +#: crypt-gpgme.c:357 #, c-format msgid "error enabling CMS protocol: %s\n" msgstr "" -#: crypt-gpgme.c:378 +#: crypt-gpgme.c:377 #, fuzzy, c-format msgid "error creating gpgme data object: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:444 crypt-gpgme.c:462 crypt-gpgme.c:1419 +#: crypt-gpgme.c:443 crypt-gpgme.c:461 crypt-gpgme.c:1453 #, fuzzy, c-format msgid "error allocating data object: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:480 +#: crypt-gpgme.c:479 #, fuzzy, c-format msgid "error rewinding data object: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:502 crypt-gpgme.c:549 +#: crypt-gpgme.c:501 crypt-gpgme.c:548 #, fuzzy, c-format msgid "error reading data object: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:610 +#: crypt-gpgme.c:609 #, fuzzy, c-format msgid "error adding recipient `%s': %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:648 +#: crypt-gpgme.c:647 #, c-format msgid "secret key `%s' not found: %s\n" msgstr "" -#: crypt-gpgme.c:658 +#: crypt-gpgme.c:657 #, c-format msgid "ambiguous specification of secret key `%s'\n" msgstr "" -#: crypt-gpgme.c:670 +#: crypt-gpgme.c:669 #, c-format msgid "error setting secret key `%s': %s\n" msgstr "" -#: crypt-gpgme.c:687 +#: crypt-gpgme.c:686 #, fuzzy, c-format msgid "error setting PKA signature notation: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:743 +#: crypt-gpgme.c:742 #, fuzzy, c-format msgid "error encrypting data: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" @@ -842,128 +842,140 @@ msgid "error signing data: %s\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:1055 +#: crypt-gpgme.c:871 +msgid "$pgp_sign_as unset and no default key specified in ~/.gnupg/gpg.conf" +msgstr "" + +#: crypt-gpgme.c:1066 msgid "Warning: One of the keys has been revoked\n" msgstr "" -#: crypt-gpgme.c:1064 +#: crypt-gpgme.c:1075 msgid "Warning: The key used to create the signature expired at: " msgstr "" -#: crypt-gpgme.c:1070 +#: crypt-gpgme.c:1081 #, fuzzy msgid "Warning: At least one certification key has expired\n" msgstr "Ñåðòèôèêàòúò íà ñúðâúðà å èçòåêúë" -#: crypt-gpgme.c:1086 +#: crypt-gpgme.c:1097 msgid "Warning: The signature expired at: " msgstr "" -#: crypt-gpgme.c:1092 +#: crypt-gpgme.c:1103 msgid "Can't verify due to a missing key or certificate\n" msgstr "" -#: crypt-gpgme.c:1097 +#: crypt-gpgme.c:1108 #, fuzzy msgid "The CRL is not available\n" msgstr "SSL íå å íà ðàçïîëîæåíèå." -#: crypt-gpgme.c:1103 +#: crypt-gpgme.c:1114 msgid "Available CRL is too old\n" msgstr "" -#: crypt-gpgme.c:1108 +#: crypt-gpgme.c:1119 msgid "A policy requirement was not met\n" msgstr "" -#: crypt-gpgme.c:1117 +#: crypt-gpgme.c:1128 msgid "A system error occurred" msgstr "" -#: crypt-gpgme.c:1151 +#: crypt-gpgme.c:1162 msgid "WARNING: PKA entry does not match signer's address: " msgstr "" -#: crypt-gpgme.c:1158 +#: crypt-gpgme.c:1169 msgid "PKA verified signer's address is: " msgstr "" -#: crypt-gpgme.c:1175 crypt-gpgme.c:3299 +#: crypt-gpgme.c:1186 crypt-gpgme.c:3333 #, fuzzy msgid "Fingerprint: " msgstr "Ïðúñòîâ îòïå÷àòúê: %s" -#: crypt-gpgme.c:1235 +#: crypt-gpgme.c:1246 msgid "" "WARNING: We have NO indication whether the key belongs to the person named " "as shown above\n" msgstr "" -#: crypt-gpgme.c:1242 +#: crypt-gpgme.c:1253 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n" msgstr "" -#: crypt-gpgme.c:1246 +#: crypt-gpgme.c:1257 msgid "" "WARNING: It is NOT certain that the key belongs to the person named as shown " "above\n" msgstr "" -#: crypt-gpgme.c:1276 +#: crypt-gpgme.c:1290 msgid "aka: " msgstr "" -#: crypt-gpgme.c:1287 +#: crypt-gpgme.c:1300 +msgid "KeyID " +msgstr "" + +#: crypt-gpgme.c:1308 #, fuzzy msgid "created: " msgstr "Æåëàåòå ëè äà ñúçäàäåòå %s?" -#: crypt-gpgme.c:1350 -msgid "Error getting key information: " +#: crypt-gpgme.c:1378 +msgid "Error getting key information for KeyID " +msgstr "" + +#: crypt-gpgme.c:1380 +msgid ": " msgstr "" #. We can't decide (yellow) but this is a PGP key with a good #. signature, so we display what a PGP user expects: The name, #. fingerprint and the key validity (which is neither fully or #. ultimate). -#: crypt-gpgme.c:1357 crypt-gpgme.c:1372 +#: crypt-gpgme.c:1387 crypt-gpgme.c:1402 msgid "Good signature from:" msgstr "" -#: crypt-gpgme.c:1364 +#: crypt-gpgme.c:1394 msgid "*BAD* signature from:" msgstr "" -#: crypt-gpgme.c:1380 +#: crypt-gpgme.c:1410 msgid "Problem signature from:" msgstr "" -#: crypt-gpgme.c:1381 +#: crypt-gpgme.c:1414 msgid " expires: " 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:1427 crypt-gpgme.c:1642 crypt-gpgme.c:2294 +#: crypt-gpgme.c:1461 crypt-gpgme.c:1676 crypt-gpgme.c:2328 msgid "[-- Begin signature information --]\n" msgstr "" -#: crypt-gpgme.c:1436 +#: crypt-gpgme.c:1470 #, fuzzy, c-format msgid "Error: verification failed: %s\n" msgstr "Ãðåøêà â êîìàíäíèÿ ðåä: %s\n" -#: crypt-gpgme.c:1485 +#: crypt-gpgme.c:1519 #, c-format msgid "*** Begin Notation (signature by: %s) ***\n" msgstr "" -#: crypt-gpgme.c:1507 +#: crypt-gpgme.c:1541 msgid "*** End Notation ***\n" msgstr "" -#: crypt-gpgme.c:1515 crypt-gpgme.c:1655 crypt-gpgme.c:2307 +#: crypt-gpgme.c:1549 crypt-gpgme.c:1689 crypt-gpgme.c:2341 #, fuzzy msgid "" "[-- End signature information --]\n" @@ -972,28 +984,28 @@ "\n" "[-- Êðàé íà ïîäïèñàíèòå äàííè --]\n" -#: crypt-gpgme.c:1610 +#: crypt-gpgme.c:1644 #, fuzzy, c-format msgid "" "[-- Error: decryption failed: %s --]\n" "\n" msgstr "[-- Ãðåøêà: íå ìîæå äà áúäå ñúçäàäåí âðåìåíåí ôàéë! --]\n" -#: crypt-gpgme.c:2090 +#: crypt-gpgme.c:2124 #, fuzzy, c-format msgid "Error extracting key data!\n" msgstr "ãðåøêà â øàáëîíà ïðè: %s" -#: crypt-gpgme.c:2270 +#: crypt-gpgme.c:2304 #, c-format msgid "Error: decryption/verification failed: %s\n" msgstr "" -#: crypt-gpgme.c:2315 +#: crypt-gpgme.c:2349 msgid "Error: copy data failed\n" msgstr "" -#: crypt-gpgme.c:2335 pgp.c:436 +#: crypt-gpgme.c:2369 pgp.c:436 msgid "" "[-- BEGIN PGP MESSAGE --]\n" "\n" @@ -1001,11 +1013,11 @@ "[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÈÑÌÎ --]\n" "\n" -#: crypt-gpgme.c:2337 pgp.c:438 +#: crypt-gpgme.c:2371 pgp.c:438 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n" msgstr "[-- ÍÀ×ÀËÎ ÍÀ ÁËÎÊ Ñ ÏÓÁËÈ×ÅÍ PGP-ÊËÞ× --]\n" -#: crypt-gpgme.c:2340 pgp.c:440 +#: crypt-gpgme.c:2374 pgp.c:440 msgid "" "[-- BEGIN PGP SIGNED MESSAGE --]\n" "\n" @@ -1013,19 +1025,19 @@ "[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎ ÏÈÑÌÎ --]\n" "\n" -#: crypt-gpgme.c:2367 pgp.c:471 +#: crypt-gpgme.c:2401 pgp.c:471 msgid "[-- END PGP MESSAGE --]\n" msgstr "[-- ÊÐÀÉ ÍÀ PGP-ÏÈÑÌÎÒÎ --]\n" -#: crypt-gpgme.c:2369 pgp.c:478 +#: crypt-gpgme.c:2403 pgp.c:478 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n" msgstr "[-- ÊÐÀÉ ÍÀ ÁËÎÊÀ Ñ ÏÓÁËÈ×ÍÈß PGP-ÊËÞ× --]\n" -#: crypt-gpgme.c:2371 pgp.c:480 +#: crypt-gpgme.c:2405 pgp.c:480 msgid "[-- END PGP SIGNED MESSAGE --]\n" msgstr "[-- ÊÐÀÉ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]\n" -#: crypt-gpgme.c:2393 pgp.c:513 +#: crypt-gpgme.c:2427 pgp.c:513 msgid "" "[-- Error: could not find beginning of PGP message! --]\n" "\n" @@ -1033,7 +1045,7 @@ "[-- Ãðåøêà: íà÷àëîòî íà PGP-ïèñìîòî íå ìîæå äà áúäå íàìåðåíî! --]\n" "\n" -#: crypt-gpgme.c:2424 pgp.c:945 +#: crypt-gpgme.c:2458 pgp.c:945 msgid "" "[-- Error: malformed PGP/MIME message! --]\n" "\n" @@ -1041,11 +1053,11 @@ "[-- Ãðåøêà: íåïðàâèëíî ïîñòðîåíî PGP/MIME ñúîáùåíèå! --]\n" "\n" -#: crypt-gpgme.c:2436 crypt-gpgme.c:2502 pgp.c:958 +#: crypt-gpgme.c:2470 crypt-gpgme.c:2536 pgp.c:958 msgid "[-- Error: could not create temporary file! --]\n" msgstr "[-- Ãðåøêà: íå ìîæå äà áúäå ñúçäàäåí âðåìåíåí ôàéë! --]\n" -#: crypt-gpgme.c:2448 +#: crypt-gpgme.c:2482 #, fuzzy msgid "" "[-- The following data is PGP/MIME signed and encrypted --]\n" @@ -1054,7 +1066,7 @@ "[-- Ñëåäíèòå äàííè ñà øèôðîâàíè ñ PGP/MIME --]\n" "\n" -#: crypt-gpgme.c:2449 pgp.c:967 +#: crypt-gpgme.c:2483 pgp.c:967 msgid "" "[-- The following data is PGP/MIME encrypted --]\n" "\n" @@ -1062,291 +1074,291 @@ "[-- Ñëåäíèòå äàííè ñà øèôðîâàíè ñ PGP/MIME --]\n" "\n" -#: crypt-gpgme.c:2471 +#: crypt-gpgme.c:2505 #, fuzzy msgid "[-- End of PGP/MIME signed and encrypted data --]\n" msgstr "[-- Êðàé íà øèôðîâàíèòå ñ PGP/MIME äàííè --]\n" -#: crypt-gpgme.c:2472 pgp.c:987 +#: crypt-gpgme.c:2506 pgp.c:987 msgid "[-- End of PGP/MIME encrypted data --]\n" msgstr "[-- Êðàé íà øèôðîâàíèòå ñ PGP/MIME äàííè --]\n" -#: crypt-gpgme.c:2514 +#: crypt-gpgme.c:2548 #, fuzzy msgid "" "[-- The following data is S/MIME signed --]\n" "\n" msgstr "[-- Ñëåäíèòå äàííè ñà ïîäïèñàíè ñúñ S/MIME --]\n" -#: crypt-gpgme.c:2515 +#: crypt-gpgme.c:2549 #, fuzzy msgid "" "[-- The following data is S/MIME encrypted --]\n" "\n" msgstr "[-- Ñëåäíèòå äàííè ñà øèôðîâàíè ñúñ S/MIME --]\n" -#: crypt-gpgme.c:2545 +#: crypt-gpgme.c:2579 #, fuzzy msgid "[-- End of S/MIME signed data --]\n" msgstr "" "\n" "[-- Êðàé íà ïîäïèñàíèòå ñúñ S/MIME äàííè --]\n" -#: crypt-gpgme.c:2546 +#: crypt-gpgme.c:2580 #, fuzzy msgid "[-- End of S/MIME encrypted data --]\n" msgstr "" "\n" "[-- Êðàé íà øèôðîâàíèòå ñúñ S/MIME äàííè --]\n" -#: crypt-gpgme.c:3139 +#: crypt-gpgme.c:3173 msgid "[Can't display this user ID (unknown encoding)]" msgstr "" -#: crypt-gpgme.c:3141 +#: crypt-gpgme.c:3175 msgid "[Can't display this user ID (invalid encoding)]" msgstr "" -#: crypt-gpgme.c:3146 +#: crypt-gpgme.c:3180 msgid "[Can't display this user ID (invalid DN)]" msgstr "" -#: crypt-gpgme.c:3225 +#: crypt-gpgme.c:3259 msgid " aka ......: " msgstr "" -#: crypt-gpgme.c:3225 +#: crypt-gpgme.c:3259 msgid "Name ......: " msgstr "" -#: crypt-gpgme.c:3228 crypt-gpgme.c:3367 +#: crypt-gpgme.c:3262 crypt-gpgme.c:3401 #, fuzzy msgid "[Invalid]" msgstr "Íåâàëèäåí " -#: crypt-gpgme.c:3248 crypt-gpgme.c:3391 +#: crypt-gpgme.c:3282 crypt-gpgme.c:3425 #, fuzzy, c-format msgid "Valid From : %s\n" msgstr "Íåâàëèäåí ìåñåö: %s" -#: crypt-gpgme.c:3261 crypt-gpgme.c:3404 +#: crypt-gpgme.c:3295 crypt-gpgme.c:3438 #, fuzzy, c-format msgid "Valid To ..: %s\n" msgstr "Íåâàëèäåí ìåñåö: %s" -#: crypt-gpgme.c:3274 crypt-gpgme.c:3417 +#: crypt-gpgme.c:3308 crypt-gpgme.c:3451 #, c-format msgid "Key Type ..: %s, %lu bit %s\n" msgstr "" -#: crypt-gpgme.c:3276 crypt-gpgme.c:3419 +#: crypt-gpgme.c:3310 crypt-gpgme.c:3453 #, c-format msgid "Key Usage .: " msgstr "" -#: crypt-gpgme.c:3281 crypt-gpgme.c:3424 +#: crypt-gpgme.c:3315 crypt-gpgme.c:3458 #, 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:3316 crypt-gpgme.c:3321 crypt-gpgme.c:3326 crypt-gpgme.c:3459 +#: crypt-gpgme.c:3464 crypt-gpgme.c:3469 msgid ", " msgstr "" -#: crypt-gpgme.c:3286 crypt-gpgme.c:3429 +#: crypt-gpgme.c:3320 crypt-gpgme.c:3463 msgid "signing" msgstr "" -#: crypt-gpgme.c:3291 crypt-gpgme.c:3434 +#: crypt-gpgme.c:3325 crypt-gpgme.c:3468 #, fuzzy msgid "certification" msgstr "Ñåðòèôèêàòúò å çàïèñàí" -#: crypt-gpgme.c:3331 +#: crypt-gpgme.c:3365 #, c-format msgid "Serial-No .: 0x%s\n" msgstr "" -#: crypt-gpgme.c:3339 +#: crypt-gpgme.c:3373 #, c-format msgid "Issued By .: " msgstr "" #. display only the short keyID -#: crypt-gpgme.c:3358 +#: crypt-gpgme.c:3392 #, fuzzy, c-format msgid "Subkey ....: 0x%s" msgstr "Êëþ÷îâ èäåíòèôèêàòîð: 0x%s" -#: crypt-gpgme.c:3362 +#: crypt-gpgme.c:3396 #, fuzzy msgid "[Revoked]" msgstr "Àíóëèðàí " -#: crypt-gpgme.c:3372 +#: crypt-gpgme.c:3406 #, fuzzy msgid "[Expired]" msgstr "Èçòåêúë " -#: crypt-gpgme.c:3377 +#: crypt-gpgme.c:3411 msgid "[Disabled]" msgstr "" -#: crypt-gpgme.c:3461 pgpkey.c:559 pgpkey.c:739 +#: crypt-gpgme.c:3495 pgpkey.c:559 pgpkey.c:739 msgid "Can't create temporary file" msgstr "Ãðåøêà ïðè ñúçäàâàíå íà âðåìåíåí ôàéë" -#: crypt-gpgme.c:3464 +#: crypt-gpgme.c:3498 #, fuzzy msgid "Collecting data..." msgstr "Ñâúðçâàíå ñ %s..." -#: crypt-gpgme.c:3490 +#: crypt-gpgme.c:3524 #, fuzzy, c-format msgid "Error finding issuer key: %s\n" msgstr "Ãðåøêà ïðè ñâúðçâàíå ñúñ ñúðâúðà: %s" -#: crypt-gpgme.c:3500 +#: crypt-gpgme.c:3534 msgid "Error: certification chain to long - stopping here\n" msgstr "" -#: crypt-gpgme.c:3511 pgpkey.c:580 +#: crypt-gpgme.c:3545 pgpkey.c:580 #, c-format msgid "Key ID: 0x%s" msgstr "Êëþ÷îâ èäåíòèôèêàòîð: 0x%s" -#: crypt-gpgme.c:3594 +#: crypt-gpgme.c:3628 #, fuzzy, c-format msgid "gpgme_new failed: %s" msgstr "Íåóñïåøåí SSL: %s" -#: crypt-gpgme.c:3633 crypt-gpgme.c:3696 +#: crypt-gpgme.c:3667 crypt-gpgme.c:3730 #, c-format msgid "gpgme_op_keylist_start failed: %s" msgstr "" -#: crypt-gpgme.c:3683 crypt-gpgme.c:3724 +#: crypt-gpgme.c:3717 crypt-gpgme.c:3758 #, c-format msgid "gpgme_op_keylist_next failed: %s" msgstr "" -#: crypt-gpgme.c:3795 +#: crypt-gpgme.c:3829 #, fuzzy msgid "All matching keys are marked expired/revoked." msgstr "Âñè÷êè ïîäõîäÿùè êëþ÷îâå ñà îñòàðåëè, àíóëèðàíè èëè äåàêòèâèðàíè." -#: crypt-gpgme.c:3824 mutt_ssl.c:1032 mutt_ssl_gnutls.c:891 pgpkey.c:515 +#: crypt-gpgme.c:3858 mutt_ssl.c:1032 mutt_ssl_gnutls.c:902 pgpkey.c:515 #: smime.c:420 msgid "Exit " msgstr "Èçõîä" #. __STRCAT_CHECKED__ -#: crypt-gpgme.c:3826 pgpkey.c:517 smime.c:422 +#: crypt-gpgme.c:3860 pgpkey.c:517 smime.c:422 msgid "Select " msgstr "Èçáîð " #. __STRCAT_CHECKED__ -#: crypt-gpgme.c:3829 pgpkey.c:520 +#: crypt-gpgme.c:3863 pgpkey.c:520 msgid "Check key " msgstr "Ïðîâåðêà íà êëþ÷ " -#: crypt-gpgme.c:3845 +#: crypt-gpgme.c:3879 #, fuzzy msgid "PGP and S/MIME keys matching" msgstr "PGP êëþ÷îâå, ñúâïàäàùè ñ \"%s\"." -#: crypt-gpgme.c:3847 +#: crypt-gpgme.c:3881 #, fuzzy msgid "PGP keys matching" msgstr "PGP êëþ÷îâå, ñúâïàäàùè ñ \"%s\"." -#: crypt-gpgme.c:3849 +#: crypt-gpgme.c:3883 #, fuzzy msgid "S/MIME keys matching" msgstr "S/MIME ñåðòèôèêàòè, ñúâïàäàùè ñ \"%s\"." -#: crypt-gpgme.c:3851 +#: crypt-gpgme.c:3885 #, fuzzy msgid "keys matching" msgstr "PGP êëþ÷îâå, ñúâïàäàùè ñ \"%s\"." -#: crypt-gpgme.c:3854 +#: crypt-gpgme.c:3888 #, c-format msgid "%s <%s>." msgstr "" -#: crypt-gpgme.c:3856 +#: crypt-gpgme.c:3890 #, c-format msgid "%s \"%s\"." msgstr "" -#: crypt-gpgme.c:3883 pgpkey.c:600 +#: crypt-gpgme.c:3917 pgpkey.c:600 msgid "This key can't be used: expired/disabled/revoked." msgstr "" "Òîçè êëþ÷ íå ìîæå äà áúäå èçïîëçâàí, çàùîòî å îñòàðÿë, äåàêòèâèðàí èëè " "àíóëèðàí." -#: crypt-gpgme.c:3897 pgpkey.c:612 +#: crypt-gpgme.c:3931 pgpkey.c:612 msgid "ID is expired/disabled/revoked." msgstr "Òîçè èäåíòèôèêàòîð å îñòàðÿë, äåàêòèâèðàí èëè àíóëèðàí." -#: crypt-gpgme.c:3917 pgpkey.c:616 +#: crypt-gpgme.c:3951 pgpkey.c:616 msgid "ID has undefined validity." msgstr "Òîçè èäåíòèôèêàòîð å ñ íåäåôèíèðàíà âàëèäíîñò." -#: crypt-gpgme.c:3920 pgpkey.c:619 +#: crypt-gpgme.c:3954 pgpkey.c:619 msgid "ID is not valid." msgstr "Òîçè èäåíòèôèêàòîð íå íå å âàëèäåí." -#: crypt-gpgme.c:3923 pgpkey.c:622 +#: crypt-gpgme.c:3957 pgpkey.c:622 msgid "ID is only marginally valid." msgstr "Òîçè èäåíòèôèêàòîð å ñ îãðàíè÷åíà âàëèäíîñò." -#: crypt-gpgme.c:3931 pgpkey.c:626 +#: crypt-gpgme.c:3965 pgpkey.c:626 #, c-format msgid "%s Do you really want to use the key?" msgstr "%s Äåéñòâèòåëíî ëè èñêàòå äà èçïîëçâàòå òîçè êëþ÷?" -#: crypt-gpgme.c:3988 crypt-gpgme.c:4100 pgpkey.c:834 pgpkey.c:939 +#: crypt-gpgme.c:4022 crypt-gpgme.c:4134 pgpkey.c:834 pgpkey.c:939 #, c-format msgid "Looking for keys matching \"%s\"..." msgstr "Òúðñåíå íà êëþ÷îâå, îòãîâàðÿùè íà \"%s\"..." -#: crypt-gpgme.c:4262 pgp.c:1194 +#: crypt-gpgme.c:4296 pgp.c:1194 #, c-format msgid "Use keyID = \"%s\" for %s?" msgstr "Æåëàåòå ëè èçïîëçâàòå êëþ÷îâèÿ èäåíòèôèêàòîð \"%s\" çà %s?" -#: crypt-gpgme.c:4298 pgp.c:1228 smime.c:650 smime.c:775 +#: crypt-gpgme.c:4332 pgp.c:1228 smime.c:650 smime.c:775 #, c-format msgid "Enter keyID for %s: " msgstr "Âúâåäåòå êëþ÷îâ èäåíòèôèêàòîð çà %s: " -#: crypt-gpgme.c:4380 +#: crypt-gpgme.c:4415 msgid "" "\n" "Using GPGME backend, although no gpg-agent is running" msgstr "" -#: crypt-gpgme.c:4410 +#: crypt-gpgme.c:4445 #, fuzzy msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?" msgstr "" "PGP øèôðîâàíå(e), ïîäïèñ(s), ïîäïèñ êàòî(a), è äâåòå(b) èëè áåç òÿõ(f)?" -#: crypt-gpgme.c:4411 +#: crypt-gpgme.c:4446 #, fuzzy msgid "esabpfc" msgstr "eswabf" -#: crypt-gpgme.c:4414 +#: crypt-gpgme.c:4449 #, fuzzy msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?" msgstr "" "PGP øèôðîâàíå(e), ïîäïèñ(s), ïîäïèñ êàòî(a), è äâåòå(b) èëè áåç òÿõ(f)?" -#: crypt-gpgme.c:4415 +#: crypt-gpgme.c:4450 #, fuzzy msgid "esabmfc" msgstr "eswabf" @@ -1354,15 +1366,15 @@ #. sign (a)s #. unset_option(OPTCRYPTCHECKTRUST); #. sign (a)s -#: crypt-gpgme.c:4431 pgp.c:1627 smime.c:2024 smime.c:2036 +#: crypt-gpgme.c:4466 pgp.c:1627 smime.c:2024 smime.c:2036 msgid "Sign as: " msgstr "Ïîäïèñ êàòî: " -#: crypt-gpgme.c:4557 +#: crypt-gpgme.c:4592 msgid "Failed to verify sender" msgstr "" -#: crypt-gpgme.c:4560 +#: crypt-gpgme.c:4595 #, fuzzy msgid "Failed to figure out sender" msgstr "Ãðåøêà ïðè îòâàðÿíå íà ôàéëà çà ïðî÷èò íà çàãëàâíàòà èíôîðìàöèÿ." @@ -2231,7 +2243,7 @@ msgid "Error opening mailbox" msgstr "Ãðåøêà ïðè îòâàðÿíå íà ïîùåíñêàòà êóòèÿ!" -#: imap/imap.c:806 imap/message.c:851 muttlib.c:1545 +#: imap/imap.c:806 imap/message.c:851 muttlib.c:1540 #, c-format msgid "Create %s?" msgstr "Æåëàåòå ëè äà ñúçäàäåòå %s?" @@ -3082,8 +3094,8 @@ msgid "SSL failed: %s" msgstr "Íåóñïåøåí SSL: %s" -#: mutt_ssl.c:416 mutt_ssl_gnutls.c:969 mutt_ssl_gnutls.c:1004 -#: mutt_ssl_gnutls.c:1014 +#: mutt_ssl.c:416 mutt_ssl_gnutls.c:980 mutt_ssl_gnutls.c:1015 +#: mutt_ssl_gnutls.c:1025 msgid "Unable to get certificate from peer" msgstr "Îò ñúðâúðà íå ìîæå äà áúäå ïîëó÷åí ñåðòèôèêàò"
