From c7aa27f2dfda4286d672482c0691fb09004fb4a6 Mon Sep 17 00:00:00 2001
From: Klaus Kaempf <kkaempf@suse.de>
Date: Sat, 25 Aug 2007 18:55:31 +0000
Subject: [PATCH] proper linebreaks, make output readable again

---
 po/cs.po                       | 19 +++++++++++++++++--
 po/da.po                       | 23 +++++++++++++++++++----
 po/et.po                       | 19 +++++++++++++++++--
 po/fi.po                       | 23 +++++++++++++++++++----
 po/hu.po                       | 23 +++++++++++++++++++----
 po/nl.po                       | 23 +++++++++++++++++++----
 po/pl.po                       | 23 +++++++++++++++++++----
 po/pt.po                       | 23 +++++++++++++++++++----
 src/zypper-keyring-callbacks.h | 13 ++++++++-----
 9 files changed, 156 insertions(+), 33 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 5abfec7..64f51f0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -56,12 +56,27 @@ msgstr "Chcete důvěřovat ID klíče"
 
 #: ../src/zypper-keyring-callbacks.h:110
 #, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:110
+#, c-format
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Warning: this might be caused by a malicious change in the file!"
 msgstr ""
 
 #: ../src/zypper-keyring-callbacks.h:119
 #, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: this might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+msgid "Continuing is risky! Continue anyway?"
 msgstr ""
 
 #: ../src/zypper-keyring-callbacks.h:133
diff --git a/po/da.po b/po/da.po
index 35fa6c4..94b9824 100644
--- a/po/da.po
+++ b/po/da.po
@@ -56,13 +56,28 @@ msgstr "Ønsker du at have tillid til nøgle-id %s, %s, fingeraftryk %s"
 
 #: ../src/zypper-keyring-callbacks.h:110
 #, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "Advarsel ignorér mislykkedes signatur-verifikation for %s offentlig nøgleid,%s,%s,fingeraftryk %s! dobbeltcheck at dette ikke er forårsaget af nogen ondskabsfulde ændringer i filen!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "Advarsel ignorér mislykkedes signatur-verifikation for %s offentlig nøgleid,%s,%s,fingeraftryk %"
+
+#: ../src/zypper-keyring-callbacks.h:110
+#, c-format
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "Dobbeltcheck at dette ikke er forårsaget af nogen ondskabsfulde ændringer i filen!"
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Signatur-verifikation mislykkedes for %s med offentlig nøgleid %s,%s fingeraftryk %s"
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Warning: this might be caused by a malicious change in the file!"
+msgstr "Advarsel: årsagen til dette kunne være ondskabsfulde ændringer i filen!"
 
 #: ../src/zypper-keyring-callbacks.h:119
 #, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: this might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "Signatur-verifikation mislykkedes for %s med offentlig nøgleid %s,%s fingeraftryk %s. Advarsel: årsagen til dette kunne være ondskabsfulde ændringer i filen! Det er risikabelt at fortsætte! Vil du fortsætte alligevel?"
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Det er risikabelt at fortsætte! Vil du fortsætte alligevel?"
 
 #: ../src/zypper-keyring-callbacks.h:133
 #, c-format
diff --git a/po/et.po b/po/et.po
index 28eff01..880d8bd 100644
--- a/po/et.po
+++ b/po/et.po
@@ -55,12 +55,27 @@ msgstr "Kas soovid usaldada võtit, mille id on %s, %s, ja sõrmejälg %s"
 
 #: ../src/zypper-keyring-callbacks.h:110
 #, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:110
+#, c-format
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Warning: this might be caused by a malicious change in the file!"
 msgstr ""
 
 #: ../src/zypper-keyring-callbacks.h:119
 #, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: this might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+msgid "Continuing is risky! Continue anyway?"
 msgstr ""
 
 #: ../src/zypper-keyring-callbacks.h:133
