[Pkg-gnupg-commit] [gnupg2] 282/292: po: Auto-update

Daniel Kahn Gillmor dkg at fifthhorseman.net
Mon Nov 21 06:31:52 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 5b5bf9bab8fecb2e05dcf64dfd3b52f13293bace
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 18 15:45:05 2016 +0100

    po: Auto-update
    
    --
---
 po/ca.po    | 265 +++++++++++++++++++++++++--------------
 po/cs.po    | 290 +++++++++++++++++++++++++++++--------------
 po/da.po    | 267 +++++++++++++++++++++++++--------------
 po/el.po    | 261 ++++++++++++++++++++++++--------------
 po/eo.po    | 262 +++++++++++++++++++++++++--------------
 po/es.po    | 284 ++++++++++++++++++++++++++----------------
 po/et.po    | 261 ++++++++++++++++++++++++--------------
 po/fi.po    | 261 ++++++++++++++++++++++++--------------
 po/fr.po    | 285 ++++++++++++++++++++++++++++--------------
 po/gl.po    | 263 +++++++++++++++++++++++++--------------
 po/hu.po    | 261 ++++++++++++++++++++++++--------------
 po/id.po    | 261 ++++++++++++++++++++++++--------------
 po/it.po    | 261 ++++++++++++++++++++++++--------------
 po/ja.po    | 380 +++++++++++++++++++++++++++++++++++++++++---------------
 po/nb.po    | 399 ++++++++++++++++++++++++++++++++++++++++++----------------
 po/pl.po    | 273 ++++++++++++++++++++++++++--------------
 po/pt.po    | 260 ++++++++++++++++++++++++--------------
 po/ro.po    | 264 +++++++++++++++++++++++++--------------
 po/ru.po    | 103 +++++++++------
 po/sk.po    | 261 ++++++++++++++++++++++++--------------
 po/sv.po    | 267 +++++++++++++++++++++++++--------------
 po/tr.po    | 265 +++++++++++++++++++++++++--------------
 po/uk.po    | 406 ++++++++++++++++++++++++++++++++++++++++++++----------------
 po/zh_CN.po | 263 +++++++++++++++++++++++++--------------
 po/zh_TW.po | 271 +++++++++++++++++++++++++++-------------
 25 files changed, 4576 insertions(+), 2318 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 9afadcc..9df52ad 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -176,14 +176,6 @@ msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -340,6 +332,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "La clau ha estat substituïda"
+
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
 msgid "verbose"
 msgstr "detall"
@@ -763,9 +760,9 @@ msgstr "error en la creació de la contrasenya: %s\n"
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "ha fallat l'actualització: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -780,13 +777,13 @@ msgid "error running '%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "ha fallat l'actualització: %s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -810,6 +807,14 @@ msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "ha fallat l'actualització: %s\n"
+
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "no s'ha pogut crear l'armadura: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "sí|si"
@@ -2278,9 +2283,9 @@ 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 "valid values for option '%s':\n"
+msgstr "opcions d'importació no vàlides\n"
 
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2290,6 +2295,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "opcions d'importació no vàlides\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"
@@ -3098,6 +3107,10 @@ msgid "[self-signature]"
 msgstr "[autosignatura]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "error en crear l'anell «%s»: %s\n"
+
+#, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
 
@@ -5197,6 +5210,23 @@ msgstr "Aquesta clau pertany probablement al seu propietari\n"
 msgid "This key belongs to us\n"
 msgstr "Aquesta clau és nostra\n"
 
+#, fuzzy, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+"No s'han trobat certificats amb confiança no definida.\n"
+"\n"
+
+#, fuzzy
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"NO és segur que la clau pertanya a la persona esmentada en\n"
+"l'ID d'usuari. Si *realment* sabeu què feu, podeu respondre\n"
+"«sí» a la següent pregunta\n"
+"\n"
+
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5881,27 +5911,31 @@ msgid "error updating TOFU database: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "llista claus i ID"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5922,41 +5956,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "llista claus"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
 msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5972,6 +6012,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -6019,50 +6069,57 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+# Werner FIXME: use ngettext. jm
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "S'han esborrat %d signatures.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|algo [fitxers]|imprimeix resums de missatges"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
+msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "xifrat amb %lu contrasenyes\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
+msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -6072,6 +6129,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6326,22 +6392,24 @@ msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr ""
-
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "elimina claus de l'anell públic"
+
+msgid "response does not contain the public key data\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -8009,6 +8077,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8287,10 +8358,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "error en crear l'anell «%s»: %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
@@ -8764,23 +8831,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "error de la xarxa"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "la contrasenya és errònia"
 
 #, fuzzy
@@ -8823,6 +8892,11 @@ msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 msgid "check global configuration file"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "actualitza la base de dades de confiança"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -9003,6 +9077,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "desactiva una clau"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
+#~ msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
 
@@ -9085,10 +9173,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n"
 
-# Werner FIXME: use ngettext. jm
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "S'han esborrat %d signatures.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "L'ID d'usuari «%s» està revocat."
@@ -9133,10 +9217,6 @@ msgstr ""
 #~ msgstr "1 signatura errònia\n"
 
 #, fuzzy
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "no s'ha pogut crear l'armadura: %s\n"
-
-#, fuzzy
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
@@ -10096,9 +10176,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "l'URI és errònia"
 
-#~ msgid "network error"
-#~ msgstr "error de la xarxa"
-
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
diff --git a/po/cs.po b/po/cs.po
index 1ebade0..56e61d9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -175,14 +175,6 @@ msgid "no suitable card key found: %s\n"
 msgstr "nenalezen žádný vhodný klíč karty: %s\n"
 
 #, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "výroba stínového klíče se nezdařila: %s\n"
-
-#, c-format
-msgid "error writing key: %s\n"
-msgstr "chyba při zápisu klíče: %s\n"
-
-#, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
@@ -332,6 +324,11 @@ msgstr "poběží v režimu démona (na pozadí)"
 msgid "run in server mode (foreground)"
 msgstr "poběží v režimu serveru (na popředí)"
 
+#, fuzzy
+#| msgid "run in server mode"
+msgid "run in supervised mode"
+msgstr "pracovat v režimu serveru"
+
 msgid "verbose"
 msgstr "upovídaný režim"
 
@@ -735,9 +732,8 @@ msgstr "chyba při vytváření proudu pro rouru: %s\n"
 msgid "error forking process: %s\n"
 msgstr "chyba při rozdvojování procesu: %s\n"
 
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
-msgid "waiting for processes to terminate failed: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
 
 #, c-format
@@ -752,15 +748,16 @@ msgstr "chyba v běhu „%s“: návratový kód %d\n"
 msgid "error running '%s': terminated\n"
 msgstr "chyba v běhu „%s“: násilně ukončeno\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for process %d to terminate failed: %s\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
+
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba při získání návratového kódu procesu %d: %s\n"
 
 #, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
-
-#, c-format
 msgid "can't connect to '%s': %s\n"
 msgstr "nelze se připojit k „%s“: %s\n"
 
@@ -781,6 +778,15 @@ msgstr "Varování: vlastnictví %s „%s“ není nastaveno bezpečně\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varování: přístupová práva %s „%s“ nejsou bezpečná\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for the agent to come up ... (%ds)\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "čeká se na agenta… (%d s)\n"
+
+#, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "ano"
@@ -2105,8 +2111,10 @@ 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ů"
 
-msgid "available TOFU policies:\n"
-msgstr "dostupné politiky TOFU:\n"
+#, fuzzy, c-format
+#| msgid "invalid argument for option \"%.50s\"\n"
+msgid "valid values for option '%s':\n"
+msgstr "neplatný argument u volby „%.50s“\n"
 
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2115,6 +2123,11 @@ msgstr "neznámá TOFU politika „%s“\n"
 msgid "(use \"help\" to list choices)\n"
 msgstr "(možnosti lze vypsat příkazem „help“)\n"
 
+#, fuzzy, c-format
+#| msgid "invalid argument for option \"%.50s\"\n"
+msgid "invalid value for option '%s'\n"
+msgstr "neplatný argument u volby „%.50s“\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"
@@ -2883,6 +2896,10 @@ msgstr "[revokace]"
 msgid "[self-signature]"
 msgstr "[podpis klíče jím samým]"
 
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "chyba při alokování paměti: %s\n"
+
 #, fuzzy, c-format
 #| msgid "key %s: unsupported public key algorithm\n"
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
@@ -4837,6 +4854,26 @@ msgstr "Tento klíč pravděpodobně náleží uvedenému uživateli\n"
 msgid "This key belongs to us\n"
 msgstr "Tento klíč náleží nám (máme odpovídající tajný klíč)\n"
 
+#, fuzzy, c-format
+#| msgid "root certificate has now been marked as trusted\n"
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr "kořenový certifikát byl nyní označen za důvěryhodný\n"
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"NENÍ jisté, zda tento klíč patří osobě, jejíž jméno je uvedeno\n"
+"v uživatelském ID. Pokud *skutečně* víte, co děláte, můžete na\n"
+"následující otázku odpovědět ano\n"
+"\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5515,19 +5552,21 @@ msgid "error updating TOFU database: %s\n"
 msgstr "chyba při odesílání dat: %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
@@ -5535,8 +5574,10 @@ msgstr ""
 msgid "error gathering other user IDs: %s\n"
 msgstr "chyba při zjišťování ID odpovídače: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "vypsat seznam klíčů a id uživatelů"
 
 #, fuzzy, c-format
 #| msgid "validity: %s"
@@ -5559,47 +5600,53 @@ msgstr[2] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "vypsat seznam klíčů"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "vypsat hash zprávy"
 msgstr[1] "vypsat hash zprávy"
 msgstr[2] "vypsat hash zprávy"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5615,6 +5662,17 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing key: %s\n"
+msgid "resetting keydb: %s\n"
+msgstr "chyba při zápisu klíče: %s\n"
+
 #, fuzzy, c-format
 #| msgid "error setting OCSP target: %s\n"
 msgid "error setting TOFU binding's trust level to %s\n"
@@ -5670,52 +5728,60 @@ msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Smazáno %d podpisů.\n"
 
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "vypsat hash zprávy"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "vypsat hash zprávy"
+msgstr[1] "vypsat hash zprávy"
+msgstr[2] "vypsat hash zprávy"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "zašifrováno s heslem %lu\n"
+
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "vypsat hash zprávy"
+msgstr[1] "vypsat hash zprávy"
+msgstr[2] "vypsat hash zprávy"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5728,6 +5794,15 @@ msgid "error opening TOFU database: %s\n"
 msgstr "chyba při odesílání dat: %s\n"
 
 #, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring '%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "chyba při zápisu do souboru veřejných klíčů „%s“: %s\n"
+
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "„%s“ není platný dlouhý keyID\n"
 
@@ -5978,22 +6053,24 @@ msgstr "uložení otisku se nezdařilo: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "uložení data vytvoření se nezdařilo: %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "čtení veřejného klíče se nezdařilo: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "odpověď neobsahuje veřejný klíč\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpověď neobsahuje RSA modulus\n"
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpověď neobsahuje veřejný RSA exponent\n"
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "odpověď neobsahuje veřejný bod EC\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "odpověď neobsahuje veřejný klíč\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "čtení veřejného klíče se nezdařilo: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "používám implicitní PIN jako %s\n"
@@ -7564,6 +7641,9 @@ msgstr "vynutí zavedení zastaralých CRL"
 msgid "allow sending OCSP requests"
 msgstr "povolí odesílání OCSP dotazů"
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr "zakáže použití HTTP"
 
@@ -7819,10 +7899,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr "„%s“ není platné LDAP URL\n"
 
 #, c-format
-msgid "error allocating memory: %s\n"
-msgstr "chyba při alokování paměti: %s\n"
-
-#, c-format
 msgid "error printing log line: %s\n"
 msgstr "chyba při tisknutí řádku protokolu: %s\n"
 
@@ -8276,22 +8352,32 @@ msgstr "Seznam LDAP serverů"
 msgid "Configuration for OCSP"
 msgstr "Nastavení OCSP"
 
-msgid "GPG for OpenPGP"
+#, fuzzy
+#| msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr "GPG pro OpenPGP"
 
-msgid "GPG Agent"
-msgstr "Agent GPG"
+msgid "Private Keys"
+msgstr ""
 
-msgid "Smartcard Daemon"
+#, fuzzy
+#| msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr "Démon pro čipové karty"
 
-msgid "GPG for S/MIME"
+#, fuzzy
+#| msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr "GPG pro S/MIME"
 
-msgid "Key Acquirer"
-msgstr "Stahovač klíčů"
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "chyba sítě"
 
-msgid "PIN and Passphrase Entry"
+#, fuzzy
+#| msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "Zadávání kódu PIN a hesla"
 
 msgid "Component not suitable for launching"
@@ -8331,6 +8417,11 @@ msgstr "vypsat globální konfigurační soubor"
 msgid "check global configuration file"
 msgstr "zkontrolovat globální konfigurační soubor"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "aktualizovat databázi důvěry"
+
 msgid "reload all or a given component"
 msgstr "znovu načíst všechny nebo zadané komponenty"
 
@@ -8509,6 +8600,26 @@ msgstr ""
 "Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
 "Prověří heslo zadané na vstupu proti souboru se vzory\n"
 
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "výroba stínového klíče se nezdařila: %s\n"
+
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "dostupné politiky TOFU:\n"
+
+#, fuzzy
+#~| msgid "print message digests"
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "vypsat hash zprávy"
+#~ msgstr[1] "vypsat hash zprávy"
+#~ msgstr[2] "vypsat hash zprávy"
+
+#~ msgid "GPG Agent"
+#~ msgstr "Agent GPG"
+
+#~ msgid "Key Acquirer"
+#~ msgstr "Stahovač klíčů"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "problémy v komunikaci s gpg-agentem\n"
 
@@ -8596,9 +8707,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "objeven 1 identifikátor uživatele bez platného podpisu jím samým\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Smazáno %d podpisů.\n"
-
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Uživatelské ID „%s“: %d podpisů odstraněno\n"
 
@@ -8639,9 +8747,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "1 dobrý podpis\n"
 
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu klíčů uloženo v keši (%lu podpisů)\n"
 
@@ -9953,9 +10058,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "špatné URI"
 
-#~ msgid "network error"
-#~ msgstr "chyba sítě"
-
 #~ msgid "not processed"
 #~ msgstr "nezpracováno"
 
diff --git a/po/da.po b/po/da.po
index ab7d352..018bab0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -172,14 +172,6 @@ msgid "no suitable card key found: %s\n"
 msgstr "ingen egnet kortnøgle fundet: %s\n"
 
 #, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "skygge for nøgle mislykkedes: %s\n"
-
-#, c-format
-msgid "error writing key: %s\n"
-msgstr "fejl ved skrivning af nøgle: %s\n"
-
-#, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
@@ -351,6 +343,11 @@ msgstr "kør i dæmontilstand (baggrunden)"
 msgid "run in server mode (foreground)"
 msgstr "kør i servertilstand (forgrunden)"
 
+#, fuzzy
+#| msgid "run in server mode"
+msgid "run in supervised mode"
+msgstr "kør i servertilstand"
+
 msgid "verbose"
 msgstr "uddybende"
 
@@ -793,9 +790,8 @@ msgstr "fejl ved oprettelse af datakanal: %s\n"
 msgid "error forking process: %s\n"
 msgstr "fejl ved forgrening af proces: %s\n"
 
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
-msgid "waiting for processes to terminate failed: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
 
 #, fuzzy, c-format
@@ -813,14 +809,15 @@ msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
 msgid "error running '%s': terminated\n"
 msgstr "fejl ved kørsel af »%s«: termineret\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for process %d to terminate failed: %s\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
+
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fejl ved indhentelse af afslutningskode for proces %d: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -841,6 +838,16 @@ msgstr "Advarsel: usikker ejerskab på %s »%s«\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
 
+#, fuzzy, c-format
+#| msgid "waiting %d seconds for the agent to come up\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "venter %d sekunder på at agenten kommer frem\n"
+
+#, fuzzy, c-format
+#| msgid "renaming `%s' to `%s' failed: %s\n"
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "ja"
@@ -2232,10 +2239,10 @@ 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 "missing argument for option \"%.50s\"\n"
+msgid "valid values for option '%s':\n"
+msgstr "manglende parameter for indstilling »%.50s«\n"
 
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
@@ -2246,6 +2253,11 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid value for option '%s'\n"
+msgstr "manglende parameter for indstilling »%.50s«\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"
@@ -3041,6 +3053,11 @@ msgid "[self-signature]"
 msgstr "[egenunderskrift]"
 
 #, fuzzy, c-format
+#| msgid "error allocating enough memory: %s\n"
+msgid "error allocating memory: %s\n"
+msgstr "fejl ved allokering af nok hukommelse: %s\n"
+
+#, fuzzy, c-format
 #| msgid "key %s: unsupported public key algorithm\n"
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
@@ -5085,6 +5102,25 @@ msgstr "Denne nøgle tilhører sikkert den navngivne bruger\n"
 msgid "This key belongs to us\n"
 msgstr "Denne nøgle tilhører os\n"
 
+#, fuzzy, c-format
+#| msgid "root certificate has now been marked as trusted\n"
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr "rodcertifikat er nu blevet markeret som troværdig\n"
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"Det er IKKE sikkert, at nøglen tilhører personen navngivet\n"
+"i bruger-id'et. Hvis du *virkelig* ved hvad du gør,\n"
+"så kan du besvare det næste spørgsmål med ja.\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5764,19 +5800,21 @@ msgid "error updating TOFU database: %s\n"
 msgstr "fejl under afsendelse af %s-kommando: %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
@@ -5784,8 +5822,10 @@ msgstr ""
 msgid "error gathering other user IDs: %s\n"
 msgstr "fejl ved indhentelse af ny PIN: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "vis nøgle og bruger-id'er"
 
 #, fuzzy, c-format
 #| msgid "validity: %s"
@@ -5807,42 +5847,48 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "vis nøgler"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "vis beskedsammendrag"
 msgstr[1] "vis beskedsammendrag"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5858,6 +5904,17 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing key: %s\n"
+msgid "resetting keydb: %s\n"
+msgstr "fejl ved skrivning af nøgle: %s\n"
+
 #, fuzzy, c-format
 #| msgid "error storing flags: %s\n"
 msgid "error setting TOFU binding's trust level to %s\n"
@@ -5907,51 +5964,58 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Slettede %d underskrifter.\n"
 
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "vis beskedsammendrag"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "vis beskedsammendrag"
+msgstr[1] "vis beskedsammendrag"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "krypteret med %lu adgangsfraser\n"
+
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "vis beskedsammendrag"
+msgstr[1] "vis beskedsammendrag"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5962,6 +6026,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "fejl under afsendelse af %s-kommando: %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "fejl ved skrivning af offentlig nøglering »%s«: %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6218,13 +6291,6 @@ msgstr "kunne ikke gemme fingeraftrykket: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "svar indeholder ikke data for offentlig nøgle\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "svar indeholder ikke RSA modulus'erne\n"
 
@@ -6233,9 +6299,16 @@ msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
 
 #, fuzzy
 #| msgid "response does not contain the RSA public exponent\n"
-msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "svar indeholder ikke data for offentlig nøgle\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "bruger standard-PIN som %s\n"
@@ -7957,6 +8030,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr "tillad PKA-opslag (DNS-forespørgsler)"
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8258,11 +8334,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "error allocating enough memory: %s\n"
-msgid "error allocating memory: %s\n"
-msgstr "fejl ved allokering af nok hukommelse: %s\n"
-
-#, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error printing log line: %s\n"
 msgstr "fejl ved skrivning til »%s«: %s\n"
@@ -8791,24 +8862,24 @@ msgstr "LDAP-serverliste"
 msgid "Configuration for OCSP"
 msgstr "Konfiguration for OCSP"
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
+msgid "Network"
 msgstr ""
 
 #, fuzzy
 #| msgid "Bad Passphrase"
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "Ugyldig adgangsfrase"
 
 #, fuzzy
@@ -8853,6 +8924,11 @@ msgid "check global configuration file"
 msgstr "kontroller global konfigurationsfil"
 
 #, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "opdater troværdighedsdatabasen"
+
+#, fuzzy
 #| msgid "list all components"
 msgid "reload all or a given component"
 msgstr "vis alle komponenter"
@@ -9043,6 +9119,21 @@ msgstr ""
 "Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
 "Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
 
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "skygge for nøgle mislykkedes: %s\n"
+
+#, fuzzy
+#~| msgid "Available keys:\n"
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "Tilgængelige nøgler:\n"
+
+#, fuzzy
+#~| msgid "print message digests"
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "vis beskedsammendrag"
+#~ msgstr[1] "vis beskedsammendrag"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "kommunikationsproblem med gpg-agent\n"
 
@@ -9129,9 +9220,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "1 bruger-id uden gyldig egenunderskrift detekteret\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Slettede %d underskrifter.\n"
-
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Bruger-id »%s«: %d underskrifter fjernet\n"
 
@@ -9174,11 +9262,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "1 ugyldig underskrift\n"
 
-#, fuzzy
-#~| msgid "renaming `%s' to `%s' failed: %s\n"
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu nøgler mellemlagret (%lu underskrifter)\n"
 
diff --git a/po/el.po b/po/el.po
index 5527de9..705cc78 100644
--- a/po/el.po
+++ b/po/el.po
@@ -154,14 +154,6 @@ msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκη
 msgid "no suitable card key found: %s\n"
 msgstr "δε βρέθηκε εγγράψιμη μυστική κλειδοθήκη: %s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -317,6 +309,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "Το κλειδί έχει παρακαμθεί"
+
 msgid "verbose"
 msgstr "αναλυτικά"
 
