po: Auto update

--

24 files changed, 573 insertions, 464 deletions

diff --git a/po/ca.po b/po/ca.po
index 620435e2e..ca195825f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -300,12 +300,8 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error en la creació de la contrasenya: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s: error en escriure el registre de directoris: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
 #, fuzzy
 msgid "Enter new passphrase"
@@ -369,11 +365,6 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "La clau ha estat substituïda"
-
 msgid "do not detach from the console"
 msgstr ""
 
@@ -552,6 +543,10 @@ msgstr "s'estan llegint opcions de «%s»\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVÍS: %s és una opció desaconsellada.\n"
+
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
@@ -4105,7 +4100,7 @@ msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 # Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
@@ -4698,6 +4693,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 # xX? ivb
 # Hmm... sí. jm
 #. TRANSLATORS: These are the allowed answers in
@@ -5306,10 +5304,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVÍS: %s és una opció desaconsellada.\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
@@ -7703,6 +7697,10 @@ msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr ""
 
@@ -9454,6 +9452,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "%s: error en escriure el registre de directoris: %s\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "La clau ha estat substituïda"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "El nom no pot començar amb un dígit\n"
 
@@ -9717,10 +9724,6 @@ msgstr ""
 #~ msgstr "no s'ha pogut obrir %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "error en la lectura de «%s»: %s\n"
 
diff --git a/po/cs.po b/po/cs.po
index 9572c255b..45c135a90 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -306,13 +306,10 @@ msgstr "PIN nebyl zopakován správně; zkuste to znovu"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Prosím, vložte PIN%s%s%s, abyste odemkli kartu"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "chyba při vytváření dočasného souboru: %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "chyba při zápisu do dočasného souboru: %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "chyba při zápisu do %s: %s\n"
 
 msgid "Enter new passphrase"
 msgstr "Vložte nové heslo"
@@ -378,9 +375,6 @@ msgstr "poběží v režimu démona (na pozadí)"
 msgid "run in server mode (foreground)"
 msgstr "poběží v režimu serveru (na popředí)"
 
-msgid "run in supervised mode"
-msgstr "poběží v režimu dohledu"
-
 msgid "do not detach from the console"
 msgstr "neodpojovat se od konzole"
 
@@ -545,6 +539,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "Poznámka: „%s“ není uvažovaná možnost\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "VAROVÁNÍ: používání parametru „%s“ se nedoporučuje\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "socket nelze vytvořit: %s\n"
 
@@ -3851,7 +3849,9 @@ msgstr "Jste si jistý, že jej chcete stále přidat? (a/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Neměli by jste přidávat fotografický ID k PGP2 klíči.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Takový identifikátor uživatele již u tohoto klíče existuje!\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4418,6 +4418,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do pole jméno nebo komentář nepište, prosím, e-mailovou adresu.\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Takový identifikátor uživatele již u tohoto klíče existuje!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5009,10 +5012,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: použití parametru „%s“ se nedoporučuje\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "VAROVÁNÍ: používání parametru „%s“ se nedoporučuje\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "použijte místo něj „%s%s“ \n"
 
@@ -7353,6 +7352,10 @@ msgstr "Vytvořit sám sebou podepsaný certifikát? (a/N)"
 msgid "These parameters are used:\n"
 msgstr "Budou použity tyto parametry:\n"
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "chyba při vytváření dočasného souboru: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr "Nyní se vytváří sám sebou podepsaný certifikát. "
 
@@ -9076,6 +9079,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "chyba při zápisu do dočasného souboru: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "poběží v režimu dohledu"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Jméno nemůže začínat číslicí\n"
 
@@ -9412,9 +9421,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "%s nelze otevřít pro zápis: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "chyba při zápisu do %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "chyba při zavírání chyba %s: %s\n"
 
diff --git a/po/da.po b/po/da.po
index f963f9828..bfc0c71b7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -305,13 +305,10 @@ msgstr "PIN er ikke korrekt gentaget; prøv igen"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Indtast venligst PIN'en%s%s%s for at låse kortet op"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "fejl ved skrivning til midlertidig fil: %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "fejl ved skrivning til »%s«: %s\n"
 
 msgid "Enter new passphrase"
 msgstr "Indtast ny adgangsfrase"
@@ -399,11 +396,6 @@ msgstr "kør i dæmontilstand (baggrunden)"
 msgid "run in server mode (foreground)"
 msgstr "kør i servertilstand (forgrunden)"
 
-#, fuzzy
-#| msgid "run in server mode"
-msgid "run in supervised mode"
-msgstr "kør i servertilstand"
-
 msgid "do not detach from the console"
 msgstr "frakobl ikke fra konsollen"
 
@@ -585,6 +577,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette sokkel: %s\n"
 
@@ -4109,7 +4105,9 @@ msgstr "Er du sikker på, at du stadig ønsker at tilføje den? (j/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du må ikke tilføje et billed-id til en nøgle i PGP2-stil.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4704,6 +4702,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Placer ikke e-post-adressen i fødselsnavnet eller kommentaren\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5308,10 +5309,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: forældet indstilling »%s«\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "brug venligst »%s%s« i stedet for\n"
 
