po: Auto-update.

--

po/ca.po

@@ -1628,6 +1628,10 @@ msgstr "no s'ha trobat la clau «%s»: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "no s'ha trobat la clau «%s»: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a no ser que especifiqueu la clau per la empremta digital)\n"
 
@@ -1849,6 +1853,19 @@ msgstr "error en crear «%s»: %s\n"
 msgid "No fingerprint"
 msgstr "Empremta digital:"
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "opcions d'importació no vàlides\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NOM|usa NOM com a clau secreta predeterminada"
+
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1984,6 +2001,9 @@ msgstr "|algo [fitxers]|imprimeix resums de missatges"
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
@@ -2197,11 +2217,48 @@ msgstr "mostra en quin anell de claus està una clau llistada"
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "desactiva una clau"
+
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "el destinatari predeterminat és desconegut «%s»\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "el destinatari predeterminat és desconegut «%s»\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "error en crear l'anell «%s»: %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2412,6 +2469,14 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "l'algoritme de dispersió és invàlid «%s»\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "l'algoritme de dispersió és invàlid «%s»\n"
+
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
@@ -2508,6 +2573,14 @@ msgstr "no s'ha pogut crear l'armadura: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
@@ -2812,6 +2885,20 @@ msgstr "s'està escrivint la clau secreta a «%s»\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2955,6 +3042,10 @@ msgstr "s'ha creat l'anell «%s»\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
@@ -3021,6 +3112,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
@@ -3379,6 +3474,10 @@ msgstr "La clau està revocada."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Realment voleu signar tots els ID d'usuari? "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
@@ -3491,10 +3590,6 @@ msgstr "ha fallat l'actualització: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "error: l'empremta digital és invàlida\n"
@@ -3716,8 +3811,11 @@ msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
 #, fuzzy
-msgid "Please select at most one subkey.\n"
+msgid ""
-msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
@@ -3772,6 +3870,10 @@ msgstr "No hi ha cap ID amb l'índex %d\n"
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No hi ha cap ID amb l'índex %d\n"
+
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
@@ -4133,6 +4235,10 @@ msgstr "Nom i cognoms: "
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
@@ -4582,10 +4688,6 @@ msgstr "desxifratge correcte\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
@@ -4788,6 +4890,10 @@ msgstr "el destinatari predeterminat és desconegut «%s»\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "la classe de signatura és desconeguda"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5274,6 +5380,11 @@ msgstr "A ser revocada per:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aquesta és una clau de revocació sensible)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "La clau secreta està disponible.\n"
+
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
@@ -5309,6 +5420,17 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
@@ -7419,7 +7541,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
 #, fuzzy, c-format
@@ -7491,6 +7613,11 @@ msgstr "error en la lectura de «%s»: %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "no s'ha pogut connectar amb «%s»: %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7529,32 +7656,6 @@ msgstr "no es pot fer stat de «%s»: %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "no s'ha pogut connectar amb «%s»: %s\n"
-
 # Suportats? ivb
 # A Softcatalà diuen molt «implementat». jm
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
@@ -7652,7 +7753,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7970,8 +8071,9 @@ msgstr "error en la lectura de «%s»: %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -8128,6 +8230,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8337,7 +8443,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8594,6 +8700,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "no s'ha pogut obrir l'anell"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "no s'ha pogut obrir «%s»: %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "el valor no és vàlid\n"
+
+#, fuzzy
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
+
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
+
 #, fuzzy
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "canvia entre el llistat de claus secretes i públiques"
@@ -8780,10 +8916,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Esteu segur de voler fer açò? "
 
-#, fuzzy
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
@@ -9435,9 +9567,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "l'algoritme de xifratge és desconegut"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "no s'ha pogut obrir l'anell"
-
 #~ msgid "invalid packet"
 #~ msgstr "el paquet és invàlid"
 

po/cs.po

@@ -1517,6 +1517,11 @@ msgstr "klíč „%s“ nenalezen: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "chyba při čtení bloku klíče: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "klíč „%s“ nenalezen: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dokud neurčíte klíč jeho otiskem)\n"
 
@@ -1711,6 +1716,20 @@ msgstr "chyba při získávání „%s“ přes %s: %s\n"
 msgid "No fingerprint"
 msgstr "Chybí otisk"
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "tajný klíč „%s“ nenalezen: %s\n"
+
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "(check argument of option '%s')\n"
+msgstr "postrádám argument u volby „%.50s“\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NÁZEV|použít NÁZEV jako implicitní tajný klíč"
+
 # c-format
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
@@ -1833,6 +1852,9 @@ msgstr "vypsat hash zprávy"
 msgid "run in server mode"
 msgstr "pracovat v režimu serveru"
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "vytvoř výstup zakódovaný pomocí ASCII"
 
@@ -2033,10 +2055,51 @@ msgstr "ukazovat název souboru s klíči při výpisu klíčů"
 msgid "show expiration dates during signature listings"
 msgstr "ukazovat data expirace během výpisu podpisů"
 
+#, fuzzy
+#| msgid "Available keys:\n"
+msgid "available TOFU policies:\n"
+msgstr "Dostupné klíče:\n"
+
+#, fuzzy, c-format
+#| msgid "unknown option '%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "neznámá volba „%s“\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "unknown command '%s'\n"
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "neznámý příkaz „%s“\n"
+
 #, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "Poznámka: starý implicitní soubor s možnostmi „%s“ ignorován\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "option \"%.50s\" is ambiguous\n"
+msgid "key specification '%s' is ambiguous\n"
+msgstr "volba „%.50s“ není jednoznačná\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring '%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "chyba při vytváření souboru klíčů (keyring) „%s“: %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt je příliš stará (potřebuji %s, mám %s)\n"
@@ -2234,6 +2297,16 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVÁNÍ: specifikován adresát (-r) bez použití šifrování s veřejným klíčem\n"
 
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "řádek %d: zadáno neplatné datum\n"
+
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "řádek %d: zadáno neplatné datum\n"
+
 msgid "--store [filename]"
 msgstr "--store [jméno souboru]"
 
@@ -2326,6 +2399,15 @@ msgstr "kódování do ASCII formátu selhalo: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus „%s“\n"
 
+#, fuzzy, c-format
+#| msgid "error loading certificate '%s': %s\n"
+msgid "error parsing key specification '%s': %s\n"
+msgstr "chyba při zavádění certifikátu „%s“: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[jméno souboru]"
 
@@ -2625,6 +2707,20 @@ msgstr "import tajných klíčů není povolen\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klíč %s: tajný klíč s neplatnou šifrou %d – přeskočeno\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "klíč %s: chybí veřejný klíč – nemohu aplikovat revokační certifikát\n"
@@ -2751,6 +2847,11 @@ msgstr "soubor klíčů (keyring) „%s“ vytvořen\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "zdroj bloku klíče „%s“: %s\n"
 
+#, fuzzy, c-format
+#| msgid "error opening '%s': %s\n"
+msgid "error opening key DB: %s\n"
+msgstr "chyba při otevírání „%s“: %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnovení vyrovnávací paměti klíčů: %s\n"
@@ -2822,6 +2923,10 @@ msgstr ""
 "Prosím vložte doménu, pro kterou je podpis omezen nebo stiskněte enter pro "
 "podpis bez omezení na doménu.\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uživatelské ID „%s“ je revokováno."
@@ -3125,6 +3230,11 @@ msgstr "Klíč revokován."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Nápověda: Vyberte id uživatele k podepsání\n"
 
@@ -3222,10 +3332,6 @@ msgstr "aktualizace selhala: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Klíč nebyl změněn, takže není potřeba jej aktualizovat.\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "tajný klíč „%s“ nenalezen: %s\n"
-
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "„%s“ není otisk\n"
@@ -3424,8 +3530,13 @@ msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jistí, že tento klíč chcete pověřit revokací? (a/N) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "Prosím, vyberte nejvýše jeden podklíč.\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr "Jste si jistí, že tento klíč chcete pověřit revokací? (a/N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Měním dobu expirace podklíče.\n"
@@ -3474,6 +3585,11 @@ msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje uživatelské ID s hashem %s\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Neexistuje podklíč s indexem %d\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podklíč s indexem %d\n"
@@ -3816,6 +3932,10 @@ msgstr "Jméno a příjmení: "
 msgid "Invalid character in name\n"
 msgstr "Neplatný znak ve jméně\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Jméno nemůže začínat číslicí\n"
 
@@ -4243,10 +4363,6 @@ msgstr "dešifrování o.k.\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVÁNÍ: se zašifrovanou zprávou bylo manipulováno!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr "vymazané heslo zapamatované pro ID: %s\n"
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dešifrování selhalo: %s\n"
@@ -4437,6 +4553,11 @@ msgstr ""
 "U veřejného klíče ECDSA se očekává, že v kódování SEC bude délka násobkem 8 "
 "bitů\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type '%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "Neznámý typ podpisu „%s“\n"
+
 #, c-format
 msgid "File '%s' exists. "
 msgstr "Soubor „%s“ existuje. "
@@ -4880,6 +5001,11 @@ msgstr "Revokován:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citlivý revokační klíč)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Tajný klíč je dostupný.\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvořit pro tento klíč pověřený revokační certifikát? (a/N)"
 
@@ -4919,6 +5045,18 @@ msgstr ""
 "vložena dvojtečka. Před použitím tohoto revokačního certifikátu odstraňte\n"
 "tuto dvojtečku textovým editorem."
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "tajný klíč „%s“ nenalezen: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvořit pro tento klíč revokační certifikát? (a/N) "
 
@@ -6930,7 +7068,7 @@ msgstr "chyba při získávání „%s“: status HTTP je %u\n"
 # Poslední argument je název protokolu
 #, fuzzy
 #| msgid "CRL access not possible due to disabled %s\n"
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "Přístup k CRL není možný kvůli vypnutému %s\n"
 
 #, c-format
@@ -6995,6 +7133,10 @@ msgstr "chyba při čtení certifikátu z „%s“: %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr "certifikát je příliš velký, než aby dával smysl\n"
 
+#, c-format
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "k dirmngr se nelze připojit: %s\n"
+
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "hledání selhalo: %s\n"
@@ -7028,31 +7170,6 @@ msgstr "obdržen status: „%s“\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "chyba při zápisu kódování base64: %s\n"
 
-#, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "alokace kontextu assuan selhala: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr "dirmngr zjevně neběží\n"
-
-msgid "no running dirmngr - starting one\n"
-msgstr "žádný dirmngr neběží – jeden bude spuštěn\n"
-
-#, c-format
-msgid "malformed %s environment variable\n"
-msgstr "špatně utvořená proměnná prostředí %s\n"
-
-#, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "verze %d protokolu dirmngr není podporována\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr "k dirmngr se nelze připojit – zkusí se náhradní postup\n"
-
-#, c-format
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "k dirmngr se nelze připojit: %s\n"
-
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "nepodporovaný dotaz „%s“\n"
@@ -7139,7 +7256,7 @@ msgstr "|N|nevrací více jak N položek na jeden dotaz"
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|SOUBOR|pro HKP přes TLS použije certifikáty CA ze SOUBORU"
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 msgid ""
@@ -7435,7 +7552,7 @@ msgstr "odpověď serveru je příliš velká, limit je %d bajtů\n"
 
 #, fuzzy
 #| msgid "OCSP request not possible due to disabled HTTP\n"
-msgid "OCSP request not possible due to TOR mode\n"
+msgid "OCSP request not possible due to Tor mode\n"
 msgstr "OCSP dotaz není možný, protože HTTP je zakázáno\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
@@ -7589,6 +7706,10 @@ msgstr "max_replies (max. odpovědí) %d překročeno\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "řídící strukturu nelze alokovat: %s\n"
 
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "alokace kontextu assuan selhala: %s\n"
+
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "inicializace serveru selhala: %s\n"
@@ -7786,7 +7907,7 @@ msgstr "Volby ovlivňující interaktivitu a vymáhání"
 
 #, fuzzy
 #| msgid "Options controlling the security"
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr "Volby ovlivňující bezpečnost"
 
 msgid "Configuration for HTTP servers"
@@ -8037,6 +8158,47 @@ msgstr ""
 "Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
 "Prověří heslo zadané na vstupu proti souboru se vzory\n"
 
+#~ msgid "cleared passphrase cached with ID: %s\n"
+#~ msgstr "vymazané heslo zapamatované pro ID: %s\n"
+
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "nemohu otevřít soubor klíčů"
+
+#, fuzzy
+#~| msgid "failed to open '%s': %s\n"
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "„%s“ nebylo možné otevřít: %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "neplatná hodnota\n"
+
+#, fuzzy
+#~| msgid "error reading secret keyblock \"%s\": %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "chyba při čtení bloku tajného klíče „%s“: %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Prosím, vyberte nejvýše jeden podklíč.\n"
+
+#~ msgid "apparently no running dirmngr\n"
+#~ msgstr "dirmngr zjevně neběží\n"
+
+#~ msgid "no running dirmngr - starting one\n"
+#~ msgstr "žádný dirmngr neběží – jeden bude spuštěn\n"
+
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "špatně utvořená proměnná prostředí %s\n"
+
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "verze %d protokolu dirmngr není podporována\n"
+
+#~ msgid "can't connect to the dirmngr - trying fall back\n"
+#~ msgstr "k dirmngr se nelze připojit – zkusí se náhradní postup\n"
+
 #~ msgid "export keys in an S-expression based format"
 #~ msgstr "exportovat klíče ve formátu postaveném na S-výrazech"
 
@@ -8589,9 +8751,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Opravdu to chcete udělat? (a/N) "
 
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "chyba při čtení bloku tajného klíče „%s“: %s\n"
-
 #~ msgid "update secret failed: %s\n"
 #~ msgstr "aktualizace tajného klíče selhala: %s\n"
 
@@ -9246,9 +9405,6 @@ msgstr ""
 #~ msgid "checksum error"
 #~ msgstr "chyba kontrolního součtu"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "nemohu otevřít soubor klíčů"
-
 #~ msgid "invalid packet"
 #~ msgstr "neplatný paket"
 

po/da.po

@@ -1596,6 +1596,11 @@ msgstr "nøglen »%s« blev ikke fundet: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved læsning af nøgleblok: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "nøglen »%s« blev ikke fundet: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(med mindre du angiver nøglen med fingeraftryk)\n"
 
@@ -1803,6 +1808,20 @@ msgstr "fejl ved indhentelse af »%s« via %s: %s\n"
 msgid "No fingerprint"
 msgstr "Ingen fingeraftryk"
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
+
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "(check argument of option '%s')\n"
+msgstr "manglende parameter for indstilling »%.50s«\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig nøgle %s gjort gyldig med --allow-non-selfsigned-uid\n"
@@ -1930,6 +1949,9 @@ msgstr "vis beskedsammendrag"
 msgid "run in server mode"
 msgstr "kør i servertilstand"
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "opret ascii-pansrede uddata"
 
@@ -2145,11 +2167,52 @@ msgstr "vis nøgleringsnavnet i nøglevisninger"
 msgid "show expiration dates during signature listings"
 msgstr "vis udløbsdatoer under underskriftvisninger"
 
+#, fuzzy
+#| msgid "Available keys:\n"
+msgid "available TOFU policies:\n"
+msgstr "Tilgængelige nøgler:\n"
+
+#, fuzzy, c-format
+#| msgid "unknown option `%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "ukendt tilvalg »%s«\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "unknown command `%s'\n"
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "ukendt kommando »%s«\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "BEMÆRK: Gammel standardfil for tilvalg »%s« blev ignoreret\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "option \"%.50s\" is ambiguous\n"
+msgid "key specification '%s' is ambiguous\n"
+msgstr "tilvalg »%.50s« er tvetydigt\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt er for gammel (kræver %s, har %s)\n"
@@ -2352,6 +2415,16 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: modtagere (-r) angivet uden brug af offentlig nøglekryptering\n"
 
+#, fuzzy, c-format
+#| msgid "line %d: invalid algorithm\n"
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "linje %d: ugyldig algoritme\n"
+
+#, fuzzy, c-format
+#| msgid "line %d: invalid algorithm\n"
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "linje %d: ugyldig algoritme\n"
+
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
@@ -2446,6 +2519,15 @@ msgstr "påklædning af panser mislykkedes: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ugyldig hash-algoritme »%s«\n"
 
+#, fuzzy, c-format
+#| msgid "error storing certificate: %s\n"
+msgid "error parsing key specification '%s': %s\n"
+msgstr "fejl ved lagring af certifikat: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[filnavn]"
 
@@ -2751,6 +2833,20 @@ msgstr "import af hemmelige nøgler er ikke tilladt\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nøgle %s: hemmelig nøgle med ugyldig chiffer %d - udeladt\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2885,6 +2981,11 @@ msgstr "nøglering »%s« oprettet\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "nøgleblokressource »%s«: %s\n"
 
+#, fuzzy, c-format
+#| msgid "error opening `%s': %s\n"
+msgid "error opening key DB: %s\n"
+msgstr "fejl ved åbning af »%s«: %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "kunne ikke genbygge nøgleringsmellemlager: %s\n"
@@ -2955,6 +3056,10 @@ msgstr ""
 "Indtast venligst et domæne for at begrænse denne underskrift, eller retur "
 "for ingen.\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Bruger-id »%s« er tilbagekaldt."
@@ -3282,6 +3387,11 @@ msgstr "Nøglen er tilbagekaldt."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Fif: Vælg bruger-id'erne at underskrive\n"
 
@@ -3382,10 +3492,6 @@ msgstr "opdatering mislykkedes: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Nøgle ikke ændret så ingen opdatering krævet.\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
-
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
@@ -3597,8 +3703,15 @@ msgstr ""
 "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
 "tilbagekalder? (j/N) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "Vælg venligst højst en undernøgle.\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
+"tilbagekalder? (j/N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
@@ -3648,6 +3761,11 @@ msgstr "Ingen bruger-id med indeks %d\n"
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med hash %s\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Ingen undernøgle med indeks %d\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøgle med indeks %d\n"
@@ -4003,6 +4121,10 @@ msgstr "Fødselsnavn: "
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Navn må ikke starte med et tal\n"
 
@@ -4441,10 +4563,6 @@ msgstr "afkryptering okay\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ADVARSEL: krypteret besked er blevet manipuleret!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr "ryddet adgangsfrase mellemlagret med id: %s\n"
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "afkryptering mislykkedes: %s\n"
@@ -4644,6 +4762,11 @@ msgstr "ukendt tilvalg »%s«\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA kræver at hashlængden skal gå op i 8 bit\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type `%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "Ukendt underskrifttype »%s«\n"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5121,6 +5244,11 @@ msgstr "Tilbagekaldes af:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Dette er en sensitiv tilbagekaldsnøgle)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Hemmelig nøgle er tilgængelig.\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Opret et designet tilbagekaldscertifikat for denne nøgle? (j/N) "
 
@@ -5156,6 +5284,18 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Opret et tilbagekaldscertifikat for denne nøgle? (j/N) "
 
@@ -7297,7 +7437,7 @@ msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
 
 #, fuzzy
 #| msgid "certificate `%s' not found: %s\n"
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "certifikat »%s« blev ikke fundet: %s\n"
 
 #, fuzzy, c-format
@@ -7377,6 +7517,11 @@ msgstr "fejl ved læsning fra %s: %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "kan ikke forbinde til »%s«: %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7419,36 +7564,6 @@ msgstr ""
 msgid "error writing base64 encoding: %s\n"
 msgstr "fejl ved skrivning af hemmelig nøglering »%s«: %s\n"
 
-#, fuzzy, c-format
-#| msgid "failed to create stream from socket: %s\n"
-msgid "failed to allocate assuan context: %s\n"
-msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-#, fuzzy
-#| msgid "no running dirmngr - starting `%s'\n"
-msgid "no running dirmngr - starting one\n"
-msgstr "ingen kørende dirmngr - starter »%s«\n"
-
-#, fuzzy, c-format
-#| msgid "malformed DIRMNGR_INFO environment variable\n"
-msgid "malformed %s environment variable\n"
-msgstr "forkert udformet DIRMNGR_INFO-miljøvariabel\n"
-
-#, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "dirmngr-protokolversion %d er ikke understøttet\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr "kan ikke forbinde til dirmngr - forsøger reserve\n"
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "kan ikke forbinde til »%s«: %s\n"
-
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported inquiry '%s'\n"
@@ -7552,7 +7667,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7900,8 +8015,10 @@ msgstr "fejl ved læsning fra %s: %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr "Fejl: Privat DO er for lang (begrænsningen er %d tegn).\n"
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+#| msgid "certificate `%s' not found: %s\n"
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "certifikat »%s« blev ikke fundet: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -8084,6 +8201,11 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "kan ikke allokere outfile-streng: %s\n"
 
+#, fuzzy, c-format
+#| msgid "failed to create stream from socket: %s\n"
+msgid "failed to allocate assuan context: %s\n"
+msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8308,7 +8430,7 @@ msgstr "Tilvalg der kontrollerer interaktiviteten og tvang"
 
 #, fuzzy
 #| msgid "Options controlling the security"
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr "Tilvalg der kontrollerer sikkerheden"
 
 msgid "Configuration for HTTP servers"
@@ -8578,6 +8700,48 @@ msgstr ""
 "Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
 "Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
 
