aboutsummaryrefslogtreecommitdiffstats
path: root/g10/g10.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2002-08-06 17:38:04 +0000
committerDavid Shaw <[email protected]>2002-08-06 17:38:04 +0000
commit58b0a36d6b096f9c38f90c5b4c2daae5b6182989 (patch)
treeaff0ed79cdaef83e30e3ffcbb71ea7d33a7cc44f /g10/g10.c
parent* gpg.sgml: Clarify that only long-form options can go in the config file. (diff)
downloadgnupg-58b0a36d6b096f9c38f90c5b4c2daae5b6182989.tar.gz
gnupg-58b0a36d6b096f9c38f90c5b4c2daae5b6182989.zip
* encode.c (encode_crypt), g10.c (main), sign.c (sign_file,
clearsign_file): Use the same --pgpX warning string everywhere to ease translations. * encode.c (write_pubkey_enc_from_list): Warn when using --throw-keyid with --pgpX. Noted by Vedaal Nistar.
Diffstat (limited to 'g10/g10.c')
-rw-r--r--g10/g10.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/g10/g10.c b/g10/g10.c
index e004015bd..ab9f6481f 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -264,8 +264,8 @@ enum cmd_and_opt_values { aNull = 0,
oFastListMode,
oListOnly,
oIgnoreTimeConflict,
- oIgnoreValidFrom,
- oIgnoreCrcError,
+ oIgnoreValidFrom,
+ oIgnoreCrcError,
oShowSessionKey,
oOverrideSessionKey,
oNoRandomSeedFile,
@@ -1598,7 +1598,8 @@ main( int argc, char **argv )
if(unusable)
{
- log_info(_("this message may not be usable by PGP 2.x\n"));
+ log_info(_("this message may not be usable by %s\n"),
+ "PGP 2.x");
opt.pgp2=0;
}
else