@@ -7720,6 +7717,10 @@ msgstr "Opret et designet tilbagekaldscertifikat for denne nøgle? (j/N) "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
+
 #, fuzzy
 #| msgid "self-signed certificate has a BAD signature"
 msgid "Now creating self-signed certificate.  "
@@ -9658,6 +9659,14 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "fejl ved skrivning til midlertidig fil: %s\n"
+
+#, fuzzy
+#~| msgid "run in server mode"
+#~ msgid "run in supervised mode"
+#~ msgstr "kør i servertilstand"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Navn må ikke starte med et tal\n"
 
@@ -10010,9 +10019,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "kunne ikke åbne %s for skrivning: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "fejl ved skrivning til »%s«: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "fejl ved lukning af %s: %s\n"
 
diff --git a/po/el.po b/po/el.po
index 33676071a..a09dc8d3a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -278,12 +278,8 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "εγγραφή στο  `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
 
 #, fuzzy
 msgid "Enter new passphrase"
@@ -347,11 +343,6 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Το κλειδί έχει παρακαμθεί"
-
 msgid "do not detach from the console"
 msgstr ""
 
@@ -523,6 +514,10 @@ msgstr "ανάγνωση επιλογών από `%s'\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
+
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "αδυναμία δημιουργίας του %s: %s\n"
@@ -4005,7 +4000,7 @@ msgstr "Σίγουρα ακόμα θέλετε να το προσθέσετε; (
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Δεν μπορείτε να προσθέσετε μια photo ID σε ένα κλειδί τύπου PGP2.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4596,6 +4591,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Παρακαλώ μην τοποθετείτε την διεύθυνση email στο όνομα ή στο σχόλιο\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5200,10 +5198,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: μη συνειστώμενη επιλογή \"%s\"\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "παρακαλώ χρησιμοποιήστε το \"%s%s\" καλύτερα\n"
 
@@ -7546,6 +7540,10 @@ msgstr "Δημιουργία ενός πιστοποιητικού ανάκλη�
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "σφάλμα στη δημιουργία της φράσης κλειδί: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr ""
 
@@ -9282,6 +9280,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "εγγραφή στο  `%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Το κλειδί έχει παρακαμθεί"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Το όνομα δεν επιτρέπεται να ξεκινά με αριθμητικό ψηφίο\n"
 
@@ -9543,10 +9550,6 @@ msgstr ""
 #~ msgstr "αδυναμία πρόσβασης του %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
diff --git a/po/eo.po b/po/eo.po
index 41dee5e45..c958e562c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -279,12 +279,8 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "skribas al '%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
 
 #, fuzzy
 msgid "Enter new passphrase"
@@ -348,11 +344,6 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Ŝlosilo estas anstataŭigita."
-
 msgid "do not detach from the console"
 msgstr ""
 
@@ -524,6 +515,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
 #, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
@@ -3977,7 +3972,7 @@ msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas aldoni ĝin? (j/n) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila ŝlosilo.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4558,6 +4553,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon aŭ la komenton\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5153,10 +5151,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#, fuzzy, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVERTO: '%s' estas malplena dosiero\n"
-
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
@@ -7464,6 +7458,10 @@ msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr ""
 
@@ -9192,6 +9190,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "skribas al '%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Ŝlosilo estas anstataŭigita."
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Nomo ne povas komenciĝi per cifero\n"
 
@@ -9435,10 +9442,6 @@ msgstr ""
 #~ msgstr "ne povas malfermi %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "eraro dum legado de '%s': %s\n"
 
diff --git a/po/es.po b/po/es.po
index 9dfbd792c..29e929dca 100644
--- a/po/es.po
+++ b/po/es.po
@@ -296,13 +296,10 @@ msgstr "PIN repetido incorrectamente; inténtelo de nuevo"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error al crear fichero temporal: %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "error escribiendo en el fichero temporal: %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "error escribiendo en %s: %s\n"
 
 msgid "Enter new passphrase"
 msgstr "Introduzca nueva frase contraseña"
@@ -372,9 +369,6 @@ msgstr "ejecutar en modo demonio (segundo plano)"
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
-msgid "run in supervised mode"
-msgstr "ejecutar en modo supervisado"
-
 msgid "do not detach from the console"
 msgstr "no independizarse de la consola"
 
@@ -541,6 +535,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "Atención: \"%s\" no se considera una opción\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
@@ -3857,7 +3855,9 @@ msgstr "¿Está seguro de querer añadirla? (s/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede añadir un ID fotográfico a una clave tipo PGP2.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4428,6 +4428,9 @@ msgstr ""
 "Por favor no ponga la dirección de correo-e en el nombre real o en el "
 "comentario\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5005,10 +5008,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opción obsoleta \"%s\"\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
@@ -7352,6 +7351,10 @@ msgstr "¿Crear un certificado auto-firmado? (s/N)"
 msgid "These parameters are used:\n"
 msgstr "Se usan estos parámetros:\n"
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error al crear fichero temporal: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr "Creando ahora certificado auto firmado. "
 
@@ -9093,6 +9096,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "error escribiendo en el fichero temporal: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "ejecutar en modo supervisado"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "El nombre no puede empezar con un número\n"
 
