From 3f7604340855760289d7ed7e2dca70f99a9f4986 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 12 Mar 2016 17:36:01 +0100 Subject: drop empty line from fetch error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 | 2 +- po/apt-all.pot | 9 ++------- po/ar.po | 14 ++++++-------- po/ast.po | 14 ++++++-------- po/bg.po | 14 ++++++-------- po/bs.po | 13 ++++--------- po/ca.po | 14 ++++++-------- po/cs.po | 11 +++-------- po/cy.po | 11 +++-------- po/da.po | 11 +++-------- po/de.po | 11 +++-------- po/dz.po | 11 +++-------- po/el.po | 11 +++-------- po/es.po | 11 +++-------- po/eu.po | 11 +++-------- po/fi.po | 11 +++-------- po/fr.po | 11 +++-------- po/gl.po | 11 +++-------- po/he.po | 4 ++-- po/hu.po | 13 ++++--------- po/it.po | 11 +++-------- po/ja.po | 11 +++-------- po/km.po | 11 +++-------- po/ko.po | 11 +++-------- po/ku.po | 11 +++-------- po/lt.po | 11 +++-------- po/mr.po | 11 +++-------- po/nb.po | 11 +++-------- po/ne.po | 11 +++-------- po/nl.po | 11 +++-------- po/nn.po | 11 +++-------- po/pl.po | 11 +++-------- po/pt.po | 11 +++-------- po/pt_BR.po | 11 +++-------- po/ro.po | 11 +++-------- po/ru.po | 11 +++-------- po/sk.po | 11 +++-------- po/sl.po | 11 +++-------- po/sv.po | 11 +++-------- po/th.po | 11 +++-------- po/tl.po | 11 +++-------- po/tr.po | 11 +++-------- po/uk.po | 11 +++-------- po/vi.po | 11 +++-------- po/zh_CN.po | 11 +++-------- po/zh_TW.po | 11 +++-------- test/integration/test-apt-get-changelog | 8 ++++---- test/integration/test-apt-helper | 2 -- .../test-ubuntu-bug-1098738-apt-get-source-md5sum | 6 ------ 49 files changed, 152 insertions(+), 368 deletions(-) diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc index 89d0a50c7..1ae0f4a0e 100644 --- a/apt-private/private-download.cc +++ b/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) diff --git a/po/apt-all.pot b/po/apt-all.pot index a29c65a7d..0b3760793 100644 --- a/po/apt-all.pot +++ b/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 " diff --git a/po/ar.po b/po/ar.po index 690e19d40..05a62bc68 100644 --- a/po/ar.po +++ b/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 طويل جداً" diff --git a/po/ast.po b/po/ast.po index f5b569c28..f3a65f7b3 100644 --- a/po/ast.po +++ b/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" diff --git a/po/bg.po b/po/bg.po index 411377e7f..cb3cd96d7 100644 --- a/po/bg.po +++ b/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" diff --git a/po/bs.po b/po/bs.po index 2478ff96f..974518689 100644 --- a/po/bs.po +++ b/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 " diff --git a/po/ca.po b/po/ca.po index 67a2734ec..e86b8ea7e 100644 --- a/po/ca.po +++ b/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" diff --git a/po/cs.po b/po/cs.po index 15dd8f094..b0c165b7e 100644 --- a/po/cs.po +++ b/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 " diff --git a/po/cy.po b/po/cy.po index ad3401fda..0ea21f927 100644 --- a/po/cy.po +++ b/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 "" diff --git a/po/da.po b/po/da.po index 56ee08ceb..7cd4effb0 100644 --- a/po/da.po +++ b/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 " diff --git a/po/de.po b/po/de.po index 8aa2be0d6..cbabbc130 100644 --- a/po/de.po +++ b/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 " diff --git a/po/dz.po b/po/dz.po index 1768a6904..08362218b 100644 --- a/po/dz.po +++ b/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 "" diff --git a/po/el.po b/po/el.po index 9f8edffc4..c2b37f24d 100644 --- a/po/el.po +++ b/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 "" diff --git a/po/es.po b/po/es.po index 9f172cb47..119c57624 100644 --- a/po/es.po +++ b/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 " diff --git a/po/eu.po b/po/eu.po index 177e48274..3425a3a74 100644 --- a/po/eu.po +++ b/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 "" diff --git a/po/fi.po b/po/fi.po index 457b3e872..f4d2bb054 100644 --- a/po/fi.po +++ b/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 "" diff --git a/po/fr.po b/po/fr.po index bd2aea317..f26a63388 100644 --- a/po/fr.po +++ b/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 " diff --git a/po/gl.po b/po/gl.po index b92084295..132ac77ce 100644 --- a/po/gl.po +++ b/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 "" diff --git a/po/he.po b/po/he.po index 1e982f8d2..3c5f40f2b 100644 --- a/po/he.po +++ b/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" diff --git a/po/hu.po b/po/hu.po index b2002e20a..efde6d6a6 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: APT Development Team \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 \n" +"Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \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 " diff --git a/po/it.po b/po/it.po index d3d698725..3b0eb4c67 100644 --- a/po/it.po +++ b/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 " diff --git a/po/ja.po b/po/ja.po index cfd7b7e40..4107bd51d 100644 --- a/po/ja.po +++ b/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 " diff --git a/po/km.po b/po/km.po index 5e856f4eb..22f73ca55 100644 --- a/po/km.po +++ b/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 "" diff --git a/po/ko.po b/po/ko.po index ca629ab70..9fa5ed445 100644 --- a/po/ko.po +++ b/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 "" diff --git a/po/ku.po b/po/ku.po index f4d834a9c..f09cb16ed 100644 --- a/po/ku.po +++ b/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 " diff --git a/po/lt.po b/po/lt.po index 7a8353200..6ebf6c769 100644 --- a/po/lt.po +++ b/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 "" diff --git a/po/mr.po b/po/mr.po index 8807abf3d..11cdacb43 100644 --- a/po/mr.po +++ b/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 "" diff --git a/po/nb.po b/po/nb.po index f5e95bbb3..1b1801e22 100644 --- a/po/nb.po +++ b/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 "" diff --git a/po/ne.po b/po/ne.po index 44653379f..ff2896312 100644 --- a/po/ne.po +++ b/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 "" diff --git a/po/nl.po b/po/nl.po index 239fc5001..202fa5705 100644 --- a/po/nl.po +++ b/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 " diff --git a/po/nn.po b/po/nn.po index 9a72242d5..4c22ef947 100644 --- a/po/nn.po +++ b/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 "" diff --git a/po/pl.po b/po/pl.po index ed4037a9c..f3517fc7f 100644 --- a/po/pl.po +++ b/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 " diff --git a/po/pt.po b/po/pt.po index 09dad26b6..a73f4d12e 100644 --- a/po/pt.po +++ b/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 " diff --git a/po/pt_BR.po b/po/pt_BR.po index 5df404352..72999ca98 100644 --- a/po/pt_BR.po +++ b/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 "" diff --git a/po/ro.po b/po/ro.po index 46d925963..cc887e72e 100644 --- a/po/ro.po +++ b/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 "" diff --git a/po/ru.po b/po/ru.po index f91078a50..0f2d58dff 100644 --- a/po/ru.po +++ b/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 " diff --git a/po/sk.po b/po/sk.po index aa6e4b26f..88c9ad6ae 100644 --- a/po/sk.po +++ b/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 " diff --git a/po/sl.po b/po/sl.po index 3f73f0f1c..b6d621152 100644 --- a/po/sl.po +++ b/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 " diff --git a/po/sv.po b/po/sv.po index 06b7e0f6a..3580937c2 100644 --- a/po/sv.po +++ b/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 " diff --git a/po/th.po b/po/th.po index c9197936f..45680fbc5 100644 --- a/po/th.po +++ b/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 " diff --git a/po/tl.po b/po/tl.po index f1961e3e0..a0801808e 100644 --- a/po/tl.po +++ b/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 "" diff --git a/po/tr.po b/po/tr.po index e32b71937..dc002e2cb 100644 --- a/po/tr.po +++ b/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 " diff --git a/po/uk.po b/po/uk.po index afcfc9ffe..b89010177 100644 --- a/po/uk.po +++ b/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 " diff --git a/po/vi.po b/po/vi.po index 43d13bfb6..48ce7e966 100644 --- a/po/vi.po +++ b/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 " diff --git a/po/zh_CN.po b/po/zh_CN.po index 0e3634fdf..a1fc57f42 100644 --- a/po/zh_CN.po +++ b/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 " diff --git a/po/zh_TW.po b/po/zh_TW.po index 173a75ec0..582c297d6 100644 --- a/po/zh_TW.po +++ b/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 "" diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog index 1815b9961..0812db500 100755 --- a/test/integration/test-apt-get-changelog +++ b/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' diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper index b2347ddcf..bc7f6e680 100755 --- a/test/integration/test-apt-helper +++ b/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' diff --git a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum index b37ca456f..2a271607e 100755 --- a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum +++ b/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! -- cgit v1.2.3