[Pkg-gnupg-commit] [gnupg2] 98/180: g10: Hyphenate --clearsign.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Sat Dec 24 22:29:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
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>
---
doc/gpg.texi | 8 ++++----
g10/gpg.c | 11 ++++++-----
po/ca.po | 8 ++++----
po/cs.po | 8 ++++----
po/da.po | 8 ++++----
po/de.po | 8 ++++----
po/el.po | 8 ++++----
po/eo.po | 8 ++++----
po/es.po | 8 ++++----
po/et.po | 8 ++++----
po/fi.po | 8 ++++----
po/fr.po | 8 ++++----
po/gl.po | 6 +++---
po/hu.po | 8 ++++----
po/id.po | 8 ++++----
po/it.po | 8 ++++----
po/ja.po | 8 ++++----
po/nb.po | 8 ++++----
po/pl.po | 8 ++++----
po/pt.po | 8 ++++----
po/ro.po | 8 ++++----
po/ru.po | 8 ++++----
po/sk.po | 8 ++++----
po/sv.po | 8 ++++----
po/tr.po | 8 ++++----
po/uk.po | 8 ++++----
po/zh_CN.po | 8 ++++----
po/zh_TW.po | 8 ++++----
tests/openpgp/clearsig.scm | 4 ++--
29 files changed, 115 insertions(+), 114 deletions(-)
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))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list