diff --git a/po/ca.po b/po/ca.po
index 86b6e522c..e6b7a4d52 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -43,7 +43,8 @@ msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -100,6 +101,13 @@ msgid ""
 "this session"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "la contrasenya és errònia"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -136,10 +144,6 @@ msgstr "l'MPI és erroni"
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "la contrasenya és errònia"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
@@ -597,10 +601,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "la contrasenya és errònia"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancel·la"
@@ -702,6 +702,12 @@ msgstr "canvia la contrasenya"
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Realment voleu eliminar les claus seleccionades? "
+
 #, fuzzy
 msgid "Delete key"
 msgstr "activa una clau"
@@ -852,6 +858,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "AVÍS: %s és una opció desaconsellada.\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4349,6 +4367,16 @@ msgstr "Notació de signatura crítica: "
 msgid "Signature notation: "
 msgstr "Notació de signatura: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 signatura errònia\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d signatures errònies\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4720,14 +4748,6 @@ msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "AVÍS: %s és una opció desaconsellada.\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
@@ -8512,6 +8532,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "la contrasenya és errònia"
+
 #, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr ""
diff --git a/po/cs.po b/po/cs.po
index b9e31bd06..00a8c3456 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -52,7 +52,8 @@ msgstr "získání zámku pinetry se nezdařilo: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
@@ -118,6 +119,12 @@ msgid ""
 msgstr ""
 "Prosím, zadejte vaše heslo, aby pro tuto relaci mohl být odemknut tajný klíč"
 
+msgid "PIN:"
+msgstr ""
+
+msgid "Passphrase:"
+msgstr "Heslo:"
+
 msgid "does not match - try again"
 msgstr "neshodují se – zkuste to znovu"
 
@@ -149,9 +156,6 @@ msgstr "Špatný PIN"
 msgid "Bad Passphrase"
 msgstr "Špatné heslo"
 
-msgid "Passphrase"
-msgstr "Heslo"
-
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH klíče delší než %d bitů nejsou podporovány\n"
@@ -310,7 +314,8 @@ msgstr[1] "Heslo by mělo obsahovat alespoň %u číslice nebo %%0Azvláštní z
 msgstr[2] ""
 "Heslo by mělo obsahovat alespoň %u číslic nebo %%0Azvláštních znaků."
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Heslo by nemělo být známým slovem nebo se shodovat%%0As určitým vzorem."
@@ -583,9 +588,6 @@ msgstr ""
 "Prosím, vložte heslo nebo PIN\n"
 "potřebný pro dokončení této operace."
 
-msgid "Passphrase:"
-msgstr "Heslo:"
-
 msgid "cancelled\n"
 msgstr "zrušeno\n"
 
@@ -686,6 +688,13 @@ msgstr "Změnit heslo"
 msgid "I'll change it later"
 msgstr "Změním jej později"
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Opravdu chcete smazat vybrané klíče? (a/N) "
+
 msgid "Delete key"
 msgstr "Smazat klíč"
 
@@ -827,6 +836,18 @@ msgstr "při pokusu alokovat %lu bajtů došla bezpečná paměť"
 msgid "out of core while allocating %lu bytes"
 msgstr "při pokusu alokovat %lu bajtů došla paměť"
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: zastaralý parametr „%s“ – neúčinkuje\n"
+
+#, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "VAROVÁNÍ: „%s%s“ je zastaralý parametr – neúčinkuje\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr "gpg-agent neběží – spouští se „%s“\n"
@@ -4013,6 +4034,16 @@ msgstr "Kritická podepisovací notace: "
 msgid "Signature notation: "
 msgstr "Podepisovací notace: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 špatný podpis\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d špatných podpisů\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr "Pozor: %lu klíč(ů) přeskočen(o) kvůli jejich přílišné velikosti\n"
@@ -4369,14 +4400,6 @@ msgstr "použijte místo něj „%s%s“ \n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROVÁNÍ: používání příkaz „%s“ se nedoporučuje - nepoužívejte jej\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: zastaralý parametr „%s“ – neúčinkuje\n"
-
-#, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "VAROVÁNÍ: „%s%s“ je zastaralý parametr – neúčinkuje\n"
-
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: „%s“ je v tomto souboru zastaralý – účinkuje pouze v %s\n"
@@ -7944,6 +7967,9 @@ msgstr ""
 "Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
 "Prověří heslo zadané na vstupu proti souboru se vzory\n"
 
+#~ msgid "Passphrase"
+#~ msgstr "Heslo"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr "používat dočasné soubory na přenos dat k modulům pro servery klíčů"
 
diff --git a/po/da.po b/po/da.po
index 90effe0e0..e9b5f902c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -31,7 +31,8 @@ msgstr "kunne ikke indhente pinentry-lås: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr "_O.k."
 
@@ -102,6 +103,12 @@ msgstr ""
 "Indtast din adgangsfrase, så at den hemmelige nøgle kan låses op for denne "
 "session"
 
+msgid "PIN:"
+msgstr ""
+
+msgid "Passphrase:"
+msgstr "Adgangsfrase:"
+
 msgid "does not match - try again"
 msgstr "matcher ikke - prøv igen"
 
@@ -133,9 +140,6 @@ msgstr "Ugyldig PIN"
 msgid "Bad Passphrase"
 msgstr "Ugyldig adgangsfrase"
 
-msgid "Passphrase"
-msgstr "Adgangsfrase"
-
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
@@ -614,9 +618,6 @@ msgstr ""
 "Indtast venligst adgangsfrasen eller PIN'en\n"
 "krævet for at færdiggøre denne handling."
 
-msgid "Passphrase:"
-msgstr "Adgangsfrase:"
-
 msgid "cancelled\n"
 msgstr "afbrudt\n"
 
