From 3d6c262e21821bdd657142bcd55c465dc7008568 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 18 Feb 2015 12:53:39 +0100
Subject: [PATCH] po: Auto update

--
---
 po/be.po    | 44 ++++++++++++++++++++++++++++++----------
 po/ca.po    | 48 ++++++++++++++++++++++++++++++++++----------
 po/cs.po    | 51 ++++++++++++++++++++++++++++++++++++----------
 po/da.po    | 16 +++++++++++----
 po/de.po    | 12 ++++++++---
 po/el.po    | 48 ++++++++++++++++++++++++++++++++++----------
 po/eo.po    | 46 +++++++++++++++++++++++++++++++++---------
 po/es.po    | 58 +++++++++++++++--------------------------------------
 po/et.po    | 48 ++++++++++++++++++++++++++++++++++----------
 po/fi.po    | 50 ++++++++++++++++++++++++++++++++++-----------
 po/fr.po    | 30 +++++++++++++++++++++------
 po/gl.po    | 48 ++++++++++++++++++++++++++++++++++----------
 po/hu.po    | 48 ++++++++++++++++++++++++++++++++++----------
 po/id.po    | 48 ++++++++++++++++++++++++++++++++++----------
 po/it.po    | 48 ++++++++++++++++++++++++++++++++++----------
 po/ja.po    | 22 ++++++++++++++------
 po/nb.po    | 49 +++++++++++++++++++++++++++++++++-----------
 po/nl.po    | 16 +++++++++++----
 po/pl.po    | 16 +++++++++++----
 po/pt.po    | 48 ++++++++++++++++++++++++++++++++++----------
 po/pt_BR.po | 48 ++++++++++++++++++++++++++++++++++----------
 po/ro.po    | 48 ++++++++++++++++++++++++++++++++++----------
 po/ru.po    | 16 +++++++++++----
 po/sk.po    | 48 ++++++++++++++++++++++++++++++++++----------
 po/sv.po    | 51 ++++++++++++++++++++++++++++++++++++----------
 po/tr.po    | 53 +++++++++++++++++++++++++++++++++++++-----------
 po/uk.po    | 16 +++++++++++----
 po/zh_CN.po | 49 ++++++++++++++++++++++++++++++++++----------
 po/zh_TW.po | 20 ++++++++++--------
 29 files changed, 847 insertions(+), 296 deletions(-)

diff --git a/po/be.po b/po/be.po
index 35a0326a1..d5ab9cd0e 100644
--- a/po/be.po
+++ b/po/be.po
@@ -2166,6 +2166,9 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+msgid "do not clear the ownertrust values during import"
+msgstr ""
+
 msgid "do not update the trustdb after import"
 msgstr ""
 
@@ -3121,6 +3124,12 @@ msgid ""
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+msgid "You may want to change its expiration date too.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3871,6 +3880,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "збой падпісаньня: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -3897,10 +3910,6 @@ msgstr "збой падпісаньня: %s\n"
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "збой падпісаньня: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
@@ -4073,6 +4082,10 @@ msgstr ""
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
@@ -4121,6 +4134,10 @@ msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
@@ -4153,6 +4170,15 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr ""
+
 msgid "Uncompressed"
 msgstr ""
 
@@ -4190,9 +4216,9 @@ msgstr "Увядзіце новае ймя файла"
 msgid "writing to stdout\n"
 msgstr "запіс у stdout\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "немагчыма адкрыць %s: %s\n"
 
 #, c-format
 msgid "new configuration file `%s' created\n"
@@ -4715,10 +4741,6 @@ msgstr ""
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
-
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 0c5614458..76f2a1771 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2326,6 +2326,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "actualitza la base de dades de confiança"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualitza la base de dades de confiança"
@@ -3397,6 +3401,14 @@ msgstr ""
 "      causar que una ID d'usuari diferent esdevinga en la primària "
 "assumida.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "No podeu canviar la data de caducitat de les claus v3\n"
+
 # Photo ID com abans.  ivb
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
@@ -4232,6 +4244,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "la recepció des del servidor de claus ha fallat: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
@@ -4260,10 +4276,6 @@ msgstr "error de servidor de claus"
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "la recepció des del servidor de claus ha fallat: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
@@ -4441,6 +4453,10 @@ msgstr "mode text"
 msgid "unknown"
 msgstr "desconeguda"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
@@ -4491,6 +4507,11 @@ msgstr "signatura %s, algorisme de resum %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "signatura %s, algorisme de resum %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el mòdul de xifratge IDEA no està present\n"
 
@@ -4522,6 +4543,15 @@ msgstr ""
 msgid "WARNING: \"%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%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVÍS: %s és una opció desaconsellada.\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVÍS: %s és una opció desaconsellada.\n"
+
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
@@ -4567,8 +4597,9 @@ msgstr "Introduïu el nou nom del fitxer"
 msgid "writing to stdout\n"
 msgstr "s'està escrivint en stdout\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "s'asumeix que hi ha dades signades en «%s»\n"
 
 #, c-format
@@ -5163,11 +5194,6 @@ msgstr "NOTA: la clau de signatura %08lX va caducar el %s\n"
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "signatura %s, algorisme de resum %s\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 7607d5101..35b1e2976 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2177,6 +2177,11 @@ msgstr "importovat podpisy, které jsou označeny jen jako místní"
 msgid "repair damage from the pks keyserver during import"
 msgstr "opravit poškození vzniklá při importu z PKS serveru"
 
+#, fuzzy
+#| msgid "do not update the trustdb after import"
+msgid "do not clear the ownertrust values during import"
+msgstr "neaktualizovat databázi důvěry po importu"
+
 msgid "do not update the trustdb after import"
 msgstr "neaktualizovat databázi důvěry po importu"
 
