1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

* 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.
This commit is contained in:
David Shaw 2003-08-31 23:49:07 +00:00
parent 653da12d2c
commit 858a0a511e
4 changed files with 19 additions and 9 deletions

View file

@ -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)