gnupg/g10 (ChangeLog keyedit.c)
cvs user dshaw
cvs at cvs.gnupg.org
Tue Dec 14 15:45:59 CET 2004
Date: Tuesday, December 14, 2004 @ 15:50:15
Author: dshaw
Path: /cvs/gnupg/gnupg/g10
Modified: ChangeLog keyedit.c
* keyedit.c (keyedit_menu): Re-remove the N_() markers.
-----------+
ChangeLog | 2 +
keyedit.c | 86 ++++++++++++++++++++++++++++++------------------------------
2 files changed, 45 insertions(+), 43 deletions(-)
Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.657 gnupg/g10/ChangeLog:1.658
--- gnupg/g10/ChangeLog:1.657 Tue Dec 14 15:42:41 2004
+++ gnupg/g10/ChangeLog Tue Dec 14 15:50:15 2004
@@ -1,5 +1,7 @@
2004-12-14 David Shaw <dshaw at jabberwocky.com>
+ * keyedit.c (keyedit_menu): Re-remove the N_() markers.
+
* trustdb.c (uid_trust_string_fixed): Show uids as revoked if the
key is revoked.
Index: gnupg/g10/keyedit.c
diff -u gnupg/g10/keyedit.c:1.159 gnupg/g10/keyedit.c:1.160
--- gnupg/g10/keyedit.c:1.159 Tue Dec 14 15:42:41 2004
+++ gnupg/g10/keyedit.c Tue Dec 14 15:50:15 2004
@@ -1282,54 +1282,54 @@
const char *desc;
} cmds[] =
{
- { N_("quit") , cmdQUIT , 0, N_("quit this menu") },
- { N_("q") , cmdQUIT , 0, NULL },
- { N_("save") , cmdSAVE , 0, N_("save and quit") },
- { N_("help") , cmdHELP , 0, N_("show this help") },
- { "?" , cmdHELP , 0, NULL },
- { N_("fpr") , cmdFPR , 0, N_("show fingerprint") },
- { N_("list") , cmdLIST , 0, N_("list key and user IDs") },
- { N_("l") , cmdLIST , 0, NULL },
- { N_("uid") , cmdSELUID , 0, N_("select user ID N") },
- { N_("key") , cmdSELKEY , 0, N_("select secondary key N") },
- { N_("check") , cmdCHECK , 0, N_("list signatures") },
- { N_("c") , cmdCHECK , 0, NULL },
- { N_("sign") , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign the key") },
- { N_("s") , cmdSIGN , KEYEDIT_NOT_SK, NULL },
+ { "quit" , cmdQUIT , 0, N_("quit this menu") },
+ { "q" , cmdQUIT , 0, NULL },
+ { "save" , cmdSAVE , 0, N_("save and quit") },
+ { "help" , cmdHELP , 0, N_("show this help") },
+ { "?" , cmdHELP , 0, NULL },
+ { "fpr" , cmdFPR , 0, N_("show fingerprint") },
+ { "list" , cmdLIST , 0, N_("list key and user IDs") },
+ { "l" , cmdLIST , 0, NULL },
+ { "uid" , cmdSELUID , 0, N_("select user ID N") },
+ { "key" , cmdSELKEY , 0, N_("select secondary key N") },
+ { "check" , cmdCHECK , 0, N_("list signatures") },
+ { "c" , cmdCHECK , 0, NULL },
+ { "sign" , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign the key") },
+ { "s" , cmdSIGN , KEYEDIT_NOT_SK, NULL },
/* "lsign" will never match since "sign" comes first and it is a
tail match. It is here so it shows up in the help menu. */
- { N_("lsign") , cmdNOP , 0, N_("sign the key locally") },
- { N_("debug") , cmdDEBUG , 0, NULL },
- { N_("adduid") , cmdADDUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") },
- { N_("addphoto"), cmdADDPHOTO , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a photo ID") },
- { N_("deluid") , cmdDELUID , KEYEDIT_NOT_SK, N_("delete user ID") },
+ { "lsign" , cmdNOP , 0, N_("sign the key locally") },
+ { "debug" , cmdDEBUG , 0, NULL },
+ { "adduid" , cmdADDUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") },
+ { "addphoto", cmdADDPHOTO , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a photo ID") },
+ { "deluid" , cmdDELUID , KEYEDIT_NOT_SK, N_("delete user ID") },
/* delphoto is really deluid in disguise */
- { N_("delphoto"), cmdDELUID , KEYEDIT_NOT_SK, NULL },
- { N_("addkey") , cmdADDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a secondary key") },
+ { "delphoto", cmdDELUID , KEYEDIT_NOT_SK, NULL },
+ { "addkey" , cmdADDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a secondary key") },
#ifdef ENABLE_CARD_SUPPORT
- { N_("addcardkey"), cmdADDCARDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a key to a smartcard") },
- { N_("keytocard"), cmdKEYTOCARD , KEYEDIT_NEED_SK|KEYEDIT_ONLY_SK, N_("move a key to a smartcard")},
+ { "addcardkey", cmdADDCARDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a key to a smartcard") },
+ { "keytocard", cmdKEYTOCARD , KEYEDIT_NEED_SK|KEYEDIT_ONLY_SK, N_("move a key to a smartcard")},
#endif /*ENABLE_CARD_SUPPORT*/
- { N_("delkey") , cmdDELKEY , KEYEDIT_NOT_SK, N_("delete a secondary key") },
- { N_("addrevoker"),cmdADDREVOKER,KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a revocation key") },
- { N_("delsig") , cmdDELSIG , KEYEDIT_NOT_SK, N_("delete signatures") },
- { N_("expire") , cmdEXPIRE , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expire date") },
- { N_("primary") , cmdPRIMARY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag user ID as primary")},
- { N_("toggle") , cmdTOGGLE , KEYEDIT_NEED_SK, N_("toggle between secret and public key listing") },
- { N_("t" ) , cmdTOGGLE , KEYEDIT_NEED_SK, NULL },
- { N_("pref") , cmdPREF , KEYEDIT_NOT_SK, N_("list preferences (expert)")},
- { N_("showpref"), cmdSHOWPREF , KEYEDIT_NOT_SK, N_("list preferences (verbose)") },
- { N_("setpref") , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preference list") },
- { N_("updpref") , cmdUPDPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("updated preferences") },
- { N_("keyserver"),cmdPREFKS , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL")},
- { N_("passwd") , cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the passphrase") },
- { N_("trust") , cmdTRUST , KEYEDIT_NOT_SK, N_("change the ownertrust") },
- { N_("revsig") , cmdREVSIG , KEYEDIT_NOT_SK, N_("revoke signatures") },
- { N_("revuid") , cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a user ID") },
- { N_("revkey") , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a secondary key") },
- { N_("disable") , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable a key") },
- { N_("enable") , cmdENABLEKEY , KEYEDIT_NOT_SK, N_("enable a key") },
- { N_("showphoto"),cmdSHOWPHOTO , 0, N_("show photo ID") },
+ { "delkey" , cmdDELKEY , KEYEDIT_NOT_SK, N_("delete a secondary key") },
+ { "addrevoker",cmdADDREVOKER,KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a revocation key") },
+ { "delsig" , cmdDELSIG , KEYEDIT_NOT_SK, N_("delete signatures") },
+ { "expire" , cmdEXPIRE , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expire date") },
+ { "primary" , cmdPRIMARY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag user ID as primary")},
+ { "toggle" , cmdTOGGLE , KEYEDIT_NEED_SK, N_("toggle between secret and public key listing") },
+ { "t" , cmdTOGGLE , KEYEDIT_NEED_SK, NULL },
+ { "pref" , cmdPREF , KEYEDIT_NOT_SK, N_("list preferences (expert)")},
+ { "showpref", cmdSHOWPREF , KEYEDIT_NOT_SK, N_("list preferences (verbose)") },
+ { "setpref" , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preference list") },
+ { "updpref" , cmdUPDPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("updated preferences") },
+ { "keyserver",cmdPREFKS , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL")},
+ { "passwd" , cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the passphrase") },
+ { "trust" , cmdTRUST , KEYEDIT_NOT_SK, N_("change the ownertrust") },
+ { "revsig" , cmdREVSIG , KEYEDIT_NOT_SK, N_("revoke signatures") },
+ { "revuid" , cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a user ID") },
+ { "revkey" , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a secondary key") },
+ { "disable" , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable a key") },
+ { "enable" , cmdENABLEKEY , KEYEDIT_NOT_SK, N_("enable a key") },
+ { "showphoto",cmdSHOWPHOTO , 0, N_("show photo ID") },
{ NULL, cmdNONE, 0, NULL }
};
enum cmdids cmd = 0;
More information about the Gnupg-commits
mailing list