@@ -3155,6 +3160,14 @@ msgstr ""
 "VAROVÁNÍ: žádné uživatelské ID nebylo označeno jako primární.  Tento příkaz\n"
 "              může způsobit, že za primární bude považováno jiné user ID.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Nemůžete změnit dobu platnosti klíče verze 3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3948,6 +3961,10 @@ msgstr "VAROVÁNÍ: obsluha serveru klíčů z jiné verze GnuPG (%s)\n"
 msgid "keyserver did not send VERSION\n"
 msgstr "server klíčů neposlal VERSION\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "chyba komunikace se serverem klíčů: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "žádný server klíčů není znám (použijte volbu --keyserver)\n"
 
@@ -3972,10 +3989,6 @@ msgstr "časový limit pro server klíčů vypršel\n"
 msgid "keyserver internal error\n"
 msgstr "interní chyba serveru klíčů\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "chyba komunikace se serverem klíčů: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "„%s“ není ID klíče: přeskočeno\n"
@@ -4151,6 +4164,10 @@ msgstr "textový formát"
 msgid "unknown"
 msgstr "neznámý formát"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ověřit podpis: %s\n"
@@ -4199,6 +4216,11 @@ msgstr "VAROVÁNÍ: používám experimentální hashovací algoritmus %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VAROVÁNÍ: vyžádaný algoritmus %s není doporučen\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "podpis %s, hashovací algoritmus %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
@@ -4230,6 +4252,17 @@ msgstr "%s:%u: zastaralý parametr „%s“ – neúčinkuje\n"
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROVÁNÍ: „%s“ je zastaralý parametr – neúčinkuje\n"
 
+#, fuzzy, c-format
+#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: zastaralý parametr „%s“ – neúčinkuje\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 except on %s\n"
+msgstr "VAROVÁNÍ: „%s“ je zastaralý parametr – neúčinkuje\n"
+
 msgid "Uncompressed"
 msgstr "Nezkomprimováno"
 
@@ -4266,8 +4299,9 @@ msgstr "Vložte nový název souboru"
 msgid "writing to stdout\n"
 msgstr "zapisuji do standardního výstupu\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "předpokládám podepsaná data v „%s“\n"
 
 #, c-format
@@ -4821,11 +4855,6 @@ msgstr "POZNÁMKA: podpisovému klíči %s skončila platnost %s\n"
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "POZNÁMKA: podpisový klíč %s byl odvolán\n"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "podpis %s, hashovací algoritmus %s\n"
-
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index d28c6342d..54d5f5f06 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3138,6 +3138,14 @@ msgstr ""
 "ADVARSEL: Intet bruger-id er blevet markeret som primær. Denne kommando\n"
 "        kan medføre at et anden bruger-id bliver den formodede primære.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3936,6 +3944,10 @@ msgstr "ADVARSEL: nøgleserverhåndtering fra en anden version af GnuPG (%s)\n"
 msgid "keyserver did not send VERSION\n"
 msgstr "nøgleserver sendte ikke VERSION\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "kommunikationsfejl for nøgleserver: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "ingen kendt nøgleserver (brug tilvalget --keyserver)\n"
 
@@ -3960,10 +3972,6 @@ msgstr "nøgleserver fik tidsudløb\n"
 msgid "keyserver internal error\n"
 msgstr "nøgleserver fik intern fejl\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "kommunikationsfejl for nøgleserver: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "»%s« er ikke et nøgle-id: udelader\n"
diff --git a/po/de.po b/po/de.po
index 0db20e91d..a79fad8ae 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4225,7 +4225,9 @@ msgstr "unbekannt"
 
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
-msgstr "WARNING: Dies ist keine abgetrennte Signatur; die Datei '%s' wurde NICHT geprüft!\n"
+msgstr ""
+"WARNING: Dies ist keine abgetrennte Signatur; die Datei '%s' wurde NICHT "
+"geprüft!\n"
 
 #, c-format
 msgid "Can't check signature: %s\n"
@@ -4316,12 +4318,16 @@ msgstr "WARNUNG: \"%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
 
 #, c-format
 msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
-msgstr "%s:%u: Die Option \"%s%s\" ist in dieser Datei sinnlos - sie hat lediglich Wirkung in %s\n"
+msgstr ""
+"%s:%u: Die Option \"%s%s\" ist in dieser Datei sinnlos - sie hat lediglich "
+"Wirkung in %s\n"
 
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
-msgstr "WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat eine Wirkung lediglich in %s\n"
+msgstr ""
+"WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat eine Wirkung lediglich "
+"in %s\n"
 
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
diff --git a/po/el.po b/po/el.po
index 2fcce6687..7c32bb938 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2261,6 +2261,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "�������� ��� ����� ��������� ������������"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "�������� ��� ����� ��������� ������������"
@@ -3310,6 +3314,14 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4138,6 +4150,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "keyserver ���� �������: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -4164,10 +4180,6 @@ msgstr "
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "keyserver ���� �������: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
@@ -4340,6 +4352,10 @@ msgstr "
 msgid "unknown"
 msgstr "�������"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
@@ -4394,6 +4410,11 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s ��������, ���������� ��������� %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
@@ -4425,6 +4446,15 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
+
 msgid "Uncompressed"
 msgstr "����������"
 
