diff options
| -rw-r--r-- | apt-private/private-cmndline.cc | 11 | ||||
| -rw-r--r-- | apt-private/private-output.h | 4 | ||||
| -rw-r--r-- | cmdline/apt-cache.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-mark.cc | 122 | ||||
| -rw-r--r-- | doc/apt-mark.8.xml | 8 | ||||
| -rw-r--r-- | po/apt-all.pot | 3 | ||||
| -rw-r--r-- | po/ar.po | 4 | ||||
| -rw-r--r-- | po/ast.po | 4 | ||||
| -rw-r--r-- | po/bg.po | 4 | ||||
| -rw-r--r-- | po/bs.po | 3 | ||||
| -rw-r--r-- | po/ca.po | 5 | ||||
| -rw-r--r-- | po/cs.po | 5 | ||||
| -rw-r--r-- | po/cy.po | 4 | ||||
| -rw-r--r-- | po/da.po | 5 | ||||
| -rw-r--r-- | po/de.po | 5 | ||||
| -rw-r--r-- | po/dz.po | 4 | ||||
| -rw-r--r-- | po/el.po | 4 | ||||
| -rw-r--r-- | po/es.po | 5 | ||||
| -rw-r--r-- | po/eu.po | 4 | ||||
| -rw-r--r-- | po/fi.po | 4 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | po/gl.po | 4 | ||||
| -rw-r--r-- | po/hu.po | 5 | ||||
| -rw-r--r-- | po/it.po | 5 | ||||
| -rw-r--r-- | po/ja.po | 5 | ||||
| -rw-r--r-- | po/km.po | 4 | ||||
| -rw-r--r-- | po/ko.po | 4 | ||||
| -rw-r--r-- | po/ku.po | 3 | ||||
| -rw-r--r-- | po/lt.po | 4 | ||||
| -rw-r--r-- | po/mr.po | 4 | ||||
| -rw-r--r-- | po/nb.po | 4 | ||||
| -rw-r--r-- | po/ne.po | 4 | ||||
| -rw-r--r-- | po/nl.po | 5 | ||||
| -rw-r--r-- | po/nn.po | 4 | ||||
| -rw-r--r-- | po/pl.po | 4 | ||||
| -rw-r--r-- | po/pt.po | 4 | ||||
| -rw-r--r-- | po/pt_BR.po | 4 | ||||
| -rw-r--r-- | po/ro.po | 4 | ||||
| -rw-r--r-- | po/ru.po | 5 | ||||
| -rw-r--r-- | po/sk.po | 4 | ||||
| -rw-r--r-- | po/sl.po | 4 | ||||
| -rw-r--r-- | po/sv.po | 4 | ||||
| -rw-r--r-- | po/th.po | 4 | ||||
| -rw-r--r-- | po/tl.po | 4 | ||||
| -rw-r--r-- | po/tr.po | 5 | ||||
| -rw-r--r-- | po/uk.po | 4 | ||||
| -rw-r--r-- | po/vi.po | 4 | ||||
| -rw-r--r-- | po/zh_CN.po | 5 | ||||
| -rw-r--r-- | po/zh_TW.po | 4 |
49 files changed, 243 insertions, 89 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index 101e0ae40..87deb6bf0 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -287,7 +287,7 @@ static bool addArgumentsAPTMark(std::vector<CommandLine::Args> &Args, char const { if (CmdMatches("auto", "manual", "hold", "unhold", "showauto", "showmanual", "showhold", "showholds", - "markauto", "unmarkauto")) + "markauto", "unmarkauto", "minimize-manual")) { addArg('f',"file","Dir::State::extended_states",CommandLine::HasArg); } @@ -303,7 +303,14 @@ static bool addArgumentsAPTMark(std::vector<CommandLine::Args> &Args, char const addArg('v',"verbose","APT::MarkAuto::Verbose",0); } - if (Cmd != nullptr && strncmp(Cmd, "show", strlen("show")) != 0) + if (CmdMatches("minimize-manual")) + { + addArg('y',"yes","APT::Get::Assume-Yes",0); + addArg('y',"assume-yes","APT::Get::Assume-Yes",0); + addArg(0,"assume-no","APT::Get::Assume-No",0); + } + + if (CmdMatches("minimize-manual") || (Cmd != nullptr && strncmp(Cmd, "show", strlen("show")) != 0)) { addArg('s',"simulate","APT::Mark::Simulate",0); addArg('s',"just-print","APT::Mark::Simulate",0); diff --git a/apt-private/private-output.h b/apt-private/private-output.h index 1ac861328..c20cc9e17 100644 --- a/apt-private/private-output.h +++ b/apt-private/private-output.h @@ -101,11 +101,11 @@ bool ShowEssential(std::ostream &out,CacheFile &Cache); void Stats(std::ostream &out, pkgDepCache &Dep); // prompting -bool YnPrompt(char const * const Question, bool Default=true); +APT_PUBLIC bool YnPrompt(char const *const Question, bool Default = true); bool YnPrompt(char const * const Question, bool const Default, bool const ShowGlobalErrors, std::ostream &c1o, std::ostream &c2o); bool AnalPrompt(std::string const &Question, const char *Text); -std::string PrettyFullName(pkgCache::PkgIterator const &Pkg); +APT_PUBLIC std::string PrettyFullName(pkgCache::PkgIterator const &Pkg); std::string CandidateVersion(pkgCacheFile * const Cache, pkgCache::PkgIterator const &Pkg); std::function<std::string(pkgCache::PkgIterator const &)> CandidateVersion(pkgCacheFile * const Cache); std::string CurrentToCandidateVersion(pkgCacheFile * const Cache, pkgCache::PkgIterator const &Pkg); diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index f1b1e144d..3c0e477b1 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -182,7 +182,7 @@ static void ShowHashTableStats(std::string Type, static bool Stats(CommandLine &CmdL) { if (CmdL.FileSize() > 1) { - _error->Error(_("apt-cache stats does not take any arguments")); + _error->Error(_("%s does not take any arguments"), "apt-cache stats"); return false; } diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index 927b31d2f..161845b53 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -125,6 +125,127 @@ static bool DoMarkAuto(CommandLine &CmdL) return true; } /*}}}*/ +// helper for Install-Recommends-Sections and Never-MarkAuto-Sections /*{{{*/ +static bool +ConfigValueInSubTree(const char *SubTree, const char *needle) +{ + // copied from depcache.cc + Configuration::Item const *Opts; + Opts = _config->Tree(SubTree); + if (Opts != 0 && Opts->Child != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + if (strcmp(needle, Opts->Value.c_str()) == 0) + return true; + } + } + return false; +} + /*}}}*/ +/* DoMinimize - minimize manually installed {{{*/ +/* Traverses dependencies of meta packages and marks them as manually + * installed. */ +static bool DoMinimize(CommandLine &CmdL) +{ + + pkgCacheFile CacheFile; + pkgDepCache *const DepCache = CacheFile.GetDepCache(); + if (unlikely(DepCache == nullptr)) + return false; + + if (CmdL.FileList[1] != nullptr) + return _error->Error(_("%s does not take any arguments"), "apt-mark minimize-manual"); + + auto Debug = _config->FindB("Debug::AptMark::Minimize", false); + auto is_root = [&DepCache](pkgCache::PkgIterator const &pkg) { + auto ver = pkg.CurrentVer(); + return ver.end() == false && ((*DepCache)[pkg].Flags & pkgCache::Flag::Auto) == 0 && + ver->Section != 0 && + ConfigValueInSubTree("APT::Never-MarkAuto-Sections", ver.Section()); + }; + + APT::PackageSet roots; + for (auto Pkg = DepCache->PkgBegin(); Pkg.end() == false; ++Pkg) + { + if (is_root(Pkg)) + { + if (Debug) + std::clog << "Found root " << Pkg.Name() << std::endl; + roots.insert(Pkg); + } + } + + APT::PackageSet workset(roots); + APT::PackageSet seen; + APT::PackageSet changed; + + pkgDepCache::ActionGroup group(*DepCache); + + while (workset.empty() == false) + { + if (Debug) + std::clog << "Iteration\n"; + + APT::PackageSet workset2; + for (auto &Pkg : workset) + { + if (seen.find(Pkg) != seen.end()) + continue; + + seen.insert(Pkg); + + if (Debug) + std::cerr << " Visiting " << Pkg.FullName(true) << "\n"; + if (roots.find(Pkg) == roots.end() && ((*DepCache)[Pkg].Flags & pkgCache::Flag::Auto) == 0) + { + DepCache->MarkAuto(Pkg, true); + changed.insert(Pkg); + } + + // Visit dependencies, add them to next working set + for (auto Dep = Pkg.CurrentVer().DependsList(); !Dep.end(); ++Dep) + { + if (DepCache->IsImportantDep(Dep) == false) + continue; + std::unique_ptr<pkgCache::Version *[]> targets(Dep.AllTargets()); + for (int i = 0; targets[i] != nullptr; i++) + { + pkgCache::VerIterator Tgt(*DepCache, targets[i]); + if (Tgt.ParentPkg()->CurrentVer != 0 && Tgt.ParentPkg().CurrentVer()->ID == Tgt->ID) + workset2.insert(Tgt.ParentPkg()); + } + } + } + + workset = std::move(workset2); + } + + if (changed.empty()) { + cout << _("No changes necessary") << endl; + return true; + } + + ShowList(c1out, _("The following packages will be marked as automatically installed:"), changed, + [](const pkgCache::PkgIterator &) { return true; }, + &PrettyFullName, + &PrettyFullName); + + if (_config->FindB("APT::Mark::Simulate", false) == false) + { + if (YnPrompt(_("Do you want to continue?"), false) == false) + return true; + + return DepCache->writeStateFile(NULL); + } + + return true; +} + /*}}}*/ + /* ShowAuto - show automatically installed packages (sorted) {{{*/ static bool ShowAuto(CommandLine &CmdL) { @@ -293,6 +414,7 @@ static std::vector<aptDispatchWithHelp> GetCommands() /*{{{*/ return { {"auto",&DoAuto, _("Mark the given packages as automatically installed")}, {"manual",&DoAuto, _("Mark the given packages as manually installed")}, + {"minimize-manual", &DoMinimize, _("Mark all dependencies of meta packages as automatically installed.")}, {"hold",&DoSelection, _("Mark a package as held back")}, {"unhold",&DoSelection, _("Unset a package set as held back")}, {"install",&DoSelection, nullptr}, diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index ddde0416f..ea39b7faa 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -66,6 +66,14 @@ </para></listitem> </varlistentry> + <varlistentry><term><option>minimize-manual</option></term> + <listitem><para><literal>minimize-manual</literal> is used to mark + (transitive) dependencies of metapackages as automatically installed. + This can be used after an installation for example, to minimize the + number of manually installed packages; or continuously on systems + managed by system configuration metapackages. + </para></listitem> + </varlistentry> <varlistentry><term><option>showauto</option></term> <listitem><para><literal>showauto</literal> is used to print a list of automatically installed packages with each package on a new line. diff --git a/po/apt-all.pot b/po/apt-all.pot index e1d0e0f97..84a22e321 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -2408,7 +2408,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" +#, c-format +msgid "%s does not take any arguments" msgstr "" #: cmdline/apt-cache.cc @@ -2445,8 +2445,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "لا يقبل الأمر update أية مُعطيات" #: cmdline/apt-cache.cc @@ -2524,8 +2524,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "La orde update nun lleva argumentos" #: cmdline/apt-cache.cc @@ -2571,8 +2571,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Командата „update“ не възприема аргументи" #: cmdline/apt-cache.cc @@ -2427,7 +2427,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" +#, c-format +msgid "%s does not take any arguments" msgstr "" #: cmdline/apt-cache.cc @@ -2629,8 +2629,9 @@ msgid "All packages are up to date." msgstr "Tots els paquets estan actualitzats." #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "apt-cache stats no pren cap argument" +#, c-format +msgid "%s does not take any arguments" +msgstr "%s no pren cap argument" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2558,8 +2558,9 @@ msgid "All packages are up to date." msgstr "Všechny balíky jsou aktuální." #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "apt-cache stats neakceptuje žádné argumenty" +#, c-format +msgid "%s does not take any arguments" +msgstr "%s neakceptuje žádné argumenty" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2516,8 +2516,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" #: cmdline/apt-cache.cc @@ -2576,8 +2576,9 @@ msgid "All packages are up to date." msgstr "Alle pakker er opdateret." #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "»apt-cache stats« benytter ingen parametre" +#, c-format +msgid "%s does not take any arguments" +msgstr "»%s« benytter ingen parametre" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2676,8 +2676,9 @@ msgid "All packages are up to date." msgstr "Alle Pakete sind aktuell." #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "Der Befehl »apt-cache stats« akzeptiert keine Argumente." +#, c-format +msgid "%s does not take any arguments" +msgstr "Der Befehl »%s« akzeptiert keine Argumente." #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2480,8 +2480,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།" #: cmdline/apt-cache.cc @@ -2507,8 +2507,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" #: cmdline/apt-cache.cc @@ -2691,8 +2691,9 @@ msgid "All packages are up to date." msgstr "Todos los paquetes están actualizados." #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "«apt-cache stats» no necesita argumentos" +#, c-format +msgid "%s does not take any arguments" +msgstr "«%s» no necesita argumentos" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2484,8 +2484,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" #: cmdline/apt-cache.cc @@ -2476,8 +2476,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Komento update ei käytä parametreja" #: cmdline/apt-cache.cc @@ -2687,7 +2687,9 @@ msgid "All packages are up to date." msgstr "Tous les paquets sont à jour." #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +#| msgid "%s does not take any arguments" +msgid "%s does not take any arguments" msgstr "La commande apt-cache ne prend pas de paramètre" #: cmdline/apt-cache.cc @@ -2556,8 +2556,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "A orde «update» non toma argumentos" #: cmdline/apt-cache.cc @@ -2606,8 +2606,9 @@ msgid "All packages are up to date." msgstr "Minden csomag naprakész." #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "Az apt-cache stats parancsnak nincsenek argumentumai" +#, c-format +msgid "%s does not take any arguments" +msgstr "Az %s parancsnak nincsenek argumentumai" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2641,8 +2641,9 @@ msgid "All packages are up to date." msgstr "Tutti i pacchetti sono aggiornati." #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "Il comando \"apt-cache stats\" non accetta alcun argomento" +#, c-format +msgid "%s does not take any arguments" +msgstr "Il comando \"%s\" non accetta alcun argomento" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2594,8 +2594,9 @@ msgid "All packages are up to date." msgstr "パッケージはすべて最新です。" #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "apt-cache stats は引数をとりません" +#, c-format +msgid "%s does not take any arguments" +msgstr "%s は引数をとりません" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2467,8 +2467,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "ពាក្យបញ្ជាដែលធ្វើឲ្យទាន់សម័យគ្មានអាគុយម៉ង់ទេ" #: cmdline/apt-cache.cc @@ -2491,8 +2491,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "update 명령은 인수를 받지 않습니다" #: cmdline/apt-cache.cc @@ -2427,7 +2427,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" +#, c-format +msgid "%s does not take any arguments" msgstr "" #: cmdline/apt-cache.cc @@ -2457,8 +2457,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Atnaujinimo komandai argumentų nereikia" #: cmdline/apt-cache.cc @@ -2470,8 +2470,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." #: cmdline/apt-cache.cc @@ -2544,8 +2544,8 @@ msgid "All packages are up to date." msgstr "Alle pakkene er oppdatert." #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" #: cmdline/apt-cache.cc @@ -2465,8 +2465,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन" #: cmdline/apt-cache.cc @@ -2637,8 +2637,9 @@ msgid "All packages are up to date." msgstr "Alle pakketten zijn up-to-date." #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "De opdracht 'apt-cache stats' aanvaardt geen argumenten" +#, c-format +msgid "%s does not take any arguments" +msgstr "De opdracht '%s' aanvaardt geen argumenten" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2478,8 +2478,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Oppdateringskommandoen tek ingen argument" #: cmdline/apt-cache.cc @@ -2596,8 +2596,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Polecenie update nie wymaga żadnych argumentów" #: cmdline/apt-cache.cc @@ -2575,8 +2575,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "O comando update não leva argumentos" #: cmdline/apt-cache.cc diff --git a/po/pt_BR.po b/po/pt_BR.po index 441558ae4..66e3b1568 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2494,8 +2494,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "O comando update não leva argumentos" #: cmdline/apt-cache.cc @@ -2503,8 +2503,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Comanda de actualizare nu are argumente" #: cmdline/apt-cache.cc @@ -2625,8 +2625,9 @@ msgid "All packages are up to date." msgstr "Все пакеты имеют последние версии." #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "Команде apt-cache stats не нужны аргументы" +#, c-format +msgid "%s does not take any arguments" +msgstr "Команде %s не нужны аргументы" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2545,8 +2545,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Príkaz update neprijíma žiadne argumenty" #: cmdline/apt-cache.cc @@ -2550,8 +2550,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Ukaz update ne sprejema argumentov" #: cmdline/apt-cache.cc @@ -2564,8 +2564,8 @@ msgid "All packages are up to date." msgstr "Alla paket är uppdaterade." #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Uppdateringskommandot tar inga argument" #: cmdline/apt-cache.cc @@ -2479,8 +2479,8 @@ msgid "All packages are up to date." msgstr "ปรับรุ่นทุกแพกเกจเป็นรุ่นล่าสุดแล้ว" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม" #: cmdline/apt-cache.cc @@ -2494,8 +2494,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" #: cmdline/apt-cache.cc @@ -2598,8 +2598,9 @@ msgid "All packages are up to date." msgstr "Tüm paketler güncel." #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "apt-cache stats komutu argüman almaz" +#, c-format +msgid "%s does not take any arguments" +msgstr "%s komutu argüman almaz" #: cmdline/apt-cache.cc msgid "Total package names: " @@ -2582,8 +2582,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Команді update не потрібні аргументи" #: cmdline/apt-cache.cc @@ -2536,8 +2536,8 @@ msgid "All packages are up to date." msgstr "Mọi gói đã được cập nhật." #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "Lệnh cập nhật không chấp nhận đối số" #: cmdline/apt-cache.cc diff --git a/po/zh_CN.po b/po/zh_CN.po index 8a935332c..07eca117d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2474,8 +2474,9 @@ msgid "All packages are up to date." msgstr "所有软件包均为最新。" #: cmdline/apt-cache.cc -msgid "apt-cache stats does not take any arguments" -msgstr "apt-cache stats 命令不需要参数" +#, c-format +msgid "%s does not take any arguments" +msgstr "%s 命令不需要参数" #: cmdline/apt-cache.cc msgid "Total package names: " diff --git a/po/zh_TW.po b/po/zh_TW.po index db704f10d..d6a08d0ec 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2454,8 +2454,8 @@ msgid "All packages are up to date." msgstr "" #: cmdline/apt-cache.cc -#, fuzzy -msgid "apt-cache stats does not take any arguments" +#, fuzzy, c-format +msgid "%s does not take any arguments" msgstr "update 指令不需任何參數" #: cmdline/apt-cache.cc |