@@ -727,6 +728,13 @@ msgstr "Ændr adgangsfrasen"
 msgid "I'll change it later"
 msgstr "Jeg ændrer den senere"
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
+
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
@@ -875,6 +883,19 @@ msgstr "ikke nok kerne i sikker hukommelse under allokering af %lu byte"
 msgid "out of core while allocating %lu bytes"
 msgstr "ikke nok kerne under allokering af %lu byte"
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: forældet indstilling »%s« - den har ingen effekt\n"
+
+#, fuzzy, c-format
+#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "no running gpg-agent - starting one\n"
 msgid "no running gpg-agent - starting '%s'\n"
@@ -4208,6 +4229,16 @@ msgstr "Kritisk underskriftnotation: "
 msgid "Signature notation: "
 msgstr "Underskriftsnotation: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 ugyldig underskrift\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d ugyldige underskrifter\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4569,15 +4600,6 @@ msgstr "brug venligst »%s%s« i stedet for\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ADVARSEL: »%s« er en forældet kommando - brug den ikke\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: forældet indstilling »%s« - den har ingen effekt\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
-
 #, fuzzy, c-format
 #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
@@ -8488,6 +8510,9 @@ msgstr ""
 "Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
 "Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
 
+#~ msgid "Passphrase"
+#~ msgstr "Adgangsfrase"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr "brug midlertidige filer til at sende data til nøgleserverhjælpere"
 
diff --git a/po/el.po b/po/el.po
index 8e5f2c42f..18bb36457 100644
--- a/po/el.po
+++ b/po/el.po
@@ -24,7 +24,8 @@ msgstr "
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -80,6 +81,13 @@ msgid ""
 "this session"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "���� ����� ������"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -116,10 +124,6 @@ msgstr "
 msgid "Bad Passphrase"
 msgstr "���� ����� ������"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "���� ����� ������"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
@@ -567,10 +571,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "���� ����� ������"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "�������"
@@ -671,6 +671,12 @@ msgstr "
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "������� ������ �� ���������� �� ���������� �������; "
+
 #, fuzzy
 msgid "Delete key"
 msgstr "����������� ��� ������"
@@ -817,6 +823,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4246,6 +4264,16 @@ msgstr "
 msgid "Signature notation: "
 msgstr "�������� ���������: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 ���� ��������\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d ����� ���������\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4616,14 +4644,6 @@ msgstr "
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
@@ -8333,6 +8353,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "���� ����� ������"
+
 #, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 3e9e0e0fd..7181f634f 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -24,7 +24,8 @@ msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -81,6 +82,13 @@ msgid ""
 "this session"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "malbona pasfrazo"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -117,10 +125,6 @@ msgstr "malbona MPI"
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "malbona pasfrazo"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
@@ -567,10 +571,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "malbona pasfrazo"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
@@ -671,6 +671,12 @@ msgstr "
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
+
 #, fuzzy
 msgid "Delete key"
 msgstr "�alti �losilon"
@@ -818,6 +824,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4225,6 +4243,16 @@ msgstr "Subskribo-notacio: "
 msgid "Signature notation: "
 msgstr "Subskribo-notacio: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 malbona subskribo\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d malbonaj subskriboj\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4595,14 +4623,6 @@ msgstr ""
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "AVERTO: '%s' estas malplena dosiero\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -8286,6 +8306,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "malbona pasfrazo"
+
 #~ msgid "gpg-agent is not available in this session\n"
 #~ msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
diff --git a/po/es.po b/po/es.po
index 0abc622ca..8cd141bf9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -26,7 +26,8 @@ msgstr "no pude conseguir el bloqueo de entrada de pin: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr "|entrada de pin-etiqueta|_OK"
 
@@ -91,6 +92,21 @@ msgstr ""
 "Por favor introduzca la frase contrase�a para desbloquear la clave secreta "
 "de esta sesi�n"
 
+msgid "PIN:"
+msgstr ""
+
+# �Por qu� no frase de paso?
+# Porque todo el mundo sabe lo que es una contrase�a
+# y una "frase de paso" no. Soy consciente de que se
+# traduce igual password y passphrase pero el contexto
+# permite saber de lo que se est� hablando.
+# No s�, no s�.
+# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
+# �Es que son m�s listos? :-)
+#
+msgid "Passphrase:"
+msgstr "Frase contrase�a:"
+
 msgid "does not match - try again"
 msgstr "no coincide - reint�ntelo"
 
@@ -131,18 +147,6 @@ msgstr "PIN incorrecto"
 msgid "Bad Passphrase"
 msgstr "Frase contrase�a err�nea"
 
-# �Por qu� no frase de paso?
-# Porque todo el mundo sabe lo que es una contrase�a
-# y una "frase de paso" no. Soy consciente de que se
-# traduce igual password y passphrase pero el contexto
-# permite saber de lo que se est� hablando.
-# No s�, no s�.
-# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
-# �Es que son m�s listos? :-)
-#
-msgid "Passphrase"
-msgstr "Frase contrase�a"
-
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "no pueden usarse claves ssh de m�s de %d bits\n"
@@ -632,18 +636,6 @@ msgstr ""
 "Por favor introduzca la frase contrase�a o PIN\n"
 "necesarios para completar esta operaci�n."
 
-# �Por qu� no frase de paso?
-# Porque todo el mundo sabe lo que es una contrase�a
-# y una "frase de paso" no. Soy consciente de que se
-# traduce igual password y passphrase pero el contexto
-# permite saber de lo que se est� hablando.
-# No s�, no s�.
-# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
-# �Es que son m�s listos? :-)
-#
-msgid "Passphrase:"
-msgstr "Frase contrase�a:"
-
 msgid "cancelled\n"
 msgstr "cancelado\n"
 
@@ -755,6 +747,13 @@ msgstr "Cambia la frase contrase
 msgid "I'll change it later"
 msgstr "La cambiar� m�s tarde"
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
+
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
@@ -903,6 +902,19 @@ msgstr "agotado nucleo de memoria segura reservando %lu bytes"
 msgid "out of core while allocating %lu bytes"
 msgstr "error de memoria reservando %lu bytes"
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: opci�n obsoleta \"%s\" - no tiene efecto\n"
+
+#, fuzzy, c-format
+#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta - no tiene efecto\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "no running gpg-agent - starting one\n"
 msgid "no running gpg-agent - starting '%s'\n"