@@ -4463,8 +4493,9 @@ msgstr "
 msgid "writing to stdout\n"
 msgstr "������� ���� stdout\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "������� �������������� ��������� ��� `%s'\n"
 
 #, c-format
@@ -5046,11 +5077,6 @@ msgstr "
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "��������: �� ������ ���� ���������"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s ��������, ���������� ��������� %s\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "������� ����� ��������� ��� ������ %08lX ���� �������� �������� bit\n"
diff --git a/po/eo.po b/po/eo.po
index 4c510c68d..cac36b87a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2245,6 +2245,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "aktualigi la fido-datenaron"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aktualigi la fido-datenaron"
@@ -3292,6 +3296,14 @@ msgid ""
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4115,6 +4127,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
@@ -4141,10 +4157,6 @@ msgstr "
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
@@ -4320,6 +4332,10 @@ msgstr ""
 msgid "unknown"
 msgstr "nekonata versio"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
@@ -4369,6 +4385,10 @@ msgstr "%s-subskribo de: %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
+#, fuzzy, c-format
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s-subskribo de: %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
@@ -4400,6 +4420,15 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
@@ -4439,8 +4468,9 @@ msgstr "Donu novan dosiernomon"
 msgid "writing to stdout\n"
 msgstr "skribas al la normala eligo\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
 #, fuzzy, c-format
@@ -5006,10 +5036,6 @@ msgstr "NOTO: subskribo-
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#, fuzzy, c-format
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s-subskribo de: %s\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
diff --git a/po/es.po b/po/es.po
index bba179e1d..f6cbb81a3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -166,7 +166,6 @@ msgid "Deny"
 msgstr "No permitir"
 
 #, c-format
-#| msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Introduzca la contraseña para la clave ssh%%0A  %F%%0A  (%c)"
 
@@ -174,15 +173,12 @@ msgid "Please re-enter this passphrase"
 msgstr "Vuelva a introducir contraseña"
 
 #, c-format
-#| msgid ""
-#| "Please enter a passphrase to protect the received secret key%%0A   %s"
-#| "%%0Awithin gpg-agent's key storage"
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr ""
-"Introduzca una contraseña para proteger la clave secreta recibida%%0A   %s%%0A   "
-"%s%%0Aen el almacén de claves del agente gpg"
+"Introduzca una contraseña para proteger la clave secreta recibida%%0A   %s"
+"%%0A   %s%%0Aen el almacén de claves del agente gpg"
 
 msgid "does not match - try again"
 msgstr "no coincide - inténtelo de nuevo"
@@ -209,7 +205,6 @@ msgid "Reset Code"
 msgstr "Código de Reinicio"
 
 #, c-format
-#| msgid "%s%%0A%%0AUse the reader's keypad for input."
 msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgstr "%s%%0A%%0AUse el teclado del lector como entrada."
 
@@ -304,7 +299,6 @@ msgid "Yes, protection is not needed"
 msgstr "Sí, no se necesita protección"
 
 #, c-format
-#| msgid "Please enter the passphrase to%0Ato protect your new key"
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Introduzca contraseña para%0Aproteger su nueva clave"
 
@@ -372,18 +366,15 @@ msgstr "|N|los PINs en la caché expiran en N segundos"
 msgid "do not use the PIN cache when signing"
 msgstr "no usar el caché de PINs al firmar"
 
-#| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "permitir que los clientes marquen claves como \"fiables\""
 
 msgid "allow presetting passphrase"
 msgstr "permitir preestablecer contraseña"
 
-#| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "permitir emulación de ssh-agent"
 
-#| msgid "not supported"
 msgid "enable putty support"
 msgstr "no disponible"
 
@@ -1713,10 +1704,6 @@ msgstr ""
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#| msgid ""
-#| "Syntax: gpg [options] [files]\n"
-#| "sign, check, encrypt or decrypt\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2192,7 +2179,6 @@ msgstr "importar firmas marcadas como sólo locales"
 msgid "repair damage from the pks keyserver during import"
 msgstr "reparar daño del servidor de claves públicas al importar"
 
-#| msgid "do not update the trustdb after import"
 msgid "do not clear the ownertrust values during import"
 msgstr "no actualiza la base de datos de confianza después de importar"
 
@@ -2317,7 +2303,6 @@ msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
 #, c-format
-#| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "omitido \"%s\": %s\n"
 
@@ -2420,7 +2405,6 @@ msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
 #, c-format
-#| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
@@ -3176,6 +3160,14 @@ msgstr ""
 "       causar que se tome como identificador principal otro identificador de "
 "usuario distinto.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3975,6 +3967,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr "el servidor de claves no envió VERSION\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "error de comunicación con el servidor de claves: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opción --keyserver)\n"
 
@@ -4002,10 +3998,6 @@ msgstr "agotado el tiempo de espera para el servidor de claves\n"
 msgid "keyserver internal error\n"
 msgstr "error interno del servidor de claves\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "error de comunicación con el servidor de claves: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave válido: omitido\n"
@@ -4228,7 +4220,6 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ATENCIÓN: el algoritmo de resumen %s está obsoleto\n"
 
 #, c-format
-#| msgid "%s signature, digest algorithm %s\n"
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "Nota: se rechazarán las firmas que usen el algoritmo %s\n"
 
@@ -4264,15 +4255,14 @@ msgid "WARNING: \"%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 "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: \"%s%s\" está obsoleta en este fichero - solo afecta en %s\n"
 
 #, 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 except on %s\n"
-msgstr "ATENCIÓN: \"%s%s\" es una opción obsoleta - no tiene efecto excepto en %s\n"
+msgstr ""
+"ATENCIÓN: \"%s%s\" es una opción obsoleta - no tiene efecto excepto en %s\n"
 
 msgid "Uncompressed"
 msgstr "Sin comprimir"
@@ -4311,7 +4301,6 @@ msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
 #, c-format
-#| msgid "assuming signed data in `%s'\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
@@ -5379,9 +5368,6 @@ msgstr "habilita depuración completa"
 msgid "Usage: kbxutil [options] [files] (-h for help)"
 msgstr "Uso: kbxutil [opciones] [ficheros] (-h para ayuda)"
 
-#| msgid ""
-#| "Syntax: kbxutil [options] [files]\n"
-#| "list, export, import Keybox data\n"
 msgid ""
 "Syntax: kbxutil [options] [files]\n"
 "List, export, import Keybox data\n"
@@ -5528,11 +5514,9 @@ msgstr "|AN|Nuevo PIN Administrador"
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#| msgid "|A|Please enter the Admin PIN"
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "|A|Introduzca PIN de Administrador"
 
-#| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Introduzca PIN"
 
