gnupg/g10 (ChangeLog keygen.c)

[cvs user wk]

    Date: Monday, December 20, 2004 @ 19:14:57
  Author: wk
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog keygen.c

(ask_expire_interval): For better translations chnage 2
strings.


-----------+
 ChangeLog |    3 +++
 keygen.c  |   17 ++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.666 gnupg/g10/ChangeLog:1.667
--- gnupg/g10/ChangeLog:1.666	Mon Dec 20 11:05:20 2004
+++ gnupg/g10/ChangeLog	Mon Dec 20 19:14:57 2004
@@ -1,5 +1,8 @@
 2004-12-20  Werner Koch  <wk at g10code.com>
 
+	* 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.
 
Index: gnupg/g10/keygen.c
diff -u gnupg/g10/keygen.c:1.139 gnupg/g10/keygen.c:1.140
--- gnupg/g10/keygen.c:1.139	Mon Dec 20 06:19:09 2004
+++ gnupg/g10/keygen.c	Mon Dec 20 19:14:57 2004
@@ -1570,18 +1570,21 @@
 	}
 
 	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"));