@@ -4224,6 +4236,16 @@ msgstr "Notaci
 msgid "Signature notation: "
 msgstr "Notaci�n de firma: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 firma incorrecta\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d firmas incorrectas\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4583,15 +4605,6 @@ msgstr "por favor use \"%s%s\" en su lugar\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATENCI�N: \"%s\" es una orden obsoleta - no la use\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: opci�n obsoleta \"%s\" - no tiene efecto\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta - no tiene efecto\n"
-
 #, fuzzy, c-format
 #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
@@ -8544,6 +8557,18 @@ msgstr ""
 "Compara frase contrase�a dada en entrada est�ndar con un fichero de "
 "patrones\n"
 
+# �Por qu� no frase de paso?
+# Porque todo el mundo sabe lo que es una contrase�a
+# y una "frase de paso" no. Soy consciente de que se
+# traduce igual password y passphrase pero el contexto
+# permite saber de lo que se est� hablando.
+# No s�, no s�.
+# �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
+# �Es que son m�s listos? :-)
+#
+#~ msgid "Passphrase"
+#~ msgstr "Frase contrase�a"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
 #~ "usar ficheros temporales para pasar datos a los ayudantes delservidor de "
diff --git a/po/et.po b/po/et.po
index fdf5462dc..4066f5842 100644
--- a/po/et.po
+++ b/po/et.po
@@ -22,7 +22,8 @@ msgstr "TrustDB initsialiseerimine eba
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -78,6 +79,13 @@ msgid ""
 "this session"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "halb parool"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -114,10 +122,6 @@ msgstr "halb MPI"
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "halb parool"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
@@ -565,10 +569,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "halb parool"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Katkesta"
@@ -669,6 +669,12 @@ msgstr "muuda parooli"
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
+
 #, fuzzy
 msgid "Delete key"
 msgstr "luba v�ti"
@@ -815,6 +821,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4200,6 +4218,16 @@ msgstr "Kriitiline allkirja noteerimine: "
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 halb allkiri\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d halba allkirja\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4565,14 +4593,6 @@ msgstr "palun kasutage selle asemel \"%s%s\"\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
@@ -8257,6 +8277,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "halb parool"
+
 #, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
diff --git a/po/fi.po b/po/fi.po
index 47bbe27d6..98624e235 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -38,7 +38,8 @@ msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -94,6 +95,13 @@ msgid ""
 "this session"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "väärä salasana"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -130,10 +138,6 @@ msgstr "MPI ei kelpaa"
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "väärä salasana"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
@@ -582,10 +586,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "väärä salasana"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Peru"
@@ -686,6 +686,12 @@ msgstr "muuta salasanaa"
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Haluatko varmasti poistaa valitut avaimet? "
+
 #, fuzzy
 msgid "Delete key"
 msgstr "ota avain käyttöön"
@@ -832,6 +838,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4231,6 +4249,16 @@ msgstr "Kriittinen allekirjoitusnotaatio: "
 msgid "Signature notation: "
 msgstr "Allekirjoitusnotaatio: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 väärä allekirjoitus\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d väärää allekirjoitusta\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4604,14 +4632,6 @@ msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
@@ -8316,6 +8336,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "väärä salasana"
+
 #, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr ""
diff --git a/po/fr.po b/po/fr.po
index d9f2c487a..6ba3bd098 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -25,7 +25,8 @@ msgstr "impossible d'obtenir le verrou pinentry : %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
@@ -94,6 +95,12 @@ msgstr ""
 "Veuillez entrer votre phrase secrète, afin de débloquer la clef secrète "
 "pendant cette session"
 
+msgid "PIN:"
+msgstr ""
+
+msgid "Passphrase:"
+msgstr "Phrase secrète :"
+
 msgid "does not match - try again"
 msgstr "ne correspond pas — veuillez réessayer"
 
@@ -125,9 +132,6 @@ msgstr "Mauvais code personnel"
 msgid "Bad Passphrase"
 msgstr "Mauvaise phrase secrète"
 
-msgid "Passphrase"
-msgstr "Phrase secrète"
-
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
@@ -291,7 +295,8 @@ msgstr[1] ""
 "Une phrase secrète devrait contenir au moins %u chiffres%%0Aou caractères "
 "spéciaux."
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Une phrase secrète ne devrait ni être un mot commun,%%0Ani correspondre à un "
@@ -570,9 +575,6 @@ msgstr ""
 "Veuillez entrer la phrase secrète ou le code personnel\n"
 "nécessaires pour terminer cette opération."
 
-msgid "Passphrase:"
-msgstr "Phrase secrète :"
-
 msgid "cancelled\n"
 msgstr "annulé\n"
 
@@ -678,6 +680,13 @@ msgstr "Modifier la phrase secrète"
 msgid "I'll change it later"
 msgstr "Je la modifierai plus tard"
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
+
 msgid "Delete key"
 msgstr "Supprimer la clef"
 
@@ -821,6 +830,18 @@ msgstr "hors limite de la mémoire sécurisée lors de l'allocation de %lu octe
 msgid "out of core while allocating %lu bytes"
 msgstr "hors limite lors de l'allocation de %lu octets"
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s : %u : option « %s » obsolète — non prise en compte\n"
+
+#, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "Attention : « %s%s » est une option obsolète — non prise en compte\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4074,6 +4095,16 @@ msgstr "Notation de signature critique : "
 msgid "Signature notation: "
 msgstr "Notation de signature : "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 mauvaise signature\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d mauvaises signatures\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr "Attention : %lu clefs ignorées en raison de leur grande taille\n"
@@ -4436,14 +4467,6 @@ msgstr "veuillez plutôt utiliser « %s%s »\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "Attention : « %s » est une commande déconseillée — ne l'utilisez pas\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s : %u : option « %s » obsolète — non prise en compte\n"
-
-#, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "Attention : « %s%s » est une option obsolète — non prise en compte\n"
-
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
@@ -8178,6 +8201,9 @@ msgstr ""
 "Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
 "ficmotif\n"
 