diff --git a/po/fi.po b/po/fi.po
index cec87c2..40d2fec 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -57,13 +57,28 @@ msgstr "Luotetaanko avaimeen %s, %s, tunnus %s"
 
 #: ../src/zypper-keyring-callbacks.h:110
 #, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "Varoitus: %s ei läpäissyt aitoustarkistusta julkisella avaimella %s, %s, tunniste %s! Tämä ei johdu pahanlaatuisesista muutoksista tiedostossa!."
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "Varoitus: %s ei läpäissyt aitoustarkistusta julkisella avaimella %s, %s, tunniste %s!"
+
+#: ../src/zypper-keyring-callbacks.h:110
+#, c-format
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "Tämä ei johdu pahanlaatuisesista muutoksista tiedostossa!."
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "%s ei läpäissyt aitoustarkistusta julkisella avaimella %s, %s, tunniste %s."
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Warning: this might be caused by a malicious change in the file!"
+msgstr "Varoitus: Tämä saattaajohtua pahanaaltuisista muutoksista tiedostossa ja jatkaminen on riskialtista!"
 
 #: ../src/zypper-keyring-callbacks.h:119
 #, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: this might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "%s ei läpäissyt aitoustarkistusta julkisella avaimella %s, %s, tunniste %s. Varoitus: Tämä saattaajohtua pahanaaltuisista muutoksista tiedostossa ja jatkaminen on riskialtista! Jatketaanko silti?"
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Jatketaanko silti?"
 
 #: ../src/zypper-keyring-callbacks.h:133
 #, c-format
diff --git a/po/hu.po b/po/hu.po
index d6c20bb..3445ef8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -59,13 +59,28 @@ msgstr "Megbízik a következő kulcsazonosítóban: %s, %s, ujjlenyomat: %s?"
 
 #: ../src/zypper-keyring-callbacks.h:110
 #, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "Figyelem! A(z) %s meghiúsult aláírás-ellenőrzése (nyilvános kulcsazonosító: %s, %s; ujjlenyomat: %s) figyelmen kívül marad. Ellenőrizze, hogy ezt nem a fájl ártó szándékú módosítása okozta."
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "Figyelem! A(z) %s meghiúsult aláírás-ellenőrzése (nyilvános kulcsazonosító: %s, %s; ujjlenyomat: %s) figyelmen kívül marad."
+
+#: ../src/zypper-keyring-callbacks.h:110
+#, c-format
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "Ellenőrizze, hogy ezt nem a fájl ártó szándékú módosítása okozta."
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "A(z) %s aláírás-ellenőrzése meghiúsult (nyilvános kulcsazonosító: %s, %s; ujjlenyomat: %s)."
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Warning: this might be caused by a malicious change in the file!"
+msgstr "Figyelem: ezt a fájl ártó szándékú módosítása is okozhatta!"
 
 #: ../src/zypper-keyring-callbacks.h:119
 #, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: this might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "A(z) %s aláírás-ellenőrzése meghiúsult (nyilvános kulcsazonosító: %s, %s; ujjlenyomat: %s). Figyelem: ezt a fájl ártó szándékú módosítása is okozhatta! A folytatás kockázatos. Mindenképp folytatja?"
+msgid "Continuing is risky! Continue anyway?"
+msgstr "A folytatás kockázatos. Mindenképp folytatja?"
 
 #: ../src/zypper-keyring-callbacks.h:133
 #, c-format
diff --git a/po/nl.po b/po/nl.po
index 8b01436..2637e04 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -56,13 +56,28 @@ msgstr "Wilt u de sleutel-id %s, %s, vingerafdruk %s vertrouwen?"
 
 #: ../src/zypper-keyring-callbacks.h:110
 #, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "Waarschuwing: mislukte ondertekeningverificatie wordt genegeerd voor %s met publieke sleutel-id %s, %s, vingerafdruk %s!. Controleer goed of dit niet wordt veroorzaakt door kwaadaardige wijzigingen in het bestand!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "Waarschuwing: mislukte ondertekeningverificatie wordt genegeerd voor %s met publieke sleutel-id %s, %s, vingerafdruk %s!"
