Browse Source

show item ID in Hit, Ign and Err lines as well

Again, consistency is the main sellingpoint here, but this way it is now
also easier to explain that some files move through different stages and
lines are printed for them hence multiple times: That is a bit hard to
believe if the number is changing all the time, but now that it keeps
consistent.
debian/1.8.y
David Kalnischkies 7 years ago
parent
commit
1eb1836f4b
  1. 2
      apt-pkg/acquire-item.cc
  2. 38
      apt-private/acqprogress.cc
  3. 3
      apt-private/acqprogress.h
  4. 12
      po/apt-all.pot
  5. 18
      po/ar.po
  6. 20
      po/ast.po
  7. 20
      po/bg.po
  8. 8
      po/bs.po
  9. 20
      po/ca.po
  10. 20
      po/cs.po
  11. 20
      po/cy.po
  12. 20
      po/da.po
  13. 20
      po/de.po
  14. 20
      po/dz.po
  15. 20
      po/el.po
  16. 20
      po/es.po
  17. 20
      po/eu.po
  18. 20
      po/fi.po
  19. 20
      po/fr.po
  20. 20
      po/gl.po
  21. 12
      po/he.po
  22. 20
      po/hu.po
  23. 21
      po/it.po
  24. 20
      po/ja.po
  25. 20
      po/km.po
  26. 20
      po/ko.po
  27. 16
      po/ku.po
  28. 20
      po/lt.po
  29. 20
      po/mr.po
  30. 20
      po/nb.po
  31. 20
      po/ne.po
  32. 20
      po/nl.po
  33. 20
      po/nn.po
  34. 20
      po/pl.po
  35. 20
      po/pt.po
  36. 20
      po/pt_BR.po
  37. 20
      po/ro.po
  38. 20
      po/ru.po
  39. 20
      po/sk.po
  40. 20
      po/sl.po
  41. 20
      po/sv.po
  42. 20
      po/th.po
  43. 20
      po/tl.po
  44. 20
      po/tr.po
  45. 20
      po/uk.po
  46. 20
      po/vi.po
  47. 20
      po/zh_CN.po
  48. 20
      po/zh_TW.po
  49. 10
      test/integration/test-apt-acquire-additional-files
  50. 4
      test/integration/test-apt-cdrom
  51. 14
      test/integration/test-apt-get-update-unauth-warning
  52. 36
      test/integration/test-apt-update-ims
  53. 40
      test/integration/test-apt-update-not-modified
  54. 14
      test/integration/test-bug-595691-empty-and-broken-archive-files
  55. 2
      test/integration/test-bug-602412-dequote-redirect
  56. 2
      test/integration/test-pdiff-usage
  57. 8
      test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum

2
apt-pkg/acquire-item.cc

