diff --git a/po/be.po b/po/be.po
index d5ab9cd0e..2478aeff9 100644
--- a/po/be.po
+++ b/po/be.po
@@ -30,9 +30,30 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "нерэчаісны пароль"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -351,6 +372,10 @@ msgstr ""
 msgid "enable putty support"
 msgstr ""
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "Паўтарыце пароль\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1502,6 +1527,10 @@ msgstr ""
 msgid "[User ID not found]"
 msgstr ""
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr ""
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1526,10 +1555,6 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr ""
-
 #, fuzzy
 msgid "make a signature"
 msgstr "зрабіць адчэплены подпіс"
@@ -5130,6 +5155,10 @@ msgstr "пароль занадта доўгі\n"
 msgid "missing argument"
 msgstr ""
 
+#, fuzzy
+msgid "invalid argument"
+msgstr "паказаць ключы й адбіткі пальцаў"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "несумяшчальныя загады\n"
@@ -5150,6 +5179,10 @@ msgstr "недапушчальныя выбары імпартаваньня\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "недапушчальныя выбары імпартаваньня\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -6737,9 +6770,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "памылка стварэньня файла"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "нерэчаісны пароль"
-
 #~ msgid "file close error"
 #~ msgstr "памылка зачыненьня файла"
 
diff --git a/po/ca.po b/po/ca.po
index 76f2a1771..bf9b79d8f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -50,9 +50,31 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+#| msgid "Do you really want to create a sign and encrypt key? "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Segur que voleu crear una clau de signatura i xifratge? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "la contrasenya és invàlida"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -391,6 +413,10 @@ msgstr "no és suportat"
 msgid "enable putty support"
 msgstr "no és suportat"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "error en la creació de la contrasenya: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1623,6 +1649,10 @@ msgstr ""
 msgid "[User ID not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1649,10 +1679,6 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fitxer]|crea una signatura"
@@ -5624,6 +5650,11 @@ msgstr "la línia és massa llarga\n"
 msgid "missing argument"
 msgstr "l'argument és invàlid"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "l'armadura és invàlida"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "les ordres entren en conflicte\n"
@@ -5648,6 +5679,10 @@ msgstr "opcions d'importació no vàlides\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "opcions d'importació no vàlides\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7726,9 +7761,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "el paquet és invàlid"
 
-#~ msgid "invalid armor"
-#~ msgstr "l'armadura és invàlida"
-
 #~ msgid "no such user id"
 #~ msgstr "no s'ha trobat l'id de l'usuari"
 
@@ -7753,9 +7785,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "error en la creació del fitxer"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "la contrasenya és invàlida"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "l'algoritme de clau pública no és implementat"
 
@@ -8520,9 +8549,6 @@ msgstr ""
 #~ msgid "%s: error checking key: %s\n"
 #~ msgstr "%s: error en la comprovació de la clau: %s\n"
 
-#~ msgid "Do you really want to create a sign and encrypt key? "
-#~ msgstr "Segur que voleu crear una clau de signatura i xifratge? "
-
 #~ msgid "Do you really need such a large keysize? "
 #~ msgstr "Realment necessiteu una clau tan llarga? "
 
diff --git a/po/cs.po b/po/cs.po
index 35b1e2976..15a90d9af 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -52,9 +52,37 @@ msgstr "|pinentry-label|_OK"
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Zrušit"
 
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_OK"
+
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_OK"
+
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
+#, fuzzy
+#| msgid "|pinentry-label|_Cancel"
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Zrušit"
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Opravdu chcete revokovat vybrané podklíče? (a/N) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "nesprávné heslo"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -380,6 +408,11 @@ msgstr "zapnout podporu pro OpenSSH"
 msgid "enable putty support"
 msgstr "zapnout podporu pro PuTTY"
 
+#, fuzzy
+#| msgid "do not allow the reuse of old passphrases"
+msgid "disallow the use of an external password cache"
+msgstr "nedovolit opakovat stará hesla"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|SOUBOR|zapsat nastavení prostředí též do SOUBORU"
 
@@ -1509,6 +1542,10 @@ msgstr "příliš mnoho položek v bufferu veřejných klíčů – vypnuto\n"
 msgid "[User ID not found]"
 msgstr "[ID uživatele nenalezeno]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "klíč %s: tajný klíč bez klíče veřejného – přeskočeno\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "„%s“ automaticky získáno přes %s\n"
@@ -1533,10 +1570,6 @@ msgstr "neexistuje tajný podklíč pro veřejný klíč %s – ignorováno\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "používám podklíč %s místo primárního klíče %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "klíč %s: tajný klíč bez klíče veřejného – přeskočeno\n"
-
 msgid "make a signature"
 msgstr "vytvořit podpis"
 
@@ -5263,6 +5296,11 @@ msgstr "klíčové slovo je příliš dlouhé"
 msgid "missing argument"
 msgstr "postrádám argument"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "neplatný způsob reprezentace v ASCII"
+
 msgid "invalid command"
 msgstr "neplatný příkaz"
 
@@ -5279,6 +5317,11 @@ msgstr "neplatný parametr"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "postrádám argument u volby „%.50s“\n"
 
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "postrádám argument u volby „%.50s“\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "volba „%.50s“ nečeká argument\n"
@@ -8360,9 +8403,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "neplatný paket"
 
-#~ msgid "invalid armor"
-#~ msgstr "neplatný způsob reprezentace v ASCII"
-
 #~ msgid "no such user id"
 #~ msgstr "neexistuje uživatel s tímto id"
 
@@ -8384,9 +8424,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "chyba při vytváření souboru"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "nesprávné heslo"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "algoritmus veřejného klíče není implementován"
 
diff --git a/po/da.po b/po/da.po
index 54d5f5f06..0d5c736b6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -39,9 +39,37 @@ msgstr "_O.k."
 msgid "|pinentry-label|_Cancel"
 msgstr "_Afbryd"
 
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_Yes"
+msgstr "_O.k."
+
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_No"
+msgstr "_O.k."
+
 msgid "|pinentry-label|PIN:"
 msgstr "PIN:"
 
