diff options
| -rw-r--r-- | g10/ChangeLog | 3 | ||||
| -rw-r--r-- | g10/keygen.c | 17 |
2 files changed, 13 insertions, 7 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index aed7b32f3..f2e8737dd 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2004-12-20 Werner Koch <[email protected]> + * keygen.c (ask_expire_interval): For better translations chnage 2 + strings. + * seckey-cert.c (do_check): Handle case when checksum was okay but passphrase still wrong. Roman Pavlik found such a case. diff --git a/g10/keygen.c b/g10/keygen.c index 5ca727dce..c9965c2ba 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1570,18 +1570,21 @@ ask_expire_interval(int object) } if( !valid_days ) { - tty_printf(_("%s does not expire at all\n"), - object==0?"Key":"Signature"); + tty_printf((object==0) + ? _("Key does not expire at all\n") : + : _("Signature does not expire at all\n")); interval = 0; } else { interval = valid_days * 86400L; - /* print the date when the key expires */ - tty_printf(_("%s expires at %s\n"), - object==0?"Key":"Signature", + + tty_printf(object==0 + ? _("Key expires at %s\n") + : _("Signature expires at %s\n"), asctimestamp((ulong)(curtime + interval) ) ); - /* FIXME: This check yields warning on alhas: - write a configure check and to this check here only for 32 bit machines */ + /* FIXME: This check yields warning on alhas: Write a + configure check and to this check here only for 32 bit + machines */ if( (time_t)((ulong)(curtime+interval)) < 0 ) tty_printf(_("Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n")); |