@@ -9442,9 +9451,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "no se puede abrir %s para escribir: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "error escribiendo en %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "error cerrando %s: %s\n"
 
diff --git a/po/et.po b/po/et.po
index c53f9a6df..4acf56d66 100644
--- a/po/et.po
+++ b/po/et.po
@@ -275,12 +275,8 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "kirjutan faili `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
 #, fuzzy
 msgid "Enter new passphrase"
@@ -344,11 +340,6 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Võti on asendatud"
-
 msgid "do not detach from the console"
 msgstr ""
 
@@ -520,6 +511,10 @@ msgstr "loen võtmeid failist `%s'\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
+
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei õnnestu luua: %s\n"
@@ -3976,7 +3971,7 @@ msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4554,6 +4549,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5144,10 +5142,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav võti \"%s\"\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
@@ -7464,6 +7458,10 @@ msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr ""
 
@@ -9196,6 +9194,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "kirjutan faili `%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Võti on asendatud"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Nimi ei või alata numbriga\n"
 
@@ -9457,10 +9464,6 @@ msgstr ""
 #~ msgstr "%s ei õnnestu avada: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "viga `%s' lugemisel: %s\n"
 
diff --git a/po/fi.po b/po/fi.po
index 4ebd65cf7..ca7965cce 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -291,12 +291,8 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+msgid "error writing to pipe: %s\n"
+msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
 #, fuzzy
 msgid "Enter new passphrase"
@@ -360,11 +356,6 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Avain on uusittu"
-
 msgid "do not detach from the console"
 msgstr ""
 
@@ -537,6 +528,10 @@ msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
+
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
@@ -3999,7 +3994,7 @@ msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4584,6 +4579,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5187,10 +5185,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
@@ -7527,6 +7521,10 @@ msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr ""
 
@@ -9263,6 +9261,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Avain on uusittu"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Nimi ei voi alkaa numerolla\n"
 
@@ -9524,10 +9531,6 @@ msgstr ""
 #~ msgstr "tiedostoa %s ei voi avata: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
diff --git a/po/fr.po b/po/fr.po
index b7f123292..74d6554a8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -294,13 +294,10 @@ msgstr "Les codes personnels ne correspondent pas ; veuillez réessayer"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Veuillez entrer le code personnel%s%s%s pour déverrouiller la carte"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erreur de création du fichier temporaire : %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "erreur d'écriture du fichier temporaire : %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "erreur d'écriture sur %s : %s\n"
 
 msgid "Enter new passphrase"
 msgstr "Entrez la nouvelle phrase secrète"
@@ -371,11 +368,6 @@ msgstr "exécuter en mode démon (arrière-plan)"
 msgid "run in server mode (foreground)"
 msgstr "exécuter en mode serveur (premier plan)"
 
-#, fuzzy
-#| msgid "run in server mode"
-msgid "run in supervised mode"
-msgstr "exécuter en mode serveur"
-
 msgid "do not detach from the console"
 msgstr "ne pas détacher de la console"
 
@@ -551,6 +543,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "Remarque : « %s » n'est pas considéré comme une option\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "Attention : « %s » est une option déconseillée\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de créer la socket : %s\n"
 
@@ -3998,7 +3994,9 @@ msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne devriez pas ajouter de photo d'identité à une clef de type PGP 2.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Cette identité existe déjà pour cette clef.\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4593,6 +4591,9 @@ msgstr ""
 "Ne mettez pas d'adresse électronique dans le nom réel ou dans le "
 "commentaire\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Cette identité existe déjà pour cette clef.\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5198,10 +5199,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s : %d : option « %s » déconseillée\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "Attention : « %s » est une option déconseillée\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "veuillez plutôt utiliser « %s%s »\n"
 
@@ -7655,6 +7652,10 @@ msgstr "Faut-il créer un certificat autosigné ? (o/N) "
 msgid "These parameters are used:\n"
 msgstr "Ces paramètres seront utilisés :\n"
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erreur de création du fichier temporaire : %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr "Création de certificat autosigné. "
 
@@ -9461,6 +9462,14 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "erreur d'écriture du fichier temporaire : %s\n"
+
+#, fuzzy
+#~| msgid "run in server mode"
+#~ msgid "run in supervised mode"
+#~ msgstr "exécuter en mode serveur"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
@@ -9814,9 +9823,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "impossible d'ouvrir %s en écriture : %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "erreur d'écriture sur %s : %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "erreur de fermeture de %s : %s\n"
 
diff --git a/po/gl.po b/po/gl.po
index b43e339d8..0e57db082 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -277,12 +277,8 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erro ao crea-lo contrasinal: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "escribindo a `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "erro escribindo no chaveiro `%s': %s\n"
 
 #, fuzzy
 msgid "Enter new passphrase"
@@ -347,11 +343,6 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "A chave é obsoleta"
-
 msgid "do not detach from the console"
 msgstr ""
 
@@ -525,6 +516,10 @@ msgstr "lendo as opcións de `%s'\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
+
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
@@ -4002,7 +3997,7 @@ msgstr ""
 "Non pode engadir unha identificación fotográfica a unha chave de estilo "
 "PGP2.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4592,6 +4587,9 @@ msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor, non poña o enderezo de correo no nome real ou no comentario\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5192,10 +5190,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opción a extinguir \"%s\"\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
