diff --git a/po/de.po b/po/de.po
index da0f13ce7..49a03c537 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"
 
@@ -1029,14 +1037,6 @@ msgstr "Ungültige Option \"%.50s\"\n"
 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"
@@ -4889,6 +4972,10 @@ msgstr "WARNUNG: Widersprechende Hashverfahren in der signierten Nachricht\n"
 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 9e58e19fb..9293376e7 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@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"
 
@@ -1033,14 +1045,6 @@ msgstr "option « %.50s » incorrecte\n"
 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"
@@ -1061,10 +1065,6 @@ msgstr "impossible de créer le fichier temporaire « %s » : %s\n"
 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"
@@ -4922,6 +5014,10 @@ msgid "WARNING: signing subkey %s is not cross-certified\n"
 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 ""
@@ -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@-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@-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 86bd536ad..e0a984e7d 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 "ガベージ行を無視します"
 
@@ -1002,14 +1014,6 @@ msgstr "無効なオプション \"%.50s\"\n"
 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"
@@ -1030,10 +1034,6 @@ msgstr "一時ファイル'%s'が作成できません: %s\n"
 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"
@@ -2581,10 +2615,18 @@ msgstr "鍵%s:\"%s\"失効証明書の追加\n"
 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"
@@ -4698,6 +4806,10 @@ msgstr "*警告*: 署名のダイジェストが、メッセージと衝突し
 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@-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@-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 [オプション] "