diff options
| author | Justus Winter <[email protected]> | 2016-09-23 12:10:07 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-09-23 12:11:58 +0000 |
| commit | 5420c821e8f095a13a2a0a5409d22fc75dccd130 (patch) | |
| tree | adc9e9c83727ca8b7c626b8881f19a50f92530d1 /g10/gpg.c | |
| parent | g10: Spell out --recv-keys. (diff) | |
| download | gnupg-justus/issue2700.tar.gz gnupg-justus/issue2700.zip | |
g10: Hyphenate --clearsign.justus/issue2700
* 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 <[email protected]>
Diffstat (limited to 'g10/gpg.c')
| -rw-r--r-- | g10/gpg.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -419,7 +419,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", "@"), @@ -653,7 +654,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")), @@ -3639,7 +3640,7 @@ main (int argc, char **argv) cmdname="--sign --encrypt"; break; case aClearsign: - cmdname="--clearsign"; + cmdname="--clear-sign"; break; case aDetachedSign: cmdname="--detach-sign"; @@ -4023,11 +4024,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; |