@@ -7538,6 +7532,10 @@ msgstr "¿Crear un certificado de revocación para esta sinatura? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr ""
 
@@ -9276,6 +9274,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "escribindo a `%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "A chave é obsoleta"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "O nome non pode comezar cun díxito\n"
 
@@ -9539,10 +9546,6 @@ msgstr ""
 #~ msgstr "non se puido abrir %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "erro escribindo no chaveiro `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "erro lendo `%s': %s\n"
 
diff --git a/po/hu.po b/po/hu.po
index ab4af53b0..295f4dd8e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -275,12 +275,8 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "Hiba a jelszó létrehozásakor: %s.\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "Írok a \"%s\" állományba.\n"
+msgid "error writing to pipe: %s\n"
+msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
 #, fuzzy
 msgid "Enter new passphrase"
@@ -344,11 +340,6 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "A kulcsot lecserélték."
-
 msgid "do not detach from the console"
 msgstr ""
 
@@ -520,6 +511,10 @@ msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "FIGYELEM: \"%s\" elavult opció!\n"
+
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozható létre: %s\n"
@@ -3978,7 +3973,7 @@ msgstr "Továbbra is hozzá akarja adni? (i/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fotóazonosítót egy PGP2 stílusú kulcshoz!\n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4560,6 +4555,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Kérem, ne rakja az e-mail címet a teljes névbe vagy a megjegyzésbe!\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5159,10 +5157,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opció: \"%s\"\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "FIGYELEM: \"%s\" elavult opció!\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Kérem, ezt használja helyette: \"%s%s\"\n"
 
@@ -7491,6 +7485,10 @@ msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr ""
 
@@ -9223,6 +9221,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "Írok a \"%s\" állományba.\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "A kulcsot lecserélték."
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "A név lehet, hogy nem kezdődhet számmal!\n"
 
@@ -9484,10 +9491,6 @@ msgstr ""
 #~ msgstr "Nem tudom megnyitni %s-t: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
diff --git a/po/id.po b/po/id.po
index 2eea26bd5..15188b012 100644
--- a/po/id.po
+++ b/po/id.po
@@ -280,12 +280,8 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "menulis ke `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
 
 #, fuzzy
 msgid "Enter new passphrase"
@@ -349,11 +345,6 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Kunci dilampaui"
-
 msgid "do not detach from the console"
 msgstr ""
 
@@ -525,6 +516,10 @@ msgstr "membaca pilihan dari `%s'\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
+
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
@@ -3984,7 +3979,7 @@ msgstr "Anda tetap ingin menambahkannya? (y/n) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4568,6 +4563,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5162,10 +5160,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
@@ -7490,6 +7484,10 @@ msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr ""
 
@@ -9222,6 +9220,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "menulis ke `%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Kunci dilampaui"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Nama tidak boleh dimulai dengan digit\n"
 
@@ -9483,10 +9490,6 @@ msgstr ""
 #~ msgstr "tidak dapat membuka %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "kesalahan menulis keyring `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "kesalahan membaca `%s': %s\n"
 
diff --git a/po/it.po b/po/it.po
index 84792a8d8..df13b8a61 100644
--- a/po/it.po
+++ b/po/it.po
@@ -269,13 +269,10 @@ msgstr "PIN non ripetuto correttamente; Riprova"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Immettere il PIN%s%s%s per sbloccare la scheda"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "errore durante la creazione del file temporaneo: %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "errore durante la scrittura nel file temporaneo: %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "errore durante la scrittura in %s: %s\n"
 
 msgid "Enter new passphrase"
 msgstr "Inserisci la nuova passphrase"
@@ -341,9 +338,6 @@ msgstr "eseguire in modalità daemon (sfondo)"
 msgid "run in server mode (foreground)"
 msgstr "eseguire in modalità server (in primo piano)"
 
-msgid "run in supervised mode"
-msgstr "eseguire in modalità supervisionata"
-
 msgid "do not detach from the console"
 msgstr "non scollegarsi dalla console"
 
@@ -501,6 +495,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "Nota: '%s' non è considerato un'opzione\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare il socket: %s\n"
 
@@ -3801,7 +3799,9 @@ msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non è possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Tale ID utente esiste già in questa chiave!\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4361,6 +4361,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Tale ID utente esiste già in questa chiave!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -4942,10 +4945,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" è una opzione deprecata\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
@@ -7284,6 +7283,10 @@ msgstr "Creare un certificato autofirmato? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "Vengono utilizzati i seguenti parametri:\n"
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "errore durante la creazione del file temporaneo: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr "Creazione di un certificato autofirmato.  "
 
@@ -9008,6 +9011,12 @@ msgstr "Comandi di gestione Yubikey"
 msgid "manage the command history"
 msgstr "gestire la cronologia dei comandi"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "errore durante la scrittura nel file temporaneo: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "eseguire in modalità supervisionata"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Il nome non può iniziare con una cifra\n"
 