@@ -5598,7 +5582,6 @@ msgstr ""
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n"
 
-#| msgid "||Please enter your PIN at the reader's keypad"
 msgid "||Please enter your PIN at the reader's pinpad"
 msgstr "||Inntroduzca su PIN en el teclado del lector"
 
@@ -5632,7 +5615,6 @@ msgstr "no usa el driverd del CCID interno"
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|desconectar la tarjeta después de N segundos de inactividad"
 
-#| msgid "do not use a reader's keypad"
 msgid "do not use a reader's pinpad"
 msgstr "no usar el teclado del lector"
 
@@ -5909,19 +5891,15 @@ msgstr "no se especifica uso de la clave - asumiendo todos los usos\n"
 msgid "error getting key usage information: %s\n"
 msgstr "error obteniendo información sobre uso de la clave: %s\n"
 
-#| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "el certificado no debería haberse usado para certificar\n"
 
-#| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "el certificado no debería haberse usado para firma en respuesta OCSP\n"
 
-#| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "el certificado no debería haberse usado para cifrar\n"
 
-#| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "el certificado no debería haberse usado para firmar\n"
 
@@ -6196,10 +6174,6 @@ msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgsm [opciones] [ficheros] (-h para ayuda)"
 
-#| msgid ""
-#| "Syntax: gpgsm [options] [files]\n"
-#| "sign, check, encrypt or decrypt using the S/MIME protocol\n"
-#| "default operation depends on the input data\n"
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
diff --git a/po/et.po b/po/et.po
index 055ce4d0e..1027083ee 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2239,6 +2239,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "uuenda usalduse andmebaasi"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "uuenda usalduse andmebaasi"
@@ -3276,6 +3280,14 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4084,6 +4096,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -4110,10 +4126,6 @@ msgstr "v
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
@@ -4284,6 +4296,10 @@ msgstr "tekstimood"
 msgid "unknown"
 msgstr "tundmatu"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
@@ -4335,6 +4351,11 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
@@ -4366,6 +4387,15 @@ msgstr ""
 msgid "WARNING: \"%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%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
+
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
@@ -4404,8 +4434,9 @@ msgstr "Sisestage uus failinimi"
 msgid "writing to stdout\n"
 msgstr "kirjutan standardv�ljundisse\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "eeldan allkirjastatud andmeid failis `%s'\n"
 
 #, c-format
@@ -4971,11 +5002,6 @@ msgstr "M
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "M�RKUS: v�ti on t�histatud"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti t�ttu v�tmel %08lX vigast allkirja\n"
diff --git a/po/fi.po b/po/fi.po
index 9da8b7d7f..b7fb5d09e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2259,6 +2259,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "päivitä luottamustietokanta"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "päivitä luottamustietokanta"
@@ -3302,6 +3306,14 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4122,6 +4134,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -4148,10 +4164,6 @@ msgstr "avainpalvelinvirhe"
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
@@ -4326,6 +4338,10 @@ msgstr "teksti"
 msgid "unknown"
 msgstr "tuntematon "
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
@@ -4380,6 +4396,12 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
+# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
 
@@ -4411,6 +4433,15 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
+
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
@@ -4449,8 +4480,9 @@ msgstr "Syötä uusi tiedostonimi"
 msgid "writing to stdout\n"
 msgstr "kirjoitetaan vakiotulosteeseen\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "data kohteessa \"%s\" oletetaan allekirjoitetuksi\n"
 
 #, c-format
@@ -5028,12 +5060,6 @@ msgstr "HUOM: allekirjoitusavain %08lX vanheni %s\n"
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "HUOM: avain on mitätöity!"
 
-# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 99a3b8eb7..4fced1313 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2207,6 +2207,11 @@ msgstr "importer des signatures marquées comme locales seulement"
 msgid "repair damage from the pks keyserver during import"
 msgstr "réparer les données endommagées du serveur pks pendant l'importation"
 
+#, fuzzy
+#| msgid "do not update the trustdb after import"
+msgid "do not clear the ownertrust values during import"
+msgstr "ne pas mettre à jour la base de confiance après l'importation"
+
 msgid "do not update the trustdb after import"
 msgstr "ne pas mettre à jour la base de confiance après l'importation"
 
@@ -3202,6 +3207,14 @@ msgstr ""
 "commande\n"
 "            risque de rendre une autre identité principale par défaut.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Vous ne pouvez pas modifier la date d'expiration d'une clef v3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4026,6 +4039,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de clefs n'a pas envoyé sa VERSION\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "erreur de communication avec le serveur de clefs : %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de clefs connu (utilisez l'option --keyserver)\n"
 
@@ -4054,10 +4071,6 @@ msgstr "le délai d'attente du serveur de clefs a expiré\n"
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de clefs\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "erreur de communication avec le serveur de clefs : %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "« %s » n'est pas un identifiant de clef : ignoré\n"
@@ -4232,6 +4245,10 @@ msgstr "mode texte"
 msgid "unknown"
 msgstr "inconnu"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature : %s\n"
@@ -4370,8 +4387,9 @@ msgstr "Entrez le nouveau nom de fichier"
 msgid "writing to stdout\n"
 msgstr "écriture vers la sortie standard\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "les données signées sont supposées être dans « %s »\n"
 
 #, c-format
diff --git a/po/gl.po b/po/gl.po
index 626abba8b..ce71bb695 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2254,6 +2254,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "actualiza-la base de datos de confianza"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualiza-la base de datos de confianza"
@@ -3308,6 +3312,14 @@ msgstr ""
 "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4133,6 +4145,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "a recepci�n do servidor de chaves fallou: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
@@ -4160,10 +4176,6 @@ msgstr "erro do servidor de chaves"
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "a recepci�n do servidor de chaves fallou: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
@@ -4334,6 +4346,10 @@ msgstr "modo texto"
 msgid "unknown"
 msgstr "desco�ecido"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
@@ -4388,6 +4404,11 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "Sinatura %s, algoritmo de resumo %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
@@ -4419,6 +4440,15 @@ msgstr ""
 msgid "WARNING: \"%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%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
+
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
@@ -4457,8 +4487,9 @@ msgstr "Introduza o novo nome de ficheiro"
 msgid "writing to stdout\n"
 msgstr "escribindo na sa�da est�ndar\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "suponse que hai datos asinados en `%s'\n"
 
 #, c-format