+#~ msgid "cleared passphrase cached with ID: %s\n"
+#~ msgstr "ryddet adgangsfrase mellemlagret med id: %s\n"
+
+#, fuzzy
+#~| msgid "failed to store the key: %s\n"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "kunne ikke gemme nøglen: %s\n"
+
+#, fuzzy
+#~| msgid "failed to open `%s': %s\n"
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "kan ikke åbne »%s«: %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "ugyldig værdi\n"
+
+#, fuzzy
+#~| msgid "error reading secret keyblock \"%s\": %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "fejl ved læsning af hemmelig nøgleblok »%s«: %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Vælg venligst højst en undernøgle.\n"
+
+#, fuzzy
+#~| msgid "no running dirmngr - starting `%s'\n"
+#~ msgid "no running dirmngr - starting one\n"
+#~ msgstr "ingen kørende dirmngr - starter »%s«\n"
+
+#, fuzzy
+#~| msgid "malformed DIRMNGR_INFO environment variable\n"
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "forkert udformet DIRMNGR_INFO-miljøvariabel\n"
+
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "dirmngr-protokolversion %d er ikke understøttet\n"
+
+#~ msgid "can't connect to the dirmngr - trying fall back\n"
+#~ msgstr "kan ikke forbinde til dirmngr - forsøger reserve\n"
+
 #~ msgid "export keys in an S-expression based format"
 #~ msgstr "eksporter nøgler i et S-udtryksbaseret format"
 
@@ -8754,9 +8918,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Vil du virkelig gerne gøre dette? (j/N) "
 
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "fejl ved læsning af hemmelig nøgleblok »%s«: %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Fjern venligst markeringer fra de hemmelige nøgler.\n"
 

po/el.po

@@ -1565,6 +1565,10 @@ msgstr "
 msgid "error reading keyblock: %s\n"
 msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ ìðëïê êëåéäéþí: %s\n"
 
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(åêôüò åÜí ðñïóäéïñßóåôå Ýíá êëåéäß áðü áðïôýðùìá)\n"
 
@@ -1783,6 +1787,19 @@ msgstr "
 msgid "No fingerprint"
 msgstr "áðåéêüíéóç ôïõ fingerprint"
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "ôï ìõóôéêü êëåéäß `%s' äå âñÝèçêå: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|ÏÍÏÌÁ|÷ñÞóç ÏÍÏÌÁôïò óáí ðñïêáèïñéóìÝíï ìõóôéêü êëåéäß"
+
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1916,6 +1933,9 @@ msgstr "|
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "äçìéïõñãßá ascii èùñáêéóìÝíçò åîüäïõ"
 
@@ -2120,11 +2140,48 @@ msgstr "
 msgid "show expiration dates during signature listings"
 msgstr "Äåí âñÝèçêå áíôßóôïé÷ç õðïãñáöÞ óôç ìõóôéêÞ êëåéäïèÞêç\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "áðåíåñãïðïéåß Ýíá êëåéäß"
+
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "Üãíùóôïò ðñïêáèïñéóìÝíïò ðáñáëÞðôçò `%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "Üãíùóôïò ðñïêáèïñéóìÝíïò ðáñáëÞðôçò `%s'\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "ÓÇÌÅÉÙÓÇ: áãíïÞèçêå ôï ðáëéü áñ÷åßï ðñïêáèïñéóìÝíùí åðéëïãþí `%s'\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "áäõíáìßá äçìéïõñãßáò ôçò êëåéäïèÞêçò `%s': %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2336,6 +2393,14 @@ msgstr ""
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äþèçêáí ðáñáëÞðôåò (-r) ÷þñéò ÷ñÞóç êñõðôïãñÜöçóçò\n"
 "äçìïóßïõ êëåéäéïý\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "ìç Ýãêõñïò áëãüñéèìïò  hash `%s'\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "ìç Ýãêõñïò áëãüñéèìïò  hash `%s'\n"
+
 msgid "--store [filename]"
 msgstr "--store [üíïìá áñ÷åßïõ]"
 
@@ -2432,6 +2497,14 @@ msgstr "
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ìç Ýãêõñïò áëãüñéèìïò  hash `%s'\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[üíïìá áñ÷åßïõ]"
 
@@ -2735,6 +2808,20 @@ msgstr "
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß ìå Üêõñï êñõðôáëã. %d - ðáñáëåßöèçêå\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2871,6 +2958,10 @@ msgstr "
 msgid "keyblock resource '%s': %s\n"
 msgstr "óöÜëìá êáôÜ ôç äçìéïõñãßá ôïõ `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ `%s': %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "áðïôõ÷ßá åðáíáäüìçóçò ôçò cache êëåéäïèÞêçò: %s\n"
@@ -2938,6 +3029,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Ôï user ID \"%s\" áíáêáëåßôå."
@@ -3287,6 +3382,10 @@ msgstr "
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Óßãïõñá íá õðïãñáöïýí üëá ôá user ID; "
 
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Óßãïõñá íá õðïãñáöïýí üëá ôá user ID; "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "ÓõìâïõëÞ: ÅðéëÝîôå ôï user ID ãéá õðïãñáöÞ\n"
 
@@ -3399,10 +3498,6 @@ msgstr "
 msgid "Key not changed so no update needed.\n"
 msgstr "Ôï êëåéäß äåí Üëëáîå ïðüôå äåí ÷ñåéÜæåôáé åíçìÝñùóç.\n"
 
-#, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "ôï ìõóôéêü êëåéäß `%s' äå âñÝèçêå: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "óöÜëìá: ìç Ýãêõñï áðïôýðùìá\n"
@@ -3621,8 +3716,12 @@ msgstr ""
 "N): "
 
 #, fuzzy
-msgid "Please select at most one subkey.\n"
+msgid ""
-msgstr "Ðáñáêáëþ åðéëÝîôå ôï ðïëý Ýíá äåõôåñåýïí êëåéäß.\n"
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Åßóôå óßãïõñïé üôé èÝëåôå íá ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ; (y/"
+"N): "
 
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
@@ -3678,6 +3777,10 @@ msgstr "
 msgid "No user ID with hash %s\n"
 msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n"
 
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n"
+
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n"
@@ -4033,6 +4136,10 @@ msgstr "
 msgid "Invalid character in name\n"
 msgstr "Ìç Ýãêõñïò ÷áñáêôÞñáò óôï üíïìá\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Ôï üíïìá äåí åðéôñÝðåôáé íá îåêéíÜ ìå áñéèìçôéêü øçößï\n"
 
@@ -4475,10 +4582,6 @@ msgstr "
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï êñõðôïãñáöçìÝíï ìÞíõìá Ý÷åé ðåéñá÷èåß!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "áðïêñõðôïãñÜöçóç áðÝôõ÷å: %s\n"
@@ -4678,6 +4781,10 @@ msgstr "
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "Üãíùóôç êëÜóç õðïãñáöÞò"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5150,6 +5257,11 @@ msgstr "
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Áõôü åßíáé Ýíá åõáßóèçôï êëåéäß áíÜêëçóçò)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Ôï ìõóôéêü êëåéäß åßíáé äéáèÝóéìï.\n"
+
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôü ôï êëåéäß; "
@@ -5185,6 +5297,17 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "ôï ìõóôéêü êëåéäß `%s' äå âñÝèçêå: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôü ôï êëåéäß; "
@@ -7253,7 +7376,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ `%s': %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n"
 
 #, fuzzy, c-format
@@ -7323,6 +7446,11 @@ msgstr "
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "áäõíáìßá óýíäåóçò óôï `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7361,32 +7489,6 @@ msgstr "
 msgid "error writing base64 encoding: %s\n"
 msgstr "áäõíáìßá åããñáöÞò ìõóôéêÞò êëåéäïèÞêçò `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: áäõíáìßá äçìéïõñãßáò hashtable: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "êáêïäéáôõðïìÝíç ìåôáâëçôÞ ðåñéâÜëëïíôïò GPG_AGENT_INFO\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "äåí õðïóôçñßæåôáé ç Ýêäïóç ðñùôïêüëëïõ %d ôïõ gpg-agent\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "áäõíáìßá óýíäåóçò óôï `%s': %s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7479,7 +7581,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7791,8 +7893,9 @@ msgstr "
 msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7949,6 +8052,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: áäõíáìßá äçìéïõñãßáò hashtable: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8158,7 +8265,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8415,6 +8522,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "áäõíáìßá ðñüóâáóçò óôç êëåéäïèÞêç"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "áäõíáìßá ðñüóâáóçò óôï `%s': %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "ìç Ýãêõñç ôéìÞ\n"
+
+#, fuzzy
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ìõóôéêïý ìðëïê êëåéäéïý `%s': %s\n"
+
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Ðáñáêáëþ åðéëÝîôå ôï ðïëý Ýíá äåõôåñåýïí êëåéäß.\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "êáêïäéáôõðïìÝíç ìåôáâëçôÞ ðåñéâÜëëïíôïò GPG_AGENT_INFO\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "äåí õðïóôçñßæåôáé ç Ýêäïóç ðñùôïêüëëïõ %d ôïõ gpg-agent\n"
+
 #, fuzzy
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "áëëáãÞ ìåôáîý ôçò áðåéêüíéóçò ìõóôéêïý êáé äçìüóéïõ êëåéäéïý"
@@ -8600,10 +8737,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Óßãïõñá èÝëåôå íá êÜíåôå áõôü; "
 
-#, fuzzy
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ìõóôéêïý ìðëïê êëåéäéïý `%s': %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Ðáñáêáëþ áöáéñÝóôå ôéò åðéëïãÝò áðü ôá ìõóôéêÜ êëåéäéÜ.\n"
 
@@ -9243,9 +9376,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "Üãíùóôïò áëãüñéèìïò êñõðôïãñÜöçóçò"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "áäõíáìßá ðñüóâáóçò óôç êëåéäïèÞêç"
-
 #~ msgid "invalid packet"
 #~ msgstr "ìç Ýãêõñï ðáêÝôï"
 

po/eo.po

@@ -1572,6 +1572,10 @@ msgstr "
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de þlosilbloko: %s\n"
 
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "þlosilo '%s' ne trovita: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
@@ -1773,6 +1777,19 @@ msgstr "eraro dum kreado de '%s': %s\n"
 msgid "No fingerprint"
 msgstr "Fingrospuro:"
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "þlosilo '%s' ne trovita: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "nevalida kiraso"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan þlosilon"
+
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida þlosilo %08lX validigita per --always-trust\n"
@@ -1905,6 +1922,9 @@ msgstr "|metodo [dosieroj]|presi mesa
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
@@ -2107,10 +2127,47 @@ msgstr "montri, en kiu
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta þlosilaro\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "malþalti þlosilon"
+
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "nekonata implicita ricevonto '%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "nekonata implicita ricevonto '%s'\n"
+
 #, fuzzy, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "eraro dum kreado de þlosilaro '%s': %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2325,6 +2382,14 @@ msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "nevalida kompendi-metodo '%s'\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "nevalida kompendi-metodo '%s'\n"
+
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
@@ -2421,6 +2486,14 @@ msgstr "enkirasigo malsukcesis: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[dosiero]"
 
@@ -2723,6 +2796,20 @@ msgstr "skribas sekretan
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "þlosilo %08lX: sekreta þlosilo sen publika þlosilo - ignorita\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2850,6 +2937,10 @@ msgstr "
 msgid "keyblock resource '%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui þlosilaran staplon: %s\n"
@@ -2917,6 +3008,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
@@ -3279,6 +3374,10 @@ msgstr "
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Æu vere subskribi æiujn uzantidentigilojn? "
 
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Æu vere subskribi æiujn uzantidentigilojn? "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
@@ -3390,10 +3489,6 @@ msgstr "aktualigo malsukcesis: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Þlosilo ne þanøita, do aktualigo ne necesas.\n"
 
-#, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "þlosilo '%s' ne trovita: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
@@ -3602,8 +3697,10 @@ msgid ""
 msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n"
 
 #, fuzzy
-msgid "Please select at most one subkey.\n"
+msgid ""
-msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n"
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n"
 
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
@@ -3657,6 +3754,10 @@ msgstr "Mankas uzantidentigilo kun indekso %d\n"
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Mankas uzantidentigilo kun indekso %d\n"
+
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
@@ -4014,6 +4115,10 @@ msgstr "Vera nomo: "
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenciøi per cifero\n"
 
@@ -4458,10 +4563,6 @@ msgstr "mal
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: æifrita mesaøo estis manipulita!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "malæifrado malsukcesis: %s\n"
@@ -4658,6 +4759,10 @@ msgstr "nekonata implicita ricevonto '%s'\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "nekonata klaso de subskribo"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5119,6 +5224,11 @@ msgstr ""
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Sekreta þlosilo estas havebla.\n"
+
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)"
@@ -5155,6 +5265,17 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "þlosilo '%s' ne trovita: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)"
@@ -7207,7 +7328,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "þlosilo '%s' ne trovita: %s\n"
 
 #, fuzzy, c-format
@@ -7278,6 +7399,11 @@ msgstr "eraro dum legado de '%s': %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "ne povas konektiøi al '%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7316,32 +7442,6 @@ msgstr "ne povas stat-i '%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "eraro dum skribado de sekreta þlosilaro '%s': %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: malsukcesis krei haktabelon: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "ne povas konektiøi al '%s': %s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7434,7 +7534,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7744,8 +7844,9 @@ msgstr "eraro dum legado de '%s': %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "þlosilo '%s' ne trovita: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7902,6 +8003,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: malsukcesis krei haktabelon: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8111,7 +8216,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8367,6 +8472,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "ne povas malfermi la þlosilaron"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "ne povas malfermi '%s': %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "nevalida valoro\n"
+
+#, fuzzy
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "eraro dum legado de sekreta þlosilbloko '%s': %s\n"
+
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
+
 #, fuzzy
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "de sekreta aý publika listo iri al la alia"
@@ -8525,10 +8660,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Æu vi vere volas fari tion? "
 
-#, fuzzy
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "eraro dum legado de sekreta þlosilbloko '%s': %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Bonvolu malelekti la sekretajn þlosilojn.\n"
 
@@ -9096,9 +9227,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "nekonata æifrad-metodo"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "ne povas malfermi la þlosilaron"
-
 #~ msgid "invalid packet"
 #~ msgstr "nevalida paketo"
 

po/es.po

@@ -1614,6 +1614,11 @@ msgstr "clave \"%s\" no encontrada: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "clave \"%s\" no encontrada: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(excepto si especifica la clave dando su huella digital)\n"
 
@@ -1822,6 +1827,20 @@ msgstr "error recuperando `%s' v
 msgid "No fingerprint"
 msgstr "No hay huella dactilar"
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "clave secreta \"%s\" no encontrada: %s\n"
+
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "(check argument of option '%s')\n"
+msgstr "falta parámetro para la opción \"%.50s\"\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inválida hecha válida mediante --allow-non-selfsigned-uid\n"
@@ -1949,6 +1968,9 @@ msgstr "imprime res
 msgid "run in server mode"
 msgstr "ejecutar en modo servidor"
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
@@ -2171,11 +2193,52 @@ msgstr "mostrar nombre de los anillos de claves al listar claves"
 msgid "show expiration dates during signature listings"
 msgstr "mostrar fechas de caducidad al listar firmas"
 
+#, fuzzy
+#| msgid "Available keys:\n"
+msgid "available TOFU policies:\n"
+msgstr "Claves disponibles:\n"
+
+#, fuzzy, c-format
+#| msgid "unknown option `%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "opción desconocida `%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "unknown command `%s'\n"
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "orden desconocida `%s'\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "option \"%.50s\" is ambiguous\n"
+msgid "key specification '%s' is ambiguous\n"
+msgstr "la opción \"%.50s\" es ambigua\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt demasiado antigua (necesito %s, tengo %s)\n"
@@ -2377,6 +2440,16 @@ msgstr "inicializaci
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave pública de cifrado\n"
 
+#, fuzzy, c-format
+#| msgid "line %d: invalid algorithm\n"
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "línea %d: algoritmo inválido\n"
+
+#, fuzzy, c-format
+#| msgid "line %d: invalid algorithm\n"
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "línea %d: algoritmo inválido\n"
+
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
@@ -2471,6 +2544,15 @@ msgstr "creaci
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de distribución inválido `%s'\n"
 
+#, fuzzy, c-format
+#| msgid "error storing certificate: %s\n"
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error almacenando certificado: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2781,6 +2863,20 @@ msgstr "no se permite importar claves secretas\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %s: clave secreta con cifrado inválido %d - omitida\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2914,6 +3010,11 @@ msgstr "anillo `%s' creado\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "recurso de bloque de claves: `%s': %s\n"
 
+#, fuzzy, c-format
+#| msgid "error opening `%s': %s\n"
+msgid "error opening key DB: %s\n"
+msgstr "error abriendo `%s': %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo caché del anillo de claves: %s\n"
@@ -2983,6 +3084,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
@@ -3293,6 +3398,11 @@ msgstr "La clave est
 msgid "Really sign all user IDs? (y/N) "
 msgstr "¿Firmar realmente todos los IDs de usuario? (s/N) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "¿Firmar realmente todos los IDs de usuario? (s/N) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
@@ -3394,10 +3504,6 @@ msgstr "actualizaci
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualización.\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "clave secreta \"%s\" no encontrada: %s\n"
-
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
@@ -3604,8 +3710,14 @@ msgid ""
 msgstr ""
 "¿Está seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "Por favor, seleccione como máximo una clave secundaria.\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"¿Está seguro de querer elegir esta clave como revocador designado? (s/N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
@@ -3654,6 +3766,11 @@ msgstr "No hay ning
 msgid "No user ID with hash %s\n"
 msgstr "No hay ID de usuario con hash %s\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No existe una subclave con índice %d\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con índice %d\n"
@@ -4005,6 +4122,10 @@ msgstr "Nombre y apellidos: "
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido en el nombre\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un número\n"
 
@@ -4441,10 +4562,6 @@ msgstr "descifrado correcto\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr "borrada frase de paso en caché con ID: %s\n"
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
@@ -4642,6 +4759,11 @@ msgstr "opci
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA necesita un resumen cuya longitud sea múltiplo de 8 bits\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type `%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "Clase de firma desconocida `%s'\n"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5113,6 +5235,11 @@ msgstr "Ser
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Este es una clave de revocación confidencial)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Clave secreta disponible.\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta clave? (s/N)"
 
@@ -5148,6 +5275,18 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "clave secreta \"%s\" no encontrada: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta clave? (s/N) "
 
@@ -7313,7 +7452,7 @@ msgstr "error ejecutando `%s': c
 
 #, fuzzy
 #| msgid "certificate `%s' not found: %s\n"
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "certificado `%s' no encontrado: %s\n"
 
 #, fuzzy, c-format
@@ -7393,6 +7532,11 @@ msgstr "error leyendo de %s: %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "no se puede conectar con `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7436,36 +7580,6 @@ msgstr "no se puede obtener informaci
 msgid "error writing base64 encoding: %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#, fuzzy, c-format
-#| msgid "failed to create stream from socket: %s\n"
-msgid "failed to allocate assuan context: %s\n"
-msgstr "fallo al crear un flujo desde el socket: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-#, fuzzy
-#| msgid "no running dirmngr - starting `%s'\n"
-msgid "no running dirmngr - starting one\n"
-msgstr "no hay dirmngr en ejecución - iniciando `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "malformed DIRMNGR_INFO environment variable\n"
-msgid "malformed %s environment variable\n"
-msgstr "variable de entorno DIRMNGR_INFO malformada\n"
-
-#, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "la versión del protocolo dirmngr %d no puede usarse\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr "no puedo conectar con el dirmngr - intentando retirada\n"
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "no se puede conectar con `%s': %s\n"
-
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported inquiry '%s'\n"
@@ -7569,7 +7683,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 # ordenes -> órdenes
@@ -7924,8 +8038,10 @@ msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 "Error: los datos privados son demasiado largos (límite de %d caracteres).\n"
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+#| msgid "certificate `%s' not found: %s\n"
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "certificado `%s' no encontrado: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -8108,6 +8224,11 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "no puedo reservar espacio para la cadena de salida: %s\n"
 
+#, fuzzy, c-format
+#| msgid "failed to create stream from socket: %s\n"
+msgid "failed to allocate assuan context: %s\n"
+msgstr "fallo al crear un flujo desde el socket: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8333,7 +8454,7 @@ msgstr "Opciones que controlan la interactividad y obligaci
 
 #, fuzzy
 #| msgid "Options controlling the security"
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr "Opciones que controlan la seguridad"
 
 msgid "Configuration for HTTP servers"
@@ -8618,6 +8739,58 @@ msgstr ""
 "Compara frase contraseña dada en entrada estándar con un fichero de "
 "patrones\n"
 
+#~ msgid "cleared passphrase cached with ID: %s\n"
+#~ msgstr "borrada frase de paso en caché con ID: %s\n"
+
+# ¿y llavero?
+# Hombre... las claves son parecidas a las llaves pero no lo mismo
+# toda la literatura en castellano usa "anillos de claves" si un
+# programa nos habla del llavero ¿no puedo abrir el llavero? nos
+# miraremos en el bolsillo bastante desconcertados. No creo que se
+# trate de establecer una nomenclatura propia.
+# A lo mejor toda esa literatura está producida por gente que no sabía
+# cómo se dice llavero en inglés...
+# Si los ingleses dicen llavero en su idioma ¿por qué no vamos a poder
+# nosotros decir lo mismo en el nuestro?
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "No se puede abrir el anillo de claves"
+
+#, fuzzy
+#~| msgid "failed to open `%s': %s\n"
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "fallo abriendo `%s': %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "valor inválido\n"
+
+#, fuzzy
+#~| msgid "error reading secret keyblock \"%s\": %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Por favor, seleccione como máximo una clave secundaria.\n"
+
+#, fuzzy
+#~| msgid "no running dirmngr - starting `%s'\n"
+#~ msgid "no running dirmngr - starting one\n"
+#~ msgstr "no hay dirmngr en ejecución - iniciando `%s'\n"
+
+#, fuzzy
+#~| msgid "malformed DIRMNGR_INFO environment variable\n"
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "variable de entorno DIRMNGR_INFO malformada\n"
+
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "la versión del protocolo dirmngr %d no puede usarse\n"
+
+#~ msgid "can't connect to the dirmngr - trying fall back\n"
+#~ msgstr "no puedo conectar con el dirmngr - intentando retirada\n"
+
 #~ msgid "export keys in an S-expression based format"
 #~ msgstr "exportar claves en formato basado en una expresión S"
 