@@ -9324,9 +9333,6 @@ msgstr "gestire la cronologia dei comandi"
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "impossibile aprire %s per la scrittura: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "errore durante la scrittura in %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "errore durante la chiusura di %s: %s\n"
 
diff --git a/po/nb.po b/po/nb.po
index efdc197d8..42405ae09 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -283,13 +283,10 @@ msgstr "PIN ble ikke gjentatt korrekt. Prøv igjen"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Skriv inn PIN-kode%s%s%s for å låse opp kort"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "feil under oppretting av midlertidig fil: %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "feil under skriving til midlertidig fil: %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "feil under skriving til %s: %s\n"
 
 msgid "Enter new passphrase"
 msgstr "Skriv inn ny passordfrase"
@@ -352,9 +349,6 @@ msgstr "kjør som bakgrunnsprosess («daemon»)"
 msgid "run in server mode (foreground)"
 msgstr "kjør i tjenermodus (forgrunn)"
 
-msgid "run in supervised mode"
-msgstr "kjør i «supervised» modus"
-
 msgid "do not detach from the console"
 msgstr "ikke løsne fra konsoll"
 
@@ -518,6 +512,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "Merk: «%s» regnes ikke som et valg\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ADVARSEL: valget «%s» er utgått\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "klarte ikke å lage sokkel: %s\n"
 
@@ -3828,7 +3826,9 @@ msgstr "Er du sikker på at du vil legge den til? (j/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan ikke knytte foto-ID til PGP2-nøkler.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4403,6 +4403,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ikk bruk e-postadresse som navn eller kommentar\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -4979,10 +4982,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: valget «%s» er utgått\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ADVARSEL: valget «%s» er utgått\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "bruk heller «%s%s»\n"
 
@@ -7279,6 +7278,10 @@ msgstr "Vil du lage selvsignert sertifikat? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "Følgende parametre brukes:\n"
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "feil under oppretting av midlertidig fil: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr "Lager selvsignert sertifikat."
 
@@ -8989,6 +8992,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "feil under skriving til midlertidig fil: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "kjør i «supervised» modus"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Navn kan ikke begynne med siffer\n"
 
@@ -9332,9 +9341,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "klarte ikke å åpne %s for skriving: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "feil under skriving til %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "feil under lukking av %s: %s\n"
 
diff --git a/po/pl.po b/po/pl.po
index ee3fb93fb..46449f426 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -274,13 +274,10 @@ msgstr "PIN nie powtórzony poprawnie; spróbuj jeszcze raz"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Proszę wprowadzić PIN%s%s%s aby odblokować kartę"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "błąd tworzenia pliku tymczasowego: %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "błąd zapisu do pliku tymczasowego: %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "błąd zapisu do %s: %s\n"
 
 msgid "Enter new passphrase"
 msgstr "Wprowadź nowe hasło"
@@ -346,9 +343,6 @@ msgstr "uruchomienie w trybie demona (w tle)"
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-msgid "run in supervised mode"
-msgstr "uruchomienie w trybie dozorowanym"
-
 msgid "do not detach from the console"
 msgstr "bez odłączania od konsoli"
 
@@ -510,6 +504,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "Uwaga: ,,%s'' nie jest uznane za opcję\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie można utworzyć gniazda: %s\n"
 
@@ -3839,7 +3837,9 @@ msgstr "Czy dalej chcesz je dodać? (t/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie można dodać zdjęcia.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4415,6 +4415,9 @@ msgstr ""
 "Nie należy umieszczać adresu poczty elektronicznej w polu nazwiska czy\n"
 "komentarza.\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5014,10 +5017,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: przestarzała opcja ,,%s''\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce należy użyć ,,%s%s''\n"
 
@@ -7381,6 +7380,10 @@ msgstr "Stworzyć własnoręcznie podpisany certyfikat? (t/N) "
 msgid "These parameters are used:\n"
 msgstr "Użyte będą następujące parametry:\n"
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "błąd tworzenia pliku tymczasowego: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr "Tworzenie własnoręcznie podpisanego certyfikatu. "
 
@@ -9105,6 +9108,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "błąd zapisu do pliku tymczasowego: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "uruchomienie w trybie dozorowanym"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Imię lub nazwisko nie może zaczynać się od cyfry\n"
 
@@ -9441,9 +9450,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "nie udało się otworzyć %s do zapisu: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "błąd zapisu do %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "błąd zamykania %s: %s\n"
 
diff --git a/po/pt.po b/po/pt.po
index b716048f3..b563bdcaf 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -278,12 +278,8 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erro na criação da frase secreta: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "a escrever para `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
 #, fuzzy
 msgid "Enter new passphrase"
@@ -347,11 +343,6 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "A chave foi substituída"
-
 msgid "do not detach from the console"
 msgstr ""
 
@@ -525,6 +516,10 @@ msgstr "a ler opções de `%s'\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVISO: \"%s\" é uma opção depreciada\n"
+
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossível criar %s: %s\n"
@@ -3988,7 +3983,7 @@ msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4572,6 +4567,9 @@ msgstr ""
 "Por favor não coloque o endereço de email no nome verdadeiro ou no "
 "comentário\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5168,10 +5166,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opção depreciada \"%s\"\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVISO: \"%s\" é uma opção depreciada\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