+#, fuzzy
+#| msgid "|pinentry-label|_Cancel"
+msgid "|pinentry-label|_Save in password manager"
+msgstr "_Afbryd"
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Vil du virkelig tilbagekalde de valgte undernøgler? (j/N) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "Enter new passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "Indtast ny adgangsfrase"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -365,6 +393,11 @@ msgstr "aktiver ssh-understøttelse"
 msgid "enable putty support"
 msgstr "aktiver putty-understøttelse"
 
+#, fuzzy
+#| msgid "do not allow the reuse of old passphrases"
+msgid "disallow the use of an external password cache"
+msgstr "tillad ikke genbrug af gamle adgangsfraser"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv også miljøindstillinger til FIL"
 
@@ -1497,6 +1530,10 @@ msgstr "for mange punkter i pk-mellemlager - deaktiveret\n"
 msgid "[User ID not found]"
 msgstr "[Bruger-id blev ikke fundet]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "nøgle %s: hemmelig nøgle uden offentlig nøgle - udeladt\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "hentede automatisk »%s« via %s\n"
@@ -1520,10 +1557,6 @@ msgstr "ingen hemmelig undernøgle for offentlig undernøgle %s - ignorerer\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger undernøgle %s i stedet for primær nøgle %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "nøgle %s: hemmelig nøgle uden offentlig nøgle - udeladt\n"
-
 msgid "make a signature"
 msgstr "opret en underskrift"
 
@@ -5247,6 +5280,11 @@ msgstr "nøgleord er for langt"
 msgid "missing argument"
 msgstr "manglende parameter"
 
+#, fuzzy
+#| msgid "invalid value\n"
+msgid "invalid argument"
+msgstr "ugyldig værdi\n"
+
 msgid "invalid command"
 msgstr "ugyldig kommando"
 
@@ -5263,6 +5301,11 @@ msgstr "ugyldig indstilling"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "manglende parameter for indstilling »%.50s«\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "tilvalg »%.50s« forventer ikke et argument\n"
diff --git a/po/el.po b/po/el.po
index 7c32bb938..e094b0741 100644
--- a/po/el.po
+++ b/po/el.po
@@ -31,9 +31,30 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "������� ������ �� ���������� �� ���������� �������; "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "�� ������ ����� ������"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -362,6 +383,10 @@ msgstr "
 msgid "enable putty support"
 msgstr "��� �������������"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1568,6 +1593,10 @@ msgstr "
 msgid "[User ID not found]"
 msgstr "[User id ��� �������]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1593,10 +1622,6 @@ msgstr "
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "���������� ���� �� ������������� ���������"
@@ -5494,6 +5519,11 @@ msgstr "
 msgid "missing argument"
 msgstr "�� ������ ������"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "�� ������ ��������"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "������������� �������\n"
@@ -5514,6 +5544,10 @@ msgstr "
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "�� ������� �������� ���������\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7554,9 +7588,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "�� ������ ������"
 
-#~ msgid "invalid armor"
-#~ msgstr "�� ������ ��������"
-
 #~ msgid "no such user id"
 #~ msgstr "������� ��������� ������ (user id)"
 
@@ -7581,9 +7612,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "������ ����������� �������"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "�� ������ ����� ������"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "�� ������������ ���������� �������� ��������"
 
diff --git a/po/eo.po b/po/eo.po
index cac36b87a..a6e781807 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -31,9 +31,31 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+#| msgid "Do you really want to create a sign and encrypt key? "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "�u vi vere volas krei subskriban kaj �ifran �losilon? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "nevalida pasfrazo"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -362,6 +384,10 @@ msgstr "ne realigita"
 msgid "enable putty support"
 msgstr "ne realigita"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1557,6 +1583,10 @@ msgstr "tro da registroj en pk-staplo - mal
 msgid "[User ID not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1581,10 +1611,6 @@ msgstr "estas sekreta 
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "fari apartan subskribon"
@@ -5445,6 +5471,11 @@ msgstr "pasfrazo estas tro longa\n"
 msgid "missing argument"
 msgstr "nevalida argumento"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "nevalida kiraso"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "malkongruaj komandoj\n"
@@ -5465,6 +5496,10 @@ msgstr "nevalida kiraso"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "nevalida kiraso"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7448,9 +7483,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "nevalida paketo"
 
-#~ msgid "invalid armor"
-#~ msgstr "nevalida kiraso"
-
 #~ msgid "no such user id"
 #~ msgstr "uzantidentigilo ne ekzistas"
 
@@ -7475,9 +7507,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "eraro �e kreo de dosiero"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "nevalida pasfrazo"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "nerealigita publik�losila metodo"
 
@@ -8395,9 +8424,6 @@ msgstr ""
 #~ msgid "For info see http://www.gnupg.org"
 #~ msgstr "Por informoj vidu http://www.gnupg.org"
 
-#~ msgid "Do you really want to create a sign and encrypt key? "
-#~ msgstr "�u vi vere volas krei subskriban kaj �ifran �losilon? "
-
 #~ msgid "can't lock keyring `%s': %s\n"
 #~ msgstr "ne povas �losi la �losilaron '%s': %s\n"
 
diff --git a/po/es.po b/po/es.po
index f6cbb81a3..7fe81483a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -37,9 +37,37 @@ msgstr "|pinentry-label|_OK"
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancelar"
 
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_OK"
+
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_OK"
+
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
+#, fuzzy
+#| msgid "|pinentry-label|_Cancel"
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Cancelar"
+
+#, fuzzy
+#| msgid "Do you really want to create a sign and encrypt key? "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "¿De verdad quiere crear una clave de firma y cifrado? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "frase contraseña incorrecta"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -378,6 +406,11 @@ msgstr "permitir emulación de ssh-agent"
 msgid "enable putty support"
 msgstr "no disponible"
 
+#, fuzzy
+#| msgid "do not allow the reuse of old passphrases"
+msgid "disallow the use of an external password cache"
+msgstr "no permite reusar antiguas frases contraseña"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FICHERO|escribir variables de entorno también en FICHERO"
 
@@ -1521,6 +1554,10 @@ msgstr "demasiados registros en la cache pk - anulada\n"
 msgid "[User ID not found]"
 msgstr "[ID de usuario no encontrado]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "clave %s: clave secreta sin clave pública - omitida\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "recuperado automáticamente `%s' vía %s\n"