@@ -731,9 +728,9 @@ msgstr "σφάλμα στη δημιουργία της φράσης κλειδ
 msgid "error forking process: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "η ενημέρωση απέτυχε: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -748,13 +745,13 @@ msgid "error running '%s': terminated\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "η ενημέρωση απέτυχε: %s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "αδυναμία εγγραφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -776,6 +773,14 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία σ
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "η ενημέρωση απέτυχε: %s\n"
+
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "θωράκιση απέτυχε: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "ναι|ναί"
@@ -2199,9 +2204,9 @@ msgstr "απεικόνιση της κλειδοθήκης στην οποία 
 msgid "show expiration dates during signature listings"
 msgstr "Δεν βρέθηκε αντίστοιχη υπογραφή στη μυστική κλειδοθήκη\n"
 
-#, fuzzy
-msgid "available TOFU policies:\n"
-msgstr "απενεργοποιεί ένα κλειδί"
+#, fuzzy, c-format
+msgid "valid values for option '%s':\n"
+msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2211,6 +2216,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "μη έγκυρες επιλογές ειγαγωγής\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"
@@ -3012,6 +3021,10 @@ msgid "[self-signature]"
 msgstr "[ιδιο-υπογραφή]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "κλειδί %08lX: μη υποστηριζόμενος αλγόριθμος δημοσίου κλειδιού\n"
 
@@ -5081,6 +5094,21 @@ msgstr "Αυτό το κλειδί πιθανώς ανήκει στον ιδιο
 msgid "This key belongs to us\n"
 msgstr "Αυτό το κλειδί ανήκει σε εμάς\n"
 
+#, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"ΔΕΝ είναι βέβαιο ότι αυτό το κλειδί ανήκει στο άτομο το οποίο\n"
+"αναφέρετε το user ID. Εάν *πραγματικά* ξέρετε τι κάνετε, μπορείτε\n"
+"να απαντήσετε στην επόμενη ερώτηση καταφατικά\n"
+"\n"
+
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5756,27 +5784,31 @@ msgid "error updating TOFU database: %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "απεικόνιση των κλειδιών και των user ID"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5797,41 +5829,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "απεικόνιση της λίστας κλειδιών"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
 msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5847,6 +5885,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -5894,50 +5942,56 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Διαγράφηκαν %d υπογραφές.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "κρυπτογραφημένο με %lu φράσεις κλειδιά\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5947,6 +6001,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "σφάλμα στη αποστολή προς το `%s': %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "αδυναμία εγγραφής δημόσιας κλειδοθήκης `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6194,22 +6257,24 @@ msgstr "αποτυχία αρχικοποίησης της TrustDB: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr ""
-
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "αφαίρεση των κλειδιών από τη δημόσια κλειδοθήκη"
+
+msgid "response does not contain the public key data\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7841,6 +7906,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8113,10 +8181,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "αδυναμία δημιουργίας της κλειδοθήκης `%s': %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
 
@@ -8590,23 +8654,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "σφάλμα δικτύου"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "κακή φράση κλειδί"
 
 #, fuzzy
@@ -8649,6 +8715,11 @@ msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
 msgid "check global configuration file"
 msgstr "άγνωστο αντικείμενο ρυθμίσεως \"%s\"\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "ανανέωση της βάσης δεδομένων εμπιστοσύνης"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8829,6 +8900,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "απενεργοποιεί ένα κλειδί"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+#~ msgstr[1] "|αλγόρ [αρχεία]| απεικόνιση περιλήψεων των μηνυμάτων"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "πρόβλημα επικοινωνίας με το gpg-agent\n"
 
@@ -8901,9 +8986,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "1 user ID ανιχνεύτηκε χωρίς έγκυρη ιδιο-υπογραφή\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Διαγράφηκαν %d υπογραφές.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Το user ID \"%s\" ανακαλείτε."
@@ -8948,10 +9030,6 @@ msgstr ""
 #~ msgstr "1 κακή υπογραφή\n"
 
 #, fuzzy
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "θωράκιση απέτυχε: %s\n"
-
-#, fuzzy
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu κλειδιά έχουν ελεγχθεί (%lu υπογραφές)\n"
 
@@ -9896,9 +9974,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "κακό URI"
 
-#~ msgid "network error"
-#~ msgstr "σφάλμα δικτύου"
-
 #~ msgid "not processed"
 #~ msgstr "μη επεξεργασμένο"
 
diff --git a/po/eo.po b/po/eo.po
index 87331ff..20b047a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -155,14 +155,6 @@ msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "neniu skribebla sekreta ŝlosilaro trovita: %s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -319,6 +311,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "Ŝlosilo estas anstataŭigita."
+
 msgid "verbose"
 msgstr "detala eligo"
 
@@ -731,9 +728,9 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "aktualigo malsukcesis: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -748,13 +745,13 @@ msgid "error running '%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "aktualigo malsukcesis: %s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eraro dum skribado de sekreta ŝlosilaro '%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -776,6 +773,14 @@ msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "aktualigo malsukcesis: %s\n"
+
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "enkirasigo malsukcesis: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 #, fuzzy
 msgid "yes"
@@ -2183,9 +2188,9 @@ msgstr "montri, en kiu ŝlosilaro estas listigita ŝlosilo"
 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 "valid values for option '%s':\n"
+msgstr "nevalida kiraso"
 
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2195,6 +2200,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "nevalida kiraso"
+
+#, fuzzy, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
@@ -2987,6 +2996,10 @@ msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "ŝlosilo %08lX: nerealigita publikŝlosila metodo\n"
 
@@ -5052,6 +5065,23 @@ msgstr "Ĉi tiu ŝlosilo verŝajne apartenas al la posedanto\n"
 msgid "This key belongs to us\n"
 msgstr "Ĉi tiu ŝlosilo apartenas al ni\n"
 
+#, fuzzy, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+"Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
+"\n"
+
+#, fuzzy
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"NE estas certe, ke la ŝlosilo apartenas al sia posedanto.\n"
+"Se vi *vere* scias, kion vi faras, vi povas respondi al\n"
+"la sekva demando per \"jes\"\n"
+"\n"
+
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5703,27 +5733,31 @@ msgid "error updating TOFU database: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "listigi ŝlosilojn kaj uzantidentigilojn"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5744,41 +5778,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "listigi ŝlosilojn"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
 msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
+#, c-format
+msgid " over the past year."
+msgid_plural " over the past %d years."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5794,6 +5834,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -5841,50 +5891,55 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Forviŝis %d subskribojn.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld messages"
+msgstr "Ripetu pasfrazon\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5894,6 +5949,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "eraro dum skribado de publika ŝlosilaro '%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6136,22 +6200,24 @@ msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui ŝlosilaran staplon: %s\n"
 
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr ""
-
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "forigi ŝlosilojn de la publika ŝlosilaro"
+
+msgid "response does not contain the public key data\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7788,6 +7854,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8058,10 +8127,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "eraro dum kreado de ŝlosilaro '%s': %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
 
@@ -8535,23 +8600,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "reteraro"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "malbona pasfrazo"
 
 #, fuzzy
@@ -8594,6 +8661,11 @@ msgstr "%s: nova opcio-dosiero kreita\n"
 msgid "check global configuration file"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "aktualigi la fido-datenaron"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8773,6 +8845,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "malŝalti ŝlosilon"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+#~ msgstr[1] "|metodo [dosieroj]|presi mesaĝo-kompendiojn"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "komunikproblemo kun gpg-agent\n"
 
@@ -8843,9 +8929,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Forviŝis %d subskribojn.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
@@ -8890,10 +8973,6 @@ msgstr ""
 #~ msgstr "1 malbona subskribo\n"
 
 #, fuzzy
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "enkirasigo malsukcesis: %s\n"
-
-#, fuzzy
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu ŝlosiloj kontrolitaj (%lu subskriboj)\n"
 
@@ -9738,9 +9817,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "malbona URI"
 
-#~ msgid "network error"
-#~ msgstr "reteraro"
-
 #~ msgid "not processed"
 #~ msgstr "ne traktita"
 
diff --git a/po/es.po b/po/es.po
index f12f9c0..510dedf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -181,14 +181,6 @@ msgid "no suitable card key found: %s\n"
 msgstr "no se encuentra una clave de tarjeta adecuada: %s\n"
 
 #, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "el sombreado de la clave falló: %s\n"
-
-#, c-format
-msgid "error writing key: %s\n"
-msgstr "error escribiendo clave: %s\n"
-
-#, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
@@ -365,6 +357,11 @@ msgstr "ejecutar en modo demonio (segundo plano)"
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
+#, fuzzy
+#| msgid "run in server mode"
+msgid "run in supervised mode"
+msgstr "ejecutar en modo servidor"
+
 msgid "verbose"
 msgstr "prolijo"
 
@@ -812,9 +809,8 @@ msgstr "error creando tubería: %s\n"
 msgid "error forking process: %s\n"
 msgstr "error bifurcando procesos: %s\n"
 
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
-msgid "waiting for processes to terminate failed: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "fallo esperando que el proceso %d terminara: %s\n"
 
 #, fuzzy, c-format
@@ -832,14 +828,15 @@ msgstr "error ejecutando `%s': código de finalización %d\n"
 msgid "error running '%s': terminated\n"
 msgstr "error ejecutando `%s': terminado\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for process %d to terminate failed: %s\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "fallo esperando que el proceso %d terminara: %s\n"
+
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error obteniendo código de finalización del proceso: %d %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "fallo esperando que el proceso %d terminara: %s\n"
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -860,6 +857,16 @@ msgstr "Aviso: propiedad insegura de %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
 
+#, fuzzy, c-format
+#| msgid "waiting %d seconds for the agent to come up\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "esperando %d segundos para que el agente arranque\n"
+
+#, fuzzy, c-format
+#| msgid "renaming `%s' to `%s' failed: %s\n"
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "renombrando `%s' en `%s' fallo: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "sí|si"
@@ -2258,10 +2265,10 @@ 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 "missing argument for option \"%.50s\"\n"
+msgid "valid values for option '%s':\n"
+msgstr "falta parámetro para la opción \"%.50s\"\n"
 
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
@@ -2272,6 +2279,11 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid value for option '%s'\n"
+msgstr "falta parámetro para la opción \"%.50s\"\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"
@@ -3070,6 +3082,11 @@ msgid "[self-signature]"
 msgstr "[autofirma]"
 
 #, fuzzy, c-format
+#| msgid "error allocating enough memory: %s\n"
+msgid "error allocating memory: %s\n"
+msgstr "error reservando memoria: %s\n"
+
+#, fuzzy, c-format
 #| msgid "key %s: unsupported public key algorithm\n"
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "clave %s: algoritmo de clave pública no disponible\n"
@@ -5082,6 +5099,25 @@ msgstr "Esta clave probablemente pertenece al usuario que se nombra\n"
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
+#, fuzzy, c-format
+#| msgid "root certificate has now been marked as trusted\n"
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr "certificado raíz marcado ahora como fiable\n"
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"No es seguro que la clave pertenezca a la persona que se nombra en el\n"
+"identificador de usuario. Si *realmente* sabe lo que está haciendo,\n"
+"puede contestar sí a la siguiente pregunta.\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5758,19 +5794,21 @@ msgid "error updating TOFU database: %s\n"
 msgstr "error enviando orden %s: %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
@@ -5778,8 +5816,10 @@ msgstr ""
 msgid "error gathering other user IDs: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "lista clave e identificadores de usuario"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5801,42 +5841,48 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "lista claves"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "imprime resúmenes de mensaje"
 msgstr[1] "imprime resúmenes de mensaje"
 
+#, fuzzy, c-format
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] "el algoritmo de resumen seleccionado no es válido\n"
+msgstr[1] "el algoritmo de resumen seleccionado no es válido\n"
+
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5852,6 +5898,17 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing key: %s\n"
+msgid "resetting keydb: %s\n"
+msgstr "error escribiendo clave: %s\n"
+
 #, fuzzy, c-format
 #| msgid "error storing flags: %s\n"
 msgid "error setting TOFU binding's trust level to %s\n"
@@ -5901,52 +5958,58 @@ msgid_plural "%d~seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundo"
 
-#, c-format
-msgid "Have never verified a message signed by key %s!\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: okay\n"
+msgid "%s: "
+msgstr "%s: bien\n"
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "%d firmas borradas\n"
 
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "imprime resúmenes de mensaje"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "imprime resúmenes de mensaje"
+msgstr[1] "imprime resúmenes de mensaje"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld messages"
+msgstr "el algoritmo de resumen seleccionado no es válido\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "el algoritmo de resumen seleccionado no es válido\n"
+msgstr[1] "el algoritmo de resumen seleccionado no es válido\n"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5957,6 +6020,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "error enviando orden %s: %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "error escribiendo anillo público `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6217,13 +6289,6 @@ msgstr "fallo al almacenar la huella digital: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo guardando la fecha de creación: %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "fallo leyendo clave pública: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "la respuesta no incluye la clave pública\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el módulo RSA\n"
 
@@ -6232,9 +6297,16 @@ msgstr "la respuesta no incluye el exponente público RSA\n"
 
 #, fuzzy
 #| msgid "response does not contain the RSA public exponent\n"
-msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "la respuesta no incluye el exponente público RSA\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "la respuesta no incluye la clave pública\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "fallo leyendo clave pública: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "usando PIN por defecto %s\n"
@@ -7976,6 +8048,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr "permitir búsquedas PKA (peticiones DNS)"
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8283,11 +8358,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "error allocating enough memory: %s\n"
-msgid "error allocating memory: %s\n"
-msgstr "error reservando memoria: %s\n"
-
-#, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error printing log line: %s\n"
 msgstr "error escribiendo en %s: %s\n"
@@ -8818,20 +8888,22 @@ msgstr "lista de servidores LDAP"
 msgid "Configuration for OCSP"
 msgstr "Configuración de OCSP"
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "error de red"
 
 # ¿Por qué no frase de paso?
 # Porque todo el mundo sabe lo que es una contraseña
@@ -8844,7 +8916,7 @@ msgstr ""
 #
 #, fuzzy
 #| msgid "Bad Passphrase"
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "Frase contraseña errónea"
 
 #, fuzzy
@@ -8889,6 +8961,11 @@ msgid "check global configuration file"
 msgstr "comprobar fichero global de configuración"
 
 #, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "actualiza la base de datos de confianza"
+
+#, fuzzy
 #| msgid "list all components"
 msgid "reload all or a given component"
 msgstr "listar todos los componentes"
@@ -9085,6 +9162,21 @@ msgstr ""
 "Compara frase contraseña dada en entrada estándar con un fichero de "
 "patrones\n"
 
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "el sombreado de la clave falló: %s\n"
+
+#, fuzzy
+#~| msgid "Available keys:\n"
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "Claves disponibles:\n"
+
+#, fuzzy
+#~| msgid "print message digests"
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "imprime resúmenes de mensaje"
+#~ msgstr[1] "imprime resúmenes de mensaje"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "problema de comunicación con el agente gpg\n"
 
@@ -9170,9 +9262,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "Detectado 1 identificador de usuario sin autofirma válida\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "%d firmas borradas\n"
-
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "ID de usuario \"%s\": %d firmas borradas\n"
 
@@ -9215,11 +9304,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "1 firma incorrecta\n"
 
-#, fuzzy
-#~| msgid "renaming `%s' to `%s' failed: %s\n"
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "renombrando `%s' en `%s' fallo: %s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu claves memorizadas (%lu firmas)\n"
 
@@ -10266,9 +10350,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "URI incorrecto"
 
-#~ msgid "network error"
-#~ msgstr "error de red"
-
 #~ msgid "not processed"
 #~ msgstr "no procesado"
 
@@ -11157,9 +11238,6 @@ msgstr ""
 #~ msgid "%s: updated\n"
 #~ msgstr "%s: actualizada\n"
 
-#~ msgid "%s: okay\n"
-#~ msgstr "%s: bien\n"
-
 #~ msgid "lid %lu: keyblock not found: %s\n"
 #~ msgstr "lid %lu: bloque de clave no encontrado: %s\n"
 
@@ -11170,10 +11248,6 @@ msgstr ""
 #~ msgstr "escribiendo bloque de claves\n"
 
 #, fuzzy
-#~ msgid "encrypted message is valid\n"
-#~ msgstr "el algoritmo de resumen seleccionado no es válido\n"
-
-#, fuzzy
 #~ msgid "Can't check MDC: %s\n"
 #~ msgstr "Imposible comprobar la firma: %s\n"
 
diff --git a/po/et.po b/po/et.po
index 75ded06..8a8e8c2 100644
--- a/po/et.po
+++ b/po/et.po
@@ -152,14 +152,6 @@ msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -315,6 +307,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "Võti on asendatud"
+
 msgid "verbose"
 msgstr "ole jutukas"
 
@@ -729,9 +726,9 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -746,13 +743,13 @@ msgid "error running '%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -774,6 +771,14 @@ msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "uuendamine ebaõnnestus: %s\n"
+
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "pakendamine ebaõnnestus: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "jah"
@@ -2189,9 +2194,9 @@ msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
 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 "valid values for option '%s':\n"
+msgstr "vigased impordi võtmed\n"
 
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2201,6 +2206,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "vigased impordi võtmed\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"
@@ -2991,6 +3000,10 @@ msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "viga võtmehoidla `%s' loomisel: %s\n"
+
+#, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
 
@@ -5028,6 +5041,21 @@ msgstr "See võti kuulub tõenäoliselt omanikule\n"
 msgid "This key belongs to us\n"
 msgstr "See võti kuulub meile\n"
 
+#, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"EI ole kindel, et see võti kuulub isikule, keda mainitakse\n"
+"kasutaja ID väljal. Kui te *tõesti* teate, mida te teete,\n"
+"võite järgnevale küsimusele vastata jaatavalt\n"
+"\n"
+
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5682,27 +5710,31 @@ msgid "error updating TOFU database: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "näita võtit ja kasutaja IDd"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5723,41 +5755,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "näita võtmeid"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|algo [failid]|trüki teatelühendid"
 msgstr[1] "|algo [failid]|trüki teatelühendid"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5773,6 +5811,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -5820,50 +5868,56 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Kustutatud %d allkirja.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|algo [failid]|trüki teatelühendid"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|algo [failid]|trüki teatelühendid"
