diff options
| author | David Shaw <[email protected]> | 2003-08-31 23:49:07 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-08-31 23:49:07 +0000 |
| commit | 858a0a511e2caa0842a09b2fc1c641cc5bfb813a (patch) | |
| tree | 1326cb2e28070a7787df2f3b386555b239da0ed6 | |
| parent | * main.h, keygen.c (keygen_add_keyserver_url): Signature callback for (diff) | |
| download | gnupg-858a0a511e2caa0842a09b2fc1c641cc5bfb813a.tar.gz gnupg-858a0a511e2caa0842a09b2fc1c641cc5bfb813a.zip | |
* g10.c (add_keyserver_url), keyedit.c (keyedit_menu), sign.c
(mk_notation_policy_etc): Clarify a few strings. It's a "preferred
keyserver URL".
* g10.c (main): Use "keyserver-url" instead of "preferred-keyserver" for
the sake of short and simple commands.
| -rw-r--r-- | g10/ChangeLog | 12 | ||||
| -rw-r--r-- | g10/g10.c | 10 | ||||
| -rw-r--r-- | g10/keyedit.c | 2 | ||||
| -rw-r--r-- | g10/sign.c | 4 |
4 files changed, 19 insertions, 9 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index c3a6ecfac..7b78ae913 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,12 @@ +2003-08-31 David Shaw <[email protected]> + + * g10.c (add_keyserver_url), keyedit.c (keyedit_menu), sign.c + (mk_notation_policy_etc): Clarify a few strings. It's a + "preferred keyserver URL". + + * g10.c (main): Use "keyserver-url" instead of + "preferred-keyserver" for the sake of short and simple commands. + 2003-08-30 David Shaw <[email protected]> * main.h, keygen.c (keygen_add_keyserver_url): Signature callback @@ -9,7 +18,8 @@ * build-packet.c (build_sig_subpkt): Set preferred keyserver flag while building a preferred keyserver subpacket. - * keylist.c (show_policy_url): Policy URLs might be UTF8. + * keylist.c (show_policy_url, show_keyserver_url): URLs might be + UTF8. * keyedit.c (menu_addrevoker): Fix leaking a few bytes. @@ -556,7 +556,7 @@ static ARGPARSE_OPTS opts[] = { { oCertPolicyURL, "cert-policy-url", 2, "@" }, { oShowPolicyURL, "show-policy-url", 0, "@" }, { oNoShowPolicyURL, "no-show-policy-url", 0, "@" }, - { oSigKeyserverURL, "sig-preferred-keyserver", 2, "@" }, + { oSigKeyserverURL, "sig-keyserver-url", 2, "@" }, { oShowNotation, "show-notation", 0, "@" }, { oNoShowNotation, "no-show-notation", 0, "@" }, { oComment, "comment", 2, "@" }, @@ -1761,7 +1761,7 @@ main( int argc, char **argv ) {"show-photos",LIST_SHOW_PHOTOS}, {"show-policy-url",LIST_SHOW_POLICY}, {"show-notation",LIST_SHOW_NOTATION}, - {"show-preferred-keyserver",LIST_SHOW_KEYSERVER}, + {"show-keyserver-url",LIST_SHOW_KEYSERVER}, {"show-validity",LIST_SHOW_VALIDITY}, {"show-long-keyid",LIST_SHOW_LONG_KEYID}, {"show-keyring",LIST_SHOW_KEYRING}, @@ -1786,7 +1786,7 @@ main( int argc, char **argv ) {"show-photos",VERIFY_SHOW_PHOTOS}, {"show-policy-url",VERIFY_SHOW_POLICY}, {"show-notation",VERIFY_SHOW_NOTATION}, - {"show-preferred-keyserver",VERIFY_SHOW_KEYSERVER}, + {"show-keyserver-url",VERIFY_SHOW_KEYSERVER}, {"show-validity",VERIFY_SHOW_VALIDITY}, {"show-long-keyid",VERIFY_SHOW_LONG_KEYID}, {NULL,0} @@ -3171,8 +3171,8 @@ add_keyserver_url( const char *string, int which ) if(which) BUG(); else - log_error(_("the given signature preferred keyserver " - "URL is invalid\n")); + log_error(_("the given signature preferred" + " keyserver URL is invalid\n")); } if(which) diff --git a/g10/keyedit.c b/g10/keyedit.c index db1589a43..043cdba5e 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1156,7 +1156,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands, { N_("showpref"), cmdSHOWPREF , 0,1,0, N_("list preferences (verbose)") }, { N_("setpref") , cmdSETPREF , 1,1,0, N_("set preference list") }, { N_("updpref") , cmdUPDPREF , 1,1,0, N_("updated preferences") }, - { N_("keyserver"),cmdPREFKS , 1,1,0, N_("set preferred keyserver")}, + { N_("keyserver"),cmdPREFKS , 1,1,0, N_("set preferred keyserver URL")}, { N_("passwd") , cmdPASSWD , 1,1,0, N_("change the passphrase") }, { N_("trust") , cmdTRUST , 0,1,0, N_("change the ownertrust") }, { N_("revsig") , cmdREVSIG , 0,1,0, N_("revoke signatures") }, diff --git a/g10/sign.c b/g10/sign.c index d90f2bdbc..965234049 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -183,8 +183,8 @@ mk_notation_policy_etc( PKT_signature *sig, s=pct_expando(string,&args); if(!s) { - log_error(_("WARNING: unable to %%-expand preferred keyserver url " - "(too large). Using unexpanded.\n")); + log_error(_("WARNING: unable to %%-expand preferred keyserver URL" + " (too large). Using unexpanded.\n")); s=m_strdup(string); } |