@@ -1544,10 +1581,6 @@ msgstr "no hay subclave secreta para la subclave pública %s - ignorada\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "clave %s: clave secreta sin clave pública - omitida\n"
-
 msgid "make a signature"
 msgstr "crea una firma"
 
@@ -5274,6 +5307,11 @@ msgstr "palabra clave demasiado larga"
 msgid "missing argument"
 msgstr "falta el parámetro"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "armadura inválida"
+
 msgid "invalid command"
 msgstr "orden inválida"
 
@@ -5290,6 +5328,11 @@ msgstr "opción inválida"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "falta parámetro para la opción \"%.50s\"\n"
 
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "falta parámetro para la opción \"%.50s\"\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "la opción \"%.50s\" no necesita parámetros\n"
@@ -7337,9 +7380,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "paquete inválido"
 
-#~ msgid "invalid armor"
-#~ msgstr "armadura inválida"
-
 #~ msgid "no such user id"
 #~ msgstr "no existe el ID de usuario"
 
@@ -7364,9 +7404,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "error al crear fichero"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "frase contraseña incorrecta"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "algoritmo de clave pública no implementado"
 
@@ -8126,9 +8163,6 @@ msgstr ""
 #~ msgid "%s: error checking key: %s\n"
 #~ msgstr "%s: error comprobando la clave: %s\n"
 
-#~ msgid "Do you really want to create a sign and encrypt key? "
-#~ msgstr "¿De verdad quiere crear una clave de firma y cifrado? "
-
 #~ msgid "Do you really need such a large keysize? "
 #~ msgstr "¿De verdad necesita una clave tan grande? "
 
diff --git a/po/et.po b/po/et.po
index 1027083ee..ba781a722 100644
--- a/po/et.po
+++ b/po/et.po
@@ -29,9 +29,30 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "vigane parool"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -359,6 +380,10 @@ msgstr "ei ole toetatud"
 msgid "enable putty support"
 msgstr "ei ole toetatud"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "viga parooli loomisel: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1556,6 +1581,10 @@ msgstr "avalike v
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1582,10 +1611,6 @@ msgstr "avalikul alamv
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "loo eraldiseisev allkiri"
@@ -5413,6 +5438,11 @@ msgstr "rida on liiga pikk\n"
 msgid "missing argument"
 msgstr "vigane argument"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "vigane pakend"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "vastuolulised k�sud\n"
@@ -5433,6 +5463,10 @@ msgstr "vigased impordi v
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "vigased impordi v�tmed\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7451,9 +7485,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "vigane pakett"
 
-#~ msgid "invalid armor"
-#~ msgstr "vigane pakend"
-
 #~ msgid "no such user id"
 #~ msgstr "sellist kasutaja id pole"
 
@@ -7478,9 +7509,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "viga faili loomisel"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "vigane parool"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "realiseerimata avaliku v�tme algoritm"
 
diff --git a/po/fi.po b/po/fi.po
index b7fb5d09e..6b3d566b6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -45,9 +45,30 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "väärä salasana"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -375,6 +396,10 @@ msgstr "ei tuettu"
 msgid "enable putty support"
 msgstr "ei tuettu"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1573,6 +1598,12 @@ msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
 msgid "[User ID not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr ""
+"avain %08lX: salaisella avaimella ei ole vastaavaa \n"
+"julkista avainta - ohitetaan\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1599,12 +1630,6 @@ msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr ""
-"avain %08lX: salaisella avaimella ei ole vastaavaa \n"
-"julkista avainta - ohitetaan\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "tee erillinen allekirjoitus"
@@ -5477,6 +5502,11 @@ msgstr "rivi on liian pitkä\n"
 msgid "missing argument"
 msgstr "virheellinen argumentti"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "virheellinen ascii-koodaus"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "ristiriitainen komento\n"
@@ -5497,6 +5527,10 @@ msgstr "virheelliset tuontivalitsimet\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "virheelliset tuontivalitsimet\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7537,9 +7571,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "virheellinen paketti"
 
-#~ msgid "invalid armor"
-#~ msgstr "virheellinen ascii-koodaus"
-
 #~ msgid "no such user id"
 #~ msgstr "käyttäjätunnusta ei löydy"
 
@@ -7564,9 +7595,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "virhe tiedostoa luotaessa"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "väärä salasana"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "julkisen avaimen algoritmi ei ole käytössä"
 
diff --git a/po/fr.po b/po/fr.po
index 4fced1313..a640f2e8e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -32,9 +32,37 @@ msgstr "|pinentry-label|_OK"
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Annuler"
 
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_OK"
+
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_OK"
+
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|Code personnel :"
 
+#, fuzzy
+#| msgid "|pinentry-label|_Cancel"
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Annuler"
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Voulez-vous vraiment révoquer les sous-clefs sélectionnées ? (o/N) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "phrase de passe incorrecte"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -361,6 +389,11 @@ msgstr "activer la prise en charge de SSH"
 msgid "enable putty support"
 msgstr "activer la prise en charge de putty"
 
+#, fuzzy
+#| msgid "do not allow the reuse of old passphrases"
+msgid "disallow the use of an external password cache"
+msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FICHIER|écrire aussi les réglages d'env. dans FICHIER"
 
@@ -1522,6 +1555,10 @@ msgstr "trop d'entrées dans le cache de clefs publiques — désactivé\n"
 msgid "[User ID not found]"
 msgstr "[identité introuvable]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "clef %s : clef secrète sans clef publique — ignorée\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "« %s » automatiquement récupéré par %s\n"
@@ -1549,10 +1586,6 @@ msgstr ""
 "utilisation de la sous-clef %s à la place de la clef\n"
 "principale %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "clef %s : clef secrète sans clef publique — ignorée\n"
-
 msgid "make a signature"
 msgstr "faire une signature"
 
@@ -5396,6 +5429,11 @@ msgstr "mot-clef trop long"
 msgid "missing argument"
 msgstr "argument manquant"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "armure incorrecte"
+
 msgid "invalid command"
 msgstr "commande incorrecte"
 
@@ -5412,6 +5450,11 @@ msgstr "option incorrecte"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "argument manquant pour l'option « %.50s »\n"
 
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "argument manquant pour l'option « %.50s »\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "l'option « %.50s » n'attend pas d'argument\n"
@@ -7381,9 +7424,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "paquet incorrect"
 
