summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2011-02-10 17:51:44 +0100
committerMichael Vogt <mvo@debian.org>2011-02-10 17:51:44 +0100
commit1dda80929fcd62c287a84f1ecc1277fc39890efe (patch)
treede7b40737ebb7341091cf7447680493e50a8ba2f
parent8a80bdea0fcead1edbb5bf58d92f36b875f15713 (diff)
parent196c511c97b83a16c551f4e767f5a8b0d4f77c45 (diff)
merged from lp:~mvo/apt/mvo
-rw-r--r--apt-pkg/algorithms.cc4
-rw-r--r--apt-pkg/cacheset.cc2
-rw-r--r--debian/changelog11
-rw-r--r--po/apt-all.pot2
-rw-r--r--po/ar.po2
-rw-r--r--po/ast.po2
-rw-r--r--po/bg.po2
-rw-r--r--po/bs.po2
-rw-r--r--po/ca.po2
-rw-r--r--po/cs.po2
-rw-r--r--po/cy.po2
-rw-r--r--po/da.po2
-rw-r--r--po/de.po2
-rw-r--r--po/dz.po2
-rw-r--r--po/el.po2
-rw-r--r--po/es.po2
-rw-r--r--po/eu.po2
-rw-r--r--po/fi.po2
-rw-r--r--po/fr.po2
-rw-r--r--po/gl.po2
-rw-r--r--po/hu.po2
-rw-r--r--po/it.po2
-rw-r--r--po/ja.po2
-rw-r--r--po/km.po2
-rw-r--r--po/ko.po2
-rw-r--r--po/ku.po2
-rw-r--r--po/lt.po2
-rw-r--r--po/mr.po2
-rw-r--r--po/nb.po2
-rw-r--r--po/ne.po2
-rw-r--r--po/nl.po2
-rw-r--r--po/nn.po2
-rw-r--r--po/pl.po2
-rw-r--r--po/pt.po2
-rw-r--r--po/pt_BR.po2
-rw-r--r--po/ro.po2
-rw-r--r--po/ru.po2
-rw-r--r--po/sk.po2
-rw-r--r--po/sl.po2
-rw-r--r--po/sv.po2
-rw-r--r--po/th.po2
-rw-r--r--po/tl.po2
-rw-r--r--po/uk.po2
-rw-r--r--po/vi.po2
-rw-r--r--po/zh_CN.po2
-rw-r--r--po/zh_TW.po2
-rw-r--r--test/integration/framework4
-rwxr-xr-xtest/integration/test-bug-595691-empty-and-broken-archive-files4
48 files changed, 61 insertions, 50 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 0d26f8f66..66c182b23 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1514,9 +1514,9 @@ bool ListUpdate(pkgAcquireStatus &Stat,
}
if (TransientNetworkFailure == true)
- _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead."));
+ _error->Warning(_("Some index files failed to download. They have been ignored, or old ones used instead."));
else if (Failed == true)
- return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead."));
+ return _error->Error(_("Some index files failed to download. They have been ignored, or old ones used instead."));
// Run the success scripts if all was fine
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index bbfdfd4f2..a1de613e2 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -464,7 +464,7 @@ PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string co
VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache,
pkgCache::PkgIterator const &Pkg) {
if (ShowError == true)
- _error->Insert(ErrorType, _("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str());
+ _error->Insert(ErrorType, _("Can't select versions from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str());
return VersionSet();
}
/*}}}*/
diff --git a/debian/changelog b/debian/changelog
index deb4d3161..bc7092bb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apt (0.8.12) UNRELEASED; urgency=low
+
+ [ Michael Vogt ]
+ * merged lp:~evfool/apt/fix641673:
+ - String-fix in the source and the translations for the grammatical
+ mistake reported in bug LP: #641673, thanks to Robert Roth
+ * merged lp:~evfool/apt/fix418552:
+ - Grammar fix for bug LP: #418552, thanks to Robert Roth
+
+ -- Michael Vogt <mvo@debian.org> Thu, 10 Feb 2011 17:51:16 +0100
+
apt (0.8.11.1) unstable; urgency=low
[ Stefan Lippers-Hollmann ]
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 71e212509..4634bf64c 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -2903,7 +2903,7 @@ msgstr ""
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/ar.po b/po/ar.po
index 0bff621b3..3801d76e9 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2937,7 +2937,7 @@ msgstr "تعذر العثور على الحزمة %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/ast.po b/po/ast.po
index fdfd83d84..3248fcd54 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3166,7 +3166,7 @@ msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Nun pueden seleicionase versiones pal paquete'%s' como puramente virtual"
diff --git a/po/bg.po b/po/bg.po
index 0fb6d6901..d4d01aeed 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3201,7 +3201,7 @@ msgstr "Не са намерен пакети, отговарящ на регу
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/bs.po b/po/bs.po
index 20e8a469f..bf106f2a8 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -2934,7 +2934,7 @@ msgstr ""
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/ca.po b/po/ca.po
index 60e1c4bc5..ba7d41e81 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3201,7 +3201,7 @@ msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular '%s'"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"No s'han pogut seleccionar les versions del paquet '%s' ja que és purament "
"virtual"
diff --git a/po/cs.po b/po/cs.po
index 08c5faff9..ef3ceab5a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3142,7 +3142,7 @@ msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Nelze vybrat verze balíku „%s“, protože je čistě virtuální"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/cy.po b/po/cy.po
index 4f516b755..b6944bdeb 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -3229,7 +3229,7 @@ msgstr "Methwyd canfod pecyn %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/da.po b/po/da.po
index 4f36f6ca0..ecbcfa0d9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3163,7 +3163,7 @@ msgstr "Kunne ikke finde nogle pakker med regulært udtryk '%s'"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Kan ikke vælge versioner fra pakke '%s' som er vitalt"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/de.po b/po/de.po
index 8cc3712cf..64743a10f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3241,7 +3241,7 @@ msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein "
"virtuell ist"
diff --git a/po/dz.po b/po/dz.po
index 431785222..25e910204 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -3152,7 +3152,7 @@ msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/el.po b/po/el.po
index ad19342a6..d86642ffd 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3186,7 +3186,7 @@ msgstr "Αδύνατη η εύρεση του πακέτου %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/es.po b/po/es.po
index c688f8d21..2cabf3b8e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3268,7 +3268,7 @@ msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"No se pueden seleccionar distintas versiones del paquete «%s» porque es "
"puramente virtual"
diff --git a/po/eu.po b/po/eu.po
index c03d23840..f2a7d279c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3148,7 +3148,7 @@ msgstr "Ezin izan da %s paketea aurkitu"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/fi.po b/po/fi.po
index 40d648088..83edb0c91 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3141,7 +3141,7 @@ msgstr "Pakettia %s ei löytynyt"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/fr.po b/po/fr.po
index cd7b1a235..69562f9d9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3252,7 +3252,7 @@ msgstr ""
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet "
"virtuel"
diff --git a/po/gl.po b/po/gl.po
index 778e67db1..99248f3be 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3163,7 +3163,7 @@ msgstr "Non se puido atopar o paquete %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/hu.po b/po/hu.po
index 841f1bf15..afd23b1b4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3133,7 +3133,7 @@ msgstr "Az alábbi csomag nem található: %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/it.po b/po/it.po
index f7b4e05a1..dc233e261 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3229,7 +3229,7 @@ msgstr ""
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale"
diff --git a/po/ja.po b/po/ja.po
index e3beaa53a..eac949216 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3188,7 +3188,7 @@ msgstr "正規表現 '%s' ではパッケージは見つかりませんでした
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/km.po b/po/km.po
index 71040d63e..eb912d3bb 100644
--- a/po/km.po
+++ b/po/km.po
@@ -3111,7 +3111,7 @@ msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/ko.po b/po/ko.po
index 11148c93a..7788e50be 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3134,7 +3134,7 @@ msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/ku.po b/po/ku.po
index d4aea23ee..c752dd0a2 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -2936,7 +2936,7 @@ msgstr "Nikarî pakêta %s bibîne"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/lt.po b/po/lt.po
index 51cebd901..21829f7ff 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3032,7 +3032,7 @@ msgstr "Nepavyko rasti paketo %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/mr.po b/po/mr.po
index 6f9b78fef..621ebba6c 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -3123,7 +3123,7 @@ msgstr "%s पॅकेज सापडू शकले नाही"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/nb.po b/po/nb.po
index 560afaa94..9b1ebabff 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3162,7 +3162,7 @@ msgstr "Klarte ikke finne noen pakken med regex «%s»"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/ne.po b/po/ne.po
index 85880dc7f..71568f2a8 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -3115,7 +3115,7 @@ msgstr "प्याकेज फेला पार्न सकिएन %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/nl.po b/po/nl.po
index b0f19abf7..1273d080e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3202,7 +3202,7 @@ msgstr "Kon pakket %s niet vinden"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/nn.po b/po/nn.po
index 4b8290373..1b19641a5 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -3136,7 +3136,7 @@ msgstr "Fann ikkje pakken %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/pl.po b/po/pl.po
index 71d0301c7..817c021b2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3170,7 +3170,7 @@ msgstr "Nie udało się odnaleźć pakietu %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/pt.po b/po/pt.po
index 1b430d861..007c0932a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3199,7 +3199,7 @@ msgstr "Não foi possível encontrar o pacote através da expressão regular '%s
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0c9d695a2..c696effb3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3178,7 +3178,7 @@ msgstr "Impossível achar pacote %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/ro.po b/po/ro.po
index 32a486269..83c76abb7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3187,7 +3187,7 @@ msgstr "Nu pot găsi pachetul %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/ru.po b/po/ru.po
index d67a64045..344c79ce3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3207,7 +3207,7 @@ msgstr "Не удалось найти пакет по регулярному в
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Не удалось выбрать версии из пакета %s, так как он полностью виртуальный"
diff --git a/po/sk.po b/po/sk.po
index 2c0a7f283..ed9166175 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3157,7 +3157,7 @@ msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/sl.po b/po/sl.po
index 5901db176..35954f055 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3163,7 +3163,7 @@ msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/sv.po b/po/sv.po
index e71e02cba..ed6ded39e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3186,7 +3186,7 @@ msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Kan inte välja versioner från paketet \"%s\" eftersom det är helt virtuellt"
diff --git a/po/th.po b/po/th.po
index 8f9962701..e8a23ce06 100644
--- a/po/th.po
+++ b/po/th.po
@@ -3093,7 +3093,7 @@ msgstr "ไม่พบแพกเกจ %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/tl.po b/po/tl.po
index 03fec29c6..db861e948 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -3170,7 +3170,7 @@ msgstr "Hindi mahanap ang paketeng %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/uk.po b/po/uk.po
index 4627bf439..e2346cb1f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3184,7 +3184,7 @@ msgstr "Не можу знайти пакунок %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/vi.po b/po/vi.po
index 376e5dca6..afe29e622 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -3208,7 +3208,7 @@ msgstr "Không tìm thấy gói nào theo biểu thức chính quy « %s »"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Không thể chọn phiên bản trong gói « %s » vì nó chỉ là ảo"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8ffb0feee..0ae10e38d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3109,7 +3109,7 @@ msgstr "无法按照正则表达式 %s 找到任何软件包"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "无法从完全虚拟的软件包 %s 中选择版本"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7501d7310..8e8bc6c87 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3094,7 +3094,7 @@ msgstr "無法找到套件 %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
diff --git a/test/integration/framework b/test/integration/framework
index e10709079..121678d4b 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -592,12 +592,12 @@ testequalor2() {
}
testshowvirtual() {
- local VIRTUAL="N: Can't select versions from package '$1' as it purely virtual"
+ local VIRTUAL="N: Can't select versions from package '$1' as it is purely virtual"
local PACKAGE="$1"
shift
while [ -n "$1" ]; do
VIRTUAL="${VIRTUAL}
-N: Can't select versions from package '$1' as it purely virtual"
+N: Can't select versions from package '$1' as it is purely virtual"
PACKAGE="${PACKAGE} $1"
shift
done
diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index 684559aa7..2179ba03b 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -97,7 +97,7 @@ Err file: Packages
Empty files can't be valid archives
W: Failed to fetch ${COMPRESSOR}:$(readlink -f aptarchive/Packages.$COMPRESS) Empty files can't be valid archives
-E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
+E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
}
testoverhttp() {
@@ -131,7 +131,7 @@ Err http://localhost Packages
Empty files can't be valid archives
W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages) Empty files can't be valid archives
-E: Some index files failed to download, they have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
+E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
}
for COMPRESSOR in 'gzip' 'bzip2' 'lzma'; do testoverfile $COMPRESSOR; done