diff --git a/g10/ChangeLog b/g10/ChangeLog
index 402c1bc53..09c9ecb10 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-15  Werner Koch  <wk@g10code.com>
+
+	* pkclist.c (do_edit_ownertrust): Add a note to translators.
+	* keygen.c (ask_user_id): Ditto.
+
+	* helptext.c: Typo fix.
+
 2004-10-14  David Shaw  <dshaw@jabberwocky.com>
 
 	* keylist.c (list_keyblock_print): Show the fingerprint after the
diff --git a/g10/helptext.c b/g10/helptext.c
index 820f1b182..5a8c0065c 100644
--- a/g10/helptext.c
+++ b/g10/helptext.c
@@ -182,7 +182,7 @@ static struct helptexts { const char *key; const char *help; } helptexts[] = {
 )},
 
 { "keyedit.sign_all.okay", N_(
- "Answer \"yes\" is you want to sign ALL the user IDs"
+ "Answer \"yes\" if you want to sign ALL the user IDs"
 )},
 
 { "keyedit.remove.uid.okay", N_(
diff --git a/g10/keygen.c b/g10/keygen.c
index c53256c33..e03fb60d3 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1713,6 +1713,17 @@ ask_user_id( int mode )
 	}
 
 	for(;;) {
+            /* Note to translators: These are the allowed answers in
+               lower and uppercase.  Below you will find the matching
+               string which should be translated accordingly and the
+               letter changed to match the one in the answer string.
+               
+                 n = Change name
+                 c = Change comment
+                 e = Change email
+                 o = Okay (ready, continue)
+                 q = Quit
+             */
 	    const char *ansstr = _("NnCcEeOoQq");
 
 	    if( strlen(ansstr) != 10 )
diff --git a/g10/pkclist.c b/g10/pkclist.c
index b24d24bf2..36947e0f6 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -190,7 +190,18 @@ do_edit_ownertrust (PKT_public_key *pk, int mode,
 
   keyid_from_pk (pk, keyid);
   for(;;) {
-    /* a string with valid answers */
+    /* A string with valid answers.
+
+       Note to translators: These are the allowed answers in lower and
+       uppercase.  Below you will find the matching strings which
+       should be translated accordingly and the letter changed to
+       match the one in the answer string.
+    
+         i = please show me more information
+         m = back to the main menu
+         s = skip this key
+	 q = quit
+    */
     const char *ans = _("iImMqQsS");
 
     if( !did_help )