-#~ msgid "invalid armor"
-#~ msgstr "armure incorrecte"
-
 #~ msgid "no such user id"
 #~ msgstr "cette identité n'existe pas"
 
@@ -7405,9 +7445,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "erreur de création de fichier"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "phrase de passe incorrecte"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "algorithme de clef publique non implémenté"
 
diff --git a/po/gl.po b/po/gl.po
index ce71bb695..3c62fc898 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -29,9 +29,31 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+#| msgid "Do you really want to create a sign and encrypt key? "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "�Seguro que quere crear unha chave para asinar e cifrar? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "contrasinal incorrecto"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -362,6 +384,10 @@ msgstr "non est
 msgid "enable putty support"
 msgstr "non est� soportado"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1568,6 +1594,10 @@ msgstr "demasiadas entradas na cach
 msgid "[User ID not found]"
 msgstr "[Non se atopou o id de usuario]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1594,10 +1624,6 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "facer unha sinatura separada"
@@ -5481,6 +5507,11 @@ msgstr "li
 msgid "missing argument"
 msgstr "argumento non v�lido"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "armadura non v�lida"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "comandos conflictivos\n"
@@ -5501,6 +5532,10 @@ msgstr "opci
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "opci�ns de importaci�n non v�lidas\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7560,9 +7595,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "paquete non v�lido"
 
-#~ msgid "invalid armor"
-#~ msgstr "armadura non v�lida"
-
 #~ msgid "no such user id"
 #~ msgstr "non hai tal id de usuario"
 
@@ -7587,9 +7619,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "erro de creaci�n de ficheiro"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "contrasinal incorrecto"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "algoritmo de chave p�blica non implementado"
 
@@ -8432,9 +8461,6 @@ msgstr ""
 #~ msgid "%s: error checking key: %s\n"
 #~ msgstr "%s: erro ao verifica-la chave: %s\n"
 
-#~ msgid "Do you really want to create a sign and encrypt key? "
-#~ msgstr "�Seguro que quere crear unha chave para asinar e cifrar? "
-
 #~ msgid "Do you really need such a large keysize? "
 #~ msgstr "�Est� seguro de precisar un tama�o de chave tan grande? "
 
diff --git a/po/hu.po b/po/hu.po
index 8a29491e4..f763ca5db 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -29,9 +29,30 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "�rv�nytelen jelsz�"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -359,6 +380,10 @@ msgstr "nem t
 msgid "enable putty support"
 msgstr "nem t�mogatott"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1552,6 +1577,10 @@ msgstr "T
 msgid "[User ID not found]"
 msgstr "[ismeretlen kulcs]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1579,10 +1608,6 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
@@ -5445,6 +5470,11 @@ msgstr "A sor t
 msgid "missing argument"
 msgstr "�rv�nytelen argumentum"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "�rv�nytelen p�nc�l"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "Egym�snak ellentmond� parancsok!\n"
@@ -5465,6 +5495,10 @@ msgstr "
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "�rv�nytelen import opci�k!\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7497,9 +7531,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "�rv�nytelen csomag"
 
-#~ msgid "invalid armor"
-#~ msgstr "�rv�nytelen p�nc�l"
-
 #~ msgid "no such user id"
 #~ msgstr "nincs ilyen felhaszn�l�i azonos�t�"
 
@@ -7524,9 +7555,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "�llom�nyl�trehoz�si hiba"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "�rv�nytelen jelsz�"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "nem megval�s�tott nyilv�nos kulcs� algoritmus"
 
diff --git a/po/id.po b/po/id.po
index e428b5c05..53d81749c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -34,9 +34,30 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Anda ingin membatalkan kunci terpilih ini? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "passphrase tidak valid"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -364,6 +385,10 @@ msgstr "tidak didukung"
 msgid "enable putty support"
 msgstr "tidak didukung"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1560,6 +1585,10 @@ msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 msgid "[User ID not found]"
 msgstr "[User id tidak ditemukan]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1584,10 +1613,6 @@ msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "buat detached signature"
@@ -5442,6 +5467,11 @@ msgstr "baris terlalu panjang\n"
 msgid "missing argument"
 msgstr "argumen tidak valid"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "armor tidak valid"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "perintah saling konflik\n"
@@ -5462,6 +5492,10 @@ msgstr "opsi impor tidak valid\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "opsi impor tidak valid\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7498,9 +7532,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "paket tidak valid"
 
-#~ msgid "invalid armor"
-#~ msgstr "armor tidak valid"
-
 #~ msgid "no such user id"
 #~ msgstr "tidak ada user id tsb"
 
@@ -7525,9 +7556,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "kesalahan buat file"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "passphrase tidak valid"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "algoritma pubkey belum diimplementasikan"
 
diff --git a/po/it.po b/po/it.po
index d640dac4f..dc614493c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -29,9 +29,30 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Vuoi davvero revocare le chiavi selezionate? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "passphrase non valida"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -359,6 +380,10 @@ msgstr "non gestito"
 msgid "enable putty support"
 msgstr "non gestito"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "errore nella creazione della passhprase: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1565,6 +1590,10 @@ msgstr "troppe voci nella pk cache - disabilitata\n"
 msgid "[User ID not found]"
 msgstr "[User ID non trovato]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1590,10 +1619,6 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "fai una firma separata"
@@ -5483,6 +5508,11 @@ msgstr "riga troppo lunga\n"
 msgid "missing argument"
 msgstr "argomento non valido"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "armatura non valida"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "comandi in conflitto\n"
@@ -5504,6 +5534,10 @@ msgstr "opzioni di importazione non valide\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "opzioni di importazione non valide\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7555,9 +7589,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "pacchetto non valido"
 
-#~ msgid "invalid armor"
-#~ msgstr "armatura non valida"
-
 #~ msgid "no such user id"
 #~ msgstr "l'user id non esiste"
 
@@ -7582,9 +7613,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "errore durante la creazione del file"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "passphrase non valida"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "algoritmo della chiave pubblica non implementato"
 