+#~ msgid "Passphrase"
+#~ msgstr "Phrase secrète"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
 #~ "utiliser des fichiers temporaires pour passer les données aux assistants "
diff --git a/po/gl.po b/po/gl.po
index f1abe61db..67a1cd66b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -22,7 +22,8 @@ msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -79,6 +80,13 @@ msgid ""
 "this session"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "contrasinal err�neo"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -115,10 +123,6 @@ msgstr "MPI err
 msgid "Bad Passphrase"
 msgstr "contrasinal err�neo"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "contrasinal err�neo"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
@@ -569,10 +573,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "contrasinal err�neo"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancelar"
@@ -673,6 +673,12 @@ msgstr "cambia-lo contrasinal"
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
+
 #, fuzzy
 msgid "Delete key"
 msgstr "habilitar unha chave"
@@ -819,6 +825,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4245,6 +4263,16 @@ msgstr "Notaci
 msgid "Signature notation: "
 msgstr "Notaci�n de sinaturas: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 sinatura err�nea\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d sinaturas err�neas\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4614,14 +4642,6 @@ msgstr "empregue \"%s%s\" no seu canto\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
@@ -8341,6 +8361,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "contrasinal err�neo"
+
 #, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
diff --git a/po/hu.po b/po/hu.po
index 7d7ee895c..d9ca173f5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -22,7 +22,8 @@ msgstr "Bizalmi adatb
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -78,6 +79,13 @@ msgid ""
 "this session"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "rossz jelsz�"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -114,10 +122,6 @@ msgstr "hib
 msgid "Bad Passphrase"
 msgstr "rossz jelsz�"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "rossz jelsz�"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
@@ -565,10 +569,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "rossz jelsz�"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "M�gsem"
@@ -669,6 +669,12 @@ msgstr "jelsz
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
+
 #, fuzzy
 msgid "Delete key"
 msgstr "kulcs enged�lyez�se"
@@ -815,6 +821,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4211,6 +4229,16 @@ msgstr "Kritikus al
 msgid "Signature notation: "
 msgstr "Al��r�s-jel�l�s: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 rossz al��r�s.\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d rossz al��r�s.\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4583,14 +4611,6 @@ msgstr "K
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
@@ -8289,6 +8309,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "rossz jelsz�"
+
 #, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr ""
diff --git a/po/id.po b/po/id.po
index 9327b9df5..0777e4edf 100644
--- a/po/id.po
+++ b/po/id.po
@@ -27,7 +27,8 @@ msgstr "gagal inisialisasi TrustDB: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -83,6 +84,13 @@ msgid ""
 "this session"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "passphrase yang buruk"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -119,10 +127,6 @@ msgstr "MPI yang buruk"
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "passphrase yang buruk"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
@@ -570,10 +574,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "passphrase yang buruk"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Batal"
@@ -674,6 +674,12 @@ msgstr "ubah passphrase"
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Anda ingin menghapus kunci terpilih ini? "
+
 #, fuzzy
 msgid "Delete key"
 msgstr "aktifkan kunci"
@@ -820,6 +826,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4215,6 +4233,16 @@ msgstr "Notasi signature kritis: "
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 signature yang buruk\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d signature yang buruk\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4579,14 +4607,6 @@ msgstr "silakan gunakan \"%s%s\"\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
@@ -8278,6 +8298,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "passphrase yang buruk"
+
 #, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
diff --git a/po/it.po b/po/it.po
index 4a08f01b8..31d4295ac 100644
--- a/po/it.po
+++ b/po/it.po
@@ -22,7 +22,8 @@ msgstr "inizializzazione del trustdb fallita: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -78,6 +79,13 @@ msgid ""
 "this session"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "passphrase errata"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -114,10 +122,6 @@ msgstr "MPI danneggiato"
 msgid "Bad Passphrase"
 msgstr "passphrase errata"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "passphrase errata"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
@@ -565,10 +569,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "passphrase errata"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancella"
@@ -669,6 +669,12 @@ msgstr "cambia la passphrase"
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Vuoi davvero cancellare le chiavi selezionate? "
+
 #, fuzzy
 msgid "Delete key"
 msgstr "abilita una chiave"
@@ -815,6 +821,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4231,6 +4249,16 @@ msgstr "Annotazione critica della firma: "
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "una firma non corretta\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d firme non corrette\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4597,14 +4625,6 @@ msgstr "usa al suo posto \"%s%s\"\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
@@ -8319,6 +8339,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "passphrase errata"
+
 #, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 6ef36a8a4..581b1b393 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -27,7 +27,8 @@ msgstr "pinentryのロックの獲得に失敗しました: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
@@ -83,6 +84,12 @@ msgstr ""
 "あなたのパスフレーズを入力してください(このセッションで秘密鍵のロックを解除す"
 "るために使われます)"
 
+msgid "PIN:"
+msgstr ""
+
+msgid "Passphrase:"
+msgstr "パスフレーズ:"
+
 msgid "does not match - try again"
 msgstr "一致しません - もう一度"
 
@@ -114,9 +121,6 @@ msgstr "不正なPINです"
 msgid "Bad Passphrase"
 msgstr "パスフレーズが不正です"
 
-msgid "Passphrase"
-msgstr "パスフレーズ"
-
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh鍵で%dビットより大きいものはサポートされません\n"
@@ -271,7 +275,8 @@ msgid_plural ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 msgstr[0] "パスフレーズは最低でも%u文字の数字か特殊文字を含むべきです。"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "パスフレーズには、よく知られている用語や特定のパターンにマッチするものは%%0A"
@@ -539,9 +544,6 @@ msgstr ""
 "パスフレーズまたはPINを入力してください。\n"
 "この操作を完了するのに必要です。"
 
-msgid "Passphrase:"
-msgstr "パスフレーズ:"
-
 msgid "cancelled\n"
 msgstr "キャンセルされました\n"
 
