[Pkg-gnupg-commit] [gnupg2] 179/205: po: Auto-update

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed May 11 08:38:37 UTC 2016


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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 6bbab4d1135bd4b17dbf884c13a0706f57e8ff1e
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 4 11:38:47 2016 +0200

    po: Auto-update
    
    --
---
 po/ca.po    | 220 +++++++++++++++++++++++-------------
 po/cs.po    | 243 +++++++++++++++++++++++++++-------------
 po/da.po    | 229 ++++++++++++++++++++++++++------------
 po/el.po    | 220 +++++++++++++++++++++++-------------
 po/eo.po    | 217 +++++++++++++++++++++++-------------
 po/es.po    | 232 +++++++++++++++++++++++++-------------
 po/et.po    | 220 +++++++++++++++++++++++-------------
 po/fi.po    | 225 ++++++++++++++++++++++++-------------
 po/fr.po    | 229 ++++++++++++++++++++++++++------------
 po/gl.po    | 220 +++++++++++++++++++++++-------------
 po/hu.po    | 220 +++++++++++++++++++++++-------------
 po/id.po    | 220 +++++++++++++++++++++++-------------
 po/it.po    | 220 +++++++++++++++++++++++-------------
 po/ja.po    | 219 +++++++++++++++++++++++++-----------
 po/nb.po    | 215 +++++++++++++++++++++++-------------
 po/pl.po    | 243 +++++++++++++++++++++++++++-------------
 po/pt.po    | 220 +++++++++++++++++++++++-------------
 po/ro.po    | 227 +++++++++++++++++++++++++-------------
 po/ru.po    | 361 +++++++++++++++++++++++++++++++++++++++++-------------------
 po/sk.po    | 224 ++++++++++++++++++++++++-------------
 po/sv.po    | 230 ++++++++++++++++++++++++++------------
 po/tr.po    | 229 ++++++++++++++++++++++++++------------
 po/uk.po    | 247 ++++++++++++++++++++++++++++-------------
 po/zh_CN.po | 215 +++++++++++++++++++++++-------------
 po/zh_TW.po | 219 ++++++++++++++++++++++++------------
 25 files changed, 3871 insertions(+), 1893 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index e70ad36..0a64bc4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -405,7 +405,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -509,6 +509,10 @@ msgid "directory '%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
@@ -763,9 +767,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"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "ha fallat l'actualització: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -783,6 +787,10 @@ msgstr "error en la lectura de «%s»: %s\n"
 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"
@@ -803,6 +811,10 @@ msgstr "s'ha cancel·lat per l'usuari\n"
 msgid "problem with the agent\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
+
 # bolcats de memòria?  ivb
 #, c-format
 msgid "can't disable core dumps: %s\n"
@@ -862,6 +874,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error en crear l'anell «%s»: %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1161,10 +1177,6 @@ msgstr "no forçat"
 msgid "invalid option \"%.50s\"\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "heu trobat un bug... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
@@ -1271,6 +1283,11 @@ msgstr ""
 "hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha "
 "utilitzat un MTA amb errors\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "no llegible per humans"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1288,12 +1305,22 @@ msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notació no pot utilitzar cap caràcter de control\n"
 
+#, fuzzy
+msgid "a notation name may not contain an '=' character\n"
+msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
+"amb el signe «=»\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
 
-msgid "not human readable"
-msgstr "no llegible per humans"
-
 #, fuzzy, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "no s'ha pogut posar «%s» en la base de dades de confiança - %s\n"
@@ -1393,10 +1420,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "error en crear l'anell «%s»: %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -1737,14 +1760,14 @@ msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "no podeu usar %s mentre esteu en mode %s\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "no podeu usar %s mentre esteu en mode %s\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
@@ -2044,7 +2067,7 @@ msgstr "|algo [fitxers]|imprimeix resums de missatges"
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -3075,11 +3098,27 @@ msgid "[self-signature]"
 msgstr "[autosignatura]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d signatures errònies\n"
-msgstr[1] "%d signatures errònies\n"
+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"
+
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "signatura %s, algorisme de resum %s\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Signatura correcta de \""
+
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "es descarta «%s»: %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "L'ID d'usuari «%s» està revocat."
+msgstr[1] "L'ID d'usuari «%s» està revocat."
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -3089,18 +3128,23 @@ msgstr[0] "1 signatura no comprovada per falta de clau\n"
 msgstr[1] "1 signatura no comprovada per falta de clau\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 signatura no comprovada a causa d'un error\n"
-msgstr[1] "1 signatura no comprovada a causa d'un error\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d signatures errònies\n"
+msgstr[1] "%d signatures errònies\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "Han estat detectats %d IDs sense autosignatura vàlida\n"
-msgstr[1] "Han estat detectats %d IDs sense autosignatura vàlida\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Signatura correcta de \""
+msgstr[1] "Signatura correcta de \""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -3321,9 +3365,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "s'està posant la signatura al lloc correcte\n"
-
 msgid "save and quit"
 msgstr "desa i ix"
 
@@ -3616,6 +3657,11 @@ msgstr "error: l'empremta digital és invàlida\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "el valor no és vàlid\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4461,6 +4507,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d signatures errònies\n"
 msgstr[1] "%d signatures errònies\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 signatura no comprovada a causa d'un error\n"
+msgstr[1] "1 signatura no comprovada a causa d'un error\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5715,16 +5768,16 @@ msgstr ""
 msgid "trustdb transaction too large\n"
 msgstr "la transacció de la base de dades de confiança és massa gran\n"
 
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: el directori no existeix!\n"
+
 # No em passe! ;)  ivb
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
 #, c-format
-msgid "%s: directory does not exist!\n"
-msgstr "%s: el directori no existeix!\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: no s'ha pogut crear un registre de versió: %s"
 
@@ -5874,8 +5927,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5964,39 +6017,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6005,20 +6060,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6032,12 +6089,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8979,6 +9043,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "heu trobat un bug... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "Han estat detectats %d IDs sense autosignatura vàlida\n"
+#~ msgstr[1] "Han estat detectats %d IDs sense autosignatura vàlida\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "s'està posant la signatura al lloc correcte\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d signatures no comprovades per falta de clau\n"
 
@@ -9074,11 +9151,6 @@ msgstr ""
 #~ msgstr "no s'ha pogut obrir «%s»: %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "el valor no és vàlid\n"
-
-#, fuzzy
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
 
diff --git a/po/cs.po b/po/cs.po
index 6ebfe07..535f74c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -389,7 +389,9 @@ msgstr "nedovolit klientům označovat klíče za „důvěryhodné“"
 msgid "allow presetting passphrase"
 msgstr "umožnit přednastavení hesla"
 
-msgid "allow caller to override the pinentry"
+#, fuzzy
+#| msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr "umožnit volajícímu přebít pinentry"
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -478,6 +480,12 @@ msgstr "nelze vytvořit adresář „%s“: %s\n"
 msgid "directory '%s' created\n"
 msgstr "adresář „%s“ vytvořen\n"
 
+# TODO: i18n of first %s
+#, fuzzy, c-format
+#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "Varování: přístupová práva %s „%s“ nejsou bezpečná\n"
+
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "volání stat() na „%s“ selhalo: %s\n"
@@ -732,8 +740,9 @@ 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"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %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 "čekání na konec procesu %d se nezdařilo: %s\n"
 
 #, c-format
@@ -753,6 +762,10 @@ 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"
 
@@ -768,6 +781,11 @@ msgstr "zrušeno uživatelem\n"
 msgid "problem with the agent\n"
 msgstr "problém s agentem\n"
 
+#, fuzzy, c-format
+#| msgid "problem with the agent: %s\n"
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problém s agentem: %s\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nemohu vypnout vytváření core souborů: %s\n"
@@ -826,6 +844,10 @@ msgid "out of core while allocating %lu bytes"
 msgstr "při pokusu alokovat %lu bajtů došla paměť"
 
 #, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "chyba při alokování dostatečného množství paměti: %s\n"
+
+#, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: zastaralý parametr „%s“ – neúčinkuje\n"
 
@@ -1065,10 +1087,6 @@ msgid "invalid option \"%.50s\"\n"
 msgstr "neplatný parametr „%.50s“\n"
 
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "našli jste chybu… (%s:%d)\n"
-
-#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "převod z „%s“ na „%s“ není k dispozici\n"
 
@@ -1168,6 +1186,11 @@ msgstr ""
 "neplatný znak (quoted-printable) v ASCII kódování – pravděpodobně byl použit "
 "špatný MTA\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "není v přímo čitelném formátu"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1184,12 +1207,23 @@ msgstr "jméno uživatele nesmí obsahovat více než jeden znak „@“\n"
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nemůže obsahovat žádné kontrolní znaky\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr "jméno uživatele nesmí obsahovat více než jeden znak „@“\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"symbolické jméno smí obsahovat pouze písmena, číslice, tečky nebo podtržítka "
+"a musí končit znakem „=“\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROVÁNÍ: nalezen neplatný formát zápisu data\n"
 
-msgid "not human readable"
-msgstr "není v přímo čitelném formátu"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "předání dotazu %s klientovi se nezdařilo\n"
@@ -1276,10 +1310,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Chyba: URL je příliš dlouhé (limit je %d znaků).\n"
 
 #, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "chyba při alokování dostatečného množství paměti: %s\n"
-
-#, c-format
 msgid "error reading '%s': %s\n"
 msgstr "chyba při čtení „%s“: %s\n"
 
@@ -1595,14 +1625,14 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "použití %s není v módu %s dovoleno\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zašifrovaný pro: „%s“\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "použití %s není v módu %s dovoleno\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s zašifrovaná data\n"
 
@@ -1872,7 +1902,9 @@ msgstr "vypsat hash zprávy"
 msgid "run in server mode"
 msgstr "pracovat v režimu serveru"
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+#, fuzzy
+#| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 "|HODNOTA|nastavit TOFU politiku klíči (good [dobrý], unknown [neznámý], bad "
 "[špatný], ask [zeptat se], auto)"
@@ -2848,12 +2880,33 @@ msgid "[self-signature]"
 msgstr "[podpis klíče jím samým]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d špatných podpisů\n"
-msgstr[1] "%d špatných podpisů\n"
-msgstr[2] "%d špatných podpisů\n"
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "karta nepodporuje hashovací algoritmus %s\n"
+
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "Dobrý podpis od"
+
+#, fuzzy, c-format
+#| msgid "key %s: %s\n"
+msgid "key %s:\n"
+msgstr "klíč %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
+msgstr[1] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
+msgstr[2] "Uživatelské ID „%s“: %d podpisů odstraněno\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2864,23 +2917,26 @@ msgstr[1] "1 podpis neověřen, protože chybí klíč\n"
 msgstr[2] "1 podpis neověřen, protože chybí klíč\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 podpis neověřen, protože vznikla chyba\n"
-msgstr[1] "1 podpis neověřen, protože vznikla chyba\n"
-msgstr[2] "1 podpis neověřen, protože vznikla chyba\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d špatných podpisů\n"
+msgstr[1] "%d špatných podpisů\n"
+msgstr[2] "%d špatných podpisů\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] ""
-"objeveno %d identifikátorů uživatele bez platného podpisu jím samým\n"
-msgstr[1] ""
-"objeveno %d identifikátorů uživatele bez platného podpisu jím samým\n"
-msgstr[2] ""
-"objeveno %d identifikátorů uživatele bez platného podpisu jím samým\n"
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Dobrý podpis od"
+msgstr[1] "Dobrý podpis od"
+msgstr[2] "Dobrý podpis od"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3080,9 +3136,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "klíč %s: chyba při měnění hesla: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "přesunuji podpis klíče na správné místo\n"
-
 msgid "save and quit"
 msgstr "uložit a ukončit"
 
@@ -3328,6 +3381,11 @@ msgstr "„%s“ není otisk\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "„%s“ není primární otisk\n"
 
+#, fuzzy, c-format
+#| msgid "read error in '%s': %s\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "chyba při čtení v „%s“: %s\n"
+
 msgid "No matching user IDs."
 msgstr "Žádný identifikátor uživatele neodpovídá."
 
@@ -4115,6 +4173,14 @@ msgstr[1] "%d dobrých podpisů\n"
 msgstr[2] "%d dobrých podpisů\n"
 
 #, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 podpis neověřen, protože vznikla chyba\n"
+msgstr[1] "1 podpis neověřen, protože vznikla chyba\n"
+msgstr[2] "1 podpis neověřen, protože vznikla chyba\n"
+
+#, fuzzy, c-format
 #| msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5328,14 +5394,14 @@ msgid "trustdb transaction too large\n"
 msgstr "transakce s databází důvěry je příliš dlouhá\n"
 
 #, c-format
-msgid "can't access '%s': %s\n"
-msgstr "k „%s“ nelze přistoupit: %s\n"
-
-#, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adresář neexistuje!\n"
 
 #, c-format
+msgid "can't access '%s': %s\n"
+msgstr "k „%s“ nelze přistoupit: %s\n"
+
+#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodařilo se vytvořit záznam verze: %s"
 
@@ -5481,8 +5547,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5581,44 +5647,46 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "chyba při vytváření roury: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5628,20 +5696,23 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "vypsat hash zprávy"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5656,12 +5727,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -8454,6 +8532,23 @@ msgstr ""
 "Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
 "Prověří heslo zadané na vstupu proti souboru se vzory\n"
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "našli jste chybu… (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] ""
+#~ "objeveno %d identifikátorů uživatele bez platného podpisu jím samým\n"
+#~ msgstr[1] ""
+#~ "objeveno %d identifikátorů uživatele bez platného podpisu jím samým\n"
+#~ msgstr[2] ""
+#~ "objeveno %d identifikátorů uživatele bez platného podpisu jím samým\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "přesunuji podpis klíče na správné místo\n"
+
 #~ msgid "key specification '%s' is ambiguous\n"
 #~ msgstr "výběr klíče pomocí „%s“ není jednoznačné\n"
 
diff --git a/po/da.po b/po/da.po
index 4e2680a..7e6ff4b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -414,7 +414,7 @@ msgstr "tillad klienter at markere nøgler som »trusted« (troværdige)"
 msgid "allow presetting passphrase"
 msgstr "tillad forhåndsindstilling af adgangsfrase"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -519,6 +519,11 @@ msgid "directory '%s' created\n"
 msgstr "mappe »%s« oprettet\n"
 
 #, fuzzy, c-format
+#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
+
+#, fuzzy, c-format
 #| msgid "stat() failed for `%s': %s\n"
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() mislykkedes for »%s«: %s\n"
@@ -792,8 +797,9 @@ msgstr "fejl ved oprettelse af datakanal: %s\n"
 msgid "error forking process: %s\n"
 msgstr "fejl ved forgrening af proces: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %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 "ventning på at proces %d skulle terminere mislykkedes: %s\n"
 
 #, fuzzy, c-format
@@ -815,6 +821,10 @@ msgstr "fejl ved kørsel af »%s«: termineret\n"
 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"
@@ -832,6 +842,11 @@ msgstr "afbrudt af brugeren\n"
 msgid "problem with the agent\n"
 msgstr "problem med agenten\n"
 
+#, fuzzy, c-format
+#| msgid "problem with the agent: %s\n"
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problem med agenten: %s\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke slå kernedump fra: %s\n"
@@ -888,6 +903,10 @@ msgid "out of core while allocating %lu bytes"
 msgstr "ikke nok kerne under allokering af %lu byte"
 
 #, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "fejl ved allokering af nok hukommelse: %s\n"
+
+#, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: forældet indstilling »%s« - den har ingen effekt\n"
 
@@ -1138,10 +1157,6 @@ msgstr "uden for kerne\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "ugyldigt tilvalg »%.50s«\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "du fandt en fejl ... (%s:%d)\n"
-
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' not available\n"
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1246,6 +1261,11 @@ msgid ""
 msgstr ""
 "citeret udskrivingstegn i panser - måske på grund af en fejlbehæftet MTA\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "kan ikke læses af mennesker"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1262,12 +1282,23 @@ msgstr "et notationsnavn må ikke indeholde mere end et »@«-tegn\n"
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr "et notationsnavn må ikke indeholde mere end et »@«-tegn\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"et notationsnavn må kun have udskrivningstegn eller mellemrum og skal "
+"sluttes med et »=«\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "ADVARSEL: Ingen notationsdata fundet\n"
 
-msgid "not human readable"
-msgstr "kan ikke læses af mennesker"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "kunne ikke proxy %s-forespørgsel til klient\n"
@@ -1355,10 +1386,6 @@ msgstr "Adresse hvor offentlig nøgle skal hentes: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fejl: Adresse er for lang (begrænsningen er %d tegn).\n"
 
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "fejl ved allokering af nok hukommelse: %s\n"
-
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
@@ -1701,14 +1728,14 @@ msgstr ""
 "tvang for symmetrisk chiffer %s (%d) overtræder modtagerens præferencer\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "du kan ikke bruge %s i tilstanden %s\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: »%s«\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "du kan ikke bruge %s i tilstanden %s\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterede data\n"
 
@@ -1991,7 +2018,7 @@ msgstr "vis beskedsammendrag"
 msgid "run in server mode"
 msgstr "kør i servertilstand"
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -3011,11 +3038,32 @@ msgid "[self-signature]"
 msgstr "[egenunderskrift]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d ugyldige underskrifter\n"
-msgstr[1] "%d ugyldige underskrifter\n"
+#| 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"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
+
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "God underskrift fra"
+
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "udelod »%s«: %s\n"
+
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
+msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -3025,18 +3073,24 @@ msgstr[0] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n
 msgstr[1] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