+msgstr[1] "|algo [failid]|trüki teatelühendid"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "krüpteeritud kasutades %lu parooli\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|algo [failid]|trüki teatelühendid"
+msgstr[1] "|algo [failid]|trüki teatelühendid"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5873,6 +5927,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6117,22 +6180,24 @@ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
 
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr ""
-
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "eemalda võtmed avalike võtmete hoidlast"
+
+msgid "response does not contain the public key data\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7759,6 +7824,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8031,10 +8099,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "viga võtmehoidla `%s' loomisel: %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
@@ -8508,23 +8572,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "võrgu viga"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "halb parool"
 
 #, fuzzy
@@ -8567,6 +8633,11 @@ msgstr "tundmatu seade \"%s\"\n"
 msgid "check global configuration file"
 msgstr "tundmatu seade \"%s\"\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "uuenda usalduse andmebaasi"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8747,6 +8818,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "blokeeri võti"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|algo [failid]|trüki teatelühendid"
+#~ msgstr[1] "|algo [failid]|trüki teatelühendid"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
@@ -8818,9 +8903,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "tuvastasin ühe kehtiva iseenda allkirjata kasutaja ID\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Kustutatud %d allkirja.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Kasutaja ID \"%s\" on tühistatud."
@@ -8865,10 +8947,6 @@ msgstr ""
 #~ msgstr "1 halb allkiri\n"
 
 #, fuzzy
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "pakendamine ebaõnnestus: %s\n"
-
-#, fuzzy
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "kontrollitud %lu võtit (%lu allkirja)\n"
 
@@ -9777,9 +9855,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "halb URI"
 
-#~ msgid "network error"
-#~ msgstr "võrgu viga"
-
 #~ msgid "not processed"
 #~ msgstr "ei töödeldud"
 
diff --git a/po/fi.po b/po/fi.po
index 5063207..d2eefc1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -168,14 +168,6 @@ msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "avainlohkojen poisto epäonnistui: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -331,6 +323,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "Avain on uusittu"
+
 msgid "verbose"
 msgstr "monisanainen"
 
@@ -746,9 +743,9 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "päivitys epäonnistui: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -763,13 +760,13 @@ msgid "error running '%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "päivitys epäonnistui: %s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -791,6 +788,14 @@ msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "päivitys epäonnistui: %s\n"
+
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "ascii-koodaaminen epäonnistui: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "kyllä|kylla|joo"
@@ -2204,9 +2209,9 @@ 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 "valid values for option '%s':\n"
+msgstr "virheelliset tuontivalitsimet\n"
 
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2216,6 +2221,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "virheelliset tuontivalitsimet\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"
@@ -3010,6 +3019,10 @@ msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
+#, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
@@ -5072,6 +5085,21 @@ msgstr "Tämä avain todennäköisesti kuuluu haltijalle\n"
 msgid "This key belongs to us\n"
 msgstr "Tämä on oma avain\n"
 
+#, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"Avaimen kuulumista nimetylle käyttäjätunnukselle EI voida varmistaa.\n"
+"Jos *todella*  tiedät mitä olet tekemässä, vastaa seuraavaan\n"
+"kysymykseen kyllä\n"
+"\n"
+
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5741,27 +5769,31 @@ msgid "error updating TOFU database: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "näytä avaimet ja käyttäjätunnukset"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5782,41 +5814,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "näytä avaimet"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
 msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5832,6 +5870,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -5879,50 +5927,56 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "%d allekirjoitusta poistettu.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
+msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "salattu %lu salasanalla\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
+msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5932,6 +5986,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6177,22 +6240,24 @@ msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "avainlohkojen poisto epäonnistui: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr ""
-
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "poista avaimet julkisten avainten renkaasta"
+
+msgid "response does not contain the public key data\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7822,6 +7887,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8095,10 +8163,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
@@ -8572,23 +8636,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "verkkovirhe"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "väärä salasana"
 
 #, fuzzy
@@ -8631,6 +8697,11 @@ msgstr "tuntematon asetus \"%s\"\n"
 msgid "check global configuration file"
 msgstr "tuntematon asetus \"%s\"\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "päivitä luottamustietokanta"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8811,6 +8882,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "poista avain käytöstä"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
+#~ msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "gpg-agentin kanssa yhteysongelma\n"
 
@@ -8885,9 +8970,6 @@ msgstr ""
 #~ msgstr ""
 #~ "havaittiin 1 käyttäjätunnus ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "%d allekirjoitusta poistettu.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Käyttäjätunnus \"%s\" on mitätöity."
@@ -8932,10 +9014,6 @@ msgstr ""
 #~ msgstr "1 väärä allekirjoitus\n"
 
 #, fuzzy
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "ascii-koodaaminen epäonnistui: %s\n"
-
-#, fuzzy
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
@@ -9875,9 +9953,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "URI ei kelpaa"
 
-#~ msgid "network error"
-#~ msgstr "verkkovirhe"
-
 #~ msgid "not processed"
 #~ msgstr "ei käsitelty"
 
diff --git a/po/fr.po b/po/fr.po
index eb7780b..4cb138f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -161,14 +161,6 @@ msgid "no suitable card key found: %s\n"
 msgstr "aucune clef de carte convenable n'a été trouvée : %s\n"
 
 #, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "échec de dissimulation de la clef : %s\n"
-
-#, c-format
-msgid "error writing key: %s\n"
-msgstr "erreur d'écriture la clef : %s\n"
-
-#, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
@@ -325,6 +317,11 @@ msgstr "exécuter en mode démon (arrière-plan)"
 msgid "run in server mode (foreground)"
 msgstr "exécuter en mode serveur (premier plan)"
 
+#, fuzzy
+#| msgid "run in server mode"
+msgid "run in supervised mode"
+msgstr "exécuter en mode serveur"
+
 msgid "verbose"
 msgstr "bavard"
 
@@ -744,9 +741,8 @@ msgstr "erreur de création d'un flux pour un tube : %s\n"
 msgid "error forking process: %s\n"
 msgstr "erreur de création de processus fils : %s\n"
 
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
-msgid "waiting for processes to terminate failed: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "échec d'attente de fin du processus %d : %s\n"
 
 #, c-format
@@ -761,15 +757,16 @@ msgstr "erreur d'exécution de « %s » : code de retour %d\n"
 msgid "error running '%s': terminated\n"
 msgstr "erreur d'exécution de « %s » : terminé\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for process %d to terminate failed: %s\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "échec d'attente de fin du processus %d : %s\n"
+
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erreur de lecture du code de retour du processus %d : %s\n"
 
 #, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "échec d'attente de fin du processus %d : %s\n"
-
-#, c-format
 msgid "can't connect to '%s': %s\n"
 msgstr "impossible de se connecter à « %s » : %s\n"
 
@@ -788,6 +785,15 @@ msgstr "Avertissement : le propriétaire de %s n'est pas sûr « %s »\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for the agent to come up ... (%ds)\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "attente pour permettre à l'agent d'arriver… (%d s)\n"
+
+#, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "impossible de renommer « %s » en « %s » : %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "oui"
@@ -2142,10 +2148,10 @@ 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 "invalid argument for option \"%.50s\"\n"
+msgid "valid values for option '%s':\n"
+msgstr "argument incorrect pour l'option « %.50s »\n"
 
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
@@ -2155,6 +2161,11 @@ msgstr "option « %s » inconnue\n"
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "invalid argument for option \"%.50s\"\n"
+msgid "invalid value for option '%s'\n"
+msgstr "argument incorrect pour l'option « %.50s »\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"
@@ -2932,6 +2943,10 @@ msgstr "[révocation]"
 msgid "[self-signature]"
 msgstr "[autosignature]"
 
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "erreur d'allocation de mémoire : %s\n"
+
 #, fuzzy, c-format
 #| msgid "key %s: unsupported public key algorithm\n"
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
@@ -4945,6 +4960,26 @@ msgstr "Cette clef appartient sans doute à l'utilisateur nommé\n"
 msgid "This key belongs to us\n"
 msgstr "Cette clef nous appartient\n"
 
+#, fuzzy, c-format
+#| msgid "root certificate has now been marked as trusted\n"
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr "le certificat racine a maintenant été marqué de confiance\n"
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"La clef n'appartient PAS forcément à la personne nommée\n"
+"dans l'identité. Si vous savez *vraiment* ce que vous\n"
+"faites, vous pouvez répondre oui à la prochaine question.\n"
+"\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5649,19 +5684,21 @@ msgid "error updating TOFU database: %s\n"
 msgstr "erreur d'envoi de données : %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
@@ -5669,8 +5706,10 @@ msgstr ""
 msgid "error gathering other user IDs: %s\n"
 msgstr "erreur de lecture de l'identifiant de répondeur : %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "afficher la clef et les identités"
 
 #, fuzzy, c-format
 #| msgid "validity: %s"
@@ -5692,42 +5731,48 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "afficher les clefs"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "indiquer les fonctions de hachage"
 msgstr[1] "indiquer les fonctions de hachage"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5743,6 +5788,17 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing key: %s\n"
+msgid "resetting keydb: %s\n"
+msgstr "erreur d'écriture la clef : %s\n"
+
 #, fuzzy, c-format
 #| msgid "error setting OCSP target: %s\n"
 msgid "error setting TOFU binding's trust level to %s\n"
@@ -5792,51 +5848,58 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "%d signatures supprimées\n"
 
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "indiquer les fonctions de hachage"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "indiquer les fonctions de hachage"
+msgstr[1] "indiquer les fonctions de hachage"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "chiffré avec %lu phrases secrètes\n"
+
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "indiquer les fonctions de hachage"
+msgstr[1] "indiquer les fonctions de hachage"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5848,6 +5911,15 @@ msgid "error opening TOFU database: %s\n"
 msgstr "erreur d'envoi de données : %s\n"
 
 #, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring '%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
+
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "« %s » n'est pas un identifiant valable de clef longue\n"
 
@@ -6110,22 +6182,24 @@ msgstr "impossible de stocker l'empreinte : %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "impossible de stocker la date de création : %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "échec de lecture de clef publique : %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "la réponse ne contient pas les données de clef publique\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "la réponse ne contient pas le module RSA\n"
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la réponse ne contient pas l'exposant public RSA\n"
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "la réponse ne contient pas le point public EC\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "la réponse ne contient pas les données de clef publique\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "échec de lecture de clef publique : %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "utilisation du code personnel par défaut en tant que %s\n"
@@ -7775,6 +7849,9 @@ msgstr "forcer le chargement des listes de révocations de certificat obsolètes
 msgid "allow sending OCSP requests"
 msgstr "permettre l'envoi de requêtes OCSP"
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr "interdire l'utilisation d'HTTP"
 
@@ -8039,10 +8116,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr "« %s » est une URL LDAP incorrecte\n"
 
 #, c-format
-msgid "error allocating memory: %s\n"
-msgstr "erreur d'allocation de mémoire : %s\n"
-
-#, c-format
 msgid "error printing log line: %s\n"
 msgstr "erreur d'affichage de ligne du journal : %s\n"
 
@@ -8512,22 +8585,32 @@ msgstr "liste de serveurs LDAP"
 msgid "Configuration for OCSP"
 msgstr "Configuration pour OCSP"
 
-msgid "GPG for OpenPGP"
+#, fuzzy
+#| msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr "GPG pour OpenPGP"
 
-msgid "GPG Agent"
-msgstr "Agent GPG"
+msgid "Private Keys"
+msgstr ""
 
-msgid "Smartcard Daemon"
+#, fuzzy
+#| msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr "Démon de carte à puce"
 
-msgid "GPG for S/MIME"
+#, fuzzy
+#| msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr "GPG pour S/MIME"
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "erreur de réseau"
 
-msgid "PIN and Passphrase Entry"
+#, fuzzy
+#| msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "Entrée de code personnel et de phrase secrète"
 
 msgid "Component not suitable for launching"
@@ -8567,6 +8650,11 @@ msgstr "afficher le fichier de configuration globale"
 msgid "check global configuration file"
 msgstr "vérifier le fichier de configuration globale"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "mettre la base de confiance à jour"
+
 msgid "reload all or a given component"
 msgstr "recharger tous les composants ou celui donné"
 
@@ -8746,6 +8834,24 @@ msgstr ""
 "Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
 "ficmotif\n"
 
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "échec de dissimulation de la clef : %s\n"
+
+#, fuzzy
+#~| msgid "Available keys:\n"
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "Clefs disponibles :\n"
+
+#, fuzzy
+#~| msgid "print message digests"
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "indiquer les fonctions de hachage"
+#~ msgstr[1] "indiquer les fonctions de hachage"
+
+#~ msgid "GPG Agent"
+#~ msgstr "Agent GPG"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "problème de communication avec gpg-agent\n"
 
@@ -8832,9 +8938,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "1 identité sans autosignature valable détecté\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "%d signatures supprimées\n"
-
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Identité « %s » : %d signatures supprimées\n"
 
@@ -8878,9 +8981,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "1 mauvaise signature\n"
 
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "impossible de renommer « %s » en « %s » : %s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu clefs mises en cache (%lu signatures)\n"
 
@@ -9876,9 +9976,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "mauvais URI"
 
-#~ msgid "network error"
-#~ msgstr "erreur de réseau"
-
 #~ msgid "not processed"
 #~ msgstr "non traité"
 
diff --git a/po/gl.po b/po/gl.po
index f02986f..0b5d876 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -153,14 +153,6 @@ msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "fallou o borrado do bloque de chaves: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "erro escribindo no chaveiro `%s': %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -317,6 +309,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "A chave é obsoleta"
+
 msgid "verbose"
 msgstr "lareto"
 
@@ -733,9 +730,9 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "a actualización fallou: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -750,13 +747,13 @@ msgid "error running '%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "a actualización fallou: %s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -778,6 +775,14 @@ msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "a actualización fallou: %s\n"
+
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "non se puido poñe-la armadura: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "si|sim"
@@ -2197,9 +2202,9 @@ msgstr "amosar en que chaveiro está unha chave listada"
 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 "valid values for option '%s':\n"
+msgstr "opcións de importación non válidas\n"
 
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2209,6 +2214,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "opcións de importación non válidas\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"
@@ -3012,6 +3021,10 @@ msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
 
@@ -5079,6 +5092,23 @@ msgstr "Esta chave probablemente pertenza ao propietario\n"
 msgid "This key belongs to us\n"
 msgstr "Esta chave perténcenos a nós\n"
 
+#, fuzzy, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+"Non se atoparon certificados con confianza non definida.\n"
+"\n"
+
+#, fuzzy
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"NON é seguro que a chave pertenza á persoa indicada no ID de\n"
+"usuario. Se *de verdade* sabe o que está a facer, pode\n"
+"respostar á seguinte pregunta cun \"si\"\n"
+"\n"
+
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5746,27 +5776,31 @@ msgid "error updating TOFU database: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "listar chave e IDs de usuario"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5787,41 +5821,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "ve-la lista de chaves"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
 msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
+#, c-format
+msgid " over the past year."
+msgid_plural " over the past %d years."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5837,6 +5877,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "erro escribindo no chaveiro `%s': %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -5884,50 +5934,56 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Borradas %d sinaturas.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
+msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "cifrado con %lu contrasinais\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
+msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5937,6 +5993,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "erro escribindo no chaveiro público `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6183,22 +6248,24 @@ msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
 
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "fallou o borrado do bloque de chaves: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr ""
-
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "borrar chaves do chaveiro público"
+
+msgid "response does not contain the public key data\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7845,6 +7912,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8117,10 +8187,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "erro ao crea-lo chaveiro `%s': %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
@@ -8595,23 +8661,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "erro de rede"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "contrasinal erróneo"
 
 #, fuzzy
@@ -8654,6 +8722,11 @@ msgstr " creouse un novo ficheiro de configuración `%s'\n"
 msgid "check global configuration file"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "actualiza-la base de datos de confianza"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8836,6 +8909,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "fallou o borrado do bloque de chaves: %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "deshabilitar unha chave"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
+#~ msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "problema de comunicación con gpg-agent\n"
 
@@ -8907,9 +8994,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "detectado 1 ID de usuario sin auto-sinatura válida\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Borradas %d sinaturas.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "O ID de usuario \"%s\" está revocado."
@@ -8954,10 +9038,6 @@ msgstr ""
 #~ msgstr "1 sinatura errónea\n"
 
 #, fuzzy
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "non se puido poñe-la armadura: %s\n"
-
-#, fuzzy
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
@@ -9900,9 +9980,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "URI incorrecto"
 
-#~ msgid "network error"
-#~ msgstr "erro de rede"
-
 #~ msgid "not processed"
 #~ msgstr "non procesado"
 
diff --git a/po/hu.po b/po/hu.po
index b068e69..18228f6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -152,14 +152,6 @@ msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 msgid "no suitable card key found: %s\n"
 msgstr "Nem írható titkoskulcs-karikát találtam: %s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "A kulcsblokk törlése sikertelen: %s.\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -315,6 +307,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "A kulcsot lecserélték."
+
 msgid "verbose"
 msgstr "bőbeszédű mód"
 
@@ -729,9 +726,9 @@ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "Frissítés sikertelen: %s.\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -746,13 +743,13 @@ msgid "error running '%s': terminated\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "Frissítés sikertelen: %s.\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -774,6 +771,14 @@ msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "Frissítés sikertelen: %s.\n"
+
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "Páncélozás nem sikerült: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "igen"
@@ -2185,9 +2190,9 @@ msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
 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 "valid values for option '%s':\n"
+msgstr "Érvénytelen import opciók!\n"
 
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2197,6 +2202,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "Érvénytelen import opciók!\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"
@@ -2992,6 +3001,10 @@ msgid "[self-signature]"
 msgstr "[önaláírás]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
+
+#, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n"
 
@@ -5049,6 +5062,21 @@ msgstr "Ez a kulcs valószínűleg a jelzett tulajdonoshoz tartozik.\n"
 msgid "This key belongs to us\n"
 msgstr "Ez a kulcs hozzánk tartozik.\n"
 
+#, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"NEM biztos, hogy a kulcs a felhasználói azonosítóban szereplő\n"
+"személyhez tartozik. Ha Ön *valóban* tudja, hogy mit csinál,\n"
+"a következő kérdésre válaszolhat igennel.\n"
+"\n"
+
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5711,27 +5739,31 @@ msgid "error updating TOFU database: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "kilistázza a kulcs- és felhasználóazonosítókat"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5752,41 +5784,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "kulcsok listázása"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
 msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5802,6 +5840,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -5849,50 +5897,56 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Töröltem %d aláírást.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
+msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "%lu jelszóval rejtjelezve\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
+msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5902,6 +5956,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "Hiba a(z) \"%s\" nyilvánoskulcs-karika írásakor: %s.\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6147,22 +6210,24 @@ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
 
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "A kulcsblokk törlése sikertelen: %s.\n"
-
-msgid "response does not contain the public key data\n"
-msgstr ""
-
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
+
+msgid "response does not contain the public key data\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "A kulcsblokk törlése sikertelen: %s.\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7790,6 +7855,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8062,10 +8130,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
@@ -8539,23 +8603,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "hálózati hiba"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "rossz jelszó"
 
 #, fuzzy
@@ -8598,6 +8664,11 @@ msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 msgid "check global configuration file"
 msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "bizalmi adatbázis frissítése"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8778,6 +8849,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "kulcs tiltása"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
+#~ msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "Kommunikációs probléma a gpg ügynökkel!\n"
 
@@ -8851,9 +8936,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "1 felhasználóazonosítót találtam érvényes önaláírás nélkül.\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Töröltem %d aláírást.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "\"%s\" felhasználói azonosítót visszavonták."
@@ -8899,10 +8981,6 @@ msgstr ""
 #~ msgstr "1 rossz aláírás.\n"
 
 #, fuzzy
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "Páncélozás nem sikerült: %s\n"
-
-#, fuzzy
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu kulcsot ellenőriztem (%lu aláírással).\n"
 
@@ -9835,9 +9913,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "rossz URI"
 
-#~ msgid "network error"
-#~ msgstr "hálózati hiba"
-
 #~ msgid "not processed"
 #~ msgstr "nem feldolgozott"
 
diff --git a/po/id.po b/po/id.po
index 5ee96c7..fc9af08 100644
--- a/po/id.po
+++ b/po/id.po
@@ -157,14 +157,6 @@ msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "gagal menghapus keyblok: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "kesalahan menulis keyring `%s': %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -320,6 +312,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "Kunci dilampaui"
+
 msgid "verbose"
 msgstr "detil"
 
@@ -734,9 +731,9 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "gagal memperbarui: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -751,13 +748,13 @@ msgid "error running '%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "gagal memperbarui: %s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -779,6 +776,14 @@ msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "gagal memperbarui: %s\n"
+
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "gagal enarmoring: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "y|ya"
@@ -2188,9 +2193,9 @@ 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 "valid values for option '%s':\n"
+msgstr "opsi impor tidak valid\n"
 
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2200,6 +2205,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "opsi impor tidak valid\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"
@@ -2994,6 +3003,10 @@ msgid "[self-signature]"
 msgstr "[self-signature]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
@@ -5043,6 +5056,21 @@ msgstr "Kunci ini mungkin milik pemiliknya\n"
 msgid "This key belongs to us\n"
 msgstr "Kunci ini milik kita\n"
 
+#, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"Tidak pasti bahwa kunci milik orang yang disebutkan\n"
+"Jika anda sangat tahu apa yang sedang anda lakukan, anda boleh menjawab\n"
+"pertanyaan berikut dengan ya\n"
+"\n"
+
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5703,27 +5731,31 @@ msgid "error updating TOFU database: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "tampilkan kunci dan ID user"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5744,41 +5776,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "tampilkan kunci"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|algo [file]|cetak digest pesan"
 msgstr[1] "|algo [file]|cetak digest pesan"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5794,6 +5832,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -5841,50 +5889,56 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Menghapus %d signature.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|algo [file]|cetak digest pesan"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|algo [file]|cetak digest pesan"
+msgstr[1] "|algo [file]|cetak digest pesan"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "dienkripsi dengan passphrase %lu\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|algo [file]|cetak digest pesan"
+msgstr[1] "|algo [file]|cetak digest pesan"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5894,6 +5948,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "kesalahan menulis keyring publik `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6138,22 +6201,24 @@ msgstr "gagal inisialisasi TrustDB: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "gagal menghapus keyblok: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr ""
-
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "hapus kunci dari keyring publik"
+
+msgid "response does not contain the public key data\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "gagal menghapus keyblok: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7781,6 +7846,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8053,10 +8121,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "kesalahan menulis keyring `%s': %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
@@ -8530,23 +8594,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "kesalahan jaringan"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "passphrase yang buruk"
 
 #, fuzzy
@@ -8589,6 +8655,11 @@ msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 msgid "check global configuration file"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "perbarui database trust"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8769,6 +8840,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "gagal menghapus keyblok: %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "tiadakan kunci"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|algo [file]|cetak digest pesan"
+#~ msgstr[1] "|algo [file]|cetak digest pesan"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "masalah komunikasi dengan gpg-agent\n"
 
@@ -8840,9 +8925,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Menghapus %d signature.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "User ID \"%s\" dibatalkan."
@@ -8888,10 +8970,6 @@ msgstr ""
 #~ msgstr "1 signature yang buruk\n"
 
 #, fuzzy
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "gagal enarmoring: %s\n"
-
-#, fuzzy
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
@@ -9832,9 +9910,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "URI yang buruk"
 
-#~ msgid "network error"
-#~ msgstr "kesalahan jaringan"
-
 #~ msgid "not processed"
 #~ msgstr "tidak diproses"
 
diff --git a/po/it.po b/po/it.po
index c109126..ea6c820 100644
--- a/po/it.po
+++ b/po/it.po
@@ -152,14 +152,6 @@ msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "non è stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "errore scrivendo il portachiavi `%s': %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -315,6 +307,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "Questa chiave è stata sostituita"
+
 msgid "verbose"
 msgstr "prolisso"
 
@@ -729,9 +726,9 @@ msgstr "errore nella creazione della passhprase: %s\n"
 msgid "error forking process: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -746,13 +743,13 @@ msgid "error running '%s': terminated\n"
 msgstr "errore leggendo `%s': %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "aggiornamento fallito: %s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -774,6 +771,14 @@ msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "aggiornamento fallito: %s\n"
+
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "creazione dell'armatura fallita: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "si|sì"
@@ -2195,9 +2200,9 @@ 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 "valid values for option '%s':\n"
+msgstr "opzioni di importazione non valide\n"
 
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2207,6 +2212,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "opzioni di importazione non valide\n"
+
+#, fuzzy, c-format
 #| msgid "NOTE: old default options file `%s' ignored\n"
 msgid "Note: old default options file '%s' ignored\n"
 msgstr ""
@@ -3003,6 +3012,10 @@ msgid "[self-signature]"
 msgstr "[autofirma]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "errore creando il portachiavi `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
@@ -5067,6 +5080,21 @@ msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 msgid "This key belongs to us\n"
 msgstr "Questa chiave ci appartiene\n"
 
+#, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"NON è sicuro che la chiave appartenga alla persona indicata.\n"
+"nell'user ID. Se sai *davvero* cosa stai facendo, puoi\n"
+"rispondere sì alla prossima domanda.\n"
+"\n"
+
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5744,27 +5772,31 @@ msgid "error updating TOFU database: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "elenca le chiavi e gli user ID"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5785,41 +5817,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "elenca le chiavi"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|algo [files]|stampa tutti i message digests"
 msgstr[1] "|algo [files]|stampa tutti i message digests"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5835,6 +5873,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "errore scrivendo il portachiavi `%s': %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -5882,50 +5930,56 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Cancellate %d firme.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|algo [files]|stampa tutti i message digests"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|algo [files]|stampa tutti i message digests"
+msgstr[1] "|algo [files]|stampa tutti i message digests"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "cifratto con %lu passphrase\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|algo [files]|stampa tutti i message digests"
+msgstr[1] "|algo [files]|stampa tutti i message digests"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5935,6 +5989,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6180,22 +6243,24 @@ msgstr "inizializzazione del trustdb fallita: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "cancellazione del keyblock fallita: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr ""
-
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "rimuove le chiavi dal portachiavi pubblico"
+
+msgid "response does not contain the public key data\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7824,6 +7889,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8097,10 +8165,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
@@ -8574,23 +8638,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "errore di rete"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "passphrase errata"
 
 #, fuzzy
