diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-02-10 17:38:16 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-02-10 17:38:16 +0100 |
commit | edc0ef102b5100acb6930ff27c4296eb101a35e7 (patch) | |
tree | 21d6ea9f3711aa2f60b49f9365035099cac98f53 | |
parent | 4c6cf49317769725fee34a132c52ec1fe076b8b5 (diff) | |
download | apt-edc0ef102b5100acb6930ff27c4296eb101a35e7.tar.gz |
* 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
-rw-r--r-- | apt-pkg/cacheset.cc | 2 | ||||
-rw-r--r-- | debian/changelog | 9 | ||||
-rw-r--r-- | po/apt-all.pot | 2 | ||||
-rw-r--r-- | po/ar.po | 2 | ||||
-rw-r--r-- | po/ast.po | 2 | ||||
-rw-r--r-- | po/bg.po | 2 | ||||
-rw-r--r-- | po/bs.po | 2 | ||||
-rw-r--r-- | po/ca.po | 2 | ||||
-rw-r--r-- | po/cs.po | 2 | ||||
-rw-r--r-- | po/cy.po | 2 | ||||
-rw-r--r-- | po/da.po | 2 | ||||
-rw-r--r-- | po/de.po | 2 | ||||
-rw-r--r-- | po/dz.po | 2 | ||||
-rw-r--r-- | po/el.po | 2 | ||||
-rw-r--r-- | po/es.po | 2 | ||||
-rw-r--r-- | po/eu.po | 2 | ||||
-rw-r--r-- | po/fi.po | 2 | ||||
-rw-r--r-- | po/fr.po | 2 | ||||
-rw-r--r-- | po/gl.po | 2 | ||||
-rw-r--r-- | po/hu.po | 2 | ||||
-rw-r--r-- | po/it.po | 2 | ||||
-rw-r--r-- | po/ja.po | 2 | ||||
-rw-r--r-- | po/km.po | 2 | ||||
-rw-r--r-- | po/ko.po | 2 | ||||
-rw-r--r-- | po/ku.po | 2 | ||||
-rw-r--r-- | po/lt.po | 2 | ||||
-rw-r--r-- | po/mr.po | 2 | ||||
-rw-r--r-- | po/nb.po | 2 | ||||
-rw-r--r-- | po/ne.po | 2 | ||||
-rw-r--r-- | po/nl.po | 2 | ||||
-rw-r--r-- | po/nn.po | 2 | ||||
-rw-r--r-- | po/pl.po | 2 | ||||
-rw-r--r-- | po/pt.po | 2 | ||||
-rw-r--r-- | po/pt_BR.po | 2 | ||||
-rw-r--r-- | po/ro.po | 2 | ||||
-rw-r--r-- | po/ru.po | 2 | ||||
-rw-r--r-- | po/sk.po | 2 | ||||
-rw-r--r-- | po/sl.po | 2 | ||||
-rw-r--r-- | po/sv.po | 2 | ||||
-rw-r--r-- | po/th.po | 2 | ||||
-rw-r--r-- | po/tl.po | 2 | ||||
-rw-r--r-- | po/uk.po | 2 | ||||
-rw-r--r-- | po/vi.po | 2 | ||||
-rw-r--r-- | po/zh_CN.po | 2 | ||||
-rw-r--r-- | po/zh_TW.po | 2 | ||||
-rw-r--r-- | test/integration/framework | 4 |
46 files changed, 55 insertions, 46 deletions
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 525654732..82d53c25a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.8.12) unstable; 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 + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Feb 2011 17:37:56 +0100 + apt (0.8.11) UNRELEASED; urgency=low [ David Kalnischkies ] 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 @@ -2927,7 +2927,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 @@ -3156,7 +3156,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" @@ -3191,7 +3191,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 @@ -2924,7 +2924,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 @@ -3191,7 +3191,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" @@ -3132,7 +3132,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 @@ -3219,7 +3219,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 @@ -3153,7 +3153,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 @@ -3231,7 +3231,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" @@ -3142,7 +3142,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 @@ -3176,7 +3176,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 @@ -3195,7 +3195,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" #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483 @@ -3138,7 +3138,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 @@ -3131,7 +3131,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 @@ -3242,7 +3242,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" @@ -3153,7 +3153,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 @@ -3123,7 +3123,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 @@ -3219,7 +3219,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" @@ -3178,7 +3178,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 @@ -3101,7 +3101,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 @@ -3124,7 +3124,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 @@ -2926,7 +2926,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 @@ -3022,7 +3022,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 @@ -3113,7 +3113,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 @@ -3152,7 +3152,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 @@ -3105,7 +3105,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 @@ -3192,7 +3192,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 @@ -3126,7 +3126,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 @@ -3160,7 +3160,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 @@ -3189,7 +3189,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 e32dd4034..0bff38c96 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3168,7 +3168,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 @@ -3177,7 +3177,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 @@ -3197,7 +3197,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, так как он полностью виртуальный" @@ -3147,7 +3147,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 @@ -3150,7 +3150,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 @@ -3176,7 +3176,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" @@ -3083,7 +3083,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 @@ -3160,7 +3160,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 @@ -3174,7 +3174,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 @@ -3198,7 +3198,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 bc15dddb6..8844f4fc3 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3099,7 +3099,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 f8592526f..5820241dd 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3084,7 +3084,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 fe1db14bc..fe0ffb64f 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -590,12 +590,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 |