From 04754ce3a704b1e6d38cb9a28dacf2821dc3f15f Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Fri, 23 Sep 2016 14:10:07 +0200 Subject: g10: Hyphenate --clearsign. * g10/gpg.c (opts): Hyphenate option. * doc/gpg.texi: Update accordingly. * po: Update translations. * tests/openpgp: Update tests. GnuPG-bug-id: 2700 Signed-off-by: Justus Winter --- g10/gpg.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'g10') diff --git a/g10/gpg.c b/g10/gpg.c index 7de62fd76..6ee755f93 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -424,7 +424,8 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_group (300, N_("@Commands:\n ")), ARGPARSE_c (aSign, "sign", N_("make a signature")), - ARGPARSE_c (aClearsign, "clearsign", N_("make a clear text signature")), + ARGPARSE_c (aClearsign, "clear-sign", N_("make a clear text signature")), + ARGPARSE_c (aClearsign, "clearsign", "@"), ARGPARSE_c (aDetachedSign, "detach-sign", N_("make a detached signature")), ARGPARSE_c (aEncr, "encrypt", N_("encrypt data")), ARGPARSE_c (aEncrFiles, "encrypt-files", "@"), @@ -661,7 +662,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_group (303, N_("@\nExamples:\n\n" " -se -r Bob [file] sign and encrypt for user Bob\n" - " --clearsign [file] make a clear text signature\n" + " --clear-sign [file] make a clear text signature\n" " --detach-sign [file] make a detached signature\n" " --list-keys [names] show keys\n" " --fingerprint [names] show fingerprints\n")), @@ -3750,7 +3751,7 @@ main (int argc, char **argv) cmdname="--sign --encrypt"; break; case aClearsign: - cmdname="--clearsign"; + cmdname="--clear-sign"; break; case aDetachedSign: cmdname="--detach-sign"; @@ -4137,11 +4138,11 @@ main (int argc, char **argv) case aClearsign: /* make a clearsig */ if( argc > 1 ) - wrong_args(_("--clearsign [filename]")); + wrong_args(_("--clear-sign [filename]")); if( (rc = clearsign_file (ctrl, fname, locusr, NULL)) ) { write_status_failure ("sign", rc); - log_error("%s: clearsign failed: %s\n", + log_error("%s: clear-sign failed: %s\n", print_fname_stdin(fname), gpg_strerror (rc) ); } break; -- cgit v1.2.3