[git] GnuPG - branch, master, updated. gnupg-2.1.16-127-g6b16b02
by Justus Winter
cvs at cvs.gnupg.org
Thu Dec 15 16:16:18 CET 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 6b16b02109f4bb5b934e456667ff4c0ba7bc85fd (commit)
via 41ad04d403de05abe54280d2a84aa51a603194e4 (commit)
via 6e4396723e9e5865015ebf7033628fa3919cf7d1 (commit)
via 3c691097ca144e9a1d4c9185636c59a848bec85c (commit)
via c252627c6fd93bc305c5a5a2f013c3de2d45c6b0 (commit)
via bc6b76ef26f31c54ae1c29c761b8ecc437fcf565 (commit)
from 2d1760ffe2ff46b77bd0f38db8b781d9564ae999 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6b16b02109f4bb5b934e456667ff4c0ba7bc85fd
Author: Justus Winter <justus at g10code.com>
Date: Thu Dec 15 16:06:49 2016 +0100
g10: Avoid translating simple error messages.
* g10/gpg.c (main): Avoid translating arguments to 'wrong_args'.
--
Translating these messages is a burden for translators, and we only
have translations for very few of them as it is.
If we want to localize these messages, I'd suggest to translate the
placeholders (e.g. 'filename').
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/g10/gpg.c b/g10/gpg.c
index e680748..cab5d53 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -4010,7 +4010,7 @@ main (int argc, char **argv)
case aStore: /* only store the file */
if( argc > 1 )
- wrong_args(_("--store [filename]"));
+ wrong_args("--store [filename]");
if( (rc = encrypt_store(fname)) )
{
write_status_failure ("store", rc);
@@ -4020,7 +4020,7 @@ main (int argc, char **argv)
break;
case aSym: /* encrypt the given file only with the symmetric cipher */
if( argc > 1 )
- wrong_args(_("--symmetric [filename]"));
+ wrong_args("--symmetric [filename]");
if( (rc = encrypt_symmetric(fname)) )
{
write_status_failure ("symencrypt", rc);
@@ -4035,7 +4035,7 @@ main (int argc, char **argv)
else
{
if( argc > 1 )
- wrong_args(_("--encrypt [filename]"));
+ wrong_args("--encrypt [filename]");
if( (rc = encrypt_crypt (ctrl, -1, fname, remusr, 0, NULL, -1)) )
{
write_status_failure ("encrypt", rc);
@@ -4051,7 +4051,7 @@ main (int argc, char **argv)
might work with 7, but alas, I don't have a copy to test
with right now. */
if( argc > 1 )
- wrong_args(_("--symmetric --encrypt [filename]"));
+ wrong_args("--symmetric --encrypt [filename]");
else if(opt.s2k_mode==0)
log_error(_("you cannot use --symmetric --encrypt"
" with --s2k-mode 0\n"));
@@ -4077,7 +4077,7 @@ main (int argc, char **argv)
}
else {
if( argc > 1 )
- wrong_args(_("--sign [filename]"));
+ wrong_args("--sign [filename]");
if( argc ) {
sl = xmalloc_clear( sizeof *sl + strlen(fname));
strcpy(sl->d, fname);
@@ -4093,7 +4093,7 @@ main (int argc, char **argv)
case aSignEncr: /* sign and encrypt the given file */
if( argc > 1 )
- wrong_args(_("--sign --encrypt [filename]"));
+ wrong_args("--sign --encrypt [filename]");
if( argc ) {
sl = xmalloc_clear( sizeof *sl + strlen(fname));
strcpy(sl->d, fname);
@@ -4111,7 +4111,7 @@ main (int argc, char **argv)
case aSignEncrSym: /* sign and encrypt the given file */
if( argc > 1 )
- wrong_args(_("--symmetric --sign --encrypt [filename]"));
+ wrong_args("--symmetric --sign --encrypt [filename]");
else if(opt.s2k_mode==0)
log_error(_("you cannot use --symmetric --sign --encrypt"
" with --s2k-mode 0\n"));
@@ -4140,7 +4140,7 @@ main (int argc, char **argv)
case aSignSym: /* sign and conventionally encrypt the given file */
if (argc > 1)
- wrong_args(_("--sign --symmetric [filename]"));
+ wrong_args("--sign --symmetric [filename]");
rc = sign_symencrypt_file (ctrl, fname, locusr);
if (rc)
{
@@ -4152,7 +4152,7 @@ main (int argc, char **argv)
case aClearsign: /* make a clearsig */
if( argc > 1 )
- wrong_args(_("--clear-sign [filename]"));
+ wrong_args("--clear-sign [filename]");
if( (rc = clearsign_file (ctrl, fname, locusr, NULL)) )
{
write_status_failure ("sign", rc);
@@ -4182,7 +4182,7 @@ main (int argc, char **argv)
else
{
if( argc > 1 )
- wrong_args(_("--decrypt [filename]"));
+ wrong_args("--decrypt [filename]");
if( (rc = decrypt_message (ctrl, fname) ))
{
write_status_failure ("decrypt", rc);
@@ -4209,11 +4209,11 @@ main (int argc, char **argv)
case aSignKey:
if( argc != 1 )
- wrong_args(_("--sign-key user-id"));
+ wrong_args("--sign-key user-id");
/* fall through */
case aLSignKey:
if( argc != 1 )
- wrong_args(_("--lsign-key user-id"));
+ wrong_args("--lsign-key user-id");
/* fall through */
sl=NULL;
@@ -4234,7 +4234,7 @@ main (int argc, char **argv)
case aEditKey: /* Edit a key signature */
if( !argc )
- wrong_args(_("--edit-key user-id [commands]"));
+ wrong_args("--edit-key user-id [commands]");
username = make_username( fname );
if( argc > 1 ) {
sl = NULL;
@@ -4250,7 +4250,7 @@ main (int argc, char **argv)
case aPasswd:
if (argc != 1)
- wrong_args (_("--change-passphrase <user-id>"));
+ wrong_args("--change-passphrase <user-id>");
else
{
username = make_username (fname);
@@ -4884,7 +4884,7 @@ main (int argc, char **argv)
case aListPackets:
default:
if( argc > 1 )
- wrong_args(_("[filename]"));
+ wrong_args("[filename]");
/* Issue some output for the unix newbie */
if (!fname && !opt.outfile
&& gnupg_isatty (fileno (stdin))
commit 41ad04d403de05abe54280d2a84aa51a603194e4
Author: Justus Winter <justus at g10code.com>
Date: Thu Dec 15 15:32:51 2016 +0100
g10: Rework the --quick-* interface.
* g10/gpg.c (opts): Rename options.
(main): Update errors.
* doc/gpg.texi: Update accordingly.
--
I decided not to keep the old versions as aliases in the documentation
because the interface is a fairly recent addition.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 81588e1..ab0289d 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -618,8 +618,8 @@ This section explains the main commands for key management.
@table @gnupgtabopt
- at item --quick-gen-key @code{user-id} [@code{algo} [@code{usage} [@code{expire}]]]
- at opindex quick-gen-key
+ at item --quick-generate-key @code{user-id} [@code{algo} [@code{usage} [@code{expire}]]]
+ at opindex quick-generate-key
This is a simple command to generate a standard key with one user id.
In contrast to @option{--generate-key} the key is generated directly
without the need to answer a bunch of prompts. Unless the option
@@ -636,7 +636,7 @@ created and no prompts are shown. To specify an expiration date but
still create a primary and subkey use ``default'' or
``future-default'' for @code{algo} and ``default'' for @code{usage}.
For a description of these optional arguments see the command
- at code{--quick-addkey}. The @code{usage} accepts also the value
+ at code{--quick-add-key}. The @code{usage} accepts also the value
``cert'' which can be used to create a certification only primary key;
the default is to a create certification and signing key.
@@ -660,8 +660,8 @@ Directly set the expiration time of the primary key to @code{expire}.
To remove the expiration time @code{0} can be used.
- at item --quick-addkey @code{fpr} [@code{algo} [@code{usage} [@code{expire}]]]
- at opindex quick-addkey
+ at item --quick-add-key @code{fpr} [@code{algo} [@code{usage} [@code{expire}]]]
+ at opindex quick-add-key
Directly add a subkey to the key identified by the fingerprint
@code{fpr}. Without the optional arguments an encryption subkey is
added. If any of the arguments are given a more specific subkey is
@@ -1074,16 +1074,16 @@ full flexibility of the "sign" subcommand from @option{--edit-key}.
Its intended use is to help unattended key signing by utilizing a list
of verified fingerprints.
- at item --quick-adduid @var{user-id} @var{new-user-id}
- at opindex quick-adduid
+ at item --quick-add-uid @var{user-id} @var{new-user-id}
+ at opindex quick-add-uid
This command adds a new user id to an existing key. In contrast to
the interactive sub-command @code{adduid} of @option{--edit-key} the
@var{new-user-id} is added verbatim with only leading and trailing
white space removed, it is expected to be UTF-8 encoded, and no checks
on its form are applied.
- at item --quick-revuid @var{user-id} @var{user-id-to-revoke}
- at opindex quick-revuid
+ at item --quick-revoke-uid @var{user-id} @var{user-id-to-revoke}
+ at opindex quick-revoke-uid
This command revokes a User ID on an existing key. It cannot be used
to revoke the last User ID on key (some non-revoked User ID must
remain), with revocation reason ``User ID is no longer valid''. If
diff --git a/g10/gpg.c b/g10/gpg.c
index f382a7a..e680748 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -447,13 +447,17 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aKeygen, "generate-key",
N_("generate a new key pair")),
ARGPARSE_c (aKeygen, "gen-key", "@"),
- ARGPARSE_c (aQuickKeygen, "quick-gen-key" ,
+ ARGPARSE_c (aQuickKeygen, "quick-generate-key" ,
N_("quickly generate a new key pair")),
- ARGPARSE_c (aQuickAddUid, "quick-adduid",
+ ARGPARSE_c (aQuickKeygen, "quick-gen-key", "@"),
+ ARGPARSE_c (aQuickAddUid, "quick-add-uid",
N_("quickly add a new user-id")),
+ ARGPARSE_c (aQuickAddUid, "quick-adduid", "@"),
+ ARGPARSE_c (aQuickAddKey, "quick-add-key", "@"),
ARGPARSE_c (aQuickAddKey, "quick-addkey", "@"),
- ARGPARSE_c (aQuickRevUid, "quick-revuid",
+ ARGPARSE_c (aQuickRevUid, "quick-revoke-uid",
N_("quickly revoke a user-id")),
+ ARGPARSE_c (aQuickRevUid, "quick-revuid", "@"),
ARGPARSE_c (aQuickSetExpire, "quick-set-expire",
N_("quickly set a new expiration date")),
ARGPARSE_c (aFullKeygen, "full-generate-key" ,
@@ -4299,7 +4303,7 @@ main (int argc, char **argv)
const char *x_algo, *x_usage, *x_expire;
if (argc < 1 || argc > 4)
- wrong_args("--quick-gen-key USER-ID [ALGO [USAGE [EXPIRE]]]");
+ wrong_args("--quick-generate-key USER-ID [ALGO [USAGE [EXPIRE]]]");
username = make_username (fname);
argv++, argc--;
x_algo = "";
@@ -4364,7 +4368,7 @@ main (int argc, char **argv)
const char *uid, *newuid;
if (argc != 2)
- wrong_args ("--quick-adduid USER-ID NEW-USER-ID");
+ wrong_args ("--quick-add-uid USER-ID NEW-USER-ID");
uid = *argv++; argc--;
newuid = *argv++; argc--;
keyedit_quick_adduid (ctrl, uid, newuid);
@@ -4376,7 +4380,7 @@ main (int argc, char **argv)
const char *x_fpr, *x_algo, *x_usage, *x_expire;
if (argc < 1 || argc > 4)
- wrong_args ("--quick-addkey FINGERPRINT [ALGO [USAGE [EXPIRE]]]");
+ wrong_args ("--quick-add-key FINGERPRINT [ALGO [USAGE [EXPIRE]]]");
x_fpr = *argv++; argc--;
x_algo = "";
x_usage = "";
@@ -4402,7 +4406,7 @@ main (int argc, char **argv)
const char *uid, *uidtorev;
if (argc != 2)
- wrong_args ("--quick-revuid USER-ID USER-ID-TO-REVOKE");
+ wrong_args ("--quick-revoke-uid USER-ID USER-ID-TO-REVOKE");
uid = *argv++; argc--;
uidtorev = *argv++; argc--;
keyedit_quick_revuid (ctrl, uid, uidtorev);
diff --git a/tests/openpgp/quick-key-manipulation.scm b/tests/openpgp/quick-key-manipulation.scm
index 639fd62..9b9c919 100755
--- a/tests/openpgp/quick-key-manipulation.scm
+++ b/tests/openpgp/quick-key-manipulation.scm
@@ -52,7 +52,7 @@
(setenv "PINENTRY_USER_DATA" "test" #t)
(info "Checking quick key generation...")
-(call-check `(, at GPG --quick-gen-key ,alpha))
+(call-check `(, at GPG --quick-generate-key ,alpha))
(define keyinfo (gpg-with-colons `(-k ,(exact alpha))))
(define fpr (:fpr (assoc "fpr" keyinfo)))
@@ -65,7 +65,7 @@
;; Make sure the key capabilities don't change when we add a user id.
;; (See bug #2697.)
(let ((pre (key-data (exact alpha)))
- (result (call-check `(, at GPG --quick-adduid ,(exact alpha) ,bravo)))
+ (result (call-check `(, at GPG --quick-add-uid ,(exact alpha) ,bravo)))
(post (key-data (exact alpha))))
(if (not (equal? pre post))
(begin
@@ -83,7 +83,7 @@
(assert (= 2 (count-uids-of-secret-key bravo)))
(info "Checking that we can revoke a user ID...")
-(call-check `(, at GPG --quick-revuid ,(exact bravo) ,alpha))
+(call-check `(, at GPG --quick-revoke-uid ,(exact bravo) ,alpha))
(assert (= 1 (count-uids-of-secret-key bravo)))
@@ -118,7 +118,7 @@
"Checking that we can add subkeys..."
(lambda (args check)
(set! count (+ 1 count))
- (call-check `(, at gpg --quick-addkey ,fpr , at args))
+ (call-check `(, at gpg --quick-add-key ,fpr , at args))
(let ((subkeys (get-subkeys)))
(assert (= count (length subkeys)))
(if check (check (last subkeys)))))
commit 6e4396723e9e5865015ebf7033628fa3919cf7d1
Author: Justus Winter <justus at g10code.com>
Date: Thu Dec 15 14:50:10 2016 +0100
g10: Rename 'card-edit' to 'edit-card'.
* g10/gpg.c (opts): Rename option.
* g10/call-agent.c (agent_scd_learn): Update comment.
* doc/gpg.texi: Update accordingly.
--
This change has a surprising side effect. Previously, --edit was an
alias for --edit-key, because the argument parser actually accepts
unique prefixes of all options. With this change, however, --edit is
ambiguous.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index d24584a..81588e1 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -367,7 +367,9 @@ values are dumped and not only their lengths. Note that the output of
this command may change with new releases.
- at item --card-edit
+ at item --edit-card
+ at opindex edit-card
+ at itemx --card-edit
@opindex card-edit
Present a menu to work with a smartcard. The subcommand "help" provides
an overview on available commands. For a detailed description, please
@@ -382,7 +384,7 @@ Show the content of the smart card.
@opindex change-pin
Present a menu to allow changing the PIN of a smartcard. This
functionality is also available as the subcommand "passwd" with the
- at option{--card-edit} command.
+ at option{--edit-card} command.
@item --delete-keys @code{name}
@itemx --delete-keys @code{name}
diff --git a/g10/call-agent.c b/g10/call-agent.c
index fd9b964..335e12a 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -660,7 +660,7 @@ agent_scd_learn (struct agent_card_info_s *info, int force)
care about the data returned. If the card has already been
initialized, this is a very fast command. The main reason we
need to do this here is to handle a card removed case so that an
- "l" command in --card-edit can be used to show ta newly inserted
+ "l" command in --edit-card can be used to show ta newly inserted
card. We request the openpgp card because that is what we
expect. */
rc = assuan_transact (agent_ctx, "SCD SERIALNO openpgp",
diff --git a/g10/gpg.c b/g10/gpg.c
index f0eb930..f382a7a 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -495,7 +495,8 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aFastImport, "fast-import", "@"),
#ifdef ENABLE_CARD_SUPPORT
ARGPARSE_c (aCardStatus, "card-status", N_("print the card status")),
- ARGPARSE_c (aCardEdit, "card-edit", N_("change data on a card")),
+ ARGPARSE_c (aCardEdit, "edit-card", N_("change data on a card")),
+ ARGPARSE_c (aCardEdit, "card-edit", "@"),
ARGPARSE_c (aChangePIN, "change-pin", N_("change a card's PIN")),
#endif
ARGPARSE_c (aListConfig, "list-config", "@"),
commit 3c691097ca144e9a1d4c9185636c59a848bec85c
Author: Justus Winter <justus at g10code.com>
Date: Thu Dec 15 13:59:48 2016 +0100
g10: Spell out --desig-revoke.
* g10/gpg.c (opts): Rename option.
* doc/gpg.texi: Update accordingly.
--
This is a rather long name, but I believe that this command is rarely
used, and in places where it is used frequently, the process is likely
automated.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 753bec3..d24584a 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -727,7 +727,9 @@ published, which is best done by sending the key to a keyserver
to a file which is then send to frequent communication partners.
- at item --desig-revoke @code{name}
+ at item --generate-designated-revocation @code{name}
+ at opindex generate-designated-revocation
+ at itemx --desig-revoke @code{name}
@opindex desig-revoke
Generate a designated revocation certificate for a key. This allows a
user (with the permission of the keyholder) to revoke someone else's
diff --git a/g10/gpg.c b/g10/gpg.c
index 7702bb3..f0eb930 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -476,6 +476,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aEditKey, "key-edit" ,"@"),
ARGPARSE_c (aPasswd, "change-passphrase", N_("change a passphrase")),
ARGPARSE_c (aPasswd, "passwd", "@"),
+ ARGPARSE_c (aDesigRevoke, "generate-designated-revocation", "@"),
ARGPARSE_c (aDesigRevoke, "desig-revoke","@" ),
ARGPARSE_c (aExport, "export" , N_("export keys") ),
ARGPARSE_c (aSendKeys, "send-keys" , N_("export keys to a keyserver") ),
@@ -4555,7 +4556,7 @@ main (int argc, char **argv)
case aDesigRevoke:
if (argc != 1)
- wrong_args ("--desig-revoke user-id");
+ wrong_args ("--generate-designated-revocation user-id");
username = make_username (*argv);
gen_desig_revoke (ctrl, username, locusr);
xfree (username);
commit c252627c6fd93bc305c5a5a2f013c3de2d45c6b0
Author: Justus Winter <justus at g10code.com>
Date: Thu Dec 15 13:01:03 2016 +0100
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 at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9b230c8..753bec3 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -710,8 +710,8 @@ mode. See the manual section ``Unattended key generation'' on how
to use this.
- at item --generate-revocation-certificate @code{name}
- at opindex generate-revocation-certificate
+ at item --generate-revocation @code{name}
+ at opindex generate-revocation
@itemx --gen-revoke @code{name}
@opindex gen-revoke
Generate a revocation certificate for the complete key. To only revoke
diff --git a/g10/gpg.c b/g10/gpg.c
index 6003d04..7702bb3 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 17c9b8c..591b641 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"
diff --git a/po/ca.po b/po/ca.po
index b4cd9c7..6f383f4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5478,7 +5478,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/cs.po b/po/cs.po
index f2cb0d7..7550f44 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5116,7 +5116,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
"Použijte jej pro odvolání tohoto klíče v případě zneužití nebo ztráty\n"
"soukromého klíče. Avšak bude-li soukromý klíč stále přístupný, bude\n"
diff --git a/po/da.po b/po/da.po
index eed0e6c..4aa7cfb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5373,7 +5373,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/de.po b/po/de.po
index 21dcc87..3af9918 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5134,14 +5134,14 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
"Benutzen Sie es, um einen Schlüssel zu widerrufen, falls der private\n"
"Schlüssel verloren wurde oder kompromittiert ist. Falls jedoch auf\n"
"den privaten Schlüssel noch zugegriffen werden kann, so ist es besser,\n"
"ein neues Widerrufszertifikat zu erzeugen, um den Grund des Widerrufs\n"
"mit angeben zu können. Weitere Informationen finden Sie im GnuPG\n"
-"Handbuch unter der Beschreibung des gpg Kommandos \"--generate-revocation-certificate\"."
+"Handbuch unter der Beschreibung des gpg Kommandos \"--generate-revocation\"."
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
diff --git a/po/el.po b/po/el.po
index e2b238a..7ac9e40 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5360,7 +5360,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/eo.po b/po/eo.po
index 0e93051..ad08839 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5328,7 +5328,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/es.po b/po/es.po
index 64e348e..772b685 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5366,7 +5366,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/et.po b/po/et.po
index 6247351..bde0be1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5302,7 +5302,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/fi.po b/po/fi.po
index 83ba0c1..9fdf162 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5350,7 +5350,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/fr.po b/po/fr.po
index d88ed36..2e76ddd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5237,7 +5237,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
"Utilisez-le pour révoquer cette clef en cas de compromis ou de\n"
"perte de la clef secrète. Cependant, si la clef secrète est\n"
diff --git a/po/gl.po b/po/gl.po
index 0995161..95cfe9e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5359,7 +5359,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/hu.po b/po/hu.po
index d437321..bcc5c30 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5324,7 +5324,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/id.po b/po/id.po
index 5b6d49c..6ad3f70 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5316,7 +5316,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/it.po b/po/it.po
index 2ffcf83..ef271eb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5344,7 +5344,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/ja.po b/po/ja.po
index 6766470..228a959 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4933,12 +4933,12 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
"秘密鍵のコンプロマイズや紛失の場合、これを使ってこの鍵を失効させます。\n"
"しかし、秘密鍵がまだアクセス可能である場合、新しい失効証明書を生成し、\n"
"失効の理由をつける方がよいでしょう。詳細は、GnuPGマニュアルのgpgコマンド \"--"
-"generate-revocation-certificate\"の記述をご覧ください。"
+"generate-revocation\"の記述をご覧ください。"
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
diff --git a/po/nb.po b/po/nb.po
index 770768c..63a153c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5008,13 +5008,13 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
"Bruk det for å oppheve denne nøkkelen hvis den blir kompromittert\n"
"eller hvis du mister den hemmelige nøkkelen. Hvis du fremdeles har\n"
"tilgang til den hemmelige nøkkelen, er det lurt å heller lage et nytt\n"
"opphevelsessertifikat og oppgi en grunn til opphevelsen.\n"
-"Se beskrivelse av kommandoen «--generate-revocation-certificate» i GnuPG-\n"
+"Se beskrivelse av kommandoen «--generate-revocation» i GnuPG-\n"
"bruksanvisninga for detaljer."
msgid ""
diff --git a/po/pl.po b/po/pl.po
index a6650af..8421f33 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5397,7 +5397,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/pt.po b/po/pt.po
index 51fdc52..fe98eaf 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5329,7 +5329,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/ro.po b/po/ro.po
index ce70c89..c7d8e3f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5344,7 +5344,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/ru.po b/po/ru.po
index 94052d0..2625e9c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5018,12 +5018,12 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
"Пользуйтесь им для отзыва этого ключа в случае раскрытия или потери\n"
"секретного ключа. Однако, если секретный ключ доступен, лучше создать\n"
"новый сертификат с указанием причины отзыва. Подробности см. в описании\n"
-"команды gpg \"--generate-revocation-certificate\" в руководстве по GnuPG."
+"команды gpg \"--generate-revocation\" в руководстве по GnuPG."
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
diff --git a/po/sk.po b/po/sk.po
index 4566b3b..ae53979 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5337,7 +5337,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/sv.po b/po/sv.po
index ccc6ee5..5c364f8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5463,7 +5463,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/tr.po b/po/tr.po
index 1ab27c9..2746f7c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5398,7 +5398,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/uk.po b/po/uk.po
index 4e8e7b5..6cf2360 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5117,14 +5117,14 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
"Скористайтеся цим для відкликання цього ключа у випадку його\n"
"компрометації або втрати закритої частини. Втім, якщо доступ до\n"
"закритого ключа не втрачено, краще створити новий сертифікат\n"
"відкликання і вказати причину відкликання. Докладніший опис\n"
"можна знайти у розділах підручника з GnuPG щодо команди\n"
-"gpg «--generate-revocation-certificate»."
+"gpg «--generate-revocation»."
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 740a7e9..a067cf3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5212,7 +5212,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0955613..6762660 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5001,7 +5001,7 @@ msgid ""
"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 GnuPG manual."
+"of the gpg command \"--generate-revocation\" in the GnuPG manual."
msgstr ""
"萬一私鑰外流或遺失時, 可以用來撤銷金鑰.\n"
"然而, 如果其實還可以存取私鑰, 建議更好的\n"
commit bc6b76ef26f31c54ae1c29c761b8ecc437fcf565
Author: Justus Winter <justus at g10code.com>
Date: Thu Dec 15 12:44:52 2016 +0100
doc: Add aliases of all changed options.
* doc/gpg.texi: Add the old version of every option that was updated
with the last change set.
* doc/gpgsm.texi: Likewise.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index c5068b9..9b230c8 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -181,6 +181,8 @@ chosen by default or can be set explicitly using the
@item --clear-sign
@opindex clear-sign
+ at itemx --clearsign
+ at opindex clearsign
Make a cleartext signature. The content in a cleartext signature is
readable without any special software. OpenPGP software is only needed
to verify the signature. cleartext signatures may modify end-of-line
@@ -303,6 +305,8 @@ exported using @option{--export-secret-subkeys}). See also
@item --list-signatures
@opindex list-signatures
+ at itemx --list-sigs
+ at opindex list-sigs
Same as @option{--list-keys}, but the signatures are listed too.
This command has the same effect as
using @option{--list-keys} with @option{--with-sig-list}.
@@ -322,6 +326,8 @@ command "tsign").
@item --check-signatures
@opindex check-signatures
+ at itemx --check-sigs
+ at opindex check-sigs
Same as @option{--list-signatures}, but the signatures are verified. Note
that for performance reasons the revocation status of a signing key is
not shown.
@@ -466,6 +472,8 @@ signatures, user-IDs and subkeys.
@item --receive-keys @code{key IDs}
@opindex receive-keys
+ at itemx --recv-keys @code{key IDs}
+ at opindex recv-keys
Import the keys with the given key IDs from a keyserver. Option
@option{--keyserver} must be used to give the name of this keyserver.
@@ -683,13 +691,17 @@ can be used for no expiration date.
@item --generate-key
@opindex generate-key
+ at itemx --gen-key
+ at opindex gen-key
Generate a new key pair using the current default parameters. This is
the standard command to create a new key. In addition to the key a
revocation certificate is created and stored in the
@file{openpgp-revocs.d} directory below the GnuPG home directory.
@item --full-generate-key
- at opindex gen-key
+ at opindex full-generate-key
+ at itemx --full-gen-key
+ at opindex full-gen-key
Generate a new key pair with dialogs for all options. This is an
extended version of @option{--generate-key}.
@@ -700,6 +712,8 @@ to use this.
@item --generate-revocation-certificate @code{name}
@opindex generate-revocation-certificate
+ at itemx --gen-revoke @code{name}
+ at opindex gen-revoke
Generate a revocation certificate for the complete key. To only revoke
a subkey or a key signature, use the @option{--edit} command.
@@ -1075,6 +1089,8 @@ sub-command @code{revuid} of @option{--edit-key}.
@item --change-passphrase @var{user_id}
@opindex change-passphrase
+ at itemx --passwd @var{user_id}
+ at opindex passwd
Change the passphrase of the secret key belonging to the certificate
specified as @var{user_id}. This is a shortcut for the sub-command
@code{passwd} of the edit key menu.
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index d7d3770..b92eaea 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -167,6 +167,8 @@ use @samp{--help} to get a list of supported operations.
@table @gnupgtabopt
@item --generate-key
@opindex generate-key
+ at itemx --gen-key
+ at opindex gen-key
This command allows the creation of a certificate signing request or a
self-signed certificate. It is commonly used along with the
@option{--output} option to save the created CSR or certificate into a
@@ -285,6 +287,8 @@ and in turn the @command{scdaemon}.
@item --change-passphrase @var{user_id}
@opindex change-passphrase
+ at itemx --passwd @var{user_id}
+ at opindex passwd
Change the passphrase of the private key belonging to the certificate
specified as @var{user_id}. Note, that changing the passphrase/PIN of a
smartcard is not yet supported.
-----------------------------------------------------------------------
Summary of changes:
doc/gpg.texi | 50 ++++++++++++++++++---------
doc/gpgsm.texi | 4 +++
g10/call-agent.c | 2 +-
g10/gpg.c | 58 ++++++++++++++++++--------------
g10/revoke.c | 2 +-
po/ca.po | 2 +-
po/cs.po | 2 +-
po/da.po | 2 +-
po/de.po | 4 +--
po/el.po | 2 +-
po/eo.po | 2 +-
po/es.po | 2 +-
po/et.po | 2 +-
po/fi.po | 2 +-
po/fr.po | 2 +-
po/gl.po | 2 +-
po/hu.po | 2 +-
po/id.po | 2 +-
po/it.po | 2 +-
po/ja.po | 4 +--
po/nb.po | 4 +--
po/pl.po | 2 +-
po/pt.po | 2 +-
po/ro.po | 2 +-
po/ru.po | 4 +--
po/sk.po | 2 +-
po/sv.po | 2 +-
po/tr.po | 2 +-
po/uk.po | 4 +--
po/zh_CN.po | 2 +-
po/zh_TW.po | 2 +-
tests/openpgp/quick-key-manipulation.scm | 8 ++---
32 files changed, 108 insertions(+), 78 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list