Changes the header presented before requesting the user ID.

2 files changed, 28 insertions, 3 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 5e481bf66..af0ec7c00 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-31  Werner Koch  <wk@g10code.com>
+
+	* keygen.c (ask_user_id): Change the string printed as header of
+	the user ID generation.  Use code to not break existing
+	translations.  Suggested by Eric Tetz.
+
 2008-05-08  Werner Koch  <wk@g10code.com>
 
 	* sig-check.c (do_check_messages): Print a revocation diagnostic
diff --git a/g10/keygen.c b/g10/keygen.c
index 48a7fa271..a89970003 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1941,12 +1941,31 @@ ask_user_id( int mode )
     char *answer;
     char *aname, *acomment, *amail, *uid;
 
-    if( !mode )
-	tty_printf( _("\n"
+    if ( !mode )
+      {
+	const char *s1 =
+          N_("\n"
+             "GnuPG needs to construct a user ID to identify your key.\n"
+             "\n");
+        const char *s2 = _(s1);
+
+        if (!strcmp (s1, s2))
+          {
+            /* There is no translation for the string thus we to use
+               the old info text.  gettext has no way to tell whether
+               a translation is actually available, thus we need to
+               to compare again. */
+            const char *s3 = N_("\n"
 "You need a user ID to identify your key; "
                                         "the software constructs the user ID\n"
 "from the Real Name, Comment and Email Address in this form:\n"
-"    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n\n") );
+"    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n\n");
+            const char *s4 = _(s3);
+            if (strcmp (s3, s4))
+              s2 = s3; /* A translation exists - use it. */
+          }
+        tty_printf ("%s", s2) ;
+      }
     uid = aname = acomment = amail = NULL;
     for(;;) {
 	char *p;