summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorJustus Winter <justus@g10code.com>2016-12-15 13:01:03 +0100
committerJustus Winter <justus@g10code.com>2016-12-15 13:01:03 +0100
commitc252627c6fd93bc305c5a5a2f013c3de2d45c6b0 (patch)
tree78ba066392ddfaec3eb98232efbfcea6b96c2a77 /g10
parentdoc: Add aliases of all changed options. (diff)
downloadgnupg2-c252627c6fd93bc305c5a5a2f013c3de2d45c6b0.tar.xz
gnupg2-c252627c6fd93bc305c5a5a2f013c3de2d45c6b0.zip
g10: Shorten unreasonably long option.
* g10/gpg.c (opts): Rename 'generate-revocation-certificate' to 'generate-revocation'. * doc/gpg.texi: Update accordingly. * po: Update translations. GnuPG-bug-id: 2700 Fixes-commit: ec1bd3ae685e95563e38077ab3c1655fd55dea07 Signed-off-by: Justus Winter <justus@g10code.com>
Diffstat (limited to 'g10')
-rw-r--r--g10/gpg.c4
-rw-r--r--g10/revoke.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index 6003d04cd..7702bb32b 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -459,7 +459,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aFullKeygen, "full-generate-key" ,
N_("full featured key pair generation")),
ARGPARSE_c (aFullKeygen, "full-gen-key", "@"),
- ARGPARSE_c (aGenRevoke, "generate-revocation-certificate",
+ ARGPARSE_c (aGenRevoke, "generate-revocation",
N_("generate a revocation certificate")),
ARGPARSE_c (aGenRevoke, "gen-revoke", "@"),
ARGPARSE_c (aDeleteKeys,"delete-keys",
@@ -4547,7 +4547,7 @@ main (int argc, char **argv)
case aGenRevoke:
if( argc != 1 )
- wrong_args("--generate-revocation-certificate user-id");
+ wrong_args("--generate-revocation user-id");
username = make_username(*argv);
gen_revoke( username );
xfree( username );
diff --git a/g10/revoke.c b/g10/revoke.c
index 17c9b8c3a..591b641d3 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -571,7 +571,7 @@ gen_standard_revoke (PKT_public_key *psk, const char *cache_nonce)
"the secret key. However, if the secret key is still accessible,\n"
"it is better to generate a new revocation certificate and give\n"
"a reason for the revocation. For details see the description of\n"
- "of the gpg command \"--generate-revocation-certificate\" in the "
+ "of the gpg command \"--generate-revocation\" in the "
"GnuPG manual."),
_("To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"