@@ -5035,11 +5066,6 @@ msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "NOTA: a chave est� revocada"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "Sinatura %s, algoritmo de resumo %s\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index f4d82baa8..8a29491e4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2237,6 +2237,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "bizalmi adatb�zis friss�t�se"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "bizalmi adatb�zis friss�t�se"
@@ -3276,6 +3280,14 @@ msgstr ""
 "FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
 " azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4094,6 +4106,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -4120,10 +4136,6 @@ msgstr "kulcsszerverhiba"
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
@@ -4300,6 +4312,10 @@ msgstr "Sz
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
@@ -4353,6 +4369,11 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
 
@@ -4384,6 +4405,15 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
+
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
@@ -4422,8 +4452,9 @@ msgstr "
 msgid "writing to stdout\n"
 msgstr "�rok a szabv�nyos kimenetre.\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "Azt felt�telezem, hogy az al��rt adat a %s �llom�nyban van.\n"
 
 #, c-format
@@ -4996,11 +5027,6 @@ msgstr "MEGJEGYZ
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 7f0036266..e428b5c05 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2250,6 +2250,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "perbarui database trust"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "perbarui database trust"
@@ -3290,6 +3294,14 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4107,6 +4119,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "Penerimaan keyserver gagal: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -4133,10 +4149,6 @@ msgstr "kesalahan keyserver"
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "Penerimaan keyserver gagal: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
@@ -4307,6 +4319,10 @@ msgstr "modeteks"
 msgid "unknown"
 msgstr "tidak dikenal"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
@@ -4357,6 +4373,11 @@ msgstr "%s signature, algoritma digest %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s signature, algoritma digest %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
@@ -4388,6 +4409,15 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
+
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
@@ -4426,8 +4456,9 @@ msgstr "Masukkan nama file baru"
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
 #, c-format
@@ -4996,11 +5027,6 @@ msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s signature, algoritma digest %s\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index ed6afb57b..d640dac4f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2251,6 +2251,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "aggiorna il database della fiducia"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aggiorna il database della fiducia"
@@ -3294,6 +3298,14 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4123,6 +4135,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "ricezione dal keyserver fallita: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -4149,10 +4165,6 @@ msgstr "errore del keyserver"
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "ricezione dal keyserver fallita: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
@@ -4323,6 +4335,10 @@ msgstr "modo testo"
 msgid "unknown"
 msgstr "sconosciuto"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
@@ -4374,6 +4390,11 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "Firma %s, algoritmo di digest %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
@@ -4405,6 +4426,15 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
+
 msgid "Uncompressed"
 msgstr "Non compresso"
 
@@ -4443,8 +4473,9 @@ msgstr "Inserire il nuovo nome del file"
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
 #, c-format
@@ -5030,11 +5061,6 @@ msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "NOTA: la chiave � stata revocata"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "Firma %s, algoritmo di digest %s\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 03a167690..9a9309bab 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3082,6 +3082,14 @@ msgstr ""
 "*警告*: 主たるユーザIDがありません。このコマンドは、別な\n"
 "              ユーザIDが主になると仮定する場合があります。\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "v3鍵の有効期限は変更できません\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3870,6 +3878,10 @@ msgstr "*警告*: 別のバージョンのGnuPGの鍵サーバ・ハンドラ (%
 msgid "keyserver did not send VERSION\n"
 msgstr "鍵サーバはVERSIONを送信しませんでした\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "鍵サーバ通信エラー: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "既知の鍵サーバがありません (オプション--keyserverを使いましょう)\n"
 
@@ -3894,10 +3906,6 @@ msgstr "鍵サーバのタイムアウト\n"
 msgid "keyserver internal error\n"
 msgstr "鍵サーバの内部エラー\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "鍵サーバ通信エラー: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\"鍵IDではありません: スキップします\n"
@@ -4159,13 +4167,15 @@ msgstr ""
 #, c-format
 msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr ""
-"%s:%u: \"%s%s\"は、使われなくなったオプションです - %sになんの効果もありません\n"
+"%s:%u: \"%s%s\"は、使われなくなったオプションです - %sになんの効果もありませ"
+"ん\n"
 
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr ""
-"*警告*: \"%s%s\"は、使われなくなったオプションです - %s以外になんの効果もありません\n"
+"*警告*: \"%s%s\"は、使われなくなったオプションです - %s以外になんの効果もあり"
+"ません\n"
 
 msgid "Uncompressed"
 msgstr "無圧縮"
diff --git a/po/nb.po b/po/nb.po
index 2504a4f2f..6cdc17b24 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <Trond.Endrestol@fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokm�l <i18n-nb@lister.ping.uio.no>\n"
-"Language: \n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2187,6 +2187,11 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+#| msgid "do not update the trustdb after import"
+msgid "do not clear the ownertrust values during import"
+msgstr "ikke oppdat�r tillitsdatabasen etter import"
+
 msgid "do not update the trustdb after import"
 msgstr "ikke oppdat�r tillitsdatabasen etter import"
 
@@ -3136,6 +3141,12 @@ msgid ""
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+msgid "You may want to change its expiration date too.\n"
+msgstr ""
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3929,6 +3940,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr "n�kkelserver sendte ikke VERSION\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "kommunikasjonsfeil med n�kkelserver: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -3953,10 +3968,6 @@ msgstr "n
 msgid "keyserver internal error\n"
 msgstr "intern feil ved n�kkelserver\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "kommunikasjonsfeil med n�kkelserver: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