-msgstr[1] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d ugyldige underskrifter\n"
+msgstr[1] "%d ugyldige underskrifter\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "%d bruger-id'er uden gyldige egenunderskrifter detekteret\n"
-msgstr[1] "%d bruger-id'er uden gyldige egenunderskrifter detekteret\n"
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "God underskrift fra"
+msgstr[1] "God underskrift fra"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3244,9 +3298,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "flytter en nøgleunderskrift til det korrekte sted\n"
-
 msgid "save and quit"
 msgstr "gem og afslut"
 
@@ -3516,6 +3567,11 @@ msgstr "ugyldig fingeraftryk"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "kunne ikke indhente fingeraftrykket\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "ugyldig værdi\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4341,6 +4397,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d ugyldige underskrifter\n"
 msgstr[1] "%d ugyldige underskrifter\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
+msgstr[1] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5577,16 +5640,16 @@ msgstr "trustdb rec %lu: skrivning mislykkedes (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transaktion for trustdb er for stor\n"
 
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: mappe findes ikke!\n"
+
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "kan ikke tilgå »%s«: %s\n"
 
 #, c-format
-msgid "%s: directory does not exist!\n"
-msgstr "%s: mappe findes ikke!\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: kunne ikke oprette versionspost: %s"
 
@@ -5734,8 +5797,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5828,39 +5891,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "fejl ved oprettelse af datakanal: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5869,20 +5934,23 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "vis beskedsammendrag"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5896,12 +5964,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8995,6 +9070,19 @@ msgstr ""
 "Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
 "Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "du fandt en fejl ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "%d bruger-id'er uden gyldige egenunderskrifter detekteret\n"
+#~ msgstr[1] "%d bruger-id'er uden gyldige egenunderskrifter detekteret\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "flytter en nøgleunderskrift til det korrekte sted\n"
+
 #, fuzzy
 #~| msgid "option \"%.50s\" is ambiguous\n"
 #~ msgid "key specification '%s' is ambiguous\n"
@@ -9097,11 +9185,6 @@ msgstr ""
 #~ msgstr "kan ikke åbne »%s«: %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "ugyldig værdi\n"
-
-#, fuzzy
 #~| msgid "error reading secret keyblock \"%s\": %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "fejl ved læsning af hemmelig nøgleblok »%s«: %s\n"
diff --git a/po/el.po b/po/el.po
index ed66200..d4316dd 100644
--- a/po/el.po
+++ b/po/el.po
@@ -381,7 +381,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -479,6 +479,10 @@ msgid "directory '%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
@@ -731,9 +735,9 @@ msgstr "
 msgid "error forking process: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "� ��������� �������: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -751,6 +755,10 @@ msgstr "
 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"
@@ -771,6 +779,10 @@ msgstr "
 msgid "problem with the agent\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "�������� ��������������� ��� core dump: %s\n"
@@ -827,6 +839,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "�������� ����������� ��� ����������� `%s': %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1103,10 +1119,6 @@ msgstr "
 msgid "invalid option \"%.50s\"\n"
 msgstr "�� ������� �������� ���������\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "������� ��� bug ... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "�������� �������: %s\n"
@@ -1210,6 +1222,11 @@ msgstr ""
 "�����������, �� ����������, ���������� ��� �������� - ���� ����� ����� "
 "������������� MTA\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "�� ����������"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1227,12 +1244,22 @@ msgstr "
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
+#, fuzzy
+msgid "a notation name may not contain an '=' character\n"
+msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
+"��� �� ����� �� ��� '='\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "�������������: �������� �� ������ �������� ���������\n"
 
-msgid "not human readable"
-msgstr "�� ����������"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1327,10 +1354,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "�������� ����������� ��� ����������� `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -1673,14 +1696,14 @@ msgstr ""
 "�������� ��� ���������\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
@@ -1974,7 +1997,7 @@ msgstr "|
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2989,11 +3012,27 @@ msgid "[self-signature]"
 msgstr "[����-��������]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d ����� ���������\n"
-msgstr[1] "%d ����� ���������\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
+
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s ��������, ���������� ��������� %s\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "���� �������� ��� \""
+
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "������������ `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "�� user ID \"%s\" ����������."
+msgstr[1] "�� user ID \"%s\" ����������."
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -3003,18 +3042,23 @@ msgstr[0] "1 
 msgstr[1] "1 �������� ��� ��������� ���� ������� ��������\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 �������� ��� ��������� ���� ���� ���������\n"
-msgstr[1] "1 �������� ��� ��������� ���� ���� ���������\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d ����� ���������\n"
+msgstr[1] "%d ����� ���������\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "%d user ID ������������ ����� ������� ����-���������\n"
-msgstr[1] "%d user ID ������������ ����� ������� ����-���������\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "���� �������� ��� \""
+msgstr[1] "���� �������� ��� \""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -3237,9 +3281,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "���������� ��������� �������� ��� ����� ����\n"
-
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
@@ -3522,6 +3563,11 @@ msgstr "
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "�� ������ ����\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4358,6 +4404,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d ����� ���������\n"
 msgstr[1] "%d ����� ���������\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 �������� ��� ��������� ���� ���� ���������\n"
+msgstr[1] "1 �������� ��� ��������� ���� ���� ���������\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5586,14 +5639,14 @@ msgstr "trustdb rec %lu: 
 msgid "trustdb transaction too large\n"
 msgstr "���� ������ ��������� trustdb\n"
 
-#, fuzzy, c-format
-msgid "can't access '%s': %s\n"
-msgstr "�������� ����������� ��� `%s': %s\n"
-
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: � ������� ��� �������!\n"
 
+#, fuzzy, c-format
+msgid "can't access '%s': %s\n"
+msgstr "�������� ����������� ��� `%s': %s\n"
+
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �������� ����������� ���� �������� �������: %s"
@@ -5739,8 +5792,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5829,39 +5882,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5870,20 +5925,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5897,12 +5954,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8795,6 +8859,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "������� ��� bug ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "%d user ID ������������ ����� ������� ����-���������\n"
+#~ msgstr[1] "%d user ID ������������ ����� ������� ����-���������\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "���������� ��������� �������� ��� ����� ����\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
@@ -8889,11 +8966,6 @@ msgstr ""
 #~ msgstr "�������� ��������� ��� `%s': %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "�� ������ ����\n"
-
-#, fuzzy
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
diff --git a/po/eo.po b/po/eo.po
index f6e30db..43b29a8 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -383,7 +383,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -479,6 +479,10 @@ msgid "directory '%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
@@ -731,9 +735,9 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "aktualigo malsukcesis: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -751,6 +755,10 @@ msgstr "eraro dum legado de '%s': %s\n"
 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"
@@ -771,6 +779,10 @@ msgstr "nuligita de uzanto\n"
 msgid "problem with the agent\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problemo kun agento: agento redonas 0x%lx\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
@@ -828,6 +840,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "eraro dum kreado de �losilaro '%s': %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1108,10 +1124,6 @@ msgstr "ne traktita"
 msgid "invalid option \"%.50s\"\n"
 msgstr "nevalida kiraso"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "vi trovis cimon ... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "enkirasigo malsukcesis: %s\n"
@@ -1215,6 +1227,11 @@ msgstr ""
 "quoted-printable-signo en kiraso - ver�ajne cima po�totransendilo estis "
 "uzata\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "ne homlegebla"
+
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1234,12 +1251,19 @@ msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
+#, fuzzy
+msgid "a notation name may not contain an '=' character\n"
+msgstr "notacia valoro ne povas enhavi stirsignojn\n"
+
+#, fuzzy
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
+"kaj fini per '='\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-msgid "not human readable"
-msgstr "ne homlegebla"
-
 #, fuzzy, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
@@ -1334,10 +1358,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "eraro dum kreado de �losilaro '%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -1672,13 +1692,13 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "Tiu komando ne eblas en la re�imo %s.\n"
-
-#, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
+#, fuzzy, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
@@ -1963,7 +1983,7 @@ msgstr "|metodo [dosieroj]|presi mesa
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2967,11 +2987,27 @@ msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d malbonaj subskriboj\n"
-msgstr[1] "%d malbonaj subskriboj\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
+
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s-subskribo de: %s\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Bona subskribo de \""
+
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "ignoris '%s': %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
+msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2981,18 +3017,23 @@ msgstr[0] "1 subskribo ne kontrolita pro manko de 
 msgstr[1] "1 subskribo ne kontrolita pro manko de �losilo\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 subskribo ne kontrolita pro eraro\n"
-msgstr[1] "1 subskribo ne kontrolita pro eraro\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d malbonaj subskriboj\n"
+msgstr[1] "%d malbonaj subskriboj\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
-msgstr[1] "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Bona subskribo de \""
+msgstr[1] "Bona subskribo de \""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -3229,9 +3270,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "movas �losilsubskribon al la �usta loko\n"
-
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
@@ -3512,6 +3550,11 @@ msgstr "%s: nevalida dosiero-versio %d\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "nevalida valoro\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4334,6 +4377,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d malbonaj subskriboj\n"
 msgstr[1] "%d malbonaj subskriboj\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 subskribo ne kontrolita pro eraro\n"
+msgstr[1] "1 subskribo ne kontrolita pro eraro\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5536,14 +5586,14 @@ msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "fido-datenaro-transakcio tro granda\n"
 
-#, fuzzy, c-format
-msgid "can't access '%s': %s\n"
-msgstr "ne povas fermi '%s': %s\n"
-
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
+#, fuzzy, c-format
+msgid "can't access '%s': %s\n"
+msgstr "ne povas fermi '%s': %s\n"
+
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: malsukcesis krei versiregistron: %s"
@@ -5688,8 +5738,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5778,39 +5828,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5819,20 +5871,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5846,12 +5900,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8741,6 +8802,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "vi trovis cimon ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
+#~ msgstr[1] "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "movas �losilsubskribon al la �usta loko\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
 
@@ -8834,11 +8908,6 @@ msgstr ""
 #~ msgstr "ne povas malfermi '%s': %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "nevalida valoro\n"
-
-#, fuzzy
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
diff --git a/po/es.po b/po/es.po
index d1915dc..09fc298 100644
--- a/po/es.po
+++ b/po/es.po
@@ -428,7 +428,7 @@ msgstr "permitir que los clientes marquen claves como \"fiables\""
 msgid "allow presetting passphrase"
 msgstr "permitir preestablecer frase contrase�a"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -535,6 +535,11 @@ msgid "directory '%s' created\n"
 msgstr "directorio `%s' creado\n"
 
 #, fuzzy, c-format
+#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
+
+#, fuzzy, c-format
 #| msgid "stat() failed for `%s': %s\n"
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() fall� para `%s': %s\n"
@@ -811,8 +816,9 @@ msgstr "error creando tuber
 msgid "error forking process: %s\n"
 msgstr "error bifurcando procesos: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %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 "fallo esperando que el proceso %d terminara: %s\n"
 
 #, fuzzy, c-format
@@ -834,6 +840,10 @@ msgstr "error ejecutando `%s': terminado\n"
 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"
@@ -851,6 +861,11 @@ msgstr "cancelado por el usuario\n"
 msgid "problem with the agent\n"
 msgstr "problema con el agente\n"
 
+#, fuzzy, c-format
+#| msgid "problem with the agent: %s\n"
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problema con el agente: %s\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los volcados de core: %s\n"
@@ -907,6 +922,10 @@ msgid "out of core while allocating %lu bytes"
 msgstr "error de memoria reservando %lu bytes"
 
 #, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error reservando memoria: %s\n"
+
+#, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: opci�n obsoleta \"%s\" - no tiene efecto\n"
 
@@ -1157,10 +1176,6 @@ msgstr "memoria desbordada\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "opci�n inv�lida \"%.50s\"\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "ha encontrado un error... (%s:%d)\n"
-
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' not available\n"
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1266,6 +1281,11 @@ msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
 "un MTA defectuoso\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "ilegible"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1282,12 +1302,23 @@ msgstr "un nombre de notaci
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr "un nombre de notaci�n no debe contener m�s de un caracter '@'\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
+"acabar con un '='\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
 
-msgid "not human readable"
-msgstr "ilegible"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "fallo al hacer la petici�n proxy %s al cliente\n"
@@ -1373,10 +1404,6 @@ msgstr "URL de donde recuperar la clave p
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
 
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "error reservando memoria: %s\n"
-
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
@@ -1720,14 +1747,14 @@ msgstr ""
 "del destinatario\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "no puede usar %s en modo %s\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "no puede usar %s en modo %s\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
@@ -2010,7 +2037,7 @@ msgstr "imprime res
 msgid "run in server mode"
 msgstr "ejecutar en modo servidor"
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -3040,11 +3067,32 @@ msgid "[self-signature]"
 msgstr "[autofirma]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d firmas incorrectas\n"
-msgstr[1] "%d firmas incorrectas\n"
+#| 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"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
+
+#, fuzzy
+#| msgid "revoke signatures"
+msgid " (reordered signatures follow)"
+msgstr "revoca firmas"
+
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "omitido \"%s\": %s\n"
+
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
+msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -3054,18 +3102,24 @@ msgstr[0] "1 firma no comprobada por falta de clave\n"
 msgstr[1] "1 firma no comprobada por falta de clave\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 firma no comprobada por causa de un error\n"
-msgstr[1] "1 firma no comprobada por causa de un error\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d firmas incorrectas\n"
+msgstr[1] "%d firmas incorrectas\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "Detectados %d identificadores de usuario sin autofirma v�lida\n"
-msgstr[1] "Detectados %d identificadores de usuario sin autofirma v�lida\n"
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Firma correcta de"
+msgstr[1] "Firma correcta de"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3264,9 +3318,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "moviendo la firma de la clave al lugar correcto\n"
-
 msgid "save and quit"
 msgstr "graba y sale"
 
@@ -3528,6 +3579,11 @@ msgstr "huella dactilar no v
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "fallo obteniendo huella digital\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "valor inv�lido\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4340,6 +4396,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d firmas incorrectas\n"
 msgstr[1] "%d firmas incorrectas\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 firma no comprobada por causa de un error\n"
+msgstr[1] "1 firma no comprobada por causa de un error\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5570,16 +5633,16 @@ msgstr ""
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
 
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: �el directorio no existe!\n"
+
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "no se puede acceder a `%s': %s\n"
 
 #, c-format
-msgid "%s: directory does not exist!\n"
-msgstr "%s: �el directorio no existe!\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: fallo en la creaci�n del registro de versi�n: %s"
 
@@ -5727,8 +5790,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5821,40 +5884,42 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "error creando tuber�a: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, fuzzy, c-format
 #| msgid "second"
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundo"
 
@@ -5863,20 +5928,23 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "imprime res�menes de mensaje"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5890,12 +5958,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -9036,6 +9111,19 @@ msgstr ""
 "Compara frase contrase�a dada en entrada est�ndar con un fichero de "
 "patrones\n"
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "ha encontrado un error... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "Detectados %d identificadores de usuario sin autofirma v�lida\n"
+#~ msgstr[1] "Detectados %d identificadores de usuario sin autofirma v�lida\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "moviendo la firma de la clave al lugar correcto\n"
+
 #, fuzzy
 #~| msgid "option \"%.50s\" is ambiguous\n"
 #~ msgid "key specification '%s' is ambiguous\n"
@@ -9148,11 +9236,6 @@ msgstr ""
 #~ msgstr "fallo abriendo `%s': %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "valor inv�lido\n"
-
-#, fuzzy
 #~| msgid "error reading secret keyblock \"%s\": %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
@@ -10530,9 +10613,6 @@ msgstr ""
 #~ msgid "revsig"
 #~ msgstr "revfir"
 
-#~ msgid "revoke signatures"
-#~ msgstr "revoca firmas"
-
 #~ msgid "revuid"
 #~ msgstr "revidu"
 
diff --git a/po/et.po b/po/et.po
index 49df7cc..ccd011b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -379,7 +379,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -477,6 +477,10 @@ msgid "directory '%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
@@ -729,9 +733,9 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "uuendamine eba�nnestus: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -749,6 +753,10 @@ msgstr "viga `%s' lugemisel: %s\n"
 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"
@@ -769,6 +777,10 @@ msgstr "katkestatud kasutaja poolt\n"
 msgid "problem with the agent\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "probleem agendiga: agent tagastas 0x%lx\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
@@ -825,6 +837,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1101,10 +1117,6 @@ msgstr "ei t
 msgid "invalid option \"%.50s\"\n"
 msgstr "vigased impordi v�tmed\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "te leidsite vea ... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "pakendamine eba�nnestus: %s\n"
@@ -1207,6 +1219,11 @@ msgid ""
 msgstr ""
 "kvooditud s�mbol pakendis - t�en�oliselt on kasutatud vigast MTA programmi\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "pole inimese poolt loetav"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1224,12 +1241,22 @@ msgstr "kasutaja noteerimise nimi peab sisaldama '@' m
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
+#, fuzzy
+msgid "a notation name may not contain an '=' character\n"
+msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
+"ning l�pus peab olema '='\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
-msgid "not human readable"
-msgstr "pole inimese poolt loetav"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1324,10 +1351,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -1666,14 +1689,14 @@ msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "%s ei ole moodis %s lubatud.\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "%s ei ole moodis %s lubatud.\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
@@ -1967,7 +1990,7 @@ msgstr "|algo [failid]|tr
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2968,11 +2991,27 @@ msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d halba allkirja\n"
-msgstr[1] "%d halba allkirja\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
+
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Korrektne allkiri kasutajalt \""
+
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "`%s' j�tsin vahele: %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Kasutaja ID \"%s\" on t�histatud."
+msgstr[1] "Kasutaja ID \"%s\" on t�histatud."
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2982,18 +3021,23 @@ msgstr[0] "1 allkiri j
 msgstr[1] "1 allkiri j�i testimata, kuna v�ti puudub\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 allkiri j�i vea t�ttu kontrollimata\n"