@@ -8633,6 +8699,11 @@ msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 msgid "check global configuration file"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "aggiorna il database della fiducia"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8813,6 +8884,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "cancellazione del keyblock fallita: %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "disabilita una chiave"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|algo [files]|stampa tutti i message digests"
+#~ msgstr[1] "|algo [files]|stampa tutti i message digests"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "problema di comunicazione con gpg-agent\n"
 
@@ -8884,9 +8969,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "Trovato un user ID senza autofirma valida\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Cancellate %d firme.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "L'user ID \"%s\" è stato revocato."
@@ -8932,10 +9014,6 @@ msgstr ""
 #~ msgstr "una firma non corretta\n"
 
 #, fuzzy
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "creazione dell'armatura fallita: %s\n"
-
-#, fuzzy
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
@@ -9893,9 +9971,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "URI non valida"
 
-#~ msgid "network error"
-#~ msgstr "errore di rete"
-
 # ??? (Md)
 #~ msgid "not processed"
 #~ msgstr "non esaminato"
diff --git a/po/ja.po b/po/ja.po
index b7cefa8..e94e34f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -150,14 +150,6 @@ msgid "no suitable card key found: %s\n"
 msgstr "適当なカードの鍵が見つかりません: %s\n"
 
 #, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "鍵のシャドウ化に失敗しました: %s\n"
-
-#, c-format
-msgid "error writing key: %s\n"
-msgstr "鍵の書き込みエラー: %s\n"
-
-#, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
@@ -304,6 +296,11 @@ msgstr "デーモン・モードで実行 (バックグラウンド)"
 msgid "run in server mode (foreground)"
 msgstr "サーバ・モードで実行 (フォアグラウンド)"
 
+#, fuzzy
+#| msgid "run in server mode"
+msgid "run in supervised mode"
+msgstr "サーバ・モードで実行"
+
 msgid "verbose"
 msgstr "冗長"
 
@@ -703,8 +700,8 @@ msgid "error forking process: %s\n"
 msgstr "プロセスforkエラー: %s\n"
 
 #, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "プロセスの終了待ちが失敗: %s\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr "プロセス%dの終了待ちが失敗: %s\n"
 
 #, c-format
 msgid "error running '%s': probably not installed\n"
@@ -719,12 +716,12 @@ msgid "error running '%s': terminated\n"
 msgstr "'%s'の実行エラー: 終了しました\n"
 
 #, c-format
-msgid "error getting exit code of process %d: %s\n"
-msgstr "プロセス %d のexitコード取得エラー: %s\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "プロセスの終了待ちが失敗: %s\n"
 
 #, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "プロセス%dの終了待ちが失敗: %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "プロセス %d のexitコード取得エラー: %s\n"
 
 #, c-format
 msgid "can't connect to '%s': %s\n"
@@ -745,6 +742,15 @@ msgstr "警告: '%s'の安全でない所有 \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: '%s'の安全でない許可 \"%s\"\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for the agent to come up ... (%ds)\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "agentの起動のため、%d秒待ちます\n"
+
+#, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "'%s'から'%s'へ名前変更に失敗: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "yes"
@@ -2019,8 +2025,10 @@ msgstr "鍵の一覧に鍵リングの名前を表示する"
 msgid "show expiration dates during signature listings"
 msgstr "署名の一覧時に有効期限の日付を表示する"
 
-msgid "available TOFU policies:\n"
-msgstr "利用可能なTOFUポリシー:\n"
+#, fuzzy, c-format
+#| msgid "invalid argument for option \"%.50s\"\n"
+msgid "valid values for option '%s':\n"
+msgstr "オプション\"%.50s\"には無効な引数です\n"
 
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2029,6 +2037,11 @@ msgstr "不明のTOFUポリシー'%s'\n"
 msgid "(use \"help\" to list choices)\n"
 msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
 
+#, fuzzy, c-format
+#| msgid "invalid argument for option \"%.50s\"\n"
+msgid "invalid value for option '%s'\n"
+msgstr "オプション\"%.50s\"には無効な引数です\n"
+
 #, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
@@ -2784,6 +2797,10 @@ msgid "[self-signature]"
 msgstr "[自己署名]"
 
 #, c-format
+msgid "error allocating memory: %s\n"
+msgstr "メモリの確保のエラー: %s\n"
+
+#, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "サポートしていない公開鍵アルゴリズム(%d)の署名は確認できません: %s.\n"
 
@@ -4666,6 +4683,25 @@ msgstr "この鍵はたぶん本人のものです\n"
 msgid "This key belongs to us\n"
 msgstr "この鍵は自分のものです\n"
 
+#, fuzzy, c-format
+#| msgid "root certificate has now been marked as trusted\n"
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr "ルート証明書は信用すると今、マークされました\n"
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"この鍵は、このユーザIDをなのる本人のものかどうか確信でき\n"
+"ません。今から行うことを*本当に*理解していない場合には、\n"
+"次の質問にはnoと答えてください。\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5289,32 +5325,42 @@ msgstr "TOFUデータベースのオープンでエラー '%s': %s\n"
 msgid "error updating TOFU database: %s\n"
 msgstr "TOFUデータベースの更新エラー: %s\n"
 
-#, c-format
-msgid "The binding %s is NOT known."
-msgstr "%sのバインディングは不明です。"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid "The email address \"%s\" is associated with %d key:\n"
+#| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+"This is the first time the email address \"%s\" is being used with key %s."
+msgstr "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます:\n"
+
+#, fuzzy, c-format
+#| msgid "The email address \"%s\" is associated with %d key:\n"
+#| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr "電子メールアドレス\"%s\"は%d個の鍵に結びつけられます:\n"
+
+#, fuzzy
+#| msgid ""
+#| "The key with fingerprint %s raised a conflict with the binding %s.  Since "
+#| "this binding's policy was 'auto', it was changed to 'ask'."
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 "鍵のフィンガープリント%sがバインディング%sと衝突しました。このバインディング"
 "ポリシーは'auto'だったので、'ask'に変更されました。"
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
-"バインディング%s%sが適切(鍵は述べられた所有者に属する)か、偽られたものか(ダ"
-"メ)かを指示してください。"
 
 #, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "ほかのユーザIDの収集エラー: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr "この鍵に結びつけられた知られているユーザID:\n"
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "鍵とユーザIDの一覧"
 
 #, c-format
 msgid "policy: %s"
@@ -5333,34 +5379,50 @@ msgstr[0] "電子メールアドレス\"%s\"は%d個の鍵に結びつけられ
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "この電子メールアドレス\"%s\"の鍵の統計:\n"
 
+msgid ", "
+msgstr ""
+
 msgid "this key"
 msgstr "この鍵"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] "%ld個のメッセージが未来に署名されました。"
+#, fuzzy, c-format
+#| msgid "Verified %ld messages signed by \"%s\"."
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
+msgstr[0] "%ld個のメッセージを検証しました(\"%s\"で署名されたもの)。"
 
 #, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
-msgstr[0] "%ld個のメッセージに署名しました"
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
 
-#, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+#, fuzzy, c-format
+#| msgid " over the past %ld day."
+#| msgid_plural " over the past %ld days."
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] "過去%ld日に。"
 
-#, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
-msgstr[0] "過去%ld週間に。"
-
-#, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+#, fuzzy, c-format
+#| msgid " over the past %ld month."
+#| msgid_plural " over the past %ld months."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] "過去%ld月に。"
 
+#, fuzzy, c-format
+#| msgid " over the past %ld day."
+#| msgid_plural " over the past %ld days."
+msgid " over the past year."
+msgid_plural " over the past %d years."
+msgstr[0] "過去%ld日に。"
+
+#, fuzzy
+#| msgid " over the past %ld day."
+#| msgid_plural " over the past %ld days."
+msgid " in the past."
+msgstr "過去%ld日に。"
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5378,6 +5440,17 @@ msgstr ""
 "(G)ood-良, (A)ccept once-一度だけ良, (U)nknown-不明, (R)eject once-一度だけ"
 "否, (B)ad-ダメ? "
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing key: %s\n"
+msgid "resetting keydb: %s\n"
+msgstr "鍵の書き込みエラー: %s\n"
+
 #, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "TOFUデータベースの信用レベルの設定エラー: %s\n"
@@ -5419,52 +5492,88 @@ msgid_plural "%d~seconds"
 msgstr[0] "%d~秒"
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
-msgstr "鍵%sで署名されたメッセージを検証したことは一度もありません!\n"
-
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
+msgid "%s: "
 msgstr ""
-"\"%s\"の署名の統計を収集することに失敗しました\n"
-"(鍵 %s)\n"
 
-#, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "%ld個のメッセージを検証しました(\"%s\"で署名されたもの)。"
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "%d個の署名を削除しました。\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "Verified %ld message signed by \"%s\"\n"
+#| "in the past %s."
+#| msgid_plural ""
+#| "Verified %ld messages signed by \"%s\"\n"
+#| "in the past %s."
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "メッセージを%ld回検証しました(\"%s\"で署名されたもの。かつて %s)。"
 
-#, c-format
-msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "%lu 個のパスフレーズで暗号化\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "Verified %ld message signed by \"%s\"\n"
+#| "in the past %s."
+#| msgid_plural ""
+#| "Verified %ld messages signed by \"%s\"\n"
+#| "in the past %s."
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
 msgstr[0] "メッセージを%ld回検証しました(\"%s\"で署名されたもの。かつて %s)。"
 
-#, c-format
-msgid "The most recent message was verified %s ago."
-msgstr "もっとも最近のメッセージは%s前に検証されました。"
+#, fuzzy
+#| msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr "警告: この鍵で署名されたメッセージを検証したことはありません!\n"
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+#, fuzzy
+#| msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
+msgstr ""
+"警告: この鍵で署名されたメッセージを検証したことは一度しかありません!\n"
+
+#, fuzzy
+#| msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr "警告: この鍵で署名されたメッセージを検証したことはありません!\n"
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+#, fuzzy
+#| msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 "警告: この鍵で署名されたメッセージを検証したことは一度しかありません!\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Warning: if you think you've seen more than %ld message signed by this "
+#| "key, then this key might be a forgery!  Carefully examine the email "
+#| "address for small variations.  If the key is suspect, then use\n"
+#| "  %s\n"
+#| "to mark it as being bad.\n"
+#| msgid_plural ""
+#| "Warning: if you think you've seen more than %ld messages signed by this "
+#| "key, then this key might be a forgery!  Carefully examine the email "
+#| "address for small variations.  If the key is suspect, then use\n"
+#| "  %s\n"
+#| "to mark it as being bad.\n"
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5479,6 +5588,15 @@ msgid "error opening TOFU database: %s\n"
 msgstr "TOFUデータベースのオープンでエラー: %s\n"
 
 #, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring '%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
+
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s'は、有効な大型鍵IDでありません\n"
 
@@ -5713,22 +5831,24 @@ msgstr "指紋の保管に失敗しました: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "生成日の保管に失敗しました: %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "公開鍵の読み込みに失敗しました: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "応答に公開鍵データが含まれていません\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "応答にRSAのモジュラスが含まれていません\n"
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr "応答にRSA公開指数が含まれていません\n"
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "応答に楕円曲線の公開点が含まれていません\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "応答に公開鍵データが含まれていません\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "公開鍵の読み込みに失敗しました: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "デフォルトPINを%sとして使います\n"
@@ -7276,6 +7396,9 @@ msgstr "期日の過ぎたCRLのロードを強制する"
 msgid "allow sending OCSP requests"
 msgstr "OCSP要求の送信を認める"
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr "HTTPの使用を禁止する"
 
@@ -7530,10 +7653,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr "'%s' は無効なLDAP URLです\n"
 
 #, c-format
-msgid "error allocating memory: %s\n"
-msgstr "メモリの確保のエラー: %s\n"
-
-#, c-format
 msgid "error printing log line: %s\n"
 msgstr "log出力エラー: %s\n"
 
@@ -7985,22 +8104,30 @@ msgstr "LDAPサーバ・リスト"
 msgid "Configuration for OCSP"
 msgstr "OCSPのコンフィグレーション"
 
-msgid "GPG for OpenPGP"
+#, fuzzy
+#| msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr "OpenPGPのためのGPG"
 
-msgid "GPG Agent"
-msgstr "GPG Agent"
+msgid "Private Keys"
+msgstr ""
 
-msgid "Smartcard Daemon"
+#, fuzzy
+#| msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr "スマートカード・デーモン"
 
-msgid "GPG for S/MIME"
+#, fuzzy
+#| msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr "S/MIME のためのGPG"
 
-msgid "Key Acquirer"
-msgstr "キー取得プログラム"
+msgid "Network"
+msgstr ""
 
-msgid "PIN and Passphrase Entry"
+#, fuzzy
+#| msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "PINとパスフレーズの入力"
 
 msgid "Component not suitable for launching"
@@ -8040,6 +8167,11 @@ msgstr "グローバルのコンフィグレーション・ファイルをリス
 msgid "check global configuration file"
 msgstr "グローバルのコンフィグレーション・ファイルをチェックする"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "信用データベースを更新"
+
 msgid "reload all or a given component"
 msgstr "すべて、あるいは指定されたコンポーネントをリロードする"
 
@@ -8218,6 +8350,56 @@ msgstr ""
 "形式: gpg-check-pattern [オプション] パターンファイル\n"
 "パターンファイルに対して標準入力のパスフレーズを確認する\n"
 
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "鍵のシャドウ化に失敗しました: %s\n"
+
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "利用可能なTOFUポリシー:\n"
+
+#~ msgid "The binding %s is NOT known."
+#~ msgstr "%sのバインディングは不明です。"
+
+#~ msgid ""
+#~ "Please indicate whether you believe the binding %s%sis legitimate (the "
+#~ "key belongs to the stated owner) or a forgery (bad)."
+#~ msgstr ""
+#~ "バインディング%s%sが適切(鍵は述べられた所有者に属する)か、偽られたものか"
+#~ "(ダメ)かを指示してください。"
+
+#~ msgid "Known user IDs associated with this key:\n"
+#~ msgstr "この鍵に結びつけられた知られているユーザID:\n"
+
+#~ msgid "%ld message signed in the future."
+#~ msgid_plural "%ld messages signed in the future."
+#~ msgstr[0] "%ld個のメッセージが未来に署名されました。"
+
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "%ld個のメッセージに署名しました"
+
+#~ msgid " over the past %ld week."
+#~ msgid_plural " over the past %ld weeks."
+#~ msgstr[0] "過去%ld週間に。"
+
+#~ msgid "Have never verified a message signed by key %s!\n"
+#~ msgstr "鍵%sで署名されたメッセージを検証したことは一度もありません!\n"
+
+#~ msgid ""
+#~ "Failed to collect signature statistics for \"%s\"\n"
+#~ "(key %s)\n"
+#~ msgstr ""
+#~ "\"%s\"の署名の統計を収集することに失敗しました\n"
+#~ "(鍵 %s)\n"
+
+#~ msgid "The most recent message was verified %s ago."
+#~ msgstr "もっとも最近のメッセージは%s前に検証されました。"
+
+#~ msgid "GPG Agent"
+#~ msgstr "GPG Agent"
+
+#~ msgid "Key Acquirer"
+#~ msgstr "キー取得プログラム"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "gpg-agentとの通信障害\n"
 
@@ -8298,9 +8480,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "有効な自己署名のないユーザIDを1個検出\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "%d個の署名を削除しました。\n"
-
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "ユーザID \"%s\": %d の署名が除去されました\n"
 
@@ -8341,9 +8520,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "正しい署名1個\n"
 
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "'%s'から'%s'へ名前変更に失敗: %s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu個の鍵をキャッシュ済 (%lu個の署名)\n"
 
diff --git a/po/nb.po b/po/nb.po
index 4e5bc40..c6bfb7f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -154,14 +154,6 @@ msgid "no suitable card key found: %s\n"
 msgstr "fant ingen passende kortnøkkel: %s\n"
 
 #, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "skyggelegging av nøkkel mislyktes: %s\n"
-
-#, c-format
-msgid "error writing key: %s\n"
-msgstr "feil under skriving av nøkkel: %s\n"
-
-#, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
@@ -308,6 +300,11 @@ msgstr "kjør som bakgrunnsprosess («daemon»)"
 msgid "run in server mode (foreground)"
 msgstr "kjør i tjenermodus (forgrunn)"
 
+#, fuzzy
+#| msgid "run in server mode"
+msgid "run in supervised mode"
+msgstr "kjør i tjenermodus"
+
 msgid "verbose"
 msgstr "detaljert utskrift"
 
@@ -708,8 +705,8 @@ msgid "error forking process: %s\n"
 msgstr "feil under kopiering av prosess: %s\n"
 
 #, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "venting på avslutning av prosesser mislyktes: %s\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr "prosess %d avsluttet ikke i tide: %s\n"
 
 #, c-format
 msgid "error running '%s': probably not installed\n"
@@ -725,12 +722,12 @@ msgid "error running '%s': terminated\n"
 msgstr "feil under kjøring av «%s». Avsluttet\n"
 
 #, c-format
-msgid "error getting exit code of process %d: %s\n"
-msgstr "feil under henting av prosess-avslutningskode %d: %s\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "venting på avslutning av prosesser mislyktes: %s\n"
 
 #, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "prosess %d avsluttet ikke i tide: %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "feil under henting av prosess-avslutningskode %d: %s\n"
 
 #, c-format
 msgid "can't connect to '%s': %s\n"
@@ -751,6 +748,16 @@ msgstr "Advarsel: utrygt eierskap til %s «%s»\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Advarsel: utrygge tillatelser til %s «%s»\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for the agent to come up ... (%ds)\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "venter på at agent skal dukke opp … (%ds)\n"
+
+#, fuzzy, c-format
+#| msgid "error renaming '%s' to '%s': %s\n"
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "ja"
@@ -2027,8 +2034,10 @@ msgstr "vis nøkkelknippe-navn i nøkkelvisning"
 msgid "show expiration dates during signature listings"
 msgstr "vis utløpsdatoer i nøkkelvisning"
 
-msgid "available TOFU policies:\n"
-msgstr "tilgjengelige TOFU-regler:\n"
+#, fuzzy, c-format
+#| msgid "invalid argument for option \"%.50s\"\n"
+msgid "valid values for option '%s':\n"
+msgstr "ugyldig argument for valget «%.50s»\n"
 
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2037,6 +2046,11 @@ msgstr "«%s» er et ukjent TOFU-regelverk\n"
 msgid "(use \"help\" to list choices)\n"
 msgstr "(bruk «help» for å vise valg)\n"
 
+#, fuzzy, c-format
+#| msgid "invalid argument for option \"%.50s\"\n"
+msgid "invalid value for option '%s'\n"
+msgstr "ugyldig argument for valget «%.50s»\n"
+
 #, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "Merk: gammel standardvalgfil «%s» ble ignorert\n"
@@ -2804,6 +2818,10 @@ msgid "[self-signature]"
 msgstr "[selvsignatur]"
 
 #, c-format
+msgid "error allocating memory: %s\n"
+msgstr "feil under minnetildeling: %s\n"
+
+#, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr ""
 "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
@@ -4734,6 +4752,25 @@ msgstr "Denne nøkkelen tilhører sannsynligvis navngitt bruker\n"
 msgid "This key belongs to us\n"
 msgstr "denne nøkkelen tilhører oss\n"
 
+#, fuzzy, c-format
+#| msgid "root certificate has now been marked as trusted\n"
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr "rotsertifikat er nå merket som troverdig\n"
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"Det er IKKE sikkert at nøkkelen tilhører personen som er navngitt i\n"
+"bruker-id-en.  Hvis du *virkelig* vet hva du gjør, kan du svare ja\n"
+"på neste spørsmål.\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5377,32 +5414,42 @@ msgstr "feil under åpning av TOFU-database «%s»: %s\n"
 msgid "error updating TOFU database: %s\n"
 msgstr "feil under oppdatering av TOFU-database: %s\n"
 
-#, c-format
-msgid "The binding %s is NOT known."
-msgstr "Tilknytning %s er ukjent."
-
-#, c-format
+#, fuzzy, c-format
+#| msgid "The email address \"%s\" is associated with %d key:\n"
+#| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+"This is the first time the email address \"%s\" is being used with key %s."
+msgstr "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
+
+#, fuzzy, c-format
+#| msgid "The email address \"%s\" is associated with %d key:\n"
+#| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
+
+#, fuzzy
+#| msgid ""
+#| "The key with fingerprint %s raised a conflict with the binding %s.  Since "
+#| "this binding's policy was 'auto', it was changed to 'ask'."
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 "Nøkkel med fingeravtrykk %s forårsaket konflikt med tilknytning %s. Siden "
 "regelen var «auto» er den nå endret til «ask» (spør)."
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
-"Oppgi hvorvidt du tror tilknytninga %s%ser sannferdig (dvs.: at nøkkelen "
-"tilhører personen som hevder å eie den) eller falsk."
 
 #, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "feil under henting av andre bruker-id-er: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr "Kjente bruker-id-er tilknyttet denne nøkkelen:\n"
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "vis nøkler og bruker-id-er"
 
 #, c-format
 msgid "policy: %s"
@@ -5422,39 +5469,55 @@ msgstr[1] "E-postadressen «%s» er tilknyttet %d nøkler:\n"
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Statistikk for nøkler med e-postadresse «%s»:\n"
 
+msgid ", "
+msgstr ""
+
 msgid "this key"
 msgstr "denne nøkkelen"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] "%ld melding signert i fremtid."
-msgstr[1] "%ld meldinger signert i fremtid."
+#, fuzzy, c-format
+#| msgid "Verified %ld messages signed by \"%s\"."
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
+msgstr[0] "Bekreftet %ld meldinger signert av «%s»."
+msgstr[1] "Bekreftet %ld meldinger signert av «%s»."
 
 #, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
