[Pkg-gnupg-commit] [gnupg2] 94/102: po: Auto-update

Daniel Kahn Gillmor dkg at fifthhorseman.net
Fri Jun 17 00:15:00 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 2ba8afb892e4306bfdaeaa3354dcd47d1de01373
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jun 16 17:19:42 2016 +0200

    po: Auto-update
    
    --
---
 po/ca.po    |  49 +++--
 po/cs.po    |  54 ++---
 po/da.po    |  54 ++---
 po/el.po    |  49 +++--
 po/eo.po    |  48 +++--
 po/es.po    |  54 ++---
 po/et.po    |  49 +++--
 po/fi.po    |  49 +++--
 po/fr.po    |  52 ++---
 po/gl.po    |  49 +++--
 po/hu.po    |  49 +++--
 po/id.po    |  49 +++--
 po/it.po    |  49 +++--
 po/ja.po    | 647 ++++++++++++++++++++++++++++++++----------------------------
 po/nb.po    |  48 +++--
 po/pl.po    |  54 ++---
 po/pt.po    |  48 +++--
 po/ro.po    |  50 +++--
 po/ru.po    | 103 +++++-----
 po/sk.po    |  49 +++--
 po/sv.po    |  56 +++---
 po/tr.po    |  54 ++---
 po/uk.po    | 150 ++++----------
 po/zh_CN.po |  50 +++--
 po/zh_TW.po |  52 ++---
 25 files changed, 1069 insertions(+), 946 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index e5fcd81..66b33de 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -492,6 +492,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\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 "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
@@ -509,10 +513,6 @@ 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"
 
@@ -2648,6 +2648,9 @@ msgstr "fes els conflictes de marques de temps només un avís"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpgv [opcions] [fitxers] (-h per a veure l'ajuda)"
 
@@ -4168,6 +4171,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "arrodonida fins a %u bits\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -4184,11 +4192,6 @@ msgstr "Quina grandària voleu? (1024) "
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "arrodonida fins a %u bits\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5913,14 +5916,6 @@ msgstr ""
 msgid "error updating TOFU database: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "no s'ha trobat la clau pública %08lX: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "error en la lectura de «%s»: %s\n"
-
 #, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
@@ -5999,14 +5994,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -6014,6 +6009,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
@@ -6175,6 +6174,10 @@ msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "no s'ha trobat la clau pública %08lX: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
@@ -6253,6 +6256,10 @@ msgstr "desconeguda"
 msgid "[  undef ]"
 msgstr ""
 
+#, fuzzy
+msgid "[  never ]"
+msgstr "mai       "
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 211fb54..855b825 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -464,6 +464,12 @@ msgstr "chyba při získávání soli pro socket\n"
 msgid "error binding socket to '%s': %s\n"
 msgstr "chyba při přilepování socketu na „%s“: %s\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 "listen() failed: %s\n"
 msgstr "volání listen() selhalo: %s\n"
@@ -480,12 +486,6 @@ 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"
@@ -2453,6 +2453,9 @@ msgstr "pouze varování při konfliktu časového razítka"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Použití: gpg [volby] [soubory] (-h pro pomoc)"
 
@@ -3853,6 +3856,10 @@ msgid "No key with this keygrip\n"
 msgstr "Klíč s takovým keygripem neexistuje\n"
 
 #, c-format
+msgid "rounded to %u bits\n"
+msgstr "zaokrouhleno na %u bitů\n"
+
+#, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "klíč %s může mít délku v intervalu %u až %u bitů.\n"
 
@@ -3868,10 +3875,6 @@ msgstr "Jakou délku klíče si přejete? (%u) "
 msgid "Requested keysize is %u bits\n"
 msgstr "Požadovaná délka klíče je %u bitů.\n"
 
-#, c-format
-msgid "rounded to %u bits\n"
-msgstr "zaokrouhleno na %u bitů\n"
-
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Prosím, vyberte, kterou eliptickou křivku chcete:\n"
 
@@ -5533,15 +5536,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "chyba při odesílání dat: %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "veřejný klíč %s nebyl nalezen: %s\n"
-
-#, fuzzy, c-format
-#| msgid "error setting OCSP target: %s\n"
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "chyba při nastavování cíle OCSP: %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
 
@@ -5628,14 +5622,14 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5643,6 +5637,11 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "error setting OCSP target: %s\n"
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "chyba při nastavování cíle OCSP: %s\n"
+
+#, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "chyba při vytváření roury: %s\n"
@@ -5807,6 +5806,10 @@ msgstr "není nutné kontrolovat databázi důvěry s modelem „%s“\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "není nutné aktualizovat databázi důvěry s modelem „%s“\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "veřejný klíč %s nebyl nalezen: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "prosím proveďte --check-trustdb\n"
 
@@ -5886,6 +5889,11 @@ msgstr "[  neznámá   ]"
 msgid "[  undef ]"
 msgstr "[nedefinovaná]"
 
+#, fuzzy
+#| msgid "never"
+msgid "[  never ]"
+msgstr "žádná"
+
 msgid "[marginal]"
 msgstr "[  částečná  ]"
 
diff --git a/po/da.po b/po/da.po
index 8dfdaaf..e7d4b68 100644
--- a/po/da.po
+++ b/po/da.po
@@ -499,6 +499,11 @@ msgstr "fejl ved indhentelse af nonce for soklen\n"
 msgid "error binding socket to '%s': %s\n"
 msgstr "fejl ved binding af sokkel til »%s«: %s\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"
+
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() mislykkedes: %s\n"
@@ -519,11 +524,6 @@ 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"
@@ -2593,6 +2593,9 @@ msgstr "giv kun tidsstempelkonflikter en advarsel"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation til denne FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Brug: gpgv [tilvalg] [filer] (-h for hjælp)"
 
@@ -4065,6 +4068,11 @@ msgstr "Ikke et gyldigt nøglegreb (forventer 40 hex cifre)\n"
 msgid "No key with this keygrip\n"
 msgstr "Ingen nøgle med dette nøglegreb\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "afrundet op til %u bit\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s nøgler kan være mellem %u og %u bit lange.\n"
@@ -4081,11 +4089,6 @@ msgstr "Hvilken nøglestørrelse ønsker du? (%u) "
 msgid "Requested keysize is %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "afrundet op til %u bit\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5783,15 +5786,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "fejl under afsendelse af %s-kommando: %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "offentlig nøgle %s blev ikke fundet: %s\n"
-
-#, fuzzy, c-format
-#| msgid "error storing flags: %s\n"
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "fejl ved lagring af flag: %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
 
@@ -5872,14 +5866,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5887,6 +5881,11 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "error storing flags: %s\n"
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "fejl ved lagring af flag: %s\n"
+
+#, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "fejl ved oprettelse af datakanal: %s\n"
@@ -6048,6 +6047,10 @@ msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "intet behov for en opdatering af trustdb med troværdighedsmodellen »%s«\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "offentlig nøgle %s blev ikke fundet: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "udfør venligst en --check-trustdb\n"
 
@@ -6126,6 +6129,11 @@ msgstr "[  ukendt]"
 msgid "[  undef ]"
 msgstr "[  ej def]"
 
+#, fuzzy
+#| msgid "never"
+msgid "[  never ]"
+msgstr "aldrig"
+
 msgid "[marginal]"
 msgstr "[marginal]"
 
diff --git a/po/el.po b/po/el.po
index 99373ad..7e3fcf2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -462,6 +462,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
@@ -479,10 +483,6 @@ 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"
 
@@ -2570,6 +2570,9 @@ msgstr "
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�����: gpgv [��������] [������] (-h ��� �������)"
 
@@ -4070,6 +4073,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "����������������� ��� �� %u bits\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -4086,11 +4094,6 @@ msgstr "
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "����������������� ��� �� %u bits\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5778,14 +5781,6 @@ msgstr ""
 msgid "error updating TOFU database: %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "�� ������� ������ %08lX ��� �������: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "������ ���� ��� �������� ��� `%s': %s\n"
-
 #, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
@@ -5864,14 +5859,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5879,6 +5874,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "������ ���� ��� �������� ��� `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
@@ -6034,6 +6033,10 @@ msgstr "
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "�� ������� ������ %08lX ��� �������: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "�������� ����� ��� --check-trustdb\n"
 
@@ -6112,6 +6115,10 @@ msgstr "
 msgid "[  undef ]"
 msgstr ""
 
+#, fuzzy
+msgid "[  never ]"
+msgstr "����     "
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/eo.po b/po/eo.po
index 02ee245..f8e64f5 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -463,6 +463,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\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 "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
@@ -479,10 +483,6 @@ 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"
 
@@ -2556,6 +2556,9 @@ msgstr "malkongruo de tempostampoj"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
@@ -4046,6 +4049,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "rondigita �is %u bitoj\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -4062,11 +4070,6 @@ msgstr "Kiun 
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "rondigita �is %u bitoj\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5724,14 +5727,6 @@ msgstr ""
 msgid "error updating TOFU database: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "publika �losilo %08lX ne trovita: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "eraro dum legado de '%s': %s\n"
-
 #, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
@@ -5810,14 +5805,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5825,6 +5820,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
@@ -5978,6 +5977,10 @@ msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "publika �losilo %08lX ne trovita: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
@@ -6054,6 +6057,9 @@ msgstr "nekonata versio"
 msgid "[  undef ]"
 msgstr ""
 
+msgid "[  never ]"
+msgstr ""
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 0d2ce38..385ea2b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -515,6 +515,11 @@ msgstr "error obteniendo valor 
 msgid "error binding socket to '%s': %s\n"
 msgstr "error enlazando el socket con `%s': %s\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"
+
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() fall�: %s\n"
@@ -535,11 +540,6 @@ 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"
@@ -2622,6 +2622,9 @@ msgstr "hacer que los conflictos de fecha-hora sean s
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opciones] [ficheros] (-h para ayuda)"
 
@@ -4066,6 +4069,11 @@ msgstr "No es un keygrip v
 msgid "No key with this keygrip\n"
 msgstr "No hay claves con ese keygrip\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "redondeados a %u bits\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
@@ -4082,11 +4090,6 @@ msgstr "
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "redondeados a %u bits\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5776,15 +5779,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "error enviando orden %s: %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "clave p�blica %s no encontrada: %s\n"
-
-#, fuzzy, c-format
-#| msgid "error storing flags: %s\n"
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "error almacenando par�metros: %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
 
@@ -5865,14 +5859,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5880,6 +5874,11 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "error storing flags: %s\n"
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "error almacenando par�metros: %s\n"
+
+#, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "error creando tuber�a: %s\n"
@@ -6044,6 +6043,10 @@ msgstr ""
 "no es necesario comprobar la base de datos de confianza\n"
 "con el modelo `%s'\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "clave p�blica %s no encontrada: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
@@ -6124,6 +6127,11 @@ msgstr "[desconocida]"
 msgid "[  undef ]"
 msgstr "[no definida]"
 
+#, fuzzy
+#| msgid "never"
+msgid "[  never ]"
+msgstr "nunca"
+
 msgid "[marginal]"
 msgstr "[   dudosa  ]"
 