-msgstr[1] "1 allkiri j�i vea t�ttu kontrollimata\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d halba allkirja\n"
+msgstr[1] "%d halba allkirja\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
-msgstr[1] "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Korrektne allkiri kasutajalt \""
+msgstr[1] "Korrektne allkiri kasutajalt \""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -3214,9 +3258,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "t�stan v�tme allkirja �igesse kohta\n"
-
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
@@ -3495,6 +3536,11 @@ msgstr "viga: vigane s
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "vigane v��rtus\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4311,6 +4357,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d halba allkirja\n"
 msgstr[1] "%d halba allkirja\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 allkiri j�i vea t�ttu kontrollimata\n"
+msgstr[1] "1 allkiri j�i vea t�ttu kontrollimata\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5511,14 +5564,14 @@ msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaktsioon on liiga suur\n"
 
-#, fuzzy, c-format
-msgid "can't access '%s': %s\n"
-msgstr "`%s' ei �nnestu sulgeda: %s\n"
-
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
+#, fuzzy, c-format
+msgid "can't access '%s': %s\n"
+msgstr "`%s' ei �nnestu sulgeda: %s\n"
+
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versioonikirje loomine ei �nnestu: %s"
@@ -5664,8 +5717,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5754,39 +5807,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5795,20 +5850,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5822,12 +5879,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8712,6 +8776,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "te leidsite vea ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
+#~ msgstr[1] "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "t�stan v�tme allkirja �igesse kohta\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
 
@@ -8803,11 +8880,6 @@ msgstr ""
 #~ msgstr "`%s' ei �nnestu avada: %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "vigane v��rtus\n"
-
-#, fuzzy
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
diff --git a/po/fi.po b/po/fi.po
index 681d891..48b8b2e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -395,7 +395,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -494,6 +494,10 @@ msgid "directory '%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
@@ -746,9 +750,9 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "päivitys epäonnistui: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -766,6 +770,10 @@ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 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"
@@ -786,6 +794,10 @@ msgstr "käyttäjän peruma\n"
 msgid "problem with the agent\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-tiedostojen luontia ei voi estää: %s\n"
@@ -842,6 +854,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1118,10 +1134,6 @@ msgstr "ei käsitelty"
 msgid "invalid option \"%.50s\"\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@ -1226,6 +1238,11 @@ msgstr ""
 "viallista\n"
 "MTA:ta on käytetty\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "ei ihmisten luettavissa"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1243,12 +1260,22 @@ msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
+#, fuzzy
+msgid "a notation name may not contain an '=' character\n"
+msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
+"välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
 
-msgid "not human readable"
-msgstr "ei ihmisten luettavissa"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1343,10 +1370,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -1682,14 +1705,14 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
@@ -1982,7 +2005,7 @@ msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2987,11 +3010,28 @@ msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d väärää allekirjoitusta\n"
-msgstr[1] "%d väärää allekirjoitusta\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
+
+# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Allekirjoitus täsmää lähettäjään \""
+
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "ohitetaan \"%s\": %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
+msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -3001,20 +3041,23 @@ msgstr[0] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 msgstr[1] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
-msgstr[1] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d väärää allekirjoitusta\n"
+msgstr[1] "%d väärää allekirjoitusta\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] ""
-"havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
-msgstr[1] ""
-"havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Allekirjoitus täsmää lähettäjään \""
+msgstr[1] "Allekirjoitus täsmää lähettäjään \""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -3236,9 +3279,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
-
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
@@ -3517,6 +3557,11 @@ msgstr "virhe: sormenjälki on väärä\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "arvo ei kelpaa\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4343,6 +4388,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d väärää allekirjoitusta\n"
 msgstr[1] "%d väärää allekirjoitusta\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
+msgstr[1] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5570,14 +5622,14 @@ msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "trustdb-tapahtuma on liian suuri\n"
 
-#, fuzzy, c-format
-msgid "can't access '%s': %s\n"
-msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
-
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: hakemistoa ei ole olemassa!\n"
 
+#, fuzzy, c-format
+msgid "can't access '%s': %s\n"
+msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
+
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versiotietueen luonti epäonnistui: %s"
@@ -5723,8 +5775,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5813,39 +5865,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5854,20 +5908,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5881,12 +5937,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8776,6 +8839,21 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "olet löytänyt ohjelmistovian ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] ""
+#~ "havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
+#~ msgstr[1] ""
+#~ "havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr ""
 #~ "%d allekirjoitusta jätetty tarkistamatta puuttuvien avainten vuoksi\n"
@@ -8871,11 +8949,6 @@ msgstr ""
 #~ msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "arvo ei kelpaa\n"
-
-#, fuzzy
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
diff --git a/po/fr.po b/po/fr.po
index b5fce4f..33eea36 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -386,7 +386,7 @@ msgstr "ne pas marquer les clefs comme de confiance"
 msgid "allow presetting passphrase"
 msgstr "permettre de préconfigurer la phrase secrète"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -477,6 +477,11 @@ msgstr "impossible de créer le répertoire « %s » : %s\n"
 msgid "directory '%s' created\n"
 msgstr "répertoire « %s » créé\n"
 
+#, fuzzy, c-format
+#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
+
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "échec de stat() pour « %s » : %s\n"
@@ -743,8 +748,9 @@ 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"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %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 "échec d'attente de fin du processus %d : %s\n"
 
 #, c-format
@@ -764,6 +770,10 @@ 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"
 
@@ -779,6 +789,11 @@ msgstr "annulé par l'utilisateur\n"
 msgid "problem with the agent\n"
 msgstr "problème avec l'agent\n"
 
+#, fuzzy, c-format
+#| msgid "problem with the agent: %s\n"
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problème avec l'agent : %s\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'empêcher la génération de fichiers « core » : %s\n"
@@ -835,6 +850,10 @@ msgid "out of core while allocating %lu bytes"
 msgstr "hors limite lors de l'allocation de %lu octets"
 
 #, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erreur d'allocation de suffisamment de mémoire : %s\n"
+
+#, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s : %u : option « %s » obsolète — non prise en compte\n"
 
@@ -1076,10 +1095,6 @@ msgid "invalid option \"%.50s\"\n"
 msgstr "option « %.50s » incorrecte\n"
 
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "vous avez trouvé un bogue… (%s : %d)\n"
-
-#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "conversion de « %s » vers « %s » non disponible\n"
 
@@ -1179,6 +1194,11 @@ msgstr ""
 "caractère Quoted-Printable dans l'armure provenant sans\n"
 "doute d'un serveur de courriers électroniques défectueux\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "non lisible par l'utilisateur"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1195,12 +1215,23 @@ msgstr "un nom de notation ne doit pas contenir plus d'un caractère « @ »\n
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr "un nom de notation ne doit pas contenir plus d'un caractère « @ »\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"un nom de notation ne doit contenir que des caractères imprimables ou des "
+"espaces, et se terminer avec « = »\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "Attention : des données de notation incorrectes ont été trouvées.\n"
 
-msgid "not human readable"
-msgstr "non lisible par l'utilisateur"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "échec de transfert de la demande %s au client\n"
@@ -1287,10 +1318,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Erreur : URL trop longue (limitée à %d caractères).\n"
 
 #, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "erreur d'allocation de suffisamment de mémoire : %s\n"
-
-#, c-format
 msgid "error reading '%s': %s\n"
 msgstr "erreur de lecture de « %s » : %s\n"
 
@@ -1620,14 +1647,14 @@ msgstr ""
 "avec les préférences du destinataire\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "impossible d'utiliser %s en mode %s.\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffré pour : « %s »\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "impossible d'utiliser %s en mode %s.\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "données chiffrées avec %s\n"
 
@@ -1904,7 +1931,7 @@ msgstr "indiquer les fonctions de hachage"
 msgid "run in server mode"
 msgstr "exécuter en mode serveur"
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2903,11 +2930,32 @@ msgid "[self-signature]"
 msgstr "[autosignature]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d mauvaises signatures\n"
-msgstr[1] "%d mauvaises signatures\n"
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "clef %s : algorithme à clef publique non pris en charge\n"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
+
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "Bonne signature de"
+
+#, fuzzy, c-format
+#| msgid "key %s: %s\n"
+msgid "key %s:\n"
+msgstr "clef %s : %s\n"
+
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Identité « %s » : %d signature supprimée\n"
+msgstr[1] "Identité « %s » : %d signature supprimée\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2917,18 +2965,24 @@ msgstr[0] "1 signature non vérifiée à cause d'une clef manquante\n"
 msgstr[1] "1 signature non vérifiée à cause d'une clef manquante\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 signature non vérifiée à cause d'une erreur\n"
-msgstr[1] "1 signature non vérifiée à cause d'une erreur\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d mauvaises signatures\n"
+msgstr[1] "%d mauvaises signatures\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "%d identités sans autosignature valable détecté\n"
-msgstr[1] "%d identités sans autosignature valable détecté\n"
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Bonne signature de"
+msgstr[1] "Bonne signature de"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3126,9 +3180,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "clef %s : erreur de modification de la phrase secrète : %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "déplacement d'une signature de clef au bon endroit\n"
-
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
@@ -3388,6 +3439,11 @@ msgstr "« %s » n’est pas une empreinte\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "« %s » n’est pas l’empreinte principale\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "valeur incorrecte\n"
+
 msgid "No matching user IDs."
 msgstr "Pas d’identités correspondantes."
 
@@ -4201,6 +4257,13 @@ msgstr[0] "%d mauvaises signatures\n"
 msgstr[1] "%d mauvaises signatures\n"
 
 #, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 signature non vérifiée à cause d'une erreur\n"
+msgstr[1] "1 signature non vérifiée à cause d'une erreur\n"
+
+#, fuzzy, c-format
 #| msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5467,14 +5530,14 @@ msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop grande\n"
 
 #, c-format
-msgid "can't access '%s': %s\n"
-msgstr "impossible d'accéder à « %s » : %s\n"
-
-#, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s : le répertoire n'existe pas.\n"
 
 #, c-format
+msgid "can't access '%s': %s\n"
+msgstr "impossible d'accéder à « %s » : %s\n"
+
+#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s : impossible de créer un enregistrement de version : %s"
 
@@ -5620,8 +5683,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5714,39 +5777,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "erreur de création d'un tube : %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5755,20 +5820,23 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "indiquer les fonctions de hachage"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5782,12 +5850,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8697,6 +8772,19 @@ msgstr ""
 "Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
 "ficmotif\n"
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "vous avez trouvé un bogue… (%s : %d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "%d identités sans autosignature valable détecté\n"
+#~ msgstr[1] "%d identités sans autosignature valable détecté\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "déplacement d'une signature de clef au bon endroit\n"
+
 #, fuzzy
 #~| msgid "option \"%.50s\" is ambiguous\n"
 #~ msgid "key specification '%s' is ambiguous\n"
@@ -8799,11 +8887,6 @@ msgstr ""
 #~ msgstr "échec d'ouverture de « %s » : %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "valeur incorrecte\n"
-
-#, fuzzy
 #~| msgid "error reading secret keyblock \"%s\": %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "erreur de lecture du bloc de clef secrète « %s » : %s\n"
diff --git a/po/gl.po b/po/gl.po
index 49ba220..7ea0c18 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -381,7 +381,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -481,6 +481,10 @@ msgid "directory '%s' created\n"
 msgstr "%s: directorio creado\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
@@ -733,9 +737,9 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "a actualizaci�n fallou: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -753,6 +757,10 @@ msgstr "erro lendo `%s': %s\n"
 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"
@@ -773,6 +781,10 @@ msgstr "cancelado polo usuario\n"
 msgid "problem with the agent\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
@@ -829,6 +841,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erro ao crea-lo chaveiro `%s': %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1109,10 +1125,6 @@ msgstr "non procesado"
 msgid "invalid option \"%.50s\"\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "atopou un erro ... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "non se puido po�e-la armadura: %s\n"
@@ -1216,6 +1228,11 @@ msgstr ""
 "car�cter quoted-printable na armadura - seguramente empregouse un MTA con "
 "erros\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "non lexible por humanos"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1233,12 +1250,22 @@ msgstr "un nome de notaci
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
 
+#, fuzzy
+msgid "a notation name may not contain an '=' character\n"
+msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
+"rematar en '='\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
 
-msgid "not human readable"
-msgstr "non lexible por humanos"
-
 #, fuzzy, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "erro ao p�r '%s' na base de datos de confianza: %s\n"
@@ -1333,10 +1360,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "erro ao crea-lo chaveiro `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -1677,14 +1700,14 @@ msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "non se pode empregar %s no modo %s\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "non se pode empregar %s no modo %s\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
@@ -1975,7 +1998,7 @@ msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2989,11 +3012,27 @@ msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d sinaturas err�neas\n"
-msgstr[1] "%d sinaturas err�neas\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
+
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "Sinatura %s, algoritmo de resumo %s\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Sinatura correcta de \""
+
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "om�tese `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "O ID de usuario \"%s\" est� revocado."
+msgstr[1] "O ID de usuario \"%s\" est� revocado."
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -3003,18 +3042,23 @@ msgstr[0] "1 sinatura non verificada debido a unha chave que falta\n"
 msgstr[1] "1 sinatura non verificada debido a unha chave que falta\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 sinatura non verificada debido a un erro\n"
-msgstr[1] "1 sinatura non verificada debido a un erro\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d sinaturas err�neas\n"
+msgstr[1] "%d sinaturas err�neas\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
-msgstr[1] "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Sinatura correcta de \""
+msgstr[1] "Sinatura correcta de \""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -3232,9 +3276,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "movendo a sinatura dunha chave � seu sitio\n"
-
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
@@ -3521,6 +3562,11 @@ msgstr "erro: pegada dactilar non v
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "valor non v�lido\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4356,6 +4402,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d sinaturas err�neas\n"
 msgstr[1] "%d sinaturas err�neas\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 sinatura non verificada debido a un erro\n"
+msgstr[1] "1 sinatura non verificada debido a un erro\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5575,14 +5628,14 @@ msgstr ""
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n da base de datos de confianza demasiado grande\n"
 
-#, fuzzy, c-format
-msgid "can't access '%s': %s\n"
-msgstr "non se pode pechar `%s': %s\n"
-
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �o directorio non existe!\n"
 
+#, fuzzy, c-format
+msgid "can't access '%s': %s\n"
+msgstr "non se pode pechar `%s': %s\n"
+
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: non se puido crea-lo rexistro de versi�n: %s"
@@ -5728,8 +5781,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5818,39 +5871,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5859,20 +5914,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5886,12 +5943,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8801,6 +8865,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "atopou un erro ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
+#~ msgstr[1] "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "movendo a sinatura dunha chave � seu sitio\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d sinaturas non verificadas debido a chaves que faltan\n"
 
@@ -8894,11 +8971,6 @@ msgstr ""
 #~ msgstr "non se puido abrir `%s': %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "valor non v�lido\n"
-
-#, fuzzy
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
diff --git a/po/hu.po b/po/hu.po
index 20846d2..539aa00 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -379,7 +379,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -477,6 +477,10 @@ msgid "directory '%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
@@ -729,9 +733,9 @@ msgstr "Hiba a jelsz
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "Friss�t�s sikertelen: %s.\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -749,6 +753,10 @@ msgstr "Hiba \"%s\" olvas
 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"
@@ -769,6 +777,10 @@ msgstr "A felhaszn
 msgid "problem with the agent\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
@@ -825,6 +837,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1101,10 +1117,6 @@ msgstr "nem feldolgozott"
 msgid "invalid option \"%.50s\"\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
@@ -1207,6 +1219,11 @@ msgid ""
 msgstr ""
 "quoted printable karakter a p�nc�lban - val�sz�n�leg egy bugos MTA b�ne.\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "nem olvashat� forma"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1224,12 +1241,22 @@ msgstr "Egy felhaszn
 msgid "a notation value must not use any control characters\n"
 msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
 
+#, fuzzy
+msgid "a notation name may not contain an '=' character\n"
+msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
+"jellel kell befejez�dj�n.\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
 
-msgid "not human readable"
-msgstr "nem olvashat� forma"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1324,10 +1351,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -1663,14 +1686,14 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkos�tott adat.\n"
 
@@ -1963,7 +1986,7 @@ msgstr "|algo [f
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2969,11 +2992,27 @@ msgid "[self-signature]"
 msgstr "[�nal��r�s]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d rossz al��r�s.\n"
-msgstr[1] "%d rossz al��r�s.\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
+
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "J� al��r�s a k�vetkez�t�l: \""
+
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "Kihagytam \"%s\"-t: %s.\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+msgstr[1] "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2983,18 +3022,23 @@ msgstr[0] "1 al
 msgstr[1] "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 al��r�st nem ellen�riztem hiba miatt.\n"
