[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-443-g518d835
by Werner Koch
cvs at cvs.gnupg.org
Thu Jun 5 17:09:23 CEST 2014
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 518d835380a2ae01d6a9cc19de92684baade96a4 (commit)
via 27f4ce40e01b501eeaa311dc7a6eee593758548b (commit)
via ab7d85be82b8add165a4ca6289fed2779fec8a41 (commit)
via 533ff0ab56dd6dfcab4bb2ef5c7755b62d158007 (commit)
via 23712e69d3f97df9d789325f1a2f2f61e7d5bbb4 (commit)
from 9c9e26d41e7d65711da8dbf1afa452254749621c (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 518d835380a2ae01d6a9cc19de92684baade96a4
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jun 5 17:05:33 2014 +0200
Post beta release update.
--
656fef6454972cb91741c37a0fd19cd9ade9db9c gnupg-2.1.0-beta442.tar.bz2
diff --git a/NEWS b/NEWS
index cc3e263..0f2e78f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.1.0 (unreleased)
+------------------------------------------------
+
+
Noteworthy changes in version 2.1.0-beta442 (2014-06-05)
--------------------------------------------------------
commit 27f4ce40e01b501eeaa311dc7a6eee593758548b
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jun 5 16:23:10 2014 +0200
Release 2.1.0-beta442.
--
This beta is small contribution for today's Reset The Net campaign.
It is a crying shame that the government of my country is not
willing to offer Edward Snowden asylum and protect him from the evil
institutions of those allies who once thankfully kicked out the most
evil German powers. Back in these dark years, many people had to
ask for asylum over there and it was granted. Now we have to fear
their Blockwarts who are listening to the entire world. It would be
more than justified for us to help that brave guy.
diff --git a/NEWS b/NEWS
index a5a0d53..cc3e263 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-Noteworthy changes in version 2.1.0-betaN (unreleased)
------------------------------------------------------
+Noteworthy changes in version 2.1.0-beta442 (2014-06-05)
+--------------------------------------------------------
* gpg: Add experimental signature support using curve Ed25519 and
with a patched Libgcrypt also encryption support with Curve25519.
commit ab7d85be82b8add165a4ca6289fed2779fec8a41
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jun 5 16:22:18 2014 +0200
po: Auto-update po files.
--
diff --git a/po/de.po b/po/de.po
index da0f13c..49a03c5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -300,12 +300,12 @@ msgstr ""
"@Optionen:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "Im Server Modus ausführen"
-
msgid "run in daemon mode (background)"
msgstr "Im Daemon Modus ausführen"
+msgid "run in server mode (foreground)"
+msgstr "Im Server Modus ausführen"
+
msgid "verbose"
msgstr "Detaillierte Informationen"
@@ -354,14 +354,19 @@ msgstr "|N|lasse PINs im Cache nach N Sekunden verfallen"
msgid "do not use the PIN cache when signing"
msgstr "benutze PINs im Cache nicht beim Signieren"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
msgid "allow presetting passphrase"
msgstr "erlaube ein \"preset\" von Passphrases"
-msgid "enable ssh-agent emulation"
-msgstr "Die ssh-agent-Emulation anschalten"
+msgid "enable ssh support"
+msgstr ""
+
+msgid "enable putty support"
+msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr "|DATEI|Schreibe die Umgebungsvariablen auf DATEI"
@@ -665,6 +670,16 @@ msgstr "Die Passphrase ändern"
msgid "I'll change it later"
msgstr "Ich werde sie später ändern"
+#, fuzzy
+#| msgid "enable key"
+msgid "Delete key"
+msgstr "Schlüssel anschalten"
+
+msgid ""
+"Warning: This key is also listed for use with SSH!\n"
+"Deleting the key will may remove your ability toaccess remote machines."
+msgstr ""
+
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "Für DSA muß die Hashlänge ein Vielfaches von 8 Bit sein\n"
@@ -724,13 +739,6 @@ msgstr "Fehler bei Ausführung von `%s': beendet\n"
msgid "error getting exit code of process %d: %s\n"
msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
-#, c-format
-msgid "error creating socket: %s\n"
-msgstr "Fehler beim Erstellen des Sockets: %s\n"
-
-msgid "host not found"
-msgstr "Host nicht gefunden"
-
msgid "gpg-agent is not available in this session\n"
msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
@@ -1030,14 +1038,6 @@ msgid "you found a bug ... (%s:%d)\n"
msgstr "Sie haben einen Bug (Programmfehler) gefunden ... (%s:%d)\n"
#, c-format
-msgid "error loading '%s': %s\n"
-msgstr "Fehler beim Laden von `%s': %s\n"
-
-#, c-format
-msgid "please see %s for more information\n"
-msgstr "Siehe %s für weitere Infos\n"
-
-#, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "Umwandlung von `%s' in `%s' ist nicht verfügbar\n"
@@ -1466,8 +1466,18 @@ msgstr "Diesen Schlüssel aus dem Schlüsselbund löschen? (j/N) "
msgid "This is a secret key! - really delete? (y/N) "
msgstr "Dies ist ein privater Schlüssel! - Wirklich löschen? (j/N) "
-msgid "deleting secret key not implemented\n"
-msgstr "Löschen des geheimen Schlüssel ist nicht implementiert\n"
+#, fuzzy, c-format
+#| msgid "deleting certificate \"%s\" failed: %s\n"
+msgid "deleting secret %s failed: %s\n"
+msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
+
+msgid "key"
+msgstr ""
+
+#, fuzzy
+#| msgid "Pubkey: "
+msgid "subkey"
+msgstr "Öff. Schlüssel: "
#, c-format
msgid "deleting keyblock failed: %s\n"
@@ -1723,6 +1733,16 @@ msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
msgid "remove keys from the secret keyring"
msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
+#, fuzzy
+#| msgid "sign a key"
+msgid "quickly sign a key"
+msgstr "Schlüssel signieren"
+
+#, fuzzy
+#| msgid "sign a key locally"
+msgid "quickly sign a key locally"
+msgstr "Schlüssel nur für diesen Rechner signieren"
+
msgid "sign a key"
msgstr "Schlüssel signieren"
@@ -2554,15 +2574,15 @@ msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
+msgid "importing secret keys not allowed\n"
+msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
+
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
"Schlüssel %s: geheimer Schlüssel mit ungültiger Verschlüsselung %d - "
"übersprungen\n"
-msgid "importing secret keys not allowed\n"
-msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
-
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
@@ -3186,6 +3206,26 @@ msgstr "Änderung fehlgeschlagen: %s\n"
msgid "Key not changed so no update needed.\n"
msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
+#, fuzzy, c-format
+#| msgid "invalid fingerprint"
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "ungültiger Fingerabdruck"
+
+#, fuzzy, c-format
+#| msgid "failed to get the fingerprint\n"
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "Kann den Fingerprint nicht ermitteln\n"
+
+#, fuzzy
+#| msgid "No such user ID.\n"
+msgid "No matching user IDs."
+msgstr "Keine solche User-ID vorhanden.\n"
+
+#, fuzzy
+#| msgid "Nothing to sign with key %s\n"
+msgid "Nothing to sign.\n"
+msgstr "Nichts zu beglaubigen für Schlüssel %s\n"
+
msgid "Digest: "
msgstr "Digest: "
@@ -3615,20 +3655,24 @@ msgstr " (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (Leistungsfähigkeit selber einstellbar)\n"
-#, c-format
-msgid " (%d) ECDSA and ECDH\n"
-msgstr " (%d) ECDSA und ECDH\n"
+#, fuzzy, c-format
+#| msgid " (%d) %s\n"
+msgid " (%d) ECC\n"
+msgstr " (%d) signieren\n"
-#, c-format
-msgid " (%d) ECDSA (sign only)\n"
+#, fuzzy, c-format
+#| msgid " (%d) ECDSA (sign only)\n"
+msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECDSA (nur signieren/beglaubigen)\n"
-#, c-format
-msgid " (%d) ECDSA (set your own capabilities)\n"
+#, fuzzy, c-format
+#| msgid " (%d) ECDSA (set your own capabilities)\n"
+msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECDSA (Leistungsfähigkeit selber einstellbar)\n"
-#, c-format
-msgid " (%d) ECDH (encrypt only)\n"
+#, fuzzy, c-format
+#| msgid " (%d) ECDH (encrypt only)\n"
+msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECDH (nur verschlüsseln)\n"
#, c-format
@@ -4180,6 +4224,18 @@ msgstr ""
msgid "no signature found\n"
msgstr "Keine Signatur gefunden\n"
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "FALSCHE Signatur von \"%s\""
+
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Verfallene Signatur von \"%s\""
+
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Korrekte Signatur von \"%s\""
+
msgid "signature verification suppressed\n"
msgstr "Signaturüberprüfung unterdrückt\n"
@@ -4202,18 +4258,6 @@ msgstr "Signatur vom %s mittels %s-Schlüssel ID %s\n"
msgid "Key available at: "
msgstr "Schlüssel erhältlich bei: "
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "FALSCHE Signatur von \"%s\""
-
-#, c-format
-msgid "Expired signature from \"%s\""
-msgstr "Verfallene Signatur von \"%s\""
-
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Korrekte Signatur von \"%s\""
-
msgid "[uncertain]"
msgstr "[ungewiß] "
@@ -4229,8 +4273,9 @@ msgstr "Diese Signatur ist seit %s verfallen.\n"
msgid "Signature expires %s\n"
msgstr "Diese Signatur verfällt am %s.\n"
-#, c-format
-msgid "%s signature, digest algorithm %s\n"
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s Signatur, Hashmethode \"%s\"\n"
msgid "binary"
@@ -4428,26 +4473,64 @@ msgstr "%u-Bit %s Schlüssel, ID %s, erzeugt %s"
msgid " (subkey on main key ID %s)"
msgstr " (Unterschlüssel aus Hauptschlüssel-ID %s)"
-msgid ""
-"Please enter the passphrase to unlock the secret key for the OpenPGP "
-"certificate:"
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to unlock the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
"entsperren:"
-msgid ""
-"Please enter the passphrase to import the secret key for the OpenPGP "
-"certificate:"
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to import the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
"importieren:"
-#, c-format
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to import the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
+msgstr ""
+"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
+"importieren:"
+
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to import the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to export the OpenPGP secret key:"
+msgstr ""
+"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
+"importieren:"
+
+#, fuzzy
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
+msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? (j/N) "
+
+#, fuzzy
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid "Do you really want to permanently delete the OpenPGP secret key:"
+msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? (j/N) "
+
+#, fuzzy, c-format
+#| msgid ""
+#| "%s\n"
+#| "\"%.*s\"\n"
+#| "%u-bit %s key, ID %s,\n"
+#| "created %s%s.\n"
msgid ""
"%s\n"
"\"%.*s\"\n"
"%u-bit %s key, ID %s,\n"
"created %s%s.\n"
+"%s"
msgstr ""
"%s\n"
"\"%.*s\"\n"
@@ -4890,6 +4973,10 @@ msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "WARNUNG: Signaturunterschlüssel %s hat keine Rücksignatur\n"
#, c-format
+msgid "please see %s for more information\n"
+msgstr "Siehe %s für weitere Infos\n"
+
+#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "WARNUNG: Signaturunterschlüssel %s hat eine ungültige Rücksignatur\n"
@@ -4923,6 +5010,11 @@ msgstr "Hinweis: Signaturschlüssel %s ist am %s verfallen\n"
msgid "NOTE: signature key %s has been revoked\n"
msgstr "Hinweis: Signaturschlüssel %s wurde widerrufen\n"
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s Signatur, Hashmethode \"%s\"\n"
+
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
@@ -5208,53 +5300,6 @@ msgstr ""
msgid "using %s trust model\n"
msgstr "verwende Vertrauensmodell %s\n"
-#. TRANSLATORS: these strings are similar to those in
-#. trust_value_to_string(), but are a fixed length. This is needed to
-#. make attractive information listings where columns line up
-#. properly. The value "10" should be the length of the strings you
-#. choose to translate to. This is the length in printable columns.
-#. It gets passed to atoi() so everything after the number is
-#. essentially a comment and need not be translated. Either key and
-#. uid are both NULL, or neither are NULL.
-msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-msgstr "10"
-
-msgid "[ revoked]"
-msgstr "[widerrufen]"
-
-msgid "[ expired]"
-msgstr "[verfall.]"
-
-msgid "[ unknown]"
-msgstr "[ unbek.]"
-
-msgid "[ undef ]"
-msgstr "[ undef.]"
-
-msgid "[marginal]"
-msgstr "[marginal]"
-
-msgid "[ full ]"
-msgstr "[ vollst.]"
-
-msgid "[ultimate]"
-msgstr "[ uneing.]"
-
-msgid "undefined"
-msgstr "unbestimmt"
-
-msgid "never"
-msgstr "niemals"
-
-msgid "marginal"
-msgstr "marginal"
-
-msgid "full"
-msgstr "vollständig"
-
-msgid "ultimate"
-msgstr "uneingeschränkt"
-
msgid "no need for a trustdb check\n"
msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
@@ -7084,6 +7129,9 @@ msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
msgid "|N|do not return more than N items in one query"
msgstr "|N|Nicht mehr als N Angaben in einer Anfrage zurückgeben"
+msgid "|FILE|use the CA certifciates in FILE for HKP over TLS"
+msgstr ""
+
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@ -7587,6 +7635,11 @@ msgstr "Druckdaten hexkodiert ausgeben"
msgid "decode received data lines"
msgstr "Dekodiere empfangene Datenzeilen"
+#, fuzzy
+#| msgid "can't connect to the dirmngr: %s\n"
+msgid "connect to the dirmngr"
+msgstr "Verbindung zum Dirmngr nicht möglich: %s\n"
+
msgid "|NAME|connect to Assuan socket NAME"
msgstr "|NAME|Verbinde mit dem Assuan-Socket NAME"
@@ -7758,6 +7811,11 @@ msgstr "Directory Manager"
msgid "PIN and Passphrase Entry"
msgstr "Falsche PIN oder Passphrase!"
+#, fuzzy
+#| msgid "Component not found"
+msgid "Component not suitable for launching"
+msgstr "Komponente nicht gefunden"
+
#, c-format
msgid "External verification of component %s failed"
msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
@@ -7783,7 +7841,9 @@ msgstr "|KOMPONENTE|Prüfe die Optionen"
msgid "apply global default values"
msgstr "Wende die gobalen Voreinstellungen an"
-msgid "get the configuration directories for gpgconf"
+#, fuzzy
+#| msgid "get the configuration directories for gpgconf"
+msgid "get the configuration directories for @GPGCONF@"
msgstr "Hole die Einstellungsverzeichnisse von gpgconf"
msgid "list global configuration file"
@@ -7795,6 +7855,11 @@ msgstr "Prüfe die globale Konfigurationsdatei"
msgid "reload all or a given component"
msgstr "\"reload\" an alle oder eine Komponente senden"
+#, fuzzy
+#| msgid "kill a given component"
+msgid "launch a given component"
+msgstr "\"kill\" an eine Komponente senden"
+
msgid "kill a given component"
msgstr "\"kill\" an eine Komponente senden"
@@ -7814,9 +7879,6 @@ msgstr ""
"Syntax: @GPGCONF@ {Optionen]\n"
"Verwalte Konfigurationsoptionen für Programme des @GNUPG@ Systems\n"
-msgid "usage: gpgconf [options] "
-msgstr "Aufruf: gpgconf [Optionen] "
-
msgid "Need one component argument"
msgstr "Benötige ein Komponentenargument"
@@ -7970,15 +8032,72 @@ msgstr ""
"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+#~ msgid "enable ssh-agent emulation"
+#~ msgstr "Die ssh-agent-Emulation anschalten"
+
+#~ msgid "error creating socket: %s\n"
+#~ msgstr "Fehler beim Erstellen des Sockets: %s\n"
+
+#~ msgid "host not found"
+#~ msgstr "Host nicht gefunden"
+
+#~ msgid "error loading '%s': %s\n"
+#~ msgstr "Fehler beim Laden von `%s': %s\n"
+
+#~ msgid "deleting secret key not implemented\n"
+#~ msgstr "Löschen des geheimen Schlüssel ist nicht implementiert\n"
+
+#~ msgid " (%d) ECDSA and ECDH\n"
+#~ msgstr " (%d) ECDSA und ECDH\n"
+
+#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+#~ msgstr "10"
+
+#~ msgid "[ revoked]"
+#~ msgstr "[widerrufen]"
+
+#~ msgid "[ expired]"
+#~ msgstr "[verfall.]"
+
+#~ msgid "[ unknown]"
+#~ msgstr "[ unbek.]"
+
+#~ msgid "[ undef ]"
+#~ msgstr "[ undef.]"
+
+#~ msgid "[marginal]"
+#~ msgstr "[marginal]"
+
+#~ msgid "[ full ]"
+#~ msgstr "[ vollst.]"
+
+#~ msgid "[ultimate]"
+#~ msgstr "[ uneing.]"
+
+#~ msgid "undefined"
+#~ msgstr "unbestimmt"
+
+#~ msgid "never"
+#~ msgstr "niemals"
+
+#~ msgid "marginal"
+#~ msgstr "marginal"
+
+#~ msgid "full"
+#~ msgstr "vollständig"
+
+#~ msgid "ultimate"
+#~ msgstr "uneingeschränkt"
+
+#~ msgid "usage: gpgconf [options] "
+#~ msgstr "Aufruf: gpgconf [Optionen] "
+
#~ msgid "Usage: scdaemon [options] (-h for help)"
#~ msgstr "Aufruf: scdaemon [Optionen] (-h für Hilfe)"
#~ msgid "malformed GPG_AGENT_INFO environment variable\n"
#~ msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
-#~ msgid " (%d) %s\n"
-#~ msgstr " (%d) signieren\n"
-
#~ msgid "Usage: gpgsm [options] [files] (-h for help)"
#~ msgstr "Aufruf: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
diff --git a/po/fr.po b/po/fr.po
index 9e58e19..9293376 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -97,14 +97,12 @@ msgstr "Phrase de passe"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
-#, fuzzy, c-format
-#| msgid "can't create '%s': %s\n"
-msgid "can't create `%s': %s\n"
+#, c-format
+msgid "can't create '%s': %s\n"
msgstr "impossible de créer « %s » : %s\n"
-#, fuzzy, c-format
-#| msgid "can't open '%s': %s\n"
-msgid "can't open `%s': %s\n"
+#, c-format
+msgid "can't open '%s': %s\n"
msgstr "impossible d'ouvrir « %s » : %s\n"
#, c-format
@@ -298,12 +296,12 @@ msgstr ""
"@Options :\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "exécuter en mode serveur (premier plan)"
-
msgid "run in daemon mode (background)"
msgstr "exécuter en mode démon (arrière-plan)"
+msgid "run in server mode (foreground)"
+msgstr "exécuter en mode serveur (premier plan)"
+
msgid "verbose"
msgstr "bavard"
@@ -352,14 +350,21 @@ msgstr "|N|oublier les codes personnels après N secondes"
msgid "do not use the PIN cache when signing"
msgstr "ne pas utiliser le cache de code pour signer"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "permettre de marquer la confiance des clefs"
msgid "allow presetting passphrase"
msgstr "permettre de préconfigurer la phrase de passe"
-msgid "enable ssh-agent emulation"
-msgstr "activer l'émulation de ssh-agent"
+msgid "enable ssh support"
+msgstr ""
+
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "non pris en charge"
msgid "|FILE|write environment settings also to FILE"
msgstr "|FICHIER|écrire aussi les réglages d'env. dans FICHIER"
@@ -373,12 +378,18 @@ msgstr ""
"Veuillez signaler toutes anomalies sur <@EMAIL@> (en anglais)\n"
"et tout problème de traduction à <traduc at traduc.org>.\n"
-msgid "Usage: gpg-agent [options] (-h for help)"
-msgstr "Utilisation : gpg-agent [options] (-h pour l'aide)"
+#, fuzzy
+#| msgid "Usage: dirmngr [options] (-h for help)"
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "Utilisation : dirmngr [options] (-h pour l'aide)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: gpg-agent [options] [command [args]]\n"
+#| "Secret key management for GnuPG\n"
msgid ""
-"Syntax: gpg-agent [options] [command [args]]\n"
-"Secret key management for GnuPG\n"
+"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
+"Secret key management for @GNUPG@\n"
msgstr ""
"Syntaxe : gpg-agent [options] [commande [arguments]]\n"
"Gestionnaire de clefs secrètes pour GnuPG\n"
@@ -490,8 +501,10 @@ msgid "no gpg-agent running in this session\n"
msgstr ""
"aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "la variable d'environnement GPG_AGENT_INFO est mal définie\n"
+#, fuzzy, c-format
+#| msgid "malformed DIRMNGR_INFO environment variable\n"
+msgid "malformed %s environment variable\n"
+msgstr "la variable d'environnement DIRMNGR_INFO est mal définie\n"
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -663,6 +676,16 @@ msgstr "Modifier la phrase de passe"
msgid "I'll change it later"
msgstr "Je la modifierai plus tard"
+#, fuzzy
+#| msgid "enable key"
+msgid "Delete key"
+msgstr "activer la clef"
+
+msgid ""
+"Warning: This key is also listed for use with SSH!\n"
+"Deleting the key will may remove your ability toaccess remote machines."
+msgstr ""
+
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA nécessite que la longueur du hachage soit un multiple de 8 bits\n"
@@ -723,13 +746,6 @@ msgstr "erreur d'exécution de « %s » : terminé\n"
msgid "error getting exit code of process %d: %s\n"
msgstr "erreur de lecture du code de retour du processus %d : %s\n"
-#, c-format
-msgid "error creating socket: %s\n"
-msgstr "erreur de création de socket : %s\n"
-
-msgid "host not found"
-msgstr "hôte introuvable"
-
msgid "gpg-agent is not available in this session\n"
msgstr "gpg-agent n'est pas disponible dans cette session\n"
@@ -968,10 +984,6 @@ msgstr "Dirmngr utilisable"
msgid "No help available for '%s'."
msgstr "Pas d'aide disponible pour « %s »."
-#, c-format
-msgid "can't open '%s': %s\n"
-msgstr "impossible d'ouvrir « %s » : %s\n"
-
msgid "ignoring garbage line"
msgstr "ligne inutile ignorée"
@@ -1034,14 +1046,6 @@ msgid "you found a bug ... (%s:%d)\n"
msgstr "vous avez trouvé un bogue… (%s : %d)\n"
#, c-format
-msgid "error loading '%s': %s\n"
-msgstr "erreur de chargement de « %s » : %s\n"
-
-#, c-format
-msgid "please see %s for more information\n"
-msgstr "veuillez consulter %s pour plus de renseignements\n"
-
-#, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "conversion de « %s » vers « %s » non disponible\n"
@@ -1062,10 +1066,6 @@ msgid "error writing to '%s': %s\n"
msgstr "erreur d'écriture sur « %s » : %s\n"
#, c-format
-msgid "can't create '%s': %s\n"
-msgstr "impossible de créer « %s » : %s\n"
-
-#, c-format
msgid "removing stale lockfile (created by %d)\n"
msgstr "suppression du vieux fichier verrou (créé par %d)\n"
@@ -1477,8 +1477,20 @@ msgstr "Faut-il supprimer cette clef du porte-clefs ? (o/N) "
msgid "This is a secret key! - really delete? (y/N) "
msgstr "C'est une clef secrète — faut-il vraiment la supprimer ? (o/N) "
-msgid "deleting secret key not implemented\n"
-msgstr "la suppression de clef secrète n'est pas implémentée\n"
+#, fuzzy, c-format
+#| msgid "deleting certificate \"%s\" failed: %s\n"
+msgid "deleting secret %s failed: %s\n"
+msgstr "échec de suppression du certificat « %s » : %s\n"
+
+#, fuzzy
+#| msgid "bad key"
+msgid "key"
+msgstr "mauvaise clef"
+
+#, fuzzy
+#| msgid "Pubkey: "
+msgid "subkey"
+msgstr "Clef publique : "
#, c-format
msgid "deleting keyblock failed: %s\n"
@@ -1736,6 +1748,16 @@ msgstr "supprimer les clefs du porte-clefs public"
msgid "remove keys from the secret keyring"
msgstr "supprimer les clefs du porte-clefs secret"
+#, fuzzy
+#| msgid "sign a key"
+msgid "quickly sign a key"
+msgstr "signer une clef"
+
+#, fuzzy
+#| msgid "sign a key locally"
+msgid "quickly sign a key locally"
+msgstr "signer une clef localement"
+
msgid "sign a key"
msgstr "signer une clef"
@@ -1838,7 +1860,9 @@ msgstr ""
" --list-keys [noms] montrer les clefs\n"
" --fingerprint [noms] montrer les empreintes\n"
-msgid "Usage: gpg [options] [files] (-h for help)"
+#, fuzzy
+#| msgid "Usage: gpg [options] [files] (-h for help)"
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Utilisation : gpg [options] [fichiers] (-h pour l'aide)"
#, fuzzy
@@ -1847,7 +1871,7 @@ msgstr "Utilisation : gpg [options] [fichiers] (-h pour l'aide)"
#| "sign, check, encrypt or decrypt\n"
#| "default operation depends on the input data\n"
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
"Default operation depends on the input data\n"
msgstr ""
@@ -2578,13 +2602,13 @@ msgstr "clef %s : la clef secrète clef existe déjà\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
+msgid "importing secret keys not allowed\n"
+msgstr "impossible d'importer des clefs secrètes\n"
+
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "clef %s : clef secrète avec chiffrement %d incorrect — ignorée\n"
-msgid "importing secret keys not allowed\n"
-msgstr "impossible d'importer des clefs secrètes\n"
-
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
@@ -3202,6 +3226,26 @@ msgstr "échec de la mise à jour : %s\n"
msgid "Key not changed so no update needed.\n"
msgstr "La clef n'a pas été modifiée donc la mise à jour est inutile.\n"
+#, fuzzy, c-format
+#| msgid "invalid fingerprint"
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "empreinte incorrecte"
+
+#, fuzzy, c-format
+#| msgid "failed to get the fingerprint\n"
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "impossible d'obtenir l'empreinte\n"
+
+#, fuzzy
+#| msgid "No such user ID.\n"
+msgid "No matching user IDs."
+msgstr "Cette identité n'existe pas.\n"
+
+#, fuzzy
+#| msgid "Nothing to sign with key %s\n"
+msgid "Nothing to sign.\n"
+msgstr "Rien à signer avec la clef %s\n"
+
msgid "Digest: "
msgstr "Hachage : "
@@ -3634,20 +3678,24 @@ msgstr " (%d) DSA (indiquez vous-même les capacités)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (indiquez vous-même les capacités)\n"
-#, c-format
-msgid " (%d) ECDSA and ECDH\n"
-msgstr " (%d) ECDSA et ECDH\n"
+#, fuzzy, c-format
+#| msgid " (%d) RSA\n"
+msgid " (%d) ECC\n"
+msgstr " (%d) RSA\n"
-#, c-format
-msgid " (%d) ECDSA (sign only)\n"
+#, fuzzy, c-format
+#| msgid " (%d) ECDSA (sign only)\n"
+msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECDSA (signature seule)\n"
-#, c-format
-msgid " (%d) ECDSA (set your own capabilities)\n"
+#, fuzzy, c-format
+#| msgid " (%d) ECDSA (set your own capabilities)\n"
+msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECDSA (indiquez vous-même les capacités)\n"
-#, c-format
-msgid " (%d) ECDH (encrypt only)\n"
+#, fuzzy, c-format
+#| msgid " (%d) ECDH (encrypt only)\n"
+msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECDH (chiffrement seul)\n"
#, c-format
@@ -3683,6 +3731,11 @@ msgstr "La taille demandée est %u bits\n"
msgid "rounded to %u bits\n"
msgstr "arrondie à %u bits\n"
+#, fuzzy
+#| msgid "Please select what kind of key you want:\n"
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Sélectionnez le type de clef désiré :\n"
+
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4208,6 +4261,18 @@ msgstr "révocation autonome — utilisez « gpg --import » pour l'appliquer\
msgid "no signature found\n"
msgstr "aucune signature trouvée\n"
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "MAUVAISE signature de « %s »"
+
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Signature expirée de « %s »"
+
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Bonne signature de « %s »"
+
msgid "signature verification suppressed\n"
msgstr "vérification de signature supprimée\n"
@@ -4229,18 +4294,6 @@ msgstr "Signature faite le %s avec la clef %s d'identifiant %s\n"
msgid "Key available at: "
msgstr "Clef disponible sur : "
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "MAUVAISE signature de « %s »"
-
-#, c-format
-msgid "Expired signature from \"%s\""
-msgstr "Signature expirée de « %s »"
-
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "Bonne signature de « %s »"
-
msgid "[uncertain]"
msgstr "[doute]"
@@ -4256,8 +4309,9 @@ msgstr "La signature a expiré le %s\n"
msgid "Signature expires %s\n"
msgstr "La signature expire le %s\n"
-#, c-format
-msgid "%s signature, digest algorithm %s\n"
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "signature %s, algorithme de hachage %s\n"
msgid "binary"
@@ -4459,27 +4513,65 @@ msgstr "clef %2$s de %1$u bits, identifiant %3$s, créée le %4$s"
msgid " (subkey on main key ID %s)"
msgstr " (sous-clef de la clef principale d'identifiant %s)"
-msgid ""
-"Please enter the passphrase to unlock the secret key for the OpenPGP "
-"certificate:"
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to unlock the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"Veuillez entrer la phrase de passe pour déverrouiller la clef secrète pour "
"le\n"
"certificat OpenPGP :"
-msgid ""
-"Please enter the passphrase to import the secret key for the OpenPGP "
-"certificate:"
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to import the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
"Veuillez entrer la phrase de passe pour importer la clef secrète pour le\n"
"certificat OpenPGP :"
-#, c-format
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to import the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
+msgstr ""
+"Veuillez entrer la phrase de passe pour importer la clef secrète pour le\n"
+"certificat OpenPGP :"
+
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to import the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to export the OpenPGP secret key:"
+msgstr ""
+"Veuillez entrer la phrase de passe pour importer la clef secrète pour le\n"
+"certificat OpenPGP :"
+
+#, fuzzy
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
+msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
+
+#, fuzzy
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid "Do you really want to permanently delete the OpenPGP secret key:"
+msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
+
+#, fuzzy, c-format
+#| msgid ""
+#| "%s\n"
+#| "\"%.*s\"\n"
+#| "%u-bit %s key, ID %s,\n"
+#| "created %s%s.\n"
msgid ""
"%s\n"
"\"%.*s\"\n"
"%u-bit %s key, ID %s,\n"
"created %s%s.\n"
+"%s"
msgstr ""
"%1$s\n"
"« %3$.*2$s »\n"
@@ -4923,6 +5015,10 @@ msgstr ""
"Attention : la sous-clef de signature %s n'a pas de certificat croisé\n"
#, c-format
+msgid "please see %s for more information\n"
+msgstr "veuillez consulter %s pour plus de renseignements\n"
+
+#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
"Attention : la sous-clef de signature %s a un certificat croisé incorrect\n"
@@ -4958,6 +5054,11 @@ msgstr "Remarque : la clef de signature %s a expiré le %s\n"
msgid "NOTE: signature key %s has been revoked\n"
msgstr "Remarque : la clef de signature %s a été révoquée\n"
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "signature %s, algorithme de hachage %s\n"
+
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
@@ -5242,53 +5343,6 @@ msgstr ""
msgid "using %s trust model\n"
msgstr "utilisation du modèle de confiance %s\n"
-#. TRANSLATORS: these strings are similar to those in
-#. trust_value_to_string(), but are a fixed length. This is needed to
-#. make attractive information listings where columns line up
-#. properly. The value "10" should be the length of the strings you
-#. choose to translate to. This is the length in printable columns.
-#. It gets passed to atoi() so everything after the number is
-#. essentially a comment and need not be translated. Either key and
-#. uid are both NULL, or neither are NULL.
-msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-msgstr "11 le traducteur a bien lu ce qu'il fallait :)"
-
-msgid "[ revoked]"
-msgstr "[ révoquée]"
-
-msgid "[ expired]"
-msgstr "[ expirée ]"
-
-msgid "[ unknown]"
-msgstr "[ inconnue]"
-
-msgid "[ undef ]"
-msgstr "[indéfinie]"
-
-msgid "[marginal]"
-msgstr "[marginale]"
-
-msgid "[ full ]"
-msgstr "[ totale ]"
-
-msgid "[ultimate]"
-msgstr "[ ultime ]"
-
-msgid "undefined"
-msgstr "indéfinie"
-
-msgid "never"
-msgstr "jamais"
-
-msgid "marginal"
-msgstr "marginale"
-
-msgid "full"
-msgstr "totale"
-
-msgid "ultimate"
-msgstr "ultime"
-
msgid "no need for a trustdb check\n"
msgstr "inutile de vérifier la base de confiance\n"
@@ -5467,6 +5521,11 @@ msgstr "la réponse ne contient pas le module RSA\n"
msgid "response does not contain the RSA public exponent\n"
msgstr "la réponse ne contient pas l'exposant public RSA\n"
+#, fuzzy
+#| msgid "response does not contain the RSA public exponent\n"
+msgid "response does not contain the EC public point\n"
+msgstr "la réponse ne contient pas l'exposant public RSA\n"
+
#, c-format
msgid "using default PIN as %s\n"
msgstr "utilisation du code personnel par défaut en tant que %s\n"
@@ -5662,12 +5721,18 @@ msgstr "refus d'utiliser les commandes d'administration de la carte"
msgid "use variable length input for pinpad"
msgstr ""
-msgid "Usage: scdaemon [options] (-h for help)"
-msgstr "Utilisation : scdaemon [options] (-h pour l'aide)"
+#, fuzzy
+#| msgid "Usage: dirmngr [options] (-h for help)"
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Utilisation : dirmngr [options] (-h pour l'aide)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: scdaemon [options] [command [args]]\n"
+#| "Smartcard daemon for GnuPG\n"
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
-"Smartcard daemon for GnuPG\n"
+"Smartcard daemon for @GNUPG@\n"
msgstr ""
"Syntaxe : scdaemon [options] [commande [arguments]]\n"
"Démon de carte à puce pour GnuPG\n"
@@ -6242,8 +6307,10 @@ msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NOM|utiliser l'algorithme de hachage NOM"
-msgid "Usage: gpgsm [options] [files] (-h for help)"
-msgstr "Utilisation : gpgsm [options] [fichiers] (-h pour l'aide)"
+#, fuzzy
+#| msgid "Usage: gpg [options] [files] (-h for help)"
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Utilisation : gpg [options] [fichiers] (-h pour l'aide)"
#, fuzzy
#| msgid ""
@@ -6251,7 +6318,7 @@ msgstr "Utilisation : gpgsm [options] [fichiers] (-h pour l'aide)"
#| "sign, check, encrypt or decrypt using the S/MIME protocol\n"
#| "default operation depends on the input data\n"
msgid ""
-"Syntax: gpgsm [options] [files]\n"
+"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
"Default operation depends on the input data\n"
msgstr ""
@@ -7089,9 +7156,6 @@ msgstr ""
"pas d'instance de dirmngr en cours d'exécution —\n"
"démarrage d'une nouvelle instance\n"
-msgid "malformed DIRMNGR_INFO environment variable\n"
-msgstr "la variable d'environnement DIRMNGR_INFO est mal définie\n"
-
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "le protocole dirmngr version %d n'est pas pris en charge\n"
@@ -7196,6 +7260,9 @@ msgstr "|EMPR|réponse OCSP signée par EMPR"
msgid "|N|do not return more than N items in one query"
msgstr "|N|ne pas renvoyer plus de N éléments dans une requête"
+msgid "|FILE|use the CA certifciates in FILE for HKP over TLS"
+msgstr ""
+
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@ -7205,12 +7272,18 @@ msgstr ""
"(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
"et options)\n"
-msgid "Usage: dirmngr [options] (-h for help)"
+#, fuzzy
+#| msgid "Usage: dirmngr [options] (-h for help)"
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "Utilisation : dirmngr [options] (-h pour l'aide)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: dirmngr [options] [command [args]]\n"
+#| "LDAP and OCSP access for GnuPG\n"
msgid ""
-"Syntax: dirmngr [options] [command [args]]\n"
-"LDAP and OCSP access for GnuPG\n"
+"Syntax: @DIRMNGR@ [options] [command [args]]\n"
+"LDAP and OCSP access for @GNUPG@\n"
msgstr ""
"Syntaxe : dirmngr [options] [commande [arguments]]\n"
"Accès LDAP et OCSP pour GnuPG\n"
@@ -7219,8 +7292,10 @@ msgstr ""
msgid "valid debug levels are: %s\n"
msgstr "les niveaux de débogage possibles sont : %s\n"
-msgid "usage: dirmngr [options] "
-msgstr "utilisation : dirmngr [options] "
+#, fuzzy, c-format
+#| msgid "usage: gpgsm [options] "
+msgid "usage: %s [options] "
+msgstr "utilisation : gpgsm [options] "
msgid "colons are not allowed in the socket name\n"
msgstr "les deux-points ne sont pas permis avec dans le nom de socket\n"
@@ -7711,6 +7786,11 @@ msgstr "afficher les données encodées au format hexadécimal"
msgid "decode received data lines"
msgstr "décoder les lignes de données reçues"
+#, fuzzy
+#| msgid "can't connect to the dirmngr: %s\n"
+msgid "connect to the dirmngr"
+msgstr "impossible de se connecter au dirmngr : %s\n"
+
msgid "|NAME|connect to Assuan socket NAME"
msgstr "|NOM|se connecter à la socket Assuan NOM"
@@ -7729,11 +7809,17 @@ msgstr "|FICHIER|exécuter les commandes du FICHIER au démarrage"
msgid "run /subst on startup"
msgstr "exécuter /subst au démarrage"
-msgid "Usage: gpg-connect-agent [options] (-h for help)"
+#, fuzzy
+#| msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
msgstr "Utilisation : gpg-connect-agent [options] (-h pour l'aide)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: gpg-connect-agent [options]\n"
+#| "Connect to a running agent and send commands\n"
msgid ""
-"Syntax: gpg-connect-agent [options]\n"
+"Syntax: @GPG at -connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
"Syntaxe : gpg-connect-agent [options]\n"
@@ -7880,6 +7966,11 @@ msgstr "Gestionnaire de répertoires"
msgid "PIN and Passphrase Entry"
msgstr "Entrée de code personnel et de phrase de passe"
+#, fuzzy
+#| msgid "Component not found"
+msgid "Component not suitable for launching"
+msgstr "Composant introuvable"
+
#, c-format
msgid "External verification of component %s failed"
msgstr "Échec de vérification externe du composant %s"
@@ -7905,7 +7996,9 @@ msgstr "|COMPOSANT|vérifier les options"
msgid "apply global default values"
msgstr "appliquer les valeurs par défaut globales"
-msgid "get the configuration directories for gpgconf"
+#, fuzzy
+#| msgid "get the configuration directories for gpgconf"
+msgid "get the configuration directories for @GPGCONF@"
msgstr "aff. répertoires de configuration pour gpgconf"
msgid "list global configuration file"
@@ -7917,6 +8010,11 @@ msgstr "vérifier le fichier de configuration globale"
msgid "reload all or a given component"
msgstr "recharger tous les composants ou celui donné"
+#, fuzzy
+#| msgid "kill a given component"
+msgid "launch a given component"
+msgstr "tuer un composant donné"
+
msgid "kill a given component"
msgstr "tuer un composant donné"
@@ -7926,19 +8024,22 @@ msgstr "utiliser comme fichier de sortie"
msgid "activate changes at runtime, if possible"
msgstr "activer modif. pendant l'exécution si possible"
-msgid "Usage: gpgconf [options] (-h for help)"
-msgstr "Utilisation : gpgconf [options] (-h pour l'aide)"
+#, fuzzy
+#| msgid "Usage: dirmngr [options] (-h for help)"
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Utilisation : dirmngr [options] (-h pour l'aide)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: gpgconf [options]\n"
+#| "Manage configuration options for tools of the GnuPG system\n"
msgid ""
-"Syntax: gpgconf [options]\n"
-"Manage configuration options for tools of the GnuPG system\n"
+"Syntax: @GPGCONF@ [options]\n"
+"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
"Syntaxe : gpgconf [options]\n"
"Gérer les options de configuration pour les outils du système GnuPG\n"
-msgid "usage: gpgconf [options] "
-msgstr "utilisation : gpgconf [options] "
-
msgid "Need one component argument"
msgstr "Un argument de composant nécessaire"
@@ -8093,6 +8194,94 @@ msgstr ""
"Vérifier une phrase de passe donnée sur l'entrée standard par rapport à "
"ficmotif\n"
+#, fuzzy
+#~| msgid "can't create '%s': %s\n"
+#~ msgid "can't create `%s': %s\n"
+#~ msgstr "impossible de créer « %s » : %s\n"
+
+#, fuzzy
+#~| msgid "can't open '%s': %s\n"
+#~ msgid "can't open `%s': %s\n"
+#~ msgstr "impossible d'ouvrir « %s » : %s\n"
+
+#~ msgid "enable ssh-agent emulation"
+#~ msgstr "activer l'émulation de ssh-agent"
+
+#~ msgid "Usage: gpg-agent [options] (-h for help)"
+#~ msgstr "Utilisation : gpg-agent [options] (-h pour l'aide)"
+
+#~ msgid "malformed GPG_AGENT_INFO environment variable\n"
+#~ msgstr "la variable d'environnement GPG_AGENT_INFO est mal définie\n"
+
+#~ msgid "error creating socket: %s\n"
+#~ msgstr "erreur de création de socket : %s\n"
+
+#~ msgid "host not found"
+#~ msgstr "hôte introuvable"
+
+#~ msgid "error loading '%s': %s\n"
+#~ msgstr "erreur de chargement de « %s » : %s\n"
+
+#~ msgid "deleting secret key not implemented\n"
+#~ msgstr "la suppression de clef secrète n'est pas implémentée\n"
+
+#~ msgid " (%d) ECDSA and ECDH\n"
+#~ msgstr " (%d) ECDSA et ECDH\n"
+
+#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+#~ msgstr "11 le traducteur a bien lu ce qu'il fallait :)"
+
+#~ msgid "[ revoked]"
+#~ msgstr "[ révoquée]"
+
+#~ msgid "[ expired]"
+#~ msgstr "[ expirée ]"
+
+#~ msgid "[ unknown]"
+#~ msgstr "[ inconnue]"
+
+#~ msgid "[ undef ]"
+#~ msgstr "[indéfinie]"
+
+#~ msgid "[marginal]"
+#~ msgstr "[marginale]"
+
+#~ msgid "[ full ]"
+#~ msgstr "[ totale ]"
+
+#~ msgid "[ultimate]"
+#~ msgstr "[ ultime ]"
+
+#~ msgid "undefined"
+#~ msgstr "indéfinie"
+
+#~ msgid "never"
+#~ msgstr "jamais"
+
+#~ msgid "marginal"
+#~ msgstr "marginale"
+
+#~ msgid "full"
+#~ msgstr "totale"
+
+#~ msgid "ultimate"
+#~ msgstr "ultime"
+
+#~ msgid "Usage: scdaemon [options] (-h for help)"
+#~ msgstr "Utilisation : scdaemon [options] (-h pour l'aide)"
+
+#~ msgid "Usage: gpgsm [options] [files] (-h for help)"
+#~ msgstr "Utilisation : gpgsm [options] [fichiers] (-h pour l'aide)"
+
+#~ msgid "usage: dirmngr [options] "
+#~ msgstr "utilisation : dirmngr [options] "
+
+#~ msgid "Usage: gpgconf [options] (-h for help)"
+#~ msgstr "Utilisation : gpgconf [options] (-h pour l'aide)"
+
+#~ msgid "usage: gpgconf [options] "
+#~ msgstr "utilisation : gpgconf [options] "
+
#~ msgid "too many entries in pk cache - disabled\n"
#~ msgstr "trop d'entrées dans le cache de clefs publiques — désactivé\n"
@@ -8782,12 +8971,6 @@ msgstr ""
#~ msgid "wrong secret key used"
#~ msgstr "mauvaise clef secrète utilisée"
-#~ msgid "not supported"
-#~ msgstr "non pris en charge"
-
-#~ msgid "bad key"
-#~ msgstr "mauvaise clef"
-
#~ msgid "file write error"
#~ msgstr "erreur d'écriture de fichier"
diff --git a/po/ja.po b/po/ja.po
index 86bd536..e0a984e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -97,11 +97,11 @@ msgid "ssh keys greater than %d bits are not supported\n"
msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
#, c-format
-msgid "can't create `%s': %s\n"
+msgid "can't create '%s': %s\n"
msgstr "'%s'が作成できません: %s\n"
#, c-format
-msgid "can't open `%s': %s\n"
+msgid "can't open '%s': %s\n"
msgstr "'%s'が開けません: %s\n"
#, c-format
@@ -282,12 +282,12 @@ msgstr ""
"@オプション:\n"
" "
-msgid "run in server mode (foreground)"
-msgstr "サーバ・モードで実行 (フォアグラウンド)"
-
msgid "run in daemon mode (background)"
msgstr "デーモン・モードで実行 (バックグラウンド)"
+msgid "run in server mode (foreground)"
+msgstr "サーバ・モードで実行 (フォアグラウンド)"
+
msgid "verbose"
msgstr "冗長"
@@ -336,14 +336,19 @@ msgstr "|N|N秒後に保持したPINを無効とする"
msgid "do not use the PIN cache when signing"
msgstr "署名に対してPINの保持を使わない"
-msgid "allow clients to mark keys as \"trusted\""
+#, fuzzy
+#| msgid "allow clients to mark keys as \"trusted\""
+msgid "disallow clients to mark keys as \"trusted\""
msgstr "クライアントが鍵に\"trusted\"マークをつけることを認める"
msgid "allow presetting passphrase"
msgstr "パスフレーズの事前設定を認める"
-msgid "enable ssh-agent emulation"
-msgstr "ssh-agentエミュレーションを有効とする"
+msgid "enable ssh support"
+msgstr ""
+
+msgid "enable putty support"
+msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr "|FILE|FILEに環境変数の設定も書き出す"
@@ -354,12 +359,18 @@ msgstr "|FILE|FILEに環境変数の設定も書き出す"
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "バグは <@EMAIL@> までご報告ください。\n"
-msgid "Usage: gpg-agent [options] (-h for help)"
-msgstr "使い方: gpg-agent [オプション] (ヘルプは -h)"
+#, fuzzy
+#| msgid "Usage: dirmngr [options] (-h for help)"
+msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
+msgstr "使い方: dirmngr [オプション] (ヘルプは -h)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: gpg-agent [options] [command [args]]\n"
+#| "Secret key management for GnuPG\n"
msgid ""
-"Syntax: gpg-agent [options] [command [args]]\n"
-"Secret key management for GnuPG\n"
+"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
+"Secret key management for @GNUPG@\n"
msgstr ""
"形式: gpg-agent [オプション] [コマンド [引数]]\n"
"GnuPGの秘密鍵の管理\n"
@@ -468,8 +479,10 @@ msgstr "%s %s 停止しました\n"
msgid "no gpg-agent running in this session\n"
msgstr "このセッションでgpg-agentは実行されていません\n"
-msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "GPG_AGENT_INFO環境変数が壊れています\n"
+#, fuzzy, c-format
+#| msgid "malformed DIRMNGR_INFO environment variable\n"
+msgid "malformed %s environment variable\n"
+msgstr "DIRMNGR_INFO環境変数が破壊されています\n"
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -636,6 +649,16 @@ msgstr "パスフレーズを変更する"
msgid "I'll change it later"
msgstr "後で変更する"
+#, fuzzy
+#| msgid "enable key"
+msgid "Delete key"
+msgstr "鍵を有効にする"
+
+msgid ""
+"Warning: This key is also listed for use with SSH!\n"
+"Deleting the key will may remove your ability toaccess remote machines."
+msgstr ""
+
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSAは8ビットの倍数のハッシュ長を必要とします\n"
@@ -694,13 +717,6 @@ msgstr "'%s'の実行エラー: 終了しました\n"
msgid "error getting exit code of process %d: %s\n"
msgstr "プロセス %d のexitコード取得エラー: %s\n"
-#, c-format
-msgid "error creating socket: %s\n"
-msgstr "ソケット作成エラー: %s\n"
-
-msgid "host not found"
-msgstr "ホストが見つかりません"
-
msgid "gpg-agent is not available in this session\n"
msgstr "このセッションでgpg-agentは無効です\n"
@@ -937,10 +953,6 @@ msgstr "Dirmngr利用可能"
msgid "No help available for '%s'."
msgstr "'%s'のヘルプはありません。"
-#, c-format
-msgid "can't open '%s': %s\n"
-msgstr "'%s'が開けません: %s\n"
-
msgid "ignoring garbage line"
msgstr "ガベージ行を無視します"
@@ -1003,14 +1015,6 @@ msgid "you found a bug ... (%s:%d)\n"
msgstr "あなたはバグを発見しました ... (%s:%d)\n"
#, c-format
-msgid "error loading '%s': %s\n"
-msgstr "'%s'の読込みエラー: %s\n"
-
-#, c-format
-msgid "please see %s for more information\n"
-msgstr "詳細は%sをご覧ください\n"
-
-#, c-format
msgid "conversion from '%s' to '%s' not available\n"
msgstr "'%s'から'%s'への変換は利用できません\n"
@@ -1031,10 +1035,6 @@ msgid "error writing to '%s': %s\n"
msgstr "'%s'の書き込みエラー: %s\n"
#, c-format
-msgid "can't create '%s': %s\n"
-msgstr "'%s'が作成できません: %s\n"
-
-#, c-format
msgid "removing stale lockfile (created by %d)\n"
msgstr "古い lockfile (%d により作成)を除去します\n"
@@ -1338,6 +1338,16 @@ msgstr " (3) 認証鍵\n"
msgid "Invalid selection.\n"
msgstr "無効な選択です。\n"
+#, fuzzy
+#| msgid "Please select the reason for the revocation:\n"
+msgid "Please select where to store the key:\n"
+msgstr "失効の理由を選択してください:\n"
+
+#, fuzzy, c-format
+#| msgid "read failed: %s\n"
+msgid "KEYTOCARD failed: %s\n"
+msgstr "read が失敗しました: %s\n"
+
msgid "quit this menu"
msgstr "このメニューを終了"
@@ -1428,8 +1438,18 @@ msgstr "この鍵を鍵リングから削除しますか? (y/N) "
msgid "This is a secret key! - really delete? (y/N) "
msgstr "これは秘密鍵です! 本当に削除しますか? (y/N) "
-msgid "deleting secret key not implemented\n"
-msgstr "秘密鍵の削除は実装されていません\n"
+#, fuzzy, c-format
+#| msgid "deleting certificate \"%s\" failed: %s\n"
+msgid "deleting secret %s failed: %s\n"
+msgstr "証明書'%s'の削除に失敗しました: %s\n"
+
+msgid "key"
+msgstr ""
+
+#, fuzzy
+#| msgid "Pubkey: "
+msgid "subkey"
+msgstr "公開鍵: "
#, c-format
msgid "deleting keyblock failed: %s\n"
@@ -1593,9 +1613,6 @@ msgstr " - スキップされました"
msgid "WARNING: nothing exported\n"
msgstr "*警告*: 何もエクスポートしていません\n"
-msgid "too many entries in pk cache - disabled\n"
-msgstr "pkキャッシュのエントリーが多すぎます - 使用禁止\n"
-
msgid "[User ID not found]"
msgstr "[ユーザIDが見つかりません]"
@@ -1670,6 +1687,16 @@ msgstr "公開鍵リングから鍵を削除"
msgid "remove keys from the secret keyring"
msgstr "秘密鍵リングから鍵を削除"
+#, fuzzy
+#| msgid "sign a key"
+msgid "quickly sign a key"
+msgstr "鍵に署名"
+
+#, fuzzy
+#| msgid "sign a key locally"
+msgid "quickly sign a key locally"
+msgstr "鍵へ内部的に署名"
+
msgid "sign a key"
msgstr "鍵に署名"
@@ -1771,11 +1798,18 @@ msgstr ""
" --list-keys [名前] 鍵を表示\n"
" --fingerprint [名前] フィンガー・プリントを表示\n"
-msgid "Usage: gpg [options] [files] (-h for help)"
+#, fuzzy
+#| msgid "Usage: gpg [options] [files] (-h for help)"
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "使い方: gpg [オプション] [ファイル] (ヘルプは -h)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: gpg [options] [files]\n"
+#| "Sign, check, encrypt or decrypt\n"
+#| "Default operation depends on the input data\n"
msgid ""
-"Syntax: gpg [options] [files]\n"
+"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
"Default operation depends on the input data\n"
msgstr ""
@@ -2470,13 +2504,13 @@ msgstr "鍵 %s: 秘密鍵はもうあります\n"
msgid "key %s: error sending to agent: %s\n"
msgstr "鍵 %s: エージェントへの送信エラー: %s\n"
+msgid "importing secret keys not allowed\n"
+msgstr "秘密鍵のインポートは禁止です\n"
+
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "鍵%s: 無効な暗号方式%dの秘密鍵です - スキップします\n"
-msgid "importing secret keys not allowed\n"
-msgstr "秘密鍵のインポートは禁止です\n"
-
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
@@ -2582,10 +2616,18 @@ msgid "key %s: direct key signature added\n"
msgstr "鍵%s: 直接鍵署名を追加\n"
#, c-format
+msgid "error creating keybox '%s': %s\n"
+msgstr "keybox'%s'の作成エラー: %s\n"
+
+#, c-format
msgid "error creating keyring '%s': %s\n"
msgstr "鍵リング'%s'の作成エラー: %s\n"
#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox'%s'が作成されました\n"
+
+#, c-format
msgid "keyring '%s' created\n"
msgstr "鍵リング'%s'ができました\n"
@@ -3060,6 +3102,26 @@ msgstr "更新に失敗しました: %s\n"
msgid "Key not changed so no update needed.\n"
msgstr "鍵は無変更なので更新は不要です。\n"
+#, fuzzy, c-format
+#| msgid "invalid fingerprint"
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "無効なフィンガー・プリント"
+
+#, fuzzy, c-format
+#| msgid "failed to get the fingerprint\n"
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "フィンガー・プリントの取得に失敗しました\n"
+
+#, fuzzy
+#| msgid "No such user ID.\n"
+msgid "No matching user IDs."
+msgstr "そのユーザIDはありません。\n"
+
+#, fuzzy
+#| msgid "Nothing to sign with key %s\n"
+msgid "Nothing to sign.\n"
+msgstr "鍵%sで署名すべきものはありません\n"
+
msgid "Digest: "
msgstr "ダイジェスト: "
@@ -3476,20 +3538,24 @@ msgstr " (%d) DSA (特性をあなた自身で設定)\n"
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (特性をあなた自身で設定)\n"
-#, c-format
-msgid " (%d) ECDSA and ECDH\n"
-msgstr " (%d) ECDSA と ECDH\n"
+#, fuzzy, c-format
+#| msgid " (%d) RSA\n"
+msgid " (%d) ECC\n"
+msgstr " (%d) RSA\n"
-#, c-format
-msgid " (%d) ECDSA (sign only)\n"
+#, fuzzy, c-format
+#| msgid " (%d) ECDSA (sign only)\n"
+msgid " (%d) ECC (sign only)\n"
msgstr " (%d) ECDSA (署名のみ)\n"
-#, c-format
-msgid " (%d) ECDSA (set your own capabilities)\n"
+#, fuzzy, c-format
+#| msgid " (%d) ECDSA (set your own capabilities)\n"
+msgid " (%d) ECC (set your own capabilities)\n"
msgstr " (%d) ECDSA (特性をあなた自身で設定)\n"
-#, c-format
-msgid " (%d) ECDH (encrypt only)\n"
+#, fuzzy, c-format
+#| msgid " (%d) ECDH (encrypt only)\n"
+msgid " (%d) ECC (encrypt only)\n"
msgstr " (%d) ECDH (暗号化のみ)\n"
#, c-format
@@ -3525,6 +3591,11 @@ msgstr "要求された鍵長は%uビット\n"
msgid "rounded to %u bits\n"
msgstr "%uビットに切り上げます\n"
+#, fuzzy
+#| msgid "Please select what kind of key you want:\n"
+msgid "Please select which elliptic curve you want:\n"
+msgstr "ご希望の鍵の種類を選択してください:\n"
+
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4025,6 +4096,18 @@ msgstr "スタンドアロン失効 - \"gpg --import\"を使って適用して
msgid "no signature found\n"
msgstr "署名が見つかりません\n"
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "\"%s\"からの*不正な*署名"
+
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "\"%s\"からの期限切れの署名"
+
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "\"%s\"からの正しい署名"
+
msgid "signature verification suppressed\n"
msgstr "署名の検証を省略\n"
@@ -4046,18 +4129,6 @@ msgstr "%sに%s鍵ID %sで施された署名\n"
msgid "Key available at: "
msgstr "以下に鍵があります: "
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "\"%s\"からの*不正な*署名"
-
-#, c-format
-msgid "Expired signature from \"%s\""
-msgstr "\"%s\"からの期限切れの署名"
-
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "\"%s\"からの正しい署名"
-
msgid "[uncertain]"
msgstr "[不確定]"
@@ -4073,8 +4144,9 @@ msgstr "期限切れの署名 %s\n"
msgid "Signature expires %s\n"
msgstr "この署名は%sで期限切れとなります\n"
-#, c-format
-msgid "%s signature, digest algorithm %s\n"
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s署名、ダイジェスト・アルゴリズム %s\n"
msgid "binary"
@@ -4266,24 +4338,60 @@ msgstr "%uビット%s鍵, ID %s作成日付は%s"
msgid " (subkey on main key ID %s)"
msgstr " (主鍵ID %s の副鍵)"
-msgid ""
-"Please enter the passphrase to unlock the secret key for the OpenPGP "
-"certificate:"
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to unlock the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
msgstr ""
"OpenPGP証明書の秘密鍵のロックを解除するためにパスフレーズを入力してください:"
-msgid ""
-"Please enter the passphrase to import the secret key for the OpenPGP "
-"certificate:"
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to import the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to import the OpenPGP secret key:"
msgstr ""
"OpenPGP証明書の秘密鍵をインポートするためにパスフレーズを入力してください:"
-#, c-format
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to import the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
+msgstr ""
+"OpenPGP証明書の秘密鍵をインポートするためにパスフレーズを入力してください:"
+
+#, fuzzy
+#| msgid ""
+#| "Please enter the passphrase to import the secret key for the OpenPGP "
+#| "certificate:"
+msgid "Please enter the passphrase to export the OpenPGP secret key:"
+msgstr ""
+"OpenPGP証明書の秘密鍵をインポートするためにパスフレーズを入力してください:"
+
+#, fuzzy
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
+msgstr "選択した鍵を本当に削除しますか? (y/N) "
+
+#, fuzzy
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid "Do you really want to permanently delete the OpenPGP secret key:"
+msgstr "選択した鍵を本当に削除しますか? (y/N) "
+
+#, fuzzy, c-format
+#| msgid ""
+#| "%s\n"
+#| "\"%.*s\"\n"
+#| "%u-bit %s key, ID %s,\n"
+#| "created %s%s.\n"
msgid ""
"%s\n"
"\"%.*s\"\n"
"%u-bit %s key, ID %s,\n"
"created %s%s.\n"
+"%s"
msgstr ""
"%s\n"
"\"%.*s\"\n"
@@ -4699,6 +4807,10 @@ msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "*警告*: 署名副鍵%sは、相互証明されてません\n"
#, c-format
+msgid "please see %s for more information\n"
+msgstr "詳細は%sをご覧ください\n"
+
+#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "*警告*: 無効な相互証明が、署名副鍵%sにあります\n"
@@ -4728,6 +4840,11 @@ msgstr "*注意*: 署名鍵%sは%sに期限切れとなります\n"
msgid "NOTE: signature key %s has been revoked\n"
msgstr "*注意*: 鍵 %s は失効済みです\n"
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s署名、ダイジェスト・アルゴリズム %s\n"
+
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "不明のクリティカル・ビットにより、鍵%sの署名を不正とみなします\n"
@@ -4989,53 +5106,6 @@ msgstr "不明の信用モデル (%d) は使えません - %s信用モデルを
msgid "using %s trust model\n"
msgstr "%s信用モデルを使用\n"
-#. TRANSLATORS: these strings are similar to those in
-#. trust_value_to_string(), but are a fixed length. This is needed to
-#. make attractive information listings where columns line up
-#. properly. The value "10" should be the length of the strings you
-#. choose to translate to. This is the length in printable columns.
-#. It gets passed to atoi() so everything after the number is
-#. essentially a comment and need not be translated. Either key and
-#. uid are both NULL, or neither are NULL.
-msgid "10 translator see trustdb.c:uid_trust_string_fixed"
-msgstr "10"
-
-msgid "[ revoked]"
-msgstr "[ 失効 ]"
-
-msgid "[ expired]"
-msgstr "[期限切れ]"
-
-msgid "[ unknown]"
-msgstr "[ 不明 ]"
-
-msgid "[ undef ]"
-msgstr "[ 未定義 ]"
-
-msgid "[marginal]"
-msgstr "[まぁまぁ]"
-
-msgid "[ full ]"
-msgstr "[ 充分 ]"
-
-msgid "[ultimate]"
-msgstr "[ 究極 ]"
-
-msgid "undefined"
-msgstr "未定義"
-
-msgid "never"
-msgstr "無期限"
-
-msgid "marginal"
-msgstr "まぁまぁ"
-
-msgid "full"
-msgstr "充分"
-
-msgid "ultimate"
-msgstr "究極"
-
msgid "no need for a trustdb check\n"
msgstr "信用データベースの検査は、不要です\n"
@@ -5190,6 +5260,11 @@ msgstr "応答にRSAの法(modulus)が含まれていません\n"
msgid "response does not contain the RSA public exponent\n"
msgstr "応答にRSA公開指数が含まれていません\n"
+#, fuzzy
+#| msgid "response does not contain the RSA public exponent\n"
+msgid "response does not contain the EC public point\n"
+msgstr "応答にRSA公開指数が含まれていません\n"
+
#, c-format
msgid "using default PIN as %s\n"
msgstr "デフォルトPINを%sとして使います\n"
@@ -5365,12 +5440,18 @@ msgstr "管理カード・コマンドの使用を拒否"
msgid "use variable length input for pinpad"
msgstr "ピンパッドの可変長入力を使う"
-msgid "Usage: scdaemon [options] (-h for help)"
-msgstr "使い方: scdaemon [オプション] (ヘルプは -h)"
+#, fuzzy
+#| msgid "Usage: dirmngr [options] (-h for help)"
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "使い方: dirmngr [オプション] (ヘルプは -h)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: scdaemon [options] [command [args]]\n"
+#| "Smartcard daemon for GnuPG\n"
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
-"Smartcard daemon for GnuPG\n"
+"Smartcard daemon for @GNUPG@\n"
msgstr ""
"形式: scdaemon [オプション] [コマンド [引数]]\n"
"GnuPGのSmartcardデーモン\n"
@@ -5923,11 +6004,18 @@ msgstr "|NAME|暗号アルゴリズムにNAMEを使用"
msgid "|NAME|use message digest algorithm NAME"
msgstr "|NAME|ダイジェスト・アルゴリズムにNAMEを使用"
-msgid "Usage: gpgsm [options] [files] (-h for help)"
-msgstr "使い方: gpgsm [オプション] [ファイル] (ヘルプは -h)"
+#, fuzzy
+#| msgid "Usage: gpg [options] [files] (-h for help)"
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "使い方: gpg [オプション] [ファイル] (ヘルプは -h)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: gpgsm [options] [files]\n"
+#| "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+#| "Default operation depends on the input data\n"
msgid ""
-"Syntax: gpgsm [options] [files]\n"
+"Syntax: @GPGSM@ [options] [files]\n"
"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
"Default operation depends on the input data\n"
msgstr ""
@@ -5994,17 +6082,9 @@ msgstr "証明書のインポート・エラー: %s\n"
msgid "error reading input: %s\n"
msgstr "入力読み込みエラー: %s\n"
-#, c-format
-msgid "error creating keybox '%s': %s\n"
-msgstr "keybox'%s'の作成エラー: %s\n"
-
msgid "you may want to start the gpg-agent first\n"
msgstr "まず gpg-agent を開始したいでしょう\n"
-#, c-format
-msgid "keybox '%s' created\n"
-msgstr "keybox'%s'が作成されました\n"
-
msgid "failed to get the fingerprint\n"
msgstr "フィンガー・プリントの取得に失敗しました\n"
@@ -6333,7 +6413,8 @@ msgid "invalid formatted checksum for '%s'\n"
msgstr "'%s'に対する無効な形式のチェックサム\n"
msgid "too many open cache files; can't open anymore\n"
-msgstr "キャッシュ・ファイルを多くオープンしすぎです。これ以上オープンできません\n"
+msgstr ""
+"キャッシュ・ファイルを多くオープンしすぎです。これ以上オープンできません\n"
#, c-format
msgid "opening cache file '%s'\n"
@@ -6382,7 +6463,8 @@ msgstr "発行者ID%sに対する利用可能なCRLが使用できません\n"
#, c-format
msgid "cached CRL for issuer id %s tampered; we need to update\n"
-msgstr "発行者ID%sに対するキャッシュされたCRLが変更されています。更新が必要です\n"
+msgstr ""
+"発行者ID%sに対するキャッシュされたCRLが変更されています。更新が必要です\n"
msgid "WARNING: invalid cache record length for S/N "
msgstr "**警告**: S/Nに対する無効なキャッシュ・レコード長"
@@ -6494,7 +6576,9 @@ msgstr "一時キャッシュ・ファイル'%s'のクローズ・エラー: %s\
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
-msgstr "**警告**: 新しいCRLはまだ古すぎます。%sに期限がきています - それでも読み込みます\n"
+msgstr ""
+"**警告**: 新しいCRLはまだ古すぎます。%sに期限がきています - それでも読み込み"
+"ます\n"
#, c-format
msgid "new CRL still too old; it expired on %s\n"
@@ -6520,7 +6604,8 @@ msgid ""
"updating the DIR file failed - cache entry will get lost with the next "
"program start\n"
msgstr ""
-"DIRファイルの更新の失敗 - キャッシュ・エントリは次のプログラムの開始で失われます\n"
+"DIRファイルの更新の失敗 - キャッシュ・エントリは次のプログラムの開始で失われ"
+"ます\n"
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
@@ -6529,13 +6614,11 @@ msgstr "CRLダンプの開始 (%s から取得)\n"
msgid ""
" ERROR: The CRL will not be used because it was still too old after an "
"update!\n"
-msgstr ""
-"*エラー*: CRLは使用されません。更新後でも、古すぎるからです!\n"
+msgstr "*エラー*: CRLは使用されません。更新後でも、古すぎるからです!\n"
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
-msgstr ""
-"*エラー*: CRLは不明なクリティカル拡張のため使用されません!\n"
+msgstr "*エラー*: CRLは不明なクリティカル拡張のため使用されません!\n"
msgid " ERROR: The CRL will not be used\n"
msgstr "*エラー*: CRLは使用されません\n"
@@ -6708,9 +6791,6 @@ msgstr "あきらかにdirmngrが動いていません\n"
msgid "no running dirmngr - starting one\n"
msgstr "dirmngrが動いていません - 開始します\n"
-msgid "malformed DIRMNGR_INFO environment variable\n"
-msgstr "DIRMNGR_INFO環境変数が破壊されています\n"
-
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr "dirmngrプロトコル・バージョン%dはサポートされていません\n"
@@ -6805,6 +6885,9 @@ msgstr "|FPR|FPRで署名されたOCSPレスポンス"
msgid "|N|do not return more than N items in one query"
msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
+msgid "|FILE|use the CA certifciates in FILE for HKP over TLS"
+msgstr ""
+
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@ -6813,12 +6896,18 @@ msgstr ""
"@\n"
"(コマンドとオプション全部の一覧は、\"info\" マニュアルをご覧ください)\n"
-msgid "Usage: dirmngr [options] (-h for help)"
+#, fuzzy
+#| msgid "Usage: dirmngr [options] (-h for help)"
+msgid "Usage: @DIRMNGR@ [options] (-h for help)"
msgstr "使い方: dirmngr [オプション] (ヘルプは -h)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: dirmngr [options] [command [args]]\n"
+#| "LDAP and OCSP access for GnuPG\n"
msgid ""
-"Syntax: dirmngr [options] [command [args]]\n"
-"LDAP and OCSP access for GnuPG\n"
+"Syntax: @DIRMNGR@ [options] [command [args]]\n"
+"LDAP and OCSP access for @GNUPG@\n"
msgstr ""
"形式: dirmngr [オプション] [コマンド [引数]]\n"
"GnuPGのLDAPとOCSPアクセス\n"
@@ -6827,8 +6916,10 @@ msgstr ""
msgid "valid debug levels are: %s\n"
msgstr "有効なdebugレベルは: %s\n"
-msgid "usage: dirmngr [options] "
-msgstr "使い方: dirmngr [オプション] "
+#, fuzzy, c-format
+#| msgid "usage: gpgsm [options] "
+msgid "usage: %s [options] "
+msgstr "使い方: gpgsm [オプション] "
msgid "colons are not allowed in the socket name\n"
msgstr "コロンはソケット名に許されません\n"
@@ -7300,6 +7391,11 @@ msgstr "16進でエンコードしてデータ出力を表示する"
msgid "decode received data lines"
msgstr "受信したデータ行をデコードする"
+#, fuzzy
+#| msgid "can't connect to the dirmngr: %s\n"
+msgid "connect to the dirmngr"
+msgstr "dirmngrへ接続できません: %s\n"
+
msgid "|NAME|connect to Assuan socket NAME"
msgstr "|NAME|Assuanのソケット名NAMEに接続する"
@@ -7318,11 +7414,17 @@ msgstr "|FILE|起動時にFILEからコマンドを実行する"
msgid "run /subst on startup"
msgstr "起動時に /subst を実行する"
-msgid "Usage: gpg-connect-agent [options] (-h for help)"
+#, fuzzy
+#| msgid "Usage: gpg-connect-agent [options] (-h for help)"
+msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
msgstr "使い方: gpg-connect-agent [オプション] (ヘルプは -h)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: gpg-connect-agent [options]\n"
+#| "Connect to a running agent and send commands\n"
msgid ""
-"Syntax: gpg-connect-agent [options]\n"
+"Syntax: @GPG at -connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
"形式: gpg-connect-agent [オプション]\n"
@@ -7470,6 +7572,11 @@ msgstr "ディレクトリ・マネージャ"
msgid "PIN and Passphrase Entry"
msgstr "PINとパスフレーズの入力"
+#, fuzzy
+#| msgid "Component not found"
+msgid "Component not suitable for launching"
+msgstr "コンポーネントが見つかりません"
+
#, c-format
msgid "External verification of component %s failed"
msgstr "コンポーネント%sの外部の検証が失敗しました"
@@ -7495,7 +7602,9 @@ msgstr "|COMPONENT|オプションをチェックする"
msgid "apply global default values"
msgstr "グローバル・デフォルト値を適用する"
-msgid "get the configuration directories for gpgconf"
+#, fuzzy
+#| msgid "get the configuration directories for gpgconf"
+msgid "get the configuration directories for @GPGCONF@"
msgstr "gpgconfのためにコンフィグレーション・ディレクトリを取得する"
msgid "list global configuration file"
@@ -7507,6 +7616,11 @@ msgstr "グローバルのコンフィグレーション・ファイルをチェ
msgid "reload all or a given component"
msgstr "すべて、あるいは指定されたコンポーネントをリロードする"
+#, fuzzy
+#| msgid "kill a given component"
+msgid "launch a given component"
+msgstr "指定されたコンポーネントをkillする"
+
msgid "kill a given component"
msgstr "指定されたコンポーネントをkillする"
@@ -7516,19 +7630,22 @@ msgstr "出力ファイルとして使用"
msgid "activate changes at runtime, if possible"
msgstr "可能な場合、実行時に変更を有効とする"
-msgid "Usage: gpgconf [options] (-h for help)"
-msgstr "使い方: gpgconf [オプション] (ヘルプは -h)"
+#, fuzzy
+#| msgid "Usage: dirmngr [options] (-h for help)"
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "使い方: dirmngr [オプション] (ヘルプは -h)"
+#, fuzzy
+#| msgid ""
+#| "Syntax: gpgconf [options]\n"
+#| "Manage configuration options for tools of the GnuPG system\n"
msgid ""
-"Syntax: gpgconf [options]\n"
-"Manage configuration options for tools of the GnuPG system\n"
+"Syntax: @GPGCONF@ [options]\n"
+"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
"形式: gpgconf [オプション]\n"
"GnuPGシステムのツールに対しコンフィグレーション・オプションを管理する\n"
-msgid "usage: gpgconf [options] "
-msgstr "使い方: gpgconf [オプション] "
-
msgid "Need one component argument"
msgstr "一つコンポーネント引数が必要です"
@@ -7681,3 +7798,90 @@ msgid ""
msgstr ""
"形式: gpg-check-pattern [オプション] パターンファイル\n"
"パターンファイルに対して標準入力のパスフレーズを確認する\n"
+
+#~ msgid "can't create `%s': %s\n"
+#~ msgstr "'%s'が作成できません: %s\n"
+
+#~ msgid "can't open `%s': %s\n"
+#~ msgstr "'%s'が開けません: %s\n"
+
+#~ msgid "enable ssh-agent emulation"
+#~ msgstr "ssh-agentエミュレーションを有効とする"
+
+#~ msgid "Usage: gpg-agent [options] (-h for help)"
+#~ msgstr "使い方: gpg-agent [オプション] (ヘルプは -h)"
+
+#~ msgid "malformed GPG_AGENT_INFO environment variable\n"
+#~ msgstr "GPG_AGENT_INFO環境変数が壊れています\n"
+
+#~ msgid "error creating socket: %s\n"
+#~ msgstr "ソケット作成エラー: %s\n"
+
+#~ msgid "host not found"
+#~ msgstr "ホストが見つかりません"
+
+#~ msgid "error loading '%s': %s\n"
+#~ msgstr "'%s'の読込みエラー: %s\n"
+
+#~ msgid "deleting secret key not implemented\n"
+#~ msgstr "秘密鍵の削除は実装されていません\n"
+
+#~ msgid "too many entries in pk cache - disabled\n"
+#~ msgstr "pkキャッシュのエントリーが多すぎます - 使用禁止\n"
+
+#~ msgid " (%d) ECDSA and ECDH\n"
+#~ msgstr " (%d) ECDSA と ECDH\n"
+
+#~ msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+#~ msgstr "10"
+
+#~ msgid "[ revoked]"
+#~ msgstr "[ 失効 ]"
+
+#~ msgid "[ expired]"
+#~ msgstr "[期限切れ]"
+
+#~ msgid "[ unknown]"
+#~ msgstr "[ 不明 ]"
+
+#~ msgid "[ undef ]"
+#~ msgstr "[ 未定義 ]"
+
+#~ msgid "[marginal]"
+#~ msgstr "[まぁまぁ]"
+
+#~ msgid "[ full ]"
+#~ msgstr "[ 充分 ]"
+
+#~ msgid "[ultimate]"
+#~ msgstr "[ 究極 ]"
+
+#~ msgid "undefined"
+#~ msgstr "未定義"
+
+#~ msgid "never"
+#~ msgstr "無期限"
+
+#~ msgid "marginal"
+#~ msgstr "まぁまぁ"
+
+#~ msgid "full"
+#~ msgstr "充分"
+
+#~ msgid "ultimate"
+#~ msgstr "究極"
+
+#~ msgid "Usage: scdaemon [options] (-h for help)"
+#~ msgstr "使い方: scdaemon [オプション] (ヘルプは -h)"
+
+#~ msgid "Usage: gpgsm [options] [files] (-h for help)"
+#~ msgstr "使い方: gpgsm [オプション] [ファイル] (ヘルプは -h)"
+
+#~ msgid "usage: dirmngr [options] "
+#~ msgstr "使い方: dirmngr [オプション] "
+
+#~ msgid "Usage: gpgconf [options] (-h for help)"
+#~ msgstr "使い方: gpgconf [オプション] (ヘルプは -h)"
+
+#~ msgid "usage: gpgconf [options] "
+#~ msgstr "使い方: gpgconf [オプション] "
commit 533ff0ab56dd6dfcab4bb2ef5c7755b62d158007
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jun 5 16:20:44 2014 +0200
Update README file.
--
The copyright list in AUTHORS as been compiled from a distribution
tarball.
diff --git a/AUTHORS b/AUTHORS
index c9a0bc0..f64d17f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,35 @@
Program: GnuPG
-Homepage: http://www.gnupg.org
+Homepage: https://www.gnupg.org
Maintainer: Werner Koch <wk at gnupg.org>
Bug reports: http://bugs.gnupg.org
Security related bug reports: <security at gnupg.org>
License: GPLv3+
+GnuPG is free software. See the files COPYING for copying conditions.
+License copyright years may be listed using range notation, e.g.,
+2000-2013, indicating that every year in the range, inclusive, is a
+copyrightable year that would otherwise be listed individually.
+
+List of Copyright holders
+=========================
+
+ Copyright (C) 1997-1998, 2013-2014 Werner Koch
+ Copyright (C) 1994-2013 Free Software Foundation, Inc.
+ Copyright (C) 2003-2013 g10 Code GmbH
+ Copyright (C) 2002 Klarälvdalens Datakonsult AB
+ Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper <drepper at gnu.ai.mit.edu>
+ Copyright (C) 1994 X Consortium
+ Copyright (C) 1998 by The Internet Society.
+ Copyright (C) 1998-2004 The OpenLDAP Foundation
+ Copyright (C) 1998-2004 Kurt D. Zeilenga.
+ Copyright (C) 1998-2004 Net Boolean Incorporated.
+ Copyright (C) 2001-2004 IBM Corporation.
+ Copyright (C) 1999-2003 Howard Y.H. Chu.
+ Copyright (C) 1999-2003 Symas Corporation.
+ Copyright (C) 1998-2003 Hallvard B. Furuseth.
+ Copyright (C) 1992-1996 Regents of the University of Michigan.
+
+
Authors with a FSF copyright assignment
=======================================
@@ -181,28 +206,15 @@ or later.
Note that some files are under a combination of the GNU Lesser General
Public License, version 3 and the GNU General Public License, version
2. A few other files carry the all permissive license note as found
-at the bottom of this file. Certain files in keyserver/ allow one
-specific exception:
-
- In addition, as a special exception, the Free Software Foundation
- gives permission to link the code of the keyserver helper tools:
- gpgkeys_ldap, gpgkeys_curl and gpgkeys_hkp with the OpenSSL
- project's "OpenSSL" library (or with modified versions of it that
- use the same license as the "OpenSSL" library), and distribute the
- linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If
- you modify this file, you may extend this exception to your version
- of the file, but you are not obligated to do so. If you do not
- wish to do so, delete this exception statement from your version.
-
-Note that the gpgkeys_* binaries are currently installed under the
-name gpg2keys_*.
+at the bottom of this file.
+
=========
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008, 2009, 2010, 2011,
2012, 2013 Free Software Foundation, Inc.
+ Copyright 1997, 1998, 2013, 2014 Werner Koch
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
diff --git a/NEWS b/NEWS
index 38c5391..a5a0d53 100644
--- a/NEWS
+++ b/NEWS
@@ -1,51 +1,84 @@
Noteworthy changes in version 2.1.0-betaN (unreleased)
-----------------------------------------------------
- * GPG now accepts a space separated fingerprint as a user ID. This
+ * gpg: Add experimental signature support using curve Ed25519 and
+ with a patched Libgcrypt also encryption support with Curve25519.
+
+ * gpg: Allow use of Brainpool curves.
+
+ * gpg: Accepts a space separated fingerprint as user ID. This
allows to copy and paste the fingerprint from the key listing.
- * The GNU Pth library has been replaced by the new nPth library.
+ * gpg: The hash algorithm is now printed for signature records in key
+ listings.
- * By default the users are now asked via the Pinentry whether they
- trust an X.509 root key. To prohibit interactive marking of such
- keys, the new option --no-allow-mark-trusted may be used.
+ * gpg: Reject signatures made using the MD5 hash algorithm unless the
+ new option --allow-weak-digest-algos or --pgp2 are given.
- * The included ssh agent does now support ECDSA keys.
+ * gpg: Print a warning if the Gnome-Keyring-Daemon intercepts the
+ communication with the gpg-agent.
- * The new option --enable-putty-support allows gpg-agent on Windows
- to act as a Pageant replacement with full smartcard support.
+ * gpg: Changed the format of key listings. To revert to the old
+ format the option --legacy-list-mode is available.
- * Removed support for the original HKP keyserver which is not anymore
- used by any site.
+ * gpg: New option --pinentry-mode.
- * The hash algorithm is now printed for sig records in key listings.
+ * gpg: Fixed decryption using an OpenPGP card.
- * New option --pinentry-mode for GPG.
+ * gpg: Fixed bug with deeply nested compressed packets.
- * New option --enable-pinpad-varlen for scdaemon.
+ * gpg: Only the major version number is by default included in the
+ armored output.
- * New option --with-secret for GPG and GPGSM.
+ * gpg: Do not create a trustdb file if --trust-model=always is used.
- * Rename option --disable-pinpad for scdaemon (was: --disable-keypad).
+ * gpg: Protect against rogue keyservers sending secret keys.
- * Better support fo CCID readers. Now, internal CCID driver supports
- readers with no auto configuration feature.
+ * gpg: The format of the fallback key listing ("gpg KEYFILE") is now
+ more aligned to the regular key listing ("gpg -k").
- * Support installation as portable application under Windows.
+ * gpg: The option--show-session-key prints its output now before the
+ decryption of the bulk message starts.
+
+ * gpg: New %U expando for the photo viewer.
+
+ * gpg,gpgsm: New option --with-secret.
+
+ * gpgsm: By default the users are now asked via the Pinentry whether
+ they trust an X.509 root key. To prohibit interactive marking of
+ such keys, the new option --no-allow-mark-trusted may be used.
+
+ * gpgsm: New commands to export a secret RSA key in PKCS#1 or PKCS#8
+ format.
+
+ * gpgsm: Improved handling of re-issued CA certificates.
- * Fixed GPG to decrypt using an OpenPGP card.
+ * agent: The included ssh agent does now support ECDSA keys.
- * Fixed bug with deeply nested compressed packets.
+ * agent: New option --enable-putty-support to allow gpg-agent on
+ Windows to act as a Pageant replacement with full smartcard support.
- * Only the major version number is by default included in the armored
- output.
+ * scdaemon: New option --enable-pinpad-varlen.
- * Do not create a trustdb file if --trust-model=always is used.
+ * scdaemon: Various fixes for pinpad equipped card readers.
- * Protect against rogue keyservers sending secret keys.
+ * scdaemon: Rename option --disable-pinpad (was --disable-keypad).
+
+ * scdaemon: Better support fo CCID readers. Now, internal CCID
+ driver supports readers with no auto configuration feature.
+
+ * dirmngr: Removed support for the original HKP keyserver which is
+ not anymore used by any site.
+
+ * dirmngr: Improved support for keyserver pools.
+
+ * tools: New option --dirmngr for gpg-connect-agent.
+
+ * The GNU Pth library has been replaced by the new nPth library.
+
+ * Support installation as portable application under Windows.
- * GPGSM can now be used to export a secret RSA key in PKCS#1 or
- PKCS#8 format.
+ * All kind of other improvements - see the git log.
Noteworthy changes in version 2.1.0beta3 (2011-12-20)
@@ -53,7 +86,7 @@ Noteworthy changes in version 2.1.0beta3 (2011-12-20)
* Fixed regression in GPG's secret key export function.
- * Allow generation of card keys up to 4096 bit.
+ * Allowj generation of card keys up to 4096 bit.
* Support the SSH confirm flag.
diff --git a/README b/README
index fd20d40..d5cd727 100644
--- a/README
+++ b/README
@@ -4,17 +4,16 @@
THIS IS A DEVELOPMENT VERSION AND NOT INTENDED FOR REGULAR USE.
- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008, 2009, 2010, 2011, 2012,
- 2013 Free Software Foundation, Inc.
+ Copyright 1997-1998, 2013-2014 Werner Koch
+ Copyright 1998-2013 Free Software Foundation, Inc.
INTRODUCTION
============
-GnuPG is GNU's tool for secure communication and data storage. It can
-be used to encrypt data and to create digital signatures. It includes
-an advanced key management facility and is compliant with the proposed
+GnuPG is a tool for secure communication and data storage. It can be
+used to encrypt data and to create digital signatures. It includes an
+advanced key management facility and is compliant with the proposed
OpenPGP Internet standard as described in RFC4880 and the S/MIME
standard as described by several RFCs.
@@ -23,9 +22,9 @@ License. See the file COPYING for details. GnuPG works best on
GNU/Linux or *BSD systems. Most other Unices are also supported but
are not as well tested as the Free Unices.
-GnuPG 2.0 is the stable version of GnuPG integrating support for
-OpenPGP and S/MIME. It does not conflict with an installed 1.4
-OpenPGP-only version.
+GnuPG-2 is the stable version of GnuPG integrating support for OpenPGP
+and S/MIME. It does not conflict with an installed 1.4 OpenPGP-only
+version.
BUILD INSTRUCTIONS
@@ -42,6 +41,10 @@ GnuPG 2.1 depends on the following packages:
You should get the latest versions of course, the GnuPG configure
script complains if a version is not sufficient.
+For some advanced features several other libraries are required. The
+configure script prints diagnostic messages if one of these libraries
+is not available and a feature will not be available..
+
You also need the Pinentry package for most functions of GnuPG;
however it is not a build requirement. Pinentry is available at
ftp://ftp.gnupg.org/gcrypt/pinentry/ .
@@ -60,12 +63,12 @@ As with all packages, you just have to do
(Before doing install you might need to become root.)
If everything succeeds, you have a working GnuPG with support for
-S/MIME and smartcards. Note that there is no binary gpg but a gpg2 so
-that this package won't conflict with a GnuPG 1.4 installation. gpg2
-behaves just like gpg.
+OpenPGP, S/MIME, ssh-agent, and smartcards. Note that there is no
+binary gpg but a gpg2 so that this package won't conflict with a GnuPG
+1.4 installation. gpg2 behaves just like gpg.
-In case of problem please ask on gnupg-users at gnupg.org mailing list
-for advise.
+In case of problem please ask on the gnupg-users at gnupg.org mailing
+list for advise.
Note that the PKITS tests are always skipped unless you copy the PKITS
test data file into the tests/pkits directory. There is no need to
@@ -138,10 +141,11 @@ dependency on other modules at run and build time.
HOW TO GET MORE INFORMATION
===========================
-The primary WWW page is "http://www.gnupg.org"
+The primary WWW page is "https://www.gnupg.org"
+ or using TOR "http://ic6au7wa3f6naxjq.onion"
The primary FTP site is "ftp://ftp.gnupg.org/gcrypt/"
-See http://www.gnupg.org/download/mirrors.html for a list of mirrors
+See https://www.gnupg.org/download/mirrors.html for a list of mirrors
and use them if possible. You may also find GnuPG mirrored on some of
the regular GNU mirrors.
@@ -178,13 +182,11 @@ The English and German mailing lists are watched by the authors and we
try to answer questions when time allows us to do so.
Commercial grade support for GnuPG is available; for a listing of
-offers see http://www.gnupg.org/service.html . The driving force
-behind the development of GnuPG is the company of its principal
-author, Werner Koch. Maintenance and improvement of GnuPG and related
-software takes up most of their resources. To allow him to continue
-his work he asks to either purchase a support contract, engage them
-for custom enhancements, or to donate money. See http://g10code.com .
-
+offers see https://www.gnupg.org/service.html . Maintaining and
+improving GnuPG is costly. Since 2001, g10 Code GmbH, a German
+company owned and headed by GnuPG's principal author Werner Koch, is
+bearing the majority of these costs. To help them carry on this work,
+they need your support. See https://gnupg.org/donate/ .
This file is Free Software; as a special exception the authors gives
unlimited permission to copy and/or distribute it, with or without
commit 23712e69d3f97df9d789325f1a2f2f61e7d5bbb4
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jun 5 13:44:40 2014 +0200
Remove keyserver helper code.
* configure.ac: Remove keyserver helper related stuff.
* Makefile.am (SUBDIRS): Remove keyserver.
* keyserver/Makefile.am: Remove.
--
The dirmngr is used instead of the keyserver helpers. Thus there is
more need to distribute the old code. We keep it in the repo for
references, though.
diff --git a/Makefile.am b/Makefile.am
index 3b79226..2d07ad2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,12 +40,8 @@ endif
if BUILD_GPG
gpg = g10
-if !HAVE_W32CE_SYSTEM
-keyserver =
-endif
else
gpg =
-keyserver =
endif
if BUILD_GPGSM
sm = sm
@@ -90,7 +86,7 @@ tests =
endif
SUBDIRS = m4 gl common ${kbx} \
- ${gpg} ${keyserver} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
+ ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
${tools} po ${doc} ${tests}
dist_doc_DATA = README
diff --git a/configure.ac b/configure.ac
index ae42f7e..2c613a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,6 @@ use_zip=yes
use_bzip2=yes
use_exec=yes
use_trust_models=yes
-disable_keyserver_path=no
card_support=yes
use_ccid_driver=yes
use_standard_socket=yes
@@ -313,61 +312,6 @@ if test "$use_exec" = yes ; then
fi],withval=no)
AC_MSG_RESULT($withval)
fi
-
- AC_MSG_CHECKING([whether to enable external keyserver helpers])
- AC_ARG_ENABLE(keyserver-helpers,
- [ --disable-keyserver-helpers disable all external keyserver support],
- [if test "$enableval" = no ; then
- AC_DEFINE(DISABLE_KEYSERVER_HELPERS,1,
- [define to disable keyserver helpers])
- fi],enableval=yes)
- gnupg_cv_enable_keyserver_helpers=$enableval
- AC_MSG_RESULT($enableval)
-
- if test "$gnupg_cv_enable_keyserver_helpers" = yes ; then
- # LDAP is defined only after we confirm the library is available later
- AC_MSG_CHECKING([whether LDAP keyserver support is requested])
- AC_ARG_ENABLE(ldap,
- AC_HELP_STRING([--disable-ldap],[disable LDAP keyserver interface only]),
- try_ks_ldap=$enableval, try_ks_ldap=yes)
- AC_MSG_RESULT($try_ks_ldap)
-
- AC_MSG_CHECKING([whether HKP keyserver support is requested])
- AC_ARG_ENABLE(hkp,
- AC_HELP_STRING([--disable-hkp],[disable HKP keyserver interface only]),
- try_hkp=$enableval, try_hkp=yes)
- AC_MSG_RESULT($try_hkp)
-
- AC_MSG_CHECKING([whether finger key fetching support is requested])
- AC_ARG_ENABLE(finger,
- AC_HELP_STRING([--disable-finger],
- [disable finger key fetching interface only]),
- try_finger=$enableval, try_finger=yes)
- AC_MSG_RESULT($try_finger)
-
- AC_MSG_CHECKING([whether generic object key fetching support is requested])
- AC_ARG_ENABLE(generic,
- AC_HELP_STRING([--disable-generic],
- [disable generic object key fetching interface only]),
- try_generic=$enableval, try_generic=yes)
- AC_MSG_RESULT($try_generic)
-
- AC_MSG_CHECKING([whether email keyserver support is requested])
- AC_ARG_ENABLE(mailto,
- AC_HELP_STRING([--enable-mailto],
- [enable email keyserver interface only]),
- try_mailto=$enableval, try_mailto=no)
- AC_MSG_RESULT($try_mailto)
- fi
-
- AC_MSG_CHECKING([whether keyserver exec-path is enabled])
- AC_ARG_ENABLE(keyserver-path,
- AC_HELP_STRING([--disable-keyserver-path],
- [disable the exec-path option for keyserver helpers]),
- [if test "$enableval" = no ; then
- disable_keyserver_path=yes
- fi],enableval=yes)
- AC_MSG_RESULT($enableval)
fi
@@ -655,7 +599,6 @@ case "${host}" in
[Because the Unix gettext has too much overhead on
MingW32 systems and these systems lack Posix functions,
we use a simplified version of gettext])
- disable_keyserver_path=yes
have_dosish_system=yes
have_w32_system=yes
run_tests=no
@@ -758,10 +701,6 @@ if test "$use_ldapwrapper" = yes; then
fi
AM_CONDITIONAL(USE_LDAPWRAPPER, test "$use_ldapwrapper" = yes)
-if test "$disable_keyserver_path" = yes; then
- AC_DEFINE(DISABLE_KEYSERVER_PATH,1,
- [Defined to disable exec-path for keyserver helpers])
-fi
#
# Allows enabling the use of a standard socket by default This is
@@ -1878,9 +1817,6 @@ tests/Makefile
tests/openpgp/Makefile
tests/pkits/Makefile
])
-#keyserver/Makefile
-#keyserver/gpg2keys_mailto
-#keyserver/gpg2keys_test
AC_OUTPUT
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
deleted file mode 100644
index 884b8eb..0000000
--- a/keyserver/Makefile.am
+++ /dev/null
@@ -1,86 +0,0 @@
-# Makefile.am - Makefile for keyservers
-# Copyright (C) 2001, 2002, 2004, 2005, 2006,
-# 2009 Free Software Foundation, Inc.
-#
-# This file is part of GnuPG.
-#
-# GnuPG is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# GnuPG is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-## Process this file with automake to produce Makefile.in
-
-# Note that we have renamed the resulting binaries to from gpgkeys_foo
-# to gpg2keys_foo to allow for a non-conflicting installation of
-# gnupg1 and gnupg2. Having the same names for the helpers would
-# otherwise lead to trouble when to uninstall one of them.
-EXTRA_PROGRAMS = gpg2keys_ldap gpg2keys_hkp gpg2keys_finger gpg2keys_curl \
- gpg2keys_kdns
-EXTRA_SCRIPTS = gpg2keys_mailto
-
-EXTRA_DIST = ChangeLog-2011
-
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
-
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
-
-include $(top_srcdir)/am/cmacros.am
-
-libexec_PROGRAMS = $(GPGKEYS_LDAP) $(GPGKEYS_HKP) $(GPGKEYS_FINGER) \
- $(GPGKEYS_CURL) $(GPGKEYS_KDNS)
-libexec_SCRIPTS = $(GPGKEYS_MAILTO)
-noinst_SCRIPTS = gpg2keys_test
-
-common_libs = ../gl/libgnu.a ../common/libcommon.a
-other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
-
-gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h no-libgcrypt.c
-gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS)
-gpg2keys_ldap_LDADD = $(common_libs) $(LDAPLIBS) $(GPG_ERROR_LIBS) \
- $(NETLIBS) $(other_libs)
-
-gpg2keys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h no-libgcrypt.c
-gpg2keys_finger_CPPFLAGS = $(AM_CPPFLAGS)
-gpg2keys_finger_LDADD = $(common_libs) $(GPG_ERROR_LIBS) \
- $(NETLIBS) $(other_libs)
-
-gpg2keys_kdns_SOURCES = gpgkeys_kdns.c ksutil.c ksutil.h no-libgcrypt.c
-gpg2keys_kdns_CPPFLAGS = $(AM_CPPFLAGS)
-gpg2keys_kdns_LDADD = $(common_libs) $(GPG_ERROR_LIBS) \
- $(ADNSLIBS) $(NETLIBS) $(other_libs)
-
-
-gpg2keys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h no-libgcrypt.c
-gpg2keys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h no-libgcrypt.c
-if FAKE_CURL
-gpg2keys_curl_SOURCES += curl-shim.c curl-shim.h
-gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
-gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
- $(other_libs)
-gpg2keys_hkp_SOURCES += curl-shim.c curl-shim.h
-gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
-gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
- $(other_libs)
-else
-# Note that we need to include all other libs here as well because
-# some compilers don't care about inline functions and insert
-# references to symbols used in unused inline functions.
-gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
-gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
- $(other_libs) $(LIBCURL) $(GETOPT)
-gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
-gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
- $(other_libs) $(LIBCURL) $(GETOPT)
-endif
-
-# Make sure that all libs are build before we use them. This is
-# important for things like make -j2.
-$(PROGRAMS): $(common_libs)
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 46 +++--
Makefile.am | 6 +-
NEWS | 95 ++++++---
README | 48 ++---
configure.ac | 64 ------
keyserver/Makefile.am | 86 --------
po/de.po | 339 +++++++++++++++++++++----------
po/fr.po | 493 +++++++++++++++++++++++++++++++--------------
po/ja.po | 532 ++++++++++++++++++++++++++++++++++---------------
9 files changed, 1056 insertions(+), 653 deletions(-)
delete mode 100644 keyserver/Makefile.am
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list