@ -405,7 +405,7 @@ class APT_HIDDEN NoActionItem : public pkgAcquire::Item /*{{{*/
// Acquire::Item::Item - Constructor /*{{{*/
APT_IGNORE_DEPRECATED_PUSH
pkgAcquire::Item::Item(pkgAcquire * const Owner) :
FileSize(0), PartialSize(0), Mode(0), Complete(false), Local(false),
FileSize(0), PartialSize(0), Mode(0), ID(0), Complete(false), Local(false),
QueueCounter(0), ExpectedAdditionalItems(0), Owner(Owner)
{
Owner->Add(this);

38
apt-private/acqprogress.cc

@ -49,6 +49,16 @@ void AcqTextStatus::Start()
ID = 1;
}
/*}}}*/
void AcqTextStatus::AssignItemID(pkgAcquire::ItemDesc &Itm) /*{{{*/
{
/* In theory calling it from Fetch() would be enough, but to be
safe we call it from IMSHit and Fail as well.
Also, an Item can pass through multiple stages, so ensure
that it keeps the same number */
if (Itm.Owner->ID == 0)
Itm.Owner->ID = ID++;
}
/*}}}*/
// AcqTextStatus::IMSHit - Called when an item got a HIT response /*{{{*/
// ---------------------------------------------------------------------
/* */
@ -57,9 +67,11 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
if (Quiet > 1)
return;
AssignItemID(Itm);
clearLastLine();
out << _("Hit ") << Itm.Description;
// TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
ioprintf(out, _("Hit:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
out << std::endl;
Update = true;
}
@ -72,15 +84,16 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
Update = true;
if (Itm.Owner->Complete == true)
return;
Itm.Owner->ID = ID++;
AssignItemID(Itm);
if (Quiet > 1)
return;
clearLastLine();
out << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description;
// TRANSLATOR: Very short word to be displayed for files processed in 'apt-get update'
// Potentially replaced later by "Hit:", "Ign:" or "Err:" if something (bad) happens
ioprintf(out, _("Get:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
if (Itm.Owner->FileSize != 0)
out << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
out << std::endl;
@ -89,9 +102,10 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
// AcqTextStatus::Done - Completed a download /*{{{*/
// ---------------------------------------------------------------------
/* We don't display anything... */
void AcqTextStatus::Done(pkgAcquire::ItemDesc &/*Itm*/)
void AcqTextStatus::Done(pkgAcquire::ItemDesc &Itm)
{
Update = true;
AssignItemID(Itm);
}
/*}}}*/
// AcqTextStatus::Fail - Called when an item fails to download /*{{{*/
@ -106,19 +120,25 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
return;
AssignItemID(Itm);
clearLastLine();
if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
{
out << _("Ign ") << Itm.Description << std::endl;
// TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
// which failed to download, but the error is ignored (compare "Err:")
ioprintf(out, _("Ign:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
if (Itm.Owner->ErrorText.empty() == false &&
_config->FindB("Acquire::Progress::Ignore::ShowErrorText", false) == true)
out << " " << Itm.Owner->ErrorText << std::endl;
out << std::endl << " " << Itm.Owner->ErrorText;
out << std::endl;
}
else
{
out << _("Err ") << Itm.Description << std::endl;
out << " " << Itm.Owner->ErrorText << std::endl;
// TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
// which failed to download and the error is critical (compare "Ign:")
ioprintf(out, _("Err:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
out << std::endl << " " << Itm.Owner->ErrorText << std::endl;
}
Update = true;

3
apt-private/acqprogress.h

@ -23,7 +23,8 @@ class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
unsigned long ID;
unsigned long Quiet;
void clearLastLine();
APT_HIDDEN void clearLastLine();
APT_HIDDEN void AssignItemID(pkgAcquire::ItemDesc &Itm);
public:

12
po/apt-all.pot

@ -1529,19 +1529,23 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
#, c-format
msgid "Hit:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:88
msgid "Get:"
#, c-format
msgid "Get:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:119
msgid "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150

18
po/ar.po

@ -1555,20 +1555,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
#, c-format
msgid "Hit:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "جلب:"
#, c-format
msgid "Get:%lu %s"
msgstr "جلب:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "تجاهل"
#, c-format
msgid "Ign:%lu %s"
msgstr "تجاهل:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "خطأ"
#, c-format
msgid "Err:%lu %s"
msgstr "خطأ:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/ast.po

@ -1684,20 +1684,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Oxe "
#, c-format
msgid "Hit:%lu %s"
msgstr "Oxe:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Des:"
#, c-format
msgid "Get:%lu %s"
msgstr "Des:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format

20
po/bg.po

@ -1720,20 +1720,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Поп "
#, c-format
msgid "Hit:%lu %s"
msgstr "Поп:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Изт:"
#, c-format
msgid "Get:%lu %s"
msgstr "Изт:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Игн "
#, c-format
msgid "Ign:%lu %s"
msgstr "Игн:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Грш "
#, c-format
msgid "Err:%lu %s"
msgstr "Грш:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

8
po/bs.po

@ -1555,19 +1555,19 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgid "Hit:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgid "Get:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150

20
po/ca.po

@ -1708,20 +1708,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Obj "
#, c-format
msgid "Hit:%lu %s"
msgstr "Obj:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Bai:"
#, c-format
msgid "Get:%lu %s"
msgstr "Bai:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format

20
po/cs.po

@ -1734,20 +1734,24 @@ msgid "Full Text Search"
msgstr "Fulltextové hledání"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Cíl "
#, c-format
msgid "Hit:%lu %s"
msgstr "Cíl:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Mám:"
#, c-format
msgid "Get:%lu %s"
msgstr "Mám:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format

20
po/cy.po

@ -1706,20 +1706,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Presennol "
#, c-format
msgid "Hit:%lu %s"
msgstr "Presennol:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Cyrchu:"
#, c-format
msgid "Get:%lu %s"
msgstr "Cyrchu:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Anwybyddu "
#, c-format
msgid "Ign:%lu %s"
msgstr "Anwybyddu:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Gwall "
#, c-format
msgid "Err:%lu %s"
msgstr "Gwall:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/da.po

@ -1749,20 +1749,24 @@ msgid "Full Text Search"
msgstr "Fuldtekst-søgning"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Havde "
#, c-format
msgid "Hit:%lu %s"
msgstr "Havde:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Henter:"
#, c-format
msgid "Get:%lu %s"
msgstr "Henter:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ignorerer "
#, c-format
msgid "Ign:%lu %s"
msgstr "Ignorerer:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Fejl "
#, c-format
msgid "Err:%lu %s"
msgstr "Fejl:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/de.po

@ -1810,20 +1810,24 @@ msgid "Full Text Search"
msgstr "Volltextsuche"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "OK "
#, c-format
msgid "Hit:%lu %s"
msgstr "OK:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Holen: "
#, c-format
msgid "Get:%lu %s"
msgstr "Holen:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr "Ign:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Fehl "
#, c-format
msgid "Err:%lu %s"
msgstr "Fehl:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/dz.po

@ -1674,20 +1674,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "ཨེབ།"
#, c-format
msgid "Hit:%lu %s"
msgstr "ཨེབ།:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "ལེན:"
#, c-format
msgid "Get:%lu %s"
msgstr "ལེན:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "ཨེལ་ཇི་ཨེན:"
#, c-format
msgid "Ign:%lu %s"
msgstr "ཨེལ་ཇི་ཨེན:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "ཨི་ཨར་ཨར།"
#, c-format
msgid "Err:%lu %s"
msgstr "ཨི་ཨར་ཨར།:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/el.po

@ -1695,20 +1695,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Hit "
#, c-format
msgid "Hit:%lu %s"
msgstr "Hit:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Φέρε:"
#, c-format
msgid "Get:%lu %s"
msgstr "Φέρε:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Αγνόησε "
#, c-format
msgid "Ign:%lu %s"
msgstr "Αγνόησε:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Σφάλμα "
#, c-format
msgid "Err:%lu %s"
msgstr "Σφάλμα:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/es.po

@ -1820,20 +1820,24 @@ msgid "Full Text Search"
msgstr "Buscar en todo el texto"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Obj "
#, c-format
msgid "Hit:%lu %s"
msgstr "Obj:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Des:"
#, c-format
msgid "Get:%lu %s"
msgstr "Des:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format

20
po/eu.po

@ -1678,20 +1678,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Atzituta "
#, c-format
msgid "Hit:%lu %s"
msgstr "Atzituta:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Hartu:"
#, c-format
msgid "Get:%lu %s"
msgstr "Hartu:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ez ikusi "
#, c-format
msgid "Ign:%lu %s"
msgstr "Ez ikusi:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format

20
po/fi.po

@ -1669,20 +1669,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Löytyi "
#, c-format
msgid "Hit:%lu %s"
msgstr "Löytyi:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Nouda:"
#, c-format
msgid "Get:%lu %s"
msgstr "Nouda:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Siv "
#, c-format
msgid "Ign:%lu %s"
msgstr "Siv:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Vrhe "
#, c-format
msgid "Err:%lu %s"
msgstr "Vrhe:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/fr.po

@ -1774,20 +1774,24 @@ msgid "Full Text Search"
msgstr "Recherche en texte intégral"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Atteint "
#, c-format
msgid "Hit:%lu %s"
msgstr "Atteint:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Réception de : "
#, c-format
msgid "Get:%lu %s"
msgstr "Réception de:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr "Ign:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr "Err:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/gl.po

@ -1706,20 +1706,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Teño "
#, c-format
msgid "Hit:%lu %s"
msgstr "Teño:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Rcb:"
#, c-format
msgid "Get:%lu %s"
msgstr "Rcb:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format

12
po/he.po

@ -1188,19 +1188,23 @@ msgid ""
msgstr ""
#: cmdline/acqprogress.cc:55
msgid "Hit "
#, c-format
msgid "Hit:%lu %s"
msgstr ""
#: cmdline/acqprogress.cc:79
msgid "Get:"
#, c-format
msgid "Get:%lu %s"
msgstr ""
#: cmdline/acqprogress.cc:110
msgid "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: cmdline/acqprogress.cc:114
msgid "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: cmdline/acqprogress.cc:135

20
po/hu.po

@ -1714,20 +1714,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Találat "
#, c-format
msgid "Hit:%lu %s"
msgstr "Találat:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Letöltés:"
#, c-format
msgid "Get:%lu %s"
msgstr "Letöltés:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Mellőz "
#, c-format
msgid "Ign:%lu %s"
msgstr "Mellőz:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Hiba "
#, c-format
msgid "Err:%lu %s"
msgstr "Hiba:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

21
po/it.po

@ -1766,21 +1766,24 @@ msgid "Full Text Search"
msgstr "Ricerca sul testo"
#: apt-private/acqprogress.cc:62
msgid "Hit "
msgstr "Trovato "
#, c-format
msgid "Hit:%lu %s"
msgstr "Trovato:%lu %s"
#: apt-private/acqprogress.cc:83
msgid "Get:"
msgstr "Scaricamento di:"
#, c-format
msgid "Get:%lu %s"
msgstr "Scaricamento di:%lu %s"
# (ndt) questa non so cosa voglia dire
#: apt-private/acqprogress.cc:113
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:120
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:143
#, c-format

20
po/ja.po

@ -1750,20 +1750,24 @@ msgid "Full Text Search"
msgstr "全文検索"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "ヒット "
#, c-format
msgid "Hit:%lu %s"
msgstr "ヒット:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "取得:"
#, c-format
msgid "Get:%lu %s"
msgstr "取得:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "無視 "
#, c-format
msgid "Ign:%lu %s"
msgstr "無視:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "エラー "
#, c-format
msgid "Err:%lu %s"
msgstr "エラー:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/km.po

@ -1652,20 +1652,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "វាយ​"
#, c-format
msgid "Hit:%lu %s"
msgstr "វាយ​:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "យក​ ៖"
#, c-format
msgid "Get:%lu %s"
msgstr "យក​ ៖:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format

20
po/ko.po

@ -1666,20 +1666,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "기존 "
#, c-format
msgid "Hit:%lu %s"
msgstr "기존:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "받기:"
#, c-format
msgid "Get:%lu %s"
msgstr "받기:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "무시"
#, c-format
msgid "Ign:%lu %s"
msgstr "무시:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "오류 "
#, c-format
msgid "Err:%lu %s"
msgstr "오류:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

16
po/ku.po

@ -1558,20 +1558,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
#, c-format
msgid "Hit:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Anîn:"
#, c-format
msgid "Get:%lu %s"
msgstr "Anîn:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Çewt"
#, c-format
msgid "Err:%lu %s"
msgstr "Çewt:%lu %s"
#: apt-private/acqprogress.cc:150
#, fuzzy, c-format

20
po/lt.po

@ -1577,20 +1577,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Imamas "
#, c-format
msgid "Hit:%lu %s"
msgstr "Imamas:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Gauti:"
#, c-format
msgid "Get:%lu %s"
msgstr "Gauti:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ignoruotas "
#, c-format
msgid "Ign:%lu %s"
msgstr "Ignoruotas:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Klaida "
#, c-format
msgid "Err:%lu %s"
msgstr "Klaida:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/mr.po

@ -1656,20 +1656,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "दाबा"
#, c-format
msgid "Hit:%lu %s"
msgstr "दाबा:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "मिळवा:"
#, c-format
msgid "Get:%lu %s"
msgstr "मिळवा:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "आय.जी.एन."
#, c-format
msgid "Ign:%lu %s"
msgstr "आय.जी.एन.:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "दोष इ.आर.आर."
#, c-format
msgid "Err:%lu %s"
msgstr "दोष इ.आर.आर.:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/nb.po

@ -1684,20 +1684,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Funnet "
#, c-format
msgid "Hit:%lu %s"
msgstr "Funnet:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Hent:"
#, c-format
msgid "Get:%lu %s"
msgstr "Hent:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr "Ign:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Feil "
#, c-format
msgid "Err:%lu %s"
msgstr "Feil:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/ne.po

@ -1652,20 +1652,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "हान्नुहोस्"
#, c-format
msgid "Hit:%lu %s"
msgstr "हान्नुहोस्:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "प्राप्त गर्नुहोस्:"
#, c-format
msgid "Get:%lu %s"
msgstr "प्राप्त गर्नुहोस्:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format

20
po/nl.po

@ -1776,20 +1776,24 @@ msgid "Full Text Search"
msgstr "Volledige tekst doorzoeken"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Geraakt "
#, c-format
msgid "Hit:%lu %s"
msgstr "Geraakt:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Ophalen:"
#, c-format
msgid "Get:%lu %s"
msgstr "Ophalen:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Genegeerd "
#, c-format
msgid "Ign:%lu %s"
msgstr "Genegeerd:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Fout "
#, c-format
msgid "Err:%lu %s"
msgstr "Fout:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/nn.po

@ -1668,20 +1668,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Treff "
#, c-format
msgid "Hit:%lu %s"
msgstr "Treff:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Hent:"
#, c-format
msgid "Get:%lu %s"
msgstr "Hent:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr "Ign:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Feil "
#, c-format
msgid "Err:%lu %s"
msgstr "Feil:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/pl.po

@ -1749,22 +1749,26 @@ msgstr ""
# Ujednolicono z aptitude
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Stary "
#, c-format
msgid "Hit:%lu %s"
msgstr "Stary:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Pobieranie:"
#, c-format
msgid "Get:%lu %s"
msgstr "Pobieranie:%lu %s"
# Wyrównane do Hit i Err.
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign. "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
# Wyrównane do Hit i Ign.
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Błąd "
#, c-format
msgid "Err:%lu %s"
msgstr "Błąd:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/pt.po

@ -1718,20 +1718,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Hit "
#, c-format
msgid "Hit:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Obter:"
#, c-format
msgid "Get:%lu %s"
msgstr "Obter:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format

20
po/pt_BR.po

@ -1687,20 +1687,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Atingido "
#, c-format
msgid "Hit:%lu %s"
msgstr "Atingido:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Obter:"
#, c-format
msgid "Get:%lu %s"
msgstr "Obter:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format

20
po/ro.po

@ -1695,20 +1695,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Atins "
#, c-format
msgid "Hit:%lu %s"
msgstr "Atins:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Luat:"
#, c-format
msgid "Get:%lu %s"
msgstr "Luat:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ignorat "
#, c-format
msgid "Ign:%lu %s"
msgstr "Ignorat:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Eroare"
#, c-format
msgid "Err:%lu %s"
msgstr "Eroare:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/ru.po

@ -1742,20 +1742,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "В кэше "
#, c-format
msgid "Hit:%lu %s"
msgstr "В кэше:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Получено:"
#, c-format
msgid "Get:%lu %s"
msgstr "Получено:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Игн "
#, c-format
msgid "Ign:%lu %s"
msgstr "Игн:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Ош "
#, c-format
msgid "Err:%lu %s"
msgstr "Ош:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/sk.po

@ -1716,20 +1716,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Už existuje "
#, c-format
msgid "Hit:%lu %s"
msgstr "Už existuje:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Získava sa:"
#, c-format
msgid "Get:%lu %s"
msgstr "Získava sa:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Chyba "
#, c-format
msgid "Err:%lu %s"
msgstr "Chyba:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/sl.po

@ -1717,20 +1717,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Zadetek "
#, c-format
msgid "Hit:%lu %s"
msgstr "Zadetek:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Dobi:"
#, c-format
msgid "Get:%lu %s"
msgstr "Dobi:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Prezr "
#, c-format
msgid "Ign:%lu %s"
msgstr "Prezr:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Nap "
#, c-format
msgid "Err:%lu %s"
msgstr "Nap:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/sv.po

@ -1698,23 +1698,27 @@ msgstr ""
# Måste vara tre bokstäver(?)
# "Hit" = aktuell version är fortfarande giltig
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Bra "
#, c-format
msgid "Hit:%lu %s"
msgstr "Bra:%lu %s"
# "Get:" = hämtar ny version
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Läs:"
#, c-format
msgid "Get:%lu %s"
msgstr "Läs:%lu %s"
# "Ign" = hoppar över
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ign "
#, c-format
msgid "Ign:%lu %s"
msgstr "Ign:%lu %s"
# "Err" = fel vid hämtning
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Fel "
#, c-format
msgid "Err:%lu %s"
msgstr "Fel:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/th.po

@ -1696,20 +1696,24 @@ msgid "Full Text Search"
msgstr "ค้นทั่วทั้งเนื้อความ"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "เจอ "
#, c-format
msgid "Hit:%lu %s"
msgstr "เจอ:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "ดึง:"
#, c-format
msgid "Get:%lu %s"
msgstr "ดึง:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "ข้าม "
#, c-format
msgid "Ign:%lu %s"
msgstr "ข้าม:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "ปัญหา "
#, c-format
msgid "Err:%lu %s"
msgstr "ปัญหา:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/tl.po

@ -1677,20 +1677,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Tumama "
#, c-format
msgid "Hit:%lu %s"
msgstr "Tumama:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Kunin: "
#, c-format
msgid "Get:%lu %s"
msgstr "Kunin:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "DiPansin "
#, c-format
msgid "Ign:%lu %s"
msgstr "DiPansin:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Err "
#, c-format
msgid "Err:%lu %s"
msgstr "Err:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/tr.po

@ -1753,20 +1753,24 @@ msgid "Full Text Search"
msgstr "Tam Metin Arama"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Bağlandı "
#, c-format
msgid "Hit:%lu %s"
msgstr "Bağlandı:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Alınıyor: "
#, c-format
msgid "Get:%lu %s"
msgstr "Alınıyor:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Yoksay "
#, c-format
msgid "Ign:%lu %s"
msgstr "Yoksay:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Hata "
#, c-format
msgid "Err:%lu %s"
msgstr "Hata:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/uk.po

@ -1736,20 +1736,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "В кеші "
#, c-format
msgid "Hit:%lu %s"
msgstr "В кеші:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Отр:"
#, c-format
msgid "Get:%lu %s"
msgstr "Отр:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Ігн "
#, c-format
msgid "Ign:%lu %s"
msgstr "Ігн:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Пом "
#, c-format
msgid "Err:%lu %s"
msgstr "Пом:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/vi.po

@ -1752,20 +1752,24 @@ msgid "Full Text Search"
msgstr "Tìm kiếm toàn văn"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Tìm thấy "
#, c-format
msgid "Hit:%lu %s"
msgstr "Tìm thấy:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "Lấy:"
#, c-format
msgid "Get:%lu %s"
msgstr "Lấy:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "Bỏq "
#, c-format
msgid "Ign:%lu %s"
msgstr "Bỏq:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "
msgstr "Lỗi "
#, c-format
msgid "Err:%lu %s"
msgstr "Lỗi:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format

20
po/zh_CN.po

@ -1693,20 +1693,24 @@ msgid "Full Text Search"
msgstr "全文搜索"
#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "命中 "
#, c-format
msgid "Hit:%lu %s"
msgstr "命中:%lu %s"
#: apt-private/acqprogress.cc:88
msgid "Get:"
msgstr "获取:"
#, c-format
msgid "Get:%lu %s"
msgstr "获取:%lu %s"
#: apt-private/acqprogress.cc:119
msgid "Ign "
msgstr "忽略 "
#, c-format
msgid "Ign:%lu %s"
msgstr "忽略:%lu %s"
#: apt-private/acqprogress.cc:126
msgid "Err "