@@ -8807,9 +8980,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "¿Realmente quiere hacer esto? (s/N) "
 
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
@@ -9520,19 +9690,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "Algoritmo de cifrado desconocido"
 
-# ¿y llavero?
-# Hombre... las claves son parecidas a las llaves pero no lo mismo
-# toda la literatura en castellano usa "anillos de claves" si un
-# programa nos habla del llavero ¿no puedo abrir el llavero? nos
-# miraremos en el bolsillo bastante desconcertados. No creo que se
-# trate de establecer una nomenclatura propia.
-# A lo mejor toda esa literatura está producida por gente que no sabía
-# cómo se dice llavero en inglés...
-# Si los ingleses dicen llavero en su idioma ¿por qué no vamos a poder
-# nosotros decir lo mismo en el nuestro?
-#~ msgid "can't open the keyring"
-#~ msgstr "No se puede abrir el anillo de claves"
-
 #~ msgid "invalid packet"
 #~ msgstr "paquete inválido"
 

po/et.po

@@ -1562,6 +1562,10 @@ msgstr "v
 msgid "error reading keyblock: %s\n"
 msgstr "viga võtmebloki lugemisel: %s\n"
 
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "võtit '%s' ei leitud: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(kui te just ei määra võtit sõrmejäljega)\n"
 
@@ -1775,6 +1779,19 @@ msgstr "viga `%s' loomisel: %s\n"
 msgid "No fingerprint"
 msgstr "näita sõrmejälge"
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "salajast võtit `%s' ei leitud: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "vigased impordi võtmed\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
+
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1909,6 +1926,9 @@ msgstr "|algo [failid]|tr
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis väljund"
 
@@ -2110,11 +2130,48 @@ msgstr "n
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "blokeeri võti"
+
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "tundmatu vaikimisi saaja `%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "tundmatu vaikimisi saaja `%s'\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "MÄRKUS: ignoreerin vana vaikimisi võtmete faili `%s'\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2321,6 +2378,14 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: määrati saajad (-r) aga ei kasutata avaliku võtme krüptograafiat\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "vigane räsialgoritm `%s'\n"
+
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
@@ -2417,6 +2482,14 @@ msgstr "pakendamine eba
 msgid "invalid hash algorithm '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[failinimi]"
 
@@ -2721,6 +2794,20 @@ msgstr "kirjutan salajase v
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "võti %08lX: salajane võti vigase ¨ifriga %d - jätsin vahele\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2850,6 +2937,10 @@ msgstr "v
 msgid "keyblock resource '%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
@@ -2917,6 +3008,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on tühistatud."
@@ -3261,6 +3356,10 @@ msgstr "V
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
 
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
@@ -3372,10 +3471,6 @@ msgstr "uuendamine eba
 msgid "Key not changed so no update needed.\n"
 msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
 
-#, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "salajast võtit `%s' ei leitud: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "viga: vigane sõrmejälg\n"
@@ -3586,8 +3681,11 @@ msgstr ""
 "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
 #, fuzzy
-msgid "Please select at most one subkey.\n"
+msgid ""
-msgstr "palun valige ülimalt üks sekundaarne võti.\n"
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
@@ -3641,6 +3739,10 @@ msgstr "Kasutaja ID numbriga %d puudub\n"
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Kasutaja ID numbriga %d puudub\n"
+
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
@@ -3994,6 +4096,10 @@ msgstr "P
 msgid "Invalid character in name\n"
 msgstr "Lubamatu sümbol nimes\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei või alata numbriga\n"
 
@@ -4427,10 +4533,6 @@ msgstr "lahtikr
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
@@ -4627,6 +4729,10 @@ msgstr "tundmatu vaikimisi saaja `%s'\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "tundmatu allkirja klass"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5090,6 +5196,11 @@ msgstr "T
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(See on tundlik tühistamise võti)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Salajane võti on kasutatav.\n"
+
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
@@ -5127,6 +5238,17 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "salajast võtit `%s' ei leitud: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
@@ -7177,7 +7299,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
 #, fuzzy, c-format
@@ -7247,6 +7369,11 @@ msgstr "viga `%s' lugemisel: %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7285,32 +7412,6 @@ msgstr "ei
 msgid "error writing base64 encoding: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7403,7 +7504,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7715,8 +7816,9 @@ msgstr "viga `%s' lugemisel: %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "võtit '%s' ei leitud: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7873,6 +7975,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8082,7 +8188,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8339,6 +8445,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "võtmehoidlat ei õnnestu avada"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "`%s' ei õnnestu avada: %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "vigane väärtus\n"
+
+#, fuzzy
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "viga salajase võtmebloki `%s' lugemisel: %s\n"
+
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "palun valige ülimalt üks sekundaarne võti.\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
+
 #, fuzzy
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "lülita salajaste või avalike võtmete loendi vahel"
@@ -8513,10 +8649,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Kas te tõesti soovite seda teha? "
 
-#, fuzzy
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "viga salajase võtmebloki `%s' lugemisel: %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n"
 
@@ -9134,9 +9266,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "tundmatu ¨ifri algoritm"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "võtmehoidlat ei õnnestu avada"
-
 #~ msgid "invalid packet"
 #~ msgstr "vigane pakett"
 

po/fi.po

@@ -1581,6 +1581,10 @@ msgstr "avainta \"%s\" ei löydy: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "avainta \"%s\" ei löydy: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(ellet määritä avainta sormenjäljen perusteella)\n"
 
@@ -1790,6 +1794,19 @@ msgstr "virhe luotaessa \"%s\": %s\n"
 msgid "No fingerprint"
 msgstr "näytä sormenjälki"
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "salaista avainta \"%s\" ei löydy: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "virheelliset tuontivalitsimet\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
+
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1924,6 +1941,9 @@ msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
@@ -2125,11 +2145,48 @@ msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "poista avain käytöstä"
+
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2337,6 +2394,14 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
+
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
@@ -2433,6 +2498,14 @@ msgstr "ascii-koodaaminen epäonnistui: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
@@ -2738,6 +2811,20 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2869,6 +2956,10 @@ msgstr "avainrengas \"%s\" luotu\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
@@ -2937,6 +3028,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
@@ -3282,6 +3377,10 @@ msgstr "Avain on mitätöity."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
@@ -3393,10 +3492,6 @@ msgstr "päivitys epäonnistui: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "salaista avainta \"%s\" ei löydy: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "virhe: sormenjälki on väärä\n"
@@ -3608,8 +3703,11 @@ msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
 #, fuzzy
-msgid "Please select at most one subkey.\n"
+msgid ""
-msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
@@ -3663,6 +3761,10 @@ msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
+
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
@@ -4022,6 +4124,10 @@ msgstr "Oikea nimi: "
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
@@ -4460,10 +4566,6 @@ msgstr "avaus onnistui\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
@@ -4666,6 +4768,10 @@ msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "tuntematon allekirjoitusluokka"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5139,6 +5245,11 @@ msgstr "Mitätöinnin tekee:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Tämä on arkaluonteinen mitätöintiavain)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Salainen avain on saatavilla.\n"
+
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
@@ -5174,6 +5285,17 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "salaista avainta \"%s\" ei löydy: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
@@ -7235,7 +7357,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
 #, fuzzy, c-format
@@ -7305,6 +7427,11 @@ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7343,32 +7470,6 @@ msgstr "tiedoston \"%s\" tilaa ei voi lukea: %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7461,7 +7562,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7774,8 +7875,9 @@ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "avainta \"%s\" ei löydy: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7932,6 +8034,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8141,7 +8247,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8398,6 +8504,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "avainrenkaan avaaminen ei onnistu"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "arvo ei kelpaa\n"
+
+#, fuzzy
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
+
 #, fuzzy
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
@@ -8578,10 +8714,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Haluatko varmasti tehdä tämän? "
 
-#, fuzzy
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
@@ -9222,9 +9354,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "tuntematon salausalgoritmi"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "avainrenkaan avaaminen ei onnistu"
-
 #~ msgid "invalid packet"
 #~ msgstr "virheellinen paketti"
 

po/fr.po

@@ -1519,6 +1519,11 @@ msgstr "clef « %s » introuvable : %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "erreur de lecture du bloc de clef : %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "clef « %s » introuvable : %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(à moins d'indiquer la clef par son empreinte)\n"
 
@@ -1719,6 +1724,20 @@ msgstr "erreur de récupération de « %s » avec %s : %s\n"
 msgid "No fingerprint"
 msgstr "Aucune empreinte"
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "clef secrète « %s » introuvable : %s\n"
+
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "(check argument of option '%s')\n"
+msgstr "argument manquant pour l'option « %.50s »\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1844,6 +1863,9 @@ msgstr "indiquer les fonctions de hachage"
 msgid "run in server mode"
 msgstr "exécuter en mode serveur"
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "créer une sortie ASCII avec armure"
 
@@ -2057,10 +2079,51 @@ msgstr "montrer le nom du porte-clefs en affichant les clefs"
 msgid "show expiration dates during signature listings"
 msgstr "montrer les dates d'expiration en affichant les signatures"
 
+#, fuzzy
+#| msgid "Available keys:\n"
+msgid "available TOFU policies:\n"
+msgstr "Clefs disponibles :\n"
+
+#, fuzzy, c-format
+#| msgid "unknown option '%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "option « %s » inconnue\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "unknown command '%s'\n"
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "commande « %s » inconnue\n"
+
 #, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "Remarque : l'ancien fichier d'options par défaut « %s » a été ignoré\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "option \"%.50s\" is ambiguous\n"
+msgid "key specification '%s' is ambiguous\n"
+msgstr "l'option « %.50s » est ambiguë\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring '%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "erreur de création du porte-clefs « %s » : %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt est trop ancienne (nécessaire : %s, utilisé : %s)\n"
@@ -2258,6 +2321,16 @@ msgstr ""
 "Attention : les destinataires (-r) indiqués n'utilisent pas\n"
 "            de clef publique pour le chiffrement\n"
 
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "ligne %d : date donnée incorrect\n"
+
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "ligne %d : date donnée incorrect\n"
+
 msgid "--store [filename]"
 msgstr "--store [fichier]"
 
@@ -2350,6 +2423,15 @@ msgstr "échec de construction d'une armure : %s \n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algorithme de hachage « %s » incorrect\n"
 
+#, fuzzy, c-format
+#| msgid "error loading certificate '%s': %s\n"
+msgid "error parsing key specification '%s': %s\n"
+msgstr "erreur de chargement du certificat « %s » : %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[fichier]"
 
@@ -2648,6 +2730,20 @@ msgstr "impossible d'importer des clefs secrètes\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clef %s : clef secrète avec chiffrement %d incorrect — ignorée\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2778,6 +2874,11 @@ msgstr "le porte-clefs « %s » a été créé\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "ressource de bloc de clef « %s » : %s\n"
 
+#, fuzzy, c-format
+#| msgid "error opening '%s': %s\n"
+msgid "error opening key DB: %s\n"
+msgstr "erreur d'ouverture de « %s » : %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "échec de reconstruction du cache de porte-clefs : %s\n"
@@ -2848,6 +2949,10 @@ msgstr ""
 "Veuillez entrer un domaine pour restreindre cette signature, ou appuyer\n"
 "sur la touche entrée pour aucun domaine.\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'identité « %s » est révoquée."
@@ -3157,6 +3262,11 @@ msgstr "La clef est révoquée."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Conseil : sélectionner les identités à signer\n"
 
@@ -3257,10 +3367,6 @@ 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"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "clef secrète « %s » introuvable : %s\n"
-
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "« %s » n’est pas une empreinte\n"
@@ -3466,8 +3572,14 @@ msgid ""
 msgstr ""
 "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "Veuillez sélectionner au plus une sous-clef.\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modification de la date d'expiration d'une sous-clef.\n"
@@ -3518,6 +3630,11 @@ msgstr "Pas d'identité d'indice %d\n"
 msgid "No user ID with hash %s\n"
 msgstr "Pas d'identité avec le hachage %s\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Pas de sous-clef d'indice %d\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-clef d'indice %d\n"
@@ -3867,6 +3984,10 @@ msgstr "Nom réel : "
 msgid "Invalid character in name\n"
 msgstr "Caractère incorrect dans le nom\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
@@ -4307,10 +4428,6 @@ msgstr "le déchiffrement a réussi\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Attention : le message chiffré a été manipulé.\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr "phrase secrète effacée mise en cache avec l'identifiant : %s\n"
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "échec du déchiffrement : %s\n"
@@ -4507,6 +4624,11 @@ msgstr ""
 "une clef publique ECDSA est censée être dans un encodage SEC multiple de "
 "8 bits\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type '%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "Type de signature « %s » inconnu\n"
+
 #, c-format
 msgid "File '%s' exists. "
 msgstr "Le fichier « %s » existe. "
@@ -4981,6 +5103,11 @@ msgstr "À révoquer par :\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(c'est une clef de révocation sensible)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "La clef secrète est disponible.\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 "Faut-il créer un certificat de révocation désigné pour cette clef ? (o/N) "
@@ -5023,6 +5150,18 @@ msgstr ""
 "Supprimez ce deux-points avec un éditeur de texte avant\n"
 "d’utiliser ce certificat de révocation."
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "clef secrète « %s » introuvable : %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Faut-il créer un certificat de révocation pour cette clef ? (o/N) "
 
@@ -7127,7 +7266,7 @@ msgstr "erreur de récupération de « %s » : état HTTP %u\n"
 
 #, fuzzy
 #| msgid "CRL access not possible due to disabled %s\n"
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr ""
 "accès à la liste de révocations de certificat impossible car %s est "
 "désactivé\n"
@@ -7196,6 +7335,10 @@ msgstr "erreur de lecture du certificat sur « %s » : %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr "certificat trop grand pour être possible\n"
 
+#, c-format
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "impossible de se connecter au dirmngr : %s\n"
+
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "échec de la recherche : %s\n"
@@ -7230,34 +7373,6 @@ msgstr "état obtenu : « %s »\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "erreur d'écriture en encodage base64 : %s\n"
 
-#, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "échec d'allocation du contexte Assuan : %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr "pas d'instance de dirmngr en cours d'exécution apparemment\n"
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-"pas d'instance de dirmngr en cours d'exécution —\n"
-"démarrage d'une nouvelle instance\n"
-
-#, c-format
-msgid "malformed %s environment variable\n"
-msgstr "la variable d'environnement %s 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"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-"impossible de se connecter au dirmngr — essai avec la solution de repli\n"
-
-#, c-format
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "impossible de se connecter au dirmngr : %s\n"
-
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "demande « %s » non prise en charge\n"
@@ -7352,7 +7467,7 @@ msgstr "|N|ne pas renvoyer plus de N éléments dans une requête"
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FICHIER|utiliser les certificats de CA dans FICHIER pour HKP par TLS"
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 msgid ""
@@ -7652,7 +7767,7 @@ msgstr "réponse trop grande du serveur ; limitée à %d octets.\n"
 
 #, fuzzy
 #| msgid "OCSP request not possible due to disabled HTTP\n"
-msgid "OCSP request not possible due to TOR mode\n"
+msgid "OCSP request not possible due to Tor mode\n"
 msgstr "requête OCSP impossible car HTTP est désactivé\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
@@ -7806,6 +7921,10 @@ msgstr "max_replies %d dépassé\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "impossible d'allouer une structure de contrôle : %s\n"
 
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "échec d'allocation du contexte Assuan : %s\n"
+
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "impossible d'initialiser le serveur : %s\n"
@@ -8015,7 +8134,7 @@ msgstr "Options contrôlant l'interactivité et la mise en application"
 
 #, fuzzy
 #| msgid "Options controlling the security"
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr "Options contrôlant la sécurité"
 
 msgid "Configuration for HTTP servers"
@@ -8267,6 +8386,50 @@ msgstr ""
 "Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
 "ficmotif\n"
 
+#~ msgid "cleared passphrase cached with ID: %s\n"
+#~ msgstr "phrase secrète effacée mise en cache avec l'identifiant : %s\n"
+
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "impossible d'ouvrir le porte-clefs"
+
+#, fuzzy
+#~| msgid "failed to open '%s': %s\n"
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "échec d'ouverture de « %s » : %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "valeur incorrecte\n"
+
+#, fuzzy
+#~| msgid "error reading secret keyblock \"%s\": %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "erreur de lecture du bloc de clef secrète « %s » : %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Veuillez sélectionner au plus une sous-clef.\n"
+
+#~ msgid "apparently no running dirmngr\n"
+#~ msgstr "pas d'instance de dirmngr en cours d'exécution apparemment\n"
+
+#~ msgid "no running dirmngr - starting one\n"
+#~ msgstr ""
+#~ "pas d'instance de dirmngr en cours d'exécution —\n"
+#~ "démarrage d'une nouvelle instance\n"
+
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "la variable d'environnement %s est mal définie\n"
+
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "le protocole dirmngr version %d n'est pas pris en charge\n"
+
+#~ msgid "can't connect to the dirmngr - trying fall back\n"
+#~ msgstr ""
+#~ "impossible de se connecter au dirmngr — essai avec la solution de repli\n"
+
 #~ msgid "export keys in an S-expression based format"
 #~ msgstr ""
 #~ "exporter les clefs dans un format basé sur une expression symbolique"
@@ -8550,9 +8713,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "erreur de lecture du bloc de clef secrète « %s » : %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Veuillez supprimer les sélections des clefs secrètes.\n"
 
@@ -9132,9 +9292,6 @@ msgstr ""
 #~ msgid "checksum error"
 #~ msgstr "erreur de somme de contrôle"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "impossible d'ouvrir le porte-clefs"
-
 #~ msgid "invalid packet"
 #~ msgstr "paquet incorrect"
 

po/gl.po

@@ -1571,6 +1571,10 @@ msgstr "non se atopou a chave `%s': %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "non se atopou a chave `%s': %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a menos que especifique a chave por pegada dactilar)\n"
 
@@ -1784,6 +1788,19 @@ msgstr "erro ao crear `%s': %s\n"
 msgid "No fingerprint"
 msgstr "Pegada dactilar:"
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "non se atopou a chave secreta `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "opcións de importación non válidas\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NOME|empregar NOME coma chave secreta por defecto"
+
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1917,6 +1934,9 @@ msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "crear saída con armadura en ascii"
 
@@ -2118,11 +2138,48 @@ msgstr "amosar en que chaveiro est
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "deshabilitar unha chave"
+
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "destinatario por defecto `%s' descoñecido\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "destinatario por defecto `%s' descoñecido\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "NOTA: ignórase o antigo ficheiro de opcións por defecto `%s'\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2331,6 +2388,14 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave pública\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "algoritmo de hash non válido `%s'\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "algoritmo de hash non válido `%s'\n"
+
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
@@ -2427,6 +2492,14 @@ msgstr "non se puido po
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[ficheiro]"
 
@@ -2734,6 +2807,20 @@ msgstr "gravando a chave secreta en `%s'\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non válida - omitida\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2871,6 +2958,10 @@ msgstr "chaveiro `%s' creado\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "erro lendo `%s': %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
@@ -2937,6 +3028,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" está revocado."
@@ -3285,6 +3380,10 @@ msgstr "A chave est
 msgid "Really sign all user IDs? (y/N) "
 msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
 
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
@@ -3398,10 +3497,6 @@ msgstr "a actualizaci
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "non se atopou a chave secreta `%s': %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "erro: pegada dactilar non válida\n"
@@ -3619,8 +3714,11 @@ msgstr ""
 "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
 #, fuzzy
-msgid "Please select at most one subkey.\n"
+msgid ""
-msgstr "Por favor, seleccione como máximo unha chave secundaria.\n"
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
@@ -3676,6 +3774,10 @@ msgstr "Non hai ID de usuario con
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Non hai ID de usuario con índice %d\n"
+
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
@@ -4032,6 +4134,10 @@ msgstr "Nome: "
 msgid "Invalid character in name\n"
 msgstr "Caracter non válido no nome\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun díxito\n"
 
@@ -4473,10 +4579,6 @@ msgstr "descifrado correcto\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: ¡a mensaxe cifrada foi manipulada!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
@@ -4676,6 +4778,10 @@ msgstr "destinatario por defecto `%s' desco
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "clase de sinatura descoñecida"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5146,6 +5252,11 @@ msgstr "Ha ser revocada por:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Esta é unha chave de revocación sensible)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "A chave secreta está disponible.\n"
+
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta sinatura? "
@@ -5181,6 +5292,17 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "non se atopou a chave secreta `%s': %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta sinatura? "
@@ -7256,7 +7378,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "erro lendo `%s': %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
 #, fuzzy, c-format