-msgstr[0] "%ld melding signert"
-msgstr[1] "%ld meldinger signert"
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+#, fuzzy, c-format
+#| msgid " over the past %ld day."
+#| msgid_plural " over the past %ld days."
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] " i løpet av gårsdagen (%ld)."
 msgstr[1] " i løpet av de %ld siste dagene."
 
-#, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
-msgstr[0] " i løpet av den siste uka (%ld)."
-msgstr[1] " i løpet av de siste %ld ukene."
-
-#, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+#, fuzzy, c-format
+#| msgid " over the past %ld month."
+#| msgid_plural " over the past %ld months."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] " i løpet av den siste måneden (%ld)."
 msgstr[1] " i løpet av de siste %ld månedene."
 
+#, fuzzy, c-format
+#| msgid " over the past %ld day."
+#| msgid_plural " over the past %ld days."
+msgid " over the past year."
+msgid_plural " over the past %d years."
+msgstr[0] " i løpet av gårsdagen (%ld)."
+msgstr[1] " i løpet av de %ld siste dagene."
+
+#, fuzzy
+#| msgid " over the past %ld day."
+#| msgid_plural " over the past %ld days."
+msgid " in the past."
+msgstr " i løpet av gårsdagen (%ld)."
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5470,6 +5533,17 @@ msgstr "gGaAuUnNdD"
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr "(G)od, (A)ksepter én gang, (U)kjent, (N)ekt én gang, (D)årlig? "
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing key: %s\n"
+msgid "resetting keydb: %s\n"
+msgstr "feil under skriving av nøkkel: %s\n"
+
 #, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "feil under endring av tillitsnivå for TOFU-tilknytning til %s\n"
@@ -5517,28 +5591,23 @@ msgstr[0] "%d~sekund"
 msgstr[1] "%d~sekunder"
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
-msgstr "Har aldri bekreftet en melding som er signert av nøkkel %s.\n"
-
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
+msgid "%s: "
 msgstr ""
-"Klarte ikke å samle inn signaturstatistikk for «%s»\n"
-"(nøkkel %s)\n"
 
-#, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "Bekreftet %ld meldinger signert av «%s»."
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Slettet %d signaturer.\n"
 
-#, c-format
-msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
+#, fuzzy, c-format
+#| msgid ""
+#| "Verified %ld message signed by \"%s\"\n"
+#| "in the past %s."
+#| msgid_plural ""
+#| "Verified %ld messages signed by \"%s\"\n"
+#| "in the past %s."
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
 msgstr[0] ""
 "Bekreftet %ld melding signert av «%s»\n"
 "siste %s."
@@ -5546,30 +5615,78 @@ msgstr[1] ""
 "Bekreftet %ld meldinger signert av «%s»\n"
 "siste %s."
 
-#, c-format
-msgid "The most recent message was verified %s ago."
-msgstr "Nyeste melding ble bekreftet for %s siden."
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "kryptert med %lu passordfraser\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "Verified %ld message signed by \"%s\"\n"
+#| "in the past %s."
+#| msgid_plural ""
+#| "Verified %ld messages signed by \"%s\"\n"
+#| "in the past %s."
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] ""
+"Bekreftet %ld melding signert av «%s»\n"
+"siste %s."
+msgstr[1] ""
+"Bekreftet %ld meldinger signert av «%s»\n"
+"siste %s."
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+#, fuzzy
+#| msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 "Advarsel: vi har enda ikke sett en melding som er signert av denne "
 "nøkkelen.\n"
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+#, fuzzy
+#| msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 "Advarsel: vi har bare sett én melding som er signert av denne nøkkelen.\n"
 
-#, c-format
+#, fuzzy
+#| msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
+msgstr ""
+"Advarsel: vi har enda ikke sett en melding som er signert av denne "
+"nøkkelen.\n"
+
+#, fuzzy
+#| msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
+msgstr ""
+"Advarsel: vi har bare sett én melding som er signert av denne nøkkelen.\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "Warning: if you think you've seen more than %ld message signed by this "
+#| "key, then this key might be a forgery!  Carefully examine the email "
+#| "address for small variations.  If the key is suspect, then use\n"
+#| "  %s\n"
+#| "to mark it as being bad.\n"
+#| msgid_plural ""
+#| "Warning: if you think you've seen more than %ld messages signed by this "
+#| "key, then this key might be a forgery!  Carefully examine the email "
+#| "address for small variations.  If the key is suspect, then use\n"
+#| "  %s\n"
+#| "to mark it as being bad.\n"
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5590,6 +5707,15 @@ msgid "error opening TOFU database: %s\n"
 msgstr "feil under åpning av TOFU-database: %s\n"
 
 #, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring '%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
+
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "«%s» er en ugyldig lang nøkkel-ID\n"
 
@@ -5827,22 +5953,24 @@ msgstr "klarte ikke å lagre fingeravtrykk: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke å lagre opprettelsesdato: %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "svar inneholder ikke offentlig nøkkeldata\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "svar inneholder ikke RSA-modulus\n"
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svar inneholder ikke offentlig RSA-eksponent\n"
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "svar inneholder ikke offentlig EC-punkt\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "svar inneholder ikke offentlig nøkkeldata\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "bruker forvalgt PIN som %s\n"
@@ -7392,6 +7520,9 @@ msgstr "tving innlasting av utdatert CRL"
 msgid "allow sending OCSP requests"
 msgstr "tillat sending av OCSP-forespørsler"
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr "hindre bruk av HTTP"
 
@@ -7647,10 +7778,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr "«%s» er en ugyldig LDAP-adresse\n"
 
 #, c-format
-msgid "error allocating memory: %s\n"
-msgstr "feil under minnetildeling: %s\n"
-
-#, c-format
 msgid "error printing log line: %s\n"
 msgstr "feil under utskrift av logglinje: %s\n"
 
@@ -8104,22 +8231,32 @@ msgstr "LDAP-tjenerliste"
 msgid "Configuration for OCSP"
 msgstr "Oppsett for OCSP"
 
-msgid "GPG for OpenPGP"
+#, fuzzy
+#| msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr "GPG for OpenPGP"
 
-msgid "GPG Agent"
-msgstr "GPG Agent"
+msgid "Private Keys"
+msgstr ""
 
-msgid "Smartcard Daemon"
+#, fuzzy
+#| msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr "Smartcard-bakgrunnsprosess"
 
-msgid "GPG for S/MIME"
+#, fuzzy
+#| msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr "GPG for S/MIME"
 
-msgid "Key Acquirer"
-msgstr "Nøkkelhenter"
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "nettverksfeil"
 
-msgid "PIN and Passphrase Entry"
+#, fuzzy
+#| msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "Skriving av PIN og passordfrase"
 
 msgid "Component not suitable for launching"
@@ -8159,6 +8296,11 @@ msgstr "vis global oppsettsfil"
 msgid "check global configuration file"
 msgstr "kontroller global oppsettsfil"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "oppdater tillitsdatabase"
+
 msgid "reload all or a given component"
 msgstr "last inn én eller alle komponenter på nytt"
 
@@ -8337,6 +8479,59 @@ msgstr ""
 "Syntaks: gpg-check-pattern [valg] mønsterfil\n"
 "Kontroller passordfrase oppgitt på standard innkanal mot valgt mønsterfil\n"
 
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "skyggelegging av nøkkel mislyktes: %s\n"
+
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "tilgjengelige TOFU-regler:\n"
+
+#~ msgid "The binding %s is NOT known."
+#~ msgstr "Tilknytning %s er ukjent."
+
+#~ msgid ""
+#~ "Please indicate whether you believe the binding %s%sis legitimate (the "
+#~ "key belongs to the stated owner) or a forgery (bad)."
+#~ msgstr ""
+#~ "Oppgi hvorvidt du tror tilknytninga %s%ser sannferdig (dvs.: at nøkkelen "
+#~ "tilhører personen som hevder å eie den) eller falsk."
+
+#~ msgid "Known user IDs associated with this key:\n"
+#~ msgstr "Kjente bruker-id-er tilknyttet denne nøkkelen:\n"
+
+#~ msgid "%ld message signed in the future."
+#~ msgid_plural "%ld messages signed in the future."
+#~ msgstr[0] "%ld melding signert i fremtid."
+#~ msgstr[1] "%ld meldinger signert i fremtid."
+
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "%ld melding signert"
+#~ msgstr[1] "%ld meldinger signert"
+
+#~ msgid " over the past %ld week."
+#~ msgid_plural " over the past %ld weeks."
+#~ msgstr[0] " i løpet av den siste uka (%ld)."
+#~ msgstr[1] " i løpet av de siste %ld ukene."
+
+#~ msgid "Have never verified a message signed by key %s!\n"
+#~ msgstr "Har aldri bekreftet en melding som er signert av nøkkel %s.\n"
+
+#~ msgid ""
+#~ "Failed to collect signature statistics for \"%s\"\n"
+#~ "(key %s)\n"
+#~ msgstr ""
+#~ "Klarte ikke å samle inn signaturstatistikk for «%s»\n"
+#~ "(nøkkel %s)\n"
+
+#~ msgid "The most recent message was verified %s ago."
+#~ msgstr "Nyeste melding ble bekreftet for %s siden."
+
+#~ msgid "GPG Agent"
+#~ msgstr "GPG Agent"
+
+#~ msgid "Key Acquirer"
+#~ msgstr "Nøkkelhenter"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "kommunikasjonsproblemer med gpg-agent\n"
 
@@ -8932,9 +9127,6 @@ msgstr ""
 #~ msgid "Please use the command \"toggle\" first.\n"
 #~ msgstr "Bruk kommandoen «toggle» først.\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Slettet %d signaturer.\n"
-
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Bruker-ID «%s»: %d signaturer fjernet\n"
 
@@ -9207,9 +9399,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "ugyldig URI"
 
-#~ msgid "network error"
-#~ msgstr "nettverksfeil"
-
 #~ msgid "not processed"
 #~ msgstr "ikke behandlet"
 
diff --git a/po/pl.po b/po/pl.po
index 97eff33..6b77df7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -161,14 +161,6 @@ msgid "no suitable card key found: %s\n"
 msgstr "nie znaleziono pasującego klucza karty: %s\n"
 
 #, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "zaciemnienie klucza nie powiodło się: %s\n"
-
-#, c-format
-msgid "error writing key: %s\n"
-msgstr "błąd zapisu klucza: %s\n"
-
-#, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
@@ -342,6 +334,11 @@ msgstr "uruchomienie w trybie demona (w tle)"
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
+#, fuzzy
+#| msgid "run in server mode"
+msgid "run in supervised mode"
+msgstr "uruchomienie w trybie serwera"
+
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
@@ -779,9 +776,8 @@ msgstr "błąd tworzenia potoku: %s\n"
 msgid "error forking process: %s\n"
 msgstr "błąd podczas tworzenia procesu: %s\n"
 
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
-msgid "waiting for processes to terminate failed: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "oczekiwanie na zakończenie procesu %d nie powiodło się: %s\n"
 
 #, fuzzy, c-format
@@ -799,14 +795,15 @@ msgstr "błąd uruchamiania ,,%s'': kod wyjścia %d\n"
 msgid "error running '%s': terminated\n"
 msgstr "błąd uruchamiania ,,%s'': zakończono\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for process %d to terminate failed: %s\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "oczekiwanie na zakończenie procesu %d nie powiodło się: %s\n"
+
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "błąd odczytu kodu zakończenia procesu %d: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "oczekiwanie na zakończenie procesu %d nie powiodło się: %s\n"
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -827,6 +824,16 @@ msgstr "Ostrzeżenie: niebezpieczne prawa własności do %s ,,%s''\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Ostrzeżenie: niebezpieczne prawa dostępu do %s ,,%s''\n"
 
+#, fuzzy, c-format
+#| msgid "waiting %d seconds for the agent to come up\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "oczekiwanie (%d s) na uruchomienie agenta\n"
+
+#, fuzzy, c-format
+#| msgid "renaming `%s' to `%s' failed: %s\n"
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "tak"
@@ -2235,10 +2242,10 @@ 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 "missing argument for option \"%.50s\"\n"
+msgid "valid values for option '%s':\n"
+msgstr "brak argumentu dla opcji ,,%.50s''\n"
 
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
@@ -2249,6 +2256,11 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid value for option '%s'\n"
+msgstr "brak argumentu dla opcji ,,%.50s''\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"
@@ -3050,6 +3062,11 @@ msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
 #, fuzzy, c-format
+#| msgid "error allocating enough memory: %s\n"
+msgid "error allocating memory: %s\n"
+msgstr "błąd przydzielania wystarczającej ilości pamięci: %s\n"
+
+#, fuzzy, c-format
 #| msgid "key %s: unsupported public key algorithm\n"
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "klucz %s: nieobsługiwany algorytm asymetryczny\n"
@@ -5109,6 +5126,25 @@ msgstr "Ten klucz prawdopodobnie należy do tej osoby\n"
 msgid "This key belongs to us\n"
 msgstr "Ten klucz należy do nas\n"
 
+#, fuzzy, c-format
+#| msgid "root certificate has now been marked as trusted\n"
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr "główny certyfikat nie został oznaczony jako zaufany\n"
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"NIE MA pewności, czy klucz należy do osoby wymienionej w identyfikatorze.\n"
+"Jeśli nie masz co do tego żadnych wątpliwości i *naprawdę* wiesz co robisz,\n"
+"możesz odpowiedzieć ,,tak'' na następne pytanie.\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5806,19 +5842,21 @@ msgid "error updating TOFU database: %s\n"
 msgstr "błąd wysyłania polecenia %s: %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
@@ -5826,8 +5864,10 @@ msgstr ""
 msgid "error gathering other user IDs: %s\n"
 msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "lista kluczy i identyfikatorów użytkownika"
 
 #, fuzzy, c-format
 #| msgid "validity: %s"
@@ -5850,47 +5890,53 @@ msgstr[2] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "lista kluczy"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "wypisanie skrótów wiadomości"
 msgstr[1] "wypisanie skrótów wiadomości"
 msgstr[2] "wypisanie skrótów wiadomości"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#, c-format
+msgid " over the past year."
+msgid_plural " over the past %d years."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5906,6 +5952,17 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing key: %s\n"
+msgid "resetting keydb: %s\n"
+msgstr "błąd zapisu klucza: %s\n"
+
 #, fuzzy, c-format
 #| msgid "error storing flags: %s\n"
 msgid "error setting TOFU binding's trust level to %s\n"
@@ -5961,52 +6018,60 @@ msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "%d podpisów usuniętych.\n"
 
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "wypisanie skrótów wiadomości"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "wypisanie skrótów wiadomości"
+msgstr[1] "wypisanie skrótów wiadomości"
+msgstr[2] "wypisanie skrótów wiadomości"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "zaszyfrowane za pomocą %lu haseł\n"
+
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "wypisanie skrótów wiadomości"
+msgstr[1] "wypisanie skrótów wiadomości"
+msgstr[2] "wypisanie skrótów wiadomości"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -6018,6 +6083,15 @@ msgstr[2] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "błąd wysyłania polecenia %s: %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "błąd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6275,13 +6349,6 @@ msgstr "nie powiódł się zapis odcisku: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "nie powiódł się zapis daty utworzenia: %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "odpowiedź nie zawiera danych klucza publicznego\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpowiedź nie zawiera współczynnika RSA\n"
 
@@ -6290,9 +6357,16 @@ msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
 
 #, fuzzy
 #| msgid "response does not contain the RSA public exponent\n"
-msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "odpowiedź nie zawiera danych klucza publicznego\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "użycie domyślnego PIN-u jako %s\n"
@@ -8018,6 +8092,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr "zezwolenie na wyszukiwania PKA (żądania DNS)"
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8320,11 +8397,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "error allocating enough memory: %s\n"
-msgid "error allocating memory: %s\n"
-msgstr "błąd przydzielania wystarczającej ilości pamięci: %s\n"
-
-#, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error printing log line: %s\n"
 msgstr "błąd zapisu do %s: %s\n"
@@ -8857,24 +8929,24 @@ msgstr "lista serwerów LDAP"
 msgid "Configuration for OCSP"
 msgstr "Konfiguracja dla OCSP"
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
+msgid "Network"
 msgstr ""
 
 #, fuzzy
 #| msgid "Bad Passphrase"
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "Niepoprawne hasło"
 
 #, fuzzy
@@ -8919,6 +8991,11 @@ msgid "check global configuration file"
 msgstr "sprawdzenie globalnego pliku konfiguracyjnego"
 
 #, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "uaktualnienie bazy zaufania"
+
+#, fuzzy
 #| msgid "list all components"
 msgid "reload all or a given component"
 msgstr "lista wszystkich komponentów"
@@ -9109,6 +9186,22 @@ 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 "shadowing the key failed: %s\n"
+#~ msgstr "zaciemnienie klucza nie powiodło się: %s\n"
+
+#, fuzzy
+#~| msgid "Available keys:\n"
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "Dostępne klucze:\n"
+
+#, fuzzy
+#~| msgid "print message digests"
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "wypisanie skrótów wiadomości"
+#~ msgstr[1] "wypisanie skrótów wiadomości"
+#~ msgstr[2] "wypisanie skrótów wiadomości"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "problem z komunikacją z gpg-agentem\n"
 
@@ -9199,9 +9292,6 @@ msgstr ""
 #~ msgstr ""
 #~ "wykryto 1 identyfikator użytkownika niepodpisany tym samym kluczem\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "%d podpisów usuniętych.\n"
-
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Identyfikator użytkownika ,,%s'': %d podpisów wyczyszczonych\n"
 
@@ -9244,11 +9334,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "1 niepoprawny podpis\n"
 
-#, fuzzy
-#~| msgid "renaming `%s' to `%s' failed: %s\n"
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu kluczy zbuforowano (%lu podpisów)\n"
 
diff --git a/po/pt.po b/po/pt.po
index 40d65f7..f0bbe97 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -155,14 +155,6 @@ msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "nenhum porta-chaves secreto com permissões de escrita encontrado: %s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "remoção do bloco de chave falhou: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "erro na escrita do porta-chaves `%s': %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -318,6 +310,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "A chave foi substituída"
+
 msgid "verbose"
 msgstr "detalhado"
 
@@ -733,9 +730,9 @@ msgstr "erro na criação da frase secreta: %s\n"
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "actualização falhou: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -750,13 +747,13 @@ msgid "error running '%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "actualização falhou: %s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -778,6 +775,14 @@ msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "actualização falhou: %s\n"
+
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "criação de armadura falhou: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 #, fuzzy
 msgid "yes"
@@ -2191,9 +2196,9 @@ 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 "valid values for option '%s':\n"
+msgstr "opções de importação inválidas\n"
 
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2203,6 +2208,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "opções de importação inválidas\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"
@@ -2998,6 +3007,10 @@ msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "erro ao criar porta-chaves `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
 
@@ -5052,6 +5065,21 @@ msgstr "Esta chave provavelmente pertence ao dono\n"
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence-nos\n"
 
+#, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"NÃO se tem certeza de que esta chave pertence ao seu dono.\n"
+"Se você *realmente* sabe o que está a fazer, pode responder\n"
+"sim à próxima pergunta\n"
+"\n"
+
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5711,27 +5739,31 @@ msgid "error updating TOFU database: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "lista chave e identificadores de utilizadores"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5752,41 +5784,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "listar as chaves"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5802,6 +5840,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -5849,50 +5897,55 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "%d assinaturas removidas.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld messages"
+msgstr "Repita a frase secreta\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5902,6 +5955,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "erro ao escrever no porta-chaves público `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6148,22 +6210,24 @@ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "remoção do bloco de chave falhou: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr ""
-
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "remover chaves do porta-chaves público"
+
+msgid "response does not contain the public key data\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "remoção do bloco de chave falhou: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7792,6 +7856,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8066,10 +8133,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "erro ao criar porta-chaves `%s': %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
@@ -8544,23 +8607,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "erro na rede"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "frase secreta incorrecta"
 
 #, fuzzy
@@ -8603,6 +8668,11 @@ msgstr "criado um novo ficheiro de configuração `%s'\n"
 msgid "check global configuration file"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "actualizar a base de dados de confiança"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8782,6 +8852,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "remoção do bloco de chave falhou: %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "desactiva uma chave"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+#~ msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "problemas na comunicação com o gpg-agent\n"
 
@@ -8854,9 +8938,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "1 ID de utilizador sem auto-assinatura válida detectado\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "%d assinaturas removidas.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Utilizador \"%s\" está revocado."
@@ -8901,10 +8982,6 @@ msgstr ""
 #~ msgstr "1 assinatura incorrecta\n"
 
 #, fuzzy
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "criação de armadura falhou: %s\n"
-
-#, fuzzy
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
@@ -9805,9 +9882,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "URI incorrecto"
 
-#~ msgid "network error"
-#~ msgstr "erro na rede"
-
 #~ msgid "not processed"
 #~ msgstr "não processado"
 
diff --git a/po/ro.po b/po/ro.po
index 12fd6f6..ea68dc3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -159,14 +159,6 @@ msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "nu am găsit nici un inel de chei secret de scris: %s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "citirea cheii publice a eşuat: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "eroare la scrierea inelului de chei `%s': %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -330,6 +322,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "Cheia este înlocuită"
+
 msgid "verbose"
 msgstr "locvace"
 
@@ -750,9 +747,9 @@ msgstr "eroare la crearea frazei-parolă: %s\n"
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "actualizarea a eşuat: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -767,13 +764,13 @@ msgid "error running '%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "actualizarea a eşuat: %s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -795,6 +792,15 @@ msgstr "AVERTISMENT: proprietate nesigură (unsafe) pentru extensia `%s'\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "actualizarea a eşuat: %s\n"
+
+#, fuzzy, c-format
+#| msgid "renaming `%s' to `%s' failed: %s\n"
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "da"
@@ -2220,9 +2226,9 @@ msgstr "arată căruia dintre inelele de chei îi aparţine o cheie enumerată"
 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 "valid values for option '%s':\n"