-msgstr[1] "1 al��r�st nem ellen�riztem hiba miatt.\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d rossz al��r�s.\n"
+msgstr[1] "%d rossz al��r�s.\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
-msgstr[1] "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "J� al��r�s a k�vetkez�t�l: \""
+msgstr[1] "J� al��r�s a k�vetkez�t�l: \""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -3213,9 +3257,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
-
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
@@ -3494,6 +3535,11 @@ msgstr "Hiba: 
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "�rv�nytelen �rt�k!\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4321,6 +4367,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d rossz al��r�s.\n"
 msgstr[1] "%d rossz al��r�s.\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 al��r�st nem ellen�riztem hiba miatt.\n"
+msgstr[1] "1 al��r�st nem ellen�riztem hiba miatt.\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5542,14 +5595,14 @@ msgstr "Bizalmi adatb
 msgid "trustdb transaction too large\n"
 msgstr "Bizalmi adatb�zis tranzakci�ja t�l nagy.\n"
 
-#, fuzzy, c-format
-msgid "can't access '%s': %s\n"
-msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
-
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: K�nyvt�r nem l�tezik!\n"
 
+#, fuzzy, c-format
+msgid "can't access '%s': %s\n"
+msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
+
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Nem siker�lt verzi�rekordot l�trehoznom: %s"
@@ -5695,8 +5748,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5785,39 +5838,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5826,20 +5881,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5853,12 +5910,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8745,6 +8809,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
+#~ msgstr[1] "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
@@ -8838,11 +8915,6 @@ msgstr ""
 #~ msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "�rv�nytelen �rt�k!\n"
-
-#, fuzzy
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
diff --git a/po/id.po b/po/id.po
index 679bd20..c017cd4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -384,7 +384,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -482,6 +482,10 @@ msgid "directory '%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
@@ -734,9 +738,9 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "gagal memperbarui: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -754,6 +758,10 @@ msgstr "kesalahan membaca `%s': %s\n"
 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"
@@ -774,6 +782,10 @@ msgstr "dibatalkan oleh user\n"
 msgid "problem with the agent\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
@@ -830,6 +842,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1106,10 +1122,6 @@ msgstr "tidak diproses"
 msgid "invalid option \"%.50s\"\n"
 msgstr "opsi impor tidak valid\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "anda menemukan kesalahan ...(%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "gagal enarmoring: %s\n"
@@ -1213,6 +1225,11 @@ msgstr ""
 "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
 "mengandung bug\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "tidak dapat dibaca manusia"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1230,12 +1247,22 @@ msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
+#, fuzzy
+msgid "a notation name may not contain an '=' character\n"
+msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
+"dan diakhiri dengan sebuah '='\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-msgid "not human readable"
-msgstr "tidak dapat dibaca manusia"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1330,10 +1357,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "kesalahan menulis keyring `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -1669,14 +1692,14 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
@@ -1966,7 +1989,7 @@ msgstr "|algo [file]|cetak digest pesan"
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2971,11 +2994,27 @@ msgid "[self-signature]"
 msgstr "[self-signature]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d signature yang buruk\n"
-msgstr[1] "%d signature yang buruk\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
+
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s signature, algoritma digest %s\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Signature baik dari \""
+
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "melewati `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "User ID \"%s\" dibatalkan."
+msgstr[1] "User ID \"%s\" dibatalkan."
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2985,18 +3024,23 @@ msgstr[0] "1 signature tidak diperiksa karena tidak ada kunci\n"
 msgstr[1] "1 signature tidak diperiksa karena tidak ada kunci\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 signature tidak diperiksa karena kesalahan\n"
-msgstr[1] "1 signature tidak diperiksa karena kesalahan\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d signature yang buruk\n"
+msgstr[1] "%d signature yang buruk\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "terdeteksi ID %d user tanpa self-signature yang valid\n"
-msgstr[1] "terdeteksi ID %d user tanpa self-signature yang valid\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Signature baik dari \""
+msgstr[1] "Signature baik dari \""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -3218,9 +3262,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "memindahkan signature kunci ke tempat yang tepat\n"
-
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
@@ -3499,6 +3540,11 @@ msgstr "kesalahan: fingerprint tidak valid\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "nilai yang tidak valid\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4325,6 +4371,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d signature yang buruk\n"
 msgstr[1] "%d signature yang buruk\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 signature tidak diperiksa karena kesalahan\n"
+msgstr[1] "1 signature tidak diperiksa karena kesalahan\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5532,14 +5585,14 @@ msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transaksi trustdb terlalu besar\n"
 