@@ -7328,6 +7450,11 @@ msgstr "erro lendo `%s': %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "non se puido conectar a `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7366,32 +7493,6 @@ msgstr "non se puido facer stat sobre `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: fallo ao crear unha táboa hash: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "a versión %d do protocolo de gpg-agent non está soportada\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "non se puido conectar a `%s': %s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7484,7 +7585,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7796,8 +7897,9 @@ msgstr "erro lendo `%s': %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "non se atopou a chave `%s': %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7954,6 +8056,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: fallo ao crear unha táboa hash: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8164,7 +8270,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8423,6 +8529,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "non foi posible abri-lo chaveiro"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "non se puido abrir `%s': %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "valor non válido\n"
+
+#, fuzzy
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
+
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Por favor, seleccione como máximo unha chave secundaria.\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "a versión %d do protocolo de gpg-agent non está soportada\n"
+
 #, fuzzy
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "cambiar entre o listado de chaves públicas e secretas"
@@ -8603,10 +8739,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "¿Seguro que quere facer esto? "
 
-#, fuzzy
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Por favor, quite as seleccións das chaves secretas.\n"
 
@@ -9250,9 +9382,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "algoritmo de cifrado descoñecido"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "non foi posible abri-lo chaveiro"
-
 #~ msgid "invalid packet"
 #~ msgstr "paquete non válido"
 

po/hu.po

@@ -1562,6 +1562,10 @@ msgstr "\"%s\" kulcs nem tal
 msgid "error reading keyblock: %s\n"
 msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
 
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "\"%s\" kulcs nem található: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(Kivéve, ha megad egy kulcsot az ujjlenyomatával.)\n"
 
@@ -1771,6 +1775,19 @@ msgstr "Hiba \"%s\" l
 msgid "No fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "\"%s\" titkos kulcs nem található: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "Érvénytelen import opciók!\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
+
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1905,6 +1922,9 @@ msgstr "|algo [f
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "ascii páncélozott kimenet létrehozása"
 
@@ -2106,11 +2126,48 @@ msgstr "mutatja a kilist
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelelõ aláírás a titkoskulcs-karikán.\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "kulcs tiltása"
+
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "MEGJEGYZÉS: Figyelmen kívül hagytam a régi opciókat (%s).\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2319,6 +2376,14 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: Címzett megadva (-r), de nincs nyilvános kulcsú titkosítás!\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
+
 msgid "--store [filename]"
 msgstr "--store [fájlnév]"
 
@@ -2415,6 +2480,14 @@ msgstr "P
 msgid "invalid hash algorithm '%s'\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[fájlnév]"
 
@@ -2719,6 +2792,20 @@ msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs érvénytelen (%d) rejtjelezõvel - kihagytam.\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilvános kulcs - nem tudok visszavonni.\n"
@@ -2851,6 +2938,10 @@ msgstr "\"%s\" kulcskarik
 msgid "keyblock resource '%s': %s\n"
 msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "Hiba \"%s\" olvasásakor: %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
@@ -2918,6 +3009,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhasználói azonosítót visszavonták."
@@ -3260,6 +3355,10 @@ msgstr "A kulcsot visszavont
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Valóban aláírja az összes felhasználóazonosítót? "
 
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Valóban aláírja az összes felhasználóazonosítót? "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n"
 
@@ -3371,10 +3470,6 @@ msgstr "Friss
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem változott, nincs szükség frissítésre.\n"
 
-#, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "\"%s\" titkos kulcs nem található: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
@@ -3588,8 +3683,10 @@ msgid ""
 msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
 
 #, fuzzy
-msgid "Please select at most one subkey.\n"
+msgid ""
-msgstr "Maximum egy másodlagos kulcsot jelöljön ki, kérem!\n"
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
 
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
@@ -3643,6 +3740,10 @@ msgstr "Nincs %d index
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d indexû felhasználóazonosító!\n"
 
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Nincs %d indexû felhasználóazonosító!\n"
+
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d indexû felhasználóazonosító!\n"
@@ -3998,6 +4099,10 @@ msgstr "Teljes n
 msgid "Invalid character in name\n"
 msgstr "Érvénytelen karakter a névben!\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "A név lehet, hogy nem kezdõdhet számmal!\n"
 
@@ -4442,10 +4547,6 @@ msgstr "Visszafejt
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkosított üzenetet manipulálták!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
@@ -4645,6 +4746,10 @@ msgstr "Ismeretlen alap
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "ismeretlen aláírásosztály"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5117,6 +5222,11 @@ msgstr "Visszavonja:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ez egy érzékeny visszavonó kulcs.)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Titkos kulcs rendelkezésre áll.\n"
+
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
@@ -5152,6 +5262,17 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "\"%s\" titkos kulcs nem található: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
@@ -7209,7 +7330,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
 #, fuzzy, c-format
@@ -7279,6 +7400,11 @@ msgstr "Hiba \"%s\" olvas
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7317,32 +7443,6 @@ msgstr "Nem tudom a stat m
 msgid "error writing base64 encoding: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "Nem megfelelõ formájú GPG_AGENT_INFO környezeti változó!\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "%d gpg-agent protokollverzió nem támogatott!\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7435,7 +7535,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7747,8 +7847,9 @@ msgstr "Hiba \"%s\" olvas
 msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "\"%s\" kulcs nem található: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7905,6 +8006,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8114,7 +8219,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8371,6 +8476,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "nem lehet megnyitni a kulcskarikát"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "Érvénytelen érték!\n"
+
+#, fuzzy
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "Hiba \"%s\" titkoskulcs-blokk olvasásakor: %s.\n"
+
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Maximum egy másodlagos kulcsot jelöljön ki, kérem!\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "Nem megfelelõ formájú GPG_AGENT_INFO környezeti változó!\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "%d gpg-agent protokollverzió nem támogatott!\n"
+
 #, fuzzy
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "váltás a titkos és a nyilvános kulcs listázása között"
@@ -8551,10 +8686,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Valóban ezt akarja? "
 
-#, fuzzy
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "Hiba \"%s\" titkoskulcs-blokk olvasásakor: %s.\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Kérem, távolítsa el a kijelöléseket a titkos kulcsokról!\n"
 
@@ -9189,9 +9320,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "ismeretlen rejtjelezõ algoritmus"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "nem lehet megnyitni a kulcskarikát"
-
 #~ msgid "invalid packet"
 #~ msgstr "érvénytelen csomag"
 

po/id.po

@@ -1568,6 +1568,10 @@ msgstr "kunci '%s' tidak ditemukan: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
 
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "kunci '%s' tidak ditemukan: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(kecuali anda menspesifikasikan kunci dengan fingerprint)\n"
 
@@ -1776,6 +1780,19 @@ msgstr "kesalahan penciptaan : `%s': %s\n"
 msgid "No fingerprint"
 msgstr "tampilkan fingerprint"
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "opsi impor tidak valid\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
+
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
@@ -1908,6 +1925,9 @@ msgstr "|algo [file]|cetak digest pesan"
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
@@ -2109,11 +2129,48 @@ msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "tiadakan kunci"
+
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "penerima baku tidak dikenal `%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "penerima baku tidak dikenal `%s'\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2324,6 +2381,14 @@ msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "algoritma hash tidak valid `%s'\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "algoritma hash tidak valid `%s'\n"
+
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
@@ -2420,6 +2485,14 @@ msgstr "gagal enarmoring: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[namafile]"
 
@@ -2723,6 +2796,20 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2853,6 +2940,10 @@ msgstr "%s: keyring tercipta\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
@@ -2920,6 +3011,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
@@ -3265,6 +3360,10 @@ msgstr "Kunci dibatalkan"
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Tandai ID seluruh user? "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
@@ -3376,10 +3475,6 @@ msgstr "gagal memperbarui: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
@@ -3597,8 +3692,11 @@ msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
 #, fuzzy
-msgid "Please select at most one subkey.\n"
+msgid ""
-msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
@@ -3652,6 +3750,10 @@ msgstr "Tidak ada ID user dengan index %d\n"
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Tidak ada ID user dengan index %d\n"
+
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
@@ -4005,6 +4107,10 @@ msgstr "Nama sebenarnya: "
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
@@ -4442,10 +4548,6 @@ msgstr "dekripsi lancar\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
@@ -4641,6 +4743,10 @@ msgstr "penerima baku tidak dikenal `%s'\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "kelas signature tidak dikenal"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5107,6 +5213,11 @@ msgstr "Akan dibatalkan oleh:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ini adalah kunci pembatalan sensitif)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Kunci rahasia tersedia.\n"
+
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
@@ -5142,6 +5253,17 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
@@ -7198,7 +7320,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
 #, fuzzy, c-format
@@ -7268,6 +7390,11 @@ msgstr "kesalahan membaca `%s': %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "tidak dapat terkoneksi ke `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7306,32 +7433,6 @@ msgstr "tidak dapat melakukan statistik `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: gagal membuat hashtable: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "protokol gpg-agent versi %d tidak didukung\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "tidak dapat terkoneksi ke `%s': %s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7424,7 +7525,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7736,8 +7837,9 @@ msgstr "kesalahan membaca `%s': %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "kunci '%s' tidak ditemukan: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7894,6 +7996,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: gagal membuat hashtable: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8103,7 +8209,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8360,6 +8466,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "tidak dapat membuka keyring"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "tidak dapat membuka `%s': %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "nilai yang tidak valid\n"
+
+#, fuzzy
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
+
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "protokol gpg-agent versi %d tidak didukung\n"
+
 #, fuzzy
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "ubah tampilan kunci rahasia dan publik"
@@ -8545,10 +8681,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Apakah anda ingin melakukan hal ini? "
 
-#, fuzzy
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
@@ -9185,9 +9317,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "algoritma cipher tidak dikenal"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "tidak dapat membuka keyring"
-
 #~ msgid "invalid packet"
 #~ msgstr "paket tidak valid"
 

po/it.po

@@ -1566,6 +1566,10 @@ msgstr "chiave `%s' non trovata: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "chiave `%s' non trovata: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a meno che la chiave sia specificata con il fingerprint)\n"
 
@@ -1783,6 +1787,19 @@ msgstr "errore creando `%s': %s\n"
 msgid "No fingerprint"
 msgstr "mostra le impronte digitali"
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "chiave segreta `%s' non trovata: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "opzioni di importazione non valide\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NOME|usa NOME come chiave segreta predefinita"
+
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
@@ -1915,6 +1932,9 @@ msgstr "|algo [files]|stampa tutti i message digests"
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
@@ -2116,12 +2136,49 @@ msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "disabilita una chiave"
+
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "destinatario predefinito `%s' sconosciuto\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "destinatario predefinito `%s' sconosciuto\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite è stato ignorato\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "errore creando il portachiavi `%s': %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2330,6 +2387,14 @@ msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "algoritmo di hash non valido `%s'\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "algoritmo di hash non valido `%s'\n"
+
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
@@ -2426,6 +2491,14 @@ msgstr "creazione dell'armatura fallita: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "errore nella creazione della passhprase: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[nomefile]"
 
@@ -2729,6 +2802,20 @@ msgstr "scrittura della chiave segreta in `%s'\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2862,6 +2949,10 @@ msgstr "portachiavi `%s' creato\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
@@ -2929,6 +3020,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" è stato revocato."
@@ -3272,6 +3367,10 @@ msgstr "La chiave
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Firmo davvero tutti gli user ID? "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
@@ -3383,10 +3482,6 @@ msgstr "aggiornamento fallito: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
 
-#, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "chiave segreta `%s' non trovata: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "errore: impronta digitale non valida\n"
@@ -3608,8 +3703,11 @@ msgstr ""
 "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
 
 #, fuzzy
-msgid "Please select at most one subkey.\n"
+msgid ""
-msgstr "Seleziona al massimo una chiave secondaria.\n"
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
 
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
@@ -3665,6 +3763,10 @@ msgstr "Nessun user ID con l'indice %d\n"
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Nessun user ID con l'indice %d\n"
+
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
@@ -4021,6 +4123,10 @@ msgstr "Nome e Cognome: "
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non può iniziare con una cifra\n"
 
@@ -4459,10 +4565,6 @@ msgstr "decifratura corretta\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
@@ -4659,6 +4761,10 @@ msgstr "destinatario predefinito `%s' sconosciuto\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "classe della firma sconosciuta"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5134,6 +5240,11 @@ msgstr "Revocabile da:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Questa è una chiave di revoca sensibile)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "È disponibile una chiave segreta.\n"
+
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
@@ -5169,6 +5280,17 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "chiave segreta `%s' non trovata: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
@@ -7238,7 +7360,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "errore leggendo `%s': %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
 #, fuzzy, c-format
@@ -7308,6 +7430,11 @@ msgstr "errore leggendo `%s': %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "impossibile connettersi a `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7346,32 +7473,6 @@ msgstr "impossibile eseguire stat su `%s': %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: creazione della tabella hash fallita: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "la versione %d del protocollo di gpg-agent non è gestita\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "impossibile connettersi a `%s': %s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7464,7 +7565,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7777,8 +7878,9 @@ msgstr "errore leggendo `%s': %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "chiave `%s' non trovata: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7935,6 +8037,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: creazione della tabella hash fallita: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8144,7 +8250,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8401,6 +8507,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "impossibile aprire il portachiavi"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "impossibile aprire `%s': %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "valore non valido\n"
+
+#, fuzzy
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "errore leggendo il keyblock segreto `%s': %s\n"
+
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Seleziona al massimo una chiave secondaria.\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "la versione %d del protocollo di gpg-agent non è gestita\n"
+
 #, fuzzy
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
@@ -8586,10 +8722,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Vuoi veramente farlo?"
 
-#, fuzzy
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "errore leggendo il keyblock segreto `%s': %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
@@ -9242,9 +9374,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "algoritmo di cifratura sconosciuto"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "impossibile aprire il portachiavi"
-
 #~ msgid "invalid packet"
 #~ msgstr "pacchetto non valido"
 

po/ja.po

@@ -1461,6 +1461,11 @@ msgstr "鍵\"%s\"が見つかりません: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "鍵ブロックの読み込みエラー: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "鍵\"%s\"が見つかりません: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(フィンガー・プリントで鍵を指定してない限り)\n"
 
@@ -1649,6 +1654,20 @@ msgstr "'%s'を %s から取得する際のエラー: %s\n"
 msgid "No fingerprint"
 msgstr "フィンガープリントがありません"
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
+
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "(check argument of option '%s')\n"
+msgstr "オプション\"%.50s\"に引数がありません\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NAME|デフォルトの秘密鍵としてNAMEを用いる"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uidで有効にされた無効な鍵%sです\n"
@@ -1768,6 +1787,9 @@ msgstr "メッセージ・ダイジェストを表示"
 msgid "run in server mode"
 msgstr "サーバ・モードで実行"
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "ASCII形式の外装を作成"
 
@@ -1955,10 +1977,51 @@ msgstr "鍵の一覧に鍵リングの名前を表示する"
 msgid "show expiration dates during signature listings"
 msgstr "署名の一覧時に有効期限の日付を表示する"
 
+#, fuzzy
+#| msgid "Available keys:\n"
+msgid "available TOFU policies:\n"
+msgstr "利用可能な鍵:\n"
+
+#, fuzzy, c-format
+#| msgid "unknown option '%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "不明のオプション'%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "unknown command '%s'\n"
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "不明のコマンド'%s'\n"
+
 #, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "option \"%.50s\" is ambiguous\n"
+msgid "key specification '%s' is ambiguous\n"
+msgstr "オプション\"%.50s\"はあいまいです\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring '%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "鍵リング'%s'の作成エラー: %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt が古すぎます (必要 %s, 現在 %s)\n"
@@ -2151,6 +2214,16 @@ msgstr "信用データベースの初期化に失敗しました: %s\n"
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
 
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "行 %d: 無効な日付が与えられました\n"
+
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "行 %d: 無効な日付が与えられました\n"
+
 msgid "--store [filename]"
 msgstr "--store [ファイル名]"
 
@@ -2243,6 +2316,15 @@ msgstr "外装に失敗しました: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
 
+#, fuzzy, c-format
+#| msgid "error loading certificate '%s': %s\n"
+msgid "error parsing key specification '%s': %s\n"
+msgstr "証明書'%s'の読み込みエラー: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[ファイル名]"
 
@@ -2536,6 +2618,20 @@ msgstr "秘密鍵のインポートは禁止です\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "鍵%s: 無効な暗号方式%dの秘密鍵です - スキップします\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
@@ -2660,6 +2756,11 @@ msgstr "鍵リング'%s'ができました\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "keyblock リソース'%s': %s\n"
 
+#, fuzzy, c-format
+#| msgid "error opening '%s': %s\n"
+msgid "error opening key DB: %s\n"
+msgstr "'%s'を開く際、エラー: %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "鍵リング・キャッシュの再構築に失敗しました: %s\n"
@@ -2727,6 +2828,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "署名を制限するドメインを入力するか、空行を入力してください。\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ユーザID\"%s\"は、失効されています。"
@@ -3024,6 +3129,11 @@ msgstr "鍵は、失効されています。"
 msgid "Really sign all user IDs? (y/N) "
 msgstr "本当に全ユーザIDに署名しますか? (y/N) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "本当に全ユーザIDに署名しますか? (y/N) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "ヒント: まず署名するユーザIDを選択します\n"
 
@@ -3120,10 +3230,6 @@ msgstr "更新に失敗しました: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "鍵は無変更なので更新は不要です。\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
-
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\"はフィンガープリントではありません\n"
@@ -3322,8 +3428,13 @@ msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "高々1個の副鍵を選択してください。\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "副鍵の有効期限を変更します。\n"
@@ -3372,6 +3483,11 @@ msgstr "%d番のユーザIDはありません\n"
 msgid "No user ID with hash %s\n"
 msgstr "ハッシュ%sのユーザIDはありません\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "%d番の副鍵はありません\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d番の副鍵はありません\n"
@@ -3713,6 +3829,10 @@ msgstr "本名: "
 msgid "Invalid character in name\n"
 msgstr "名前に無効な文字があります\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "名前を数字で始めてはいけません\n"
 
@@ -4125,10 +4245,6 @@ msgstr "復号に成功\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "*警告*: 暗号化されたメッセージは改竄されています!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr "保持したパスフレーズをクリアしました ID: %s\n"
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "復号に失敗しました: %s\n"
@@ -4318,6 +4434,11 @@ msgstr "不明のオプション'%s'\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "ECDSAの公開鍵は8ビットの倍数のSECエンコーディングを期待します\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type '%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "不明の署名タイプ'%s'\n"
+
 #, c-format
 msgid "File '%s' exists. "
 msgstr "ファイル'%s'は既に存在します。"
@@ -4757,6 +4878,11 @@ msgstr "失効者:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(これは、機密指定の失効鍵です)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "秘密鍵が使用できます。\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "この鍵に対する指名失効証明書を作成しますか? (y/N) "
 
@@ -4796,6 +4922,18 @@ msgstr ""
 "入されます。\n"
 "この失効証明書を使う前にはテクスト・エディタでこのコロンを削除してください。"
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "この鍵に対する失効証明書を作成しますか? (y/N) "
 
@@ -6761,7 +6899,9 @@ msgstr "'%s'を取得する際のエラー: %s\n"
 msgid "error retrieving '%s': http status %u\n"
 msgstr "'%s'の取得エラー: httpステイタス %u\n"
 
-msgid "CRL access not possible due to TOR mode\n"
+#, fuzzy
+#| msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "CRLアクセスはTORモードのため不可能です\n"
 
 #, c-format
@@ -6827,6 +6967,10 @@ msgstr "'%s'から証明書の読み込みエラー: %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr "証明書は意味のあるものとしては大きすぎます\n"
 
+#, c-format
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "dirmngrへ接続できません: %s\n"
+
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "検索に失敗しました: %s\n"
@@ -6860,31 +7004,6 @@ msgstr "ステイタス'%s'を取得しました\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "base64エンコーディングの書き込みエラー: %s\n"
 
-#, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "assuanコンテクストの確保に失敗しました: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr "あきらかにdirmngrが動いていません\n"
-
-msgid "no running dirmngr - starting one\n"
-msgstr "dirmngrが動いていません - 開始します\n"
-
-#, c-format
-msgid "malformed %s environment variable\n"
-msgstr "環境変数%sが破壊されています\n"
-
-#, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "dirmngrプロトコル・バージョン%dはサポートされていません\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr "dirmngrに接続できません - フォールバックを試します\n"
-
-#, c-format
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "dirmngrへ接続できません: %s\n"
-
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "サポートされていない問い合わせ: '%s'\n"
@@ -6971,7 +7090,9 @@ msgstr "|N|一つのクエリでNを越えるのアイテムを返さない"
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|FILEにあるCA証明書をTLSでのHKPに使う"
 
-msgid "route all network traffic via TOR"
+#, fuzzy
+#| msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr "ネットワーク・トラフィックをすべてTOR経由にする"
 
 msgid ""
@@ -7264,7 +7385,9 @@ msgstr "応答からの読み込みエラー: %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr "サーバからの応答がが長すぎます (上限%dバイト)。\n"
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
+#| msgid "OCSP request not possible due to TOR mode\n"
+msgid "OCSP request not possible due to Tor mode\n"
 msgstr "TORモードのためOCSPリクエストが不可能です\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
@@ -7417,6 +7540,10 @@ msgstr "max_replies %d を越えました\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "制御構造を確保できません: %s\n"
 
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "assuanコンテクストの確保に失敗しました: %s\n"
+
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "サーバの初期化に失敗しました: %s\n"
@@ -7613,7 +7740,9 @@ msgstr "出力フォーマットを制御するオプション"
 msgid "Options controlling the interactivity and enforcement"
 msgstr "インタラクティビティと強制を制御するオプション"
 