@@ -643,6 +645,13 @@ msgstr "パスフレーズを変更する"
 msgid "I'll change it later"
 msgstr "後で変更する"
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "選択した鍵を本当に削除しますか? (y/N) "
+
 msgid "Delete key"
 msgstr "鍵を削除する"
 
@@ -782,6 +791,20 @@ msgstr "%luバイトの確保においてセキュア・メモリが足りませ
 msgid "out of core while allocating %lu bytes"
 msgstr "%luバイトの確保においてメモリが足りません"
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+"%s:%u: \"%s\"は、使われなくなったオプションです - なんの効果もありません\n"
+
+#, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr ""
+"*警告*: \"%s%s\"は、使われなくなったオプションです - なんの効果もありません\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr "gpg-agentが実行されていません - '%s'を開始します\n"
@@ -3907,6 +3930,16 @@ msgstr "クリティカルな署名注釈: "
 msgid "Signature notation: "
 msgstr "署名注釈: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "不正な署名1個\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "不正な署名%d個\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr "*警告*: %lu 鍵がその大きさのためスキップされました\n"
@@ -4256,16 +4289,6 @@ msgstr "\"%s%s\"を代わりに使ってください\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "*警告*: \"%s\" は、廃止されているコマンドです - 使わないでください\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-"%s:%u: \"%s\"は、使われなくなったオプションです - なんの効果もありません\n"
-
-#, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr ""
-"*警告*: \"%s%s\"は、使われなくなったオプションです - なんの効果もありません\n"
-
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
@@ -7792,6 +7815,9 @@ msgstr ""
 "形式: gpg-check-pattern [オプション] パターンファイル\n"
 "パターンファイルに対して標準入力のパスフレーズを確認する\n"
 
+#~ msgid "Passphrase"
+#~ msgstr "パスフレーズ"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr "キーサーバ・ヘルパーにデータを与える際、一時ファイルを使う"
 
diff --git a/po/nb.po b/po/nb.po
index 9e5f2077c..d85db6594 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -26,7 +26,8 @@ msgstr "klarte ikke 
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -83,6 +84,13 @@ msgid ""
 "this session"
 msgstr ""
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "ugyldig passfrase"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -119,10 +127,6 @@ msgstr "ugyldig MPI"
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "ugyldig passfrase"
-
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
@@ -568,10 +572,6 @@ msgid ""
 "needed to complete this operation."
 msgstr ""
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "ugyldig passfrase"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancel|cancel"
@@ -672,6 +672,13 @@ msgstr "endre passfrasen"
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
+
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
@@ -812,6 +819,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr ""
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4105,6 +4124,16 @@ msgstr ""
 msgid "Signature notation: "
 msgstr ""
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 ubrukelig signatur\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d ubrukelige signaturer\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4464,14 +4493,6 @@ msgstr ""
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr ""
-
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
@@ -8139,6 +8160,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "ugyldig passfrase"
+
 #, fuzzy
 #~| msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
diff --git a/po/pl.po b/po/pl.po
index cf0c7279a..9d70c8d9f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -26,7 +26,8 @@ msgstr "nie uda
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
@@ -91,6 +92,12 @@ msgid ""
 msgstr ""
 "Prosz� wprowadzi� swoje has�o, �eby odblokowa� klucz tajny dla tej sesji"
 
+msgid "PIN:"
+msgstr ""
+
+msgid "Passphrase:"
+msgstr "Has�o:"
+
 msgid "does not match - try again"
 msgstr "nie pasuj� - prosz� spr�bowa� jeszcze raz"
 
@@ -122,9 +129,6 @@ msgstr "Niepoprawny PIN"
 msgid "Bad Passphrase"
 msgstr "Niepoprawne has�o"
 
-msgid "Passphrase"
-msgstr "Has�o"
-
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "klucze ssh wi�ksze ni� %d bit�w nie s� obs�ugiwane\n"
@@ -601,9 +605,6 @@ msgstr ""
 "Prosz� wprowadzi� has�o lub PIN\n"
 "Potrzebny do zako�czenia tej operacji."
 
-msgid "Passphrase:"
-msgstr "Has�o:"
-
 msgid "cancelled\n"
 msgstr "anulowano\n"
 
@@ -713,6 +714,13 @@ msgstr "Zmiana has
 msgid "I'll change it later"
 msgstr "Zmieni� je p�niej"
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
+
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
@@ -861,6 +869,19 @@ msgstr "brak miejsca w bezpiecznej pami
 msgid "out of core while allocating %lu bytes"
 msgstr "brak miejsca podczas przydzielania %lu bajt�w"
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: przestarza�a opcja ,,%s'' - nie ma efektu\n"
+
+#, fuzzy, c-format
+#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj� - nie ma efektu\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "no running gpg-agent - starting one\n"
 msgid "no running gpg-agent - starting '%s'\n"
@@ -4230,6 +4251,16 @@ msgstr "Krytyczne adnotacje podpisu: "
 msgid "Signature notation: "
 msgstr "Adnotacje podpisu: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 niepoprawny podpis\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d niepoprawnych podpis�w\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4594,15 +4625,6 @@ msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "OSTRZE�ENIE: ,,%s'' jest przestarza�ym poleceniem - nie nale�y go u�ywa�\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: przestarza�a opcja ,,%s'' - nie ma efektu\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj� - nie ma efektu\n"
-
 #, fuzzy, c-format
 #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
@@ -8518,6 +8540,9 @@ msgstr ""
 "Sk�adnia: gpg-check-pattern [opcje] plik-wzorc�w\n"
 "Sprawdzanie has�a ze standardowego wej�cia wzgl�dem pliku wzorc�w\n"
 
+#~ msgid "Passphrase"
+#~ msgstr "Has�o"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
 #~ "u�ycie plik�w tymczasowych do przekazywania danych do modu��w obs�ugi "