@@ -7484,6 +7478,10 @@ msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro na criação da frase secreta: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr ""
 
@@ -9217,6 +9215,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "a escrever para `%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "A chave foi substituída"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "O nome não pode começar com um dígito\n"
 
@@ -9474,10 +9481,6 @@ msgstr ""
 #~ msgstr "impossível abrir %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "erro na escrita do porta-chaves `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "erro na leitura de `%s': %s\n"
 
diff --git a/po/ro.po b/po/ro.po
index ceaf5fa6f..432c67d67 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -288,12 +288,8 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "eroare la crearea frazei-parolă: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s: eroare scriere înregistrare dir: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
 #, fuzzy
 msgid "Enter new passphrase"
@@ -357,11 +353,6 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Cheia este înlocuită"
-
 msgid "do not detach from the console"
 msgstr ""
 
@@ -533,6 +524,10 @@ msgstr "citesc opţiuni din `%s'\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
+
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
@@ -4034,7 +4029,7 @@ msgstr "Sunteţi încă sigur(ă) că doriţi să o adăugaţi? (d/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nu puteţi adăuga o poză ID la o cheie stil PGP2.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4624,6 +4619,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Vă rugăm nu puneţi adresa de email în numele real sau comentariu\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5228,10 +5226,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opţiune învechită \"%s\"\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "vă rugăm folosiţi \"%s%s\" în loc\n"
 
@@ -7607,6 +7601,10 @@ msgstr "Creaţi un certificat de revocare desemnat pentru această cheie? (d/N)
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "eroare la crearea frazei-parolă: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr ""
 
@@ -9365,6 +9363,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "%s: eroare scriere înregistrare dir: %s\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Cheia este înlocuită"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Numele nu poate începe cu o cifră\n"
 
@@ -9642,10 +9649,6 @@ msgstr ""
 #~ msgstr "nu pot deschide %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "eroare la scrierea inelului de chei `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "eroare în `%s': %s\n"
 
diff --git a/po/ru.po b/po/ru.po
index 2fccbe4c1..e7218eae5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -278,13 +278,10 @@ msgstr "PIN повторен неверно; попробуйте еще раз"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Введите PIN%s%s%s для доступа к карте"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "ошибка создания временного файла: %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "ошибка записи во временный файл: %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "ошибка записи в %s: %s\n"
 
 msgid "Enter new passphrase"
 msgstr "Введите новую фразу-пароль"
@@ -356,9 +353,6 @@ msgstr "запуск в режиме демона (фоновый режим)"
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (нефоновый режим)"
 
-msgid "run in supervised mode"
-msgstr "запуск в подконтрольном режиме"
-
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
@@ -522,6 +516,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "Замечание: '%s' не считается параметром\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "Внимание: параметр \"%s\" не рекомендуется\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
@@ -3843,7 +3841,9 @@ msgstr "Вы уверены, что хотите добавить это? (y/N)
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Нельзя добавить фотоидентификатор в ключ типа PGP2.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Такой идентификатор пользователя на этом ключе уже есть!\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4415,6 +4415,9 @@ msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Не вставляйте адрес электронной почты в имя пользователя или примечание\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Такой идентификатор пользователя на этом ключе уже есть!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5001,10 +5004,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: параметр \"%s\" не рекомендуется\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "Внимание: параметр \"%s\" не рекомендуется\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте вместо этого \"%s%s\"\n"
 
@@ -7347,6 +7346,10 @@ msgstr "Создать самозаверенный сертификат? (y/N)
 msgid "These parameters are used:\n"
 msgstr "Используются параметры:\n"
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "ошибка создания временного файла: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr "Сейчас создается самозаверенный сертификат."
 
@@ -9089,6 +9092,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "ошибка записи во временный файл: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "запуск в подконтрольном режиме"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Имя не должно начинаться с цифры\n"
 
@@ -9423,9 +9432,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "невозможно открыть %s на запись: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "ошибка записи в %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "ошибка закрытия %s: %s\n"
 
diff --git a/po/sk.po b/po/sk.po
index ff6695cf9..7c76d178b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -278,12 +278,8 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "chyba pri vytváraní hesla: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "zapisujem do '%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
 
 #, fuzzy
 msgid "Enter new passphrase"
@@ -347,11 +343,6 @@ msgstr ""
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Kľúč je nahradený"
-
 msgid "do not detach from the console"
 msgstr ""
 
@@ -525,6 +516,10 @@ msgstr "čítam možnosti z `%s'\n"
 msgid "Note: '%s' is not considered an option\n"
 msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
 
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
+
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nemôžem vytvoriť: %s\n"
@@ -4002,7 +3997,7 @@ msgstr "Ste si istý, že ho chcete stále pridať? (a/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste pridávať fotografické ID k PGP2 kľúču.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4580,6 +4575,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do poľa meno alebo komentár nepíšte, prosím, e-mailovú adresu.\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5180,10 +5178,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: použitie parametra \"%s\" sa neodporúča\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "VAROVÁNÍ: použitie parametra \"%s\" sa neodporúča\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "použite namiesto neho \"%s%s\" \n"
 