-msgid "Options controlling the use of TOR"
+#, fuzzy
+#| msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr "TORの使用を制御するオプション"
 
 msgid "Configuration for HTTP servers"
@@ -7864,6 +7993,47 @@ msgstr ""
 "形式: gpg-check-pattern [オプション] パターンファイル\n"
 "パターンファイルに対して標準入力のパスフレーズを確認する\n"
 
+#~ msgid "cleared passphrase cached with ID: %s\n"
+#~ msgstr "保持したパスフレーズをクリアしました ID: %s\n"
+
+#, fuzzy
+#~| msgid "failed to store the key: %s\n"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "鍵の保管に失敗しました: %s\n"
+
+#, fuzzy
+#~| msgid "failed to open '%s': %s\n"
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "'%s'が開けません: %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "無効な値\n"
+
+#, fuzzy
+#~| msgid "error locking keybox: %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "keyboxのロックのエラー: %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "高々1個の副鍵を選択してください。\n"
+
+#~ msgid "apparently no running dirmngr\n"
+#~ msgstr "あきらかにdirmngrが動いていません\n"
+
+#~ msgid "no running dirmngr - starting one\n"
+#~ msgstr "dirmngrが動いていません - 開始します\n"
+
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "環境変数%sが破壊されています\n"
+
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "dirmngrプロトコル・バージョン%dはサポートされていません\n"
+
+#~ msgid "can't connect to the dirmngr - trying fall back\n"
+#~ msgstr "dirmngrに接続できません - フォールバックを試します\n"
+
 #~ msgid "export keys in an S-expression based format"
 #~ msgstr "S式ベースのフォーマットで鍵をエクスポートする"
 

po/nb.po

@@ -1537,6 +1537,11 @@ msgstr "n
 msgid "error reading keyblock: %s\n"
 msgstr "feil ved lesing av nøkkelblokk: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "nøkkelen «%s» ble ikke funnet: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(med mindre du angir nøkkelen ved hjelp av fingeravtrykk)\n"
 
@@ -1744,6 +1749,19 @@ msgstr "feil ved lesing av
 msgid "No fingerprint"
 msgstr "CA-fingeravtrykk: "
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "hemmelig nøkkel «%s» ble ikke funnet: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "ugyldige listevalg\n"
+
+#, fuzzy, c-format
+#| msgid "unusable secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "ubrukelig hemmelig nøkkel"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig nøkkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
@@ -1875,6 +1893,9 @@ msgstr "|algo [filer]|skrive meldingsdigester"
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
@@ -2100,11 +2121,49 @@ msgstr "vise navnet til n
 msgid "show expiration dates during signature listings"
 msgstr ""
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "utkoble en nøkkel"
+
+#, fuzzy, c-format
+#| msgid "unknown option `%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "ukjent valg «%s»\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "ukjent valg «%s»\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "MERK: den gamle valgfila «%s» ble ignorert\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "feil ved opprettelse av nøkkelknippet «%s»: %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2307,6 +2366,14 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: mottakere (-r) angitt uten å bruke offentlig nøkkelkryptering\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "ugyldig hashalgoritme «%s»\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "ugyldig hashalgoritme «%s»\n"
+
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
@@ -2402,6 +2469,14 @@ msgstr "enarmoring failed: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ugyldig hashalgoritme «%s»\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "feil ved henting av nåværende nøkkelinfo: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[filnavn]"
 
@@ -2703,6 +2778,20 @@ msgstr "import av hemmelig n
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nøkkel %s: hemmelig nøkkel med ugyldig cipher %d - hoppet over\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2832,6 +2921,10 @@ msgstr "n
 msgid "keyblock resource '%s': %s\n"
 msgstr "nøkkelblokkressurs «%s»: %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "feil med «%s»: %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
@@ -2897,6 +2990,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Brukerid «%s» er opphevet."
@@ -3195,6 +3292,11 @@ msgstr "N
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Virkelig signerere alle brukerider? (j/N) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Virkelig signerere alle brukerider? (j/N) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Velg brukeriden som skal signeres\n"
 
