[git] GnuPG - branch, master, updated. gnupg-2.1.16-104-gc1c35fb
by Justus Winter
cvs at cvs.gnupg.org
Tue Dec 13 17:58:07 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 c1c35fb887061de05661f3411eda97546e1a52d7 (commit)
via ec1bd3ae685e95563e38077ab3c1655fd55dea07 (commit)
via 09163a6390bd9713f3a7946de739765b30ef6f64 (commit)
via 892c827e72b1396e3b58e2f8869cc48328a2b59c (commit)
via 9147737f1c6894f38b855f3cf38cd33122a1ae2a (commit)
via a6d6e4afe488bc05ee730e85da6a9505c6cd245a (commit)
via 04754ce3a704b1e6d38cb9a28dacf2821dc3f15f (commit)
via ca598152345b40f3a236227dfc63ae04ddf777d7 (commit)
from dd3dde07a9a46130ac01d849f8edf0566e44f11f (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 c1c35fb887061de05661f3411eda97546e1a52d7
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 13 17:49:47 2016 +0100
g10,sm: Spell out --passwd.
* g10/gpg.c (opts): Spell out option.
* sm/gpgsm.c (opts): Likewise.
* doc/gpg.texi: Update accordingly.
* 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 3b5167d..c5068b9 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1073,8 +1073,8 @@ you want to specify a different revocation reason, or to supply
supplementary revocation text, you should use the interactive
sub-command @code{revuid} of @option{--edit-key}.
- at item --passwd @var{user_id}
- at opindex passwd
+ at item --change-passphrase @var{user_id}
+ at opindex change-passphrase
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 2e53a56..d7d3770 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -283,8 +283,8 @@ Read information about the private keys from the smartcard and import
the certificates from there. This command utilizes the @command{gpg-agent}
and in turn the @command{scdaemon}.
- at item --passwd @var{user_id}
- at opindex passwd
+ at item --change-passphrase @var{user_id}
+ at opindex change-passphrase
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.
diff --git a/g10/gpg.c b/g10/gpg.c
index a586388..6003d04 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -474,7 +474,8 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aLSignKey, "lsign-key" ,N_("sign a key locally")),
ARGPARSE_c (aEditKey, "edit-key" ,N_("sign or edit a key")),
ARGPARSE_c (aEditKey, "key-edit" ,"@"),
- ARGPARSE_c (aPasswd, "passwd", N_("change a passphrase")),
+ ARGPARSE_c (aPasswd, "change-passphrase", N_("change a passphrase")),
+ ARGPARSE_c (aPasswd, "passwd", "@"),
ARGPARSE_c (aDesigRevoke, "desig-revoke","@" ),
ARGPARSE_c (aExport, "export" , N_("export keys") ),
ARGPARSE_c (aSendKeys, "send-keys" , N_("export keys to a keyserver") ),
@@ -4243,7 +4244,7 @@ main (int argc, char **argv)
case aPasswd:
if (argc != 1)
- wrong_args (_("--passwd <user-id>"));
+ wrong_args (_("--change-passphrase <user-id>"));
else
{
username = make_username (fname);
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index a2ec441..79508e6 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -231,7 +231,8 @@ static ARGPARSE_OPTS opts[] = {
N_("pass a command to the dirmngr")),
ARGPARSE_c (aCallProtectTool, "call-protect-tool",
N_("invoke gpg-protect-tool")),
- ARGPARSE_c (aPasswd, "passwd", N_("change a passphrase")),
+ ARGPARSE_c (aPasswd, "change-passphrase", N_("change a passphrase")),
+ ARGPARSE_c (aPasswd, "passwd", "@"),
ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
@@ -1995,7 +1996,7 @@ main ( int argc, char **argv)
case aPasswd:
if (argc != 1)
- wrong_args ("--passwd <key-Id>");
+ wrong_args ("--change-passphrase <key-Id>");
else
{
int rc;
commit ec1bd3ae685e95563e38077ab3c1655fd55dea07
Author: Justus Winter <justus at g10code.com>
Date: Tue Dec 13 17:43:22 2016 +0100
g10: Spell out --gen-revoke.
* g10/gpg.c (opts): Spell out option.
* doc/gpg.texi: Update accordingly.
* po: Update translations.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index ff99864..3b5167d 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -698,8 +698,8 @@ mode. See the manual section ``Unattended key generation'' on how
to use this.
- at item --gen-revoke @code{name}
- at opindex gen-revoke
+ at item --generate-revocation-certificate @code{name}
+ at opindex generate-revocation-certificate
Generate a revocation certificate for the complete key. To only revoke
a subkey or a key signature, use the @option{--edit} command.
diff --git a/g10/gpg.c b/g10/gpg.c
index 02bbdd3..a586388 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -459,7 +459,9 @@ 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, "gen-revoke",N_("generate a revocation certificate")),
+ ARGPARSE_c (aGenRevoke, "generate-revocation-certificate",
+ N_("generate a revocation certificate")),
+ ARGPARSE_c (aGenRevoke, "gen-revoke", "@"),
ARGPARSE_c (aDeleteKeys,"delete-keys",
N_("remove keys from the public keyring")),
ARGPARSE_c (aDeleteSecretKeys, "delete-secret-keys",
@@ -4544,7 +4546,7 @@ main (int argc, char **argv)
case aGenRevoke:
if( argc != 1 )
- wrong_args("--gen-revoke user-id");
+ wrong_args("--generate-revocation-certificate user-id");
username = make_username(*argv);
gen_revoke( username );
xfree( username );
diff --git a/g10/revoke.c b/g10/revoke.c
index 68fc44a..17c9b8c 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -571,7 +571,8 @@ 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 \"--gen-revoke\" in the GnuPG manual."),
+ "of the gpg command \"--generate-revocation-certificate\" 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"
"before importing and publishing this revocation certificate."));
diff --git a/po/ca.po b/po/ca.po
index d841639..b4cd9c7 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/cs.po b/po/cs.po
index 8e5f60e..f2cb0d7 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" 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 94f0719..eed0e6c 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/de.po b/po/de.po
index d5fbb7b..21dcc87 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" 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 \"--gen-revoke\"."
+"Handbuch unter der Beschreibung des gpg Kommandos \"--generate-revocation-certificate\"."
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 02e871e..e2b238a 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/eo.po b/po/eo.po
index 3839b48..0e93051 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/es.po b/po/es.po
index a4695cd..64e348e 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/et.po b/po/et.po
index 7ed6f68..6247351 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/fi.po b/po/fi.po
index f529d23..83ba0c1 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/fr.po b/po/fr.po
index b06d2d0..d88ed36 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" 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 31e02da..0995161 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/hu.po b/po/hu.po
index 8955315..d437321 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/id.po b/po/id.po
index 2b1f67c..5b6d49c 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/it.po b/po/it.po
index 8e4b3ff..2ffcf83 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/ja.po b/po/ja.po
index ba2dd0d..6766470 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
"秘密鍵のコンプロマイズや紛失の場合、これを使ってこの鍵を失効させます。\n"
"しかし、秘密鍵がまだアクセス可能である場合、新しい失効証明書を生成し、\n"
"失効の理由をつける方がよいでしょう。詳細は、GnuPGマニュアルのgpgコマンド \"--"
-"gen-revoke\"の記述をご覧ください。"
+"generate-revocation-certificate\"の記述をご覧ください。"
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 6706183..770768c 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" 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 «--gen-revoke» i GnuPG-\n"
+"Se beskrivelse av kommandoen «--generate-revocation-certificate» i GnuPG-\n"
"bruksanvisninga for detaljer."
msgid ""
diff --git a/po/pl.po b/po/pl.po
index 3ff745a..a6650af 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/pt.po b/po/pt.po
index a44b082..51fdc52 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/ro.po b/po/ro.po
index 422e1e4..ce70c89 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/ru.po b/po/ru.po
index 43cd056..94052d0 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
"Пользуйтесь им для отзыва этого ключа в случае раскрытия или потери\n"
"секретного ключа. Однако, если секретный ключ доступен, лучше создать\n"
"новый сертификат с указанием причины отзыва. Подробности см. в описании\n"
-"команды gpg \"--gen-revoke\" в руководстве по GnuPG."
+"команды gpg \"--generate-revocation-certificate\" в руководстве по 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 c5611a6..4566b3b 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/sv.po b/po/sv.po
index 1cc318e..ccc6ee5 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/tr.po b/po/tr.po
index 5420cbf..1ab27c9 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/uk.po b/po/uk.po
index 3c207e5..4e8e7b5 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
"Скористайтеся цим для відкликання цього ключа у випадку його\n"
"компрометації або втрати закритої частини. Втім, якщо доступ до\n"
"закритого ключа не втрачено, краще створити новий сертифікат\n"
"відкликання і вказати причину відкликання. Докладніший опис\n"
"можна знайти у розділах підручника з GnuPG щодо команди\n"
-"gpg «--gen-revoke»."
+"gpg «--generate-revocation-certificate»."
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 23b1474..740a7e9 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
msgid ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e3e8a3c..0955613 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 \"--gen-revoke\" in the GnuPG manual."
+"of the gpg command \"--generate-revocation-certificate\" in the GnuPG manual."
msgstr ""
"萬一私鑰外流或遺失時, 可以用來撤銷金鑰.\n"
"然而, 如果其實還可以存取私鑰, 建議更好的\n"
commit 09163a6390bd9713f3a7946de739765b30ef6f64
Author: Justus Winter <justus at g10code.com>
Date: Fri Dec 9 15:10:39 2016 +0100
g10: Spell out --full-gen-key.
* g10/gpg.c (opts): Spell out option.
(main): Likewise.
* g10/keygen.c (generate_keypair): Likewise.
* doc/gpg.texi: Update accordingly.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 3f73754..ff99864 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -688,7 +688,7 @@ 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.
- at item --full-gen-key
+ at item --full-generate-key
@opindex gen-key
Generate a new key pair with dialogs for all options. This is an
extended version of @option{--generate-key}.
diff --git a/g10/gpg.c b/g10/gpg.c
index 96a8ab9..02bbdd3 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -456,8 +456,9 @@ static ARGPARSE_OPTS opts[] = {
N_("quickly revoke a user-id")),
ARGPARSE_c (aQuickSetExpire, "quick-set-expire",
N_("quickly set a new expiration date")),
- ARGPARSE_c (aFullKeygen, "full-gen-key" ,
+ ARGPARSE_c (aFullKeygen, "full-generate-key" ,
N_("full featured key pair generation")),
+ ARGPARSE_c (aFullKeygen, "full-gen-key", "@"),
ARGPARSE_c (aGenRevoke, "gen-revoke",N_("generate a revocation certificate")),
ARGPARSE_c (aDeleteKeys,"delete-keys",
N_("remove keys from the public keyring")),
@@ -4342,13 +4343,13 @@ main (int argc, char **argv)
if (opt.batch)
{
if (argc > 1)
- wrong_args ("--full-gen-key [parameterfile]");
+ wrong_args ("--full-generate-key [parameterfile]");
generate_keypair (ctrl, 1, argc? *argv : NULL, NULL, 0);
}
else
{
if (argc)
- wrong_args("--full-gen-key");
+ wrong_args("--full-generate-key");
generate_keypair (ctrl, 1, NULL, NULL, 0);
}
break;
diff --git a/g10/keygen.c b/g10/keygen.c
index 9fa4a07..b4fddba 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4319,7 +4319,7 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
#else
GPG_NAME
#endif
- , "--full-gen-key" );
+ , "--full-generate-key" );
err = parse_key_parameter_string (NULL, -1,
&algo, &size, &keyuse, &curve,
commit 892c827e72b1396e3b58e2f8869cc48328a2b59c
Author: Justus Winter <justus at g10code.com>
Date: Mon Nov 14 16:59:23 2016 +0100
g10,sm: Spell out --gen-key.
* g10/gpg.c (opts): Spell out option.
* sm/gpgsm.c (opts): Likewise.
* doc/gpg.texi: Update accordingly.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/debugging.texi b/doc/debugging.texi
index 7fde49a..42a1a15 100644
--- a/doc/debugging.texi
+++ b/doc/debugging.texi
@@ -235,7 +235,8 @@ gpg: fatal: WriteConsole failed: Access denied
@noindent
The solution is to use the command @command{wineconsole}.
-Some operations like gen-key really want to talk to the console directly
+Some operations like @option{--generate-key} really want to talk to
+the console directly
for increased security (for example to prevent the passphrase from
appearing on the screen). So, you should use @command{wineconsole}
instead of @command{wine}, which will launch a windows console that
diff --git a/doc/faq.org b/doc/faq.org
index 22d07f0..8fc3775 100644
--- a/doc/faq.org
+++ b/doc/faq.org
@@ -1243,7 +1243,7 @@ update this FAQ in the next month. See the section "Changes" for recent updates
To generate a secret/public keypair, run:
- : $ gpg --gen-key
+ : $ gpg --generate-key
and choose the default values.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 015b930..3f73754 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -611,7 +611,7 @@ This section explains the main commands for key management.
@item --quick-gen-key @code{user-id} [@code{algo} [@code{usage} [@code{expire}]]]
@opindex quick-gen-key
This is a simple command to generate a standard key with one user id.
-In contrast to @option{--gen-key} the key is generated directly
+In contrast to @option{--generate-key} the key is generated directly
without the need to answer a bunch of prompts. Unless the option
@option{--yes} is given, the key creation will be canceled if the
given user id already exists in the keyring.
@@ -681,8 +681,8 @@ for the subkey. Several formats are supported; commonly the ISO
YYYY-MM-DD format is used. The values ``never'', ``none'', or ``-''
can be used for no expiration date.
- at item --gen-key
- at opindex gen-key
+ at item --generate-key
+ at opindex generate-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
@@ -691,7 +691,7 @@ revocation certificate is created and stored in the
@item --full-gen-key
@opindex gen-key
Generate a new key pair with dialogs for all options. This is an
-extended version of @option{--gen-key}.
+extended version of @option{--generate-key}.
There is also a feature which allows you to create keys in batch
mode. See the manual section ``Unattended key generation'' on how
@@ -1342,7 +1342,7 @@ the opposite meaning. The options are:
@itemx --disable-large-rsa
@opindex enable-large-rsa
@opindex disable-large-rsa
-With --gen-key and --batch, enable the creation of RSA secret keys as
+With --generate-key and --batch, enable the creation of RSA secret keys as
large as 8192 bit. Note: 8192 bit is more than is generally
recommended. These large keys don't significantly improve security,
but they are more expensive to use, and their signatures and
@@ -3729,7 +3729,7 @@ are almost always required for this.
@node Unattended GPG key generation
@subsection Unattended key generation
-The command @option{--gen-key} may be used along with the option
+The command @option{--generate-key} may be used along with the option
@option{--batch} for unattended key generation. The parameters are
either read from stdin or given as a file on the command line.
The format of the parameter file is as follows:
@@ -3921,7 +3921,7 @@ $ cat >foo <<EOF
%commit
%echo done
EOF
-$ @gpgname --batch --gen-key foo
+$ @gpgname --batch --generate-key foo
[...]
$ @gpgname --no-default-keyring --secret-keyring ./foo.sec \
--keyring ./foo.pub --list-secret-keys
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index e3e852c..2e53a56 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -165,8 +165,8 @@ use @samp{--help} to get a list of supported operations.
@subsection How to manage the certificates and keys
@table @gnupgtabopt
- at item --gen-key
- at opindex gen-key
+ at item --generate-key
+ at opindex generate-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
@@ -1005,7 +1005,7 @@ this is a missing certificate.
@node CSR and certificate creation
@subsection CSR and certificate creation
-The command @option{--gen-key} may be used along with the option
+The command @option{--generate-key} may be used along with the option
@option{--batch} to either create a certificate signing request (CSR)
or an X.509 certificate. This is controlled by a parameter file; the
format of this file is as follows:
diff --git a/doc/howto-create-a-server-cert.texi b/doc/howto-create-a-server-cert.texi
index ea0ce71..55f1a91 100644
--- a/doc/howto-create-a-server-cert.texi
+++ b/doc/howto-create-a-server-cert.texi
@@ -12,7 +12,7 @@ is no need for a configuration file, you may simply enter:
@cartouche
@example
- $ gpgsm --gen-key >example.com.cert-req.pem
+ $ gpgsm --generate-key >example.com.cert-req.pem
Please select what kind of key you want:
(1) RSA
(2) Existing key
diff --git a/g10/gpg.c b/g10/gpg.c
index dd959c9..96a8ab9 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -444,8 +444,9 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aCheckKeys, "check-sigs", "@"),
ARGPARSE_c (oFingerprint, "fingerprint", N_("list keys and fingerprints")),
ARGPARSE_c (aListSecretKeys, "list-secret-keys", N_("list secret keys")),
- ARGPARSE_c (aKeygen, "gen-key",
+ ARGPARSE_c (aKeygen, "generate-key",
N_("generate a new key pair")),
+ ARGPARSE_c (aKeygen, "gen-key", "@"),
ARGPARSE_c (aQuickKeygen, "quick-gen-key" ,
N_("quickly generate a new key pair")),
ARGPARSE_c (aQuickAddUid, "quick-adduid",
@@ -4318,20 +4319,20 @@ main (int argc, char **argv)
case aKeygen: /* generate a key */
if( opt.batch ) {
if( argc > 1 )
- wrong_args("--gen-key [parameterfile]");
+ wrong_args("--generate-key [parameterfile]");
generate_keypair (ctrl, 0, argc? *argv : NULL, NULL, 0);
}
else {
if (opt.command_fd != -1 && argc)
{
if( argc > 1 )
- wrong_args("--gen-key [parameterfile]");
+ wrong_args("--generate-key [parameterfile]");
opt.batch = 1;
generate_keypair (ctrl, 0, argc? *argv : NULL, NULL, 0);
}
else if (argc)
- wrong_args ("--gen-key");
+ wrong_args ("--generate-key");
else
generate_keypair (ctrl, 0, NULL, NULL, 0);
}
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 9582996..a2ec441 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -210,7 +210,8 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aListSecretKeys, "list-secret-keys", N_("list secret keys")),
ARGPARSE_c (aListChain, "list-chain", N_("list certificate chain")),
ARGPARSE_c (aFingerprint, "fingerprint", N_("list keys and fingerprints")),
- ARGPARSE_c (aKeygen, "gen-key", N_("generate a new key pair")),
+ ARGPARSE_c (aKeygen, "generate-key", N_("generate a new key pair")),
+ ARGPARSE_c (aKeygen, "gen-key", "@"),
ARGPARSE_c (aDeleteKey, "delete-keys",
N_("remove keys from the public keyring")),
/*ARGPARSE_c (aSendKeys, "send-keys", N_("export keys to a keyserver")),*/
@@ -1904,7 +1905,7 @@ main ( int argc, char **argv)
else if (argc == 1) /* From file. */
fpin = open_es_fread (*argv, "r");
else
- wrong_args ("--gen-key --batch [parmfile]");
+ wrong_args ("--generate-key --batch [parmfile]");
}
fpout = open_es_fwrite (opt.outfile?opt.outfile:"-");
diff --git a/tests/openpgp/genkey1024.scm b/tests/openpgp/genkey1024.scm
index e5008c3..60eba0b 100755
--- a/tests/openpgp/genkey1024.scm
+++ b/tests/openpgp/genkey1024.scm
@@ -23,7 +23,7 @@
(define (genkey config)
(pipe:do
(pipe:echo config)
- (pipe:spawn `(,(tool 'gpg) --quiet --batch --gen-key))))
+ (pipe:spawn `(,(tool 'gpg) --quiet --batch --generate-key))))
(info "Checking batch key generation")
(genkey "Key-Type: DSA
commit 9147737f1c6894f38b855f3cf38cd33122a1ae2a
Author: Justus Winter <justus at g10code.com>
Date: Mon Oct 10 15:20:14 2016 +0200
g10,sm: Spell out --check-sigs.
* g10/gpg.c (opts): Spell out option.
* sm/gpgsm.c (opts): Likewise.
* doc/gpg.texi: Update accordingly.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 5b4584d..015b930 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -320,8 +320,8 @@ notation (see @option{--cert-notation}), "X" for an eXpired signature
above to indicate trust signature levels (see the @option{--edit-key}
command "tsign").
- at item --check-sigs
- at opindex check-sigs
+ at item --check-signatures
+ at opindex check-signatures
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.
@@ -348,7 +348,7 @@ be used to locate a key. Only public keys are listed.
List all keys (or the specified ones) along with their
fingerprints. This is the same output as @option{--list-keys} but with
the additional output of a line with the fingerprint. May also be
-combined with @option{--list-signatures} or @option{--check-sigs}. If this
+combined with @option{--list-signatures} or @option{--check-signatures}. If this
command is given twice, the fingerprints of all secondary keys are
listed too. This command also forces pretty printing of fingerprints
if the keyid format has been set to "none".
@@ -1227,7 +1227,7 @@ give the opposite meaning. The options are:
@item show-policy-urls
@opindex list-options:show-policy-urls
- Show policy URLs in the @option{--list-signatures} or @option{--check-sigs}
+ Show policy URLs in the @option{--list-signatures} or @option{--check-signatures}
listings. Defaults to no.
@item show-notations
@@ -1237,12 +1237,12 @@ give the opposite meaning. The options are:
@opindex list-options:show-std-notations
@opindex list-options:show-user-notations
Show all, IETF standard, or user-defined signature notations in the
- @option{--list-signatures} or @option{--check-sigs} listings. Defaults to no.
+ @option{--list-signatures} or @option{--check-signatures} listings. Defaults to no.
@item show-keyserver-urls
@opindex list-options:show-keyserver-urls
Show any preferred keyserver URL in the @option{--list-signatures} or
- @option{--check-sigs} listings. Defaults to no.
+ @option{--check-signatures} listings. Defaults to no.
@item show-uid-validity
@opindex list-options:show-uid-validity
@@ -1265,7 +1265,7 @@ give the opposite meaning. The options are:
@item show-sig-expire
@opindex list-options:show-sig-expire
Show signature expiration dates (if any) during @option{--list-signatures} or
- @option{--check-sigs} listings. Defaults to no.
+ @option{--check-signatures} listings. Defaults to no.
@item show-sig-subpackets
@opindex list-options:show-sig-subpackets
@@ -1273,7 +1273,7 @@ give the opposite meaning. The options are:
optional argument list of the subpackets to list. If no argument is
passed, list all subpackets. Defaults to no. This option is only
meaningful when using @option{--with-colons} along with
- @option{--list-signatures} or @option{--check-sigs}.
+ @option{--list-signatures} or @option{--check-signatures}.
@end table
@@ -3293,7 +3293,7 @@ Identical to @option{--trust-model always}. This option is deprecated.
@item --show-notation
@itemx --no-show-notation
@opindex show-notation
-Show signature notations in the @option{--list-signatures} or @option{--check-sigs} listings
+Show signature notations in the @option{--list-signatures} or @option{--check-signatures} listings
as well as when verifying a signature with a notation in it. These
options are deprecated. Use @option{--list-options [no-]show-notation}
and/or @option{--verify-options [no-]show-notation} instead.
@@ -3301,7 +3301,7 @@ and/or @option{--verify-options [no-]show-notation} instead.
@item --show-policy-url
@itemx --no-show-policy-url
@opindex show-policy-url
-Show policy URLs in the @option{--list-signatures} or @option{--check-sigs}
+Show policy URLs in the @option{--list-signatures} or @option{--check-signatures}
listings as well as when verifying a signature with a policy URL in
it. These options are deprecated. Use @option{--list-options
[no-]show-policy-url} and/or @option{--verify-options
diff --git a/g10/gpg.c b/g10/gpg.c
index 5361d6c..dd959c9 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -439,7 +439,9 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aListKeys, "list-public-keys", "@" ),
ARGPARSE_c (aListSigs, "list-signatures", N_("list keys and signatures")),
ARGPARSE_c (aListSigs, "list-sigs", "@"),
- ARGPARSE_c (aCheckKeys, "check-sigs",N_("list and check key signatures")),
+ ARGPARSE_c (aCheckKeys, "check-signatures",
+ N_("list and check key signatures")),
+ ARGPARSE_c (aCheckKeys, "check-sigs", "@"),
ARGPARSE_c (oFingerprint, "fingerprint", N_("list keys and fingerprints")),
ARGPARSE_c (aListSecretKeys, "list-secret-keys", N_("list secret keys")),
ARGPARSE_c (aKeygen, "gen-key",
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index a25edce..9582996 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -406,7 +406,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aListKeys, "list-key", "@"),
ARGPARSE_c (aListChain, "list-signatures", "@"),
ARGPARSE_c (aListChain, "list-sigs", "@"),
- ARGPARSE_c (aListChain, "check-sig", "@"),
+ ARGPARSE_c (aListChain, "check-signatures", "@"),
ARGPARSE_c (aListChain, "check-sigs", "@"),
ARGPARSE_c (aDeleteKey, "delete-key", "@"),
commit a6d6e4afe488bc05ee730e85da6a9505c6cd245a
Author: Justus Winter <justus at g10code.com>
Date: Mon Oct 10 14:55:27 2016 +0200
g10,sm: Spell out --list-sigs.
* g10/gpg.c (opts): Spell out option.
* sm/gpgsm.c (opts): Likewise.
* doc/gpg.texi: Update accordingly.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index b079eda..5b4584d 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -301,8 +301,8 @@ means that the secret key is not usable (for example, if it was
exported using @option{--export-secret-subkeys}). See also
@option{--list-keys}.
- at item --list-sigs
- at opindex list-sigs
+ at item --list-signatures
+ at opindex list-signatures
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,7 +322,7 @@ command "tsign").
@item --check-sigs
@opindex check-sigs
-Same as @option{--list-sigs}, but the signatures are verified. Note
+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.
This command has the same effect as
@@ -330,7 +330,7 @@ using @option{--list-keys} with @option{--with-sig-check}.
The status of the verification is indicated by a flag directly following
the "sig" tag (and thus before the flags described above for
- at option{--list-sigs}). A "!" indicates that the signature has been
+ at option{--list-signatures}). A "!" indicates that the signature has been
successfully verified, a "-" denotes a bad signature and a "%" is used
if an error occurred while checking the signature (e.g. a non supported
algorithm).
@@ -348,7 +348,7 @@ be used to locate a key. Only public keys are listed.
List all keys (or the specified ones) along with their
fingerprints. This is the same output as @option{--list-keys} but with
the additional output of a line with the fingerprint. May also be
-combined with @option{--list-sigs} or @option{--check-sigs}. If this
+combined with @option{--list-signatures} or @option{--check-sigs}. If this
command is given twice, the fingerprints of all secondary keys are
listed too. This command also forces pretty printing of fingerprints
if the keyid format has been set to "none".
@@ -1202,7 +1202,7 @@ Assume "no" on most questions.
@opindex list-options
This is a space or comma delimited string that gives options used when
listing keys and signatures (that is, @option{--list-keys},
- at option{--list-sigs}, @option{--list-public-keys},
+ at option{--list-signatures}, @option{--list-public-keys},
@option{--list-secret-keys}, and the @option{--edit-key} functions).
Options can be prepended with a @option{no-} (after the two dashes) to
give the opposite meaning. The options are:
@@ -1211,7 +1211,7 @@ give the opposite meaning. The options are:
@item show-photos
@opindex list-options:show-photos
- Causes @option{--list-keys}, @option{--list-sigs},
+ Causes @option{--list-keys}, @option{--list-signatures},
@option{--list-public-keys}, and @option{--list-secret-keys} to
display any photo IDs attached to the key. Defaults to no. See also
@option{--photo-viewer}. Does not work with @option{--with-colons}:
@@ -1227,7 +1227,7 @@ give the opposite meaning. The options are:
@item show-policy-urls
@opindex list-options:show-policy-urls
- Show policy URLs in the @option{--list-sigs} or @option{--check-sigs}
+ Show policy URLs in the @option{--list-signatures} or @option{--check-sigs}
listings. Defaults to no.
@item show-notations
@@ -1237,11 +1237,11 @@ give the opposite meaning. The options are:
@opindex list-options:show-std-notations
@opindex list-options:show-user-notations
Show all, IETF standard, or user-defined signature notations in the
- @option{--list-sigs} or @option{--check-sigs} listings. Defaults to no.
+ @option{--list-signatures} or @option{--check-sigs} listings. Defaults to no.
@item show-keyserver-urls
@opindex list-options:show-keyserver-urls
- Show any preferred keyserver URL in the @option{--list-sigs} or
+ Show any preferred keyserver URL in the @option{--list-signatures} or
@option{--check-sigs} listings. Defaults to no.
@item show-uid-validity
@@ -1264,7 +1264,7 @@ give the opposite meaning. The options are:
@item show-sig-expire
@opindex list-options:show-sig-expire
- Show signature expiration dates (if any) during @option{--list-sigs} or
+ Show signature expiration dates (if any) during @option{--list-signatures} or
@option{--check-sigs} listings. Defaults to no.
@item show-sig-subpackets
@@ -1273,7 +1273,7 @@ give the opposite meaning. The options are:
optional argument list of the subpackets to list. If no argument is
passed, list all subpackets. Defaults to no. This option is only
meaningful when using @option{--with-colons} along with
- @option{--list-sigs} or @option{--check-sigs}.
+ @option{--list-signatures} or @option{--check-sigs}.
@end table
@@ -3273,7 +3273,7 @@ on the configuration file.
@item --show-photos
@itemx --no-show-photos
@opindex show-photos
-Causes @option{--list-keys}, @option{--list-sigs},
+Causes @option{--list-keys}, @option{--list-signatures},
@option{--list-public-keys}, @option{--list-secret-keys}, and verifying
a signature to also display the photo ID attached to the key, if
any. See also @option{--photo-viewer}. These options are deprecated. Use
@@ -3293,7 +3293,7 @@ Identical to @option{--trust-model always}. This option is deprecated.
@item --show-notation
@itemx --no-show-notation
@opindex show-notation
-Show signature notations in the @option{--list-sigs} or @option{--check-sigs} listings
+Show signature notations in the @option{--list-signatures} or @option{--check-sigs} listings
as well as when verifying a signature with a notation in it. These
options are deprecated. Use @option{--list-options [no-]show-notation}
and/or @option{--verify-options [no-]show-notation} instead.
@@ -3301,7 +3301,7 @@ and/or @option{--verify-options [no-]show-notation} instead.
@item --show-policy-url
@itemx --no-show-policy-url
@opindex show-policy-url
-Show policy URLs in the @option{--list-sigs} or @option{--check-sigs}
+Show policy URLs in the @option{--list-signatures} or @option{--check-sigs}
listings as well as when verifying a signature with a policy URL in
it. These options are deprecated. Use @option{--list-options
[no-]show-policy-url} and/or @option{--verify-options
diff --git a/g10/gpg.c b/g10/gpg.c
index 6ee755f..5361d6c 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -437,7 +437,8 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aVerifyFiles, "verify-files" , "@" ),
ARGPARSE_c (aListKeys, "list-keys", N_("list keys")),
ARGPARSE_c (aListKeys, "list-public-keys", "@" ),
- ARGPARSE_c (aListSigs, "list-sigs", N_("list keys and signatures")),
+ ARGPARSE_c (aListSigs, "list-signatures", N_("list keys and signatures")),
+ ARGPARSE_c (aListSigs, "list-sigs", "@"),
ARGPARSE_c (aCheckKeys, "check-sigs",N_("list and check key signatures")),
ARGPARSE_c (oFingerprint, "fingerprint", N_("list keys and fingerprints")),
ARGPARSE_c (aListSecretKeys, "list-secret-keys", N_("list secret keys")),
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 08d4830..a25edce 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -404,7 +404,7 @@ static ARGPARSE_OPTS opts[] = {
/* Command aliases. */
ARGPARSE_c (aListKeys, "list-key", "@"),
- ARGPARSE_c (aListChain, "list-sig", "@"),
+ ARGPARSE_c (aListChain, "list-signatures", "@"),
ARGPARSE_c (aListChain, "list-sigs", "@"),
ARGPARSE_c (aListChain, "check-sig", "@"),
ARGPARSE_c (aListChain, "check-sigs", "@"),
commit 04754ce3a704b1e6d38cb9a28dacf2821dc3f15f
Author: Justus Winter <justus at g10code.com>
Date: Fri Sep 23 14:10:07 2016 +0200
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 <justus at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9ea3b80..b079eda 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -179,8 +179,8 @@ decrypted using a secret key or a passphrase). The signing key is
chosen by default or can be set explicitly using the
@option{--local-user} and @option{--default-key} options.
- at item --clearsign
- at opindex clearsign
+ at item --clear-sign
+ at opindex clear-sign
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
@@ -2521,7 +2521,7 @@ to safely override the algorithm chosen by the recipient key
preferences, as GPG will only select an algorithm that is usable by
all recipients. The most highly ranked digest algorithm in this list
is also used when signing without encryption
-(e.g. @option{--clearsign} or @option{--sign}).
+(e.g. @option{--clear-sign} or @option{--sign}).
@item --personal-compress-preferences @code{string}
@opindex personal-compress-preferences
@@ -3464,7 +3464,7 @@ Operation is further controlled by a few environment variables:
@item gpg -se -r @code{Bob} @code{file}
sign and encrypt for user Bob
- at item gpg --clearsign @code{file}
+ at item gpg --clear-sign @code{file}
make a cleartext signature
@item gpg -sb @code{file}
diff --git a/g10/gpg.c b/g10/gpg.c
index 7de62fd..6ee755f 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;
diff --git a/po/ca.po b/po/ca.po
index 9df52ad..d841639 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2116,7 +2116,7 @@ msgid ""
"Examples:\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"
@@ -2125,7 +2125,7 @@ msgstr ""
"Exemples:\n"
"\n"
" -se -r Bob [fitxer] signa i xifra per a l'usuari Bob\n"
-" --clearsign [fitxer] crea una signatura en text clar\n"
+" --clear-sign [fitxer] crea una signatura en text clar\n"
" --detach-sign [fitxer] crea una signatura separada\n"
" --list-keys [noms] mostra claus\n"
" --fingerprint [noms] mostra empremtes digitals\n"
@@ -2561,8 +2561,8 @@ msgstr "no podeu usar %s mentre esteu en mode %s\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom_del_fitxer]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [nom_del_fitxer]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [nom_del_fitxer]"
msgid "--decrypt [filename]"
msgstr "--decrypt [nom_del_fitxer]"
diff --git a/po/cs.po b/po/cs.po
index 56e61d9..8e5f60e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1950,14 +1950,14 @@ msgid ""
"Examples:\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"
msgstr ""
"@\n"
" -se -r Bob [soubor] podepsat a zašifrovat pro uživatele Bob\n"
-" --clearsign [soubor] vytvořit podpis čitelného dokumentu\n"
+" --clear-sign [soubor] vytvořit podpis čitelného dokumentu\n"
" --detach-sign [soubor] vytvořit podpis oddělený od dokumentu\n"
" --list-keys [jména] vypsat klíče\n"
" --fingerprint [jména] vypsat otisky\n"
@@ -2377,8 +2377,8 @@ msgstr "nelze použít --symmetric --sign --encrypt v módu %s\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [jméno souboru]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [jméno souboru]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [jméno souboru]"
msgid "--decrypt [filename]"
msgstr "--decrypt [jméno souboru]"
diff --git a/po/da.po b/po/da.po
index 018bab0..94f0719 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2063,7 +2063,7 @@ msgid ""
"Examples:\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"
@@ -2072,7 +2072,7 @@ msgstr ""
"Eksempler:\n"
"\n"
" -se -r Mikael [fil] underskriv og krypter for bruger Mikael\n"
-" --clearsign [fil] lav en ren tekstunderskrift\n"
+" --clear-sign [fil] lav en ren tekstunderskrift\n"
" --detach-sign [fil] lav en separat underskrift\n"
" --list-keys [navne] vis nøgler\n"
" --fingerprint [navne] vis fingeraftryk\n"
@@ -2513,8 +2513,8 @@ msgstr "du kan ikke bruge --symmetric --sign --encrypt i tilstanden %s\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [filnavn]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [filnavn]"
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
diff --git a/po/de.po b/po/de.po
index aad4cd1..d5fbb7b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1934,7 +1934,7 @@ msgid ""
"Examples:\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"
@@ -1943,7 +1943,7 @@ msgstr ""
"Beispiele:\n"
"\n"
" -se -r Bob [Datei] Signieren und verschlüsseln für Benutzer Bob\n"
-" --clearsign [Datei] Eine Klartextsignatur erzeugen\n"
+" --clear-sign [Datei] Eine Klartextsignatur erzeugen\n"
" --detach-sign [Datei] Eine abgetrennte Signatur erzeugen\n"
" --list-keys [Namen] Schlüssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n"
@@ -2358,8 +2358,8 @@ msgstr ""
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [Dateiname]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [Dateiname]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [Dateiname]"
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
diff --git a/po/el.po b/po/el.po
index 705cc78..02e871e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2043,7 +2043,7 @@ msgid ""
"Examples:\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"
@@ -2052,7 +2052,7 @@ msgstr ""
"Παραδείγματα:\n"
"\n"
" -se -r Bob [αρχείο] υπογραφή και κρυπτογράφηση για το Bob\n"
-" --clearsign [αρχείο] δημιουργία μη κρυπτογραφημένης υπογραφής\n"
+" --clear-sign [αρχείο] δημιουργία μη κρυπτογραφημένης υπογραφής\n"
" --detach-sign [αρχείο] δημιουργία αποκομμένης υπογραφής\n"
" --list-keys [ονόματα] απεικόνιση κλειδιών\n"
" --fingerprint [ονόματα] απεικόνιση αποτυπωμάτων (fingerprints)\n"
@@ -2483,8 +2483,8 @@ msgstr "απαγορεύετε η χρήση του %s στην κατάστασ
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [όνομα αρχείου]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [όνομα αρχείου]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [όνομα αρχείου]"
msgid "--decrypt [filename]"
msgstr "--decrypt [όνομα αρχείου]"
diff --git a/po/eo.po b/po/eo.po
index 20b047a..3839b48 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2029,7 +2029,7 @@ msgid ""
"Examples:\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"
@@ -2038,7 +2038,7 @@ msgstr ""
"Ekzemploj:\n"
"\n"
" -se -r Bob [dosiero] subskribi kaj ĉifri por uzanto Bob\n"
-" --clearsign [dosiero] fari klartekstan subskribon\n"
+" --clear-sign [dosiero] fari klartekstan subskribon\n"
" --detach-sign [dosiero] fari apartan subskribon\n"
" --list-keys [nomoj] montri ŝlosilojn\n"
" --fingerprint [nomoj] montri fingroŝpurojn\n"
@@ -2469,8 +2469,8 @@ msgstr "Tiu komando ne eblas en la reĝimo %s.\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [dosiero]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [dosiero]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [dosiero]"
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
diff --git a/po/es.po b/po/es.po
index 510dedf..a4695cd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2086,7 +2086,7 @@ msgid ""
"Examples:\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"
@@ -2095,7 +2095,7 @@ msgstr ""
"Ejemplos:\n"
"\n"
" -se -r Bob [fichero] firma y cifra para el usuario Bob\n"
-" --clearsign [fichero] hace una firma manteniendo el texto sin cifrar\n"
+" --clear-sign [fichero] hace una firma manteniendo el texto sin cifrar\n"
" --detach-sign [fichero] hace una firma separada\n"
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
@@ -2538,8 +2538,8 @@ msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nombre_fichero]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [nombre_fichero]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [nombre_fichero]"
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
diff --git a/po/et.po b/po/et.po
index 8a8e8c2..7ed6f68 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2036,7 +2036,7 @@ msgid ""
"Examples:\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"
@@ -2045,7 +2045,7 @@ msgstr ""
"Näited:\n"
"\n"
" -se -r Bob [fail] allkirjasta ja krüpti kasutajale Bob\n"
-" --clearsign [fail] loo avateksti allkiri\n"
+" --clear-sign [fail] loo avateksti allkiri\n"
" --detach-sign [fail] loo eraldiseisev allkiri\n"
" --list-keys [nimed] näita võtmeid\n"
" --fingerprint [nimed] näita sõrmejälgi\n"
@@ -2468,8 +2468,8 @@ msgstr "%s ei ole moodis %s lubatud.\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [failinimi]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [failinimi]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [failinimi]"
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
diff --git a/po/fi.po b/po/fi.po
index d2eefc1..f529d23 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2052,7 +2052,7 @@ msgid ""
"Examples:\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"
@@ -2060,7 +2060,7 @@ msgstr ""
"@\n"
"Esim:\n"
" -se -r Pekka [tiedosto] allekirjoita ja salaa Pekalle\n"
-" --clearsign [tiedosto] tee tekstimuotoinen allekirjoitus\n"
+" --clear-sign [tiedosto] tee tekstimuotoinen allekirjoitus\n"
" --detach-sign [tiedosto] tee erillinen allekirjoitus\n"
" --list-keys [nimet] näytä avaimet\n"
" --fingerprint [nimet] näytä sormenjäljet\n"
@@ -2484,8 +2484,8 @@ msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [tiedostonimi]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [tiedostonimi]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [tiedostonimi]"
msgid "--decrypt [filename]"
msgstr "--decrypt [tiedostonimi]"
diff --git a/po/fr.po b/po/fr.po
index 4cb138f..b06d2d0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1976,7 +1976,7 @@ msgid ""
"Examples:\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"
@@ -1985,7 +1985,7 @@ msgstr ""
"Exemples :\n"
"\n"
" -se -r Alice [fichier] signer et chiffrer pour l'utilisateur Alice\n"
-" --clearsign [fichier] faire une signature en texte clair\n"
+" --clear-sign [fichier] faire une signature en texte clair\n"
" --detach-sign [fichier] faire une signature détachée\n"
" --list-keys [noms] montrer les clefs\n"
" --fingerprint [noms] montrer les empreintes\n"
@@ -2415,8 +2415,8 @@ msgstr "impossible d'utiliser --symmetric --sign --encrypt en mode %s\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [fichier]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [fichier]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [fichier]"
msgid "--decrypt [filename]"
msgstr "--decrypt [fichier]"
diff --git a/po/gl.po b/po/gl.po
index 0b5d876..31e02da 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2044,7 +2044,7 @@ msgid ""
"Examples:\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"
@@ -2478,8 +2478,8 @@ msgstr "non se pode empregar %s no modo %s\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ficheiro]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [ficheiro]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [ficheiro]"
msgid "--decrypt [filename]"
msgstr "--decrypt [ficheiro]"
diff --git a/po/hu.po b/po/hu.po
index 18228f6..8955315 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2032,7 +2032,7 @@ msgid ""
"Examples:\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"
@@ -2041,7 +2041,7 @@ msgstr ""
"Példák:\n"
"\n"
" -se -r Bob [fájl] titkosítás és aláírás Bob részére\n"
-" --clearsign [fájl] olvasható szöveg aláírása\n"
+" --clear-sign [fájl] olvasható szöveg aláírása\n"
" --detach-sign [fájl] különálló aláírás készítése\n"
" --list-keys [nevek] kulcsok kiíratása\n"
" --fingerprint [nevek] ujjlenyomatok kiíratása\n"
@@ -2466,8 +2466,8 @@ msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [fájlnév]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [fájlnév]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [fájlnév]"
msgid "--decrypt [filename]"
msgstr "--decrypt [fájlnév]"
diff --git a/po/id.po b/po/id.po
index fc9af08..2b1f67c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2035,7 +2035,7 @@ msgid ""
"Examples:\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"
@@ -2044,7 +2044,7 @@ msgstr ""
"Contoh:\n"
"\n"
" -se -r Bob [file] tandai dan enkripsi untuk user Bob\n"
-" --clearsign [file] buat signature berbentuk teks\n"
+" --clear-sign [file] buat signature berbentuk teks\n"
" --detach-sign [file] buat signature detached\n"
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
@@ -2471,8 +2471,8 @@ msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [namafile]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [namafile]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [namafile]"
msgid "--decrypt [filename]"
msgstr "--decrypt [namafile]"
diff --git a/po/it.po b/po/it.po
index ea6c820..8e4b3ff 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2042,7 +2042,7 @@ msgid ""
"Examples:\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"
@@ -2051,7 +2051,7 @@ msgstr ""
"Esempi:\n"
"\n"
" -se -r Bob [file] firma e cifra per l'utente Bob\n"
-" --clearsign [file] fai una firma mantenendo il testo in chiaro\n"
+" --clear-sign [file] fai una firma mantenendo il testo in chiaro\n"
" --detach-sign [file] fai una firma separata\n"
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
@@ -2477,8 +2477,8 @@ msgstr "non è possibile usare %s in modalità %s\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nomefile]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [nomefile]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [nomefile]"
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
diff --git a/po/ja.po b/po/ja.po
index e8f0152..ba2dd0d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1877,7 +1877,7 @@ msgid ""
"Examples:\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"
@@ -1886,7 +1886,7 @@ msgstr ""
"例:\n"
"\n"
" -se -r Bob [ファイル] ユーザBobへ署名と暗号化\n"
-" --clearsign [ファイル] クリア・テクスト署名を作成\n"
+" --clear-sign [ファイル] クリア・テクスト署名を作成\n"
" --detach-sign [ファイル] 分遣署名を作成\n"
" --list-keys [名前] 鍵を表示\n"
" --fingerprint [名前] フィンガープリントを表示\n"
@@ -2282,8 +2282,8 @@ msgstr "--symmetric --sign --encryptを%sモードで使うことはできませ
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ファイル名]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [ファイル名]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [ファイル名]"
msgid "--decrypt [filename]"
msgstr "--decrypt [ファイル名]"
diff --git a/po/nb.po b/po/nb.po
index c6bfb7f..6706183 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1888,7 +1888,7 @@ msgid ""
"Examples:\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"
@@ -1897,7 +1897,7 @@ msgstr ""
"Eksempler:\n"
"\n"
" -se -r Bob [fil] signer og krypter for brukeren Bob\n"
-" --clearsign [fil] lag klartekst-signatur\n"
+" --clear-sign [fil] lag klartekst-signatur\n"
" --detach-sign [fil] lag adskilt signatur\n"
" --list-keys [navn] vis nøkler\n"
" --fingerprint [navn] vis fingeravtrykk\n"
@@ -2295,8 +2295,8 @@ msgstr "du kan ikke velge «--symmtric», «--sign» og «--encrypt» i «%s»-m
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [filnavn]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [filnavn]"
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
diff --git a/po/pl.po b/po/pl.po
index 6b77df7..3ff745a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2050,7 +2050,7 @@ msgid ""
"Examples:\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"
@@ -2059,7 +2059,7 @@ msgstr ""
"Przykłady:\n"
"\n"
" -se -r Bob [plik] podpisanie i zaszyfrowanie kluczem Boba\n"
-" --clearsign [plik] podpisanie z pozostawieniem czytelności "
+" --clear-sign [plik] podpisanie z pozostawieniem czytelności "
"dokumentu\n"
" --detach-sign [plik] podpisanie z umieszczeniem podpisu w osobnym "
"pliku\n"
@@ -2520,8 +2520,8 @@ msgstr "nie można użyć --symmetric --sign --encrypt w trybie %s\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [plik]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [plik]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [plik]"
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
diff --git a/po/pt.po b/po/pt.po
index f0bbe97..a44b082 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2038,7 +2038,7 @@ msgid ""
"Examples:\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"
@@ -2047,7 +2047,7 @@ msgstr ""
"Exemplos:\n"
"\n"
" -se -r Bob [ficheiro] assinar e cifrar para o utilizador Bob\n"
-" --clearsign [ficheiro] criar uma assinatura em texto puro\n"
+" --clear-sign [ficheiro] criar uma assinatura em texto puro\n"
" --detach-sign [ficheiro] criar uma assinatura separada\n"
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impressões digitais\n"
@@ -2472,8 +2472,8 @@ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nome_do_ficheiro]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [nome_do_ficheiro]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [nome_do_ficheiro]"
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_ficheiro]"
diff --git a/po/ro.po b/po/ro.po
index ea68dc3..422e1e4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2035,7 +2035,7 @@ msgid ""
"Examples:\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"
@@ -2044,7 +2044,7 @@ msgstr ""
"Exemple:\n"
"\n"
" -se -r Dan [fişier] semnează şi cifrează pentru utilizatorul Dan\n"
-" --clearsign [fişier] crează o semnătură text în clar\n"
+" --clear-sign [fişier] crează o semnătură text în clar\n"
" --detach-sign [fişier] crează o semnătură detaşată\n"
" --list-keys [nume] arată chei\n"
" --fingerprint [nume] arată amprente\n"
@@ -2502,8 +2502,8 @@ msgstr "nu puteţi folosi --symmetric --sign --encrypt câtă vreme în modul %s
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nume_fişier]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [nume_fişier]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [nume_fişier]"
msgid "--decrypt [filename]"
msgstr "--decrypt [nume_fişier]"
diff --git a/po/ru.po b/po/ru.po
index 53bb489..43cd056 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1895,7 +1895,7 @@ msgid ""
"Examples:\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"
@@ -1904,7 +1904,7 @@ msgstr ""
"Примеры:\n"
"\n"
" -se -r Вова [файл] подписать и зашифровать для получателя Вова\n"
-" --clearsign [файл] создать текстовую подпись\n"
+" --clear-sign [файл] создать текстовую подпись\n"
" --detach-sign [файл] создать отделенную подпись\n"
" --list-keys [имена] показать ключи\n"
" --fingerprint [имена] показать отпечатки\n"
@@ -2312,8 +2312,8 @@ msgstr "в режиме %s нельзя использовать --symmetric --s
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [файл]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [файл]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [файл]"
msgid "--decrypt [filename]"
msgstr "--decrypt [файл]"
diff --git a/po/sk.po b/po/sk.po
index c44b6c3..c5611a6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2045,7 +2045,7 @@ msgid ""
"Examples:\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"
@@ -2054,7 +2054,7 @@ msgstr ""
"Príklady:\n"
"\n"
" -se -r Bob [súbor] podpísať a zašifrovať pre užívateľa Bob\n"
-" --clearsign [súbor] vytvoriť podpis čitateľného dokumentu\n"
+" --clear-sign [súbor] vytvoriť podpis čitateľného dokumentu\n"
" --detach-sign [súbor] vytvoriť podpis oddelený od dokumentu\n"
" --list-keys [mená] vypísať kľúče\n"
" --fingerprint [mená] vypísať fingerprinty\n"
@@ -2484,8 +2484,8 @@ msgstr ""
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [meno súboru]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [meno súboru]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [meno súboru]"
msgid "--decrypt [filename]"
msgstr "--decrypt [meno súboru]"
diff --git a/po/sv.po b/po/sv.po
index de350a1..1cc318e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2099,7 +2099,7 @@ msgid ""
"Examples:\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"
@@ -2108,7 +2108,7 @@ msgstr ""
"Exempel:\n"
"\n"
"-se -r Bosse [fil] signera och kryptera för användaren Bosse\n"
-"--clearsign [fil] skapa en klartextsignatur\n"
+"--clear-sign [fil] skapa en klartextsignatur\n"
"--detach-sign [fil] skapa signatur i en separat fil\n"
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
@@ -2569,8 +2569,8 @@ msgstr ""
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnamn]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [filnamn]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [filnamn]"
msgid "--decrypt [filename]"
msgstr "--decrypt [filnamn]"
diff --git a/po/tr.po b/po/tr.po
index 093de7a..5420cbf 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2044,7 +2044,7 @@ msgid ""
"Examples:\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"
@@ -2053,7 +2053,7 @@ msgstr ""
"Örnekler:\n"
"\n"
" -se -r Ali [dosya] kullanıcı Ali için imzalar ve şifreler\n"
-" --clearsign [dosya] açıkça okunabilir bir imza yapar\n"
+" --clear-sign [dosya] açıkça okunabilir bir imza yapar\n"
" --detach-sign [dosya] bağımsız bir imza yapar\n"
" --list-keys [isimler] anahtarları listeler\n"
" --fingerprint [isimler] parmak izlerini gösterir\n"
@@ -2500,8 +2500,8 @@ msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [DOSYA]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [dosyaismi]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [dosyaismi]"
msgid "--decrypt [filename]"
msgstr "--decrypt [dosyaismi]"
diff --git a/po/uk.po b/po/uk.po
index 65529e2..3c207e5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1914,7 +1914,7 @@ msgid ""
"Examples:\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"
@@ -1924,7 +1924,7 @@ msgstr ""
"\n"
" -se -r Bob [файл] підписати і зашифрувати дані для користувача "
"Bob\n"
-" --clearsign [файл] створити текстовий підпис\n"
+" --clear-sign [файл] створити текстовий підпис\n"
" --detach-sign [файл] створити від’єднаний підпис\n"
" --list-keys [назви] показати ключі\n"
" --fingerprint [назви] показати відбитки\n"
@@ -2356,8 +2356,8 @@ msgstr ""
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [назва файла]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [назва файла]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [назва файла]"
msgid "--decrypt [filename]"
msgstr "--decrypt [назва файла]"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 00025a9..23b1474 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2005,7 +2005,7 @@ msgid ""
"Examples:\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"
@@ -2014,7 +2014,7 @@ msgstr ""
"范例：\n"
"\n"
" -se -r Bob [文件名] 为 Bob 这个收件人签名及加密\n"
-" --clearsign [文件名] 做出明文签名\n"
+" --clear-sign [文件名] 做出明文签名\n"
" --detach-sign [文件名] 做出分离式签名\n"
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
@@ -2447,8 +2447,8 @@ msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [文件名]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [文件名]"
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e4a9afb..e3e8a3c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1899,7 +1899,7 @@ msgid ""
"Examples:\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"
@@ -1908,7 +1908,7 @@ msgstr ""
"範例:\n"
"\n"
" -se -r Bob [檔案] 對 Bob 這個使用者簽署及加密\n"
-" --clearsign [檔案] 做出明文簽章\n"
+" --clear-sign [檔案] 做出明文簽章\n"
" --detach-sign [檔案] 做出分離式簽章\n"
" --list-keys [名字] 顯示金鑰\n"
" --fingerprint [名字] 顯示指紋\n"
@@ -2307,8 +2307,8 @@ msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [檔名]"
-msgid "--clearsign [filename]"
-msgstr "--clearsign [檔名]"
+msgid "--clear-sign [filename]"
+msgstr "--clear-sign [檔名]"
msgid "--decrypt [filename]"
msgstr "--decrypt [檔名]"
diff --git a/tests/openpgp/clearsig.scm b/tests/openpgp/clearsig.scm
index 7b95561..cdbf603 100755
--- a/tests/openpgp/clearsig.scm
+++ b/tests/openpgp/clearsig.scm
@@ -37,7 +37,7 @@
;; Otherwise, we do check that we recover the original file.
check-identity)
source
- (check-signing '(--passphrase-fd "0" --clearsign) usrpass1)))
+ (check-signing '(--passphrase-fd "0" --clear-sign) usrpass1)))
(append plain-files '("plain-large")))
;; The test vectors are lists of length three, containing
@@ -102,7 +102,7 @@ there is a blank line after this
(with-output-to-file tmp (lambda () (display (:string vec))))
((if (:check-equality vec) check-identity check-execution)
tmp
- (check-signing `(--passphrase-fd "0" --clearsign ,@(:options vec))
+ (check-signing `(--passphrase-fd "0" --clear-sign ,@(:options vec))
usrpass1))))
(lambda (vec) (counter))
vectors))
commit ca598152345b40f3a236227dfc63ae04ddf777d7
Author: Justus Winter <justus at g10code.com>
Date: Fri Sep 23 13:40:55 2016 +0200
g10: Spell out --recv-keys.
* g10/gpg.c (opts): Spell out option.
* doc/gpg.texi: Update accordingly.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index c7c7db6..9ea3b80 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -464,8 +464,8 @@ Most notable here is the @option{--import-options merge-only} option
which does not insert new keys but does only the merging of new
signatures, user-IDs and subkeys.
- at item --recv-keys @code{key IDs}
- at opindex recv-keys
+ at item --receive-keys @code{key IDs}
+ at opindex receive-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.
@@ -1757,7 +1757,7 @@ This option is deprecated - please use the @option{--keyserver} in
@file{dirmngr.conf} instead.
Use @code{name} as your keyserver. This is the server that
- at option{--recv-keys}, @option{--send-keys}, and @option{--search-keys}
+ at option{--receive-keys}, @option{--send-keys}, and @option{--search-keys}
will communicate with to receive keys from, send keys to, and search for
keys on. The format of the @code{name} is a URI:
`scheme:[//]keyservername[:port]' The scheme is the type of keyserver:
@@ -1825,9 +1825,9 @@ are available for all keyserver types, some common options are:
Tell the keyserver helper program how long (in seconds) to try and
perform a keyserver action before giving up. Note that performing
multiple actions at the same time uses this timeout value per action.
- For example, when retrieving multiple keys via @option{--recv-keys}, the
+ For example, when retrieving multiple keys via @option{--receive-keys}, the
timeout applies separately to each key retrieval, and not to the
- @option{--recv-keys} command as a whole. Defaults to 30 seconds.
+ @option{--receive-keys} command as a whole. Defaults to 30 seconds.
@item http-proxy=@code{value}
This option is deprecated.
@@ -2229,7 +2229,7 @@ opposite meaning. The options are:
that this cannot completely repair the damaged key as some crucial data
is removed by the keyserver, but it does at least give you back one
subkey. Defaults to no for regular @option{--import} and to yes for
- keyserver @option{--recv-keys}.
+ keyserver @option{--receive-keys}.
@item import-show
Show a listing of the key as imported right before it is stored.
diff --git a/g10/gpg.c b/g10/gpg.c
index c087387..7de62fd 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -470,7 +470,8 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aDesigRevoke, "desig-revoke","@" ),
ARGPARSE_c (aExport, "export" , N_("export keys") ),
ARGPARSE_c (aSendKeys, "send-keys" , N_("export keys to a keyserver") ),
- ARGPARSE_c (aRecvKeys, "recv-keys" , N_("import keys from a keyserver") ),
+ ARGPARSE_c (aRecvKeys, "receive-keys" , N_("import keys from a keyserver") ),
+ ARGPARSE_c (aRecvKeys, "recv-keys" , "@"),
ARGPARSE_c (aSearchKeys, "search-keys" ,
N_("search for keys on a keyserver") ),
ARGPARSE_c (aRefreshKeys, "refresh-keys",
-----------------------------------------------------------------------
Summary of changes:
doc/debugging.texi | 3 +-
doc/faq.org | 2 +-
doc/gpg.texi | 82 ++++++++++++++++++-------------------
doc/gpgsm.texi | 10 ++---
doc/howto-create-a-server-cert.texi | 2 +-
g10/gpg.c | 48 +++++++++++++---------
g10/keygen.c | 2 +-
g10/revoke.c | 3 +-
po/ca.po | 10 ++---
po/cs.po | 10 ++---
po/da.po | 10 ++---
po/de.po | 12 +++---
po/el.po | 10 ++---
po/eo.po | 10 ++---
po/es.po | 10 ++---
po/et.po | 10 ++---
po/fi.po | 10 ++---
po/fr.po | 10 ++---
po/gl.po | 8 ++--
po/hu.po | 10 ++---
po/id.po | 10 ++---
po/it.po | 10 ++---
po/ja.po | 12 +++---
po/nb.po | 12 +++---
po/pl.po | 10 ++---
po/pt.po | 10 ++---
po/ro.po | 10 ++---
po/ru.po | 12 +++---
po/sk.po | 10 ++---
po/sv.po | 10 ++---
po/tr.po | 10 ++---
po/uk.po | 12 +++---
po/zh_CN.po | 10 ++---
po/zh_TW.po | 10 ++---
sm/gpgsm.c | 14 ++++---
tests/openpgp/clearsig.scm | 4 +-
tests/openpgp/genkey1024.scm | 2 +-
37 files changed, 227 insertions(+), 213 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list