Browse Source

* 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
debian/1.8.y
Michael Vogt 11 years ago
parent
commit
edc0ef102b
  1. 2
      apt-pkg/cacheset.cc
  2. 9
      debian/changelog
  3. 2
      po/apt-all.pot
  4. 2
      po/ar.po
  5. 2
      po/ast.po
  6. 2
      po/bg.po
  7. 2
      po/bs.po
  8. 2
      po/ca.po
  9. 2
      po/cs.po
  10. 2
      po/cy.po
  11. 2
      po/da.po
  12. 2
      po/de.po
  13. 2
      po/dz.po
  14. 2
      po/el.po
  15. 2
      po/es.po
  16. 2
      po/eu.po
  17. 2
      po/fi.po
  18. 2
      po/fr.po
  19. 2
      po/gl.po
  20. 2
      po/hu.po
  21. 2
      po/it.po
  22. 2
      po/ja.po
  23. 2
      po/km.po
  24. 2
      po/ko.po
  25. 2
      po/ku.po
  26. 2
      po/lt.po
  27. 2
      po/mr.po
  28. 2
      po/nb.po
  29. 2
      po/ne.po
  30. 2
      po/nl.po
  31. 2
      po/nn.po
  32. 2
      po/pl.po
  33. 2
      po/pt.po
  34. 2
      po/pt_BR.po
  35. 2
      po/ro.po
  36. 2
      po/ru.po
  37. 2
      po/sk.po
  38. 2
      po/sl.po
  39. 2
      po/sv.po
  40. 2
      po/th.po
  41. 2
      po/tl.po
  42. 2
      po/uk.po
  43. 2
      po/vi.po
  44. 2
      po/zh_CN.po
  45. 2
      po/zh_TW.po
  46. 4
      test/integration/framework

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

9
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 ]

2
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

2
po/ar.po

@ -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

2
po/ast.po

@ -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"

2
po/bg.po

@ -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

2
po/bs.po

@ -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

2
po/ca.po

@ -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"

2
po/cs.po

@ -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

2
po/cy.po

@ -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

2
po/da.po

@ -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

2
po/de.po

@ -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"

2
po/dz.po

@ -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

2
po/el.po

@ -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

2
po/es.po

@ -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

2
po/eu.po

@ -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

2
po/fi.po

@ -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

2
po/fr.po

@ -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"

2
po/gl.po

@ -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

2
po/hu.po

@ -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

2
po/it.po

@ -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"

2
po/ja.po

@ -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

2
po/km.po

@ -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

2
po/ko.po

@ -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

2
po/ku.po

@ -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

2
po/lt.po

@ -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

2
po/mr.po

@ -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

2
po/nb.po

@ -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

2
po/ne.po

@ -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

2
po/nl.po

@ -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

2
po/nn.po

@ -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

2
po/pl.po

@ -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

2
po/pt.po

@ -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"

2
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

2
po/ro.po

@ -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

2
po/ru.po

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

2
po/sk.po

@ -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

2
po/sl.po

@ -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

2
po/sv.po

@ -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"

2
po/th.po

@ -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

2
po/tl.po

@ -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

2
po/uk.po

@ -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

2
po/vi.po

@ -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

2
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

2
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

4
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

Loading…
Cancel
Save