@@ -3293,10 +3395,6 @@ msgstr "oppdatering mislyktes: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Nøkkelen ble ikke endret, så ingen oppdatering er nødvendig.\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "hemmelig nøkkel «%s» ble ikke funnet: %s\n"
-
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
@@ -3492,8 +3590,15 @@ msgstr ""
 "Er du fortsatt sikker på at du vil gjøre denne nøkkelen til en opphever? (j/"
 "N) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "Vennligst velg minst en undernøkkel.\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Er du fortsatt sikker på at du vil gjøre denne nøkkelen til en opphever? (j/"
+"N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
@@ -3542,6 +3647,11 @@ msgstr ""
 msgid "No user ID with hash %s\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "Nothing to sign with key %s\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Ingenting å signere med nøkkelen %s\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
@@ -3890,6 +4000,10 @@ msgstr "Fullt navn: "
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Navnet kan ikke starte med et siffer\n"
 
@@ -4334,10 +4448,6 @@ msgstr ""
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
@@ -4530,6 +4640,11 @@ msgstr "ukjent valg
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type `%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "Ukjent signaturtype «%s»\n"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -4992,6 +5107,11 @@ msgstr ""
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Hemmelig nøkkel er tilgjengelig\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Lage et utpekt opphevingssertifikat for denne nøkkelen? (j/N) "
 
@@ -5027,6 +5147,18 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "hemmelig nøkkel «%s» ble ikke funnet: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Lage et opphevingssertifikat for denne nøkkelen? (j/N) "
 
@@ -7053,7 +7185,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "feil ved lesing av «%s»: %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "hemmelig nøkkel «%s» ble ikke funnet: %s\n"
 
 #, fuzzy, c-format
@@ -7121,6 +7253,10 @@ msgstr "feil ved lesing av
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "kan ikke åpne nøkkelknippet"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7160,31 +7296,6 @@ msgstr "kan ikke stat()
 msgid "error writing base64 encoding: %s\n"
 msgstr "feil ved skriving av hemmelig nøkkelknippe «%s»: %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "klarte ikke å lagre nøkkelen: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, c-format
-msgid "malformed %s environment variable\n"
-msgstr ""
-
-#, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr ""
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "kan ikke åpne nøkkelknippet"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7278,7 +7389,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7598,8 +7709,9 @@ msgstr "feil ved lesing av
 msgid "response from server too large; limit is %d bytes\n"
 msgstr "Feil: Privat DO for lang (grensa går ved %d tegn).\n"
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "hemmelig nøkkel «%s» ble ikke funnet: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7757,6 +7869,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil «%s»: %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "klarte ikke å lagre nøkkelen: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -7963,7 +8079,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8220,6 +8336,28 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "failed to store the key: %s\n"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "klarte ikke å lagre nøkkelen: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "Kan ikke åpne «%s»: %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "ugyldig verdi\n"
+
+#, fuzzy
+#~| msgid "error reading secret keyblock \"%s\": %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "feil ved lesing av hemmelig nøkkelblokk «%s»: %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Vennligst velg minst en undernøkkel.\n"
+
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "veksle mellom hemmelig og offentlig nøkkellisting"
 
@@ -8351,9 +8489,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Vil du virkelig gjøre dette? (j/N) "
 
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "feil ved lesing av hemmelig nøkkelblokk «%s»: %s\n"
-
 #~ msgid "writing secret key stub to `%s'\n"
 #~ msgstr "skriver foreløpig hemmelig nøkkel til «%s»\n"
 
@@ -8750,9 +8885,6 @@ msgstr ""
 #~ msgid "unusable public key"
 #~ msgstr "ubrukelig offentlig nøkkel"
 
-#~ msgid "unusable secret key"
-#~ msgstr "ubrukelig hemmelig nøkkel"
-
 #~ msgid "keyserver error"
 #~ msgstr "feil med nøkkelserver"
 

po/pl.po

@@ -1581,6 +1581,11 @@ msgstr "klucz ,,%s'' nie zosta
 msgid "error reading keyblock: %s\n"
 msgstr "b³±d odczytu bloku kluczy: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(chyba, ¿e klucz zostaje wybrany przez podanie odcisku)\n"
 
@@ -1787,6 +1792,20 @@ msgstr "b
 msgid "No fingerprint"
 msgstr "Brak odcisku"
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "klucz prywatny ,,%s'' nie zosta³ odnaleziony: %s\n"
+
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "(check argument of option '%s')\n"
+msgstr "brak argumentu dla opcji ,,%.50s''\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NAZWA|u¿ycie NAZWY jako domy¶lnego klucza tajnego"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1915,6 +1934,9 @@ msgstr "wypisanie skr
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
@@ -2148,11 +2170,52 @@ msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wyga¶niêcia przy wypisywaniu podpisów"
 
+#, fuzzy
+#| msgid "Available keys:\n"
+msgid "available TOFU policies:\n"
+msgstr "Dostêpne klucze:\n"
+
+#, fuzzy, c-format
+#| msgid "unknown option `%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "nieznana opcja ,,%s''\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "unknown command `%s'\n"
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "nieznane polecenie ,,%s''\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "UWAGA: stary domy¶lny plik opcji ,,%s'' zosta³ zignorowany\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "option \"%.50s\" is ambiguous\n"
+msgid "key specification '%s' is ambiguous\n"
+msgstr "opcja ,,%.50s'' jest niejednoznaczna\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "b³±d tworzenia zbioru kluczy `%s': %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2360,6 +2423,16 @@ msgstr "inicjowanie Bazy Zaufania nie powiod
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE¯ENIE: podano adresatów (-r) w dzia³aniu które ich nie dotyczy\n"
 
+#, fuzzy, c-format
+#| msgid "line %d: invalid algorithm\n"
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "linia %d: niew³a¶ciwy algorytm\n"
+
+#, fuzzy, c-format
+#| msgid "line %d: invalid algorithm\n"
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "linia %d: niew³a¶ciwy algorytm\n"
+
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
@@ -2454,6 +2527,15 @@ msgstr "opakowywanie ASCII nie powiod
 msgid "invalid hash algorithm '%s'\n"
 msgstr "niew³a¶ciwy algorytm skrótu ,,%s''\n"
 
+#, fuzzy, c-format
+#| msgid "error storing certificate: %s\n"
+msgid "error parsing key specification '%s': %s\n"
+msgstr "b³±d zapisywania certyfikatu: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
@@ -2758,6 +2840,20 @@ msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %s: klucz tajny z b³êdnym szyfrem %d - pominiêty\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2895,6 +2991,11 @@ msgstr "zbi
 msgid "keyblock resource '%s': %s\n"
 msgstr "zasób bloku klucza `%s': %s\n"
 
+#, fuzzy, c-format
+#| msgid "error opening `%s': %s\n"
+msgid "error opening key DB: %s\n"
+msgstr "b³±d podczas otwierania ,,%s'': %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod³a siê odbudowa bufora bazy: %s\n"
@@ -2964,6 +3065,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Proszê wpisaæ domenê ograniczaj±c± ten podpis lub Enter dla ¿adnej.\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u¿ytkownika ,,%s'' zosta³ uniewa¿niony."
@@ -3292,6 +3397,11 @@ msgstr "Klucz uniewa
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Czy na pewno podpisaæ wszystkie identyfikatory u¿ytkownika? (t/N) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Czy na pewno podpisaæ wszystkie identyfikatory u¿ytkownika? (t/N) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied¼: wybierz identyfikatory u¿ytkownika do podpisania.\n"
 
@@ -3395,10 +3505,6 @@ msgstr "zapis zmian nie powi
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie zosta³ zmieniony wiêc zapis zmian nie jest konieczny.\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "klucz prywatny ,,%s'' nie zosta³ odnaleziony: %s\n"
-
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
@@ -3606,8 +3712,13 @@ msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczyæ ten klucz jako uniewa¿niaj±cy? (t/N) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "Proszê wybraæ najwy¿ej jeden podklucz.\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr "Czy na pewno chcesz wyznaczyæ ten klucz jako uniewa¿niaj±cy? (t/N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa¿no¶ci podklucza.\n"
@@ -3657,6 +3768,11 @@ msgstr "Brak identyfikatora u
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u¿ytkownika o skrócie %s\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Brak podklucza o numerze %d.\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d.\n"
@@ -4012,6 +4128,10 @@ msgstr "Imi
 msgid "Invalid character in name\n"
 msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Imiê lub nazwisko nie mo¿e zaczynaæ siê od cyfry\n"
 
@@ -4460,10 +4580,6 @@ msgstr "odszyfrowanie poprawne\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE¯ENIE: zaszyfrowana wiadomo¶æ by³a manipulowana!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr "wyczyszczono has³o zapamiêtane z ID: %s\n"
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania: %s\n"
@@ -4666,6 +4782,11 @@ msgstr "nieznana opcja ,,%s''\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA wymaga d³ugo¶ci skrótu bêd±cego wielokrotno¶ci± 8 bitów\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type `%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "Nieznany rodzaj podpisu ,,%s''\n"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5135,6 +5256,11 @@ msgstr "Zostanie uniewa
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(to jest czu³y klucz uniewa¿niaj±cy)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Dostêpny jest klucz tajny.\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Stworzyæ certyfikat uniewa¿nienia tego klucza? (t/N) "
 
@@ -5170,6 +5296,18 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "klucz prywatny ,,%s'' nie zosta³ odnaleziony: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Stworzyæ certyfikat uniewa¿nienia tego klucza? (t/N) "
 
@@ -7320,7 +7458,7 @@ msgstr "b
 
 #, fuzzy
 #| msgid "certificate `%s' not found: %s\n"
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
 
 #, fuzzy, c-format
@@ -7400,6 +7538,11 @@ msgstr "b
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "nie mo¿na siê po³±czyæ z ,,%s'': %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7442,36 +7585,6 @@ msgstr ""
 msgid "error writing base64 encoding: %s\n"
 msgstr "b³±d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#, fuzzy, c-format
-#| msgid "failed to create stream from socket: %s\n"
-msgid "failed to allocate assuan context: %s\n"
-msgstr "nie uda³o siê utworzyæ strumienia z gniazda: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-#, fuzzy
-#| msgid "no running dirmngr - starting `%s'\n"
-msgid "no running dirmngr - starting one\n"
-msgstr "dirmngr nie dzia³a - uruchamianie ,,%s''\n"
-
-#, fuzzy, c-format
-#| msgid "malformed DIRMNGR_INFO environment variable\n"
-msgid "malformed %s environment variable\n"
-msgstr "z³y format zmiennej ¶rodowiskowej DIRMNGR_INFO\n"
-
-#, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "wersja %d protoko³u dirmngr nie jest obs³ugiwana\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr "nie mo¿na po³±czyæ siê z dirmngr - próba fallbacku\n"
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "nie mo¿na siê po³±czyæ z ,,%s'': %s\n"
-
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported inquiry '%s'\n"
@@ -7576,7 +7689,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7924,8 +8037,10 @@ msgstr "b
 msgid "response from server too large; limit is %d bytes\n"
 msgstr "B³±d: prywatne DO zbyt d³ugie (limit to %d znaków).\n"
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+#| msgid "certificate `%s' not found: %s\n"
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -8108,6 +8223,11 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "nie mo¿na przydzieliæ ³añcucha pliku wyj¶ciowego: %s\n"
 
+#, fuzzy, c-format
+#| msgid "failed to create stream from socket: %s\n"
+msgid "failed to allocate assuan context: %s\n"
+msgstr "nie uda³o siê utworzyæ strumienia z gniazda: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8335,7 +8455,7 @@ msgstr "Opcje steruj
 
 #, fuzzy
 #| msgid "Options controlling the security"
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr "Opcje steruj±ce bezpieczeñstwem"
 
 msgid "Configuration for HTTP servers"
@@ -8605,6 +8725,48 @@ msgstr ""
 "Sk³adnia: gpg-check-pattern [opcje] plik-wzorców\n"
 "Sprawdzanie has³a ze standardowego wej¶cia wzglêdem pliku wzorców\n"
 
+#~ msgid "cleared passphrase cached with ID: %s\n"
+#~ msgstr "wyczyszczono has³o zapamiêtane z ID: %s\n"
+
+#, fuzzy
+#~| msgid "failed to store the key: %s\n"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "nie powiód³ siê zapis klucza: %s\n"
+
+#, fuzzy
+#~| msgid "failed to open `%s': %s\n"
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "nie uda³o siê otworzyæ ,,%s'': %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "niepoprawna warto¶æ\n"
+
+#, fuzzy
+#~| msgid "error reading secret keyblock \"%s\": %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "b³±d odczytu bloku klucza tajnego ,,%s'': %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Proszê wybraæ najwy¿ej jeden podklucz.\n"
+
+#, fuzzy
+#~| msgid "no running dirmngr - starting `%s'\n"
+#~ msgid "no running dirmngr - starting one\n"
+#~ msgstr "dirmngr nie dzia³a - uruchamianie ,,%s''\n"
+
+#, fuzzy
+#~| msgid "malformed DIRMNGR_INFO environment variable\n"
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "z³y format zmiennej ¶rodowiskowej DIRMNGR_INFO\n"
+
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "wersja %d protoko³u dirmngr nie jest obs³ugiwana\n"
+
+#~ msgid "can't connect to the dirmngr - trying fall back\n"
+#~ msgstr "nie mo¿na po³±czyæ siê z dirmngr - próba fallbacku\n"
+
 #~ msgid "export keys in an S-expression based format"
 #~ msgstr "eksport kluczy w formacie opartym na S-wyra¿eniach"
 
@@ -8783,9 +8945,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Czy na pewno chcesz to zrobiæ? (t/N) "
 
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "b³±d odczytu bloku klucza tajnego ,,%s'': %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Proszê usun±æ znacznik wyboru z kluczy prywatnych.\n"
 

po/pt.po

@@ -1568,6 +1568,10 @@ msgstr "chave `%s' n
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "chave `%s' não encontrada: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a não ser que escolha a chave pela sua impressão digital)\n"
 
@@ -1775,6 +1779,19 @@ msgstr "erro ao criar `%s': %s\n"
 msgid "No fingerprint"
 msgstr "mostra impressão digital"
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "chave `%s' não encontrada: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "opções de importação inválidas\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NOME|usar NOME como chave secreta por omissão"
+
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inválida %08lX tornada válida por --allow-non-selfsigned-uid\n"
@@ -1907,6 +1924,9 @@ msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
@@ -2112,11 +2132,48 @@ msgstr "mostrar em que porta-chave a chave est
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "desactiva uma chave"
+
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "destinatário por omissão desconhecido `%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "destinatário por omissão desconhecido `%s'\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de opções por omissão `%s' foi ignorado\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "erro ao criar porta-chaves `%s': %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2325,6 +2382,14 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinatários (-r) dados sem utilizar uma cifra de chave pública\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "algoritmo de dispersão inválido `%s'\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "algoritmo de dispersão inválido `%s'\n"
+
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
@@ -2421,6 +2486,14 @@ msgstr "cria
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "erro na criação da frase secreta: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
@@ -2725,6 +2798,20 @@ msgstr "a escrever chave privada para `%s'\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inválida %d - ignorada\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2858,6 +2945,10 @@ msgstr "porta-chaves `%s' criado\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
@@ -2925,6 +3016,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" está revocado."
@@ -3273,6 +3368,10 @@ msgstr "A chave est
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Realmente assinar todos os IDs de utilizador? "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n"
 
@@ -3385,10 +3484,6 @@ msgstr "actualiza
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
 
-#, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "chave `%s' não encontrada: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
@@ -3598,8 +3693,10 @@ msgid ""
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
 #, fuzzy
-msgid "Please select at most one subkey.\n"
+msgid ""
-msgstr "Por favor seleccione no máximo uma chave secundária.\n"
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
@@ -3653,6 +3750,10 @@ msgstr "Nenhum ID de utilizador com
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Nenhum ID de utilizador com índice %d\n"
+
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
@@ -4010,6 +4111,10 @@ msgstr "Nome completo: "
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido no nome\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "O nome não pode começar com um dígito\n"
 
@@ -4451,10 +4556,6 @@ msgstr "decifragem correcta\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
@@ -4656,6 +4757,10 @@ msgstr "destinat
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "classe de assinatura desconhecida"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5122,6 +5227,11 @@ msgstr ""
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Chave secreta disponível.\n"
+
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
@@ -5158,6 +5268,17 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "chave `%s' não encontrada: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
@@ -7212,7 +7333,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "erro na leitura de `%s': %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
 #, fuzzy, c-format
@@ -7282,6 +7403,11 @@ msgstr "erro na leitura de `%s': %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "impossível ligar a `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7320,32 +7446,6 @@ msgstr "imposs
 msgid "error writing base64 encoding: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: falha ao criar tabela de dispersão: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "variável de ambiente GPG_AGENT_INFO inválida\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "a versão %d do protocolo gpg-agent não é suportada\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "impossível ligar a `%s': %s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7438,7 +7538,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7752,8 +7852,9 @@ msgstr "erro na leitura de `%s': %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "chave `%s' não encontrada: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7909,6 +8010,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "impossível criar `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: falha ao criar tabela de dispersão: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8120,7 +8225,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8376,6 +8481,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "não é possível abrir o porta-chaves"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "impossível abrir `%s': %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "valor inválido\n"
+
+#, fuzzy
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
+
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Por favor seleccione no máximo uma chave secundária.\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "variável de ambiente GPG_AGENT_INFO inválida\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "a versão %d do protocolo gpg-agent não é suportada\n"
+
 #, fuzzy
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "alterna entre listagem de chave secreta e pública"
@@ -8543,10 +8678,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Você quer realmente fazer isso? "
 
-#, fuzzy
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Por favor remova as selecções das chaves secretas.\n"
 
@@ -9161,9 +9292,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "algoritmo de criptografia desconhecido"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "não é possível abrir o porta-chaves"
-
 #~ msgid "invalid packet"
 #~ msgstr "pacote inválido"
 

po/ro.po

@@ -1565,6 +1565,11 @@ msgstr "cheia \"%s\" nu a fost g
 msgid "error reading keyblock: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "cheia \"%s\" nu a fost gãsitã: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dacã nu specificaþi cheia prin amprentã)\n"
 
@@ -1774,6 +1779,19 @@ msgstr "eroare la creearea `%s': %s\n"
 msgid "No fingerprint"
 msgstr "Amprenta CA: "
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "cheia secretã \"%s\" nu a fost gãsitã: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "opþiuni enumerare invalide\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NUME|foloseºte NUME ca cheie secretã implicitã"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalidã %s fãcutã validã de --allow-non-selfsigned-uid\n"
@@ -1905,6 +1923,9 @@ msgstr "|algo [fi
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "creazã ieºire în armurã ascii"
 
@@ -2139,11 +2160,49 @@ msgstr "arat
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semnãturã corespunzãtoare în inelul secret\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "deactiveazã cheia"
+
+#, fuzzy, c-format
+#| msgid "unknown option `%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "opþiune necunoscutã `%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "opþiune necunoscutã `%s'\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "NOTÃ: fisier opþiuni implicite vechi `%s' ignorat\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2351,6 +2410,14 @@ msgstr ""
 "AVERTISMENT: destinatari (-r) furnizaþi fãrã a folosi cifrare cu cheie "
 "publicã\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "algoritm hash invalid `%s'\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "algoritm hash invalid `%s'\n"
+
 msgid "--store [filename]"
 msgstr "--store [nume_fiºier]"
 
@@ -2446,6 +2513,14 @@ msgstr "punerea armurii a e
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "eroare la obþinerea numãrului serial: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[nume_fiºier]"
 
@@ -2752,6 +2827,20 @@ msgstr "importul de chei secrete nu este permis\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secretã cu cifru invalid %d - sãritã\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2884,6 +2973,10 @@ msgstr "inelul de chei `%s' creat\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "resursã keyblock `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "eroare în `%s': %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am eºuat sã reconstruiesc cache-ul inelului de chei: %s\n"
@@ -2954,6 +3047,10 @@ msgstr ""
 "Vã rugãm sã introduceþi domeniul de restricþionare al acestei semnãturi, sau "
 "apãsaþi enter pentru niciunul.\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
@@ -3272,6 +3369,11 @@ msgstr "Cheia este revocat
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semnaþi într-adevãr toate ID-urile utilizator? (d/N) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Semnaþi într-adevãr toate ID-urile utilizator? (d/N) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selectaþi ID-ul utilizator de semnat\n"
 
@@ -3375,10 +3477,6 @@ msgstr "actualizarea a e
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbatã aºa cã nici o actualizare a fost necesarã.\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "cheia secretã \"%s\" nu a fost gãsitã: %s\n"
-
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
@@ -3590,8 +3688,15 @@ msgstr ""
 "Sunteþi sigur(ã) cã doriþi sã desemnaþi aceastã cheie ca ºi un revocator "
 "desemnat? (d/N) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "Vã rugãm selectaþi cel mult o subcheie.\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Sunteþi sigur(ã) cã doriþi sã desemnaþi aceastã cheie ca ºi un revocator "
+"desemnat? (d/N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
@@ -3644,6 +3749,11 @@ msgstr "Nici un ID utilizator cu indicele %d\n"
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Nici o subcheie cu indicele %d\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
@@ -3992,6 +4102,10 @@ msgstr "Nume real: "
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid în nume\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate începe cu o cifrã\n"
 
@@ -4430,10 +4544,6 @@ msgstr "decriptare OK\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a eºuat: %s\n"
@@ -4632,6 +4742,11 @@ msgstr "op
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type `%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "Tip de semnãturã necunoscut `%s'\n"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5109,6 +5224,11 @@ msgstr "Pentru a fi revocat de:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aceasta este o cheie de revocare senzitivã)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Cheia secretã este disponibilã.\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Creaþi un certificat de revocare desemnat pentru aceastã cheie? (d/N) "
 
@@ -5144,6 +5264,18 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "cheia secretã \"%s\" nu a fost gãsitã: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Creaþi un certificat de revocare pentru aceastã cheie? (d/N) "
 
@@ -7218,7 +7350,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "eroare la citire `%s': %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "cheia secretã \"%s\" nu a fost gãsitã: %s\n"
 
 #, fuzzy, c-format
@@ -7288,6 +7420,11 @@ msgstr "eroare la citire `%s': %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "nu mã pot conecta la `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7327,32 +7464,6 @@ msgstr "nu pot ob
 msgid "error writing base64 encoding: %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: am eºuat sã creez hashtable: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "variabila de mediu GPG_AGENT_INFO anormalã\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "gpg-agent versiune protocol %d nu este suportat\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "nu mã pot conecta la `%s': %s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7447,7 +7558,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7773,8 +7884,9 @@ msgstr "eroare la citire `%s': %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "cheia secretã \"%s\" nu a fost gãsitã: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7932,6 +8044,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "nu pot crea fiºier de rezervã `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: am eºuat sã creez hashtable: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8143,7 +8259,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8400,6 +8516,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "nu pot deschide inelul de chei"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "Nu pot deschide `%s': %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "valoare invalidã\n"
+
+#, fuzzy
+#~| msgid "error reading secret keyblock \"%s\": %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "eroare la citire keyblock secret \"%s\": %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Vã rugãm selectaþi cel mult o subcheie.\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "variabila de mediu GPG_AGENT_INFO anormalã\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "gpg-agent versiune protocol %d nu este suportat\n"
+
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "comutã între listele de chei secrete ºi publice"
 
@@ -8572,9 +8718,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Doriþi într-adevãr sã faceþi acest lucru? (d/N) "
 
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "eroare la citire keyblock secret \"%s\": %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Vã rugãm ºtergeþi selecþiile din cheile secrete.\n"
 
@@ -9260,9 +9403,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "algoritm cifrare necunoscut"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "nu pot deschide inelul de chei"
-
 #~ msgid "invalid packet"
 #~ msgstr "pachet invalid"
 

po/ru.po

@@ -1474,6 +1474,11 @@ msgstr "ключ \"%s\" не найден: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "ошибка чтения блока ключей: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "ключ \"%s\" не найден: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(если только Вы не задали ключ отпечатком)\n"
 
@@ -1665,6 +1670,20 @@ msgstr "ошибка получения '%s' через %s: %s\n"
 msgid "No fingerprint"
 msgstr "Нет отпечатка"
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "закрытый ключ \"%s\" не найден: %s\n"
+
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "(check argument of option '%s')\n"
+msgstr "не хватает аргумента для параметра \"%.50s\"\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NAME|использовать NAME как основной закрытый ключ"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1786,6 +1805,9 @@ msgstr "вывести хэши сообщений"
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "вывод в текстовом формате"
 
@@ -1981,10 +2003,51 @@ msgstr "показать в списке ключей название табл
 msgid "show expiration dates during signature listings"
 msgstr "показать в списке подписей сроки действия"
 
+#, fuzzy
+#| msgid "Available keys:\n"
+msgid "available TOFU policies:\n"
+msgstr "Доступные ключи:\n"
+
+#, fuzzy, c-format
+#| msgid "unknown option '%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "неизвестный параметр '%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "unknown command '%s'\n"
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "неизвестная команда '%s'\n"
+
 #, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "option \"%.50s\" is ambiguous\n"
+msgid "key specification '%s' is ambiguous\n"
+msgstr "параметр \"%.50s\" неоднозначен\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring '%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "ошибка создания таблицы ключей '%s': %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "слишком старая версия libcrypt (нужно %s, есть %s)\n"
@@ -2180,6 +2243,16 @@ msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "строка %d: задана недопустимая дата\n"
+
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "строка %d: задана недопустимая дата\n"
+
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
@@ -2273,6 +2346,15 @@ msgstr "ошибка преобразования в текстовый форм
 msgid "invalid hash algorithm '%s'\n"
 msgstr "недопустимая хэш-функция '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "error loading certificate '%s': %s\n"
+msgid "error parsing key specification '%s': %s\n"
+msgstr "ошибка загрузки сертификата '%s': %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[файл]"
 
@@ -2568,6 +2650,20 @@ msgstr "импорт закрытого ключа не допускается\n
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: закрытый ключ с недопустимым шифром %d - пропущен\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
@@ -2694,6 +2790,11 @@ msgstr "создана таблица ключей '%s'\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "источник блока ключей '%s': %s\n"
 
+#, fuzzy, c-format
+#| msgid "error opening '%s': %s\n"
+msgid "error opening key DB: %s\n"
+msgstr "ошибка открытия '%s': %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой пересоставления буфера таблицы ключей: %s\n"
@@ -2764,6 +2865,10 @@ msgstr ""
 "Введите домен, ограничивающий использование данной подписи, или пустую "
 "строку, если нет ограничений.\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID пользователя \"%s\" отозван."
@@ -3064,6 +3169,11 @@ msgstr "Ключ отозван."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Действительно подписать все ID пользователя? (y/N) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Действительно подписать все ID пользователя? (y/N) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Подсказка: Выберите ID пользователей, которые нужно подписать\n"
 
@@ -3162,10 +3272,6 @@ msgstr "сбой при обновлении: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не изменялся - обновление не нужно.\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "закрытый ключ \"%s\" не найден: %s\n"
-
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" - не отпечаток\n"
@@ -3367,8 +3473,13 @@ msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "Выделите не более одного подключа.\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действия подключа.\n"
@@ -3417,6 +3528,11 @@ msgstr "Нет ID пользователя с индексом %d\n"
 msgid "No user ID with hash %s\n"
 msgstr "Нет ID пользователя с хэшем %s\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Нет подключа с индексом %d\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
@@ -3758,6 +3874,10 @@ msgstr "Ваше полное имя: "
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в имени\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
@@ -4177,10 +4297,6 @@ msgstr "расшифровано нормально\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Внимание: зашифрованное сообщение было изменено!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr "в буфере сброшена фраза-пароль с индексом %s\n"
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифровки: %s\n"
@@ -4371,6 +4487,11 @@ msgstr "неизвестный параметр '%s'\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "Открытый ключ ECDSA бывает в кодировке SEC, кратной 8 битам\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type '%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "Неизвестный тип подписи '%s'\n"
+
 #, c-format
 msgid "File '%s' exists. "
 msgstr "Файл '%s' существует. "
@@ -4816,6 +4937,11 @@ msgstr "Будет отозван:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Это особо важный ключ отзыва)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Закрытый ключ доступен.\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N) "
 
@@ -4855,6 +4981,18 @@ msgstr ""
 "вставлено двоеточие. Удалите это двоеточие в текстовом редакторе\n"
 "перед использованием этого сертификата отзыва."
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "закрытый ключ \"%s\" не найден: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N) "
 
@@ -6872,7 +7010,7 @@ msgstr "ошибка получения '%s': статус HTTP %u\n"
 
 #, fuzzy
 #| msgid "CRL access not possible due to disabled %s\n"
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr ""
 "Доступ к списку отозванных сертификатов невозможен\n"
 "из-за того, что не задействуется %s\n"
@@ -6941,6 +7079,10 @@ msgstr "ошибка чтения сертификата из %s: %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr "сертификат слишком велик, чтобы иметь какой-то смысл\n"
 
+#, c-format
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "не могу подключиться к dirmngr: %s\n"
+
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "сбой при поиске: %s\n"
@@ -6974,31 +7116,6 @@ msgstr "получен статус: '%s'\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "ошибка записи в кодировке base64: %s\n"
 
-#, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "сбой размещения контекста Assuan: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr "видимо, dirmngr не работает\n"
-
-msgid "no running dirmngr - starting one\n"
-msgstr "dirmngr не выполняется - запуск\n"
-
-#, c-format
-msgid "malformed %s environment variable\n"
-msgstr "неправильная переменная окружения %s\n"
-
-#, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "протокол dirmngr версии %d не поддерживается\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr "не могу подключиться к dirmngr - пробую запасной вариант\n"
-
-#, c-format
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "не могу подключиться к dirmngr: %s\n"
-
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "запрос '%s' не поддерживается\n"
@@ -7091,7 +7208,7 @@ msgstr ""
 "|FILE|использовать сертификаты удостоверяющего центра из файла FILE для HKP "
 "по TLS"
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 msgid ""
@@ -7386,7 +7503,7 @@ msgstr "слишком длинный ответ сервера; предел -
 
 #, fuzzy
 #| msgid "OCSP request not possible due to disabled HTTP\n"
-msgid "OCSP request not possible due to TOR mode\n"
+msgid "OCSP request not possible due to Tor mode\n"
 msgstr "запрос OCSP невозможен из-за отключения HTTP\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
@@ -7539,6 +7656,10 @@ msgstr "превышено max_replies %d\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
 
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "сбой размещения контекста Assuan: %s\n"
+
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "сбой инициализации сервера: %s\n"
@@ -7741,7 +7862,7 @@ msgstr "Параметры, управляющие интерактивност
 
 #, fuzzy
 #| msgid "Options controlling the security"
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr "Параметры, управляющие безопасностью"
 
 msgid "Configuration for HTTP servers"
@@ -7993,6 +8114,47 @@ msgstr ""
 "Синтаксис: gpg-check-pattern [параметры] файл_образцов\n"
 "Проверить фразу-пароль, поступающую из stdin, по файлу образцов\n"
 
+#~ msgid "cleared passphrase cached with ID: %s\n"
+#~ msgstr "в буфере сброшена фраза-пароль с индексом %s\n"
+
+#, fuzzy
+#~| msgid "failed to store the key: %s\n"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "сбой сохранения ключа: %s\n"
+
+#, fuzzy
+#~| msgid "failed to open '%s': %s\n"
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "не могу открыть '%s': %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "недопустимое значение\n"
+
+#, fuzzy
+#~| msgid "error locking keybox: %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "ошибка блокировки щита с ключами: %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Выделите не более одного подключа.\n"
+
+#~ msgid "apparently no running dirmngr\n"
+#~ msgstr "видимо, dirmngr не работает\n"
+
+#~ msgid "no running dirmngr - starting one\n"
+#~ msgstr "dirmngr не выполняется - запуск\n"
+
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "неправильная переменная окружения %s\n"
+
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "протокол dirmngr версии %d не поддерживается\n"
+
+#~ msgid "can't connect to the dirmngr - trying fall back\n"
+#~ msgstr "не могу подключиться к dirmngr - пробую запасной вариант\n"
+
 #~ msgid "export keys in an S-expression based format"
 #~ msgstr "экспортировать ключи в формате на основе S-выражений"
 

po/sk.po

@@ -1568,6 +1568,10 @@ msgstr "k
 msgid "error reading keyblock: %s\n"
 msgstr "chyba pri èítaní bloku kµúèa: %s\n"
 
+#, fuzzy, c-format
+msgid "key \"%s\" not found\n"
+msgstr "kµúè `%s' nebol nájdený: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(pokiaµ neurèíte kµúè jeho fingerprintom)\n"
 
@@ -1779,6 +1783,19 @@ msgstr "chyba pri vytv
 msgid "No fingerprint"
 msgstr "vypísa» fingerprint"
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "tajný kµúè `%s' nebol nájdený: %s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "neplatný parameter pre import\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|MENO|pou¾i MENO ako implicitný tajný kµúè"
+
 # c-format
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
@@ -1913,6 +1930,9 @@ msgstr "|algo [s
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "vytvor výstup zakódovaný pomocou ASCII"
 
@@ -2122,11 +2142,48 @@ msgstr "uk
 msgid "show expiration dates during signature listings"
 msgstr "V súbore tajných kµúèov chýba zodpovedajúci podpis\n"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "nastavi» kµúè ako neplatný (disable)"
+
+#, fuzzy, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "neznámy implicitný adresát `%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "neznámy implicitný adresát `%s'\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "POZNÁMKA: starý implicitný súbor s mo¾nos»ami `%s ignorovaný'\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "chyba pri vytváraní súboru kµúèov (keyring)`%s': %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2333,6 +2390,14 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: daný adresát (-r) bez pou¾itia ¹ifrovania s verejným kµúèom\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "neplatný hashovací algoritmus `%s'\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "neplatný hashovací algoritmus `%s'\n"
+
 msgid "--store [filename]"
 msgstr "--store [meno súboru]"
 
@@ -2433,6 +2498,14 @@ msgstr "k
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "chyba pri vytváraní hesla: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[meno súboru]"
 
@@ -2738,6 +2811,20 @@ msgstr "zapisujem tajn
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kµúè %08lX: tajný kµúè bez verejného kµúèa %d - preskoèené\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2871,6 +2958,10 @@ msgstr "s
 msgid "keyblock resource '%s': %s\n"
 msgstr "chyba pri vytváraní `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "chyba pri èítaní `%s': %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovnávacej pamäti kµúèov: %s\n"
@@ -2939,6 +3030,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U¾ívateµské ID \"%s\" je revokované."
@@ -3285,6 +3380,10 @@ msgstr "K
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skutoène podpísa» v¹etky id u¾ívateµa? "
 
+#, fuzzy
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Skutoène podpísa» v¹etky id u¾ívateµa? "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Nápoveda: Vyberte id u¾ívateµa na podpísanie\n"
 
@@ -3396,10 +3495,6 @@ msgstr "aktualiz
 msgid "Key not changed so no update needed.\n"
 msgstr "kµúè nebol zmenený, tak¾e nie je potrebné ho aktualizova».\n"
 
-#, fuzzy, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "tajný kµúè `%s' nebol nájdený: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "chyba: neplatný odtlaèok\n"
@@ -3609,8 +3704,10 @@ msgid ""
 msgstr "Ste si istý, ¾e chcete oznaèi» tento kµúè ako revokovací? (a/N): "
 
 #, fuzzy
-msgid "Please select at most one subkey.\n"
+msgid ""
-msgstr "Prosím, vyberte najviac jeden sekundárny kµúè.\n"
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr "Ste si istý, ¾e chcete oznaèi» tento kµúè ako revokovací? (a/N): "
 
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
@@ -3664,6 +3761,10 @@ msgstr "Neexistuje identifik
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifikátor u¾ívateµa s indexom %d\n"
 
+#, fuzzy, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Neexistuje identifikátor u¾ívateµa s indexom %d\n"
+
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifikátor u¾ívateµa s indexom %d\n"
@@ -4019,6 +4120,10 @@ msgstr "Meno a priezvisko: "
 msgid "Invalid character in name\n"
 msgstr "Neplatný znak ve mene\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Meno nemô¾e zaèína» èíslicou\n"
 
@@ -4459,10 +4564,6 @@ msgstr "de
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so za¹ifrovanou správou bolo manipulované!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de¹ifrovanie zlyhalo: %s\n"
@@ -4662,6 +4763,10 @@ msgstr "nezn
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "neznáma trieda podpisu"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5129,6 +5234,11 @@ msgstr "Bude revokovan
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citlivý revokaèný kµúè)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Tajný kµúè je dostupný.\n"
+
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvori» pre tento podpis revokaèný certifikát? "
@@ -5164,6 +5274,17 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "tajný kµúè `%s' nebol nájdený: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvori» pre tento podpis revokaèný certifikát? "
@@ -7226,7 +7347,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "chyba pri èítaní `%s': %s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "kµúè `%s' nebol nájdený: %s\n"
 
 #, fuzzy, c-format
@@ -7296,6 +7417,11 @@ msgstr "chyba pri
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "nemô¾em sa pripoji» k `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7334,32 +7460,6 @@ msgstr "nem
 msgid "error writing base64 encoding: %s\n"
 msgstr "chyba pri zápise do súboru tajných kµúèov `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s: nepodarilo sa vytvori» hashovaciu tabuµku: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "zlý formát premennej prostredia GPG_AGENT_INFO\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "gpg-agent protokol verzie %d nie je podporovaný\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "nemô¾em sa pripoji» k `%s': %s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7452,7 +7552,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7765,8 +7865,9 @@ msgstr "chyba pri
 msgid "response from server too large; limit is %d bytes\n"
 msgstr ""
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "kµúè `%s' nebol nájdený: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7923,6 +8024,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "nemô¾em vytvori» `%s': %s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s: nepodarilo sa vytvori» hashovaciu tabuµku: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8132,7 +8237,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8389,6 +8494,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "nemô¾em otvori» súbor kµúèov"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "nemô¾em otvori» `%s': %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "neplatná hodnota\n"
+
+#, fuzzy
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "chyba pri èítaní bloku tajného kµúèa `%s': %s\n"
+
+#, fuzzy
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Prosím, vyberte najviac jeden sekundárny kµúè.\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "zlý formát premennej prostredia GPG_AGENT_INFO\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "gpg-agent protokol verzie %d nie je podporovaný\n"
+
 #, fuzzy
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "prepnú» medzi vypísaním zoznamu tajných a verejných kµúèov"
@@ -8566,10 +8701,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Skutoène to chcete urobi»? "
 
-#, fuzzy
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "chyba pri èítaní bloku tajného kµúèa `%s': %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Prosím, odstráòte výber z tajných kµúèov.\n"
 
@@ -9201,9 +9332,6 @@ msgstr ""
 #~ msgid "unknown cipher algorithm"
 #~ msgstr "neznámy ¹ifrovací algoritmus"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "nemô¾em otvori» súbor kµúèov"
-
 #~ msgid "invalid packet"
 #~ msgstr "neplatný paket"
 

po/sv.po

@@ -1626,6 +1626,11 @@ msgstr "nyckeln \"%s\" hittades inte: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "nyckeln \"%s\" hittades inte: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
 
@@ -1834,6 +1839,20 @@ msgstr "fel vid hämtning av \"%s\" via %s: %s\n"
 msgid "No fingerprint"
 msgstr "Inget fingeravtryck"
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
+
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "(check argument of option '%s')\n"
+msgstr "argument för flaggan \"%.50s\" saknas\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1963,6 +1982,9 @@ msgstr "skriv ut kontrollsummor"
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
@@ -2188,11 +2210,52 @@ msgstr "visa nyckelringens namn i nyckellistningar"
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
+#, fuzzy
+#| msgid "Available keys:\n"
+msgid "available TOFU policies:\n"
+msgstr "Tillgängliga nycklar:\n"
+
+#, fuzzy, c-format
+#| msgid "unknown option `%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "okänd flagga \"%s\"\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "unknown command `%s'\n"
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "okänt kommando \"%s\"\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "option \"%.50s\" is ambiguous\n"
+msgid "key specification '%s' is ambiguous\n"
+msgstr "flagga \"%.50s\" är tvetydig\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
@@ -2406,6 +2469,16 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
+#, fuzzy, c-format
+#| msgid "line %d: invalid algorithm\n"
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "rad %d: ogiltig algoritm\n"
+
+#, fuzzy, c-format
+#| msgid "line %d: invalid algorithm\n"
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "rad %d: ogiltig algoritm\n"
+
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
@@ -2501,6 +2574,15 @@ msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
+#, fuzzy, c-format
+#| msgid "error storing certificate: %s\n"
+msgid "error parsing key specification '%s': %s\n"
+msgstr "fel vid lagring av certifikat: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[filnamn]"
 
@@ -2813,6 +2895,20 @@ msgstr "import av hemliga nycklar tillåts inte\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
@@ -2948,6 +3044,11 @@ msgstr "%s: nyckelring skapad\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "nyckelblockresurs \"%s\": %s\n"
 
+#, fuzzy, c-format
+#| msgid "error opening `%s': %s\n"
+msgid "error opening key DB: %s\n"
+msgstr "fel vid öppnandet av \"%s\": %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
@@ -3017,6 +3118,10 @@ msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Ange en domän för att begränsa denna signatur. eller Enter för ingen.\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användaridentiteten \"%s\" är spärrad."
@@ -3338,6 +3443,11 @@ msgstr "Nyckeln är spärrad."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Verkligen signera alla användaridentiteter? (j/N) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Verkligen signera alla användaridentiteter? (j/N) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
 
@@ -3440,10 +3550,6 @@ msgstr "uppdateringen misslyckades: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
-
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
@@ -3655,8 +3761,15 @@ msgid ""
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-msgid "Please select at most one subkey.\n"
+# designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-msgstr "Välj som mest en undernyckel.\n"
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
@@ -3708,6 +3821,11 @@ msgstr "Ingen användaridentitet med indexet %d\n"
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Ingen undernyckel med indexet %d\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
@@ -4071,6 +4189,10 @@ msgstr "Namn: "
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
@@ -4518,10 +4640,6 @@ msgstr "dekrypteringen lyckades\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr "tömde mellanlagrad lösenfras med ID: %s\n"
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
@@ -4725,6 +4843,11 @@ msgstr "okänd flagga \"%s\"\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA kräver att hashlängden är delbar med 8 bitar\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type `%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "Okänd signaturtyp \"%s\"\n"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5205,6 +5328,11 @@ msgstr "Kommer att spärras av:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Detta är en känslig spärrnyckel)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Den hemliga nyckeln finns tillgänglig.\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
@@ -5246,6 +5374,18 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
@@ -7431,7 +7571,7 @@ msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
 #, fuzzy
 #| msgid "certificate `%s' not found: %s\n"
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "certifikatet \"%s\" hittades inte: %s\n"
 
 #, fuzzy, c-format
@@ -7511,6 +7651,11 @@ msgstr "fel vid läsning från %s: %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "kan inte ansluta till \"%s\": %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7553,36 +7698,6 @@ msgstr ""
 msgid "error writing base64 encoding: %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#, fuzzy, c-format
-#| msgid "failed to create stream from socket: %s\n"
-msgid "failed to allocate assuan context: %s\n"
-msgstr "misslyckades med att skapa flöde från uttag: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-#, fuzzy
-#| msgid "no running dirmngr - starting `%s'\n"
-msgid "no running dirmngr - starting one\n"
-msgstr "ingen körande dirmngr - startar \"%s\"\n"
-
-#, fuzzy, c-format
-#| msgid "malformed DIRMNGR_INFO environment variable\n"
-msgid "malformed %s environment variable\n"
-msgstr "miljövariabeln DIRMNGR_INFO är felformaterad\n"
-
-#, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "dirmngr-protokoll version %d stöds inte\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "kan inte ansluta till \"%s\": %s\n"
-
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported inquiry '%s'\n"
@@ -7686,7 +7801,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 # inställningar istället för flaggor?
@@ -8038,8 +8153,10 @@ msgstr "fel vid läsning från %s: %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+#| msgid "certificate `%s' not found: %s\n"
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "certifikatet \"%s\" hittades inte: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -8222,6 +8339,11 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "kan inte allokera utfilssträng: %s\n"
 
+#, fuzzy, c-format
+#| msgid "failed to create stream from socket: %s\n"
+msgid "failed to allocate assuan context: %s\n"
+msgstr "misslyckades med att skapa flöde från uttag: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8447,7 +8569,7 @@ msgstr "Flaggor som kontrollerar interaktivitet och framtvingande"
 
 #, fuzzy
 #| msgid "Options controlling the security"
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr "Flaggor som kontrollerar säkerheten"
 
 msgid "Configuration for HTTP servers"
@@ -8719,6 +8841,48 @@ msgstr ""
 "Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
 "Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
+#~ msgid "cleared passphrase cached with ID: %s\n"
+#~ msgstr "tömde mellanlagrad lösenfras med ID: %s\n"
+
+#, fuzzy
+#~| msgid "failed to store the key: %s\n"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "misslyckades med att lagra nyckeln: %s\n"
+
+#, fuzzy
+#~| msgid "failed to open `%s': %s\n"
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "misslyckades med att öppna \"%s\": %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "ogiltigt värde\n"
+
+#, fuzzy
+#~| msgid "error reading secret keyblock \"%s\": %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "fel vid läsning av hemligt nyckelblock \"%s\": %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Välj som mest en undernyckel.\n"
+
+#, fuzzy
+#~| msgid "no running dirmngr - starting `%s'\n"
+#~ msgid "no running dirmngr - starting one\n"
+#~ msgstr "ingen körande dirmngr - startar \"%s\"\n"
+
+#, fuzzy
+#~| msgid "malformed DIRMNGR_INFO environment variable\n"
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "miljövariabeln DIRMNGR_INFO är felformaterad\n"
+
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "dirmngr-protokoll version %d stöds inte\n"
+
+#~ msgid "can't connect to the dirmngr - trying fall back\n"
+#~ msgstr "kan inte ansluta till dirmngr - försöker falla tillbaka\n"
+
 #~ msgid "export keys in an S-expression based format"
 #~ msgstr "exportera nycklar i ett S-uttrycksbaserat format"
 
@@ -8901,9 +9065,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Vill du verkligen göra detta? (j/N) "
 
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "fel vid läsning av hemligt nyckelblock \"%s\": %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 

po/tr.po

@@ -1575,6 +1575,11 @@ msgstr "anahtar \"%s\" yok: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "anahtar \"%s\" yok: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(anahtarı parmak izi ile belirtmedikçe)\n"
 
@@ -1781,6 +1786,20 @@ msgstr "`%s' %s üzerinden alınırken hata: %s\n"
 msgid "No fingerprint"
 msgstr "Parmak izi yok"
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "gizli anahtar \"%s\" yok: %s\n"
+
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "(check argument of option '%s')\n"
+msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1909,6 +1928,9 @@ msgstr "ileti özetlerini gösterir"
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
@@ -2128,11 +2150,51 @@ msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "anahtarı iptal eder"
+
+#, fuzzy, c-format
+#| msgid "unknown option `%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "`%s' seçeneği bilinmiyor\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "unknown command `%s'\n"
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "komut `%s' bilinmiyor\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "option \"%.50s\" is ambiguous\n"
+msgid "key specification '%s' is ambiguous\n"
+msgstr "\"%.50s\" seçeneği belirsiz\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
@@ -2339,6 +2401,16 @@ msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
+#, fuzzy, c-format
+#| msgid "line %d: invalid algorithm\n"
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "`%d. satır: algoritma geçersiz\n"
+
+#, fuzzy, c-format
+#| msgid "line %d: invalid algorithm\n"
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "`%d. satır: algoritma geçersiz\n"
+
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
@@ -2434,6 +2506,15 @@ msgstr "zırhlama başarısız: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
+#, fuzzy, c-format
+#| msgid "error storing certificate: %s\n"
+msgid "error parsing key specification '%s': %s\n"
+msgstr "serifika saklanırken hata: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
@@ -2743,6 +2824,20 @@ msgstr "gizli anahtarı alımına izin verilmez\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2882,6 +2977,11 @@ msgstr "`%s' anahtarlığı oluşturuldu\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "anahtar bloku özkaynağı `%s': %s\n"
 
+#, fuzzy, c-format
+#| msgid "error opening `%s': %s\n"
+msgid "error opening key DB: %s\n"
+msgstr "'%s' açılırken hata: %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri önbelleği yeniden oluşturulurken hata: %s\n"
@@ -2950,6 +3050,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
@@ -3276,6 +3380,11 @@ msgstr "Anahtar yürürlükten kaldırıldı."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
@@ -3388,10 +3497,6 @@ msgstr "güncelleme başarısız: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "gizli anahtar \"%s\" yok: %s\n"
-
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
@@ -3612,8 +3717,15 @@ msgstr ""
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
+"misiniz? (e/H ya da y/N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
@@ -3664,6 +3776,11 @@ msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 msgid "No user ID with hash %s\n"
 msgstr "%s çittirmeli kullanıcı kimliği yok\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "%d indisli bir yardımcı anahtar yok\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
@@ -4023,6 +4140,10 @@ msgstr "Adınız ve Soyadınız: "
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
@@ -4470,10 +4591,6 @@ msgstr "Şifre çözme tamam\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
@@ -4672,6 +4789,11 @@ msgstr "`%s' seçeneği bilinmiyor\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA sekizin katlarında bir çittirim uzunluğu gerektirir\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type `%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "imza türü `%s' bilinmiyor\n"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -5144,6 +5266,11 @@ msgstr "Yürürlükten kaldıran:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Gizli anahtar mevcut.\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
@@ -5183,6 +5310,18 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "gizli anahtar \"%s\" yok: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 "Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
@@ -7347,7 +7486,7 @@ msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 
 #, fuzzy
 #| msgid "certificate `%s' not found: %s\n"
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "sertifika \"%s\" yok: %s\n"
 
 #, fuzzy, c-format
@@ -7428,6 +7567,11 @@ msgstr "%s okunurken hata: %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7470,36 +7614,6 @@ msgstr ""
 msgid "error writing base64 encoding: %s\n"
 msgstr "`%s' gizli anahtarlığa yazılırken hata oluştu: %s\n"
 
-#, fuzzy, c-format
-#| msgid "failed to create stream from socket: %s\n"
-msgid "failed to allocate assuan context: %s\n"
-msgstr "sokette akım oluşturulamadı: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-#, fuzzy
-#| msgid "no running dirmngr - starting `%s'\n"
-msgid "no running dirmngr - starting one\n"
-msgstr "çalışan dirmngr yok - `%s' başlatılıyor\n"
-
-#, fuzzy, c-format
-#| msgid "malformed DIRMNGR_INFO environment variable\n"
-msgid "malformed %s environment variable\n"
-msgstr "DIRMNGR_INFO ortam değişkeni hatalı\n"
-
-#, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "dirmngr protokolünün %d. sürümü desteklenmiyor\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
-
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported inquiry '%s'\n"
@@ -7603,7 +7717,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7951,8 +8065,10 @@ msgstr "%s okunurken hata: %s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+#| msgid "certificate `%s' not found: %s\n"
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "sertifika \"%s\" yok: %s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -8135,6 +8251,11 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "dosya dışı dizge ayrılamıyor: %s\n"
 
+#, fuzzy, c-format
+#| msgid "failed to create stream from socket: %s\n"
+msgid "failed to allocate assuan context: %s\n"
+msgstr "sokette akım oluşturulamadı: %s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -8362,7 +8483,7 @@ msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
 
 #, fuzzy
 #| msgid "Options controlling the security"
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr "Güvenliği denetleyen seçenekler"
 
 msgid "Configuration for HTTP servers"
@@ -8634,6 +8755,45 @@ msgstr ""
 "Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
 "karşılaştırır\n"
 
+#, fuzzy
+#~| msgid "failed to store the key: %s\n"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "anahtarın saklanması başarısız: %s\n"
+
+#, fuzzy
+#~| msgid "failed to open `%s': %s\n"
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "`%s' açılamadı: %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "değer hatalı\n"
+
+#, fuzzy
+#~| msgid "error reading secret keyblock \"%s\": %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
+
+#, fuzzy
+#~| msgid "no running dirmngr - starting `%s'\n"
+#~ msgid "no running dirmngr - starting one\n"
+#~ msgstr "çalışan dirmngr yok - `%s' başlatılıyor\n"
+
+#, fuzzy
+#~| msgid "malformed DIRMNGR_INFO environment variable\n"
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "DIRMNGR_INFO ortam değişkeni hatalı\n"
+
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "dirmngr protokolünün %d. sürümü desteklenmiyor\n"
+
+#~ msgid "can't connect to the dirmngr - trying fall back\n"
+#~ msgstr "dirmngr'a bağlanılamıyor - son çareye başvuruluyor\n"
+
 #~ msgid "export keys in an S-expression based format"
 #~ msgstr "anahtarları bir S ifadesine dayalı biçimde ihraceder"
 
@@ -8812,9 +8972,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
 
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 

po/uk.po

@@ -1497,6 +1497,11 @@ msgstr "ключ «%s» не знайдено: %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "помилка під час спроби читання блокування ключа: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "ключ «%s» не знайдено: %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(якщо ключ не задано відбитком)\n"
 
@@ -1695,6 +1700,20 @@ msgstr "помилка під час спроби отримання «%s» за
 msgid "No fingerprint"
 msgstr "Без відбитка"
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "закритий ключ «%s» не знайдено: %s\n"
+
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "(check argument of option '%s')\n"
+msgstr "не вказано аргументу до параметра «%.50s»\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|NAME|використовувати вказаний типовий закритий ключ"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
@@ -1818,6 +1837,9 @@ msgstr "показати контрольні суми повідомлень"
 msgid "run in server mode"
 msgstr "запустити у режимі сервера"
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "створити дані у форматі ASCII"
 
@@ -2023,10 +2045,51 @@ msgstr "показувати назву сховища ключів у спис
 msgid "show expiration dates during signature listings"
 msgstr "показувати дати завершення строків дії у списку підписів"
 
+#, fuzzy
+#| msgid "Available keys:\n"
+msgid "available TOFU policies:\n"
+msgstr "Доступні ключі:\n"
+
+#, fuzzy, c-format
+#| msgid "unknown option '%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "невідомий параметр «%s»\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "unknown command '%s'\n"
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "невідома команда «%s»\n"
+
 #, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "option \"%.50s\" is ambiguous\n"
+msgid "key specification '%s' is ambiguous\n"
+msgstr "параметр «%.50s» є неоднозначним\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring '%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "помилка під час спроби створення сховища ключів «%s»: %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt занадто стара (потрібна — %s, маємо %s)\n"
@@ -2231,6 +2294,16 @@ msgstr ""
 "УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
 "ключем\n"
 
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "рядок %d: вказано некоректну дату\n"
+
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "рядок %d: вказано некоректну дату\n"
+
 msgid "--store [filename]"
 msgstr "--store [назва файла]"
 
@@ -2330,6 +2403,15 @@ msgstr "помилка перетворення у формат ASCII: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "некоректний алгоритм хешування «%s»\n"
 
+#, fuzzy, c-format
+#| msgid "error loading certificate '%s': %s\n"
+msgid "error parsing key specification '%s': %s\n"
+msgstr "помилка під час спроби завантаження сертифіката «%s»: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[назва файла]"
 
@@ -2626,6 +2708,20 @@ msgstr "імпортування закритих ключів забороне
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: закритий ключ з некоректним шифром %d — пропущено\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2754,6 +2850,11 @@ msgstr "створено сховище ключів «%s»\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "ресурс блоку ключів «%s»: %s\n"
 
+#, fuzzy, c-format
+#| msgid "error opening '%s': %s\n"
+msgid "error opening key DB: %s\n"
+msgstr "помилка під час відкриття «%s»: %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "не вдалося перебудувати кеш сховища ключів: %s\n"
@@ -2824,6 +2925,10 @@ msgstr ""
 "Будь ласка, вкажіть домен обмеження цього підпису або натисніть Enter, якщо "
 "такого домену немає.\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Ідентифікатор користувача «%s» відкликано."
@@ -3136,6 +3241,11 @@ msgstr "Ключ відкликано."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Підказка: виберіть ідентифікатори користувача для підписування\n"
 
@@ -3234,10 +3344,6 @@ msgstr "помилка оновлення: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не змінено, отже оновлення непотрібне.\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "закритий ключ «%s» не знайдено: %s\n"
-
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "«%s» не є відбитком\n"
@@ -3442,8 +3548,15 @@ msgstr ""
 "Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
 "Н) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "Будь ласка, виберіть не більше одного ключа.\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
+"Н) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Зміна часу завершення строку дії для підключа.\n"
@@ -3494,6 +3607,11 @@ msgstr "Ідентифікатора користувача з індексом
 msgid "No user ID with hash %s\n"
 msgstr "Ідентифікатора користувача з хешем %s не існує\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "Підключа з індексом %d не існує\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Підключа з індексом %d не існує\n"
@@ -3840,6 +3958,10 @@ msgstr "Справжнє ім’я: "
 msgid "Invalid character in name\n"
 msgstr "Некоректний символ у імені\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "Ім’я не може починатися з цифри\n"
 
@@ -4271,10 +4393,6 @@ msgstr "розшифровано\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "УВАГА: зашифроване повідомлення було змінено!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr "текстовий пароль кешовано з ідентифікатором: %s\n"
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "невдала спроба розшифрування: %s\n"
@@ -4467,6 +4585,11 @@ msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "Відкритий ключ ECDSA має зберігатися у кодуванні SEC кратному 8-бітовому\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type '%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "Невідомий тип підпису «%s»\n"
+
 #, c-format
 msgid "File '%s' exists. "
 msgstr "Файл «%s» існує. "
@@ -4918,6 +5041,11 @@ msgstr "Буде відкликано:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Це критичний ключ відкликання)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "Доступний закритий ключ.\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 "Створити підписаний сертифікат відкликання для цього ключа? (y/N або т/Н) "
@@ -4959,6 +5087,18 @@ msgstr ""
 "дефісами нижче додано двокрапку. Вилучіть цю двокрапку у текстовому\n"
 "редакторі, перш ніж скористатися цим сертифікатом відкликання."
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "закритий ключ «%s» не знайдено: %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Створити сертифікат відкликання для цього ключа? (y/N або т/Н) "
 
@@ -6988,7 +7128,7 @@ msgstr "помилка отримання «%s»: стан http %u\n"
 
 #, fuzzy
 #| msgid "CRL access not possible due to disabled %s\n"
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "Доступ до CRL неможливий через вимкнений %s\n"
 
 #, c-format
@@ -7055,6 +7195,10 @@ msgstr "помилка під час спроби читання сертифі
 msgid "certificate too large to make any sense\n"
 msgstr "сертифікат занадто великий для використання\n"
 
+#, c-format
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "не вдалося встановити з’єднання з dirmngr: %s\n"
+
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "помилка пошуку: %s\n"
@@ -7088,33 +7232,6 @@ msgstr "отримано стан: «%s»\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "помилка під час спроби запису у кодуванні base64: %s\n"
 
-#, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "не вдалося розмістити контекст assuan: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr "ймовірно, dirmngr не запущено\n"
-
-msgid "no running dirmngr - starting one\n"
-msgstr "dirmngr не запущено — запускаємо\n"
-
-#, c-format
-msgid "malformed %s environment variable\n"
-msgstr "помилкове форматування змінної середовища %s\n"
-
-#, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "підтримки протоколу dirmngr версії %d не передбачено\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-"не вдалося встановити з’єднання з dirmngr — намагаємося скористатися "
-"резервним\n"
-
-#, c-format
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "не вдалося встановити з’єднання з dirmngr: %s\n"
-
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "непідтримуваний запит «%s»\n"
@@ -7201,7 +7318,7 @@ msgstr "|N|повертати не більше за вказану кількі
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|ФАЙЛ|використовувати сертифікати CA з файла ФАЙЛ для HKP крізь TLS"
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 msgid ""
@@ -7500,7 +7617,7 @@ msgstr "занадто об’ємна відповідь від сервера;
 
 #, fuzzy
 #| msgid "OCSP request not possible due to disabled HTTP\n"
-msgid "OCSP request not possible due to TOR mode\n"
+msgid "OCSP request not possible due to Tor mode\n"
 msgstr "запит за допомогою OCSP неможливий через вимикання протоколу HTTP\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
@@ -7653,6 +7770,10 @@ msgstr "перевищено max_replies у %d\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "не вдалося розмістити структуру керування: %s\n"
 
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "не вдалося розмістити контекст assuan: %s\n"
+
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "не вдалося ініціалізувати сервер: %s\n"
@@ -7854,7 +7975,7 @@ msgstr "Параметри керування інтерактивністю т
 
 #, fuzzy
 #| msgid "Options controlling the security"
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr "Параметри керування захистом"
 
 msgid "Configuration for HTTP servers"
@@ -8106,6 +8227,49 @@ msgstr ""
 "Синтаксис: gpg-check-pattern [параметри] файл_шаблонів\n"
 "Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
 
+#~ msgid "cleared passphrase cached with ID: %s\n"
+#~ msgstr "текстовий пароль кешовано з ідентифікатором: %s\n"
+
+#, fuzzy
+#~| msgid "failed to store the key: %s\n"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "не вдалося зберегти ключ: %s\n"
+
+#, fuzzy
+#~| msgid "failed to open '%s': %s\n"
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "не вдалося відкрити «%s»: %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "некоректне значення\n"
+
+#, fuzzy
+#~| msgid "error locking keybox: %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "помилка під час блокування сховища ключів: %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "Будь ласка, виберіть не більше одного ключа.\n"
+
+#~ msgid "apparently no running dirmngr\n"
+#~ msgstr "ймовірно, dirmngr не запущено\n"
+
+#~ msgid "no running dirmngr - starting one\n"
+#~ msgstr "dirmngr не запущено — запускаємо\n"
+
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "помилкове форматування змінної середовища %s\n"
+
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "підтримки протоколу dirmngr версії %d не передбачено\n"
+
+#~ msgid "can't connect to the dirmngr - trying fall back\n"
+#~ msgstr ""
+#~ "не вдалося встановити з’єднання з dirmngr — намагаємося скористатися "
+#~ "резервним\n"
+
 #~ msgid "export keys in an S-expression based format"
 #~ msgstr "експортувати ключі у форматі, заснованому на S-виразах"
 

po/zh_CN.po

@@ -1555,6 +1555,11 @@ msgstr "密钥‘%s’找不到：%s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "读取密钥区块时发生错误：%s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "密钥‘%s’找不到：%s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非您用指纹指定密钥)\n"
 
@@ -1753,6 +1758,19 @@ msgstr "建立‘%s’时发生错误：%s\n"
 msgid "No fingerprint"
 msgstr "CA 指纹："
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "找不到私钥“%s”：%s\n"
+
+#, fuzzy, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "无效的列表选项\n"
+
+#, fuzzy, c-format
+#| msgid "unusable secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "不可用的私钥"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
@@ -1884,6 +1902,9 @@ msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 msgid "run in server mode"
 msgstr ""
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
@@ -2099,11 +2120,49 @@ msgstr "列出密钥时显示钥匙环的名称"
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
+#, fuzzy
+msgid "available TOFU policies:\n"
+msgstr "禁用密钥"
+
+#, fuzzy, c-format
+#| msgid "unknown option `%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "未知的选项 '%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "未知的选项 '%s'\n"
+
 #, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, c-format
+msgid "key specification '%s' is ambiguous\n"
+msgstr ""
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring `%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "建立钥匙环‘%s’时发生错误：%s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
@@ -2305,6 +2364,14 @@ msgstr "初始化信任度数据库失败：%s\n"
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
+#, fuzzy, c-format
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "无效的‘%s’散列算法\n"
+
+#, fuzzy, c-format
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "无效的‘%s’散列算法\n"
+
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
@@ -2400,6 +2467,14 @@ msgstr "进行 ASCII 封装失败：%s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
+#, fuzzy, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "取得当前密钥信息时出错：%s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[文件名]"
 
@@ -2702,6 +2777,20 @@ msgstr "不允许导入私钥\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
@@ -2833,6 +2922,10 @@ msgstr "钥匙环‘%s’已建立\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "密钥块资源‘%s’：%s\n"
 
+#, fuzzy, c-format
+msgid "error opening key DB: %s\n"
+msgstr "‘%s’中出错：%s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
@@ -2900,6 +2993,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入这份签名的限制域，如果没有请按回车。\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
@@ -3202,6 +3299,11 @@ msgstr "密钥已被吊销。"
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签名吗？(y/N)"
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "真的为所有的用户标识签名吗？(y/N)"
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示：选择要添加签名的用户标识\n"
 
@@ -3301,10 +3403,6 @@ msgstr "更新失败：%s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "找不到私钥“%s”：%s\n"
-
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
@@ -3511,8 +3609,13 @@ msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "请至多选择一个子钥。\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
@@ -3561,6 +3664,11 @@ msgstr "没有索引为 %d 的用户标识\n"
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "没有索引为 %d 的子钥\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
@@ -3907,6 +4015,10 @@ msgstr "真实姓名："
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
@@ -4337,10 +4449,6 @@ msgstr "解密成功\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr ""
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
@@ -4537,6 +4645,11 @@ msgstr "未知的选项 '%s'\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "DSA 需要散列值长度为 8 位的倍数\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type `%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "未知的签名类型‘%s’\n"
+
 #, fuzzy, c-format
 #| msgid "File `%s' exists. "
 msgid "File '%s' exists. "
@@ -4987,6 +5100,11 @@ msgstr "将被吊销，吊销者：\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(这是一把敏感的吊销密钥)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "私钥可用。\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
 
@@ -5022,6 +5140,18 @@ msgid ""
 "before making use of this revocation certificate."
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "找不到私钥“%s”：%s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
 
@@ -7063,7 +7193,7 @@ msgid "error retrieving '%s': http status %u\n"
 msgstr "读取‘%s’时出错：%s\n"
 
 #, fuzzy
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "找不到私钥“%s”：%s\n"
 
 #, fuzzy, c-format
@@ -7133,6 +7263,11 @@ msgstr "读取‘%s’时出错：%s\n"
 msgid "certificate too large to make any sense\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't connect to `%s': %s\n"
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "无法连接至‘%s’：%s\n"
+
 #, fuzzy, c-format
 #| msgid "update failed: %s\n"
 msgid "lookup failed: %s\n"
@@ -7172,32 +7307,6 @@ msgstr "无法获得文件‘%s’的信息： %s\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#, fuzzy, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "%s：建立散列表失败：%s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr ""
-
-msgid "no running dirmngr - starting one\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "malformed %s environment variable\n"
-msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-
-#, fuzzy, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "不支持 gpg-agent 协议版本 %d\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr ""
-
-#, fuzzy, c-format
-#| msgid "can't connect to `%s': %s\n"
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "无法连接至‘%s’：%s\n"
-
 #, fuzzy, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr ""
@@ -7291,7 +7400,7 @@ msgstr ""
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 #, fuzzy
@@ -7614,8 +7723,9 @@ msgstr "读取‘%s’时出错：%s\n"
 msgid "response from server too large; limit is %d bytes\n"
 msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
 
-msgid "OCSP request not possible due to TOR mode\n"
+#, fuzzy
-msgstr ""
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "找不到私钥“%s”：%s\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
 msgstr ""
@@ -7773,6 +7883,10 @@ msgstr ""
 msgid "can't allocate control structure: %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
+#, fuzzy, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "%s：建立散列表失败：%s\n"
+
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
@@ -7982,7 +8096,7 @@ msgstr ""
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr ""
 
 msgid "Configuration for HTTP servers"
@@ -8239,6 +8353,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~| msgid "can't open the keyring"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "无法打开钥匙环"
+
+#, fuzzy
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "无法打开‘%s’：%s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "无效的数值\n"
+
+#, fuzzy
+#~| msgid "error reading secret keyblock \"%s\": %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "读取私钥区块“%s”时出错：%s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "请至多选择一个子钥。\n"
+
+#, fuzzy
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
+
+#, fuzzy
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "不支持 gpg-agent 协议版本 %d\n"
+
 #~ msgid "toggle between the secret and public key listings"
 #~ msgstr "在私钥和公钥清单间切换"
 
@@ -8404,9 +8548,6 @@ msgstr ""
 #~ msgid "Do you really want to do this? (y/N) "
 #~ msgstr "您真的想要这么做吗？(y/N)"
 
-#~ msgid "error reading secret keyblock \"%s\": %s\n"
-#~ msgstr "读取私钥区块“%s”时出错：%s\n"
-
 #~ msgid "Please remove selections from the secret keys.\n"
 #~ msgstr "请从私钥中删除选择。\n"
 
@@ -9033,9 +9174,6 @@ msgstr ""
 #~ msgid "checksum error"
 #~ msgstr "校验和错误"
 
-#~ msgid "can't open the keyring"
-#~ msgstr "无法打开钥匙环"
-
 #~ msgid "invalid packet"
 #~ msgstr "无效包"
 
@@ -9114,9 +9252,6 @@ msgstr ""
 #~ msgid "unusable public key"
 #~ msgstr "不可用的公钥"
 
-#~ msgid "unusable secret key"
-#~ msgstr "不可用的私钥"
-
 #~ msgid "keyserver error"
 #~ msgstr "公钥服务器错误"
 

po/zh_TW.po

@@ -1467,6 +1467,11 @@ msgstr "找不到金鑰 \"%s\": %s\n"
 msgid "error reading keyblock: %s\n"
 msgstr "讀取金鑰區塊時出錯: %s\n"
 
+#, fuzzy, c-format
+#| msgid "key \"%s\" not found: %s\n"
+msgid "key \"%s\" not found\n"
+msgstr "找不到金鑰 \"%s\": %s\n"
+
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非你用指紋指定了金鑰)\n"
 