@@ -4127,6 +4138,10 @@ msgstr "tekstmodus"
 msgid "unknown"
 msgstr "ukjent"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
@@ -4176,6 +4191,11 @@ msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s signatur, digestalgoritme %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
@@ -4207,6 +4227,15 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
+#, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr ""
+
 msgid "Uncompressed"
 msgstr ""
 
@@ -4243,8 +4272,9 @@ msgstr "Tast inn nytt filnavn"
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "antar at signert data er i �%s�\n"
 
 #, c-format
@@ -4788,11 +4818,6 @@ msgstr "NOTIS: signaturn
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s signatur, digestalgoritme %s\n"
-
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index e38678fba..c999b3434 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3250,6 +3250,14 @@ msgstr ""
 "              programma te gebruiken kan er een andere gebruikers-ID de\n"
 "              veronderstelde primaire ID worden.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "U kunt de vervaldatum van een v3-sleutel niet veranderen\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4077,6 +4085,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr "sleutelserver verstuurde geen versie-informatie\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "fout in de communicatie met de sleutelserver: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "er is geen sleutelserver bekend (gebruik optie --keyserver)\n"
 
@@ -4103,10 +4115,6 @@ msgstr "sleutelserver reageert te langzaam\n"
 msgid "keyserver internal error\n"
 msgstr "sleutelserver geeft een interne fout\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "fout in de communicatie met de sleutelserver: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" is geen sleutel-ID: overgeslagen\n"
diff --git a/po/pl.po b/po/pl.po
index d697fe9ce..eb5f449b3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3158,6 +3158,14 @@ msgstr ""
 "             jako główny. Wykonanie tego polecenie może więc spowodować\n"
 "             wyświetlanie innego identyfikatora jako domyślnego głównego.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Nie można zmienić daty ważności klucza w wersji 3.\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3966,6 +3974,10 @@ msgstr "OSTRZEŻENIE: moduł obsługi serwera kluczy z innej wersji GnuPG (%s)\n
 msgid "keyserver did not send VERSION\n"
 msgstr "serwer kluczy nie wysłał VERSION\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "błąd komunikacji z serwerem kluczy: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwerów kluczy (użyj opcji --keyserver)\n"
 
@@ -3992,10 +4004,6 @@ msgstr "zbyt długi czas oczekiwania na serwer kluczy\n"
 msgid "keyserver internal error\n"
 msgstr "błąd wewnętrzny serwera kluczy\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "błąd komunikacji z serwerem kluczy: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ",,%s'' nie jest identyfikatorem klucza - pominięto\n"
diff --git a/po/pt.po b/po/pt.po
index 73a911cf7..650f16905 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -12,7 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
-"Language: \n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2247,6 +2247,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "actualizar a base de dados de confian�a"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualizar a base de dados de confian�a"
@@ -3288,6 +3292,14 @@ msgid ""
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4106,6 +4118,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -4132,10 +4148,6 @@ msgstr "erro do servidor de chaves"
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "A gera��o de chaves falhou: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
@@ -4310,6 +4322,10 @@ msgstr ""
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
@@ -4364,6 +4380,10 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
+#, fuzzy, c-format
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "assinatura %s de: \"%s\"\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
@@ -4395,6 +4415,15 @@ msgstr ""
 msgid "WARNING: \"%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%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
+
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
@@ -4434,8 +4463,9 @@ msgstr "Digite novo nome de ficheiro"
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
 #, c-format
@@ -5004,10 +5034,6 @@ msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "NOTA: a chave foi revogada"
 
-#, fuzzy, c-format
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "assinatura %s de: \"%s\"\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1276d5d2c..a6c6f92ac 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,7 +16,7 @@ msgstr ""
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
-"Language: \n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2271,6 +2271,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "atualizar o banco de dados de confiabilidade"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "atualizar o banco de dados de confiabilidade"
@@ -3293,6 +3297,14 @@ msgid ""
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4121,6 +4133,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "enumera��o de chaves secretas falhou: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -4147,10 +4163,6 @@ msgstr "erro geral"
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "enumera��o de chaves secretas falhou: %s\n"
-
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
@@ -4325,6 +4337,10 @@ msgstr ""
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
@@ -4375,6 +4391,10 @@ msgstr "assinatura %s de: %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
+#, fuzzy, c-format
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "assinatura %s de: %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
@@ -4406,6 +4426,15 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
@@ -4445,8 +4474,9 @@ msgstr "Digite novo nome de arquivo"
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
 #, fuzzy, c-format
@@ -5019,10 +5049,6 @@ msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#, fuzzy, c-format
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "assinatura %s de: %s\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
diff --git a/po/ro.po b/po/ro.po
index 9414bf900..e0d5907bf 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2234,6 +2234,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "actualizeaz� baza de date de �ncredere"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "actualizeaz� baza de date de �ncredere"
@@ -3228,6 +3232,14 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4028,6 +4040,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "eroare de comunicare server de chei: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
@@ -4053,10 +4069,6 @@ msgstr "serverul de chei a epuizat timpul de a
 msgid "keyserver internal error\n"
 msgstr "eroare intern� server de chei\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "eroare de comunicare server de chei: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
@@ -4227,6 +4239,10 @@ msgstr "modtext"
 msgid "unknown"
 msgstr "necunoscut"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
@@ -4277,6 +4293,11 @@ msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "semn�tur� %s, algoritm rezumat %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
@@ -4308,6 +4329,15 @@ msgstr ""
 msgid "WARNING: \"%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%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+
 msgid "Uncompressed"
 msgstr "Necompresat"
 