diff --git a/po/pt.po b/po/pt.po
index 3962b424b..ef8fd0e37 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -25,7 +25,8 @@ msgstr "falha ao inicializar a base de dados de confian
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -81,6 +82,13 @@ msgid ""
 "this session"
 msgstr "Por favor digite a frase secreta \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "frase secreta incorrecta"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -117,10 +125,6 @@ msgstr "MPI incorreto"
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "frase secreta incorrecta"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
@@ -569,10 +573,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "frase secreta incorrecta"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
@@ -673,6 +673,12 @@ msgstr "muda a frase secreta"
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Voc� quer realmente remover as chaves selecionadas? "
+
 #, fuzzy
 msgid "Delete key"
 msgstr "activa uma chave"
@@ -820,6 +826,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4223,6 +4241,16 @@ msgstr "Nota
 msgid "Signature notation: "
 msgstr "Nota��o de assinatura: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 assinatura incorrecta\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d assinaturas incorrectas\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4593,14 +4621,6 @@ msgstr "por favor utilize \"%s%s\" em vez dela\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
@@ -8295,6 +8315,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "frase secreta incorrecta"
+
 #, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
diff --git a/po/ro.po b/po/ro.po
index d71286cc8..753e4de95 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -26,7 +26,8 @@ msgstr "am e
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -85,6 +86,13 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "fraz�-parol� incorect�"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -121,10 +129,6 @@ msgstr "MPI incorect"
 msgid "Bad Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "fraz�-parol� incorect�"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
@@ -584,10 +588,6 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "fraz�-parol� incorect�"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "anulat�"
@@ -688,6 +688,13 @@ msgstr "schimb
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
+
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
@@ -834,6 +841,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4203,6 +4222,16 @@ msgstr "Notare semn
 msgid "Signature notation: "
 msgstr "Notare semn�tur�: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 semn�tur� incorect�\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d semn�turi incorecte\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4566,14 +4595,6 @@ msgstr "v
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "AVERTISMENT: \"%s\" este o comand� �nvechit� - nu o folosi�i\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
@@ -8318,6 +8339,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "fraz�-parol� incorect�"
+
 #, fuzzy
 #~| msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
diff --git a/po/ru.po b/po/ru.po
index aa7db360c..76339544a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -29,7 +29,8 @@ msgstr "сбой при блокировке для ввода PIN: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
@@ -86,6 +87,12 @@ msgstr ""
 "Введите фразу-пароль, чтобы сделать закрытый ключ доступным на протяжении "
 "этого сеанса"
 
+msgid "PIN:"
+msgstr ""
+
+msgid "Passphrase:"
+msgstr "Фраза-пароль:"
+
 msgid "does not match - try again"
 msgstr "не подходит - попробуйте еще раз"
 
@@ -117,9 +124,6 @@ msgstr "Неверный PIN"
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-msgid "Passphrase"
-msgstr "Фраза-пароль"
-
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ключи ssh длиннее %d бит не поддерживаются\n"
@@ -550,9 +554,6 @@ msgstr ""
 "Введите фразу-пароль или PIN,\n"
 "необходимые для выполнения данной операции."
 
-msgid "Passphrase:"
-msgstr "Фраза-пароль:"
-
 msgid "cancelled\n"
 msgstr "отменено\n"
 
@@ -655,6 +656,13 @@ msgstr "Сменить фразу-пароль"
 msgid "I'll change it later"
 msgstr "Сменю позже"
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Вы действительно хотите удалить выбранные ключи? (y/N) "
+
 msgid "Delete key"
 msgstr "Удалить ключ"
 
@@ -794,6 +802,14 @@ msgstr "выход за предел безопасной памяти при р
 msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при размещении %lu байтов"
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: устаревший параметр \"%s\" - игнорируется\n"
+
+#, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "Внимание: параметр \"%s%s\" устарел - он игнорируется\n"
+
 #, c-format
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "неизвестный отладочный флаг '%s' игнорируется\n"
@@ -3962,6 +3978,16 @@ msgstr "Критическое примечание к подписи: "
 msgid "Signature notation: "
 msgstr "Примечание к подписи: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 плохая подпись\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d плохих подписей\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr "Внимание: %lu ключей пропущено из-за большого размера\n"
@@ -4316,14 +4342,6 @@ msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "Внимание: команда \"%s\" не рекомендуется к употреблению - не применяйте ее\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: устаревший параметр \"%s\" - игнорируется\n"
-
-#, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "Внимание: параметр \"%s%s\" устарел - он игнорируется\n"
-
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: \"%s\" в этом файле устарело - оно действует только в %s\n"
@@ -7906,6 +7924,9 @@ msgstr ""
 "Синтаксис: gpg-check-pattern [параметры] файл_образцов\n"
 "Проверить фразу-пароль, поступающую из stdin, по файлу образцов\n"
 
+#~ msgid "Passphrase"
+#~ msgstr "Фраза-пароль"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr "передавать данные в сервер с помощью временных файлов"
 
diff --git a/po/sk.po b/po/sk.po
index 1d34221eb..9c1375d08 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -25,7 +25,8 @@ msgstr "nem
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -81,6 +82,13 @@ msgid ""
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "nespr�vne heslo"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -117,10 +125,6 @@ msgstr "nespr
 msgid "Bad Passphrase"
 msgstr "nespr�vne heslo"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "nespr�vne heslo"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
@@ -570,10 +574,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "nespr�vne heslo"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Zru�i�"
@@ -674,6 +674,12 @@ msgstr "zmeni
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
+
 #, fuzzy
 msgid "Delete key"
 msgstr "nastavi� k��� ako platn� (enable)"
@@ -820,6 +826,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4228,6 +4246,16 @@ msgstr "Kritick
 msgid "Signature notation: "
 msgstr "Podpisov� not�cia: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 zl� podpis\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d zl�ch podpisov\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4600,14 +4628,6 @@ msgstr "pou
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
@@ -8307,6 +8327,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "nespr�vne heslo"
+
 #, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
diff --git a/po/sv.po b/po/sv.po
index aae01e844..8f9d65493 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -41,7 +41,8 @@ msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr "_OK"
 
@@ -111,6 +112,12 @@ msgid ""
 msgstr ""
 "Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
 