+msgstr "opţiuni enumerare invalide\n"
 
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
@@ -2233,6 +2239,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "opţiuni enumerare invalide\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"
@@ -3030,6 +3040,10 @@ msgid "[self-signature]"
 msgstr "[auto-semnătură]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
+#, fuzzy, c-format
 #| msgid "key %s: unsupported public key algorithm\n"
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
@@ -5064,6 +5078,24 @@ msgstr "Această cheie aparţine probabil utilizatorului numit\n"
 msgid "This key belongs to us\n"
 msgstr "Această cheie ne aparţine\n"
 
+#, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"NU este sigur că cheia aparţine persoanei numite în ID-ul\n"
+"utilizator.  Dacă ştiţi *cu adevărat* ce faceţi, puteţi\n"
+"răspunde cu da la următoarea întrebare.\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5736,19 +5768,21 @@ msgid "error updating TOFU database: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
@@ -5756,8 +5790,10 @@ msgstr ""
 msgid "error gathering other user IDs: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "enumeră chei şi ID-uri utilizator"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5778,41 +5814,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "enumeră chei"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
 msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
+#, c-format
+msgid " over the past year."
+msgid_plural " over the past %d years."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5828,6 +5870,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "eroare la scrierea inelului de chei `%s': %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -5875,50 +5927,56 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Am şters %d semnături.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|algo [fişiere]|afişează rezumate mesaje"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
+msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "cifrată cu %lu fraze-parolă\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
+msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5928,6 +5986,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6177,13 +6244,6 @@ msgstr "am eşuat să stochez amprenta: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "am eşuat să stochez data creării: %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "citirea cheii publice a eşuat: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "răspunsul nu conţine datele cheii publice\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "răspunsul nu conţine modulul RSA\n"
 
@@ -6192,9 +6252,16 @@ msgstr "răspunsul nu conţine exponentul public RSA\n"
 
 #, fuzzy
 #| msgid "response does not contain the RSA public exponent\n"
-msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "răspunsul nu conţine exponentul public RSA\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "răspunsul nu conţine datele cheii publice\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "citirea cheii publice a eşuat: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7840,6 +7907,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8124,10 +8194,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "eroare la crearea inelului de chei `%s': %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
@@ -8607,23 +8673,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "eroare reţea"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "frază-parolă incorectă"
 
 #, fuzzy
@@ -8666,6 +8734,11 @@ msgstr "articol configurare necunoscut `%s'\n"
 msgid "check global configuration file"
 msgstr "articol configurare necunoscut `%s'\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "actualizează baza de date de încredere"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8846,6 +8919,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "citirea cheii publice a eşuat: %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "deactivează cheia"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
+#~ msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "probleme de comunicare cu gpg-agent\n"
 
@@ -8918,9 +9005,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "am găsit 1 ID utilizator fără auto-semnătură validă\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Am şters %d semnături.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "ID utilizator \"%s\" a fost revocat."
@@ -8964,11 +9048,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "1 semnătură incorectă\n"
 
-#, fuzzy
-#~| msgid "renaming `%s' to `%s' failed: %s\n"
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu chei puse în cache (%lu semnături)\n"
 
@@ -9946,9 +10025,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "URI incorect"
 
-#~ msgid "network error"
-#~ msgstr "eroare reţea"
-
 #~ msgid "not processed"
 #~ msgstr "neprocesat"
 
diff --git a/po/ru.po b/po/ru.po
index 7659124..53bb489 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.1.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2016-11-16 17:17+0000\n"
+"PO-Revision-Date: 2016-11-18 15:44+0100\n"
 "Last-Translator: Ineiev <ineiev at gnu.org>\n"
 "Language-Team: Russian <gnupg-ru at gnupg.org>\n"
 "Language: ru\n"
@@ -751,6 +751,16 @@ msgstr "Внимание: небезопасный владелец %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Внимание: небезопасные права доступа %s \"%s\"\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for the agent to come up ... (%ds)\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "ожидаю подключения агента ... (%iс)\n"
+
+#, fuzzy, c-format
+#| msgid "error renaming '%s' to '%s': %s\n"
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "ошибка переименования '%s' в '%s': %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "да|yes"
@@ -5425,8 +5435,7 @@ msgstr "ошибка обновления базы данных TOFU: %s\n"
 #, c-format
 msgid ""
 "This is the first time the email address \"%s\" is being used with key %s."
-msgstr ""
-"Адрес электронной почты \"%s\" используется с ключом %s впервые."
+msgstr "Адрес электронной почты \"%s\" используется с ключом %s впервые."
 
 #, c-format
 msgid "The email address \"%s\" is associated with %d keys!"
@@ -5434,8 +5443,8 @@ msgstr "Адрес электронной почты \"%s\" связан с %d 
 
 msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
-" Поскольку правило "
-"привязки было 'автоматически', оно изменилось на 'спрашивать'."
+" Поскольку правило привязки было 'автоматически', оно изменилось на "
+"'спрашивать'."
 
 #, c-format
 msgid ""
@@ -5478,7 +5487,6 @@ msgid "this key"
 msgstr "этот ключ"
 
 #, c-format
-#| msgid "Verified %ld messages signed by \"%s\"."
 msgid "Verified %d message"
 msgid_plural "Verified %d messages"
 msgstr[0] "Проверено %d сообщение"
@@ -5502,9 +5510,9 @@ msgstr[2] " за %d прошедших дней."
 #, c-format
 msgid " over the past month."
 msgid_plural " over the past %d months."
-msgstr[0] " за %ld прошедший месяц."
-msgstr[1] " за %ld прошедших месяца."
-msgstr[2] " за %ld прошедших месяцев."
+msgstr[0] " за %d прошедший месяц."
+msgstr[1] " за %d прошедших месяца."
+msgstr[2] " за %d прошедших месяцев."
 
 #, c-format
 msgid " over the past year."
@@ -5611,12 +5619,9 @@ msgstr "Проверено %ld подписей"
 #, c-format
 msgid "Verified %ld signature in the past %s"
 msgid_plural "Verified %ld signatures in the past %s"
-msgstr[0] ""
-"Проверена %ld подпись за %s."
-msgstr[1] ""
-"Проверены %ld прописи за %s."
-msgstr[2] ""
-"Проверено %ld подписей за %s."
+msgstr[0] "Проверена %ld подпись за %s."
+msgstr[1] "Проверены %ld прописи за %s."
+msgstr[2] "Проверено %ld подписей за %s."
 
 #, c-format
 msgid ", and encrypted %ld messages"
@@ -5625,12 +5630,9 @@ msgstr ", зашифровано %ld сообщений"
 #, c-format
 msgid ", and encrypted %ld message in the past %s"
 msgid_plural ", and encrypted %ld messages in the past %s"
-msgstr[0] ""
-", зашифровано %ld сообщение за %s."
-msgstr[1] ""
-", зашифрованы %ld сообщения за %s."
-msgstr[2] ""
-", зашифровано %ld сообщений за %s."
+msgstr[0] ", зашифровано %ld сообщение за %s."
+msgstr[1] ", зашифрованы %ld сообщения за %s."
+msgstr[2] ", зашифровано %ld сообщений за %s."
 
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
@@ -5646,13 +5648,11 @@ msgstr ""
 
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
-"Внимание: мы до сих пор не зашифровали этим "
-"ключом ни одного сообщения!\n"
+"Внимание: мы до сих пор не зашифровали этим ключом ни одного сообщения!\n"
 
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
-"Внимание: мы до сих пор зашифровали этим "
-"ключом только одно сообщение!\n"
+"Внимание: мы до сих пор зашифровали этим ключом только одно сообщение!\n"
 
 #, c-format
 msgid ""
@@ -5668,8 +5668,8 @@ msgid_plural ""
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
-"Внимание: если вы видели другие сообщения, подписанные этим ключом, "
-"этот ключ может быть подделкой! Внимательно проверьте, не внесены ли в адрес "
+"Внимание: если вы видели другие сообщения, подписанные этим ключом, этот "
+"ключ может быть подделкой! Внимательно проверьте, не внесены ли в адрес "
 "электронной почты небольшие изменения. В случае подозрений пометьте ключ как "
 "некачественный командой\n"
 "  %s\n"
@@ -5693,12 +5693,14 @@ msgstr "ошибка при открытии базы данных TOFU: %s\n"
 #, c-format
 msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
 msgstr ""
-"ВНИМАНИЕ: Шифрование для ключа %s, у которого нет неотозванных идентификаторов пользователя.\n"
+"ВНИМАНИЕ: Шифрование для ключа %s, у которого нет неотозванных "
+"идентификаторов пользователя.\n"
 
 #, c-format
 msgid "error setting policy for key %s, user id \"%s\": %s"
 msgstr ""
-"ошибка установки правил для ключа %s с идентификатором пользователя \"%s\": %s"
+"ошибка установки правил для ключа %s с идентификатором пользователя \"%s\": "
+"%s"
 
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
@@ -7543,6 +7545,11 @@ msgstr "принудительная загрузка устаревших сп
 msgid "allow sending OCSP requests"
 msgstr "разрешить посылку запросов OCSP"
 
+#, fuzzy
+#| msgid "query the software version database"
+msgid "allow online software version check"
+msgstr "запросить базу данных версий программ"
+
 msgid "inhibit the use of HTTP"
 msgstr "запретить использование HTTP"
 
@@ -8033,10 +8040,6 @@ msgid "max_replies %d exceeded\n"
 msgstr "превышено max_replies %d\n"
 
 #, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "не могу создать временный каталог '%s': %s\n"
-
-#, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
 
@@ -8262,22 +8265,30 @@ msgstr "Список серверов LDAP"
 msgid "Configuration for OCSP"
 msgstr "Настройки OCSP"
 
-msgid "GPG for OpenPGP"
+#, fuzzy
+#| msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr "GPG для OpenPGP"
 
-msgid "GPG Agent"
-msgstr "Агент GPG"
+msgid "Private Keys"
+msgstr ""
 
-msgid "Smartcard Daemon"
+#, fuzzy
+#| msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr "Демон криптографических карт"
 
-msgid "GPG for S/MIME"
+#, fuzzy
+#| msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr "GPG для S/MIME"
 
-msgid "Key Acquirer"
-msgstr "Диспетчер ключей"
+msgid "Network"
+msgstr ""
 
-msgid "PIN and Passphrase Entry"
+#, fuzzy
+#| msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "Ввод PIN и фраз-паролей"
 
 msgid "Component not suitable for launching"
@@ -8402,6 +8413,10 @@ msgid "%s on %s failed with status %i\n"
 msgstr "сбой %s над %s, статус %i\n"
 
 #, c-format
+msgid "can't create temporary directory '%s': %s\n"
+msgstr "не могу создать временный каталог '%s': %s\n"
+
+#, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "невозможно открыть %s на запись: %s\n"
 
@@ -8494,3 +8509,9 @@ msgid ""
 msgstr ""
 "Синтаксис: gpg-check-pattern [параметры] файл_образцов\n"
 "Проверить фразу-пароль, поступающую из stdin, по файлу образцов\n"
+
+#~ msgid "GPG Agent"
+#~ msgstr "Агент GPG"
+
+#~ msgid "Key Acquirer"
+#~ msgstr "Диспетчер ключей"
diff --git a/po/sk.po b/po/sk.po
index 62b220e..c44b6c3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -155,14 +155,6 @@ msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "nenájdený zapisovateľný súbor tajných kľúčov (secring): %s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -318,6 +310,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "Kľúč je nahradený"
+
 msgid "verbose"
 msgstr "s dodatočnými informáciami"
 
@@ -734,9 +731,9 @@ msgstr "chyba pri vytváraní hesla: %s\n"
 msgid "error forking process: %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "aktualizácia zlyhala: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -751,13 +748,13 @@ msgid "error running '%s': terminated\n"
 msgstr "chyba pri čítaní `%s': %s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "aktualizácia zlyhala: %s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba pri zápise do súboru tajných kľúčov `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -779,6 +776,14 @@ msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpečne \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpečne \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "aktualizácia zlyhala: %s\n"
+
+#, fuzzy, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "ano"
@@ -2201,9 +2206,9 @@ msgstr "ukáž v ktorom súbore kľúčov je vypísaný kľúč"
 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 "valid values for option '%s':\n"
+msgstr "neplatný parameter pre import\n"
 
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2213,6 +2218,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "neplatný parameter pre import\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"
@@ -3012,6 +3021,10 @@ msgid "[self-signature]"
 msgstr "[podpis kľúča ním samým]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
+
+#, fuzzy, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "kľúč %08lX: nepodporovaný algoritmus verejného kľúča\n"
 
@@ -5063,6 +5076,21 @@ msgstr "Tento kľúč pravdepodobne patrí jeho majiteľovi\n"
 msgid "This key belongs to us\n"
 msgstr "Tento kľúč patrí nám (máme zodpovedajúci tajný kľúč)\n"
 
+#, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"NIE JE isté, že tento kľúč patrí osobe, ktorá sa vydáva za jeho\n"
+"vlastníka. Pokiaľ *skutočne* viete, čo robíte, môžete na otázku\n"
+"odpovedať áno\n"
+"\n"
+
 #, fuzzy
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
@@ -5728,27 +5756,31 @@ msgid "error updating TOFU database: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "vypísať zoznam kľúčov a id užívateľov"
 
 #, fuzzy, c-format
 #| msgid "Policy: "
@@ -5769,41 +5801,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "vypísať zoznam kľúčov"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|algo [súbory]|vypíš hash"
 msgstr[1] "|algo [súbory]|vypíš hash"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5819,6 +5857,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "chyba pri čítaní `%s': %s\n"
@@ -5866,50 +5914,56 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Zmazaných %d podpisov.\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|algo [súbory]|vypíš hash"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|algo [súbory]|vypíš hash"
+msgstr[1] "|algo [súbory]|vypíš hash"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "zašifrované s %lu heslami\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|algo [súbory]|vypíš hash"
+msgstr[1] "|algo [súbory]|vypíš hash"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5919,6 +5973,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "chyba pri zápise do súboru verejných kľúčov `%s': %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6164,22 +6227,24 @@ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľúčov: %s\n"
 
-#, fuzzy, c-format
-msgid "reading public key failed: %s\n"
-msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr ""
-
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "remove keys from the public keyring"
+msgid "response does not contain the EC public key\n"
+msgstr "odstrániť kľúč zo súboru verejných kľúčov"
+
+msgid "response does not contain the public key data\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "reading public key failed: %s\n"
+msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7810,6 +7875,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8083,10 +8151,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "chyba pri vytváraní súboru kľúčov (keyring)`%s': %s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
 
@@ -8560,23 +8624,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "chyba siete"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "nesprávne heslo"
 
 #, fuzzy
@@ -8619,6 +8685,11 @@ msgstr "neznáma položka konfigurácie \"%s\"\n"
 msgid "check global configuration file"
 msgstr "neznáma položka konfigurácie \"%s\"\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "aktualizovať databázu dôvery"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8799,6 +8870,20 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "nastaviť kľúč ako neplatný (disable)"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|algo [súbory]|vypíš hash"
+#~ msgstr[1] "|algo [súbory]|vypíš hash"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "problém v komunikácii s gpg-agentom\n"
 
@@ -8872,9 +8957,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "zistený 1 identifikátor užívateľa bez platného podpisu ním samým\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Zmazaných %d podpisov.\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Užívateľské ID \"%s\" je revokované."
@@ -8920,10 +9002,6 @@ msgstr ""
 #~ msgstr "1 zlý podpis\n"
 
 #, fuzzy
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
-
-#, fuzzy
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu kľúčov skontrolovaných (%lu podpisov)\n"
 
@@ -9851,9 +9929,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "nesprávne URI"
 
-#~ msgid "network error"
-#~ msgstr "chyba siete"
-
 #~ msgid "not processed"
 #~ msgstr "nespracované"
 
diff --git a/po/sv.po b/po/sv.po
index 27a591d..de350a1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -184,14 +184,6 @@ msgid "no suitable card key found: %s\n"
 msgstr "ingen lämplig kortnyckel hittades: %s\n"
 
 #, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "skuggning av nyckeln misslyckades: %s\n"
-
-#, c-format
-msgid "error writing key: %s\n"
-msgstr "fel vid skrivning av nyckel: %s\n"
-
-#, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
@@ -364,6 +356,11 @@ msgstr "kör i demonläge (bakgrund)"
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
+#, fuzzy
+#| msgid "run in server mode"
+msgid "run in supervised mode"
+msgstr "kör i serverläge"
+
 msgid "verbose"
 msgstr "utförlig"
 
@@ -813,9 +810,8 @@ msgstr "fel när ett rör skapades: %s\n"
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
 
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
-msgid "waiting for processes to terminate failed: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 
 #, fuzzy, c-format
@@ -833,14 +829,15 @@ msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 msgid "error running '%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for process %d to terminate failed: %s\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
+
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -862,6 +859,16 @@ msgstr "Varning: osäkert ägarskap på %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
 
+#, fuzzy, c-format
+#| msgid "waiting %d seconds for the agent to come up\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "väntar %d sekunder för att agenten ska komma igång\n"
+
+#, fuzzy, c-format
+#| msgid "renaming `%s' to `%s' failed: %s\n"
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "ja"
@@ -2276,10 +2283,10 @@ 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 "missing argument for option \"%.50s\"\n"
+msgid "valid values for option '%s':\n"
+msgstr "argument för flaggan \"%.50s\" saknas\n"
 
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
@@ -2290,6 +2297,11 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid value for option '%s'\n"
+msgstr "argument för flaggan \"%.50s\" saknas\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"
@@ -3105,6 +3117,11 @@ msgid "[self-signature]"
 msgstr "[självsignatur]"
 
 #, fuzzy, c-format
+#| msgid "error allocating enough memory: %s\n"
+msgid "error allocating memory: %s\n"
+msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
+
+#, fuzzy, c-format
 #| msgid "key %s: unsupported public key algorithm\n"
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
@@ -5166,6 +5183,25 @@ msgstr "Den här nyckel tillhör antagligen den namngivna användaren\n"
 msgid "This key belongs to us\n"
 msgstr "Denna nyckel tillhör oss\n"
 
+#, fuzzy, c-format
+#| msgid "root certificate has now been marked as trusted\n"
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr "rotcertifikatet har nu markerats som betrott\n"
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"Det är INTE säkert att nyckeln tillhör den namngivna personen i\n"
+"användaridentiteten. Om du *verkligen* vet vad du gör, kan du svara\n"
+"ja på nästkommande fråga.\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5863,19 +5899,21 @@ msgid "error updating TOFU database: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
@@ -5883,8 +5921,10 @@ msgstr ""
 msgid "error gathering other user IDs: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "lista nycklar och användaridentiteter"
 
 #, fuzzy, c-format
 #| msgid "validity: %s"
@@ -5906,42 +5946,48 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "lista nycklar"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "skriv ut kontrollsummor"
 msgstr[1] "skriv ut kontrollsummor"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5957,6 +6003,17 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing key: %s\n"
+msgid "resetting keydb: %s\n"
+msgstr "fel vid skrivning av nyckel: %s\n"
+
 #, fuzzy, c-format
 #| msgid "error storing flags: %s\n"
 msgid "error setting TOFU binding's trust level to %s\n"
@@ -6006,51 +6063,58 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Raderade %d signaturer.\n"
 
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "skriv ut kontrollsummor"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "skriv ut kontrollsummor"
+msgstr[1] "skriv ut kontrollsummor"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "krypterad med %lu lösenfraser\n"
+
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "skriv ut kontrollsummor"
+msgstr[1] "skriv ut kontrollsummor"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -6061,6 +6125,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6333,13 +6406,6 @@ msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "läsning av publik nyckel misslyckades: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "svaret innehåller inte publikt nyckeldata\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
@@ -6348,9 +6414,16 @@ msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
 #, fuzzy
 #| msgid "response does not contain the RSA public exponent\n"
-msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "svaret innehåller inte publikt nyckeldata\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "läsning av publik nyckel misslyckades: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "använder standard-PIN som %s\n"
@@ -8095,6 +8168,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8400,11 +8476,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "error allocating enough memory: %s\n"
-msgid "error allocating memory: %s\n"
-msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
-
-#, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error printing log line: %s\n"
 msgstr "fel vid skrivning till %s: %s\n"
@@ -8934,24 +9005,24 @@ msgstr "LDAP-serverlista"
 msgid "Configuration for OCSP"
 msgstr "Konfiguration för OCSP"
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
+msgid "Network"
 msgstr ""
 
 #, fuzzy
 #| msgid "Bad Passphrase"
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "Felaktig lösenfras"
 
 #, fuzzy
@@ -8996,6 +9067,11 @@ msgid "check global configuration file"
 msgstr "kontrollera global konfigurationsfil"
 
 #, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "uppdatera tillitsdatabasen"
+
+#, fuzzy
 #| msgid "list all components"
 msgid "reload all or a given component"
 msgstr "lista alla komponenter"
@@ -9188,6 +9264,21 @@ msgstr ""
 "Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
 "Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "skuggning av nyckeln misslyckades: %s\n"
+
+#, fuzzy
+#~| msgid "Available keys:\n"
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "Tillgängliga nycklar:\n"
+
+#, fuzzy
+#~| msgid "print message digests"
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "skriv ut kontrollsummor"
+#~ msgstr[1] "skriv ut kontrollsummor"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "kommunikationsproblem med gpg-agent\n"
 
@@ -9273,9 +9364,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "1 användaridentitet utan giltig självsignatur hittades\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Raderade %d signaturer.\n"
-
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
@@ -9319,11 +9407,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "1 felaktig signatur\n"
 
-#, fuzzy
-#~| msgid "renaming `%s' to `%s' failed: %s\n"
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu nycklar mellanlagrade (%lu signaturer)\n"
 
diff --git a/po/tr.po b/po/tr.po
index 14a4492..093de7a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -155,14 +155,6 @@ msgid "no suitable card key found: %s\n"
 msgstr "uygun bir kart anahtarı yok: %s\n"
 
 #, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "anahtar gölgelenemedi: %s\n"