diff --git a/po/ja.po b/po/ja.po
index 6b7d71529..ad88b4368 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -33,9 +33,37 @@ msgstr "|pinentry-label|_OK"
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_キャンセル"
 
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_OK"
+
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_OK"
+
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
+#, fuzzy
+#| msgid "|pinentry-label|_Cancel"
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_キャンセル"
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "選択した副鍵を本当に失効しますか? (y/N) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "Enter new passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "新しいパスフレーズを入力してください"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -348,6 +376,11 @@ msgstr "sshサポートを有効にする"
 msgid "enable putty support"
 msgstr "puttyサポートを有効にする"
 
+#, fuzzy
+#| msgid "do not allow the reuse of old passphrases"
+msgid "disallow the use of an external password cache"
+msgstr "古いパスフレーズを再使用することを認めない"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|FILEに環境変数の設定も書き出す"
 
@@ -1468,6 +1501,10 @@ msgstr "pkキャッシュのエントリーが多すぎます - 使用禁止\n"
 msgid "[User ID not found]"
 msgstr "[ユーザIDが見つかりません]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "鍵%s: 公開鍵のない秘密鍵です - スキップします\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "「%s」を %s から自動取得\n"
@@ -1491,10 +1528,6 @@ msgstr "公開副鍵%sにたいする秘密副鍵がありません - 無視\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "副鍵%s(主鍵%sではなく)を用います\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "鍵%s: 公開鍵のない秘密鍵です - スキップします\n"
-
 msgid "make a signature"
 msgstr "署名を作成"
 
@@ -3093,7 +3126,8 @@ msgid ""
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
-"*警告*: これはPGP2形式の鍵です。フォトIDの追加で、一部のバージョンのPGPでは、\n"
+"*警告*: これはPGP2形式の鍵です。フォトIDの追加で、一部のバージョンのPGPで"
+"は、\n"
 "        この鍵を拒否するかもしれません。\n"
 
 msgid "Are you sure you still want to add it? (y/N) "
@@ -5146,6 +5180,11 @@ msgstr "キーワードが長すぎます"
 msgid "missing argument"
 msgstr "引数ありません"
 
+#, fuzzy
+#| msgid "invalid value\n"
+msgid "invalid argument"
+msgstr "無効な値\n"
+
 msgid "invalid command"
 msgstr "無効なコマンド"
 
@@ -5162,6 +5201,11 @@ msgstr "無効なオプション"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "オプション\"%.50s\"に引数がありません\n"
 
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "オプション\"%.50s\"に引数がありません\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "オプション\"%.50s\"は引数をとりません\n"
diff --git a/po/nb.po b/po/nb.po
index 6cdc17b24..98fbbc268 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -33,9 +33,31 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Vil du virkelig oppheve de valgte undern�klene? (j/N) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "ugyldig passfrase"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 #, fuzzy
@@ -367,6 +389,10 @@ msgstr ""
 msgid "enable putty support"
 msgstr ""
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "feil ved opprettelse av passfrase: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1514,6 +1540,10 @@ msgstr "for mange innslag i pk-cachen - utkoblet\n"
 msgid "[User ID not found]"
 msgstr "[Brukerid ikke funnet]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1538,10 +1568,6 @@ msgstr "ingen hemmelig undern
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fil]|lage en signatur"
@@ -5205,6 +5231,11 @@ msgstr "for lang linje"
 msgid "missing argument"
 msgstr "ugydig argument"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "ugyldig beskyttelse"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "Admin-reservert kommando\n"
@@ -5225,6 +5256,10 @@ msgstr "ugyldige listevalg\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "ugyldige listevalg\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -6998,9 +7033,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "ugyldig pakke"
 
-#~ msgid "invalid armor"
-#~ msgstr "ugyldig beskyttelse"
-
 #~ msgid "no such user id"
 #~ msgstr "det finnes ingen slik brukerid"
 
@@ -7019,9 +7051,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "feil ved opprettelse av fil"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "ugyldig passfrase"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "uimplementert pubkey-algoritme"
 
diff --git a/po/nl.po b/po/nl.po
index c999b3434..f2a839c24 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -54,9 +54,37 @@ msgstr "|pinentry-label|_OK"
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Annuleren"
 
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_OK"
+
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_OK"
+
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|Pincode:"
 
+#, fuzzy
+#| msgid "|pinentry-label|_Cancel"
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Annuleren"
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Wilt U de geselecteerde subsleutels echt intrekken? (j/N) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "ongeldige wachtwoordzin"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -386,6 +414,11 @@ msgstr "ssh-ondersteuning mogelijk maken"
 msgid "enable putty support"
 msgstr "putty-ondersteuning mogelijk maken"
 
+#, fuzzy
+#| msgid "do not allow the reuse of old passphrases"
+msgid "disallow the use of an external password cache"
+msgstr "laat het opnieuw gebruiken van oude wachtwoordzinnen niet toe"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|BESTAND|schrijf omgevingsinstellingen ook weg naar BESTAND"
 
@@ -1542,6 +1575,10 @@ msgstr "te veel regels in de pk-cache - gedeactiveerd\n"
 msgid "[User ID not found]"
 msgstr "[Gebruikers-ID niet gevonden]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "sleutel %s: geheime sleutel zonder publieke sleutel - overgeslagen\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "`%s' automatisch opgehaald via %s\n"
@@ -1566,10 +1603,6 @@ msgstr "geen geheime subsleutel voor publieke subsleutel %s - overgeslagen\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "subsleutel %s wordt gebruikt in plaats van primaire sleutel %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "sleutel %s: geheime sleutel zonder publieke sleutel - overgeslagen\n"
-
 msgid "make a signature"
 msgstr "maak een ondertekening"
 
@@ -5449,6 +5482,11 @@ msgstr "sleutelwoord is te lang"
 msgid "missing argument"
 msgstr "ontbrekende parameter"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "ongeldig harnas"
+
 msgid "invalid command"
 msgstr "ongeldig commando"
 
@@ -5465,6 +5503,11 @@ msgstr "ongeldige optie"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "ontbrekende parameter voor optie \"%.50s\"\n"
 
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "ontbrekende parameter voor optie \"%.50s\"\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "optie \"%.50s\" verwacht geen parameter\n"
@@ -7467,9 +7510,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "ongeldig pakket"
 
-#~ msgid "invalid armor"
-#~ msgstr "ongeldig harnas"
-
 #~ msgid "no such user id"
 #~ msgstr "een dergelijk gebruikers-id bestaat niet"
 