+msgid "PIN:"
+msgstr ""
+
+msgid "Passphrase:"
+msgstr "Lösenfras:"
+
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
@@ -143,9 +150,6 @@ msgstr "Felaktig PIN-kod"
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-msgid "Passphrase"
-msgstr "Lösenfras"
-
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
 #, c-format
@@ -631,9 +635,6 @@ msgstr ""
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-msgid "Passphrase:"
-msgstr "Lösenfras:"
-
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
@@ -746,6 +747,13 @@ msgstr "ändra lösenfras"
 msgid "I'll change it later"
 msgstr "Jag ändrar den senare"
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
+
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
@@ -895,6 +903,19 @@ msgstr "slut på kärna i säkert minne vid allokering av %lu byte"
 msgid "out of core while allocating %lu bytes"
 msgstr "slut på kärna vid allokering av %lu byte"
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
+
+#, fuzzy, c-format
+#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "no running gpg-agent - starting one\n"
 msgid "no running gpg-agent - starting '%s'\n"
@@ -4283,6 +4304,16 @@ msgstr "Kritisk signaturnotation: "
 msgid "Signature notation: "
 msgstr "Signaturnotation: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 felaktig signatur\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d felaktiga signaturer\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4653,15 +4684,6 @@ msgstr "Använd \"%s%s\" istället\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "VARNING: \"%s\" är ett föråldrat kommando - använd det inte\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
-
 #, fuzzy, c-format
 #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
@@ -8623,6 +8645,9 @@ msgstr ""
 "Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
 "Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
+#~ msgid "Passphrase"
+#~ msgstr "Lösenfras"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
 #~ "använd temporärfiler för att skicka data till nyckelserverns hjälpprogram"
diff --git a/po/tr.po b/po/tr.po
index c47a67d60..9ce59cef5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -25,7 +25,8 @@ msgstr "PIN giriş kilidi edinilemedi: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -85,6 +86,12 @@ msgstr ""
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
+msgid "PIN:"
+msgstr ""
+
+msgid "Passphrase:"
+msgstr "Anahtar Parolası:"
+
 msgid "does not match - try again"
 msgstr "aynı değiller - tekrar deneyin"
 
@@ -116,9 +123,6 @@ msgstr "PIN hatalı"
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-msgid "Passphrase"
-msgstr "Anahtar Parolası"
-
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
@@ -598,9 +602,6 @@ msgstr ""
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-msgid "Passphrase:"
-msgstr "Anahtar Parolası:"
-
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
@@ -712,6 +713,13 @@ msgstr "Anahtar parolasını değiştir"
 msgid "I'll change it later"
 msgstr "Sonra değiştireceğim"
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
+
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
@@ -860,6 +868,19 @@ msgstr "%lu bayt ayrılırken güvenli bellekte nüve dışına çıkıldı"
 msgid "out of core while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
+
+#, fuzzy, c-format
+#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, fuzzy, c-format
 #| msgid "no running gpg-agent - starting one\n"
 msgid "no running gpg-agent - starting '%s'\n"
@@ -4238,6 +4259,16 @@ msgstr "Kritik imza simgelemi: "
 msgid "Signature notation: "
 msgstr "imza simgelemi: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 kötü imza\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d kötü imza\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4601,15 +4632,6 @@ msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "UYARI: \"%s\" komutu artık önerilmiyor - kullanmayın onu\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
-
-#, fuzzy, c-format
-#| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
-
 #, fuzzy, c-format
 #| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
@@ -8548,6 +8570,9 @@ msgstr ""
 "Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
 "karşılaştırır\n"
 
+#~ msgid "Passphrase"
+#~ msgstr "Anahtar Parolası"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
 #~ "anahtar sunucusu yardımcılarına veri aktaracak geçici dosyalar kullanılır"
diff --git a/po/uk.po b/po/uk.po
index 21911c7bb..865a2921a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -26,7 +26,8 @@ msgstr "не вдалося встановити блокування запис
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr "_Гаразд"
 
@@ -94,6 +95,12 @@ msgstr ""
 "Будь ласка, вкажіть ваш пароль, щоб ключ можна було розблокувати для цього "
 "сеансу"
 
+msgid "PIN:"
+msgstr ""
+
+msgid "Passphrase:"
+msgstr "Пароль:"
+
 msgid "does not match - try again"
 msgstr "паролі не збігаються, повторіть спробу"
 
@@ -125,9 +132,6 @@ msgstr "Помилковий пінкод"
 msgid "Bad Passphrase"
 msgstr "Помилковий пароль"
 
-msgid "Passphrase"
-msgstr "Пароль"
-
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
@@ -286,7 +290,8 @@ msgstr[0] "У паролі має бути принаймні %u цифра аб
 msgstr[1] "У паролі має бути принаймні %u цифри або%%0Aспеціальних символи."
 msgstr[2] "У паролі має бути принаймні %u цифр або%%0Aспеціальних символів."
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Паролем не повинно бути слово зі словника або слово%%0A, що відповідає "
@@ -559,9 +564,6 @@ msgstr ""
 "Будь ласка, вкажіть пароль або пінкод,\n"
 "потрібні для завершення цієї дії."
 
-msgid "Passphrase:"
-msgstr "Пароль:"
-
 msgid "cancelled\n"
 msgstr "скасовано\n"
 
@@ -666,6 +668,13 @@ msgstr "Змінити пароль"
 msgid "I'll change it later"
 msgstr "Я зміню його пізніше"
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "Справді бажаєте вилучити вибрані ключі? (y/N або т/Н) "
+
 msgid "Delete key"
 msgstr "Вилучити ключ"
 
@@ -809,6 +818,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr "вихід за межі області під час спроби отримання %lu байтів"
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: застарілий параметр «%s» — він не працюватиме\n"
+
+#, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "УВАГА: «%s%s» є застарілим параметром — він не працюватиме\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr "не запущено gpg-agent — запускаємо «%s»\n"
@@ -4039,6 +4060,16 @@ msgstr "Критична примітка підпису: "
 msgid "Signature notation: "
 msgstr "Примітка підпису: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 помилковий підпис\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d помилкових підписів\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr "Попередження: %lu ключів пропущено через їхній надто великий розмір\n"