-#, fuzzy, c-format
-msgid "can't access '%s': %s\n"
-msgstr "tidak dapat menutup `%s': %s\n"
-
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
+#, fuzzy, c-format
+msgid "can't access '%s': %s\n"
+msgstr "tidak dapat menutup `%s': %s\n"
+
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
@@ -5685,8 +5738,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5775,39 +5828,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5816,20 +5871,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|algo [file]|cetak digest pesan"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5843,12 +5900,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8734,6 +8798,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "anda menemukan kesalahan ...(%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "terdeteksi ID %d user tanpa self-signature yang valid\n"
+#~ msgstr[1] "terdeteksi ID %d user tanpa self-signature yang valid\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "memindahkan signature kunci ke tempat yang tepat\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
@@ -8828,11 +8905,6 @@ msgstr ""
 #~ msgstr "tidak dapat membuka `%s': %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "nilai yang tidak valid\n"
-
-#, fuzzy
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
diff --git a/po/it.po b/po/it.po
index 573f0f3..6b30fbd 100644
--- a/po/it.po
+++ b/po/it.po
@@ -379,7 +379,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -477,6 +477,10 @@ msgid "directory '%s' created\n"
 msgstr "%s: directory creata\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
@@ -729,9 +733,9 @@ msgstr "errore nella creazione della passhprase: %s\n"
 msgid "error forking process: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "aggiornamento fallito: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -749,6 +753,10 @@ msgstr "errore leggendo `%s': %s\n"
 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"
@@ -769,6 +777,10 @@ msgstr "interrotto dall'utente\n"
 msgid "problem with the agent\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problema con l'agent: ha restituito 0x%lx\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
@@ -825,6 +837,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "errore creando il portachiavi `%s': %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1103,10 +1119,6 @@ msgstr "non esaminato"
 msgid "invalid option \"%.50s\"\n"
 msgstr "opzioni di importazione non valide\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "hai trovato un bug... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "creazione dell'armatura fallita: %s\n"
@@ -1210,6 +1222,11 @@ msgstr ""
 "carattere quoted printable nell'armatura - probabilmente � stato usato\n"
 "un MTA buggato\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "non leggibile"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1227,12 +1244,22 @@ msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
+#, fuzzy
+msgid "a notation name may not contain an '=' character\n"
+msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"il nome di una nota deve essere formato solo da caratteri stampabili o\n"
+"spazi e terminare con un '='\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-msgid "not human readable"
-msgstr "non leggibile"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1328,10 +1355,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "errore creando il portachiavi `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -1674,14 +1697,14 @@ msgstr ""
 "del destinatario\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "non � possibile usare %s in modalit� %s\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "non � possibile usare %s in modalit� %s\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
@@ -1973,7 +1996,7 @@ msgstr "|algo [files]|stampa tutti i message digests"
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2980,11 +3003,27 @@ msgid "[self-signature]"
 msgstr "[autofirma]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d firme non corrette\n"
-msgstr[1] "%d firme non corrette\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
+
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "Firma %s, algoritmo di digest %s\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Firma valida da \""
+
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "saltata `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "L'user ID \"%s\" � stato revocato."
+msgstr[1] "L'user ID \"%s\" � stato revocato."
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2994,18 +3033,23 @@ msgstr[0] "una firma non controllata per mancanza della chiave\n"
 msgstr[1] "una firma non controllata per mancanza della chiave\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "una firma non controllata a causa di un errore\n"
-msgstr[1] "una firma non controllata a causa di un errore\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d firme non corrette\n"
+msgstr[1] "%d firme non corrette\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "Trovati %d user ID senza autofirme valide\n"
-msgstr[1] "Trovati %d user ID senza autofirme valide\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Firma valida da \""
+msgstr[1] "Firma valida da \""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -3225,9 +3269,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "spostamento della firma di una chiave nel posto corretto\n"
-
 msgid "save and quit"
 msgstr "salva ed esci"
 
@@ -3506,6 +3547,11 @@ msgstr "errore: impronta digitale non valida\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "valore non valido\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4342,6 +4388,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d firme non corrette\n"
 msgstr[1] "%d firme non corrette\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "una firma non controllata a causa di un errore\n"
+msgstr[1] "una firma non controllata a causa di un errore\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5573,14 +5626,14 @@ msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transazione del trustdb troppo grande\n"
 
-#, fuzzy, c-format
-msgid "can't access '%s': %s\n"
-msgstr "impossibile chiudere `%s': %s\n"
-
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
+#, fuzzy, c-format
+msgid "can't access '%s': %s\n"
+msgstr "impossibile chiudere `%s': %s\n"
+
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
@@ -5726,8 +5779,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5816,39 +5869,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5857,20 +5912,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|algo [files]|stampa tutti i message digests"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5884,12 +5941,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8778,6 +8842,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "hai trovato un bug... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "Trovati %d user ID senza autofirme valide\n"
+#~ msgstr[1] "Trovati %d user ID senza autofirme valide\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "spostamento della firma di una chiave nel posto corretto\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
@@ -8873,11 +8950,6 @@ msgstr ""
 #~ msgstr "impossibile aprire `%s': %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "valore non valido\n"
-
-#, fuzzy
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
diff --git a/po/ja.po b/po/ja.po
index d78cca2..e138ede 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -361,7 +361,9 @@ msgstr "クライアントが鍵に\"trusted\"マークをつけることを認
 msgid "allow presetting passphrase"
 msgstr "パスフレーズの事前設定を認める"
 
-msgid "allow caller to override the pinentry"
+#, fuzzy
+#| msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr "pinentryより優先してパスフレーズ入力を認める"
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -447,6 +449,11 @@ msgstr "ディレクトリ'%s'が作成できません: %s\n"
 msgid "directory '%s' created\n"
 msgstr "ディレクトリ'%s'が作成されました\n"
 
+#, fuzzy, c-format
+#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "警告: '%s'の安全でない許可 \"%s\"\n"
+
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s'でstat()が失敗しました: %s\n"
@@ -702,8 +709,9 @@ msgstr "パイプのストリーム作成エラー: %s\n"
 msgid "error forking process: %s\n"
 msgstr "プロセスforkエラー: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %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
@@ -723,6 +731,10 @@ msgid "error getting exit code of process %d: %s\n"
 msgstr "プロセス %d のexitコード取得エラー: %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"
 
@@ -738,6 +750,11 @@ msgstr "ユーザによる取消し\n"
 msgid "problem with the agent\n"
 msgstr "エージェントに障害\n"
 
+#, fuzzy, c-format
+#| msgid "problem with the agent: %s\n"
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "エージェントに問題: %s\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "コア・ダンプを無効にできません: %s\n"
@@ -794,6 +811,10 @@ msgid "out of core while allocating %lu bytes"
 msgstr "%luバイトの確保においてメモリが足りません"
 
 #, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "十分なメモリの確保のエラー: %s\n"
+
+#, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 "%s:%u: \"%s\"は、使われなくなったオプションです - なんの効果もありません\n"
@@ -1034,10 +1055,6 @@ msgid "invalid option \"%.50s\"\n"
 msgstr "無効なオプション \"%.50s\"\n"
 
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "あなたはバグを発見しました ... (%s:%d)\n"
-
-#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "'%s'から'%s'への変換は利用できません\n"
 
@@ -1137,6 +1154,11 @@ msgstr ""
 "外装の中にquoted printable文字があります。おそらくバグのあるMTAが使われたので"
 "しょう\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "人には読めません"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1152,12 +1174,22 @@ msgstr "ユーザ注釈名は、一つより大きい'@'文字を含んではな
 msgid "a notation value must not use any control characters\n"
 msgstr "注釈名の値に制御文字を使ってはいけません\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr "ユーザ注釈名は、一つより大きい'@'文字を含んではなりません\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"注釈名には印字可能な文字か空白のみを使い、'='で終わらなければなりません\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "*警告*: 無効な注釈データを発見\n"
 
-msgid "not human readable"
-msgstr "人には読めません"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "プロキシ%sのクライアントへの問い合わせが失敗しました\n"
@@ -1244,10 +1276,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "エラー: URLが長すぎます (上限%d文字)。\n"
 
 #, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "十分なメモリの確保のエラー: %s\n"
-
-#, c-format
 msgid "error reading '%s': %s\n"
 msgstr "'%s'の読み込みエラー: %s\n"
 
@@ -1556,14 +1584,14 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "%sを%sモードで使うことはできません\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s暗号化 受信者:\"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "%sを%sモードで使うことはできません\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s暗号化済みデータ\n"
 
@@ -1831,7 +1859,9 @@ msgstr "メッセージ・ダイジェストを表示"
 msgid "run in server mode"
 msgstr "サーバ・モードで実行"
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+#, fuzzy
+#| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|TOFUポリシーを鍵に設定する(good, unknown, bad, ask, auto)"
 
 msgid "create ascii armored output"
@@ -2782,10 +2812,31 @@ msgid "[self-signature]"
 msgstr "[自己署名]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "不正な署名%d個\n"
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "鍵%s: サポートしていない公開鍵アルゴリズムです\n"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "カードはダイジェスト・アルゴリズム %s をサポートしていません\n"
+
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "正しい署名"
+
+#, fuzzy, c-format
+#| msgid "key %s: %s\n"
+msgid "key %s:\n"
+msgstr "鍵  %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "ユーザID \"%s\": %d の署名が除去されました\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2794,16 +2845,22 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "鍵がないため1個の署名を検査しません\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "エラーのため1個の署名を検査しません\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "不正な署名%d個\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "有効な自己署名のないユーザIDを%d個検出\n"
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "正しい署名"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2996,9 +3053,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "鍵 %s: パスフレーズの変更エラー: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "鍵の署名を正しい場所に移動します\n"
-
 msgid "save and quit"
 msgstr "保存して終了"
 
@@ -3242,6 +3296,11 @@ msgstr "\"%s\"はフィンガープリントではありません\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" はプライマリ・フィンガープリントではありません\n"
 
+#, fuzzy, c-format
+#| msgid "read error in '%s': %s\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "'%s'で読み込みエラー: %s\n"
+
 msgid "No matching user IDs."
 msgstr "マッチするユーザIDはありません。"
 
@@ -4014,6 +4073,12 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "正しい署名%d個\n"
 
 #, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "エラーのため1個の署名を検査しません\n"
+
+#, fuzzy, c-format
 #| msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5180,14 +5245,14 @@ msgid "trustdb transaction too large\n"
 msgstr "信用データベースのトランザクションが大きすぎます\n"
 
 #, c-format
-msgid "can't access '%s': %s\n"
-msgstr "'%s'にアクセスできません: %s\n"
-
-#, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ディレクトリがありません!\n"
 
 #, c-format
+msgid "can't access '%s': %s\n"
+msgstr "'%s'にアクセスできません: %s\n"
+
+#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: バージョン・レコードの作成に失敗しました: %s"
 
@@ -5333,8 +5398,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5421,34 +5486,36 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "パイプの作成エラー: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 
 #, c-format
@@ -5456,20 +5523,23 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "メッセージ・ダイジェストを表示"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 
 #, c-format
@@ -5482,12 +5552,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 
 #, fuzzy, c-format
@@ -8244,6 +8321,18 @@ msgstr ""
 "形式: gpg-check-pattern [オプション] パターンファイル\n"
 "パターンファイルに対して標準入力のパスフレーズを確認する\n"
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "あなたはバグを発見しました ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "有効な自己署名のないユーザIDを%d個検出\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "鍵の署名を正しい場所に移動します\n"
+
 #~ msgid "key specification '%s' is ambiguous\n"
 #~ msgstr "鍵の指定'%s'はあいまいです\n"
 
diff --git a/po/nb.po b/po/nb.po
index d48d38a..970241e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -391,7 +391,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -484,6 +484,10 @@ msgid "directory '%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
@@ -731,9 +735,9 @@ msgstr "feil ved opprettelse av passfrase: %s\n"
 msgid "error forking process: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "oppdatering mislyktes: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -751,6 +755,10 @@ msgstr "feil ved lesing av 
 msgid "error getting exit code of process %d: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "can't close `%s': %s\n"
 msgid "can't connect to '%s': %s\n"
@@ -769,6 +777,10 @@ msgid "problem with the agent\n"
 msgstr ""
 
 #, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr ""
+
+#, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
@@ -823,6 +835,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1099,10 +1115,6 @@ msgstr "ikke tvunget"
 msgid "invalid option \"%.50s\"\n"
 msgstr "ugyldige listevalg\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "du fant en feil ... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
@@ -1203,6 +1215,10 @@ msgid ""
 msgstr ""
 "quoted printable-tegn i armor - antakelig har en MTA med feil blitt brukt\n"
 
+#, c-format
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr ""
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1217,13 +1233,16 @@ msgstr ""
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
+msgid "a notation name may not contain an '=' character\n"
+msgstr ""
+
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "ingen gyldig OpenPGP-data funnet.\n"
 
-msgid "not human readable"
-msgstr ""
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1311,10 +1330,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Feil: URL er for lang (grensa g�r ved %d tegn).\n"
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -1643,14 +1658,14 @@ msgstr ""
 "p�tvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "du kan ikke bruke %s i %s modus\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kryptert for: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "du kan ikke bruke %s i %s modus\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterte data\n"
 
@@ -1934,7 +1949,7 @@ msgstr "|algo [filer]|skrive meldingsdigester"
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2952,11 +2967,30 @@ msgid "[self-signature]"
 msgstr "[selvsignatur]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d ubrukelige signaturer\n"
-msgstr[1] "%d ubrukelige signaturer\n"
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "kortet st�tter ikke digestalgoritme %s\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "God signatur fra �%s�"
+
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "hoppet over �%s�: %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "n�kkel: %s: �%s� %d nye signaturer\n"
+msgstr[1] "n�kkel: %s: �%s� %d nye signaturer\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2966,18 +3000,23 @@ msgstr[0] "1 signatur ble ikke sjekket p
 msgstr[1] "1 signatur ble ikke sjekket p� grunn av en manglende n�kkel\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 signatur ble ikke sjekket p� grunn av en feil\n"
-msgstr[1] "1 signatur ble ikke sjekket p� grunn av en feil\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d ubrukelige signaturer\n"
+msgstr[1] "%d ubrukelige signaturer\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
-msgstr[1] "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "God signatur fra �%s�"
+msgstr[1] "God signatur fra �%s�"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3170,9 +3209,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "flytter en n�kkelsignatur til den rette plassen\n"
-
 msgid "save and quit"
 msgstr "lagre og avslutte"
 
@@ -3420,6 +3456,11 @@ msgstr "ugyldig fingeravtrykk"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "ugyldig verdi\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4225,6 +4266,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d ubrukelige signaturer\n"
 msgstr[1] "%d ubrukelige signaturer\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 signatur ble ikke sjekket p� grunn av en feil\n"
+msgstr[1] "1 signatur ble ikke sjekket p� grunn av en feil\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5418,16 +5466,16 @@ msgstr ""
 msgid "trustdb transaction too large\n"
 msgstr ""
 
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
 #, c-format
-msgid "%s: directory does not exist!\n"
-msgstr ""
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
@@ -5569,8 +5617,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5660,39 +5708,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5701,20 +5751,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|algo [filer]|skrive meldingsdigester"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5728,12 +5780,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8616,6 +8675,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "du fant en feil ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
+#~ msgstr[1] "%d brukerider uten gyldige selvsignaturer ble oppdaget\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "flytter en n�kkelsignatur til den rette plassen\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d signaturer ble ikke sjekket p� grunn av manglende n�kler\n"
 
@@ -8701,11 +8773,6 @@ msgstr ""
 #~ msgstr "Kan ikke �pne �%s�: %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "ugyldig verdi\n"
-
-#, fuzzy
 #~| msgid "error reading secret keyblock \"%s\": %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "feil ved lesing av hemmelig n�kkelblokk �%s�: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 9936e87..2b8c12c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -405,7 +405,7 @@ msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
 msgid "allow presetting passphrase"
 msgstr "zezwolenie na predefiniowane has�o"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -508,6 +508,11 @@ msgid "directory '%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
 #, fuzzy, c-format
+#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "Ostrze�enie: niebezpieczne prawa dost�pu do %s ,,%s''\n"
+
+#, fuzzy, c-format
 #| msgid "stat() failed for `%s': %s\n"
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() nie powiod�o si� dla ,,%s'': %s\n"
@@ -778,8 +783,9 @@ msgstr "b
 msgid "error forking process: %s\n"
 msgstr "b��d podczas tworzenia procesu: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %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 "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
 
 #, fuzzy, c-format
@@ -801,6 +807,10 @@ msgstr "b
 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"
@@ -818,6 +828,11 @@ msgstr "anulowano przez u
 msgid "problem with the agent\n"
 msgstr "problem z agentem\n"
 
+#, fuzzy, c-format
+#| msgid "problem with the agent: %s\n"
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problem z agentem: %s\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
@@ -874,6 +889,10 @@ msgid "out of core while allocating %lu bytes"
 msgstr "brak miejsca podczas przydzielania %lu bajt�w"
 
 #, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "b��d przydzielania wystarczaj�cej ilo�ci pami�ci: %s\n"
+
+#, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: przestarza�a opcja ,,%s'' - nie ma efektu\n"
 
@@ -1124,10 +1143,6 @@ msgstr "brak pami
 msgid "invalid option \"%.50s\"\n"
 msgstr "b��dna opcja ,,%.50s''\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
-
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' not available\n"
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1233,6 +1248,11 @@ msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przek�amanie wprowadzone przez serwer pocztowy\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "nieczytelne dla cz�owieka"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1249,12 +1269,23 @@ msgstr "nazwa adnotacjinie mo
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� �adnych znak�w steruj�cych\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr "nazwa adnotacjinie mo�e zawiera� wi�cej ni� jednego znaku ,,@''\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"nazwa adnotacji musi zawiera� tylko znaki drukowalne lub spacje i ko�czy� "
+"si� znakiem ,,=''\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE�ENIE: napotkano b��dne dane adnotacji\n"
 
-msgid "not human readable"
-msgstr "nieczytelne dla cz�owieka"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "nie uda�o si� przekaza� zapytania %s do klienta\n"
@@ -1342,10 +1373,6 @@ msgstr "URL do odczytania klucza publicznego: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "B��d: URL zbyt d�ugi (limit to %d znak�w).\n"
 
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "b��d przydzielania wystarczaj�cej ilo�ci pami�ci: %s\n"
-
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
@@ -1686,14 +1713,14 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "%s nie jest dost�pne w trybie %s\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "%s nie jest dost�pne w trybie %s\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
@@ -1976,7 +2003,7 @@ msgstr "wypisanie skr
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -3021,12 +3048,33 @@ msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d niepoprawnych podpis�w\n"
-msgstr[1] "%d niepoprawnych podpis�w\n"
-msgstr[2] "%d niepoprawnych podpis�w\n"
+#| 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"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "karta nie obs�uguje algorytmu skr�tu %s\n"
+
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "Poprawny podpis z�o�ony przez"
+
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "pomini�ty ,,%s'': %s\n"
+
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
+msgstr[1] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
+msgstr[2] "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -3037,23 +3085,26 @@ msgstr[1] "1 podpis nie zosta
 msgstr[2] "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
-msgstr[1] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
-msgstr[2] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d niepoprawnych podpis�w\n"
+msgstr[1] "%d niepoprawnych podpis�w\n"
+msgstr[2] "%d niepoprawnych podpis�w\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] ""
-"wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
-msgstr[1] ""
-"wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
-msgstr[2] ""
-"wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Poprawny podpis z�o�ony przez"
+msgstr[1] "Poprawny podpis z�o�ony przez"
+msgstr[2] "Poprawny podpis z�o�ony przez"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3255,9 +3306,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
-
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
@@ -3535,6 +3583,11 @@ msgstr "niew
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "nie uda�o si� pobra� odcisku\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "niepoprawna warto��\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4367,6 +4420,14 @@ msgstr[0] "%d niepoprawnych podpis
 msgstr[1] "%d niepoprawnych podpis�w\n"
 msgstr[2] "%d niepoprawnych podpis�w\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
+msgstr[1] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
+msgstr[2] "1 podpis nie zosta� sprawdzony z powodu b��du\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5621,16 +5682,16 @@ msgstr "baza zaufania, wpis %lu: zapis nie powi
 msgid "trustdb transaction too large\n"
 msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
 
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: katalog nie istnieje!\n"
+
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "nie mo�na dosta� si� do ,,%s'': %s\n"
 
 #, c-format
-msgid "%s: directory does not exist!\n"
-msgstr "%s: katalog nie istnieje!\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
 
@@ -5778,8 +5839,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5878,44 +5939,46 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "b��d tworzenia potoku: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5925,20 +5988,23 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "wypisanie skr�t�w wiadomo�ci"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5953,12 +6019,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -9063,6 +9136,23 @@ 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 "you found a bug ... (%s:%d)\n"
+#~ msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] ""
+#~ "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
+#~ msgstr[1] ""
+#~ "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
+#~ msgstr[2] ""
+#~ "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
+
 #, fuzzy
 #~| msgid "option \"%.50s\" is ambiguous\n"
 #~ msgid "key specification '%s' is ambiguous\n"
@@ -9164,11 +9254,6 @@ msgstr ""
 #~ msgstr "nie uda�o si� otworzy� ,,%s'': %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "niepoprawna warto��\n"
-
-#, fuzzy
 #~| msgid "error reading secret keyblock \"%s\": %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "b��d odczytu bloku klucza tajnego ,,%s'': %s\n"
diff --git a/po/pt.po b/po/pt.po
index bfdfdf1..c271492 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -384,7 +384,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -481,6 +481,10 @@ msgid "directory '%s' created\n"
 msgstr "%s: directoria criada\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
@@ -733,9 +737,9 @@ msgstr "erro na cria
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "actualiza��o falhou: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -753,6 +757,10 @@ msgstr "erro na leitura de `%s': %s\n"
 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"
@@ -773,6 +781,10 @@ msgstr "cancelado pelo utilizador\n"
 msgid "problem with the agent\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problema com o agente: o agente returnou 0x%lx\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desactivar core dumps: %s\n"
@@ -830,6 +842,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "erro ao criar porta-chaves `%s': %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1106,10 +1122,6 @@ msgstr "n
 msgid "invalid option \"%.50s\"\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "voc� encontrou um bug ... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "cria��o de armadura falhou: %s\n"
@@ -1213,6 +1225,11 @@ msgstr ""
 "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
 "foi usado\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "n�o leg�vel por humanos"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1230,12 +1247,22 @@ msgstr "um valor de nota
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
+#, fuzzy
+msgid "a notation name may not contain an '=' character\n"
+msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
+"terminar com um '='\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-msgid "not human readable"
-msgstr "n�o leg�vel por humanos"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1330,10 +1357,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "erro ao criar porta-chaves `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1673,14 +1696,14 @@ msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
@@ -1965,7 +1988,7 @@ msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2975,11 +2998,27 @@ msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d assinaturas incorrectas\n"
-msgstr[1] "%d assinaturas incorrectas\n"
+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"
+
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "assinatura %s de: \"%s\"\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Assinatura correcta de \""
+
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "ignorado `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Utilizador \"%s\" est� revocado."
+msgstr[1] "Utilizador \"%s\" est� revocado."
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2989,18 +3028,23 @@ msgstr[0] "1 assinatura n
 msgstr[1] "1 assinatura n�o verificada por falta de chave\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 assinatura n�o verificada devido a um erro\n"
-msgstr[1] "1 assinatura n�o verificada devido a um erro\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d assinaturas incorrectas\n"
+msgstr[1] "%d assinaturas incorrectas\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
-msgstr[1] "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Assinatura correcta de \""
+msgstr[1] "Assinatura correcta de \""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -3222,9 +3266,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "a mover a assinatura da chave para o local correcto\n"
-
 msgid "save and quit"
 msgstr "gravar e sair"
 
@@ -3507,6 +3548,11 @@ msgstr "%s: vers
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "valor inv�lido\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4332,6 +4378,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d assinaturas incorrectas\n"
 msgstr[1] "%d assinaturas incorrectas\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 assinatura n�o verificada devido a um erro\n"
+msgstr[1] "1 assinatura n�o verificada devido a um erro\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5542,14 +5595,14 @@ msgstr "base de dados de confian
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de base de dados de confian�a muito grande\n"
 
-#, fuzzy, c-format
-msgid "can't access '%s': %s\n"
-msgstr "imposs�vel fechar `%s': %s\n"
-
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
+#, fuzzy, c-format
+msgid "can't access '%s': %s\n"
+msgstr "imposs�vel fechar `%s': %s\n"
+
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de vers�o: %s"
@@ -5695,8 +5748,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5785,39 +5838,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5826,20 +5881,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5853,12 +5910,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8749,6 +8813,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "voc� encontrou um bug ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
+#~ msgstr[1] "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "a mover a assinatura da chave para o local correcto\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
@@ -8842,11 +8919,6 @@ msgstr ""
 #~ msgstr "imposs�vel abrir `%s': %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "valor inv�lido\n"
-
-#, fuzzy
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
diff --git a/po/ro.po b/po/ro.po
index a8b2be4..79d9bae 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -394,7 +394,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -493,6 +493,10 @@ msgid "directory '%s' created\n"
 msgstr "director `%s' creat\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
@@ -750,9 +754,9 @@ msgstr "eroare la crearea frazei-parol
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "actualizarea a e�uat: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -770,6 +774,10 @@ msgstr "eroare la citire `%s': %s\n"
 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"
@@ -790,6 +798,10 @@ msgstr "anulat
 msgid "problem with the agent\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
@@ -845,6 +857,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1123,10 +1139,6 @@ msgstr "nefor
 msgid "invalid option \"%.50s\"\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "a�i g�sit un bug ... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
@@ -1228,6 +1240,11 @@ msgstr ""
 "caracter printabil �n ghilimele �n armur� - probabil a fost folosit un MTA "
 "cu bug-uri\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "ilizibil"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1245,12 +1262,23 @@ msgid "a notation value must not use any control characters\n"
 msgstr ""
 "o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
+"�i s� se termine cu un '='\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
 
-msgid "not human readable"
-msgstr "ilizibil"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1339,10 +1367,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "eroare la crearea inelului de chei `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -1670,14 +1694,14 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
@@ -1964,7 +1988,7 @@ msgstr "|algo [fi
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -3004,11 +3028,30 @@ msgid "[self-signature]"
 msgstr "[auto-semn�tur�]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d semn�turi incorecte\n"
-msgstr[1] "%d semn�turi incorecte\n"
+#| 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"
+
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "semn�tur� %s, algoritm rezumat %s\n"
+
+#, fuzzy
+#| msgid "revoke signatures"
+msgid " (reordered signatures follow)"
+msgstr "revoc� semn�turi"
+
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "s�rit� \"%s\": %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "ID utilizator \"%s\" a fost revocat."
+msgstr[1] "ID utilizator \"%s\" a fost revocat."
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -3018,18 +3061,23 @@ msgstr[0] "1 semn
 msgstr[1] "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
-msgstr[1] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d semn�turi incorecte\n"
+msgstr[1] "%d semn�turi incorecte\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
-msgstr[1] "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Semn�tur� bun� din \"%s\""
+msgstr[1] "Semn�tur� bun� din \"%s\""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3231,9 +3279,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "mut o semn�tur� de cheie �n locul corect\n"
-
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
@@ -3502,6 +3547,11 @@ msgstr "amprent
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "valoare invalid�\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4324,6 +4374,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d semn�turi incorecte\n"
 msgstr[1] "%d semn�turi incorecte\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
+msgstr[1] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5556,16 +5613,16 @@ msgstr "trustdb rec %lu: scrierea a e
 msgid "trustdb transaction too large\n"
 msgstr "tranzac�ia trustdb prea mare\n"
 
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directorul nu exist�!\n"
+
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
 #, c-format
-msgid "%s: directory does not exist!\n"
-msgstr "%s: directorul nu exist�!\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: am e�uat s� creez �nregistrare versiune: %s"
 
@@ -5710,8 +5767,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5801,39 +5858,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5842,20 +5901,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5869,12 +5930,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8802,6 +8870,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "a�i g�sit un bug ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
+#~ msgstr[1] "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "mut o semn�tur� de cheie �n locul corect\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d semn�turi nu au fost verificate din cauza unor chei lips�\n"
 
@@ -8895,11 +8976,6 @@ msgstr ""
 #~ msgstr "Nu pot deschide `%s': %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "valoare invalid�\n"
-
-#, fuzzy
 #~| msgid "error reading secret keyblock \"%s\": %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "eroare la citire keyblock secret \"%s\": %s\n"
@@ -10219,9 +10295,6 @@ msgstr ""
 #~ msgid "revsig"
 #~ msgstr "revsem"
 
-#~ msgid "revoke signatures"
-#~ msgstr "revoc� semn�turi"
-
 #~ msgid "revuid"
 #~ msgstr "revuid"
 
diff --git a/po/ru.po b/po/ru.po
index 8d7f3e7..f311cd1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -371,7 +371,9 @@ msgstr "не позволять клиентам помечать ключи к
 msgid "allow presetting passphrase"
 msgstr "разрешить предустанавливать фразу-пароль"
 
-msgid "allow caller to override the pinentry"
+#, fuzzy
+#| msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr "разрешить клиентам замещать собой pinentry"
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -457,6 +459,11 @@ msgstr "не могу создать каталог '%s': %s\n"
 msgid "directory '%s' created\n"
 msgstr "создан каталог '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "Внимание: небезопасные права доступа %s \"%s\"\n"
+
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "сбой stat() для '%s': %s\n"
@@ -712,8 +719,9 @@ msgstr "ошибка при создании потока для канала к
 msgid "error forking process: %s\n"
 msgstr "ошибка при дублировании процесса: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %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
@@ -733,6 +741,10 @@ 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"
 
@@ -748,6 +760,11 @@ msgstr "прервано пользователем\n"
 msgid "problem with the agent\n"
 msgstr "проблема с агентом\n"
 
+#, fuzzy, c-format
+#| msgid "problem with the agent: %s\n"
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "проблема с агентом: %s\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "не могу отключить создание файла образа памяти: %s\n"
@@ -804,6 +821,10 @@ msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при размещении %lu байтов"
 
 #, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "ошибка выделения достаточной памяти: %s\n"
+
+#, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: устаревший параметр \"%s\" - игнорируется\n"
 
@@ -1042,10 +1063,6 @@ msgid "invalid option \"%.50s\"\n"
 msgstr "недопустимый параметр \"%.50s\"\n"
 
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "Вы нашли ошибку в программе ... (%s:%d)\n"
-
-#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "преобразование из '%s' в '%s' недоступно\n"
 
@@ -1145,6 +1162,11 @@ msgstr ""
 "символ quoted printable в текстовом формате - испорчено почтовой "
 "программой?\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "не для чтения человеком"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1162,12 +1184,24 @@ msgstr ""
 msgid "a notation value must not use any control characters\n"
 msgstr "в значении примечания не должно быть управляющих символов\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr ""
+"имя примечания пользователя не должно содержать более одного символа '@'\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"имя примечания должно содержать только печатные символы или пробелы и "
+"заканчиваться знаком '='\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "Внимание: найдена недопустимая форма записи примечания\n"
 
-msgid "not human readable"
-msgstr "не для чтения человеком"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "сбой при трансляции запроса %s клиенту\n"
@@ -1252,10 +1286,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: Слишком длинный URL (предел - %d символов).\n"
 
 #, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "ошибка выделения достаточной памяти: %s\n"
-
-#, c-format
 msgid "error reading '%s': %s\n"
 msgstr "ошибка чтения '%s': %s\n"
 
@@ -1567,14 +1597,14 @@ msgstr ""
 "предпочтения получателя\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "нельзя использовать %s в режиме %s\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "нельзя использовать %s в режиме %s\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "данные зашифрованы алгоритмом %s\n"
 
@@ -1679,8 +1709,8 @@ msgstr "(проверьте аргумент параметра '%s')\n"
 #, c-format
 msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
 msgstr ""
-"Внимание: '%s' должно быть должно быть длинным идентификатором "
-"или отпечатком ключа\n"
+"Внимание: '%s' должно быть должно быть длинным идентификатором или "
+"отпечатком ключа\n"
 
 #, c-format
 msgid "error looking up: %s\n"
@@ -1711,7 +1741,8 @@ msgstr "Внимание: '%s' не используется в качестве
 
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
-msgstr "\"%s\" используется в качестве основного секретного ключа для подписи\n"
+msgstr ""
+"\"%s\" используется в качестве основного секретного ключа для подписи\n"
 
 #, c-format
 msgid "all values passed to '%s' ignored\n"
@@ -1838,7 +1869,9 @@ msgstr "вывести хэши сообщений"
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+#, fuzzy
+#| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 "|VALUE|установить правила TOFU для ключа (good - хороший, unknown - "
 "неизвестно, bad - плохой, ask - спрашивать, auto - автоматически)"
@@ -2805,12 +2838,35 @@ msgstr "[отзыв]"
 msgid "[self-signature]"
 msgstr "[самоподпись]"
 
-#, c-format
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d плохая подпись\n"
-msgstr[1] "%d плохих подписи\n"
-msgstr[2] "%d плохих подписей\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"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "карта не поддерживает хэш-функцию %s\n"
+
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "Хорошая подпись пользователя"
+
+#, fuzzy, c-format
+#| msgid "key %s: %s\n"
+msgid "key %s:\n"
+msgstr "ключ %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+#| msgid_plural "User ID \"%s\": %d signatures removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "ID пользователя \"%s\": %d подпись удалена\n"
+msgstr[1] "ID пользователя \"%s\": %d подписи удалены\n"
+msgstr[2] "ID пользователя \"%s\": %d подписей удалено\n"
 
 #, c-format
 msgid "%d signature not checked due to a missing key\n"
@@ -2820,18 +2876,25 @@ msgstr[1] "%d подписи не проверены за отсутствием
 msgstr[2] "%d подписей не проверено за отсутствием ключа\n"
 
 #, c-format
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "%d подпись не проверена из-за ошибки\n"
-msgstr[1] "%d подписи не проверены из-за ошибки\n"
-msgstr[2] "%d подписей не проверено из-за ошибки\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d плохая подпись\n"
+msgstr[1] "%d плохих подписи\n"
+msgstr[2] "%d плохих подписей\n"
+
+#, fuzzy, c-format
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Хорошая подпись пользователя"
+msgstr[1] "Хорошая подпись пользователя"
+msgstr[2] "Хорошая подпись пользователя"
 
 #, c-format
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "обнаружен %d ID пользователя без действительной самоподписи\n"
-msgstr[1] "обнаружены %d ID пользователя без действительной самоподписи\n"
-msgstr[2] "обнаружено %d ID пользователя без действительной самоподписи\n"
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3028,9 +3091,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "ключ %s: ошибка изменения фразы-пароля: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "перемещение подписи ключа в нужное место\n"
-
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
@@ -3278,6 +3338,11 @@ msgstr "\"%s\" - не отпечаток\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" - не первичный отпечаток\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "недопустимое значение\n"
+
 msgid "No matching user IDs."
 msgstr "Нет подходящих ID пользователей."
 
@@ -4066,6 +4131,13 @@ msgstr[1] "%d хороших подписи\n"
 msgstr[2] "%d хороших подписей\n"
 
 #, c-format
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "%d подпись не проверена из-за ошибки\n"
+msgstr[1] "%d подписи не проверены из-за ошибки\n"
+msgstr[2] "%d подписей не проверено из-за ошибки\n"
+
+#, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
 msgstr[0] "Внимание: %lu ключ пропущен из-за большого размера\n"
@@ -5250,14 +5322,14 @@ msgid "trustdb transaction too large\n"
 msgstr "слишком большая операция над таблицей доверия\n"
 
 #, c-format
-msgid "can't access '%s': %s\n"
-msgstr "нет доступа к '%s': %s\n"
-
-#, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталог не существует!\n"
 
 #, c-format
+msgid "can't access '%s': %s\n"
+msgstr "нет доступа к '%s': %s\n"
+
+#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: сбой создания записи о версии: %s"
 
@@ -5393,10 +5465,13 @@ msgstr "ошибка установки уровня доверия привяз
 msgid "The binding %s is NOT known."
 msgstr "Привязка %s неизвестна."
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "The key %s raised a conflict with this binding (%s).  Since this "
+#| "binding's policy was 'auto', it was changed to 'ask'."
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 "Ключ %s противоречит этой привязке (%s). Поскольку правило привязки было "
 "'автоматически', оно изменилось на 'спрашивать'."
@@ -5478,12 +5553,12 @@ msgstr[2] " за %ld прошедших месяцев."
 #. so that we can tweak it without breaking translations.
 msgid "TOFU detected a binding conflict"
 msgstr ""
-"Обычно с конкретным адресом электронной почты связан только один "
-"ключ. Однако иногда создают новый ключ, например, если ключ слишком "
-"стар или владелец считает, что ключ может быть раскрыт. В противном "
-"случае новый ключ может означать атаку \"человек посередине\"! "
-"Перед тем как принять этот ключ, следует связаться с владельцем "
-"и убедиться, что этот новый ключ правомерен."
+"Обычно с конкретным адресом электронной почты связан только один ключ. "
+"Однако иногда создают новый ключ, например, если ключ слишком стар или "
+"владелец считает, что ключ может быть раскрыт. В противном случае новый ключ "
+"может означать атаку \"человек посередине\"! Перед тем как принять этот "
+"ключ, следует связаться с владельцем и убедиться, что этот новый ключ "
+"правомерен."
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. version of the hotkey) for each of the five choices.  If
@@ -5499,44 +5574,56 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "ошибка при смене правила TOFU: %s\n"
 
