merged from lp:~mvo/apt/mvo

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

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();
 }
 									/*}}}*/

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 ]

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

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

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"
 

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

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

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"

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

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

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

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"

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

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

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"

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

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

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"

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

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

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"
 

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

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

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

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

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

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

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

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

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

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

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

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"
 

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

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

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, так как он полностью виртуальный"
 

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

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

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"
 

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

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

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

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

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

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

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

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