@@ -7491,9 +7531,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "fout bij het aanmaken van het bestand"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "ongeldige wachtwoordzin"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "niet geïmplementeerd algoritme voor de publieke sleutel"
 
diff --git a/po/pl.po b/po/pl.po
index eb5f449b3..f1efab6b4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -33,9 +33,37 @@ msgstr "|pinentry-label|_OK"
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Anuluj"
 
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_OK"
+
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_OK"
+
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
+#, fuzzy
+#| msgid "|pinentry-label|_Cancel"
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Anuluj"
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Czy na pewno chcesz unieważnić wybrane podklucze? (t/N) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "Enter new passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "Wprowadź nowe hasło"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -357,6 +385,11 @@ msgstr "włączenie obsługi ssh"
 msgid "enable putty support"
 msgstr "włączenie obsługi putty"
 
+#, fuzzy
+#| msgid "do not allow the reuse of old passphrases"
+msgid "disallow the use of an external password cache"
+msgstr "nie zezwalanie na ponowne użycie starych haseł"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|PLIK|zapis ustawień środowiska także do PLIKU"
 
@@ -1484,6 +1517,10 @@ msgstr "zbyt wiele wpisów w buforze kluczy publicznych - wyłączony\n"
 msgid "[User ID not found]"
 msgstr "[brak identyfikatora użytkownika]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "klucz %s: klucz tajny bez klucza jawnego - pominięty\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "automatycznie pobrano `%s' poprzez %s\n"
@@ -1508,10 +1545,6 @@ msgstr "brak prywatnego odpowiednika podklucza publicznego %s - pominięty\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "używany jest podklucz %s zamiast klucza głównego %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "klucz %s: klucz tajny bez klucza jawnego - pominięty\n"
-
 msgid "make a signature"
 msgstr "złożenie podpisu"
 
@@ -5285,6 +5318,11 @@ msgstr "słowo kluczowe zbyt długie"
 msgid "missing argument"
 msgstr "brak argumentu"
 
+#, fuzzy
+#| msgid "invalid value\n"
+msgid "invalid argument"
+msgstr "niepoprawna wartość\n"
+
 msgid "invalid command"
 msgstr "błędne polecenie"
 
@@ -5301,6 +5339,11 @@ msgstr "błędna opcja"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "brak argumentu dla opcji ,,%.50s''\n"
 
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "brak argumentu dla opcji ,,%.50s''\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "opcja ,,%.50s'' nie może mieć argumentów\n"
diff --git a/po/pt.po b/po/pt.po
index 650f16905..1ebd6ab3c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -32,9 +32,30 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Voc� quer realmente revogar as chaves selecionadas? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "frase-secreta inv�lida"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -363,6 +384,10 @@ msgstr "n
 msgid "enable putty support"
 msgstr "n�o suportado"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1559,6 +1584,10 @@ msgstr "entradas demais no cache pk - desactivado\n"
 msgid "[User ID not found]"
 msgstr "[Utilizador n�o encontrado]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1583,10 +1612,6 @@ msgstr "h
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
@@ -5448,6 +5473,11 @@ msgstr "frase secreta demasiado longa\n"
 msgid "missing argument"
 msgstr "argumento inv�lido"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "armadura inv�lida"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "comandos em conflito\n"
@@ -5468,6 +5498,10 @@ msgstr "op
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "op��es de importa��o inv�lidas\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7492,9 +7526,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "pacote inv�lido"
 
-#~ msgid "invalid armor"
-#~ msgstr "armadura inv�lida"
-
 #~ msgid "no such user id"
 #~ msgstr "identificador de utilizador inexistente"
 
@@ -7519,9 +7550,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "erro na cria��o do ficheiro"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "frase-secreta inv�lida"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "algoritmo de chave p�blica n�o implementado"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a6c6f92ac..579ea19fe 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -36,9 +36,31 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+#| msgid "Do you really want to create a sign and encrypt key? "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Voc� realmente quer criar uma chave para assinatura e criptografia? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "frase secreta inv�lida"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -369,6 +391,10 @@ msgstr "n
 msgid "enable putty support"
 msgstr "n�o suportado"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "erro na cria��o da frase secreta: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1566,6 +1592,10 @@ msgstr "entradas demais no cache pk - desativado\n"
 msgid "[User ID not found]"
 msgstr "[usu�rio n�o encontrado]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1590,10 +1620,6 @@ msgstr "h
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
@@ -5456,6 +5482,11 @@ msgstr "linha muito longa\n"
 msgid "missing argument"
 msgstr "argumento inv�lido"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "armadura inv�lida"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "comandos conflitantes\n"
@@ -5476,6 +5507,10 @@ msgstr "armadura inv
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "armadura inv�lida"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7324,9 +7359,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "pacote inv�lido"
 
-#~ msgid "invalid armor"
-#~ msgstr "armadura inv�lida"
-
 #~ msgid "no such user id"
 #~ msgstr "identificador de usu�rio inexistente"
 
@@ -7351,9 +7383,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "erro na cria��o de arquivo"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "frase secreta inv�lida"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "algoritmo de chave p�blica n�o implementado"
 
@@ -8269,10 +8298,6 @@ msgstr ""
 #~ "usu�rio `%s' n�o encontrado no banco de dados de confiabilidade - "
 #~ "inserindo\n"
 
-#~ msgid "Do you really want to create a sign and encrypt key? "
-#~ msgstr ""
-#~ "Voc� realmente quer criar uma chave para assinatura e criptografia? "
-
 #~ msgid "no default public keyring\n"
 #~ msgstr "sem chaveiro p�blico padr�o\n"
 
diff --git a/po/ro.po b/po/ro.po
index e0d5907bf..5ddab61fe 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -33,9 +33,31 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "fraz�-parol� invalid�"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 #, fuzzy
@@ -373,6 +395,10 @@ msgstr "nu este suportat(
 msgid "enable putty support"
 msgstr "nu este suportat(�)"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "eroare la crearea frazei-parol�: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1541,6 +1567,10 @@ msgstr "prea multe intr
 msgid "[User ID not found]"
 msgstr "[ID utilizator nu a fost g�sit]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1565,10 +1595,6 @@ msgstr "nici o subcheie secret
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
@@ -5353,6 +5379,11 @@ msgstr "linie prea lung
 msgid "missing argument"
 msgstr "argument invalid"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "armur� invalid�"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "Comand� numai-administrare\n"