-#, c-format
-msgid "%d year"
-msgid_plural "%d years"
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
+#, fuzzy, c-format
+#| msgid "%d year"
+#| msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] "%d год"
 msgstr[1] "%d года"
 msgstr[2] "%d лет"
 
-#, c-format
-msgid "%d month"
-msgid_plural "%d months"
+#, fuzzy, c-format
+#| msgid "%d month"
+#| msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] "%d месяц"
 msgstr[1] "%d месяца"
 msgstr[2] "%d месяцев"
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d день"
-msgstr[1] "%d дня"
-msgstr[2] "%d дней"
+msgid "%d~day"
+msgid_plural "%d~days"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+#, fuzzy, c-format
+#| msgid "%d hour"
+#| msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] "%d час"
 msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+#, fuzzy, c-format
+#| msgid "%d minute"
+#| msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+#, fuzzy, c-format
+#| msgid "%d second"
+#| msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] "%d секунда"
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
@@ -5545,24 +5632,37 @@ msgstr[2] "%d секунд"
 msgid "Have never verified a message signed by key %s!\n"
 msgstr "Сообщения, подписанные ключом %s, никогда не проверялись!\n"
 
-#, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+#, fuzzy, c-format
+#| msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr "Не удалось собрать статистику для \"%s\" (ключ %s)\n"
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
+#, fuzzy, c-format
+#| msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
+msgid "Verified %ld messages signed by \"%s\"."
 msgstr "Проверено 0 сообщений, подписанных \"%s\" (ключ: %s, правило: %s)."
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past "
+#| "%s."
+#| msgid_plural ""
+#| "Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past "
+#| "%s."
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
-msgstr[0] "Проверено %ld сообщение, подписанное \"%s\" (ключ: %s, правило: %s) за %s."
-msgstr[1] "Проверены %ld сообщения, подписанные \"%s\" (ключ: %s, правило: %s) за %s."
-msgstr[2] "Проверено %ld сообщений, подписанных \"%s\" (ключ: %s, правило: %s) за %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
+msgstr[0] ""
+"Проверено %ld сообщение, подписанное \"%s\" (ключ: %s, правило: %s) за %s."
+msgstr[1] ""
+"Проверены %ld сообщения, подписанные \"%s\" (ключ: %s, правило: %s) за %s."
+msgstr[2] ""
+"Проверено %ld сообщений, подписанных \"%s\" (ключ: %s, правило: %s) за %s."
 
 #, c-format
 msgid "The most recent message was verified %s ago."
@@ -5570,38 +5670,30 @@ msgstr "Последнее сообщение проверено %s назад."
 
 msgid "Warning: we've have yet to see a message signed by this key!\n"
 msgstr ""
-"Внимание: мы до сих пор не видели ни одного сообщения, подписанного этим ключом!\n"
+"Внимание: мы до сих пор не видели ни одного сообщения, подписанного этим "
+"ключом!\n"
 
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
-"Внимание: мы до сих пор видели только одно сообщение, подписанное этим ключом!\n"
+"Внимание: мы до сих пор видели только одно сообщение, подписанное этим "
+"ключом!\n"
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
-#  I believe the translation produces an equivalent Russian output
-#  for that code snippet in g10/tofu.c -- ineiev
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
-"Внимание: если Вы думаете, что видели больше %d сообщения, подписанного "
-"этим ключом, то этот ключ может быть подделкой! Проверьте внимательно, "
-"не внесены ли в адрес электронной почты небольшие изменения (напр., "
-"дополнительные пробелы). В случае подозрений отметьте его как плохой "
-"с помощью '%s'.\n "
 msgstr[1] ""
-"Внимание: если Вы думаете, что видели больше %d сообщений, подписанных "
-"этим ключом, то этот ключ может быть подделкой! Проверьте внимательно, "
-"не внесены ли в адрес электронной почты небольшие изменения (напр., "
-"дополнительные пробелы). В случае подозрений отметьте его как плохой "
-"с помощью '%s'.\n "
 msgstr[2] ""
-"Внимание: если Вы думаете, что видели больше %d сообщений, подписанных "
-"этим ключом, то этот ключ может быть подделкой! Проверьте внимательно, "
-"не внесены ли в адрес электронной почты небольшие изменения (напр., "
-"дополнительные пробелы). В случае подозрений отметьте его как плохой "
-"с помощью '%s'.\n "
 
 #, c-format
 msgid "error opening TOFU database: %s\n"
@@ -8406,6 +8498,50 @@ msgstr ""
 "Синтаксис: gpg-check-pattern [параметры] файл_образцов\n"
 "Проверить фразу-пароль, поступающую из stdin, по файлу образцов\n"
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "Вы нашли ошибку в программе ... (%s:%d)\n"
+
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "обнаружен %d ID пользователя без действительной самоподписи\n"
+#~ msgstr[1] "обнаружены %d ID пользователя без действительной самоподписи\n"
+#~ msgstr[2] "обнаружено %d ID пользователя без действительной самоподписи\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "перемещение подписи ключа в нужное место\n"
+
+#~ msgid "%d day"
+#~ msgid_plural "%d days"
+#~ msgstr[0] "%d день"
+#~ msgstr[1] "%d дня"
+#~ msgstr[2] "%d дней"
+
+#  I believe the translation produces an equivalent Russian output
+#  for that code snippet in g10/tofu.c -- ineiev
+#~ msgid "TOFU: few signatures %d message %s"
+#~ msgid_plural "TOFU: few signatures %d messages %s"
+#~ msgstr[0] ""
+#~ "Внимание: если Вы думаете, что видели больше %d сообщения, подписанного "
+#~ "этим ключом, то этот ключ может быть подделкой! Проверьте внимательно, не "
+#~ "внесены ли в адрес электронной почты небольшие изменения (напр., "
+#~ "дополнительные пробелы). В случае подозрений отметьте его как плохой с "
+#~ "помощью '%s'.\n"
+#~ " "
+#~ msgstr[1] ""
+#~ "Внимание: если Вы думаете, что видели больше %d сообщений, подписанных "
+#~ "этим ключом, то этот ключ может быть подделкой! Проверьте внимательно, не "
+#~ "внесены ли в адрес электронной почты небольшие изменения (напр., "
+#~ "дополнительные пробелы). В случае подозрений отметьте его как плохой с "
+#~ "помощью '%s'.\n"
+#~ " "
+#~ msgstr[2] ""
+#~ "Внимание: если Вы думаете, что видели больше %d сообщений, подписанных "
+#~ "этим ключом, то этот ключ может быть подделкой! Проверьте внимательно, не "
+#~ "внесены ли в адрес электронной почты небольшие изменения (напр., "
+#~ "дополнительные пробелы). В случае подозрений отметьте его как плохой с "
+#~ "помощью '%s'.\n"
+#~ " "
+
 #~ msgid "key specification '%s' is ambiguous\n"
 #~ msgstr "спецификация ключа '%s' неоднозначна\n"
 
@@ -8504,11 +8640,6 @@ msgstr ""
 #~ msgstr "не могу открыть '%s': %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "недопустимое значение\n"
-
-#, fuzzy
 #~| msgid "error locking keybox: %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "ошибка блокировки щита с ключами: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 65742d5..3bf2c2b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -382,7 +382,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -482,6 +482,10 @@ msgid "directory '%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
@@ -734,9 +738,9 @@ msgstr "chyba pri vytv
 msgid "error forking process: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "aktualiz�cia zlyhala: %s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -754,6 +758,10 @@ msgstr "chyba pri 
 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"
@@ -774,6 +782,10 @@ msgstr "zru
 msgid "problem with the agent\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "probl�m s agentom: agent vracia 0x%lx\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nem�em vypn�� vytv�ranie core s�borov: %s\n"
@@ -830,6 +842,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1106,10 +1122,6 @@ msgstr "nespracovan
 msgid "invalid option \"%.50s\"\n"
 msgstr "neplatn� parameter pre import\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "n�jden� chyba v programe ... (%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
@@ -1213,6 +1225,11 @@ msgstr ""
 "neplatn� znak (quoted-printable) v ASCII k�dovan� - pravdepodobne bol "
 "pou�it� nespr�vny MTA\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "nie je v priamo �itate�nom form�te"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1230,12 +1247,22 @@ msgstr "hodnota mus
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
 
+#, fuzzy
+msgid "a notation name may not contain an '=' character\n"
+msgstr "hodnota mus� obsahova� znak '@'\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"meno m�e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
+"kon�i� s '='\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
 
-msgid "not human readable"
-msgstr "nie je v priamo �itate�nom form�te"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1330,10 +1357,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -1670,16 +1693,16 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
 #, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s za�ifrovan� pre: %s\n"
+
+#, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
 #, c-format
-msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s za�ifrovan� pre: %s\n"
-
-#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� d�ta\n"
 
@@ -1971,7 +1994,7 @@ msgstr "|algo [s
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2989,11 +3012,27 @@ msgid "[self-signature]"
 msgstr "[podpis k���a n�m sam�m]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d zl�ch podpisov\n"
-msgstr[1] "%d zl�ch podpisov\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
+
+#, fuzzy, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "%s podpis, hashovac� algoritmus %s\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "Dobr� podpis od \""
+
+#, fuzzy, c-format
+msgid "key %s:\n"
+msgstr "presko�en� `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "U��vate�sk� ID \"%s\" je revokovan�."
+msgstr[1] "U��vate�sk� ID \"%s\" je revokovan�."
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -3003,20 +3042,23 @@ msgstr[0] "1 podpis neoveren
 msgstr[1] "1 podpis neoveren�, preto�e ch�ba k���\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 podpis neoveren�, preto�e vznikla chyba\n"
-msgstr[1] "1 podpis neoveren�, preto�e vznikla chyba\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d zl�ch podpisov\n"
+msgstr[1] "%d zl�ch podpisov\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] ""
-"zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
-msgstr[1] ""
-"zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Dobr� podpis od \""
+msgstr[1] "Dobr� podpis od \""
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -3239,9 +3281,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "pres�vam podpis k���a na spr�vne miesto\n"
-
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
@@ -3520,6 +3559,11 @@ msgstr "chyba: neplatn
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "nem�em inicializova� datab�zu d�very: %s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "neplatn� hodnota\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4339,6 +4383,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d zl�ch podpisov\n"
 msgstr[1] "%d zl�ch podpisov\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 podpis neoveren�, preto�e vznikla chyba\n"
+msgstr[1] "1 podpis neoveren�, preto�e vznikla chyba\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5559,14 +5610,14 @@ msgstr "z
 msgid "trustdb transaction too large\n"
 msgstr "transakcia s datab�zou d�very je pr�li� dlh�\n"
 
-#, fuzzy, c-format
-msgid "can't access '%s': %s\n"
-msgstr "nem�em zavrie� `%s': %s\n"
-
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adres�r neexistuje!\n"
 
+#, fuzzy, c-format
+msgid "can't access '%s': %s\n"
+msgstr "nem�em zavrie� `%s': %s\n"
+
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodarilo sa vytvori� z�znam verzie: %s"
@@ -5712,8 +5763,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5802,39 +5853,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5843,20 +5896,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|algo [s�bory]|vyp� hash"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5870,12 +5925,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8766,6 +8828,21 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "n�jden� chyba v programe ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] ""
+#~ "zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
+#~ msgstr[1] ""
+#~ "zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "pres�vam podpis k���a na spr�vne miesto\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "%d podpisov neoveren�ch, preto�e ch�ba k���\n"
 