+
+#: ../src/zypper-keyring-callbacks.h:110
+#, c-format
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "Controleer goed of dit niet wordt veroorzaakt door kwaadaardige wijzigingen in het bestand!"
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Ondertekenverificatie mislukt voor %s met sleutel-id %s, %s, vingerafdruk %s."
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Warning: this might be caused by a malicious change in the file!"
+msgstr "Waarschuwing: dit kan zijn veroorzaakt door een kwaadaardige wijzigingen in het bestand!"
 
 #: ../src/zypper-keyring-callbacks.h:119
 #, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: this might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "Ondertekenverificatie mislukt voor %s met sleutel-id %s, %s, vingerafdruk %s. Waarschuwing: dit kan zijn veroorzaakt door een kwaadaardige wijzigingen in het bestand! Doorgaan is riskant! Wilt u toch doorgaan?"
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Doorgaan is riskant! Wilt u toch doorgaan?"
 
 #: ../src/zypper-keyring-callbacks.h:133
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index c7a89fd..c3c9bf9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -55,13 +55,28 @@ msgstr "Czy ufać kluczowi: id: %s, %s, odcisk: %s"
 
 #: ../src/zypper-keyring-callbacks.h:110
 #, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "Uwaga: zignorowano nieudaną weryfikację sygnatury dla %s. ID klucza: %s, %s odcisk: %s. Proszę jeszcze raz skontrolować czy nie jest to spowodowane przez niebezpieczne zmiany w pliku."
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "Uwaga: zignorowano nieudaną weryfikację sygnatury dla %s. ID klucza: %s, %s odcisk: %s."
+
+#: ../src/zypper-keyring-callbacks.h:110
+#, c-format
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "Proszę jeszcze raz skontrolować czy nie jest to spowodowane przez niebezpieczne zmiany w pliku."
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Nieudana weryfikacja sygnatury dla %s. ID klucza: %s, %s, odcisk: %s."
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Warning: this might be caused by a malicious change in the file!"
+msgstr "Uwaga: to może być spowodowane przez niebezpieczne zmiany w pliku"
 
 #: ../src/zypper-keyring-callbacks.h:119
 #, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: this might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "Nieudana weryfikacja sygnatury dla %s. ID klucza: %s, %s, odcisk: %s. Uwaga: to może być spowodowane przez niebezpieczne zmiany w pliku. Kontynuacja wiąże się z ryzykiem. Kontynuować?"
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Kontynuacja wiąże się z ryzykiem. Kontynuować?"
 
 #: ../src/zypper-keyring-callbacks.h:133
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index c53529c..e66d83f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -59,13 +59,28 @@ msgstr "Pretende confiar no id da chave %s, %s, impressão digital %s"
 
 #: ../src/zypper-keyring-callbacks.h:110
 #, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "Atenção: A ignorar falha na verificação da assinatura para %s com a id da chave pública %s, %s, impressão digital %s! Verifique se não é causado por alguma modificação maliciosa no ficheiro!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "Atenção: A ignorar falha na verificação da assinatura para %s com a id da chave pública %s, %s, impressão digital %s!"
+
+#: ../src/zypper-keyring-callbacks.h:110
+#, c-format
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "Verifique se não é causado por alguma modificação maliciosa no ficheiro!"
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Verificação da assinatura falhou para %s com a id da cheve pública %s, %s, impressão digital %s."
+
+#: ../src/zypper-keyring-callbacks.h:119
+#, c-format
+msgid "Warning: this might be caused by a malicious change in the file!"
+msgstr "Aviso: isto pode ser causado por uma alteração maliciosa no ficheiro!"
 
 #: ../src/zypper-keyring-callbacks.h:119
 #, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: this might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "Verificação da assinatura falhou para %s com a id da cheve pública %s, %s, impressão digital %s. Aviso: isto pode ser causado por uma alteração maliciosa no ficheiro! Continuar é arriscaod! Continuar à mesma?"
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Continuar é arriscaod! Continuar à mesma?"
 
 #: ../src/zypper-keyring-callbacks.h:133
 #, c-format
diff --git a/src/zypper-keyring-callbacks.h b/src/zypper-keyring-callbacks.h
index b29a0b3..dc572bd 100644
--- a/src/zypper-keyring-callbacks.h
+++ b/src/zypper-keyring-callbacks.h
@@ -108,8 +108,9 @@ namespace zypp {
               % file % keyid % keyname % fingerprint << endl;
           cerr << boost::format(
               _("Warning: Ignoring failed signature verification for %s"
-                " with public key id %s, %s, fingerprint %s!"			// FIXME: LINEBREAK!
-                " Double-check this is not caused by some malicious"
+                " with public key id %s, %s, fingerprint %s!") +
+		string("\n") +
+               _("Double-check this is not caused by some malicious"
                 " changes in the file!"))
               %file % keyid % keyname % fingerprint << endl;
           return true;
@@ -117,9 +118,11 @@ namespace zypp {
 
         std::string question = boost::str(boost::format(
             _("Signature verification failed for %s"
-              " with public key id %s, %s, fingerprint %s."			// FIXME: LINEBREAK!
-              " Warning: This might be caused by a malicious change in the file!"			// FIXME: LINEBREAK!
-              " Continuing is risky! Continue anyway?"))
+              " with public key id %s, %s, fingerprint %s.") +
+	      string("\n") +
+             _("Warning: This might be caused by a malicious change in the file!") +
+	      string("\n") +
+             _("Continuing is risky! Continue anyway?"))
             % file % keyid % keyname % fingerprint);
         return read_bool_answer(question, false);
       }
-- 
2.7.4