Prepared for last 1.4 release candidate

1 files changed, 48 insertions, 47 deletions

diff --git a/g10/keyedit.c b/g10/keyedit.c
index 94be382de..afae1bb2c 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1242,56 +1242,57 @@ keyedit_menu( const char *username, STRLIST locusr,
                     int not_with_sk;  /* but 2 == must use SK */
 		    const char *desc;
 		  } cmds[] = { 
-	{ N_("quit")    , cmdQUIT      , 0,0, N_("quit this menu") },
-	{ N_("q")       , cmdQUIT      , 0,0, NULL   },
-	{ N_("save")    , cmdSAVE      , 0,0, N_("save and quit") },
-	{ N_("help")    , cmdHELP      , 0,0, N_("show this help") },
-	{    "?"        , cmdHELP      , 0,0, NULL   },
-	{ N_("fpr")     , cmdFPR       , 0,0, N_("show fingerprint") },
-	{ N_("list")    , cmdLIST      , 0,0, N_("list key and user IDs") },
-	{ N_("l")       , cmdLIST      , 0,0, NULL   },
-	{ N_("uid")     , cmdSELUID    , 0,0, N_("select user ID N") },
-	{ N_("key")     , cmdSELKEY    , 0,0, N_("select secondary key N") },
-	{ N_("check")   , cmdCHECK     , 0,0, N_("list signatures") },
-	{ N_("c")       , cmdCHECK     , 0,0, NULL },
-	{ N_("sign")    , cmdSIGN      , 0,1, N_("sign the key") },
-	{ N_("s")       , cmdSIGN      , 0,1, NULL },
-	{ N_("tsign")   , cmdTSIGN     , 0,1, N_("make a trust signature")},
-	{ N_("lsign")   , cmdLSIGN     , 0,1, N_("sign the key locally") },
-	{ N_("nrsign")  , cmdNRSIGN    , 0,1, N_("sign the key non-revocably") },
-	{ N_("nrlsign") , cmdNRLSIGN   , 0,1, N_("sign the key locally and non-revocably") },
-	{ N_("debug")   , cmdDEBUG     , 0,0, NULL },
-	{ N_("adduid")  , cmdADDUID    , 1,1, N_("add a user ID") },
-	{ N_("addphoto"), cmdADDPHOTO  , 1,1, N_("add a photo ID") },
-	{ N_("deluid")  , cmdDELUID    , 0,1, N_("delete user ID") },
+	{ "quit"     , cmdQUIT      , 0,0, N_("quit this menu") },
+	{ "q"        , cmdQUIT      , 0,0, NULL   },
+	{ "save"     , cmdSAVE      , 0,0, N_("save and quit") },
+	{ "help"     , cmdHELP      , 0,0, N_("show this help") },
+	{ "?"        , cmdHELP      , 0,0, NULL   },
+	{ "fpr"      , cmdFPR       , 0,0, N_("show fingerprint") },
+	{ "list"     , cmdLIST      , 0,0, N_("list key and user IDs") },
+	{ "l"        , cmdLIST      , 0,0, NULL   },
+	{ "uid"      , cmdSELUID    , 0,0, N_("select user ID N") },
+	{ "key"      , cmdSELKEY    , 0,0, N_("select secondary key N") },
+	{ "check"    , cmdCHECK     , 0,0, N_("list signatures") },
+	{ "c"        , cmdCHECK     , 0,0, NULL },
+	{ "sign"     , cmdSIGN      , 0,1, N_("sign the key") },
+	{ "s"        , cmdSIGN      , 0,1, NULL },
+	{ "tsign"    , cmdTSIGN     , 0,1, N_("make a trust signature")},
+	{ "lsign"    , cmdLSIGN     , 0,1, N_("sign the key locally") },
+	{ "nrsign"   , cmdNRSIGN    , 0,1, N_("sign the key non-revocably") },
+	{ "nrlsign"  , cmdNRLSIGN   , 0,1, N_("sign the key locally "
+                                              "and non-revocably") },
+	{ "debug"    , cmdDEBUG     , 0,0, NULL },
+	{ "adduid"   , cmdADDUID    , 1,1, N_("add a user ID") },
+	{ "addphoto" , cmdADDPHOTO  , 1,1, N_("add a photo ID") },
+	{ "deluid"   , cmdDELUID    , 0,1, N_("delete user ID") },
 	/* delphoto is really deluid in disguise */
-	{ N_("delphoto"), cmdDELUID    , 0,1, NULL },
-	{ N_("addkey")  , cmdADDKEY    , 1,1, N_("add a secondary key") },
+	{ "delphoto" , cmdDELUID    , 0,1, NULL },
+	{ "addkey"   , cmdADDKEY    , 1,1, N_("add a secondary key") },
 #ifdef ENABLE_CARD_SUPPORT
-	{ N_("addcardkey"), cmdADDCARDKEY , 1,1, N_("add a key to a smartcard") },
-	{ N_("keytocard"), cmdKEYTOCARD , 1,2, N_("move a key to a smartcard")},
+	{ "addcardkey", cmdADDCARDKEY , 1,1, N_("add a key to a smartcard") },
+	{ "keytocard", cmdKEYTOCARD , 1,2, N_("move a key to a smartcard")},
 #endif /*ENABLE_CARD_SUPPORT*/
-	{ N_("delkey")  , cmdDELKEY    , 0,1, N_("delete a secondary key") },
-	{ N_("addrevoker"),cmdADDREVOKER,1,1, N_("add a revocation key") },
-	{ N_("delsig")  , cmdDELSIG    , 0,1, N_("delete signatures") },
-	{ N_("expire")  , cmdEXPIRE    , 1,1, N_("change the expire date") },
-        { N_("primary") , cmdPRIMARY   , 1,1, N_("flag user ID as primary")},
-	{ N_("toggle")  , cmdTOGGLE    , 1,0, N_("toggle between secret "
-					         "and public key listing") },
-	{ N_("t"     )  , cmdTOGGLE    , 1,0, NULL },
-	{ N_("pref")    , cmdPREF      , 0,1, N_("list preferences (expert)")},
-	{ N_("showpref"), cmdSHOWPREF  , 0,1, N_("list preferences (verbose)") },
-	{ N_("setpref") , cmdSETPREF   , 1,1, N_("set preference list") },
-	{ N_("updpref") , cmdUPDPREF   , 1,1, N_("updated preferences") },
-	{ N_("keyserver"),cmdPREFKS    , 1,1, N_("set preferred keyserver URL")},
-	{ N_("passwd")  , cmdPASSWD    , 1,1, N_("change the passphrase") },
-	{ N_("trust")   , cmdTRUST     , 0,1, N_("change the ownertrust") },
-	{ N_("revsig")  , cmdREVSIG    , 0,1, N_("revoke signatures") },
-	{ N_("revuid")  , cmdREVUID    , 1,1, N_("revoke a user ID") },
-	{ N_("revkey")  , cmdREVKEY    , 1,1, N_("revoke a secondary key") },
-	{ N_("disable") , cmdDISABLEKEY, 0,1, N_("disable a key") },
-	{ N_("enable")  , cmdENABLEKEY , 0,1, N_("enable a key") },
-	{ N_("showphoto"),cmdSHOWPHOTO , 0,0, N_("show photo ID") },
+	{ "delkey"   , cmdDELKEY    , 0,1, N_("delete a secondary key") },
+	{ "addrevoker",cmdADDREVOKER,1,1, N_("add a revocation key") },
+	{ "delsig"   , cmdDELSIG    , 0,1, N_("delete signatures") },
+	{ "expire"   , cmdEXPIRE    , 1,1, N_("change the expire date") },
+        { "primary"  , cmdPRIMARY   , 1,1, N_("flag user ID as primary")},
+	{ "toggle"   , cmdTOGGLE    , 1,0, N_("toggle between secret "
+	     		                      "and public key listing") },
+	{ "t"        , cmdTOGGLE    , 1,0, NULL },
+	{ "pref"     , cmdPREF      , 0,1, N_("list preferences (expert)")},
+	{ "showpref" , cmdSHOWPREF  , 0,1, N_("list preferences (verbose)") },
+	{ "setpref"  , cmdSETPREF   , 1,1, N_("set preference list") },
+	{ "updpref"  , cmdUPDPREF   , 1,1, N_("updated preferences") },
+	{ "keyserver",cmdPREFKS     , 1,1, N_("set preferred keyserver URL")},
+	{ "passwd"   , cmdPASSWD    , 1,1, N_("change the passphrase") },
+	{ "trust"    , cmdTRUST     , 0,1, N_("change the ownertrust") },
+	{ "revsig"   , cmdREVSIG    , 0,1, N_("revoke signatures") },
+	{ "revuid"   , cmdREVUID    , 1,1, N_("revoke a user ID") },
+	{ "revkey"   , cmdREVKEY    , 1,1, N_("revoke a secondary key") },
+	{ "disable"  , cmdDISABLEKEY, 0,1, N_("disable a key") },
+	{ "enable"   , cmdENABLEKEY , 0,1, N_("enable a key") },
+	{ "showphoto",cmdSHOWPHOTO  , 0,0, N_("show photo ID") },
 	{ NULL, cmdNONE, 0, 0, NULL } };
     enum cmdids cmd = 0;
     int rc = 0;