@@ -4345,8 +4375,9 @@ msgstr "Introduce
 msgid "writing to stdout\n"
 msgstr "scriu la stdout\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "presupun date semnate �n `%s'\n"
 
 #, c-format
@@ -4916,11 +4947,6 @@ msgstr "NOT
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "NOT�: cheia a fost revocat�"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "semn�tur� %s, algoritm rezumat %s\n"
-
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index dcce210b6..ca64d97c9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3141,6 +3141,14 @@ msgstr ""
 "          привести к тому, что главным станет считаться другой ID "
 "пользователя.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Нельзя изменить срок действия ключа v3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3935,6 +3943,10 @@ msgstr "ВНИМАНИЕ: обработчик сервера ключей от
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "ошибка связи с сервером ключей: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
@@ -3959,10 +3971,6 @@ msgstr "превышено время ожидания сервера ключе
 msgid "keyserver internal error\n"
 msgstr "внутренняя ошибка сервера ключей\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "ошибка связи с сервером ключей: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" не идентификатор ключа: пропущен\n"
diff --git a/po/sk.po b/po/sk.po
index d32c1dcfa..b715a1189 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2256,6 +2256,10 @@ msgstr ""
 msgid "repair damage from the pks keyserver during import"
 msgstr ""
 
+#, fuzzy
+msgid "do not clear the ownertrust values during import"
+msgstr "aktualizova� datab�zu d�very"
+
 #, fuzzy
 msgid "do not update the trustdb after import"
 msgstr "aktualizova� datab�zu d�very"
@@ -3302,6 +3306,14 @@ msgstr ""
 "VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
 "sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4114,6 +4126,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
@@ -4140,10 +4156,6 @@ msgstr "chyba servera k
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#, fuzzy, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
@@ -4321,6 +4333,10 @@ msgstr "textov
 msgid "unknown"
 msgstr "nezn�me"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
@@ -4372,6 +4388,11 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s podpis, hashovac� algoritmus %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pre GnuPG nen�jden�\n"
 
@@ -4403,6 +4424,15 @@ msgstr ""
 msgid "WARNING: \"%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%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
+
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
@@ -4441,8 +4471,9 @@ msgstr "Vlo
 msgid "writing to stdout\n"
 msgstr "zapisujem na �tandardn� v�stup (stdout)\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "predpoklad�m podp�san� d�ta v `%s'\n"
 
 #, c-format
@@ -5012,11 +5043,6 @@ msgstr "POZN
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s podpis, hashovac� algoritmus %s\n"
-
 #, fuzzy, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 58782f0af..4c42193c4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2215,6 +2215,11 @@ msgstr "importera signaturer som är markerade som endast lokala"
 msgid "repair damage from the pks keyserver during import"
 msgstr "reparera skada från pks-nyckelservern under importering"
 
+#, fuzzy
+#| msgid "do not update the trustdb after import"
+msgid "do not clear the ownertrust values during import"
+msgstr "uppdatera inte tillitsdatabasen efter importering"
+
 msgid "do not update the trustdb after import"
 msgstr "uppdatera inte tillitsdatabasen efter importering"
 
@@ -3213,6 +3218,14 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4028,6 +4041,10 @@ msgstr "VARNING: nyckelserverhanteraren från en annan version av GnuPG (%s)\n"
 msgid "keyserver did not send VERSION\n"
 msgstr "nyckelserver skickade inte VERSION\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "kommunikationsfel mot nyckelserver: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
 
@@ -4052,10 +4069,6 @@ msgstr "tidsgräns överstigen för nyckelserver\n"
 msgid "keyserver internal error\n"
 msgstr "internt fel i nyckelserver\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "kommunikationsfel mot nyckelserver: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
@@ -4234,6 +4247,10 @@ msgstr "textläge"
 msgid "unknown"
 msgstr "okänd"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
@@ -4284,6 +4301,11 @@ msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s signatur, sammandragsalgoritm %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "insticksmodul för IDEA-chiffer är inte installerat\n"
 
@@ -4315,6 +4337,17 @@ msgstr "%s:%u: föråldrad flagga \"%s\" - den har ingen effekt\n"
 msgid "WARNING: \"%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%s\" is obsolete in this file - it only has effect in %s\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 except on %s\n"
+msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
+
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
@@ -4351,8 +4384,9 @@ msgstr "Ange nytt filnamn"
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "antar att signerad data finns i filen \"%s\"\n"
 
 #, c-format
@@ -4934,11 +4968,6 @@ msgstr "OBSERVERA: signaturnyckeln %s gick ut %s\n"
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "OBSERVERA: signaturnyckeln %s har spärrats\n"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s signatur, sammandragsalgoritm %s\n"
-
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index e5df7d375..8fb4bff1f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2008-12-14 23:25+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
 "Language-Team: Turkish\n"
-"Language: \n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2160,6 +2160,11 @@ msgstr "salt-yerel olarak imlenmiş imzaları ithal eder"
 msgid "repair damage from the pks keyserver during import"
 msgstr "ithalat sırasında pks anahtar sunucusundaki bozukluğu giderir"
 
+#, fuzzy
+#| msgid "do not update the trustdb after import"
+msgid "do not clear the ownertrust values during import"
+msgstr "ithalat sonrası güvence veritabanını güncellemez"
+
 msgid "do not update the trustdb after import"
 msgstr "ithalat sonrası güvence veritabanını güncellemez"
 
@@ -3178,6 +3183,14 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3993,6 +4006,10 @@ msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s
 msgid "keyserver did not send VERSION\n"
 msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
@@ -4017,10 +4034,6 @@ msgstr "anahtar sunucusu zamanaşımına uğradı\n"
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu iç hatası\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
@@ -4193,6 +4206,10 @@ msgstr "metinkipi"
 msgid "unknown"
 msgstr "bilinmeyen"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
@@ -4241,6 +4258,11 @@ msgstr "UYARI: deneysel %s özet algoritması kullanılıyor\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "UYARI: %s özet algoritması artık önerilmiyor.\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s imzası, %s özet algoritması\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
@@ -4272,6 +4294,17 @@ msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
 msgid "WARNING: \"%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%s\" is obsolete in this file - it only has effect in %s\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 except on %s\n"
+msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
+
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
@@ -4308,8 +4341,9 @@ msgstr "Yeni dosya ismini giriniz"
 msgid "writing to stdout\n"
 msgstr "standart çıktıya yazıyor\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "\"%s\" içindeki veri imzalı kabul ediliyor\n"
 
 #, c-format
@@ -4876,11 +4910,6 @@ msgstr "BİLGİ: %s imza anahtarının kullanım süresi %s sularında dolmuş\n
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "BİLGİ: imza anahtarı %s yürürlükten kaldırılmıştı\n"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s imzası, %s özet algoritması\n"
-
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index dffe25b04..32400e215 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3192,6 +3192,14 @@ msgstr ""
 "              цієї команди можна зробити основним інший ідентифікатор "
 "користувача.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "Не можна змінювати дату завершення строку дії ключа v3\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4000,6 +4008,10 @@ msgstr ""
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключів не надіслав значення VERSION\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "помилка під час обміну даними з сервером ключів: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "не вказано жодного сервера ключів (скористайтеся параметром --keyserver)\n"
@@ -4025,10 +4037,6 @@ msgstr "перевищення часу очікування даних від 
 msgid "keyserver internal error\n"
 msgstr "внутрішня помилка сервера ключів\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "помилка під час обміну даними з сервером ключів: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "«%s» не є ідентифікатором ключа: пропускаємо\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3e0146546..d8dfc3446 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2178,6 +2178,11 @@ msgstr "导入被标记为局部的签名"
 msgid "repair damage from the pks keyserver during import"
 msgstr "导入时修复 PKS 公钥服务器导致的损坏"
 
+#, fuzzy
+#| msgid "do not update the trustdb after import"
+msgid "do not clear the ownertrust values during import"
+msgstr "导入后不更新信任度数据库"
+
 msgid "do not update the trustdb after import"
 msgstr "导入后不更新信任度数据库"
 
@@ -3134,6 +3139,14 @@ msgid ""
 msgstr ""
 "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "您不能变更 v3 密钥的使用期限\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3917,6 +3930,10 @@ msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "公钥服务器通讯错误：%s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
@@ -3941,10 +3958,6 @@ msgstr "公钥服务器超时\n"
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "公钥服务器通讯错误：%s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
@@ -4113,6 +4126,10 @@ msgstr "文本模式"
 msgid "unknown"
 msgstr "未知"
 
+#, c-format
+msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
+msgstr ""
+
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
@@ -4162,6 +4179,11 @@ msgstr "警告：使用试验性质的散列算法 %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告：不建议使用散列算法 %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s 签名，散列算法 %s\n"
+
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
@@ -4193,6 +4215,15 @@ msgstr ""
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
+#, fuzzy, c-format
+msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "警告：“%s”选项已不建议使用\n"
+
+#, fuzzy, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr "警告：“%s”选项已不建议使用\n"
+
 msgid "Uncompressed"
 msgstr "不压缩"
 
@@ -4229,8 +4260,9 @@ msgstr "请输入新的文件名"
 msgid "writing to stdout\n"
 msgstr "正在写入到标准输出\n"
 
-#, c-format
-msgid "assuming signed data in `%s'\n"
+#, fuzzy, c-format
+#| msgid "assuming signed data in `%s'\n"
+msgid "assuming signed data in '%s'\n"
 msgstr "假定被签名的数据是‘%s’\n"
 
 #, c-format
@@ -4765,11 +4797,6 @@ msgstr "注意：签名密钥 %s 已于 %s 过期\n"
 msgid "NOTE: signature key %s has been revoked\n"
 msgstr "注意：密钥已被吊销"
 
-#, fuzzy, c-format
-#| msgid "%s signature, digest algorithm %s\n"
-msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "%s 签名，散列算法 %s\n"
-
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c3b52c975..2941a864f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2092,7 +2092,6 @@ msgstr "匯入標記為僅限本機使用的簽章"
 msgid "repair damage from the pks keyserver during import"
 msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
 
-#| msgid "do not update the trustdb after import"
 msgid "do not clear the ownertrust values during import"
 msgstr "匯入過程中不要清除主觀信任值"
 
@@ -3058,6 +3057,14 @@ msgstr ""
 "警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
 "      導致不同的使用者 ID 被當成主要 ID.\n"
 
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr ""
+
+#, fuzzy
+#| msgid "You can't change the expiration date of a v3 key\n"
+msgid "You may want to change its expiration date too.\n"
+msgstr "你不能變更 v3 金鑰的使用期限\n"
+
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3840,6 +3847,10 @@ msgstr "警告: 金鑰伺服器經手程式係來自不同版本的 GnuPG (%s)\n
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "金鑰伺服器通訊錯誤: %s\n"
+
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
@@ -3864,10 +3875,6 @@ msgstr "金鑰伺服器逾時\n"
 msgid "keyserver internal error\n"
 msgstr "金鑰伺服器內部錯誤\n"
 
-#, c-format
-msgid "keyserver communications error: %s\n"
-msgstr "金鑰伺服器通訊錯誤: %s\n"
-
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
@@ -4124,12 +4131,10 @@ msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告: \"%s\" 是已廢棄的選項 - 沒有效果\n"
 
 #, c-format
-#| msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgid "%s:%u: \"%s%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: \"%s%s\" 在此檔案中已廢棄 - 僅對 %s 造成影響\n"
 
 #, 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 except on %s\n"
 msgstr "警告: \"%s%s\" 是已廢棄的選項 - 除了對 %s 之外沒有效果\n"
@@ -4171,7 +4176,6 @@ msgid "writing to stdout\n"
 msgstr "寫到標準輸出中\n"
 
 #, c-format
-#| msgid "assuming signed data in `%s'\n"
 msgid "assuming signed data in '%s'\n"
 msgstr "假設被簽署的資料在 '%s'\n"