@@ -1650,6 +1655,20 @@ msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
 msgid "No fingerprint"
 msgstr "沒有指紋"
 
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "找不到私鑰 \"%s\": %s\n"
+
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "(check argument of option '%s')\n"
+msgstr "\"%.50s\" 選項遺失了引數\n"
+
+#, fuzzy, c-format
+#| msgid "|NAME|use NAME as default secret key"
+msgid "using \"%s\" as default secret key\n"
+msgstr "|名字|使用指定名字做為預設私鑰"
+
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
@@ -1771,6 +1790,9 @@ msgstr "印出訊息摘要"
 msgid "run in server mode"
 msgstr "以伺服器模式執行"
 
+msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgstr ""
+
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
@@ -1956,10 +1978,51 @@ msgstr "在金鑰清單中顯示鑰匙圈名稱"
 msgid "show expiration dates during signature listings"
 msgstr "列出簽章時顯示有效期限"
 
+#, fuzzy
+#| msgid "Available keys:\n"
+msgid "available TOFU policies:\n"
+msgstr "可用金鑰:\n"
+
+#, fuzzy, c-format
+#| msgid "unknown option '%s'\n"
+msgid "unknown TOFU policy '%s'\n"
+msgstr "未知的選項 '%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "unknown command '%s'\n"
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "未知的指令 '%s'\n"
+
 #, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
 