-
-#, c-format
-msgid "error writing key: %s\n"
-msgstr "anahtarı yazarken hata: %s\n"
-
-#, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
@@ -334,6 +326,11 @@ msgstr "artalan süreci olarak çalışır"
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
+#, fuzzy
+#| msgid "run in server mode"
+msgid "run in supervised mode"
+msgstr "sunucu kipinde çalışır"
+
 msgid "verbose"
 msgstr "ayrıntılı"
 
@@ -778,9 +775,8 @@ msgstr "boru oluşturulurken hata: %s\n"
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
 
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
-msgid "waiting for processes to terminate failed: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
 #, fuzzy, c-format
@@ -798,14 +794,15 @@ msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 msgid "error running '%s': terminated\n"
 msgstr "`%s' çalışırken hata: sonlandırıldı\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for process %d to terminate failed: %s\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -826,6 +823,16 @@ msgstr "UYARI: %s üzerinde sahiplik güvensiz: \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for process %d to terminate failed: %s\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
+
+#, fuzzy, c-format
+#| msgid "renaming `%s' to `%s' failed: %s\n"
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "evet"
@@ -2215,9 +2222,10 @@ 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 "missing argument for option \"%.50s\"\n"
+msgid "valid values for option '%s':\n"
+msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
@@ -2228,6 +2236,11 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid value for option '%s'\n"
+msgstr "\"%.50s\" seçeneği için değiştirge eksik\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"
@@ -3037,6 +3050,11 @@ msgid "[self-signature]"
 msgstr "[öz-imza]"
 
 #, fuzzy, c-format
+#| msgid "error allocating enough memory: %s\n"
+msgid "error allocating memory: %s\n"
+msgstr "yeterli bellek ayrılırken hata: %s\n"
+
+#, fuzzy, c-format
 #| msgid "key %s: unsupported public key algorithm\n"
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
@@ -5109,6 +5127,25 @@ msgstr "Bu anahtarın ismi belirtilen şahsa ait olduğu umuluyor\n"
 msgid "This key belongs to us\n"
 msgstr "Bu anahtar bizim\n"
 
+#, fuzzy, c-format
+#| msgid "root certificate has now been marked as trusted\n"
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr "kök sertifika artık güvenilir olarak imlenmiş oldu\n"
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"Bu anahtarın kullanıcı kimliğinde ismi belirtilen şahsa ait\n"
+"olduğu kesin DEĞİL. *Gerçekten* ne yaptığınızı biliyorsanız,\n"
+"sonraki soruya da evet cevabı verebilirsiniz.\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5790,19 +5827,21 @@ msgid "error updating TOFU database: %s\n"
 msgstr "%s komutu gönderilirken hata: %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
@@ -5810,8 +5849,10 @@ msgstr ""
 msgid "error gathering other user IDs: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
 #, fuzzy, c-format
 #| msgid "validity: %s"
@@ -5833,42 +5874,48 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "anahtarları listeler"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "ileti özetlerini gösterir"
 msgstr[1] "ileti özetlerini gösterir"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5884,6 +5931,17 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing key: %s\n"
+msgid "resetting keydb: %s\n"
+msgstr "anahtarı yazarken hata: %s\n"
+
 #, fuzzy, c-format
 #| msgid "error storing flags: %s\n"
 msgid "error setting TOFU binding's trust level to %s\n"
@@ -5933,51 +5991,58 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "%d imza silindi.\n"
 
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "ileti özetlerini gösterir"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "ileti özetlerini gösterir"
+msgstr[1] "ileti özetlerini gösterir"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "%lu anahtar parolası ile şifrelenmiş\n"
+
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "ileti özetlerini gösterir"
+msgstr[1] "ileti özetlerini gösterir"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5988,6 +6053,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "%s komutu gönderilirken hata: %s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6243,13 +6317,6 @@ msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "genel anahtar okuması başarısız: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "yanıt genel anahtar verisi içermiyor\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
@@ -6258,9 +6325,16 @@ msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
 #, fuzzy
 #| msgid "response does not contain the RSA public exponent\n"
-msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "yanıt genel anahtar verisi içermiyor\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "genel anahtar okuması başarısız: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
@@ -8003,6 +8077,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr "PKA aramalarına izin verilir (DNS istekleri)"
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -8304,11 +8381,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-#| msgid "error allocating enough memory: %s\n"
-msgid "error allocating memory: %s\n"
-msgstr "yeterli bellek ayrılırken hata: %s\n"
-
-#, fuzzy, c-format
 #| msgid "error writing to %s: %s\n"
 msgid "error printing log line: %s\n"
 msgstr "%s yazılırken hata: %s\n"
@@ -8840,24 +8912,24 @@ msgstr "LDAP sunucu listesi"
 msgid "Configuration for OCSP"
 msgstr "OCSP için yapılandırma"
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
+msgid "Network"
 msgstr ""
 
 #, fuzzy
 #| msgid "Bad Passphrase"
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "Anahtar Parolası hatalı"
 
 #, fuzzy
@@ -8902,6 +8974,11 @@ msgid "check global configuration file"
 msgstr "küresel yapılandırma dosayasını sınar"
 
 #, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "güvence veritabanını günceller"
+
+#, fuzzy
 #| msgid "list all components"
 msgid "reload all or a given component"
 msgstr "tüm bileşenleri listeler"
@@ -9094,6 +9171,20 @@ msgstr ""
 "Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
 "karşılaştırır\n"
 
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "anahtar gölgelenemedi: %s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "anahtarı iptal eder"
+
+#, fuzzy
+#~| msgid "print message digests"
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "ileti özetlerini gösterir"
+#~ msgstr[1] "ileti özetlerini gösterir"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "gpg-agent ile haberleşme problemi\n"
 
@@ -9180,9 +9271,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "%d imza silindi.\n"
-
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 
@@ -9228,11 +9316,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "1 kötü imza\n"
 
-#, fuzzy
-#~| msgid "renaming `%s' to `%s' failed: %s\n"
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "%lu anahtar arabelleklendi (%lu imza)\n"
 
diff --git a/po/uk.po b/po/uk.po
index 864fa1c..65529e2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -152,14 +152,6 @@ msgid "no suitable card key found: %s\n"
 msgstr "не виявлено відповідних ключів картки: %s\n"
 
 #, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "помилка під час спроби хешування ключа: %s\n"
-
-#, c-format
-msgid "error writing key: %s\n"
-msgstr "помилка під час спроби запису ключа: %s\n"
-
-#, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
@@ -309,6 +301,11 @@ msgstr "запустити у режимі фонової служби (фоно
 msgid "run in server mode (foreground)"
 msgstr "запустити у режимі сервера (основному)"
 
+#, fuzzy
+#| msgid "run in server mode"
+msgid "run in supervised mode"
+msgstr "запустити у режимі сервера"
+
 msgid "verbose"
 msgstr "докладний режим"
 
@@ -715,8 +712,8 @@ msgid "error forking process: %s\n"
 msgstr "помилка під час спроби розгалужування процесу: %s\n"
 
 #, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "не вдалося дочекатися переривання процесу: %s\n"
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr "не вдалося дочекатися завершення процесу %d: %s\n"
 
 #, c-format
 msgid "error running '%s': probably not installed\n"
@@ -732,12 +729,12 @@ msgid "error running '%s': terminated\n"
 msgstr "помилка під час спроби виконання «%s»: виконання перервано\n"
 
 #, c-format
-msgid "error getting exit code of process %d: %s\n"
-msgstr "помилка під час спроби отримання коду виходу процесу %d: %s\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "не вдалося дочекатися переривання процесу: %s\n"
 
 #, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "не вдалося дочекатися завершення процесу %d: %s\n"
+msgid "error getting exit code of process %d: %s\n"
+msgstr "помилка під час спроби отримання коду виходу процесу %d: %s\n"
 
 #, c-format
 msgid "can't connect to '%s': %s\n"
@@ -758,6 +755,15 @@ msgstr "Увага: визначення власника не є безпечн
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Увага: визначення прав доступу не є безпечним для %s — «%s»\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for the agent to come up ... (%ds)\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "очікування на працездатність агента… (%d с)\n"
+
+#, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "спроба перейменування «%s» на «%s» зазнала невдачі: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "yes|так"
@@ -2071,8 +2077,10 @@ msgstr "показувати назву сховища ключів у спис
 msgid "show expiration dates during signature listings"
 msgstr "показувати дати завершення строків дії у списку підписів"
 
-msgid "available TOFU policies:\n"
-msgstr "можливі варіанти правил TOFU:\n"
+#, fuzzy, c-format
+#| msgid "invalid argument for option \"%.50s\"\n"
+msgid "valid values for option '%s':\n"
+msgstr "некоректний аргумент параметра «%.50s»\n"
 
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
@@ -2081,6 +2089,11 @@ msgstr "невідомі правила TOFU «%s»\n"
 msgid "(use \"help\" to list choices)\n"
 msgstr "(команда «help» виводить список можливих варіантів)\n"
 
+#, fuzzy, c-format
+#| msgid "invalid argument for option \"%.50s\"\n"
+msgid "invalid value for option '%s'\n"
+msgstr "некоректний аргумент параметра «%.50s»\n"
+
 #, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
@@ -2865,6 +2878,10 @@ msgid "[self-signature]"
 msgstr "[самопідпис]"
 
 #, c-format
+msgid "error allocating memory: %s\n"
+msgstr "помилка під час спроби отримання області пам’яті: %s\n"
+
+#, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr ""
 "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
@@ -4841,6 +4858,26 @@ msgstr "Ймовірно, цей ключ належить користувач
 msgid "This key belongs to us\n"
 msgstr "Цей ключ належить нам\n"
 
+#, fuzzy, c-format
+#| msgid "root certificate has now been marked as trusted\n"
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr "кореневий сертифікат було позначено як надійний\n"
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"Не можна з певністю вважати, що ключ належить особі,\n"
+"вказаній у ідентифікаторі користувача. Якщо вам *точно*\n"
+"відомі наслідки ваших дій, можете ствердно відповісти\n"
+"на наступне питання.\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5505,32 +5542,42 @@ msgstr "помилка під час спроби відкрити бази да
 msgid "error updating TOFU database: %s\n"
 msgstr "помилка під час спроби оновлення бази даних TOFU: %s\n"
 
-#, c-format
-msgid "The binding %s is NOT known."
-msgstr "Прив’язка %s є невідомою."
-
-#, c-format
+#, fuzzy, c-format
+#| msgid "The email address \"%s\" is associated with %d key:\n"
+#| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+"This is the first time the email address \"%s\" is being used with key %s."
+msgstr "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
+
+#, fuzzy, c-format
+#| msgid "The email address \"%s\" is associated with %d key:\n"
+#| msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr "Адресу електронної пошти «%s» пов’язано із %d ключем:\n"
+
+#, fuzzy
+#| msgid ""
+#| "The key with fingerprint %s raised a conflict with the binding %s.  Since "
+#| "this binding's policy was 'auto', it was changed to 'ask'."
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 "Ключ із відбитком %s конфліктує із прив’язкою %s. Оскільки правилами цієї "
 "прив’язки визначалося «автоматично», їх змінено на «запитувати»."
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
-"Будь ласка, вкажіть, чи вважаєте прив’язку %s%sчинною (ключ належить "
-"декларованому власнику) чи підробною (помилковою)."
 
 #, c-format
 msgid "error gathering other user IDs: %s\n"
 msgstr "помилка під час збирання інших ідентифікаторів користувачів: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr "Відомі ідентифікатори користувачів, пов’язані із цим ключем:\n"
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "показати список ключів та ідентифікаторів користувача"
 
 #, c-format
 msgid "policy: %s"
@@ -5552,44 +5599,60 @@ msgstr[2] "Адресу електронної пошти «%s» пов’яза
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Статистичні дані для ключів із адресою електронної пошти «%s»:\n"
 
+msgid ", "
+msgstr ""
+
 msgid "this key"
 msgstr "цей ключ"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] "%ld повідомлення підписано у майбутньому."
-msgstr[1] "%ld повідомлення підписано у майбутньому."
-msgstr[2] "%ld повідомлень підписано у майбутньому."
+#, fuzzy, c-format
+#| msgid "Verified %ld messages signed by \"%s\"."
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
+msgstr[0] "Перевірено %ld повідомлень, підписаних «%s»."
+msgstr[1] "Перевірено %ld повідомлень, підписаних «%s»."
+msgstr[2] "Перевірено %ld повідомлень, підписаних «%s»."
 
 #, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
-msgstr[0] "підписано %ld повідомлення"
-msgstr[1] "підписано %ld повідомлення"
-msgstr[2] "підписано %ld повідомлень"
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+#, fuzzy, c-format
+#| msgid " over the past %ld day."
+#| msgid_plural " over the past %ld days."
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] " протягом %ld попереднього дня."
 msgstr[1] " протягом %ld попередніх днів."
 msgstr[2] " протягом %ld попередніх днів."
 
-#, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
-msgstr[0] " протягом %ld попереднього тижня."
-msgstr[1] " протягом %ld попередніх тижнів."
-msgstr[2] " протягом %ld попередніх тижнів."
-
-#, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+#, fuzzy, c-format
+#| msgid " over the past %ld month."
+#| msgid_plural " over the past %ld months."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] " протягом %ld попереднього місяця."
 msgstr[1] " протягом %ld попередніх місяців."
 msgstr[2] " протягом %ld попередніх місяців."
 
+#, fuzzy, c-format
+#| msgid " over the past %ld day."
+#| msgid_plural " over the past %ld days."
+msgid " over the past year."
+msgid_plural " over the past %d years."
+msgstr[0] " протягом %ld попереднього дня."
+msgstr[1] " протягом %ld попередніх днів."
+msgstr[2] " протягом %ld попередніх днів."
+
+#, fuzzy
+#| msgid " over the past %ld day."
+#| msgid_plural " over the past %ld days."
+msgid " in the past."
+msgstr " протягом %ld попереднього дня."
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5613,6 +5676,17 @@ msgstr ""
 "(G)Добрий, (A)Прийняти одноразово, (U)Невідомий, (R)Відкинути одноразово, "
 "(B)Поганий? "
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing key: %s\n"
+msgid "resetting keydb: %s\n"
+msgstr "помилка під час спроби запису ключа: %s\n"
+
 #, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr ""
@@ -5667,28 +5741,23 @@ msgstr[1] "%d~секунди"
 msgstr[2] "%d~секунд"
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
-msgstr "Ніколи не перевірялося повідомлення, підписане ключем %s!\n"
-
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
+msgid "%s: "
 msgstr ""
-"Не вдалося зібрати статистичні дані щодо підписування для «%s»\n"
-"(ключ %s)\n"
 
-#, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "Перевірено %ld повідомлень, підписаних «%s»."
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "Вилучено %d підписів.\n"
 
-#, c-format
-msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
+#, fuzzy, c-format
+#| msgid ""
+#| "Verified %ld message signed by \"%s\"\n"
+#| "in the past %s."
+#| msgid_plural ""
+#| "Verified %ld messages signed by \"%s\"\n"
+#| "in the past %s."
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
 msgstr[0] ""
 "Перевірено %ld повідомлення, підписане «%s»,\n"
 "протягом такого строку: %s."
@@ -5699,27 +5768,75 @@ msgstr[2] ""
 "Перевірено %ld повідомлень, підписаних «%s»,\n"
 "протягом такого строку: %s."
 
-#, c-format
-msgid "The most recent message was verified %s ago."
-msgstr "Останнє повідомлення було перевірено %s тому."
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "зашифровано за допомогою %lu паролів\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "Verified %ld message signed by \"%s\"\n"
+#| "in the past %s."
+#| msgid_plural ""
+#| "Verified %ld messages signed by \"%s\"\n"
+#| "in the past %s."
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] ""
+"Перевірено %ld повідомлення, підписане «%s»,\n"
+"протягом такого строку: %s."
+msgstr[1] ""
+"Перевірено %ld повідомлення, підписаних «%s»,\n"
+"протягом такого строку: %s."
+msgstr[2] ""
+"Перевірено %ld повідомлень, підписаних «%s»,\n"
+"протягом такого строку: %s."
+
+#, fuzzy
+#| msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr "Попередження: повідомлень, які було б підписано цим ключем, не було!\n"
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+#, fuzzy
+#| msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
+msgstr "Попередження: цим ключем було підписано лише одне повідомлення!\n"
+
+#, fuzzy
+#| msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr "Попередження: повідомлень, які було б підписано цим ключем, не було!\n"
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+#, fuzzy
+#| msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr "Попередження: цим ключем було підписано лише одне повідомлення!\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Warning: if you think you've seen more than %ld message signed by this "
+#| "key, then this key might be a forgery!  Carefully examine the email "
+#| "address for small variations.  If the key is suspect, then use\n"
+#| "  %s\n"
+#| "to mark it as being bad.\n"
+#| msgid_plural ""
+#| "Warning: if you think you've seen more than %ld messages signed by this "
+#| "key, then this key might be a forgery!  Carefully examine the email "
+#| "address for small variations.  If the key is suspect, then use\n"
+#| "  %s\n"
+#| "to mark it as being bad.\n"
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5749,6 +5866,15 @@ msgid "error opening TOFU database: %s\n"
 msgstr "помилка під час спроби відкрити бази даних TOFU: %s\n"
 
 #, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring '%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
+
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "«%s» не є коректним довгим ідентифікатором ключа\n"
 
@@ -6004,22 +6130,24 @@ msgstr "не вдалося зберегти відбиток: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "не вдалося зберегти дату створення: %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "помилка читання відкритого ключа: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "відповідь не містить даних відкритого ключа\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "відповідь не містить основи числення RSA\n"
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr "відповідь не містить відкритого показника RSA\n"
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "відповідь не містить відкритої точки еліптичної кривої\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "відповідь не містить даних відкритого ключа\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "помилка читання відкритого ключа: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "використовуємо типовий пінкод як %s\n"
@@ -7602,6 +7730,9 @@ msgstr "примусове завантаження застарілих САС"
 msgid "allow sending OCSP requests"
 msgstr "дозволити надсилання запитів OCSP"
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr "заборонити використання HTTP"
 
@@ -7859,10 +7990,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr "«%s» є некоректною адресою LDAP\n"
 
 #, c-format
-msgid "error allocating memory: %s\n"
-msgstr "помилка під час спроби отримання області пам’яті: %s\n"
-
-#, c-format
 msgid "error printing log line: %s\n"
 msgstr "помилка під час спроби виводу рядка журналу: %s\n"
 
@@ -8318,22 +8445,30 @@ msgstr "список серверів LDAP"
 msgid "Configuration for OCSP"
 msgstr "Налаштування OCSP"
 
-msgid "GPG for OpenPGP"
+#, fuzzy
+#| msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr "GPG для OpenPGP"
 
-msgid "GPG Agent"
-msgstr "Агент GPG"
+msgid "Private Keys"
+msgstr ""
 
-msgid "Smartcard Daemon"
+#, fuzzy
+#| msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr "Фонова служба карток пам’яті"
 
-msgid "GPG for S/MIME"
+#, fuzzy
+#| msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr "GPG для S/MIME"
 
-msgid "Key Acquirer"
-msgstr "Засіб запиту ключів"
+msgid "Network"
+msgstr ""
 
-msgid "PIN and Passphrase Entry"
+#, fuzzy
+#| msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "Введення пінкодів і паролів"
 
 msgid "Component not suitable for launching"
@@ -8373,6 +8508,11 @@ msgstr "показати загальний файл налаштувань"
 msgid "check global configuration file"
 msgstr "перевірити загальний файл налаштувань"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "оновити базу даних довіри"
+
 msgid "reload all or a given component"
 msgstr "перезавантажити всі або вказаний компонент"
 
@@ -8552,6 +8692,62 @@ msgstr ""
 "Синтаксис: gpg-check-pattern [параметри] файл_шаблонів\n"
 "Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
 
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "помилка під час спроби хешування ключа: %s\n"
+
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "можливі варіанти правил TOFU:\n"
+
+#~ msgid "The binding %s is NOT known."
+#~ msgstr "Прив’язка %s є невідомою."
+
+#~ msgid ""
+#~ "Please indicate whether you believe the binding %s%sis legitimate (the "
+#~ "key belongs to the stated owner) or a forgery (bad)."
+#~ msgstr ""
+#~ "Будь ласка, вкажіть, чи вважаєте прив’язку %s%sчинною (ключ належить "
+#~ "декларованому власнику) чи підробною (помилковою)."
+
+#~ msgid "Known user IDs associated with this key:\n"
+#~ msgstr "Відомі ідентифікатори користувачів, пов’язані із цим ключем:\n"
+
+#~ msgid "%ld message signed in the future."
+#~ msgid_plural "%ld messages signed in the future."
+#~ msgstr[0] "%ld повідомлення підписано у майбутньому."
+#~ msgstr[1] "%ld повідомлення підписано у майбутньому."
+#~ msgstr[2] "%ld повідомлень підписано у майбутньому."
+
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "підписано %ld повідомлення"
+#~ msgstr[1] "підписано %ld повідомлення"
+#~ msgstr[2] "підписано %ld повідомлень"
+
+#~ msgid " over the past %ld week."
+#~ msgid_plural " over the past %ld weeks."
+#~ msgstr[0] " протягом %ld попереднього тижня."
+#~ msgstr[1] " протягом %ld попередніх тижнів."
+#~ msgstr[2] " протягом %ld попередніх тижнів."
+
+#~ msgid "Have never verified a message signed by key %s!\n"
+#~ msgstr "Ніколи не перевірялося повідомлення, підписане ключем %s!\n"
+
+#~ msgid ""
+#~ "Failed to collect signature statistics for \"%s\"\n"
+#~ "(key %s)\n"
+#~ msgstr ""
+#~ "Не вдалося зібрати статистичні дані щодо підписування для «%s»\n"
+#~ "(ключ %s)\n"
+
+#~ msgid "The most recent message was verified %s ago."
+#~ msgstr "Останнє повідомлення було перевірено %s тому."
+
+#~ msgid "GPG Agent"
+#~ msgstr "Агент GPG"
+
+#~ msgid "Key Acquirer"
+#~ msgstr "Засіб запиту ключів"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "проблема під час спроби обміну даними з gpg-agent\n"
 