@@ -7515,6 +7509,10 @@ msgstr "Vytvoriť pre tento podpis revokačný certifikát? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "chyba pri vytváraní hesla: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr ""
 
@@ -9255,6 +9253,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "zapisujem do '%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Kľúč je nahradený"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Meno nemôže začínať číslicou\n"
 
@@ -9518,10 +9525,6 @@ msgstr ""
 #~ msgstr "nemožno otvoriť %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "chyba pri čítaní `%s': %s\n"
 
diff --git a/po/sv.po b/po/sv.po
index 6bedeb47b..76d162d13 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -314,13 +314,10 @@ msgstr "PIN-kod repeterades inte korrekt; försök igen"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "fel när temporärfil skapades: %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "fel vid skrivning till temporärfil: %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "fel vid skrivning till %s: %s\n"
 
 msgid "Enter new passphrase"
 msgstr "Ange ny lösenfras"
@@ -409,11 +406,6 @@ msgstr "kör i demonläge (bakgrund)"
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#, fuzzy
-#| msgid "run in server mode"
-msgid "run in supervised mode"
-msgstr "kör i serverläge"
-
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
@@ -598,6 +590,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
@@ -4179,7 +4175,9 @@ msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4782,6 +4780,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
+
 # Ej solklart vad förkortningarna står för
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
@@ -5397,10 +5398,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
@@ -7858,6 +7855,10 @@ msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "fel när temporärfil skapades: %s\n"
+
 #, fuzzy
 #| msgid "self-signed certificate has a BAD signature"
 msgid "Now creating self-signed certificate.  "
@@ -9804,6 +9805,14 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "fel vid skrivning till temporärfil: %s\n"
+
+#, fuzzy
+#~| msgid "run in server mode"
+#~ msgid "run in supervised mode"
+#~ msgstr "kör i serverläge"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Namnet får inte börja med en siffra\n"
 
@@ -10157,9 +10166,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "kunde inte öppna %s för skrivning: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "fel vid skrivning till %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "fel vid stängning av %s: %s\n"
 
diff --git a/po/tr.po b/po/tr.po
index 1d97d84fa..efdf62e92 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -281,13 +281,10 @@ msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "geçici dosya oluşturulurken hata: %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "geçeci dosyaya yazma hatası: %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "%s yazılırken hata: %s\n"
 
 msgid "Enter new passphrase"
 msgstr "Yeni anahtar parolasını giriniz"
@@ -375,11 +372,6 @@ msgstr "artalan süreci olarak çalışır"
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#, fuzzy
-#| msgid "run in server mode"
-msgid "run in supervised mode"
-msgstr "sunucu kipinde çalışır"
-
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
@@ -563,6 +555,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
@@ -4112,7 +4108,7 @@ msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4719,6 +4715,9 @@ msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5326,10 +5325,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
@@ -7751,6 +7746,10 @@ msgstr ""
 msgid "These parameters are used:\n"
 msgstr ""
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "geçici dosya oluşturulurken hata: %s\n"
+
 #, fuzzy
 #| msgid "self-signed certificate has a BAD signature"
 msgid "Now creating self-signed certificate.  "
@@ -9688,6 +9687,14 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "geçeci dosyaya yazma hatası: %s\n"
+
+#, fuzzy
+#~| msgid "run in server mode"
+#~ msgid "run in supervised mode"
+#~ msgstr "sunucu kipinde çalışır"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
@@ -10035,9 +10042,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "%s yazmak için açılamadı: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "%s yazılırken hata: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "%s kapanırken hata: %s\n"
 
diff --git a/po/uk.po b/po/uk.po
index d9c203b67..15f545201 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -281,13 +281,10 @@ msgstr "Помилка під час повторного введення пі�
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Будь ласка, введіть пінкод%s%s%s для розблокування картки"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "помилка створення тимчасового файла: %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "помилка під час спроби запису до тимчасового файла: %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "помилка під час запису до %s: %s\n"
 
 msgid "Enter new passphrase"
 msgstr "Вкажіть новий пароль"
@@ -353,9 +350,6 @@ msgstr "запустити у режимі фонової служби (фоно
 msgid "run in server mode (foreground)"
 msgstr "запустити у режимі сервера (основному)"
 
-msgid "run in supervised mode"
-msgstr "запустити у режимі із наглядом"
-
 msgid "do not detach from the console"
 msgstr "не від’єднувати від консолі"
 
@@ -518,6 +512,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "УВАГА: «%s» вважається застарілим параметром\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "не вдалося створити сокет: %s\n"
 
@@ -3886,7 +3884,9 @@ msgstr "Ви справді бажаєте додати його? (y/N або т
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Не можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4467,6 +4467,9 @@ msgstr ""
 "Будь ласка, не використовуйте адресу електронної пошти у полях справжнього "
 "імені або коментаря\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5061,10 +5064,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: застарілий параметр «%s»\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "УВАГА: «%s» вважається застарілим параметром\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "будь ласка, скористайтеся «%s%s»\n"
 
