drop empty line from fetch error

This is a duplicate of sorts of 0efb29eb36184bbe6de7b1013d1898796d94b171
which is the a lot more frequent case of this error – and also a
duplicate of this error message, just without the \n at the end.

Git-Dch: Ignore

apt-private/private-download.cc

@@ -109,7 +109,7 @@ bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failu
       uri.User.clear();
       uri.Password.clear();
       std::string descUri = std::string(uri);
-      _error->Error(_("Failed to fetch %s  %s\n"), descUri.c_str(),
+      _error->Error(_("Failed to fetch %s  %s"), descUri.c_str(),
 	    (*I)->ErrorText.c_str());
 
       if (Failure != NULL)

po/apt-all.pot

@@ -220,9 +220,9 @@ msgid ""
 "unauthenticated"
 msgstr ""
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
+msgid "Failed to fetch %s  %s"
 msgstr ""
 
 #: apt-private/private-download.cc
@@ -3493,11 +3493,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr ""
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/ar.po

@@ -228,10 +228,10 @@ msgid ""
 "unauthenticated"
 msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "فشل إحضار %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "فشل إحضار %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3555,11 +3555,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "فشل إحضار %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3570,6 +3565,9 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "حساب الترقية"
 
+#~ msgid "Failed to fetch %s  %s\n"
+#~ msgstr "فشل إحضار %s  %s\n"
+
 #, fuzzy
 #~ msgid "The repository is insufficiently signed by key %s (%s)"
 #~ msgstr "المسار %s طويل جداً"

po/ast.po

@@ -227,10 +227,10 @@ msgid ""
 "unauthenticated"
 msgstr "Hai problemes y utilizose -y ensin --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Falló algamar %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Falló algamar %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3706,11 +3706,6 @@ msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Falló algamar %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""
@@ -3724,6 +3719,9 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Calculando l'anovamientu"
 
+#~ msgid "Failed to fetch %s  %s\n"
+#~ msgstr "Falló algamar %s  %s\n"
+
 #, fuzzy
 #~ msgid "The repository is insufficiently signed by key %s (%s)"
 #~ msgstr "El direutorio %s ta desviáu"

po/bg.po

@@ -237,10 +237,10 @@ msgid ""
 "unauthenticated"
 msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Неуспех при изтеглянето на %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Неуспех при изтеглянето на %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3751,11 +3751,6 @@ msgstr "Трябва да добавите адреси-URI от тип „sourc
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Неуспех при изтеглянето на %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3772,6 +3767,9 @@ msgstr "Изчисляване на актуализацията"
 #~ msgid "The repository is insufficiently signed by key %s (%s)"
 #~ msgstr "Директорията %s е отклонена"
 
+#~ msgid "Failed to fetch %s  %s\n"
+#~ msgstr "Неуспех при изтеглянето на %s  %s\n"
+
 #~ msgid ""
 #~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 #~ "packages"

po/bs.po

@@ -224,10 +224,10 @@ msgid ""
 "unauthenticated"
 msgstr ""
 
-#: apt-private/private-download.cc
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr ""
+#: apt-private/private-download.cc apt-pkg/update.cc
+#, fuzzy, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Ne mogu otvoriti %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3538,11 +3538,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Ne mogu otvoriti %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/ca.po

@@ -232,10 +232,10 @@ msgid ""
 "unauthenticated"
 msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "No s'ha pogut obtenir %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "No s'ha pogut obtenir %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3753,11 +3753,6 @@ msgstr "Heu de posar algunes URI 'font' en el vostre sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "No s'ha pogut obtenir %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3774,6 +3769,9 @@ msgstr "S'està calculant l'actualització"
 #~ msgid "The repository is insufficiently signed by key %s (%s)"
 #~ msgstr "El directori %s està desviat"
 
+#~ msgid "Failed to fetch %s  %s\n"
+#~ msgstr "No s'ha pogut obtenir %s  %s\n"
+
 #~ msgid ""
 #~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 #~ "packages"

po/cs.po

@@ -231,10 +231,10 @@ msgid ""
 msgstr ""
 "Vyskytly se neověřené balíky a -y bylo použito bez --allow-unauthenticated."
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Selhalo stažení %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Selhalo stažení %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3706,11 +3706,6 @@ msgstr "Do sources.list musíte zadat „zdrojové“ URI"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "Nelze převést %s na celé číslo (integer)"
 
-#: apt-pkg/update.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Selhalo stažení %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/cy.po

@@ -232,10 +232,10 @@ msgid ""
 "unauthenticated"
 msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Methwyd cyrchu %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Methwyd cyrchu %s  %s"
 
 #: apt-private/private-download.cc
 #, fuzzy, c-format
@@ -3737,11 +3737,6 @@ msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Methwyd cyrchu %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/da.po

@@ -231,10 +231,10 @@ msgid ""
 "unauthenticated"
 msgstr "Der er problemer og -y blev brugt uden --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Kunne ikke hente %s %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Kunne ikke hente %s %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3721,11 +3721,6 @@ msgstr "Du skal have nogle »source«-URI'er i din sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Kunne ikke hente %s %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/de.po

@@ -234,10 +234,10 @@ msgid ""
 "unauthenticated"
 msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet."
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Fehlschlag beim Holen von %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Fehlschlag beim Holen von %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3831,11 +3831,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Fehlschlag beim Holen von %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/dz.po

@@ -233,10 +233,10 @@ msgid ""
 "unauthenticated"
 msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
+msgid "Failed to fetch %s  %s"
+msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3680,11 +3680,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/el.po

@@ -243,10 +243,10 @@ msgid ""
 "unauthenticated"
 msgstr "Υπάρχουν προβλήματα και δώσατε -y  χωρίς το --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Αποτυχία ανάκτησης του %s   %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Αποτυχία ανάκτησης του %s   %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3709,11 +3709,6 @@ msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών'
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Αποτυχία ανάκτησης του %s   %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/es.po

@@ -295,10 +295,10 @@ msgid ""
 msgstr ""
 "Había paquetes sin autenticar y se utilizó -y sin --allow-unauthenticated"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Fallo al obtener %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Fallo al obtener %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3891,11 +3891,6 @@ msgstr "Debe poner algunos URIs fuente («source») en su sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "No se pudo convertir %s a entero: fuera de rango"
 
-#: apt-pkg/update.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Fallo al obtener %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/eu.po

@@ -231,10 +231,10 @@ msgid ""
 "unauthenticated"
 msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Ezin da lortu %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Ezin da lortu %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3676,11 +3676,6 @@ msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Ezin da lortu %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/fi.po

@@ -231,10 +231,10 @@ msgid ""
 "unauthenticated"
 msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Tiedoston %s nouto ei onnistunut  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3668,11 +3668,6 @@ msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/fr.po

@@ -235,10 +235,10 @@ msgid ""
 "unauthenticated"
 msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Impossible de récupérer %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Impossible de récupérer %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3815,11 +3815,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Impossible de récupérer %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/gl.po

@@ -234,10 +234,10 @@ msgid ""
 "unauthenticated"
 msgstr "Xurdiron problemas e empregouse -y sen --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Non foi posíbel obter %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Non foi posíbel obter %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3744,11 +3744,6 @@ msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Non foi posíbel obter %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/he.po

@@ -779,8 +779,8 @@ msgstr "האם אתה רוצה להמשיך? [Y/n]"
 
 #: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "כשלון בהבאת %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "כשלון בהבאת %s  %s"
 
 #: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"

po/hu.po

@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2016-04-25 15:24+0200\n"
 "PO-Revision-Date: 2016-04-10 19:46+0200\n"
-"Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n"
+"Last-Translator: Gabor Kelemen <kelemeng@ubuntu.com>\n"
 "Language-Team: Hungarian <gnome-hu-list@gnome.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
@@ -238,10 +238,10 @@ msgstr ""
 "Hitelesítetlen csomagok vannak, és a -y kapcsolót használta\n"
 "a --allow-unauthenticated nélkül."
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Sikertelen letöltés: %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Sikertelen letöltés: %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3787,11 +3787,6 @@ msgstr "Néhány „source” URI-t el kell helyezni a sources.list fájlban"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "%s nem alakítható egésszé: kívül esik a tartományon"
 
-#: apt-pkg/update.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Sikertelen letöltés: %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/it.po

@@ -233,10 +233,10 @@ msgid ""
 "unauthenticated"
 msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Impossibile recuperare %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Impossibile recuperare %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3792,11 +3792,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Impossibile recuperare %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/ja.po

@@ -244,10 +244,10 @@ msgstr ""
 "認証されていないパッケージがあり、-y オプションが --allow-unauthenticated な"
 "しで使用されました"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s の取得に失敗しました  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "%s の取得に失敗しました  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3780,11 +3780,6 @@ msgstr "sources.list に 'ソース' URI を指定する必要があります"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "%s を整数に変換できません: 範囲外"
 
-#: apt-pkg/update.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s の取得に失敗しました  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/km.po

@@ -235,10 +235,10 @@ msgid ""
 "unauthenticated"
 msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3650,11 +3650,6 @@ msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs ម
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/ko.po

@@ -228,10 +228,10 @@ msgid ""
 "unauthenticated"
 msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s 파일을 받는데 실패했습니다  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "%s 파일을 받는데 실패했습니다  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3664,11 +3664,6 @@ msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s 파일을 받는데 실패했습니다  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/ku.po

@@ -226,10 +226,10 @@ msgid ""
 "unauthenticated"
 msgstr ""
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Anîna %s %s biserneket\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Anîna %s %s biserneket"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3551,11 +3551,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Anîna %s %s biserneket\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/lt.po

@@ -234,10 +234,10 @@ msgid ""
 "unauthenticated"
 msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Nepavyko parsiųsti %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Nepavyko parsiųsti %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3642,11 +3642,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Nepavyko parsiųsti %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/mr.po

@@ -231,10 +231,10 @@ msgid ""
 "unauthenticated"
 msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s  %s आणणे असफल\n"
+msgid "Failed to fetch %s  %s"
+msgstr "%s  %s आणणे असफल"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3652,11 +3652,6 @@ msgstr "तुम्ही तुमच्या उगमस्थान या
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s  %s आणणे असफल\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/nb.po

@@ -234,10 +234,10 @@ msgid ""
 "unauthenticated"
 msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Klarte ikke å skaffe %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Klarte ikke å skaffe %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3703,11 +3703,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Klarte ikke å skaffe %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/ne.po

@@ -231,10 +231,10 @@ msgid ""
 "unauthenticated"
 msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s  %s तान्न असफल भयो\n"
+msgid "Failed to fetch %s  %s"
+msgstr "%s  %s तान्न असफल भयो"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3649,11 +3649,6 @@ msgstr "तपाईँको स्रोत सूचिमा केही 's
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s  %s तान्न असफल भयो\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/nl.po

@@ -246,10 +246,10 @@ msgstr ""
 "Er waren niet-geauthenticeerde pakketten en -y was gebruikt zonder --allow-"
 "unauthenticated"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Ophalen van %s is mislukt  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Ophalen van %s is mislukt  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3845,11 +3845,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr "Kan %s niet naar een geheel getal omzetten: buiten het bereik"
 
-#: apt-pkg/update.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Ophalen van %s is mislukt  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/nn.po

@@ -234,10 +234,10 @@ msgid ""
 "unauthenticated"
 msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Klarte ikkje henta %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Klarte ikkje henta %s  %s"
 
 #: apt-private/private-download.cc
 #, fuzzy, c-format
@@ -3665,11 +3665,6 @@ msgstr "Du m
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Klarte ikkje henta %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/pl.po

@@ -240,10 +240,10 @@ msgid ""
 "unauthenticated"
 msgstr "Wystąpiły problemy, a użyto -y bez --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Nie udało się pobrać %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Nie udało się pobrać %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3778,11 +3778,6 @@ msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.li
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Nie udało się pobrać %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/pt.po

@@ -232,10 +232,10 @@ msgid ""
 "unauthenticated"
 msgstr "Há problemas e foi utilizado -y sem --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Falhou obter %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Falhou obter %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3759,11 +3759,6 @@ msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Falhou obter %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/pt_BR.po

@@ -231,10 +231,10 @@ msgid ""
 "unauthenticated"
 msgstr "Há problemas e -y foi usado sem --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Falhou ao buscar %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Falhou ao buscar %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3694,11 +3694,6 @@ msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Falhou ao buscar %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/ro.po

@@ -232,10 +232,10 @@ msgid ""
 "unauthenticated"
 msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Eșec la aducerea lui %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Eșec la aducerea lui %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3709,11 +3709,6 @@ msgstr "Trebuie să puneți niște 'surse' de URI în sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Eșec la aducerea lui %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/ru.po

@@ -240,10 +240,10 @@ msgid ""
 "unauthenticated"
 msgstr "Существуют проблемы, а параметр -y указан без --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Не удалось получить %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Не удалось получить %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3779,11 +3779,6 @@ msgstr "Вы должны заполнить sources.list, поместив ту
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Не удалось получить %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/sk.po

@@ -233,10 +233,10 @@ msgid ""
 "unauthenticated"
 msgstr "Nastali problémy a -y bolo použité bez --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Zlyhalo stiahnutie %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Zlyhalo stiahnutie %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3719,11 +3719,6 @@ msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Zlyhalo stiahnutie %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/sl.po

@@ -233,10 +233,10 @@ msgid ""
 "unauthenticated"
 msgstr "Prišlo je do težav in -y je bil uporabljen brez --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Ni mogoče dobiti %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Ni mogoče dobiti %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3724,11 +3724,6 @@ msgstr "V sources.list morate vstaviti URI-je z viri"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Ni mogoče dobiti %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/sv.po

@@ -234,10 +234,10 @@ msgid ""
 "unauthenticated"
 msgstr "Problem har uppstått och -y användes utan --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Misslyckades med att hämta %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Misslyckades med att hämta %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3753,11 +3753,6 @@ msgstr "Du måste lägga till några ”source”-URI:er i din sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Misslyckades med att hämta %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/th.po

@@ -229,10 +229,10 @@ msgid ""
 "unauthenticated"
 msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "ไม่สามารถดาวน์โหลด %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "ไม่สามารถดาวน์โหลด %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3639,11 +3639,6 @@ msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน so
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "ไม่สามารถดาวน์โหลด %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/tl.po

@@ -235,10 +235,10 @@ msgid ""
 "unauthenticated"
 msgstr "May mga problema at -y ay ginamit na walang --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Bigo sa pagkuha ng %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Bigo sa pagkuha ng %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3688,11 +3688,6 @@ msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Bigo sa pagkuha ng %s  %s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

po/tr.po

@@ -240,10 +240,10 @@ msgstr ""
 "Aslına uygunluğu doğrulanamayan paketler var ve -y seçeneği --allow-"
 "unauthenticated olmadan kullanılmış"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "%s ağdan alınamadı. %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "%s alınamadı %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3748,11 +3748,6 @@ msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "%s metni tam sayıya dönüştürülemiyor"
 
-#: apt-pkg/update.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "%s alınamadı %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/uk.po

@@ -240,10 +240,10 @@ msgid ""
 "unauthenticated"
 msgstr "Виявлено проблеми, а опція -y була використана без --force-yes"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Не вдалося завантажити %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Не вдалося завантажити %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3778,11 +3778,6 @@ msgstr "Додайте деякі посилання (URI) на вихідні
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Не вдалося завантажити %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/vi.po

@@ -234,10 +234,10 @@ msgid ""
 "unauthenticated"
 msgstr "Có lỗi và đã dùng tùy chọn “-y” mà không có  “--force-yes”"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Gặp lỗi khi lấy về %s  %s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "Gặp lỗi khi lấy về %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3749,11 +3749,6 @@ msgstr ""
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "Gặp lỗi khi lấy về %s  %s\n"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/zh_CN.po

@@ -235,10 +235,10 @@ msgid ""
 msgstr ""
 "存在未认证的软件包同时使用了 -y 选项，然而未搭配  --allow-unauthenticated"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "下载 %s  %s 失败\n"
+msgid "Failed to fetch %s  %s"
+msgstr "无法下载 %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3646,11 +3646,6 @@ msgstr "您必须在 sources.list 中指定代码源(deb-src) URI"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "无法将 %s 转换为整数：超出范围"
 
-#: apt-pkg/update.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "无法下载 %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "

po/zh_TW.po

@@ -230,10 +230,10 @@ msgid ""
 "unauthenticated"
 msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "無法取得 %s，%s\n"
+msgid "Failed to fetch %s  %s"
+msgstr "無法取得 %s，%s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -3632,11 +3632,6 @@ msgstr "在 sources.list 中必須包含一些 'source' URI"
 msgid "Cannot convert %s to integer: out of range"
 msgstr ""
 
-#: apt-pkg/update.cc
-#, fuzzy, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "無法取得 %s，%s\n"
-
 #: apt-pkg/update.cc
 #, fuzzy
 msgid ""

test/integration/test-apt-get-changelog

@@ -106,12 +106,12 @@ testequal 'bogus1.0) stable; urgency=low' head -n 1 foo.changelog
 rm -f foo.changelog
 
 # no @CHANGEPATH@ in the URI
-testequal 'E: Failed to fetch changelog:/foo.changelog  Changelog unavailable for foo=1.0
-' aptget changelog foo -qq -d -o Acquire::Changelogs::URI::Label::Testcases="http://localhost:${APTHTTPPORT}/change.txt"
+testequal 'E: Failed to fetch changelog:/foo.changelog  Changelog unavailable for foo=1.0' \
+	aptget changelog foo -qq -d -o Acquire::Changelogs::URI::Label::Testcases="http://localhost:${APTHTTPPORT}/change.txt"
 testfailure test -e foo.changelog
 
-testequal "E: Failed to fetch http://localhost:${APTHTTPPORT}/does/not/exist/main/f/foo/foo_1.0/change.txt  Changelog unavailable for foo=1.0 (404  Not Found)
-" aptget changelog foo -qq -d -o Acquire::Changelogs::URI::Label::Testcases="http://localhost:${APTHTTPPORT}/does/not/exist/@CHANGEPATH@/change.txt"
+testequal "E: Failed to fetch http://localhost:${APTHTTPPORT}/does/not/exist/main/f/foo/foo_1.0/change.txt  Changelog unavailable for foo=1.0 (404  Not Found)" \
+	aptget changelog foo -qq -d -o Acquire::Changelogs::URI::Label::Testcases="http://localhost:${APTHTTPPORT}/does/not/exist/@CHANGEPATH@/change.txt"
 testfailure test -e foo.changelog
 
 testdpkgnotinstalled 'foo'

test/integration/test-apt-helper

@@ -34,14 +34,12 @@ test_apt_helper_download() {
     msgtest 'apt-file download-file' 'wrong md5sum'
     testfailure --nomsg apthelper -qq download-file "${1}/foo" './downloaded/foo5' 'MD5Sum:aabbcc'
     testfileequal rootdir/tmp/testfailure.output "E: Failed to fetch ${1}/foo  Hash Sum mismatch
-
 E: Download Failed"
     testfileequal ./downloaded/foo5.FAILED 'foo'
 
     msgtest 'apt-file download-file' 'wrong sha256'
     testfailure --nomsg apthelper -qq download-file "${1}/foo" './downloaded/foo6' 'SHA256:aabbcc'
     testfileequal rootdir/tmp/testfailure.output "E: Failed to fetch ${1}/foo  Hash Sum mismatch
-
 E: Download Failed"
     testfileequal './downloaded/foo6.FAILED' 'foo'
 

test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum

@@ -221,9 +221,7 @@ Get:2 http://localhost:${APTHTTPPORT}  $1 1.0 (tar) [4 B]
 Err:2 http://localhost:${APTHTTPPORT}  $1 1.0 (tar)
   Hash Sum mismatch
 E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.dsc  Writing more data than expected (3 > 2)
-
 E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.tar.gz  Hash Sum mismatch
-
 E: Failed to fetch some archives."
 	else
 		FAILURE="Reading package lists...
@@ -235,13 +233,10 @@ Get:2 http://localhost:${APTHTTPPORT}  $1 1.0 (tar) [3 B]
 Err:2 http://localhost:${APTHTTPPORT}  $1 1.0 (tar)
   Hash Sum mismatch
 E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.dsc  Hash Sum mismatch
-
 E: Failed to fetch http://localhost:${APTHTTPPORT}/${1}_1.0.tar.gz  Hash Sum mismatch
-
 E: Failed to fetch some archives."
 	fi
 	testfailureequal "$FAILURE" aptget source -d "$@"
-
 	msgtest 'Files were not download as they have hashsum mismatches for' "$1"
 	testfailure --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
 
@@ -317,7 +312,6 @@ Get:1 http://localhost:${APTHTTPPORT}  pkg-mixed-sha2-bad 1.0 (tar) [3 B]
 Err:1 http://localhost:${APTHTTPPORT}  pkg-mixed-sha2-bad 1.0 (tar)
   Hash Sum mismatch
 E: Failed to fetch http://localhost:${APTHTTPPORT}/pkg-mixed-sha2-bad_1.0.tar.gz  Hash Sum mismatch
-
 E: Failed to fetch some archives." aptget source -d pkg-mixed-sha2-bad
 
 # it gets even more pathologic: multiple entries for one file, some even disagreeing!