diff --git a/g10/ChangeLog b/g10/ChangeLog
index 174a6a298..58350562d 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-22  David Shaw  <dshaw@jabberwocky.com>
+
+	* g10.c (main): --openpgp disables --pgpX.
+
+	* keyedit.c (show_prefs): Make strings translatable.
+
 2003-02-19  David Shaw  <dshaw@jabberwocky.com>
 
 	* Makefile.am: Use @CAPLIBS@ to link in -lcap if we are using
diff --git a/g10/g10.c b/g10/g10.c
index 802d162a1..453725bdd 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1454,6 +1454,10 @@ main( int argc, char **argv )
             opt.s2k_mode = 3; /* iterated+salted */
 	    opt.s2k_digest_algo = DIGEST_ALGO_SHA1;
 	    opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
+	    opt.pgp2 = 0;
+	    opt.pgp6 = 0;
+	    opt.pgp7 = 0;
+	    opt.pgp8 = 0;
 	    break;
 	  case oPGP2: opt.pgp2 = 1; break;
 	  case oNoPGP2: opt.pgp2 = 0; break;
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 413df0d4f..55603bfc6 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1488,7 +1488,8 @@ show_prefs (PKT_user_id *uid, int verbose)
 
     if (verbose) {
         int any, des_seen=0, sha1_seen=0, uncomp_seen=0;
-        tty_printf ("     Cipher: ");
+        tty_printf ("     ");
+	tty_printf (_("Cipher: "));
         for(i=any=0; prefs[i].type; i++ ) {
             if( prefs[i].type == PREFTYPE_SYM ) {
                 const char *s = cipher_algo_to_string (prefs[i].value);
@@ -1510,7 +1511,8 @@ show_prefs (PKT_user_id *uid, int verbose)
                 tty_printf (", ");
             tty_printf ("%s",cipher_algo_to_string(CIPHER_ALGO_3DES));
         }
-        tty_printf ("\n     Hash: ");
+        tty_printf ("\n     ");
+	tty_printf (_("Digest: "));
         for(i=any=0; prefs[i].type; i++ ) {
             if( prefs[i].type == PREFTYPE_HASH ) {
                 const char *s = digest_algo_to_string (prefs[i].value);
@@ -1532,7 +1534,8 @@ show_prefs (PKT_user_id *uid, int verbose)
                 tty_printf (", ");
             tty_printf ("%s",digest_algo_to_string(DIGEST_ALGO_SHA1));
         }
-        tty_printf ("\n     Compression: ");
+        tty_printf ("\n     ");
+	tty_printf (_("Compression: "));
         for(i=any=0; prefs[i].type; i++ ) {
             if( prefs[i].type == PREFTYPE_ZIP ) {
                 const char *s=compress_algo_to_string(prefs[i].value);
@@ -1558,10 +1561,13 @@ show_prefs (PKT_user_id *uid, int verbose)
 	    }
 	    tty_printf ("%s",compress_algo_to_string(0));
         }
-        tty_printf ("\n     Features: ");
 	if(uid->mdc_feature)
-	  tty_printf ("MDC");
-	tty_printf("\n");
+	  {
+	    tty_printf ("\n     ");
+	    tty_printf (_("Features: "));
+	    tty_printf ("MDC");
+	  }
+	tty_printf ("\n");
     }
     else {
         tty_printf("    ");