@@ -7455,6 +7454,10 @@ msgstr "Створити самопідписаний сертифікат? (y/N
 msgid "These parameters are used:\n"
 msgstr "Використано ці параметри:\n"
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "помилка створення тимчасового файла: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr "Створюємо самопідписаний сертифікат.  "
 
@@ -9185,6 +9188,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "помилка під час спроби запису до тимчасового файла: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "запустити у режимі із наглядом"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Ім’я не може починатися з цифри\n"
 
@@ -9532,9 +9541,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "не вдалося відкрити %s для запису: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "помилка під час запису до %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "помилка під час спроби закрити %s: %s\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4ab5bda7c..5ff91977d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -265,13 +265,10 @@ msgstr "PIN 再次输入时与首次输入不符；请重试"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "请输入 PIN%s%s%s 以解锁这张卡"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "创建临时文件时出现错误： %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "写入临时文件时出现错误： %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "写入 %s 时出现错误：%s\n"
 
 msgid "Enter new passphrase"
 msgstr "输入新的密码"
@@ -329,9 +326,6 @@ msgstr "以守护进程模式运行 （后台）"
 msgid "run in server mode (foreground)"
 msgstr "以服务进程模式运行 （前台）"
 
-msgid "run in supervised mode"
-msgstr "以管理进程模式运行"
-
 msgid "do not detach from the console"
 msgstr "请勿离开控制台"
 
@@ -490,6 +484,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "注意：‘%s’不被认为是一个选项\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "警告：“%s” 是一个已被弃用的选项\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法创建套接字： %s\n"
 
@@ -3672,7 +3670,9 @@ msgstr "您确定仍然想要增加吗？(y/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "这样的用户标识已经存在于这个密钥上了！\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4215,6 +4215,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "这样的用户标识已经存在于这个密钥上了！\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -4771,10 +4774,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：被弃用的选项 “%s”\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "警告：“%s” 是一个已被弃用的选项\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请用“%s%s”代替\n"
 
@@ -6942,6 +6941,10 @@ msgstr "创建自签名证书？ (y/N) "
 msgid "These parameters are used:\n"
 msgstr "这些参数被使用：\n"
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "创建临时文件时出现错误： %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr "现在正在创建自签名证书。  "
 
@@ -8621,6 +8624,12 @@ msgstr "Yubikey 管理命令"
 msgid "manage the command history"
 msgstr "管理命令历史记录"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "写入临时文件时出现错误： %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "以管理进程模式运行"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "姓名不可以用数字开头\n"
 
@@ -8948,9 +8957,6 @@ msgstr "管理命令历史记录"
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "不能为写入打开 %s ：%s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "写入 %s 时出现错误：%s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "关闭 %s 时出现错误：%s\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2d97896d0..863afc5c6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -286,13 +286,10 @@ msgstr "前後兩次輸入的個人識別碼 (PIN) 不一致; 請再試一次"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "請輸入個人識別碼 (PIN)%s%s%s 以解開卡片"
 
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "建立暫存檔時出錯: %s\n"
-
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "寫入暫存檔時出錯: %s\n"
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "寫入 %s 時出錯: %s\n"
 
 msgid "Enter new passphrase"
 msgstr "請輸入新密語"
@@ -353,11 +350,6 @@ msgstr "以服務模式執行 (背景)"
 msgid "run in server mode (foreground)"
 msgstr "以伺服器模式執行 (前景)"
 
-#, fuzzy
-#| msgid "run in server mode"
-msgid "run in supervised mode"
-msgstr "以伺服器模式執行"
-
 msgid "do not detach from the console"
 msgstr "不要從 console 分離"
 
@@ -526,6 +518,10 @@ msgid "Note: '%s' is not considered an option\n"
 msgstr "請注意: '%s' 並不當成選項\n"
 
 #, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "警告: 已不建議使用 \"%s\" 選項\n"
+
+#, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
@@ -3863,7 +3859,9 @@ msgstr "你確定仍然想要增加嗎? (y/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-msgid "Such a user ID already exists on this key!\n"
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
 
 msgid "Delete this good signature? (y/N/q)"
@@ -4436,6 +4434,9 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 
+msgid "Such a user ID already exists on this key!\n"
+msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5008,10 +5009,6 @@ msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
 #, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "警告: 已不建議使用 \"%s\" 選項\n"
-
-#, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
@@ -7286,6 +7283,10 @@ msgstr "要建立自簽憑證嗎? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "採用下列這些參數:\n"
 
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "建立暫存檔時出錯: %s\n"
+
 msgid "Now creating self-signed certificate.  "
 msgstr "現在正在建立自簽憑證.  "
 
@@ -8994,6 +8995,14 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "寫入暫存檔時出錯: %s\n"
+
+#, fuzzy
+#~| msgid "run in server mode"
+#~ msgid "run in supervised mode"
+#~ msgstr "以伺服器模式執行"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "姓名不可以用數字開頭\n"
 
@@ -9339,9 +9348,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "無法開啟 %s 來寫入: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "寫入 %s 時出錯: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "關閉 %s 時出錯: %s\n"