diff --git a/doc/gpg.texi b/doc/gpg.texi index 050410578..596785dfb 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -174,8 +174,8 @@ decrypted via a secret key or a passphrase). The key to be used for signing is chosen by default or can be set with the @option{--local-user} and @option{--default-key} options. -@item --clearsign -@opindex clearsign +@item --clear-sign +@opindex clear-sign Make a clear text signature. The content in a clear text signature is readable without any special software. OpenPGP software is only needed to verify the signature. Clear text signatures may modify end-of-line @@ -2499,7 +2499,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 @@ -3425,7 +3425,7 @@ Operation is further controlled by a few environment variables: @item gpg -se -r @code{Bob} @code{file} sign and encrypt for user Bob -@item gpg --clearsign @code{file} +@item gpg --clear-sign @code{file} make a clear text signature @item gpg -sb @code{file} diff --git a/g10/gpg.c b/g10/gpg.c index 6a5dc130b..f0ce97ba1 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -419,7 +419,8 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_group (300, N_("@Commands:\n ")), ARGPARSE_c (aSign, "sign", N_("make a signature")), - ARGPARSE_c (aClearsign, "clearsign", N_("make a clear text signature")), + ARGPARSE_c (aClearsign, "clear-sign", N_("make a clear text signature")), + ARGPARSE_c (aClearsign, "clearsign", "@")), ARGPARSE_c (aDetachedSign, "detach-sign", N_("make a detached signature")), ARGPARSE_c (aEncr, "encrypt", N_("encrypt data")), ARGPARSE_c (aEncrFiles, "encrypt-files", "@"), @@ -653,7 +654,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_group (303, N_("@\nExamples:\n\n" " -se -r Bob [file] sign and encrypt for user Bob\n" - " --clearsign [file] make a clear text signature\n" + " --clear-sign [file] make a clear text signature\n" " --detach-sign [file] make a detached signature\n" " --list-keys [names] show keys\n" " --fingerprint [names] show fingerprints\n")), @@ -3639,7 +3640,7 @@ main (int argc, char **argv) cmdname="--sign --encrypt"; break; case aClearsign: - cmdname="--clearsign"; + cmdname="--clear-sign"; break; case aDetachedSign: cmdname="--detach-sign"; @@ -4023,11 +4024,11 @@ main (int argc, char **argv) case aClearsign: /* make a clearsig */ if( argc > 1 ) - wrong_args(_("--clearsign [filename]")); + wrong_args(_("--clear-sign [filename]")); if( (rc = clearsign_file (ctrl, fname, locusr, NULL)) ) { write_status_failure ("sign", rc); - log_error("%s: clearsign failed: %s\n", + log_error("%s: clear-sign failed: %s\n", print_fname_stdin(fname), gpg_strerror (rc) ); } break; diff --git a/po/ca.po b/po/ca.po index 51f56504f..b99f947c2 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2111,7 +2111,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" @@ -2120,7 +2120,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" @@ -2552,8 +2552,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 d185c5737..4d12db2ad 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1944,14 +1944,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" @@ -2364,8 +2364,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 ab7d35255..9d1bb07b9 100644 --- a/po/da.po +++ b/po/da.po @@ -2056,7 +2056,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" @@ -2065,7 +2065,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" @@ -2501,8 +2501,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 71e57001e..e8224947f 100644 --- a/po/de.po +++ b/po/de.po @@ -1931,7 +1931,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" @@ -1940,7 +1940,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" @@ -2350,8 +2350,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 77c81a83a..75199d42c 100644 --- a/po/el.po +++ b/po/el.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 "" "Παραδείγματα:\n" "\n" " -se -r Bob [αρχείο] υπογραφή και κρυπτογράφηση για το Bob\n" -" --clearsign [αρχείο] δημιουργία μη κρυπτογραφημένης υπογραφής\n" +" --clear-sign [αρχείο] δημιουργία μη κρυπτογραφημένης υπογραφής\n" " --detach-sign [αρχείο] δημιουργία αποκομμένης υπογραφής\n" " --list-keys [ονόματα] απεικόνιση κλειδιών\n" " --fingerprint [ονόματα] απεικόνιση αποτυπωμάτων (fingerprints)\n" @@ -2474,8 +2474,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 63f388221..fcd7162ee 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2024,7 +2024,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" @@ -2033,7 +2033,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" @@ -2460,8 +2460,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 76fae21fd..d14539370 100644 --- a/po/es.po +++ b/po/es.po @@ -2079,7 +2079,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" @@ -2088,7 +2088,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" @@ -2526,8 +2526,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 74426d802..6ca4ab532 100644 --- a/po/et.po +++ b/po/et.po @@ -2031,7 +2031,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" @@ -2040,7 +2040,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" @@ -2459,8 +2459,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 5002410a6..c3b6502f2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2047,7 +2047,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" @@ -2055,7 +2055,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" @@ -2475,8 +2475,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 eb7780bd4..ed9f06c51 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1970,7 +1970,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" @@ -1979,7 +1979,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" @@ -2404,8 +2404,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 833533dc0..87b15a3df 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2039,7 +2039,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" @@ -2469,8 +2469,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 bcfe70498..2523a38f3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -2027,7 +2027,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" @@ -2036,7 +2036,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" @@ -2457,8 +2457,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 015e41907..383d6ddd4 100644 --- a/po/id.po +++ b/po/id.po @@ -2030,7 +2030,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" @@ -2039,7 +2039,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" @@ -2462,8 +2462,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 dfc4f45d7..ff929d5a7 100644 --- a/po/it.po +++ b/po/it.po @@ -2037,7 +2037,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" @@ -2046,7 +2046,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" @@ -2468,8 +2468,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 b7cefa8bd..82922a798 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1871,7 +1871,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" @@ -1880,7 +1880,7 @@ msgstr "" "例:\n" "\n" " -se -r Bob [ファイル] ユーザBobへ署名と暗号化\n" -" --clearsign [ファイル] クリア・テクスト署名を作成\n" +" --clear-sign [ファイル] クリア・テクスト署名を作成\n" " --detach-sign [ファイル] 分遣署名を作成\n" " --list-keys [名前] 鍵を表示\n" " --fingerprint [名前] フィンガープリントを表示\n" @@ -2271,8 +2271,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 4e5bc4048..a00a30e9a 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1881,7 +1881,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" @@ -1890,7 +1890,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" @@ -2281,8 +2281,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 97eff332f..6c5c0c970 100644 --- a/po/pl.po +++ b/po/pl.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 "" "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" @@ -2508,8 +2508,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 1593ff0bb..1d7bdeee3 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2033,7 +2033,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" @@ -2042,7 +2042,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" @@ -2463,8 +2463,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 460223c28..f18bbd8b8 100644 --- a/po/ro.po +++ b/po/ro.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 "" "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" @@ -2492,8 +2492,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 fc1290807..2861014eb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1890,7 +1890,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" @@ -1899,7 +1899,7 @@ msgstr "" "Примеры:\n" "\n" " -se -r Вова [файл] подписать и зашифровать для получателя Вова\n" -" --clearsign [файл] создать текстовую подпись\n" +" --clear-sign [файл] создать текстовую подпись\n" " --detach-sign [файл] создать отделенную подпись\n" " --list-keys [имена] показать ключи\n" " --fingerprint [имена] показать отпечатки\n" @@ -2303,8 +2303,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 801cfe8cc..d6252b9e2 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2040,7 +2040,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" @@ -2049,7 +2049,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" @@ -2475,8 +2475,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 27a591d88..654b7cf40 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2092,7 +2092,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" @@ -2101,7 +2101,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" @@ -2557,8 +2557,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 14a4492f8..1d52b1468 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2037,7 +2037,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" @@ -2046,7 +2046,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" @@ -2487,8 +2487,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 864fa1c85..9840ae772 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1908,7 +1908,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" @@ -1918,7 +1918,7 @@ msgstr "" "\n" " -se -r Bob [файл] підписати і зашифрувати дані для користувача " "Bob\n" -" --clearsign [файл] створити текстовий підпис\n" +" --clear-sign [файл] створити текстовий підпис\n" " --detach-sign [файл] створити від’єднаний підпис\n" " --list-keys [назви] показати ключі\n" " --fingerprint [назви] показати відбитки\n" @@ -2343,8 +2343,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 5e16c8a10..3e8bba196 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1999,7 +1999,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" @@ -2008,7 +2008,7 @@ msgstr "" "范例：\n" "\n" " -se -r Bob [文件名] 为 Bob 这个收件人签名及加密\n" -" --clearsign [文件名] 做出明文签名\n" +" --clear-sign [文件名] 做出明文签名\n" " --detach-sign [文件名] 做出分离式签名\n" " --list-keys [某甲] 显示密钥\n" " --fingerprint [某甲] 显示指纹\n" @@ -2437,8 +2437,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 15677d744..651c219a7 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1893,7 +1893,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" @@ -1902,7 +1902,7 @@ msgstr "" "範例:\n" "\n" " -se -r Bob [檔案] 對 Bob 這個使用者簽署及加密\n" -" --clearsign [檔案] 做出明文簽章\n" +" --clear-sign [檔案] 做出明文簽章\n" " --detach-sign [檔案] 做出分離式簽章\n" " --list-keys [名字] 顯示金鑰\n" " --fingerprint [名字] 顯示指紋\n" @@ -2296,8 +2296,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 96b1b4c31..4bf092630 100755 --- a/tests/openpgp/clearsig.scm +++ b/tests/openpgp/clearsig.scm @@ -36,7 +36,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 @@ -101,7 +101,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))