@@ -5373,6 +5404,10 @@ msgstr "op
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "op�iuni enumerare invalide\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7449,9 +7484,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "pachet invalid"
 
-#~ msgid "invalid armor"
-#~ msgstr "armur� invalid�"
-
 #~ msgid "no such user id"
 #~ msgstr "nu exist� acest id utilizator"
 
@@ -7476,9 +7508,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "eroare creare fi�ier"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "fraz�-parol� invalid�"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "algoritm pubkey neimplementat"
 
diff --git a/po/sk.po b/po/sk.po
index b715a1189..23bac58c9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -32,9 +32,30 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Skuto�ne chcete revokova� vybran� k���e? "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "nespr�vne heslo"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -362,6 +383,10 @@ msgstr "nepodporovan
 msgid "enable putty support"
 msgstr "nepodporovan�"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "chyba pri vytv�ran� hesla: %s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1560,6 +1585,10 @@ msgstr "pr
 msgid "[User ID not found]"
 msgstr "[User id not found]"
 
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr ""
@@ -1586,10 +1615,6 @@ msgstr "existuje tajn
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#, fuzzy, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
@@ -5461,6 +5486,11 @@ msgstr "riadok je pr
 msgid "missing argument"
 msgstr "neplatn� argument"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "neplatn� sp�sob reprezent�cie v ASCII"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "konfliktn� pr�kazy\n"
@@ -5481,6 +5511,10 @@ msgstr "neplatn
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "neplatn� parameter pre import\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7516,9 +7550,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "neplatn� paket"
 
-#~ msgid "invalid armor"
-#~ msgstr "neplatn� sp�sob reprezent�cie v ASCII"
-
 #~ msgid "no such user id"
 #~ msgstr "u��vate� s t�mto id neexistuje"
 
@@ -7543,9 +7574,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "chyba pri vytv�ran� s�boru"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "nespr�vne heslo"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "algoritmus verejn�ho k���a nie je implementovan�"
 
diff --git a/po/sv.po b/po/sv.po
index 4c42193c4..3e8b6cdf2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -48,9 +48,37 @@ msgstr "_OK"
 msgid "|pinentry-label|_Cancel"
 msgstr "_Avbryt"
 
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_Yes"
+msgstr "_OK"
+
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_No"
+msgstr "_OK"
+
 msgid "|pinentry-label|PIN:"
 msgstr "PIN-kod:"
 
+#, fuzzy
+#| msgid "|pinentry-label|_Cancel"
+msgid "|pinentry-label|_Save in password manager"
+msgstr "_Avbryt"
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "Enter new passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "Ange ny lösenfras"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -382,6 +410,11 @@ msgstr "aktivera ssh-agent-emulering"
 msgid "enable putty support"
 msgstr ""
 
+#, fuzzy
+#| msgid "do not allow the reuse of old passphrases"
+msgid "disallow the use of an external password cache"
+msgstr "tillåt inte återanvändning av gamla lösenfraser"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv även miljöinställningar till FIL"
 
@@ -1532,6 +1565,10 @@ msgstr "för många poster i pk-cachen - inaktiverad\n"
 msgid "[User ID not found]"
 msgstr "[Användaridentiteten hittades inte]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "hämtade \"%s\" automatiskt via %s\n"
@@ -1556,10 +1593,6 @@ msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
-
 msgid "make a signature"
 msgstr "skapa en signatur"
 
@@ -5393,6 +5426,11 @@ msgstr "nyckelordet är för långt"
 msgid "missing argument"
 msgstr "argument saknas"
 
+#, fuzzy
+#| msgid "invalid value\n"
+msgid "invalid argument"
+msgstr "ogiltigt värde\n"
+
 msgid "invalid command"
 msgstr "ogiltigt kommando"
 
@@ -5409,6 +5447,11 @@ msgstr "ogiltig flagga"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "argument för flaggan \"%.50s\" saknas\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "flaggan \"%.50s\" förväntar sig inte ett argument\n"
diff --git a/po/tr.po b/po/tr.po
index 8fb4bff1f..889f53288 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -32,9 +32,33 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr ""
+"Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
+"(e/H ya da y/N) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "Enter new passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "Yeni anahtar parolasını giriniz"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -357,6 +381,11 @@ msgstr "ssh-agent öykünümü etkinleşir"
 msgid "enable putty support"
 msgstr ""
 