@@ -4399,14 +4430,6 @@ msgstr "будь ласка, скористайтеся «%s%s»\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "УВАГА: «%s» вважається застарілою командою — не користуйтеся нею\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: застарілий параметр «%s» — він не працюватиме\n"
-
-#, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "УВАГА: «%s%s» є застарілим параметром — він не працюватиме\n"
-
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: «%s» є застарілим у цьому файлі — він працює лише у %s\n"
@@ -8016,6 +8039,9 @@ msgstr ""
 "Синтаксис: gpg-check-pattern [параметри] файл_шаблонів\n"
 "Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
 
+#~ msgid "Passphrase"
+#~ msgstr "Пароль"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
 #~ "використовувати тимчасові файли для передавання даних до допоміжних "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 301c43282..caa956844 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -27,7 +27,8 @@ msgstr "无法存储指纹：%s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr ""
 
@@ -85,6 +86,13 @@ msgid ""
 "this session"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
+msgid "PIN:"
+msgstr ""
+
+#, fuzzy
+msgid "Passphrase:"
+msgstr "错误的密码"
+
 msgid "does not match - try again"
 msgstr ""
 
@@ -121,10 +129,6 @@ msgstr "损坏的多精度整数(MPI)"
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#, fuzzy
-msgid "Passphrase"
-msgstr "错误的密码"
-
 #, fuzzy, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
@@ -579,10 +583,6 @@ msgid ""
 "needed to complete this operation."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#, fuzzy
-msgid "Passphrase:"
-msgstr "错误的密码"
-
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
@@ -683,6 +683,13 @@ msgstr "更改密码"
 msgid "I'll change it later"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "您真的想要删除选定的密钥吗？(y/N)"
+
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
@@ -828,6 +835,18 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "警告：“%s”选项已不建议使用\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr ""
@@ -4110,6 +4129,16 @@ msgstr "关键签名注记："
 msgid "Signature notation: "
 msgstr "签名注记："
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 个损坏的签名\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d 个损坏的签名\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr ""
@@ -4470,14 +4499,6 @@ msgstr "请以“%s%s”代替\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "警告：“%s”选项已不建议使用\n"
-
 #, fuzzy, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "警告：“%s”选项已不建议使用\n"
@@ -8157,6 +8178,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Passphrase"
+#~ msgstr "错误的密码"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr "向公钥服务器辅助程序传递数据时使用临时文件"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 53a18c65c..18d8b0925 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -28,7 +28,8 @@ msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
 #. Pinentries.  An underscore indicates that the next letter
 #. should be used as an accelerator.  Double the underscore for
 #. a literal one.  The actual to be translated text starts after
-#. the second vertical bar.
+#. the second vertical bar.  Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
@@ -92,6 +93,12 @@ msgid ""
 "this session"
 msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
 
+msgid "PIN:"
+msgstr ""
+
+msgid "Passphrase:"
+msgstr "密語:"
+
 msgid "does not match - try again"
 msgstr "前後不一致 - 請再試一次"
 
@@ -123,9 +130,6 @@ msgstr "不良的個人識別碼 (PIN)"
 msgid "Bad Passphrase"
 msgstr "不良的密語"
 
-msgid "Passphrase"
-msgstr "密語"
-
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
@@ -277,7 +281,8 @@ msgid_plural ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 msgstr[0] "密語至少得要含有 %u 個數字或%%0A特別字符."
 
-#, c-format
+#, fuzzy, c-format
+#| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "密語不得含有已知的詞彙, 亦不得與%%0A確知的模式吻合."
 
@@ -544,9 +549,6 @@ msgstr ""
 "請輸入完成這項操作所需的\n"
 "密語或個人識別碼 (PIN)."
 
-msgid "Passphrase:"
-msgstr "密語:"
-
 msgid "cancelled\n"
 msgstr "已取消\n"
 
@@ -644,6 +646,13 @@ msgstr "更改密語"
 msgid "I'll change it later"
 msgstr "我稍後再變更"
 
+#, fuzzy, c-format
+#| msgid "Do you really want to delete the selected keys? (y/N) "
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
+"%%0A?"
+msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
+
 msgid "Delete key"
 msgstr "刪除金鑰"
 
@@ -783,6 +792,18 @@ msgstr "在安全記憶體配置 %lu 位元組時超出核心"
 msgid "out of core while allocating %lu bytes"
 msgstr "配置 %lu 位元組時超出核心"
 
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
+
+#, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
+
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr ""
+
 #, c-format
 msgid "no running gpg-agent - starting '%s'\n"
 msgstr "沒有執行中的 gpg-agent - 正在啟動 '%s'\n"
@@ -3905,6 +3926,16 @@ msgstr "關鍵簽章註記: "
 msgid "Signature notation: "
 msgstr "簽章註記: "
 
+#, fuzzy
+#| msgid "1 bad signature\n"
+msgid "1 good signature\n"
+msgstr "1 份損壞的簽章\n"
+
+#, fuzzy, c-format
+#| msgid "%d bad signatures\n"
+msgid "%d good signatures\n"
+msgstr "%d 份損壞的簽章\n"
+
 #, c-format
 msgid "Warning: %lu key(s) skipped due to their large size\n"
 msgstr "警告: %lu 把金鑰因尺寸太大已跳過\n"
@@ -4254,14 +4285,6 @@ msgstr "請改以 \"%s%s\" 代替\n"
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個棄而不顧的指令 - 別再用了\n"
 
-#, c-format
-msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
-
-#, c-format
-msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
-
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: 此檔案內的 \"%s\" 已廢棄 - 僅對 %s 有影響\n"
@@ -7752,6 +7775,9 @@ msgstr ""
 "語法: gpg-check-pattern [選項] 樣式檔案\n"
 "用樣式檔案來檢查由標準輸入給定的密語\n"
 
+#~ msgid "Passphrase"
+#~ msgstr "密語"
+
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr "用暫存檔來將資料遞送給金鑰伺服器協助程式"