aboutsummaryrefslogtreecommitdiffstats
path: root/g10/g10.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2003-08-31 23:49:07 +0000
committerDavid Shaw <[email protected]>2003-08-31 23:49:07 +0000
commit858a0a511e2caa0842a09b2fc1c641cc5bfb813a (patch)
tree1326cb2e28070a7787df2f3b386555b239da0ed6 /g10/g10.c
parent* main.h, keygen.c (keygen_add_keyserver_url): Signature callback for (diff)
downloadgnupg-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.
Diffstat (limited to 'g10/g10.c')
-rw-r--r--g10/g10.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/g10.c b/g10/g10.c
index 1be39a786..ce7ac2548 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -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)