diff --git a/po/et.po b/po/et.po
index c4a195b..4ca6566 100644
--- a/po/et.po
+++ b/po/et.po
@@ -460,6 +460,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
+
+#, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
@@ -477,10 +481,6 @@ 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"
 
@@ -2555,6 +2555,9 @@ msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kasuta: gpgv [v�tmed] [failid] (-h n�itab abiinfot)"
 
@@ -4031,6 +4034,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "�mardatud �les %u bitini\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -4047,11 +4055,6 @@ msgstr "Millist v
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "�mardatud �les %u bitini\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5703,14 +5706,6 @@ msgstr ""
 msgid "error updating TOFU database: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "ei leia avalikku v�tit %08lX: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
-
 #, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
@@ -5789,14 +5784,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5804,6 +5799,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
@@ -5957,6 +5956,10 @@ msgstr "trustdb kontrolliks puudub vajadus\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "ei leia avalikku v�tit %08lX: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
@@ -6034,6 +6037,10 @@ msgstr "tundmatu"
 msgid "[  undef ]"
 msgstr ""
 
+#, fuzzy
+msgid "[  never ]"
+msgstr "mitte kunagi"
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index de8dcf4..1b93bce 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -477,6 +477,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\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 "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
@@ -494,10 +498,6 @@ 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"
 