@@ -8860,11 +8937,6 @@ msgstr ""
 #~ msgstr "nem�em otvori� `%s': %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "neplatn� hodnota\n"
-
-#, fuzzy
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
 
diff --git a/po/sv.po b/po/sv.po
index 93aad23..a88dd81 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -428,7 +428,7 @@ msgstr "tillåt klienter att markera nycklar som \"trusted\""
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -535,6 +535,12 @@ msgstr "%s: kan inte skapa katalog: %s\n"
 msgid "directory '%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
+# Extension är vad? FIXME
+#, fuzzy, c-format
+#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
+
 #, fuzzy, c-format
 #| msgid "stat() failed for `%s': %s\n"
 msgid "stat() failed for '%s': %s\n"
@@ -811,8 +817,9 @@ msgstr "fel när ett rör skapades: %s\n"
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %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 "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 
 #, fuzzy, c-format
@@ -834,6 +841,10 @@ msgstr "fel vid körning av \"%s\": avslutades\n"
 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"
@@ -851,6 +862,11 @@ msgstr "avbruten av användaren\n"
 msgid "problem with the agent\n"
 msgstr "problem med agenten\n"
 
+#, fuzzy, c-format
+#| msgid "problem with the agent: %s\n"
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problem med agenten: %s\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte stänga av minnesutskrifter: %s\n"
@@ -908,6 +924,10 @@ msgid "out of core while allocating %lu bytes"
 msgstr "slut på kärna vid allokering av %lu byte"
 
 #, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
+
+#, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
 
@@ -1158,10 +1178,6 @@ msgstr "slut på minne\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "ogiltig flagga \"%.50s\"\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
-
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' not available\n"
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1272,6 +1288,11 @@ msgstr ""
 "beror sannolikt på att en felaktig e-postserver eller e-postklient har "
 "använts\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "inte läsbart"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1288,12 +1309,23 @@ msgstr "ett notationsnamn får inte innehålla fler än ett \"@\"-tecken\n"
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte använda några styrtecken\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr "ett notationsnamn får inte innehålla fler än ett \"@\"-tecken\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
+"sluta med ett \"'=\"\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-msgid "not human readable"
-msgstr "inte läsbart"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "misslyckades med att förmedla %s-begäran till klient\n"
@@ -1381,10 +1413,6 @@ msgstr "Url för att hämta publik nyckel: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
 
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
-
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
@@ -1731,14 +1759,14 @@ msgstr ""
 "tvinga symmetriskt chiffer med %s (%d) strider mot mottagarinställningarna\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "du kan inte använda %s när du är i %s-läget\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "du kan inte använda %s när du är i %s-läget\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-krypterad data\n"
 
@@ -2024,7 +2052,7 @@ msgstr "skriv ut kontrollsummor"
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -3074,11 +3102,32 @@ msgid "[self-signature]"
 msgstr "[självsignatur]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d felaktiga signaturer\n"
-msgstr[1] "%d felaktiga signaturer\n"
+#| 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"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
+
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "Korrekt signatur från"
+
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "hoppade över \"%s\": %s\n"
+
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
+msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -3088,18 +3137,24 @@ msgstr[0] "1 signatur validerades inte eftersom nyckeln saknades\n"
 msgstr[1] "1 signatur validerades inte eftersom nyckeln saknades\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 signatur validerades inte eftersom ett fel uppstod\n"
-msgstr[1] "1 signatur validerades inte eftersom ett fel uppstod\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d felaktiga signaturer\n"
+msgstr[1] "%d felaktiga signaturer\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "%d användaridentiteter utan giltiga självsignaturer hittades\n"
-msgstr[1] "%d användaridentiteter utan giltiga självsignaturer hittades\n"
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Korrekt signatur från"
+msgstr[1] "Korrekt signatur från"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3300,9 +3355,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "fel när lösenfras skapades: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
-
 msgid "save and quit"
 msgstr "spara och avsluta"
 
@@ -3574,6 +3626,11 @@ msgstr "ogiltigt fingeravtryck"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "misslyckades med att få fingeravtrycket\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "ogiltigt värde\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4412,6 +4469,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d felaktiga signaturer\n"
 msgstr[1] "%d felaktiga signaturer\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 signatur validerades inte eftersom ett fel uppstod\n"
+msgstr[1] "1 signatur validerades inte eftersom ett fel uppstod\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5675,16 +5739,16 @@ msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion för stor\n"
 
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: katalogen finns inte!\n"
+
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "kan inte komma åt \"%s\": %s\n"
 
 #, c-format
-msgid "%s: directory does not exist!\n"
-msgstr "%s: katalogen finns inte!\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
@@ -5832,8 +5896,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5926,39 +5990,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5967,20 +6033,23 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "skriv ut kontrollsummor"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5994,12 +6063,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -9139,6 +9215,19 @@ msgstr ""
 "Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
 "Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "%d användaridentiteter utan giltiga självsignaturer hittades\n"
+#~ msgstr[1] "%d användaridentiteter utan giltiga självsignaturer hittades\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
+
 #, fuzzy
 #~| msgid "option \"%.50s\" is ambiguous\n"
 #~ msgid "key specification '%s' is ambiguous\n"
@@ -9241,11 +9330,6 @@ msgstr ""
 #~ msgstr "misslyckades med att öppna \"%s\": %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "ogiltigt värde\n"
-
-#, fuzzy
 #~| msgid "error reading secret keyblock \"%s\": %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "fel vid läsning av hemligt nyckelblock \"%s\": %s\n"
diff --git a/po/tr.po b/po/tr.po
index d41d2b2..c9417fb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -397,7 +397,7 @@ msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -503,6 +503,11 @@ msgid "directory '%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
 #, fuzzy, c-format
+#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
+
+#, fuzzy, c-format
 #| msgid "stat() failed for `%s': %s\n"
 msgid "stat() failed for '%s': %s\n"
 msgstr "%s için stat() başarısız oldu: %s\n"
@@ -777,8 +782,9 @@ msgstr "boru oluşturulurken hata: %s\n"
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %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 "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
 #, fuzzy, c-format
@@ -800,6 +806,10 @@ msgstr "`%s' çalışırken hata: sonlandırıldı\n"
 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"
@@ -817,6 +827,11 @@ msgstr "kullanıcı tarafından iptal edildi\n"
 msgid "problem with the agent\n"
 msgstr "aracı ile sorun var\n"
 
+#, fuzzy, c-format
+#| msgid "problem with the agent: %s\n"
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "aracı ile sorun var: %s\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
@@ -873,6 +888,10 @@ msgid "out of core while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
 
 #, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "yeterli bellek ayrılırken hata: %s\n"
+
+#, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
 
@@ -1129,10 +1148,6 @@ msgstr "nüve dışında\n"
 msgid "invalid option \"%.50s\"\n"
 msgstr "geçersiz seçenekler \"%.50s\"\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
-
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' not available\n"
 msgid "conversion from '%s' to '%s' not available\n"
@@ -1238,6 +1253,11 @@ msgstr ""
 "zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
 "sunucusu kullanılmış\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "insan okuyabilir değil"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1254,12 +1274,23 @@ msgstr "bir simgelem isminin birden fazla '@' karakteri içermemesi gerekir\n"
 msgid "a notation value must not use any control characters\n"
 msgstr "bir simgelem değerinde kontrol karakterleri kullanılamaz\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr "bir simgelem isminin birden fazla '@' karakteri içermemesi gerekir\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"bir simgelem ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
+"sonuna bir '=' gelir.\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
 
-msgid "not human readable"
-msgstr "insan okuyabilir değil"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1347,10 +1378,6 @@ msgstr "genel anahtarın alınacağı URL: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
 
-#, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "yeterli bellek ayrılırken hata: %s\n"
-
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
@@ -1680,14 +1707,14 @@ msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
@@ -1970,7 +1997,7 @@ msgstr "ileti özetlerini gösterir"
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -3007,11 +3034,32 @@ msgid "[self-signature]"
 msgstr "[öz-imza]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d kötü imza\n"
-msgstr[1] "%d kötü imza\n"
+#| 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"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "kart %s özet algoritmasını desteklemiyor\n"
+
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "Buradaki imzeler iyi:"
+
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "\"%s\" atlandı: %s\n"
+
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
+msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -3021,18 +3069,24 @@ msgstr[0] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 msgstr[1] "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 imza bir hata yüzünden kontrol edilmedi\n"
-msgstr[1] "1 imza bir hata yüzünden kontrol edilmedi\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d kötü imza\n"
+msgstr[1] "%d kötü imza\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
-msgstr[1] "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Buradaki imzeler iyi:"
+msgstr[1] "Buradaki imzeler iyi:"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3236,9 +3290,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "bir anahtar imzası doğru yere taşınıyor\n"
-
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
@@ -3521,6 +3572,11 @@ msgstr "parmakizi geçersiz"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "parmakizinin alınması başarısız oldu\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "değer hatalı\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4363,6 +4419,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d kötü imza\n"
 msgstr[1] "%d kötü imza\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 imza bir hata yüzünden kontrol edilmedi\n"