@@ -8644,9 +8840,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "виявлено 1 ідентифікатор користувача без коректного самопідпису\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "Вилучено %d підписів.\n"
-
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
 
@@ -8687,9 +8880,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "1 добрий підпис\n"
 
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "спроба перейменування «%s» на «%s» зазнала невдачі: %s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "кешовано %lu ключів (%lu підписів)\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f153d7e..00025a9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -159,14 +159,6 @@ msgstr "取得当前密钥信息时出错:%s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "找不到可写的私钥钥匙环:%s\n"
 
-#, fuzzy, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "无法读出公钥:%s\n"
-
-#, fuzzy, c-format
-msgid "error writing key: %s\n"
-msgstr "写入钥匙环‘%s’时出错: %s\n"
-
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -328,6 +320,11 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
+#, fuzzy
+#| msgid "Key is superseded"
+msgid "run in supervised mode"
+msgstr "密钥被替换"
+
 msgid "verbose"
 msgstr "详细模式"
 
@@ -745,9 +742,9 @@ msgstr "生成密码的时候发生错误:%s\n"
 msgid "error forking process: %s\n"
 msgstr "读取‘%s’时出错:%s\n"
 
-#, fuzzy, c-format
-msgid "waiting for processes to terminate failed: %s\n"
-msgstr "更新失败:%s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -762,13 +759,13 @@ msgid "error running '%s': terminated\n"
 msgstr "读取‘%s’时出错:%s\n"
 
 #, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "更新失败:%s\n"
+
+#, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得当前密钥信息时出错:%s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 #| msgid "can't connect to `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -789,6 +786,15 @@ msgstr "警告:扩展模块‘%s’所有权不安全\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告:扩展模块‘%s’权限不安全\n"
 
+#, fuzzy, c-format
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "更新失败:%s\n"
+
+#, fuzzy, c-format
+#| msgid "renaming `%s' to `%s' failed: %s\n"
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "yes"
@@ -2171,9 +2177,9 @@ msgstr "列出密钥时显示钥匙环的名称"
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#, fuzzy
-msgid "available TOFU policies:\n"
-msgstr "禁用密钥"
+#, fuzzy, c-format
+msgid "valid values for option '%s':\n"
+msgstr "无效的列表选项\n"
 
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
@@ -2184,6 +2190,10 @@ msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
 #, fuzzy, c-format
+msgid "invalid value for option '%s'\n"
+msgstr "无效的列表选项\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"
@@ -2970,6 +2980,10 @@ msgid "[self-signature]"
 msgstr "[自身签名]"
 
 #, fuzzy, c-format
+msgid "error allocating memory: %s\n"
+msgstr "建立钥匙环‘%s’时发生错误:%s\n"
+
+#, fuzzy, c-format
 #| msgid "key %s: unsupported public key algorithm\n"
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr "密钥 %s:不支持的公钥算法\n"
@@ -4941,6 +4955,23 @@ msgstr "这把密钥有可能属于它所声称的持有者\n"
 msgid "This key belongs to us\n"
 msgstr "这把密钥是属于我们的\n"
 
+#, c-format
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr ""
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
+"己在做什么,您可以在下一个问题回答 yes。\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5583,19 +5614,21 @@ msgid "error updating TOFU database: %s\n"
 msgstr "读取‘%s’时出错:%s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
@@ -5603,8 +5636,10 @@ msgstr ""
 msgid "error gathering other user IDs: %s\n"
 msgstr "获取新 PIN 时出错:%s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "列出密钥和用户标识"
 
 #, fuzzy, c-format
 #| msgid "validity: %s"
@@ -5625,41 +5660,47 @@ msgstr[1] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "列出密钥"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-msgstr[1] ""
-
 #, fuzzy, c-format
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
 msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past year."
+msgid_plural " over the past %d years."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5675,6 +5716,16 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "resetting keydb: %s\n"
+msgstr "写入钥匙环‘%s’时出错: %s\n"
+
 #, fuzzy, c-format
 msgid "error setting TOFU binding's trust level to %s\n"
 msgstr "读取‘%s’时出错:%s\n"
@@ -5722,50 +5773,56 @@ msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "已经删除了 %d 个签名。\n"
 
 #, fuzzy, c-format
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "以 %lu 个密码加密\n"
+
+#, fuzzy, c-format
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
-msgstr[1] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5775,6 +5832,15 @@ msgstr[1] ""
 msgid "error opening TOFU database: %s\n"
 msgstr "读取‘%s’时出错:%s\n"
 
+#, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring `%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
+
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid long keyID\n"
 msgid "'%s' is not a valid long keyID\n"
@@ -6022,13 +6088,6 @@ msgstr "无法存储指纹:%s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "无法存储创建日期:%s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "无法读出公钥:%s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "响应未包含公钥数据\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
@@ -6037,9 +6096,16 @@ msgstr "响应未包含 RSA 公钥指数\n"
 
 #, fuzzy
 #| msgid "response does not contain the RSA public exponent\n"
-msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "响应未包含公钥数据\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "无法读出公钥:%s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
@@ -7671,6 +7737,9 @@ msgstr ""
 msgid "allow sending OCSP requests"
 msgstr ""
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr ""
 
@@ -7951,10 +8020,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating memory: %s\n"
-msgstr "建立钥匙环‘%s’时发生错误:%s\n"
-
-#, fuzzy, c-format
 msgid "error printing log line: %s\n"
 msgstr "写入钥匙环‘%s’时出错: %s\n"
 
@@ -8432,23 +8497,25 @@ msgstr ""
 msgid "Configuration for OCSP"
 msgstr ""
 
-msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr ""
 
-msgid "GPG Agent"
+msgid "Private Keys"
 msgstr ""
 
-msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr ""
 
-msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr ""
 
-msgid "Key Acquirer"
-msgstr ""
+#, fuzzy
+#| msgid "network error"
+msgid "Network"
+msgstr "网络错误"
 
 #, fuzzy
-msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "错误的密码"
 
 #, fuzzy
@@ -8491,6 +8558,11 @@ msgstr "未知的配置项‘%s’\n"
 msgid "check global configuration file"
 msgstr "未知的配置项‘%s’\n"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "更新信任度数据库"
+
 msgid "reload all or a given component"
 msgstr ""
 
@@ -8672,6 +8744,20 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "无法读出公钥:%s\n"
+
+#, fuzzy
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "禁用密钥"
+
+#, fuzzy
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+#~ msgstr[1] "|算法 [文件]|使用指定的散列算法打印报文散列值"
+
+#, fuzzy
 #~ msgid "canceled by user\n"
 #~ msgstr "用户取消\n"
 
@@ -8737,9 +8823,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "检测到 1 个没有有效自身签名的用户标识\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "已经删除了 %d 个签名。\n"
-
 #, fuzzy
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "密钥 %s:“%s”%d 个签名被清除\n"
@@ -8782,11 +8865,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "1 个损坏的签名\n"
 
-#, fuzzy
-#~| msgid "renaming `%s' to `%s' failed: %s\n"
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "缓存了 %lu 把密钥(%lu 份签名)\n"
 
@@ -9689,9 +9767,6 @@ msgstr ""
 #~ msgid "bad URI"
 #~ msgstr "URI 已损坏"
 
-#~ msgid "network error"
-#~ msgstr "网络错误"
-
 #~ msgid "not processed"
 #~ msgstr "未被处理"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 15677d7..e4a9afb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -159,14 +159,6 @@ msgid "no suitable card key found: %s\n"
 msgstr "找不到合適的卡片金鑰: %s\n"
 
 #, c-format
-msgid "shadowing the key failed: %s\n"
-msgstr "遮蔽金鑰時失敗: %s\n"
-
-#, c-format
-msgid "error writing key: %s\n"
-msgstr "寫入金鑰時出錯: %s\n"
-
-#, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
@@ -309,6 +301,11 @@ msgstr "以服務模式執行 (背景)"
 msgid "run in server mode (foreground)"
 msgstr "以伺服器模式執行 (前景)"
 
+#, fuzzy
+#| msgid "run in server mode"
+msgid "run in supervised mode"
+msgstr "以伺服器模式執行"
+
 msgid "verbose"
 msgstr "囉唆模式"
 
@@ -706,9 +703,8 @@ msgstr "建立管道串流時出錯: %s\n"
 msgid "error forking process: %s\n"
 msgstr "衍生執行程序時出錯: %s\n"
 
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
-msgid "waiting for processes to terminate failed: %s\n"
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "等候 %d 處理程序終止時失敗: %s\n"
 
 #, c-format
@@ -723,15 +719,16 @@ msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
 msgid "error running '%s': terminated\n"
 msgstr "執行 '%s' 時出錯: 已終止\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for process %d to terminate failed: %s\n"
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "等候 %d 處理程序終止時失敗: %s\n"
+
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
 
 #, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "等候 %d 處理程序終止時失敗: %s\n"
-
-#, c-format
 msgid "can't connect to '%s': %s\n"
 msgstr "無法連接至 '%s': %s\n"
 
@@ -750,6 +747,15 @@ msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 
+#, fuzzy, c-format
+#| msgid "waiting for the agent to come up ... (%ds)\n"
+msgid "waiting for file '%s' to become accessible ...\n"
+msgstr "正在等候代理程式出現 ... (%d 秒)\n"
+
+#, c-format
+msgid "renaming '%s' to '%s' failed: %s\n"
+msgstr "把 '%s' 重新新命成 '%s' 時失敗: %s\n"
+
 #. TRANSLATORS: See doc/TRANSLATE about this string.
 msgid "yes"
 msgstr "yes"
@@ -2039,10 +2045,10 @@ 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 "invalid argument for option \"%.50s\"\n"
+msgid "valid values for option '%s':\n"
+msgstr "選項 \"%.50s\" 的引數無效\n"
 
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
@@ -2052,6 +2058,11 @@ msgstr "未知的選項 '%s'\n"
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "invalid argument for option \"%.50s\"\n"
+msgid "invalid value for option '%s'\n"
+msgstr "選項 \"%.50s\" 的引數無效\n"
+
 #, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
@@ -2818,6 +2829,10 @@ msgstr "[撤銷]"
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "配置記憶體時出錯: %s\n"
+
 #, fuzzy, c-format
 #| msgid "key %s: unsupported public key algorithm\n"
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
@@ -4726,6 +4741,25 @@ msgstr "這把金鑰很可能屬於叫這個名字的使用者\n"
 msgid "This key belongs to us\n"
 msgstr "這把金鑰是屬於我們自己的\n"
 
+#, fuzzy, c-format
+#| msgid "root certificate has now been marked as trusted\n"
+msgid "%s: This key is bad!  It has been marked as untrusted!\n"
+msgstr "根憑證現在已標記為已信任\n"
+
+#, fuzzy
+#| msgid ""
+#| "It is NOT certain that the key belongs to the person named\n"
+#| "in the user ID.  If you *really* know what you are doing,\n"
+#| "you may answer the next question with yes.\n"
+msgid ""
+"This key has is bad!  It has been marked as untrusted!  If you\n"
+"*really* know what you are doing, you may answer the next\n"
+"question with yes.\n"
+msgstr ""
+"這把金鑰並 *不* 確定屬於使用者 ID 裡的那個人.\n"
+"除非你 **真的** 知道自己在做甚麼,\n"
+"否則你最好在下一個問題回答 no\n"
+
 msgid ""
 "It is NOT certain that the key belongs to the person named\n"
 "in the user ID.  If you *really* know what you are doing,\n"
@@ -5372,19 +5406,21 @@ msgid "error updating TOFU database: %s\n"
 msgstr "送出資料時出錯: %s\n"
 
 #, c-format
-msgid "The binding %s is NOT known."
+msgid ""
+"This is the first time the email address \"%s\" is being used with key %s."
 msgstr ""
 
 #, c-format
-msgid ""
-"The key with fingerprint %s raised a conflict with the binding %s.  Since "
-"this binding's policy was 'auto', it was changed to 'ask'."
+msgid "The email address \"%s\" is associated with %d keys!"
+msgstr ""
+
+msgid "  Since this binding's policy was 'auto', it has been changed to 'ask'."
 msgstr ""
 
 #, c-format
 msgid ""
-"Please indicate whether you believe the binding %s%sis legitimate (the key "
-"belongs to the stated owner) or a forgery (bad)."
+"Please indicate whether this email address should be associated with key %s "
+"or whether you think someone is impersonating \"%s\"."
 msgstr ""
 
 #, fuzzy, c-format
@@ -5392,8 +5428,10 @@ msgstr ""
 msgid "error gathering other user IDs: %s\n"
 msgstr "取得回應程式 ID 時出錯: %s\n"
 
-msgid "Known user IDs associated with this key:\n"
-msgstr ""
+#, fuzzy
+#| msgid "list key and user IDs"
+msgid "This key's user IDs:\n"
+msgstr "列出金鑰和使用者 ID"
 
 #, fuzzy, c-format
 #| msgid "validity: %s"
@@ -5414,37 +5452,43 @@ msgstr[0] ""
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
+msgid ", "
+msgstr ""
+
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "列出金鑰"
 
-#, c-format
-msgid "%ld message signed in the future."
-msgid_plural "%ld messages signed in the future."
-msgstr[0] ""
-
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "%ld message signed"
-msgid_plural "%ld messages signed"
+msgid "Verified %d message"
+msgid_plural "Verified %d messages"
 msgstr[0] "印出訊息摘要"
 
 #, c-format
-msgid " over the past %ld day."
-msgid_plural " over the past %ld days."
+msgid "Encrypted %d message"
+msgid_plural "Encrypted %d messages"
 msgstr[0] ""
 
 #, c-format
-msgid " over the past %ld week."
-msgid_plural " over the past %ld weeks."
+msgid " over the past day."
+msgid_plural " over the past %d days."
 msgstr[0] ""
 
 #, c-format
-msgid " over the past %ld month."
-msgid_plural " over the past %ld months."
+msgid " over the past month."
+msgid_plural " over the past %d months."
 msgstr[0] ""
 
+#, c-format
+msgid " over the past year."
+msgid_plural " over the past %d years."
+msgstr[0] ""
+
+msgid " in the past."
+msgstr ""
+
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
@@ -5460,6 +5504,17 @@ msgstr ""
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
+msgid "Defaulting to unknown."
+msgstr ""
+
+msgid "TOFU db corruption detected.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing key: %s\n"
+msgid "resetting keydb: %s\n"
+msgstr "寫入金鑰時出錯: %s\n"
+
 #, fuzzy, c-format
 #| msgid "error setting OCSP target: %s\n"
 msgid "error setting TOFU binding's trust level to %s\n"
@@ -5503,50 +5558,56 @@ msgid_plural "%d~seconds"
 msgstr[0] ""
 
 #, c-format
-msgid "Have never verified a message signed by key %s!\n"
+msgid "%s: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Failed to collect signature statistics for \"%s\"\n"
-"(key %s)\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Deleted %d signatures.\n"
+msgid "Verified %ld signatures"
+msgstr "已經刪除了 %d 份簽章.\n"
 
 #, fuzzy, c-format
 #| msgid "print message digests"
-msgid "Verified %ld messages signed by \"%s\"."
-msgstr "印出訊息摘要"
+msgid "Verified %ld signature in the past %s"
+msgid_plural "Verified %ld signatures in the past %s"
+msgstr[0] "印出訊息摘要"
+
+#, fuzzy, c-format
+#| msgid "encrypted with %lu passphrases\n"
+msgid ", and encrypted %ld messages"
+msgstr "已用 %lu 個密語加密了\n"
+
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid ", and encrypted %ld message in the past %s"
+msgid_plural ", and encrypted %ld messages in the past %s"
+msgstr[0] "印出訊息摘要"
 
-#, c-format
 msgid ""
-"Verified %ld message signed by \"%s\"\n"
-"in the past %s."
-msgid_plural ""
-"Verified %ld messages signed by \"%s\"\n"
-"in the past %s."
-msgstr[0] ""
+"Warning: we have yet to see a message signed using this key and user id!\n"
+msgstr ""
 
-#, c-format
-msgid "The most recent message was verified %s ago."
+msgid ""
+"Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-msgid "Warning: we've only seen a single message signed by this key!\n"
+msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"Warning: if you think you've seen more than %ld message signed by this key, "
+"Warning: if you think you've seen more signatures by this key and user id, "
 "then this key might be a forgery!  Carefully examine the email address for "
 "small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgid_plural ""
-"Warning: if you think you've seen more than %ld messages signed by this key, "
-"then this key might be a forgery!  Carefully examine the email address for "
-"small variations.  If the key is suspect, then use\n"
+"Warning: if you think you've seen more signatures by this key and these user "
+"ids, then this key might be a forgery!  Carefully examine the email "
+"addresses for small variations.  If the key is suspect, then use\n"
 "  %s\n"
 "to mark it as being bad.\n"
 msgstr[0] ""
@@ -5557,6 +5618,15 @@ msgid "error opening TOFU database: %s\n"
 msgstr "送出資料時出錯: %s\n"
 
 #, c-format
+msgid "WARNING: Encrypting to %s, which has nonon-revoked user ids.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "error writing public keyring '%s': %s\n"
+msgid "error setting policy for key %s, user id \"%s\": %s"
+msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
+
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "'%s' 不是有效的長式金鑰 ID\n"
 
@@ -5799,22 +5869,24 @@ msgstr "存放指紋失敗: %s\n"
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生日期失敗: %s\n"
 
-#, c-format
-msgid "reading public key failed: %s\n"
-msgstr "讀取公鑰時失敗: %s\n"
-
-msgid "response does not contain the public key data\n"
-msgstr "回應中未包含公鑰資料\n"
-
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-msgid "response does not contain the EC public point\n"
+#, fuzzy
+#| msgid "response does not contain the EC public point\n"
+msgid "response does not contain the EC public key\n"
 msgstr "回應中未包含 EC 公用指數\n"
 
+msgid "response does not contain the public key data\n"
+msgstr "回應中未包含公鑰資料\n"
+
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "讀取公鑰時失敗: %s\n"
+
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "以 %s 做為預設 PIN\n"
@@ -7346,6 +7418,9 @@ msgstr "強迫載入過時的 CRL"
 msgid "allow sending OCSP requests"
 msgstr "允許送出 OCSP 請求"
 
+msgid "allow online software version check"
+msgstr ""
+
 msgid "inhibit the use of HTTP"
 msgstr "避免使用 HTTP"
 
@@ -7600,10 +7675,6 @@ msgid "'%s' is an invalid LDAP URL\n"
 msgstr "'%s' 是無效的 LDAP 網址\n"
 
 #, c-format
-msgid "error allocating memory: %s\n"
-msgstr "配置記憶體時出錯: %s\n"
-
-#, c-format
 msgid "error printing log line: %s\n"
 msgstr "印出日誌記錄列時出錯: %s\n"
 
@@ -8060,22 +8131,30 @@ msgstr "LDAP 伺服器清單"
 msgid "Configuration for OCSP"
 msgstr "OCSP 組態"
 
-msgid "GPG for OpenPGP"
+#, fuzzy
+#| msgid "GPG for OpenPGP"
+msgid "OpenPGP"
 msgstr "OpenPGP 版 GPG"
 
-msgid "GPG Agent"
-msgstr "GPG Agent"
+msgid "Private Keys"
+msgstr ""
 
-msgid "Smartcard Daemon"
+#, fuzzy
+#| msgid "Smartcard Daemon"
+msgid "Smartcards"
 msgstr "智慧卡服務"
 
-msgid "GPG for S/MIME"
+#, fuzzy
+#| msgid "GPG for S/MIME"
+msgid "S/MIME"
 msgstr "S/MIME 版 GPG"
 
-msgid "Key Acquirer"
+msgid "Network"
 msgstr ""
 
-msgid "PIN and Passphrase Entry"
+#, fuzzy
+#| msgid "PIN and Passphrase Entry"
+msgid "Passphrase Entry"
 msgstr "個人識別碼及密語項目"
 
 msgid "Component not suitable for launching"
@@ -8115,6 +8194,11 @@ msgstr "列出全域組態檔"
 msgid "check global configuration file"
 msgstr "檢查全域組態檔案"
 
+#, fuzzy
+#| msgid "update the trust database"
+msgid "query the software version database"
+msgstr "更新信任資料庫"
+
 msgid "reload all or a given component"
 msgstr "重新載入所有或給定的元件"
 
@@ -8293,6 +8377,23 @@ msgstr ""
 "語法: gpg-check-pattern [選項] 樣式檔案\n"
 "用樣式檔案來檢查由標準輸入給定的密語\n"
 
+#~ msgid "shadowing the key failed: %s\n"
+#~ msgstr "遮蔽金鑰時失敗: %s\n"
+
+#, fuzzy
+#~| msgid "Available keys:\n"
+#~ msgid "available TOFU policies:\n"
+#~ msgstr "可用金鑰:\n"
+
+#, fuzzy
+#~| msgid "print message digests"
+#~ msgid "%ld message signed"
+#~ msgid_plural "%ld messages signed"
+#~ msgstr[0] "印出訊息摘要"
+
+#~ msgid "GPG Agent"
+#~ msgstr "GPG Agent"
+
 #~ msgid "communication problem with gpg-agent\n"
 #~ msgstr "與 gpg-agent 的溝通問題\n"
 
@@ -8375,9 +8476,6 @@ msgstr ""
 #~ msgid "1 user ID without valid self-signature detected\n"
 #~ msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 
-#~ msgid "Deleted %d signatures.\n"
-#~ msgstr "已經刪除了 %d 份簽章.\n"
-
 #~ msgid "User ID \"%s\": %d signatures removed\n"
 #~ msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
@@ -8418,9 +8516,6 @@ msgstr ""
 #~ msgid "1 good signature\n"
 #~ msgstr "1 份損壞的簽章\n"
 
-#~ msgid "renaming '%s' to '%s' failed: %s\n"
-#~ msgstr "把 '%s' 重新新命成 '%s' 時失敗: %s\n"
-
 #~ msgid "%lu keys cached (%lu signatures)\n"
 #~ msgstr "已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list