+#, c-format
+msgid ""
+"Warning: value '%s' for option '%s' should be a long key ID or a "
+"fingerprint\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "option \"%.50s\" is ambiguous\n"
+msgid "key specification '%s' is ambiguous\n"
+msgstr "\"%.50s\" 選項不明確\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Two
+#. lines with fingerprints are printed after this message.
+#, c-format
+msgid "'%s' matches at least:\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error creating keyring '%s': %s\n"
+msgid "error searching the keyring: %s\n"
+msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
+
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
@@ -2152,6 +2215,16 @@ msgstr "信任資料庫啟始失敗: %s\n"
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but no valid default keys given\n"
+msgstr "第 %d 列: 無效的給定日期\n"
+
+#, fuzzy, c-format
+#| msgid "line %d: invalid date given\n"
+msgid "option '%s' given, but option '%s' not given\n"
+msgstr "第 %d 列: 無效的給定日期\n"
+
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
@@ -2244,6 +2317,15 @@ msgstr "進行封裝失敗: %s\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無效的雜湊演算法 '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "error loading certificate '%s': %s\n"
+msgid "error parsing key specification '%s': %s\n"
+msgstr "載入憑證 '%s' 時出錯: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr ""
+
 msgid "[filename]"
 msgstr "[檔名]"
 
@@ -2538,6 +2620,20 @@ msgstr "未允許匯入私鑰\n"
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
 
+#. TRANSLATORS: For smartcard, each private key on
+#. host has a reference (stub) to a smartcard and
+#. actual private key data is stored on the card.  A
+#. single smartcard can have up to three private key
+#. data.  Importing private key stub is always
+#. skipped in 2.1, and it returns
+#. GPG_ERR_NOT_PROCESSED.  Instead, user should be
+#. suggested to run 'gpg --card-status', then,
+#. references to a card will be automatically
+#. created again.
+#, c-format
+msgid "To migrate '%s', with each smartcard, run: %s\n"
+msgstr ""
+
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
@@ -2666,6 +2762,11 @@ msgstr "鑰匙圈 '%s' 已建立\n"
 msgid "keyblock resource '%s': %s\n"
 msgstr "金鑰區塊資源 '%s': %s\n"
 
+#, fuzzy, c-format
+#| msgid "error opening '%s': %s\n"
+msgid "error opening key DB: %s\n"
+msgstr "開啟 '%s' 時出錯: %s\n"
+
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
@@ -2733,6 +2834,10 @@ msgstr ""
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr ""
+
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已撤銷."
@@ -3030,6 +3135,11 @@ msgstr "金鑰已撤銷."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
+#, fuzzy
+#| msgid "Really sign all user IDs? (y/N) "
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
+
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 
@@ -3125,10 +3235,6 @@ msgstr "更新失敗: %s\n"
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#, c-format
-msgid "secret key \"%s\" not found: %s\n"
-msgstr "找不到私鑰 \"%s\": %s\n"
-
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" 不是指紋\n"
@@ -3330,8 +3436,13 @@ msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-msgid "Please select at most one subkey.\n"
+#, fuzzy
-msgstr "請至多選擇一把子鑰.\n"
+#| msgid ""
+#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更子鑰的使用期限.\n"
@@ -3380,6 +3491,11 @@ msgstr "索引 %d 沒有對應到使用者 ID\n"
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
+#, fuzzy, c-format
+#| msgid "No subkey with index %d\n"
+msgid "No subkey with key ID '%s'.\n"
+msgstr "索引 %d 沒有對應到子鑰\n"
+
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到子鑰\n"
@@ -3718,6 +3834,10 @@ msgstr "真實姓名: "
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr ""
+
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
@@ -4132,10 +4252,6 @@ msgstr "解密成功\n"
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#, c-format
-msgid "cleared passphrase cached with ID: %s\n"
-msgstr "清除此 ID 被快取住的密語: %s\n"
-
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
@@ -4320,6 +4436,11 @@ msgstr "未知的選項 '%s'\n"
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
 
+#, fuzzy, c-format
+#| msgid "Unknown signature type '%s'\n"
+msgid "unknown weak digest '%s'\n"
+msgstr "未知的簽章種類 '%s'\n"
+
 #, c-format
 msgid "File '%s' exists. "
 msgstr "檔案 '%s' 已存在. "
@@ -4758,6 +4879,11 @@ msgstr "將被撤銷:\n"
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(這是把機密的撤銷金鑰)\n"
 
+#, fuzzy
+#| msgid "Secret key is available.\n"
+msgid "Secret key is not available.\n"
+msgstr "私鑰可用.\n"
+
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
@@ -4798,6 +4924,18 @@ msgstr ""
 "真的要使用這份撤銷憑證前, 請先用文字編輯器把那個冒號移除,\n"
 "撤銷憑證才能使用."
 
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key \"%s\" not found\n"
+msgstr "找不到私鑰 \"%s\": %s\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line.  Several lines
+#. lines with secret key infos are printed after this message.
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr ""
+
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
 
@@ -6743,7 +6881,7 @@ msgstr "取回 '%s' 時出錯: http 狀態 %u\n"
 
 #, fuzzy
 #| msgid "CRL access not possible due to disabled %s\n"
-msgid "CRL access not possible due to TOR mode\n"
+msgid "CRL access not possible due to Tor mode\n"
 msgstr "不可能存取 CRL 因已停用 %s\n"
 
 #, c-format
@@ -6808,6 +6946,10 @@ msgstr "從 '%s' 讀取憑證時出錯: %s\n"
 msgid "certificate too large to make any sense\n"
 msgstr "憑證大到全然不合理的境界\n"
 
+#, c-format
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "無法連接至 dirmngr: %s\n"
+
 #, c-format
 msgid "lookup failed: %s\n"
 msgstr "查找失敗: %s\n"
@@ -6841,31 +6983,6 @@ msgstr "得到狀態: '%s'\n"
 msgid "error writing base64 encoding: %s\n"
 msgstr "寫入 base64 編碼時出錯: %s\n"
 
-#, c-format
-msgid "failed to allocate assuan context: %s\n"
-msgstr "配置 assuan 脈絡失敗: %s\n"
-
-msgid "apparently no running dirmngr\n"
-msgstr "顯然沒有執行中的 dirmngr\n"
-
-msgid "no running dirmngr - starting one\n"
-msgstr "沒有執行中的 dirmngr - 正在啟動一個出來\n"
-
-#, c-format
-msgid "malformed %s environment variable\n"
-msgstr "格式不對的 %s 環境變數\n"
-
-#, c-format
-msgid "dirmngr protocol version %d is not supported\n"
-msgstr "未支援 dirmngr 協定版本 %d\n"
-
-msgid "can't connect to the dirmngr - trying fall back\n"
-msgstr "無法連線至 dirmngr - 正試著退回\n"
-
-#, c-format
-msgid "can't connect to the dirmngr: %s\n"
-msgstr "無法連接至 dirmngr: %s\n"
-
 #, c-format
 msgid "unsupported inquiry '%s'\n"
 msgstr "未支援的查詢 '%s'\n"
@@ -6952,7 +7069,7 @@ msgstr "|N|單次查詢不要傳回超過 N 筆項目"
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
 
-msgid "route all network traffic via TOR"
+msgid "route all network traffic via Tor"
 msgstr ""
 
 msgid ""
@@ -7247,7 +7364,7 @@ msgstr "來自伺服器的回應太大; 上限是 %d 位元組\n"
 
 #, fuzzy
 #| msgid "OCSP request not possible due to disabled HTTP\n"
-msgid "OCSP request not possible due to TOR mode\n"
+msgid "OCSP request not possible due to Tor mode\n"
 msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
 
 msgid "OCSP request not possible due to disabled HTTP\n"
@@ -7400,6 +7517,10 @@ msgstr "max_replies %d 已超出\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "無法配置控制結構: %s\n"
 
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "配置 assuan 脈絡失敗: %s\n"
+
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "伺服器啟始失敗: %s\n"
@@ -7597,7 +7718,7 @@ msgstr "控制著互動及強制執行的選項"
 
 #, fuzzy
 #| msgid "Options controlling the security"
-msgid "Options controlling the use of TOR"
+msgid "Options controlling the use of Tor"
 msgstr "控制著安全性的選項"
 
 msgid "Configuration for HTTP servers"
@@ -7848,6 +7969,47 @@ msgstr ""
 "語法: gpg-check-pattern [選項] 樣式檔案\n"
 "用樣式檔案來檢查由標準輸入給定的密語\n"
 
+#~ msgid "cleared passphrase cached with ID: %s\n"
+#~ msgstr "清除此 ID 被快取住的密語: %s\n"
+
+#, fuzzy
+#~| msgid "failed to store the key: %s\n"
+#~ msgid "Failed to open the keyring DB.\n"
+#~ msgstr "存放金鑰失敗: %s\n"
+
+#, fuzzy
+#~| msgid "failed to open '%s': %s\n"
+#~ msgid "Failed to parse '%s'.\n"
+#~ msgstr "開啟 '%s' 失敗: %s\n"
+
+#, fuzzy
+#~| msgid "invalid value\n"
+#~ msgid "invalid value '%s'\n"
+#~ msgstr "無效的數值\n"
+
+#, fuzzy
+#~| msgid "error locking keybox: %s\n"
+#~ msgid "error looking up secret key \"%s\": %s\n"
+#~ msgstr "鎖住金鑰鑰匙盒時出錯: %s\n"
+
+#~ msgid "Please select at most one subkey.\n"
+#~ msgstr "請至多選擇一把子鑰.\n"
+
+#~ msgid "apparently no running dirmngr\n"
+#~ msgstr "顯然沒有執行中的 dirmngr\n"
+
+#~ msgid "no running dirmngr - starting one\n"
+#~ msgstr "沒有執行中的 dirmngr - 正在啟動一個出來\n"
+
+#~ msgid "malformed %s environment variable\n"
+#~ msgstr "格式不對的 %s 環境變數\n"
+
+#~ msgid "dirmngr protocol version %d is not supported\n"
+#~ msgstr "未支援 dirmngr 協定版本 %d\n"
+
+#~ msgid "can't connect to the dirmngr - trying fall back\n"
+#~ msgstr "無法連線至 dirmngr - 正試著退回\n"
+
 #~ msgid "export keys in an S-expression based format"
 #~ msgstr "匯出金鑰成以 S-表示式形式的格式"