+msgstr[1] "1 imza bir hata yüzünden kontrol edilmedi\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5601,16 +5664,16 @@ msgstr "güvence veritabanı %lu kaydı: yazma başarısız (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "güvence veritabanı işlemi çok uzun\n"
 
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: dizin yok!\n"
+
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "'%s' erişilemiyor: %s\n"
 
 #, c-format
-msgid "%s: directory does not exist!\n"
-msgstr "%s: dizin yok!\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
 
@@ -5759,8 +5822,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5853,39 +5916,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "boru oluşturulurken hata: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5894,20 +5959,23 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "ileti özetlerini gösterir"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5921,12 +5989,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -9045,6 +9120,19 @@ msgstr ""
 "Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
 "karşılaştırır\n"
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
+#~ msgstr[1] "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "bir anahtar imzası doğru yere taşınıyor\n"
+
 #, fuzzy
 #~| msgid "option \"%.50s\" is ambiguous\n"
 #~ msgid "key specification '%s' is ambiguous\n"
@@ -9145,11 +9233,6 @@ msgstr ""
 #~ msgstr "`%s' açılamadı: %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "değer hatalı\n"
-
-#, fuzzy
 #~| msgid "error reading secret keyblock \"%s\": %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
diff --git a/po/uk.po b/po/uk.po
index 269de99..b2d6860 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -366,7 +366,9 @@ msgstr "заборонити клієнтам позначати ключі як
 msgid "allow presetting passphrase"
 msgstr "дозволити попереднє встановлення пароля"
 
-msgid "allow caller to override the pinentry"
+#, fuzzy
+#| msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr "дозволити функції виклику перевизначати pinentry"
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -452,6 +454,11 @@ msgstr "не вдалося створити каталог «%s»: %s\n"
 msgid "directory '%s' created\n"
 msgstr "створено каталог «%s»\n"
 
+#, fuzzy, c-format
+#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "Увага: визначення прав доступу не є безпечним для %s — «%s»\n"
+
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "помилка stat() щодо «%s»: %s\n"
@@ -714,8 +721,9 @@ msgstr "помилка під час спроби створення поток
 msgid "error forking process: %s\n"
 msgstr "помилка під час спроби розгалужування процесу: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %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
@@ -736,6 +744,10 @@ 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"
 
@@ -751,6 +763,11 @@ msgstr "скасовано користувачем\n"
 msgid "problem with the agent\n"
 msgstr "проблема з агентом\n"
 
+#, fuzzy, c-format
+#| msgid "problem with the agent: %s\n"
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "проблема з агентом: %s\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "не вдалося вимкнути створення дампів образів у пам’яті: %s\n"
@@ -808,6 +825,10 @@ msgid "out of core while allocating %lu bytes"
 msgstr "вихід за межі області під час спроби отримання %lu байтів"
 
 #, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "помилка під час спроби розподілу пам’яті: %s\n"
+
+#, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: застарілий параметр «%s» — він не працюватиме\n"
 
@@ -1046,10 +1067,6 @@ msgid "invalid option \"%.50s\"\n"
 msgstr "некоректний параметр «%.50s»\n"
 
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "ви виявили ваду… (%s:%d)\n"
-
-#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "перетворення з «%s» у «%s» недоступне\n"
 
@@ -1149,6 +1166,11 @@ msgstr ""
 "символи quoted printable у кодуванні ASCII — ймовірно, використано "
 "помилковий MTA\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "незручне для читання"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1165,12 +1187,23 @@ msgstr "назва примітки не повинна містити біль
 msgid "a notation value must not use any control characters\n"
 msgstr "у значенні примітки не повинно міститися керівних символів\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr "назва примітки не повинна містити більше за один символ «@»\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+"назва примітки має складатися з друкованих символів або пробілів і "
+"завершуватися символом «=»\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "УВАГА: виявлено некоректні дані примітки\n"
 
-msgid "not human readable"
-msgstr "незручне для читання"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "не вдалося пропустити через проксі запит %s до клієнта\n"
@@ -1258,10 +1291,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Помилка: адреса є занадто довгою (максимум — %d символів).\n"
 
 #, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "помилка під час спроби розподілу пам’яті: %s\n"
-
-#, c-format
 msgid "error reading '%s': %s\n"
 msgstr "помилка під час спроби читання «%s»: %s\n"
 
@@ -1583,14 +1612,14 @@ msgstr ""
 "отримувача\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "не можна використовувати %s у режимі %s\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для «%s»\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "не можна використовувати %s у режимі %s\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "Дані, зашифровані за алгоритмом %s\n"
 
@@ -1861,7 +1890,9 @@ msgstr "показати контрольні суми повідомлень"
 msgid "run in server mode"
 msgstr "запустити у режимі сервера"
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+#, fuzzy
+#| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr "встановити правила TOFU для ключа (good, unknown, bad, ask, auto)"
 
 msgid "create ascii armored output"
@@ -2862,12 +2893,33 @@ msgid "[self-signature]"
 msgstr "[самопідпис]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d помилкових підписів\n"
-msgstr[1] "%d помилкових підписів\n"
-msgstr[2] "%d помилкових підписів\n"
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "ключ %s: непідтримуваний алгоритм створення відкритого ключа\n"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "карткою не підтримується алгоритм контрольних сум %s\n"
+
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "Правильний підпис від"
+
+#, fuzzy, c-format
+#| msgid "key %s: %s\n"
+msgid "key %s:\n"
+msgstr "ключ %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "Ідентифікатор користувача «%s»: вилучено %d підпис\n"
+msgstr[1] "Ідентифікатор користувача «%s»: вилучено %d підпис\n"
+msgstr[2] "Ідентифікатор користувача «%s»: вилучено %d підпис\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2878,23 +2930,26 @@ msgstr[1] "1 підпис не перевірено через те, що нем
 msgstr[2] "1 підпис не перевірено через те, що немає ключа\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "1 підпис не перевірено через помилку\n"
-msgstr[1] "1 підпис не перевірено через помилку\n"
-msgstr[2] "1 підпис не перевірено через помилку\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d помилкових підписів\n"
+msgstr[1] "%d помилкових підписів\n"
+msgstr[2] "%d помилкових підписів\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] ""
-"виявлено %d ідентифікаторів користувачів без коректних самопідписів\n"
-msgstr[1] ""
-"виявлено %d ідентифікаторів користувачів без коректних самопідписів\n"
-msgstr[2] ""
-"виявлено %d ідентифікаторів користувачів без коректних самопідписів\n"
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "Правильний підпис від"
+msgstr[1] "Правильний підпис від"
+msgstr[2] "Правильний підпис від"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3093,9 +3148,6 @@ msgstr ""
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "ключ %s: помилка під час спроби зміни пароля: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "пересування підпису ключа у належне місце\n"
-
 msgid "save and quit"
 msgstr "зберегти і вийти"
 
@@ -3353,6 +3405,11 @@ msgstr "«%s» не є відбитком\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "«%s» не є основним відбитком\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "некоректне значення\n"
+
 msgid "No matching user IDs."
 msgstr "Немає відповідних ідентифікаторів користувачів."
 
@@ -4160,6 +4217,14 @@ msgstr[1] "%d добрих підписів\n"
 msgstr[2] "%d добрих підписів\n"
 
 #, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "1 підпис не перевірено через помилку\n"
+msgstr[1] "1 підпис не перевірено через помилку\n"
+msgstr[2] "1 підпис не перевірено через помилку\n"
+
+#, fuzzy, c-format
 #| msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5398,14 +5463,14 @@ msgid "trustdb transaction too large\n"
 msgstr "занадто велика операція trustdb\n"
 
 #, c-format
-msgid "can't access '%s': %s\n"
-msgstr "немає доступу до «%s»: %s\n"
-
-#, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталогу не існує!\n"
 
 #, c-format
+msgid "can't access '%s': %s\n"
+msgstr "немає доступу до «%s»: %s\n"
+
+#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: не вдалося створити запис щодо версії: %s"
 
@@ -5552,8 +5617,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5652,44 +5717,46 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "помилка під час спроби створення каналу: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5699,20 +5766,23 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "показати контрольні суми повідомлень"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -5727,12 +5797,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -8555,6 +8632,23 @@ msgstr ""
 "Синтаксис: gpg-check-pattern [параметри] файл_шаблонів\n"
 "Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "ви виявили ваду… (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] ""
+#~ "виявлено %d ідентифікаторів користувачів без коректних самопідписів\n"
+#~ msgstr[1] ""
+#~ "виявлено %d ідентифікаторів користувачів без коректних самопідписів\n"
+#~ msgstr[2] ""
+#~ "виявлено %d ідентифікаторів користувачів без коректних самопідписів\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "пересування підпису ключа у належне місце\n"
+
 #, fuzzy
 #~| msgid "option \"%.50s\" is ambiguous\n"
 #~ msgid "key specification '%s' is ambiguous\n"
@@ -8662,11 +8756,6 @@ msgstr ""
 #~ msgstr "текстовий пароль кешовано з ідентифікатором: %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "некоректне значення\n"
-
-#, fuzzy
 #~| msgid "error locking keybox: %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "помилка під час блокування сховища ключів: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c33a05d..3d5f8bc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -391,7 +391,7 @@ msgstr ""
 msgid "allow presetting passphrase"
 msgstr "生成密码的时候发生错误:%s\n"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -491,6 +491,10 @@ msgid "directory '%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "警告:扩展模块‘%s’权限不安全\n"
+
+#, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错:%s\n"
 
@@ -745,9 +749,9 @@ msgstr "生成密码的时候发生错误:%s\n"
 msgid "error forking process: %s\n"
 msgstr "读取‘%s’时出错:%s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "更新失败:%s\n"
 
 #, fuzzy, c-format
 msgid "error running '%s': probably not installed\n"
@@ -765,6 +769,10 @@ msgstr "读取‘%s’时出错:%s\n"
 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"
@@ -784,6 +792,10 @@ msgstr "用户取消\n"
 msgid "problem with the agent\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
+#, fuzzy, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "代理程序有问题――正在停用代理程序\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "无法禁用核心内存转储:%s\n"
@@ -839,6 +851,10 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "建立钥匙环‘%s’时发生错误:%s\n"
+
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
@@ -1117,10 +1133,6 @@ msgstr "可选"
 msgid "invalid option \"%.50s\"\n"
 msgstr "无效的列表选项\n"
 
-#, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "您找到一个程序缺陷了……(%s:%d)\n"
-
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
@@ -1220,6 +1232,10 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
 
+#, c-format
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr ""
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1234,13 +1250,16 @@ msgstr ""
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
+msgid "a notation name may not contain an '=' character\n"
+msgstr ""
+
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr ""
+
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "找不到有效的 OpenPGP 数据。\n"
 
-msgid "not human readable"
-msgstr ""
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
@@ -1329,10 +1348,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误:URL 太长(至多 %d 个字符)\n"
 
 #, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "建立钥匙环‘%s’时发生错误:%s\n"
-
-#, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "读取‘%s’时出错:%s\n"
@@ -1656,14 +1671,14 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "您不该将 %s 用于 %s 模式中\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给:“%s”\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "您不该将 %s 用于 %s 模式中\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
@@ -1943,7 +1958,7 @@ msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 msgid "run in server mode"
 msgstr ""
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2953,11 +2968,30 @@ msgid "[self-signature]"
 msgstr "[自身签名]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d 个损坏的签名\n"
-msgstr[1] "%d 个损坏的签名\n"
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "密钥 %s:不支持的公钥算法\n"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "卡不支持散列算法 %s\n"
+
+#, fuzzy
+msgid " (reordered signatures follow)"
+msgstr "完好的签名,来自于“%s”"
+
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s:\n"
+msgstr "“%s”已跳过:%s\n"
+
+#, fuzzy, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "密钥 %s:“%s”%d 个签名被清除\n"
+msgstr[1] "密钥 %s:“%s”%d 个签名被清除\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2967,18 +3001,23 @@ msgstr[0] "有 1 份签名因为遗失密钥而未被检查\n"
 msgstr[1] "有 1 份签名因为遗失密钥而未被检查\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "有 1 份签名因为某个错误而未被检查\n"
-msgstr[1] "有 1 份签名因为某个错误而未被检查\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d 个损坏的签名\n"
+msgstr[1] "%d 个损坏的签名\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "检测到 %d 个没有有效自身签名的用户标识\n"
-msgstr[1] "检测到 %d 个没有有效自身签名的用户标识\n"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "完好的签名,来自于“%s”"
+msgstr[1] "完好的签名,来自于“%s”"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3168,9 +3207,6 @@ msgstr "只有占位密钥,或者密钥存储在卡上——没有密码可以
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "生成密码的时候发生错误:%s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "正在把密钥的签名移动到正确的位置去\n"
-
 msgid "save and quit"
 msgstr "保存并离开"
 
@@ -3428,6 +3464,11 @@ msgstr "指纹无效"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "无法存储指纹:%s\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "无效的数值\n"
+
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
@@ -4229,6 +4270,13 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d 个损坏的签名\n"
 msgstr[1] "%d 个损坏的签名\n"
 
+#, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "有 1 份签名因为某个错误而未被检查\n"
+msgstr[1] "有 1 份签名因为某个错误而未被检查\n"
+
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5410,16 +5458,16 @@ msgstr "信任度数据库记录 %lu:write 失败 (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "信任度数据库处理量过大\n"
 
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s:目录不存在!\n"
+
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "无法存取‘%s’:%s\n"
 
 #, c-format
-msgid "%s: directory does not exist!\n"
-msgstr "%s:目录不存在!\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s:建立版本记录失败:%s"
 
@@ -5564,8 +5612,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5655,39 +5703,41 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "生成密码的时候发生错误:%s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5696,20 +5746,22 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -5723,12 +5775,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -8634,6 +8693,19 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "您找到一个程序缺陷了……(%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "检测到 %d 个没有有效自身签名的用户标识\n"
+#~ msgstr[1] "检测到 %d 个没有有效自身签名的用户标识\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "正在把密钥的签名移动到正确的位置去\n"
+
 #~ msgid "%d signatures not checked due to missing keys\n"
 #~ msgstr "有 %d 份签名因为遗失密钥而未被检查\n"
 
@@ -8723,11 +8795,6 @@ msgstr ""
 #~ msgstr "无法打开‘%s’:%s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "无效的数值\n"
-
-#, fuzzy
 #~| msgid "error reading secret keyblock \"%s\": %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "读取私钥区块“%s”时出错:%s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a0879c1..22aebfa 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -370,7 +370,7 @@ msgstr "不允許用戶端將金鑰標記為 \"已信任\""
 msgid "allow presetting passphrase"
 msgstr "允許預先設定密語"
 
-msgid "allow caller to override the pinentry"
+msgid "disallow caller to override the pinentry"
 msgstr ""
 
 msgid "allow passphrase to be prompted through Emacs"
@@ -456,6 +456,11 @@ msgstr "無法建立目錄 '%s': %s\n"
 msgid "directory '%s' created\n"
 msgstr "目錄 '%s' 已建立\n"
 
+#, fuzzy, c-format
+#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "can't set permissions of '%s': %s\n"
+msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
+
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s' 的 stat() 失敗: %s\n"
@@ -705,8 +710,9 @@ msgstr "建立管道串流時出錯: %s\n"
 msgid "error forking process: %s\n"
 msgstr "衍生執行程序時出錯: %s\n"
 
-#, c-format
-msgid "waiting for process %d to terminate failed: %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
@@ -726,6 +732,10 @@ 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"
 
@@ -741,6 +751,11 @@ msgstr "由使用者取消\n"
 msgid "problem with the agent\n"
 msgstr "代理程式的問題\n"
 
+#, fuzzy, c-format
+#| msgid "problem with the agent: %s\n"
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "代理程式的問題: %s\n"
+
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
@@ -797,6 +812,10 @@ msgid "out of core while allocating %lu bytes"
 msgstr "配置 %lu 位元組時超出核心"
 
 #, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "配置足夠的記憶體時出錯: %s\n"
+
+#, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
 
@@ -1037,10 +1056,6 @@ msgid "invalid option \"%.50s\"\n"
 msgstr "無效的選項 \"%.50s\"\n"
 
 #, c-format
-msgid "you found a bug ... (%s:%d)\n"
-msgstr "你找到一個瑕疵了 ... (%s:%d)\n"
-
-#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "沒有從 '%s' 到 '%s' 之間的轉換可用\n"
 
@@ -1138,6 +1153,11 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 
+#, fuzzy, c-format
+#| msgid "not human readable"
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "不是人類能讀得懂的"
+
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1152,12 +1172,21 @@ msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
 msgid "a notation value must not use any control characters\n"
 msgstr "標記值一定不能使用任何的控制字符\n"
 
+#, fuzzy
+#| msgid "a notation name must not contain more than one '@' character\n"
+msgid "a notation name may not contain an '=' character\n"
+msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
+
+#, fuzzy
+#| msgid ""
+#| "a notation name must have only printable characters or spaces, and end "
+#| "with an '='\n"
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
+
 msgid "WARNING: invalid notation data found\n"
 msgstr "警告: 找到無效的標記資料\n"
 
-msgid "not human readable"
-msgstr "不是人類能讀得懂的"
-
 #, c-format
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "以 %s 代理伺服器查詢用戶端時失敗\n"
@@ -1244,10 +1273,6 @@ msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 
 #, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "配置足夠的記憶體時出錯: %s\n"
-
-#, c-format
 msgid "error reading '%s': %s\n"
 msgstr "讀取 '%s' 時出錯: %s\n"
 
@@ -1561,14 +1586,14 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
 #, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "你不能夠將 %s 用於 %s 模式中\n"
-
-#, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已加密給: \"%s\"\n"
 
 #, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "你不能夠將 %s 用於 %s 模式中\n"
+
+#, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 已加密的資料\n"
 
@@ -1831,7 +1856,7 @@ msgstr "印出訊息摘要"
 msgid "run in server mode"
 msgstr "以伺服器模式執行"
 
-msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
+msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
 msgid "create ascii armored output"
@@ -2791,10 +2816,31 @@ msgid "[self-signature]"
 msgstr "[自我簽章]"
 
 #, fuzzy, c-format
-#| msgid "%d bad signatures\n"
-msgid "%d bad signature\n"
-msgid_plural "%d bad signatures\n"
-msgstr[0] "%d 份損壞的簽章\n"
+#| msgid "key %s: unsupported public key algorithm\n"
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr "金鑰 %s: 未支援的公鑰演算法\n"
+
+#, fuzzy, c-format
+#| msgid "card does not support digest algorithm %s\n"
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr "卡片不支援 %s 摘要演算法\n"
+
+#, fuzzy
+#| msgid "Good signature from"
+msgid " (reordered signatures follow)"
+msgstr "完好的簽章來自於"
+
+#, fuzzy, c-format
+#| msgid "key %s: %s\n"
+msgid "key %s:\n"
+msgstr "金鑰 %s: %s\n"
+
+#, fuzzy, c-format
+#| msgid "User ID \"%s\": %d signature removed\n"
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
 #, fuzzy, c-format
 #| msgid "1 signature not checked due to a missing key\n"
@@ -2803,16 +2849,22 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
 #, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
-msgid "%d signature not checked due to an error\n"
-msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "有 1 份簽章因錯誤而未被檢查\n"
+#| msgid "%d bad signatures\n"
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d 份損壞的簽章\n"
 
 #, fuzzy, c-format
-#| msgid "%d user IDs without valid self-signatures detected\n"
-msgid "%d user ID without valid self-signature detected\n"
-msgid_plural "%d user IDs without valid self-signatures detected\n"
-msgstr[0] "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
+#| msgid "Good signature from"
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "完好的簽章來自於"
+
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
 
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -3003,9 +3055,6 @@ msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "金鑰 %s: 變更密語時出錯: %s\n"
 
-msgid "moving a key signature to the correct place\n"
-msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
-
 msgid "save and quit"
 msgstr "儲存並離開"
 
@@ -3252,6 +3301,11 @@ msgstr "\"%s\" 不是指紋\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" 不是主要指紋\n"
 
+#, fuzzy, c-format
+#| msgid "invalid value\n"
+msgid "Invalid user ID '%s': %s\n"
+msgstr "無效的數值\n"
+
 msgid "No matching user IDs."
 msgstr "沒有相符的使用者 ID."
 
@@ -4028,6 +4082,12 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d 份損壞的簽章\n"
 
 #, fuzzy, c-format
+#| msgid "1 signature not checked due to an error\n"
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "有 1 份簽章因錯誤而未被檢查\n"
+
+#, fuzzy, c-format
 #| msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@ -5191,14 +5251,14 @@ msgid "trustdb transaction too large\n"
 msgstr "信任資料庫更動量過大\n"
 
 #, c-format
-msgid "can't access '%s': %s\n"
-msgstr "無法存取 '%s': %s\n"
-
-#, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
 #, c-format
+msgid "can't access '%s': %s\n"
+msgstr "無法存取 '%s': %s\n"
+
+#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: 建立版本記錄失敗: %s"
 
@@ -5344,8 +5404,8 @@ msgstr ""
 
 #, c-format
 msgid ""
-"The key %s raised a conflict with this binding (%s).  Since this binding's "
-"policy was 'auto', it was changed to 'ask'."
+"The key with fingerprint %s raised a conflict with the binding %s.  Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
 
 #, c-format
@@ -5432,34 +5492,36 @@ msgstr ""
 msgid "error changing TOFU policy: %s\n"
 msgstr "建立管道時出錯: %s\n"
 
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
 #, c-format
-msgid "%d year"
-msgid_plural "%d years"
+msgid "%d~year"
+msgid_plural "%d~years"
 msgstr[0] ""
 
 #, c-format
-msgid "%d month"
-msgid_plural "%d months"
+msgid "%d~month"
+msgid_plural "%d~months"
 msgstr[0] ""
 
 #, c-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "%d~day"
+msgid_plural "%d~days"
 msgstr[0] ""
 
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d~hour"
+msgid_plural "%d~hours"
 msgstr[0] ""
 
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
+msgid "%d~minute"
+msgid_plural "%d~minutes"
 msgstr[0] ""
 
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
+msgid "%d~second"
+msgid_plural "%d~seconds"
 msgstr[0] ""
 
 #, c-format
@@ -5467,20 +5529,23 @@ msgid "Have never verified a message signed by key %s!\n"
 msgstr ""
 
 #, c-format
-msgid "Failed to collect signature statistics for \"%s\" (key %s)\n"
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
 msgstr ""
 
-#, c-format
-msgid "Verified 0 messages signed by \"%s\" (key: %s, policy: %s)."
-msgstr ""
+#, fuzzy, c-format
+#| msgid "print message digests"
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "印出訊息摘要"
 
-#. TRANSLATORS: The final %s is replaced by a string like
-#. "7 months, 1 day, 5 minutes, 0 seconds".
 #, c-format
 msgid ""
-"Verified %ld message signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
 msgid_plural ""
-"Verified %ld messages signed by \"%s\" (key: %s, policy: %s) in the past %s."
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
 msgstr[0] ""
 
 #, c-format
@@ -5493,12 +5558,19 @@ msgstr ""
 msgid "Warning: we've only seen a single message signed by this key!\n"
 msgstr ""
 
-#. TRANSLATORS: translate the below text.  We don't
-#. directly internationalize that text so that we can
-#. tweak it without breaking translations.
 #, c-format
-msgid "TOFU: few signatures %d message %s"
-msgid_plural "TOFU: few signatures %d messages %s"
+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"
 msgstr[0] ""
 
 #, fuzzy, c-format
@@ -8244,6 +8316,18 @@ msgstr ""
 "語法: gpg-check-pattern [選項] 樣式檔案\n"
 "用樣式檔案來檢查由標準輸入給定的密語\n"
 
+#~ msgid "you found a bug ... (%s:%d)\n"
+#~ msgstr "你找到一個瑕疵了 ... (%s:%d)\n"
+
+#, fuzzy
+#~| msgid "%d user IDs without valid self-signatures detected\n"
+#~ msgid "%d user ID without valid self-signature detected\n"
+#~ msgid_plural "%d user IDs without valid self-signatures detected\n"
+#~ msgstr[0] "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
+
+#~ msgid "moving a key signature to the correct place\n"
+#~ msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
+
 #, fuzzy
 #~| msgid "option \"%.50s\" is ambiguous\n"
 #~ msgid "key specification '%s' is ambiguous\n"
@@ -8339,11 +8423,6 @@ msgstr ""
 #~ msgstr "開啟 '%s' 失敗: %s\n"
 
 #, fuzzy
-#~| msgid "invalid value\n"
-#~ msgid "invalid value '%s'\n"
-#~ msgstr "無效的數值\n"
-
-#, fuzzy
 #~| msgid "error locking keybox: %s\n"
 #~ msgid "error looking up secret key \"%s\": %s\n"
 #~ msgstr "鎖住金鑰鑰匙盒時出錯: %s\n"

-- 
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