@@ -2571,6 +2571,9 @@ msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Käyttö: gpgv [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
@@ -4057,6 +4060,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "pyöristetty %u bittiin\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -4073,11 +4081,6 @@ msgstr "Minkä kokoisen avaimen haluat? (1024) "
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "pyöristetty %u bittiin\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5761,14 +5764,6 @@ msgstr ""
 msgid "error updating TOFU database: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "julkista avainta %08lX ei löydy: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-
 #, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
@@ -5847,14 +5842,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5862,6 +5857,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
@@ -6016,6 +6015,10 @@ msgstr "trustdb:n tarkistusta ei tarvita\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "julkista avainta %08lX ei löydy: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
@@ -6093,6 +6096,10 @@ msgstr "tuntematon "
 msgid "[  undef ]"
 msgstr ""
 
+#, fuzzy
+msgid "[  never ]"
+msgstr "ei koskaan"
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 0bd0e38..94ac188 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -461,6 +461,11 @@ msgstr "erreur de lecture du « nonce » de la socket\n"
 msgid "error binding socket to '%s': %s\n"
 msgstr "erreur de lien de la socket à « %s » : %s\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 "listen() failed: %s\n"
 msgstr "échec de listen() : %s\n"
@@ -477,11 +482,6 @@ 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"
@@ -2496,6 +2496,9 @@ msgstr "convertir les conflits de date en avertissements"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Utilisation : gpgv [options] [fichiers] (-h pour l'aide)"
 
@@ -3930,6 +3933,10 @@ msgid "No key with this keygrip\n"
 msgstr "Pas de clef avec ce keygrip\n"
 
 #, c-format
+msgid "rounded to %u bits\n"
+msgstr "arrondie à %u bits\n"
+
+#, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "les clefs %s peuvent faire une taille comprise entre %u et %u bits.\n"
 
@@ -3945,10 +3952,6 @@ msgstr "Quelle taille de clef désirez-vous ? (%u) "
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demandée est %u bits\n"
 
-#, c-format
-msgid "rounded to %u bits\n"
-msgstr "arrondie à %u bits\n"
-
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Sélectionnez le type de courbe elliptique désiré :\n"
 
@@ -5669,15 +5672,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "erreur d'envoi de données : %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "clef publique %s introuvable : %s\n"
-
-#, fuzzy, c-format
-#| msgid "error setting OCSP target: %s\n"
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "erreur de configuration de la cible OCSP : %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
 
@@ -5758,14 +5752,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5773,6 +5767,11 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "error setting OCSP target: %s\n"
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "erreur de configuration de la cible OCSP : %s\n"
+
+#, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "erreur de création d'un tube : %s\n"
@@ -5936,6 +5935,10 @@ msgstr ""
 "inutile de mettre à jour la base de confiance avec le modèle de\n"
 "     confiance « %s »\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "clef publique %s introuvable : %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "veuillez faire un --check-trustdb\n"
 
@@ -6014,6 +6017,11 @@ msgstr "[ inconnue]"
 msgid "[  undef ]"
 msgstr "[indéfinie]"
 
+#, fuzzy
+#| msgid "never"
+msgid "[  never ]"
+msgstr "jamais"
+
 msgid "[marginal]"
 msgstr "[marginale]"
 
diff --git a/po/gl.po b/po/gl.po
index 4293f23..915deaf 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -464,6 +464,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\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 "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
@@ -481,10 +485,6 @@ 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"
 
@@ -2565,6 +2565,9 @@ msgstr "converte-los conflictos de selo de data nun aviso"
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
@@ -4068,6 +4071,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "redondeado a %u bits\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -4084,11 +4092,6 @@ msgstr "
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "redondeado a %u bits\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5767,14 +5770,6 @@ msgstr ""
 msgid "error updating TOFU database: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "non se atopou a chave p�blica %08lX: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "erro lendo `%s': %s\n"
-
 #, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
@@ -5853,14 +5848,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5868,6 +5863,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
@@ -6022,6 +6021,10 @@ msgstr "non se precisa comproba-la base de datos de confianza\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "non se atopou a chave p�blica %08lX: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
@@ -6099,6 +6102,10 @@ msgstr "desco
 msgid "[  undef ]"
 msgstr ""
 
+#, fuzzy
+msgid "[  never ]"
+msgstr "nunca     "
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 21c66bc..a37b430 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -460,6 +460,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\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 "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
@@ -477,10 +481,6 @@ 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"
 
@@ -2553,6 +2553,9 @@ msgstr "id
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpgv [opci�k] [f�jlok] (-h a s�g�hoz)"
 
@@ -4033,6 +4036,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "Felkerek�tve %u bitre.\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -4049,11 +4057,6 @@ msgstr "Milyen kulcsm
 msgid "Requested keysize is %u bits\n"
 msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "Felkerek�tve %u bitre.\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5734,14 +5737,6 @@ msgstr ""
 msgid "error updating TOFU database: %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "Hiba \"%s\" olvas�sakor: %s\n"
-
 #, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
@@ -5820,14 +5815,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5835,6 +5830,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "Hiba \"%s\" olvas�sakor: %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
@@ -5989,6 +5988,10 @@ msgstr "Nincs sz
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
 
@@ -6066,6 +6069,10 @@ msgstr "Ismeretlen m
 msgid "[  undef ]"
 msgstr ""
 
+#, fuzzy
+msgid "[  never ]"
+msgstr "soha      "
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 619bfd5..04a3e98 100644
--- a/po/id.po
+++ b/po/id.po
@@ -465,6 +465,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\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 "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
@@ -482,10 +486,6 @@ 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"
 
@@ -2558,6 +2558,9 @@ msgstr "buat timestamp konflik hanya sebagai peringatan"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pemakaian: gpgv [opsi] [file] (-h untuk bantuan)"
 
@@ -4042,6 +4045,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "dibulatkan hingga %u bit\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -4058,11 +4066,6 @@ msgstr "Keysize yang anda inginkan? (1024) "
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "dibulatkan hingga %u bit\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5724,14 +5727,6 @@ msgstr ""
 msgid "error updating TOFU database: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "kunci publik %08lX tidak ditemukan: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "kesalahan membaca `%s': %s\n"
-
 #, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
@@ -5810,14 +5805,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5825,6 +5820,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
@@ -5978,6 +5977,10 @@ msgstr "tidak perlu memeriksa trustdb\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "kunci publik %08lX tidak ditemukan: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
@@ -6055,6 +6058,10 @@ msgstr "tidak dikenal"
 msgid "[  undef ]"
 msgstr ""
 
+#, fuzzy
+msgid "[  never ]"
+msgstr "tidak pernah..."
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index df563ed..86317d9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -460,6 +460,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "errore leggendo `%s': %s\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 "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
@@ -477,10 +481,6 @@ 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"
 
@@ -2564,6 +2564,9 @@ msgstr "segnala i conflitti di data solo con un avvertimento"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpgv [opzioni] [file] (-h per l'aiuto)"
 
@@ -4057,6 +4060,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "arrotondate a %u bit\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -4073,11 +4081,6 @@ msgstr "Di che dimensioni vuoi la chiave? (1024) "
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "arrotondate a %u bit\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5765,14 +5768,6 @@ msgstr ""
 msgid "error updating TOFU database: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "chiave pubblica %08lX non trovata: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "errore leggendo `%s': %s\n"
-
 #, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
@@ -5851,14 +5846,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5866,6 +5861,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
@@ -6020,6 +6019,10 @@ msgstr "non 
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "chiave pubblica %08lX non trovata: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
@@ -6097,6 +6100,10 @@ msgstr "sconosciuto"
 msgid "[  undef ]"
 msgstr ""
 
+#, fuzzy
+msgid "[  never ]"
+msgstr "mai       "
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 49b2e1e..7f284e1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -432,6 +432,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "'%s'でソケットのバインドのエラー: %s\n"
 
 #, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "'%s'の許可が設定できません: %s\n"
+
+#, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() に失敗しました: %s\n"
 
@@ -448,10 +452,6 @@ msgid "directory '%s' created\n"
 msgstr "ディレクトリ'%s'が作成されました\n"
 
 #, c-format
-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"
 
@@ -2025,6 +2025,335 @@ msgstr "鍵の一覧に鍵リングの名前を表示する"
 msgid "show expiration dates during signature listings"
 msgstr "署名の一覧時に有効期限の日付を表示する"
 
+msgid "available TOFU policies:\n"
+msgstr "利用可能なTOFUポリシー:\n"
+
+#, c-format
+msgid "unknown TOFU policy '%s'\n"
+msgstr "不明のTOFUポリシー'%s'\n"
+
+msgid "(use \"help\" to list choices)\n"
+msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
+
+#, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "不明のTOFU DBフォーマット'%s'\n"
+
+#, c-format
+msgid "Note: old default options file '%s' ignored\n"
+msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
+
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr "libgcrypt が古すぎます (必要 %s, 現在 %s)\n"
+
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "*注意*: 普通%sは使いません!\n"
+
+#, c-format
+msgid "'%s' is not a valid signature expiration\n"
+msgstr "'%s'は、有効な署名表現ではありません\n"
+
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "無効な pinentry mode '%s'です\n"
+
+#, c-format
+msgid "'%s' is not a valid character set\n"
+msgstr "'%s'は、有効な文字集合ではありません\n"
+
+msgid "could not parse keyserver URL\n"
+msgstr "鍵サーバのURLを解析不能\n"
+
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
+
+msgid "invalid keyserver options\n"
+msgstr "無効な鍵サーバ・オプションです\n"
+
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: 無効なインポート・オプションです\n"
+
+msgid "invalid import options\n"
+msgstr "無効なインポート・オプションです\n"
+
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: 無効なエクスポート・オプションです\n"
+
+msgid "invalid export options\n"
+msgstr "無効なエクスポート・オプションです\n"
+
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: 無効な一覧オプションです\n"
+
+msgid "invalid list options\n"
+msgstr "無効な一覧オプションです\n"
+
+msgid "display photo IDs during signature verification"
+msgstr "署名の検証時にフォトIDを表示する"
+
+msgid "show policy URLs during signature verification"
+msgstr "署名の検証時にポリシーURLを表示する"
+
+msgid "show all notations during signature verification"
+msgstr "署名の検証時にすべての注釈を表示する"
+
+msgid "show IETF standard notations during signature verification"
+msgstr "署名の検証時にIETF標準注釈を表示する"
+
+msgid "show user-supplied notations during signature verification"
+msgstr "署名の検証時にユーザの注釈を表示する"
+
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "署名の検証時に優先鍵サーバURLを表示する"
+
+msgid "show user ID validity during signature verification"
+msgstr "署名の検証時にユーザIDの有効性を表示する"
+
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
+
+msgid "show only the primary user ID in signature verification"
+msgstr "署名の検証時に主なユーザIDだけをを表示する"
+
+msgid "validate signatures with PKA data"
+msgstr "PKAデータで署名を検証する"
+
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "有効なPKAデータで署名の信用度を上昇させる"
+
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: 無効な検証オプションです\n"
+
+msgid "invalid verify options\n"
+msgstr "無効な検証オプションです\n"
+
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "exec-pathを%sに設定不能\n"
+
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: 無効な auto-key-locate リストです\n"
+
+msgid "invalid auto-key-locate list\n"
+msgstr "無効な auto-key-locate リストです\n"
+
+msgid "WARNING: program may create a core file!\n"
+msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
+
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "*警告*: %sは%sより優先\n"
+
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%sは%sとともに使うことはできません!\n"
+
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%sは%sとともに使っても無意味です!\n"
+
+msgid "WARNING: running with faked system time: "
+msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
+
+#, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "%s のため、セキュアでないメモリで実行しません\n"
+
+msgid "selected cipher algorithm is invalid\n"
+msgstr "選択された暗号アルゴリズムは、無効です\n"
+
+msgid "selected digest algorithm is invalid\n"
+msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
+
+msgid "selected compression algorithm is invalid\n"
+msgstr "選択された圧縮アルゴリズムは、無効です\n"
+
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
+
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-neededは正の値が必要です\n"
+
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-neededは1より大きな値が必要です\n"
+
+msgid "max-cert-depth must be in the range from 1 to 255\n"
+msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
+
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "無効なdefault-cert-level。0か1か2か3でなければなりません\n"
+
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
+
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
+
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
+
+msgid "invalid default preferences\n"
+msgstr "無効なデフォルトの優先指定\n"
+
+msgid "invalid personal cipher preferences\n"
+msgstr "無効な個人用暗号方式の優先指定\n"
+
+msgid "invalid personal digest preferences\n"
+msgstr "無効な個人用ダイジェストの優先指定\n"
+
+msgid "invalid personal compress preferences\n"
+msgstr "無効な個人用圧縮の優先指定\n"
+
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%sは%sではまだ機能しません\n"
+
+#, c-format
+msgid "you may not use cipher algorithm '%s' while in %s mode\n"
+msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
+
+#, c-format
+msgid "you may not use digest algorithm '%s' while in %s mode\n"
+msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
+
+#, c-format
+msgid "you may not use compression algorithm '%s' while in %s mode\n"
+msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
+
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "信用データベースの初期化に失敗しました: %s\n"
+
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
+
+msgid "--store [filename]"
+msgstr "--store [ファイル名]"
+
+msgid "--symmetric [filename]"
+msgstr "--symmetric [ファイル名]"
+
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
+
+msgid "--encrypt [filename]"
+msgstr "--encrypt [ファイル名]"
+
+msgid "--symmetric --encrypt [filename]"
+msgstr "--symmetric --encrypt [ファイル名]"
+
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
+
+#, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
+
+msgid "--sign [filename]"
+msgstr "--sign [ファイル名]"
+
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [ファイル名]"
+
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--symmetric --sign --encrypt [ファイル名]"
+
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
+
+#, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
+
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [ファイル名]"
+
+msgid "--clearsign [filename]"
+msgstr "--clearsign [ファイル名]"
+
+msgid "--decrypt [filename]"
+msgstr "--decrypt [ファイル名]"
+
+msgid "--sign-key user-id"
+msgstr "--sign-key ユーザid"
+
+msgid "--lsign-key user-id"
+msgstr "--lsign-key ユーザid"
+
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key ユーザid [コマンド]"
+
+msgid "--passwd <user-id>"
+msgstr "--passwd <ユーザid>"
+
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "鍵サーバへの送信に失敗しました: %s\n"
+
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "鍵サーバからの受信に失敗しました: %s\n"
+
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "鍵のエクスポートに失敗しました: %s\n"
+
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "ssh鍵としてのエクスポートに失敗しました: %s\n"
+
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "鍵サーバの検索に失敗しました: %s\n"
+
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "鍵サーバの更新に失敗しました: %s\n"
+
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "外装除去に失敗しました: %s\n"
+
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "外装に失敗しました: %s\n"
+
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
+
+#, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "鍵指定'%s'の構文解析エラー: %s\n"
+
+#, c-format
+msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
+msgstr "'%s'は有効な鍵ID, フィンガープリント、keygripではないようです。\n"
+
+msgid "[filename]"
+msgstr "[ファイル名]"
+
+msgid "Go ahead and type your message ...\n"
+msgstr "開始します。メッセージを打ってください ...\n"
+
+msgid "the given certification policy URL is invalid\n"
+msgstr "あたえられた証明書ポリシーURLは無効です\n"
+
+msgid "the given signature policy URL is invalid\n"
+msgstr "あたえられた署名ポリシーURLは無効です\n"
+
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "指定された優先鍵サーバURLは無効です\n"
+
 msgid "|FILE|take the keys from the keyring FILE"
 msgstr "|FILE|鍵リングFILEの鍵を扱います"
 
@@ -3157,9 +3486,6 @@ msgstr "ユーザID\"%s\"のv3自己署名をスキップします\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "優先鍵サーバURLを入力してください: "
 
-msgid "could not parse keyserver URL\n"
-msgstr "鍵サーバのURLを解析不能\n"
-
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "本当に置き換えたいですか? (y/N) "
 
@@ -3842,10 +4168,6 @@ msgid "sending key %s to %s\n"
 msgstr "鍵%sを%sへ送信\n"
 
 #, c-format
-msgid "keyserver send failed: %s\n"
-msgstr "鍵サーバへの送信に失敗しました: %s\n"
-
-#, c-format
 msgid "requesting key from '%s'\n"
 msgstr "鍵を'%s'から要求\n"
 
@@ -4996,10 +5318,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "TOFUデータベースの更新エラー: %s\n"
 
 #, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "TOFUデータベースの信用レベルの設定エラー: %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr "%sのバインディングは不明です。"
 
@@ -5072,14 +5390,14 @@ msgid_plural " over the past %ld months."
 msgstr[0] "過去%ld月に。"
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text so
+#. * that we can tweak it without breaking translations.
 msgid "TOFU detected a binding conflict"
 msgstr "TOFUはバインディングの衝突を検出しました"
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
-#. version of the hotkey) for each of the five choices.  If
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUrRbB"
 
@@ -5089,6 +5407,10 @@ msgstr ""
 "否, (B)ad-ダメ? "
 
 #, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "TOFUデータベースの信用レベルの設定エラー: %s\n"
+
+#, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "TOFUポリシーの作成エラー: %s\n"
 
@@ -6209,25 +6531,9 @@ msgstr "%s:%u: ユーザなしに与えられたパスワード\n"
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: この行はスキップ\n"
 
-#, c-format
-msgid "invalid pinentry mode '%s'\n"
-msgstr "無効な pinentry mode '%s'です\n"
-
 msgid "could not parse keyserver\n"
 msgstr "鍵サーバのURLを解析不能\n"
 
-msgid "WARNING: program may create a core file!\n"
-msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
-
-msgid "WARNING: running with faked system time: "
-msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
-
-msgid "selected cipher algorithm is invalid\n"
-msgstr "選択された暗号アルゴリズムは、無効です\n"
-
-msgid "selected digest algorithm is invalid\n"
-msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
-
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "共通証明書のインポート・エラー: %s\n"
@@ -7950,277 +8256,6 @@ msgstr ""
 "形式: gpg-check-pattern [オプション] パターンファイル\n"
 "パターンファイルに対して標準入力のパスフレーズを確認する\n"
 
-#~ msgid "available TOFU policies:\n"
-#~ msgstr "利用可能なTOFUポリシー:\n"
-
-#~ msgid "unknown TOFU policy '%s'\n"
-#~ msgstr "不明のTOFUポリシー'%s'\n"
-
-#~ msgid "(use \"help\" to list choices)\n"
-#~ msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
-
-#~ msgid "unknown TOFU DB format '%s'\n"
-#~ msgstr "不明のTOFU DBフォーマット'%s'\n"
-
-#~ msgid "Note: old default options file '%s' ignored\n"
-#~ msgstr ""
-#~ "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
-
-#~ msgid "libgcrypt is too old (need %s, have %s)\n"
-#~ msgstr "libgcrypt が古すぎます (必要 %s, 現在 %s)\n"
-
-#~ msgid "Note: %s is not for normal use!\n"
-#~ msgstr "*注意*: 普通%sは使いません!\n"
-
-#~ msgid "'%s' is not a valid signature expiration\n"
-#~ msgstr "'%s'は、有効な署名表現ではありません\n"
-
-#~ msgid "'%s' is not a valid character set\n"
-#~ msgstr "'%s'は、有効な文字集合ではありません\n"
-
-#~ msgid "%s:%d: invalid keyserver options\n"
-#~ msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
-
-#~ msgid "invalid keyserver options\n"
-#~ msgstr "無効な鍵サーバ・オプションです\n"
-
-#~ msgid "%s:%d: invalid import options\n"
-#~ msgstr "%s:%d: 無効なインポート・オプションです\n"
-
-#~ msgid "invalid import options\n"
-#~ msgstr "無効なインポート・オプションです\n"
-
-#~ msgid "%s:%d: invalid export options\n"
-#~ msgstr "%s:%d: 無効なエクスポート・オプションです\n"
-
-#~ msgid "invalid export options\n"
-#~ msgstr "無効なエクスポート・オプションです\n"
-
-#~ msgid "%s:%d: invalid list options\n"
-#~ msgstr "%s:%d: 無効な一覧オプションです\n"
-
-#~ msgid "invalid list options\n"
-#~ msgstr "無効な一覧オプションです\n"
-
-#~ msgid "display photo IDs during signature verification"
-#~ msgstr "署名の検証時にフォトIDを表示する"
-
-#~ msgid "show policy URLs during signature verification"
-#~ msgstr "署名の検証時にポリシーURLを表示する"
-
-#~ msgid "show all notations during signature verification"
-#~ msgstr "署名の検証時にすべての注釈を表示する"
-
-#~ msgid "show IETF standard notations during signature verification"
-#~ msgstr "署名の検証時にIETF標準注釈を表示する"
-
-#~ msgid "show user-supplied notations during signature verification"
-#~ msgstr "署名の検証時にユーザの注釈を表示する"
-
-#~ msgid "show preferred keyserver URLs during signature verification"
-#~ msgstr "署名の検証時に優先鍵サーバURLを表示する"
-
-#~ msgid "show user ID validity during signature verification"
-#~ msgstr "署名の検証時にユーザIDの有効性を表示する"
-
-#~ msgid "show revoked and expired user IDs in signature verification"
-#~ msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
-
-#~ msgid "show only the primary user ID in signature verification"
-#~ msgstr "署名の検証時に主なユーザIDだけをを表示する"
-
-#~ msgid "validate signatures with PKA data"
-#~ msgstr "PKAデータで署名を検証する"
-
-#~ msgid "elevate the trust of signatures with valid PKA data"
-#~ msgstr "有効なPKAデータで署名の信用度を上昇させる"
-
-#~ msgid "%s:%d: invalid verify options\n"
-#~ msgstr "%s:%d: 無効な検証オプションです\n"
-
-#~ msgid "invalid verify options\n"
-#~ msgstr "無効な検証オプションです\n"
-
-#~ msgid "unable to set exec-path to %s\n"
-#~ msgstr "exec-pathを%sに設定不能\n"
-
-#~ msgid "%s:%d: invalid auto-key-locate list\n"
-#~ msgstr "%s:%d: 無効な auto-key-locate リストです\n"
-
-#~ msgid "invalid auto-key-locate list\n"
-#~ msgstr "無効な auto-key-locate リストです\n"
-
-#~ msgid "WARNING: %s overrides %s\n"
-#~ msgstr "*警告*: %sは%sより優先\n"
-
-#~ msgid "%s not allowed with %s!\n"
-#~ msgstr "%sは%sとともに使うことはできません!\n"
-
-#~ msgid "%s makes no sense with %s!\n"
-#~ msgstr "%sは%sとともに使っても無意味です!\n"
-
-#~ msgid "will not run with insecure memory due to %s\n"
-#~ msgstr "%s のため、セキュアでないメモリで実行しません\n"
-
-#~ msgid "selected compression algorithm is invalid\n"
-#~ msgstr "選択された圧縮アルゴリズムは、無効です\n"
-
-#~ msgid "selected certification digest algorithm is invalid\n"
-#~ msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
-
-#~ msgid "completes-needed must be greater than 0\n"
-#~ msgstr "completes-neededは正の値が必要です\n"
-
-#~ msgid "marginals-needed must be greater than 1\n"
-#~ msgstr "marginals-neededは1より大きな値が必要です\n"
-
-#~ msgid "max-cert-depth must be in the range from 1 to 255\n"
-#~ msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
-
-#~ msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-#~ msgstr "無効なdefault-cert-level。0か1か2か3でなければなりません\n"
-
-#~ msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-#~ msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
-
-#~ msgid "Note: simple S2K mode (0) is strongly discouraged\n"
-#~ msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
-
-#~ msgid "invalid S2K mode; must be 0, 1 or 3\n"
-#~ msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
-
-#~ msgid "invalid default preferences\n"
-#~ msgstr "無効なデフォルトの優先指定\n"
-
-#~ msgid "invalid personal cipher preferences\n"
-#~ msgstr "無効な個人用暗号方式の優先指定\n"
-
-#~ msgid "invalid personal digest preferences\n"
-#~ msgstr "無効な個人用ダイジェストの優先指定\n"
-
-#~ msgid "invalid personal compress preferences\n"
-#~ msgstr "無効な個人用圧縮の優先指定\n"
-
-#~ msgid "%s does not yet work with %s\n"
-#~ msgstr "%sは%sではまだ機能しません\n"
-
-#~ msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-#~ msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
-
-#~ msgid "you may not use digest algorithm '%s' while in %s mode\n"
-#~ msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
-
-#~ msgid "you may not use compression algorithm '%s' while in %s mode\n"
-#~ msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
-
-#~ msgid "failed to initialize the TrustDB: %s\n"
-#~ msgstr "信用データベースの初期化に失敗しました: %s\n"
-
-#~ msgid "WARNING: recipients (-r) given without using public key encryption\n"
-#~ msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
-
-#~ msgid "--store [filename]"
-#~ msgstr "--store [ファイル名]"
-
-#~ msgid "--symmetric [filename]"
-#~ msgstr "--symmetric [ファイル名]"
-
-#~ msgid "symmetric encryption of '%s' failed: %s\n"
-#~ msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
-
-#~ msgid "--encrypt [filename]"
-#~ msgstr "--encrypt [ファイル名]"
-
-#~ msgid "--symmetric --encrypt [filename]"
-#~ msgstr "--symmetric --encrypt [ファイル名]"
-
-#~ msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-#~ msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
-
-#~ msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-#~ msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
-
-#~ msgid "--sign [filename]"
-#~ msgstr "--sign [ファイル名]"
-
-#~ msgid "--sign --encrypt [filename]"
-#~ msgstr "--sign --encrypt [ファイル名]"
-
-#~ msgid "--symmetric --sign --encrypt [filename]"
-#~ msgstr "--symmetric --sign --encrypt [ファイル名]"
-
-#~ msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-#~ msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
-
-#~ msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-#~ msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
-
-#~ msgid "--sign --symmetric [filename]"
-#~ msgstr "--sign --symmetric [ファイル名]"
-
-#~ msgid "--clearsign [filename]"
-#~ msgstr "--clearsign [ファイル名]"
-
-#~ msgid "--decrypt [filename]"
-#~ msgstr "--decrypt [ファイル名]"
-
-#~ msgid "--sign-key user-id"
-#~ msgstr "--sign-key ユーザid"
-
-#~ msgid "--lsign-key user-id"
-#~ msgstr "--lsign-key ユーザid"
-
-#~ msgid "--edit-key user-id [commands]"
-#~ msgstr "--edit-key ユーザid [コマンド]"
-
-#~ msgid "--passwd <user-id>"
-#~ msgstr "--passwd <ユーザid>"
-
-#~ msgid "keyserver receive failed: %s\n"
-#~ msgstr "鍵サーバからの受信に失敗しました: %s\n"
-
-#~ msgid "key export failed: %s\n"
-#~ msgstr "鍵のエクスポートに失敗しました: %s\n"
-
-#~ msgid "export as ssh key failed: %s\n"
-#~ msgstr "ssh鍵としてのエクスポートに失敗しました: %s\n"
-
-#~ msgid "keyserver search failed: %s\n"
-#~ msgstr "鍵サーバの検索に失敗しました: %s\n"
-
-#~ msgid "keyserver refresh failed: %s\n"
-#~ msgstr "鍵サーバの更新に失敗しました: %s\n"
-
-#~ msgid "dearmoring failed: %s\n"
-#~ msgstr "外装除去に失敗しました: %s\n"
-
-#~ msgid "enarmoring failed: %s\n"
-#~ msgstr "外装に失敗しました: %s\n"
-
-#~ msgid "invalid hash algorithm '%s'\n"
-#~ msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
-
-#~ msgid "error parsing key specification '%s': %s\n"
-#~ msgstr "鍵指定'%s'の構文解析エラー: %s\n"
-
-#~ msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
-#~ msgstr "'%s'は有効な鍵ID, フィンガープリント、keygripではないようです。\n"
-
-#~ msgid "[filename]"
-#~ msgstr "[ファイル名]"
-
-#~ msgid "Go ahead and type your message ...\n"
-#~ msgstr "開始します。メッセージを打ってください ...\n"
-
-#~ msgid "the given certification policy URL is invalid\n"
-#~ msgstr "あたえられた証明書ポリシーURLは無効です\n"
-
-#~ msgid "the given signature policy URL is invalid\n"
-#~ msgstr "あたえられた署名ポリシーURLは無効です\n"
-
-#~ msgid "the given preferred keyserver URL is invalid\n"
-#~ msgstr "指定された優先鍵サーバURLは無効です\n"
-
 #~ msgid "you found a bug ... (%s:%d)\n"
 #~ msgstr "あなたはバグを発見しました ... (%s:%d)\n"
 
diff --git a/po/nb.po b/po/nb.po
index 5d813db..9844310 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -466,6 +466,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\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 "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
@@ -484,10 +488,6 @@ 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"
 
@@ -2533,6 +2533,9 @@ msgstr "la konflikter mellom tidsstempler bare v
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
 
@@ -3933,6 +3936,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "rundet opp til %u bits\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -3949,11 +3957,6 @@ msgstr "Hvilken n
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�kkelst�rrelse er %u bits\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "rundet opp til %u bits\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5604,14 +5607,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "fant ikke offentlig n�kkel %s: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "feil ved lesing av �%s�: %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
 
@@ -5690,14 +5685,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5705,6 +5700,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "feil ved lesing av �%s�: %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
@@ -5858,6 +5857,10 @@ msgstr ""
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "fant ikke offentlig n�kkel %s: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
@@ -5931,6 +5934,9 @@ msgstr "[ ukjent]"
 msgid "[  undef ]"
 msgstr "[ udef ]"
 
+msgid "[  never ]"
+msgstr ""
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 771d340..075ec76 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -488,6 +488,11 @@ msgstr "b
 msgid "error binding socket to '%s': %s\n"
 msgstr "b��d podczas przypisywania gniazda do ,,%s'': %s\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"
+
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() nie powiod�o si�: %s\n"
@@ -508,11 +513,6 @@ 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"
@@ -2601,6 +2601,9 @@ msgstr "nie traktowa
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgv [opcje] [pliki] (-h podaje pomoc)"
 
@@ -4077,6 +4080,11 @@ msgstr "Nieprawid
 msgid "No key with this keygrip\n"
 msgstr "Brak klucza o tym uchwycie\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "zaokr�glono do %u bit�w\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "Klucze %s b�d� mia�y od %u do %u bit�w d�ugo�ci.\n"
@@ -4093,11 +4101,6 @@ msgstr "Jakiej d
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "zaokr�glono do %u bit�w\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5825,15 +5828,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "b��d wysy�ania polecenia %s: %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "klucz publiczny %s nie odnaleziony: %s\n"
-
-#, fuzzy, c-format
-#| msgid "error storing flags: %s\n"
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "b��d zapisywania flag: %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
 
@@ -5920,14 +5914,14 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5935,6 +5929,11 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "error storing flags: %s\n"
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "b��d zapisywania flag: %s\n"
+
+#, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "b��d tworzenia potoku: %s\n"
@@ -6102,6 +6101,10 @@ msgstr "sprawdzanie bazy jest niepotrzebne przy modelu zaufania ,,%s''\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "aktualizacja bazy jest niepotrzebna przy modelu zaufania ,,%s''\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "klucz publiczny %s nie odnaleziony: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 
@@ -6184,6 +6187,11 @@ msgstr "[    nieznane   ]"
 msgid "[  undef ]"
 msgstr "[  nieokre�lone ]"
 
+#, fuzzy
+#| msgid "never"
+msgid "[  never ]"
+msgstr "nigdy"
+
 msgid "[marginal]"
 msgstr "[   marginalne  ]"
 
diff --git a/po/pt.po b/po/pt.po
index 17021a3..e20d484 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -465,6 +465,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\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 "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
@@ -481,10 +485,6 @@ 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"
 
@@ -2561,6 +2561,9 @@ msgstr ""
 "|DF|escrever informa��es de estado para o\n"
 "descritor de ficheiro DF"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 #, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
@@ -4043,6 +4046,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "arredondado para %u bits\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -4059,11 +4067,6 @@ msgstr "Qual o tamanho de chave desejado? (1024) "
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "arredondado para %u bits\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5734,14 +5737,6 @@ msgstr ""
 msgid "error updating TOFU database: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "chave p�blica %08lX n�o encontrada: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
 #, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
@@ -5820,14 +5815,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5835,6 +5830,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
@@ -5990,6 +5989,10 @@ msgstr "n
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "chave p�blica %08lX n�o encontrada: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
@@ -6068,6 +6071,9 @@ msgstr "vers
 msgid "[  undef ]"
 msgstr ""
 
+msgid "[  never ]"
+msgstr ""
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index a40a28d..9f54576 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -475,6 +475,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\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 "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
@@ -493,10 +497,6 @@ 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"
 
@@ -2586,6 +2586,9 @@ msgstr "d
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
 
@@ -4043,6 +4046,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "rotunjit� prin adaos la %u bi�i\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "cheile %s pot avea lungimea �ntre %u �i %u bi�i.\n"
@@ -4059,11 +4067,6 @@ msgstr "Ce lungime de cheie dori
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesar� este %u bi�i\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "rotunjit� prin adaos la %u bi�i\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5754,14 +5757,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "cheia public� %s nu a fost g�sit�: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "eroare la citire `%s': %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
 
@@ -5840,14 +5835,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5855,6 +5850,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
@@ -6011,6 +6010,10 @@ msgstr "nu e nevoie de o verificare trustdb cu modelul de 
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "nu e nevoie de o actualizare trustdb cu modelul de �ncredere `%s'\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "cheia public� %s nu a fost g�sit�: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "v� rug�m face�i un --check-trustdb\n"
 
@@ -6089,6 +6092,11 @@ msgstr "[necunoscut
 msgid "[  undef ]"
 msgstr "[  nedef ]"
 
+#, fuzzy
+#| msgid "never"
+msgid "[  never ]"
+msgstr "niciodat�"
+
 msgid "[marginal]"
 msgstr "[marginal]"
 
diff --git a/po/ru.po b/po/ru.po
index a202bdf..7997837 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -372,7 +372,8 @@ msgid "allow presetting passphrase"
 msgstr "разрешить предустанавливать фразу-пароль"
 
 msgid "disallow caller to override the pinentry"
-msgstr "не позволять вызывающей программе замещать собой программу ввода пароля"
+msgstr ""
+"не позволять вызывающей программе замещать собой программу ввода пароля"
 
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "разрешить ввод фразы-пароля через Emacs"
@@ -442,6 +443,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "ошибка связывания сокета с '%s': %s\n"
 
 #, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "не удалось задать права доступа для '%s': %s\n"
+
+#, c-format
 msgid "listen() failed: %s\n"
 msgstr "сбой listen(): %s\n"
 
@@ -458,10 +463,6 @@ msgid "directory '%s' created\n"
 msgstr "создан каталог '%s'\n"
 
 #, c-format
-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"
 
@@ -1172,19 +1173,16 @@ msgid "a user notation name must contain the '@' character\n"
 msgstr "имя замечания должно содержать символ '@'\n"
 
 msgid "a notation name must not contain more than one '@' character\n"
-msgstr ""
-"имя замечания не должно содержать более одного символа '@'\n"
+msgstr "имя замечания не должно содержать более одного символа '@'\n"
 
 msgid "a notation value must not use any control characters\n"
 msgstr "в тексте замечания не должно быть управляющих символов\n"
 
 msgid "a notation name may not contain an '=' character\n"
-msgstr ""
-"имя примечания не должно содержать символа '='\n"
+msgstr "имя примечания не должно содержать символа '='\n"
 
 msgid "a notation name must have only printable characters or spaces\n"
-msgstr ""
-"имя замечания должно содержать только печатные символы или пробелы\n"
+msgstr "имя замечания должно содержать только печатные символы или пробелы\n"
 
 msgid "WARNING: invalid notation data found\n"
 msgstr "Внимание: найдена недопустимая форма записи замечания\n"
@@ -2396,6 +2394,9 @@ msgstr "при несоответствии метки времени - толь
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить информацию в файл с дескриптором FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Вызов: gpgv [параметры] [файлы] (-h для подсказки)"
 
@@ -2824,13 +2825,13 @@ msgstr "[самоподпись]"
 #, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr ""
-"не удалось проверить подпись: алгоритм с открытым ключом %d не поддерживается: %s.\n"
+"не удалось проверить подпись: алгоритм с открытым ключом %d не "
+"поддерживается: %s.\n"
 
 #, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-msgstr ""
-"не удалось проверить подпись: хеш-функция %d не поддерживается: %s.\n"
+msgstr "не удалось проверить подпись: хеш-функция %d не поддерживается: %s.\n"
 
 msgid " (reordered signatures follow)"
 msgstr "(порядок подписей изменен)"
@@ -3791,6 +3792,10 @@ msgid "No key with this keygrip\n"
 msgstr "Нет ключа с таким кодом\n"
 
 #, c-format
+msgid "rounded to %u bits\n"
+msgstr "округлен до %u бит\n"
+
+#, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "длина ключей %s может быть от %u до %u бит.\n"
 
@@ -3806,10 +3811,6 @@ msgstr "Какой размер ключа Вам необходим? (%u) "
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрошенный размер ключа - %u бит\n"
 
-#, c-format
-msgid "rounded to %u bits\n"
-msgstr "округлен до %u бит\n"
-
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Выберите эллиптическую кривую:\n"
 
@@ -5432,14 +5433,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "ошибка обновления базы данных TOFU: %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "открытый ключ %s не найден: %s\n"
-
-#, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "ошибка установки уровня доверия привязки TOFU в %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr "Привязка %s неизвестна."
 
@@ -5448,8 +5441,8 @@ msgid ""
 "The key with fingerprint %s raised a conflict with the binding %s.  Since "
 "this binding's policy was 'auto', it was changed to 'ask'."
 msgstr ""
-"Ключ с отпечатком %s противоречит этой привязке %s. Поскольку правило привязки было "
-"'автоматически', оно изменилось на 'спрашивать'."
+"Ключ с отпечатком %s противоречит этой привязке %s. Поскольку правило "
+"привязки было 'автоматически', оно изменилось на 'спрашивать'."
 
 #, c-format
 msgid ""
@@ -5524,8 +5517,8 @@ msgstr[1] " за %ld прошедших месяца."
 msgstr[2] " за %ld прошедших месяцев."
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text so
+#. * that we can tweak it without breaking translations.
 msgid "TOFU detected a binding conflict"
 msgstr ""
 "Обычно с конкретным адресом электронной почты связан только один ключ. "
@@ -5536,8 +5529,8 @@ msgstr ""
 "правомерен."
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
-#. version of the hotkey) for each of the five choices.  If
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUrRbB"
 
@@ -5546,6 +5539,10 @@ msgstr ""
 "(G)Хороший, (A)Пока принять, (U)Неясно, (R)Пока отвергнуть, (B)Плохой? "
 
 #, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "ошибка установки уровня доверия привязки TOFU в %s\n"
+
+#, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "ошибка при смене правила TOFU: %s\n"
 
@@ -5601,7 +5598,9 @@ msgstr "Сообщения, подписанные ключом %s, никогд
 msgid ""
 "Failed to collect signature statistics for \"%s\"\n"
 "(key %s)\n"
-msgstr "Не удалось собрать статистику подписей для \"%s\"\n(ключ %s)\n"
+msgstr ""
+"Не удалось собрать статистику подписей для \"%s\"\n"
+"(ключ %s)\n"
 
 #, c-format
 msgid "Verified %ld messages signed by \"%s\"."
@@ -5615,11 +5614,14 @@ msgid_plural ""
 "Verified %ld messages signed by \"%s\"\n"
 "in the past %s."
 msgstr[0] ""
-"Проверено %ld сообщение, подписанное \"%s\"\n за %s."
+"Проверено %ld сообщение, подписанное \"%s\"\n"
+" за %s."
 msgstr[1] ""
-"Проверены %ld сообщения, подписанные \"%s\"\n за %s."
+"Проверены %ld сообщения, подписанные \"%s\"\n"
+" за %s."
 msgstr[2] ""
-"Проверено %ld сообщений, подписанных \"%s\"\n за %s."
+"Проверено %ld сообщений, подписанных \"%s\"\n"
+" за %s."
 
 #, c-format
 msgid "The most recent message was verified %s ago."
@@ -5651,20 +5653,20 @@ msgid_plural ""
 msgstr[0] ""
 "Внимание: если вы видели больше %ld сообщения, подписанного этим ключом, "
 "этот ключ может быть подделкой! Внимательно проверьте, не внесены ли в адрес "
-"электронной почты небольшие изменения. В случае подозрений пометьте ключ "
-"как некачественный командой\n"
+"электронной почты небольшие изменения. В случае подозрений пометьте ключ как "
+"некачественный командой\n"
 "  %s\n"
 msgstr[1] ""
-"Внимание: если вы видели больше %ld сообщений, подписанных этим ключом, "
-"этот ключ может быть подделкой! Внимательно проверьте, не внесены ли в адрес "
-"электронной почты небольшие изменения. В случае подозрений пометьте ключ "
-"как некачественный командой\n"
+"Внимание: если вы видели больше %ld сообщений, подписанных этим ключом, этот "
+"ключ может быть подделкой! Внимательно проверьте, не внесены ли в адрес "
+"электронной почты небольшие изменения. В случае подозрений пометьте ключ как "
+"некачественный командой\n"
 "  %s\n"
 msgstr[2] ""
-"Внимание: если вы видели больше %ld сообщений, подписанных этим ключом, "
-"этот ключ может быть подделкой! Внимательно проверьте, не внесены ли в адрес "
-"электронной почты небольшие изменения. В случае подозрений пометьте ключ "
-"как некачественный командой\n"
+"Внимание: если вы видели больше %ld сообщений, подписанных этим ключом, этот "
+"ключ может быть подделкой! Внимательно проверьте, не внесены ли в адрес "
+"электронной почты небольшие изменения. В случае подозрений пометьте ключ как "
+"некачественный командой\n"
 "  %s\n"
 
 #, c-format
@@ -5729,6 +5731,10 @@ msgstr "проверять таблицу доверия при модели д
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "обновлять таблицу доверия при модели доверия '%s' не нужно\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "открытый ключ %s не найден: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
@@ -5806,6 +5812,11 @@ msgstr "[ неизвестно ]"
 msgid "[  undef ]"
 msgstr "[неопределено]"
 
+#, fuzzy
+#| msgid "never"
+msgid "[  never ]"
+msgstr "никогда"
+
 msgid "[marginal]"
 msgstr "[ ограничено ]"
 
diff --git a/po/sk.po b/po/sk.po
index 0c0e13f..bf23106 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -465,6 +465,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\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 "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
@@ -482,10 +486,6 @@ 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"
 
@@ -2571,6 +2571,9 @@ msgstr "konflikt 
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Pou�itie: gpgv [mo�nosti] [s�bory] (-h pre pomoc)"
 
@@ -4053,6 +4056,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "zaokr�hlen� na %u bitov\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
@@ -4069,11 +4077,6 @@ msgstr "Ak
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "zaokr�hlen� na %u bitov\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5749,14 +5752,6 @@ msgstr ""
 msgid "error updating TOFU database: %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "public key %s not found: %s\n"
-msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "chyba pri ��tan� `%s': %s\n"
-
 #, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
@@ -5835,14 +5830,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5850,6 +5845,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "chyba pri ��tan� `%s': %s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
@@ -6004,6 +6003,10 @@ msgstr "nie je nutn
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
+msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m vykonajte --check-trustdb\n"
 
@@ -6081,6 +6084,10 @@ msgstr "nezn
 msgid "[  undef ]"
 msgstr ""
 
+#, fuzzy
+msgid "[  never ]"
+msgstr "nikdy     "
+
 msgid "[marginal]"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index bac433f..996912a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -516,6 +516,12 @@ msgstr "fel vid hämtning av nonce för uttaget\n"
 msgid "error binding socket to '%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\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"
+
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
@@ -535,12 +541,6 @@ 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"
@@ -2652,6 +2652,9 @@ msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Användning: gpgv [flaggor] [filer] (-h för hjälp)"
 
@@ -4129,6 +4132,11 @@ msgstr "Inte en giltig nyckelhash (förväntade 40 hexadecimala siffror)\n"
 msgid "No key with this keygrip\n"
 msgstr "Ingen nyckel med denna nyckelhash\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "avrundade uppåt till %u bitar\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
@@ -4145,11 +4153,6 @@ msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "avrundade uppåt till %u bitar\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5882,15 +5885,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "publika nyckeln %s hittades inte: %s\n"
-
-#, fuzzy, c-format
-#| msgid "error storing flags: %s\n"
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "fel vid lagring av flaggor: %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
 
@@ -5971,14 +5965,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5986,6 +5980,11 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "error storing flags: %s\n"
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "fel vid lagring av flaggor: %s\n"
+
+#, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
@@ -6151,6 +6150,10 @@ msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr ""
 "det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "publika nyckeln %s hittades inte: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
 
@@ -6241,6 +6244,11 @@ msgstr "[    okänt    ]"
 msgid "[  undef ]"
 msgstr "[ odefinierad ]"
 
+#, fuzzy
+#| msgid "never"
+msgid "[  never ]"
+msgstr "aldrig"
+
 msgid "[marginal]"
 msgstr "[  marginell  ]"
 
diff --git a/po/tr.po b/po/tr.po
index f522850..c40022d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -483,6 +483,11 @@ msgstr "soket için tuz alınırken hata\n"
 msgid "error binding socket to '%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\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"
+
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
@@ -503,11 +508,6 @@ 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"
@@ -2580,6 +2580,9 @@ msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgv [seçenekler] [dosyalar] (yardım için -h)"
 
@@ -4083,6 +4086,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "%u bite yuvarlandı\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
@@ -4099,11 +4107,6 @@ msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "%u bite yuvarlandı\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5808,15 +5811,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "%s komutu gönderilirken hata: %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "genel anahtar %s yok: %s\n"
-
-#, fuzzy, c-format
-#| msgid "error storing flags: %s\n"
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "bayraklar saklanırken hata: %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
 
@@ -5897,14 +5891,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5912,6 +5906,11 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "error storing flags: %s\n"
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "bayraklar saklanırken hata: %s\n"
+
+#, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "boru oluşturulurken hata: %s\n"
@@ -6072,6 +6071,10 @@ msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "genel anahtar %s yok: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
@@ -6151,6 +6154,11 @@ msgstr "[    bilinmeyen   ]"
 msgid "[  undef ]"
 msgstr "[     tanımsız    ]"
 
+#, fuzzy
+#| msgid "never"
+msgid "[  never ]"
+msgstr "asla    "
+
 msgid "[marginal]"
 msgstr "[   şöyle böyle   ]"
 
diff --git a/po/uk.po b/po/uk.po
index 965392f..0a1fdef 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -366,7 +366,6 @@ msgstr "заборонити клієнтам позначати ключі як
 msgid "allow presetting passphrase"
 msgstr "дозволити попереднє встановлення пароля"
 
-#| msgid "allow caller to override the pinentry"
 msgid "disallow caller to override the pinentry"
 msgstr "заборонити функції виклику перевизначати pinentry"
 
@@ -438,6 +437,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "помилка під час спроби прив’язування сокета до «%s»: %s\n"
 
 #, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "не вдалося встановити права доступу до «%s»: %s\n"
+
+#, c-format
 msgid "listen() failed: %s\n"
 msgstr "помилка listen(): %s\n"
 
@@ -454,11 +457,6 @@ msgid "directory '%s' created\n"
 msgstr "створено каталог «%s»\n"
 
 #, 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"
 
@@ -721,7 +719,6 @@ msgid "error forking process: %s\n"
 msgstr "помилка під час спроби розгалужування процесу: %s\n"
 
 #, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for processes to terminate failed: %s\n"
 msgstr "не вдалося дочекатися переривання процесу: %s\n"
 
@@ -763,7 +760,6 @@ msgid "problem with the agent\n"
 msgstr "проблема з агентом\n"
 
 #, c-format
-#| msgid "problem with the agent: %s\n"
 msgid "problem with the agent (unexpected response \"%s\")\n"
 msgstr "проблема із агентом (неочікувана відповідь «%s»)\n"
 
@@ -1166,7 +1162,6 @@ msgstr ""
 "помилковий MTA\n"
 
 #, c-format
-#| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ незручне для читання (%zu байтів: %s%s) ]"
 
@@ -1186,13 +1181,9 @@ msgstr "назва примітки не повинна містити біль
 msgid "a notation value must not use any control characters\n"
 msgstr "у значенні примітки не повинно міститися керівних символів\n"
 
-#| msgid "a notation name must not contain more than one '@' character\n"
 msgid "a notation name may not contain an '=' character\n"
 msgstr "назва позначення не може містити символів «=»\n"
 
-#| 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"
 
@@ -1207,7 +1198,6 @@ msgid "Enter passphrase: "
 msgstr "Введіть пароль: "
 
 #, c-format
-#| msgid "error creating keyring '%s': %s\n"
 msgid "error getting version from '%s': %s\n"
 msgstr "помилка під час спроби отримання даних щодо версії з «%s»: %s\n"
 
@@ -1216,7 +1206,6 @@ msgid "server '%s' is older than us (%s < %s)"
 msgstr "сервер «%s» має версію, старішу за нашу (%s < %s)"
 
 #, c-format
-#| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
 msgstr "УВАГА: %s\n"
 
@@ -1521,7 +1510,6 @@ msgid "error reading keyblock: %s\n"
 msgstr "помилка під час спроби читання блокування ключа: %s\n"
 
 #, c-format
-#| msgid "key \"%s\" not found: %s\n"
 msgid "key \"%s\" not found\n"
 msgstr "ключ «%s» не знайдено\n"
 
@@ -1717,7 +1705,6 @@ msgid "[User ID not found]"
 msgstr "[Ідентифікатор не знайдено]"
 
 #, c-format
-#| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "(перевірте аргумент параметра «%s»)\n"
 
@@ -1727,12 +1714,10 @@ msgstr ""
 "Попередження: «%s» має бути довгим ідентифікатором ключа або відбитком\n"
 
 #, c-format
-#| msgid "error closing %s: %s\n"
 msgid "error looking up: %s\n"
 msgstr "помилка під час пошуку: %s\n"
 
 #, c-format
-#| msgid "error creating keyring '%s': %s\n"
 msgid "Warning: %s appears in the keyring %d times\n"
 msgstr "Попередження: запис %s наявний у сховищі %d разів\n"
 
@@ -1752,12 +1737,10 @@ msgid "secret key \"%s\" not found: %s\n"
 msgstr "закритий ключ «%s» не знайдено: %s\n"
 
 #, c-format
-#| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Попередження: «%s» не використовується як типовий ключ: %s\n"
 
 #, c-format
-#| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "використовуємо «%s» як типовий закритий ключ для підписування\n"
 
@@ -1886,7 +1869,6 @@ 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 "|VALUE|встановити вказане правило TOFU для ключа"
 
@@ -2095,7 +2077,6 @@ msgstr "показувати назву сховища ключів у спис
 msgid "show expiration dates during signature listings"
 msgstr "показувати дати завершення строків дії у списку підписів"
 
-#| msgid "Available keys:\n"
 msgid "available TOFU policies:\n"
 msgstr "можливі варіанти правил TOFU:\n"
 
@@ -2398,7 +2379,6 @@ msgid "key export failed: %s\n"
 msgstr "помилка під час спроби експортування ключа: %s\n"
 
 #, c-format
-#| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "спроба експортування ключа ssh зазнала невдачі: %s\n"
 
@@ -2423,13 +2403,10 @@ msgid "invalid hash algorithm '%s'\n"
 msgstr "некоректний алгоритм хешування «%s»\n"
 
 #, c-format
-#| msgid "error loading certificate '%s': %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "помилка під час спроби обробки специфікації ключа «%s»: %s\n"
 
 #, c-format
-#| msgid ""
-#| "'%s' does not appear to be a valid key id, fingerprint or key grip.\n"
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
 
@@ -2457,6 +2434,9 @@ msgstr "супроводжувати конфлікти часових позн
 msgid "|FD|write status info to this FD"
 msgstr "записувати до дескриптора файла дані щодо стану"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "Використання: gpgv [параметри] [файли] (-h — довідка)"
 
@@ -2742,8 +2722,8 @@ msgstr "ключ %s: закритий ключ з некоректним шиф
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
-"Для перенесення «%s» на кожній із карток пам’яті слід виконати таку команду: %"
-"s\n"
+"Для перенесення «%s» на кожній із карток пам’яті слід виконати таку команду: "
+"%s\n"
 
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
@@ -2874,7 +2854,6 @@ msgid "keyblock resource '%s': %s\n"
 msgstr "ресурс блоку ключів «%s»: %s\n"
 
 #, c-format
-#| msgid "error opening '%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "помилка під час спроби відкрити базу даних ключів: %s\n"
 
@@ -2889,31 +2868,26 @@ msgid "[self-signature]"
 msgstr "[самопідпис]"
 
 #, c-format
-#| msgid "key %s: unsupported public key algorithm\n"
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
 msgstr ""
 "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
 "відкритого ключа (%d): %s.\n"
 
 #, 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 ""
 "неможливо перевірити підпис із непідтримуваним алгоритмом створення "
 "контрольної суми %d: %s.\n"
 
-#| msgid "Good signature from"
 msgid " (reordered signatures follow)"
 msgstr " (нижче наведено перевпорядковані підписи)"
 
 #, c-format
-#| msgid "key %s: %s\n"
 msgid "key %s:\n"
 msgstr "ключ %s:\n"
 
 #, 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] "вилучено %d дублікат підпису\n"
@@ -2921,7 +2895,6 @@ msgstr[1] "вилучено %d дублікати підписів\n"
 msgstr[2] "вилучено %d дублікатів підписів\n"
 
 #, c-format
-#| msgid "1 signature not checked due to a missing key\n"
 msgid "%d signature not checked due to a missing key\n"
 msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "%d підпис не перевірено через те, що немає ключа\n"
@@ -2929,7 +2902,6 @@ msgstr[1] "%d підписи не перевірено через те, що н
 msgstr[2] "%d підписів не перевірено через те, що немає ключа\n"
 
 #, c-format
-#| msgid "%d bad signatures\n"
 msgid "%d bad signature\n"
 msgid_plural "%d bad signatures\n"
 msgstr[0] "%d помилкових підпис\n"
@@ -2937,7 +2909,6 @@ msgstr[1] "%d помилкових підписи\n"
 msgstr[2] "%d помилкових підписів\n"
 
 #, c-format
-#| msgid "Good signature from"
 msgid "%d signature reordered\n"
 msgid_plural "%d signatures reordered\n"
 msgstr[0] "перевпорядковано %d підпис\n"
@@ -3295,7 +3266,6 @@ msgstr "Ключ відкликано."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
 
-#| msgid "Really sign all user IDs? (y/N) "
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Підписати всі текстові ідентифікатори користувача? (y/N або т/Н) "
 
@@ -3406,7 +3376,6 @@ msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "«%s» не є основним відбитком\n"
 
 #, c-format
-#| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Некоректний ідентифікатор користувача «%s»: %s\n"
 
@@ -3539,7 +3508,6 @@ msgid "Really delete this self-signature? (y/N)"
 msgstr "Вилучити цей самопідпис? (y/N або т/Н)"
 
 #, c-format
-#| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Вилучено %d підпис.\n"
@@ -3557,7 +3525,6 @@ msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Ідентифікатор користувача «%s» ущільнено: %s\n"
 
 #, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Ідентифікатор користувача «%s»: вилучено %d підпис\n"
@@ -3606,8 +3573,6 @@ msgstr ""
 "Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
 "Н) "
 
-#| msgid ""
-#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -3665,7 +3630,6 @@ msgid "No user ID with hash %s\n"
 msgstr "Ідентифікатора користувача з хешем %s не існує\n"
 
 #, c-format
-#| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Піключа із ідентифікатором ключа «%s» не існує.\n"
 
@@ -3893,6 +3857,10 @@ msgid "No key with this keygrip\n"
 msgstr "Немає ключів з таким значенням keygrip\n"
 
 #, c-format
+msgid "rounded to %u bits\n"
+msgstr "округлено до %u бітів\n"
+
+#, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключі %s можуть мати довжину від %u до %u бітів.\n"
 
@@ -3908,10 +3876,6 @@ msgstr "Якою має бути довжина ключа? (%u) "
 msgid "Requested keysize is %u bits\n"
 msgstr "Запитана довжина ключа — %u бітів\n"
 
-#, c-format
-msgid "rounded to %u bits\n"
-msgstr "округлено до %u бітів\n"
-
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Вкажіть потрібну вам еліптичну криву:\n"
 
@@ -4208,7 +4172,6 @@ msgid "Signature notation: "
 msgstr "Примітка підпису: "
 
 #, c-format
-#| msgid "%d good signatures\n"
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr[0] "%d добрий підпис\n"
@@ -4216,7 +4179,6 @@ msgstr[1] "%d добрих підписи\n"
 msgstr[2] "%d добрих підписів\n"
 
 #, 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] "%d підпис не перевірено через помилку\n"
@@ -4224,7 +4186,6 @@ msgstr[1] "%d підписи не перевірено через помилку
 msgstr[2] "%d підписів не перевірено через помилку\n"
 
 #, 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"
 msgstr[0] "Попередження: %lu ключ пропущено через надто великий розмір\n"
@@ -4265,7 +4226,6 @@ msgid "caching keyring '%s'\n"
 msgstr "кешування сховища ключів «%s»\n"
 
 #, c-format
-#| msgid "%lu keys cached so far (%lu signatures)\n"
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "зараз кешовано %lu ключів (%lu підпис)\n"
@@ -4273,7 +4233,6 @@ msgstr[1] "зараз кешовано %lu ключів (%lu підписи)\n"
 msgstr[2] "зараз кешовано %lu ключів (%lu підписів)\n"
 
 #, c-format
-#| msgid "flush the cache"
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] "кешовано %lu ключ"
@@ -4281,7 +4240,6 @@ msgstr[1] "кешовано %lu ключі"
 msgstr[2] "кешовано %lu ключів"
 
 #, c-format
-#| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (%lu підпис)\n"
@@ -4329,7 +4287,6 @@ msgid "\"%s\" not a key ID: skipping\n"
 msgstr "«%s» не є ідентифікатором ключа: пропускаємо\n"
 
 #, c-format
-#| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "оновлюємо %d ключ з %s\n"
@@ -4359,7 +4316,6 @@ msgstr "надсилаємо запит щодо ключа %s до %s серв
 msgid "requesting key %s from %s\n"
 msgstr "надсилаємо запит щодо ключа %s з %s\n"
 
-#| msgid "invalid keyserver options\n"
 msgid "no keyserver known\n"
 msgstr "немає відомих серверів ключів\n"
 
@@ -4582,12 +4538,10 @@ msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Зауваження: підписи за допомогою алгоритму %s відкинуто\n"
 
 #, c-format
-#| msgid "%s:%u: read error: %s\n"
 msgid "(reported error: %s)\n"
 msgstr "(повідомлена помилка: %s)\n"
 
 #, c-format
-#| msgid "read error in '%s': %s\n"
 msgid "(reported error: %s <%s>)\n"
 msgstr "(повідомлена помилка: %s <%s>)\n"
 
@@ -4644,7 +4598,6 @@ msgstr ""
 "Відкритий ключ ECDSA має зберігатися у кодуванні SEC кратному 8-бітовому\n"
 
 #, c-format
-#| msgid "Unknown signature type '%s'\n"
 msgid "unknown weak digest '%s'\n"
 msgstr "невідома слабка контрольна сума «%s»\n"
 
@@ -4991,17 +4944,14 @@ msgid "%s: skipped: public key already present\n"
 msgstr "%s: пропущено: відкритий ключ вже існує\n"
 
 #, c-format
-#| msgid "can't connect to '%s': %s\n"
 msgid "can't encrypt to '%s'\n"
 msgstr "не вдалося зашифрувати до «%s»\n"
 
 #, c-format
-#| msgid "line %d: invalid date given\n"
 msgid "option '%s' given, but no valid default keys given\n"
 msgstr "вказано параметр «%s», але не вказано коректних типових ключів\n"
 
 #, c-format
-#| msgid "line %d: invalid date given\n"
 msgid "option '%s' given, but option '%s' not given\n"
 msgstr "вказано параметр «%s», але не вказано параметр «%s»\n"
 
@@ -5144,11 +5094,6 @@ msgstr ""
 "Такий сертифікат відкликання не можна скасовувати після його\n"
 "оприлюднення."
 
-#| msgid ""
-#| "Use it to revoke this key in case of a compromise or loss of\n"
-#| "the secret key.  However, if the secret key is still accessible,\n"
-#| "it is better to generate a new revocation certificate and give\n"
-#| "a reason for the revocation."
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -5163,10 +5108,6 @@ msgstr ""
 "можна знайти у розділах підручника з GnuPG щодо команди\n"
 "gpg «--gen-revoke»."
 
-#| msgid ""
-#| "To avoid an accidental use of this file, a colon has been inserted\n"
-#| "before the 5 dashes below.  Remove this colon with a text editor\n"
-#| "before making use of this revocation certificate."
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -5178,12 +5119,10 @@ msgstr ""
 "відкликання."
 
 #, c-format
-#| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "сертифікат відкликання збережено як «%s.rev»\n"
 
 #, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key \"%s\" not found\n"
 msgstr "закритий ключ «%s» не знайдено\n"
 
@@ -5195,7 +5134,6 @@ msgid "'%s' matches multiple secret keys:\n"
 msgstr "«%s» відповідає декільком закритим ключам:\n"
 
 #, c-format
-#| msgid "error creating keyring '%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "помилка під час спроби пошуку у сховищі ключів: %s\n"
 
@@ -5280,7 +5218,6 @@ msgstr ""
 "УВАГА: підписування підключа %s містить некоректну перехресну сертифікацію\n"
 
 #, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
 msgid "public key %s is %lu second newer than the signature\n"
 msgid_plural "public key %s is %lu seconds newer than the signature\n"
 msgstr[0] "відкритий ключ %s є на %lu секунду новішим за підпис\n"
@@ -5288,7 +5225,6 @@ msgstr[1] "відкритий ключ %s є на %lu секунди новіш
 msgstr[2] "відкритий ключ %s є на %lu секунд новішим за підпис\n"
 
 #, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
 msgid "public key %s is %lu day newer than the signature\n"
 msgid_plural "public key %s is %lu days newer than the signature\n"
 msgstr[0] "відкритий ключ %s є на %lu день новішим за підпис\n"
@@ -5296,8 +5232,6 @@ msgstr[1] "відкритий ключ %s є на %lu дні новішим за
 msgstr[2] "відкритий ключ %s є на %lu днів новішим за підпис\n"
 
 #, c-format
-#| msgid ""
-#| "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgid_plural ""
@@ -5313,8 +5247,6 @@ msgstr[2] ""
 "або проблема з годинником)\n"
 
 #, c-format
-#| msgid ""
-#| "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
 msgid_plural ""
 "key %s was created %lu days in the future (time warp or clock problem)\n"
@@ -5322,8 +5254,8 @@ msgstr[0] ""
 "ключ %s було створено з позначкою на %lu день у майбутньому (часова петля "
 "або проблема з годинником)\n"
 msgstr[1] ""
-"ключ %s було створено з позначкою на %lu дні у майбутньому (часова петля "
-"або проблема з годинником)\n"
+"ключ %s було створено з позначкою на %lu дні у майбутньому (часова петля або "
+"проблема з годинником)\n"
 msgstr[2] ""
 "ключ %s було створено з позначкою на %lu днів у майбутньому (часова петля "
 "або проблема з годинником)\n"
@@ -5556,7 +5488,6 @@ msgid "input line longer than %d characters\n"
 msgstr "рядок вхідних даних довший за %d символів\n"
 
 #, c-format
-#| msgid "error sending standard options: %s\n"
 msgid "error beginning transaction on TOFU database: %s\n"
 msgstr ""
 "помилка під час спроби розпочати внесення змін до бази даних TOFU: %s\n"
@@ -5570,27 +5501,22 @@ msgid "error rolling back transaction on TOFU database: %s\n"
 msgstr "помилка під час скасовування змін у базі даних TOFU: %s\n"
 
 #, c-format
-#| msgid "unsupported algorithm: %s"
 msgid "unsupported TOFU database version: %s\n"
 msgstr "непідтримувана версія бази даних TOFU: %s\n"
 
 #, c-format
-#| msgid "error sending data: %s\n"
 msgid "error reading TOFU database: %s\n"
 msgstr "помилка під час спроби читання бази даних TOFU: %s\n"
 
 #, c-format
-#| msgid "error writing base64 encoding: %s\n"
 msgid "error determining TOFU database's version: %s\n"
 msgstr "помилка під час спроби визначення версії бази даних TOFU: %s\n"
 
 #, c-format
-#| msgid "error initializing reader object: %s\n"
 msgid "error initializing TOFU database: %s\n"
 msgstr "помилка під час спроби ініціалізації бази даних TOFU: %s\n"
 
 #, c-format
-#| msgid "error opening '%s': %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "помилка під час спроби відкрити бази даних TOFU «%s»: %s\n"
 
@@ -5602,21 +5528,10 @@ msgid "Using split format for TOFU database\n"
 msgstr "Використовуємо розділений формат для бази даних TOFU\n"
 
 #, c-format
-#| msgid "error sending data: %s\n"
 msgid "error updating TOFU database: %s\n"
 msgstr "помилка під час спроби оновлення бази даних TOFU: %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "відкритий ключ %s не знайдено: %s\n"
-
-#, c-format
-#| msgid "error setting OCSP target: %s\n"
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr ""
-"помилка під час спроби встановлення рівня довіри до прив’язки TOFU до %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr "Прив’язка %s є невідомою."
 
@@ -5637,7 +5552,6 @@ msgstr ""
 "декларованому власнику) чи підробною (помилковою)."
 
 #, c-format
-#| msgid "error getting responder ID: %s\n"
 msgid "error gathering other user IDs: %s\n"
 msgstr "помилка під час збирання інших ідентифікаторів користувачів: %s\n"
 
@@ -5645,12 +5559,10 @@ msgid "Known user IDs associated with this key:\n"
 msgstr "Відомі ідентифікатори користувачів, пов’язані із цим ключем:\n"
 
 #, c-format
-#| msgid "validity: %s"
 msgid "policy: %s"
 msgstr "правило: %s"
 
 #, c-format
-#| msgid "error getting stored flags: %s\n"
 msgid "error gathering signature stats: %s\n"
 msgstr ""
 "помилка під час спроби зібрати статистичні дані щодо підписування: %s\n"
@@ -5666,7 +5578,6 @@ msgstr[2] "Адресу електронної пошти «%s» пов’яза
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Статистичні дані для ключів із адресою електронної пошти «%s»:\n"
 
-#| msgid "list keys"
 msgid "this key"
 msgstr "цей ключ"
 
@@ -5678,7 +5589,6 @@ msgstr[1] "%ld повідомлення підписано у майбутньо
 msgstr[2] "%ld повідомлень підписано у майбутньому."
 
 #, c-format
-#| msgid "print message digests"
 msgid "%ld message signed"
 msgid_plural "%ld messages signed"
 msgstr[0] "підписано %ld повідомлення"
@@ -5707,8 +5617,8 @@ msgstr[1] " протягом %ld попередніх місяців."
 msgstr[2] " протягом %ld попередніх місяців."
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text so
+#. * that we can tweak it without breaking translations.
 msgid "TOFU detected a binding conflict"
 msgstr ""
 "Зазвичай, з певною адресою електронної пошти пов’язано лише один ключ. Втім, "
@@ -5719,8 +5629,8 @@ msgstr ""
 "із власником і переконатися, що новий ключ є чинним."
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
-#. version of the hotkey) for each of the five choices.  If
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUrRbB"
 
@@ -5730,7 +5640,11 @@ msgstr ""
 "(B)Поганий? "
 
 #, c-format
-#| msgid "error creating a pipe: %s\n"
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr ""
+"помилка під час спроби встановлення рівня довіри до прив’язки TOFU до %s\n"
+
+#, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "помилка під час спроби змінити правила TOFU: %s\n"
 
@@ -5791,7 +5705,6 @@ msgstr ""
 "(ключ %s)\n"
 
 #, c-format
-#| msgid "print message digests"
 msgid "Verified %ld messages signed by \"%s\"."
 msgstr "Перевірено %ld повідомлень, підписаних «%s»."
 
@@ -5858,7 +5771,6 @@ msgstr[2] ""
 "для позначення ключа як помилкового.\n"
 
 #, c-format
-#| msgid "error sending data: %s\n"
 msgid "error opening TOFU database: %s\n"
 msgstr "помилка під час спроби відкрити бази даних TOFU: %s\n"
 
@@ -5922,6 +5834,10 @@ msgstr "потреби у перевірці trustdb на основі моде
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "потреби у оновленні trustdb на основі моделі довіри «%s» немає\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "відкритий ключ %s не знайдено: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "будь ласка, скористайтеся параметром --check-trustdb\n"
 
@@ -5929,7 +5845,6 @@ msgid "checking the trustdb\n"
 msgstr "перевірка trustdb\n"
 
 #, c-format
-#| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "оброблено %d ключ"
@@ -5937,7 +5852,6 @@ msgstr[1] "оброблено %d ключі"
 msgstr[2] "оброблено %d ключів"
 
 #, c-format
-#| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (очищено %d значення чинності)\n"
@@ -6000,6 +5914,11 @@ msgstr "[невідома]"
 msgid "[  undef ]"
 msgstr "[не визн.]"
 
+#, fuzzy
+#| msgid "never"
+msgid "[  never ]"
+msgstr "ніколи"
+
 msgid "[marginal]"
 msgstr "[неповна ]"
 
@@ -6161,7 +6080,6 @@ msgid "card is permanently locked!\n"
 msgstr "картку заблоковано!\n"
 
 #, c-format
-#| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
 "%d Admin PIN attempts remaining before card is permanently locked\n"
@@ -6253,7 +6171,6 @@ msgid "generating key failed\n"
 msgstr "помилка під час створення ключа\n"
 
 #, c-format
-#| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "створення ключа завершено (за %d секунду)\n"
@@ -8381,7 +8298,6 @@ msgstr "|N|завершувати строк дії паролів за вказ
 msgid "do not allow the reuse of old passphrases"
 msgstr "не дозволяти повторне використання старих паролів"
 
-#| msgid "|N|set LDAP timeout to N seconds"
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|встановити вказаний час очікування Pinentry у секундах"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 51364a7..034ee5c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -473,6 +473,10 @@ msgid "error binding socket to '%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
 
 #, fuzzy, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "警告:扩展模块‘%s’权限不安全\n"
+
+#, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败:%s\n"
 
@@ -491,10 +495,6 @@ 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"
 
@@ -2531,6 +2531,9 @@ msgstr "把时间戳矛盾仅视为警告"
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法:gpgv [选项] [文件] (用 -h 求助)"
 
@@ -3948,6 +3951,11 @@ msgstr ""
 msgid "No key with this keygrip\n"
 msgstr "没有索引为 %d 的子钥\n"
 
+#, fuzzy, c-format
+#| msgid "rounded up to %u bits\n"
+msgid "rounded to %u bits\n"
+msgstr "舍入到 %u 位\n"
+
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
@@ -3964,11 +3972,6 @@ msgstr "您想要用多大的密钥尺寸?(%u)"
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#, fuzzy, c-format
-#| msgid "rounded up to %u bits\n"
-msgid "rounded to %u bits\n"
-msgstr "舍入到 %u 位\n"
-
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
@@ -5599,14 +5602,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "读取‘%s’时出错:%s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "找不到公钥 %s:%s\n"
-
-#, fuzzy, c-format
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "读取‘%s’时出错:%s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
 
@@ -5685,14 +5680,14 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5700,6 +5695,10 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "读取‘%s’时出错:%s\n"
+
+#, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "生成密码的时候发生错误:%s\n"
 
@@ -5855,6 +5854,10 @@ msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "找不到公钥 %s:%s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
@@ -5932,6 +5935,11 @@ msgstr "[ 未知 ]"
 msgid "[  undef ]"
 msgstr "[未定义]"
 
+#, fuzzy
+#| msgid "never"
+msgid "[  never ]"
+msgstr "从不"
+
 msgid "[marginal]"
 msgstr "[ 勉强 ]"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 991db81..984ef55 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -440,6 +440,11 @@ msgstr "為 socket 取得 nonce 時出錯\n"
 msgid "error binding socket to '%s': %s\n"
 msgstr "綁定 socket 至 '%s' 時出錯: %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 "listen() failed: %s\n"
 msgstr "listen() 失敗: %s\n"
@@ -456,11 +461,6 @@ 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"
@@ -2388,6 +2388,9 @@ msgstr "僅把時間戳印矛盾視為警告"
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
 
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr ""
+
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "用法: gpgv [選項] [檔案] (或用 -h 求助)"
 
@@ -3774,6 +3777,10 @@ msgid "No key with this keygrip\n"
 msgstr "沒有金鑰有此金鑰鑰柄\n"
 
 #, c-format
+msgid "rounded to %u bits\n"
+msgstr "加大到 %u 位元\n"
+
+#, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
@@ -3789,10 +3796,6 @@ msgstr "你想要用多大的金鑰尺寸? (%u) "
 msgid "Requested keysize is %u bits\n"
 msgstr "你所要求的金鑰尺寸是 %u 位元\n"
 
-#, c-format
-msgid "rounded to %u bits\n"
-msgstr "加大到 %u 位元\n"
-
 msgid "Please select which elliptic curve you want:\n"
 msgstr "請選擇你要使用的橢圓曲線:\n"
 
@@ -5390,15 +5393,6 @@ msgid "error updating TOFU database: %s\n"
 msgstr "送出資料時出錯: %s\n"
 
 #, c-format
-msgid "public key %s not found: %s\n"
-msgstr "找不到公鑰 %s: %s\n"
-
-#, fuzzy, c-format
-#| msgid "error setting OCSP target: %s\n"
-msgid "error setting TOFU binding's trust level to %s\n"
-msgstr "設定 OCSP 目標時出錯: %s\n"
-
-#, c-format
 msgid "The binding %s is NOT known."
 msgstr ""
 
@@ -5473,14 +5467,14 @@ msgid_plural " over the past %ld months."
 msgstr[0] ""
 
 #. TRANSLATORS: Please translate the text found in the source
-#. file below.  We don't directly internationalize that text
-#. so that we can tweak it without breaking translations.
+#. * file below.  We don't directly internationalize that text 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
-#. there is only one choice in your language, repeat it.
+#. * version of the hotkey) for each of the five choices.  If
+#. * there is only one choice in your language, repeat it.
 msgid "gGaAuUrRbB"
 msgstr ""
 
@@ -5488,6 +5482,11 @@ msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
 #, fuzzy, c-format
+#| msgid "error setting OCSP target: %s\n"
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "設定 OCSP 目標時出錯: %s\n"
+
+#, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "建立管道時出錯: %s\n"
@@ -5635,6 +5634,10 @@ msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
 
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "找不到公鑰 %s: %s\n"
+
 msgid "please do a --check-trustdb\n"
 msgstr "請做一次 --check-trustdb\n"
 
@@ -5715,6 +5718,11 @@ msgstr "未知"
 msgid "[  undef ]"
 msgstr ""
 
+#, fuzzy
+#| msgid "never     "
+msgid "[  never ]"
+msgstr "永遠不過期"
+
 msgid "[marginal]"
 msgstr ""
 

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