+#, fuzzy
+#| msgid "do not allow the reuse of old passphrases"
+msgid "disallow the use of an external password cache"
+msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
@@ -1495,6 +1524,10 @@ msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 msgid "[User ID not found]"
 msgstr "[Kullanıcı kimliği yok]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "`%s' %s üzerinden özdevinimli olarak alındı\n"
@@ -1520,10 +1553,6 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
-
 msgid "make a signature"
 msgstr "bir imza yapar"
 
@@ -5317,6 +5346,11 @@ msgstr "anahtar sözcük çok uzun"
 msgid "missing argument"
 msgstr "eksik değiştirge"
 
+#, fuzzy
+#| msgid "invalid value\n"
+msgid "invalid argument"
+msgstr "değer hatalı\n"
+
 msgid "invalid command"
 msgstr "geçersiz komut"
 
@@ -5333,6 +5367,11 @@ msgstr "geçersiz seçenek"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "\"%.50s\" seçeneğinin değiştirge ihtiyacı yok\n"
diff --git a/po/uk.po b/po/uk.po
index 32400e215..77998ae67 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -33,9 +33,37 @@ msgstr "_Гаразд"
 msgid "|pinentry-label|_Cancel"
 msgstr "_Скасувати"
 
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_Yes"
+msgstr "_Гаразд"
+
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_No"
+msgstr "_Гаразд"
+
 msgid "|pinentry-label|PIN:"
 msgstr "Пінкод:"
 
+#, fuzzy
+#| msgid "|pinentry-label|_Cancel"
+msgid "|pinentry-label|_Save in password manager"
+msgstr "_Скасувати"
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Ви справді бажаєте відкликати позначені підключі? (y/N або т/Н) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "Enter new passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "Вкажіть новий пароль"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -363,6 +391,11 @@ msgstr "увімкнути підтримку ssh"
 msgid "enable putty support"
 msgstr "увімкнути підтримку putty"
 
+#, fuzzy
+#| msgid "do not allow the reuse of old passphrases"
+msgid "disallow the use of an external password cache"
+msgstr "не дозволяти повторне використання старих паролів"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr "записати параметри середовища і до файла"
 
@@ -1510,6 +1543,10 @@ msgstr "занадто багато записів у кеші pk — вимкн
 msgid "[User ID not found]"
 msgstr "[Ідентифікатор не знайдено]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "ключ %s: закритий ключ без відкритого ключа — пропущено\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "автоматично отримано «%s» за допомогою %s\n"
@@ -1535,10 +1572,6 @@ msgstr "немає закритого підключа для відкритог
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "використовуємо підключ %s замість основного ключа %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "ключ %s: закритий ключ без відкритого ключа — пропущено\n"
-
 msgid "make a signature"
 msgstr "створити підпис"
 
@@ -5322,6 +5355,11 @@ msgstr "занадто довге ключове слово"
 msgid "missing argument"
 msgstr "не вистачає аргументу"
 
+#, fuzzy
+#| msgid "invalid value\n"
+msgid "invalid argument"
+msgstr "некоректне значення\n"
+
 msgid "invalid command"
 msgstr "некоректна команда"
 
@@ -5338,6 +5376,11 @@ msgstr "некоректний параметр"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "не вказано аргументу до параметра «%.50s»\n"
 
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "не вказано аргументу до параметра «%.50s»\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "для параметра «%.50s» аргументи не потрібно вказувати\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d8dfc3446..8ab5db72b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -34,9 +34,31 @@ msgstr ""
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
+msgid "|pinentry-label|_Yes"
+msgstr ""
+
+msgid "|pinentry-label|_No"
+msgstr ""
+
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
+msgid "|pinentry-label|_Save in password manager"
+msgstr ""
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "您真的要吊销选定的子钥吗？(y/N)"
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "无效的密码"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 #, fuzzy
@@ -371,6 +393,10 @@ msgstr "未被支持"
 msgid "enable putty support"
 msgstr "未被支持"
 
+#, fuzzy
+msgid "disallow the use of an external password cache"
+msgstr "生成密码的时候发生错误：%s\n"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
@@ -1516,6 +1542,10 @@ msgstr "pk 缓存里项目太多――已禁用\n"
 msgid "[User ID not found]"
 msgstr "[找不到用户标识]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "自动获取‘%s’，通过 %s\n"
@@ -1540,10 +1570,6 @@ msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
-
 #, fuzzy
 msgid "make a signature"
 msgstr "|[文件名]|生成一份签名"
@@ -5189,6 +5215,11 @@ msgstr "列太长"
 msgid "missing argument"
 msgstr "无效的参数"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "无效的 ASCII 封装格式"
+
 #, fuzzy
 msgid "invalid command"
 msgstr "仅供管理员使用的命令\n"
@@ -5209,6 +5240,10 @@ msgstr "无效的列表选项\n"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "无效的列表选项\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
@@ -7220,9 +7255,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "无效包"
 
-#~ msgid "invalid armor"
-#~ msgstr "无效的 ASCII 封装格式"
-
 #~ msgid "no such user id"
 #~ msgstr "没有这个用户标识"
 
@@ -7244,9 +7276,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "文件建立错误"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "无效的密码"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "未实现的公钥算法"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2941a864f..f8192f6de 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -35,9 +35,37 @@ msgstr "|pinentry-label|_OK"
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|取消 (_C)"
 
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_OK"
+
+#, fuzzy
+#| msgid "|pinentry-label|_OK"
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_OK"
+
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|個人識別碼 (PIN):"
 
+#, fuzzy
+#| msgid "|pinentry-label|_Cancel"
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|取消 (_C)"
+
+#, fuzzy
+#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
+
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr ""
+
+#, fuzzy
+#| msgid "invalid passphrase"
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "無效的密語"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
 msgid "Quality:"
@@ -342,6 +370,11 @@ msgstr "啟用 ssh 支援"
 msgid "enable putty support"
 msgstr "啟用 putty 支援"
 
+#, fuzzy
+#| msgid "do not allow the reuse of old passphrases"
+msgid "disallow the use of an external password cache"
+msgstr "不允許重複使用舊密語"
+
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|檔案|將環境設定也寫至指定檔案"
 
@@ -1448,6 +1481,10 @@ msgstr "pk 快取裡有太多項目 - 已禁用\n"
 msgid "[User ID not found]"
 msgstr "[找不到使用者 ID]"
 
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
+
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
 msgstr "已自動取回 `%s' (經由 %s )\n"
@@ -1471,10 +1508,6 @@ msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 
-#, c-format
-msgid "key %s: secret key without public key - skipped\n"
-msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
-
 msgid "make a signature"
 msgstr "建立簽章"
 
@@ -5103,6 +5136,11 @@ msgstr "關鍵字太長"
 msgid "missing argument"
 msgstr "無效的引數"
 
+#, fuzzy
+#| msgid "invalid armor"
+msgid "invalid argument"
+msgstr "無效的封裝"
+
 msgid "invalid command"
 msgstr "無效的指令"
 
@@ -5119,6 +5157,11 @@ msgstr "無效的選項"
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "\"%.50s\" 選項遺失了引數\n"
 
+#, fuzzy, c-format
+#| msgid "missing argument for option \"%.50s\"\n"
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "\"%.50s\" 選項遺失了引數\n"
+
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr "\"%.50s\" 選項沒料到會有引數\n"
@@ -7038,9 +7081,6 @@ msgstr ""
 #~ msgid "invalid packet"
 #~ msgstr "無效的封包"
 
-#~ msgid "invalid armor"
-#~ msgstr "無效的封裝"
-
 #~ msgid "no such user id"
 #~ msgstr "沒有這個使用者 ID"
 
@@ -7059,9 +7099,6 @@ msgstr ""
 #~ msgid "file create error"
 #~ msgstr "檔案建立錯誤"
 
-#~ msgid "invalid passphrase"
-#~ msgstr "無效的密語"
-
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "尚未實做的公鑰演算法"